Changeset 29737 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

May 21, 2010 2:07:52 PM (15 years ago)

Author:

vboxsync

Message:

Fixed dropping back to the recompiler too often when running unrestricted guest code that switches mode very often.

File:

• trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (14 diffs)

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

@@ -755 +755 @@
 #endif
 
-#ifdef HWACCM_VMX_EMULATE_REALMODE
     if (    CPUMIsGuestInRealModeEx(pCtx)
         &&  pVM->hwaccm.s.vmx.pRealModeTSS)
@@ -826 +825 @@
         return VINF_SUCCESS;
     }
-#endif /* HWACCM_VMX_EMULATE_REALMODE */
 
     /* Set event injection state. */
@@ -1282 +1280 @@
 #endif
 
-# ifdef HWACCM_VMX_EMULATE_REALMODE
     /* Intercept all exceptions in real mode as none of them can be injected directly (#GP otherwise). */
     if (    CPUMIsGuestInRealModeEx(pCtx)
         &&  pVM->hwaccm.s.vmx.pRealModeTSS)
         u32TrapMask |= HWACCM_VMX_TRAP_MASK_REALMODE;
-# endif /* HWACCM_VMX_EMULATE_REALMODE */
 
     int rc = VMXWriteVMCS(VMX_VMCS_CTRL_EXCEPTION_BITMAP, u32TrapMask);
@@ -1351 +1347 @@
     if (pVCpu->hwaccm.s.fContextUseFlags & HWACCM_CHANGED_GUEST_SEGMENT_REGS)
     {
-#ifdef HWACCM_VMX_EMULATE_REALMODE
         if (pVM->hwaccm.s.vmx.pRealModeTSS)
         {
@@ -1421 +1416 @@
             }
         }
-#endif /* HWACCM_VMX_EMULATE_REALMODE */
 
         VMX_WRITE_SELREG(ES, es);
@@ -1465 +1459 @@
     if (pVCpu->hwaccm.s.fContextUseFlags & HWACCM_CHANGED_GUEST_TR)
     {
-#ifdef HWACCM_VMX_EMULATE_REALMODE
         /* Real mode emulation using v86 mode with CR4.VME (interrupt redirection using the int bitmap in the TSS) */
         if (    CPUMIsGuestInRealModeEx(pCtx)
@@ -1488 +1481 @@
         }
         else
-#endif /* HWACCM_VMX_EMULATE_REALMODE */
         {
             rc =  VMXWriteVMCS(VMX_VMCS16_GUEST_FIELD_TR,         pCtx->tr);
@@ -1646 +1638 @@
         }
 
-#ifdef HWACCM_VMX_EMULATE_REALMODE
         /* Turn off VME if we're in emulated real mode. */
         if (    CPUMIsGuestInRealModeEx(pCtx)
             &&  pVM->hwaccm.s.vmx.pRealModeTSS)
             val &= ~X86_CR4_VME;
-#endif /* HWACCM_VMX_EMULATE_REALMODE */
 
         rc |= VMXWriteVMCS64(VMX_VMCS64_GUEST_CR4,            val);
@@ -1787 +1777 @@
     eflags.u32 |= VMX_EFLAGS_RESERVED_1;
 
-#ifdef HWACCM_VMX_EMULATE_REALMODE
     /* Real mode emulation using v86 mode. */
     if (    CPUMIsGuestInRealModeEx(pCtx)
@@ -1797 +1786 @@
         eflags.Bits.u2IOPL = 0; /* must always be 0 or else certain instructions won't cause faults. */
     }
-#endif /* HWACCM_VMX_EMULATE_REALMODE */
     rc   = VMXWriteVMCS(VMX_VMCS_GUEST_RFLAGS,           eflags.u32);
     AssertRC(rc);
@@ -2018 +2006 @@
     pCtx->idtr.pIdt         = val;
 
-#ifdef HWACCM_VMX_EMULATE_REALMODE
     /* Real mode emulation using v86 mode. */
     if (    CPUMIsGuestInRealModeEx(pCtx)
@@ -2033 +2020 @@
     }
     else
-#endif /* HWACCM_VMX_EMULATE_REALMODE */
     {
         /* In real mode we have a fake TSS, so only sync it back when it's supposed to be valid. */
@@ -3320 +3306 @@
 #endif
             default:
-#ifdef HWACCM_VMX_EMULATE_REALMODE
                 if (    CPUMIsGuestInRealModeEx(pCtx)
                     &&  pVM->hwaccm.s.vmx.pRealModeTSS)
@@ -3336 +3321 @@
                     goto ResumeExecution;
                 }
-#endif
                 AssertMsgFailed(("Unexpected vm-exit caused by exception %x\n", vector));
                 rc = VERR_VMX_UNEXPECTED_EXCEPTION;