Changeset 4416 in vbox

Timestamp:

Aug 29, 2007 9:02:17 AM (18 years ago)

Author:

vboxsync

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

23988

Message:

Backed out 23986

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• EMAll.cpp (modified) (4 diffs)
• IOMAllMMIO.cpp (modified) (2 diffs)

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

@@ -281 +281 @@
 DECLINLINE(int) emRamRead(PVM pVM, void *pDest, RTGCPTR GCSrc, uint32_t cb)
 {
-#ifdef IN_GC
-    int rc = MMGCRamRead(pVM, pDest, GCSrc, cb);
+    int rc;
+#ifdef IN_GC
+    rc = MMGCRamRead(pVM, pDest, GCSrc, cb);
     if (RT_LIKELY(rc != VERR_ACCESS_DENIED))
         return rc;
@@ -290 +291 @@
      * instruction and it either flushed the TLB or the CPU reused it.
      */
+#endif
     RTGCPHYS    GCPhys;
     RTGCUINTPTR offset;
@@ -299 +301 @@
     PGMPhysRead(pVM, GCPhys + offset, pDest, cb);
     return VINF_SUCCESS;
-#else
-    return PGMPhysReadGCPtrSafe(pVM, pDest, GCSrc, cb);
-#endif
 }
 
@@ -330 +329 @@
 
 #else
-    return PGMPhysWriteGCPtrSafe(pVM, GCDest, pSrc, cb);
+
+    int         rc;
+    RTGCPHYS    GCPhys;
+    RTGCUINTPTR offset;
+
+    offset = GCDest & PAGE_OFFSET_MASK;
+    rc = PGMPhysGCPtr2GCPhys(pVM, GCDest, &GCPhys);
+    AssertRCReturn(rc, rc);
+    PGMPhysWrite(pVM, GCPhys + offset, pSrc, cb);
+    return VINF_SUCCESS;
 #endif
 }

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

@@ -461 +461 @@
     return MMGCRamReadNoTrapHandler(pDest, GCSrc, cb);
 #else
-    return PGMPhysReadGCPtrSafe(pVM, pDest, GCSrc, cb);
+    int         rc;
+    RTGCPHYS    GCPhys;
+    RTGCUINTPTR offset;
+
+    offset = GCSrc & PAGE_OFFSET_MASK;
+
+    /** @todo optimize the loop; no need to convert the address all the time */
+    rc = PGMPhysGCPtr2GCPhys(pVM, GCSrc, &GCPhys);
+    AssertRCReturn(rc, rc);
+    PGMPhysRead(pVM, GCPhys + offset, pDest, cb);
+    return VINF_SUCCESS;
 #endif
 }
@@ -470 +480 @@
     return MMGCRamWriteNoTrapHandler(GCDest, pSrc, cb);
 #else
-    return PGMPhysWriteGCPtrSafe(pVM, GCDest, pSrc, cb);
+    int         rc;
+    RTGCPHYS    GCPhys;
+    RTGCUINTPTR offset;
+
+    /** @todo optimize the loop; no need to convert the address all the time */
+    offset = GCDest & PAGE_OFFSET_MASK;
+    rc = PGMPhysGCPtr2GCPhys(pVM, GCDest, &GCPhys);
+    AssertRCReturn(rc, rc);
+    PGMPhysWrite(pVM, GCPhys + offset, pSrc, cb);
+    return VINF_SUCCESS;
 #endif
 }