diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2024-01-01 17:17:50 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2024-01-01 17:30:53 -0500 |
| commit | 9b6e0cb3bac0852ccc61a50cb189c5187956e76b (patch) | |
| tree | 685aa111a6b36671bc0f1028b478414627b88f63 | |
| parent | fd520e1af1d4c6b907582cb22ddcb581c39614f2 (diff) | |
| download | fsf-binutils-gdb-9b6e0cb3bac0852ccc61a50cb189c5187956e76b.zip fsf-binutils-gdb-9b6e0cb3bac0852ccc61a50cb189c5187956e76b.tar.gz fsf-binutils-gdb-9b6e0cb3bac0852ccc61a50cb189c5187956e76b.tar.bz2 | |
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.
| -rw-r--r-- | sim/ppc/igen.c | 4 | ||||
| -rw-r--r-- | sim/ppc/ld-insn.c | 2 | ||||
| -rw-r--r-- | sim/ppc/ld-insn.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sim/ppc/igen.c b/sim/ppc/igen.c index 4de7469..61afa49 100644 --- 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 a94464d..5cb72b2 100644 --- 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 52baeaa..562e6d8 100644 --- 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; |