From: Alan Modra <amodra@gmail.com>
Date: Sat, 3 Jul 2021 02:09:24 +0000 (+0930)
Subject: Re: opcodes: constify & local meps macros
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9d6d087078672d73767b78d896adb89b6967cded;p=thirdparty%2Fbinutils-gdb.git

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)
---

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;