Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-12-26 01:07:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

sim: Fix -Werror=shadow=local by changing mem to addr in sim_{read,write}

Browse Source 
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.
This commit is contained in:
Mark Wielaard
2024-01-22 12:58:11 +01:00
parent c2625a463f
commit cbbcd7fd10
7 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/sim/sim.h
View File

@@ -160,14 +160,14 @@ SIM_RC sim_create_inferior (SIM_DESC sd, struct bfd *abfd,
at virtual address MEM and store in BUF. Result is number of bytes at virtual address MEM and store in BUF. Result is number of bytes
read, or zero if error. */ read, or zero if error. */
uint64_t sim_read (SIM_DESC sd, uint64_t mem, void *buf, uint64_t length); uint64_t sim_read (SIM_DESC sd, uint64_t addr, void *buf, uint64_t length);
/* Store LENGTH bytes from BUF into the simulated program's /* Store LENGTH bytes from BUF into the simulated program's
memory. Store bytes starting at virtual address MEM. Result is memory. Store bytes starting at virtual address MEM. Result is
number of bytes write, or zero if error. */ number of bytes write, or zero if error. */
uint64_t sim_write (SIM_DESC sd, uint64_t mem, const void *buf, uint64_t length); uint64_t sim_write (SIM_DESC sd, uint64_t addr, const void *buf, uint64_t length);
/* Fetch register REGNO storing its raw (target endian) value in the /* Fetch register REGNO storing its raw (target endian) value in the

8
sim/common/sim-hrw.c
View File

@@ -27,17 +27,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
modeling real hardware */ modeling real hardware */
uint64_t 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); SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
return sim_core_read_buffer (sd, NULL, read_map, return sim_core_read_buffer (sd, NULL, read_map,
buffer, mem, length); buffer, addr, length);
} }
uint64_t 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); SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
return sim_core_write_buffer (sd, NULL, write_map, return sim_core_write_buffer (sd, NULL, write_map,
buffer, mem, length); buffer, addr, length);
} }

8
sim/erc32/interf.c
View File

@@ -330,25 +330,25 @@ sim_fetch_register(SIM_DESC sd, int regno, void *buf, int length)
} }
uint64_t 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; int i;
const unsigned char *data = buffer; const unsigned char *data = buffer;
for (i = 0; i < length; i++) { 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; return length;
} }
uint64_t 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; int i;
unsigned char *data = buffer; unsigned char *data = buffer;
for (i = 0; i < length; i++) { 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; return length;
} }

10
sim/m32c/gdb-if.c
View File

@@ -159,24 +159,24 @@ sim_create_inferior (SIM_DESC sd, struct bfd * abfd,
} }
uint64_t 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); check_desc (sd);
if (mem == 0) if (addr == 0)
return 0; return 0;
mem_get_blk ((int) mem, buf, length); mem_get_blk ((int) addr, buf, length);
return length; return length;
} }
uint64_t 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); check_desc (sd);
mem_put_blk ((int) mem, buf, length); mem_put_blk ((int) addr, buf, length);
return length; return length;
} }

16
sim/ppc/sim_calls.c
View File

@@ -125,26 +125,26 @@ sim_load (SIM_DESC sd, const char *prog, bfd *abfd, int from_tty)
uint64_t 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, int result = psim_read_memory(simulator, MAX_NR_PROCESSORS,
buf, mem, length); buf, addr, length);
TRACE(trace_gdb, TRACE(trace_gdb,
("sim_read(mem=0x%" PRIx64 ", buf=%p, length=%" PRIx64 ") = %d\n", ("sim_read(addr=0x%" PRIx64 ", buf=%p, length=%" PRIx64 ") = %d\n",
mem, buf, length, result)); addr, buf, length, result));
return result; return result;
} }
uint64_t 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, int result = psim_write_memory(simulator, MAX_NR_PROCESSORS,
buf, mem, length, buf, addr, length,
1/*violate_ro*/); 1/*violate_ro*/);
TRACE(trace_gdb, TRACE(trace_gdb,
("sim_write(mem=0x%" PRIx64 ", buf=%p, length=%" PRIx64 ") = %d\n", ("sim_write(addr=0x%" PRIx64 ", buf=%p, length=%" PRIx64 ") = %d\n",
mem, buf, length, result)); addr, buf, length, result));
return result; return result;
} }

20
sim/rl78/gdb-if.c
View File

@@ -205,32 +205,32 @@ sim_create_inferior (SIM_DESC sd, struct bfd *abfd,
/* Read memory. */ /* Read memory. */
uint64_t 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); check_desc (sd);
if (mem >= MEM_SIZE) if (addr >= MEM_SIZE)
return 0; return 0;
else if (mem + length > MEM_SIZE) else if (addr + length > MEM_SIZE)
length = MEM_SIZE - mem; length = MEM_SIZE - addr;
mem_get_blk (mem, buf, length); mem_get_blk (addr, buf, length);
return length; return length;
} }
/* Write memory. */ /* Write memory. */
uint64_t 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); check_desc (sd);
if (mem >= MEM_SIZE) if (addr >= MEM_SIZE)
return 0; return 0;
else if (mem + length > MEM_SIZE) else if (addr + length > MEM_SIZE)
length = MEM_SIZE - mem; length = MEM_SIZE - addr;
mem_put_blk (mem, buf, length); mem_put_blk (addr, buf, length);
return length; return length;
} }

18
sim/rx/gdb-if.c
View File

@@ -227,23 +227,23 @@ sim_create_inferior (SIM_DESC sd, struct bfd *abfd,
} }
uint64_t 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; int i;
unsigned char *data = buffer; unsigned char *data = buffer;
check_desc (sd); check_desc (sd);
if (mem == 0) if (addr == 0)
return 0; return 0;
execution_error_clear_last_error (); execution_error_clear_last_error ();
for (i = 0; i < length; i++) for (i = 0; i < length; i++)
{ {
bfd_vma addr = mem + i; bfd_vma vma = addr + i;
int do_swap = addr_in_swap_list (addr); int do_swap = addr_in_swap_list (vma);
data[i] = mem_get_qi (addr ^ (do_swap ? 3 : 0)); data[i] = mem_get_qi (vma ^ (do_swap ? 3 : 0));
if (execution_error_get_last_error () != SIM_ERR_NONE) if (execution_error_get_last_error () != SIM_ERR_NONE)
return i; return i;
@@ -253,7 +253,7 @@ sim_read (SIM_DESC sd, uint64_t mem, void *buffer, uint64_t length)
} }
uint64_t 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; int i;
const unsigned char *data = buffer; 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++) for (i = 0; i < length; i++)
{ {
bfd_vma addr = mem + i; bfd_vma vma = addr + i;
int do_swap = addr_in_swap_list (addr); int do_swap = addr_in_swap_list (vma);
mem_put_qi (addr ^ (do_swap ? 3 : 0), data[i]); mem_put_qi (vma ^ (do_swap ? 3 : 0), data[i]);
if (execution_error_get_last_error () != SIM_ERR_NONE) if (execution_error_get_last_error () != SIM_ERR_NONE)
return i; return i;