[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 18/21] target-arm: A64: Generalize update_spsel f
From: |
Edgar E. Iglesias |
Subject: |
[Qemu-devel] [PATCH v4 18/21] target-arm: A64: Generalize update_spsel for the various ELs |
Date: |
Fri, 23 May 2014 10:42:15 +1000 |
From: "Edgar E. Iglesias" <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Edgar E. Iglesias <address@hidden>
---
target-arm/internals.h | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/target-arm/internals.h b/target-arm/internals.h
index c9897c2..564b5fa 100644
--- a/target-arm/internals.h
+++ b/target-arm/internals.h
@@ -107,6 +107,7 @@ int arm_rmode_to_sf(int rmode);
static inline void update_spsel(CPUARMState *env, uint32_t imm)
{
+ unsigned int cur_el = arm_current_pl(env);
/* Update PSTATE SPSel bit; this requires us to update the
* working stack pointer in xregs[31].
*/
@@ -115,17 +116,17 @@ static inline void update_spsel(CPUARMState *env,
uint32_t imm)
}
env->pstate = deposit32(env->pstate, 0, 1, imm);
- /* EL0 has no access rights to update SPSel, and this code
- * assumes we are updating SP for EL1 while running as EL1.
+ /* We rely on illegal updates to SPsel from EL0 to get trapped
+ * at translation time.
*/
- assert(arm_current_pl(env) == 1);
+ assert(cur_el >= 1 && cur_el <= 3);
if (env->pstate & PSTATE_SP) {
/* Switch from using SP_EL0 to using SP_ELx */
env->sp_el[0] = env->xregs[31];
- env->xregs[31] = env->sp_el[1];
+ env->xregs[31] = env->sp_el[cur_el];
} else {
/* Switch from SP_EL0 to SP_ELx */
- env->sp_el[1] = env->xregs[31];
+ env->sp_el[cur_el] = env->xregs[31];
env->xregs[31] = env->sp_el[0];
}
}
--
1.8.3.2
- [Qemu-devel] [PATCH v4 08/21] target-arm: A64: Add ELR entries for EL2 and 3, (continued)
- [Qemu-devel] [PATCH v4 08/21] target-arm: A64: Add ELR entries for EL2 and 3, Edgar E. Iglesias, 2014/05/22
- [Qemu-devel] [PATCH v4 09/21] target-arm: Add SPSR entries for EL2/HYP and EL3/MON, Edgar E. Iglesias, 2014/05/22
- [Qemu-devel] [PATCH v4 10/21] target-arm: A64: Introduce aarch64_banked_spsr_index(), Edgar E. Iglesias, 2014/05/22
- [Qemu-devel] [PATCH v4 12/21] target-arm: Add a feature flag for EL3, Edgar E. Iglesias, 2014/05/22
- [Qemu-devel] [PATCH v4 13/21] target-arm: Register EL2 versions of ELR and SPSR, Edgar E. Iglesias, 2014/05/22
- [Qemu-devel] [PATCH v4 11/21] target-arm: Add a feature flag for EL2, Edgar E. Iglesias, 2014/05/22
- [Qemu-devel] [PATCH v4 14/21] target-arm: Register EL3 versions of ELR and SPSR, Edgar E. Iglesias, 2014/05/22
- [Qemu-devel] [PATCH v4 15/21] target-arm: A64: Forbid ERET to higher or unimplemented ELs, Edgar E. Iglesias, 2014/05/22
- [Qemu-devel] [PATCH v4 16/21] target-arm: A64: Trap ERET from EL0 at translation time, Edgar E. Iglesias, 2014/05/22
- [Qemu-devel] [PATCH v4 17/21] target-arm: A64: Generalize ERET to various ELs, Edgar E. Iglesias, 2014/05/22
- [Qemu-devel] [PATCH v4 18/21] target-arm: A64: Generalize update_spsel for the various ELs,
Edgar E. Iglesias <=
- [Qemu-devel] [PATCH v4 19/21] target-arm: Make vbar_write writeback to any CPREG, Edgar E. Iglesias, 2014/05/22
- [Qemu-devel] [PATCH v4 20/21] target-arm: A64: Register VBAR_EL2, Edgar E. Iglesias, 2014/05/22
- [Qemu-devel] [PATCH v4 21/21] target-arm: A64: Register VBAR_EL3, Edgar E. Iglesias, 2014/05/22
- Re: [Qemu-devel] [PATCH v4 00/21] target-arm: Preparations for A64 EL2 and 3, Peter Maydell, 2014/05/23