aboutsummaryrefslogtreecommitdiff
path: root/sim/m32c/gdb-if.c
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/m32c/gdb-if.c
parentc2625a463ffd8c0d10b85b65e80ab8b67b28e441 (diff)
downloadbinutils-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 'sim/m32c/gdb-if.c')
-rw-r--r--sim/m32c/gdb-if.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sim/m32c/gdb-if.c b/sim/m32c/gdb-if.c
index a1a96b4..bf8424e 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;
}