diff options
Diffstat (limited to 'hw/armv7m.c')
| -rw-r--r-- | hw/armv7m.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/hw/armv7m.c b/hw/armv7m.c index 35f75735b9..854261d940 100644 --- a/hw/armv7m.c +++ b/hw/armv7m.c @@ -151,6 +151,12 @@ static void armv7m_bitband_init(void) } /* Board init. */ + +static void armv7m_reset(void *opaque) +{ + cpu_reset((CPUState *)opaque); +} + /* Init CPU and memory for a v7-M based board. flash_size and sram_size are in kb. Returns the NVIC array. */ @@ -163,7 +169,6 @@ qemu_irq *armv7m_init(int flash_size, int sram_size, /* FIXME: make this local state. */ static qemu_irq pic[64]; qemu_irq *cpu_pic; - uint32_t pc; int image_size; uint64_t entry; uint64_t lowaddr; @@ -201,7 +206,7 @@ qemu_irq *armv7m_init(int flash_size, int sram_size, armv7m_bitband_init(); nvic = qdev_create(NULL, "armv7m_nvic"); - env->v7m.nvic = nvic; + env->nvic = nvic; qdev_init_nofail(nvic); cpu_pic = arm_pic_init_cpu(env); sysbus_connect_irq(sysbus_from_qdev(nvic), 0, cpu_pic[ARM_PIC_CPU_IRQ]); @@ -227,24 +232,13 @@ qemu_irq *armv7m_init(int flash_size, int sram_size, exit(1); } - /* If the image was loaded at address zero then assume it is a - regular ROM image and perform the normal CPU reset sequence. - Otherwise jump directly to the entry point. */ - if (lowaddr == 0) { - env->regs[13] = ldl_phys(0); - pc = ldl_phys(4); - } else { - pc = entry; - } - env->thumb = pc & 1; - env->regs[15] = pc & ~1; - /* Hack to map an additional page of ram at the top of the address space. This stops qemu complaining about executing code outside RAM when returning from an exception. */ cpu_register_physical_memory(0xfffff000, 0x1000, qemu_ram_alloc(0x1000) | IO_MEM_RAM); + qemu_register_reset(armv7m_reset, env); return pic; } |