Changeset 12685 in vbox for trunk/src

Timestamp:

Sep 24, 2008 1:24:39 PM (16 years ago)

Author:

vboxsync

Message:

Must select a valid switcher even if not used.

File:

• trunk/src/VBox/VMM/PGM.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PGM.cpp

@@ -2990 +2990 @@
              */
             enmShadowMode = PGMMODE_32_BIT;
-            enmSwitcher = VMMSWITCHER_INVALID;
+
+            switch (enmHostMode)
+            {
+                case SUPPAGINGMODE_32_BIT:
+                case SUPPAGINGMODE_32_BIT_GLOBAL:
+                    enmSwitcher = VMMSWITCHER_32_TO_32;
+                    break;
+
+                case SUPPAGINGMODE_PAE:
+                case SUPPAGINGMODE_PAE_NX:
+                case SUPPAGINGMODE_PAE_GLOBAL:
+                case SUPPAGINGMODE_PAE_GLOBAL_NX:
+                    enmSwitcher = VMMSWITCHER_PAE_TO_PAE;
+                    break;
+
+                case SUPPAGINGMODE_AMD64:
+                case SUPPAGINGMODE_AMD64_GLOBAL:
+                case SUPPAGINGMODE_AMD64_NX:
+                case SUPPAGINGMODE_AMD64_GLOBAL_NX:
+                    /* Not correct, but not relevant as we don't use switchers in real or protected mode without paging. */
+                    enmSwitcher = VMMSWITCHER_AMD64_TO_PAE;
+                    break;
+
+                default: AssertMsgFailed(("enmHostMode=%d\n", enmHostMode)); break;
+            }
             break;