Changeset 13071 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Oct 8, 2008 12:07:55 PM (16 years ago)

Author:

vboxsync

Message:

PGM: Fixed some raw-mode regressions introduced in r37532.

File:

• trunk/src/VBox/VMM/VMMAll/PGMAll.cpp (modified) (5 diffs)

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

@@ -1767 +1767 @@
 VMMDECL(int) PGMDynMapGCPage(PVM pVM, RTGCPHYS GCPhys, void **ppv)
 {
-    AssertMsg(!(GCPhys & PAGE_OFFSET_MASK), ("GCPhys=%VGp\n", GCPhys));
+    AssertMsg(!(GCPhys & PAGE_OFFSET_MASK), ("GCPhys=%RGp\n", GCPhys));
 
     /*
@@ -1777 +1777 @@
     if (!pRam)
     {
-        AssertMsgFailed(("Invalid physical address %VGp!\n", GCPhys));
+        AssertMsgFailed(("Invalid physical address %RGp!\n", GCPhys));
         return VERR_PGM_INVALID_GC_PHYSICAL_ADDRESS;
     }
@@ -1823 +1823 @@
      */
     RTHCPHYS HCPhys = PGM_PAGE_GET_HCPHYS(&pRam->aPages[(GCPhys - pRam->GCPhys) >> PAGE_SHIFT]);
-    return PGMDynMapHCPageOff(pVM, HCPhys, ppv);
+    int rc = PGMDynMapHCPhys(pVM, HCPhys, ppv);
+    if (RT_SUCCESS(rc))
+        *ppv = (void *)((uintptr_t)*ppv | (GCPhys & PAGE_OFFSET_MASK));
+    return rc;
 }
 
@@ -1836 +1839 @@
  * @param   pVM         VM handle.
  * @param   HCPhys      HC Physical address of the page.
- * @param   ppv         Where to store the address of the mapping.
+ * @param   ppv         Where to store the address of the mapping. This is the
+ *                      address of the PAGE not the exact address corresponding
+ *                      to HCPhys. Use PGMDynMapHCPageOff if you care for the
+ *                      page offset.
  */
 VMMDECL(int) PGMDynMapHCPage(PVM pVM, RTHCPHYS HCPhys, void **ppv)
 {
-    AssertMsg(!(HCPhys & PAGE_OFFSET_MASK), ("HCPhys=%VHp\n", HCPhys));
+    AssertMsg(!(HCPhys & PAGE_OFFSET_MASK), ("HCPhys=%RHp\n", HCPhys));
 # ifdef IN_GC
 
@@ -1913 +1919 @@
 VMMDECL(int) PGMDynMapHCPageOff(PVM pVM, RTHCPHYS HCPhys, void **ppv)
 {
-    int rc = PGMDynMapHCPage(pVM, HCPhys, ppv);
+    int rc = PGMDynMapHCPage(pVM, HCPhys & ~(RTHCPHYS)PAGE_OFFSET_MASK, ppv);
     if (RT_SUCCESS(rc))
         *ppv = (void *)((uintptr_t)*ppv | (HCPhys & PAGE_OFFSET_MASK));