diff options
Diffstat (limited to 'gas')
-rw-r--r-- | gas/NEWS | 7 | ||||
-rw-r--r-- | gas/macro.c | 16 | ||||
-rw-r--r-- | gas/testsuite/gas/macros/irp-count.d | 2 | ||||
-rw-r--r-- | gas/testsuite/gas/macros/irp-count.l | 8 | ||||
-rw-r--r-- | gas/testsuite/gas/macros/irp-count.s | 8 | ||||
-rw-r--r-- | gas/testsuite/gas/macros/macros.exp | 6 |
6 files changed, 24 insertions, 23 deletions
@@ -1,8 +1,9 @@ -*- text -*- -* Assembler macros can now use the syntax \+ to access the number of times a - given macro has been executed. This is similar to the already existing \@ - syntax, except that the count is maintained on a per-macro basis. +* Assembler macros as well as the bodies of .irp / .irpc can now use the + syntax \+ to access the number of times a given macro has been executed. + This is similar to the already existing \@ syntax, except that the count is + maintained on a per-macro basis. * Support the NF feature in Intel APX. diff --git a/gas/macro.c b/gas/macro.c index 077bb01..a35e135 100644 --- a/gas/macro.c +++ b/gas/macro.c @@ -798,7 +798,8 @@ sub_actual (size_t start, sb *in, sb *t, struct htab *formal_hash, static const char * macro_expand_body (sb *in, sb *out, formal_entry *formals, - struct htab *formal_hash, const macro_entry *macro) + struct htab *formal_hash, const macro_entry *macro, + unsigned int instance) { sb t; size_t src = 0; @@ -854,13 +855,13 @@ macro_expand_body (sb *in, sb *out, formal_entry *formals, sprintf (buffer, "%u", macro_number); sb_add_string (out, buffer); } - else if (macro && src < in->len && in->ptr[src] == '+') + else if (src < in->len && in->ptr[src] == '+') { /* Sub in the current macro invocation number. */ char buffer[12]; src++; - sprintf (buffer, "%d", macro->count); + sprintf (buffer, "%d", instance); sb_add_string (out, buffer); } else if (src < in->len && in->ptr[src] == '&') @@ -1213,7 +1214,8 @@ macro_expand (size_t idx, sb *in, macro_entry *m, sb *out) } } - err = macro_expand_body (&m->sub, out, m->formals, m->formal_hash, m); + err = macro_expand_body (&m->sub, out, m->formals, m->formal_hash, m, + m->count); } /* Discard any unnamed formal arguments. */ @@ -1363,11 +1365,12 @@ expand_irp (int irpc, size_t idx, sb *in, sb *out, size_t (*get_line) (sb *)) if (idx >= in->len) { /* Expand once with a null string. */ - err = macro_expand_body (&sub, out, &f, h, 0); + err = macro_expand_body (&sub, out, &f, h, NULL, 0); } else { bool in_quotes = false; + unsigned int instance = 0; while (idx < in->len) { @@ -1392,7 +1395,8 @@ expand_irp (int irpc, size_t idx, sb *in, sb *out, size_t (*get_line) (sb *)) ++idx; } - err = macro_expand_body (&sub, out, &f, h, 0); + err = macro_expand_body (&sub, out, &f, h, NULL, instance); + ++instance; if (err != NULL) break; if (!irpc) diff --git a/gas/testsuite/gas/macros/irp-count.d b/gas/testsuite/gas/macros/irp-count.d deleted file mode 100644 index 66c51a6..0000000 --- a/gas/testsuite/gas/macros/irp-count.d +++ /dev/null @@ -1,2 +0,0 @@ -#name: Macro counters inside IRP commands (irp-count.d) -# Tests that \+ does not trip up IRP commands diff --git a/gas/testsuite/gas/macros/irp-count.l b/gas/testsuite/gas/macros/irp-count.l index d101555..734032e 100644 --- a/gas/testsuite/gas/macros/irp-count.l +++ b/gas/testsuite/gas/macros/irp-count.l @@ -1,3 +1,7 @@ #... -\+ -\+ +a0 +a1 +b2 +x0 +x1 +y2 diff --git a/gas/testsuite/gas/macros/irp-count.s b/gas/testsuite/gas/macros/irp-count.s index 1ff5c7b..93d8c93 100644 --- a/gas/testsuite/gas/macros/irp-count.s +++ b/gas/testsuite/gas/macros/irp-count.s @@ -1,7 +1,7 @@ - .irp i,1 - .print "\+" + .irp i,a,a,b + .print "\i\+" .endr - .irpc i,1 - .print "\+" + .irpc i,xxy + .print "\i\+" .endr diff --git a/gas/testsuite/gas/macros/macros.exp b/gas/testsuite/gas/macros/macros.exp index 4934709..fbe50f3 100644 --- a/gas/testsuite/gas/macros/macros.exp +++ b/gas/testsuite/gas/macros/macros.exp @@ -103,11 +103,5 @@ gas_test_error "exit.s" "" ".exitm outside of a macro" run_list_test altmacro run_list_test count - -# The AVR, CRIS, MSP430 and Z80 targets define ONLY_STANDARD_ESCAPES, -# so \+ is rejected. -# AIX targets need an extended regexp to match "\+". -setup_xfail "avr-*-*" "cris*-*-*" "msp430-*-*" "z80-*-*" "*-*-aix*" run_list_test irp-count - run_list_test irpc-quote |