From patchwork Fri Dec 22 01:23:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 82714 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 407E43857739 for ; Fri, 22 Dec 2023 01:24:16 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id 32FFA3858C74 for ; Fri, 22 Dec 2023 01:23:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 32FFA3858C74 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 32FFA3858C74 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.211.166.183 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703208239; cv=none; b=pNLbmZ8oKhaIH23sMrt5KkXxo43nr4RIHPnY7xc27pXdUqqHw5hVrEhHSVbEMOXp2jOlH6xkKQNezpA6r/1WiTjBOxvWiZ0JTDn13Tn5QD8kyOdDp1QNcvYLYpm8wOngepyEgG6O5T5XvwO3XnbS0DtXDi6M0KLXctwxvOuuNVE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703208239; c=relaxed/simple; bh=Sna9lzMlZ3jyOy3B2Vewl3HkZupDjUpXshYROWAwxx4=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=sNLLh42MAK5+lotDp9piYBGmkt0MvDycqgkzqY/wtJw5N5ffzd4I+Lfom+zjNUi7xgWoON9GfDMN/TZb5DrWZA1V3mU4+dyWuLFg0V1gREsMYa6DHXeI3jlEeSKfY4yBkwsudksB3Cc9J+lextk/CVCbU/FXyt6uZyJjGIr2gtc= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by smtp.gentoo.org (Postfix, from userid 559) id B4347340943; Fri, 22 Dec 2023 01:23:57 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 01/15] sim: aarch64: fix -Wshadow=local warnings Date: Thu, 21 Dec 2023 20:23:41 -0500 Message-ID: <20231222012355.7504-1-vapier@gentoo.org> X-Mailer: git-send-email 2.43.0 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, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 These functions have local vars named "val" of type float, and then create nested vars named "val" of type double. This is a bit confusing and causes build time warnings. --- sim/aarch64/simulator.c | 42 ++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/sim/aarch64/simulator.c b/sim/aarch64/simulator.c index 8825819a3910..e7537b739aa0 100644 --- a/sim/aarch64/simulator.c +++ b/sim/aarch64/simulator.c @@ -7942,44 +7942,44 @@ do_FRINT (sim_cpu *cpu) TRACE_DECODE (cpu, "emulated at line %d", __LINE__); if (INSTR (22, 22)) { - double val = aarch64_get_FP_double (cpu, rs); + double dval = aarch64_get_FP_double (cpu, rs); switch (rmode) { case 0: /* mode N: nearest or even. */ { - double rval = round (val); + double rval = round (dval); - if (val - rval == 0.5) + if (dval - rval == 0.5) { if (((rval / 2.0) * 2.0) != rval) rval += 1.0; } - aarch64_set_FP_double (cpu, rd, round (val)); + aarch64_set_FP_double (cpu, rd, round (dval)); return; } case 1: /* mode P: towards +inf. */ - if (val < 0.0) - aarch64_set_FP_double (cpu, rd, trunc (val)); + if (dval < 0.0) + aarch64_set_FP_double (cpu, rd, trunc (dval)); else - aarch64_set_FP_double (cpu, rd, round (val)); + aarch64_set_FP_double (cpu, rd, round (dval)); return; case 2: /* mode M: towards -inf. */ - if (val < 0.0) - aarch64_set_FP_double (cpu, rd, round (val)); + if (dval < 0.0) + aarch64_set_FP_double (cpu, rd, round (dval)); else - aarch64_set_FP_double (cpu, rd, trunc (val)); + aarch64_set_FP_double (cpu, rd, trunc (dval)); return; case 3: /* mode Z: towards 0. */ - aarch64_set_FP_double (cpu, rd, trunc (val)); + aarch64_set_FP_double (cpu, rd, trunc (dval)); return; case 4: /* mode A: away from 0. */ - aarch64_set_FP_double (cpu, rd, round (val)); + aarch64_set_FP_double (cpu, rd, round (dval)); return; case 6: /* mode X: use FPCR with exactness check. */ @@ -9186,29 +9186,29 @@ do_scalar_FCM (sim_cpu *cpu) TRACE_DECODE (cpu, "emulated at line %d", __LINE__); if (INSTR (22, 22)) { - double val1 = aarch64_get_FP_double (cpu, rn); - double val2 = aarch64_get_FP_double (cpu, rm); + double dval1 = aarch64_get_FP_double (cpu, rn); + double dval2 = aarch64_get_FP_double (cpu, rm); switch (EUac) { case 0: /* 000 */ - result = val1 == val2; + result = dval1 == dval2; break; case 3: /* 011 */ - val1 = fabs (val1); - val2 = fabs (val2); + dval1 = fabs (dval1); + dval2 = fabs (dval2); ATTRIBUTE_FALLTHROUGH; case 2: /* 010 */ - result = val1 >= val2; + result = dval1 >= dval2; break; case 7: /* 111 */ - val1 = fabs (val1); - val2 = fabs (val2); + dval1 = fabs (dval1); + dval2 = fabs (dval2); ATTRIBUTE_FALLTHROUGH; case 6: /* 110 */ - result = val1 > val2; + result = dval1 > dval2; break; default: From patchwork Fri Dec 22 01:23:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 82715 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 A0B673858410 for ; Fri, 22 Dec 2023 01:24:19 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id 3CEDB3858C2D for ; Fri, 22 Dec 2023 01:24:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3CEDB3858C2D 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 3CEDB3858C2D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.211.166.183 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703208241; cv=none; b=Xq14pT99nLMia01BGXE/DBJTARj84JFoG6y9Eg4JRy7ez5hIAarrRTgdis3MWHg4Bl0i6rKkmkH/zEZs4YNRr45KSGLAo4PC4UnFEIugUcCXMELvJs5U/4rTINqBBVMzSjQT/9WP0RGXy7qndtI1Q2fzUBb2yyInyA3Be7rG4m4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703208241; c=relaxed/simple; bh=ow59Qffz0bsVKLpws699l3nV2RHeh4TGE95/Cqyc5rQ=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=KWGYbRP630UwL0p4GG3bVwXuuCmxYh/Kc6DOQunMsz4SnJOaG7QiYe+lq+75vt2yIJAjnaC4GhUnmJd7ggFQqLyP0HdX19tUZvO3VMJCTsOt2utGwcX6CZrjdeginlREiMAzZQq5V4McpBZSkbiZg4SQino3Ac6VjFgqR60OVhU= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by smtp.gentoo.org (Postfix, from userid 559) id C840B340943; Fri, 22 Dec 2023 01:23:59 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 02/15] sim: arm: fix -Wshadow=local warnings Date: Thu, 21 Dec 2023 20:23:42 -0500 Message-ID: <20231222012355.7504-2-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, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 Remove duplicate nested variable declarations, rename some to avoid confusion when the type is different or the original value should be retained, and fix some weirdness with nested enums in structs. --- sim/arm/armemu.c | 38 +++++++++++++++++--------------------- sim/arm/thumbemu.c | 22 ++++++---------------- sim/arm/wrapper.c | 16 +++++++--------- 3 files changed, 30 insertions(+), 46 deletions(-) diff --git a/sim/arm/armemu.c b/sim/arm/armemu.c index 2b8ae007cb56..cafaabbf637c 100644 --- a/sim/arm/armemu.c +++ b/sim/arm/armemu.c @@ -1023,7 +1023,7 @@ handle_v6_insn (ARMul_State * state, ARMword instr) Rn = BITS (0, 3); if (Rn != 0xF) { - ARMword val = state->Reg[Rn] & ~(-(1 << ((msb + 1) - lsb))); + val = state->Reg[Rn] & ~(-(1 << ((msb + 1) - lsb))); state->Reg[Rd] |= val << lsb; } return 1; @@ -1434,8 +1434,6 @@ ARMul_Emulate26 (ARMul_State * state) { if (BITS (25, 27) == 5) /* BLX(1) */ { - ARMword dest; - state->Reg[14] = pc + 4; /* Force entry into Thumb mode. */ @@ -1568,10 +1566,10 @@ check_PMUintr: if (do_int && (cp14r0 & ARMul_CP14_R0_INTEN2)) { - ARMword temp; + ARMword cp; - if (state->CPRead[13] (state, 8, & temp) - && (temp & ARMul_CP13_R8_PMUS)) + if (state->CPRead[13] (state, 8, & cp) + && (cp & ARMul_CP13_R8_PMUS)) ARMul_Abort (state, ARMul_FIQV); else ARMul_Abort (state, ARMul_IRQV); @@ -1604,8 +1602,8 @@ check_PMUintr: if (BITS (4, 7) == 0xD) { /* XScale Load Consecutive insn. */ - ARMword temp = GetLS7RHS (state, instr); - ARMword temp2 = BIT (23) ? LHS + temp : LHS - temp; + ARMword temp1 = GetLS7RHS (state, instr); + ARMword temp2 = BIT (23) ? LHS + temp1 : LHS - temp1; ARMword addr = BIT (24) ? temp2 : LHS; if (BIT (12)) @@ -1630,8 +1628,8 @@ check_PMUintr: else if (BITS (4, 7) == 0xF) { /* XScale Store Consecutive insn. */ - ARMword temp = GetLS7RHS (state, instr); - ARMword temp2 = BIT (23) ? LHS + temp : LHS - temp; + ARMword temp1 = GetLS7RHS (state, instr); + ARMword temp2 = BIT (23) ? LHS + temp1 : LHS - temp1; ARMword addr = BIT (24) ? temp2 : LHS; if (BIT (12)) @@ -2313,15 +2311,13 @@ check_PMUintr: if (BITS (4, 7) == 3) { /* BLX(2) */ - ARMword temp; - if (TFLAG) - temp = (pc + 2) | 1; + dest = (pc + 2) | 1; else - temp = pc + 4; + dest = pc + 4; WriteR15Branch (state, state->Reg[RHSReg]); - state->Reg[14] = temp; + state->Reg[14] = dest; break; } } @@ -2487,7 +2483,7 @@ check_PMUintr: /* ElSegundo SMLALxy insn. */ ARMdword op1 = state->Reg[BITS (0, 3)]; ARMdword op2 = state->Reg[BITS (8, 11)]; - ARMdword dest; + ARMdword result; if (BIT (5)) op1 >>= 16; @@ -2500,11 +2496,11 @@ check_PMUintr: if (op2 & 0x8000) op2 -= 65536; - dest = (ARMdword) state->Reg[BITS (16, 19)] << 32; - dest |= state->Reg[BITS (12, 15)]; - dest += op1 * op2; - state->Reg[BITS (12, 15)] = dest; - state->Reg[BITS (16, 19)] = dest >> 32; + result = (ARMdword) state->Reg[BITS (16, 19)] << 32; + result |= state->Reg[BITS (12, 15)]; + result += op1 * op2; + state->Reg[BITS (12, 15)] = result; + state->Reg[BITS (16, 19)] = result >> 32; break; } diff --git a/sim/arm/thumbemu.c b/sim/arm/thumbemu.c index 99f51ef34691..58a9c85ce2b9 100644 --- a/sim/arm/thumbemu.c +++ b/sim/arm/thumbemu.c @@ -2131,14 +2131,11 @@ ARMul_ThumbDecode (ARMul_State * state, if ((tinstr & (1 << 10)) == 0) { /* Format 4 */ - struct - { + struct insn_format { ARMword opcode; - enum - { t_norm, t_shift, t_neg, t_mul } - otype; - } - subset[16] = + enum { t_norm, t_shift, t_neg, t_mul } otype; + }; + struct insn_format subset[16] = { { 0xE0100000, t_norm}, /* ANDS Rd,Rd,Rs */ { 0xE0300000, t_norm}, /* EORS Rd,Rd,Rs */ @@ -2161,14 +2158,7 @@ ARMul_ThumbDecode (ARMul_State * state, if (in_IT_block ()) { - struct - { - ARMword opcode; - enum - { t_norm, t_shift, t_neg, t_mul } - otype; - } - subset[16] = + struct insn_format it_subset[16] = { { 0xE0000000, t_norm}, /* AND Rd,Rd,Rs */ { 0xE0200000, t_norm}, /* EOR Rd,Rd,Rs */ @@ -2187,7 +2177,7 @@ ARMul_ThumbDecode (ARMul_State * state, { 0xE1C00000, t_norm}, /* BIC Rd,Rd,Rs */ { 0xE1E00000, t_norm} /* MVN Rd,Rs */ }; - *ainstr = subset[(tinstr & 0x03C0) >> 6].opcode; /* base */ + *ainstr = it_subset[(tinstr & 0x03C0) >> 6].opcode; /* base */ } switch (subset[(tinstr & 0x03C0) >> 6].otype) diff --git a/sim/arm/wrapper.c b/sim/arm/wrapper.c index 8d928a6f79f9..06512754725b 100644 --- a/sim/arm/wrapper.c +++ b/sim/arm/wrapper.c @@ -746,14 +746,14 @@ sim_target_parse_command_line (int argc, char ** argv) while (* ptr) { - int i; + int o; - for (i = ARRAY_SIZE (options); i--;) - if (strncmp (ptr, options[i].swi_option, - strlen (options[i].swi_option)) == 0) + for (o = ARRAY_SIZE (options); o--;) + if (strncmp (ptr, options[o].swi_option, + strlen (options[o].swi_option)) == 0) { - swi_mask |= options[i].swi_mask; - ptr += strlen (options[i].swi_option); + swi_mask |= options[o].swi_mask; + ptr += strlen (options[o].swi_option); if (* ptr == ',') ++ ptr; @@ -761,7 +761,7 @@ sim_target_parse_command_line (int argc, char ** argv) break; } - if (i < 0) + if (o < 0) break; } @@ -884,8 +884,6 @@ sim_open (SIM_OPEN_KIND kind, if (argv_copy[1] != NULL) { - int i; - /* Scan for memory-size switches. */ for (i = 0; (argv_copy[i] != NULL) && (argv_copy[i][0] != 0); i++) if (argv_copy[i][0] == '-' && argv_copy[i][1] == 'm') From patchwork Fri Dec 22 01:23:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 82719 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 B1869384CBAF for ; Fri, 22 Dec 2023 01:24:38 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id 358D03858420 for ; Fri, 22 Dec 2023 01:24:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 358D03858420 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 358D03858420 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.211.166.183 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703208243; cv=none; b=tXZe2/rZ6W+w0/Y2ZLX6qmswamyh15QJmu+PoDahDxyhUMOIK6U529R2LG5yGwJU3ZU9T0zQh9CPJNG9ba8ysNVtf9GYlCNpMvZPU7S+bugw0bbE5AZOt+Kumvej3lUwgEuuHT49dTfULCU52B5jMZOrlI1yfXvoRlMo561PfD8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703208243; c=relaxed/simple; bh=Z7rK7FJyRx964nZGJ3PzcIh7TUh076spcJHXLFArzdU=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=cGyOUXKMJOGzAWwZo1z/CYY/dIKg/gNDOPMPGsnZjiOWlKLUZk8gW2wxOBrxCCVSKJOuK8176FalR117ow2TiSrCzRCOR4RV7gMDCMsu50t/QH4oZHmLCqV+te80vJU050Nfs5YIly7/kq/QgTaGDGJkg1+SBz1r+TQSW2TJxb4= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by smtp.gentoo.org (Postfix, from userid 559) id D71AA340BEF; Fri, 22 Dec 2023 01:24:01 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 03/15] sim: bfin: fix -Wshadow=local warnings Date: Thu, 21 Dec 2023 20:23:43 -0500 Message-ID: <20231222012355.7504-3-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, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 the shadowed var to avoid confusion with the function argument as to which address this code is using. --- sim/bfin/dv-bfin_mmu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sim/bfin/dv-bfin_mmu.c b/sim/bfin/dv-bfin_mmu.c index c14e2088c1f1..3d244344ac0c 100644 --- a/sim/bfin/dv-bfin_mmu.c +++ b/sim/bfin/dv-bfin_mmu.c @@ -144,7 +144,7 @@ bfin_mmu_io_write_buffer (struct hw *me, const void *source, *valuep = value; if (value) { - bu32 addr = mmu->sram_base_address | + bu32 sram_addr = mmu->sram_base_address | ((value >> (26 - 11)) & (1 << 11)) | /* addr bit 11 (Way0/Way1) */ ((value >> (24 - 21)) & (1 << 21)) | /* addr bit 21 (Data/Inst) */ ((value >> (23 - 15)) & (1 << 15)) | /* addr bit 15 (Data Bank) */ @@ -157,9 +157,9 @@ bfin_mmu_io_write_buffer (struct hw *me, const void *source, hw_abort (me, "DTEST_COMMAND bits undefined"); if (value & TEST_WRITE) - sim_write (hw_system (me), addr, mmu->dtest_data, 8); + sim_write (hw_system (me), sram_addr, mmu->dtest_data, 8); else - sim_read (hw_system (me), addr, mmu->dtest_data, 8); + sim_read (hw_system (me), sram_addr, mmu->dtest_data, 8); } break; default: From patchwork Fri Dec 22 01:23:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 82723 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 6307C386C5B2 for ; Fri, 22 Dec 2023 01:24:54 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 66C3B3858C2F for ; Fri, 22 Dec 2023 01:24:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 66C3B3858C2F 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 66C3B3858C2F 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=1703208245; cv=none; b=xp+NrGU4MUvm16m3W3Ye45lXE3fyWU5v6FlysrOoQBiPwhi/lNrR7cBjg8gjWP/+rTfywZsOKYA6U/TykoeCqt5aF2D04beKmpYAEh7aHi+j80IY7MRQv/HD8axeULzwUteTjFol6GpZ6RhNma+Gt6PLmopFYACwBThNZ6NUdz4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703208245; c=relaxed/simple; bh=8jktfVC5mWVUHxANkhb1mVlQLz4sk1UyGrhfCWqTKtU=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=fpXSQETDSlTReynBG+8ed9DW/P1j73qmeth9S5bAxNGpzsAwyd0aoPJs3ANvTTlLQeobP/RMH5UwHAgUZ8BPrzvilSEbM3B2iTpKH7/zHqdLnZt9Pmi8wJHVo0n3cBTAzHV/2GwE4yieGtfjvKzIAMQU7vjAckuqLjre/vS4xdU= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by smtp.gentoo.org (Postfix, from userid 559) id E3EF7340DE6; Fri, 22 Dec 2023 01:24:03 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 04/15] sim: common: fix -Wshadow=local warnings Date: Thu, 21 Dec 2023 20:23:44 -0500 Message-ID: <20231222012355.7504-4-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, and delete redundant decls. --- sim/common/sim-fpu.c | 4 ++-- sim/common/sim-options.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sim/common/sim-fpu.c b/sim/common/sim-fpu.c index 491a99b7212e..4ee26723ee26 100644 --- a/sim/common/sim-fpu.c +++ b/sim/common/sim-fpu.c @@ -413,9 +413,9 @@ unpack_fpu (sim_fpu *dst, uint64_t packed, int is_double) } else { - uint32_t val = pack_fpu (dst, 0); + uint32_t fval = pack_fpu (dst, 0); uint32_t org = packed; - ASSERT (val == org); + ASSERT (fval == org); } } } diff --git a/sim/common/sim-options.c b/sim/common/sim-options.c index 9f238339fb8f..c695db687cb1 100644 --- a/sim/common/sim-options.c +++ b/sim/common/sim-options.c @@ -496,7 +496,7 @@ standard_option_handler (SIM_DESC sd, sim_cpu *cpu, int opt, case OPTION_ENV_UNSET: { - int i, varlen; + int varlen; char **envp; if (STATE_PROG_ENVP (sd) == NULL) From patchwork Fri Dec 22 01:23:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 82716 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 76BB1384DEC0 for ; Fri, 22 Dec 2023 01:24:27 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id 94ABC3858C3A for ; Fri, 22 Dec 2023 01:24:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 94ABC3858C3A 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 94ABC3858C3A Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.211.166.183 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703208249; cv=none; b=aBTbSUfWlG3rQTafQCxlH7i7lzNfeSHDjheHlmBvbE60pvrI0LCHcYBYm9igihSvDb6n85jwV1bit3Xkf1y4MMAk2XxX1yHwrXMVSvmorVsg59LO/iFvkK75ndXJRfZmmbBFw/mH6CJ4/iK//UZozYGHRXOQl9ywvMQGnhXgX/U= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703208249; c=relaxed/simple; bh=IWVadrTeVi4P/uwySaB2BBMZ9zgKtAjgMopGZCkx8hU=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=dXhv6iETxTnKL9C5ubrGBw983M3ExUMqr9f5NcwGGPJdBflo+myPHUUa61e62vcIRb6i1CSyCme9OfJp0Ye7BcqyydXp8u0A47OJxpOhKy0r2DC3jEP0uhoNyk1MoM0mL/ohHtvaQ4aowfTAAF2jmU6GKavU0XAXDQKi4B0MIUw= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by smtp.gentoo.org (Postfix, from userid 559) id 21F2A340943; Fri, 22 Dec 2023 01:24:06 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 05/15] sim: cris: fix -Wshadow=local warnings Date: Thu, 21 Dec 2023 20:23:45 -0500 Message-ID: <20231222012355.7504-5-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, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 Delete redundant local decls. --- sim/cris/mloop.in | 1 - sim/cris/sim-if.c | 1 - 2 files changed, 2 deletions(-) diff --git a/sim/cris/mloop.in b/sim/cris/mloop.in index d0f3ee534167..9e3147a917f0 100644 --- a/sim/cris/mloop.in +++ b/sim/cris/mloop.in @@ -234,7 +234,6 @@ cat <attrs, CGEN_INSN_DELAY_SLOT)) { - UHI insn; trace_p = PC_IN_TRACE_RANGE_P (current_cpu, pc); profile_p = PC_IN_PROFILE_RANGE_P (current_cpu, pc); befaft_p = profile_p || trace_p; diff --git a/sim/cris/sim-if.c b/sim/cris/sim-if.c index 06803687ec7c..3919df0381ae 100644 --- a/sim/cris/sim-if.c +++ b/sim/cris/sim-if.c @@ -761,7 +761,6 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback, struct bfd *abfd, int len = strlen (name) + 1; USI epp, epp0; USI stacklen; - int i; char **prog_argv = STATE_PROG_ARGV (sd); int my_argc = 0; USI csp; 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; From patchwork Fri Dec 22 01:23:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 82728 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 48D3A3860015 for ; Fri, 22 Dec 2023 01:25:27 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id AAFF038618AB for ; Fri, 22 Dec 2023 01:24:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AAFF038618AB 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 AAFF038618AB Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.211.166.183 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703208252; cv=none; b=JXH7EjNHpZ3aUfjsLrnTZw4zTleljisaFS5jDrx6b5DizmkmptpRL6PRGT58hBpgv2snBJMxOOksO0RpNcbh/7cM5v1uRYNPhAJzfPG0HwPkfT/Zej6hOmeuo0RPqTO7nme/bwDyvwNGECKJAHIjKSFCuXvG41wTIW1yiWKIFxw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703208252; c=relaxed/simple; bh=X7cKHQn4O0wOqdn6+l7icKlFCsfJWWM3sgzopEbQUnE=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=v4RGlieEFwccsLXNQWtfu2ImMLF/RjyAZTW/Y+eku9KeWdX2QCwez9ViRZL10gjh5Hz4KsXZ+JbMmJGJgoA7nr8hGR7wjJMZxBf6gyDmNTtvxjMRz/9jh2QP6y3LWwyJSYmbYuLv+ayQS2qJvh0iBSOBSrUVRjnWrbt95WEpL38= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by smtp.gentoo.org (Postfix, from userid 559) id 5B119340943; Fri, 22 Dec 2023 01:24:10 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 07/15] sim: frv: fix -Wshadow=local warnings Date: Thu, 21 Dec 2023 20:23:47 -0500 Message-ID: <20231222012355.7504-7-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, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 Delete redundant decls, and rename conflicting vars. --- sim/frv/interrupts.c | 1 - sim/frv/options.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/sim/frv/interrupts.c b/sim/frv/interrupts.c index 979360738bab..8faab5fe0db9 100644 --- a/sim/frv/interrupts.c +++ b/sim/frv/interrupts.c @@ -887,7 +887,6 @@ set_exception_status_registers ( break; default: { - SIM_DESC sd = CPU_STATE (current_cpu); IADDR pc = CPU_PC_GET (current_cpu); sim_engine_abort (sd, current_cpu, pc, "invalid non-strict program interrupt kind: %d\n", diff --git a/sim/frv/options.c b/sim/frv/options.c index cb1729b9c403..d6425002901f 100644 --- a/sim/frv/options.c +++ b/sim/frv/options.c @@ -212,9 +212,9 @@ frv_option_handler (SIM_DESC sd, sim_cpu *current_cpu, int opt, } for (i = 0; i < MAX_NR_PROCESSORS; ++i) { - SIM_CPU *current_cpu = STATE_CPU (sd, i); - FRV_CACHE *insn_cache = CPU_INSN_CACHE (current_cpu); - FRV_CACHE *data_cache = CPU_DATA_CACHE (current_cpu); + SIM_CPU *cpu = STATE_CPU (sd, i); + FRV_CACHE *insn_cache = CPU_INSN_CACHE (cpu); + FRV_CACHE *data_cache = CPU_DATA_CACHE (cpu); insn_cache->memory_latency = cycles; data_cache->memory_latency = cycles; } From patchwork Fri Dec 22 01:23:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 82717 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 ACDC23858420 for ; Fri, 22 Dec 2023 01:24:34 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id D21C03858420 for ; Fri, 22 Dec 2023 01:24:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D21C03858420 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 D21C03858420 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.211.166.183 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703208254; cv=none; b=HiJg4tPeUbDQtOaookJjoiX94dOwJ04ETXOOmaekPfog9RX72ftKFLP6/7/p2J05qgVRs88Ey/8ze1Iqrf03pRp0XzyTRXn+7Ps6cEKczB8jksWbJxkw70jrCvZoZvUwwxuBlFTf2M7nC6FBX9XYo5hvxLrOOsCpdhNvEbCF/ss= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703208254; c=relaxed/simple; bh=1D3mTvpzdYr3mujeEc5y18eSZVFYEXs60BA3Lcd+T6g=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=IgxKbhwwH8dVfNEGuKruSWuIA4CgLJnra4vDyZ/fIgzu/BDEPfm8SJ1lMs6KKAy9NZyENE+nISpFYOt6IoAbt6Qri4hHYPMTzMXAV5JLAFQSetz6nebKPxmcDl7waHq6awXJXWAwX3Mgc/0IdJMUky3QnG/3OotpK2Cm5YsfANA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by smtp.gentoo.org (Postfix, from userid 559) id 6D6EC340BEF; Fri, 22 Dec 2023 01:24:12 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 08/15] sim: h8300: fix -Wshadow=local warnings Date: Thu, 21 Dec 2023 20:23:48 -0500 Message-ID: <20231222012355.7504-8-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, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 Delete conflicting decls when the existing scope has vars of the same name & type for this exact use. --- sim/h8300/compile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sim/h8300/compile.c b/sim/h8300/compile.c index 8ae7757ee1b1..cfa6eeead5c1 100644 --- a/sim/h8300/compile.c +++ b/sim/h8300/compile.c @@ -1738,7 +1738,7 @@ init_pointers (SIM_DESC sd) #define OBITOP(name, f, s, op) \ case O (name, SB): \ { \ - int m, tmp; \ + int m; \ \ if (f) \ if (fetch (sd, &code->dst, &ea)) \ @@ -4770,7 +4770,7 @@ sim_open (SIM_OPEN_KIND kind, /* CPU specific initialization. */ for (i = 0; i < MAX_NR_PROCESSORS; ++i) { - SIM_CPU *cpu = STATE_CPU (sd, i); + cpu = STATE_CPU (sd, i); CPU_REG_FETCH (cpu) = h8300_reg_fetch; CPU_REG_STORE (cpu) = h8300_reg_store; From patchwork Fri Dec 22 01:23:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 82718 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 6A0F8386547E for ; Fri, 22 Dec 2023 01:24:38 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id A55E4385E01F for ; Fri, 22 Dec 2023 01:24:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A55E4385E01F 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 A55E4385E01F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.211.166.183 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703208256; cv=none; b=sJDINOLTARMkiPj5sUTc+tD0RxZyEe1pVuwGabMMohBrtIScK8ZRxJpL04pNYv9c8U93+0iPaDnKiucOSLSq2Jj4OM2RcjS41Z140ICrjV2QlbW77r3L2RGEBpACD0l522qd93+sjZoAsNu37BVqxkwmmc1uJiZX7/BUincLvss= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703208256; c=relaxed/simple; bh=OQ4+ZNJvcNQws2TV2qtVpt0WWwUrKZh3Y3AXyFmEMtg=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=of6lJPhyyCmM+CfERxLx5USOYEB1GNJadihAqwu8nBcdyYDJTlR9W4Oppi6cLA7hLtQJASO/s/mbDDn+cb+BqNUhcRgS6+k1aoaDv8rE5wq2BOJ9cXmlEAjQKaA9B0pRRPXBUqkyrzlZdczBptAYbIHtoY02Mgruvp0GEFSbOdQ= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by smtp.gentoo.org (Postfix, from userid 559) id 7B19D340943; Fri, 22 Dec 2023 01:24:14 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 09/15] sim: iq2000: fix -Wshadow=local warnings Date: Thu, 21 Dec 2023 20:23:49 -0500 Message-ID: <20231222012355.7504-9-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, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 Delete redundant decls. --- sim/iq2000/mloop.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sim/iq2000/mloop.in b/sim/iq2000/mloop.in index 1d3df32ee777..9ffa167de2e8 100644 --- a/sim/iq2000/mloop.in +++ b/sim/iq2000/mloop.in @@ -191,7 +191,7 @@ cat <attrs, CGEN_INSN_DELAY_SLOT)) { - USI insn = GETIMEMUSI (current_cpu, CPU2INSN(pc)); + insn = GETIMEMUSI (current_cpu, CPU2INSN(pc)); idesc = extract (current_cpu, pc, insn, &sc->argbuf, FAST_P); if (likely_cti && IDESC_CTI_P (idesc)) From patchwork Fri Dec 22 01:23:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 82720 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 CBEFF385E01F for ; Fri, 22 Dec 2023 01:24:43 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 059163858427 for ; Fri, 22 Dec 2023 01:24:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 059163858427 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 059163858427 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=1703208258; cv=none; b=FTYLdq8AgE/ugrYS/6oVESLItj+wTMuLRBDilBAb4Fr4ERZW7W7NvBxGeSqV9O/kWeAOqaX47w5eglLpYuC2ovQEqHxzDVVBcoqvTMA+CQ2dkag4OfTDBLBjfKSHR0nBcDLmRe/eb8GuEakIA9dCH/vAMGT2AqVUOYMxm8GhCro= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703208258; c=relaxed/simple; bh=t0VqkLzbS4Ex2eZ7dUPJTl6QN5dkmXfPTAo09pP054Q=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=KlanO/l2KNFRJ9biPyDBOP0ugtlsNu2vr9bf8AsZkm8aFT/nmco4aoWpqeHZzxdvZEwQnZ19OAI4O467b3Oj22kP8UUcD9g6bvCQEbS2Pa9FdktVJCgtK1Gjn6qy0jsDxQ1C+/NCvsiMohGYHo0l+1ju4BtjFmdZvQR0RJbIsAs= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by smtp.gentoo.org (Postfix, from userid 559) id A7CBF342F65; Fri, 22 Dec 2023 01:24:16 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 10/15] sim: m68hc11: fix -Wshadow=local warnings Date: Thu, 21 Dec 2023 20:23:50 -0500 Message-ID: <20231222012355.7504-10-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 Delete redundant decls when the existing scope has the same var and type available for use. --- sim/m68hc11/dv-m68hc11.c | 3 +-- sim/m68hc11/dv-m68hc11sio.c | 2 +- sim/m68hc11/interp.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/sim/m68hc11/dv-m68hc11.c b/sim/m68hc11/dv-m68hc11.c index ef18f0999360..fc8b22cede3f 100644 --- a/sim/m68hc11/dv-m68hc11.c +++ b/sim/m68hc11/dv-m68hc11.c @@ -782,7 +782,6 @@ m68hc11_option_handler (SIM_DESC sd, sim_cpu *cpu, osc = &controller->oscillators[i]; if (osc->event) { - double f; int cur_value; int next_value; char freq[32]; @@ -927,7 +926,7 @@ m68hc11cpu_set_port (struct hw *me, sim_cpu *cpu, /* Scan IC3, IC2 and IC1. Bit number is 3 - i. */ for (i = 0; i < 3; i++) { - uint8_t mask = (1 << i); + mask = (1 << i); if (delta & mask) { diff --git a/sim/m68hc11/dv-m68hc11sio.c b/sim/m68hc11/dv-m68hc11sio.c index 03b44613c180..f77dfdec1f99 100644 --- a/sim/m68hc11/dv-m68hc11sio.c +++ b/sim/m68hc11/dv-m68hc11sio.c @@ -227,7 +227,7 @@ m68hc11sio_port_event (struct hw *me, simulate some initial setup by the internal rom. */ if (((m68hc11_cpu->ios[M6811_HPRIO]) & (M6811_SMOD | M6811_MDA)) == M6811_SMOD) { - unsigned char val = 0x33; + val = 0x33; m68hc11sio_io_write_buffer (me, &val, io_map, (unsigned_word) M6811_BAUD, 1); diff --git a/sim/m68hc11/interp.c b/sim/m68hc11/interp.c index df6bd7bea565..c4d5c22fa075 100644 --- a/sim/m68hc11/interp.c +++ b/sim/m68hc11/interp.c @@ -478,7 +478,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback, /* CPU specific initialization. */ for (i = 0; i < MAX_NR_PROCESSORS; ++i) { - SIM_CPU *cpu = STATE_CPU (sd, i); + cpu = STATE_CPU (sd, i); CPU_REG_FETCH (cpu) = m68hc11_reg_fetch; CPU_REG_STORE (cpu) = m68hc11_reg_store; From patchwork Fri Dec 22 01:23:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 82721 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 756BB384771E for ; Fri, 22 Dec 2023 01:24:52 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id 1A5813858C66 for ; Fri, 22 Dec 2023 01:24:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1A5813858C66 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 1A5813858C66 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.211.166.183 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703208262; cv=none; b=ioSMlaMxGqeWyLk3Gy2dNalcEoD645UeB6BxZoPF3/40cgyUJreTVEBmyGXzYOFntQOofgC5AW5Ic46vhFxswxOXkXk0i6pRMcp//IN072VdKVUdA+zfmwWgC8bN7BnFxl/2MMXXl+8GUUgBCKvZN5ht1wFPPzpIywqwAFW5J2w= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703208262; c=relaxed/simple; bh=B1wLhA/0wUOe6MzZFXvxmoZnTLFk0NgXZxQSKzr4xbY=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=coDA/4HmAmvRSq5D2sme56IwNlqNpSeH60NUtGUMRfFiwQ8+sPBS6DTjIFmQzAWVTjyhObjiWtinezIgUhpKdHsZJsEG/i1HZs01NIxWat6cfChEqqDJCC/C3SqNZh+qmgXOoWAyVYbNh5PxJE8d54RYUWC45dCq3FxEtCE9/j0= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by smtp.gentoo.org (Postfix, from userid 559) id AC185342F94; Fri, 22 Dec 2023 01:24:18 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 11/15] sim: mips: fix -Wshadow=local warnings Date: Thu, 21 Dec 2023 20:23:51 -0500 Message-ID: <20231222012355.7504-11-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, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 Delete redundant decls when the existing scope has the same var and type available for use. --- sim/mips/interp.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sim/mips/interp.c b/sim/mips/interp.c index 708e27f6b2b7..b15b228600c2 100644 --- a/sim/mips/interp.c +++ b/sim/mips/interp.c @@ -184,7 +184,7 @@ mips_option_handler (SIM_DESC sd, sim_cpu *cpu, int opt, char *arg, etc.). */ for (cpu_nr = 0; cpu_nr < MAX_NR_PROCESSORS; cpu_nr++) { - sim_cpu *cpu = STATE_CPU (sd, cpu_nr); + cpu = STATE_CPU (sd, cpu_nr); if (arg == NULL) STATE |= simTRACE; else if (strcmp (arg, "yes") == 0) @@ -448,8 +448,6 @@ sim_open (SIM_OPEN_KIND kind, host_callback *cb, else if (board != NULL && (strcmp(board, BOARD_BSP) == 0)) { - int i; - STATE_ENVIRONMENT (sd) = OPERATING_ENVIRONMENT; /* ROM: 0x9FC0_0000 - 0x9FFF_FFFF and 0xBFC0_0000 - 0xBFFF_FFFF */ @@ -481,7 +479,6 @@ sim_open (SIM_OPEN_KIND kind, host_callback *cb, strcmp(board, BOARD_JMR3904_DEBUG) == 0)) { /* match VIRTUAL memory layout of JMR-TX3904 board */ - int i; /* --- disable monitor unless forced on by user --- */ @@ -805,7 +802,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *cb, /* CPU specific initialization. */ for (i = 0; i < MAX_NR_PROCESSORS; ++i) { - SIM_CPU *cpu = STATE_CPU (sd, i); + cpu = STATE_CPU (sd, i); CPU_REG_FETCH (cpu) = mips_reg_fetch; CPU_REG_STORE (cpu) = mips_reg_store; From patchwork Fri Dec 22 01:23:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 82722 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 1219A3858296 for ; Fri, 22 Dec 2023 01:24:53 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id 1AFB43858408 for ; Fri, 22 Dec 2023 01:24:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1AFB43858408 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 1AFB43858408 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.211.166.183 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703208263; cv=none; b=Ei0bue/WODuouht8KGfb9FM7S6F924EjbimloQXb+G2D4rGhaDoqwaUrAH+0X0T+VmhjIkGMShS2JY0NQEmStv9U7VzYHzLrsXvLNL/++wD9yDmoocxQ8NdRrI9e1vYGdFGdPPCIP1gwxM3NOR662lhljvVy0Tu/pr02SkUHeFs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703208263; c=relaxed/simple; bh=k8MsMudkNZGlpUhSwOraa4wdNUSbRU5o/SLVGiJnnRw=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=HBs7/ihf72Pa/JcXwpQOR00hGwe3/QoDxi6K7k/kUcjq6CEMo8kmchdoOEDrJ0I4Cb4QHb7O2WawaFv0F7syqn7caHY+eWbrCD8FsOpOwUG2WBrp9s2gMzi8/o5tVqa0TTPfvDkwCNRnTbzEcqBU/QUCRcqnDKV8/YKPpT2YdKM= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by smtp.gentoo.org (Postfix, from userid 559) id BD053342FF7; Fri, 22 Dec 2023 01:24:20 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 12/15] sim: ppc: fix -Wshadow=local warnings Date: Thu, 21 Dec 2023 20:23:52 -0500 Message-ID: <20231222012355.7504-12-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, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 Use a local name in the macro to avoid shadowing wherever it's used. --- sim/ppc/debug.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sim/ppc/debug.h b/sim/ppc/debug.h index 08ea5795fd89..28e42c7bb753 100644 --- a/sim/ppc/debug.h +++ b/sim/ppc/debug.h @@ -125,14 +125,14 @@ do { \ #define DITRACE(OBJECT, ARGS) \ do { \ if (WITH_TRACE) { \ - device *me = device_instance_device(instance); \ - int trace_device = device_trace(me); \ + device *_me = device_instance_device(instance); \ + int trace_device = device_trace(_me); \ if (ppc_trace[trace_devices] \ || ppc_trace[trace_##OBJECT##_device] \ || trace_device) { \ sim_io_printf_filtered("%s:%d:%s:%s%s ", \ filter_filename(__FILE__), __LINE__, #OBJECT, \ - trace_device ? device_path(me) : "", \ + trace_device ? device_path(_me) : "", \ trace_device ? ":" : ""); \ sim_io_printf_filtered ARGS; \ } \ From patchwork Fri Dec 22 01:23:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 82725 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 36AE2384DEE6 for ; Fri, 22 Dec 2023 01:25:08 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id 22FCD3857739 for ; Fri, 22 Dec 2023 01:24:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 22FCD3857739 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 22FCD3857739 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.211.166.183 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703208264; cv=none; b=nFVYxUp7zMBbjs5UCztJR1rjq86EK3TmkbKglqeo5FC3J+uQqJSCQHZQ5Xs0j8swEgkzimm4Expb8oObnLZc0YmjNpxX6cAImJaRoPcQTYJfp7kXDTSnCTk6c0THnS7XgzEKxpVUNlREgsllYLhhZQVNN7KJF7kiKbig1Abz0K0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703208264; c=relaxed/simple; bh=VdylB8SsIhfYQJ+w5qCL+06gkcqMVUp2ni7wjG5qS+0=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=ccOqsFiqSk7tgJhJFanHvXk6pKcR9D0avXJGxaCO1ADD2vpaN75oo6Z5E570Zt09uTC4RzXqmOsIMar9S8ifjBVR85XVcqqBgQbICpYxqQIDtHz7/ms5pEw93WC1Z2qvU894MFetnR7K0DjcYk8zvteFJ0qHppo0y0vLZ9/QL7s= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by smtp.gentoo.org (Postfix, from userid 559) id C595A342FF8; Fri, 22 Dec 2023 01:24:22 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 13/15] sim: riscv: fix -Wshadow=local warnings Date: Thu, 21 Dec 2023 20:23:53 -0500 Message-ID: <20231222012355.7504-13-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, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 Inline the one usage of sd in these macros to avoid possible shadowing. --- sim/riscv/sim-main.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sim/riscv/sim-main.c b/sim/riscv/sim-main.c index 4d2053453950..b04d12c0de1c 100644 --- a/sim/riscv/sim-main.c +++ b/sim/riscv/sim-main.c @@ -48,10 +48,9 @@ static const struct riscv_opcode *riscv_hash[OP_MASK_OP + 1]; do { \ if (RISCV_XLEN (cpu) != 32) \ { \ - SIM_DESC sd = CPU_STATE (cpu); \ TRACE_INSN (cpu, "RV32I-only " fmt, ## args); \ - sim_engine_halt (sd, cpu, NULL, sim_pc_get (cpu), sim_signalled, \ - SIM_SIGILL); \ + sim_engine_halt (CPU_STATE (cpu), cpu, NULL, sim_pc_get (cpu), \ + sim_signalled, SIM_SIGILL); \ } \ } while (0) @@ -59,10 +58,9 @@ static const struct riscv_opcode *riscv_hash[OP_MASK_OP + 1]; do { \ if (RISCV_XLEN (cpu) != 64) \ { \ - SIM_DESC sd = CPU_STATE (cpu); \ TRACE_INSN (cpu, "RV64I-only " fmt, ## args); \ - sim_engine_halt (sd, cpu, NULL, sim_pc_get (cpu), sim_signalled, \ - SIM_SIGILL); \ + sim_engine_halt (CPU_STATE (cpu), cpu, NULL, sim_pc_get (cpu), \ + sim_signalled, SIM_SIGILL); \ } \ } while (0) From patchwork Fri Dec 22 01:23:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 82727 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 A289B3865C1D for ; Fri, 22 Dec 2023 01:25:22 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 379213860C2B for ; Fri, 22 Dec 2023 01:24:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 379213860C2B 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 379213860C2B 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=1703208266; cv=none; b=n3rbA98mMrAplFGaRufqvKumNkvE3gO7iKbuLQHafI/OgU4yU6oWwkFmE4FivaFbfbMb2TAKitUAUziXFCK4E0ycQNHH1khYSPIU0wiILMFHbm94dspVxACM9H018X3J7v3OakiJWUR/1oRS/fmaN1BpH7ApLdwNmScOv+Tyv80= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703208266; c=relaxed/simple; bh=eaxcZSxL6HlnOqyc40fbxPI6gUAKIkz/F7ovIBOGel0=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=jNvON/tCm3XFC7nQ/ioico7pfiomUl16I4hGjOLkoR46TWmBYqlVVTGpYjK3Aj/rPZ6Ggov3x0q4QUd6T2I1mJ+d4cQ1AmmjltyRQVoDtvu7tSoTB/PhNrcZbfFXAFjif/Y70ASPHyrOifa8aIgClznfHkIGkrS8IIeucGPnCLE= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by smtp.gentoo.org (Postfix, from userid 559) id D9079342FF8; Fri, 22 Dec 2023 01:24:24 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 14/15] sim: sh: fix -Wshadow=local warnings Date: Thu, 21 Dec 2023 20:23:54 -0500 Message-ID: <20231222012355.7504-14-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 the var to avoid shadowing & clobbering the higher context. --- sim/sh/interp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sim/sh/interp.c b/sim/sh/interp.c index 01d7a1c7be91..bbf26bb11893 100644 --- a/sim/sh/interp.c +++ b/sim/sh/interp.c @@ -1046,8 +1046,8 @@ trap (SIM_DESC sd, int i, int *regs, unsigned char *insn_ptr, if (regs[5] < countargv (prog_argv)) { /* Include the termination byte. */ - int i = strlen (prog_argv[regs[5]]) + 1; - regs[0] = sim_write (0, regs[6], prog_argv[regs[5]], i); + int len = strlen (prog_argv[regs[5]]) + 1; + regs[0] = sim_write (0, regs[6], prog_argv[regs[5]], len); } else regs[0] = -1; From patchwork Fri Dec 22 01:23:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 82724 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 8F158384CB8E for ; Fri, 22 Dec 2023 01:24:59 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 50762385840C for ; Fri, 22 Dec 2023 01:24:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 50762385840C 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 50762385840C 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=1703208268; cv=none; b=k0upemqRyuy70tr2s3xu6QE16i4ETyM8OsV41Fhk+ZOFJwYnpjCjJPO01WGNkJ08cV4AQLzpmJSzJB1XocBOfmgXzgAzoyfN56HUSwtexyGN+qc7dtfVXOigCz1IBrofHy+SkLo+6BpBjvSo6EYcKx1uTWKAW8CJWCSg/IPnB3M= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703208268; c=relaxed/simple; bh=a/R1C0ysdXIy9bEcrDyAxk1gnf3vc2ntTpYwycvFonM=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=jWPLr7nlNz+RfMTsUVMg2Sh1tGrr0B/OLWAsduywxu3eIdAnE0wfvr1PZUR78bLSX+wdYzwdTSLpNh4F/knMLttxEDg9rLylUWWUlzeZp3fC5FVj7RMwqfc6X3oxila5cuyix6r+dY+bU7lmYX4wG5TXDrCMOtPcR/3YoOane4E= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by smtp.gentoo.org (Postfix, from userid 559) id EBE5A342FF8; Fri, 22 Dec 2023 01:24:26 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 15/15] sim: warnings: enable -Wshadow=local Date: Thu, 21 Dec 2023 20:23:55 -0500 Message-ID: <20231222012355.7504-15-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 This brings us in sync with current set of gdb warnings (for C). --- sim/configure | 1 + sim/m4/sim_ac_option_warnings.m4 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sim/m4/sim_ac_option_warnings.m4 b/sim/m4/sim_ac_option_warnings.m4 index faa7198a29b2..dca507076f55 100644 --- a/sim/m4/sim_ac_option_warnings.m4 +++ b/sim/m4/sim_ac_option_warnings.m4 @@ -46,7 +46,7 @@ dnl C++ -Wno-mismatched-tags dnl C++ -Wsuggest-override -Wimplicit-fallthrough=5 -Wduplicated-cond -dnl -Wshadow=local +-Wshadow=local dnl C++ -Wdeprecated-copy dnl C++ -Wdeprecated-copy-dtor dnl C++ -Wredundant-move