Changeset 105745 in vbox for trunk/src/VBox/VMM/VMMR3/PGM-armv8.cpp

Timestamp:

Aug 21, 2024 7:16:50 AM (5 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/src/VBox/VMM/VMMR3/PGM-armv8.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMR3/PGM-armv8.cpp

@@ -43 +43 @@
 #include <VBox/vmm/pgm.h>
 #include <VBox/vmm/cpum.h>
+#include <VBox/vmm/cpum-armv8.h>
 #include <VBox/vmm/iom.h>
 #include <VBox/sup.h>
@@ -722 +723 @@
 VMMDECL(PGMMODE) PGMGetGuestMode(PVMCPU pVCpu)
 {
-    return pVCpu->pgm.s.enmGuestMode;
+    VMCPU_ASSERT_EMT(pVCpu);
+
+    bool fMmuEnabled = CPUMGetGuestMmuEnabled(pVCpu);
+    if (!fMmuEnabled)
+        return PGMMODE_NONE;
+
+    CPUMMODE enmCpuMode = CPUMGetGuestMode(pVCpu);
+    return   enmCpuMode == CPUMMODE_ARMV8_AARCH64
+           ? PGMMODE_VMSA_V8_64
+           : PGMMODE_VMSA_V8_32;
 }
 
@@ -728 +738 @@
 VMMDECL(PGMMODE) PGMGetShadowMode(PVMCPU pVCpu)
 {
-    return pVCpu->pgm.s.enmShadowMode;
+    RT_NOREF(pVCpu);
+    return PGMMODE_NONE; /* NEM doesn't need any shadow paging. */
 }
 
@@ -736 +747 @@
     VMCPU_ASSERT_EMT(pVCpu);
     Assert(pWalk);
-    AssertReleaseFailed();
+    //AssertReleaseFailed();
     RT_NOREF(pVCpu, GCPtr, pWalk);
     return VERR_NOT_IMPLEMENTED;