diff options
| author | Mark Wielaard <mark@klomp.org> | 2024-01-22 12:58:11 +0100 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2024-01-22 14:22:30 +0100 |
| commit | cbbcd7fd1075b7fb158586507cce3be19051b26f (patch) | |
| tree | d94b8e2edf8275fd6903209910f80571ff2d5ef2 /include | |
| parent | c2625a463ffd8c0d10b85b65e80ab8b67b28e441 (diff) | |
| download | binutils-cbbcd7fd1075b7fb158586507cce3be19051b26f.zip binutils-cbbcd7fd1075b7fb158586507cce3be19051b26f.tar.gz binutils-cbbcd7fd1075b7fb158586507cce3be19051b26f.tar.bz2 | |
sim: Fix -Werror=shadow=local by changing mem to addr in sim_{read,write}
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.
Diffstat (limited to 'include')
| -rw-r--r-- | include/sim/sim.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/sim/sim.h b/include/sim/sim.h index 251a1d4..5dfb28b 100644 --- a/include/sim/sim.h +++ b/include/sim/sim.h @@ -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 |