Message ID | 1506012099-13605-7-git-send-email-peter.maydell@linaro.org |
---|---|
State | Accepted |
Commit | 028b0da424ba85049557c61f9f0a8a6698352b41 |
Headers | show
Delivered-To: patch@linaro.org Received: by 10.80.163.150 with SMTP id s22csp2098585edb; Thu, 21 Sep 2017 09:57:31 -0700 (PDT) X-Google-Smtp-Source: AOwi7QAoIkqJF8G1AtYLtUASmjRWk4oK1jnufrtoQzRlx9n4Fa4lnt69vPJUeAPxn9n6IGp1cQJ1 X-Received: by 10.55.212.93 with SMTP id l90mr4041764qki.30.1506012882968; Thu, 21 Sep 2017 09:54:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506012882; cv=none; d=google.com; s=arc-20160816; b=O8RLM74/rzhq5zf4Mptzbvd6iQhKMgXBDTGEoRjh1xCA8u8j0CJH82SwIulCd6rds0 9ZVbApSJDjFjpVzfj4lZPplqtD2lqSR1Oiiqu5dsYnFKIa67zoMcxW4gP/3yRjrYlXrP L42SpXrMs2ldCW+SrmUlfVD5P1ESuYkFqL7NgSX0G6uEdlL5CcUX89zew83+tzR2rVBX 1sNvKHo26GHdCovT4URmg5M0qQFkREg84HBD/ui7VK2KAJ7f+cf7IN4EPU9GUNPH7Gjv cMEvQgRVmo1GSQaPMxR8N6PMKFehtFFxMHdshmneHwvPK8pdn6TraZRJXz/PyNaIC+V6 XRZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=P8LsbU0NqQ7324sLSBRIWx0tT1wnCE0gX+BN9K97CrI=; b=ksTOHyZtQjWFHLvgey9wwIstHVVwlQLFxgQSdg/s0CmG3AtmRnqXBXq+V9keL7BrUT fRwfrVDgQYdlYSoiRsiRxVHdHuo9SON5b76dkLj09kJBSLkBcvWrOVQ1QvB7H8uq0/Qg nekfCgsqfREYrUxczun6TLZxlXDr6UKXL11DkzhV77jpgif0fKjdch8LPJR2SlZ1tLRv BbHOE5Korc5Qx86BnZqNBSMda17NlTY62Y6+237r8HcPMIdqCsBhUpn/Cus6JjNjWhrO 784yK12XAPIWEZKAKuzHJyAi5Q6/AVibQZaPkAqj3BFi4TjtiTgch+zO3b+C8GudZn+e ++0g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id u51si1657973qta.217.2017.09.21.09.54.42 for <patch@linaro.org> (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 21 Sep 2017 09:54:42 -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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:54686 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1dv4kK-0005hh-Mv for patch@linaro.org; Thu, 21 Sep 2017 12:54:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60257) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1dv4XO-00035N-3R for qemu-devel@nongnu.org; Thu, 21 Sep 2017 12:41:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1dv4XM-00034p-UQ for qemu-devel@nongnu.org; Thu, 21 Sep 2017 12:41:18 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:37498) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1dv4XM-0002sG-Nk for qemu-devel@nongnu.org; Thu, 21 Sep 2017 12:41:16 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from <pm215@archaic.org.uk>) id 1dv4XD-00054Y-2o for qemu-devel@nongnu.org; Thu, 21 Sep 2017 17:41:07 +0100 From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Date: Thu, 21 Sep 2017 17:41:14 +0100 Message-Id: <1506012099-13605-7-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1506012099-13605-1-git-send-email-peter.maydell@linaro.org> References: <1506012099-13605-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 06/31] nvic: Make ICSR.RETTOBASE handle banked exceptions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org> |
Series |
target-arm queue
|
expand
|
diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c index d745f38..0df5eaf 100644 --- a/hw/intc/armv7m_nvic.c +++ b/hw/intc/armv7m_nvic.c @@ -84,9 +84,12 @@ static int nvic_pending_prio(NVICState *s) static bool nvic_rettobase(NVICState *s) { int irq, nhand = 0; + bool check_sec = arm_feature(&s->cpu->env, ARM_FEATURE_M_SECURITY); for (irq = ARMV7M_EXCP_RESET; irq < s->num_irq; irq++) { - if (s->vectors[irq].active) { + if (s->vectors[irq].active || + (check_sec && irq < NVIC_INTERNAL_VECTORS && + s->sec_vectors[irq].active)) { nhand++; if (nhand == 2) { return 0;