Changeset 3534 for trunk/kDbg/kDbgModule.cpp

Timestamp:

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

Author:

bird

Message:

hacking

File:

• trunk/kDbg/kDbgModule.cpp (modified) (4 diffs)

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;
 }