Changeset 49085 in vbox

Timestamp:

Oct 14, 2013 12:45:59 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

89897

Message:

VMM/HMVMXR0: Partially revert r89778. Back to disassembling and interpreting string IO instructions, doesn't yet work.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp ¶

@@ -9788 +9788 @@
     if (fIOString)
     {
+#if 0       /* Not yet ready. IEM gurus with debian 32-bit guest without NP (on ATA reads). See @bugref{5752#c158}*/
         /*
          * INS/OUTS - I/O String instruction.
@@ -9832 +9833 @@
         VMCPU_HMCF_SET(pVCpu, HM_CHANGED_GUEST_RIP);
         fUpdateRipAlready = true;
+#else
+        PDISCPUSTATE pDis = &pVCpu->hm.s.DisState;
+        rcStrict = EMInterpretDisasCurrent(pVM, pVCpu, pDis, NULL);
+        if (RT_SUCCESS(rcStrict))
+        {
+            if (fIOWrite)
+            {
+                rcStrict = IOMInterpretOUTSEx(pVM, pVCpu, CPUMCTX2CORE(pMixedCtx), uIOPort, pDis->fPrefix,
+                                              (DISCPUMODE)pDis->uAddrMode, cbValue);
+                STAM_COUNTER_INC(&pVCpu->hm.s.StatExitIOStringWrite);
+            }
+            else
+            {
+                rcStrict = IOMInterpretINSEx(pVM, pVCpu, CPUMCTX2CORE(pMixedCtx), uIOPort, pDis->fPrefix,
+                                             (DISCPUMODE)pDis->uAddrMode, cbValue);
+                STAM_COUNTER_INC(&pVCpu->hm.s.StatExitIOStringRead);
+            }
+        }
+        else
+        {
+            AssertMsg(rcStrict == VERR_EM_INTERPRETER, ("rcStrict=%Rrc RIP %#RX64\n", VBOXSTRICTRC_VAL(rcStrict), pMixedCtx->rip));
+            rcStrict = VINF_EM_RAW_EMULATE_INSTR;
+        }
+#endif
     }
     else