Changeset 87594 in vbox for trunk/src/VBox/Debugger

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Debugger

Files:

• DBGCEmulateCodeView.cpp (modified) (5 diffs)
• DBGCRemoteKd.cpp (modified) (2 diffs)
• Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Debugger/DBGCEmulateCodeView.cpp

@@ -945 +945 @@
 
 
-#ifndef VBOX_WITH_LOTS_OF_DBGF_BPS
-/**
- * Breakpoint enumeration callback function.
- *
- * @returns VBox status code. Any failure will stop the enumeration.
- * @param   pUVM        The user mode VM handle.
- * @param   pvUser      The user argument.
- * @param   pBp         Pointer to the breakpoint information. (readonly)
- */
-static DECLCALLBACK(int) dbgcEnumBreakpointsCallback(PUVM pUVM, void *pvUser, PCDBGFBP pBp)
-#else
 /**
  * Breakpoint enumeration callback function.
@@ -966 +955 @@
  */
 static DECLCALLBACK(int) dbgcEnumBreakpointsCallback(PUVM pUVM, void *pvUser, DBGFBP hBp, PCDBGFBPPUB pBp)
-#endif
 {
     PDBGC   pDbgc   = (PDBGC)pvUser;
-#ifndef VBOX_WITH_LOTS_OF_DBGF_BPS
-    PDBGCBP pDbgcBp = dbgcBpGet(pDbgc, pBp->iBp);
-#else
     PDBGCBP pDbgcBp = dbgcBpGet(pDbgc, hBp);
-#endif
 
     /*
      * BP type and size.
      */
-#ifndef VBOX_WITH_LOTS_OF_DBGF_BPS
-    DBGCCmdHlpPrintf(&pDbgc->CmdHlp, "%#4x %c ", pBp->iBp, pBp->fEnabled ? 'e' : 'd');
-#else
     DBGCCmdHlpPrintf(&pDbgc->CmdHlp, "%#4x %c ", hBp, DBGF_BP_PUB_IS_ENABLED(pBp->fFlagsAndType) ? 'e' : 'd');
-#endif
     bool fHasAddress = false;
-#ifndef VBOX_WITH_LOTS_OF_DBGF_BPS
-    switch (pBp->enmType)
-#else
     switch (DBGF_BP_PUB_GET_TYPE(pBp->fFlagsAndType))
-#endif
     {
         case DBGFBPTYPE_INT3:
@@ -1011 +987 @@
         }
 
-#ifndef VBOX_WITH_LOTS_OF_DBGF_BPS
-        case DBGFBPTYPE_REM:
-            DBGCCmdHlpPrintf(&pDbgc->CmdHlp, " r %RGv", pBp->u.Rem.GCPtr);
-            fHasAddress = true;
-            break;
-#endif
-
 /** @todo realign the list when I/O and MMIO breakpoint command have been added and it's possible to test this code. */
         case DBGFBPTYPE_PORT_IO:
         case DBGFBPTYPE_MMIO:
         {
-#ifndef VBOX_WITH_LOTS_OF_DBGF_BPS
-            uint32_t fAccess = pBp->enmType == DBGFBPTYPE_PORT_IO ? pBp->u.PortIo.fAccess : pBp->u.Mmio.fAccess;
-            DBGCCmdHlpPrintf(&pDbgc->CmdHlp, pBp->enmType == DBGFBPTYPE_PORT_IO ?  " i" : " m");
-#else
             uint32_t fAccess = DBGF_BP_PUB_GET_TYPE(pBp->fFlagsAndType) == DBGFBPTYPE_PORT_IO ? pBp->u.PortIo.fAccess : pBp->u.Mmio.fAccess;
             DBGCCmdHlpPrintf(&pDbgc->CmdHlp, DBGF_BP_PUB_GET_TYPE(pBp->fFlagsAndType) == DBGFBPTYPE_PORT_IO ?  " i" : " m");
-#endif
             DBGCCmdHlpPrintf(&pDbgc->CmdHlp, " %c%c%c%c%c%c",
                              fAccess & DBGFBPIOACCESS_READ_MASK   ? 'r' : '-',
@@ -1043 +1007 @@
                              fAccess & DBGFBPIOACCESS_WRITE_QWORD ? '8' : '-',
                              fAccess & DBGFBPIOACCESS_WRITE_OTHER ? '+' : '-');
-#ifndef VBOX_WITH_LOTS_OF_DBGF_BPS
-            if (pBp->enmType == DBGFBPTYPE_PORT_IO)
-#else
             if (DBGF_BP_PUB_GET_TYPE(pBp->fFlagsAndType) == DBGFBPTYPE_PORT_IO)
-#endif
                 DBGCCmdHlpPrintf(&pDbgc->CmdHlp, " %04x-%04x",
                                  pBp->u.PortIo.uPort, pBp->u.PortIo.uPort + pBp->u.PortIo.cPorts - 1);
@@ -1056 +1016 @@
 
         default:
-#ifndef VBOX_WITH_LOTS_OF_DBGF_BPS
-            DBGCCmdHlpPrintf(&pDbgc->CmdHlp, " unknown type %d!!", pBp->enmType);
-#else
             DBGCCmdHlpPrintf(&pDbgc->CmdHlp, " unknown type %d!!", DBGF_BP_PUB_GET_TYPE(pBp->fFlagsAndType));
-#endif
             AssertFailed();
             break;

trunk/src/VBox/Debugger/DBGCRemoteKd.cpp

@@ -1160 +1160 @@
 typedef struct KDCTXHWBP
 {
-#ifndef VBOX_WITH_LOTS_OF_DBGF_BPS
-    /** The DBGF breakpoint handle if active, UINT32_MAX if not active. */
-    uint32_t                    hDbgfBp;
-#else
     /** The DBGF breakpoint handle if active, NIL_DBGFBP if not active. */
     DBGFBP                      hDbgfBp;
-#endif
     /** The linear address of the breakpoint if active. */
     RTGCPTR                     GCPtrBp;
@@ -1245 +1240 @@
 #define KD_PTR_GET(a_pThis, a_GCPtr) ((a_pThis)->f32Bit ? (a_GCPtr) & ~UINT64_C(0xffffffff00000000) : (a_GCPtr))
 
-#ifndef VBOX_WITH_LOTS_OF_DBGF_BPS
-# define NIL_DBGFBP              ((uint32_t)UINT32_MAX)
-#endif
-
 
 /*********************************************************************************************************************************
 *   Internal Functions                                                                                                           *
 *********************************************************************************************************************************/
-
 static void dbgcKdCtxMsgSend(PKDCTX pThis, bool fWarning, const char *pszMsg);
 

trunk/src/VBox/Debugger/Makefile.kmk

@@ -35 +35 @@
 Debugger_TEMPLATE  = VBOXR3
 Debugger_DEFS      = IN_VMM_R3 IN_DBG_R3 IN_DIS
-ifdef VBOX_WITH_LOTS_OF_DBGF_BPS
-Debugger_DEFS     += VBOX_WITH_LOTS_OF_DBGF_BPS
-endif
 ifneq ($(KBUILD_TYPE),release)
  Debugger_DEFS    += VBOX_WITH_DEBUGGER_TCP_BY_DEFAULT