From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47387) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zw9Kw-0004Rt-0v for qemu-devel@nongnu.org; Tue, 10 Nov 2015 08:51:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zw9Kv-0006HM-5H for qemu-devel@nongnu.org; Tue, 10 Nov 2015 08:51:49 -0500 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:35389) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zw9Ku-0006HI-Uq for qemu-devel@nongnu.org; Tue, 10 Nov 2015 08:51:49 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1Zw9Kt-0006w0-Gc for qemu-devel@nongnu.org; Tue, 10 Nov 2015 13:51:47 +0000 From: Peter Maydell Date: Tue, 10 Nov 2015 13:51:41 +0000 Message-Id: <1447163507-26627-2-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1447163507-26627-1-git-send-email-peter.maydell@linaro.org> References: <1447163507-26627-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PULL 1/7] target-arm: Fix gdb singlestep handling in arm_debug_excp_handler() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org From: Sergey Fedorov 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 Message-id: 1446726361-18328-1-git-send-email-serge.fdrv@gmail.com Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- 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