From patchwork Mon Jan 22 12:05:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mark Wielaard X-Patchwork-Id: 84548 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 C415F385840C for ; Mon, 22 Jan 2024 12:06:16 +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 2C76E3858D3C for ; Mon, 22 Jan 2024 12:05:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2C76E3858D3C 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 2C76E3858D3C 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=1705925151; cv=none; b=hBdKyrR0GbnpaTH3fOBPTN1E1E6GAGWATTKui0R5up0l4d9x0EBnkuFyrVgNjBePhwN32f1fh7tLNPb048Cf2qt1HXk1GjJ1rqx95x0GmgdmON6v8IneanKpSwuIhL/tmXMGqnphnoaDO5whLT0XvbKWcErdMdGt3b98aotdIxU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705925151; c=relaxed/simple; bh=Hz1KYSgAaQ5zpOjhrKM9jevMggWZP7qcpF9KorTvHgU=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=A0ZOYkEoY+3Oj55Y6SltD3y1BKIDNtCtYmgtP9CXFTljGMcMlCKVcjAhG8CLY/q1baiI5KR7y5W1KZWmr0u5kY4qtMukHlHpa42ApLqpIcUJQQEkUk0VSI1ZCVT9X4lW7JQPjvLmn2/wFKYqAV7HgEXwHRd6nxcdhHq7kmK1Bf0= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from r6.localdomain (82-217-174-174.cable.dynamic.v4.ziggo.nl [82.217.174.174]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id D19CE302BBEA; Mon, 22 Jan 2024 13:05:46 +0100 (CET) Received: by r6.localdomain (Postfix, from userid 1000) id 95D943404C3; Mon, 22 Jan 2024 13:05:46 +0100 (CET) From: Mark Wielaard To: gdb-patches@sourceware.org Cc: Mike Frysinger , Mark Wielaard Subject: [PATCH] sim: Fix -Werror=shadow=local by changing mem to addr in sim_{read, write} Date: Mon, 22 Jan 2024 13:05:25 +0100 Message-ID: <20240122120534.232865-1-mark@klomp.org> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, KAM_SHORT, RCVD_IN_BARRACUDACENTRAL, 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 m32c/cpu.h defines mem as enum value, which causes GCC 14 to emit sim/m32c/gdb-if.c: In function ‘sim_read’: sim/m32c/gdb-if.c:162:33: error: declaration of ‘mem’ shadows a previous local [-Werror=shadow=local] 162 | sim_read (SIM_DESC sd, uint64_t mem, void *buf, uint64_t length) | ~~~~~~~~~^~~ In file included from ../../binutils-gdb/sim/m32c/gdb-if.c:38: sim/m32c/cpu.h:83:3: note: shadowed declaration is here 83 | mem, | ^~~ Fix this by renaming mem to addr in all sim_read and sim_write functions. Most already used addr instead of mem. In one file, sim/rx/gdb-if.c, this also meant renaming the local addr variable to vma. --- sim/common/sim-hrw.c | 8 ++++---- sim/erc32/interf.c | 8 ++++---- sim/m32c/gdb-if.c | 10 +++++----- sim/ppc/sim_calls.c | 16 ++++++++-------- sim/rl78/gdb-if.c | 20 ++++++++++---------- sim/rx/gdb-if.c | 18 +++++++++--------- 6 files changed, 40 insertions(+), 40 deletions(-) diff --git a/sim/common/sim-hrw.c b/sim/common/sim-hrw.c index 757b826cc63..582d391ae1a 100644 --- a/sim/common/sim-hrw.c +++ b/sim/common/sim-hrw.c @@ -27,17 +27,17 @@ along with this program. If not, see . */ modeling real hardware */ uint64_t -sim_read (SIM_DESC sd, uint64_t mem, void *buffer, uint64_t length) +sim_read (SIM_DESC sd, uint64_t addr, void *buffer, uint64_t length) { SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER); return sim_core_read_buffer (sd, NULL, read_map, - buffer, mem, length); + buffer, addr, length); } uint64_t -sim_write (SIM_DESC sd, uint64_t mem, const void *buffer, uint64_t length) +sim_write (SIM_DESC sd, uint64_t addr, const void *buffer, uint64_t length) { SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER); return sim_core_write_buffer (sd, NULL, write_map, - buffer, mem, length); + buffer, addr, length); } diff --git a/sim/erc32/interf.c b/sim/erc32/interf.c index 1f2660771f8..98b8a65b944 100644 --- a/sim/erc32/interf.c +++ b/sim/erc32/interf.c @@ -330,25 +330,25 @@ sim_fetch_register(SIM_DESC sd, int regno, void *buf, int length) } uint64_t -sim_write (SIM_DESC sd, uint64_t mem, const void *buffer, uint64_t length) +sim_write (SIM_DESC sd, uint64_t addr, const void *buffer, uint64_t length) { int i; const unsigned char *data = buffer; for (i = 0; i < length; i++) { - sis_memory_write ((mem + i) ^ EBT, &data[i], 1); + sis_memory_write ((addr + i) ^ EBT, &data[i], 1); } return length; } uint64_t -sim_read (SIM_DESC sd, uint64_t mem, void *buffer, uint64_t length) +sim_read (SIM_DESC sd, uint64_t addr, void *buffer, uint64_t length) { int i; unsigned char *data = buffer; for (i = 0; i < length; i++) { - sis_memory_read ((mem + i) ^ EBT, &data[i], 1); + sis_memory_read ((addr + i) ^ EBT, &data[i], 1); } return length; } diff --git a/sim/m32c/gdb-if.c b/sim/m32c/gdb-if.c index a1a96b450f3..bf8424e65df 100644 --- a/sim/m32c/gdb-if.c +++ b/sim/m32c/gdb-if.c @@ -159,24 +159,24 @@ sim_create_inferior (SIM_DESC sd, struct bfd * abfd, } uint64_t -sim_read (SIM_DESC sd, uint64_t mem, void *buf, uint64_t length) +sim_read (SIM_DESC sd, uint64_t addr, void *buf, uint64_t length) { check_desc (sd); - if (mem == 0) + if (addr == 0) return 0; - mem_get_blk ((int) mem, buf, length); + mem_get_blk ((int) addr, buf, length); return length; } uint64_t -sim_write (SIM_DESC sd, uint64_t mem, const void *buf, uint64_t length) +sim_write (SIM_DESC sd, uint64_t addr, const void *buf, uint64_t length) { check_desc (sd); - mem_put_blk ((int) mem, buf, length); + mem_put_blk ((int) addr, buf, length); return length; } diff --git a/sim/ppc/sim_calls.c b/sim/ppc/sim_calls.c index 13e39a6e07b..dc177e45c7a 100644 --- a/sim/ppc/sim_calls.c +++ b/sim/ppc/sim_calls.c @@ -125,26 +125,26 @@ sim_load (SIM_DESC sd, const char *prog, bfd *abfd, int from_tty) uint64_t -sim_read (SIM_DESC sd, uint64_t mem, void *buf, uint64_t length) +sim_read (SIM_DESC sd, uint64_t addr, void *buf, uint64_t length) { int result = psim_read_memory(simulator, MAX_NR_PROCESSORS, - buf, mem, length); + buf, addr, length); TRACE(trace_gdb, - ("sim_read(mem=0x%" PRIx64 ", buf=%p, length=%" PRIx64 ") = %d\n", - mem, buf, length, result)); + ("sim_read(addr=0x%" PRIx64 ", buf=%p, length=%" PRIx64 ") = %d\n", + addr, buf, length, result)); return result; } uint64_t -sim_write (SIM_DESC sd, uint64_t mem, const void *buf, uint64_t length) +sim_write (SIM_DESC sd, uint64_t addr, const void *buf, uint64_t length) { int result = psim_write_memory(simulator, MAX_NR_PROCESSORS, - buf, mem, length, + buf, addr, length, 1/*violate_ro*/); TRACE(trace_gdb, - ("sim_write(mem=0x%" PRIx64 ", buf=%p, length=%" PRIx64 ") = %d\n", - mem, buf, length, result)); + ("sim_write(addr=0x%" PRIx64 ", buf=%p, length=%" PRIx64 ") = %d\n", + addr, buf, length, result)); return result; } diff --git a/sim/rl78/gdb-if.c b/sim/rl78/gdb-if.c index b85302b40a0..6c0a70beb19 100644 --- a/sim/rl78/gdb-if.c +++ b/sim/rl78/gdb-if.c @@ -205,32 +205,32 @@ sim_create_inferior (SIM_DESC sd, struct bfd *abfd, /* Read memory. */ uint64_t -sim_read (SIM_DESC sd, uint64_t mem, void *buf, uint64_t length) +sim_read (SIM_DESC sd, uint64_t addr, void *buf, uint64_t length) { check_desc (sd); - if (mem >= MEM_SIZE) + if (addr >= MEM_SIZE) return 0; - else if (mem + length > MEM_SIZE) - length = MEM_SIZE - mem; + else if (addr + length > MEM_SIZE) + length = MEM_SIZE - addr; - mem_get_blk (mem, buf, length); + mem_get_blk (addr, buf, length); return length; } /* Write memory. */ uint64_t -sim_write (SIM_DESC sd, uint64_t mem, const void *buf, uint64_t length) +sim_write (SIM_DESC sd, uint64_t addr, const void *buf, uint64_t length) { check_desc (sd); - if (mem >= MEM_SIZE) + if (addr >= MEM_SIZE) return 0; - else if (mem + length > MEM_SIZE) - length = MEM_SIZE - mem; + else if (addr + length > MEM_SIZE) + length = MEM_SIZE - addr; - mem_put_blk (mem, buf, length); + mem_put_blk (addr, buf, length); return length; } diff --git a/sim/rx/gdb-if.c b/sim/rx/gdb-if.c index 6b616b7612a..0fc626d9e9c 100644 --- a/sim/rx/gdb-if.c +++ b/sim/rx/gdb-if.c @@ -227,23 +227,23 @@ sim_create_inferior (SIM_DESC sd, struct bfd *abfd, } uint64_t -sim_read (SIM_DESC sd, uint64_t mem, void *buffer, uint64_t length) +sim_read (SIM_DESC sd, uint64_t addr, void *buffer, uint64_t length) { int i; unsigned char *data = buffer; check_desc (sd); - if (mem == 0) + if (addr == 0) return 0; execution_error_clear_last_error (); for (i = 0; i < length; i++) { - bfd_vma addr = mem + i; - int do_swap = addr_in_swap_list (addr); - data[i] = mem_get_qi (addr ^ (do_swap ? 3 : 0)); + bfd_vma vma = addr + i; + int do_swap = addr_in_swap_list (vma); + data[i] = mem_get_qi (vma ^ (do_swap ? 3 : 0)); if (execution_error_get_last_error () != SIM_ERR_NONE) return i; @@ -253,7 +253,7 @@ sim_read (SIM_DESC sd, uint64_t mem, void *buffer, uint64_t length) } uint64_t -sim_write (SIM_DESC sd, uint64_t mem, const void *buffer, uint64_t length) +sim_write (SIM_DESC sd, uint64_t addr, const void *buffer, uint64_t length) { int i; const unsigned char *data = buffer; @@ -264,9 +264,9 @@ sim_write (SIM_DESC sd, uint64_t mem, const void *buffer, uint64_t length) for (i = 0; i < length; i++) { - bfd_vma addr = mem + i; - int do_swap = addr_in_swap_list (addr); - mem_put_qi (addr ^ (do_swap ? 3 : 0), data[i]); + bfd_vma vma = addr + i; + int do_swap = addr_in_swap_list (vma); + mem_put_qi (vma ^ (do_swap ? 3 : 0), data[i]); if (execution_error_get_last_error () != SIM_ERR_NONE) return i;