From patchwork Thu Sep 7 13:28:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 111940 Delivered-To: patch@linaro.org Received: by 10.140.94.239 with SMTP id g102csp116781qge; Thu, 7 Sep 2017 06:46:51 -0700 (PDT) X-Google-Smtp-Source: ADKCNb6eoigh5HFPzyEteMJDWiB5FKa/JHhl52KtSpNv5vwQ95gciDkr0VkOloPHHjYAq069sds2 X-Received: by 10.200.22.93 with SMTP id x29mr3729827qtk.111.1504792011027; Thu, 07 Sep 2017 06:46:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504792011; cv=none; d=google.com; s=arc-20160816; b=uUmT5YyPyMGboCBCBaAcJm56p1HrthjRSIVcHVsI+pYG5QqQ6inIGi+MGOcUy90WKf 1QEFzezbPSxMwfixpmwcPG73pDX43BhQ2wTBOIceTRE4d5cI+vWF3LRu9XK6NzlBaZDX F/NHm0T51JEInzRIhWQK16gvsKnp3Q5oNs6mYRvqtuh6rTUDlKEK5sFUoCRUE5hcMtsU CGlztJAI6dcTWIHt9q5Q+7d1vll6MYjAzh39QqDnfDucGxHZPS1Lkts3Q7gQ+Qtm3AEp dpEFXZGhu5S6te6ropVfCMtiguvHWO6S6SSA5CrLcOz1K2c7kLwmuzDKLpKlmCpzo0GQ B4kQ== 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=hVBpHK86Hl+rxQLaZIUEmKHBiD6CUd5L8c1VHOcpkoU=; b=P3+gEXInirVR60eq3OhU3jG0KTcQ9rRxBFqiqw8HQPGmy3j4L5qxFQJMevUM7495UX Qq9n1uIImtIRYJCRpGyceMrQu/+ZXU2r19tGu7mD4XV1mzWSbj63wK3uUVUtH9RGAs8y p6KvEeHLYZPOuGYreGDGIu7tmz79IoU1Hr/76J9iqyc4HVORAmbVxMDvS9foCkEOj2ih YmVdPUoDIIR150B8DeBWbl8xCUOU4mJNF4iXwPwnoyeSKQoeWZwO6i8H7IZcpq+H6VJ5 YrKuNYw0Q31jSQ3Ok/ZOsyHF69AnUflwFF4HUaO+cFuf9oTZ3HGGLYDWiGvWBmFQ8Jad ivCg== 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: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id i132si2757984qke.166.2017.09.07.06.46.50 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 07 Sep 2017 06:46:51 -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]:40565 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpx8r-0000Cg-09 for patch@linaro.org; Thu, 07 Sep 2017 09:46:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56547) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpwr8-00013B-Bz for qemu-devel@nongnu.org; Thu, 07 Sep 2017 09:28:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dpwr1-0007gM-4M for qemu-devel@nongnu.org; Thu, 07 Sep 2017 09:28:30 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:37198) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dpwr0-0007fH-TH for qemu-devel@nongnu.org; Thu, 07 Sep 2017 09:28:23 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1dpwqz-0001gk-Id for qemu-devel@nongnu.org; Thu, 07 Sep 2017 14:28:21 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 7 Sep 2017 14:28:19 +0100 Message-Id: <1504790904-17018-27-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1504790904-17018-1-git-send-email-peter.maydell@linaro.org> References: <1504790904-17018-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 26/31] target/arm: Move regime_is_secure() to target/arm/internals.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" Move the regime_is_secure() utility function to internals.h; we are going to want to call it from translate.c. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 1503414539-28762-20-git-send-email-peter.maydell@linaro.org --- target/arm/internals.h | 26 ++++++++++++++++++++++++++ target/arm/helper.c | 26 -------------------------- 2 files changed, 26 insertions(+), 26 deletions(-) -- 2.7.4 diff --git a/target/arm/internals.h b/target/arm/internals.h index 461f558..4afebd9 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -480,4 +480,30 @@ static inline void arm_call_el_change_hook(ARMCPU *cpu) } } +/* Return true if this address translation regime is secure */ +static inline bool regime_is_secure(CPUARMState *env, ARMMMUIdx mmu_idx) +{ + switch (mmu_idx) { + case ARMMMUIdx_S12NSE0: + case ARMMMUIdx_S12NSE1: + case ARMMMUIdx_S1NSE0: + case ARMMMUIdx_S1NSE1: + case ARMMMUIdx_S1E2: + case ARMMMUIdx_S2NS: + case ARMMMUIdx_MPriv: + case ARMMMUIdx_MNegPri: + case ARMMMUIdx_MUser: + return false; + case ARMMMUIdx_S1E3: + case ARMMMUIdx_S1SE0: + case ARMMMUIdx_S1SE1: + case ARMMMUIdx_MSPriv: + case ARMMMUIdx_MSNegPri: + case ARMMMUIdx_MSUser: + return true; + default: + g_assert_not_reached(); + } +} + #endif diff --git a/target/arm/helper.c b/target/arm/helper.c index 1c47f71..00807b4 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -7055,32 +7055,6 @@ static inline uint32_t regime_el(CPUARMState *env, ARMMMUIdx mmu_idx) } } -/* Return true if this address translation regime is secure */ -static inline bool regime_is_secure(CPUARMState *env, ARMMMUIdx mmu_idx) -{ - switch (mmu_idx) { - case ARMMMUIdx_S12NSE0: - case ARMMMUIdx_S12NSE1: - case ARMMMUIdx_S1NSE0: - case ARMMMUIdx_S1NSE1: - case ARMMMUIdx_S1E2: - case ARMMMUIdx_S2NS: - case ARMMMUIdx_MPriv: - case ARMMMUIdx_MNegPri: - case ARMMMUIdx_MUser: - return false; - case ARMMMUIdx_S1E3: - case ARMMMUIdx_S1SE0: - case ARMMMUIdx_S1SE1: - case ARMMMUIdx_MSPriv: - case ARMMMUIdx_MSNegPri: - case ARMMMUIdx_MSUser: - return true; - default: - g_assert_not_reached(); - } -} - /* Return the SCTLR value which controls this address translation regime */ static inline uint32_t regime_sctlr(CPUARMState *env, ARMMMUIdx mmu_idx) {