diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2021-06-27 02:17:27 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2021-07-01 18:04:16 -0400 |
| commit | f375d32b35cef9813410107430963d51600d6896 (patch) | |
| tree | 944bd762589e74a7da1b388761c0b79ab962f588 | |
| parent | 9b2beaf7788e328f5a954da24b4db13f9ba40465 (diff) | |
| download | gdb-f375d32b35cef9813410107430963d51600d6896.zip gdb-f375d32b35cef9813410107430963d51600d6896.tar.gz gdb-f375d32b35cef9813410107430963d51600d6896.tar.bz2 | |
opcodes: constify & local meps macros
Avoid exporting this common variable name into writable data.
| -rw-r--r-- | opcodes/ChangeLog | 7 | ||||
| -rw-r--r-- | opcodes/mep-asm.c | 10 |
2 files changed, 12 insertions, 5 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 44d059f..1205dbf 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,5 +1,12 @@ 2021-07-01 Mike Frysinger <vapier@gentoo.org> + * mep-asm.c (macros): Mark static & const. + (lookup_macro): Change return & m to const. + (expand_macro): Change mac to const. + (expand_string): Change pmacro to const. + +2021-07-01 Mike Frysinger <vapier@gentoo.org> + * nds32-asm.c (operand_fields): Rename to ... (nds32_operand_fields): ... this. (keyword_gpr): Rename to ... diff --git a/opcodes/mep-asm.c b/opcodes/mep-asm.c index 78c4066..b2fae27 100644 --- a/opcodes/mep-asm.c +++ b/opcodes/mep-asm.c @@ -582,7 +582,7 @@ typedef struct int len; } arg; -macro macros[] = +static macro const macros[] = { { "sizeof", "(`1.end + (- `1))"}, { "startof", "(`1 | 0)" }, @@ -615,10 +615,10 @@ str_append (char *dest, const char *input, int len) return strncat (new_dest, input, len); } -static macro * +static const macro * lookup_macro (const char *name) { - macro *m; + const macro *m; for (m = macros; m->name; ++m) if (strncmp (m->name, name, strlen(m->name)) == 0) @@ -628,7 +628,7 @@ lookup_macro (const char *name) } static char * -expand_macro (arg *args, int narg, macro *mac) +expand_macro (arg *args, int narg, const macro *mac) { char *result = 0, *rescanned_result = 0; char *e = mac->expansion; @@ -678,7 +678,7 @@ expand_string (const char *in, int first_only) arg args[MAXARGS]; int state = IN_TEXT; const char *mark = in; - macro *pmacro = NULL; + const macro *pmacro = NULL; char *expansion = 0; char *result = 0; |