Changeset 92745 in vbox for trunk/src/VBox/VMM/VMMR0

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/VMMR0

Files:

• HMSVMR0.cpp (modified) (1 diff)
• HMVMXR0.cpp (modified) (1 diff)

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;
 }