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.

diff --git a/cpu/ChangeLog b/cpu/ChangeLog
index 24d0775920e7d8dfa183b43632b4551a9c85b489..1c178a8fd3efa12e9b9f306c4bb53055c7162924 100644 (file)
--- a/cpu/ChangeLog
+++ b/cpu/ChangeLog
@@ -1,3 +1,10 @@
+2021-07-05  Alan Modra  <amodra@gmail.com>
+
+       * 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.
+
 2021-07-03  Nick Clifton  <nickc@redhat.com>
 
        * 2.37 release branch created.

diff --git a/cpu/mep.opc b/cpu/mep.opc
index 5a4c93dc3abed96daf209ba7de076ac746903782..6ad0c5879e810ae0afef3f2ae11597b3cd0bea08 100644 (file)
--- 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;