Changeset 14749

Timestamp:

11/28/08 01:45:25 (1 month ago)

Author:

vboxsync

Message:

#1865: PGMAllPool: PGMPOOLKIND_ROOT_PAE_PD -> PGMPOOLKIND_PAE_PD_FOR_PAE_PD in pgmPoolFlushAllSpecialRoots.

Files:

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

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

@@ -136 +136 @@
-            HCPhys = pVM->pgm.s.HCPhysShw32BitPD;
-            break;
-        case PGMPOOL_IDX_PAE_PD:
-        case PGMPOOL_IDX_PAE_PD_0:
-            HCPhys = pVM->pgm.s.aHCPhysPaePDs[0];
@@ -152 +151 @@
-            HCPhys = pVM->pgm.s.HCPhysShwPaePdpt;
-            break;
+        case PGMPOOL_IDX_PAE_PD:
+            AssertReleaseMsgFailed(("PGMPOOL_IDX_PAE_PD is not usable in VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 context\n"));
+            return NULL;
-        default:
-            AssertReleaseMsgFailed(("Invalid index %d\n", pPage->idx));
@@ -2737 +2739 @@
-        case PGMPOOLKIND_ROOT_PAE_PD:
-            Assert(pUser->iUserTable < 2048 && pUser->iUser == PGMPOOL_IDX_PAE_PD);
-(!(u.pau64[pUser->iUserTable] & PGM_PDFLAGS_MAPPING
+Msg(!(u.pau64[pUser->iUserTable] & PGM_PDFLAGS_MAPPING), ("%llx %d\n", u.pau64[pUser->iUserTable], pUser->iUserTable
-            break;
-        case PGMPOOLKIND_ROOT_PDPT:
@@ -3580 +3582 @@
-            uint32_t *pau32;
-        } u;
-        u.pau64 = (uint64_t *)PGMPOOL_PAGE_2_PTR(pPool->CTX_SUFF(pVM), pPage);
-
-        /*
@@ -3588 +3589 @@
-        {
-            case PGMPOOLKIND_ROOT_32BIT_PD:
+                u.pau64 = (uint64_t *)PGMPOOL_PAGE_2_PTR(pPool->CTX_SUFF(pVM), pPage);
-                for (unsigned iPage = 0; iPage < X86_PG_ENTRIES; iPage++)
-                    if ((u.pau32[iPage] & (PGM_PDFLAGS_MAPPING | X86_PDE_P)) == X86_PDE_P)
@@ -3593 +3595 @@
-                break;
-
-
-
+
+
+
-                    if ((u.pau64[iPage] & (PGM_PDFLAGS_MAPPING | X86_PDE_P)) == X86_PDE_P)
-                        u.pau64[iPage] = 0;
@@ -3604 +3607 @@
-
-            case PGMPOOLKIND_ROOT_NESTED:
+                u.pau64 = (uint64_t *)PGMPOOL_PAGE_2_PTR(pPool->CTX_SUFF(pVM), pPage);
-                ASMMemZero32(u.pau64, PAGE_SIZE);
-                break;