Changeset 72600 in vbox

Timestamp:

Jun 18, 2018 1:40:48 PM (7 years ago)

Author:

vboxsync

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

123096

Message:

VMM: Eliminated VBOX_WITH_2ND_IEM_STEP.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/VMM/Config.kmk (modified) (1 diff)
• src/VBox/VMM/VMMAll/PGMAllPhys.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (2 diffs)

trunk/Config.kmk

@@ -404 +404 @@
 # Enable the debugger GUI.
 VBOX_WITH_DEBUGGER_GUI = 1
-# Enables the second step using IEM (the interpreter).
-VBOX_WITH_2ND_IEM_STEP = 1
 # Enables the third step using IEM (the interpreter).
 VBOX_WITH_3RD_IEM_STEP = 1

trunk/src/VBox/VMM/Config.kmk

@@ -30 +30 @@
 # Can be prepended to by setting it in LocalConfig.kmk
 VMM_COMMON_DEFS += VBOX_IN_VMM
-ifdef VBOX_WITH_2ND_IEM_STEP
- VMM_COMMON_DEFS += VBOX_WITH_2ND_IEM_STEP
-endif
 ifdef VBOX_WITH_3RD_IEM_STEP
  VMM_COMMON_DEFS += VBOX_WITH_3RD_IEM_STEP

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

@@ -1308 +1308 @@
         }
         else
-# ifdef VBOX_WITH_2ND_IEM_STEP
             *ppv = pVM->pgm.s.CTXALLSUFF(pvZeroPg);
-# else
-        {
-            /* This kind of screws up the TLB entry if accessed from a different section afterwards. */
-            static uint8_t s_abPlayItSafe[0x1000*2];  /* I don't dare return the zero page at the moment. */
-            *ppv = (uint8_t *)((uintptr_t)&s_abPlayItSafe[0x1000] & ~(uintptr_t)0xfff);
-        }
-# endif
         *ppMap = NULL;
         return VINF_SUCCESS;

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

@@ -6802 +6802 @@
     if (IoExitInfo.n.u1Str)
     {
-#ifdef VBOX_WITH_2ND_IEM_STEP
         /* INS/OUTS - I/O String instruction. */
         /** @todo Huh? why can't we use the segment prefix information given by AMD-V
@@ -6861 +6860 @@
         }
         fUpdateRipAlready = true;
-
-#else
-        /* INS/OUTS - I/O String instruction. */
-        PDISCPUSTATE pDis = &pVCpu->hm.s.DisState;
-
-        /** @todo Huh? why can't we use the segment prefix information given by AMD-V
-         *        in EXITINFO1? Investigate once this thing is up and running. */
-
-        rcStrict = EMInterpretDisasCurrent(pVM, pVCpu, pDis, NULL);
-        if (rcStrict == VINF_SUCCESS)
-        {
-            if (IoExitInfo.n.u1Type == SVM_IOIO_WRITE)
-            {
-                rcStrict = IOMInterpretOUTSEx(pVM, pVCpu, CPUMCTX2CORE(pCtx), IoExitInfo.n.u16Port, pDis->fPrefix,
-                                              (DISCPUMODE)pDis->uAddrMode, cbValue);
-                STAM_COUNTER_INC(&pVCpu->hm.s.StatExitIOStringWrite);
-            }
-            else
-            {
-                rcStrict = IOMInterpretINSEx(pVM, pVCpu, CPUMCTX2CORE(pCtx), IoExitInfo.n.u16Port, pDis->fPrefix,
-                                             (DISCPUMODE)pDis->uAddrMode, cbValue);
-                STAM_COUNTER_INC(&pVCpu->hm.s.StatExitIOStringRead);
-            }
-        }
-        else
-            rcStrict = VINF_EM_RAW_EMULATE_INSTR;
-#endif
     }
     else

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

@@ -12732 +12732 @@
     if (fIOString)
     {
-#ifdef VBOX_WITH_2ND_IEM_STEP /* This used to gurus with debian 32-bit guest without NP (on ATA reads).
-                                 See @bugref{5752#c158}. Should work now. */
         /*
          * INS/OUTS - I/O String instruction.
@@ -12779 +12777 @@
         HMCPU_CF_SET(pVCpu, HM_CHANGED_GUEST_RIP);
         fUpdateRipAlready = true;
-#else
-        PDISCPUSTATE pDis = &pVCpu->hm.s.DisState;
-        rcStrict = EMInterpretDisasCurrent(pVM, pVCpu, pDis, NULL /* pcbInstr */);
-        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