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

Timestamp:

Mar 23, 2009 10:32:05 AM (16 years ago)

Author:

vboxsync

Message:

darwin build fix.

File:

• trunk/src/VBox/VMM/VMMAll/PGMAll.cpp (modified) (6 diffs)

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

@@ -1310 +1310 @@
 }
 
-#ifdef VBOX_WITH_NEW_PHYS_CODE 
+#ifdef VBOX_WITH_NEW_PHYS_CODE
 #ifdef IN_RING3
 
 /**
- * Performs the lazy mapping of the 32-bit guest PD. 
- *  
+ * Performs the lazy mapping of the 32-bit guest PD.
+ *
  * @returns Pointer to the mapping.
  * @param   pPGM        The PGM instance data.
@@ -1344 +1344 @@
 /**
  * Performs the lazy mapping of the PAE guest PDPT.
- *  
+ *
  * @returns Pointer to the mapping.
  * @param   pPGM        The PGM instance data.
@@ -1372 +1372 @@
 #endif /* IN_RING3  */
 
+#ifndef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
 /**
  * Performs the lazy mapping / updating of a PAE guest PD.
- *  
+ *
  * @returns Pointer to the mapping.
- * @param   pPGM        The PGM instance data. 
- * @param   iPdpt       Which PD entry to map (0..3). 
+ * @param   pPGM        The PGM instance data.
+ * @param   iPdpt       Which PD entry to map (0..3).
  */
 PX86PDPAE pgmGstLazyMapPaePD(PPGM pPGM, uint32_t iPdpt)
@@ -1410 +1411 @@
 # ifndef VBOX_WITH_2X_4GB_ADDR_SPACE
             pPGM->apGstPaePDsR0[iPdpt]          = (R0PTRTYPE(PX86PDPAE))HCPtr;
-# endif 
+# endif
             if (fChanged)
-            {    
+            {
                 pPGM->aGCPhysGstPaePDs[iPdpt]   = GCPhys;
                 pPGM->apGstPaePDsRC[iPdpt]      = (RCPTRTYPE(PX86PDPAE))RCPtr;
@@ -1427 +1428 @@
 # ifndef VBOX_WITH_2X_4GB_ADDR_SPACE
     pPGM->apGstPaePDsR0[iPdpt]      = 0;
-# endif 
+# endif
     pPGM->apGstPaePDsRC[iPdpt]      = 0;
 
@@ -1433 +1434 @@
     return NULL;
 }
+#endif /* !VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 */
 
 
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R3
 /**
- * Performs the lazy mapping of the 32-bit guest PD. 
- *  
+ * Performs the lazy mapping of the 32-bit guest PD.
+ *
  * @returns Pointer to the mapping.
  * @param   pPGM        The PGM instance data.