OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

armv7m: Implement reading and writing of PRIGROUP

Browse Source 
Add a state field for the v7M PRIGROUP register and implent
reading and writing it. The current NVIC doesn't honour
the values written, but the new version will.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
This commit is contained in:
Peter Maydell 2017-02-28 12:08:16 +00:00
parent f797c07507
commit 1004102a77
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/intc/armv7m_nvic.c
View File

@ -24,6 +24,9 @@
typedef struct NVICState { typedef struct NVICState {
GICState gic; GICState gic;
ARMCPU *cpu; ARMCPU *cpu;
uint32_t prigroup;
struct { struct {
uint32_t control; uint32_t control;
uint32_t reload; uint32_t reload;
@ -223,7 +226,7 @@ static uint32_t nvic_readl(NVICState *s, uint32_t offset)
case 0xd08: /* Vector Table Offset. */ case 0xd08: /* Vector Table Offset. */
return cpu->env.v7m.vecbase; return cpu->env.v7m.vecbase;
case 0xd0c: /* Application Interrupt/Reset Control. */ case 0xd0c: /* Application Interrupt/Reset Control. */
return 0xfa050000; return 0xfa050000 | (s->prigroup << 8);
case 0xd10: /* System Control. */ case 0xd10: /* System Control. */
/* TODO: Implement SLEEPONEXIT. */ /* TODO: Implement SLEEPONEXIT. */
return 0; return 0;
@ -362,9 +365,7 @@ static void nvic_writel(NVICState *s, uint32_t offset, uint32_t value)
if (value & 1) { if (value & 1) {
qemu_log_mask(LOG_UNIMP, "AIRCR system reset unimplemented\n"); qemu_log_mask(LOG_UNIMP, "AIRCR system reset unimplemented\n");
} }
if (value & 0x700) { s->prigroup = extract32(value, 8, 3);
qemu_log_mask(LOG_UNIMP, "PRIGROUP unimplemented\n");
}
} }
break; break;
case 0xd10: /* System Control. */ case 0xd10: /* System Control. */
@ -483,13 +484,14 @@ static const MemoryRegionOps nvic_sysreg_ops = {
static const VMStateDescription vmstate_nvic = { static const VMStateDescription vmstate_nvic = {
.name = "armv7m_nvic", .name = "armv7m_nvic",
.version_id = 1, .version_id = 2,
.minimum_version_id = 1, .minimum_version_id = 2,
.fields = (VMStateField[]) { .fields = (VMStateField[]) {
VMSTATE_UINT32(systick.control, NVICState), VMSTATE_UINT32(systick.control, NVICState),
VMSTATE_UINT32(systick.reload, NVICState), VMSTATE_UINT32(systick.reload, NVICState),
VMSTATE_INT64(systick.tick, NVICState), VMSTATE_INT64(systick.tick, NVICState),
VMSTATE_TIMER_PTR(systick.timer, NVICState), VMSTATE_TIMER_PTR(systick.timer, NVICState),
VMSTATE_UINT32(prigroup, NVICState),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
} }
}; };