Changeset 20660 in vbox for trunk/src/VBox/VMM

Timestamp:

Jun 17, 2009 11:33:02 AM (16 years ago)

Author:

vboxsync

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

48753

Message:

Update TPR only when changed.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HWSVMR0.cpp (modified) (3 diffs)
• HWVMXR0.cpp (modified) (4 diffs)

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

@@ -856 +856 @@
     bool        fSyncTPR = false;
     unsigned    cResume = 0;
-    uint8_t     u8LastVTPR;
+    uint8_t     u8LastTPR;
     PHWACCM_CPUINFO pCpu = 0;
     RTCCUINTREG uOldEFlags = ~(RTCCUINTREG)0;
@@ -984 +984 @@
 
         /* TPR caching in CR8 */
-        int rc = PDMApicGetTPR(pVCpu, &u8LastVTPR, &fPending);
+        int rc = PDMApicGetTPR(pVCpu, &u8LastTPR, &fPending);
         AssertRC(rc);
-        pVMCB->ctrl.IntCtrl.n.u8VTPR = u8LastVTPR;
+        pVMCB->ctrl.IntCtrl.n.u8VTPR = u8LastTPR;
 
         if (fPending)
@@ -1378 +1378 @@
 #endif
 
-    if (fSyncTPR)
+    /* Sync back the TPR if it was changed. */
+    if (    fSyncTPR
+        &&  u8LastTPR != pVMCB->ctrl.IntCtrl.n.u8VTPR)
     {
         rc = PDMApicSetTPR(pVCpu, pVMCB->ctrl.IntCtrl.n.u8VTPR);

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

@@ -2004 +2004 @@
     RTGCUINTPTR intInfo = 0; /* shut up buggy gcc 4 */
     RTGCUINTPTR errCode, instrInfo;
-    bool        fSyncTPR = false;
     bool        fSetupTPRCaching = false;
+    uint8_t     u8LastTPR = 0;
     PHWACCM_CPUINFO pCpu = 0;
     RTCCUINTREG uOldEFlags = ~(RTCCUINTREG)0;
@@ -2224 +2224 @@
         AssertRC(rc);
         /* The TPR can be found at offset 0x80 in the APIC mmio page. */
-        pVCpu->hwaccm.s.vmx.pVAPIC[0x80] = u8TPR << 4; /* bits 7-4 contain the task priority */
+        u8LastTPR = pVCpu->hwaccm.s.vmx.pVAPIC[0x80] = u8TPR << 4; /* bits 7-4 contain the task priority */
 
         /* Two options here:
@@ -2234 +2234 @@
         rc  = VMXWriteVMCS(VMX_VMCS_CTRL_TPR_THRESHOLD, (fPending) ? u8TPR : 0);
         AssertRC(rc);
-
-        /* Always sync back the TPR; we should optimize this though */ /** @todo optimize TPR sync. */
-        fSyncTPR = true;
     }
 
@@ -2426 +2423 @@
     Log2(("IntInfo = %08x\n", (uint32_t)intInfo));
 
-    if (fSyncTPR)
+    /* Sync back the TPR if it was changed. */
+    if (    fSetupTPRCaching
+        &&  u8LastTPR != pVCpu->hwaccm.s.vmx.pVAPIC[0x80])
     {
         rc = PDMApicSetTPR(pVCpu, pVCpu->hwaccm.s.vmx.pVAPIC[0x80] >> 4);