Changeset 38547 in vbox for trunk/include/iprt

Timestamp:

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

Author:

vboxsync

Message:

IPRT: More debug info hacking.

Location:

trunk/include/iprt

Files:

• ldr.h (modified) (10 diffs)
• mangling.h (modified) (1 diff)

trunk/include/iprt/ldr.h

@@ -38 +38 @@
 
 RT_C_DECLS_BEGIN
+
+/** Loader address (unsigned integer). */
+typedef RTUINTPTR           RTLDRADDR;
+/** Pointer to a loader address. */
+typedef RTLDRADDR          *PRTLDRADDR;
+/** Pointer to a const loader address. */
+typedef RTLDRADDR const    *PCRTLDRADDR;
+/** The max loader address value. */
+#define RTLDRADDR_MAX       RTUINTPTR_MAX
+/** NIL loader address value. */
+#define NIL_RTLDRADDR       RTLDRADDR_MAX
 
 
@@ -237 +248 @@
  * @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);
 
 /**
@@ -261 +273 @@
  * @param   pvUser          User argument.
  */
-typedef DECLCALLBACK(int) RTLDRIMPORT(RTLDRMOD hLdrMod, const char *pszModule, const char *pszSymbol, unsigned uSymbol, RTUINTPTR *pValue, void *pvUser);
+typedef DECLCALLBACK(int) RTLDRIMPORT(RTLDRMOD hLdrMod, const char *pszModule, const char *pszSymbol, unsigned uSymbol,
+                                      PRTLDRADDR pValue, void *pvUser);
 /** Pointer to a FNRTLDRIMPORT() callback function. */
 typedef RTLDRIMPORT *PFNRTLDRIMPORT;
@@ -278 +291 @@
  * @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);
 
 /**
@@ -294 +307 @@
  * @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);
 
@@ -307 +320 @@
  * @param   pvUser          The user argument specified to RTLdrEnumSymbols().
  */
-typedef DECLCALLBACK(int) RTLDRENUMSYMS(RTLDRMOD hLdrMod, const char *pszSymbol, unsigned uSymbol, RTUINTPTR Value, void *pvUser);
+typedef DECLCALLBACK(int) RTLDRENUMSYMS(RTLDRMOD hLdrMod, const char *pszSymbol, unsigned uSymbol, RTLDRADDR Value, void *pvUser);
 /** Pointer to a RTLDRENUMSYMS() callback function. */
 typedef RTLDRENUMSYMS *PFNRTLDRENUMSYMS;
@@ -324 +337 @@
  * @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);
 
 /** @name RTLdrEnumSymbols flags.
@@ -377 +390 @@
  *                          if there isn't any specific file location.
  * @param   LinkAddress     The link address of the debug info if it's
- *                          loadable. RTUINTPTR_MAX if not loadable.
+ *                          loadable. NIL_RTLDRADDR if not loadable.
  * @param   cb              The size of the debug information. -1 is used if
  *                          this isn't applicable.
@@ -387 +400 @@
 typedef DECLCALLBACK(int) FNRTLDRENUMDBG(RTLDRMOD hLdrMod, uint32_t iDbgInfo, RTLDRDBGINFOTYPE enmType,
                                          uint16_t iMajorVer, uint16_t iMinorVer, const char *pszPartNm,
-                                         RTFOFF offFile, RTUINTPTR LinkAddress, RTUINTPTR cb,
+                                         RTFOFF offFile, RTLDRADDR LinkAddress, RTLDRADDR cb,
                                          const char *pszExtFile, void *pvUser);
 /** Pointer to a debug info enumerator callback. */
 typedef FNRTLDRENUMDBG *PFNRTLDRENUMDBG;
-
 
 /**
@@ -407 +419 @@
 RTDECL(int) RTLdrEnumDbgInfo(RTLDRMOD hLdrMod, const void *pvBits, PFNRTLDRENUMDBG pfnCallback, void *pvUser);
 
+
+/**
+ * Loader segment.
+ */
+typedef struct RTLDRSEG
+{
+    /** The segment name. (Might not be zero terminated!) */
+    const char     *pchName;
+    /** The length of the segment name. */
+    uint32_t        cchName;
+    /** The flat selector to use for the segment (i.e. data/code).
+     * Primarily a way for the user to specify selectors for the LX/LE and NE interpreters. */
+    uint16_t        SelFlat;
+    /** The 16-bit selector to use for the segment.
+     * Primarily a way for the user to specify selectors for the LX/LE and NE interpreters. */
+    uint16_t        Sel16bit;
+    /** Segment flags. */
+    uint32_t        fFlags;
+    /** The segment protection (RTMEM_PROT_XXX). */
+    uint32_t        fProt;
+    /** The size of the segment. */
+    RTLDRADDR       cb;
+    /** The required segment alignment.
+     * The to 0 if the segment isn't supposed to be mapped. */
+    RTLDRADDR       Alignment;
+    /** The link address.
+     * Set to NIL_RTLDRADDR if the segment isn't supposed to be mapped or if
+     * the image doesn't have link addresses. */
+    RTLDRADDR       LinkAddress;
+    /** File offset of the segment.
+     * Set to -1 if no file backing (like BSS). */
+    RTFOFF          offFile;
+    /** Size of the file bits of the segment.
+     * Set to -1 if no file backing (like BSS). */
+    RTFOFF          cbFile;
+    /** The relative virtual address when mapped.
+     * Set to NIL_RTLDRADDR if the segment isn't supposed to be mapped. */
+    RTLDRADDR       RVA;
+    /** The size of the segment including the alignment gap up to the next segment when mapped.
+     * This is set to NIL_RTLDRADDR if not implemented. */
+    RTLDRADDR       cbMapped;
+} RTLDRSEG;
+/** Pointer to a loader segment. */
+typedef RTLDRSEG *PRTLDRSEG;
+/** Pointer to a read only loader segment. */
+typedef RTLDRSEG const *PCRTLDRSEG;
+
+
+/** @name Segment flags
+ * @{ */
+/** The segment is 16-bit. When not set the default of the target architecture is assumed. */
+#define RTLDRSEG_FLAG_16BIT         UINT32_C(1)
+/** The segment requires a 16-bit selector alias. (OS/2) */
+#define RTLDRSEG_FLAG_OS2_ALIAS16   UINT32_C(2)
+/** Conforming segment (x86 weirdness). (OS/2) */
+#define RTLDRSEG_FLAG_OS2_CONFORM   UINT32_C(4)
+/** IOPL (ring-2) segment. (OS/2) */
+#define RTLDRSEG_FLAG_OS2_IOPL      UINT32_C(8)
+/** @} */
+
+/**
+ * Segment enumerator callback.
+ *
+ * @returns VINF_SUCCESS to continue the enumeration.  Any other status code
+ *          will cause RTLdrEnumSegments to immediately return with that
+ *          status.
+ *
+ * @param   hLdrMod         The module handle.
+ * @param   pSeg            The segment information.
+ * @param   pvUser          The user parameter specified to RTLdrEnumSegments.
+ */
+typedef DECLCALLBACK(int) FNRTLDRENUMSEGS(RTLDRMOD hLdrMod, PCRTLDRSEG pSeg, void *pvUser);
+/** Pointer to a segment enumerator callback. */
+typedef FNRTLDRENUMSEGS *PFNRTLDRENUMSEGS;
+
+/**
+ * Enumerate the debug info contained in the executable image.
+ *
+ * @returns IPRT status code or whatever pfnCallback returns.
+ *
+ * @param   hLdrMod         The module handle.
+ * @param   pfnCallback     The callback function.
+ * @param   pvUser          The user argument.
+ */
+RTDECL(int) RTLdrEnumSegments(RTLDRMOD hLdrMod, PFNRTLDRENUMSEGS pfnCallback, void *pvUser);
+
+
 RT_C_DECLS_END
 

trunk/include/iprt/mangling.h

@@ -552 +552 @@
 # define RTLdrClose                                     RT_MANGLER(RTLdrClose)
 # define RTLdrEnumDbgInfo                               RT_MANGLER(RTLdrEnumDbgInfo)
+# define RTLdrEnumSegments                              RT_MANGLER(RTLdrEnumSegments)
 # define RTLdrEnumSymbols                               RT_MANGLER(RTLdrEnumSymbols)
 # define RTLdrGetBits                                   RT_MANGLER(RTLdrGetBits)