From patchwork Fri Oct 16 13:58:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 55105 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lf0-f70.google.com (mail-lf0-f70.google.com [209.85.215.70]) by patches.linaro.org (Postfix) with ESMTPS id 72C7C22EAC for ; Fri, 16 Oct 2015 13:59:24 +0000 (UTC) Received: by lffv3 with SMTP id v3sf18360237lff.1 for ; Fri, 16 Oct 2015 06:59:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=n7FJwdtZ8xYFN8BYf6c0O5AGBhfacoPZ3fdUIfkNid0=; b=Hy2SHyI5rJcma5G0qwdWe1x3FjPK6iis9eAcyRWcoV2Il3Kkd2sDtTf9WLLtkBPp0a lOrFEU+08ybJaabOckCGImiZS4QqToimfV+7Z1aNs617dwUi4d8XlkmU7teuT1uoC/4Q H7YVFmTvadHNPWbSFxDmT2iWGyoEArwmRwm3WKwHAwkLA+8+KjSWmVL8hRmQ1dNEK81g FcHi7V2E91YRgyENixdoQklduT5O2hwKpNCpcvAwf9xb8rzTauVeEbs38W7szZSuUwP/ 9zfZSZps/SvrYGoA4XJbTagbfFeX3rtEkDq4g0JZ5tN5cjzVjxU6kssgMU9bNqDlXgm8 jxqg== X-Gm-Message-State: ALoCoQkLYXlJSNlf8oRFRA5QlUV2osK7KZJruJfFqKOd0gqCp/7e2ZEi4NPWpXEa41xunpP6BIBH X-Received: by 10.112.147.7 with SMTP id tg7mr3691959lbb.16.1445003962287; Fri, 16 Oct 2015 06:59:22 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.212.195 with SMTP id l186ls165590lfg.67.gmail; Fri, 16 Oct 2015 06:59:21 -0700 (PDT) X-Received: by 10.112.151.106 with SMTP id up10mr8528697lbb.106.1445003961947; Fri, 16 Oct 2015 06:59:21 -0700 (PDT) Received: from mail-lb0-f180.google.com (mail-lb0-f180.google.com. [209.85.217.180]) by mx.google.com with ESMTPS id rm8si13015430lbb.16.2015.10.16.06.59.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Oct 2015 06:59:21 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.180 as permitted sender) client-ip=209.85.217.180; Received: by lbcao8 with SMTP id ao8so100755320lbc.3 for ; Fri, 16 Oct 2015 06:59:21 -0700 (PDT) X-Received: by 10.112.139.201 with SMTP id ra9mr8352725lbb.29.1445003961719; Fri, 16 Oct 2015 06:59:21 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp1307758lbq; Fri, 16 Oct 2015 06:59:20 -0700 (PDT) X-Received: by 10.140.235.84 with SMTP id g81mr20087540qhc.75.1445003960656; Fri, 16 Oct 2015 06:59:20 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id f75si18009260qkf.66.2015.10.16.06.59.20 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 16 Oct 2015 06:59:20 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:53826 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zn5XT-00032u-SG for patch@linaro.org; Fri, 16 Oct 2015 09:59:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54967) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zn5WM-00020S-FX for qemu-devel@nongnu.org; Fri, 16 Oct 2015 09:58:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zn5WL-0000jx-Jn for qemu-devel@nongnu.org; Fri, 16 Oct 2015 09:58:10 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:35158) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zn5WL-0000ht-DZ for qemu-devel@nongnu.org; Fri, 16 Oct 2015 09:58:09 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1Zn5WK-0003mt-5A for qemu-devel@nongnu.org; Fri, 16 Oct 2015 14:58:08 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 16 Oct 2015 14:58:06 +0100 Message-Id: <1445003887-14475-13-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1445003887-14475-1-git-send-email-peter.maydell@linaro.org> References: <1445003887-14475-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Subject: [Qemu-devel] [PULL 12/13] target-arm: Fix GDB breakpoint handling X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.180 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Sergey Fedorov 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 Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- 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)) {