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

Timestamp:

Mar 6, 2009 3:59:52 PM (16 years ago)

Author:

vboxsync

Message:

Cleaned up nested paging init and removed obsolete structure members.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PGMAll.cpp (modified) (5 diffs)
• PGMAllBth.h (modified) (3 diffs)
• PGMAllPool.cpp (modified) (5 diffs)

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

@@ -1428 +1428 @@
 {
 #ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
-    PGMMODE enmShadowMode = pVM->pgm.s.enmShadowMode;
-    switch (enmShadowMode)
-    {
-        case PGMMODE_EPT:
-            return pVM->pgm.s.HCPhysShwNestedRoot;
-
-        default:
-            return pVM->pgm.s.HCPhysShwCR3;
-    }
+    Assert(pVM->pgm.s.CTX_SUFF(pShwPageCR3));
+    return pVM->pgm.s.CTX_SUFF(pShwPageCR3)->Core.Key;
 #else
     PGMMODE enmShadowMode = pVM->pgm.s.enmShadowMode;
@@ -1474 +1467 @@
 {
 #ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
-    return pVM->pgm.s.HCPhysShwCR3;
+    Assert(pVM->pgm.s.CTX_SUFF(pShwPageCR3));
+    return pVM->pgm.s.CTX_SUFF(pShwPageCR3)->Core.Key;
 #else
     switch (enmShadowMode)
@@ -1516 +1510 @@
 {
 #ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
-    return pVM->pgm.s.HCPhysShwCR3;
+    Assert(pVM->pgm.s.CTX_SUFF(pShwPageCR3));
+    return pVM->pgm.s.CTX_SUFF(pShwPageCR3)->Core.Key;
 #else
     return pVM->pgm.s.HCPhysShw32BitPD;
@@ -1531 +1526 @@
 {
 #ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
-    return pVM->pgm.s.HCPhysShwCR3;
+    Assert(pVM->pgm.s.CTX_SUFF(pShwPageCR3));
+    return pVM->pgm.s.CTX_SUFF(pShwPageCR3)->Core.Key;
 #else
     return pVM->pgm.s.HCPhysShwPaePdpt;
@@ -1545 +1541 @@
 VMMDECL(RTHCPHYS) PGMGetHyperAmd64CR3(PVM pVM)
 {
+#ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
+    Assert(pVM->pgm.s.CTX_SUFF(pShwPageCR3));
+    return pVM->pgm.s.CTX_SUFF(pShwPageCR3)->Core.Key;
+#else
     return pVM->pgm.s.HCPhysShwCR3;
+#endif
 }
 

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

@@ -973 +973 @@
 # else /* PGM_SHW_TYPE == PGM_TYPE_AMD64 */
     /* PML4 */
+#  ifndef VBOX_WITH_PGMPOOL_PAGING_ONLY
     AssertReturn(pVM->pgm.s.pShwRootR3, VERR_INTERNAL_ERROR);
+#  endif
 
     const unsigned  iPml4     = (GCPtrPage >> X86_PML4_SHIFT) & X86_PML4_MASK;
@@ -4774 +4776 @@
     pVM->pgm.s.pShwPageCR3RC = MMHyperCCToRC(pVM, pVM->pgm.s.CTX_SUFF(pShwPageCR3));
 #  endif
-    pVM->pgm.s.pShwRootR3    = (R3PTRTYPE(void *))pVM->pgm.s.CTX_SUFF(pShwPageCR3)->pvPageR3;
-    Assert(pVM->pgm.s.pShwRootR3);
-#  ifndef VBOX_WITH_2X_4GB_ADDR_SPACE
-    pVM->pgm.s.pShwRootR0    = (R0PTRTYPE(void *))PGMPOOL_PAGE_2_PTR(pPool->CTX_SUFF(pVM), pVM->pgm.s.CTX_SUFF(pShwPageCR3));
-#  endif
-    pVM->pgm.s.HCPhysShwCR3  = pVM->pgm.s.CTX_SUFF(pShwPageCR3)->Core.Key;
 
 #  ifndef PGM_WITHOUT_MAPPINGS
@@ -4899 +4895 @@
 # endif
 
-    pVM->pgm.s.pShwRootR3 = 0;
-#  ifndef VBOX_WITH_2X_4GB_ADDR_SPACE
-    pVM->pgm.s.pShwRootR0 = 0;
-#  endif
-    pVM->pgm.s.HCPhysShwCR3 = 0;
     if (pVM->pgm.s.CTX_SUFF(pShwPageCR3))
     {
         PPGMPOOL pPool = pVM->pgm.s.CTX_SUFF(pPool);
+
+        Assert(pVM->pgm.s.iShwUser != PGMPOOL_IDX_NESTED_ROOT);
 
         /* Mark the page as unlocked; allow flushing again. */

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

@@ -137 +137 @@
 #endif
 
-#if defined(IN_RC) || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
+#if !defined(VBOX_WITH_PGMPOOL_PAGING_ONLY) && (defined(IN_RC) || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0))
 /**
  * Maps a pool page into the current context.
@@ -156 +156 @@
     switch (pPage->idx)
     {
-#  ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
-        case PGMPOOL_IDX_PD:
-        case PGMPOOL_IDX_PDPT:
-        case PGMPOOL_IDX_AMD64_CR3:
-            return pPGM->pShwRootRC;
-#  else
         case PGMPOOL_IDX_PD:
             return pPGM->pShw32BitPdRC;
@@ -175 +169 @@
         case PGMPOOL_IDX_PDPT:
             return pPGM->pShwPaePdptRC;
-#  endif
         default:
             AssertReleaseMsgFailed(("Invalid index %d\n", pPage->idx));
@@ -185 +178 @@
     switch (pPage->idx)
     {
-#  ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
-        case PGMPOOL_IDX_PD:
-        case PGMPOOL_IDX_PDPT:
-        case PGMPOOL_IDX_AMD64_CR3:
-            HCPhys = pPGM->HCPhysShwCR3;
-            break;
-
-        case PGMPOOL_IDX_NESTED_ROOT:
-            HCPhys = pPGM->HCPhysShwNestedRoot;
-            break;
-#  else
         case PGMPOOL_IDX_PD:
             HCPhys = pPGM->HCPhysShw32BitPD;
@@ -220 +202 @@
             AssertReleaseMsgFailed(("PGMPOOL_IDX_PAE_PD is not usable in VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 context\n"));
             return NULL;
-#  endif
         default:
             AssertReleaseMsgFailed(("Invalid index %d\n", pPage->idx));