diff options
| author | Mark Wielaard <mark@klomp.org> | 2024-01-21 23:52:50 +0100 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2024-01-22 12:04:49 +0100 |
| commit | 865e469c6024b3aa5266092597bf7d00166f5049 (patch) | |
| tree | 3ff34b196a776f78ebfda8c625a2cff50137307b /sim | |
| parent | 06ceae57ed4031e8a11ad7556684e1ac83477d73 (diff) | |
| download | gdb-865e469c6024b3aa5266092597bf7d00166f5049.zip gdb-865e469c6024b3aa5266092597bf7d00166f5049.tar.gz gdb-865e469c6024b3aa5266092597bf7d00166f5049.tar.bz2 | |
sim: Fix cc -Werror=shadow=local in cr16/simops.c
include/opcode/cr16.h defines cc as an enum value, which causes GCC 14
to warn
sim/cr16/simops.c: In function ‘cond_stat’:
sim/cr16/simops.c:138:26: error: declaration of ‘cc’ shadows a previous local [-Werror=shadow=local]
138 | static int cond_stat(int cc)
| ~~~~^~
In file included from ../../binutils-gdb/sim/cr16/cr16-sim.h:26,
from ../../binutils-gdb/sim/cr16/simops.c:39:
sim/../include/opcode/cr16.h:149:3: note: shadowed declaration is here
149 | cc,
| ^~
Fix this by renaming cc in cr16/simops.c to cond.
Diffstat (limited to 'sim')
| -rw-r--r-- | sim/cr16/simops.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sim/cr16/simops.c b/sim/cr16/simops.c index b09284b..e56e533 100644 --- a/sim/cr16/simops.c +++ b/sim/cr16/simops.c @@ -135,9 +135,9 @@ enum { * LT Less Than Z and N flags are 0 * GE Greater Than or Equal To Z or N flag is 1. */ -static int cond_stat(int cc) +static int cond_stat(int cond) { - switch (cc) + switch (cond) { case 0: return PSR_Z; break; case 1: return !PSR_Z; break; @@ -983,9 +983,9 @@ OP_14A_14 (SIM_DESC sd, SIM_CPU *cpu) void OP_1_4 (SIM_DESC sd, SIM_CPU *cpu) { - uint32_t tmp = 0, cc = cond_stat (OP[0]); + uint32_t tmp = 0, cond = cond_stat (OP[0]); trace_input ("b", OP_CONSTANT4, OP_DISPE9, OP_VOID); - if (cc) + if (cond) { if (sign_flag) tmp = (PC - (OP[1])); @@ -1010,9 +1010,9 @@ OP_1_4 (SIM_DESC sd, SIM_CPU *cpu) void OP_18_8 (SIM_DESC sd, SIM_CPU *cpu) { - uint32_t tmp = 0, cc = cond_stat (OP[0]); + uint32_t tmp = 0, cond = cond_stat (OP[0]); trace_input ("b", OP_CONSTANT4, OP_DISP17, OP_VOID); - if (cc) + if (cond) { if (sign_flag) tmp = (PC - OP[1]); @@ -1037,9 +1037,9 @@ OP_18_8 (SIM_DESC sd, SIM_CPU *cpu) void OP_10_10 (SIM_DESC sd, SIM_CPU *cpu) { - uint32_t tmp = 0, cc = cond_stat (OP[0]); + uint32_t tmp = 0, cond = cond_stat (OP[0]); trace_input ("b", OP_CONSTANT4, OP_DISP25, OP_VOID); - if (cc) + if (cond) { if (sign_flag) tmp = (PC - (OP[1])); |