From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37420) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XbVVy-0008SC-4A for qemu-devel@nongnu.org; Tue, 07 Oct 2014 10:13:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XbVVp-00012D-1q for qemu-devel@nongnu.org; Tue, 07 Oct 2014 10:13:22 -0400 Received: from mail-pa0-x234.google.com ([2607:f8b0:400e:c03::234]:44852) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XbVVo-0000zV-Oe for qemu-devel@nongnu.org; Tue, 07 Oct 2014 10:13:12 -0400 Received: by mail-pa0-f52.google.com with SMTP id fb1so7289552pad.39 for ; Tue, 07 Oct 2014 07:13:11 -0700 (PDT) From: Alistair Francis Date: Wed, 8 Oct 2014 00:13:06 +1000 Message-Id: In-Reply-To: References: Subject: [Qemu-devel] [Patch v4 6/8] target_arm: Change the reset values based on the ELF entry List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, peter.crosthwaite@xilinx.com, konstanty@ieee.org, martin.galvan@tallertechnologies.com The Netduino 2 machine won't run unless the reset_pc is based on the ELF entry point. Signed-off-by: Alistair Francis Signed-off-by: Peter Crosthwaite --- V2: - Malloc straight away, thanks to Peter C hw/arm/armv7m.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c index 7169027..07b36e2 100644 --- a/hw/arm/armv7m.c +++ b/hw/arm/armv7m.c @@ -155,11 +155,19 @@ static void armv7m_bitband_init(void) /* Board init. */ +typedef struct ARMV7MResetArgs { + ARMCPU *cpu; + uint32_t reset_pc; +} ARMV7MResetArgs; + static void armv7m_reset(void *opaque) { - ARMCPU *cpu = opaque; + ARMV7MResetArgs *args = opaque; + + cpu_reset(CPU(args->cpu)); - cpu_reset(CPU(cpu)); + args->cpu->env.thumb = args->reset_pc & 1; + args->cpu->env.regs[15] = args->reset_pc & ~1; } /* Init CPU and memory for a v7-M based board. @@ -180,6 +188,7 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory, int mem_size, int num_irq, int i; int big_endian; MemoryRegion *hack = g_new(MemoryRegion, 1); + ARMV7MResetArgs *reset_args = g_new0(ARMV7MResetArgs, 1); if (cpu_model == NULL) { cpu_model = "cortex-m3"; @@ -234,7 +243,11 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory, int mem_size, int num_irq, vmstate_register_ram_global(hack); memory_region_add_subregion(system_memory, 0xfffff000, hack); - qemu_register_reset(armv7m_reset, cpu); + *reset_args = (ARMV7MResetArgs) { + .cpu = cpu, + .reset_pc = entry, + }; + qemu_register_reset(armv7m_reset, reset_args); return pic; } -- 1.9.1