Changeset 20808 in vbox

Timestamp:

Jun 23, 2009 8:43:53 AM (16 years ago)

Author:

vboxsync

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

48945

Message:

Removed dead code

Location:

trunk/src/VBox/VMM

Files:

• PGM.cpp (modified) (1 diff)
• PGMHandler.cpp (modified) (1 diff)
• PGMInternal.h (modified) (2 diffs)
• PGMPhysRWTmpl.h (modified) (2 diffs)
• VMMAll/PGMAllHandler.cpp (modified) (4 diffs)
• testcase/tstVMStructGC.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PGM.cpp

@@ -3031 +3031 @@
         }
 
-        pPGM->fPhysCacheFlushPending = true;
         pgmR3HandlerPhysicalUpdateAll(pVM);
 

trunk/src/VBox/VMM/PGMHandler.cpp

@@ -390 +390 @@
             PVMCPU pVCpu = VMMGetCpu(pVM);
 
-            pVM->pgm.s.fPhysCacheFlushPending = true;
-
             pVCpu->pgm.s.fSyncFlags |= PGM_SYNC_UPDATE_PAGE_BIT_VIRTUAL | PGM_SYNC_CLEAR_PGM_POOL;
             VMCPU_FF_SET(pVCpu, VMCPU_FF_PGM_SYNC_CR3);

trunk/src/VBox/VMM/PGMInternal.h

@@ -84 +84 @@
 #define PGM_MAX_PHYSCACHE_ENTRIES       64
 #define PGM_MAX_PHYSCACHE_ENTRIES_MASK  (PGM_MAX_PHYSCACHE_ENTRIES-1)
-
-/**
- * Enable caching of PGMR3PhysRead/WriteByte/Word/Dword
- */
-#define PGM_PHYSMEMACCESS_CACHING
 
 /** @def PGMPOOL_WITH_CACHE
@@ -2371 +2366 @@
     bool                            fNoMorePhysWrites;
 
-    /** Flush the cache on the next access. */
-    bool                            fPhysCacheFlushPending;
-/** @todo r=bird: Fix member names!*/
-    /** PGMPhysRead cache */
-    PGMPHYSCACHE                    pgmphysreadcache;
-    /** PGMPhysWrite cache */
-    PGMPHYSCACHE                    pgmphyswritecache;
-
     /**
      * Data associated with managing the ring-3 mappings of the allocation chunks.

trunk/src/VBox/VMM/PGMPhysRWTmpl.h

@@ -32 +32 @@
 VMMDECL(PGMPHYS_DATATYPE) PGMPHYSFN_READNAME(PVM pVM, RTGCPHYS GCPhys)
 {
-    uint32_t iCacheIndex;
-
     Assert(VM_IS_EMT(pVM));
-
-#ifdef PGM_PHYSMEMACCESS_CACHING
-    if (pVM->pgm.s.fPhysCacheFlushPending)
-    {
-        pVM->pgm.s.pgmphysreadcache.aEntries  = 0;   /* flush cache; physical or virtual handlers have changed */
-        pVM->pgm.s.pgmphyswritecache.aEntries = 0;   /* flush cache; physical or virtual handlers have changed */
-        pVM->pgm.s.fPhysCacheFlushPending = false;
-    }
-    else
-    if (    ASMBitTest(&pVM->pgm.s.pgmphysreadcache.aEntries, (iCacheIndex = ((GCPhys >> PAGE_SHIFT) & PGM_MAX_PHYSCACHE_ENTRIES_MASK)))
-        &&  pVM->pgm.s.pgmphysreadcache.Entry[iCacheIndex].GCPhys == PHYS_PAGE_ADDRESS(GCPhys)
-#if PGMPHYS_DATASIZE != 1
-        &&  PHYS_PAGE_ADDRESS(GCPhys) == PHYS_PAGE_ADDRESS(GCPhys + sizeof(PGMPHYS_DATATYPE) - 1) /** (GCPhys & PAGE_OFFSET_MASK) <= PAGE_SIZE - sizeof(PGMPHYS_DATATYPE) */
-#endif
-       )
-    {
-        RTGCPHYS off = GCPhys - pVM->pgm.s.pgmphysreadcache.Entry[iCacheIndex].GCPhys;
-        return *(PGMPHYS_DATATYPE *)(pVM->pgm.s.pgmphysreadcache.Entry[iCacheIndex].pbR3 + off);
-    }
-#endif /* PGM_PHYSMEMACCESS_CACHING */
     PGMPHYS_DATATYPE val;
-
     PGMPhysRead(pVM, GCPhys, &val, sizeof(val));
     return val;
@@ -74 +51 @@
 VMMDECL(void) PGMPHYSFN_WRITENAME(PVM pVM, RTGCPHYS GCPhys, PGMPHYS_DATATYPE val)
 {
-    uint32_t iCacheIndex;
-
     Assert(VM_IS_EMT(pVM));
-
-#ifdef PGM_PHYSMEMACCESS_CACHING
-    if (pVM->pgm.s.fPhysCacheFlushPending)
-    {
-        pVM->pgm.s.pgmphysreadcache.aEntries  = 0;   /* flush cache; physical or virtual handlers have changed */
-        pVM->pgm.s.pgmphyswritecache.aEntries = 0;   /* flush cache; physical or virtual handlers have changed */
-        pVM->pgm.s.fPhysCacheFlushPending = false;
-    }
-    else
-    if (    ASMBitTest(&pVM->pgm.s.pgmphyswritecache.aEntries, (iCacheIndex = ((GCPhys >> PAGE_SHIFT) & PGM_MAX_PHYSCACHE_ENTRIES_MASK)))
-        &&  pVM->pgm.s.pgmphyswritecache.Entry[iCacheIndex].GCPhys == PHYS_PAGE_ADDRESS(GCPhys)
-#if PGMPHYS_DATASIZE != 1
-        &&  PHYS_PAGE_ADDRESS(GCPhys) == PHYS_PAGE_ADDRESS(GCPhys + sizeof(val) - 1)
-#endif
-       )
-    {
-        RTGCPHYS off = GCPhys - pVM->pgm.s.pgmphyswritecache.Entry[iCacheIndex].GCPhys;
-        *(PGMPHYS_DATATYPE *)(pVM->pgm.s.pgmphyswritecache.Entry[iCacheIndex].pbR3 + off) = val;
-        return;
-    }
-#endif /* PGM_PHYSMEMACCESS_CACHING */
     PGMPhysWrite(pVM, GCPhys, &val, sizeof(val));
 }

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

@@ -167 +167 @@
         if (rc == VINF_PGM_SYNC_CR3)
             rc = VINF_PGM_GCPHYS_ALIASED;
-        pVM->pgm.s.fPhysCacheFlushPending = true;
         pgmUnlock(pVM);
         HWACCMFlushTLBOnAllVCpus(pVM);
@@ -421 +420 @@
     HWACCMFlushTLBOnAllVCpus(pVM);
 # endif
-    pVM->pgm.s.fPhysCacheFlushPending = true;
 
     /*
@@ -549 +547 @@
                      */
                     rc = pgmHandlerPhysicalSetRamFlagsAndFlushShadowPTs(pVM, pCur, pRam);
-                    pVM->pgm.s.fPhysCacheFlushPending = true;
                     pgmUnlock(pVM);
 
@@ -854 +851 @@
                      */
                     rc = pgmHandlerPhysicalSetRamFlagsAndFlushShadowPTs(pVM, pCur, pRam);
-                    pVM->pgm.s.fPhysCacheFlushPending = true;
                     HWACCMFlushTLBOnAllVCpus(pVM);
                 }

trunk/src/VBox/VMM/testcase/tstVMStructGC.cpp

@@ -531 +531 @@
     GEN_CHECK_OFF(PGM, pPoolRC);
     GEN_CHECK_OFF(PGM, fNoMorePhysWrites);
-    GEN_CHECK_OFF(PGM, fPhysCacheFlushPending);
-    GEN_CHECK_OFF(PGM, pgmphysreadcache);
-    GEN_CHECK_OFF(PGM, pgmphyswritecache);
     GEN_CHECK_OFF(PGM, ChunkR3Map);
     GEN_CHECK_OFF(PGM, ChunkR3Map.pTree);