Changeset 87594 in vbox for trunk/src/VBox/VMM/include/DBGFInternal.h

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

File:

• trunk/src/VBox/VMM/include/DBGFInternal.h (modified) (13 diffs)

trunk/src/VBox/VMM/include/DBGFInternal.h

@@ -55 +55 @@
 
 
-#ifdef VBOX_WITH_LOTS_OF_DBGF_BPS
 /** @name Global breakpoint table handling defines.
  * @{ */
@@ -81 +80 @@
 #define DBGF_BP_L2_TBL_CHUNK_COUNT          (DBGF_BP_L2_TBL_ENTRY_COUNT_MAX / DBGF_BP_L2_TBL_ENTRIES_PER_CHUNK)
 /** @} */
-#endif
 
 
@@ -775 +773 @@
 
 
-#ifndef VBOX_WITH_LOTS_OF_DBGF_BPS
-/**
- * Breakpoint search optimization.
- */
-typedef struct DBGFBPSEARCHOPT
-{
-    /** Where to start searching for hits.
-     * (First enabled is #DBGF::aBreakpoints[iStartSearch]). */
-    uint32_t volatile       iStartSearch;
-    /** The number of aBreakpoints entries to search.
-     * (Last enabled is #DBGF::aBreakpoints[iStartSearch + cToSearch - 1])  */
-    uint32_t volatile       cToSearch;
-} DBGFBPSEARCHOPT;
-/** Pointer to a breakpoint search optimziation structure. */
-typedef DBGFBPSEARCHOPT *PDBGFBPSEARCHOPT;
-#else
-
 /** An invalid breakpoint chunk ID. */
 #define DBGF_BP_CHUNK_ID_INVALID                    UINT32_MAX
@@ -1087 +1068 @@
 /** Pointer to a breakpoint L2 lookup table chunk - Ring-0 Ptr. */
 typedef R0PTRTYPE(DBGFBPL2TBLCHUNKR0 *) PDBGFBPL2TBLCHUNKR0;
-#endif
 
 
@@ -1117 +1097 @@
     /** The number of enabled hardware I/O breakpoints. */
     uint8_t                     cEnabledHwIoBreakpoints;
-#ifndef VBOX_WITH_LOTS_OF_DBGF_BPS
+    uint8_t                     au8Alignment1[2]; /**< Alignment padding. */
     /** The number of enabled INT3 breakpoints. */
-    uint8_t                     cEnabledInt3Breakpoints;
-    uint8_t                     abPadding; /**< Unused padding space up for grabs. */
-    uint32_t                    uPadding;
-#else
-    uint16_t                    u16Pad; /**< Unused padding space up for grabs. */
-    /** The number of enabled INT3 breakpoints. */
-    volatile uint32_t           cEnabledInt3Breakpoints;
-#endif
+    uint32_t volatile           cEnabledInt3Breakpoints;
 
     /** Debugger Attached flag.
@@ -1161 +1134 @@
     } SteppingFilter;
 
-    uint32_t                    u32Padding[2]; /**< Alignment padding. */
-
-#ifndef VBOX_WITH_LOTS_OF_DBGF_BPS
-    /** Array of hardware breakpoints. (0..3)
-     * This is shared among all the CPUs because life is much simpler that way. */
-    DBGFBP                      aHwBreakpoints[4];
-    /** Array of int 3 and REM breakpoints. (4..)
-     * @remark This is currently a fixed size array for reasons of simplicity. */
-    DBGFBP                      aBreakpoints[32];
-
-    /** MMIO breakpoint search optimizations. */
-    DBGFBPSEARCHOPT             Mmio;
-    /** I/O port breakpoint search optimizations. */
-    DBGFBPSEARCHOPT             PortIo;
-    /** INT3 breakpoint search optimizations. */
-    DBGFBPSEARCHOPT             Int3;
-#else
+    uint32_t                    au32Alignment2[2]; /**< Alignment padding. */
+
     /** @name Breakpoint handling related state.
      * @{ */
     /** Array of hardware breakpoints (0..3).
      * This is shared among all the CPUs because life is much simpler that way. */
-    DBGFBPHW                        aHwBreakpoints[4];
+    DBGFBPHW                    aHwBreakpoints[4];
     /** @} */
-#endif
 
     /**
@@ -1249 +1206 @@
     uint32_t                offVM;
 
-#ifndef VBOX_WITH_LOTS_OF_DBGF_BPS
-    /** Current active breakpoint (id).
-     * This is ~0U if not active. It is set when a execution engine
-     * encounters a breakpoint and returns VINF_EM_DBG_BREAKPOINT. This is
-     * currently not used for REM breakpoints because of the lazy coupling
-     * between VBox and REM.
-     *
-     * @todo drop this in favor of aEvents!  */
-    uint32_t                iActiveBp;
-#else
+    /** Flag whether the to invoke any owner handlers in ring-3 before dropping into the debugger. */
+    bool                    fBpInvokeOwnerCallback;
+    /** Set if we're singlestepping in raw mode.
+     * This is checked and cleared in the \#DB handler. */
+    bool                    fSingleSteppingRaw;
+    /** Alignment padding. */
+    bool                    afPadding[2];
     /** Current active breakpoint handle.
      * This is NIL_DBGFBP if not active. It is set when a execution engine
@@ -1265 +1219 @@
      * @todo drop this in favor of aEvents!  */
     DBGFBP                  hBpActive;
-    /** Flag whether the to invoke any owner handlers in ring-3 before dropping into the debugger. */
-    bool                    fBpInvokeOwnerCallback;
-#endif
-    /** Set if we're singlestepping in raw mode.
-     * This is checked and cleared in the \#DB handler. */
-    bool                    fSingleSteppingRaw;
-
-    /** Alignment padding. */
-    bool                    afPadding[3];
 
     /** The number of events on the stack (aEvents).
@@ -1326 +1271 @@
     R0PTRTYPE(struct DBGFTRACERINSR0 *) pTracerR0;
 
-#ifdef VBOX_WITH_LOTS_OF_DBGF_BPS
     /** @name Breakpoint handling related state, Ring-0 only part.
      * @{ */
@@ -1349 +1293 @@
     bool                                fInit;
     /** @} */
-#endif
 } DBGFR0PERVM;
 
@@ -1424 +1367 @@
     /** @} */
 
-#ifdef VBOX_WITH_LOTS_OF_DBGF_BPS
     /** @name Breakpoint handling related state.
      * @{ */
@@ -1442 +1384 @@
     RTSEMFASTMUTEX                  hMtxBpL2Wr;
     /** @} */
-#endif
 
     /** The type database lock. */
@@ -1490 +1431 @@
 void dbgfR3AsTerm(PUVM pUVM);
 void dbgfR3AsRelocate(PUVM pUVM, RTGCUINTPTR offDelta);
-#ifdef VBOX_WITH_LOTS_OF_DBGF_BPS
 DECLHIDDEN(int) dbgfR3BpInit(PUVM pUVM);
 DECLHIDDEN(int) dbgfR3BpTerm(PUVM pUVM);
-#else
-int  dbgfR3BpInit(PVM pVM);
-#endif
 int  dbgfR3InfoInit(PUVM pUVM);
 int  dbgfR3InfoTerm(PUVM pUVM);