Changeset 14376 in vbox for trunk/src/VBox/VMM

Timestamp:

Nov 19, 2008 7:17:18 PM (16 years ago)

Author:

vboxsync

Message:

#1865: ring-0 mapping cache, code in progress.

File:

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

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

@@ -636 +636 @@
     /* close the set */
     uint32_t    i = pVCpu->pgm.s.AutoSet.cEntries;
-    AssertMsg(i <= RT_ELEMENTS(pVCpu->pgm.s.AutoSet.aEntries), ("%u\n", i));
+    AssertMsg(i <= RT_ELEMENTS(pVCpu->pgm.s.AutoSet.aEntries), ("%#x (%u)\n", i, i));
     pVCpu->pgm.s.AutoSet.cEntries = PGMMAPSET_CLOSED;
 
@@ -680 +680 @@
     PPGMMAPSET  pSet = &pVCpu->pgm.s.AutoSet;
     uint32_t    i = pVCpu->pgm.s.AutoSet.cEntries;
-    AssertMsg(i <= RT_ELEMENTS(pVCpu->pgm.s.AutoSet.aEntries), ("%u\n", i));
+    AssertMsg(i <= RT_ELEMENTS(pVCpu->pgm.s.AutoSet.aEntries), ("%#x (%u)\n", i, i));
     if (i != 0 && RT_LIKELY(i <= RT_ELEMENTS(pVCpu->pgm.s.AutoSet.aEntries)))
     {
@@ -744 +744 @@
      * Validate state.
      */
+    AssertMsgReturn(pVM->pgm.s.pvR0DynMapUsed == g_pPGMR0DynMap,
+                    ("%p != %p\n", pVM->pgm.s.pvR0DynMapUsed, g_pPGMR0DynMap),
+                    VERR_ACCESS_DENIED);
     AssertMsg(!(HCPhys & PAGE_OFFSET_MASK), ("HCPhys=%RHp\n", HCPhys));
     PVMCPU          pVCpu   = VMMGetCpu(pVM);
@@ -749 +752 @@
     AssertPtrReturn(pVCpu, VERR_INTERNAL_ERROR);
     AssertMsgReturn(pSet->cEntries > RT_ELEMENTS(pSet->aEntries),
-                    ("%#x\n", pSet->cEntries), VERR_WRONG_ORDER);
+                    ("%#x (%u)\n", pSet->cEntries, pSet->cEntries), VERR_WRONG_ORDER);
 
     /*
@@ -809 +812 @@
 }
 
-