Changeset 2963 for trunk/kLdr/kLdrModMachO.h

Timestamp:

Feb 13, 2007, 9:40:28 AM (19 years ago)

Author:

bird

Message:

Implemented generic fixups for 32-bit symbol tables.

File:

• trunk/kLdr/kLdrModMachO.h (modified) (13 diffs)

trunk/kLdr/kLdrModMachO.h

@@ -641 +641 @@
 /**
  * The 32-bit Mach-O version of the nlist structure.
- * 
- * This differs from the a.out nlist struct in that the unused n_other field 
+ *
+ * This differs from the a.out nlist struct in that the unused n_other field
  * was renamed to n_sect and used for keeping the relevant section number.
  * @remark  This structure is not name mach_nlist_32 in the Apple headers, but nlist.
@@ -648 +648 @@
 typedef struct macho_nlist_32
 {
-    union 
+    union
     {
         int32_t n_strx;         /**< Offset (index) into the string table. 0 means "". */
@@ -665 +665 @@
 typedef struct macho_nlist_64
 {
-    union 
+    union
     {
         uint32_t n_strx;        /**< Offset (index) into the string table. 0 means "". */
@@ -676 +676 @@
 
 
-/** @name Symbol Type Constants (macho_nlist_32_t::n_type, macho_nlist_64_t::n_type) 
- * 
+/** @name Symbol Type Constants (macho_nlist_32_t::n_type, macho_nlist_64_t::n_type)
+ *
  * In the Mach-O world n_type is somewhat similar to a.out, meaning N_EXT, N_UNDF, N_ABS
  * and the debug symbols are essentially the same, but the remaining stuff is different.
- * The main reason for this is that the encoding of section has been moved to n_sect 
- * to permit up to 255 sections instead of the fixed 3 a.out sections (not counting 
+ * The main reason for this is that the encoding of section has been moved to n_sect
+ * to permit up to 255 sections instead of the fixed 3 a.out sections (not counting
  * the abs symbols and set vectors).
- * 
- * To avoid confusion with a.out the Mach-O constants has been fitted with a MACHO_ 
+ *
+ * To avoid confusion with a.out the Mach-O constants has been fitted with a MACHO_
  * prefix here.
- * 
- * Common symbols (aka communal symbols and comdefs) are represented by 
- * n_type = MACHO_N_EXT | MACHO_N_UNDF, n_sect = NO_SECT and n_value giving 
+ *
+ * Common symbols (aka communal symbols and comdefs) are represented by
+ * n_type = MACHO_N_EXT | MACHO_N_UNDF, n_sect = NO_SECT and n_value giving
  * the size.
- * 
- * 
+ *
+ *
  * Symbol table entries can be inserted directly in the assembly code using
  * this notation:
@@ -697 +697 @@
  *      .stabs "n_name", n_type, n_sect, n_desc, n_value
  * @endcode
- * 
+ *
  * (1) The line number is optional, GCC doesn't set it.
  * (2) The type is optional, GCC doesn't set it.
@@ -729 +729 @@
 #define MACHO_N_PC      UINT8_C(0x30)   /**< Global pascal symbol.  "name",, NO_SECT, subtype?, line (3) */
     /* omits N_NSYMS, N_NOMAP and N_OBJ. */
-#define MACHO_N_OPT     UINT8_C(0x3c)   /**< Options for the debugger related to the language of the 
+#define MACHO_N_OPT     UINT8_C(0x3c)   /**< Options for the debugger related to the language of the
                                              source file.           "options?",,,, */
 #define MACHO_N_RSYM    UINT8_C(0x40)   /**< Register variable.     "name",, NO_SECT, type, register */
@@ -758 +758 @@
 #define MACHO_N_ECOMM   UINT8_C(0xe4)   /**< End common.            "name",, section, 0, 0 */
 #define MACHO_N_ECOML   UINT8_C(0xe8)   /**< End local common.           0,, section, 0, address */
-#define MACHO_N_LENG    UINT8_C(0xfe)   /**< Length-value of the preceding entry. 
+#define MACHO_N_LENG    UINT8_C(0xfe)   /**< Length-value of the preceding entry.
                                                                     "name",, NO_SECT, 0, length */
 
 /** @} */
 
-/** @name Symbol Description Bits (macho_nlist_32_t::n_desc, macho_nlist_64_t::n_desc) 
- * 
- * Mach-O puts the n_desc field to a number of uses, like lazy binding , library 
+/** @name Symbol Description Bits (macho_nlist_32_t::n_desc, macho_nlist_64_t::n_desc)
+ *
+ * Mach-O puts the n_desc field to a number of uses, like lazy binding , library
  * ordinal numbers for -twolevel_namespace, stripping and weak symbol handling.
- * 
- * @remark The REFERENCE_FLAGS_* are really not flags in the normal sense (bit), 
+ *
+ * @remark The REFERENCE_FLAGS_* are really not flags in the normal sense (bit),
  *         they are more like enum values.
  * @{
@@ -802 +802 @@
 /** Weak external symbol. Symbol can be missing, in which case it's will have the value 0. */
 #define N_WEAK_REF                      UINT16_C(0x0040)
-/** Weak symbol definition. The symbol can be overridden by another weak 
- * symbol already present or by a non-weak (strong) symbol definition. 
- * Currently only supported for coalesed symbols. 
+/** Weak symbol definition. The symbol can be overridden by another weak
+ * symbol already present or by a non-weak (strong) symbol definition.
+ * Currently only supported for coalesed symbols.
  * @remark This bit means something differently for undefined symbols, see N_REF_TO_WEAK.
  */
@@ -822 +822 @@
 /**
  * Relocation entry.
- * 
- * Differs from a.out in the meaning of r_symbolnum when r_extern=0 and 
- * that r_pad is made into r_type. 
- * 
+ *
+ * Differs from a.out in the meaning of r_symbolnum when r_extern=0 and
+ * that r_pad is made into r_type.
+ *
  * @remark  This structure and type has been prefixed with macho_ to avoid
  *          confusion with the original a.out type.
  */
-typedef struct macho_relocation_info 
-{
-    int32_t     r_address;          /**< Section relative address of the fixup. 
-                                         The top bit (signed) indicates that this is a scattered 
+typedef struct macho_relocation_info
+{
+    int32_t     r_address;          /**< Section relative address of the fixup.
+                                         The top bit (signed) indicates that this is a scattered
                                          relocation if set, see scattered_relocation_info_t. */
     uint32_t    r_symbolnum : 24,   /**< r_extern=1: Symbol table index, relocate with the address of this symbol.
@@ -845 +845 @@
 #define R_ABS           0
 
-/** Flag in r_address indicating that the relocation is of the 
+/** Flag in r_address indicating that the relocation is of the
  * scattered_relocation_info_t kind and not macho_relocation_info_t. */
 #define R_SCATTERED     UINT32_C(0x80000000)
@@ -851 +851 @@
 /**
  * Scattered relocation.
- * 
- * This is a hack mainly for RISC machines which restricts section size 
+ *
+ * This is a hack mainly for RISC machines which restricts section size
  * to 16MB among other things.
- * 
+ *
  * The reason for the big/little endian differences here is of course because
- * of the R_SCATTERED mask and the way bitfields are implemented by the 
+ * of the R_SCATTERED mask and the way bitfields are implemented by the
  * C/C++ compilers.
  */
@@ -876 +876 @@
 # error "Neither KLDR_LITTLE_ENDIAN nor KLDR_BIG_ENDIAN is defined!"
 #endif
-    int32_t     r_value;            /**< The value the fixup is refering to (Without offset added). */
+    int32_t     r_value;            /**< The value the fixup is refering to (without offset added). */
 } scattered_relocation_info_t;
 
@@ -884 +884 @@
 typedef enum reloc_type_generic
 {
-    GENERIC_RELOC_VANILLA = 0,      /**< Standard relocation. */ 
+    GENERIC_RELOC_VANILLA = 0,      /**< Standard relocation. */
     GENERIC_RELOC_PAIR,             /**< Follows GENERIC_RELOC_SECTDIFF. */
     GENERIC_RELOC_SECTDIFF,         /**< ??? */