Changeset 56064 in vbox for trunk/src/VBox/VMM/VMMR3/EM.cpp

Timestamp:

May 25, 2015 4:09:01 PM (10 years ago)

Author:

vboxsync

Message:

Committed the VBOX_WITH_FIRST_IEM_STEP code, removing the #else cases.

File:

• trunk/src/VBox/VMM/VMMR3/EM.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMR3/EM.cpp

@@ -387 +387 @@
 
         EM_REG_COUNTER_USED(&pStats->StatIoRestarted,            "/EM/CPU%d/R3/PrivInst/IoRestarted",        "I/O instructions restarted in ring-3.");
-# ifdef VBOX_WITH_FIRST_IEM_STEP
         EM_REG_COUNTER_USED(&pStats->StatIoIem,                  "/EM/CPU%d/R3/PrivInst/IoIem",              "I/O instructions end to IEM in ring-3.");
-# else
-        EM_REG_COUNTER_USED(&pStats->StatIn,                     "/EM/CPU%d/R3/PrivInst/In",                 "Number of in instructions.");
-        EM_REG_COUNTER_USED(&pStats->StatOut,                    "/EM/CPU%d/R3/PrivInst/Out",                "Number of out instructions.");
-# endif
         EM_REG_COUNTER_USED(&pStats->StatCli,                    "/EM/CPU%d/R3/PrivInst/Cli",                "Number of cli instructions.");
         EM_REG_COUNTER_USED(&pStats->StatSti,                    "/EM/CPU%d/R3/PrivInst/Sti",                "Number of sli instructions.");
@@ -1366 +1361 @@
          *       turns off monitoring features essential for raw mode!
          */
-#ifdef VBOX_WITH_FIRST_IEM_STEP
         return EMSTATE_IEM_THEN_REM;
-#else
-        return EMSTATE_REM;
-#endif
     }
 
@@ -2215 +2206 @@
                  */
                 case VINF_EM_RESCHEDULE_REM:
-#ifdef VBOX_WITH_FIRST_IEM_STEP
                     Assert(!pVM->em.s.fIemExecutesAll || pVCpu->em.s.enmState != EMSTATE_IEM);
                     if (HMIsEnabled(pVM))
@@ -2232 +2222 @@
                         pVCpu->em.s.enmState = EMSTATE_REM;
                     }
-#else
-                    Log2(("EMR3ExecuteVM: VINF_EM_RESCHEDULE_REM: %d -> %d (EMSTATE_REM)\n", enmOldState, EMSTATE_REM));
-                    Assert(!pVM->em.s.fIemExecutesAll || pVCpu->em.s.enmState != EMSTATE_IEM);
-                    pVCpu->em.s.enmState = EMSTATE_REM;
-#endif
                     break;