Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

Using .mri in assembly

Browse Source 
Changing mri mode between macro definition and use isn't good.  This
	.macro x
	.endm
	.mri 1
	x
leads to a segfault.  Fixed with the following patch, but I suppose
what should really happen is that macros be marked as being mri mode
when defined, and that determine whether the magic NARG parameter be
supplied at expansion.  Nobody has complained about this in 30 years
so I'm not inclined to change gas behaviour to that extent.

	* macro.c (macro_expand): Don't segfault in mri mode if NARG
	formal isn't found.
This commit is contained in:
Alan Modra
2023-03-02 07:34:40 +10:30
parent 9d834fcaa1
commit 40e7bdbddc
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gas/macro.c
View File

@@ -1221,13 +1221,14 @@ macro_expand (size_t idx, sb *in, macro_entry *m, sb *out)
if (macro_mri)
{
char buffer[20];
sb_reset (&t);
sb_add_string (&t, macro_strip_at ? "$NARG" : "NARG");
ptr = str_hash_find (m->formal_hash, sb_terminate (&t));
sprintf (buffer, "%d", narg);
sb_add_string (&ptr->actual, buffer);
ptr = str_hash_find (m->formal_hash,
macro_strip_at ? "$NARG" : "NARG");
if (ptr)
{
char buffer[20];
sprintf (buffer, "%d", narg);
sb_add_string (&ptr->actual, buffer);
}
}
err = macro_expand_body (&m->sub, out, m->formals, m->formal_hash, m);