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

target-arm: A64: Introduce aarch64_banked_spsr_index() 

Add aarch64_banked_spsr_index(), used to map an Exception Level
to an index in the banked_spsr array.

Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Message-id: 1400980132-25949-13-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:52 +01:00 committed by Peter Maydell
parent 28c9457df0
commit 2a923c4dde
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -488,7 +488,7 @@ void aarch64_cpu_do_interrupt(CPUState *cs)
} }
if (is_a64(env)) { if (is_a64(env)) {
env->banked_spsr[0] = pstate_read(env); env->banked_spsr[aarch64_banked_spsr_index(1)] = pstate_read(env);
env->sp_el[arm_current_pl(env)] = env->xregs[31]; env->sp_el[arm_current_pl(env)] = env->xregs[31];
env->xregs[31] = env->sp_el[1]; env->xregs[31] = env->sp_el[1];
env->elr_el[1] = env->pc; env->elr_el[1] = env->pc;

14
target-arm/internals.h
View File

@ -75,6 +75,20 @@ static inline void arm_log_exception(int idx)
*/ */
#define GTIMER_SCALE 16 #define GTIMER_SCALE 16
/*
* For AArch64, map a given EL to an index in the banked_spsr array.
*/
static inline unsigned int aarch64_banked_spsr_index(unsigned int el)
{
static const unsigned int map[4] = {
[1] = 0, /* EL1. */
[2] = 6, /* EL2. */
[3] = 7, /* EL3. */
};
assert(el >= 1 && el <= 3);
return map[el];
}
int bank_number(int mode); int bank_number(int mode);
void switch_mode(CPUARMState *, int); void switch_mode(CPUARMState *, int);
void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu); void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu);

3
target-arm/op_helper.c
View File

@ -386,7 +386,8 @@ void HELPER(msr_i_pstate)(CPUARMState *env, uint32_t op, uint32_t imm)
void HELPER(exception_return)(CPUARMState *env) void HELPER(exception_return)(CPUARMState *env)
{ {
uint32_t spsr = env->banked_spsr[0]; unsigned int spsr_idx = aarch64_banked_spsr_index(1);
uint32_t spsr = env->banked_spsr[spsr_idx];
int new_el, i; int new_el, i;
if (env->pstate & PSTATE_SP) { if (env->pstate & PSTATE_SP) {