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

Timestamp:

Feb 11, 2009 3:34:12 PM (16 years ago)

Author:

vboxsync

Message:

VBOX_WITH_PGMPOOL_PAGING_ONLY: updates

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp (modified) (3 diffs)

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

@@ -760 +760 @@
             case PGMPOOLKIND_64BIT_PD_FOR_64BIT_PD:
             {
-                Assert(pPage->enmKind == PGMPOOLKIND_64BIT_PD_FOR_64BIT_PD);
-
                 uShw.pv = PGMPOOL_PAGE_2_PTR(pPool->CTX_SUFF(pVM), pPage);
                 const unsigned iShw = off / sizeof(X86PDEPAE);
@@ -4248 +4246 @@
     {
 #ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
+        AssertMsg(   pPage->enmKind == PGMPOOLKIND_64BIT_PML4
+                  || pPage->enmKind == PGMPOOLKIND_PAE_PDPT
+                  || pPage->enmKind == PGMPOOLKIND_PAE_PDPT_FOR_32BIT
+                  || pPage->enmKind == PGMPOOLKIND_32BIT_PD,
+                  ("Can't free the shadow CR3! (%RHp vs %RHp kind=%d\n", PGMGetHyperCR3(pPool->CTX_SUFF(pVM)), pPage->Core.Key, pPage->enmKind));
+#else
         AssertMsg(pPage->enmKind == PGMPOOLKIND_64BIT_PML4,
                   ("Can't free the shadow CR3! (%RHp vs %RHp kind=%d\n", PGMGetHyperCR3(pPool->CTX_SUFF(pVM)), pPage->Core.Key, pPage->enmKind));
@@ -4578 +4582 @@
 
 #ifdef LOG_ENABLED
-static char *pgmPoolPoolKindToStr(uint8_t enmKind)
+static const char *pgmPoolPoolKindToStr(uint8_t enmKind)
 {
     switch(enmKind)