| Message ID | 20210818010041.337010-5-richard.henderson@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | target/arm: Fix insn exception priorities | expand |
On Wed, 18 Aug 2021 at 02:01, Richard Henderson <richard.henderson@linaro.org> wrote: > > Both single-step and pc alignment faults have priority over > breakpoint exceptions. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > target/arm/debug_helper.c | 23 +++++++++++++++++++++++ > 1 file changed, 23 insertions(+) > + > + /* > + * PC alignment faults have priority over breakpoint exceptions. > + */ > + pc = is_a64(env) ? env->pc : env->regs[15]; > + if ((is_a64(env) || !env->thumb) && (pc & 3) != 0) { > + return false; > + } Other than the obvious adjustment if we need to handle env->thumb && (pc & 1) Reviewed-by: Peter Maydell <peter.maydell@linaro.org> thanks -- PMM
diff --git a/target/arm/debug_helper.c b/target/arm/debug_helper.c index 2983e36dd3..32f3caec23 100644 --- a/target/arm/debug_helper.c +++ b/target/arm/debug_helper.c @@ -220,6 +220,7 @@ bool arm_debug_check_breakpoint(CPUState *cs) { ARMCPU *cpu = ARM_CPU(cs); CPUARMState *env = &cpu->env; + target_ulong pc; int n; /* @@ -231,6 +232,28 @@ bool arm_debug_check_breakpoint(CPUState *cs) return false; } + /* + * Single-step exceptions have priority over breakpoint exceptions. + * If single-step state is active-pending, suppress the bp. + */ + if (arm_singlestep_active(env) && !(env->pstate & PSTATE_SS)) { + return false; + } + + /* + * PC alignment faults have priority over breakpoint exceptions. + */ + pc = is_a64(env) ? env->pc : env->regs[15]; + if ((is_a64(env) || !env->thumb) && (pc & 3) != 0) { + return false; + } + + /* + * Instruction aborts have priority over breakpoint exceptions. + * TODO: We would need to look up the page for PC and verify that + * it is present and executable. + */ + for (n = 0; n < ARRAY_SIZE(env->cpu_breakpoint); n++) { if (bp_wp_matches(cpu, n, false)) { return true;
Both single-step and pc alignment faults have priority over breakpoint exceptions. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- target/arm/debug_helper.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) -- 2.25.1