Changeset 37137 in vbox

Timestamp:

May 18, 2011 2:49:39 PM (14 years ago)

Author:

vboxsync

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

71810

Message:

Remvoed the non-PGM_USE_RAMRANGE_SEARCH_TREES code.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PGMAllPhys.cpp (modified) (10 diffs)
• VMMR3/PGMPhys.cpp (modified) (5 diffs)
• include/PGMInternal.h (modified) (3 diffs)

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

@@ -180 +180 @@
     STAM_COUNTER_INC(&pVM->pgm.s.CTX_SUFF(pStats)->CTX_MID_Z(Stat,RamRangeTlbMisses));
 
-#ifdef PGM_USE_RAMRANGE_SEARCH_TREES
     PPGMRAMRANGE pRam = pVM->pgm.s.CTX_SUFF(pRamRangeTree);
     while (pRam)
@@ -196 +195 @@
     }
     return NULL;
-#else
-    PPGMRAMRANGE pRam = pVM->pgm.s.CTX_SUFF(pRamRangesX);
-    while (GCPhys > pRam->GCPhysLast)
-    {
-        pRam = pRam->CTX_SUFF(pNext);
-        if (!pRam)
-            return NULL;
-    }
-    if (GCPhys < pRam->GCPhys)
-        return NULL;
-
-    pVM->pgm.s.CTX_SUFF(apRamRangesTlb)[PGM_RAMRANGE_TLB_IDX(GCPhys)] = pRam;
-    return pRam;
-#endif
 }
 
@@ -222 +207 @@
     STAM_COUNTER_INC(&pVM->pgm.s.CTX_SUFF(pStats)->CTX_MID_Z(Stat,RamRangeTlbMisses));
 
-#ifdef PGM_USE_RAMRANGE_SEARCH_TREES
     PPGMRAMRANGE pLastLeft = NULL;
     PPGMRAMRANGE pRam = pVM->pgm.s.CTX_SUFF(pRamRangeTree);
@@ -242 +226 @@
     }
     return pLastLeft;
-#else
-    PPGMRAMRANGE pRam = pVM->pgm.s.CTX_SUFF(pRamRangesX);
-    while (GCPhys > pRam->GCPhysLast)
-    {
-        pRam = pRam->CTX_SUFF(pNext);
-        if (!pRam)
-            return NULL;
-    }
-    pVM->pgm.s.CTX_SUFF(apRamRangesTlb)[PGM_RAMRANGE_TLB_IDX(GCPhys)] = pRam;
-    return pRam;
-#endif
 }
 
@@ -265 +238 @@
     STAM_COUNTER_INC(&pVM->pgm.s.CTX_SUFF(pStats)->CTX_MID_Z(Stat,RamRangeTlbMisses));
 
-#ifdef PGM_USE_RAMRANGE_SEARCH_TREES
     PPGMRAMRANGE pRam = pVM->pgm.s.CTX_SUFF(pRamRangeTree);
     while (pRam)
@@ -281 +253 @@
             pRam = pRam->CTX_SUFF(pRight);
     }
-#else
-    for (PPGMRAMRANGE pRam = pVM->pgm.s.CTX_SUFF(pRamRangesX);
-         pRam;
-         pRam = pRam->CTX_SUFF(pNext))
-    {
-        RTGCPHYS off = GCPhys - pRam->GCPhys;
-        if (off < pRam->cb)
-        {
-            pVM->pgm.s.CTX_SUFF(apRamRangesTlb)[PGM_RAMRANGE_TLB_IDX(GCPhys)] = pRam;
-            return &pRam->aPages[off >> PAGE_SHIFT];
-        }
-    }
-#endif
     return NULL;
 }
@@ -307 +266 @@
     STAM_COUNTER_INC(&pVM->pgm.s.CTX_SUFF(pStats)->CTX_MID_Z(Stat,RamRangeTlbMisses));
 
-#ifdef PGM_USE_RAMRANGE_SEARCH_TREES
     PPGMRAMRANGE pRam = pVM->pgm.s.CTX_SUFF(pRamRangeTree);
     while (pRam)
@@ -324 +282 @@
             pRam = pRam->CTX_SUFF(pRight);
     }
-#else
-    for (PPGMRAMRANGE pRam = pVM->pgm.s.CTX_SUFF(pRamRangesX);
-         pRam;
-         pRam = pRam->CTX_SUFF(pNext))
-    {
-        RTGCPHYS off = GCPhys - pRam->GCPhys;
-        if (off < pRam->cb)
-        {
-            pVM->pgm.s.CTX_SUFF(apRamRangesTlb)[PGM_RAMRANGE_TLB_IDX(GCPhys)] = pRam;
-            *ppPage = &pRam->aPages[off >> PAGE_SHIFT];
-            return VINF_SUCCESS;
-        }
-    }
-#endif
 
     *ppPage = NULL;
@@ -353 +297 @@
     STAM_COUNTER_INC(&pVM->pgm.s.CTX_SUFF(pStats)->CTX_MID_Z(Stat,RamRangeTlbMisses));
 
-#ifdef PGM_USE_RAMRANGE_SEARCH_TREES
     PPGMRAMRANGE pRam = pVM->pgm.s.CTX_SUFF(pRamRangeTree);
     while (pRam)
@@ -371 +314 @@
             pRam = pRam->CTX_SUFF(pRight);
     }
-#else
-    for (PPGMRAMRANGE pRam = pVM->pgm.s.CTX_SUFF(pRamRangesX);
-         pRam;
-         pRam = pRam->CTX_SUFF(pNext))
-    {
-        RTGCPHYS off = GCPhys - pRam->GCPhys;
-        if (off < pRam->cb)
-        {
-            pVM->pgm.s.CTX_SUFF(apRamRangesTlb)[PGM_RAMRANGE_TLB_IDX(GCPhys)] = pRam;
-            *ppRam  = pRam;
-            *ppPage = &pRam->aPages[off >> PAGE_SHIFT];
-            return VINF_SUCCESS;
-        }
-    }
-#endif
 
     *ppRam  = NULL;

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

@@ -578 +578 @@
 }
 
-#ifdef PGM_USE_RAMRANGE_SEARCH_TREES
 
 #define MAKE_LEAF(a_pNode) \
@@ -720 +719 @@
 #undef INSERT_LEFT
 #undef INSERT_RIGHT
-#endif /* PGM_USE_RAMRANGE_SEARCH_TREES */
 
 /**
@@ -770 +768 @@
     ASMAtomicIncU32(&pVM->pgm.s.idRamRangesGen);
 
-#ifdef PGM_USE_RAMRANGE_SEARCH_TREES
     pgmR3PhysRebuildRamRangeSearchTrees(pVM);
-#endif
 }
 
@@ -810 +806 @@
     ASMAtomicIncU32(&pVM->pgm.s.idRamRangesGen);
 
-#ifdef PGM_USE_RAMRANGE_SEARCH_TREES
     pgmR3PhysRebuildRamRangeSearchTrees(pVM);
-#endif
     pgmUnlock(pVM);
 }
@@ -848 +842 @@
     ASMAtomicIncU32(&pVM->pgm.s.idRamRangesGen);
 
-#ifdef PGM_USE_RAMRANGE_SEARCH_TREES
     pgmR3PhysRebuildRamRangeSearchTrees(pVM);
-#endif
     pgmUnlock(pVM);
 }

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

@@ -1264 +1264 @@
 
 
-/** Enables the RAM range search trees. */
-#define PGM_USE_RAMRANGE_SEARCH_TREES
-
 /**
  * RAM range for GC Phys to HC Phys conversion.
@@ -1302 +1299 @@
     RCPTRTYPE(struct PGMRAMRANGE *)     pSelfRC;
 
-#ifdef PGM_USE_RAMRANGE_SEARCH_TREES
     /** Alignment padding. */
     RTRCPTR                             Alignment0;
@@ -1317 +1313 @@
     /** Pointer to the right search three node - raw-mode context. */
     RCPTRTYPE(struct PGMRAMRANGE *)     pRightRC;
-#endif
 
     /** Padding to make aPage aligned on sizeof(PGMPAGE). */
-#ifdef PGM_USE_RAMRANGE_SEARCH_TREES
-# if HC_ARCH_BITS == 32
+#if HC_ARCH_BITS == 32
     uint32_t                            au32Alignment2[HC_ARCH_BITS == 32 ? 2 : 0];
-# endif
-#else
-    uint32_t                            au32Alignment2[HC_ARCH_BITS == 32 ? 1 : 3];
 #endif
     /** Array of physical guest page tracking structures. */