On 12/9/22 05:17, Philippe Mathieu-Daudé wrote:
+++ b/target/arm/machine.c
@@ -6,6 +6,45 @@
  #include "internals.h"
  #include "migration/cpu.h"
+/* This mapping is common between ID_AA64MMFR0.PARANGE and TCR_ELx.{I}PS. */
+static const uint8_t pamax_map[] = {
+    [0] = 32,
+    [1] = 36,
+    [2] = 40,
+    [3] = 42,
+    [4] = 44,
+    [5] = 48,
+    [6] = 52,
+};
...
+++ b/target/arm/ptw.c
@@ -42,45 +42,6 @@ static bool get_phys_addr_with_struct(CPUARMState *env, 
S1Translate *ptw,
                                        ARMMMUFaultInfo *fi)
      __attribute__((nonnull));
-/* This mapping is common between ID_AA64MMFR0.PARANGE and TCR_ELx.{I}PS. */
-static const uint8_t pamax_map[] = {
-    [0] = 32,
-    [1] = 36,
-    [2] = 40,
-    [3] = 42,
-    [4] = 44,
-    [5] = 48,
-    [6] = 52,
-};

How does this even compile with the remaining usage of pamax_map in 
get_phys_addr_lpae?


r~

Reply via email to