mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/m68k/mcf5206: Reduce m5206_mbar_read/write() offset arg to 16-bit

Browse Source 
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>
This commit is contained in:
Philippe Mathieu-Daudé 2020-05-26 11:40:51 +02:00 committed by Thomas Huth
parent c86274bc2e
commit ccff1ae4df
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/m68k/mcf5206.c
View File

@ -273,7 +273,7 @@ static void m5206_mbar_reset(m5206_mbar_state *s)
} }
static uint64_t m5206_mbar_read(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) { if (offset >= 0x100 && offset < 0x120) {
return m5206_timer_read(s->timer[0], offset - 0x100); 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 0x170: return s->uivr[0];
case 0x1b0: return s->uivr[1]; 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; 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) uint64_t value, unsigned size)
{ {
if (offset >= 0x100 && offset < 0x120) { 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; s->uivr[1] = value;
break; break;
default: default:
hw_error("Bad MBAR write offset 0x%x", (int)offset); hw_error("Bad MBAR write offset 0x%"PRIx16, offset);
break; break;
} }
} }