Changeset 13098 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Oct 8, 2008 5:10:32 PM (16 years ago)

Author:

vboxsync

Message:

#1865: More PGM changes.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PGMAll.cpp (modified) (7 diffs)
• PGMAllBth.h (modified) (5 diffs)
• PGMAllPhys.cpp (modified) (4 diffs)

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

@@ -1161 +1161 @@
 VMMDECL(int)  PGMGstModifyPage(PVM pVM, RTGCPTR GCPtr, size_t cb, uint64_t fFlags, uint64_t fMask)
 {
-    STAM_PROFILE_START(&CTXMID(pVM->pgm.s.Stat,GstModifyPage), a);
+    STAM_PROFILE_START(&pVM->pgm.s.CTX_MID_Z(Stat,GstModifyPage), a);
 
     /*
@@ -1169 +1169 @@
     {
         AssertMsgFailed(("fFlags=%#llx\n", fFlags));
-        STAM_PROFILE_STOP(&CTXMID(pVM->pgm.s.Stat,GstModifyPage), a);
+        STAM_PROFILE_STOP(&pVM->pgm.s.CTX_MID_Z(Stat,GstModifyPage), a);
         return VERR_INVALID_PARAMETER;
     }
@@ -1176 +1176 @@
     {
         AssertFailed();
-        STAM_PROFILE_STOP(&CTXMID(pVM->pgm.s.Stat,GstModifyPage), a);
+        STAM_PROFILE_STOP(&pVM->pgm.s.CTX_MID_Z(Stat,GstModifyPage), a);
         return VERR_INVALID_PARAMETER;
     }
@@ -1194 +1194 @@
     int rc = PGM_GST_PFN(ModifyPage, pVM)(pVM, (RTGCUINTPTR)GCPtr, cb, fFlags, fMask);
 
-    STAM_PROFILE_STOP(&CTXMID(pVM->pgm.s.Stat,GstModifyPage), a);
+    STAM_PROFILE_STOP(&pVM->pgm.s.CTX_MID_Z(Stat,GstModifyPage), a);
     return rc;
 }
@@ -1402 +1402 @@
 VMMDECL(int) PGMFlushTLB(PVM pVM, uint64_t cr3, bool fGlobal)
 {
-    STAM_PROFILE_START(&pVM->pgm.s.StatFlushTLB, a);
+    STAM_PROFILE_START(&pVM->pgm.s.CTX_MID_Z(Stat,FlushTLB), a);
 
     /*
@@ -1434 +1434 @@
         }
         if (fGlobal)
-            STAM_COUNTER_INC(&pVM->pgm.s.StatFlushTLBNewCR3Global);
+            STAM_COUNTER_INC(&pVM->pgm.s.CTX_MID_Z(Stat,FlushTLBNewCR3Global));
         else
-            STAM_COUNTER_INC(&pVM->pgm.s.StatFlushTLBNewCR3);
+            STAM_COUNTER_INC(&pVM->pgm.s.CTX_MID_Z(Stat,FlushTLBNewCR3));
     }
     else
@@ -1450 +1450 @@
         }
         if (fGlobal)
-            STAM_COUNTER_INC(&pVM->pgm.s.StatFlushTLBSameCR3Global);
+            STAM_COUNTER_INC(&pVM->pgm.s.CTX_MID_Z(Stat,FlushTLBSameCR3Global));
         else
-            STAM_COUNTER_INC(&pVM->pgm.s.StatFlushTLBSameCR3);
-    }
-
-    STAM_PROFILE_STOP(&pVM->pgm.s.StatFlushTLB, a);
+            STAM_COUNTER_INC(&pVM->pgm.s.CTX_MID_Z(Stat,FlushTLBSameCR3));
+    }
+
+    STAM_PROFILE_STOP(&pVM->pgm.s.CTX_MID_Z(Stat,FlushTLB), a);
     return rc;
 }

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

@@ -839 +839 @@
      */
     LogFlow(("PGM: Unhandled #PF -> route trap to recompiler!\n"));
-    STAM_COUNTER_INC(&pVM->pgm.s.StatRZTrap0eGuestPF);
+    STAM_COUNTER_INC(&pVM->pgm.s.StatRZTrap0eGuestPFUnh);
     return VINF_EM_RAW_GUEST_TRAP;
 #  else
@@ -1565 +1565 @@
      * Assert preconditions.
      */
-    STAM_COUNTER_INC(&pVM->pgm.s.StatGCSyncPagePD[(GCPtrPage >> GST_PD_SHIFT) & GST_PD_MASK]);
     Assert(PdeSrc.n.u1Present);
     Assert(cPages);
+    STAM_COUNTER_INC(&pVM->pgm.s.StatSyncPagePD[(GCPtrPage >> GST_PD_SHIFT) & GST_PD_MASK]);
 
     /*
@@ -2278 +2278 @@
 {
     STAM_PROFILE_START(&pVM->pgm.s.CTX_MID_Z(Stat,SyncPT), a);
-    STAM_COUNTER_INC(&pVM->pgm.s.StatGCSyncPtPD[iPDSrc]);
+    STAM_COUNTER_INC(&pVM->pgm.s.StatSyncPtPD[iPDSrc]);
     LogFlow(("SyncPT: GCPtrPage=%VGv\n", GCPtrPage));
 
@@ -2471 +2471 @@
                  *
                  */
-                STAM_COUNTER_INC(CTXSUFF(&pVM->pgm.s.StatSynPT4k));
+                STAM_COUNTER_INC(&pVM->pgm.s.CTX_MID_Z(Stat,SyncPT4K));
 # ifdef PGM_SYNC_N_PAGES
                 unsigned        iPTBase   = (GCPtrPage >> SHW_PT_SHIFT) & SHW_PT_MASK;
@@ -2531 +2531 @@
              * We will only sync on shadow page table at a time.
              */
-            STAM_COUNTER_INC(CTXSUFF(&pVM->pgm.s.StatSynPT4M));
+            STAM_COUNTER_INC(&pVM->pgm.s.CTX_MID_Z(Stat,SyncPT4M));
 
             /**

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

@@ -408 +408 @@
         Log2(("PGM: Replaced shared page %#x at %RGp with %#x / %RHp\n", PGM_PAGE_GET_PAGEID(pPage),
               GCPhys, pVM->pgm.s.aHandyPages[iHandyPage].idPage, HCPhys));
-        STAM_COUNTER_INC(&pVM->pgm.s.StatPageReplaceShared);
+        STAM_COUNTER_INC(&pVM->pgm.s.CTX_MID_Z(Stat,PageReplaceShared));
         pVM->pgm.s.cSharedPages--;
 /** @todo err.. what about copying the page content? */
@@ -415 +415 @@
     {
         Log2(("PGM: Replaced zero page %RGp with %#x / %RHp\n", GCPhys, pVM->pgm.s.aHandyPages[iHandyPage].idPage, HCPhys));
-        STAM_COUNTER_INC(&pVM->pgm.s.StatPageReplaceZero);
+        STAM_COUNTER_INC(&pVM->pgm.s.StatRZPageReplaceZero);
         pVM->pgm.s.cZeroPages--;
 /** @todo verify that the handy page is zero! */
@@ -510 +510 @@
     if (pTlbe->idChunk == idChunk)
     {
-        STAM_COUNTER_INC(&pVM->pgm.s.StatChunkR3MapTlbHits);
+        STAM_COUNTER_INC(&pVM->pgm.s.CTX_MID_Z(Stat,ChunkR3MapTlbHits));
         pMap = pTlbe->pChunk;
     }
     else if (idChunk != NIL_GMM_CHUNKID)
     {
-        STAM_COUNTER_INC(&pVM->pgm.s.StatChunkR3MapTlbMisses);
+        STAM_COUNTER_INC(&pVM->pgm.s.CTX_MID_Z(Stat,ChunkR3MapTlbMisses));
 
         /*
@@ -569 +569 @@
 int pgmPhysPageLoadIntoTlb(PPGM pPGM, RTGCPHYS GCPhys)
 {
-    STAM_COUNTER_INC(&pPGM->CTXMID(StatPage,MapTlbMisses));
+    STAM_COUNTER_INC(&pPGM->CTX_MID_Z(Stat,PageMapTlbMisses));
 
     /*