Changeset 47660 in vbox for trunk/src/VBox/VMM/VMMRZ

Timestamp:

Aug 12, 2013 12:37:34 AM (12 years ago)

Author:

vboxsync

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

87863

Message:

VMM: Debug register handling redo. (only partly tested on AMD-V so far.)

File:

• trunk/src/VBox/VMM/VMMRZ/DBGFRZ.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMRZ/DBGFRZ.cpp

@@ -41 +41 @@
  * @param   pVCpu       Pointer to the VMCPU.
  * @param   pRegFrame   Pointer to the register frame for the trap.
- * @param   uDr6        The DR6 register value.
+ * @param   uDr6        The DR6 hypervisor register value.
  */
 VMMRZ_INT_DECL(int) DBGFRZTrap01Handler(PVM pVM, PVMCPU pVCpu, PCPUMCTXCORE pRegFrame, RTGCUINTREG uDr6)
@@ -85 +85 @@
     }
 
-#ifdef IN_RC
     /*
-     * Currently we only implement single stepping in the guest,
-     * so we'll bitch if this is not a BS event.
+     * Either an ICEBP in hypervisor code or a guest related debug exception
+     * of sorts.
      */
-    AssertMsg(uDr6 & X86_DR6_BS, ("hey! we're not doing guest BPs yet! dr6=%RTreg %04x:%RGv\n",
-                                  uDr6, pRegFrame->cs.Sel, pRegFrame->rip));
-#endif
+    if (RT_UNLIKELY(fInHyper))
+    {
+        LogFlow(("DBGFRZTrap01Handler: unabled bp at %04x:%RGv\n", pRegFrame->cs.Sel, pRegFrame->rip));
+        return VERR_DBGF_HYPER_DB_XCPT;
+    }
 
     LogFlow(("DBGFRZTrap01Handler: guest debug event %RTreg at %04x:%RGv!\n", uDr6, pRegFrame->cs.Sel, pRegFrame->rip));
-    return fInHyper ? VERR_DBGF_HYPER_DB_XCPT : VINF_EM_RAW_GUEST_TRAP;
+    return VINF_EM_RAW_GUEST_TRAP;
 }