Skip to content

Commit

Permalink
sim: Fix -Werror=shadow=local by changing mem to addr in sim_{read,wr…
Browse files Browse the repository at this point in the history 
…ite}

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.
  • Loading branch information
Mark Wielaard committed Jan 22, 2024
1 parent c2625a4 commit cbbcd7f
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 42 deletions.
4 changes: 2 additions & 2 deletions include/sim/sim.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
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
memory. Store bytes starting at virtual address MEM. Result is
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
Expand Down
8 changes: 4 additions & 4 deletions sim/common/sim-hrw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
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);
}
8 changes: 4 additions & 4 deletions sim/erc32/interf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
10 changes: 5 additions & 5 deletions sim/m32c/gdb-if.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
16 changes: 8 additions & 8 deletions sim/ppc/sim_calls.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
20 changes: 10 additions & 10 deletions sim/rl78/gdb-if.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
18 changes: 9 additions & 9 deletions sim/rx/gdb-if.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit cbbcd7f

Please sign in to comment.