Changeset 16110 in vbox for trunk/src/VBox

Timestamp:

Jan 21, 2009 1:37:45 AM (16 years ago)

Author:

vboxsync

Message:

HWCMXR0: debugger (dbgf) breakpoints; DEBUG build only for the time being. Corrected a log statment.

File:

• trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (3 diffs)

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

@@ -601 +601 @@
 #ifdef VBOX_STRICT
     if (iGate == 0xE)
-        LogFlow(("VMXR0InjectEvent: Injecting interrupt %d at %RGv error code=%08x CR2=%08x intInfo=%08x\n", iGate, (RTGCPTR)pCtx->rip, errCode, pCtx->cr2, intInfo));
+        LogFlow(("VMXR0InjectEvent: Injecting interrupt %d at %RGv error code=%08x CR2=%RGv intInfo=%08x\n", iGate, (RTGCPTR)pCtx->rip, errCode, pCtx->cr2, intInfo));
     else
     if (iGate < 0x20)
@@ -1088 +1088 @@
     }
 
-#ifdef DEBUG
+#ifdef DEBUG /* till after branching, enable it by default then. */
     /* Intercept X86_XCPT_DB if stepping is enabled */
     if (DBGFIsStepping(pVM))
         u32TrapMask |= RT_BIT(X86_XCPT_DB);
+    /** @todo Don't trap it unless the debugger has armed breakpoints.  */
+    u32TrapMask |= RT_BIT(X86_XCPT_BP);
 #endif
 
@@ -2503 +2505 @@
                 break;
             }
+
+#ifdef DEBUG /* till after branching, enable by default after that. */
+            case X86_XCPT_BP:   /* Breakpoint. */
+            {
+                rc = DBGFR0Trap03Handler(pVM, CPUMCTX2CORE(pCtx));
+                if (rc == VINF_EM_RAW_GUEST_TRAP)
+                {
+                    Log(("Guest #BP at %04x:%RGv\n", pCtx->cs, pCtx->rip));
+                    rc = VMXR0InjectEvent(pVM, pVCpu, pCtx, VMX_VMCS_CTRL_ENTRY_IRQ_INFO_FROM_EXIT_INT_INFO(intInfo), cbInstr, errCode);
+                    AssertRC(rc);
+                    goto ResumeExecution;
+                }
+                if (rc == VINF_SUCCESS)
+                    goto ResumeExecution;
+                Log(("Debugger BP at %04x:%RGv (rc=%Rrc)\n", pCtx->cs, pCtx->rip, rc));
+                break;
+            }
+#endif
 
             case X86_XCPT_GP:   /* General protection failure exception.*/