sim: ppc: rename igen max_insn_bit_size

We want to avoid conflicts with the common igen enums.  This should
get migrated over to the common parsing logic, but for now, switch
the name to avoid redefinition.

diff --git a/sim/ppc/igen.c b/sim/ppc/igen.c
index 4de7469b4e3682f1b86d085793d2f20614b16621..61afa491bb9e080e4023ed7aa01e6ebaa5ec744f 100644 (file)
--- a/sim/ppc/igen.c
+++ b/sim/ppc/igen.c
@@ -40,7 +40,7 @@
 #include "gen-support.h"
 
 int hi_bit_nr;
-int insn_bit_size = max_insn_bit_size;
+int insn_bit_size = ppc_max_insn_bit_size;
 
 igen_code code = generate_calls;
 
@@ -472,7 +472,7 @@ main(int argc,
       break;
     case 'B':
       insn_bit_size = a2i(optarg);
-      ASSERT(insn_bit_size > 0 && insn_bit_size <= max_insn_bit_size
+      ASSERT(insn_bit_size > 0 && insn_bit_size <= ppc_max_insn_bit_size
             && (hi_bit_nr == insn_bit_size-1 || hi_bit_nr == 0));
       break;
     case 'H':

diff --git a/sim/ppc/ld-insn.c b/sim/ppc/ld-insn.c
index a94464d44bbf64a7482683c97ae6d2ac2197afc7..5cb72b226226a10c4f43daccfc513823bac7194f 100644 (file)
--- a/sim/ppc/ld-insn.c
+++ b/sim/ppc/ld-insn.c
@@ -966,7 +966,7 @@ dump_insn_table(insn_table *table,
   }
 }
 
-int insn_bit_size = max_insn_bit_size;
+int insn_bit_size = ppc_max_insn_bit_size;
 int hi_bit_nr;
 int generate_expanded_instructions;
 

diff --git a/sim/ppc/ld-insn.h b/sim/ppc/ld-insn.h
index 52baeaa2d846c30e1df1d10138c4b5fc7955ca5a..562e6d8742b4e3c425a74dbab9819d5cdcdc6b2e 100644 (file)
--- a/sim/ppc/ld-insn.h
+++ b/sim/ppc/ld-insn.h
@@ -56,7 +56,7 @@
 /* Global constants */
 
 enum {
-  max_insn_bit_size = 32,
+  ppc_max_insn_bit_size = 32,
 };
 
 
@@ -77,7 +77,7 @@ struct _insn_field {
 
 typedef struct _insn_fields insn_fields;
 struct _insn_fields {
-  insn_field *bits[max_insn_bit_size];
+  insn_field *bits[ppc_max_insn_bit_size];
   insn_field *first;
   insn_field *last;
   unsigned value;