Changeset 38515 in vbox for trunk/src/VBox/Runtime/include/internal

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/include/internal

Files:

• dbgmod.h (modified) (6 diffs)
• ldr.h (modified) (2 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2008-2009 Oracle Corporation
+ * Copyright (C) 2008-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -30 +30 @@
 #include <iprt/types.h>
 #include <iprt/critsect.h>
+#include <iprt/ldr.h> /* for PFNRTLDRENUMDBG */
 #include "internal/magics.h"
 
@@ -50 +51 @@
     /** Magic number (RTDBGMODVTIMG_MAGIC). */
     uint32_t    u32Magic;
-    /** Mask of supported executable image types, see grp_rt_exe_img_type.
-     * Used to speed up the search for a suitable interpreter. */
-    uint32_t    fSupports;
+    /** Reserved. */
+    uint32_t    fReserved;
     /** The name of the interpreter. */
     const char *pszName;
@@ -74 +74 @@
      *
      *                      Upon successful return the method is expected to
-     *                      initialize pDbgOps and pvDbgPriv.
+     *                      initialize pImgOps and pvImgPriv.
      */
     DECLCALLBACKMEMBER(int, pfnTryOpen)(PRTDBGMODINT pMod);
@@ -88 +88 @@
     DECLCALLBACKMEMBER(int, pfnClose)(PRTDBGMODINT pMod);
 
+    /**
+     * Enumerate the debug info contained in the executable image.
+     *
+     * Identical to RTLdrEnumDbgInfo.
+     *
+     * @returns IPRT status code or whatever pfnCallback returns.
+     *
+     * @param   hLdrMod         The module handle.
+     * @param   pvBits          Optional pointer to bits returned by
+     *                          RTLdrGetBits().  This can be used by some module
+     *                          interpreters to reduce memory consumption.
+     * @param   pfnCallback     The callback function.  Ignore the module
+     *                          handle argument!
+     * @param   pvUser          The user argument.
+     */
+    DECLCALLBACKMEMBER(int, pfnEnumDbgInfo)(PRTDBGMODINT pMod, PFNRTLDRENUMDBG pfnCallback, void *pvUser);
+
+    /** For catching initialization errors (RTDBGMODVTIMG_MAGIC). */
+    uint32_t    u32EndMagic;
 } RTDBGMODVTIMG;
 /** Pointer to a const RTDBGMODVTIMG. */
@@ -400 +419 @@
 
 extern DECLHIDDEN(RTSTRCACHE)           g_hDbgModStrCache;
+extern DECLHIDDEN(RTDBGMODVTDBG const)  g_rtDbgModVtDbgDwarf;
 extern DECLHIDDEN(RTDBGMODVTDBG const)  g_rtDbgModVtDbgNm;
+extern DECLHIDDEN(RTDBGMODVTIMG const)  g_rtDbgModVtImgLdr;
 
 int rtDbgModContainerCreate(PRTDBGMODINT pMod, RTUINTPTR cbSeg);

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

@@ -162 +162 @@
      * @param   pvBits      Pointer to the bits returned by RTLDROPS::pfnGetBits(), optional.
      * @param   BaseAddress The image base addressto use when calculating the symbol values.
-     * @param   pfnCallback The callback function which each symbol is to be feeded to.
+     * @param   pfnCallback The callback function which each symbol is to be
+     *                      fed to.
      * @param   pvUser      User argument to pass to the enumerator.
      * @remark  This is an optional entry point.
@@ -225 +226 @@
     DECLCALLBACKMEMBER(int, pfnGetSymbolEx)(PRTLDRMODINTERNAL pMod, const void *pvBits, RTUINTPTR BaseAddress, const char *pszSymbol, RTUINTPTR *pValue);
 
+    /**
+     * Enumerates the debug info contained in the module.
+     *
+     * @returns iprt status code, which might have been returned by pfnCallback.
+     * @param   pMod        Pointer to the loader module structure.
+     * @param   pvBits      Pointer to the bits returned by RTLDROPS::pfnGetBits(), optional.
+     * @param   pfnCallback The callback function which each debug info part is
+     *                      to be fed to.
+     * @param   pvUser      User argument to pass to the enumerator.
+     * @remark  This is an optional entry point that can be NULL.
+     */
+    DECLCALLBACKMEMBER(int, pfnEnumDbgInfo)(PRTLDRMODINTERNAL pMod, const void *pvBits,
+                                            PFNRTLDRENUMDBG pfnCallback, void *pvUser);
+
+
     /** Dummy entry to make sure we've initialized it all. */
     RTUINT uDummy;