Changeset 87594 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Feb 3, 2021 8:23:46 PM (4 years ago)

Author:

vboxsync

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

142626

Message:

VMM/DBGF,Debugger: Removed the !defined(VBOX_WITH_LOTS_OF_DBGF_BPS) code. bugref:9837

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• DBGF.cpp (modified) (5 diffs)
• DBGFBp.cpp (deleted)
• EM.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMR3/DBGF.cpp

@@ -149 +149 @@
                 if (RT_SUCCESS(rc))
                 {
-#ifndef VBOX_WITH_LOTS_OF_DBGF_BPS
-                    rc = dbgfR3BpInit(pVM);
-#else
                     rc = dbgfR3BpInit(pUVM);
-#endif
                     if (RT_SUCCESS(rc))
                     {
@@ -178 +174 @@
                             dbgfR3OSTermPart2(pUVM);
                         }
-#ifdef VBOX_WITH_LOTS_OF_DBGF_BPS
                         dbgfR3BpTerm(pUVM);
-#endif
                     }
                     dbgfR3AsTerm(pUVM);
@@ -210 +204 @@
     dbgfR3PlugInTerm(pUVM);
     dbgfR3OSTermPart2(pUVM);
-#ifdef VBOX_WITH_LOTS_OF_DBGF_BPS
     dbgfR3BpTerm(pUVM);
-#endif
     dbgfR3AsTerm(pUVM);
     dbgfR3RegTerm(pUVM);
@@ -785 +777 @@
      */
     DBGFEVENT DbgEvent;
-#ifndef VBOX_WITH_LOTS_OF_DBGF_BPS
-    RTUINT iBp = DbgEvent.u.Bp.hBp = pVCpu->dbgf.s.iActiveBp;
-    pVCpu->dbgf.s.iActiveBp = ~0U;
-    if (iBp != ~0U)
-    {
-        DbgEvent.enmCtx = DBGFEVENTCTX_RAW;
-        return dbgfR3SendEventWaitEx(pVM, pVCpu, enmEvent, DBGFEVENTCTX_RAW, &DbgEvent.u, sizeof(DbgEvent.u.Bp));
-    }
-#else
     DbgEvent.u.Bp.hBp = pVCpu->dbgf.s.hBpActive;
     pVCpu->dbgf.s.hBpActive = NIL_DBGFBP;
@@ -801 +784 @@
         return dbgfR3SendEventWaitEx(pVM, pVCpu, enmEvent, DBGFEVENTCTX_RAW, &DbgEvent.u, sizeof(DbgEvent.u.Bp));
     }
-#endif
-
-#ifndef VBOX_WITH_LOTS_OF_DBGF_BPS
-    AssertFailed(); /** @todo this should be obsolete now...   */
-
-    /* REM breakpoints has be been searched for. */
-#if 0   /** @todo get flat PC api! */
-    uint32_t eip = CPUMGetGuestEIP(pVM);
-#else
-    PCPUMCTX pCtx = CPUMQueryGuestCtxPtr(pVCpu);
-    RTGCPTR  eip = pCtx->rip + pCtx->cs.u64Base;
-#endif
-    for (size_t i = 0; i < RT_ELEMENTS(pVM->dbgf.s.aBreakpoints); i++)
-        if (    pVM->dbgf.s.aBreakpoints[i].enmType == DBGFBPTYPE_REM
-            &&  pVM->dbgf.s.aBreakpoints[i].u.Rem.GCPtr == eip)
-        {
-            DbgEvent.u.Bp.hBp = pVM->dbgf.s.aBreakpoints[i].iBp;
-            break;
-        }
-    AssertMsg(DbgEvent.u.Bp.hBp != ~0U, ("eip=%08x\n", eip));
-    return dbgfR3SendEventWaitEx(pVM, pVCpu, enmEvent, DBGFEVENTCTX_REM, &DbgEvent.u, sizeof(DbgEvent.u.Bp));
-#else
+
     return VERR_DBGF_IPE_1;
-#endif
 }
 

trunk/src/VBox/VMM/VMMR3/EM.cpp

@@ -839 +839 @@
 
             case VINF_EM_DBG_BREAKPOINT:
-#ifdef VBOX_WITH_LOTS_OF_DBGF_BPS
                 rc = DBGFR3BpHit(pVM, pVCpu);
-#else
-                rc = DBGFR3EventBreakpoint(pVM, DBGFEVENT_BREAKPOINT);
-#endif
                 break;