Changeset 38515 in vbox for trunk/src/VBox/Runtime/common/ldr

Timestamp:

Aug 24, 2011 2:33:32 PM (14 years ago)

Author:

vboxsync

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

73640

Message:

IPRT: Working on debug info again.

Location:

trunk/src/VBox/Runtime/common/ldr

Files:

• ldrELFRelocatable.cpp.h (modified) (2 diffs)
• ldrEx.cpp (modified) (2 diffs)
• ldrNative.cpp (modified) (1 diff)
• ldrPE.cpp (modified) (3 diffs)
• ldrkStuff.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/common/ldr/ldrELFRelocatable.cpp.h

@@ -685 +685 @@
 
 
+/** @copydoc RTLDROPS::pfnEnumDbgInfo */
+static DECLCALLBACK(int) RTLDRELF_NAME(EnumDbgInfo)(PRTLDRMODINTERNAL pMod, const void *pvBits,
+                                                    PFNRTLDRENUMDBG pfnCallback, void *pvUser)
+{
+    PRTLDRMODELF pModElf = (PRTLDRMODELF)pMod;
+    NOREF(pvBits);
+
+    return VERR_NOT_IMPLEMENTED;
+}
+
 
 /**
@@ -705 +715 @@
     RTLDRELF_NAME(Relocate),
     RTLDRELF_NAME(GetSymbolEx),
-    0
+    RTLDRELF_NAME(EnumDbgInfo),
+    42
 };
 

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

@@ -340 +340 @@
 RTDECL(int) RTLdrEnumSymbols(RTLDRMOD hLdrMod, unsigned fFlags, const void *pvBits, RTUINTPTR BaseAddress, PFNRTLDRENUMSYMS pfnCallback, void *pvUser)
 {
-    LogFlow(("RTLdrEnumSymbols: hLdrMod=%RTldrm fFlags=%#x pvBit=%p BaseAddress=%RTptr pfnCallback=%p pvUser=%p\n",
+    LogFlow(("RTLdrEnumSymbols: hLdrMod=%RTldrm fFlags=%#x pvBits=%p BaseAddress=%RTptr pfnCallback=%p pvUser=%p\n",
              hLdrMod, fFlags, pvBits, BaseAddress, pfnCallback, pvUser));
 
@@ -361 +361 @@
 RT_EXPORT_SYMBOL(RTLdrEnumSymbols);
 
+
+RTDECL(int) RTLdrEnumDbgInfo(RTLDRMOD hLdrMod, const void *pvBits, PFNRTLDRENUMDBG pfnCallback, void *pvUser)
+{
+    LogFlow(("RTLdrEnumDbgInfo: hLdrMod=%RTldrm pvBits=%p pfnCallback=%p pvUser=%p\n",
+             hLdrMod, pvBits, pfnCallback, pvUser));
+
+    /*
+     * Validate input.
+     */
+    AssertMsgReturn(rtldrIsValid(hLdrMod), ("hLdrMod=%p\n", hLdrMod), VERR_INVALID_HANDLE);
+    AssertMsgReturn(!pvBits || RT_VALID_PTR(pvBits), ("pvBits=%p\n", pvBits), VERR_INVALID_PARAMETER);
+    AssertMsgReturn(RT_VALID_PTR(pfnCallback), ("pfnCallback=%p\n", pfnCallback), VERR_INVALID_PARAMETER);
+    PRTLDRMODINTERNAL pMod = (PRTLDRMODINTERNAL)hLdrMod;
+    //AssertMsgReturn(pMod->eState == LDR_STATE_OPENED, ("eState=%d\n", pMod->eState), VERR_WRONG_ORDER);
+
+    /*
+     * Do it.
+     */
+    int rc;
+    if (pMod->pOps->pfnEnumDbgInfo)
+        rc = pMod->pOps->pfnEnumDbgInfo(pMod, pvBits, pfnCallback, pvUser);
+    else
+        rc = VERR_NOT_SUPPORTED;
+
+    LogFlow(("RTLdrEnumDbgInfo: returns %Rrc\n", rc));
+    return rc;
+}
+RT_EXPORT_SYMBOL(RTLdrEnumDbgInfo);
+

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

@@ -69 +69 @@
     rtldrNativeEnumSymbols,
     /* ext: */
+    NULL,
     NULL,
     NULL,

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

@@ -768 +768 @@
 
 
+/** @copydoc RTLDROPS::pfnEnumDbgInfo. */
+static DECLCALLBACK(int) rtldrPE_EnumDbgInfo(PRTLDRMODINTERNAL pMod, const void *pvBits,
+                                             PFNRTLDRENUMDBG pfnCallback, void *pvUser)
+{
+    return VINF_NOT_SUPPORTED;
+}
+
+
 /** @copydoc RTLDROPS::pfnDone */
 static DECLCALLBACK(int) rtldrPEDone(PRTLDRMODINTERNAL pMod)
@@ -826 +834 @@
         rtldrPERelocate,
         rtldrPEGetSymbolEx,
+        rtldrPE_EnumDbgInfo,
         42
     },
@@ -849 +858 @@
         rtldrPERelocate,
         rtldrPEGetSymbolEx,
+        rtldrPE_EnumDbgInfo,
         42
     },

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

@@ -136 +136 @@
 static DECLCALLBACK(int) rtkldrGetSymbolEx(PRTLDRMODINTERNAL pMod, const void *pvBits, RTUINTPTR BaseAddress,
                                            const char *pszSymbol, RTUINTPTR *pValue);
+static DECLCALLBACK(int) rtkldr_EnumDbgInfo(PRTLDRMODINTERNAL pMod, const void *pvBits,
+                                            PFNRTLDRENUMDBG pfnCallback, void *pvUser);
 
 
@@ -442 +444 @@
     rtkldrRelocate,
     rtkldrGetSymbolEx,
+    rtkldr_EnumDbgInfo,
     42
 };
@@ -627 +630 @@
 }
 
+
+/** @copydoc RTLDROPS::pfnEnumDbgInfo */
+static DECLCALLBACK(int) rtkldr_EnumDbgInfo(PRTLDRMODINTERNAL pMod, const void *pvBits,
+                                            PFNRTLDRENUMDBG pfnCallback, void *pvUser)
+{
+    return VERR_NOT_SUPPORTED;
+}