Changeset 3534

Timestamp:

Aug 23, 2007, 2:28:15 AM (18 years ago)

Author:

bird

Message:

hacking

Location:

trunk/kDbg

Files:

• Makefile.kmk (modified) (1 diff)
• kDbgDump.cpp (added)
• kDbgHlp.h (modified) (1 diff)
• kDbgInternal.h (modified) (4 diffs)
• kDbgModPE.cpp (modified) (1 diff)
• kDbgModWinDbgHelp.cpp (modified) (2 diffs)
• kDbgModule.cpp (modified) (4 diffs)

trunk/kDbg/Makefile.kmk

@@ -61 +61 @@
 ## kDbgDump - Test program which dumps whatever is thrown at it.
 ##
-#PROGRAMS += kDbgDump
+PROGRAMS += kDbgDump
 kDbgDump_TEMPLATE = kStuffEXE
 kDbgDump_SOURCES = kDbgDump.cpp
-kDbgDump_LIBS = $(TARGET_kDbgStatic)
+kDbgDump_LIBS = \
+        $(TARGET_kDbgStatic) \
+        $(TARGET_kDbgStatic:kDbgStatic=kLdrStatic)
 
 # Generate the rules

trunk/kDbg/kDbgHlp.h

@@ -278 +278 @@
 #else   /* !KDBG_STRICT */
 # define kDbgAssert(expr)                       do { } while (0)
-# define kDbgAssertReturn(expr, rcRet)          return (rcRet)
+# define kDbgAssertReturn(expr, rcRet)          do { if (!(expr)) return (rcRet); } while (0)
 # define kDbgAssertMsg(expr, msg)               do { } while (0)
-# define kDbgAssertMsgReturn(expr, msg, rcRet)  return (rcRet)
+# define kDbgAssertMsgReturn(expr, msg, rcRet)  do { if (!(expr)) return (rcRet); } while (0)
 #endif  /* !KDBG_STRICT */
 
-#define kDbgAssertPtr(ptr)                      kDbgAssertMsg(VALID_PTR(expr), ("%s = %p\n", #ptr, (ptr)))
-#define kDbgAssertPtrReturn(ptr, rcRet)         kDbgAssertMsgReturn(VALID_PTR(expr), ("%s = %p -> %d\n", #ptr, (ptr), (rcRet)), (rcRet))
+#define kDbgAssertPtr(ptr)                      kDbgAssertMsg(KDBG_VALID_PTR(ptr), ("%s = %p\n", #ptr, (ptr)))
+#define kDbgAssertPtrReturn(ptr, rcRet)         kDbgAssertMsgReturn(KDBG_VALID_PTR(ptr), ("%s = %p -> %d\n", #ptr, (ptr), (rcRet)), (rcRet))
 #define kDbgAssertRC(rc)                        kDbgAssertMsg((rc) == 0, ("%s = %d\n", #rc, (rc)))
 #define kDbgAssertRCReturn(rc, rcRet)           kDbgAssertMsgReturn((rc) == 0, ("%s = %d -> %d\n", #rc, (rc), (rcRet)), (rcRet))

trunk/kDbg/kDbgInternal.h

@@ -43 +43 @@
     const char *pszName;
 
+    /** Pointer to the next debug module readers.
+     * This is only used for dynamically registered readers. */
+    struct KDBGMODOPS  *pNext;
+
+    /**
+     * Tries to open the module.
+     *
+     * @returns 0 on success, KDBG_ERR on failure.
+     * @param   pFile           The file
+     * @param   off             The file offset of the debug info. This is 0 if there isn't
+     *                          any specfic debug info section and the reader should start
+     *                          looking for debug info at the start of the file.
+     * @param   cb              The size of the debug info in the file. INT64_MAX if we don't
+     *                          know or there isn't any particular debug info section in the file.
+     * @param   pLdrMod         The associated loader module. This can be NULL.
+     * @param   ppMod           Where to store the module that's been opened.
+     *
+     * @remark  This is NULL for the builtin readers.
+     */
+    int (*pfnOpen)(PKDBGHLPFILE pFile, int64_t off, int64_t cb, PKLDRMOD pLdrMod, PKDBGMOD pMod);
+
     /**
      * Closes the module.
@@ -58 +79 @@
      * This will be approximated to the nearest symbol if there is no exact match.
      *
-     * @returns IPRT status code.
+     * @returns 0 on success. KLDR_ERR_* on failure.
      * @param   pMod        The module.
      * @param   iSegment    The segment this offset is relative to.
@@ -73 +94 @@
      * This will be approximated to the nearest line number there is no exact match.
      *
-     * @returns IPRT status code.
+     * @returns 0 on success. KLDR_ERR_* on failure.
      * @param   pMod        The module.
      * @param   iSegment    The segment this offset is relative to.
@@ -112 +133 @@
 
 int kdbgModPEOpen(PKDBGHLPFILE pFile, KDBGADDR offHdr, const char *pszModulePath, PKDBGMOD *ppDbgMod);
-int kdbgModWinDbgHelpOpen(PKDBGHLPFILE pFile, KDBGADDR offHdr, const char *pszModulePath, PKDBGMOD *ppDbgMod);
+int kdbgModWinDbgHelpOpen(PKDBGHLPFILE pFile, const char *pszModulePath, PKDBGMOD *ppDbgMod);
 
 #ifdef __cplusplus

trunk/kDbg/kDbgModPE.cpp

@@ -101 +101 @@
 {
     kDbgAssertMsgReturn(uRVA < pModPe->cbImage, ("uRVA=%x, cbImage=%x\n", uRVA, pModPe->cbImage),
-                    KDBG_ERR_INVALID_ADDRESS);
+                        KDBG_ERR_INVALID_ADDRESS);
     for (int32_t iSegment = 0; iSegment < pModPe->cSections; iSegment++)
     {

trunk/kDbg/kDbgModWinDbgHelp.cpp

@@ -431 +431 @@
     if (rc == KDBG_ERR_DBGHLP_VERSION_MISMATCH)
         kDbgAssertMsgFailed(("dbghelp.dll found, but it was ancient! The highest file version found was 0x%08x'%08x.\n"
-                         "This program require a file version of at least 0x00060004'00000000. Please download\n"
-                         "the latest windbg and use the dbghelp.dll from that package. Just put it somewhere in\n"
-                         "the PATH and we'll find it.\n", FileVersionMS, FileVersionLS));
+                             "This program require a file version of at least 0x00060004'00000000. Please download\n"
+                             "the latest windbg and use the dbghelp.dll from that package. Just put it somewhere in\n"
+                             "the PATH and we'll find it.\n", FileVersionMS, FileVersionLS));
     else
         kDbgAssertMsgFailed(("dbghelp.dll was not found! Download the latest windbg and use the dbghelp.dll\n"
-                         "from that package - just put it somewhere in the PATH and we'll find it.\n"));
+                             "from that package - just put it somewhere in the PATH and we'll find it.\n"));
     return rc;
 }
@@ -566 +566 @@
  *
  */
-int kdbgModWinDbgHelpOpen(PKDBGHLPFILE pFile, int64_t offHdr, const char *pszModulePath, PKDBGMOD *ppDbgMod)
+int kdbgModWinDbgHelpOpen(PKDBGHLPFILE pFile, PKDBGMOD *ppDbgMod)
 {
     /*

trunk/kDbg/kDbgModule.cpp

@@ -30 +30 @@
 *******************************************************************************/
 #include "kDbg.h"
+#include "kLdr.h"
 #include "kDbgInternal.h"
 
@@ -35 +36 @@
 #include <kLdrModPE.h>
 
+
+/*******************************************************************************
+*   Global Variables                                                           *
+*******************************************************************************/
+
+
+
+KDBG_DECL(int) kDbgModuleOpenFilePart(PKDBGHLPFILE pFile, int64_t off, int64_t cb, PKDBGMOD *ppDbgMod)
+{
+#if KOS_WINDOWS
+    /*
+     * If we're on Windows, let DbgHelp have a go first.
+     */
+    if (!off)
+    {
+        int rc = kdbgModWinDbgHelpOpen(pFile, ppDbgMod);
+        if (!rc)
+            return 0;
+    }
+#endif
+
+    /*
+     * Probe the file for signatures we recognize.
+     */
+    int64_t offHdr = 0;
+    union
+    {
+        uint32_t    au32[4];
+        uint16_t    au16[8];
+        uint8_t     ab[16];
+        char
+    } Buf;
+    rc = kDbgHlpReadAt(pFile, &Buf, sizeof(Buf), off);
+
+}
+
+
+KDBG_DECL(int) kDbgModuleOpenFile(PKDBGHLPFILE pFile, PKDBGMOD *ppDbgMod)
+{
+    return kDbgModuleOpenFilePart(pFile, 0, INT64_MAX, ppDbgMod);
+}
+
+
+KDBG_DECL(int) kDbgModuleOpenkLdrMod(PKLDRMOD pLdrMod, PKDBGMOD *ppDbgMod)
+{
+    /*
+     * Enumerate the debug info, if nothing found check for a matching .pdb,
+     * .dbg, .sym or .map file.
+     */
+
+}
 
 
@@ -55 +107 @@
 
     /*
-     * The file and try figure out the format.
+     * Open the file and see if we can read it.
      */
     PKDBGHLPFILE pFile;
@@ -61 +113 @@
     if (rc)
         return rc;
-
-    int64_t offHdr = 0;
-    union
-    {
-        uint32_t    au32[4];
-        uint16_t    au16[8];
-        uint8_t     ab[16];
-    } Buf;
-    rc = kDbgHlpRead(pFile, &Buf, sizeof(Buf));
-    if (    !rc
-        &&  Buf.au16[0] == IMAGE_DOS_SIGNATURE)
-    {
-        /* new header? */
-        uint32_t offNewHeader;
-        rc = kDbgHlpReadAt(pFile, KDBG_OFFSETOF(IMAGE_DOS_HEADER, e_lfanew), &offNewHeader, sizeof(offNewHeader));
-        if (!rc && offNewHeader)
+    rc = kDbgModuleOpenFile(pFile, ppDbgMod);
+    if (rc)
+    {
+        kDbgHlpClose(pFile);
+
+        /*
+         * Let kLdr have a shot at it, if it's a binary it may contain
+         * some debug sections or a link to an external debug file.
+         */
+        PKLDRMOD pLdrMod;
+        int rc2 = kLdrModOpen(pszModulePath, *pLdrMod);
+        if (!rc2)
         {
-            offHdr = offNewHeader;
-            rc = kDbgHlpReadAt(pFile, offNewHeader, &Buf, sizeof(Buf));
+            rc = kDbgModuleOpenkLdrMod(pLdrMod, ppDbgMod);
+            if (rc)
+                kLdrModClose(pLdrMod);
         }
     }
-    if (!rc)
-    {
-        if (Buf.au16[0] == IMAGE_DOS_SIGNATURE)
-            rc = KDBG_ERR_FORMAT_NOT_SUPPORTED;
-#ifdef IMAGE_NE_SIGNATURE
-        else if (Buf.au16[0] == IMAGE_NE_SIGNATURE)
-            rc = KDBG_ERR_FORMAT_NOT_SUPPORTED;
-#endif
-#ifdef IMAGE_LX_SIGNATURE
-        else if (Buf.au16[0] == IMAGE_LX_SIGNATURE)
-            rc = KDBG_ERR_FORMAT_NOT_SUPPORTED;
-#endif
-#ifdef IMAGE_LE_SIGNATURE
-        else if (Buf.au16[0] == IMAGE_LE_SIGNATURE)
-            rc = KDBG_ERR_FORMAT_NOT_SUPPORTED;
-#endif
-#ifdef IMAGE_ELF_SIGNATURE
-        else if (Buf.au32[0] == IMAGE_ELF_SIGNATURE)
-            rc = KDBG_ERR_FORMAT_NOT_SUPPORTED;
-#endif
-#ifdef IMAGE_NT_SIGNATURE
-        else if (Buf.au32[0] == IMAGE_NT_SIGNATURE)
-        {
-# ifdef KS_OS_WINDOWS
-            rc = kdbgModWinDbgHelpOpen(pFile, offHdr, pszModulePath, ppDbgMod);
-            if (    rc
-                &&  !kdbgModPEOpen(pFile, offHdr, pszModulePath, ppDbgMod))
-                rc = 0;
-# endif
-            rc = kdbgModPEOpen(pFile, offHdr, pszModulePath, ppDbgMod);
-        }
-#endif
-        /** @todo there are a number of text file formats too which I want to support. */
-        else
-            rc = KDBG_ERR_UNKOWN_FORMAT;
-    }
-
-    if (rc)
-        kDbgHlpClose(pFile);
+
     return rc;
 }