Changeset 31170 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Jul 28, 2010 3:20:02 PM (15 years ago)

Author:

vboxsync

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

64156

Message:

PGM: More inline cleanup (prep for tracking dynamic mappings in raw-mode).

File:

• trunk/src/VBox/VMM/VMMR0/PGMR0DynMap.cpp (modified) (10 diffs)

trunk/src/VBox/VMM/VMMR0/PGMR0DynMap.cpp

@@ -81 +81 @@
 #endif
 
+/** Converts a PGMCPUM::AutoSet pointer into a PVMCPU. */
+#define PGMR0DYNMAP_2_VMCPU(pSet)           (RT_FROM_MEMBER(pSet, VMCPU, pgm.s.AutoSet))
+
+/** Converts a PGMCPUM::AutoSet pointer into a PVM. */
+#define PGMR0DYNMAP_2_VM(pSet)              (PGMR0DYNMAP_2_VMCPU(pSet)->CTX_SUFF(pVM))
+
 
 /*******************************************************************************
@@ -1179 +1185 @@
  * @param   HCPhys      The address of the page to be mapped.
  * @param   iPage       The page index pgmR0DynMapPage hashed HCPhys to.
- * @param   pVM         The shared VM structure, for statistics only.
- */
-static uint32_t pgmR0DynMapPageSlow(PPGMR0DYNMAP pThis, RTHCPHYS HCPhys, uint32_t iPage, PVM pVM)
+ */
+static uint32_t pgmR0DynMapPageSlow(PPGMR0DYNMAP pThis, RTHCPHYS HCPhys, uint32_t iPage)
 {
 #ifdef VBOX_WITH_STATISTICS
-    PVMCPU pVCpu = VMMGetCpu(pVM);
+    PVMCPU pVCpu = PGMR0DYNMAP_2_VMCPU(pThis);
 #endif
     STAM_COUNTER_INC(&pVCpu->pgm.s.CTX_SUFF(pStats)->StatR0DynMapPageSlow);
@@ -1280 +1285 @@
  * @param   HCPhys      The address of the page to be mapped.
  * @param   iRealCpu    The real cpu set index. (optimization)
- * @param   pVM         The shared VM structure, for statistics only.
  * @param   ppvPage     Where to the page address.
  */
-DECLINLINE(uint32_t) pgmR0DynMapPage(PPGMR0DYNMAP pThis, RTHCPHYS HCPhys, int32_t iRealCpu, PVM pVM, void **ppvPage)
+DECLINLINE(uint32_t) pgmR0DynMapPage(PPGMR0DYNMAP pThis, RTHCPHYS HCPhys, int32_t iRealCpu, void **ppvPage)
 {
 #ifdef VBOX_WITH_STATISTICS
-    PVMCPU              pVCpu   = VMMGetCpu(pVM);
+    PVMCPU              pVCpu   = PGMR0DYNMAP_2_VMCPU(pThis);
 #endif
     RTSPINLOCKTMP       Tmp     = RTSPINLOCKTMP_INITIALIZER;
@@ -1324 +1328 @@
             else
             {
-                iPage = pgmR0DynMapPageSlow(pThis, HCPhys, iPage, pVM);
+                iPage = pgmR0DynMapPageSlow(pThis, HCPhys, iPage);
                 if (RT_UNLIKELY(iPage == UINT32_MAX))
                 {
@@ -1829 +1833 @@
  *
  * @returns VINF_SUCCESS, bails out to ring-3 on failure.
- * @param   pVM         The shared VM structure (for statistics).
  * @param   pSet        The set.
  * @param   HCPhys      The physical address of the page.
@@ -1836 +1839 @@
  * @remarks This is a very hot path.
  */
-int pgmR0DynMapHCPageCommon(PVM pVM, PPGMMAPSET pSet, RTHCPHYS HCPhys, void **ppv)
-{
-    LogFlow(("pgmR0DynMapHCPageCommon: pVM=%p pSet=%p HCPhys=%RHp ppv=%p\n",
-             pVM, pSet, HCPhys, ppv));
+int pgmR0DynMapHCPageCommon(PPGMMAPSET pSet, RTHCPHYS HCPhys, void **ppv)
+{
+    LogFlow(("pgmR0DynMapHCPageCommon: pSet=%p HCPhys=%RHp ppv=%p\n", pSet, HCPhys, ppv));
 #ifdef VBOX_WITH_STATISTICS
-    PVMCPU pVCpu = VMMGetCpu(pVM);
+    PVMCPU pVCpu = PGMR0DYNMAP_2_VMCPU(pSet);
 #endif
     AssertMsg(pSet->iCpu == RTMpCpuIdToSetIndex(RTMpCpuId()), ("%d %d(%d) efl=%#x\n", pSet->iCpu, RTMpCpuIdToSetIndex(RTMpCpuId()), RTMpCpuId(), ASMGetFlags()));
@@ -1849 +1851 @@
      */
     void *pvPage;
-    uint32_t const  iPage = pgmR0DynMapPage(g_pPGMR0DynMap, HCPhys, pSet->iCpu, pVM, &pvPage);
+    uint32_t const  iPage = pgmR0DynMapPage(g_pPGMR0DynMap, HCPhys, pSet->iCpu, &pvPage);
     if (RT_UNLIKELY(iPage == UINT32_MAX))
     {
@@ -1855 +1857 @@
                          g_pPGMR0DynMap->cLoad, g_pPGMR0DynMap->cMaxLoad, g_pPGMR0DynMap->cPages, g_pPGMR0DynMap->cGuardPages);
         if (!g_fPGMR0DynMapTestRunning)
-            VMMRZCallRing3NoCpu(pVM, VMMCALLRING3_VM_R0_ASSERTION, 0);
+            VMMRZCallRing3NoCpu(PGMR0DYNMAP_2_VM(pSet), VMMCALLRING3_VM_R0_ASSERTION, 0);
         *ppv = NULL;
         return VERR_PGM_DYNMAP_FAILED;
@@ -1951 +1953 @@
                 RTAssertMsg2Weak("PGMDynMapHCPage: set is full!\n");
                 if (!g_fPGMR0DynMapTestRunning)
-                    VMMRZCallRing3NoCpu(pVM, VMMCALLRING3_VM_R0_ASSERTION, 0);
+                    VMMRZCallRing3NoCpu(PGMR0DYNMAP_2_VM(pSet), VMMCALLRING3_VM_R0_ASSERTION, 0);
                 *ppv = NULL;
                 return VERR_PGM_DYNMAP_FULL_SET;
@@ -1987 +1989 @@
      * Call common code.
      */
-    int rc = pgmR0DynMapHCPageCommon(pVM, pSet, HCPhys, ppv);
+    int rc = pgmR0DynMapHCPageCommon(pSet, HCPhys, ppv);
 
     STAM_PROFILE_STOP(&pVCpu->pgm.s.StatR0DynMapHCPage, a);