Changeset 16859 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Feb 17, 2009 4:19:51 PM (16 years ago)

Author:

vboxsync

Message:

Load hypervisor CR3 from CPUM (instead of hardcoded fixups in the switchers). Dangerous change. Watch for regressions.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• CPUMAllRegs.cpp (modified) (1 diff)
• PGMAllBth.h (modified) (1 diff)

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

@@ -126 +126 @@
 {
     pVM->cpum.s.Hyper.cr3 = cr3;
+
+#ifdef IN_RC
+    /* Update the current CR3. */
+    ASMSetCR3(cr3);
+#endif
+}
+
+VMMDECL(uint32_t) CPUMGetHyperCR3(PVM pVM)
+{
+    return pVM->cpum.s.Hyper.cr3;
 }
 

trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

@@ -4672 +4672 @@
 #  endif
 
-#  ifdef IN_RC
-    /* Update the current CR3. */
-    ASMSetCR3(pVM->pgm.s.HCPhysShwCR3);
-#  endif
+    /* Set the current hypervisor CR3. */
+    CPUMSetHyperCR3(pVM, PGMGetHyperCR3(pVM));
 
     /* Clean up the old CR3 root. */