Re: [PATCH 02/11] target/arm: Add arm_mmu_idx_is_stage1

[Philippe Mathieu-Daudé]

On 12/3/19 11:53 PM, Richard Henderson wrote:

Use a common predicate for querying stage1-ness.

Signed-off-by: Richard Henderson <richard.hender...@linaro.org>

Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com>

---
  target/arm/internals.h | 11 +++++++++++
  target/arm/helper.c    |  8 +++-----
  2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/target/arm/internals.h b/target/arm/internals.h
index 49dac2a677..850f204f14 100644
--- a/target/arm/internals.h
+++ b/target/arm/internals.h
@@ -1034,6 +1034,17 @@ static inline ARMMMUIdx arm_stage1_mmu_idx(CPUARMState 
*env)
  ARMMMUIdx arm_stage1_mmu_idx(CPUARMState *env);
  #endif

+static inline bool arm_mmu_idx_is_stage1(ARMMMUIdx mmu_idx)

+{
+    switch (mmu_idx) {
+    case ARMMMUIdx_Stage1_E0:
+    case ARMMMUIdx_Stage1_E1:
+        return true;
+    default:
+        return false;
+    }
+}
+
  /*
   * Parameters of a given virtual address, as extracted from the
   * translation control register (TCR) for a given regime.
diff --git a/target/arm/helper.c b/target/arm/helper.c
index f3785d5ad6..fdb86ea427 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -3212,8 +3212,7 @@ static uint64_t do_ats_write(CPUARMState *env, uint64_t 
value,
          bool take_exc = false;

if (fi.s1ptw && current_el == 1 && !arm_is_secure(env)

-            && (mmu_idx == ARMMMUIdx_Stage1_E1
-                || mmu_idx == ARMMMUIdx_Stage1_E0)) {
+            && arm_mmu_idx_is_stage1(mmu_idx)) {
              /*
               * Synchronous stage 2 fault on an access made as part of the
               * translation table walk for AT S1E0* or AT S1E1* insn
@@ -9159,8 +9158,7 @@ static inline bool 
regime_translation_disabled(CPUARMState *env,
          }
      }

- if ((env->cp15.hcr_el2 & HCR_DC) &&

-        (mmu_idx == ARMMMUIdx_Stage1_E0 || mmu_idx == ARMMMUIdx_Stage1_E1)) {
+    if ((env->cp15.hcr_el2 & HCR_DC) && arm_mmu_idx_is_stage1(mmu_idx)) {
          /* HCR.DC means SCTLR_EL1.M behaves as 0 */
          return true;
      }
@@ -9469,7 +9467,7 @@ static hwaddr S1_ptw_translate(CPUARMState *env, 
ARMMMUIdx mmu_idx,
                                 hwaddr addr, MemTxAttrs txattrs,
                                 ARMMMUFaultInfo *fi)
  {
-    if ((mmu_idx == ARMMMUIdx_Stage1_E0 || mmu_idx == ARMMMUIdx_Stage1_E1) &&
+    if (arm_mmu_idx_is_stage1(mmu_idx) &&
          !regime_translation_disabled(env, ARMMMUIdx_Stage2)) {
          target_ulong s2size;
          hwaddr s2pa;