From patchwork Sun Jan 21 22:52:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mark Wielaard X-Patchwork-Id: 84530 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 12704385E449 for ; Sun, 21 Jan 2024 22:53:18 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from gnu.wildebeest.org (gnu.wildebeest.org [45.83.234.184]) by sourceware.org (Postfix) with ESMTPS id D68983858D3C for ; Sun, 21 Jan 2024 22:52:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D68983858D3C Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=klomp.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=klomp.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D68983858D3C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=45.83.234.184 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705877576; cv=none; b=QzHZ4ZpNO6zQeLjLMt2wonzW23ZMKU6DBRBsggxioNnyjz3ghOZfYvm5NvDgCJ570VQicy6WXPZvYFMl+3+roMD4+urtFBEPxu/3vvKN8hYKO6KidQC1g1NKPspVhmH9dj0/9/bCYjb3+9KSNo+vF8g6VfDpVbp3Q/MDY0bAasA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705877576; c=relaxed/simple; bh=vPdXY8dzf15GXg31dx6hyts3PpFkYy8ZlvGLmA56HBs=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=MNQ0m9CtU30kmLrnDBGFCgL8/S1roRhPsKxCLf1iBNYdQMG+FlB/YJEJkAPWmqYgEoAlf0rJ1iRRxHRIhmxnk+QDQd43q3E7tmBGDqN88OkEiFQ/bJhaa083pu4LMpFsHEVmE1DeEewOmAmlQenlsG566m7MmRc8nEaBkUn7ZZk= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from csb.redhat.com (deer0x03.wildebeest.org [172.31.17.133]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id CE177302BBEA; Sun, 21 Jan 2024 23:52:52 +0100 (CET) Received: by csb.redhat.com (Postfix, from userid 10916) id AE1F0CEF2C; Sun, 21 Jan 2024 23:52:52 +0100 (CET) From: Mark Wielaard To: gdb-patches@sourceware.org Cc: Mark Wielaard Subject: [PATCH] sim: Fix cc -Werror=shadow=local in cr16/simops.c Date: Sun, 21 Jan 2024 23:52:50 +0100 Message-Id: <20240121225250.574864-1-mark@klomp.org> X-Mailer: git-send-email 2.39.3 MIME-Version: 1.0 X-Spam-Status: No, score=-9.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_NONE, 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 include/opcode/cr16.h defines cc as an enum value, which causes GCC 14 to warn sim/cr16/simops.c: In function ‘cond_stat’: sim/cr16/simops.c:138:26: error: declaration of ‘cc’ shadows a previous local [-Werror=shadow=local] 138 | static int cond_stat(int cc) | ~~~~^~ In file included from ../../binutils-gdb/sim/cr16/cr16-sim.h:26, from ../../binutils-gdb/sim/cr16/simops.c:39: sim/../include/opcode/cr16.h:149:3: note: shadowed declaration is here 149 | cc, | ^~ Fix this by renaming cc in cr16/simops.c to cond. --- sim/cr16/simops.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sim/cr16/simops.c b/sim/cr16/simops.c index b09284bf818..e56e5338dff 100644 --- a/sim/cr16/simops.c +++ b/sim/cr16/simops.c @@ -135,9 +135,9 @@ enum { * LT Less Than Z and N flags are 0 * GE Greater Than or Equal To Z or N flag is 1. */ -static int cond_stat(int cc) +static int cond_stat(int cond) { - switch (cc) + switch (cond) { case 0: return PSR_Z; break; case 1: return !PSR_Z; break; @@ -983,9 +983,9 @@ OP_14A_14 (SIM_DESC sd, SIM_CPU *cpu) void OP_1_4 (SIM_DESC sd, SIM_CPU *cpu) { - uint32_t tmp = 0, cc = cond_stat (OP[0]); + uint32_t tmp = 0, cond = cond_stat (OP[0]); trace_input ("b", OP_CONSTANT4, OP_DISPE9, OP_VOID); - if (cc) + if (cond) { if (sign_flag) tmp = (PC - (OP[1])); @@ -1010,9 +1010,9 @@ OP_1_4 (SIM_DESC sd, SIM_CPU *cpu) void OP_18_8 (SIM_DESC sd, SIM_CPU *cpu) { - uint32_t tmp = 0, cc = cond_stat (OP[0]); + uint32_t tmp = 0, cond = cond_stat (OP[0]); trace_input ("b", OP_CONSTANT4, OP_DISP17, OP_VOID); - if (cc) + if (cond) { if (sign_flag) tmp = (PC - OP[1]); @@ -1037,9 +1037,9 @@ OP_18_8 (SIM_DESC sd, SIM_CPU *cpu) void OP_10_10 (SIM_DESC sd, SIM_CPU *cpu) { - uint32_t tmp = 0, cc = cond_stat (OP[0]); + uint32_t tmp = 0, cond = cond_stat (OP[0]); trace_input ("b", OP_CONSTANT4, OP_DISP25, OP_VOID); - if (cc) + if (cond) { if (sign_flag) tmp = (PC - (OP[1]));