Changeset 38708 in vbox for trunk/src/VBox

Timestamp:

Sep 9, 2011 2:38:59 PM (13 years ago)

Author:

vboxsync

Message:

PGM: Drop the PGM_WITH_LARGE_ADDRESS_SPACE_ON_32_BIT_HOST define and instead just select different defaults when reading MaxRing3Chunks from CFGM. Also, force a 3GB max limit on 32-bit darwin (previously unlimted).

Location:

trunk/src/VBox/VMM

Files:

• VMMR3/PGM.cpp (modified) (1 diff)
• VMMR3/PGMPhys.cpp (modified) (3 diffs)
• include/PGMInternal.h (modified) (1 diff)

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

@@ -1264 +1264 @@
     AssertLogRelRCReturn(rc, rc);
 
-#ifdef PGM_WITH_LARGE_ADDRESS_SPACE_ON_32_BIT_HOST
+#if HC_ARCH_BITS == 32
+# ifdef RT_OS_DARWIN
+    rc = CFGMR3QueryU32Def(pCfgPGM, "MaxRing3Chunks", &pVM->pgm.s.ChunkR3Map.cMax, _1G / GMM_CHUNK_SIZE * 3);
+# else
     rc = CFGMR3QueryU32Def(pCfgPGM, "MaxRing3Chunks", &pVM->pgm.s.ChunkR3Map.cMax, _1G / GMM_CHUNK_SIZE);
+# endif
 #else
     rc = CFGMR3QueryU32Def(pCfgPGM, "MaxRing3Chunks", &pVM->pgm.s.ChunkR3Map.cMax, UINT32_MAX);

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

@@ -3686 +3686 @@
 }
 
-#ifdef PGM_WITH_LARGE_ADDRESS_SPACE_ON_32_BIT_HOST
 
 /**
@@ -3939 +3938 @@
 }
 
-#endif /* PGM_WITH_LARGE_ADDRESS_SPACE_ON_32_BIT_HOST */
 
 /**
@@ -4001 +3999 @@
         if (pVM->pgm.s.ChunkR3Map.c >= pVM->pgm.s.ChunkR3Map.cMax)
         {
-#ifdef PGM_WITH_LARGE_ADDRESS_SPACE_ON_32_BIT_HOST
             /* Postpone the unmap operation (which requires a rendezvous operation) as we own the PGM lock here. */
             rc = VMR3ReqCallNoWaitU(pVM->pUVM, VMCPUID_ANY_QUEUE, (PFNRT)pgmR3PhysUnmapChunk, 1, pVM);
             AssertRC(rc);
-#else
-            AssertFatalFailed();  /* can't happen */
-#endif
         }
     }

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

@@ -90 +90 @@
 #if 1 /* testing */
 # define PGM_WITH_MMIO_OPTIMIZATIONS
-#endif
-
-/**
- * Chunk unmapping code activated on 32-bit hosts for > 1.5/2 GB guest memory support
- */
-#if (HC_ARCH_BITS == 32) && !defined(RT_OS_DARWIN)
-# define PGM_WITH_LARGE_ADDRESS_SPACE_ON_32_BIT_HOST
 #endif