Changeset 63

Timestamp:

Oct 30, 2013, 3:00:14 AM (12 years ago)

Author:

bird

Message:

kLdrModMachO.c: Workaround for misaligned TEXT.unwind_info found once in VirtualBox.dylib (Xcode 3.2.6, I think). DYLIB debug info loading adjustments.

Location:

trunk

Files:

• include/k/kLdrFmts/mach-o.h (modified) (1 diff)
• kLdr/kLdrModMachO.c (modified) (4 diffs)

trunk/include/k/kLdrFmts/mach-o.h

@@ -500 +500 @@
  */
 /** Section type mask. */
-#define SECTION_TYPE                KU32_C(0x000000ff)
+#define SECTION_TYPE                    KU32_C(0x000000ff)
 /** Regular section. */
-#define S_REGULAR                   0x0
+#define S_REGULAR                       0x00
 /** Zero filled section. */
-#define S_ZEROFILL                  0x1
+#define S_ZEROFILL                      0x01
 /** C literals. */
-#define S_CSTRING_LITERALS          0x2
+#define S_CSTRING_LITERALS              0x02
 /** 4 byte literals. */
-#define S_4BYTE_LITERALS            0x3
+#define S_4BYTE_LITERALS                0x03
 /** 8 byte literals. */
-#define S_8BYTE_LITERALS            0x4
+#define S_8BYTE_LITERALS                0x04
 /** Pointer to literals. */
-#define S_LITERAL_POINTERS          0x5
+#define S_LITERAL_POINTERS              0x05
 /** Section containing non-lazy symbol pointers.
  * Reserved1 == start index in the indirect symbol table. */
-#define S_NON_LAZY_SYMBOL_POINTERS  0x6
+#define S_NON_LAZY_SYMBOL_POINTERS      0x06
 /** Section containing lazy symbol pointers.
  * Reserved1 == start index in the indirect symbol table. */
-#define S_LAZY_SYMBOL_POINTERS      0x7
+#define S_LAZY_SYMBOL_POINTERS          0x07
 /** Section containing symbol stubs.
  * Reserved2 == stub size. */
-#define S_SYMBOL_STUBS              0x8
+#define S_SYMBOL_STUBS                  0x08
 /** Section containing function pointers for module initialization. . */
-#define S_MOD_INIT_FUNC_POINTERS    0x9
+#define S_MOD_INIT_FUNC_POINTERS        0x09
 /** Section containing function pointers for module termination. . */
-#define S_MOD_TERM_FUNC_POINTERS    0xa
+#define S_MOD_TERM_FUNC_POINTERS        0x0a
 /** Section containing symbols that are to be coalesced. */
-#define S_COALESCED                 0xb
+#define S_COALESCED                     0x0b
 /** Zero filled section that be larger than 4GB. */
-#define S_GB_ZEROFILL               0xc
+#define S_GB_ZEROFILL                   0x0c
 /** Section containing pairs of function pointers for interposing. */
-#define S_INTERPOSING               0xd
+#define S_INTERPOSING                   0x0d
 /** 16 byte literals. */
-#define S_16BYTE_LITERALS           0xe
+#define S_16BYTE_LITERALS               0x0e
+/** DTrace byte code / definitions (DOF = DTrace object format). */
+#define S_DTRACE_DOF                    0x0f
+/** Section containing pointers to symbols in lazily loaded dylibs. */
+#define S_LAZY_DYLIB_SYMBOL_POINTERS    0x10
 
 /** Section attribute mask. */

trunk/kLdr/kLdrModMachO.c

@@ -739 +739 @@
                             case S_NON_LAZY_SYMBOL_POINTERS: \
                             case S_LAZY_SYMBOL_POINTERS: \
+                            case S_LAZY_DYLIB_SYMBOL_POINTERS: \
                                 /* (reserved 1 = is indirect symbol table index) */ \
                                 KLDRMODMACHO_CHECK_RETURN(!pSect->reserved2, KLDR_ERR_MACHO_BAD_SECTION); \
@@ -759 +760 @@
                             \
                             case S_LITERAL_POINTERS: \
+                            case S_DTRACE_DOF: \
+                                KLDRMODMACHO_CHECK_RETURN(!pSect->reserved1, KLDR_ERR_MACHO_BAD_SECTION); \
+                                KLDRMODMACHO_CHECK_RETURN(!pSect->reserved2, KLDR_ERR_MACHO_BAD_SECTION); \
+                                fFileBits = 1; \
+                                break; \
+                            \
                             case S_INTERPOSING: \
                             case S_GB_ZEROFILL: \
@@ -780 +787 @@
                         KLDRMODMACHO_CHECK_RETURN(pSect->align < 31, \
                                                   KLDR_ERR_MACHO_BAD_SECTION); \
+                        /* Workaround for buggy ld64 (or as, llvm, ++) that produces a misaligned __TEXT.__unwind_info. */ \
+                        /* Seen: pSect->align = 4, pSect->addr = 0x5ebe14.  Just adjust the alignment down. */ \
+                        if (   ((K_BIT32(pSect->align) - KU32_C(1)) & pSect->addr) \
+                            && pSect->align == 4 \
+                            && kHlpStrComp(pSect->sectname, "__unwind_info") == 0) \
+                            pSect->align = 2; \
                         KLDRMODMACHO_CHECK_RETURN(!((K_BIT32(pSect->align) - KU32_C(1)) & pSect->addr), \
                                                   KLDR_ERR_MACHO_BAD_SECTION); \
@@ -1025 +1038 @@
                 if (!(fOpenFlags & KLDRMOD_OPEN_FLAGS_FOR_INFO))
                     KLDRMODMACHO_FAILED_RETURN(KLDR_ERR_MACHO_UNSUPPORTED_LOAD_COMMAND);
+                *pfCanLoad = K_FALSE;
                 break;