qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, qemu-arm@nongnu.org
Subject: [PATCH v8 13/22] target/arm: Split out arm_mmu_idx_el
Date: Fri, 18 Oct 2019 10:44:22 -0700	[thread overview]
Message-ID: <20191018174431.1784-14-richard.henderson@linaro.org> (raw)
In-Reply-To: <20191018174431.1784-1-richard.henderson@linaro.org>

Avoid calling arm_current_el() twice.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 target/arm/internals.h |  9 +++++++++
 target/arm/helper.c    | 12 +++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

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);
-- 
2.17.1



  parent reply	other threads:[~2019-10-18 17:56 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-18 17:44 [PATCH v8 00/22] target/arm: Reduce overhead of cpu_get_tb_cpu_state Richard Henderson
2019-10-18 17:44 ` [PATCH v8 01/22] target/arm: Split out rebuild_hflags_common Richard Henderson
2019-10-18 17:44 ` [PATCH v8 02/22] target/arm: Split out rebuild_hflags_a64 Richard Henderson
2019-10-18 17:44 ` [PATCH v8 03/22] target/arm: Split out rebuild_hflags_common_32 Richard Henderson
2019-10-18 17:44 ` [PATCH v8 04/22] target/arm: Split arm_cpu_data_is_big_endian Richard Henderson
2019-10-18 17:44 ` [PATCH v8 05/22] target/arm: Split out rebuild_hflags_m32 Richard Henderson
2019-10-18 17:44 ` [PATCH v8 06/22] target/arm: Reduce tests vs M-profile in cpu_get_tb_cpu_state Richard Henderson
2019-10-18 17:44 ` [PATCH v8 07/22] target/arm: Split out rebuild_hflags_a32 Richard Henderson
2019-10-18 17:44 ` [PATCH v8 08/22] target/arm: Split out rebuild_hflags_aprofile Richard Henderson
2019-10-18 17:44 ` [PATCH v8 09/22] target/arm: Hoist XSCALE_CPAR, VECLEN, VECSTRIDE in cpu_get_tb_cpu_state Richard Henderson
2019-10-18 17:44 ` [PATCH v8 10/22] target/arm: Simplify set of PSTATE_SS " Richard Henderson
2019-10-18 17:44 ` [PATCH v8 11/22] target/arm: Hoist computation of TBFLAG_A32.VFPEN Richard Henderson
2019-10-18 17:44 ` [PATCH v8 12/22] target/arm: Add arm_rebuild_hflags Richard Henderson
2019-10-18 17:44 ` Richard Henderson [this message]
2019-10-18 17:44 ` [PATCH v8 14/22] target/arm: Hoist store to cs_base in cpu_get_tb_cpu_state Richard Henderson
2019-10-18 17:44 ` [PATCH v8 15/22] target/arm: Add HELPER(rebuild_hflags_{a32, a64, m32}) Richard Henderson
2019-10-18 17:44 ` [PATCH v8 16/22] target/arm: Rebuild hflags at EL changes Richard Henderson
2019-10-18 17:44 ` [PATCH v8 17/22] target/arm: Rebuild hflags at MSR writes Richard Henderson
2019-10-18 17:44 ` [PATCH v8 18/22] target/arm: Rebuild hflags at CPSR writes Richard Henderson
2019-10-18 17:44 ` [PATCH v8 19/22] target/arm: Rebuild hflags at Xscale SCTLR writes Richard Henderson
2019-10-18 17:44 ` [PATCH v8 20/22] target/arm: Rebuild hflags for M-profile Richard Henderson
2019-10-18 17:44 ` [PATCH v8 21/22] target/arm: Rebuild hflags for M-profile NVIC Richard Henderson
2019-10-18 17:44 ` [PATCH v8 22/22] target/arm: Rely on hflags correct in cpu_get_tb_cpu_state Richard Henderson
2019-10-22 12:47 ` [PATCH v8 00/22] target/arm: Reduce overhead of cpu_get_tb_cpu_state Peter Maydell
2019-10-22 15:38   ` Peter Maydell
2019-10-23 14:49     ` Richard Henderson
2019-10-23 15:17       ` Alex Bennée
2019-10-23 16:13         ` Richard Henderson
2019-10-23 18:06           ` Alex Bennée

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191018174431.1784-14-richard.henderson@linaro.org \
    --to=richard.henderson@linaro.org \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).