Changeset 80089 in vbox for trunk/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h

Timestamp:

Jul 31, 2019 8:50:22 PM (5 years ago)

Author:

vboxsync

Message:

VMM: Kicking out raw-mode - IEM. bugref:9517

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h

@@ -213 +213 @@
 static void iemHlpAdjustSelectorForNewCpl(PVMCPU pVCpu, uint8_t uCpl, PCPUMSELREG pSReg)
 {
-#ifdef VBOX_WITH_RAW_MODE_NOT_R0
-    if (!CPUMSELREG_ARE_HIDDEN_PARTS_VALID(pVCpu, pSReg))
-        CPUMGuestLazyLoadHiddenSelectorReg(pVCpu, pSReg);
-#else
     Assert(CPUMSELREG_ARE_HIDDEN_PARTS_VALID(pVCpu, pSReg));
-#endif
     IEM_CTX_ASSERT(pVCpu, CPUMCTX_EXTRN_SREG_MASK);
 
@@ -839 +834 @@
     if (rcStrict != VINF_SUCCESS)
         return rcStrict;
-
-#if defined(IN_RING3) && defined(VBOX_WITH_RAW_MODE) && defined(VBOX_WITH_CALL_RECORD)
-    /*
-     * CASM hook for recording interesting indirect calls.
-     */
-    if (   !pVCpu->cpum.GstCtx.eflags.Bits.u1IF
-        && (pVCpu->cpum.GstCtx.cr0 & X86_CR0_PG)
-        && !CSAMIsEnabled(pVCpu->CTX_SUFF(pVM))
-        && pVCpu->iem.s.uCpl == 0)
-    {
-        EMSTATE enmState = EMGetState(pVCpu);
-        if (   enmState == EMSTATE_IEM_THEN_REM
-            || enmState == EMSTATE_IEM
-            || enmState == EMSTATE_REM)
-            CSAMR3RecordCallAddress(pVCpu->CTX_SUFF(pVM), pVCpu->cpum.GstCtx.eip);
-    }
-#endif
 
     pVCpu->cpum.GstCtx.rip = uNewPC;
@@ -5693 +5671 @@
             }
             rcStrict = PGMChangeMode(pVCpu, pVCpu->cpum.GstCtx.cr0, pVCpu->cpum.GstCtx.cr4, pVCpu->cpum.GstCtx.msrEFER);
-
-#ifdef IN_RC
-            /* Return to ring-3 for rescheduling if WP or AM changes. */
-            if (   rcStrict == VINF_SUCCESS
-                && (   (uNewCrX & (X86_CR0_WP | X86_CR0_AM))
-                    != (uOldCrX & (X86_CR0_WP | X86_CR0_AM))) )
-                rcStrict = VINF_EM_RESCHEDULE;
-#endif
             break;
         }