Changeset 14945 in vbox for trunk/src/VBox

Timestamp:

Dec 3, 2008 2:14:27 PM (16 years ago)

Author:

vboxsync

Message:

Manual disassembly of ins/outs. Take two.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HWSVMR0.cpp (modified) (1 diff)
• HWVMXR0.cpp (modified) (1 diff)

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

@@ -1841 +1841 @@
         if (IoExitInfo.n.u1STR)
         {
-            uint32_t cbSize;
-
             /* ins/outs */
-            if (IoExitInfo.n.u1Type == 0)
+            DISCPUSTATE Cpu;
+
+            /* Disassemble manually to deal with segment prefixes. */
+            rc = EMInterpretDisasOne(pVM, CPUMCTX2CORE(pCtx), &Cpu, NULL);
+            if (rc == VINF_SUCCESS)
             {
-                STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatExitIOStringWrite);
-                Log2(("IOMInterpretOUTSEx %RGv %x size=%d\n", (RTGCPTR)pCtx->rip, IoExitInfo.n.u16Port, uIOSize));
+                if (IoExitInfo.n.u1Type == 0)
+                {
+                    Log2(("IOMInterpretOUTSEx %RGv %x size=%d\n", (RTGCPTR)pCtx->rip, IoExitInfo.n.u16Port, uIOSize));
+                    STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatExitIOStringWrite);
+                    rc = IOMInterpretOUTSEx(pVM, CPUMCTX2CORE(pCtx), IoExitInfo.n.u16Port, Cpu.prefix, uIOSize);
+                }
+                else
+                {
+                    Log2(("IOMInterpretINSEx  %RGv %x size=%d\n", (RTGCPTR)pCtx->rip, IoExitInfo.n.u16Port, uIOSize));
+                    STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatExitIOStringRead);
+                    rc = IOMInterpretINSEx(pVM, CPUMCTX2CORE(pCtx), IoExitInfo.n.u16Port, Cpu.prefix, uIOSize);
+                }
             }
             else
-            {
-                Log2(("IOMInterpretINSEx  %RGv %x size=%d\n", (RTGCPTR)pCtx->rip, IoExitInfo.n.u16Port, uIOSize));
-                STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatExitIOStringRead);
-            }
-
-            /* Disassemble manually, because we don't have any information about segment prefixes. */
-            rc = EMInterpretInstruction(pVM, CPUMCTX2CORE(pCtx), 0, &cbSize);
+                rc = VINF_EM_RAW_EMULATE_INSTR;
         }
         else

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

@@ -2771 +2771 @@
         }
 
+        uint32_t cbSize = g_aIOSize[uIOWidth];
+
         if (VMX_EXIT_QUALIFICATION_IO_STRING(exitQualification))
         {
-            uint32_t cbSize;
-
             /* ins/outs */
-            if (fIOWrite)
+            DISCPUSTATE Cpu;
+
+            /* Disassemble manually to deal with segment prefixes. */
+            rc = EMInterpretDisasOne(pVM, CPUMCTX2CORE(pCtx), &Cpu, NULL);
+            if (rc == VINF_SUCCESS)
             {
-                STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatExitIOStringWrite);
-                Log2(("IOMInterpretOUTSEx %RGv %x size=%d\n", (RTGCPTR)pCtx->rip, uPort, g_aIOSize[uIOWidth]));
+                if (fIOWrite)
+                {
+                    Log2(("IOMInterpretOUTSEx %RGv %x size=%d\n", (RTGCPTR)pCtx->rip, uPort, cbSize));
+                    STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatExitIOStringWrite);
+                    rc = IOMInterpretOUTSEx(pVM, CPUMCTX2CORE(pCtx), uPort, Cpu.prefix, cbSize);
+                }
+                else
+                {
+                    Log2(("IOMInterpretINSEx  %RGv %x size=%d\n", (RTGCPTR)pCtx->rip, uPort, cbSize));
+                    STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatExitIOStringRead);
+                    rc = IOMInterpretINSEx(pVM, CPUMCTX2CORE(pCtx), uPort, Cpu.prefix, cbSize);
+                }
             }
             else
-            {
-                Log2(("IOMInterpretINSEx  %RGv %x size=%d\n", (RTGCPTR)pCtx->rip, uPort, g_aIOSize[uIOWidth]));
-                STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatExitIOStringRead);
-            }
-
-            /* Disassemble manually, because we don't have any information about segment prefixes. */
-            rc = EMInterpretInstruction(pVM, CPUMCTX2CORE(pCtx), 0, &cbSize);
+                rc = VINF_EM_RAW_EMULATE_INSTR;
         }
         else
         {
             /* normal in/out */
-            uint32_t cbSize  = g_aIOSize[uIOWidth];
             uint32_t uAndVal = g_aIOOpAnd[uIOWidth];