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

Timestamp:

Dec 3, 2008 1:58:36 PM (16 years ago)

Author:

vboxsync

Message:

Disassemble ins/outs manually to deal with segment prefixes.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

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

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

@@ -1841 +1841 @@
         if (IoExitInfo.n.u1STR)
         {
+            uint32_t cbSize;
+
             /* ins/outs */
-            uint32_t prefix = 0;
-            if (IoExitInfo.n.u1REP)
-                prefix |= PREFIX_REP;
-
             if (IoExitInfo.n.u1Type == 0)
             {
+                STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatExitIOStringWrite);
                 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, prefix, uIOSize);
             }
             else
@@ -1856 +1853 @@
                 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, prefix, uIOSize);
             }
+
+            /* Disassemble manually, because we don't have any information about segment prefixes. */
+            rc = EMInterpretInstruction(pVM, CPUMCTX2CORE(pCtx), 0, &cbSize);
         }
         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 */
-            uint32_t prefix = 0;
-            if (VMX_EXIT_QUALIFICATION_IO_REP(exitQualification))
-                prefix |= PREFIX_REP;
-
             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, prefix, cbSize);
+                Log2(("IOMInterpretOUTSEx %RGv %x size=%d\n", (RTGCPTR)pCtx->rip, uPort, g_aIOSize[uIOWidth]));
             }
             else
             {
-                Log2(("IOMInterpretINSEx  %RGv %x size=%d\n", (RTGCPTR)pCtx->rip, uPort, cbSize));
+                Log2(("IOMInterpretINSEx  %RGv %x size=%d\n", (RTGCPTR)pCtx->rip, uPort, g_aIOSize[uIOWidth]));
                 STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatExitIOStringRead);
-                rc = IOMInterpretINSEx(pVM, CPUMCTX2CORE(pCtx), uPort, prefix, cbSize);
             }
+
+            /* Disassemble manually, because we don't have any information about segment prefixes. */
+            rc = EMInterpretInstruction(pVM, CPUMCTX2CORE(pCtx), 0, &cbSize);
         }
         else
         {
             /* normal in/out */
+            uint32_t cbSize  = g_aIOSize[uIOWidth];
             uint32_t uAndVal = g_aIOOpAnd[uIOWidth];