aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Fedorov <serge.fdrv@gmail.com>2015-10-13 12:56:27 +0300
committerPeter Maydell <peter.maydell@linaro.org>2015-10-16 14:48:56 +0100
commite63a2d4d9ed73e33a0b7483085808048be8bbcb1 (patch)
tree1caa80587b00510501fba285a7190c98fbc8a356
parent81669b8b81eb450d7b89ee5fdd57bdb73d87022d (diff)
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: Sergey Fedorov <serge.fdrv@gmail.com> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--target-arm/op_helper.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c
index 1425a1d4bb..67b18c09c3 100644
--- a/target-arm/op_helper.c
+++ b/target-arm/op_helper.c
@@ -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)) {