mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-05 00:33:55 -06:00
target/arm: Take an exception if PC is misaligned
For A64, any input to an indirect branch can cause this. For A32, many indirect branch paths force the branch to be aligned, but BXWritePC does not. This includes the BX instruction but also other interworking changes to PC. Prior to v8, this case is UNDEFINED. With v8, this is CONSTRAINED UNPREDICTABLE and may either raise an exception or force align the PC. We choose to raise an exception because we have the infrastructure, it makes the generated code for gen_bx simpler, and it has the possibility of catching more guest bugs. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
936a6b8603
commit
ee03027a2c
6 changed files with 87 additions and 20 deletions
|
@ -14753,6 +14753,7 @@ static void aarch64_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu)
|
|||
uint64_t pc = s->base.pc_next;
|
||||
uint32_t insn;
|
||||
|
||||
/* Singlestep exceptions have the highest priority. */
|
||||
if (s->ss_active && !s->pstate_ss) {
|
||||
/* Singlestep state is Active-pending.
|
||||
* If we're in this state at the start of a TB then either
|
||||
|
@ -14771,6 +14772,20 @@ static void aarch64_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu)
|
|||
return;
|
||||
}
|
||||
|
||||
if (pc & 3) {
|
||||
/*
|
||||
* PC alignment fault. This has priority over the instruction abort
|
||||
* that we would receive from a translation fault via arm_ldl_code.
|
||||
* This should only be possible after an indirect branch, at the
|
||||
* start of the TB.
|
||||
*/
|
||||
assert(s->base.num_insns == 1);
|
||||
gen_helper_exception_pc_alignment(cpu_env, tcg_constant_tl(pc));
|
||||
s->base.is_jmp = DISAS_NORETURN;
|
||||
s->base.pc_next = QEMU_ALIGN_UP(pc, 4);
|
||||
return;
|
||||
}
|
||||
|
||||
s->pc_curr = pc;
|
||||
insn = arm_ldl_code(env, &s->base, pc, s->sctlr_b);
|
||||
s->insn = insn;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue