GDB breakpoints have higher priority so they have to be checked first. Should GDB breakpoint match, just return from the debug exception handler.
Signed-off-by: Sergey Fedorov <serge.f...@gmail.com> --- target-arm/op_helper.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c index 1425a1d..1d4d8cb 100644 --- a/target-arm/op_helper.c +++ b/target-arm/op_helper.c @@ -897,6 +897,15 @@ void arm_debug_excp_handler(CPUState *cs) } } } else { + CPUBreakpoint *bp; + uint64_t pc = is_a64(env) ? env->pc : env->regs[15]; + + QTAILQ_FOREACH(bp, &cs->breakpoints, entry) { + if (bp->pc == pc && !(bp->flags & BP_CPU)) { + return; + } + } + if (check_breakpoints(cpu)) { bool same_el = (arm_debug_target_el(env) == arm_current_el(env)); if (extended_addresses_enabled(env)) { -- 1.9.1