Changeset 17059 in vbox

Timestamp:

Feb 24, 2009 12:24:44 PM (16 years ago)

Author:

vboxsync

Message:

Updates

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PGMAll.cpp (modified) (2 diffs)
• PGMAllBth.h (modified) (5 diffs)

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

@@ -2227 +2227 @@
     unsigned iPage;
 
+    Assert(GCPage >= pVM->pgm.s.pbDynPageMapBaseGC && GCPage < (pVM->pgm.s.pbDynPageMapBaseGC + MM_HYPER_DYNAMIC_SIZE));
     iPage = ((uintptr_t)(GCPage - pVM->pgm.s.pbDynPageMapBaseGC)) >> PAGE_SHIFT;
     Assert(!(pVM->pgm.s.paDynPageMap32BitPTEsGC[iPage].u & PGM_PTFLAGS_DYN_LOCKED));
@@ -2244 +2245 @@
     unsigned iPage;
 
+    Assert(GCPage >= pVM->pgm.s.pbDynPageMapBaseGC && GCPage < (pVM->pgm.s.pbDynPageMapBaseGC + MM_HYPER_DYNAMIC_SIZE));
     iPage = ((uintptr_t)(GCPage - pVM->pgm.s.pbDynPageMapBaseGC)) >> PAGE_SHIFT;
     Assert(pVM->pgm.s.paDynPageMap32BitPTEsGC[iPage].u & PGM_PTFLAGS_DYN_LOCKED);

trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

@@ -2458 +2458 @@
 # if defined(IN_RC) && defined(VBOX_WITH_PGMPOOL_PAGING_ONLY)
     /* Make sure the dynamic pPdeDst mapping will not be reused during this function. */
-    PGMDynLockHCPage(pVM, pPdeDst);
+    PGMDynLockHCPage(pVM, (uint8_t *)pPdeDst);
 # endif
 
@@ -2528 +2528 @@
             *pPdeDst = PdeDst;
 # if defined(IN_RC) && defined(VBOX_WITH_PGMPOOL_PAGING_ONLY)
-            PGMDynUnlockHCPage(pVM, pPdeDst);
+            PGMDynUnlockHCPage(pVM, (uint8_t *)pPdeDst);
 # endif
             return VINF_SUCCESS;
@@ -2536 +2536 @@
             VM_FF_SET(pVM, VM_FF_PGM_SYNC_CR3);
 # if defined(IN_RC) && defined(VBOX_WITH_PGMPOOL_PAGING_ONLY)
-            PGMDynUnlockHCPage(pVM, pPdeDst);
+            PGMDynUnlockHCPage(pVM, (uint8_t *)pPdeDst);
 # endif
             return VINF_PGM_SYNC_CR3;
@@ -2569 +2569 @@
                 *pPdeDst = PdeDst;
 # if defined(IN_RC) && defined(VBOX_WITH_PGMPOOL_PAGING_ONLY)            
-                PGMDynUnlockHCPage(pVM, pPdeDst);
+                PGMDynUnlockHCPage(pVM, (uint8_t *)pPdeDst);
 # endif
 
@@ -2675 +2675 @@
             *pPdeDst = PdeDst;
 # if defined(IN_RC) && defined(VBOX_WITH_PGMPOOL_PAGING_ONLY)            
-            PGMDynUnlockHCPage(pVM, pPdeDst);
+            PGMDynUnlockHCPage(pVM, (uint8_t *)pPdeDst);
 # endif