aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé <f4bug@amsat.org>2020-05-26 11:40:51 +0200
committerThomas Huth <huth@tuxfamily.org>2020-05-30 09:16:28 +0200
commitccff1ae4df08ad79d055ad255fd578786f17a313 (patch)
treefb25e9779ba9226f42638a5074e71409b82038b2 /hw
parentc86274bc2e34295764fb44c2aef3cf29623f9b4b (diff)
downloadqemu-ccff1ae4df08ad79d055ad255fd578786f17a313.zip
qemu-ccff1ae4df08ad79d055ad255fd578786f17a313.tar.gz
qemu-ccff1ae4df08ad79d055ad255fd578786f17a313.tar.bz2
hw/m68k/mcf5206: Reduce m5206_mbar_read/write() offset arg to 16-bit
All calls to m5206_mbar_read/m5206_mbar_write are used with 'offset = hwaddr & 0x3ff', so we are sure the offset fits in 16-bit. Suggested-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-Id: <20200526094052.1723-2-f4bug@amsat.org> Signed-off-by: Thomas Huth <huth@tuxfamily.org>
Diffstat (limited to 'hw')
-rw-r--r--hw/m68k/mcf5206.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/m68k/mcf5206.c b/hw/m68k/mcf5206.c
index b155dd8..187291e 100644
--- a/hw/m68k/mcf5206.c
+++ b/hw/m68k/mcf5206.c
@@ -273,7 +273,7 @@ static void m5206_mbar_reset(m5206_mbar_state *s)
}
static uint64_t m5206_mbar_read(m5206_mbar_state *s,
- uint64_t offset, unsigned size)
+ uint16_t offset, unsigned size)
{
if (offset >= 0x100 && offset < 0x120) {
return m5206_timer_read(s->timer[0], offset - 0x100);
@@ -306,11 +306,11 @@ static uint64_t m5206_mbar_read(m5206_mbar_state *s,
case 0x170: return s->uivr[0];
case 0x1b0: return s->uivr[1];
}
- hw_error("Bad MBAR read offset 0x%x", (int)offset);
+ hw_error("Bad MBAR read offset 0x%"PRIx16, offset);
return 0;
}
-static void m5206_mbar_write(m5206_mbar_state *s, uint32_t offset,
+static void m5206_mbar_write(m5206_mbar_state *s, uint16_t offset,
uint64_t value, unsigned size)
{
if (offset >= 0x100 && offset < 0x120) {
@@ -360,7 +360,7 @@ static void m5206_mbar_write(m5206_mbar_state *s, uint32_t offset,
s->uivr[1] = value;
break;
default:
- hw_error("Bad MBAR write offset 0x%x", (int)offset);
+ hw_error("Bad MBAR write offset 0x%"PRIx16, offset);
break;
}
}