Changeset 60779 in vbox

Timestamp:

May 2, 2016 8:50:50 AM (9 years ago)

Author:

vboxsync

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

106977

Message:

IEM: Fixed cross page CR2 value.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAll.cpp (modified) (1 diff)

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

@@ -6727 +6727 @@
         return rcStrict;
 
-/** @todo Testcase & AMD-V/VT-x verification: Check if CR2 should really be the
- *        last byte. */
     RTGCPHYS GCPhysSecond;
-    rcStrict = iemMemPageTranslateAndCheckAccess(pIemCpu, GCPtrFirst + (cbMem - 1), fAccess, &GCPhysSecond);
+    rcStrict = iemMemPageTranslateAndCheckAccess(pIemCpu, (GCPtrFirst + (cbMem - 1)) & ~(RTGCPTR)PAGE_OFFSET_MASK,
+                                                 fAccess, &GCPhysSecond);
     if (rcStrict != VINF_SUCCESS)
         return rcStrict;