Changeset 105745 in vbox for trunk/include

Timestamp:

Aug 21, 2024 7:16:50 AM (3 months ago)

Author:

vboxsync

Message:

VMM/PGM: Some preparations for ARMv8 page table walking, introduce dedicated PGMMODE enumerations for ARMv8 and hide all accesses behind PGMMODE_XXX macros, bugref:10388

File:

• trunk/include/VBox/vmm/pgm.h (modified) (5 diffs)

trunk/include/VBox/vmm/pgm.h

@@ -250 +250 @@
 
 
+/** @todo r=aeichner This doesn't seem to be used outside of the VMM module, so we might make
+ *                   all APIs (PGMGetGuestMode(), etc.) internal and split this up into an
+ *                   x86 and arm specific header. */
 /**
  * Paging mode.
@@ -259 +262 @@
     /** The usual invalid value. */
     PGMMODE_INVALID = 0,
+#ifndef VBOX_VMM_TARGET_ARMV8
     /** Real mode. */
     PGMMODE_REAL,
@@ -283 +287 @@
     /** Special mode used by NEM to indicate no shadow paging necessary. */
     PGMMODE_NONE,
+#else
+    /** Paging is not enabled by the guest. */
+    PGMMODE_NONE,
+    /** VMSAv8-32 Virtual Memory System Architecture v8 - 32-bit variant enabled. */
+    PGMMODE_VMSA_V8_32,
+    /** VMSAv8-64 Virtual Memory System Architecture v8 - 64-bit variant enabled. */
+    PGMMODE_VMSA_V8_64,
+#endif
     /** The max number of modes */
     PGMMODE_MAX,
@@ -288 +300 @@
     PGMMODE_32BIT_HACK = 0x7fffffff
 } PGMMODE;
+
 
 /**
@@ -659 +672 @@
 
 
+#ifndef VBOX_VMM_TARGET_ARMV8
 /** Macro for checking if the guest is using paging.
  * @param enmMode   PGMMODE_*.
  * @remark  ASSUMES certain order of the PGMMODE_* values.
  */
-#define PGMMODE_WITH_PAGING(enmMode) ((enmMode) >= PGMMODE_32_BIT)
+# define PGMMODE_WITH_PAGING(enmMode) ((enmMode) >= PGMMODE_32_BIT)
 
 /** Macro for checking if it's one of the long mode modes.
  * @param enmMode   PGMMODE_*.
  */
-#define PGMMODE_IS_LONG_MODE(enmMode) ((enmMode) == PGMMODE_AMD64_NX || (enmMode) == PGMMODE_AMD64)
+# define PGMMODE_IS_64BIT_MODE(enmMode) ((enmMode) == PGMMODE_AMD64_NX || (enmMode) == PGMMODE_AMD64)
 
 /** Macro for checking if it's one of the AMD64 nested modes.
  * @param enmMode   PGMMODE_*.
  */
-#define PGMMODE_IS_NESTED(enmMode)  (   (enmMode) == PGMMODE_NESTED_32BIT \
-                                     || (enmMode) == PGMMODE_NESTED_PAE \
-                                     || (enmMode) == PGMMODE_NESTED_AMD64)
+# define PGMMODE_IS_NESTED(enmMode)  (   (enmMode) == PGMMODE_NESTED_32BIT \
+                                      || (enmMode) == PGMMODE_NESTED_PAE \
+                                      || (enmMode) == PGMMODE_NESTED_AMD64)
 
 /** Macro for checking if it's one of the PAE modes.
  * @param enmMode   PGMMODE_*.
  */
-#define PGMMODE_IS_PAE(enmMode)     (   (enmMode) == PGMMODE_PAE \
-                                     || (enmMode) == PGMMODE_PAE_NX)
+# define PGMMODE_IS_PAE(enmMode)     (   (enmMode) == PGMMODE_PAE \
+                                      || (enmMode) == PGMMODE_PAE_NX)
+#else
+/** Macro for checking if the guest is using paging.
+ * @param enmMode   PGMMODE_*.
+ * @remark  ASSUMES certain order of the PGMMODE_* values.
+ */
+# define PGMMODE_WITH_PAGING(enmMode) ((enmMode) > PGMMODE_NONE)
+
+/** Macro for checking if it's the 64-bit translation mode.
+ * @param enmMode   PGMMODE_*.
+ */
+# define PGMMODE_IS_64BIT_MODE(enmMode) ((enmMode) == PGMMODE_VMSA_V8_64)
+#endif
+
 
 /**