Mirror of the gdb-patches mailing list
 help / color / mirror / Atom feed
From: Mark Wielaard <mark@klomp.org>
To: gdb-patches@sourceware.org
Cc: Mark Wielaard <mark@klomp.org>
Subject: [PATCH] sim: Fix cc -Werror=shadow=local in cr16/simops.c
Date: Sun, 21 Jan 2024 23:52:50 +0100	[thread overview]
Message-ID: <20240121225250.574864-1-mark@klomp.org> (raw)

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.
---
 sim/cr16/simops.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/sim/cr16/simops.c b/sim/cr16/simops.c
index b09284bf818..e56e5338dff 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]));
-- 
2.39.3


             reply	other threads:[~2024-01-21 22:53 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-21 22:52 Mark Wielaard [this message]
2024-01-22  3:41 ` Mike Frysinger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240121225250.574864-1-mark@klomp.org \
    --to=mark@klomp.org \
    --cc=gdb-patches@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox