[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/7] target-arm: Fix gdb singlestep handling in arm_d
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 1/7] target-arm: Fix gdb singlestep handling in arm_debug_excp_handler() |
Date: |
Tue, 10 Nov 2015 13:51:41 +0000 |
From: Sergey Fedorov <address@hidden>
Do not raise a CPU exception if no CPU breakpoint has fired, since
singlestep is also done by generating a debug internal exception. This
fixes a bug with singlestepping in gdbstub.
Signed-off-by: Sergey Fedorov <address@hidden>
Message-id: address@hidden
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
---
target-arm/op_helper.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c
index b5db345..6cd54c8 100644
--- a/target-arm/op_helper.c
+++ b/target-arm/op_helper.c
@@ -917,7 +917,13 @@ void arm_debug_excp_handler(CPUState *cs)
uint64_t pc = is_a64(env) ? env->pc : env->regs[15];
bool same_el = (arm_debug_target_el(env) == arm_current_el(env));
- if (cpu_breakpoint_test(cs, pc, BP_GDB)) {
+ /* (1) GDB breakpoints should be handled first.
+ * (2) Do not raise a CPU exception if no CPU breakpoint has fired,
+ * since singlestep is also done by generating a debug internal
+ * exception.
+ */
+ if (cpu_breakpoint_test(cs, pc, BP_GDB)
+ || !cpu_breakpoint_test(cs, pc, BP_CPU)) {
return;
}
--
1.9.1
- [Qemu-devel] [PULL 0/7] target-arm queue, Peter Maydell, 2015/11/10
- [Qemu-devel] [PULL 1/7] target-arm: Fix gdb singlestep handling in arm_debug_excp_handler(),
Peter Maydell <=
- [Qemu-devel] [PULL 7/7] target-arm: Clean up DISAS_UPDATE usage in AArch32 translation code, Peter Maydell, 2015/11/10
- [Qemu-devel] [PULL 3/7] arm: boot: Add secure_board_setup flag, Peter Maydell, 2015/11/10
- [Qemu-devel] [PULL 5/7] arm: highbank: Implement PSCI and dummy monitor, Peter Maydell, 2015/11/10
- [Qemu-devel] [PULL 6/7] hw/arm/virt: error_report cleanups, Peter Maydell, 2015/11/10
- [Qemu-devel] [PULL 4/7] arm: highbank: Defeature CPU override, Peter Maydell, 2015/11/10
- [Qemu-devel] [PULL 2/7] hw/intc/arm_gic: Remove the definition of NUM_CPU, Peter Maydell, 2015/11/10
- Re: [Qemu-devel] [PULL 0/7] target-arm queue, Peter Maydell, 2015/11/10