aboutsummaryrefslogtreecommitdiff
path: root/sim/common
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2024-01-22 12:58:11 +0100
committerMark Wielaard <mark@klomp.org>2024-01-22 14:22:30 +0100
commitcbbcd7fd1075b7fb158586507cce3be19051b26f (patch)
treed94b8e2edf8275fd6903209910f80571ff2d5ef2 /sim/common
parentc2625a463ffd8c0d10b85b65e80ab8b67b28e441 (diff)
downloadgdb-cbbcd7fd1075b7fb158586507cce3be19051b26f.zip
gdb-cbbcd7fd1075b7fb158586507cce3be19051b26f.tar.gz
gdb-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 'sim/common')
-rw-r--r--sim/common/sim-hrw.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sim/common/sim-hrw.c b/sim/common/sim-hrw.c
index 757b826c..582d391 100644
--- a/sim/common/sim-hrw.c
+++ b/sim/common/sim-hrw.c
@@ -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);
}