Changeset 73359 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Jul 25, 2018 6:50:19 PM (6 years ago)

Author:

vboxsync

Message:

IPRT/RTDbg: Added RTDBGSYMADDR_FLAGS_SKIP_ABS and RTDBGSYMADDR_FLAGS_SKIP_ABS_IN_DEFERRED to symbol lookup code. Made RTDbgModSymbolByAddr use segment number and names to return something if an address is within the module.

Location:

trunk/src/VBox/Runtime/common/dbg

Files:

• dbgas.cpp (modified) (1 diff)
• dbgmod.cpp (modified) (2 diffs)
• dbgmoddeferred.cpp (modified) (1 diff)

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

@@ -1372 +1372 @@
          * Check for absolute symbols.  Requires iterating all modules.
          */
+        if (fFlags & RTDBGSYMADDR_FLAGS_SKIP_ABS)
+            return VERR_NOT_FOUND;
+
         uint32_t cModules;
         PRTDBGMOD pahModules = rtDbgAsSnapshotModuleTable(pDbgAs, &cModules);

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

@@ -1858 +1858 @@
 
 
+/**
+ * Return a segment number/name as symbol if we couldn't find any
+ * valid symbols within the segment.
+ *
+ * @returns
+ * @param   pDbgMod             .
+ * @param   iSeg                .
+ * @param   off                 .
+ * @param   poffDisp            .
+ * @param   pSymInfo            .
+ */
+DECL_NO_INLINE(static, int)
+rtDbgModSymbolByAddrTrySegments(PRTDBGMODINT pDbgMod, RTDBGSEGIDX iSeg, RTUINTPTR off,
+                                PRTINTPTR poffDisp, PRTDBGSYMBOL pSymInfo)
+{
+    Assert(iSeg <= RTDBGSEGIDX_LAST);
+    RTDBGSEGMENT SegInfo;
+    int rc = pDbgMod->pDbgVt->pfnSegmentByIndex(pDbgMod, iSeg, &SegInfo);
+    if (RT_SUCCESS(rc))
+    {
+        pSymInfo->Value  = 0;
+        pSymInfo->cb     = SegInfo.cb;
+        pSymInfo->offSeg = 0;
+        pSymInfo->iSeg   = iSeg;
+        pSymInfo->fFlags = 0;
+        if (SegInfo.szName[0])
+            RTStrPrintf(pSymInfo->szName, sizeof(pSymInfo->szName), "start_seg%u_%s", SegInfo.iSeg, SegInfo.szName);
+        else
+            RTStrPrintf(pSymInfo->szName, sizeof(pSymInfo->szName), "start_seg%u", SegInfo.iSeg);
+        if (poffDisp)
+            *poffDisp = off;
+        return VINF_SUCCESS;
+    }
+    return VERR_SYMBOL_NOT_FOUND;
+}
+
+
 RTDECL(int) RTDbgModSymbolByAddr(RTDBGMOD hDbgMod, RTDBGSEGIDX iSeg, RTUINTPTR off, uint32_t fFlags,
                                  PRTINTPTR poffDisp, PRTDBGSYMBOL pSymInfo)
@@ -1889 +1926 @@
      */
     int rc = pDbgMod->pDbgVt->pfnSymbolByAddr(pDbgMod, iSeg, off, fFlags, poffDisp, pSymInfo);
+
+    /* If we failed to locate a symbol, try use the specified segment as a reference. */
+    if (   rc == VERR_SYMBOL_NOT_FOUND
+        && iSeg <= RTDBGSEGIDX_LAST
+        && !(fFlags & RTDBGSYMADDR_FLAGS_GREATER_OR_EQUAL))
+        rc = rtDbgModSymbolByAddrTrySegments(pDbgMod, iSeg, off, poffDisp, pSymInfo);
 
     RTDBGMOD_UNLOCK(pDbgMod);

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

@@ -236 +236 @@
                                                           PRTINTPTR poffDisp, PRTDBGSYMBOL pSymInfo)
 {
+    if (   (fFlags & RTDBGSYMADDR_FLAGS_SKIP_ABS_IN_DEFERRED)
+        && iSeg == RTDBGSEGIDX_ABS)
+        return VERR_SYMBOL_NOT_FOUND;
+
     int rc = rtDbgModDeferredDoIt(pMod, false /*fForceRetry*/);
     if (RT_SUCCESS(rc))