summary refs log tree commit diff stats
path: root/target/arm/ptw.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2022-10-03 17:23:14 +0100
committerPeter Maydell <peter.maydell@linaro.org>2022-10-10 14:52:25 +0100
commit3c003f7029eb322c15f137b33af1120096e14f4d (patch)
tree8e6e7679d867fae7f9836dd60c50a8acb521c742 /target/arm/ptw.c
parent104f703d93c9f12984a165985af653f83527c84e (diff)
downloadfocaccia-qemu-3c003f7029eb322c15f137b33af1120096e14f4d.tar.gz
focaccia-qemu-3c003f7029eb322c15f137b33af1120096e14f4d.zip
target/arm: Use ARMGranuleSize in ARMVAParameters
Now we have an enum for the granule size, use it in the
ARMVAParameters struct instead of the using16k/using64k bools.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20221003162315.2833797-3-peter.maydell@linaro.org
Diffstat (limited to 'target/arm/ptw.c')
-rw-r--r--target/arm/ptw.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/target/arm/ptw.c b/target/arm/ptw.c
index ddacffa7ee..23f16f4ff7 100644
--- a/target/arm/ptw.c
+++ b/target/arm/ptw.c
@@ -1062,13 +1062,7 @@ static bool get_phys_addr_lpae(CPUARMState *env, uint64_t address,
         }
     }
 
-    if (param.using64k) {
-        stride = 13;
-    } else if (param.using16k) {
-        stride = 11;
-    } else {
-        stride = 9;
-    }
+    stride = arm_granule_bits(param.gran) - 3;
 
     /*
      * Note that QEMU ignores shareability and cacheability attributes,