Changeset 73250 in vbox for trunk/src/VBox/VMM/VMMR3/PGMGst.h

Timestamp:

Jul 19, 2018 5:57:31 PM (7 years ago)

Author:

vboxsync

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

123856

Message:

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

File:

• trunk/src/VBox/VMM/VMMR3/PGMGst.h (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR3/PGMGst.h

@@ -45 +45 @@
      * Map and monitor CR3
      */
-    int rc = PGM_BTH_PFN(MapCR3, pVCpu)(pVCpu, GCPhysCR3);
-    return rc;
+    uintptr_t idxBth = pVCpu->pgm.s.idxBothModeData;
+    AssertReturn(idxBth < RT_ELEMENTS(g_aPgmBothModeData), VERR_PGM_MODE_IPE);
+    AssertReturn(g_aPgmBothModeData[idxBth].pfnMapCR3, VERR_PGM_MODE_IPE);
+    return g_aPgmBothModeData[idxBth].pfnMapCR3(pVCpu, GCPhysCR3);
 }
 
@@ -79 +81 @@
 PGM_GST_DECL(int, Exit)(PVMCPU pVCpu)
 {
-    int rc;
-
-    rc = PGM_BTH_PFN(UnmapCR3, pVCpu)(pVCpu);
-    return rc;
+    uintptr_t idxBth = pVCpu->pgm.s.idxBothModeData;
+    AssertReturn(idxBth < RT_ELEMENTS(g_aPgmBothModeData), VERR_PGM_MODE_IPE);
+    AssertReturn(g_aPgmBothModeData[idxBth].pfnUnmapCR3, VERR_PGM_MODE_IPE);
+    return g_aPgmBothModeData[idxBth].pfnUnmapCR3(pVCpu);
 }