Changeset 14519 in vbox for trunk/src/VBox

Timestamp:

Nov 24, 2008 2:07:29 PM (16 years ago)

Author:

vboxsync

Message:

PGMR0DynMap: fixes (InitVM+TermVM working).

File:

• trunk/src/VBox/VMM/VMMR0/PGMR0DynMap.cpp (modified) (7 diffs)

trunk/src/VBox/VMM/VMMR0/PGMR0DynMap.cpp

@@ -285 +285 @@
         g_pPGMR0DynMap = NULL;
 
-        AssertLogRelMsg(!pThis->cUsers && !pThis->paPages && !pThis->cPages,
-                        ("cUsers=%d paPages=%p cPages=%#x\n",
-                         pThis->cUsers, pThis->paPages, pThis->cPages));
+        AssertLogRelMsg(!pThis->cUsers && !pThis->paPages && !pThis->pvSavedPTEs && !pThis->cPages,
+                        ("cUsers=%d paPages=%p pvSavedPTEs=%p cPages=%#x\n",
+                         pThis->cUsers, pThis->paPages, pThis->pvSavedPTEs, pThis->cPages));
 
         /* Free the associated resources. */
@@ -648 +648 @@
          * The next level.
          */
-        uint32_t iEntry = ((uintptr_t)pvPage >> pPgLvl->a[i].fPtrShift) & pPgLvl->a[i].fPtrMask;
+        uint32_t iEntry = ((uint64_t)(uintptr_t)pvPage >> pPgLvl->a[i].fPtrShift) & pPgLvl->a[i].fPtrMask;
         if (pThis->fLegacyMode)
         {
@@ -662 +662 @@
         if ((uEntry & pPgLvl->a[i].fAndMask) != pPgLvl->a[i].fResMask)
         {
-            LogRel(("PGMR0DynMap: internal error - iPgLvl=%u cLevels=%u uEntry=%#llx fAnd=%#llx fRes=%#llx got=%#llx\n",
-                    i, pPgLvl->cLevels, uEntry, pPgLvl->a[i].fAndMask, pPgLvl->a[i].fResMask, uEntry & pPgLvl->a[i].fAndMask));
+            LogRel(("PGMR0DynMap: internal error - iPgLvl=%u cLevels=%u uEntry=%#llx fAnd=%#llx fRes=%#llx got=%#llx\n"
+                    "PGMR0DynMap: pv=%p pvPage=%p iEntry=%#x fLegacyMode=%RTbool\n",
+                    i, pPgLvl->cLevels, uEntry, pPgLvl->a[i].fAndMask, pPgLvl->a[i].fResMask, uEntry & pPgLvl->a[i].fAndMask,
+                    pPgLvl->a[i].u.pv, pvPage, iEntry, pThis->fLegacyMode));
             return VERR_INTERNAL_ERROR;
         }
@@ -715 +717 @@
 
     /*
-     * Allocate the segment structure and pages memory.
+     * Allocate the segment structure and pages of memory, then touch all the pages (paranoia).
      */
     uint32_t cMaxPTs = cPages / (pThis->fLegacyMode ? X86_PG_ENTRIES : X86_PG_PAE_ENTRIES) + 2;
@@ -730 +732 @@
         uint8_t            *pbPage = (uint8_t *)RTR0MemObjAddress(pSeg->hMemObj);
         AssertMsg(VALID_PTR(pbPage) && !((uintptr_t)pbPage & PAGE_OFFSET_MASK), ("%p\n", pbPage));
+        memset(pbPage, 0xfe, cPages << PAGE_SHIFT);
 
         /*
@@ -799 +802 @@
     RTMemFree(pSeg);
 
-    /* Don't bother resizing the arrays, too layz. */
+    /* Don't bother resizing the arrays, but free them if we're the only user. */
+    if (!pThis->cPages)
+    {
+        RTMemFree(pThis->paPages);
+        pThis->paPages = NULL;
+        RTMemFree(pThis->pvSavedPTEs);
+        pThis->pvSavedPTEs = NULL;
+    }
     return rc;
 }
@@ -889 +899 @@
     Assert(!pvUser2);
     PPGMR0DYNMAP        pThis   = (PPGMR0DYNMAP)pvUser1;
-    AssertPtr(pThis == g_pPGMR0DynMap);
+    Assert(pThis == g_pPGMR0DynMap);
     PPGMR0DYNMAPENTRY   paPages = pThis->paPages;
     uint32_t            iPage   = pThis->cPages;