Changeset 20756 in vbox

Timestamp:

Jun 22, 2009 1:59:33 AM (16 years ago)

Author:

vboxsync

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

48872

Message:

IPRT: More RTDbg coding - generic container is mostly done now.

Location:

trunk

Files:

• include/iprt/err.h (modified) (1 diff)
• src/VBox/Runtime/common/dbg/dbgmodcontainer.cpp (modified) (4 diffs)
• src/VBox/Runtime/include/internal/dbgmod.h (modified) (2 diffs)

trunk/include/iprt/err.h

@@ -953 +953 @@
 #define VERR_DBG_INVALID_RVA                    (-655)
 /** Address conflict within a module/segment.
- * Attempted to add a symbol or line number that fully or partially overlaps with an existing one.  */
+ * Attempted to add a segment, symbol or line number that fully or partially
+ * overlaps with an existing one. */
 #define VERR_DBG_ADDRESS_CONFLICT               (-656)
 /** Duplicate symbol within the module.

trunk/src/VBox/Runtime/common/dbg/dbgmodcontainer.cpp

@@ -75 +75 @@
     /** The segment size. */
     RTUINTPTR                   cb;
+    /** The segment flags. */
+    uint32_t                    fFlags;
     /** The segment name. */
     const char                 *pszName;
@@ -365 +367 @@
 
     pSymbol->AddrCore.Key       = off;
-    pSymbol->AddrCore.KeyLast   = off + RT_MIN(cb, 1);
+    pSymbol->AddrCore.KeyLast   = off + RT_MAX(cb, 1);
     pSymbol->OrdinalCore.Key    = pThis->iNextSymbolOrdinal;
     pSymbol->iSeg               = iSeg;
@@ -405 +407 @@
     RTMemFree(pSymbol);
     return rc;
+}
+
+
+/** @copydoc RTDBGMODVTDBG::pfnSegmentByIndex */
+static DECLCALLBACK(int) rtDbgModContainer_SegmentByIndex(PRTDBGMODINT pMod, RTDBGSEGIDX iSeg, PRTDBGSEGMENT pSegInfo)
+{
+    PRTDBGMODCTN pThis = (PRTDBGMODCTN)pMod->pvDbgPriv;
+    if (iSeg >= pThis->cSegs)
+        return VERR_DBG_INVALID_SEGMENT_INDEX;
+    pSegInfo->Address = RTUINTPTR_MAX;
+    pSegInfo->uRva    = pThis->paSegs[iSeg].off;
+    pSegInfo->cb      = pThis->paSegs[iSeg].cb;
+    pSegInfo->fFlags  = pThis->paSegs[iSeg].fFlags;
+    pSegInfo->iSeg    = iSeg;
+    strcpy(pSegInfo->szName, pThis->paSegs[iSeg].pszName);
+    return VINF_SUCCESS;
+}
+
+
+/** @copydoc RTDBGMODVTDBG::pfnSegmentCount */
+static DECLCALLBACK(RTDBGSEGIDX) rtDbgModContainer_SegmentCount(PRTDBGMODINT pMod)
+{
+    PRTDBGMODCTN pThis = (PRTDBGMODCTN)pMod->pvDbgPriv;
+    return pThis->cSegs;
+}
+
+
+/** @copydoc RTDBGMODVTDBG::pfnSegmentAdd */
+static DECLCALLBACK(int) rtDbgModContainer_SegmentAdd(PRTDBGMODINT pMod, RTUINTPTR uRva, RTUINTPTR cb, const char *pszName, size_t cchName,
+                                                      uint32_t fFlags, PRTDBGSEGIDX piSeg)
+{
+    PRTDBGMODCTN pThis = (PRTDBGMODCTN)pMod->pvDbgPriv;
+
+    /*
+     * Input validation (the bits the caller cannot do).
+     */
+    /* Overlapping segments are not yet supported. Will use flags to deal with it if it becomes necessary. */
+    RTUINTPTR   uRvaLast    = uRva + RT_MAX(cb, 1) - 1;
+    RTUINTPTR   uRvaLastMax = uRvaLast;
+    RTDBGSEGIDX iSeg        = pThis->cSegs;
+    while (iSeg-- > 0)
+    {
+        RTUINTPTR uCurRva     = pThis->paSegs[iSeg].off;
+        RTUINTPTR uCurRvaLast = uCurRva + RT_MAX(pThis->paSegs[iSeg].cb, 1) - 1;
+        if (   uRva      <= uCurRvaLast
+            && uRvaLast  >= uCurRva)
+            AssertMsgFailedReturn(("uRva=%RTptr uRvaLast=%RTptr (cb=%RTptr) \"%s\";\n"
+                                   "uRva=%RTptr uRvaLast=%RTptr (cb=%RTptr) \"%s\" iSeg=%#x\n",
+                                   uRva, uRvaLast, cb, pszName,
+                                   uCurRva, uCurRvaLast, pThis->paSegs[iSeg].cb, pThis->paSegs[iSeg].pszName, iSeg),
+                                  VERR_DBG_SEGMENT_INDEX_CONFLICT);
+        if (uRvaLastMax < uCurRvaLast)
+            uRvaLastMax = uCurRvaLast;
+    }
+    /* Strict ordered segment addition at the moment. */
+    iSeg = pThis->cSegs;
+    AssertMsgReturn(!piSeg || *piSeg == NIL_RTDBGSEGIDX || *piSeg == iSeg,
+                    ("iSeg=%#x *piSeg=%#x\n", iSeg, *piSeg),
+                    VERR_DBG_INVALID_SEGMENT_INDEX);
+
+    /*
+     * Add an entry to the segment table, extending it if necessary.
+     */
+    if (!(iSeg % 8))
+    {
+        void *pvSegs = RTMemRealloc(pThis->paSegs, sizeof(RTDBGMODCTNSEGMENT) * (iSeg + 8));
+        if (!pvSegs)
+            return VERR_NO_MEMORY;
+        pThis->paSegs = (PRTDBGMODCTNSEGMENT)pvSegs;
+    }
+
+    pThis->paSegs[iSeg].SymAddrTree     = NULL;
+    pThis->paSegs[iSeg].LineAddrTree    = NULL;
+    pThis->paSegs[iSeg].off             = uRva;
+    pThis->paSegs[iSeg].cb              = cb;
+    pThis->paSegs[iSeg].fFlags          = fFlags;
+    pThis->paSegs[iSeg].pszName         = RTStrCacheEnterN(g_hDbgModStrCache, pszName, cchName);
+    if (pThis->paSegs[iSeg].pszName)
+    {
+        if (piSeg)
+            *piSeg = iSeg;
+        pThis->cSegs++;
+        pThis->cb = uRvaLastMax + 1;
+        if (!pThis->cb)
+            pThis->cb = RTUINTPTR_MAX;
+        return VINF_SUCCESS;
+    }
+    return VERR_NO_MEMORY;
+}
+
+
+/** @copydoc RTDBGMODVTDBG::pfnRvaToSegOff */
+static DECLCALLBACK(RTUINTPTR) rtDbgModContainer_ImageSize(PRTDBGMODINT pMod)
+{
+    PRTDBGMODCTN pThis = (PRTDBGMODCTN)pMod->pvDbgPriv;
+    return pThis->cb;
 }
 
@@ -519 +617 @@
 {
     /*.u32Magic = */            RTDBGMODVTDBG_MAGIC,
-    /*.fSupports = */           0, ///@todo iprt/types.h isn't up to date...
+    /*.fSupports = */           0, /* (Don't call my TryOpen, please.) */
     /*.pszName = */             "container",
     /*.pfnTryOpen = */          rtDbgModContainer_TryOpen,
     /*.pfnClose = */            rtDbgModContainer_Close,
+
     /*.pfnRvaToSegOff = */      rtDbgModContainer_RvaToSegOff,
-
-    /*.pfnSegmentAdd = */       NULL,//rtDbgModContainer_SegmentAdd,
-    /*.pfnSegmentCount = */     NULL,//rtDbgModContainer_SegmentCount,
-    /*.pfnSegmentByIndex = */   NULL,//rtDbgModContainer_SegmentByIndex,
+    /*.pfnImageSize = */        rtDbgModContainer_ImageSize,
+
+    /*.pfnSegmentAdd = */       rtDbgModContainer_SegmentAdd,
+    /*.pfnSegmentCount = */     rtDbgModContainer_SegmentCount,
+    /*.pfnSegmentByIndex = */   rtDbgModContainer_SegmentByIndex,
 
     /*.pfnSymbolAdd = */        rtDbgModContainer_SymbolAdd,

trunk/src/VBox/Runtime/include/internal/dbgmod.h

@@ -155 +155 @@
     DECLCALLBACKMEMBER(RTDBGSEGIDX, pfnRvaToSegOff)(PRTDBGMODINT pMod, RTUINTPTR uRva, PRTUINTPTR poffSeg);
 
+    /**
+     * Image size when mapped if segments are mapped adjecently.
+     *
+     * For ELF, PE, and Mach-O images this is (usually) a natural query, for LX and
+     * NE and such it's a bit odder and the answer may not make much sense for them.
+     *
+     * @returns Image mapped size.
+     * @param   pMod        Pointer to the module structure.
+     */
+    DECLCALLBACKMEMBER(RTUINTPTR, pfnImageSize)(PRTDBGMODINT pMod);
+
 
 
@@ -197 +208 @@
      * @param   pSegInfo    Where to store the segment information.
      */
-    DECLCALLBACKMEMBER(int, pfnSegmentByIndex)(PRTDBGMODINT pMod, RTDBGSEGIDX iSeg, RTDBGSEGMENT pSegInfo);
+    DECLCALLBACKMEMBER(int, pfnSegmentByIndex)(PRTDBGMODINT pMod, RTDBGSEGIDX iSeg, PRTDBGSEGMENT pSegInfo);