Changeset 21688 in vbox

Timestamp:

Jul 17, 2009 1:50:40 PM (16 years ago)

Author:

vboxsync

Message:

TPR caching updates

File:

• trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp (modified) (2 diffs)

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

@@ -1798 +1798 @@
         LogFlow(("Nested page fault at %RGv cr2=%RGp error code %x\n", (RTGCPTR)pCtx->rip, uFaultAddress, errCode));
 
-#if 0
+#ifdef VBOX_HWACCM_WITH_GUEST_PATCHING
         /* Shortcut for APIC TPR reads and writes; 32 bits guests only */
         if (    (uFaultAddress & 0xfff) == 0x080
             &&  pVM->hwaccm.s.fHasIoApic
             &&  !(errCode & X86_TRAP_PF_P)  /* not present */
+            &&  CPUMGetGuestCPL(pVCpu, CPUMCTX2CORE(pCtx)) == 0
             &&  !CPUMIsGuestInLongModeEx(pCtx))
         {
@@ -1808 +1809 @@
             PDMApicGetBase(pVM, &GCPhysApicBase);   /* @todo cache this */
             GCPhysApicBase &= PAGE_BASE_GC_MASK;
-
-            Assert(CPUMGetGuestCPL(pVCpu, CPUMCTX2CORE(pCtx)) == 0);
 
             if (uFaultAddress == GCPhysApicBase + 0x80)