Changeset 17468 in vbox for trunk/src

Timestamp:

Mar 6, 2009 1:39:14 PM (16 years ago)

Author:

vboxsync

Message:

Always free entry if it's not a hypervisor mapping

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllMap.cpp (modified) (2 diffs)

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

@@ -248 +248 @@
                 AssertFatal(pShw32BitPd);
 
-                if (pShw32BitPd->a[iNewPDE].n.u1Present)
-                {
-                    Assert(!(pShw32BitPd->a[iNewPDE].u & PGM_PDFLAGS_MAPPING));
+                if (    pShw32BitPd->a[iNewPDE].n.u1Present
+                    &&  !(pShw32BitPd->a[iNewPDE].u & PGM_PDFLAGS_MAPPING))
+                {
                     pgmPoolFree(pVM, pShw32BitPd->a[iNewPDE].u & X86_PDE_PG_MASK, pVM->pgm.s.CTX_SUFF(pShwPageCR3)->idx, iNewPDE);
                 }
@@ -310 +310 @@
                     /* Mark the page as locked; disallow flushing. */
                     pgmPoolLockPage(pVM->pgm.s.CTX_SUFF(pPool), pPoolPagePd);
-
-                    if (pShwPaePd->a[iPDE].n.u1Present)
-                    {
-                        Assert(!(pShwPaePd->a[iPDE].u & PGM_PDFLAGS_MAPPING));
-                        pgmPoolFree(pVM, pShwPaePd->a[iPDE].u & X86_PDE_PG_MASK, pPoolPagePd->idx, iPDE);
-                    }
                 }
 # ifdef VBOX_STRICT
-                else
-                {
-                    if (pShwPaePd->a[iPDE].u & PGM_PDFLAGS_MAPPING)
-                    {
-                        Assert(PGMGetGuestMode(pVM) >= PGMMODE_PAE);
-                        AssertFatalMsg((pShwPaePd->a[iPDE].u & X86_PDE_PG_MASK) == pMap->aPTs[i].HCPhysPaePT0, ("%RX64 vs %RX64\n", pShwPaePd->a[iPDE+1].u & X86_PDE_PG_MASK, pMap->aPTs[i].HCPhysPaePT0));
-                        Assert(pShwPaePd->a[iPDE+1].u & PGM_PDFLAGS_MAPPING);
-                        AssertFatalMsg((pShwPaePd->a[iPDE+1].u & X86_PDE_PG_MASK) == pMap->aPTs[i].HCPhysPaePT1, ("%RX64 vs %RX64\n", pShwPaePd->a[iPDE+1].u & X86_PDE_PG_MASK, pMap->aPTs[i].HCPhysPaePT1));
-                    }
+                else 
+                if (pShwPaePd->a[iPDE].u & PGM_PDFLAGS_MAPPING)
+                {
+                    Assert(PGMGetGuestMode(pVM) >= PGMMODE_PAE);
+                    AssertFatalMsg((pShwPaePd->a[iPDE].u & X86_PDE_PG_MASK) == pMap->aPTs[i].HCPhysPaePT0, ("%RX64 vs %RX64\n", pShwPaePd->a[iPDE+1].u & X86_PDE_PG_MASK, pMap->aPTs[i].HCPhysPaePT0));
+                    Assert(pShwPaePd->a[iPDE+1].u & PGM_PDFLAGS_MAPPING);
+                    AssertFatalMsg((pShwPaePd->a[iPDE+1].u & X86_PDE_PG_MASK) == pMap->aPTs[i].HCPhysPaePT1, ("%RX64 vs %RX64\n", pShwPaePd->a[iPDE+1].u & X86_PDE_PG_MASK, pMap->aPTs[i].HCPhysPaePT1));
                 }
 # endif
+                if (    pShwPaePd->a[iPDE].n.u1Present
+                    &&  !(pShwPaePd->a[iPDE].u & PGM_PDFLAGS_MAPPING))
+                {
+                    Assert(!(pShwPaePd->a[iPDE].u & PGM_PDFLAGS_MAPPING));
+                    pgmPoolFree(pVM, pShwPaePd->a[iPDE].u & X86_PDE_PG_MASK, pPoolPagePd->idx, iPDE);
+                }
+
 #else
                 if (pShwPaePd->a[iPDE].n.u1Present)