Received: from eggs.gnu.org ([2001:4830:134:3::10]:60401) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VH9eB-0003cw-C4 for qemu-devel@nongnu.org; Wed, 04 Sep 2013 05:45:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VH9e5-0003QG-Jv for qemu-devel@nongnu.org; Wed, 04 Sep 2013 05:45:11 -0400 Received: from ex-e-2.perimeter.fzi.de ([141.21.8.251]:23412) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VH9e5-0003OK-DC for qemu-devel@nongnu.org; Wed, 04 Sep 2013 05:45:05 -0400 From: Sebastian Ottlik Date: Wed, 4 Sep 2013 11:23:15 +0200 Message-ID: <1378286595-27072-1-git-send-email-ottlik@fzi.de> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH] target-arm: fix ARMv7M stack alignment on reset List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Sebastian Ottlik , Paul Brook When the initial SP is loaded from the vector table on ARMv7M systems the two least significant bits are ignored as the stack is always aligned at a four byte boundary (see ARM DDI 0403C, B1.4.1 and B1.5.5). So far QEMU did not ignore these bits leading to a stack alignment inconsitent with real hardware for binaries that rely on this behaviour. This patch fixes this issue by masking the two least significant bits when loading the SP. Signed-off-by: Sebastian Ottlik --- target-arm/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target-arm/cpu.c b/target-arm/cpu.c index b2556c6..e689fde 100644 --- a/target-arm/cpu.c +++ b/target-arm/cpu.c @@ -108,7 +108,7 @@ static void arm_cpu_reset(CPUState *s) modified flash and reset itself. However images loaded via -kernel have not been copied yet, so load the values directly from there. */ - env->regs[13] = ldl_p(rom); + env->regs[13] = ldl_p(rom) & 0xFFFFFFFC; pc = ldl_p(rom + 4); env->thumb = pc & 1; env->regs[15] = pc & ~1; -- 1.7.9.5