儲存庫 vbox 的更動 13996

時間撮記:

2008-11-10 上午11:57:33 (16 年 以前)

作者:

vboxsync

訊息:

darwin build fix.

檔案:

• trunk/src/VBox/VMM/PGMInternal.h (修改) (4 筆差異)

trunk/src/VBox/VMM/PGMInternal.h

@@ -2095 +2095 @@
     /** The Physical Address (HC) of the Page Map Level 4 table. */
     RTHCPHYS                        HCPhysPaePML4;
-    /** The pgm pool page descriptor for the current active CR3. */
-#if 0///@todo def VBOX_WITH_2X_4GB_ADDR_SPACE
-    R3PTRTYPE(PPGMPOOLPAGE)         pHCShwAmd64CR3;
-#else
-    R3R0PTRTYPE(PPGMPOOLPAGE)       pHCShwAmd64CR3;
-#endif
+    /** The pgm pool page descriptor for the current active CR3 - R3 Ptr. */
+    R3PTRTYPE(PPGMPOOLPAGE)         pShwAmd64CR3R3;
+    /** The pgm pool page descriptor for the current active CR3 - R0 Ptr. */
+    R0PTRTYPE(PPGMPOOLPAGE)         pShwAmd64CR3R0;
     /** @}*/
 
@@ -3800 +3798 @@
     PX86PML4 pShwPml4;
     Assert(pPGM->HCPhysPaePML4 != 0 && pPGM->HCPhysPaePML4 != NIL_RTHCPHYS);
-    int rc = PGM_HCPHYS_2_PTR(pVM, pPGM->HCPhysPaePML4, &pShwPml4);
+    int rc = PGM_HCPHYS_2_PTR(PGM2VM(pPGM), pPGM->HCPhysPaePML4, &pShwPml4);
     AssertRCReturn(rc, 0);
     return pShwPml4;
@@ -3823 +3821 @@
     PCX86PML4       pShwPml4;
     Assert(pPGM->HCPhysPaePML4 != 0 && pPGM->HCPhysPaePML4 != NIL_RTHCPHYS);
-    int rc = PGM_HCPHYS_2_PTR(pVM, pPGM->HCPhysPaePML4, &pShwPml4);
+    int rc = PGM_HCPHYS_2_PTR(PGM2VM(pPGM), pPGM->HCPhysPaePML4, &pShwPml4);
     AssertRCReturn(rc, 0);
     return pShwPml4->a[iPml4].u;
@@ -3845 +3843 @@
     PX86PML4        pShwPml4;
     Assert(pPGM->HCPhysPaePML4 != 0 && pPGM->HCPhysPaePML4 != NIL_RTHCPHYS);
-    int rc = PGM_HCPHYS_2_PTR(pVM, pPGM->HCPhysPaePML4, &pShwPml4);
+    int rc = PGM_HCPHYS_2_PTR(PGM2VM(pPGM), pPGM->HCPhysPaePML4, &pShwPml4);
     AssertRCReturn(rc, 0);
     return &pShwPml4->a[iPml4];