Changeset 17521 in vbox

Timestamp:

Mar 7, 2009 6:31:32 AM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

43954

Message:

PGMPhys: cound page counting fixes.

File:

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

trunk/src/VBox/VMM/PGMPhys.cpp

@@ -807 +807 @@
         &&  !fRamExists)
     {
+        pVM->pgm.s.cZeroPages -= cb >> PAGE_SHIFT;
+        pVM->pgm.s.cAllPages  -= cb >> PAGE_SHIFT;
+
         /* remove the ad-hoc range. */
         pgmR3PhysUnlinkRamRange2(pVM, pNew, pRamPrev);
         pNew->cb = pNew->GCPhys = pNew->GCPhysLast = NIL_RTGCPHYS;
         MMHyperFree(pVM, pRam);
-        pVM->pgm.s.cZeroPages -= cb >> PAGE_SHIFT;
-        pVM->pgm.s.cAllPages  -= cb >> PAGE_SHIFT;
     }
 
@@ -855 +856 @@
                  * See if all the pages are dead MMIO pages.
                  */
-                bool fAllMMIO = true;
-                PPGMPAGE pPage = &pRam->aPages[0];
-                uint32_t cLeft = cb >> PAGE_SHIFT;
+                bool            fAllMMIO = true;
+                PPGMPAGE        pPage    = &pRam->aPages[0];
+                uint32_t const  cPages   = cb >> PAGE_SHIFT;
+                uint32_t        cLeft    = cPages;
                 while (cLeft-- > 0)
                 {
@@ -879 +881 @@
                          GCPhys, GCPhysLast, pRam->pszDesc));
 
+                    pVM->pgm.s.cAllPages  -= cPages;
+                    pVM->pgm.s.cZeroPages -= cPages;
+
                     pgmR3PhysUnlinkRamRange2(pVM, pRam, pRamPrev);
                     pRam->cb = pRam->GCPhys = pRam->GCPhysLast = NIL_RTGCPHYS;
                     MMHyperFree(pVM, pRam);
-                    pVM->pgm.s.cAllPages -= pRam->cb >> PAGE_SHIFT;
-                    pVM->pgm.s.cZeroPages -= pRam->cb >> PAGE_SHIFT;
                 }
                 break;