Changeset 10379 in vbox for trunk/src

Timestamp:

Jul 8, 2008 4:52:25 PM (17 years ago)

Author:

vboxsync

Message:

MMIO: missing changes for 64 bits mode.

File:

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

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

@@ -348 +348 @@
         /* Convert source address ds:esi. */
         RTGCUINTPTR pu8Virt;
-        rc = SELMToFlatEx(pVM, DIS_SELREG_DS, pRegFrame, (RTGCPTR)pRegFrame->esi,
+        rc = SELMToFlatEx(pVM, DIS_SELREG_DS, pRegFrame, (RTGCPTR)pRegFrame->rsi,
                           SELMTOFLAT_FLAGS_HYPER | SELMTOFLAT_FLAGS_NO_PL,
                           (PRTGCPTR)&pu8Virt);
@@ -380 +380 @@
                 pu8Virt        += offIncrement;
                 Phys           += offIncrement;
-                pRegFrame->esi += offIncrement;
-                pRegFrame->edi += offIncrement;
+                pRegFrame->rsi += offIncrement;
+                pRegFrame->rdi += offIncrement;
                 cTransfers--;
             }
@@ -407 +407 @@
         /* Convert destination address. */
         RTGCUINTPTR pu8Virt;
-        rc = SELMToFlatEx(pVM, DIS_SELREG_ES, pRegFrame, (RTGCPTR)pRegFrame->edi,
+        rc = SELMToFlatEx(pVM, DIS_SELREG_ES, pRegFrame, (RTGCPTR)pRegFrame->rdi,
                           SELMTOFLAT_FLAGS_HYPER | SELMTOFLAT_FLAGS_NO_PL,
                           (RTGCPTR *)&pu8Virt);
@@ -447 +447 @@
                 Phys           += offIncrement;
                 PhysDst        += offIncrement;
-                pRegFrame->esi += offIncrement;
-                pRegFrame->edi += offIncrement;
+                pRegFrame->rsi += offIncrement;
+                pRegFrame->rdi += offIncrement;
                 cTransfers--;
             }
@@ -489 +489 @@
                 pu8Virt        += offIncrement;
                 Phys           += offIncrement;
-                pRegFrame->esi += offIncrement;
-                pRegFrame->edi += offIncrement;
+                pRegFrame->rsi += offIncrement;
+                pRegFrame->rdi += offIncrement;
                 cTransfers--;
             }
@@ -582 +582 @@
             {
                 /* Update registers. */
-                pRegFrame->edi += cTransfers << SIZE_2_SHIFT(cb);
+                pRegFrame->rdi += cTransfers << SIZE_2_SHIFT(cb);
                 if (pCpu->prefix & PREFIX_REP)
                     pRegFrame->ecx = 0;
@@ -594 +594 @@
             {
                 /* Update registers. */
-                pRegFrame->edi -= cTransfers << SIZE_2_SHIFT(cb);
+                pRegFrame->rdi -= cTransfers << SIZE_2_SHIFT(cb);
                 if (pCpu->prefix & PREFIX_REP)
                     pRegFrame->ecx = 0;
@@ -615 +615 @@
 
             Phys           += offIncrement;
-            pRegFrame->edi += offIncrement;
+            pRegFrame->rdi += offIncrement;
             cTransfers--;
         } while (cTransfers);
@@ -671 +671 @@
     int rc = iomMMIODoRead(pVM, pRange, GCPhysFault, &pRegFrame->eax, cb);
     if (rc == VINF_SUCCESS)
-        pRegFrame->esi += offIncrement;
+        pRegFrame->rsi += offIncrement;
 
     /*
@@ -1332 +1332 @@
     /* Convert destination address es:edi. */
     RTGCPTR GCPtrDst;
-    int rc = SELMToFlatEx(pVM, DIS_SELREG_ES, pRegFrame, (RTGCPTR)pRegFrame->edi,
+    int rc = SELMToFlatEx(pVM, DIS_SELREG_ES, pRegFrame, (RTGCPTR)pRegFrame->rdi,
                           SELMTOFLAT_FLAGS_HYPER | SELMTOFLAT_FLAGS_NO_PL,
                           &GCPtrDst);
@@ -1360 +1360 @@
         rc = IOMIOPortReadString(pVM, uPort, &GCPtrDst, &cTransfers, cbTransfer);
         AssertRC(rc); Assert(cTransfers <= cTransfersOrg);
-        pRegFrame->edi += (cTransfersOrg - cTransfers) * cbTransfer;
+        pRegFrame->rdi += (cTransfersOrg - cTransfers) * cbTransfer;
     }
 
@@ -1376 +1376 @@
         Assert(rc2 == VINF_SUCCESS); NOREF(rc2);
         GCPtrDst = (RTGCPTR)((RTGCUINTPTR)GCPtrDst + cbTransfer);
-        pRegFrame->edi += cbTransfer;
+        pRegFrame->rdi += cbTransfer;
         cTransfers--;
     }
@@ -1487 +1487 @@
     /* Convert source address ds:esi. */
     RTGCPTR GCPtrSrc;
-    int rc = SELMToFlatEx(pVM, DIS_SELREG_DS, pRegFrame, (RTGCPTR)pRegFrame->esi,
+    int rc = SELMToFlatEx(pVM, DIS_SELREG_DS, pRegFrame, (RTGCPTR)pRegFrame->rsi,
                           SELMTOFLAT_FLAGS_HYPER | SELMTOFLAT_FLAGS_NO_PL,
                           &GCPtrSrc);
@@ -1516 +1516 @@
         rc = IOMIOPortWriteString(pVM, uPort, &GCPtrSrc, &cTransfers, cbTransfer);
         AssertRC(rc); Assert(cTransfers <= cTransfersOrg);
-        pRegFrame->esi += (cTransfersOrg - cTransfers) * cbTransfer;
+        pRegFrame->rsi += (cTransfersOrg - cTransfers) * cbTransfer;
     }
 
@@ -1533 +1533 @@
             break;
         GCPtrSrc = (RTGCPTR)((RTUINTPTR)GCPtrSrc + cbTransfer);
-        pRegFrame->esi += cbTransfer;
+        pRegFrame->rsi += cbTransfer;
         cTransfers--;
     }