Changeset 46113 in vbox

Timestamp:

May 15, 2013 10:39:43 PM (12 years ago)

Author:

vboxsync

Message:

Implemented debug module that uses the exported symbols. This will work on all hosts. :-)

Location:

trunk

Files:

• include/iprt/ldr.h (modified) (1 diff)
• src/VBox/Runtime/common/dbg/dbgmoddeferred.cpp (modified) (2 diffs)
• src/VBox/Runtime/common/dbg/dbgmodexports.cpp (modified) (2 diffs)
• src/VBox/Runtime/common/dbg/dbgmodldr.cpp (modified) (2 diffs)
• src/VBox/Runtime/common/ldr/ldrPE.cpp (modified) (1 diff)
• src/VBox/Runtime/include/internal/dbgmod.h (modified) (1 diff)

trunk/include/iprt/ldr.h

@@ -371 +371 @@
  * @{ */
 /** Returns ALL kinds of symbols. The default is to only return public/exported symbols. */
-#define RTLDR_ENUM_SYMBOL_FLAGS_ALL    RT_BIT(1)
+#define RTLDR_ENUM_SYMBOL_FLAGS_ALL     RT_BIT(1)
+/** Ignore forwarders (for use with RTLDR_ENUM_SYMBOL_FLAGS_ALL). */
+#define RTLDR_ENUM_SYMBOL_FLAGS_NO_FWD  RT_BIT(2)
 /** @} */
 

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

@@ -478 +478 @@
 
 
+/** @interface_method_impl{RTDBGMODVTIMG,pfnEnumSymbols} */
+static DECLCALLBACK(int) rtDbgModDeferredImg_EnumSymbols(PRTDBGMODINT pMod, uint32_t fFlags, RTLDRADDR BaseAddress,
+                                                         PFNRTLDRENUMSYMS pfnCallback, void *pvUser)
+{
+    int rc = rtDbgModDeferredDoIt(pMod, false /*fForceRetry*/);
+    if (RT_SUCCESS(rc))
+        rc = pMod->pImgVt->pfnEnumSymbols(pMod, fFlags, BaseAddress, pfnCallback, pvUser);
+    return rc;
+}
+
+
 /** @interface_method_impl{RTDBGMODVTIMG,pfnEnumSegments} */
 static DECLCALLBACK(int) rtDbgModDeferredImg_EnumSegments(PRTDBGMODINT pMod, PFNRTLDRENUMSEGS pfnCallback, void *pvUser)
@@ -523 +534 @@
     /*.pfnEnumDbgInfo = */              rtDbgModDeferredImg_EnumDbgInfo,
     /*.pfnEnumSegments = */             rtDbgModDeferredImg_EnumSegments,
+    /*.pfnEnumSymbols = */              rtDbgModDeferredImg_EnumSymbols,
     /*.pfnGetLoadedSize = */            rtDbgModDeferredImg_ImageSize,
     /*.pfnLinkAddressToSegOffset = */   rtDbgModDeferredImg_LinkAddressToSegOffset,

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

@@ -29 +29 @@
 *   Header Files                                                               *
 *******************************************************************************/
+#define LOG_GROUP RTLOGGROUP_DBG
 #include <iprt/dbg.h>
 #include "internal/iprt.h"
 
+#include <iprt/alloca.h>
 #include <iprt/assert.h>
 #include <iprt/err.h>
+#include <iprt/log.h>
 #include <iprt/string.h>
 #include "internal/dbgmod.h"
 
 
+/*******************************************************************************
+*   Structures and Typedefs                                                    *
+*******************************************************************************/
+typedef struct RTDBGMODEXPORTARGS
+{
+    PRTDBGMODINT    pDbgMod;
+    RTLDRADDR       uImageBase;
+} RTDBGMODEXPORTARGS;
+/** Pointer to an argument package. */
+typedef RTDBGMODEXPORTARGS *PRTDBGMODEXPORTARGS;
 
 
+/** @callback_method_impl{FNRTLDRENUMSYMS,
+ *  Copies the symbols over into the container.} */
+static DECLCALLBACK(int) rtDbgModExportsAddSymbolCallback(RTLDRMOD hLdrMod, const char *pszSymbol, unsigned uSymbol,
+                                                          RTLDRADDR Value, void *pvUser)
+{
+    PRTDBGMODEXPORTARGS pArgs = (PRTDBGMODEXPORTARGS)pvUser;
+    NOREF(hLdrMod);
+
+    if (Value >= pArgs->uImageBase)
+    {
+        int rc = RTDbgModSymbolAdd(pArgs->pDbgMod, pszSymbol, RTDBGSEGIDX_RVA, Value - pArgs->uImageBase,
+                                   0 /*cb*/, 0 /* fFlags */, NULL /*piOrdinal*/);
+        Log(("Symbol #%05u %#018x %s [%Rrc]\n", uSymbol, Value, pszSymbol, rc)); NOREF(rc);
+    }
+    else
+        Log(("Symbol #%05u %#018x %s [SKIPPED - INVALID ADDRESS]\n", uSymbol, Value, pszSymbol));
+    return VINF_SUCCESS;
+}
+
+
+/** @callback_method_impl{FNRTLDRENUMSEGS,
+ *  Copies the segments over into the container.} */
+static DECLCALLBACK(int) rtDbgModExportsAddSegmentsCallback(RTLDRMOD hLdrMod, PCRTLDRSEG pSeg, void *pvUser)
+{
+    PRTDBGMODEXPORTARGS pArgs = (PRTDBGMODEXPORTARGS)pvUser;
+    Log(("Segment %.*s: LinkAddress=%#llx RVA=%#llx cb=%#llx\n",
+         pSeg->cchName, pSeg->pchName, (uint64_t)pSeg->LinkAddress, (uint64_t)pSeg->RVA, pSeg->cb));
+    NOREF(hLdrMod);
+
+    /* Find the best base address for the module. */
+    if (    pSeg->LinkAddress != NIL_RTLDRADDR
+        &&  (   !pArgs->uImageBase
+             || pArgs->uImageBase > pSeg->LinkAddress))
+        pArgs->uImageBase = pSeg->LinkAddress;
+
+    /* Make sure the name is terminated before we add it. */
+    char *pszName = (char *)pSeg->pchName;
+    if (pszName[pSeg->cchName])
+    {
+        pszName = (char *)alloca(pSeg->cchName + 1);
+        memcpy(pszName, pSeg->pchName, pSeg->cchName);
+        pszName[pSeg->cchName] = '\0';
+    }
+
+    RTLDRADDR cb = RT_MAX(pSeg->cb, pSeg->cbMapped);
+    return RTDbgModSegmentAdd(pArgs->pDbgMod, pSeg->RVA, cb, pszName, 0 /*fFlags*/, NULL);
+}
 
 
@@ -62 +122 @@
      * We simply use a container type for this work.
      */
-    /// @todo later int rc = rtDbgModContainerCreate(pDbgMod, 0);
-    int rc = rtDbgModContainerCreate(pDbgMod, cbImage);
+    int rc = rtDbgModContainerCreate(pDbgMod, 0);
     if (RT_FAILURE(rc))
         return rc;
+    pDbgMod->fExports = true;
 
     /*
-     * Copy the segments.
+     * Copy the segments and symbols.
      */
+    RTDBGMODEXPORTARGS Args;
+    Args.pDbgMod    = pDbgMod;
+    Args.uImageBase = 0;
+    rc = pDbgMod->pImgVt->pfnEnumSegments(pDbgMod, rtDbgModExportsAddSegmentsCallback, &Args);
+    if (RT_SUCCESS(rc))
+    {
+        rc = pDbgMod->pImgVt->pfnEnumSymbols(pDbgMod, RTLDR_ENUM_SYMBOL_FLAGS_ALL | RTLDR_ENUM_SYMBOL_FLAGS_NO_FWD,
+                                             Args.uImageBase ? Args.uImageBase : 0x10000,
+                                             rtDbgModExportsAddSymbolCallback, &Args);
+        if (RT_FAILURE(rc))
+            Log(("rtDbgModCreateForExports: Error during symbol enum: %Rrc\n", rc));
+    }
+    else
+        Log(("rtDbgModCreateForExports: Error during segment enum: %Rrc\n", rc));
 
-    /*
-     * Copy the symbols.
-     */
-
-
-    return VINF_SUCCESS;
+    /* This won't fail. */
+    if (RT_SUCCESS(rc))
+        rc = VINF_SUCCESS;
+    else
+        rc = -rc; /* Change it into a warning. */
+    return rc;
 }
 

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

@@ -109 +109 @@
 
 /** @interface_method_impl{RTDBGMODVTIMG,pfnEnumSegments} */
+static DECLCALLBACK(int) rtDbgModLdr_EnumSymbols(PRTDBGMODINT pMod, uint32_t fFlags, RTLDRADDR BaseAddress,
+                                                 PFNRTLDRENUMSYMS pfnCallback, void *pvUser)
+{
+    PRTDBGMODLDR pThis = (PRTDBGMODLDR)pMod->pvImgPriv;
+    return RTLdrEnumSymbols(pThis->hLdrMod, fFlags, NULL /*pvBits*/, BaseAddress, pfnCallback, pvUser);
+}
+
+
+/** @interface_method_impl{RTDBGMODVTIMG,pfnEnumSegments} */
 static DECLCALLBACK(int) rtDbgModLdr_EnumSegments(PRTDBGMODINT pMod, PFNRTLDRENUMSEGS pfnCallback, void *pvUser)
 {
@@ -164 +173 @@
     /*.pfnEnumDbgInfo = */              rtDbgModLdr_EnumDbgInfo,
     /*.pfnEnumSegments = */             rtDbgModLdr_EnumSegments,
+    /*.pfnEnumSymbols = */              rtDbgModLdr_EnumSymbols,
     /*.pfnGetLoadedSize = */            rtDbgModLdr_GetLoadedSize,
     /*.pfnLinkAddressToSegOffset = */   rtDbgModLdr_LinkAddressToSegOffset,

trunk/src/VBox/Runtime/common/ldr/ldrPE.cpp

@@ -971 +971 @@
             uintptr_t   uRVAExport = paAddress[uOrdinal];
             RTUINTPTR Value;
-            if (    uRVAExport - (uintptr_t)pModPe->ExportDir.VirtualAddress
-                <   pModPe->ExportDir.Size)
-            {
-                /* Resolve forwarder. */
-                AssertMsgFailed(("Forwarders are not supported!\n"));
+            if (  uRVAExport - (uintptr_t)pModPe->ExportDir.VirtualAddress
+                < pModPe->ExportDir.Size)
+            {
+                if (!(fFlags & RTLDR_ENUM_SYMBOL_FLAGS_NO_FWD))
+                {
+                    /* Resolve forwarder. */
+                    AssertMsgFailed(("Forwarders are not supported!\n"));
+                }
                 continue;
             }

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

@@ -115 +115 @@
      */
     DECLCALLBACKMEMBER(int, pfnEnumSegments)(PRTDBGMODINT pMod, PFNRTLDRENUMSEGS pfnCallback, void *pvUser);
+
+    /**
+     * Enumerates the symbols exported by the module.
+     *
+     * @returns iprt status code, which might have been returned by pfnCallback.
+     * @param   pMod            Pointer to the module structure.
+     * @param   fFlags          Flags indicating what to return and such.
+     * @param   BaseAddress     The image base addressto use when calculating the
+     *                          symbol values.
+     * @param   pfnCallback     The callback function which each symbol is to be fed
+     *                          to.
+     * @param   pvUser          User argument to pass to the enumerator.
+     */
+    DECLCALLBACKMEMBER(int, pfnEnumSymbols)(PRTDBGMODINT pMod, uint32_t fFlags, RTLDRADDR BaseAddress,
+                                            PFNRTLDRENUMSYMS pfnCallback, void *pvUser);
 
     /**