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

Timestamp:

Jun 26, 2008 9:58:34 AM (16 years ago)

Author:

vboxsync

Message:

Corrections

File:

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

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

@@ -420 +420 @@
                     LogFlow(("pgmPoolMonitorChainChanging: Detected conflict at iShw=%#x!\n", iShw));
                 }
-
-                if (uShw.pPDPae->a[iShw].n.u1Present)
+                else
                 {
-                    LogFlow(("pgmPoolMonitorChainChanging: pae pd iShw=%#x: %RX64 -> freeing it!\n", iShw, uShw.pPDPae->a[iShw].u));
-                    pgmPoolFree(pPool->CTXSUFF(pVM), 
-                                uShw.pPDPae->a[iShw].u & X86_PDE_PAE_PG_MASK, 
-                                /* Note: hardcoded PAE implementation dependency */
-                                (pPage->enmKind == PGMPOOLKIND_PAE_PD_FOR_PAE_PD) ? PGMPOOL_IDX_PAE_PD : pPage->idx, 
-                                (pPage->enmKind == PGMPOOLKIND_PAE_PD_FOR_PAE_PD) ? iShw + (pPage->idx - PGMPOOL_IDX_PAE_PD_0) * X86_PG_PAE_ENTRIES : iShw);
-                    uShw.pPDPae->a[iShw].u = 0;
+                    if (uShw.pPDPae->a[iShw].n.u1Present)
+                    {
+                        LogFlow(("pgmPoolMonitorChainChanging: pae pd iShw=%#x: %RX64 -> freeing it!\n", iShw, uShw.pPDPae->a[iShw].u));
+                        pgmPoolFree(pPool->CTXSUFF(pVM), 
+                                    uShw.pPDPae->a[iShw].u & X86_PDE_PAE_PG_MASK, 
+                                    /* Note: hardcoded PAE implementation dependency */
+                                    (pPage->enmKind == PGMPOOLKIND_PAE_PD_FOR_PAE_PD) ? PGMPOOL_IDX_PAE_PD : pPage->idx, 
+                                    (pPage->enmKind == PGMPOOLKIND_PAE_PD_FOR_PAE_PD) ? iShw + (pPage->idx - PGMPOOL_IDX_PAE_PD_0) * X86_PG_PAE_ENTRIES : iShw);
+                        uShw.pPDPae->a[iShw].u = 0;
+                    }
                 }
 
@@ -438 +440 @@
                 {
                     const unsigned iShw2 = (off + pgmPoolDisasWriteSize(pCpu) - 1) / sizeof(X86PDEPAE);
+                    AssertReturnVoid(iShw2 < ELEMENTS(uShw.pPDPae->a));
+
                     if (    iShw2 != iShw
-                        &&  iShw2 < ELEMENTS(uShw.pPDPae->a)
                         &&  uShw.pPDPae->a[iShw2].u & PGM_PDFLAGS_MAPPING)
                     {
@@ -446 +449 @@
                         LogFlow(("pgmPoolMonitorChainChanging: Detected conflict at iShw2=%#x!\n", iShw2));
                     }
+                    else
                     if (uShw.pPDPae->a[iShw2].n.u1Present)
                     {