diff mbox

[v1,02/16] target-arm: A64: Respect SPSEL in ERET SP restore

Message ID 1401434911-26992-3-git-send-email-edgar.iglesias@gmail.com
State New
Headers show

Commit Message

Edgar E. Iglesias May 30, 2014, 7:28 a.m. UTC 
From: "Edgar E. Iglesias" <edgar.iglesias@xilinx.com>

Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
---
 target-arm/op_helper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Alex Bennée June 2, 2014, 9:52 a.m. UTC | #1 
Edgar E. Iglesias writes:

> From: "Edgar E. Iglesias" <edgar.iglesias@xilinx.com>
>
> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
> ---
>  target-arm/op_helper.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c
> index 2e2429a..581dc09 100644
> --- a/target-arm/op_helper.c
> +++ b/target-arm/op_helper.c
> @@ -425,7 +425,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];
>      }

It might be worth putting the Aarch64 ARM reference next to the aarch64_
functions to make it easier to find in future.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
diff mbox

Patch

diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c
index 2e2429a..581dc09 100644
--- a/target-arm/op_helper.c
+++ b/target-arm/op_helper.c
@@ -425,7 +425,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];
     }