Changeset 73249 in vbox for trunk/src/VBox/VMM/VMMR3/PGM.cpp

Timestamp:

Jul 19, 2018 5:29:09 PM (6 years ago)

Author:

vboxsync

Message:

PGM: Working on eliminating PGMMODEDATA and the corresponding PGMCPU section so we can do mode switching in ring-0. This third part starts dealing with shadow+guest paging pointers. bugref:9044

File:

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

trunk/src/VBox/VMM/VMMR3/PGM.cpp

@@ -3515 +3515 @@
     NOREF(idxShw);
 
-    pVCpu->pgm.s.idxBothModeData   = pgmModeDataIndexByMode(enmShw, enmGst);
+    uintptr_t idxBth = pVCpu->pgm.s.idxBothModeData = (idxShw - PGM_TYPE_FIRST_SHADOW) * PGM_TYPE_END + idxGst;
+    Assert(g_aPgmBothModeData[idxBth].uShwType == idxShw);
+    Assert(g_aPgmBothModeData[idxBth].uGstType == idxGst);
+    AssertPtr(g_aPgmBothModeData[idxBth].pfnInvalidatePage);
+    AssertPtr(g_aPgmBothModeData[idxBth].pfnSyncCR3);
+    AssertPtr(g_aPgmBothModeData[idxBth].pfnPrefetchPage);
+    AssertPtr(g_aPgmBothModeData[idxBth].pfnVerifyAccessSyncPage);
+    AssertPtr(g_aPgmBothModeData[idxBth].pfnMapCR3);
+    AssertPtr(g_aPgmBothModeData[idxBth].pfnUnmapCR3);
+    AssertPtr(g_aPgmBothModeData[idxBth].pfnEnter);
+    AssertPtr(g_aPgmBothModeData[idxBth].pfnRelocate);
+#ifdef VBOX_STRICT
+    AssertPtr(g_aPgmBothModeData[idxBth].pfnAssertCR3);
+#endif
+    NOREF(idxBth);
 
     /*