Changeset 56416 in vbox for trunk/src/VBox/VMM

Timestamp:

Jun 14, 2015 12:26:09 PM (9 years ago)

Author:

vboxsync

Message:

IEM: Use the modified IOM string I/O APIs.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImplStrInstr.cpp.h (modified) (6 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAllCImplStrInstr.cpp.h

@@ -1141 +1141 @@
                     && uAddrReg + (cLeftPage * (OP_SIZE / 8)) <= pCtx->es.u32Limit)
                )
+            && !IEM_VERIFICATION_ENABLED(pIemCpu)
            )
         {
@@ -1149 +1150 @@
 
             /*
-             * If we can map the page without trouble, we would've liked to use
-             * an string I/O method to do the work, but the current IOM
-             * interface doesn't match our current approach. So, do a regular
-             * loop instead.
+             * If we can map the page without trouble, use the IOM
+             * string I/O interface to do the work.
              */
-            /** @todo Change the I/O manager interface to make use of
-             *        mapped buffers instead of leaving those bits to the
-             *        device implementation! */
             PGMPAGEMAPLOCK PgLockMem;
             OP_TYPE *puMem;
@@ -1162 +1158 @@
             if (rcStrict == VINF_SUCCESS)
             {
-                uint32_t off = 0;
-                while (off < cLeftPage)
+                uint32_t cTransfers = cLeftPage;
+                rcStrict = IOMIOPortReadString(pVM, pVCpu, u16Port, puMem, &cTransfers, OP_SIZE / 8);
+
+                uint32_t cActualTransfers = cLeftPage - cTransfers;
+                Assert(cActualTransfers <= cLeftPage);
+                pCtx->ADDR_rDI = uAddrReg    += cbIncr * cActualTransfers;
+                pCtx->ADDR_rCX = uCounterReg -= cActualTransfers;
+                puMem += cActualTransfers;
+
+                iemMemPageUnmap(pIemCpu, GCPhysMem, IEM_ACCESS_DATA_W, puMem, &PgLockMem);
+
+                if (rcStrict != VINF_SUCCESS)
                 {
-                    uint32_t u32Value;
-                    if (!IEM_VERIFICATION_ENABLED(pIemCpu))
-                        rcStrict = IOMIOPortRead(pVM, pVCpu, u16Port, &u32Value, OP_SIZE / 8);
-                    else
-                        rcStrict = iemVerifyFakeIOPortRead(pIemCpu, u16Port, &u32Value, OP_SIZE / 8);
                     if (IOM_SUCCESS(rcStrict))
                     {
-                        puMem[off]     = (OP_TYPE)u32Value;
-                        pCtx->ADDR_rDI = uAddrReg += cbIncr;
-                        pCtx->ADDR_rCX = --uCounterReg;
+                        rcStrict = iemSetPassUpStatus(pIemCpu, rcStrict);
+                        if (uCounterReg == 0)
+                            iemRegAddToRipAndClearRF(pIemCpu, cbInstr);
                     }
-                    if (rcStrict != VINF_SUCCESS)
-                    {
-                        if (IOM_SUCCESS(rcStrict))
-                        {
-                            rcStrict = iemSetPassUpStatus(pIemCpu, rcStrict);
-                            if (uCounterReg == 0)
-                                iemRegAddToRipAndClearRF(pIemCpu, cbInstr);
-                        }
-                        iemMemPageUnmap(pIemCpu, GCPhysMem, IEM_ACCESS_DATA_W, puMem, &PgLockMem);
-                        return rcStrict;
-                    }
-                    off++;
+                    return rcStrict;
                 }
-                iemMemPageUnmap(pIemCpu, GCPhysMem, IEM_ACCESS_DATA_W, puMem, &PgLockMem);
 
                 /* If unaligned, we drop thru and do the page crossing access
@@ -1352 +1341 @@
                     && uAddrReg + (cLeftPage * (OP_SIZE / 8)) <= pHid->u32Limit)
                )
+            && !IEM_VERIFICATION_ENABLED(pIemCpu)
            )
         {
@@ -1360 +1350 @@
 
             /*
-             * If we can map the page without trouble, we would've liked to use
-             * an string I/O method to do the work, but the current IOM
-             * interface doesn't match our current approach. So, do a regular
-             * loop instead.
+             * If we can map the page without trouble, we use the IOM
+             * string I/O interface to do the job.
              */
-            /** @todo Change the I/O manager interface to make use of
-             *        mapped buffers instead of leaving those bits to the
-             *        device implementation? */
             PGMPAGEMAPLOCK PgLockMem;
             OP_TYPE const *puMem;
@@ -1373 +1358 @@
             if (rcStrict == VINF_SUCCESS)
             {
-                uint32_t off = 0;
-                while (off < cLeftPage)
+                uint32_t cTransfers = cLeftPage;
+                rcStrict = IOMIOPortWriteString(pVM, pVCpu, u16Port, puMem, &cTransfers, OP_SIZE / 8);
+
+                uint32_t cActualTransfers = cLeftPage - cTransfers;
+                Assert(cActualTransfers <= cLeftPage);
+                pCtx->ADDR_rSI = uAddrReg    += cbIncr * cActualTransfers;
+                pCtx->ADDR_rCX = uCounterReg -= cActualTransfers;
+                puMem += cActualTransfers;
+
+                iemMemPageUnmap(pIemCpu, GCPhysMem, IEM_ACCESS_DATA_R, puMem, &PgLockMem);
+
+                if (rcStrict != VINF_SUCCESS)
                 {
-                    uint32_t u32Value = *puMem++;
-                    if (!IEM_VERIFICATION_ENABLED(pIemCpu))
-                        rcStrict = IOMIOPortWrite(pVM, pVCpu, u16Port, u32Value, OP_SIZE / 8);
-                    else
-                        rcStrict = iemVerifyFakeIOPortWrite(pIemCpu, u16Port, u32Value, OP_SIZE / 8);
                     if (IOM_SUCCESS(rcStrict))
                     {
-                        pCtx->ADDR_rSI = uAddrReg += cbIncr;
-                        pCtx->ADDR_rCX = --uCounterReg;
+                        rcStrict = iemSetPassUpStatus(pIemCpu, rcStrict);
+                        if (uCounterReg == 0)
+                            iemRegAddToRipAndClearRF(pIemCpu, cbInstr);
                     }
-                    if (rcStrict != VINF_SUCCESS)
-                    {
-                        if (IOM_SUCCESS(rcStrict))
-                        {
-                            rcStrict = iemSetPassUpStatus(pIemCpu, rcStrict);
-                            if (uCounterReg == 0)
-                                iemRegAddToRipAndClearRF(pIemCpu, cbInstr);
-                        }
-                        iemMemPageUnmap(pIemCpu, GCPhysMem, IEM_ACCESS_DATA_R, puMem, &PgLockMem);
-                        return rcStrict;
-                    }
-                    off++;
+                    return rcStrict;
                 }
-                iemMemPageUnmap(pIemCpu, GCPhysMem, IEM_ACCESS_DATA_R, puMem, &PgLockMem);
 
                 /* If unaligned, we drop thru and do the page crossing access