Changeset 7735 in vbox

Timestamp:

Apr 4, 2008 9:14:57 AM (17 years ago)

Author:

vboxsync

Message:

Include EFER msr in all PGMChangeMode calls.

Location:

trunk/src/VBox/VMM

Files:

• EM.cpp (modified) (1 diff)
• VMMAll/EMAll.cpp (modified) (2 diffs)
• VMMTests.cpp (modified) (1 diff)

trunk/src/VBox/VMM/EM.cpp

@@ -2115 +2115 @@
          */
         case VINF_PGM_CHANGE_MODE:
-            rc = PGMChangeMode(pVM, pCtx->cr0, pCtx->cr4, 0);
+            rc = PGMChangeMode(pVM, pCtx->cr0, pCtx->cr4, pCtx->msrEFER);
             if (VBOX_SUCCESS(rc))
                 rc = VINF_EM_RESCHEDULE;

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

@@ -1674 +1674 @@
                 AssertRCReturn(rc, rc);
             }
-            return PGMChangeMode(pVM, CPUMGetGuestCR0(pVM), CPUMGetGuestCR4(pVM), 0);
+            return PGMChangeMode(pVM, CPUMGetGuestCR0(pVM), CPUMGetGuestCR4(pVM), CPUMGetGuestEFER(pVM));
 
         case USE_REG_CR2:
@@ -1714 +1714 @@
             }
 # endif
-            return PGMChangeMode(pVM, CPUMGetGuestCR0(pVM), CPUMGetGuestCR4(pVM), 0);
+            return PGMChangeMode(pVM, CPUMGetGuestCR0(pVM), CPUMGetGuestCR4(pVM), CPUMGetGuestEFER(pVM));
 
         default:

trunk/src/VBox/VMM/VMMTests.cpp

@@ -471 +471 @@
     pHyperCtx->cr0 = X86_CR0_PE | X86_CR0_WP | X86_CR0_PG | X86_CR0_TS | X86_CR0_ET | X86_CR0_NE | X86_CR0_MP;
     pHyperCtx->cr4 = X86_CR4_PGE | X86_CR4_OSFSXR | X86_CR4_OSXMMEEXCPT;
-    PGMChangeMode(pVM, pHyperCtx->cr0, pHyperCtx->cr4, 0);
+    PGMChangeMode(pVM, pHyperCtx->cr0, pHyperCtx->cr4, pHyperCtx->msrEFER);
     PGMSyncCR3(pVM, pHyperCtx->cr0, CR3Phys, pHyperCtx->cr4, true);