Changeset 87346 in vbox for trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp

Timestamp:

Jan 21, 2021 11:42:23 AM (4 years ago)

Author:

vboxsync

Message:

VMM/CPUM: Dropped the fForceHyper parameter of CPUMRecalcHyperDRx. It seems to stem from some confusion in the HM implementation about how to handle DRx registers. The DBGF breakpoints shall always take precedence over the guest ones.

File:

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

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

@@ -1080 +1080 @@
 {
     pVCpu->cpum.s.Guest.dr[0] = uDr0;
-    return CPUMRecalcHyperDRx(pVCpu, 0, false);
+    return CPUMRecalcHyperDRx(pVCpu, 0);
 }
 
@@ -1087 +1087 @@
 {
     pVCpu->cpum.s.Guest.dr[1] = uDr1;
-    return CPUMRecalcHyperDRx(pVCpu, 1, false);
+    return CPUMRecalcHyperDRx(pVCpu, 1);
 }
 
@@ -1094 +1094 @@
 {
     pVCpu->cpum.s.Guest.dr[2] = uDr2;
-    return CPUMRecalcHyperDRx(pVCpu, 2, false);
+    return CPUMRecalcHyperDRx(pVCpu, 2);
 }
 
@@ -1101 +1101 @@
 {
     pVCpu->cpum.s.Guest.dr[3] = uDr3;
-    return CPUMRecalcHyperDRx(pVCpu, 3, false);
+    return CPUMRecalcHyperDRx(pVCpu, 3);
 }
 
@@ -1117 +1117 @@
     pVCpu->cpum.s.Guest.dr[7] = uDr7;
     pVCpu->cpum.s.Guest.fExtrn &= ~CPUMCTX_EXTRN_DR7;
-    return CPUMRecalcHyperDRx(pVCpu, 7, false);
+    return CPUMRecalcHyperDRx(pVCpu, 7);
 }
 
@@ -1128 +1128 @@
         iReg += 2;
     pVCpu->cpum.s.Guest.dr[iReg] = Value;
-    return CPUMRecalcHyperDRx(pVCpu, iReg, false);
+    return CPUMRecalcHyperDRx(pVCpu, iReg);
 }
 
@@ -1159 +1159 @@
  * @param   iGstReg     The guest debug register number that was modified.
  *                      UINT8_MAX if not guest register.
- * @param   fForceHyper Used in HM to force hyper registers because of single
- *                      stepping.
- */
-VMMDECL(int) CPUMRecalcHyperDRx(PVMCPUCC pVCpu, uint8_t iGstReg, bool fForceHyper)
+ */
+VMMDECL(int) CPUMRecalcHyperDRx(PVMCPUCC pVCpu, uint8_t iGstReg)
 {
     PVM pVM = pVCpu->CTX_SUFF(pVM);
@@ -1187 +1185 @@
 
     const RTGCUINTREG uDbgfDr7 = DBGFBpGetDR7(pVM);
-
-    /** @todo r=bird: I'm totally confused by fForceHyper! */
-#ifdef IN_RING0
-    if (!fForceHyper && (pVCpu->cpum.s.fUseFlags & CPUM_USED_DEBUG_REGS_HYPER))
-        fForceHyper = true;
-#endif
-    if ((!fForceHyper ? uDbgfDr7 : (uGstDr7 | uDbgfDr7)) & X86_DR7_ENABLED_MASK)
+    if ((uGstDr7 | uDbgfDr7) & X86_DR7_ENABLED_MASK)
     {
         Assert(!CPUMIsGuestDebugStateActive(pVCpu));