diff options
author | Jan Beulich <jbeulich@novell.com> | 2005-04-25 06:43:46 +0000 |
---|---|---|
committer | Jan Beulich <jbeulich@novell.com> | 2005-04-25 06:43:46 +0000 |
commit | 02ddf1568180e41117d6d2804636e64775ac37b6 (patch) | |
tree | 4588484ed90e22025ecfedf8a3b007e67accab0f /gas/read.c | |
parent | fc41e3d163065a3876e13f2f61579bb59c1accb5 (diff) | |
download | fsf-binutils-gdb-02ddf1568180e41117d6d2804636e64775ac37b6.zip fsf-binutils-gdb-02ddf1568180e41117d6d2804636e64775ac37b6.tar.gz fsf-binutils-gdb-02ddf1568180e41117d6d2804636e64775ac37b6.tar.bz2 |
gas/
2005-04-25 Jan Beulich <jbeulich@novell.com>
* macro.c (macro_expand_body): Replace locals indicator parameters
with actual macro_entry. New local variables macro_line and err.
Don't return when encountering an error, just record the fact.
Detect local symbol name colliding with parameter. Track line number
inside of macro expansion.
(do_formals): Move local variable name to wider scope. Check
parameter of the same name doesn't already exist. In MRI mode, also
check it doesn't collide with the argument count pseudo-parameter).
(define_macro): Add file and line number parameters. Remove local
variable namestr. New local variable error. Initialize macro_entry
members file, line, and name. Don't return when encountering an
error, just record the fact. Use %s in some diagnostics for read.c
to insert the macro name. Free macro_entry on error.
(macro_expand): Pass macro_entry to macro_epand_body. Don't return
when encountering an error, just record the fact.
(expand_irp): Don't return when encountering an error, just record
the fact.
* macro.h (macro_struct): New members name, file, and line.
(define_macro): Add file and line number parameters.
* read.c (s_macro): Pass file and line to define_macro. Tag warning
regarding pseudo-op redefinition with the file/line that macro
definition started at.
gas/testsuite/
2005-04-25 Jan Beulich <jbeulich@novell.com>
* gas/macros/badarg.s: Add tests for collisions between/among macro
parameters and local symbols.
* gas/macros/badarg.l: Adjust.
Diffstat (limited to 'gas/read.c')
-rw-r--r-- | gas/read.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -2338,9 +2338,9 @@ s_macro (int ignore ATTRIBUTE_UNUSED) if (line_label != NULL) sb_add_string (&label, S_GET_NAME (line_label)); - err = define_macro (0, &s, &label, get_line_sb, &name); + err = define_macro (0, &s, &label, get_line_sb, file, line, &name); if (err != NULL) - as_bad_where (file, line, "%s", err); + as_bad_where (file, line, err, name); else { if (line_label != NULL) @@ -2355,7 +2355,9 @@ s_macro (int ignore ATTRIBUTE_UNUSED) || (!flag_m68k_mri && *name == '.' && hash_find (po_hash, name + 1) != NULL)) - as_warn (_("attempt to redefine pseudo-op `%s' ignored"), + as_warn_where (file, + line, + _("attempt to redefine pseudo-op `%s' ignored"), name); } |