Changeset 3197 in vbox for trunk

Timestamp:

Jun 21, 2007 8:19:41 AM (18 years ago)

Author:

vboxsync

Message:

IO handling updates

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HWSVMR0.cpp (modified) (3 diffs)
• HWVMXR0.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp

@@ -1290 +1290 @@
         /*
          * Handled the I/O return codes.
-         * (The unhandled cases end up with rc == VINF_EM_RESCHEDULE_REM.)
+         * (The unhandled cases end up with rc == VINF_EM_RAW_EMULATE_INSTR.)
          */
         if (IOM_SUCCESS(rc))
@@ -1304 +1304 @@
             break;
         }
+        if (rc == VINF_EM_RAW_EMULATE_INSTR)
+        {
+            /* First attempt to emulate directly before falling back to the recompiler */
+            rc = (IoExitInfo.n.u1Type == 0) ? VINF_IOM_HC_IOPORT_WRITE : VINF_IOM_HC_IOPORT_READ;
+        }
+
 #ifdef VBOX_STRICT
         if (rc == VINF_IOM_HC_IOPORT_READ)
@@ -1310 +1316 @@
             Assert(IoExitInfo.n.u1Type == 0);
         else
-            AssertMsg(VBOX_FAILURE(rc) || rc == VINF_EM_RAW_EMULATE_INSTR || rc == VINF_EM_RAW_GUEST_TRAP || rc == VINF_TRPM_XCPT_DISPATCHED || rc == VINF_EM_RESCHEDULE_REM, ("%Vrc\n", rc));
+            AssertMsg(VBOX_FAILURE(rc) || rc == VINF_EM_RAW_EMULATE_INSTR || rc == VINF_EM_RAW_GUEST_TRAP || rc == VINF_TRPM_XCPT_DISPATCHED, ("%Vrc\n", rc));
 #endif
         Log2(("Failed IO at %VGv %x size %d\n", pCtx->eip, IoExitInfo.n.u16Port, uIOSize));

trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp

@@ -1729 +1729 @@
         /*
          * Handled the I/O return codes.
-         * (The unhandled cases end up with rc == VINF_EM_RESCHEDULE_REM.)
+         * (The unhandled cases end up with rc == VINF_EM_RAW_EMULATE_INSTR.)
          */
         if (IOM_SUCCESS(rc))
@@ -1742 +1742 @@
             break;
         }
+        if (rc == VINF_EM_RAW_EMULATE_INSTR)
+        {
+            /* First attempt to emulate directly before falling back to the recompiler */
+            rc = (fIOWrite) ? VINF_IOM_HC_IOPORT_WRITE : VINF_IOM_HC_IOPORT_READ;
+        }
+
 #ifdef VBOX_STRICT
         if (rc == VINF_IOM_HC_IOPORT_READ)
@@ -1748 +1754 @@
             Assert(fIOWrite);
         else
-            AssertMsg(VBOX_FAILURE(rc) || rc == VINF_EM_RAW_EMULATE_INSTR || rc == VINF_EM_RAW_GUEST_TRAP || rc == VINF_TRPM_XCPT_DISPATCHED || rc == VINF_EM_RESCHEDULE_REM, ("%Vrc\n", rc));
+            AssertMsg(VBOX_FAILURE(rc) || rc == VINF_EM_RAW_EMULATE_INSTR || rc == VINF_EM_RAW_GUEST_TRAP || rc == VINF_TRPM_XCPT_DISPATCHED, ("%Vrc\n", rc));
 #endif
         break;