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;