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

Timestamp:

Apr 19, 2007 12:14:38 PM (18 years ago)

Author:

vboxsync

Message:

Added ins/outs support to VMX. Cleaned up both VMX & SVM io handling.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

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

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

@@ -1221 +1221 @@
         }
 
-        if (    IoExitInfo.n.u1REP
-            ||  IoExitInfo.n.u1STR
-           )
-        {
+        if (IoExitInfo.n.u1STR)
+        {
+            /* ins/outs */
             uint32_t prefix = 0;
             if (IoExitInfo.n.u1REP)
@@ -1244 +1243 @@
         else
         {
+            /* normal in/out */
+            Assert(!IoExitInfo.n.u1REP);
+
             if (IoExitInfo.n.u1Type == 0)
             {
@@ -1273 +1275 @@
         Assert(rc == VINF_IOM_HC_IOPORT_READ || rc == VINF_IOM_HC_IOPORT_WRITE);
         rc = (IoExitInfo.n.u1Type == 0) ? VINF_IOM_HC_IOPORT_WRITE : VINF_IOM_HC_IOPORT_READ;
-
         Log2(("Failed IO at %VGv %x size %d\n", pCtx->eip, IoExitInfo.n.u16Port, uIOSize));
         break;

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

@@ -1550 +1550 @@
         uint32_t uIOWidth = VMX_EXIT_QUALIFICATION_IO_WIDTH(exitQualification);
         uint32_t uPort;
+        bool     fIOWrite = (VMX_EXIT_QUALIFICATION_IO_DIRECTION(exitQualification) == VMX_EXIT_QUALIFICATION_IO_DIRECTION_OUT);
 
         /** @todo necessary to make the distinction? */
@@ -1559 +1560 @@
             uPort = VMX_EXIT_QUALIFICATION_IO_PORT(exitQualification);  /* Immediate encoding. */
 
-        /* First simple in and out instructions. */
-        /** @todo str & rep */
-        if (    !VMX_EXIT_QUALIFICATION_IO_STRING(exitQualification)
-            &&  !VMX_EXIT_QUALIFICATION_IO_REP(exitQualification)
-            /* paranoid checks ahead */
-            &&  uIOWidth != 2
-            &&  uIOWidth < 4
-           )
-        {
-            uint32_t cbSize  = aIOSize[uIOWidth];
+        /* paranoia */
+        if (RT_UNLIKELY(uIOWidth == 2 || uIOWidth >= 4))
+        {
+            rc = VINF_IOM_HC_IOPORT_READWRITE;
+            break;
+        }
+
+        uint32_t cbSize = aIOSize[uIOWidth];
+
+        if (VMX_EXIT_QUALIFICATION_IO_STRING(exitQualification))
+        {
+            /* ins/outs */
+            uint32_t prefix = 0;
+            if (VMX_EXIT_QUALIFICATION_IO_REP(exitQualification))
+                prefix |= PREFIX_REP;
+
+            if (fIOWrite)
+            {
+                Log2(("IOMInterpretOUTSEx %VGv %x size=%d\n", pCtx->eip, uPort, cbSize));
+                STAM_COUNTER_INC(&pVM->hwaccm.s.StatExitIOStringWrite);
+                rc = IOMInterpretOUTSEx(pVM, CPUMCTX2CORE(pCtx), uPort, prefix, cbSize);
+            }
+            else
+            {
+                Log2(("IOMInterpretINSEx  %VGv %x size=%d\n", pCtx->eip, uPort, cbSize));
+                STAM_COUNTER_INC(&pVM->hwaccm.s.StatExitIOStringRead);
+                rc = IOMInterpretINSEx(pVM, CPUMCTX2CORE(pCtx), uPort, prefix, cbSize);
+            }
+        }
+        else
+        {
+            /* normal in/out */
             uint32_t uAndVal = aIOOpAnd[uIOWidth];
 
-            if (VMX_EXIT_QUALIFICATION_IO_DIRECTION(exitQualification) == VMX_EXIT_QUALIFICATION_IO_DIRECTION_OUT)
+            Assert(!VMX_EXIT_QUALIFICATION_IO_REP(exitQualification));
+
+            if (fIOWrite)
             {
                 STAM_COUNTER_INC(&pVM->hwaccm.s.StatExitIOWrite);
@@ -1588 +1613 @@
                 }
             }
-            if (rc == VINF_SUCCESS)
-            {
-                /* Update EIP and continue execution. */
-                pCtx->eip += cbInstr;
-                STAM_PROFILE_ADV_STOP(&pVM->hwaccm.s.StatExit, x);
-                goto ResumeExecution;
-            }
-            Assert(rc == VINF_IOM_HC_IOPORT_READ || rc == VINF_IOM_HC_IOPORT_WRITE);
-            rc = (VMX_EXIT_QUALIFICATION_IO_DIRECTION(exitQualification) == VMX_EXIT_QUALIFICATION_IO_DIRECTION_OUT)
-                        ? VINF_IOM_HC_IOPORT_WRITE : VINF_IOM_HC_IOPORT_READ;
-        }
-        else
-            rc = VINF_IOM_HC_IOPORT_READWRITE;
+        }
+        if (rc == VINF_SUCCESS)
+        {
+            /* Update EIP and continue execution. */
+            pCtx->eip += cbInstr;
+            STAM_PROFILE_ADV_STOP(&pVM->hwaccm.s.StatExit, x);
+            goto ResumeExecution;
+        }
+        Assert(rc == VINF_IOM_HC_IOPORT_READ || rc == VINF_IOM_HC_IOPORT_WRITE);
+        rc = (fIOWrite) ? VINF_IOM_HC_IOPORT_WRITE : VINF_IOM_HC_IOPORT_READ;
 
         break;