Changeset 47828 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Aug 18, 2013 12:14:12 AM (11 years ago)

Author:

vboxsync

Message:

CPUMRecalcHyperDRx: Fixed raw-mode assertion.

File:

• trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp

@@ -2364 +2364 @@
 #ifdef IN_RC
         /* Make sure to save host registers first. */
-        if (!(pVCpu->cpum.s.fUseFlags & (CPUM_USE_DEBUG_REGS_HOST | CPUM_USE_DEBUG_REGS_HYPER)))
-        {
-            Assert(!(pVCpu->cpum.s.fUseFlags & CPUM_USED_DEBUG_REGS_HOST));
-            pVCpu->cpum.s.Host.dr6 = ASMGetDR6();
-            pVCpu->cpum.s.Host.dr7 = ASMGetDR7();
-            pVCpu->cpum.s.fUseFlags |= CPUM_USE_DEBUG_REGS_HYPER;
-            ASMSetDR6(X86_DR6_INIT_VAL);
-        }
         if (!(pVCpu->cpum.s.fUseFlags & CPUM_USED_DEBUG_REGS_HOST))
         {
+            if (!(pVCpu->cpum.s.fUseFlags & CPUM_USE_DEBUG_REGS_HOST))
+            {
+                pVCpu->cpum.s.Host.dr6 = ASMGetDR6();
+                pVCpu->cpum.s.Host.dr7 = ASMGetDR7();
+            }
             pVCpu->cpum.s.Host.dr0 = ASMGetDR0();
             pVCpu->cpum.s.Host.dr1 = ASMGetDR1();
@@ -2389 +2386 @@
             pVCpu->cpum.s.Hyper.dr[3] = uNewDr3;
             ASMSetDR3(uNewDr3);
+            ASMSetDR6(X86_DR6_INIT_VAL);
             pVCpu->cpum.s.Hyper.dr[7] = uNewDr7;
             ASMSetDR7(uNewDr7);