motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-11 03:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

target-arm: A64: Generalize update_spsel for the various ELs

Browse source 
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Message-id: 1400980132-25949-21-git-send-email-edgar.iglesias@gmail.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Edgar E. Iglesias 2014-05-27 17:09:54 +01:00 • committed by Peter Maydell
parent db6c3cd0e7
commit 61d4b215d1
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
target-arm/internals.h
View file

@ -107,6 +107,7 @@ int arm_rmode_to_sf(int rmode);
static inline void update_spsel(CPUARMState *env, uint32_t imm) 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 /* Update PSTATE SPSel bit; this requires us to update the
* working stack pointer in xregs[31]. * 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); env->pstate = deposit32(env->pstate, 0, 1, imm);
/* EL0 has no access rights to update SPSel, and this code /* We rely on illegal updates to SPsel from EL0 to get trapped
* assumes we are updating SP for EL1 while running as EL1. * at translation time.
*/ */
assert(arm_current_pl(env) == 1); assert(cur_el >= 1 && cur_el <= 3);
if (env->pstate & PSTATE_SP) { if (env->pstate & PSTATE_SP) {
/* Switch from using SP_EL0 to using SP_ELx */ /* Switch from using SP_EL0 to using SP_ELx */
env->sp_el[0] = env->xregs[31]; env->sp_el[0] = env->xregs[31];
env->xregs[31] = env->sp_el[1]; env->xregs[31] = env->sp_el[cur_el];
} else { } else {
/* Switch from SP_EL0 to SP_ELx */ /* 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]; env->xregs[31] = env->sp_el[0];
} }
} }