Changeset 73268 in vbox

Timestamp:

Jul 20, 2018 2:49:05 PM (7 years ago)

Author:

vboxsync

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

123875

Message:

PGM: Working on consolidating templated code... bugref:9044

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PGMAll.cpp (modified) (3 diffs)
• VMMAll/PGMAllGst.h (modified) (1 diff)
• VMMAll/PGMAllShw.h (modified) (1 diff)
• VMMR3/PGM.cpp (modified) (1 diff)
• VMMR3/PGMGst.h (modified) (1 diff)
• VMMR3/PGMShw.h (modified) (1 diff)
• include/PGMInternal.h (modified) (2 diffs)

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

@@ -593 +593 @@
 PGMMODEDATASHW const g_aPgmShadowModeData[PGM_SHADOW_MODE_DATA_ARRAY_SIZE] =
 {
-    { UINT8_MAX, NULL, NULL, NULL, NULL, NULL }, /* 0 */
-    { UINT8_MAX, NULL, NULL, NULL, NULL, NULL }, /* PGM_TYPE_REAL */
-    { UINT8_MAX, NULL, NULL, NULL, NULL, NULL }, /* PGM_TYPE_PROT */
+    { UINT8_MAX, NULL, NULL, NULL, NULL }, /* 0 */
+    { UINT8_MAX, NULL, NULL, NULL, NULL }, /* PGM_TYPE_REAL */
+    { UINT8_MAX, NULL, NULL, NULL, NULL }, /* PGM_TYPE_PROT */
     {
         PGM_TYPE_32BIT,
@@ -689 +689 @@
 # define PGMMODEDATABTH_NULL_ENTRY()    { UINT32_MAX, UINT32_MAX, NULL, NULL, NULL, NULL, NULL, NULL }
 # define PGMMODEDATABTH_ENTRY(uShwT, uGstT, Nm) \
-    { uShwT, uGstT, Nm(InvalidatePage), Nm(SyncCR3), Nm(PrefetchPage), Nm(VerifyAccessSyncPage), Nm(MapCR3), Nm(UnmapCR3), Nm(Enter), Nm(Relocate), }
+    { uShwT, uGstT, Nm(InvalidatePage), Nm(SyncCR3), Nm(PrefetchPage), Nm(VerifyAccessSyncPage), Nm(MapCR3), Nm(UnmapCR3), Nm(Enter), }
 
 #elif defined(IN_RING3) && defined(VBOX_STRICT)
 # define PGMMODEDATABTH_NULL_ENTRY()    { UINT32_MAX, UINT32_MAX, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
 # define PGMMODEDATABTH_ENTRY(uShwT, uGstT, Nm) \
-    { uShwT, uGstT, Nm(InvalidatePage), Nm(SyncCR3), Nm(PrefetchPage), Nm(VerifyAccessSyncPage), Nm(MapCR3), Nm(UnmapCR3), Nm(Enter), Nm(Relocate), Nm(AssertCR3) }
+    { uShwT, uGstT, Nm(InvalidatePage), Nm(SyncCR3), Nm(PrefetchPage), Nm(VerifyAccessSyncPage), Nm(MapCR3), Nm(UnmapCR3), Nm(Enter), Nm(AssertCR3) }
 
 #else
@@ -3248 +3248 @@
     AssertPtrReturn(g_aPgmBothModeData[idxNewBth].pfnUnmapCR3, VERR_PGM_MODE_IPE);
     AssertPtrReturn(g_aPgmBothModeData[idxNewBth].pfnEnter, VERR_PGM_MODE_IPE);
-#ifdef IN_RING3
-    AssertPtrReturn(g_aPgmBothModeData[idxNewBth].pfnRelocate, VERR_PGM_MODE_IPE);
-#endif
 #ifdef VBOX_STRICT
     AssertPtrReturn(g_aPgmBothModeData[idxNewBth].pfnAssertCR3, VERR_PGM_MODE_IPE);

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

@@ -740 +740 @@
 }
 
+
+#ifdef IN_RING3
+/**
+ * Relocate any GC pointers related to guest mode paging.
+ *
+ * @returns VBox status code.
+ * @param   pVCpu       The cross context virtual CPU structure.
+ * @param   offDelta    The relocation offset.
+ */
+PGM_GST_DECL(int, Relocate)(PVMCPU pVCpu, RTGCPTR offDelta)
+{
+    pVCpu->pgm.s.pGst32BitPdRC += offDelta;
+    for (unsigned i = 0; i < RT_ELEMENTS(pVCpu->pgm.s.apGstPaePDsRC); i++)
+        pVCpu->pgm.s.apGstPaePDsRC[i] += offDelta;
+    pVCpu->pgm.s.pGstPaePdptRC += offDelta;
+
+    return VINF_SUCCESS;
+}
+#endif

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

@@ -582 +582 @@
 }
 
+
+#ifdef IN_RING3
+/**
+ * Relocate any GC pointers related to shadow mode paging.
+ *
+ * @returns VBox status code.
+ * @param   pVCpu       The cross context virtual CPU structure.
+ * @param   offDelta    The relocation offset.
+ */
+PGM_SHW_DECL(int, Relocate)(PVMCPU pVCpu, RTGCPTR offDelta)
+{
+    pVCpu->pgm.s.pShwPageCR3RC += offDelta;
+    return VINF_SUCCESS;
+}
+#endif
+

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

@@ -2601 +2601 @@
         else
             AssertFailed();
-
-        uintptr_t idxBth = pVCpu->pgm.s.idxBothModeData;
-        if (    idxBth < RT_ELEMENTS(g_aPgmBothModeData)
-            && g_aPgmBothModeData[idxBth].pfnRelocate)
-            g_aPgmBothModeData[idxBth].pfnRelocate(pVCpu, offDelta);
-        else
-            AssertFailed();
     }
 

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

@@ -33 +33 @@
 
 
-/**
- * Relocate any GC pointers related to guest mode paging.
- *
- * @returns VBox status code.
- * @param   pVCpu       The cross context virtual CPU structure.
- * @param   offDelta    The relocation offset.
- */
-PGM_GST_DECL(int, Relocate)(PVMCPU pVCpu, RTGCPTR offDelta)
-{
-    pVCpu->pgm.s.pGst32BitPdRC += offDelta;
 
-    for (unsigned i = 0; i < RT_ELEMENTS(pVCpu->pgm.s.apGstPaePDsRC); i++)
-    {
-        pVCpu->pgm.s.apGstPaePDsRC[i] += offDelta;
-    }
-    pVCpu->pgm.s.pGstPaePdptRC += offDelta;
-
-    return VINF_SUCCESS;
-}
-

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

@@ -120 +120 @@
 RT_C_DECLS_END
 
-
-/**
- * Relocate any GC pointers related to shadow mode paging.
- *
- * @returns VBox status code.
- * @param   pVCpu       The cross context virtual CPU structure.
- * @param   offDelta    The relocation offset.
- */
-PGM_SHW_DECL(int, Relocate)(PVMCPU pVCpu, RTGCPTR offDelta)
-{
-    pVCpu->pgm.s.pShwPageCR3RC += offDelta;
-    return VINF_SUCCESS;
-}
-

trunk/src/VBox/VMM/include/PGMInternal.h

@@ -3158 +3158 @@
     DECLCALLBACKMEMBER(int,         pfnEnter)(PVMCPU pVCpu, bool fIs64BitsPagingMode);
     DECLCALLBACKMEMBER(int,         pfnExit)(PVMCPU pVCpu);
+#ifdef IN_RING3
     DECLCALLBACKMEMBER(int,         pfnRelocate)(PVMCPU pVCpu, RTGCPTR offDelta); /**< Only in ring-3. */
+#endif
 } PGMMODEDATASHW;
 
@@ -3188 +3190 @@
     DECLCALLBACKMEMBER(int,         pfnUnmapCR3)(PVMCPU pVCpu);
     DECLCALLBACKMEMBER(int,         pfnEnter)(PVMCPU pVCpu, RTGCPHYS GCPhysCR3);
-#ifdef IN_RING3
-    DECLCALLBACKMEMBER(int,         pfnRelocate)(PVMCPU pVCpu, RTGCPTR offDelta);
-#else
+#ifndef IN_RING3
     DECLCALLBACKMEMBER(int,         pfnTrap0eHandler)(PVMCPU pVCpu, RTGCUINT uErr, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, bool *pfLockTaken);
 #endif