From nobody Sat May 18 02:07:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1695976378996439.8279281087765; Fri, 29 Sep 2023 01:32:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qm8uq-0006rr-RN; Fri, 29 Sep 2023 04:32:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qm8um-0006rX-Cf; Fri, 29 Sep 2023 04:32:00 -0400 Received: from mail.ozlabs.org ([2404:9400:2221:ea00::3] helo=gandalf.ozlabs.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qm8uk-0000lG-K6; Fri, 29 Sep 2023 04:32:00 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4Rxk9043Yfz4x3H; Fri, 29 Sep 2023 18:31:48 +1000 (AEST) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Rxk8y1PQ0z4x5J; Fri, 29 Sep 2023 18:31:45 +1000 (AEST) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: qemu-ppc@nongnu.org, qemu-devel@nongnu.org Cc: Daniel Henrique Barboza , Nicholas Piggin , Markus Armbruster , Michael Tokarev , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Subject: [PATCH v2] target/ppc: Rename variables to avoid local variable shadowing in VUPKPX Date: Fri, 29 Sep 2023 10:31:43 +0200 Message-ID: <20230929083143.234553-1-clg@kaod.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2404:9400:2221:ea00::3; envelope-from=SRS0=Yu9m=FN=kaod.org=clg@ozlabs.org; helo=gandalf.ozlabs.org X-Spam_score_int: -39 X-Spam_score: -4.0 X-Spam_bar: ---- X-Spam_report: (-4.0 / 5.0 requ) BAYES_00=-1.9, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1695976380401100003 and fix such warnings : ../target/ppc/int_helper.c: In function =E2=80=98helper_vupklpx=E2=80=99: ../target/ppc/int_helper.c:2025:21: warning: declaration of =E2=80=98r=E2= =80=99 shadows a parameter [-Wshadow=3Dlocal] 2025 | uint8_t r =3D (e >> 10) & 0x1f; = \ | ^ ../target/ppc/int_helper.c:2033:1: note: in expansion of macro =E2=80=98V= UPKPX=E2=80=99 2033 | VUPKPX(lpx, UPKLO) | ^~~~~~ ../target/ppc/int_helper.c:2017:41: note: shadowed declaration is here 2017 | void helper_vupk##suffix(ppc_avr_t *r, ppc_avr_t *b) = \ | ~~~~~~~~~~~^ ../target/ppc/int_helper.c:2033:1: note: in expansion of macro =E2=80=98V= UPKPX=E2=80=99 2033 | VUPKPX(lpx, UPKLO) | ^~~~~~ Signed-off-by: C=C3=A9dric Le Goater Reviewed-by: Michael Tokarev --- v2: changed all locals to start with '_' (Michael) target/ppc/int_helper.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/target/ppc/int_helper.c b/target/ppc/int_helper.c index 6fd00684a5b9..0a5c3e78a413 100644 --- a/target/ppc/int_helper.c +++ b/target/ppc/int_helper.c @@ -2020,13 +2020,13 @@ void helper_vsum4ubs(CPUPPCState *env, ppc_avr_t *r= , ppc_avr_t *a, ppc_avr_t *b) ppc_avr_t result; \ \ for (i =3D 0; i < ARRAY_SIZE(r->u32); i++) { \ - uint16_t e =3D b->u16[hi ? i : i + 4]; \ - uint8_t a =3D (e >> 15) ? 0xff : 0; \ - uint8_t r =3D (e >> 10) & 0x1f; \ - uint8_t g =3D (e >> 5) & 0x1f; \ - uint8_t b =3D e & 0x1f; \ + uint16_t _e =3D b->u16[hi ? i : i + 4]; \ + uint8_t _a =3D (_e >> 15) ? 0xff : 0; \ + uint8_t _r =3D (_e >> 10) & 0x1f; \ + uint8_t _g =3D (_e >> 5) & 0x1f; \ + uint8_t _b =3D _e & 0x1f; \ \ - result.u32[i] =3D (a << 24) | (r << 16) | (g << 8) | b; \ + result.u32[i] =3D (_a << 24) | (_r << 16) | (_g << 8) | _b; \ } \ *r =3D result; \ } --=20 2.41.0