Changeset 13993 in vbox for trunk/src/VBox/VMM

Timestamp:

Nov 10, 2008 10:52:22 AM (16 years ago)

Author:

vboxsync

Message:

darwin build fix.

Location:

trunk/src/VBox/VMM

Files:

• PGMInternal.h (modified) (3 diffs)
• VMMAll/PGMAll.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PGMInternal.h

@@ -3797 +3797 @@
 DECLINLINE(PX86PML4) pgmShwGetLongModePML4Ptr(PPGM pPGM)
 {
-#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_R0
+#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
     PX86PML4 pShwPml4;
     Assert(pPGM->HCPhysPaePML4 != 0 && pPGM->HCPhysPaePML4 != NIL_RTHCPHYS);
@@ -3820 +3820 @@
 {
     const unsigned  iPml4 = ((RTGCUINTPTR64)GCPtr >> X86_PML4_SHIFT) & X86_PML4_MASK;
-# ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_R0
+# ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
     PCX86PML4       pShwPml4;
     Assert(pPGM->HCPhysPaePML4 != 0 && pPGM->HCPhysPaePML4 != NIL_RTHCPHYS);
@@ -3842 +3842 @@
 DECLINLINE(PX86PML4E) pgmShwGetLongModePML4EPtr(PPGM pPGM, unsigned int iPml4)
 {
-# ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_R0
+# ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
     PX86PML4        pShwPml4;
     Assert(pPGM->HCPhysPaePML4 != 0 && pPGM->HCPhysPaePML4 != NIL_RTHCPHYS);

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

@@ -1065 +1065 @@
     Assert(HWACCMIsNestedPagingActive(pVM));
 
-# ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_R0
+# ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
     rc = PGM_HCPHYS_2_PTR(pVM, pPGM->HCPhysNestedRoot, &pPml4);
     AssertRCReturn(rc);