[binutils-gdb] sim: cris: change temp var name slightly to avoid shadowing
Michael Frysinger
vapier@sourceware.org
Sun Jan 7 05:15:26 GMT 2024
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=199b67ca043e21b94c965ffe2f3c56f25ee6e234
commit 199b67ca043e21b94c965ffe2f3c56f25ee6e234
Author: Mike Frysinger <vapier@gentoo.org>
Date: Thu Dec 21 19:41:17 2023 -0500
sim: cris: change temp var name slightly to avoid shadowing
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;
| ^~~~~~~~
Diff:
---
cpu/cris.cpu | 8 ++++----
sim/cris/semcrisv10f-switch.c | 48 +++++++++++++++++++++----------------------
sim/cris/semcrisv32f-switch.c | 48 +++++++++++++++++++++----------------------
3 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/cpu/cris.cpu b/cpu/cris.cpu
index 32a1e2dda82..5d50307e65b 100644
--- a/cpu/cris.cpu
+++ b/cpu/cris.cpu
@@ -3668,10 +3668,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 8441c220fcb..d3967435b20 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 77cd07a4ddf..6a23bd76fa5 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)))))))); });
}
More information about the Binutils-cvs
mailing list