Changeset 92745 in vbox for trunk/src/VBox

Timestamp:

Dec 3, 2021 8:38:46 PM (3 years ago)

Author:

vboxsync

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

148656

Message:

VMM/IEM,DBGF: Hook INT3 emulation IEM up with DBGF to make breakpoints work a little bit.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/DBGFAllBp.cpp (modified) (4 diffs)
• VMMAll/IEMAllCImpl.cpp.h (modified) (1 diff)
• VMMAll/VMXAllTemplate.cpp.h (modified) (1 diff)
• VMMR0/HMSVMR0.cpp (modified) (1 diff)
• VMMR0/HMVMXR0.cpp (modified) (1 diff)

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

@@ -530 +530 @@
  * @param   pRegFrame   Pointer to the register frame for the trap.
  */
-VMM_INT_DECL(int) DBGFTrap03Handler(PVMCC pVM, PVMCPUCC pVCpu, PCPUMCTXCORE pRegFrame)
+VMM_INT_DECL(VBOXSTRICTRC) DBGFTrap03Handler(PVMCC pVM, PVMCPUCC pVCpu, PCPUMCTXCORE pRegFrame)
 {
 #if defined(IN_RING0)
@@ -552 +552 @@
 
         LogFlowFunc(("GCPtrBp=%RGv idxL1=%u u32L1Entry=%#x\n", GCPtrBp, idxL1, u32L1Entry));
-        rc = VINF_EM_RAW_GUEST_TRAP;
         if (u32L1Entry != DBGF_BP_INT3_L1_ENTRY_TYPE_NULL)
         {
@@ -576 +575 @@
                         rc = dbgfBpHit(pVM, pVCpu, pRegFrame, hBp, pBp, pBpR0);
 #endif
-                    /* else: Genuine guest trap. */
+                    else
+                        rc = VINF_EM_RAW_GUEST_TRAP; /* Genuine guest trap. */
                 }
                 else /* Invalid breakpoint handle or not an int3 breakpoint. */
@@ -587 +587 @@
                 rc = VERR_DBGF_BP_L1_LOOKUP_FAILED;
         }
-        /* else: Genuine guest trap. */
+        else
+            rc = VINF_EM_RAW_GUEST_TRAP; /* Genuine guest trap. */
 
         return rc;

trunk/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h

@@ -2831 +2831 @@
 {
     Assert(pVCpu->iem.s.cXcptRecursions == 0);
+
+    /*
+     * We must check if this INT3 might belong to DBGF before raising a #BP.
+     */
+    if (u8Int == 3)
+    {
+        PVMCC pVM = pVCpu->CTX_SUFF(pVM);
+        if (pVM->dbgf.ro.cEnabledInt3Breakpoints == 0)
+        { /* likely: No vbox debugger breakpoints */ }
+        else
+        {
+            VBOXSTRICTRC rcStrict = DBGFTrap03Handler(pVM, pVCpu, CPUMCTX2CORE(&pVCpu->cpum.GstCtx));
+            Log(("iemCImpl_int: DBGFTrap03Handler -> %Rrc\n", VBOXSTRICTRC_VAL(rcStrict) ));
+            if (rcStrict != VINF_EM_RAW_GUEST_TRAP)
+                return iemSetPassUpStatus(pVCpu, rcStrict);
+        }
+    }
     return iemRaiseXcptOrInt(pVCpu,
                              cbInstr,

trunk/src/VBox/VMM/VMMAll/VMXAllTemplate.cpp.h

@@ -10652 +10652 @@
     AssertRCReturn(rc, rc);
 
+    VBOXSTRICTRC rcStrict;
     if (!pVmxTransient->fIsNestedGuest)
-        rc = DBGFTrap03Handler(pVCpu->CTX_SUFF(pVM), pVCpu, CPUMCTX2CORE(&pVCpu->cpum.GstCtx));
+        rcStrict = DBGFTrap03Handler(pVCpu->CTX_SUFF(pVM), pVCpu, CPUMCTX2CORE(&pVCpu->cpum.GstCtx));
     else
-        rc = VINF_EM_RAW_GUEST_TRAP;
-
-    if (rc == VINF_EM_RAW_GUEST_TRAP)
+        rcStrict = VINF_EM_RAW_GUEST_TRAP;
+
+    if (rcStrict == VINF_EM_RAW_GUEST_TRAP)
     {
         vmxHCSetPendingEvent(pVCpu, VMX_ENTRY_INT_INFO_FROM_EXIT_INT_INFO(pVmxTransient->uExitIntInfo),
                                pVmxTransient->cbExitInstr, pVmxTransient->uExitIntErrorCode, 0 /* GCPtrFaultAddress */);
-        rc = VINF_SUCCESS;
-    }
-
-    Assert(rc == VINF_SUCCESS || rc == VINF_EM_DBG_BREAKPOINT);
-    return rc;
+        rcStrict = VINF_SUCCESS;
+    }
+
+    Assert(rcStrict == VINF_SUCCESS || rcStrict == VINF_EM_DBG_BREAKPOINT);
+    return rcStrict;
 }
 

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

@@ -7511 +7511 @@
 
     PCPUMCTX pCtx = &pVCpu->cpum.GstCtx;
-    int rc = DBGFTrap03Handler(pVCpu->CTX_SUFF(pVM), pVCpu, CPUMCTX2CORE(pCtx));
+    VBOXSTRICTRC rc = DBGFTrap03Handler(pVCpu->CTX_SUFF(pVM), pVCpu, CPUMCTX2CORE(pCtx));
     if (rc == VINF_EM_RAW_GUEST_TRAP)
     {

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

@@ -14105 +14105 @@
     AssertRCReturn(rc, rc);
 
+    VBOXSTRICTRC rcStrict;
     if (!pVmxTransient->fIsNestedGuest)
-        rc = DBGFTrap03Handler(pVCpu->CTX_SUFF(pVM), pVCpu, CPUMCTX2CORE(&pVCpu->cpum.GstCtx));
+        rcStrict = DBGFTrap03Handler(pVCpu->CTX_SUFF(pVM), pVCpu, CPUMCTX2CORE(&pVCpu->cpum.GstCtx));
     else
-        rc = VINF_EM_RAW_GUEST_TRAP;
-
-    if (rc == VINF_EM_RAW_GUEST_TRAP)
+        rcStrict = VINF_EM_RAW_GUEST_TRAP;
+
+    if (rcStrict == VINF_EM_RAW_GUEST_TRAP)
     {
         hmR0VmxSetPendingEvent(pVCpu, VMX_ENTRY_INT_INFO_FROM_EXIT_INT_INFO(pVmxTransient->uExitIntInfo),
                                pVmxTransient->cbExitInstr, pVmxTransient->uExitIntErrorCode, 0 /* GCPtrFaultAddress */);
-        rc = VINF_SUCCESS;
-    }
-
-    Assert(rc == VINF_SUCCESS || rc == VINF_EM_DBG_BREAKPOINT);
-    return rc;
+        rcStrict = VINF_SUCCESS;
+    }
+
+    Assert(rcStrict == VINF_SUCCESS || rcStrict == VINF_EM_DBG_BREAKPOINT);
+    return rcStrict;
 }