Changeset 60875 in vbox for trunk/src/VBox

Timestamp:

May 7, 2016 6:09:37 PM (9 years ago)

Author:

vboxsync

Message:

PATMRC.cpp: Use IEM for the INT3 stuff.

File:

• trunk/src/VBox/VMM/VMMRC/PATMRC.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMRC/PATMRC.cpp

@@ -27 +27 @@
 #include <VBox/vmm/mm.h>
 #include <VBox/vmm/em.h>
-#ifdef VBOX_WITH_IEM
-# include <VBox/vmm/iem.h>
-#endif
+#include <VBox/vmm/iem.h>
 #include <VBox/vmm/selm.h>
 #include <VBox/vmm/mm.h>
@@ -462 +460 @@
 {
     PPATMPATCHREC pRec;
-    int rc;
 
     AssertReturn(!pCtxCore->eflags.Bits.u1VM
@@ -532 +529 @@
             }
 
-#ifdef VBOX_WITH_IEM
             VBOXSTRICTRC rcStrict;
             rcStrict = IEMExecOneBypassWithPrefetchedByPC(pVCpu, pCtxCore, pCtxCore->rip,
                                                           pRec->patch.aPrivInstr, pRec->patch.cbPrivInstr);
-            rc = VBOXSTRICTRC_TODO(rcStrict);
-#else
-            uint32_t    cbOp;
-            DISCPUSTATE cpu;
-            rc = DISInstr(&pRec->patch.aPrivInstr[0], enmCpuMode, &cpu, &cbOp);
-            if (RT_FAILURE(rc))
-            {
-                Log(("DISCoreOne failed with %Rrc\n", rc));
+            if (RT_FAILURE(rcStrict))
+            {
+                Log(("EMInterpretInstructionCPU failed with %Rrc\n", VBOXSTRICTRC_TODO(rcStrict)));
                 PATM_STAT_FAULT_INC(&pRec->patch);
                 pRec->patch.cTraps++;
                 return VINF_EM_RAW_EMULATE_INSTR;
             }
-
-            rc = VBOXSTRICTRC_TODO(EMInterpretInstructionDisasState(pVCpu, &cpu, pCtxCore, 0 /* not relevant here */,
-                                                                    EMCODETYPE_SUPERVISOR));
-#endif
-            if (RT_FAILURE(rc))
-            {
-                Log(("EMInterpretInstructionCPU failed with %Rrc\n", rc));
-                PATM_STAT_FAULT_INC(&pRec->patch);
-                pRec->patch.cTraps++;
-                return VINF_EM_RAW_EMULATE_INSTR;
-            }
-            return rc;
+            return VBOXSTRICTRC_TODO(rcStrict);
         }
     }