From patchwork Fri Sep 12 13:23:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 37303 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f72.google.com (mail-la0-f72.google.com [209.85.215.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6F6FC203EE for ; Fri, 12 Sep 2014 13:27:31 +0000 (UTC) Received: by mail-la0-f72.google.com with SMTP id gi9sf481951lab.7 for ; Fri, 12 Sep 2014 06:27:30 -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=865T5jyqPelcC/lkiWnO4y7QujJCo47AAgtnwUqQqzQ=; b=BUPPvDVegvbJWP9QdAPXdC4gDSQTjFa+9vjp9rb1/WtQcDsdGIO0AkzfdUjU81qTZX +hWZX0JVsVRjsmck//jInpsb+YSNcXDPntLgfmSUuJIme/ZekvRQZxx0c8ksrFCnXw/a Qb5R4Jy65fl4ygxY1efv1BQLumJiV6EJXbRswlAcmFucxmtqtabNfQjxd+ibSKJ5cMaE lMyJoutCpmOm2LbrVVYs+Ko8iQAOqIpvMDEaSkvIHRvS0H8jYnOEG+s9tJiF/fVhCwYr ijmqDFnXbjIoKBBt17w69C+n/L5NZoKeRcDg5lXQLG8z7kvuuXQ0JvprVBzakPxNmRLp cyeg== X-Gm-Message-State: ALoCoQnp/2LMyoGX2VFNy9UvP56fICZvPEAmQC3CqNOTYFGpMXftjqWD49NOxniDc0QzRed4Wvbs X-Received: by 10.152.3.134 with SMTP id c6mr2268052lac.5.1410528449695; Fri, 12 Sep 2014 06:27:29 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.7.141 with SMTP id j13ls173426laa.5.gmail; Fri, 12 Sep 2014 06:27:29 -0700 (PDT) X-Received: by 10.112.44.129 with SMTP id e1mr8649149lbm.78.1410528449414; Fri, 12 Sep 2014 06:27:29 -0700 (PDT) Received: from mail-la0-f52.google.com (mail-la0-f52.google.com [209.85.215.52]) by mx.google.com with ESMTPS id mk4si6566426lbc.48.2014.09.12.06.27.29 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 12 Sep 2014 06:27:29 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) client-ip=209.85.215.52; Received: by mail-la0-f52.google.com with SMTP id b8so908021lan.39 for ; Fri, 12 Sep 2014 06:27:29 -0700 (PDT) X-Received: by 10.112.4.33 with SMTP id h1mr8285005lbh.67.1410528449299; Fri, 12 Sep 2014 06:27:29 -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.141.42 with SMTP id rl10csp731070lbb; Fri, 12 Sep 2014 06:27:28 -0700 (PDT) X-Received: by 10.140.108.2 with SMTP id i2mr10267816qgf.56.1410528447964; Fri, 12 Sep 2014 06:27:27 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id k4si5639131qcj.12.2014.09.12.06.27.27 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 12 Sep 2014 06:27:27 -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]:44922 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSQsp-0003MW-7A for patch@linaro.org; Fri, 12 Sep 2014 09:27:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56918) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSQpX-0006pr-Lq for qemu-devel@nongnu.org; Fri, 12 Sep 2014 09:24:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XSQpR-0003yh-G1 for qemu-devel@nongnu.org; Fri, 12 Sep 2014 09:24:03 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:46960) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSQpR-0003xI-A9 for qemu-devel@nongnu.org; Fri, 12 Sep 2014 09:23:57 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1XSQpP-0003Y3-7x for qemu-devel@nongnu.org; Fri, 12 Sep 2014 14:23:55 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 12 Sep 2014 14:23:45 +0100 Message-Id: <1410528234-13545-15-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1410528234-13545-1-git-send-email-peter.maydell@linaro.org> References: <1410528234-13545-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 81.2.115.146 Subject: [Qemu-devel] [PULL 14/23] target-arm: Set DBGDSCR.MOE for debug exceptions taken to AArch32 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.215.52 as permitted sender) smtp.mail=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 For debug exceptions taken to AArch32 we have to set the DBGDSCR.MOE (Method Of Entry) bits; we can identify the kind of debug exception from the information in exception.syndrome. Signed-off-by: Peter Maydell --- target-arm/helper.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/target-arm/helper.c b/target-arm/helper.c index b0d2424..30d8e60 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -3629,11 +3629,37 @@ void arm_cpu_do_interrupt(CPUState *cs) uint32_t mask; int new_mode; uint32_t offset; + uint32_t moe; assert(!IS_M(env)); arm_log_exception(cs->exception_index); + /* If this is a debug exception we must update the DBGDSCR.MOE bits */ + switch (env->exception.syndrome >> ARM_EL_EC_SHIFT) { + case EC_BREAKPOINT: + case EC_BREAKPOINT_SAME_EL: + moe = 1; + break; + case EC_WATCHPOINT: + case EC_WATCHPOINT_SAME_EL: + moe = 10; + break; + case EC_AA32_BKPT: + moe = 3; + break; + case EC_VECTORCATCH: + moe = 5; + break; + default: + moe = 0; + break; + } + + if (moe) { + env->cp15.mdscr_el1 = deposit64(env->cp15.mdscr_el1, 2, 4, moe); + } + /* TODO: Vectored interrupt controller. */ switch (cs->exception_index) { case EXCP_UDEF: