diff options
| author | Sebastian Ottlik <ottlik@fzi.de> | 2013-09-10 19:09:32 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2013-09-10 19:09:32 +0100 |
| commit | f62cafd4c87fad7bb9b9544b4cf4991d34764b11 (patch) | |
| tree | a334a34281af602744fff638a5e3a0e9b7280ed0 | |
| parent | 78dbbbe4dff95369c63bf77ee0df23371e1d6602 (diff) | |
| download | qemu-f62cafd4c87fad7bb9b9544b4cf4991d34764b11.tar.gz qemu-f62cafd4c87fad7bb9b9544b4cf4991d34764b11.tar.bz2 qemu-f62cafd4c87fad7bb9b9544b4cf4991d34764b11.zip | |
target-arm: fix ARMv7M stack alignment on reset
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 <ottlik@fzi.de>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1378286595-27072-1-git-send-email-ottlik@fzi.de
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | target-arm/cpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target-arm/cpu.c b/target-arm/cpu.c index 827e28ee4d..09206b5971 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; |