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

Timestamp:

Jul 2, 2008 2:22:41 PM (16 years ago)

Author:

vboxsync

Message:

More TPR updates

File:

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

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

@@ -253 +253 @@
     /* Program the control fields. Most of them never have to be changed again. */
     /* CR0/3/4 reads must be intercepted, our shadow values are not necessarily the same as the guest's. */
-    /* Note: CR8 reads will refer to V_TPR, so no need to catch them. */
     /** @note CR0 & CR4 can be safely read when guest and shadow copies are identical. */
     if (!pVM->hwaccm.s.fNestedPaging)
@@ -264 +263 @@
      */
     if (!pVM->hwaccm.s.fNestedPaging)
-        pVMCB->ctrl.u16InterceptWrCRx = RT_BIT(0) | RT_BIT(3) | RT_BIT(4) | RT_BIT(8);
+        pVMCB->ctrl.u16InterceptWrCRx = RT_BIT(0) | RT_BIT(3) | RT_BIT(4);
     else
-        pVMCB->ctrl.u16InterceptWrCRx = RT_BIT(0) | RT_BIT(4) | RT_BIT(8);
+        pVMCB->ctrl.u16InterceptWrCRx = RT_BIT(0) | RT_BIT(4);
 
     /* Intercept all DRx reads and writes. */
@@ -744 +743 @@
 #endif
 
+    /* TPR caching in CR8 */
+    uint8_t u8TPR;
+    int rc = PDMApicGetTPR(pVM, &u8TPR);
+    AssertRC(rc);
+    pCtx->cr8                    = u8TPR;
+    pVMCB->ctrl.IntCtrl.n.u8VTPR = u8TPR;
+
     /* Done. */
     pVM->hwaccm.s.fContextUseFlags &= ~HWACCM_CHANGED_ALL_GUEST;
@@ -1106 +1112 @@
     pCtx->dr6 = pVMCB->guest.u64DR6;
     pCtx->dr7 = pVMCB->guest.u64DR7;
+
+    /* Update the APIC if the cached TPR value has changed. */
+    if (pVMCB->ctrl.IntCtrl.n.u8VTPR != pCtx->cr8)
+    {
+        rc = PDMApicSetTPR(pVM, pVMCB->ctrl.IntCtrl.n.u8VTPR);
+        AssertRC(rc);
+        pCtx->cr8 = pVMCB->ctrl.IntCtrl.n.u8VTPR;
+    }
+    pVMCB->ctrl.IntCtrl.n.u8VTPR = pCtx->cr8;
 
     /* Check if an injected event was interrupted prematurely. */
@@ -1494 +1509 @@
             break;
         case 8:
+            AssertFailed(); /* shouldn't come here anymore */
             pVM->hwaccm.s.fContextUseFlags |= HWACCM_CHANGED_GUEST_CR8;
             break;