Changeset 72674 in vbox for trunk/src/VBox

Timestamp:

Jun 25, 2018 10:49:34 AM (7 years ago)

Author:

vboxsync

Message:

EM: Quietly deal with IEM errors VERR_IEM_INSTR_NOT_IMPLEMENTED and VERR_IEM_ASPECT_NOT_IMPLEMENTED. bugref:9198

File:

• trunk/src/VBox/VMM/VMMAll/EMAll.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMAll/EMAll.cpp

@@ -478 +478 @@
                      VBOXSTRICTRC_VAL(rcStrict), ExecStats.cExits, ExecStats.cMaxExitDistance, ExecStats.cInstructions));
             emHistoryExecSetContinueExitRecIdx(pVCpu, rcStrict, pExitRec);
+
+            /* Ignore instructions IEM doesn't know about. */
+            if (   (   rcStrict != VERR_IEM_INSTR_NOT_IMPLEMENTED
+                    && rcStrict != VERR_IEM_ASPECT_NOT_IMPLEMENTED)
+                || ExecStats.cInstructions == 0)
+            { /* likely */ }
+            else
+                rcStrict = VINF_SUCCESS;
+
             if (ExecStats.cExits > 1)
                 STAM_REL_COUNTER_ADD(&pVCpu->em.s.StatHistoryExecSavedExits, ExecStats.cExits - 1);
@@ -501 +510 @@
                      VBOXSTRICTRC_VAL(rcStrict), ExecStats.cExits, ExecStats.cMaxExitDistance, ExecStats.cInstructions));
             emHistoryExecSetContinueExitRecIdx(pVCpu, rcStrict, pExitRecUnconst);
-            if (ExecStats.cExits >= 2)
+            if (   ExecStats.cExits >= 2
+                && RT_SUCCESS(rcStrict))
             {
                 Assert(ExecStats.cMaxExitDistance > 0 && ExecStats.cMaxExitDistance <= 32);
@@ -510 +520 @@
             }
 #ifndef IN_RING3
-            else if (pVCpu->em.s.idxContinueExitRec != UINT16_MAX)
+            else if (   pVCpu->em.s.idxContinueExitRec != UINT16_MAX
+                     && RT_SUCCESS(rcStrict))
             {
                 STAM_REL_COUNTER_INC(&pVCpu->em.s.StatHistoryProbedToRing3);
@@ -522 +533 @@
                 LogFlow(("EMHistoryExec/EXEC_PROBE: -> PROBED\n"));
                 STAM_REL_COUNTER_INC(&pVCpu->em.s.StatHistoryProbedNormal);
+                if (   rcStrict == VERR_IEM_INSTR_NOT_IMPLEMENTED
+                    || rcStrict == VERR_IEM_ASPECT_NOT_IMPLEMENTED)
+                    rcStrict = VINF_SUCCESS;
             }
             STAM_REL_COUNTER_ADD(&pVCpu->em.s.StatHistoryProbeInstructions, ExecStats.cInstructions);