Changeset 41 in kStuff

Timestamp:

Aug 24, 2011 2:35:57 PM (14 years ago)

Author:

bird

Message:

Debug info enumration adjustments. Working on MH_DSYM support.

Location:

trunk

Files:

• include/k/kLdr.h (modified) (3 diffs)
• kLdr/kLdrMod.c (modified) (1 diff)
• kLdr/kLdrModMachO.c (modified) (12 diffs)
• kLdr/kLdrModPE.c (modified) (1 diff)

trunk/include/k/kLdr.h

@@ -337 +337 @@
     /** Core or dump. */
     KLDRTYPE_CORE,
+    /** Debug module (debug info with empty code & data segments). */
+    KLDRTYPE_DEBUG_INFO,
     /** The end of the valid types values (exclusive). */
     KLDRTYPE_END,
@@ -523 +525 @@
  * @param   iMajorVer   The major version number of the debug info format. -1 if unknow - implies invalid iMinorVer.
  * @param   iMinorVer   The minor version number of the debug info format. -1 when iMajorVer is -1.
+ * @param   pszPartNm   The name of the debug info part, NULL if not applicable.
  * @param   offFile     The file offset *if* this type has one specific location in the executable image file.
  *                      This is -1 if there isn't any specific file location.
@@ -532 +535 @@
  */
 typedef int FNKLDRENUMDBG(PKLDRMOD pMod, KU32 iDbgInfo, KLDRDBGINFOTYPE enmType, KI16 iMajorVer, KI16 iMinorVer,
-                          KLDRFOFF offFile, KLDRADDR LinkAddress, KLDRSIZE cb, const char *pszExtFile, void *pvUser);
+                          const char *pszPartNm, KLDRFOFF offFile, KLDRADDR LinkAddress, KLDRSIZE cb,
+                          const char *pszExtFile, void *pvUser);
 /** Pointer to a debug info enumerator callback. */
 typedef FNKLDRENUMDBG *PFNKLDRENUMDBG;

trunk/kLdr/kLdrMod.c

@@ -311 +311 @@
             return rc;
         if (    u.u16 == IMAGE_DOS_SIGNATURE
-            &&  kRdrSize(pRdr) > sizeof(IMAGE_DOS_HEADER))
+            &&  kRdrSize(pRdr) > (KFOFF)sizeof(IMAGE_DOS_HEADER))
         {
             rc = kRdrRead(pRdr, &u, sizeof(u.u32), K_OFFSETOF(IMAGE_DOS_HEADER, e_lfanew));

trunk/kLdr/kLdrModMachO.c

@@ -330 +330 @@
             return KLDR_ERR_MACHO_UNSUPPORTED_MACHINE;
     }
-    if (s.Hdr32.filetype != MH_OBJECT)
+    if (   s.Hdr32.filetype != MH_OBJECT
+        && s.Hdr32.filetype != MH_EXECUTE
+        && s.Hdr32.filetype != MH_DYLIB
+        && s.Hdr32.filetype != MH_DSYM)
         return KLDR_ERR_MACHO_UNSUPPORTED_FILE_TYPE;
 
@@ -432 +435 @@
     switch (s.Hdr32.filetype)
     {
-        case MH_OBJECT:
-            pMod->enmType = KLDRTYPE_OBJECT;
-            break;
+        case MH_OBJECT:     pMod->enmType = KLDRTYPE_OBJECT; break;
+        case MH_EXECUTE:    pMod->enmType = KLDRTYPE_EXECUTABLE_FIXED; break;
+        case MH_DYLIB:      pMod->enmType = KLDRTYPE_SHARED_LIBRARY_RELOCATABLE; break;
+        case MH_DSYM:       pMod->enmType = KLDRTYPE_DEBUG_INFO; break;
         default:
             return KLDR_ERR_MACHO_UNSUPPORTED_FILE_TYPE;
@@ -677 +681 @@
                     {
                         case MH_OBJECT:
+                        case MH_EXECUTE:
+                        case MH_DYLIB:
+                        case MH_DSYM:
                         {
                             cSections++;
@@ -852 +859 @@
                     {
                         case MH_OBJECT:
+                        case MH_EXECUTE:
+                        case MH_DYLIB:
+                        case MH_DSYM:
                         {
                             cSections++;
@@ -1000 +1010 @@
     {
         case MH_OBJECT:
+        case MH_EXECUTE:
+        case MH_DYLIB:
+        case MH_DSYM:
             if (!cSegments)
                 return KLDR_ERR_MACHO_BAD_OBJECT_FILE;
@@ -1073 +1086 @@
                     {
                         case MH_OBJECT:
+                        case MH_EXECUTE:
+                        case MH_DYLIB:
+                        case MH_DSYM:
                         {
                             /* Section data extract. */
@@ -1204 +1220 @@
                     {
                         case MH_OBJECT:
+                        case MH_EXECUTE:
+                        case MH_DYLIB:
+                        case MH_DSYM:
                         {
                             /* Section data extract. */
@@ -1321 +1340 @@
                 {
                     case MH_OBJECT:
+                    case MH_EXECUTE:
+                    case MH_DYLIB: /** @todo ??? */
+                    case MH_DSYM:
                         pModMachO->offSymbols = u.pSymTab->symoff + pModMachO->offImage;
                         pModMachO->cSymbols = u.pSymTab->nsyms;
@@ -1396 +1418 @@
     {
         case MH_OBJECT:
+        case MH_EXECUTE:
+        case MH_DYLIB: /** @todo dylib */
+        case MH_DSYM:
         {
             KLDRADDR cb1;
@@ -1505 +1530 @@
      * Take action according to file type.
      */
-    if (pModMachO->Hdr.filetype == MH_OBJECT)
+    if (   pModMachO->Hdr.filetype == MH_OBJECT
+        || pModMachO->Hdr.filetype == MH_EXECUTE /** @todo dylib, execute, dsym: symbols */
+        || pModMachO->Hdr.filetype == MH_DYLIB
+        || pModMachO->Hdr.filetype == MH_DSYM)
     {
         rc = kldrModMachOLoadObjSymTab(pModMachO);
@@ -1797 +1825 @@
      * Take action according to file type.
      */
-    if (pModMachO->Hdr.filetype == MH_OBJECT)
+    if (   pModMachO->Hdr.filetype == MH_OBJECT
+        || pModMachO->Hdr.filetype == MH_EXECUTE /** @todo dylib, execute, dsym: symbols */
+        || pModMachO->Hdr.filetype == MH_DYLIB
+        || pModMachO->Hdr.filetype == MH_DSYM)
     {
         rc = kldrModMachOLoadObjSymTab(pModMachO);
@@ -2110 +2141 @@
 static int kldrModMachOEnumDbgInfo(PKLDRMOD pMod, const void *pvBits, PFNKLDRENUMDBG pfnCallback, void *pvUser)
 {
-#if 0
-    PKLDRMODMACHO                      pModMachO = (PKLDRMODMACHO)pMod->pvData;
-    const IMAGE_DEBUG_DIRECTORY    *pDbgDir;
-    KU32                            iDbgInfo;
-    KU32                            cb;
-    int                             rc;
-
-    /*
-     * Check that there is a debug directory first.
-     */
-    cb = pModMachO->Hdrs.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DEBUG].Size;
-    if (    cb < sizeof(IMAGE_DEBUG_DIRECTORY) /* screw borland linkers */
-        ||  !pModMachO->Hdrs.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress)
-        return 0;
-
-    /*
-     * Make sure we've got mapped bits.
-     */
-    rc = kldrModMachOBitsAndBaseAddress(pModMachO, &pvBits, NULL);
-    if (rc)
-        return rc;
-
-    /*
-     * Enumerate the debug directory.
-     */
-    pDbgDir = KLDRMODMACHO_RVA2TYPE(pvBits,
-                                 pModMachO->Hdrs.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DEBUG].VirtualAddress,
-                                 const IMAGE_DEBUG_DIRECTORY *);
-    for (iDbgInfo = 0;; iDbgInfo++, pDbgDir++, cb -= sizeof(IMAGE_DEBUG_DIRECTORY))
-    {
-        KLDRDBGINFOTYPE     enmDbgInfoType;
-
-        /* convert the type. */
-        switch (pDbgDir->Type)
-        {
-            case IMAGE_DEBUG_TYPE_UNKNOWN:
-            case IMAGE_DEBUG_TYPE_FPO:
-            case IMAGE_DEBUG_TYPE_COFF: /*stabs dialect??*/
-            case IMAGE_DEBUG_TYPE_MISC:
-            case IMAGE_DEBUG_TYPE_EXCEPTION:
-            case IMAGE_DEBUG_TYPE_FIXUP:
-            case IMAGE_DEBUG_TYPE_BORLAND:
-            default:
-                enmDbgInfoType = KLDRDBGINFOTYPE_UNKNOWN;
-                break;
-            case IMAGE_DEBUG_TYPE_CODEVIEW:
-                enmDbgInfoType = KLDRDBGINFOTYPE_CODEVIEW;
-                break;
-        }
-
-        rc = pfnCallback(pMod, iDbgInfo,
-                         enmDbgInfoType, pDbgDir->MajorVersion, pDbgDir->MinorVersion,
-                         pDbgDir->PointerToRawData ? pDbgDir->PointerToRawData : -1,
-                         pDbgDir->AddressOfRawData ? pDbgDir->AddressOfRawData : NIL_KLDRADDR,
-                         pDbgDir->SizeOfData,
-                         NULL,
-                         pvUser);
-        if (rc)
+    PKLDRMODMACHO pModMachO = (PKLDRMODMACHO)pMod->pvData;
+    int rc = 0;
+    KU32 iSect;
+
+    for (iSect = 0; iSect < pModMachO->cSections; iSect++)
+    {
+        section_32_t *pMachOSect = pModMachO->paSections[iSect].pvMachoSection; /* (32-bit & 64-bit starts the same way) */
+        if (kHlpStrComp(pMachOSect->segname, "DWARF"))
+            continue;
+
+        rc = pfnCallback(pMod, iSect, KLDRDBGINFOTYPE_DWARF, 0, 0, pMachOSect->sectname,
+                         pModMachO->paSections[iSect].offFile,
+                         pModMachO->paSections[iSect].LinkAddress,
+                         pModMachO->paSections[iSect].cb,
+                         NULL, pvUser);
+        if (rc != 0)
             break;
-
-        /* next */
-        if (cb <= sizeof(IMAGE_DEBUG_DIRECTORY))
-            break;
     }
 
     return rc;
-#else
-    return 0;
-#endif
 }
 

trunk/kLdr/kLdrModPE.c

@@ -1193 +1193 @@
 
         rc = pfnCallback(pMod, iDbgInfo,
-                         enmDbgInfoType, pDbgDir->MajorVersion, pDbgDir->MinorVersion,
+                         enmDbgInfoType, pDbgDir->MajorVersion, pDbgDir->MinorVersion, NULL,
                          pDbgDir->PointerToRawData ? (KLDRFOFF)pDbgDir->PointerToRawData : -1,
                          pDbgDir->AddressOfRawData ? pDbgDir->AddressOfRawData : NIL_KLDRADDR,