ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target-arm: Store SPSR_EL1 state in banked_spsr[1] (SPSR_svc) 

The AArch64 SPSR_EL1 register is architecturally mandated to
be mapped to the AArch32 SPSR_svc register. This means its
state should live in QEMU's env->banked_spsr[1] field.
Correct the various places in the code that incorrectly
put it in banked_spsr[0].

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2015-04-01 17:57:29 +01:00
parent 4de9a883be
commit 7847f9ea9f
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target-arm/helper-a64.c
View File

@ -523,7 +523,7 @@ void aarch64_cpu_do_interrupt(CPUState *cs)
aarch64_save_sp(env, arm_current_el(env)); aarch64_save_sp(env, arm_current_el(env));
env->elr_el[new_el] = env->pc; env->elr_el[new_el] = env->pc;
} else { } else {
env->banked_spsr[0] = cpsr_read(env); env->banked_spsr[aarch64_banked_spsr_index(new_el)] = cpsr_read(env);
if (!env->thumb) { if (!env->thumb) {
env->cp15.esr_el[new_el] |= 1 << 25; env->cp15.esr_el[new_el] |= 1 << 25;
} }

2
target-arm/helper.c
View File

@ -2438,7 +2438,7 @@ static const ARMCPRegInfo v8_cp_reginfo[] = {
{ .name = "SPSR_EL1", .state = ARM_CP_STATE_AA64, { .name = "SPSR_EL1", .state = ARM_CP_STATE_AA64,
.type = ARM_CP_ALIAS, .type = ARM_CP_ALIAS,
.opc0 = 3, .opc1 = 0, .crn = 4, .crm = 0, .opc2 = 0, .opc0 = 3, .opc1 = 0, .crn = 4, .crm = 0, .opc2 = 0,
.access = PL1_RW, .fieldoffset = offsetof(CPUARMState, banked_spsr[0]) }, .access = PL1_RW, .fieldoffset = offsetof(CPUARMState, banked_spsr[1]) },
/* We rely on the access checks not allowing the guest to write to the /* We rely on the access checks not allowing the guest to write to the
* state field when SPSel indicates that it's being used as the stack * state field when SPSel indicates that it's being used as the stack
* pointer. * pointer.

5
target-arm/internals.h
View File

@ -82,11 +82,14 @@ static inline void arm_log_exception(int idx)
/* /*
* For AArch64, map a given EL to an index in the banked_spsr array. * For AArch64, map a given EL to an index in the banked_spsr array.
* Note that this mapping and the AArch32 mapping defined in bank_number()
* must agree such that the AArch64<->AArch32 SPSRs have the architecturally
* mandated mapping between each other.
*/ */
static inline unsigned int aarch64_banked_spsr_index(unsigned int el) static inline unsigned int aarch64_banked_spsr_index(unsigned int el)
{ {
static const unsigned int map[4] = { static const unsigned int map[4] = {
[1] = 0, /* EL1. */ [1] = 1, /* EL1. */
[2] = 6, /* EL2. */ [2] = 6, /* EL2. */
[3] = 7, /* EL3. */ [3] = 7, /* EL3. */
}; };