From: Mike Frysinger <vapier@gentoo.org>
To: gdb-patches@sourceware.org
Cc: hp@sourceware.org
Subject: [PATCH] sim: cris: change temp var name slightly to avoid shadowing
Date: Thu, 21 Dec 2023 19:42:47 -0500 [thread overview]
Message-ID: <20231222004247.11774-1-vapier@gentoo.org> (raw)
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(-)
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)))))))); });
}
--
2.43.0
reply other threads:[~2023-12-22 0:42 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20231222004247.11774-1-vapier@gentoo.org \
--to=vapier@gentoo.org \
--cc=gdb-patches@sourceware.org \
--cc=hp@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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).