diff options
| author |   Alan Modra <amodra@gmail.com> | 2021-07-03 11:39:24 +0930 |
|---|---|---|
| committer |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2021-07-31 11:40:42 +0200 |
| commit | c8bc9f1315a46257defe08d9c0501b72fd9b7800 (patch) | |
| tree | 8b62d6c6bad1f9723389e2d8eb09b79360334e93 | |
| parent | texi2pod.pl: add no-op --no-split option support [PR28144] (diff) | |
| download | binutils-gdb-c8bc9f1315a46257defe08d9c0501b72fd9b7800.tar.gz binutils-gdb-c8bc9f1315a46257defe08d9c0501b72fd9b7800.tar.bz2 binutils-gdb-c8bc9f1315a46257defe08d9c0501b72fd9b7800.zip | |
Re: opcodes: constify & local meps macros
Commit f375d32b35ce changed a generated file. Edit the source instead.
* mep.opc (macros): Make static and const.
(lookup_macro): Return and use const pointer.
(expand_macro): Make mac param const.
(expand_string): Make pmacro const.
(cherry picked from commit 4dcdbbd1bc1d14f2caff3bb4f8fe1f0e5dabcb85)
(cherry picked from commit 9d6d087078672d73767b78d896adb89b6967cded)
| -rw-r--r-- | cpu/mep.opc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpu/mep.opc b/cpu/mep.opc index 5a4c93dc3ab..6ad0c5879e8 100644 --- a/cpu/mep.opc +++ b/cpu/mep.opc @@ -626,7 +626,7 @@ typedef struct int len; } arg; -macro macros[] = +static macro const macros[] = { { "sizeof", "(`1.end + (- `1))"}, { "startof", "(`1 | 0)" }, @@ -659,10 +659,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) @@ -672,7 +672,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; @@ -722,7 +722,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; |