Changeset 31177 in vbox

Timestamp:

Jul 28, 2010 5:17:31 PM (15 years ago)

Author:

vboxsync

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

64164

Message:

PGMR0DynMap.cpp: Applied PGMR0DYNMAP_2_VMCPU to the wrong type. Fixes crashes caused by the pgmR0DynMapHCPageCommon signature change.

File:

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

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

@@ -1185 +1185 @@
  * @param   HCPhys      The address of the page to be mapped.
  * @param   iPage       The page index pgmR0DynMapPage hashed HCPhys to.
- */
-static uint32_t pgmR0DynMapPageSlow(PPGMR0DYNMAP pThis, RTHCPHYS HCPhys, uint32_t iPage)
-{
-#ifdef VBOX_WITH_STATISTICS
-    PVMCPU pVCpu = PGMR0DYNMAP_2_VMCPU(pThis);
-#endif
+ * @param   pVCpu       The current CPU, for statistics.
+ */
+static uint32_t pgmR0DynMapPageSlow(PPGMR0DYNMAP pThis, RTHCPHYS HCPhys, uint32_t iPage, PVMCPU pVCpu)
+{
     STAM_COUNTER_INC(&pVCpu->pgm.s.CTX_SUFF(pStats)->StatR0DynMapPageSlow);
 
@@ -1285 +1283 @@
  * @param   HCPhys      The address of the page to be mapped.
  * @param   iRealCpu    The real cpu set index. (optimization)
+ * @param   pVCpu       The current CPU (for statistics).
  * @param   ppvPage     Where to the page address.
  */
-DECLINLINE(uint32_t) pgmR0DynMapPage(PPGMR0DYNMAP pThis, RTHCPHYS HCPhys, int32_t iRealCpu, void **ppvPage)
-{
-#ifdef VBOX_WITH_STATISTICS
-    PVMCPU              pVCpu   = PGMR0DYNMAP_2_VMCPU(pThis);
-#endif
+DECLINLINE(uint32_t) pgmR0DynMapPage(PPGMR0DYNMAP pThis, RTHCPHYS HCPhys, int32_t iRealCpu, PVMCPU pVCpu, void **ppvPage)
+{
     RTSPINLOCKTMP       Tmp     = RTSPINLOCKTMP_INITIALIZER;
     RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
@@ -1328 +1324 @@
             else
             {
-                iPage = pgmR0DynMapPageSlow(pThis, HCPhys, iPage);
+                iPage = pgmR0DynMapPageSlow(pThis, HCPhys, iPage, pVCpu);
                 if (RT_UNLIKELY(iPage == UINT32_MAX))
                 {
@@ -1842 +1838 @@
 {
     LogFlow(("pgmR0DynMapHCPageCommon: pSet=%p HCPhys=%RHp ppv=%p\n", pSet, HCPhys, ppv));
-#ifdef VBOX_WITH_STATISTICS
+    AssertMsg(pSet->iCpu == RTMpCpuIdToSetIndex(RTMpCpuId()), ("%d %d(%d) efl=%#x\n", pSet->iCpu, RTMpCpuIdToSetIndex(RTMpCpuId()), RTMpCpuId(), ASMGetFlags()));
     PVMCPU pVCpu = PGMR0DYNMAP_2_VMCPU(pSet);
-#endif
-    AssertMsg(pSet->iCpu == RTMpCpuIdToSetIndex(RTMpCpuId()), ("%d %d(%d) efl=%#x\n", pSet->iCpu, RTMpCpuIdToSetIndex(RTMpCpuId()), RTMpCpuId(), ASMGetFlags()));
 
     /*
@@ -1851 +1845 @@
      */
     void *pvPage;
-    uint32_t const  iPage = pgmR0DynMapPage(g_pPGMR0DynMap, HCPhys, pSet->iCpu, &pvPage);
+    uint32_t const  iPage = pgmR0DynMapPage(g_pPGMR0DynMap, HCPhys, pSet->iCpu, pVCpu, &pvPage);
     if (RT_UNLIKELY(iPage == UINT32_MAX))
     {