ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/pci-host/astro: Avoid aborting on access failure 

Instead of stopping the emulation, report a MEMTX_DECODE_ERROR if the OS
tries to access non-existent registers.

Signed-off-by: Helge Deller <deller@gmx.de>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Helge Deller 2024-02-02 21:05:56 +01:00
parent dbca083513
commit b7174d9ad3
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hw/pci-host/astro.c
View File

@ -122,10 +122,6 @@ static MemTxResult elroy_chip_read_with_attrs(void *opaque, hwaddr addr,
case 0x0800: /* IOSAPIC_REG_SELECT */ case 0x0800: /* IOSAPIC_REG_SELECT */
val = s->iosapic_reg_select; val = s->iosapic_reg_select;
break; break;
case 0x0808:
val = UINT64_MAX; /* XXX: tbc. */
g_assert_not_reached();
break;
case 0x0810: /* IOSAPIC_REG_WINDOW */ case 0x0810: /* IOSAPIC_REG_WINDOW */
switch (s->iosapic_reg_select) { switch (s->iosapic_reg_select) {
case 0x01: /* IOSAPIC_REG_VERSION */ case 0x01: /* IOSAPIC_REG_VERSION */
@ -135,15 +131,15 @@ static MemTxResult elroy_chip_read_with_attrs(void *opaque, hwaddr addr,
if (s->iosapic_reg_select < ARRAY_SIZE(s->iosapic_reg)) { if (s->iosapic_reg_select < ARRAY_SIZE(s->iosapic_reg)) {
val = s->iosapic_reg[s->iosapic_reg_select]; val = s->iosapic_reg[s->iosapic_reg_select];
} else { } else {
trace_iosapic_reg_read(s->iosapic_reg_select, size, val); val = 0;
g_assert_not_reached(); ret = MEMTX_DECODE_ERROR;
} }
} }
trace_iosapic_reg_read(s->iosapic_reg_select, size, val); trace_iosapic_reg_read(s->iosapic_reg_select, size, val);
break; break;
default: default:
trace_elroy_read(addr, size, val); val = 0;
g_assert_not_reached(); ret = MEMTX_DECODE_ERROR;
} }
trace_elroy_read(addr, size, val); trace_elroy_read(addr, size, val);
@ -191,7 +187,7 @@ static MemTxResult elroy_chip_write_with_attrs(void *opaque, hwaddr addr,
if (s->iosapic_reg_select < ARRAY_SIZE(s->iosapic_reg)) { if (s->iosapic_reg_select < ARRAY_SIZE(s->iosapic_reg)) {
s->iosapic_reg[s->iosapic_reg_select] = val; s->iosapic_reg[s->iosapic_reg_select] = val;
} else { } else {
g_assert_not_reached(); return MEMTX_DECODE_ERROR;
} }
break; break;
case 0x0840: /* IOSAPIC_REG_EOI */ case 0x0840: /* IOSAPIC_REG_EOI */
@ -204,7 +200,7 @@ static MemTxResult elroy_chip_write_with_attrs(void *opaque, hwaddr addr,
} }
break; break;
default: default:
g_assert_not_reached(); return MEMTX_DECODE_ERROR;
} }
return MEMTX_OK; return MEMTX_OK;
} }
@ -594,8 +590,8 @@ static MemTxResult astro_chip_read_with_attrs(void *opaque, hwaddr addr,
#undef EMPTY_PORT #undef EMPTY_PORT
default: default:
trace_astro_chip_read(addr, size, val); val = 0;
g_assert_not_reached(); ret = MEMTX_DECODE_ERROR;
} }
/* for 32-bit accesses mask return value */ /* for 32-bit accesses mask return value */
@ -610,6 +606,7 @@ static MemTxResult astro_chip_write_with_attrs(void *opaque, hwaddr addr,
uint64_t val, unsigned size, uint64_t val, unsigned size,
MemTxAttrs attrs) MemTxAttrs attrs)
{ {
MemTxResult ret = MEMTX_OK;
AstroState *s = opaque; AstroState *s = opaque;
trace_astro_chip_write(addr, size, val); trace_astro_chip_write(addr, size, val);
@ -686,11 +683,9 @@ static MemTxResult astro_chip_write_with_attrs(void *opaque, hwaddr addr,
#undef EMPTY_PORT #undef EMPTY_PORT
default: default:
/* Controlled by astro_chip_mem_valid above. */ ret = MEMTX_DECODE_ERROR;
trace_astro_chip_write(addr, size, val);
g_assert_not_reached();
} }
return MEMTX_OK; return ret;
} }
static const MemoryRegionOps astro_chip_ops = { static const MemoryRegionOps astro_chip_ops = {