From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50312) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZlwK4-0000Hb-OL for qemu-devel@nongnu.org; Tue, 13 Oct 2015 05:56:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZlwK1-0006xh-Re for qemu-devel@nongnu.org; Tue, 13 Oct 2015 05:56:44 -0400 Received: from mail-lb0-x230.google.com ([2a00:1450:4010:c04::230]:36846) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZlwK1-0006xX-Dg for qemu-devel@nongnu.org; Tue, 13 Oct 2015 05:56:41 -0400 Received: by lbcao8 with SMTP id ao8so13418698lbc.3 for ; Tue, 13 Oct 2015 02:56:40 -0700 (PDT) From: Sergey Fedorov Date: Tue, 13 Oct 2015 12:56:27 +0300 Message-Id: <1444730188-5861-2-git-send-email-serge.fdrv@gmail.com> In-Reply-To: <1444730188-5861-1-git-send-email-serge.fdrv@gmail.com> References: <1444730188-5861-1-git-send-email-serge.fdrv@gmail.com> Subject: [Qemu-devel] [PATCH v3 1/2] target-arm: Fix GDB breakpoint handling List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Sergey Fedorov , Peter Maydell 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 --- target-arm/op_helper.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c index 1425a1d..67b18c0 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)) { -- 1.9.1