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

Timestamp:

Sep 19, 2013 11:41:35 PM (11 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0, HMSVMR0: Restore hyper/guest DR7 in accordance with what we load.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HMSVMR0.cpp (modified) (3 diffs)
• HMVMXR0.cpp (modified) (3 diffs)

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

@@ -1429 +1429 @@
             pVmcb->guest.u64DR6 = X86_DR6_INIT_VAL;
             pVmcb->ctrl.u64VmcbCleanBits &= ~HMSVM_VMCB_CLEAN_DRX;
+            pVCpu->hm.s.fUsingHyperDR7 = true;
         }
 
@@ -1448 +1449 @@
             pVmcb->guest.u64DR6 = pCtx->dr[6];
             pVmcb->ctrl.u64VmcbCleanBits &= ~HMSVM_VMCB_CLEAN_DRX;
+            pVCpu->hm.s.fUsingHyperDR7 = false;
         }
 
@@ -1932 +1934 @@
      * Guest Debug registers.
      */
-    /** @todo We need to save DR6, DR7 according to what we did in
-     *        hmR0SvmLoadSharedDebugState(). */
-    if (!CPUMIsHyperDebugStateActive(pVCpu))
+    if (!pVCpu->hm.s.fUsingHyperDR7)
     {
         pMixedCtx->dr[6] = pVmcb->guest.u64DR6;

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

@@ -3436 +3436 @@
         AssertRCReturn(rc, rc);
 
+        pVCpu->hm.s.fUsingHyperDR7 = true;
         fInterceptDB = true;
         fInterceptMovDRx = true;
@@ -3482 +3483 @@
         }
 
+        /* Update guest DR7. */
         rc = VMXWriteVmcs32(VMX_VMCS_GUEST_DR7, pMixedCtx->dr[7]);
         AssertRCReturn(rc, rc);
+
+        pVCpu->hm.s.fUsingHyperDR7 = false;
     }
 
@@ -5789 +5793 @@
     if (!(pVCpu->hm.s.vmx.fUpdatedGuestState & HMVMX_UPDATED_GUEST_DEBUG))
     {
-        /** @todo We need to update DR7 according to what was done in hmR0VmxLoadSharedDebugState(). */
-        if (!CPUMIsHyperDebugStateActive(pVCpu))
+        if (!pVCpu->hm.s.fUsingHyperDR7)
         {
             /* Upper 32-bits are always zero. See Intel spec. 2.7.3 "Loading and Storing Debug Registers". */