Changeset 108132 in vbox for trunk/include/VBox

Timestamp:

Feb 10, 2025 11:05:23 AM (2 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

167432

Message:

VMM/PGM: Merge and deduplicate code targeting x86 & amd64 in PGM.cpp. Don't bother compiling pool stuff on arm and darwin.amd64. jiraref:VBP-1531

Location:

trunk/include/VBox/vmm

Files:

• pgm.h (modified) (4 diffs)
• vmmr3vtable-def.h (modified) (1 diff)

trunk/include/VBox/vmm/pgm.h

@@ -257 +257 @@
  *
  * @note    Part of saved state.  Change with extreme care.
+ * @note    Due to PGMGetShadowMode() and the possibility that we will be
+ *          running ARMv8 VMs on a AMD64 hosts, it's safer to combine these
+ *          modes. We could rethink this if we start using PGMMODE exclusively
+ *          for the guest mode and come up with a different enum for the host.
  */
 typedef enum PGMMODE
@@ -262 +266 @@
     /** The usual invalid value. */
     PGMMODE_INVALID = 0,
-#ifndef VBOX_VMM_TARGET_ARMV8
+
+    /** @name X86
+     * @{ */
     /** Real mode. */
     PGMMODE_REAL,
@@ -285 +291 @@
     /** Extended paging (Intel) mode. */
     PGMMODE_EPT,
-    /** Special mode used by NEM to indicate no shadow paging necessary. */
-    PGMMODE_NONE,
-#else
-    /** Paging is not enabled by the guest. */
-    PGMMODE_NONE,
+    /** @} */
+
+    /** ARMv8: Paging is not enabled by the guest.
+     * AMD64 host: Special mode used by NEM to indicate no shadow paging
+     * necessary.  Not used by X86 guests. */
+    PGMMODE_NONE = 32,
+
+    /** @name ARMv8
+     * @{ */
     /** 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,
@@ -782 +793 @@
 VMM_INT_DECL(const char *) PGMGetSlatModeName(PGMSLAT enmSlatMode);
 #endif
-VMM_INT_DECL(RTGCPHYS) PGMGetGuestCR3Phys(PVMCPU pVCpu);
 VMM_INT_DECL(void)  PGMNotifyNxeChanged(PVMCPU pVCpu, bool fNxe);
 VMMDECL(bool)       PGMHasDirtyPages(PVM pVM);

trunk/include/VBox/vmm/vmmr3vtable-def.h

@@ -662 +662 @@
 VTABLE_ENTRY(PGMPhysSimpleWriteGCPtr)
 VTABLE_ENTRY(PGMPhysWriteGCPtr)
-VTABLE_ENTRY(PGMShwMakePageWritable)
+VTABLE_RESERVED(pfnPGMR3Reserved0)
 VTABLE_ENTRY(PGMR3QueryGlobalMemoryStats)
 VTABLE_ENTRY(PGMR3QueryMemoryStats)