mirrors/binutils-gdb
1
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-11-23 01:53:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

sim: Fix cc -Werror=shadow=local in cr16/simops.c

Browse Source 
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.
This commit is contained in:
Mark Wielaard 2024-01-21 23:52:50 +01:00
parent 06ceae57ed
commit 865e469c60
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sim/cr16/simops.c
View File

@ -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]));