From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43070) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZgVM6-0002Ec-K9 for qemu-devel@nongnu.org; Mon, 28 Sep 2015 06:08:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZgVM5-0007UU-Lg for qemu-devel@nongnu.org; Mon, 28 Sep 2015 06:08:22 -0400 Received: from mail-la0-x22f.google.com ([2a00:1450:4010:c03::22f]:35249) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZgVM5-0007UN-EU for qemu-devel@nongnu.org; Mon, 28 Sep 2015 06:08:21 -0400 Received: by laer8 with SMTP id r8so25082734lae.2 for ; Mon, 28 Sep 2015 03:08:20 -0700 (PDT) From: Sergey Fedorov Date: Mon, 28 Sep 2015 13:07:49 +0300 Message-Id: <1443434870-5702-2-git-send-email-serge.fdrv@gmail.com> In-Reply-To: <1443434870-5702-1-git-send-email-serge.fdrv@gmail.com> References: <1443434870-5702-1-git-send-email-serge.fdrv@gmail.com> Subject: [Qemu-devel] [PATCH v2 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 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c index 1425a1d..1d4d8cb 100644 --- a/target-arm/op_helper.c +++ b/target-arm/op_helper.c @@ -897,6 +897,15 @@ void arm_debug_excp_handler(CPUState *cs) } } } else { + CPUBreakpoint *bp; + uint64_t pc = is_a64(env) ? env->pc : env->regs[15]; + + QTAILQ_FOREACH(bp, &cs->breakpoints, entry) { + if (bp->pc == pc && !(bp->flags & BP_CPU)) { + 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