diff options
| author | Edgar E. Iglesias <edgar.iglesias@xilinx.com> | 2014-08-04 14:41:54 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-08-04 14:41:54 +0100 |
| commit | 98ea5615ab24b21991d68b61bc91427fab273817 (patch) | |
| tree | b5171d2494b5bc82ba313f94dab4c93a4b39c41d | |
| parent | 9208b9617f18b56ba4eb32928ae8f6439ba38a24 (diff) | |
| download | focaccia-qemu-98ea5615ab24b21991d68b61bc91427fab273817.tar.gz focaccia-qemu-98ea5615ab24b21991d68b61bc91427fab273817.zip | |
target-arm: A64: Respect SPSEL in ERET SP restore
Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> Reviewed-by: Greg Bellows <greg.bellows@linaro.org> Message-id: 1402994746-8328-3-git-send-email-edgar.iglesias@gmail.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | target-arm/op_helper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c index 90a946a0fd..25ad902e04 100644 --- a/target-arm/op_helper.c +++ b/target-arm/op_helper.c @@ -410,7 +410,7 @@ void HELPER(exception_return)(CPUARMState *env) } env->aarch64 = 1; pstate_write(env, spsr); - env->xregs[31] = env->sp_el[new_el]; + aarch64_restore_sp(env, new_el); env->pc = env->elr_el[cur_el]; } |