Changeset 4418 in vbox for trunk

Timestamp:

Aug 29, 2007 9:16:39 AM (17 years ago)

Author:

vboxsync

Message:

Reapplied 23986

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• EMAll.cpp (modified) (8 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)
 {
-    int rc;
-#ifdef IN_GC
-    rc = MMGCRamRead(pVM, pDest, GCSrc, cb);
+#ifdef IN_GC
+    int rc = MMGCRamRead(pVM, pDest, GCSrc, cb);
     if (RT_LIKELY(rc != VERR_ACCESS_DENIED))
         return rc;
@@ -291 +290 @@
      * instruction and it either flushed the TLB or the CPU reused it.
      */
-#endif
     RTGCPHYS    GCPhys;
     RTGCUINTPTR offset;
@@ -301 +299 @@
     PGMPhysRead(pVM, GCPhys + offset, pDest, cb);
     return VINF_SUCCESS;
+#else
+    return PGMPhysReadGCPtrSafe(pVM, pDest, GCSrc, cb);
+#endif
 }
 
@@ -329 +330 @@
 
 #else
-
-    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;
+    return PGMPhysWriteGCPtrSafe(pVM, GCDest, pSrc, cb);
 #endif
 }
@@ -701 +693 @@
 #ifdef IN_GC
                 /* Safety check (in theory it could cross a page boundary and fault there though) */
-                AssertMsgReturn(pParam1 == pvFault, ("eip=%VGv, pParam1=%VGv pvFault=%VGv\n", pRegFrame->eip, pParam1, pvFault), VERR_EM_INTERPRETER);
+//                AssertMsgReturn(pParam1 == pvFault, ("eip=%VGv, pParam1=%VGv pvFault=%VGv\n", pRegFrame->eip, pParam1, pvFault), VERR_EM_INTERPRETER);
 #endif
                 rc = emRamRead(pVM,  &valpar1, pParam1, param1.size);
                 if (VBOX_FAILURE(rc))
                 {
-                    AssertMsgFailed(("emRamRead %VGv size=%d failed with %Vrc\n", pParam1, param1.size, rc));
+//                    AssertMsgFailed(("emRamRead %VGv size=%d failed with %Vrc\n", pParam1, param1.size, rc));
                     return VERR_EM_INTERPRETER;
                 }
@@ -1025 +1017 @@
 #ifdef IN_GC
             /* Safety check (in theory it could cross a page boundary and fault there though) */
-            AssertMsgReturn(pDest == pvFault, ("eip=%VGv pDest=%VGv pvFault=%VGv\n", pRegFrame->eip, pDest, pvFault), VERR_EM_INTERPRETER);
+//            AssertMsgReturn(pDest == pvFault, ("eip=%VGv pDest=%VGv pvFault=%VGv\n", pRegFrame->eip, pDest, pvFault), VERR_EM_INTERPRETER);
 #endif
             rc = emRamWrite(pVM, pDest, &val32, param2.size);
@@ -1124 +1116 @@
 
                 /* Safety check (in theory it could cross a page boundary and fault there though) */
-                AssertMsgReturn(pParam1 == pvFault, ("eip=%VGv pParam1=%VGv pvFault=%VGv\n", pRegFrame->eip, pParam1, pvFault), VERR_EM_INTERPRETER);
+//                AssertMsgReturn(pParam1 == pvFault, ("eip=%VGv pParam1=%VGv pvFault=%VGv\n", pRegFrame->eip, pParam1, pvFault), VERR_EM_INTERPRETER);
 
 #ifdef VBOX_STRICT
@@ -1262 +1254 @@
     Log(("PGMInvalidatePage %VGv returned %VGv (%d)\n", pAddrGC, rc, rc));
     Assert(rc == VERR_REM_FLUSHED_PAGES_OVERFLOW);
-
     /** @todo r=bird: we shouldn't ignore returns codes like this... I'm 99% sure the error is fatal. */
     return VERR_EM_INTERPRETER;

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

@@ -461 +461 @@
     return MMGCRamReadNoTrapHandler(pDest, GCSrc, cb);
 #else
-    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;
+    return PGMPhysReadGCPtrSafe(pVM, pDest, GCSrc, cb);
 #endif
 }
@@ -480 +470 @@
     return MMGCRamWriteNoTrapHandler(GCDest, pSrc, cb);
 #else
-    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;
+    return PGMPhysWriteGCPtrSafe(pVM, GCDest, pSrc, cb);
 #endif
 }