Changeset 2958 for trunk

Timestamp:

Feb 9, 2007, 6:12:22 AM (19 years ago)

Author:

bird

Message:

Relocations (generic only - x86 is generic).

Location:

trunk/kLdr

Files:

• kLdr.h (modified) (1 diff)
• kLdrHlp.h (modified) (3 diffs)
• kLdrModMachO.h (modified) (4 diffs)

trunk/kLdr/kLdr.h

@@ -541 +541 @@
     KLDRENDIAN_32BIT_HACK = 0x7fffffff
 } KLDRENDIAN;
+
+
+/** @def KLDR_LITTLE_ENDIAN
+ * The kLdr build is for a little endian target. */
+/** @def KLDR_BIG_ENDIAN
+ * The kLdr build is for a big endian target. */
+#if !defined(KLDR_LITTLE_ENDIAN) && !defined(KLDR_BIG_ENDIAN)
+# define KLDR_LITTLE_ENDIAN
+#endif 
+#ifdef __DOXYGEN__
+# define KLDR_BIG_ENDIAN
+#endif 
 
 

trunk/kLdr/kLdrHlp.h

@@ -86 +86 @@
 /** @def KLDRHLP_BE2H_U64
  * Unsigned 64-bit big-endian to host endian. */
-#if 1
+#ifdef KLDR_LITTLE_ENDIAN
 # define KLDRHLP_LE2H_U16(u16)  ((uint16_t)(u16))
 # define KLDRHLP_LE2H_U32(u32)  ((uint32_t)(u32))
@@ -93 +93 @@
 # define KLDRHLP_BE2H_U32(u32)  KLDRHLP_E2E_U32(u32)
 # define KLDRHLP_BE2H_U64(u64)  KLDRHLP_E2E_U64(u64)
-#else
+#elif defined(KLDR_BIG_ENDIAN)
 # define KLDRHLP_LE2H_U16(u16)  KLDRHLP_E2E_U16(u16)
 # define KLDRHLP_LE2H_U32(u32)  KLDRHLP_E2E_U32(u32)
@@ -100 +100 @@
 # define KLDRHLP_BE2H_U32(u32)  ((uint32_t)(u32))
 # define KLDRHLP_BE2H_U64(u64)  ((uint32_t)(u32))
+#else
+# error "KLDR_BIG_ENDIAN or KLDR_LITTLE_ENDIAN is supposed to be defined."
 #endif
 

trunk/kLdr/kLdrModMachO.h

@@ -6 +6 @@
 #ifndef __kLdrModMachO_h__
 #define __kLdrModMachO_h__
+
+/** @defgroup grp_mach_o    The Mach-O Structures, Types, and Defines.
+ * @{
+ */
 
 
@@ -273 +277 @@
 /** @} */
 
+
+
+/** @defgroup grp_macho_o_lc        Load Commands
+ * @{ */
 
 /**
@@ -624 +632 @@
 /** @todo fvmfile_command (LC_FVMFILE) */
 
-
-
-
-
+/** @} */
+
+
+
+/** @defgroup grp_macho_o_syms  Symbol Table
+ * @{ */
 
 /**
@@ -804 +814 @@
 /** @} */
 
+/** @} */
+
+
+/** @defgroup grp_macho_o_relocs    Relocations
+ * @{ */
+
+/**
+ * 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. 
+ * 
+ * @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 
+                                         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.
+                                         r_extern=0: Section ordinal, relocate with the address of this section. */
+                r_pcrel : 1,        /**< PC (program counter) relative fixup; subtract the fixup address. */
+                r_length : 2,       /**< Fixup length: 0=uint8_t, 1=uint16_t, 2=uint32_t, 3=uint64_t. */
+                r_extern : 1,       /**< External or internal fixup, decides the r_symbolnum interpretation.. */
+                r_type : 4;         /**< Relocation type; 0 is standard, non-zero are machine specific. */
+} macho_relocation_info_t;
+
+/** Special section ordinal value for absolute relocations. */
+#define R_ABS           0
+
+/** 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)
+
+/**
+ * Scattered relocation.
+ * 
+ * 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 
+ * C/C++ compilers.
+ */
+typedef struct scattered_relocation_info
+{
+#ifdef KLDR_LITTLE_ENDIAN
+    uint32_t    r_address : 24,     /**< Section relative address of the fixup. (macho_relocation_info_t::r_address) */
+                r_type : 4,         /**< Relocation type; 0 is standard, non-zero are machine specific. (macho_relocation_info_t::r_type) */
+                r_length : 2,       /**< Fixup length: 0=uint8_t, 1=uint16_t, 2=uint32_t, 3=uint64_t. (macho_relocation_info_t::r_length) */
+                r_pcrel : 1,        /**< PC (program counter) relative fixup; subtract the fixup address. (macho_relocation_info_t::r_pcrel) */
+                r_scattered : 1;    /**< Set if scattered relocation, clear if normal relocation. */
+#elif defined(KLDR_BIG_ENDIAN)
+    uint32_t    r_scattered : 1,    /**< Set if scattered relocation, clear if normal relocation. */
+                r_pcrel : 1,        /**< PC (program counter) relative fixup; subtract the fixup address. (macho_relocation_info_t::r_pcrel) */
+                r_length : 2,       /**< Fixup length: 0=uint8_t, 1=uint16_t, 2=uint32_t, 3=uint64_t. (macho_relocation_info_t::r_length) */
+                r_type : 4,         /**< Relocation type; 0 is standard, non-zero are machine specific. (macho_relocation_info_t::r_type) */
+                r_address : 24;     /**< Section relative address of the fixup. (macho_relocation_info_t::r_address) */
+#else
+# 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). */
+} scattered_relocation_info_t;
+
+/**
+ * Relocation type values for a generic implementation (for r_type).
+ */
+typedef enum reloc_type_generic
+{
+    GENERIC_RELOC_VANILLA = 0,      /**< Standard relocation. */ 
+    GENERIC_RELOC_PAIR,             /**< Follows GENERIC_RELOC_SECTDIFF. */
+    GENERIC_RELOC_SECTDIFF,         /**< ??? */
+    GENERIC_RELOC_PB_LA_PTR,        /**< Prebound lazy pointer whatever that. */
+    GENERIC_RELOC_LOCAL_SECTDIFF    /**< ??? */
+} reloc_type_generic_t;
+
+/** @} */
+
+
+/** @} */
+#endif
+