Changeset 16865 in vbox

Timestamp:

Feb 17, 2009 4:52:24 PM (16 years ago)

Author:

vboxsync

Message:

VBOX_WITH_PGMPOOL_PAGING_ONLY: updates

Location:

trunk/src/VBox/VMM

Files:

• PGM.cpp (modified) (1 diff)
• PGMInternal.h (modified) (2 diffs)
• VMMAll/PGMAll.cpp (modified) (2 diffs)
• testcase/tstVMStructGC.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PGM.cpp

@@ -1157 +1157 @@
     pVM->pgm.s.enmHostMode      = SUPPAGINGMODE_INVALID;
     pVM->pgm.s.GCPhysCR3        = NIL_RTGCPHYS;
+#ifndef VBOX_WITH_PGMPOOL_PAGING_ONLY
     pVM->pgm.s.GCPhysGstCR3Monitored = NIL_RTGCPHYS;
+#endif
     pVM->pgm.s.fA20Enabled      = true;
     pVM->pgm.s.GCPhys4MBPSEMask = RT_BIT_64(32) - 1; /* default; checked later */

trunk/src/VBox/VMM/PGMInternal.h

@@ -57 +57 @@
  * Enable to use the PGM pool for all levels in the paging chain in all paging modes.
  */
-//#define VBOX_WITH_PGMPOOL_PAGING_ONLY
+#define VBOX_WITH_PGMPOOL_PAGING_ONLY
 
 /**
@@ -2175 +2175 @@
     uint32_t                        u32Alignment;
 #endif
+#ifndef VBOX_WITH_PGMPOOL_PAGING_ONLY
     /** The physical address of the currently monitored guest CR3 page.
      * When this value is NIL_RTGCPHYS no page is being monitored. */
     RTGCPHYS                        GCPhysGstCR3Monitored;
-
+#endif
     /** @name 32-bit Guest Paging.
      * @{ */

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

@@ -722 +722 @@
         pVM->pgm.s.fSyncFlags &= ~PGM_SYNC_MONITOR_CR3;
         Assert(!pVM->pgm.s.fMappingsFixed);
+#ifndef VBOX_WITH_PGMPOOL_PAGING_ONLY
         Assert(pVM->pgm.s.GCPhysCR3 == pVM->pgm.s.GCPhysGstCR3Monitored);
-#ifndef VBOX_WITH_PGMPOOL_PAGING_ONLY
         rc = PGM_GST_PFN(MonitorCR3, pVM)(pVM, pVM->pgm.s.GCPhysCR3);
 #endif
@@ -1851 +1851 @@
             pVM->pgm.s.fSyncFlags &= ~PGM_SYNC_MONITOR_CR3;
             Assert(!pVM->pgm.s.fMappingsFixed);
+#ifndef VBOX_WITH_PGMPOOL_PAGING_ONLY
             Assert(pVM->pgm.s.GCPhysCR3 == pVM->pgm.s.GCPhysGstCR3Monitored);
-#ifndef VBOX_WITH_PGMPOOL_PAGING_ONLY
             rc = PGM_GST_PFN(MonitorCR3, pVM)(pVM, pVM->pgm.s.GCPhysCR3);
 #endif

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

@@ -413 +413 @@
     GEN_CHECK_OFF(PGM, GCPhysCR3);
     GEN_CHECK_OFF(PGM, GCPtrCR3Mapping);
+#ifndef VBOX_WITH_PGMPOOL_PAGING_ONLY
     GEN_CHECK_OFF(PGM, GCPhysGstCR3Monitored);
+#endif
     GEN_CHECK_OFF(PGM, pGst32BitPdR3);
 #ifndef VBOX_WITH_2X_4GB_ADDR_SPACE