Changeset 17616 in vbox for trunk

Timestamp:

Mar 10, 2009 11:08:39 AM (16 years ago)

Author:

vboxsync

Message:

Inform SELM about shadow CR3 changes.

Location:

trunk

Files:

• include/VBox/selm.h (modified) (2 diffs)
• src/VBox/VMM/PGM.cpp (modified) (1 diff)
• src/VBox/VMM/SELM.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/PGMAllBth.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/SELMAll.cpp (modified) (1 diff)

trunk/include/VBox/selm.h

@@ -56 +56 @@
 VMMDECL(RTGCPTR)    SELMToFlat(PVM pVM, DIS_SELREG SelReg, PCPUMCTXCORE pCtxCore, RTGCPTR Addr);
 VMMDECL(RTGCPTR)    SELMToFlatBySel(PVM pVM, RTSEL Sel, RTGCPTR Addr);
+VMMDECL(void)       SELMShadowCR3Changed(PVM pVM);
 
 /** Flags for SELMToFlatEx().
@@ -135 +136 @@
 VMMR3DECL(int)      SELMR3InitFinalize(PVM pVM);
 VMMR3DECL(void)     SELMR3Relocate(PVM pVM);
-VMMR3DECL(void)     SELMR3PagingModeChanged(PVM pVM);
 VMMR3DECL(int)      SELMR3Term(PVM pVM);
 VMMR3DECL(void)     SELMR3Reset(PVM pVM);

trunk/src/VBox/VMM/PGM.cpp

@@ -3477 +3477 @@
             rc = VINF_SUCCESS;
     }
-
-    /*
-     * Notify SELM so it can update the TSSes with correct CR3s.
-     */
-    SELMR3PagingModeChanged(pVM);
 
     /* Notify HWACCM as well. */

trunk/src/VBox/VMM/SELM.cpp

@@ -496 +496 @@
 #endif
     }
-}
-
-
-/**
- * Notification callback which is called whenever there is a chance that a CR3
- * value might have changed.
- * This is called by PGM.
- *
- * @param   pVM       The VM handle
- */
-VMMR3DECL(void) SELMR3PagingModeChanged(PVM pVM)
-{
-    pVM->selm.s.Tss.cr3       = PGMGetHyperCR3(pVM);
-    pVM->selm.s.TssTrap08.cr3 = PGMGetInterRCCR3(pVM);
 }
 

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

@@ -4282 +4282 @@
     /* Set the current hypervisor CR3. */
     CPUMSetHyperCR3(pVM, PGMGetHyperCR3(pVM));
+    SELMShadowCR3Changed(pVM);
 
 #  ifdef IN_RC

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

@@ -1205 +1205 @@
 }
 
+
+
+/**
+ * Notification callback which is called whenever there is a chance that a CR3
+ * value might have changed.
+ * This is called by PGM.
+ *
+ * @param   pVM       The VM handle
+ */
+VMMDECL(void) SELMShadowCR3Changed(PVM pVM)
+{
+    pVM->selm.s.Tss.cr3 = PGMGetHyperCR3(pVM);
+    Assert(pVM->selm.s.TssTrap08.cr3 == PGMGetInterRCCR3(pVM));
+}