target/arm: Assert thumb pc is aligned
Misaligned thumb PC is architecturally impossible. Assert is better than proceeding, in case we've missed something somewhere. Expand a comment about aligning the pc in gdbstub. Fail an incoming migrate if a thumb pc is misaligned. Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
ee03027a2c
commit
7055fe4baf
|
@ -77,8 +77,13 @@ int arm_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)
|
||||||
|
|
||||||
tmp = ldl_p(mem_buf);
|
tmp = ldl_p(mem_buf);
|
||||||
|
|
||||||
/* Mask out low bit of PC to workaround gdb bugs. This will probably
|
/*
|
||||||
cause problems if we ever implement the Jazelle DBX extensions. */
|
* Mask out low bits of PC to workaround gdb bugs.
|
||||||
|
* This avoids an assert in thumb_tr_translate_insn, because it is
|
||||||
|
* architecturally impossible to misalign the pc.
|
||||||
|
* This will probably cause problems if we ever implement the
|
||||||
|
* Jazelle DBX extensions.
|
||||||
|
*/
|
||||||
if (n == 15) {
|
if (n == 15) {
|
||||||
tmp &= ~1;
|
tmp &= ~1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -794,6 +794,16 @@ static int cpu_post_load(void *opaque, int version_id)
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Misaligned thumb pc is architecturally impossible.
|
||||||
|
* We have an assert in thumb_tr_translate_insn to verify this.
|
||||||
|
* Fail an incoming migrate to avoid this assert.
|
||||||
|
*/
|
||||||
|
if (!is_a64(env) && env->thumb && (env->regs[15] & 1)) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
if (!kvm_enabled()) {
|
if (!kvm_enabled()) {
|
||||||
pmu_op_finish(&cpu->env);
|
pmu_op_finish(&cpu->env);
|
||||||
}
|
}
|
||||||
|
|
|
@ -9646,6 +9646,9 @@ static void thumb_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu)
|
||||||
uint32_t insn;
|
uint32_t insn;
|
||||||
bool is_16bit;
|
bool is_16bit;
|
||||||
|
|
||||||
|
/* Misaligned thumb PC is architecturally impossible. */
|
||||||
|
assert((dc->base.pc_next & 1) == 0);
|
||||||
|
|
||||||
if (arm_check_ss_active(dc) || arm_check_kernelpage(dc)) {
|
if (arm_check_ss_active(dc) || arm_check_kernelpage(dc)) {
|
||||||
dc->base.pc_next = pc + 2;
|
dc->base.pc_next = pc + 2;
|
||||||
return;
|
return;
|
||||||
|
|
Loading…
Reference in New Issue