Changeset 1269 in vbox

Timestamp:

Mar 6, 2007 12:48:07 PM (18 years ago)

Author:

vboxsync

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

19215

Message:

Completed hwaccm world switch test

File:

• trunk/src/VBox/VMM/VMM.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMM.cpp

@@ -2938 +2938 @@
     int      rc;
     PCPUMCTX pHyperCtx, pGuestCtx;
+    RTGCPHYS CR3Phys = 0x0; /* fake address */
 
     if (!HWACCMR3IsAllowed(pVM))
@@ -2953 +2954 @@
     /* Enable mapping of the hypervisor into the shadow page table. */
     PGMR3ChangeShwPDMappings(pVM, true);
+
+    CPUMQueryHyperCtxPtr(pVM, &pHyperCtx);
+
+    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);
+    PGMSyncCR3(pVM, pHyperCtx->cr0, CR3Phys, pHyperCtx->cr4, true);
 
     VM_FF_CLEAR(pVM, VM_FF_TO_R3);
     VM_FF_CLEAR(pVM, VM_FF_TIMER);
     VM_FF_CLEAR(pVM, VM_FF_REQUEST);
-
-    CPUMQueryHyperCtxPtr(pVM, &pHyperCtx);
-
-    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;
 
     /*
@@ -3008 +3011 @@
             /* Copy the hypervisor context to make sure we have a valid guest context. */
             *pGuestCtx = *pHyperCtx;
-
-            pGuestCtx->csHid.u32Base  = 0;
-            pGuestCtx->csHid.u32Limit = 0xffffffff;
+            pGuestCtx->cr3 = CR3Phys;
+
+            VM_FF_CLEAR(pVM, VM_FF_TO_R3);
+            VM_FF_CLEAR(pVM, VM_FF_TIMER);
 
             uint64_t TickThisStart = ASMReadTSC();