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

Timestamp:

Aug 13, 2013 11:43:24 PM (12 years ago)

Author:

vboxsync

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

87953

Message:

CPUMRecalcHyperDRx: Host single stepping in HM-mode fix.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/CPUMAllRegs.cpp (modified) (10 diffs)
• VMMR3/CPUM.cpp (modified) (1 diff)
• VMMR3/DBGFBp.cpp (modified) (1 diff)

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

@@ -2157 +2157 @@
 {
     pVCpu->cpum.s.Guest.dr[0] = uDr0;
-    return CPUMRecalcHyperDRx(pVCpu, 0);
+    return CPUMRecalcHyperDRx(pVCpu, 0, false);
 }
 
@@ -2164 +2164 @@
 {
     pVCpu->cpum.s.Guest.dr[1] = uDr1;
-    return CPUMRecalcHyperDRx(pVCpu, 1);
+    return CPUMRecalcHyperDRx(pVCpu, 1, false);
 }
 
@@ -2171 +2171 @@
 {
     pVCpu->cpum.s.Guest.dr[2] = uDr2;
-    return CPUMRecalcHyperDRx(pVCpu, 2);
+    return CPUMRecalcHyperDRx(pVCpu, 2, false);
 }
 
@@ -2178 +2178 @@
 {
     pVCpu->cpum.s.Guest.dr[3] = uDr3;
-    return CPUMRecalcHyperDRx(pVCpu, 3);
+    return CPUMRecalcHyperDRx(pVCpu, 3, false);
 }
 
@@ -2192 +2192 @@
 {
     pVCpu->cpum.s.Guest.dr[7] = uDr7;
-    return CPUMRecalcHyperDRx(pVCpu, 7);
+    return CPUMRecalcHyperDRx(pVCpu, 7, false);
 }
 
@@ -2203 +2203 @@
         iReg += 2;
     pVCpu->cpum.s.Guest.dr[iReg] = Value;
-    return CPUMRecalcHyperDRx(pVCpu, iReg);
+    return CPUMRecalcHyperDRx(pVCpu, iReg, false);
 }
 
@@ -2234 +2234 @@
  * @param   iGstReg     The guest debug register number that was modified.
  *                      UINT8_MAX if not guest register.
- */
-VMMDECL(int) CPUMRecalcHyperDRx(PVMCPU pVCpu, uint8_t iGstReg)
+ * @param   fForceHyper Used in HM to force hyper registers because of single
+ *                      stepping.
+ */
+VMMDECL(int) CPUMRecalcHyperDRx(PVMCPU pVCpu, uint8_t iGstReg, bool fForceHyper)
 {
     PVM pVM = pVCpu->CTX_SUFF(pVM);
@@ -2256 +2258 @@
 
     const RTGCUINTREG uDbgfDr7 = DBGFBpGetDR7(pVM);
-    if ((HMIsEnabled(pVCpu->CTX_SUFF(pVM)) ? uDbgfDr7 : (uGstDr7 | uDbgfDr7)) & X86_DR7_ENABLED_MASK)
+
+#ifdef IN_RING0
+    if (!fForceHyper && (pVCpu->cpum.s.fUseFlags & CPUM_USED_DEBUG_REGS_HYPER))
+        fForceHyper = true;
+#endif
+    if (( HMIsEnabled(pVCpu->CTX_SUFF(pVM)) && !fForceHyper ? uDbgfDr7 : (uGstDr7 | uDbgfDr7)) & X86_DR7_ENABLED_MASK)
     {
         Assert(!CPUMIsGuestDebugStateActive(pVCpu));
@@ -2426 +2433 @@
          * No active debug state any more.  In raw-mode this means we have to
          * make sure DR7 has everything disabled now, if we armed it already.
-         *
-         * In the ring-0 this only happens when we decided to lazy load the
-         * debug state because it wasn't active, and that didn't change with
-         * the latest changes, so nothing to do here.
+         * In ring-0 we might end up here when just single stepping.
          */
-#if defined(IN_RC)
+#if defined(IN_RC) || defined(IN_RING0)
         if (pVCpu->cpum.s.fUseFlags & CPUM_USED_DEBUG_REGS_HYPER)
         {
+# ifdef IN_RC
             ASMSetDR7(X86_DR7_INIT_VAL);
+# endif
             if (pVCpu->cpum.s.Hyper.dr[0])
                 ASMSetDR0(0);
@@ -2445 +2451 @@
             pVCpu->cpum.s.fUseFlags &= ~CPUM_USED_DEBUG_REGS_HYPER;
         }
-
-#elif defined(IN_RING0)
-        Assert(!CPUMIsHyperDebugStateActive(pVCpu)); /* (can only change while in ring-3) */
 #endif
         pVCpu->cpum.s.fUseFlags &= ~CPUM_USE_DEBUG_REGS_HYPER;

trunk/src/VBox/VMM/VMMR3/CPUM.cpp

@@ -1413 +1413 @@
     /* Recheck the guest DRx values in raw-mode. */
     for (VMCPUID iCpu = 0; iCpu < pVM->cCpus; iCpu++)
-        CPUMRecalcHyperDRx(&pVM->aCpus[iCpu], UINT8_MAX);
+        CPUMRecalcHyperDRx(&pVM->aCpus[iCpu], UINT8_MAX, false);
 }
 

trunk/src/VBox/VMM/VMMR3/DBGFBp.cpp

@@ -566 +566 @@
 {
     NOREF(pVM); NOREF(pvUser);
-    return CPUMRecalcHyperDRx(pVCpu, UINT8_MAX);
+    return CPUMRecalcHyperDRx(pVCpu, UINT8_MAX, false);
 }