Changeset 2964

Timestamp:

Feb 13, 2007, 11:40:35 AM (18 years ago)

Author:

bird

Message:

literals and ignore weaks.

Location:

trunk/kLdr

Files:

• kLdr.h (modified) (2 diffs)
• kLdrModMachO.c (modified) (5 diffs)

trunk/kLdr/kLdr.h

@@ -636 +636 @@
 #if !defined(KLDR_LITTLE_ENDIAN) && !defined(KLDR_BIG_ENDIAN)
 # define KLDR_LITTLE_ENDIAN
-#endif 
+#endif
 #ifdef __DOXYGEN__
 # define KLDR_BIG_ENDIAN
-#endif 
+#endif
 
 
@@ -1376 +1376 @@
 /** Bad symbol table entry. */
 #define KLDR_ERR_MACHO_BAD_SYMBOL                           (KLDR_ERR_MACHO_BASE + 14)
+/** Unsupported fixup type. */
+#define KLDR_ERR_MACHO_UNSUPPORTED_FIXUP_TYPE               (KLDR_ERR_MACHO_BASE + 15)
 /** @} */
 
 /** End of the valid kLdr status codes. */
-#define KLDR_ERR_END                                        (KLDR_ERR_MACHO_BASE + 15)
+#define KLDR_ERR_END                                        (KLDR_ERR_MACHO_BASE + 16)
 
 const char *kLdrErrStr(int rc);

trunk/kLdr/kLdrModMachO.c

@@ -557 +557 @@
                         case S_CSTRING_LITERALS:
                         case S_COALESCED:
+                        case S_4BYTE_LITERALS:
+                        case S_8BYTE_LITERALS:
+                        case S_16BYTE_LITERALS:
                             if (pSect->reserved1 || pSect->reserved2)
                                 return KLDR_ERR_MACHO_BAD_SECTION;
@@ -567 +570 @@
                         case S_NON_LAZY_SYMBOL_POINTERS:
                         case S_LAZY_SYMBOL_POINTERS:
-                        case S_4BYTE_LITERALS:
-                        case S_8BYTE_LITERALS:
-                        case S_16BYTE_LITERALS:
                         case S_SYMBOL_STUBS:
                         case S_MOD_INIT_FUNC_POINTERS:
@@ -1767 +1767 @@
             }
             else if (paSyms[iSym].n_desc & N_WEAK_DEF)
-                return KLDR_ERR_TODO; /** @todo implement weak symbols. */
+            {
+                /** @todo implement weak symbols. */
+                /*return KLDR_ERR_TODO; - ignored for now. */
+            }
         }
     }
@@ -1815 +1818 @@
             }
             else if (paSyms[iSym].n_desc & N_WEAK_DEF)
-                return KLDR_ERR_TODO; /** @todo implement weak symbols. */
+            {
+                /** @todo implement weak symbols. */
+                /*return KLDR_ERR_TODO; - ignored for now. */
+            }
         }
     }
@@ -2078 +2084 @@
         }
         else if (Fixup.r.r_type <= GENERIC_RELOC_LOCAL_SECTDIFF)
-            return KLDR_ERR_TODO;
+            return KLDR_ERR_MACHO_UNSUPPORTED_FIXUP_TYPE;
         else
             return KLDR_ERR_BAD_FIXUP;