vbox的更動 9678 路徑 trunk/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp

時間撮記:

2008-6-13 上午11:42:02 (16 年 以前)

作者:

vboxsync

訊息:

Rewrote SELMToFlatEx for long mode.

檔案:

• trunk/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp (修改) (4 筆差異)

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

@@ -345 +345 @@
         /* Convert source address ds:esi. */
         RTGCUINTPTR pu8Virt;
-        rc = SELMToFlatEx(pVM, pRegFrame->eflags, pRegFrame->ds, (RTGCPTR)pRegFrame->esi, &pRegFrame->dsHid,
+        rc = SELMToFlatEx(pVM, DIS_SELREG_DS, pRegFrame, (RTGCPTR)pRegFrame->esi,
                           SELMTOFLAT_FLAGS_HYPER | SELMTOFLAT_FLAGS_NO_PL,
-                          (PRTGCPTR)&pu8Virt, NULL);
+                          (PRTGCPTR)&pu8Virt);
         if (VBOX_SUCCESS(rc))
         {
@@ -404 +404 @@
         /* Convert destination address. */
         RTGCUINTPTR pu8Virt;
-        rc = SELMToFlatEx(pVM, pRegFrame->eflags, pRegFrame->es, (RTGCPTR)pRegFrame->edi, &pRegFrame->esHid,
-                                SELMTOFLAT_FLAGS_HYPER | SELMTOFLAT_FLAGS_NO_PL,
-                                (RTGCPTR *)&pu8Virt, NULL);
+        rc = SELMToFlatEx(pVM, DIS_SELREG_ES, pRegFrame, (RTGCPTR)pRegFrame->edi,
+                          SELMTOFLAT_FLAGS_HYPER | SELMTOFLAT_FLAGS_NO_PL,
+                          (RTGCPTR *)&pu8Virt);
         if (VBOX_FAILURE(rc))
             return VINF_EM_RAW_GUEST_TRAP;
@@ -1319 +1319 @@
     /* Convert destination address es:edi. */
     RTGCPTR GCPtrDst;
-    int rc = SELMToFlatEx(pVM, pRegFrame->eflags, pRegFrame->es, (RTGCPTR)pRegFrame->edi, &pRegFrame->esHid,
+    int rc = SELMToFlatEx(pVM, DIS_SELREG_ES, pRegFrame, (RTGCPTR)pRegFrame->edi,
                           SELMTOFLAT_FLAGS_HYPER | SELMTOFLAT_FLAGS_NO_PL,
-                          &GCPtrDst, NULL);
+                          &GCPtrDst);
     if (VBOX_FAILURE(rc))
     {
@@ -1474 +1474 @@
     /* Convert source address ds:esi. */
     RTGCPTR GCPtrSrc;
-    int rc = SELMToFlatEx(pVM, pRegFrame->eflags, pRegFrame->ds, (RTGCPTR)pRegFrame->esi, &pRegFrame->dsHid,
+    int rc = SELMToFlatEx(pVM, DIS_SELREG_DS, pRegFrame, (RTGCPTR)pRegFrame->esi,
                           SELMTOFLAT_FLAGS_HYPER | SELMTOFLAT_FLAGS_NO_PL,
-                          &GCPtrSrc, NULL);
+                          &GCPtrSrc);
     if (VBOX_FAILURE(rc))
     {