From patchwork Thu Oct 17 18:51:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 176695 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp1351486ill; Thu, 17 Oct 2019 12:03:58 -0700 (PDT) X-Google-Smtp-Source: APXvYqwnrQ6yuNTFYyPQgWuJKrBSXSeC7CTyn1wgKVUa6PUlYyWTmz0Ua7A26NvO7HKtn2Dhhep/ X-Received: by 2002:a50:f701:: with SMTP id g1mr5463124edn.62.1571339038065; Thu, 17 Oct 2019 12:03:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571339038; cv=none; d=google.com; s=arc-20160816; b=MaxRx9Tf2sjkc4lgaTfFtPxmrchzPbAx5IV7BI3lBdNZceb7CQB+H9z9Mt+OcRq6iT sq6TGVHGWnEGVyGTF0JKSQu/SVzV/J1iQyw+UVB8PX+brYYpxQKO35HpdSEA7yukA3VI ehHo+D44/0Znu7PhYU12L3ytftHAVp1inQEZ59W/FZVzdw1+4YDBotdm1euSLZg44Epx NZUWrkrwNesJrJI3YXVohn5a1EYR+NndCAsIHpKs6mKwwvndkNKjU99utsAzRvrylsgt ezp5buAOqq5ls5VCylI85++Ib6/I2nHi7VRYT7V4RL1hXYQeLymDfi5WkPIQef6LQgRo mUKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=xWBixVJrplgoFEDYWsC1KvhyFbMO/zEb6ezvCN+GZN0=; b=y0DmpP5faR8LpGD1Y1C1wqRXy28JJ1fFNIcQJ+TZydmrLvcJS1uMZY7JrwYl285ASe BMrtTcvpMxrsgRFCdbakAFdY7kNfQ8Hog+CYuxpD2Lfez4oW/VjJdGv7G0xwk4RGodfb Epfux5+pK1YqQSI4uQb3ztIsp74z1+4o/g1QHsy0Pa40JiqQsM44X3VJ9zuD3OPri9KD RttbULEJ7UI4pftwgXJ9wHSORH4O0y5mlO18jldsuccu/vouhY6y7/0t8sKe0JYULn/M ynb9oyCAaPTV/PTNZx9uYNWilWS6Nw+6s4GNUnN/pCDErTGFrthmCB4hsTPPzZCvcLCj vh9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=qLwtHFjk; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id me23si1846459ejb.344.2019.10.17.12.03.57 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 Oct 2019 12:03:58 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=qLwtHFjk; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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]:57170 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLB41-0006HD-1U for patch@linaro.org; Thu, 17 Oct 2019 15:03:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35345) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLAs8-0001JU-Pj for qemu-devel@nongnu.org; Thu, 17 Oct 2019 14:51:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iLAs6-0000wc-Go for qemu-devel@nongnu.org; Thu, 17 Oct 2019 14:51:40 -0400 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]:36821) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iLAs6-0000uL-59 for qemu-devel@nongnu.org; Thu, 17 Oct 2019 14:51:38 -0400 Received: by mail-pl1-x641.google.com with SMTP id j11so1564987plk.3 for ; Thu, 17 Oct 2019 11:51:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xWBixVJrplgoFEDYWsC1KvhyFbMO/zEb6ezvCN+GZN0=; b=qLwtHFjka0RAuBfWznYLYokdMU6JmAewlx7MtQyQaY+cxUeLFNiS2BWWRlqM7bHH+N appSYNhRgn32/i203CIH6ROoriq7MgPxwQv3d3GFvj27A7NY+GBY8GMCqnFijBikanj6 22jePEC3JGoqEl1Q4knIVv9RmR0zigQacCYqmIQM5gtFuPSDpr56xJiJM7yOGkzCWZKv wG+c8eBtJVXy0NBZJfZ8nDmOAuHyhChNDOhSaQlBn61R2B7iFdwcpUsg9EM5JTHkMBVv zLgRE6hWqELjjDpY1L5tKaNMBKi935EDHZ3emxEGwg/v84B8Utpf8vxfQ2FSSUWwlZzA sxZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xWBixVJrplgoFEDYWsC1KvhyFbMO/zEb6ezvCN+GZN0=; b=dx3BTVBQz67Zs3NSnjYnQZBkiJtOflUambY+hxG8urs2hxX20CHR+Vxc1EY1EBlDNn c3eyvWu7VebVttyE8yKXRLKuQwnsNwTZXFSCKpiCnnVXfMWa7JRcE8Wk+e+JIOdkcU1g a5mjS+DDg3K8aE6lnHbJLIuS3qd4AU1nnMN1ePl+FqFFYmJzeWJHRVRlVrAe8/7porlx byuI4wGO7Q5rmOIT9Mi7dUIOu7d7tvY9Aem70Uck10uaj7UjWUwd/51fXQBzc07DZxbD HHmja7D7+415yfX/GaVXMDD3hYG/3bbzPTe5WuW6XqUHMEeSSFpSAUTdz28IvDWkW5iI ZQ8A== X-Gm-Message-State: APjAAAUEI/O2qeSYs3D1v0UzjWbAgcd2DMu2gdyT3DlE57+uPVvlKQor +Dsnwwh8Yz360sN4t/3aMkZoagz3r1U= X-Received: by 2002:a17:902:8642:: with SMTP id y2mr5292662plt.187.1571338289434; Thu, 17 Oct 2019 11:51:29 -0700 (PDT) Received: from localhost.localdomain (97-113-7-119.tukw.qwest.net. [97.113.7.119]) by smtp.gmail.com with ESMTPSA id s97sm5009256pjc.4.2019.10.17.11.51.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 11:51:28 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v7 13/20] target/arm: Split out arm_mmu_idx_el Date: Thu, 17 Oct 2019 11:51:03 -0700 Message-Id: <20191017185110.539-14-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191017185110.539-1-richard.henderson@linaro.org> References: <20191017185110.539-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::641 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Avoid calling arm_current_el() twice. Reviewed-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- target/arm/internals.h | 9 +++++++++ target/arm/helper.c | 12 +++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) -- 2.17.1 diff --git a/target/arm/internals.h b/target/arm/internals.h index 232d963875..f5313dd3d4 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -949,6 +949,15 @@ void arm_cpu_update_virq(ARMCPU *cpu); */ void arm_cpu_update_vfiq(ARMCPU *cpu); +/** + * arm_mmu_idx_el: + * @env: The cpu environment + * @el: The EL to use. + * + * Return the full ARMMMUIdx for the translation regime for EL. + */ +ARMMMUIdx arm_mmu_idx_el(CPUARMState *env, int el); + /** * arm_mmu_idx: * @env: The cpu environment diff --git a/target/arm/helper.c b/target/arm/helper.c index 85de96d071..3f7d3f257d 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -11026,15 +11026,12 @@ ARMMMUIdx arm_v7m_mmu_idx_for_secstate(CPUARMState *env, bool secstate) } #endif -ARMMMUIdx arm_mmu_idx(CPUARMState *env) +ARMMMUIdx arm_mmu_idx_el(CPUARMState *env, int el) { - int el; - if (arm_feature(env, ARM_FEATURE_M)) { return arm_v7m_mmu_idx_for_secstate(env, env->v7m.secure); } - el = arm_current_el(env); if (el < 2 && arm_is_secure_below_el3(env)) { return ARMMMUIdx_S1SE0 + el; } else { @@ -11042,6 +11039,11 @@ ARMMMUIdx arm_mmu_idx(CPUARMState *env) } } +ARMMMUIdx arm_mmu_idx(CPUARMState *env) +{ + return arm_mmu_idx_el(env, arm_current_el(env)); +} + int cpu_mmu_index(CPUARMState *env, bool ifetch) { return arm_to_core_mmu_idx(arm_mmu_idx(env)); @@ -11202,7 +11204,7 @@ static uint32_t rebuild_hflags_internal(CPUARMState *env) { int el = arm_current_el(env); int fp_el = fp_exception_el(env, el); - ARMMMUIdx mmu_idx = arm_mmu_idx(env); + ARMMMUIdx mmu_idx = arm_mmu_idx_el(env, el); if (is_a64(env)) { return rebuild_hflags_a64(env, el, fp_el, mmu_idx);