Changeset 16904 in vbox

Timestamp:

Feb 18, 2009 2:35:38 PM (16 years ago)

Author:

vboxsync

Message:

VBOX_WITH_PGMPOOL_PAGING_ONLY: fCR3Mix is not relevant anymore

Location:

trunk/src/VBox/VMM

Files:

• PGMInternal.h (modified) (2 diffs)
• PGMPool.cpp (modified) (1 diff)
• VMMAll/PGMAllPool.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/PGMInternal.h

@@ -1635 +1635 @@
      * It's a hack required because of REMR3NotifyHandlerPhysicalDeregister. */
     bool volatile       fReusedFlushPending;
+#ifndef VBOX_WITH_PGMPOOL_PAGING_ONLY
     /** Used to indicate that the guest is mapping the page is also used as a CR3.
      * In these cases the access handler acts differently and will check
@@ -1642 +1643 @@
      */
     bool                fCR3Mix;
+#endif
 } PGMPOOLPAGE, *PPGMPOOLPAGE, **PPPGMPOOLPAGE;
 

trunk/src/VBox/VMM/PGMPool.cpp

@@ -585 +585 @@
         STAM_PROFILE_STOP(&pPool->StatMonitorR3, a);
     }
-    else if (    (pPage->fCR3Mix || pPage->cModifications < 96) /* it's cheaper here. */
+    else if (    (   pPage->cModifications < 96 /* it's cheaper here. */
+#ifndef VBOX_WITH_PGMPOOL_PAGING_ONLY
+                  || pPage->fCR3Mix
+#endif
+                  )
              &&  cbBuf <= 4)
     {

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

@@ -1235 +1235 @@
     bool fReused = false;
     if (    (   pPage->cModifications < 48   /** @todo #define */ /** @todo need to check that it's not mapping EIP. */ /** @todo adjust this! */
-             || pPage->fCR3Mix)
+#ifndef VBOX_WITH_PGMPOOL_PAGING_ONLY
+             || pPage->fCR3Mix
+#endif
+            )
         &&  !(fReused = pgmPoolMonitorIsReused(pVM, pPage, pRegFrame, &Cpu, pvFault))
         &&  !pgmPoolMonitorIsForking(pPool, &Cpu, GCPhysFault & PAGE_OFFSET_MASK))
@@ -1944 +1947 @@
             PPGMPOOLPAGE pNewHead = &pPool->aPages[pPage->iMonitoredNext];
             pNewHead->iMonitoredPrev = NIL_PGMPOOL_IDX;
+#ifndef VBOX_WITH_PGMPOOL_PAGING_ONLY
             pNewHead->fCR3Mix = pPage->fCR3Mix;
+#endif
             rc = PGMHandlerPhysicalChangeCallbacks(pVM, pPage->GCPhys & ~(RTGCPHYS)(PAGE_SIZE - 1),
                                                    pPool->pfnAccessHandlerR3, MMHyperCCToR3(pVM, pNewHead),
@@ -4110 +4115 @@
         pPage->fCached   = false;
         pPage->fReusedFlushPending = false;
-        pPage->fCR3Mix = false;
 #ifdef PGMPOOL_WITH_USER_TRACKING
         pPage->iUserHead = NIL_PGMPOOL_USER_INDEX;
+#else
+        pPage->fCR3Mix = false;
 #endif
 #ifdef PGMPOOL_WITH_CACHE
@@ -4496 +4502 @@
     pPage->fCached = false;
     pPage->fReusedFlushPending = false;
-    pPage->fCR3Mix = false;
 #ifdef PGMPOOL_WITH_MONITORING
     pPage->cModifications = 0;
     pPage->iModifiedNext = NIL_PGMPOOL_IDX;
     pPage->iModifiedPrev = NIL_PGMPOOL_IDX;
+#else
+    pPage->fCR3Mix = false;
 #endif
 #ifdef PGMPOOL_WITH_USER_TRACKING