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

Timestamp:

Jun 14, 2015 7:35:54 PM (10 years ago)

Author:

vboxsync

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

101023

Message:

PATM: virt access handlers: Only use pvUser for asserting.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PATMAll.cpp (modified) (1 diff)
• VMMRC/PATMRC.cpp (modified) (1 diff)

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

@@ -45 +45 @@
  *          monitored.
  */
-PGM_ALL_CB2_DECL(VBOXSTRICTRC) patmVirtPageHandler(PVM pVM, PVMCPU pVCpu, RTGCPTR GCPtr, void *pvPtr, void *pvBuf, size_t cbBuf,
-                                                   PGMACCESSTYPE enmAccessType, PGMACCESSORIGIN enmOrigin, void *pvUser)
+PGM_ALL_CB2_DECL(VBOXSTRICTRC)
+patmVirtPageHandler(PVM pVM, PVMCPU pVCpu, RTGCPTR GCPtr, void *pvPtr, void *pvBuf, size_t cbBuf,
+                    PGMACCESSTYPE enmAccessType, PGMACCESSORIGIN enmOrigin, void *pvUser)
 {
     Assert(enmAccessType == PGMACCESSTYPE_WRITE); NOREF(enmAccessType);
     NOREF(pvPtr); NOREF(pvBuf); NOREF(cbBuf); NOREF(enmOrigin); NOREF(pvUser);
-    Assert(pvUser); Assert(!((uintptr_t)pvUser & PAGE_OFFSET_MASK));
-
-    pVM->patm.s.pvFaultMonitor = (RTRCPTR)((uintptr_t)pvUser + (GCPtr & PAGE_OFFSET_MASK));
+
+    Assert(pvUser);
+    Assert(!((uintptr_t)pvUser & PAGE_OFFSET_MASK));
+    Assert(((uintptr_t)pvUser + (GCPtr & PAGE_OFFSET_MASK)) == GCPtr);
+
+    pVM->patm.s.pvFaultMonitor = (RTRCPTR)GCPtr;
 #ifdef IN_RING3
     PATMR3HandleMonitoredPage(pVM);

trunk/src/VBox/VMM/VMMRC/PATMRC.cpp

@@ -56 +56 @@
 {
     NOREF(pVCpu); NOREF(uErrorCode); NOREF(pRegFrame); NOREF(pvFault); NOREF(pvRange); NOREF(offRange);
-    Assert(pvUser); Assert(!((uintptr_t)pvUser & PAGE_OFFSET_MASK));
-    pVM->patm.s.pvFaultMonitor = (RTRCPTR)((uintptr_t)pvUser + (pvFault & PAGE_OFFSET_MASK));
+
+    Assert(pvUser);
+    Assert(!((uintptr_t)pvUser & PAGE_OFFSET_MASK));
+    Assert(((uintptr_t)pvUser + (pvFault & PAGE_OFFSET_MASK)) == pvRange + offRange);
+
+    pVM->patm.s.pvFaultMonitor = (RTRCPTR)(pvRange + offRange);
     return VINF_PATM_CHECK_PATCH_PAGE;
 }