Changeset 13991 in vbox for trunk/src/VBox/VMM/VMMAll/PGMAllGst.h

Timestamp:

Nov 10, 2008 10:36:38 AM (16 years ago)

Author:

vboxsync

Message:

#1865: More PGM cleanup.

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllGst.h (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/PGMAllGst.h

@@ -520 +520 @@
                         pgmPoolFreeByPage(pPool, pVM->pgm.s.pHCShwAmd64CR3, PGMPOOL_IDX_AMD64_CR3, pVM->pgm.s.pHCShwAmd64CR3->GCPhys >> PAGE_SHIFT);
                     pVM->pgm.s.pHCShwAmd64CR3 = 0;
-                    pVM->pgm.s.pHCPaePML4     = 0;
+                    pVM->pgm.s.pShwPaePml4R3  = 0;
+#  ifndef VBOX_WITH_2X_4GB_ADDR_SPACE
+                    pVM->pgm.s.pShwPaePml4R0  = 0;
+#  endif
                     pVM->pgm.s.HCPhysPaePML4  = 0;
                 }
@@ -535 +538 @@
                     goto l_try_again;
                 }
-                pVM->pgm.s.pHCPaePML4    = (PX86PML4)PGMPOOL_PAGE_2_PTR(pPool->CTX_SUFF(pVM), pVM->pgm.s.pHCShwAmd64CR3);
+                pVM->pgm.s.pShwPaePml4R3 = (R3PTRTYPE(PX86PML4))PGMPOOL_PAGE_2_PTR(pPool->CTX_SUFF(pVM), pVM->pgm.s.pHCShwAmd64CR3);
+#  ifndef VBOX_WITH_2X_4GB_ADDR_SPACE
+                pVM->pgm.s.pShwPaePml4R0 = (R0PTRTYPE(PX86PML4))PGMPOOL_PAGE_2_PTR(pPool->CTX_SUFF(pVM), pVM->pgm.s.pHCShwAmd64CR3);
+#  endif
                 pVM->pgm.s.HCPhysPaePML4 = pVM->pgm.s.pHCShwAmd64CR3->Core.Key;
             }
@@ -595 +601 @@
     if (!HWACCMIsNestedPagingActive(pVM))
     {
-        pVM->pgm.s.pHCPaePML4    = 0;
+        pVM->pgm.s.pShwPaePml4R3 = 0;
+# ifndef VBOX_WITH_2X_4GB_ADDR_SPACE
+        pVM->pgm.s.pShwPaePml4R0 = 0;
+# endif
         pVM->pgm.s.HCPhysPaePML4 = 0;
         if (pVM->pgm.s.pHCShwAmd64CR3)