From patchwork Fri Dec 22 01:23:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 82726 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 62EFC3865490 for ; Fri, 22 Dec 2023 01:25:10 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id A98993858016 for ; Fri, 22 Dec 2023 01:24:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A98993858016 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org A98993858016 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2001:470:ea4a:1:5054:ff:fec7:86e4 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703208250; cv=none; b=r0QKAiztzq4K3EHGHqRalqv+KTOxuPB4akkdCA60ytDPAQhaddtBGqL1YENH+ujO0B3iz3xI3IZTks4WPfRLDeX13ktfMIniwkUGLEfGP7FLr9tuV/c7qBFymj3z/3NG8ebttvAHdRrZDBAk7YELcc0klK9CBrOs174oJsf/OlM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703208250; c=relaxed/simple; bh=koq+sKhlgafEbppRQsbHisynpbFFbfjxaaF+6Z1/jbI=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=o6jq3PdwnGRRy1aYaDjKUA6wlLWn0kzfuSOBF4pEPtjyv6WAZ1mzPThkMYTvyEv97RW5KUixCpvdxrBd4WNktrqOghe9NEeRp4PkWvOvBKMSGIiPUrXYbUvL+A1QxwKHMvrWq7k7ZuZISQHAMZRVwDSG1T6V11UP7Fb7s30QXUY= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by smtp.gentoo.org (Postfix, from userid 559) id 35B5A340BEF; Fri, 22 Dec 2023 01:24:08 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 06/15] sim: erc32: fix -Wshadow=local warnings Date: Thu, 21 Dec 2023 20:23:46 -0500 Message-ID: <20231222012355.7504-6-vapier@gentoo.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231222012355.7504-1-vapier@gentoo.org> References: <20231222012355.7504-1-vapier@gentoo.org> MIME-Version: 1.0 X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Rename shadowed vars with different types to avoid confusion. --- sim/erc32/exec.c | 63 ++++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/sim/erc32/exec.c b/sim/erc32/exec.c index 10a9dae603c0..c8186df02f1d 100644 --- a/sim/erc32/exec.c +++ b/sim/erc32/exec.c @@ -707,7 +707,7 @@ dispatch_instruction(struct pstate *sregs) case DIVScc: { int sign; - uint32_t result, remainder; + uint32_t uresult, remainder; int c0, y31; if (!sparclite) { @@ -723,7 +723,7 @@ dispatch_instruction(struct pstate *sregs) Otherwise, calculate remainder + divisor. */ if (sign == 0) operand2 = ~operand2 + 1; - result = remainder + operand2; + uresult = remainder + operand2; /* The SPARClite User's Manual is not clear on how the "carry out" of the above ALU operation is to @@ -733,24 +733,23 @@ dispatch_instruction(struct pstate *sregs) even in cases where the divisor is subtracted from the remainder. FIXME: get the true story from Fujitsu. */ - c0 = result < (uint32_t) remainder - || result < (uint32_t) operand2; + c0 = uresult < remainder || uresult < (uint32_t) operand2; - if (result & 0x80000000) + if (uresult & 0x80000000) sregs->psr |= PSR_N; else sregs->psr &= ~PSR_N; y31 = (sregs->y & 0x80000000) == 0x80000000; - if (result == 0 && sign == y31) + if (uresult == 0 && sign == y31) sregs->psr |= PSR_Z; else sregs->psr &= ~PSR_Z; sign = (sign && !y31) || (!c0 && (sign || !y31)); - if (sign ^ (result >> 31)) + if (sign ^ (uresult >> 31)) sregs->psr |= PSR_V; else sregs->psr &= ~PSR_V; @@ -760,7 +759,7 @@ dispatch_instruction(struct pstate *sregs) else sregs->psr &= ~PSR_C; - sregs->y = result; + sregs->y = uresult; if (rd != 0) *rdd = (rs1 << 1) | !sign; @@ -773,21 +772,21 @@ dispatch_instruction(struct pstate *sregs) break; case SMULCC: { - uint32_t result; + uint32_t uresult; - mul64 (rs1, operand2, &sregs->y, &result, 1); + mul64 (rs1, operand2, &sregs->y, &uresult, 1); - if (result & 0x80000000) + if (uresult & 0x80000000) sregs->psr |= PSR_N; else sregs->psr &= ~PSR_N; - if (result == 0) + if (uresult == 0) sregs->psr |= PSR_Z; else sregs->psr &= ~PSR_Z; - *rdd = result; + *rdd = uresult; } break; case UMUL: @@ -797,21 +796,21 @@ dispatch_instruction(struct pstate *sregs) break; case UMULCC: { - uint32_t result; + uint32_t uresult; - mul64 (rs1, operand2, &sregs->y, &result, 0); + mul64 (rs1, operand2, &sregs->y, &uresult, 0); - if (result & 0x80000000) + if (uresult & 0x80000000) sregs->psr |= PSR_N; else sregs->psr &= ~PSR_N; - if (result == 0) + if (uresult == 0) sregs->psr |= PSR_Z; else sregs->psr &= ~PSR_Z; - *rdd = result; + *rdd = uresult; } break; case SDIV: @@ -831,7 +830,7 @@ dispatch_instruction(struct pstate *sregs) break; case SDIVCC: { - uint32_t result; + uint32_t uresult; if (sparclite) { sregs->trap = TRAP_UNIMP; @@ -843,14 +842,14 @@ dispatch_instruction(struct pstate *sregs) break; } - div64 (sregs->y, rs1, operand2, &result, 1); + div64 (sregs->y, rs1, operand2, &uresult, 1); - if (result & 0x80000000) + if (uresult & 0x80000000) sregs->psr |= PSR_N; else sregs->psr &= ~PSR_N; - if (result == 0) + if (uresult == 0) sregs->psr |= PSR_Z; else sregs->psr &= ~PSR_Z; @@ -858,7 +857,7 @@ dispatch_instruction(struct pstate *sregs) /* FIXME: should set overflow flag correctly. */ sregs->psr &= ~(PSR_C | PSR_V); - *rdd = result; + *rdd = uresult; } break; case UDIV: @@ -878,7 +877,7 @@ dispatch_instruction(struct pstate *sregs) break; case UDIVCC: { - uint32_t result; + uint32_t uresult; if (sparclite) { sregs->trap = TRAP_UNIMP; @@ -890,14 +889,14 @@ dispatch_instruction(struct pstate *sregs) break; } - div64 (sregs->y, rs1, operand2, &result, 0); + div64 (sregs->y, rs1, operand2, &uresult, 0); - if (result & 0x80000000) + if (uresult & 0x80000000) sregs->psr |= PSR_N; else sregs->psr &= ~PSR_N; - if (result == 0) + if (uresult == 0) sregs->psr |= PSR_Z; else sregs->psr &= ~PSR_Z; @@ -905,7 +904,7 @@ dispatch_instruction(struct pstate *sregs) /* FIXME: should set overflow flag correctly. */ sregs->psr &= ~(PSR_C | PSR_V); - *rdd = result; + *rdd = uresult; } break; case IXNOR: @@ -1168,7 +1167,7 @@ dispatch_instruction(struct pstate *sregs) case SCAN: { - uint32_t result, mask; + uint32_t uresult, mask; int i; if (!sparclite) { @@ -1176,12 +1175,12 @@ dispatch_instruction(struct pstate *sregs) break; } mask = (operand2 & 0x80000000) | (operand2 >> 1); - result = rs1 ^ mask; + uresult = rs1 ^ mask; for (i = 0; i < 32; i++) { - if (result & 0x80000000) + if (uresult & 0x80000000) break; - result <<= 1; + uresult <<= 1; } *rdd = i == 32 ? 63 : i;