Commit e63a2d4d authored by Sergey Fedorov's avatar Sergey Fedorov Committed by Peter Maydell
Browse files

target-arm: Fix GDB breakpoint handling



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: default avatarSergey Fedorov <serge.fdrv@gmail.com>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 81669b8b
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -897,6 +897,12 @@ void arm_debug_excp_handler(CPUState *cs)
            }
        }
    } else {
        uint64_t pc = is_a64(env) ? env->pc : env->regs[15];

        if (cpu_breakpoint_test(cs, pc, BP_GDB)) {
            return;
        }

        if (check_breakpoints(cpu)) {
            bool same_el = (arm_debug_target_el(env) == arm_current_el(env));
            if (extended_addresses_enabled(env)) {