target/arm: adjust program counter for wfi exception in AArch32
The wfi instruction can be configured to be trapped by a higher exception level, such as the EL2 hypervisor. When the instruction is trapped, the program counter should contain the address of the wfi instruction that caused the exception. The program counter is adjusted for this in the wfi op helper function. However, this correction is done to env->pc, which only applies to AArch64 mode. For AArch32, the program counter is stored in env->regs[15]. This adds an if-else statement to modify the correct program counter location based on the the current CPU mode. Signed-off-by: Jeff Kubascik <jeff.kubascik@dornerworks.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
f03965490e
commit
855532912b
|
@ -295,7 +295,12 @@ void HELPER(wfi)(CPUARMState *env, uint32_t insn_len)
|
|||
}
|
||||
|
||||
if (target_el) {
|
||||
env->pc -= insn_len;
|
||||
if (env->aarch64) {
|
||||
env->pc -= insn_len;
|
||||
} else {
|
||||
env->regs[15] -= insn_len;
|
||||
}
|
||||
|
||||
raise_exception(env, EXCP_UDEF, syn_wfx(1, 0xe, 0, insn_len == 2),
|
||||
target_el);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue