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

時間撮記:

2007-6-20 下午01:40:16 (17 年 以前)

作者:

vboxsync

訊息:

return VINF_EM_RAW_EMULATE_INSTR instead of VINF_EM_RESCHEDULE_REM when the emulation of string I/O encounters difficult bits.

檔案:

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

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

@@ -1597 +1597 @@
  * @remark Assumes caller checked the access privileges (IOMInterpretCheckPortIOAccess)
  *
- * @returns Strict VBox status code. Informational status codes other than the one documented 
+ * @returns Strict VBox status code. Informational status codes other than the one documented
  *          here are to be treated as internal failure. Use IOM_SUCCESS() to check for success.
  * @retval  VINF_SUCCESS                Success.
- * @retval  VINF_EM_FIRST-VINF_EM_LAST  Success with some exceptions (see IOM_SUCCESS()), the 
+ * @retval  VINF_EM_FIRST-VINF_EM_LAST  Success with some exceptions (see IOM_SUCCESS()), the
  *                                      status code must be passed on to EM.
  * @retval  VINF_IOM_HC_IOPORT_READ     Defer the read to ring-3. (R0/GC only)
+ * @retval  VINF_EM_RAW_EMULATE_INSTR   Defer the read to the REM.
  * @retval  VINF_EM_RAW_GUEST_TRAP      The exception was left pending. (TRPMRaiseXcptErr)
  * @retval  VINF_TRPM_XCPT_DISPATCHED   The exception was raised and dispatched for raw-mode execution. (TRPMRaiseXcptErr)
@@ -1625 +1626 @@
     if (   (uPrefix & PREFIX_REPNE)
         || pRegFrame->eflags.Bits.u1DF)
-        return VINF_EM_RESCHEDULE_REM;
+        return VINF_EM_RAW_EMULATE_INSTR;
 
     /*
@@ -1644 +1645 @@
     /* Convert destination address es:edi. */
     RTGCPTR GCPtrDst;
-    int rc = SELMToFlatEx(pVM, pRegFrame->eflags, pRegFrame->es, (RTGCPTR)pRegFrame->edi, &pRegFrame->esHid, 
+    int rc = SELMToFlatEx(pVM, pRegFrame->eflags, pRegFrame->es, (RTGCPTR)pRegFrame->edi, &pRegFrame->esHid,
                           SELMTOFLAT_FLAGS_HYPER | SELMTOFLAT_FLAGS_NO_PL,
                           &GCPtrDst, NULL);
@@ -1650 +1651 @@
     {
         Log(("INS destination address conversion failed -> fallback, rc=%d\n", rc));
-        return VINF_EM_RESCHEDULE_REM;
+        return VINF_EM_RAW_EMULATE_INSTR;
     }
 
@@ -1661 +1662 @@
     {
         Log(("INS will generate a trap -> fallback, rc=%d\n", rc));
-        return VINF_EM_RESCHEDULE_REM;
+        return VINF_EM_RAW_EMULATE_INSTR;
     }
 
@@ -1708 +1709 @@
  * ES:EDI,DX[,ECX]
  *
- * @returns Strict VBox status code. Informational status codes other than the one documented 
+ * @returns Strict VBox status code. Informational status codes other than the one documented
  *          here are to be treated as internal failure. Use IOM_SUCCESS() to check for success.
  * @retval  VINF_SUCCESS                Success.
- * @retval  VINF_EM_FIRST-VINF_EM_LAST  Success with some exceptions (see IOM_SUCCESS()), the 
+ * @retval  VINF_EM_FIRST-VINF_EM_LAST  Success with some exceptions (see IOM_SUCCESS()), the
  *                                      status code must be passed on to EM.
  * @retval  VINF_IOM_HC_IOPORT_READ     Defer the read to ring-3. (R0/GC only)
+ * @retval  VINF_EM_RAW_EMULATE_INSTR   Defer the read to the REM.
  * @retval  VINF_EM_RAW_GUEST_TRAP      The exception was left pending. (TRPMRaiseXcptErr)
  * @retval  VINF_TRPM_XCPT_DISPATCHED   The exception was raised and dispatched for raw-mode execution. (TRPMRaiseXcptErr)
@@ -1752 +1754 @@
  * @remark  Assumes caller checked the access privileges (IOMInterpretCheckPortIOAccess)
  *
- * @returns Strict VBox status code. Informational status codes other than the one documented 
+ * @returns Strict VBox status code. Informational status codes other than the one documented
  *          here are to be treated as internal failure. Use IOM_SUCCESS() to check for success.
  * @retval  VINF_SUCCESS                Success.
- * @retval  VINF_EM_FIRST-VINF_EM_LAST  Success with some exceptions (see IOM_SUCCESS()), the 
+ * @retval  VINF_EM_FIRST-VINF_EM_LAST  Success with some exceptions (see IOM_SUCCESS()), the
  *                                      status code must be passed on to EM.
  * @retval  VINF_IOM_HC_IOPORT_WRITE    Defer the write to ring-3. (R0/GC only)
@@ -1780 +1782 @@
     if (   (uPrefix & (PREFIX_SEG | PREFIX_REPNE))
         || pRegFrame->eflags.Bits.u1DF)
-        return VINF_EM_RESCHEDULE_REM;
+        return VINF_EM_RAW_EMULATE_INSTR;
 
     /*
@@ -1804 +1806 @@
     {
         Log(("OUTS source address conversion failed -> fallback, rc=%Vrc\n", rc));
-        return VINF_EM_RESCHEDULE_REM;
+        return VINF_EM_RAW_EMULATE_INSTR;
     }
 
@@ -1814 +1816 @@
     {
         Log(("OUTS will generate a trap -> fallback, rc=%Vrc\n", rc));
-        return VINF_EM_RESCHEDULE_REM;
+        return VINF_EM_RAW_EMULATE_INSTR;
     }
 
@@ -1865 +1867 @@
  * DS:ESI,DX[,ECX]
  *
- * @returns Strict VBox status code. Informational status codes other than the one documented 
+ * @returns Strict VBox status code. Informational status codes other than the one documented
  *          here are to be treated as internal failure. Use IOM_SUCCESS() to check for success.
  * @retval  VINF_SUCCESS                Success.
- * @retval  VINF_EM_FIRST-VINF_EM_LAST  Success with some exceptions (see IOM_SUCCESS()), the 
+ * @retval  VINF_EM_FIRST-VINF_EM_LAST  Success with some exceptions (see IOM_SUCCESS()), the
  *                                      status code must be passed on to EM.
  * @retval  VINF_IOM_HC_IOPORT_WRITE    Defer the write to ring-3. (R0/GC only)
+ * @retval  VINF_EM_RAW_EMULATE_INSTR   Defer the write to the REM.
  * @retval  VINF_EM_RAW_GUEST_TRAP      The exception was left pending. (TRPMRaiseXcptErr)
  * @retval  VINF_TRPM_XCPT_DISPATCHED   The exception was raised and dispatched for raw-mode execution. (TRPMRaiseXcptErr)