Changeset 8108 in vbox

Timestamp:

Apr 17, 2008 3:17:37 PM (17 years ago)

Author:

vboxsync

Message:

Updated check.
Added PGMGetHostMode.

Location:

trunk

Files:

• include/VBox/pgm.h (modified) (1 diff)
• src/VBox/VMM/PGM.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/CPUMAllRegs.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/PGMAll.cpp (modified) (1 diff)

trunk/include/VBox/pgm.h

@@ -330 +330 @@
 PGMDECL(PGMMODE) PGMGetGuestMode(PVM pVM);
 PGMDECL(PGMMODE) PGMGetShadowMode(PVM pVM);
+PGMDECL(PGMMODE) PGMGetHostMode(PVM pVM);
 PGMDECL(const char *) PGMGetModeName(PGMMODE enmMode);
 PGMDECL(int)    PGMHandlerPhysicalRegisterEx(PVM pVM, PGMPHYSHANDLERTYPE enmType, RTGCPHYS GCPhys, RTGCPHYS GCPhysLast,

trunk/src/VBox/VMM/PGM.cpp

@@ -2684 +2684 @@
                 case SUPPAGINGMODE_32_BIT:
                 case SUPPAGINGMODE_32_BIT_GLOBAL:
+                    AssertFailed(); /* this switcher is not well tested!! */
                     enmShadowMode = PGMMODE_PAE;
                     enmSwitcher = VMMSWITCHER_32_TO_PAE;
-                    break;
+                    return PGMMODE_INVALID;
 
                 case SUPPAGINGMODE_PAE:

trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp

@@ -1035 +1035 @@
                 return;
             }
-            if (PGMGetShadowMode(pVM) <= PGMMODE_32_BIT)
+            /* Remove this restriction once the 32->PAE switcher works properly. */
+            if (PGMGetHostMode(pVM) <= PGMMODE_32_BIT)
             {
                 LogRel(("WARNING: Can't turn on PAE when the host is in 32 bits paging mode!!\n"));

trunk/src/VBox/VMM/VMMAll/PGMAll.cpp

@@ -1117 +1117 @@
 }
 
+/**
+ * Gets the current host paging mode.
+ *
+ * @returns The current paging mode.
+ * @param   pVM             The VM handle.
+ */
+PGMDECL(PGMMODE) PGMGetHostMode(PVM pVM)
+{
+    switch (pVM->pgm.s.enmHostMode)
+    {
+        case SUPPAGINGMODE_32_BIT:
+        case SUPPAGINGMODE_32_BIT_GLOBAL:
+            return PGMMODE_32_BIT;
+
+        case SUPPAGINGMODE_PAE:
+        case SUPPAGINGMODE_PAE_GLOBAL:
+            return PGMMODE_PAE;
+
+        case SUPPAGINGMODE_PAE_NX:
+        case SUPPAGINGMODE_PAE_GLOBAL_NX:
+            return PGMMODE_PAE_NX;
+
+        case SUPPAGINGMODE_AMD64:
+        case SUPPAGINGMODE_AMD64_GLOBAL:
+            return PGMMODE_AMD64;
+
+        case SUPPAGINGMODE_AMD64_NX:
+        case SUPPAGINGMODE_AMD64_GLOBAL_NX:
+            return PGMMODE_AMD64_NX;
+
+        default: AssertMsgFailed(("enmHostMode=%d\n", pVM->pgm.s.enmHostMode)); break;
+    }
+
+    return PGMMODE_INVALID;
+}
+
 
 /**