On Wed, 18 Aug 2021 at 02:01, Richard Henderson <richard.hender...@linaro.org> wrote: > > Both single-step and pc alignment faults have priority over > breakpoint exceptions. > > Signed-off-by: Richard Henderson <richard.hender...@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.mayd...@linaro.org> thanks -- PMM