Changeset 12225 in vbox

Timestamp:

Sep 8, 2008 12:59:59 PM (16 years ago)

Author:

vboxsync

Message:

VMM: X86_DR7_ENABLED_MASK should not include GD, because it isn't a breakpoint and including it will break assumptions in CPUMRecalcHyperDRx (DBGFBpGetDR7 always returns GD).

Location:

trunk

Files:

• include/VBox/x86.h (modified) (1 diff)
• src/VBox/VMM/VMMR0/HWACCMR0.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (1 diff)

trunk/include/VBox/x86.h

@@ -719 +719 @@
 
 /** Mask used to check if any breakpoints are enabled. */
-#define X86_DR7_ENABLED_MASK                (RT_BIT(0) | RT_BIT(1) | RT_BIT(2) | RT_BIT(3) | RT_BIT(4) | RT_BIT(5) | RT_BIT(6) | RT_BIT(7) | X86_DR7_GD)
+#define X86_DR7_ENABLED_MASK                (RT_BIT(0) | RT_BIT(1) | RT_BIT(2) | RT_BIT(3) | RT_BIT(4) | RT_BIT(5) | RT_BIT(6) | RT_BIT(7))
 
 /** @} */

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

@@ -752 +752 @@
      */
     uint64_t u64DR7 = ASMGetDR7();
-    if (u64DR7 & X86_DR7_ENABLED_MASK)
+    if (u64DR7 & (X86_DR7_ENABLED_MASK | X86_DR7_GD))
     {
         pVM->hwaccm.s.savedhoststate.dr7  = u64DR7;

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

@@ -978 +978 @@
 #ifdef VBOX_WITH_HWACCM_DEBUG_REGISTER_SUPPORT
         /* Any guest breakpoints enabled? */
-        if (    (pCtx->dr7 & X86_DR7_ENABLED_MASK)
+        if (    (pCtx->dr7 & (X86_DR7_ENABLED_MASK | X86_DR7_GD))
             &&  !pVM->hwaccm.s.savedhoststate.fHostDebugRegsSaved)
         {