From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: Markus Armbruster <armbru@redhat.com>, qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org, qemu-arm@nongnu.org,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Peter Maydell" <peter.maydell@linaro.org>
Subject: [PATCH v2 02/22] target/arm/tcg: Clean up local variable shadowing
Date: Mon, 4 Sep 2023 18:12:14 +0200 [thread overview]
Message-ID: <20230904161235.84651-3-philmd@linaro.org> (raw)
In-Reply-To: <20230904161235.84651-1-philmd@linaro.org>
Fix:
target/arm/tcg/translate-m-nocp.c: In function ‘gen_M_fp_sysreg_read’:
target/arm/tcg/translate-m-nocp.c:509:18: warning: declaration of ‘tmp’ shadows a previous local [-Wshadow=compatible-local]
509 | TCGv_i32 tmp = load_cpu_field(v7m.fpdscr[M_REG_NS]);
| ^~~
target/arm/tcg/translate-m-nocp.c:433:14: note: shadowed declaration is here
433 | TCGv_i32 tmp;
| ^~~
---
target/arm/tcg/mve_helper.c: In function ‘helper_mve_vqshlsb’:
target/arm/tcg/mve_helper.c:1259:19: warning: declaration of ‘r’ shadows a previous local [-Wshadow=compatible-local]
1259 | typeof(N) r = FN(N, (int8_t)(M), sizeof(N) * 8, ROUND, &su32); \
| ^
target/arm/tcg/mve_helper.c:1267:5: note: in expansion of macro ‘WRAP_QRSHL_HELPER’
1267 | WRAP_QRSHL_HELPER(do_sqrshl_bhs, N, M, false, satp)
| ^~~~~~~~~~~~~~~~~
target/arm/tcg/mve_helper.c:927:22: note: in expansion of macro ‘DO_SQSHL_OP’
927 | TYPE r = FN(n[H##ESIZE(e)], m[H##ESIZE(e)], &sat); \
| ^~
target/arm/tcg/mve_helper.c:945:5: note: in expansion of macro ‘DO_2OP_SAT’
945 | DO_2OP_SAT(OP##b, 1, int8_t, FN) \
| ^~~~~~~~~~
target/arm/tcg/mve_helper.c:1277:1: note: in expansion of macro ‘DO_2OP_SAT_S’
1277 | DO_2OP_SAT_S(vqshls, DO_SQSHL_OP)
| ^~~~~~~~~~~~
---
target/arm/tcg/mve_helper.c: In function ‘do_sqrshl48_d’:
target/arm/tcg/mve_helper.c:2463:17: warning: declaration of ‘extval’ shadows a previous local [-Wshadow=compatible-local]
2463 | int64_t extval = sextract64(src << shift, 0, 48);
| ^~~~~~
target/arm/tcg/mve_helper.c:2443:18: note: shadowed declaration is here
2443 | int64_t val, extval;
| ^~~~~~
---
target/arm/tcg/mve_helper.c: In function ‘do_uqrshl48_d’:
target/arm/tcg/mve_helper.c:2495:18: warning: declaration of ‘extval’ shadows a previous local [-Wshadow=compatible-local]
2495 | uint64_t extval = extract64(src << shift, 0, 48);
| ^~~~~~
target/arm/tcg/mve_helper.c:2479:19: note: shadowed declaration is here
2479 | uint64_t val, extval;
| ^~~~~~
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
target/arm/tcg/mve_helper.c | 16 ++++++++--------
target/arm/tcg/translate-m-nocp.c | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/target/arm/tcg/mve_helper.c b/target/arm/tcg/mve_helper.c
index 403b345ea3..7f5b6533cd 100644
--- a/target/arm/tcg/mve_helper.c
+++ b/target/arm/tcg/mve_helper.c
@@ -924,8 +924,8 @@ DO_1OP_IMM(vorri, DO_ORRI)
bool qc = false; \
for (e = 0; e < 16 / ESIZE; e++, mask >>= ESIZE) { \
bool sat = false; \
- TYPE r = FN(n[H##ESIZE(e)], m[H##ESIZE(e)], &sat); \
- mergemask(&d[H##ESIZE(e)], r, mask); \
+ TYPE r_ = FN(n[H##ESIZE(e)], m[H##ESIZE(e)], &sat); \
+ mergemask(&d[H##ESIZE(e)], r_, mask); \
qc |= sat & mask & 1; \
} \
if (qc) { \
@@ -1256,11 +1256,11 @@ DO_2OP_SAT(vqsubsw, 4, int32_t, DO_SQSUB_W)
#define WRAP_QRSHL_HELPER(FN, N, M, ROUND, satp) \
({ \
uint32_t su32 = 0; \
- typeof(N) r = FN(N, (int8_t)(M), sizeof(N) * 8, ROUND, &su32); \
+ typeof(N) qrshl_ret = FN(N, (int8_t)(M), sizeof(N) * 8, ROUND, &su32); \
if (su32) { \
*satp = true; \
} \
- r; \
+ qrshl_ret; \
})
#define DO_SQSHL_OP(N, M, satp) \
@@ -1298,12 +1298,12 @@ DO_2OP_SAT_U(vqrshlu, DO_UQRSHL_OP)
for (e = 0; e < 16 / ESIZE; e++, mask >>= ESIZE) { \
bool sat = false; \
if ((e & 1) == XCHG) { \
- TYPE r = FN(n[H##ESIZE(e)], \
+ TYPE vqdmladh_ret = FN(n[H##ESIZE(e)], \
m[H##ESIZE(e - XCHG)], \
n[H##ESIZE(e + (1 - 2 * XCHG))], \
m[H##ESIZE(e + (1 - XCHG))], \
ROUND, &sat); \
- mergemask(&d[H##ESIZE(e)], r, mask); \
+ mergemask(&d[H##ESIZE(e)], vqdmladh_ret, mask); \
qc |= sat & mask & 1; \
} \
} \
@@ -2460,7 +2460,7 @@ static inline int64_t do_sqrshl48_d(int64_t src, int64_t shift,
return extval;
}
} else if (shift < 48) {
- int64_t extval = sextract64(src << shift, 0, 48);
+ extval = sextract64(src << shift, 0, 48);
if (!sat || src == (extval >> shift)) {
return extval;
}
@@ -2492,7 +2492,7 @@ static inline uint64_t do_uqrshl48_d(uint64_t src, int64_t shift,
return extval;
}
} else if (shift < 48) {
- uint64_t extval = extract64(src << shift, 0, 48);
+ extval = extract64(src << shift, 0, 48);
if (!sat || src == (extval >> shift)) {
return extval;
}
diff --git a/target/arm/tcg/translate-m-nocp.c b/target/arm/tcg/translate-m-nocp.c
index 33f6478bb9..42308c4db5 100644
--- a/target/arm/tcg/translate-m-nocp.c
+++ b/target/arm/tcg/translate-m-nocp.c
@@ -506,7 +506,7 @@ static bool gen_M_fp_sysreg_read(DisasContext *s, int regno,
gen_branch_fpInactive(s, TCG_COND_EQ, lab_active);
/* fpInactive case: reads as FPDSCR_NS */
- TCGv_i32 tmp = load_cpu_field(v7m.fpdscr[M_REG_NS]);
+ tmp = load_cpu_field(v7m.fpdscr[M_REG_NS]);
storefn(s, opaque, tmp, true);
lab_end = gen_new_label();
tcg_gen_br(lab_end);
--
2.41.0
next prev parent reply other threads:[~2023-09-04 16:14 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-04 16:12 [PATCH v2 00/22] (few more) Steps towards enabling -Wshadow Philippe Mathieu-Daudé
2023-09-04 16:12 ` [PATCH v2 01/22] tcg: Clean up local variable shadowing Philippe Mathieu-Daudé
2023-09-04 16:12 ` Philippe Mathieu-Daudé [this message]
2023-09-08 12:25 ` [PATCH v2 02/22] target/arm/tcg: " Peter Maydell
2023-09-04 16:12 ` [PATCH v2 03/22] target/arm/hvf: " Philippe Mathieu-Daudé
2023-09-08 12:26 ` Peter Maydell
2023-09-04 16:12 ` [PATCH v2 04/22] target/mips: " Philippe Mathieu-Daudé
2023-09-04 16:12 ` [PATCH v2 05/22] target/m68k: " Philippe Mathieu-Daudé
2023-09-04 16:12 ` [PATCH v2 06/22] target/tricore: " Philippe Mathieu-Daudé
2023-09-05 5:34 ` Bastian Koppelmann
2023-09-04 16:12 ` [PATCH v2 07/22] hw/arm/armv7m: " Philippe Mathieu-Daudé
2023-09-08 12:29 ` Peter Maydell
2023-09-04 16:12 ` [PATCH v2 08/22] hw/arm/virt: " Philippe Mathieu-Daudé
2023-09-04 16:12 ` [PATCH v2 09/22] hw/arm/allwinner: " Philippe Mathieu-Daudé
2023-09-04 16:12 ` [PATCH v2 10/22] hw/arm/aspeed: " Philippe Mathieu-Daudé
2023-09-04 16:12 ` [PATCH v2 11/22] hw/ide/ahci: " Philippe Mathieu-Daudé
2023-09-29 5:07 ` Markus Armbruster
2023-09-04 16:12 ` [PATCH v2 12/22] hw/m68k: " Philippe Mathieu-Daudé
2023-09-26 16:28 ` Thomas Huth
2023-09-04 16:12 ` [PATCH v2 13/22] hw/microblaze: " Philippe Mathieu-Daudé
2023-09-04 16:12 ` [PATCH v2 14/22] hw/nios2: " Philippe Mathieu-Daudé
2023-09-04 16:12 ` [PATCH v2 15/22] net/eth: " Philippe Mathieu-Daudé
2023-09-08 13:18 ` Eric Blake
2023-09-10 4:20 ` Akihiko Odaki
2023-09-04 16:12 ` [PATCH v2 16/22] crypto/cipher-gnutls.c: " Philippe Mathieu-Daudé
2023-09-04 16:27 ` Daniel P. Berrangé
2023-09-04 16:29 ` Philippe Mathieu-Daudé
2023-09-04 16:12 ` [PATCH v2 17/22] util/vhost-user-server: " Philippe Mathieu-Daudé
2023-09-22 10:23 ` Michael S. Tsirkin
2023-09-04 16:12 ` [PATCH v2 18/22] semihosting/arm-compat: " Philippe Mathieu-Daudé
2023-09-08 12:36 ` Peter Maydell
2023-10-04 9:41 ` Philippe Mathieu-Daudé
2023-09-04 16:12 ` [PATCH v2 19/22] linux-user/strace: " Philippe Mathieu-Daudé
2023-09-04 16:12 ` [PATCH v2 20/22] sysemu/device_tree: " Philippe Mathieu-Daudé
2023-09-29 4:58 ` Markus Armbruster
2023-09-04 16:12 ` [PATCH v2 21/22] softmmu/memory: " Philippe Mathieu-Daudé
2023-09-05 15:46 ` Peter Xu
2023-09-04 16:12 ` [RFC PATCH v2 22/22] softmmu/physmem: " Philippe Mathieu-Daudé
2023-09-04 16:31 ` Daniel P. Berrangé
2023-09-05 15:50 ` Peter Xu
2023-09-29 5:13 ` [PATCH v2 00/22] (few more) Steps towards enabling -Wshadow Markus Armbruster
2023-09-29 6:42 ` Markus Armbruster
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=20230904161235.84651-3-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=armbru@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.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 NNTP newsgroup(s).