sim: cris: change temp var name slightly to avoid shadowing

Message ID 20231222004247.11774-1-vapier@gentoo.org
State New
Headers
Series sim: cris: change temp var name slightly to avoid shadowing |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gdb_build--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_gdb_build--master-arm success Testing passed
linaro-tcwg-bot/tcwg_gdb_check--master-arm success Testing passed
linaro-tcwg-bot/tcwg_gdb_check--master-aarch64 success Testing passed

Commit Message

Mike Frysinger Dec. 22, 2023, 12:42 a.m. UTC
  Rename the temp var to avoid shadowing another one:

.../sim/cris/semcrisv10f-switch.c:11032:22: error: declaration of ‘tmp_tmpb’ shadows a previous local [-Werror=shadow=compatible-local]
11032 |   tmp_tmpb = ({   SI tmp_tmpb;
      |                      ^~~~~~~~
.../sim/cris/semcrisv10f-switch.c:11031:24: note: shadowed declaration is here
11031 |   tmp_tmpres = ({   SI tmp_tmpb;
      |                        ^~~~~~~~
---
 cpu/cris.cpu                  |  8 +++---
 sim/cris/semcrisv10f-switch.c | 48 +++++++++++++++++------------------
 sim/cris/semcrisv32f-switch.c | 48 +++++++++++++++++------------------
 3 files changed, 52 insertions(+), 52 deletions(-)
  

Patch

diff --git a/cpu/cris.cpu b/cpu/cris.cpu
index ba5ed18a3d41..2fcd04e8e361 100644
--- a/cpu/cris.cpu
+++ b/cpu/cris.cpu
@@ -3667,10 +3667,10 @@ 
   "Perform word-wise swap within each dword"
   (sequence
     SI
-    ((SI tmpb))
-    (set tmpb x)
-    (or (and (sll tmpb 16) #xffff0000)
-	(and (srl tmpb 16) #xffff)))
+    ((SI tmpw))
+    (set tmpw x)
+    (or (and (sll tmpw 16) #xffff0000)
+	(and (srl tmpw 16) #xffff)))
 )
 
 (define-pmacro (swap-_ x)
diff --git a/sim/cris/semcrisv10f-switch.c b/sim/cris/semcrisv10f-switch.c
index cae56fd5ca8e..a803809ddc6e 100644
--- a/sim/cris/semcrisv10f-switch.c
+++ b/sim/cris/semcrisv10f-switch.c
@@ -11016,30 +11016,30 @@  SET_H_VBIT_MOVE (0);
 ; ORSI (SLLSI (ANDSI (tmp_tmpr, 16843009), 7), ORSI (SLLSI (ANDSI (tmp_tmpr, 33686018), 5), ORSI (SLLSI (ANDSI (tmp_tmpr, 67372036), 3), ORSI (SLLSI (ANDSI (tmp_tmpr, 134744072), 1), ORSI (SRLSI (ANDSI (tmp_tmpr, 269488144), 1), ORSI (SRLSI (ANDSI (tmp_tmpr, 538976288), 3), ORSI (SRLSI (ANDSI (tmp_tmpr, 1077952576), 5), SRLSI (ANDSI (tmp_tmpr, 0x80808080), 7)))))))); });
 }
  else if (EQSI (tmp_tmpcode, 4)) {
-  tmp_tmpres = ({   SI tmp_tmpb;
-  tmp_tmpb = tmp_tmpval;
-; ORSI (ANDSI (SLLSI (tmp_tmpb, 16), 0xffff0000), ANDSI (SRLSI (tmp_tmpb, 16), 65535)); });
+  tmp_tmpres = ({   SI tmp_tmpw;
+  tmp_tmpw = tmp_tmpval;
+; ORSI (ANDSI (SLLSI (tmp_tmpw, 16), 0xffff0000), ANDSI (SRLSI (tmp_tmpw, 16), 65535)); });
 }
  else if (EQSI (tmp_tmpcode, 5)) {
   tmp_tmpres = ({   SI tmp_tmpr;
-  tmp_tmpr = ({   SI tmp_tmpb;
-  tmp_tmpb = tmp_tmpval;
-; ORSI (ANDSI (SLLSI (tmp_tmpb, 16), 0xffff0000), ANDSI (SRLSI (tmp_tmpb, 16), 65535)); });
+  tmp_tmpr = ({   SI tmp_tmpw;
+  tmp_tmpw = tmp_tmpval;
+; ORSI (ANDSI (SLLSI (tmp_tmpw, 16), 0xffff0000), ANDSI (SRLSI (tmp_tmpw, 16), 65535)); });
 ; ORSI (SLLSI (ANDSI (tmp_tmpr, 16843009), 7), ORSI (SLLSI (ANDSI (tmp_tmpr, 33686018), 5), ORSI (SLLSI (ANDSI (tmp_tmpr, 67372036), 3), ORSI (SLLSI (ANDSI (tmp_tmpr, 134744072), 1), ORSI (SRLSI (ANDSI (tmp_tmpr, 269488144), 1), ORSI (SRLSI (ANDSI (tmp_tmpr, 538976288), 3), ORSI (SRLSI (ANDSI (tmp_tmpr, 1077952576), 5), SRLSI (ANDSI (tmp_tmpr, 0x80808080), 7)))))))); });
 }
  else if (EQSI (tmp_tmpcode, 6)) {
   tmp_tmpres = ({   SI tmp_tmpb;
-  tmp_tmpb = ({   SI tmp_tmpb;
-  tmp_tmpb = tmp_tmpval;
-; ORSI (ANDSI (SLLSI (tmp_tmpb, 16), 0xffff0000), ANDSI (SRLSI (tmp_tmpb, 16), 65535)); });
+  tmp_tmpb = ({   SI tmp_tmpw;
+  tmp_tmpw = tmp_tmpval;
+; ORSI (ANDSI (SLLSI (tmp_tmpw, 16), 0xffff0000), ANDSI (SRLSI (tmp_tmpw, 16), 65535)); });
 ; ORSI (ANDSI (SLLSI (tmp_tmpb, 8), 0xff00ff00), ANDSI (SRLSI (tmp_tmpb, 8), 16711935)); });
 }
  else if (EQSI (tmp_tmpcode, 7)) {
   tmp_tmpres = ({   SI tmp_tmpr;
   tmp_tmpr = ({   SI tmp_tmpb;
-  tmp_tmpb = ({   SI tmp_tmpb;
-  tmp_tmpb = tmp_tmpval;
-; ORSI (ANDSI (SLLSI (tmp_tmpb, 16), 0xffff0000), ANDSI (SRLSI (tmp_tmpb, 16), 65535)); });
+  tmp_tmpb = ({   SI tmp_tmpw;
+  tmp_tmpw = tmp_tmpval;
+; ORSI (ANDSI (SLLSI (tmp_tmpw, 16), 0xffff0000), ANDSI (SRLSI (tmp_tmpw, 16), 65535)); });
 ; ORSI (ANDSI (SLLSI (tmp_tmpb, 8), 0xff00ff00), ANDSI (SRLSI (tmp_tmpb, 8), 16711935)); });
 ; ORSI (SLLSI (ANDSI (tmp_tmpr, 16843009), 7), ORSI (SLLSI (ANDSI (tmp_tmpr, 33686018), 5), ORSI (SLLSI (ANDSI (tmp_tmpr, 67372036), 3), ORSI (SLLSI (ANDSI (tmp_tmpr, 134744072), 1), ORSI (SRLSI (ANDSI (tmp_tmpr, 269488144), 1), ORSI (SRLSI (ANDSI (tmp_tmpr, 538976288), 3), ORSI (SRLSI (ANDSI (tmp_tmpr, 1077952576), 5), SRLSI (ANDSI (tmp_tmpr, 0x80808080), 7)))))))); });
 }
@@ -11064,30 +11064,30 @@  SET_H_VBIT_MOVE (0);
 ; ORSI (SLLSI (ANDSI (tmp_tmpr, 16843009), 7), ORSI (SLLSI (ANDSI (tmp_tmpr, 33686018), 5), ORSI (SLLSI (ANDSI (tmp_tmpr, 67372036), 3), ORSI (SLLSI (ANDSI (tmp_tmpr, 134744072), 1), ORSI (SRLSI (ANDSI (tmp_tmpr, 269488144), 1), ORSI (SRLSI (ANDSI (tmp_tmpr, 538976288), 3), ORSI (SRLSI (ANDSI (tmp_tmpr, 1077952576), 5), SRLSI (ANDSI (tmp_tmpr, 0x80808080), 7)))))))); });
 }
  else if (EQSI (tmp_tmpcode, 12)) {
-  tmp_tmpres = ({   SI tmp_tmpb;
-  tmp_tmpb = INVSI (tmp_tmpval);
-; ORSI (ANDSI (SLLSI (tmp_tmpb, 16), 0xffff0000), ANDSI (SRLSI (tmp_tmpb, 16), 65535)); });
+  tmp_tmpres = ({   SI tmp_tmpw;
+  tmp_tmpw = INVSI (tmp_tmpval);
+; ORSI (ANDSI (SLLSI (tmp_tmpw, 16), 0xffff0000), ANDSI (SRLSI (tmp_tmpw, 16), 65535)); });
 }
  else if (EQSI (tmp_tmpcode, 13)) {
   tmp_tmpres = ({   SI tmp_tmpr;
-  tmp_tmpr = ({   SI tmp_tmpb;
-  tmp_tmpb = INVSI (tmp_tmpval);
-; ORSI (ANDSI (SLLSI (tmp_tmpb, 16), 0xffff0000), ANDSI (SRLSI (tmp_tmpb, 16), 65535)); });
+  tmp_tmpr = ({   SI tmp_tmpw;
+  tmp_tmpw = INVSI (tmp_tmpval);
+; ORSI (ANDSI (SLLSI (tmp_tmpw, 16), 0xffff0000), ANDSI (SRLSI (tmp_tmpw, 16), 65535)); });
 ; ORSI (SLLSI (ANDSI (tmp_tmpr, 16843009), 7), ORSI (SLLSI (ANDSI (tmp_tmpr, 33686018), 5), ORSI (SLLSI (ANDSI (tmp_tmpr, 67372036), 3), ORSI (SLLSI (ANDSI (tmp_tmpr, 134744072), 1), ORSI (SRLSI (ANDSI (tmp_tmpr, 269488144), 1), ORSI (SRLSI (ANDSI (tmp_tmpr, 538976288), 3), ORSI (SRLSI (ANDSI (tmp_tmpr, 1077952576), 5), SRLSI (ANDSI (tmp_tmpr, 0x80808080), 7)))))))); });
 }
  else if (EQSI (tmp_tmpcode, 14)) {
   tmp_tmpres = ({   SI tmp_tmpb;
-  tmp_tmpb = ({   SI tmp_tmpb;
-  tmp_tmpb = INVSI (tmp_tmpval);
-; ORSI (ANDSI (SLLSI (tmp_tmpb, 16), 0xffff0000), ANDSI (SRLSI (tmp_tmpb, 16), 65535)); });
+  tmp_tmpb = ({   SI tmp_tmpw;
+  tmp_tmpw = INVSI (tmp_tmpval);
+; ORSI (ANDSI (SLLSI (tmp_tmpw, 16), 0xffff0000), ANDSI (SRLSI (tmp_tmpw, 16), 65535)); });
 ; ORSI (ANDSI (SLLSI (tmp_tmpb, 8), 0xff00ff00), ANDSI (SRLSI (tmp_tmpb, 8), 16711935)); });
 }
  else if (EQSI (tmp_tmpcode, 15)) {
   tmp_tmpres = ({   SI tmp_tmpr;
   tmp_tmpr = ({   SI tmp_tmpb;
-  tmp_tmpb = ({   SI tmp_tmpb;
-  tmp_tmpb = INVSI (tmp_tmpval);
-; ORSI (ANDSI (SLLSI (tmp_tmpb, 16), 0xffff0000), ANDSI (SRLSI (tmp_tmpb, 16), 65535)); });
+  tmp_tmpb = ({   SI tmp_tmpw;
+  tmp_tmpw = INVSI (tmp_tmpval);
+; ORSI (ANDSI (SLLSI (tmp_tmpw, 16), 0xffff0000), ANDSI (SRLSI (tmp_tmpw, 16), 65535)); });
 ; ORSI (ANDSI (SLLSI (tmp_tmpb, 8), 0xff00ff00), ANDSI (SRLSI (tmp_tmpb, 8), 16711935)); });
 ; ORSI (SLLSI (ANDSI (tmp_tmpr, 16843009), 7), ORSI (SLLSI (ANDSI (tmp_tmpr, 33686018), 5), ORSI (SLLSI (ANDSI (tmp_tmpr, 67372036), 3), ORSI (SLLSI (ANDSI (tmp_tmpr, 134744072), 1), ORSI (SRLSI (ANDSI (tmp_tmpr, 269488144), 1), ORSI (SRLSI (ANDSI (tmp_tmpr, 538976288), 3), ORSI (SRLSI (ANDSI (tmp_tmpr, 1077952576), 5), SRLSI (ANDSI (tmp_tmpr, 0x80808080), 7)))))))); });
 }
diff --git a/sim/cris/semcrisv32f-switch.c b/sim/cris/semcrisv32f-switch.c
index db2f7aa4710e..aa22ea24fd2b 100644
--- a/sim/cris/semcrisv32f-switch.c
+++ b/sim/cris/semcrisv32f-switch.c
@@ -11286,30 +11286,30 @@  SET_H_VBIT_MOVE (0);
 ; ORSI (SLLSI (ANDSI (tmp_tmpr, 16843009), 7), ORSI (SLLSI (ANDSI (tmp_tmpr, 33686018), 5), ORSI (SLLSI (ANDSI (tmp_tmpr, 67372036), 3), ORSI (SLLSI (ANDSI (tmp_tmpr, 134744072), 1), ORSI (SRLSI (ANDSI (tmp_tmpr, 269488144), 1), ORSI (SRLSI (ANDSI (tmp_tmpr, 538976288), 3), ORSI (SRLSI (ANDSI (tmp_tmpr, 1077952576), 5), SRLSI (ANDSI (tmp_tmpr, 0x80808080), 7)))))))); });
 }
  else if (EQSI (tmp_tmpcode, 4)) {
-  tmp_tmpres = ({   SI tmp_tmpb;
-  tmp_tmpb = tmp_tmpval;
-; ORSI (ANDSI (SLLSI (tmp_tmpb, 16), 0xffff0000), ANDSI (SRLSI (tmp_tmpb, 16), 65535)); });
+  tmp_tmpres = ({   SI tmp_tmpw;
+  tmp_tmpw = tmp_tmpval;
+; ORSI (ANDSI (SLLSI (tmp_tmpw, 16), 0xffff0000), ANDSI (SRLSI (tmp_tmpw, 16), 65535)); });
 }
  else if (EQSI (tmp_tmpcode, 5)) {
   tmp_tmpres = ({   SI tmp_tmpr;
-  tmp_tmpr = ({   SI tmp_tmpb;
-  tmp_tmpb = tmp_tmpval;
-; ORSI (ANDSI (SLLSI (tmp_tmpb, 16), 0xffff0000), ANDSI (SRLSI (tmp_tmpb, 16), 65535)); });
+  tmp_tmpr = ({   SI tmp_tmpw;
+  tmp_tmpw = tmp_tmpval;
+; ORSI (ANDSI (SLLSI (tmp_tmpw, 16), 0xffff0000), ANDSI (SRLSI (tmp_tmpw, 16), 65535)); });
 ; ORSI (SLLSI (ANDSI (tmp_tmpr, 16843009), 7), ORSI (SLLSI (ANDSI (tmp_tmpr, 33686018), 5), ORSI (SLLSI (ANDSI (tmp_tmpr, 67372036), 3), ORSI (SLLSI (ANDSI (tmp_tmpr, 134744072), 1), ORSI (SRLSI (ANDSI (tmp_tmpr, 269488144), 1), ORSI (SRLSI (ANDSI (tmp_tmpr, 538976288), 3), ORSI (SRLSI (ANDSI (tmp_tmpr, 1077952576), 5), SRLSI (ANDSI (tmp_tmpr, 0x80808080), 7)))))))); });
 }
  else if (EQSI (tmp_tmpcode, 6)) {
   tmp_tmpres = ({   SI tmp_tmpb;
-  tmp_tmpb = ({   SI tmp_tmpb;
-  tmp_tmpb = tmp_tmpval;
-; ORSI (ANDSI (SLLSI (tmp_tmpb, 16), 0xffff0000), ANDSI (SRLSI (tmp_tmpb, 16), 65535)); });
+  tmp_tmpb = ({   SI tmp_tmpw;
+  tmp_tmpw = tmp_tmpval;
+; ORSI (ANDSI (SLLSI (tmp_tmpw, 16), 0xffff0000), ANDSI (SRLSI (tmp_tmpw, 16), 65535)); });
 ; ORSI (ANDSI (SLLSI (tmp_tmpb, 8), 0xff00ff00), ANDSI (SRLSI (tmp_tmpb, 8), 16711935)); });
 }
  else if (EQSI (tmp_tmpcode, 7)) {
   tmp_tmpres = ({   SI tmp_tmpr;
   tmp_tmpr = ({   SI tmp_tmpb;
-  tmp_tmpb = ({   SI tmp_tmpb;
-  tmp_tmpb = tmp_tmpval;
-; ORSI (ANDSI (SLLSI (tmp_tmpb, 16), 0xffff0000), ANDSI (SRLSI (tmp_tmpb, 16), 65535)); });
+  tmp_tmpb = ({   SI tmp_tmpw;
+  tmp_tmpw = tmp_tmpval;
+; ORSI (ANDSI (SLLSI (tmp_tmpw, 16), 0xffff0000), ANDSI (SRLSI (tmp_tmpw, 16), 65535)); });
 ; ORSI (ANDSI (SLLSI (tmp_tmpb, 8), 0xff00ff00), ANDSI (SRLSI (tmp_tmpb, 8), 16711935)); });
 ; ORSI (SLLSI (ANDSI (tmp_tmpr, 16843009), 7), ORSI (SLLSI (ANDSI (tmp_tmpr, 33686018), 5), ORSI (SLLSI (ANDSI (tmp_tmpr, 67372036), 3), ORSI (SLLSI (ANDSI (tmp_tmpr, 134744072), 1), ORSI (SRLSI (ANDSI (tmp_tmpr, 269488144), 1), ORSI (SRLSI (ANDSI (tmp_tmpr, 538976288), 3), ORSI (SRLSI (ANDSI (tmp_tmpr, 1077952576), 5), SRLSI (ANDSI (tmp_tmpr, 0x80808080), 7)))))))); });
 }
@@ -11334,30 +11334,30 @@  SET_H_VBIT_MOVE (0);
 ; ORSI (SLLSI (ANDSI (tmp_tmpr, 16843009), 7), ORSI (SLLSI (ANDSI (tmp_tmpr, 33686018), 5), ORSI (SLLSI (ANDSI (tmp_tmpr, 67372036), 3), ORSI (SLLSI (ANDSI (tmp_tmpr, 134744072), 1), ORSI (SRLSI (ANDSI (tmp_tmpr, 269488144), 1), ORSI (SRLSI (ANDSI (tmp_tmpr, 538976288), 3), ORSI (SRLSI (ANDSI (tmp_tmpr, 1077952576), 5), SRLSI (ANDSI (tmp_tmpr, 0x80808080), 7)))))))); });
 }
  else if (EQSI (tmp_tmpcode, 12)) {
-  tmp_tmpres = ({   SI tmp_tmpb;
-  tmp_tmpb = INVSI (tmp_tmpval);
-; ORSI (ANDSI (SLLSI (tmp_tmpb, 16), 0xffff0000), ANDSI (SRLSI (tmp_tmpb, 16), 65535)); });
+  tmp_tmpres = ({   SI tmp_tmpw;
+  tmp_tmpw = INVSI (tmp_tmpval);
+; ORSI (ANDSI (SLLSI (tmp_tmpw, 16), 0xffff0000), ANDSI (SRLSI (tmp_tmpw, 16), 65535)); });
 }
  else if (EQSI (tmp_tmpcode, 13)) {
   tmp_tmpres = ({   SI tmp_tmpr;
-  tmp_tmpr = ({   SI tmp_tmpb;
-  tmp_tmpb = INVSI (tmp_tmpval);
-; ORSI (ANDSI (SLLSI (tmp_tmpb, 16), 0xffff0000), ANDSI (SRLSI (tmp_tmpb, 16), 65535)); });
+  tmp_tmpr = ({   SI tmp_tmpw;
+  tmp_tmpw = INVSI (tmp_tmpval);
+; ORSI (ANDSI (SLLSI (tmp_tmpw, 16), 0xffff0000), ANDSI (SRLSI (tmp_tmpw, 16), 65535)); });
 ; ORSI (SLLSI (ANDSI (tmp_tmpr, 16843009), 7), ORSI (SLLSI (ANDSI (tmp_tmpr, 33686018), 5), ORSI (SLLSI (ANDSI (tmp_tmpr, 67372036), 3), ORSI (SLLSI (ANDSI (tmp_tmpr, 134744072), 1), ORSI (SRLSI (ANDSI (tmp_tmpr, 269488144), 1), ORSI (SRLSI (ANDSI (tmp_tmpr, 538976288), 3), ORSI (SRLSI (ANDSI (tmp_tmpr, 1077952576), 5), SRLSI (ANDSI (tmp_tmpr, 0x80808080), 7)))))))); });
 }
  else if (EQSI (tmp_tmpcode, 14)) {
   tmp_tmpres = ({   SI tmp_tmpb;
-  tmp_tmpb = ({   SI tmp_tmpb;
-  tmp_tmpb = INVSI (tmp_tmpval);
-; ORSI (ANDSI (SLLSI (tmp_tmpb, 16), 0xffff0000), ANDSI (SRLSI (tmp_tmpb, 16), 65535)); });
+  tmp_tmpb = ({   SI tmp_tmpw;
+  tmp_tmpw = INVSI (tmp_tmpval);
+; ORSI (ANDSI (SLLSI (tmp_tmpw, 16), 0xffff0000), ANDSI (SRLSI (tmp_tmpw, 16), 65535)); });
 ; ORSI (ANDSI (SLLSI (tmp_tmpb, 8), 0xff00ff00), ANDSI (SRLSI (tmp_tmpb, 8), 16711935)); });
 }
  else if (EQSI (tmp_tmpcode, 15)) {
   tmp_tmpres = ({   SI tmp_tmpr;
   tmp_tmpr = ({   SI tmp_tmpb;
-  tmp_tmpb = ({   SI tmp_tmpb;
-  tmp_tmpb = INVSI (tmp_tmpval);
-; ORSI (ANDSI (SLLSI (tmp_tmpb, 16), 0xffff0000), ANDSI (SRLSI (tmp_tmpb, 16), 65535)); });
+  tmp_tmpb = ({   SI tmp_tmpw;
+  tmp_tmpw = INVSI (tmp_tmpval);
+; ORSI (ANDSI (SLLSI (tmp_tmpw, 16), 0xffff0000), ANDSI (SRLSI (tmp_tmpw, 16), 65535)); });
 ; ORSI (ANDSI (SLLSI (tmp_tmpb, 8), 0xff00ff00), ANDSI (SRLSI (tmp_tmpb, 8), 16711935)); });
 ; ORSI (SLLSI (ANDSI (tmp_tmpr, 16843009), 7), ORSI (SLLSI (ANDSI (tmp_tmpr, 33686018), 5), ORSI (SLLSI (ANDSI (tmp_tmpr, 67372036), 3), ORSI (SLLSI (ANDSI (tmp_tmpr, 134744072), 1), ORSI (SRLSI (ANDSI (tmp_tmpr, 269488144), 1), ORSI (SRLSI (ANDSI (tmp_tmpr, 538976288), 3), ORSI (SRLSI (ANDSI (tmp_tmpr, 1077952576), 5), SRLSI (ANDSI (tmp_tmpr, 0x80808080), 7)))))))); });
 }