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

Timestamp:

Aug 26, 2011 12:58:47 PM (14 years ago)

Author:

vboxsync

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

73701

Message:

IPRT: More debug info hacking.

Location:

trunk/src/VBox/Runtime/common/ldr

Files:

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

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

@@ -696 +696 @@
 
 
+/** @copydoc RTLDROPS::pfnEnumSegments. */
+static DECLCALLBACK(int) RTLDRELF_NAME(EnumSegments)(PRTLDRMODINTERNAL pMod, PFNRTLDRENUMSEGS pfnCallback, void *pvUser)
+{
+    PRTLDRMODELF pModElf = (PRTLDRMODELF)pMod;
+
+    return VERR_NOT_IMPLEMENTED;
+}
+
+
+
 /**
  * The ELF module operations.
@@ -716 +726 @@
     RTLDRELF_NAME(GetSymbolEx),
     RTLDRELF_NAME(EnumDbgInfo),
+    RTLDRELF_NAME(EnumSegments),
     42
 };

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

@@ -209 +209 @@
  * @remark  Not supported for RTLdrLoad() images.
  */
-RTDECL(int) RTLdrGetBits(RTLDRMOD hLdrMod, void *pvBits, RTUINTPTR BaseAddress, PFNRTLDRIMPORT pfnGetImport, void *pvUser)
+RTDECL(int) RTLdrGetBits(RTLDRMOD hLdrMod, void *pvBits, RTLDRADDR BaseAddress, PFNRTLDRIMPORT pfnGetImport, void *pvUser)
 {
     LogFlow(("RTLdrGetBits: hLdrMod=%RTldrm pvBits=%p BaseAddress=%RTptr pfnGetImport=%p pvUser=%p\n",
@@ -247 +247 @@
  * @remark  Not supported for RTLdrLoad() images.
  */
-RTDECL(int) RTLdrRelocate(RTLDRMOD hLdrMod, void *pvBits, RTUINTPTR NewBaseAddress, RTUINTPTR OldBaseAddress,
+RTDECL(int) RTLdrRelocate(RTLDRMOD hLdrMod, void *pvBits, RTLDRADDR NewBaseAddress, RTLDRADDR OldBaseAddress,
                           PFNRTLDRIMPORT pfnGetImport, void *pvUser)
 {
@@ -289 +289 @@
  * @param   pValue          Where to store the symbol value.
  */
-RTDECL(int) RTLdrGetSymbolEx(RTLDRMOD hLdrMod, const void *pvBits, RTUINTPTR BaseAddress, const char *pszSymbol, RTUINTPTR *pValue)
+RTDECL(int) RTLdrGetSymbolEx(RTLDRMOD hLdrMod, const void *pvBits, RTLDRADDR BaseAddress, const char *pszSymbol,
+                             PRTLDRADDR pValue)
 {
     LogFlow(("RTLdrGetSymbolEx: hLdrMod=%RTldrm pvBits=%p BaseAddress=%RTptr pszSymbol=%p:{%s} pValue\n",
@@ -338 +339 @@
  * @remark  Not supported for RTLdrLoad() images.
  */
-RTDECL(int) RTLdrEnumSymbols(RTLDRMOD hLdrMod, unsigned fFlags, const void *pvBits, RTUINTPTR BaseAddress, PFNRTLDRENUMSYMS pfnCallback, void *pvUser)
+RTDECL(int) RTLdrEnumSymbols(RTLDRMOD hLdrMod, unsigned fFlags, const void *pvBits, RTLDRADDR BaseAddress,
+                             PFNRTLDRENUMSYMS pfnCallback, void *pvUser)
 {
     LogFlow(("RTLdrEnumSymbols: hLdrMod=%RTldrm fFlags=%#x pvBits=%p BaseAddress=%RTptr pfnCallback=%p pvUser=%p\n",
@@ -390 +392 @@
 RT_EXPORT_SYMBOL(RTLdrEnumDbgInfo);
 
+
+RTDECL(int) RTLdrEnumSegments(RTLDRMOD hLdrMod, PFNRTLDRENUMSEGS pfnCallback, void *pvUser)
+{
+    LogFlow(("RTLdrEnumSegments: hLdrMod=%RTldrm pfnCallback=%p pvUser=%p\n",
+             hLdrMod, pfnCallback, pvUser));
+
+    /*
+     * Validate input.
+     */
+    AssertMsgReturn(rtldrIsValid(hLdrMod), ("hLdrMod=%p\n", hLdrMod), VERR_INVALID_HANDLE);
+    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->pfnEnumSegments)
+        rc = pMod->pOps->pfnEnumSegments(pMod, pfnCallback, pvUser);
+    else
+        rc = VERR_NOT_SUPPORTED;
+
+    LogFlow(("RTLdrEnumSegments: returns %Rrc\n", rc));
+    return rc;
+
+}
+RT_EXPORT_SYMBOL(RTLdrEnumSegments);
+

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

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

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

@@ -776 +776 @@
 
 
+/** @copydoc RTLDROPS::pfnEnumSegments. */
+static DECLCALLBACK(int) rtldrPE_EnumSegments(PRTLDRMODINTERNAL pMod, PFNRTLDRENUMSEGS pfnCallback, void *pvUser)
+{
+    return VINF_NOT_SUPPORTED;
+}
+
+
 /** @copydoc RTLDROPS::pfnDone */
 static DECLCALLBACK(int) rtldrPEDone(PRTLDRMODINTERNAL pMod)
@@ -835 +842 @@
         rtldrPEGetSymbolEx,
         rtldrPE_EnumDbgInfo,
+        rtldrPE_EnumSegments,
         42
     },
@@ -859 +867 @@
         rtldrPEGetSymbolEx,
         rtldrPE_EnumDbgInfo,
+        rtldrPE_EnumSegments,
         42
     },

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

@@ -629 +629 @@
 
 
+/** @copydoc RTLDROPS::pfnEnumSegments. */
+static DECLCALLBACK(int) rtkldr_EnumSegments(PRTLDRMODINTERNAL pMod, PFNRTLDRENUMSEGS pfnCallback, void *pvUser)
+{
+    PRTLDRMODKLDR   pThis      = (PRTLDRMODKLDR)pMod;
+    uint32_t const  cSegments  = pThis->pMod->cSegments;
+    PCKLDRSEG       paSegments = &pThis->pMod->aSegments[0];
+
+    for (uint32_t iSeg = 0; iSeg < cSegments; iSeg++)
+    {
+        RTLDRSEG Seg;
+
+        Seg.pchName     = paSegments[iSeg].pchName;
+        Seg.cchName     = paSegments[iSeg].cchName;
+        Seg.SelFlat     = paSegments[iSeg].SelFlat;
+        Seg.Sel16bit    = paSegments[iSeg].Sel16bit;
+        Seg.fFlags      = paSegments[iSeg].fFlags;
+        AssertCompile(KLDRSEG_FLAG_16BIT          == RTLDRSEG_FLAG_16BIT      );
+        AssertCompile(KLDRSEG_FLAG_OS2_ALIAS16    == RTLDRSEG_FLAG_OS2_ALIAS16);
+        AssertCompile(KLDRSEG_FLAG_OS2_CONFORM    == RTLDRSEG_FLAG_OS2_CONFORM);
+        AssertCompile(KLDRSEG_FLAG_OS2_IOPL       == RTLDRSEG_FLAG_OS2_IOPL   );
+
+        switch (paSegments[iSeg].enmProt)
+        {
+            default:
+                AssertMsgFailed(("%d\n", paSegments[iSeg].enmProt));
+            case KPROT_NOACCESS:
+                Seg.fProt = 0;
+                break;
+
+            case KPROT_READONLY:            Seg.fProt = RTMEM_PROT_READ; break;
+            case KPROT_READWRITE:           Seg.fProt = RTMEM_PROT_READ | RTMEM_PROT_WRITE; break;
+            case KPROT_WRITECOPY:           Seg.fProt = RTMEM_PROT_WRITE; break;
+            case KPROT_EXECUTE:             Seg.fProt = RTMEM_PROT_EXEC; break;
+            case KPROT_EXECUTE_READ:        Seg.fProt = RTMEM_PROT_EXEC | RTMEM_PROT_READ; break;
+            case KPROT_EXECUTE_READWRITE:   Seg.fProt = RTMEM_PROT_EXEC | RTMEM_PROT_READ | RTMEM_PROT_WRITE; break;
+            case KPROT_EXECUTE_WRITECOPY:   Seg.fProt = RTMEM_PROT_EXEC | RTMEM_PROT_WRITE; break;
+        }
+        Seg.cb          = paSegments[iSeg].cb;
+        Seg.Alignment   = paSegments[iSeg].Alignment;
+        Seg.LinkAddress = paSegments[iSeg].LinkAddress;
+        Seg.offFile     = paSegments[iSeg].offFile;
+        Seg.cbFile      = paSegments[iSeg].cbFile;
+        Seg.RVA         = paSegments[iSeg].RVA;
+        Seg.cbMapped    = paSegments[iSeg].cbMapped;
+
+        int rc = pfnCallback(pMod, &Seg, pvUser);
+        if (rc != VINF_SUCCESS)
+            return rc;
+    }
+
+    return VINF_SUCCESS;
+}
+
+
 /**
  * Operations for a kLdr module.
@@ -645 +699 @@
     rtkldr_GetSymbolEx,
     rtkldr_EnumDbgInfo,
+    rtkldr_EnumSegments,
     42
 };