Changeset 2220 in vbox for trunk

Timestamp:

Apr 19, 2007 12:27:00 PM (18 years ago)

Author:

vboxsync

Message:

Don't call the outs/ins string handler if we're only supposed to transfer a single unit.

File:

• trunk/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp (modified) (2 diffs)

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

@@ -1647 +1647 @@
 
     Log(("IOM: rep ins%d port %#x count %d\n", cbTransfer * 8, uPort, cTransfers));
+    if (cTransfers > 1)
+    {
+        /* If the device supports string transfers, ask it to do as
+         * much as it wants. The rest is done with single-word transfers. */
+        const RTGCUINTREG cTransfersOrg = cTransfers;
+        rc = IOMIOPortReadString(pVM, uPort, &GCPtrDst, &cTransfers, cbTransfer);
+        AssertRC(rc); Assert(cTransfers <= cTransfersOrg);
+        pRegFrame->edi += (cTransfersOrg - cTransfers) * cbTransfer;
+    }
+
 #ifdef IN_GC
     MMGCRamRegisterTrapHandler(pVM);
 #endif
-
-    /* If the device supports string transfers, ask it to do as
-     * much as it wants. The rest is done with single-word transfers. */
-    const RTGCUINTREG cTransfersOrg = cTransfers;
-    rc = IOMIOPortReadString(pVM, uPort, &GCPtrDst, &cTransfers, cbTransfer);
-    AssertRC(rc); Assert(cTransfers <= cTransfersOrg);
-    pRegFrame->edi += (cTransfersOrg - cTransfers) * cbTransfer;
 
     while (cTransfers && rc == VINF_SUCCESS)
@@ -1775 +1778 @@
 
     Log(("IOM: rep outs%d port %#x count %d\n", cbTransfer * 8, uPort, cTransfers));
+    if (cTransfers > 1)
+    {
+        /*
+        * If the device supports string transfers, ask it to do as
+        * much as it wants. The rest is done with single-word transfers.
+        */
+        const RTGCUINTREG cTransfersOrg = cTransfers;
+        rc = IOMIOPortWriteString(pVM, uPort, &GCPtrSrc, &cTransfers, cbTransfer);
+        AssertRC(rc); Assert(cTransfers <= cTransfersOrg);
+        pRegFrame->esi += (cTransfersOrg - cTransfers) * cbTransfer;
+    }
+
 #ifdef IN_GC
     MMGCRamRegisterTrapHandler(pVM);
 #endif
-    /*
-     * If the device supports string transfers, ask it to do as
-     * much as it wants. The rest is done with single-word transfers.
-     */
-    const RTGCUINTREG cTransfersOrg = cTransfers;
-    rc = IOMIOPortWriteString(pVM, uPort, &GCPtrSrc, &cTransfers, cbTransfer);
-    AssertRC(rc); Assert(cTransfers <= cTransfersOrg);
-    pRegFrame->esi += (cTransfersOrg - cTransfers) * cbTransfer;
 
     while (cTransfers && rc == VINF_SUCCESS)