diff options
| -rw-r--r-- | include/llvm/Object/ELF.h | 718 | ||||
| -rw-r--r-- | lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp | 100 | ||||
| -rw-r--r-- | lib/Object/ELFObjectFile.cpp | 34 | ||||
| -rw-r--r-- | test/Object/archive-long-index.test (renamed from test/Object/archive-long-index.donttest) | 0 | ||||
| -rw-r--r-- | test/Object/simple-archive.test (renamed from test/Object/simple-archive.donttest) | 0 |
5 files changed, 466 insertions, 386 deletions
diff --git a/include/llvm/Object/ELF.h b/include/llvm/Object/ELF.h index fcd77c74ab..38bd73a0f3 100644 --- a/include/llvm/Object/ELF.h +++ b/include/llvm/Object/ELF.h @@ -33,6 +33,14 @@ namespace llvm { namespace object { +using support::endianness; + +template<typename T, std::size_t max_align> +struct MaximumAlignment { + enum {value = AlignOf<T>::Alignment > max_align ? max_align + : AlignOf<T>::Alignment}; +}; + // Subclasses of ELFObjectFile may need this for template instantiation inline std::pair<unsigned char, unsigned char> getElfArchType(MemoryBuffer *Object) { @@ -43,69 +51,78 @@ getElfArchType(MemoryBuffer *Object) { } // Templates to choose Elf_Addr and Elf_Off depending on is64Bits. -template<support::endianness target_endianness> +template<endianness target_endianness, std::size_t max_alignment> struct ELFDataTypeTypedefHelperCommon { typedef support::detail::packed_endian_specific_integral - <uint16_t, target_endianness, support::aligned> Elf_Half; + <uint16_t, target_endianness, + MaximumAlignment<uint16_t, max_alignment>::value> Elf_Half; typedef support::detail::packed_endian_specific_integral - <uint32_t, target_endianness, support::aligned> Elf_Word; + <uint32_t, target_endianness, + MaximumAlignment<uint32_t, max_alignment>::value> Elf_Word; typedef support::detail::packed_endian_specific_integral - <int32_t, target_endianness, support::aligned> Elf_Sword; + <int32_t, target_endianness, + MaximumAlignment<int32_t, max_alignment>::value> Elf_Sword; typedef support::detail::packed_endian_specific_integral - <uint64_t, target_endianness, support::aligned> Elf_Xword; + <uint64_t, target_endianness, + MaximumAlignment<uint64_t, max_alignment>::value> Elf_Xword; typedef support::detail::packed_endian_specific_integral - <int64_t, target_endianness, support::aligned> Elf_Sxword; + <int64_t, target_endianness, + MaximumAlignment<int64_t, max_alignment>::value> Elf_Sxword; }; -template<support::endianness target_endianness, bool is64Bits> +template<endianness target_endianness, std::size_t max_alignment, bool is64Bits> struct ELFDataTypeTypedefHelper; /// ELF 32bit types. -template<support::endianness target_endianness> -struct ELFDataTypeTypedefHelper<target_endianness, false> - : ELFDataTypeTypedefHelperCommon<target_endianness> { +template<endianness target_endianness, std::size_t max_alignment> +struct ELFDataTypeTypedefHelper<target_endianness, max_alignment, false> + : ELFDataTypeTypedefHelperCommon<target_endianness, max_alignment> { typedef uint32_t value_type; typedef support::detail::packed_endian_specific_integral - <value_type, target_endianness, support::aligned> Elf_Addr; + <value_type, target_endianness, + MaximumAlignment<value_type, max_alignment>::value> Elf_Addr; typedef support::detail::packed_endian_specific_integral - <value_type, target_endianness, support::aligned> Elf_Off; + <value_type, target_endianness, + MaximumAlignment<value_type, max_alignment>::value> Elf_Off; }; /// ELF 64bit types. -template<support::endianness target_endianness> -struct ELFDataTypeTypedefHelper<target_endianness, true> - : ELFDataTypeTypedefHelperCommon<target_endianness>{ +template<endianness target_endianness, std::size_t max_alignment> +struct ELFDataTypeTypedefHelper<target_endianness, max_alignment, true> + : ELFDataTypeTypedefHelperCommon<target_endianness, max_alignment>{ typedef uint64_t value_type; typedef support::detail::packed_endian_specific_integral - <value_type, target_endianness, support::aligned> Elf_Addr; + <value_type, target_endianness, + MaximumAlignment<value_type, max_alignment>::value> Elf_Addr; typedef support::detail::packed_endian_specific_integral - <value_type, target_endianness, support::aligned> Elf_Off; + <value_type, target_endianness, + MaximumAlignment<value_type, max_alignment>::value> Elf_Off; }; // I really don't like doing this, but the alternative is copypasta. -#define LLVM_ELF_IMPORT_TYPES(target_endianness, is64Bits) \ -typedef typename \ - ELFDataTypeTypedefHelper<target_endianness, is64Bits>::Elf_Addr Elf_Addr; \ -typedef typename \ - ELFDataTypeTypedefHelper<target_endianness, is64Bits>::Elf_Off Elf_Off; \ -typedef typename \ - ELFDataTypeTypedefHelper<target_endianness, is64Bits>::Elf_Half Elf_Half; \ -typedef typename \ - ELFDataTypeTypedefHelper<target_endianness, is64Bits>::Elf_Word Elf_Word; \ -typedef typename \ - ELFDataTypeTypedefHelper<target_endianness, is64Bits>::Elf_Sword Elf_Sword; \ -typedef typename \ - ELFDataTypeTypedefHelper<target_endianness, is64Bits>::Elf_Xword Elf_Xword; \ -typedef typename \ - ELFDataTypeTypedefHelper<target_endianness, is64Bits>::Elf_Sxword Elf_Sxword; +#define LLVM_ELF_IMPORT_TYPES(target_endianness, max_alignment, is64Bits) \ +typedef typename ELFDataTypeTypedefHelper \ + <target_endianness, max_alignment, is64Bits>::Elf_Addr Elf_Addr; \ +typedef typename ELFDataTypeTypedefHelper \ + <target_endianness, max_alignment, is64Bits>::Elf_Off Elf_Off; \ +typedef typename ELFDataTypeTypedefHelper \ + <target_endianness, max_alignment, is64Bits>::Elf_Half Elf_Half; \ +typedef typename ELFDataTypeTypedefHelper \ + <target_endianness, max_alignment, is64Bits>::Elf_Word Elf_Word; \ +typedef typename ELFDataTypeTypedefHelper \ + <target_endianness, max_alignment, is64Bits>::Elf_Sword Elf_Sword; \ +typedef typename ELFDataTypeTypedefHelper \ + <target_endianness, max_alignment, is64Bits>::Elf_Xword Elf_Xword; \ +typedef typename ELFDataTypeTypedefHelper \ + <target_endianness, max_alignment, is64Bits>::Elf_Sxword Elf_Sxword; // Section header. -template<support::endianness target_endianness, bool is64Bits> +template<endianness target_endianness, std::size_t max_alignment, bool is64Bits> struct Elf_Shdr_Base; -template<support::endianness target_endianness> -struct Elf_Shdr_Base<target_endianness, false> { - LLVM_ELF_IMPORT_TYPES(target_endianness, false) +template<endianness target_endianness, std::size_t max_alignment> +struct Elf_Shdr_Base<target_endianness, max_alignment, false> { + LLVM_ELF_IMPORT_TYPES(target_endianness, max_alignment, false) Elf_Word sh_name; // Section name (index into string table) Elf_Word sh_type; // Section type (SHT_*) Elf_Word sh_flags; // Section flags (SHF_*) @@ -118,9 +135,9 @@ struct Elf_Shdr_Base<target_endianness, false> { Elf_Word sh_entsize; // Size of records contained within the section }; -template<support::endianness target_endianness> -struct Elf_Shdr_Base<target_endianness, true> { - LLVM_ELF_IMPORT_TYPES(target_endianness, true) +template<endianness target_endianness, std::size_t max_alignment> +struct Elf_Shdr_Base<target_endianness, max_alignment, true> { + LLVM_ELF_IMPORT_TYPES(target_endianness, max_alignment, true) Elf_Word sh_name; // Section name (index into string table) Elf_Word sh_type; // Section type (SHT_*) Elf_Xword sh_flags; // Section flags (SHF_*) @@ -133,10 +150,11 @@ struct Elf_Shdr_Base<target_endianness, true> { Elf_Xword sh_entsize; // Size of records contained within the section }; -template<support::endianness target_endianness, bool is64Bits> -struct Elf_Shdr_Impl : Elf_Shdr_Base<target_endianness, is64Bits> { - using Elf_Shdr_Base<target_endianness, is64Bits>::sh_entsize; - using Elf_Shdr_Base<target_endianness, is64Bits>::sh_size; +template<endianness target_endianness, std::size_t max_alignment, bool is64Bits> +struct Elf_Shdr_Impl + : Elf_Shdr_Base<target_endianness, max_alignment, is64Bits> { + using Elf_Shdr_Base<target_endianness, max_alignment, is64Bits>::sh_entsize; + using Elf_Shdr_Base<target_endianness, max_alignment, is64Bits>::sh_size; /// @brief Get the number of entities this section contains if it has any. unsigned getEntityCount() const { @@ -146,12 +164,14 @@ struct Elf_Shdr_Impl : Elf_Shdr_Base<target_endianness, is64Bits> { } }; -template<support::endianness target_endianness, bool is64Bits> +template< endianness target_endianness + , std::size_t max_alignment + , bool is64Bits> struct Elf_Sym_Base; -template<support::endianness target_endianness> -struct Elf_Sym_Base<target_endianness, false> { - LLVM_ELF_IMPORT_TYPES(target_endianness, false) +template<endianness target_endianness, std::size_t max_alignment> +struct Elf_Sym_Base<target_endianness, max_alignment, false> { + LLVM_ELF_IMPORT_TYPES(target_endianness, max_alignment, false) Elf_Word st_name; // Symbol name (index into string table) Elf_Addr st_value; // Value or address associated with the symbol Elf_Word st_size; // Size of the symbol @@ -160,9 +180,9 @@ struct Elf_Sym_Base<target_endianness, false> { Elf_Half st_shndx; // Which section (header table index) it's defined in }; -template<support::endianness target_endianness> -struct Elf_Sym_Base<target_endianness, true> { - LLVM_ELF_IMPORT_TYPES(target_endianness, true) +template<endianness target_endianness, std::size_t max_alignment> +struct Elf_Sym_Base<target_endianness, max_alignment, true> { + LLVM_ELF_IMPORT_TYPES(target_endianness, max_alignment, true) Elf_Word st_name; // Symbol name (index into string table) unsigned char st_info; // Symbol's type and binding attributes unsigned char st_other; // Must be zero; reserved @@ -171,9 +191,10 @@ struct Elf_Sym_Base<target_endianness, true> { Elf_Xword st_size; // Size of the symbol }; -template<support::endianness target_endianness, bool is64Bits> -struct Elf_Sym_Impl : Elf_Sym_Base<target_endianness, is64Bits> { - using Elf_Sym_Base<target_endianness, is64Bits>::st_info; +template<endianness target_endianness, std::size_t max_alignment, bool is64Bits> +struct Elf_Sym_Impl + : Elf_Sym_Base<target_endianness, max_alignment, is64Bits> { + using Elf_Sym_Base<target_endianness, max_alignment, is64Bits>::st_info; // These accessors and mutators correspond to the ELF32_ST_BIND, // ELF32_ST_TYPE, and ELF32_ST_INFO macros defined in the ELF specification: @@ -188,21 +209,22 @@ struct Elf_Sym_Impl : Elf_Sym_Base<target_endianness, is64Bits> { /// Elf_Versym: This is the structure of entries in the SHT_GNU_versym section /// (.gnu.version). This structure is identical for ELF32 and ELF64. -template<support::endianness target_endianness, bool is64Bits> +template<endianness target_endianness, std::size_t max_alignment, bool is64Bits> struct Elf_Versym_Impl { - LLVM_ELF_IMPORT_TYPES(target_endianness, is64Bits) + LLVM_ELF_IMPORT_TYPES(target_endianness, max_alignment, is64Bits) Elf_Half vs_index; // Version index with flags (e.g. VERSYM_HIDDEN) }; -template<support::endianness target_endianness, bool is64Bits> +template<endianness target_endianness, std::size_t max_alignment, bool is64Bits> struct Elf_Verdaux_Impl; /// Elf_Verdef: This is the structure of entries in the SHT_GNU_verdef section /// (.gnu.version_d). This structure is identical for ELF32 and ELF64. -template<support::endianness target_endianness, bool is64Bits> +template<endianness target_endianness, std::size_t max_alignment, bool is64Bits> struct Elf_Verdef_Impl { - LLVM_ELF_IMPORT_TYPES(target_endianness, is64Bits) - typedef Elf_Verdaux_Impl<target_endianness, is64Bits> Elf_Verdaux; + LLVM_ELF_IMPORT_TYPES(target_endianness, max_alignment, is64Bits) + typedef + Elf_Verdaux_Impl<target_endianness, max_alignment, is64Bits> Elf_Verdaux; Elf_Half vd_version; // Version of this structure (e.g. VER_DEF_CURRENT) Elf_Half vd_flags; // Bitwise flags (VER_DEF_*) Elf_Half vd_ndx; // Version index, used in .gnu.version entries @@ -219,18 +241,18 @@ struct Elf_Verdef_Impl { /// Elf_Verdaux: This is the structure of auxiliary data in the SHT_GNU_verdef /// section (.gnu.version_d). This structure is identical for ELF32 and ELF64. -template<support::endianness target_endianness, bool is64Bits> +template<endianness target_endianness, std::size_t max_alignment, bool is64Bits> struct Elf_Verdaux_Impl { - LLVM_ELF_IMPORT_TYPES(target_endianness, is64Bits) + LLVM_ELF_IMPORT_TYPES(target_endianness, max_alignment, is64Bits) Elf_Word vda_name; // Version name (offset in string table) Elf_Word vda_next; // Offset to next Verdaux entry (in bytes) }; /// Elf_Verneed: This is the structure of entries in the SHT_GNU_verneed /// section (.gnu.version_r). This structure is identical for ELF32 and ELF64. -template<support::endianness target_endianness, bool is64Bits> +template<endianness target_endianness, std::size_t max_alignment, bool is64Bits> struct Elf_Verneed_Impl { - LLVM_ELF_IMPORT_TYPES(target_endianness, is64Bits) + LLVM_ELF_IMPORT_TYPES(target_endianness, max_alignment, is64Bits) Elf_Half vn_version; // Version of this structure (e.g. VER_NEED_CURRENT) Elf_Half vn_cnt; // Number of associated Vernaux entries Elf_Word vn_file; // Library name (string table offset) @@ -240,9 +262,9 @@ struct Elf_Verneed_Impl { /// Elf_Vernaux: This is the structure of auxiliary data in SHT_GNU_verneed /// section (.gnu.version_r). This structure is identical for ELF32 and ELF64. -template<support::endianness target_endianness, bool is64Bits> +template<endianness target_endianness, std::size_t max_alignment, bool is64Bits> struct Elf_Vernaux_Impl { - LLVM_ELF_IMPORT_TYPES(target_endianness, is64Bits) + LLVM_ELF_IMPORT_TYPES(target_endianness, max_alignment, is64Bits) Elf_Word vna_hash; // Hash of dependency name Elf_Half vna_flags; // Bitwise Flags (VER_FLAG_*) Elf_Half vna_other; // Version index, used in .gnu.version entries @@ -252,12 +274,12 @@ struct Elf_Vernaux_Impl { /// Elf_Dyn_Base: This structure matches the form of entries in the dynamic /// table section (.dynamic) look like. -template<support::endianness target_endianness, bool is64Bits> +template<endianness target_endianness, std::size_t max_alignment, bool is64Bits> struct Elf_Dyn_Base; -template<support::endianness target_endianness> -struct Elf_Dyn_Base<target_endianness, false> { - LLVM_ELF_IMPORT_TYPES(target_endianness, false) +template<endianness target_endianness, std::size_t max_alignment> +struct Elf_Dyn_Base<target_endianness, max_alignment, false> { + LLVM_ELF_IMPORT_TYPES(target_endianness, max_alignment, false) Elf_Sword d_tag; union { Elf_Word d_val; @@ -265,9 +287,9 @@ struct Elf_Dyn_Base<target_endianness, false> { } d_un; }; -template<support::endianness target_endianness> -struct Elf_Dyn_Base<target_endianness, true> { - LLVM_ELF_IMPORT_TYPES(target_endianness, true) +template<endianness target_endianness, std::size_t max_alignment> +struct Elf_Dyn_Base<target_endianness, max_alignment, true> { + LLVM_ELF_IMPORT_TYPES(target_endianness, max_alignment, true) Elf_Sxword d_tag; union { Elf_Xword d_val; @@ -276,24 +298,24 @@ struct Elf_Dyn_Base<target_endianness, true> { }; /// Elf_Dyn_Impl: This inherits from Elf_Dyn_Base, adding getters and setters. -template<support::endianness target_endianness, bool is64Bits> -struct Elf_Dyn_Impl : Elf_Dyn_Base<target_endianness, is64Bits> { - using Elf_Dyn_Base<target_endianness, is64Bits>::d_tag; - using Elf_Dyn_Base<target_endianness, is64Bits>::d_un; +template<endianness target_endianness, std::size_t max_alignment, bool is64Bits> +struct Elf_Dyn_Impl : Elf_Dyn_Base<target_endianness, max_alignment, is64Bits> { + using Elf_Dyn_Base<target_endianness, max_alignment, is64Bits>::d_tag; + using Elf_Dyn_Base<target_endianness, max_alignment, is64Bits>::d_un; int64_t getTag() const { return d_tag; } uint64_t getVal() const { return d_un.d_val; } uint64_t getPtr() const { return d_un.ptr; } }; -template<support::endianness target_endianness, bool is64Bits> +template<endianness target_endianness, std::size_t max_alignment, bool is64Bits> class ELFObjectFile; // DynRefImpl: Reference to an entry in the dynamic table // This is an ELF-specific interface. -template<support::endianness target_endianness, bool is64Bits> +template<endianness target_endianness, std::size_t max_alignment, bool is64Bits> class DynRefImpl { - typedef Elf_Dyn_Impl<target_endianness, is64Bits> Elf_Dyn; - typedef ELFObjectFile<target_endianness, is64Bits> OwningType; + typedef Elf_Dyn_Impl<target_endianness, max_alignment, is64Bits> Elf_Dyn; + typedef ELFObjectFile<target_endianness, max_alignment, is64Bits> OwningType; DataRefImpl DynPimpl; const OwningType *OwningObject; @@ -315,47 +337,53 @@ public: }; // Elf_Rel: Elf Relocation -template<support::endianness target_endianness, bool is64Bits, bool isRela> +template< endianness target_endianness + , std::size_t max_alignment + , bool is64Bits + , bool isRela> struct Elf_Rel_Base; -template<support::endianness target_endianness> -struct Elf_Rel_Base<target_endianness, false, false> { - LLVM_ELF_IMPORT_TYPES(target_endianness, false) +template<endianness target_endianness, std::size_t max_alignment> +struct Elf_Rel_Base<target_endianness, max_alignment, false, false> { + LLVM_ELF_IMPORT_TYPES(target_endianness, max_alignment, false) Elf_Addr r_offset; // Location (file byte offset, or program virtual addr) Elf_Word r_info; // Symbol table index and type of relocation to apply }; -template<support::endianness target_endianness> -struct Elf_Rel_Base<target_endianness, true, false> { - LLVM_ELF_IMPORT_TYPES(target_endianness, true) +template<endianness target_endianness, std::size_t max_alignment> +struct Elf_Rel_Base<target_endianness, max_alignment, true, false> { + LLVM_ELF_IMPORT_TYPES(target_endianness, max_alignment, true) Elf_Addr r_offset; // Location (file byte offset, or program virtual addr) Elf_Xword r_info; // Symbol table index and type of relocation to apply }; -template<support::endianness target_endianness> -struct Elf_Rel_Base<target_endianness, false, true> { - LLVM_ELF_IMPORT_TYPES(target_endianness, false) +template<endianness target_endianness, std::size_t max_alignment> +struct Elf_Rel_Base<target_endianness, max_alignment, false, true> { + LLVM_ELF_IMPORT_TYPES(target_endianness, max_alignment, false) Elf_Addr r_offset; // Location (file byte offset, or program virtual addr) Elf_Word r_info; // Symbol table index and type of relocation to apply Elf_Sword r_addend; // Compute value for relocatable field by adding this }; -template<support::endianness target_endianness> -struct Elf_Rel_Base<target_endianness, true, true> { - LLVM_ELF_IMPORT_TYPES(target_endianness, true) +template<endianness target_endianness, std::size_t max_alignment> +struct Elf_Rel_Base<target_endianness, max_alignment, true, true> { + LLVM_ELF_IMPORT_TYPES(target_endianness, max_alignment, true) Elf_Addr r_offset; // Location (file byte offset, or program virtual addr) Elf_Xword r_info; // Symbol table index and type of relocation to apply Elf_Sxword r_addend; // Compute value for relocatable field by adding this. }; -template<support::endianness target_endianness, bool is64Bits, bool isRela> +template< endianness target_endianness + , std::size_t max_alignment + , bool is64Bits + , bool isRela> struct Elf_Rel_Impl; -template<support::endianness target_endianness, bool isRela> -struct Elf_Rel_Impl<target_endianness, true, isRela> - : Elf_Rel_Base<target_endianness, true, isRela> { - using Elf_Rel_Base<target_endianness, true, isRela>::r_info; - LLVM_ELF_IMPORT_TYPES(target_endianness, true) +template<endianness target_endianness, std::size_t max_alignment, bool isRela> +struct Elf_Rel_Impl<target_endianness, max_alignment, true, isRela> + : Elf_Rel_Base<target_endianness, max_alignment, true, isRela> { + using Elf_Rel_Base<target_endianness, max_alignment, true, isRela>::r_info; + LLVM_ELF_IMPORT_TYPES(target_endianness, max_alignment, true) // These accessors and mutators correspond to the ELF64_R_SYM, ELF64_R_TYPE, // and ELF64_R_INFO macros defined in the ELF specification: @@ -370,11 +398,11 @@ struct Elf_Rel_Impl<target_endianness, true, isRela> } }; -template<support::endianness target_endianness, bool isRela> -struct Elf_Rel_Impl<target_endianness, false, isRela> - : Elf_Rel_Base<target_endianness, false, isRela> { - using Elf_Rel_Base<target_endianness, false, isRela>::r_info; - LLVM_ELF_IMPORT_TYPES(target_endianness, false) +template<endianness target_endianness, std::size_t max_alignment, bool isRela> +struct Elf_Rel_Impl<target_endianness, max_alignment, false, isRela> + : Elf_Rel_Base<target_endianness, max_alignment, false, isRela> { + using Elf_Rel_Base<target_endianness, max_alignment, false, isRela>::r_info; + LLVM_ELF_IMPORT_TYPES(target_endianness, max_alignment, false) // These accessors and mutators correspond to the ELF32_R_SYM, ELF32_R_TYPE, // and ELF32_R_INFO macros defined in the ELF specification: @@ -387,9 +415,9 @@ struct Elf_Rel_Impl<target_endianness, false, isRela> } }; -template<support::endianness target_endianness, bool is64Bits> +template<endianness target_endianness, std::size_t max_alignment, bool is64Bits> struct Elf_Ehdr_Impl { - LLVM_ELF_IMPORT_TYPES(target_endianness, is64Bits) + LLVM_ELF_IMPORT_TYPES(target_endianness, max_alignment, is64Bits) unsigned char e_ident[ELF::EI_NIDENT]; // ELF Identification bytes Elf_Half e_type; // Type of file (see ET_*) Elf_Half e_machine; // Required architecture for this file (see EM_*) @@ -412,15 +440,15 @@ struct Elf_Ehdr_Impl { unsigned char getDataEncoding() const { return e_ident[ELF::EI_DATA]; } }; -template<support::endianness target_endianness, bool is64Bits> +template<endianness target_endianness, std::size_t max_alignment, bool is64Bits> struct Elf_Phdr; -template<support::endianness target_endianness> -struct Elf_Phdr<target_endianness, false> { - LLVM_ELF_IMPORT_TYPES(target_endianness, false) +template<endianness target_endianness, std::size_t max_alignment> +struct Elf_Phdr<target_endianness, max_alignment, false> { + LLVM_ELF_IMPORT_TYPES(target_endianness, max_alignment, false) Elf_Word p_type; // Type of segment Elf_Off p_offset; // FileOffset where segment is located, in bytes - Elf_Addr p_vaddr; // Virtual Address of beginning of segment + Elf_Addr p_vaddr; // Virtual Address of beginning of segment Elf_Addr p_paddr; // Physical address of beginning of segment (OS-specific) Elf_Word p_filesz; // Num. of bytes in file image of segment (may be zero) Elf_Word p_memsz; // Num. of bytes in mem image of segment (may be zero) @@ -428,35 +456,42 @@ struct Elf_Phdr<target_endianness, false> { Elf_Word p_align; // Segment alignment constraint }; -template<support::endianness target_endianness> -struct Elf_Phdr<target_endianness, true> { - LLVM_ELF_IMPORT_TYPES(target_endianness, true) +template<endianness target_endianness, std::size_t max_alignment> +struct Elf_Phdr<target_endianness, max_alignment, true> { + LLVM_ELF_IMPORT_TYPES(target_endianness, max_alignment, true) Elf_Word p_type; // Type of segment Elf_Word p_flags; // Segment flags Elf_Off p_offset; // FileOffset where segment is located, in bytes - Elf_Addr p_vaddr; // Virtual Address of beginning of segment + Elf_Addr p_vaddr; // Virtual Address of beginning of segment Elf_Addr p_paddr; // Physical address of beginning of segment (OS-specific) Elf_Word p_filesz; // Num. of bytes in file image of segment (may be zero) Elf_Word p_memsz; // Num. of bytes in mem image of segment (may be zero) Elf_Word p_align; // Segment alignment constraint }; -template<support::endianness target_endianness, bool is64Bits> +template<endianness target_endianness, std::size_t max_alignment, bool is64Bits> class ELFObjectFile : public ObjectFile { - LLVM_ELF_IMPORT_TYPES(target_endianness, is64Bits) - - typedef Elf_Ehdr_Impl<target_endianness, is64Bits> Elf_Ehdr; - typedef Elf_Shdr_Impl<target_endianness, is64Bits> Elf_Shdr; - typedef Elf_Sym_Impl<target_endianness, is64Bits> Elf_Sym; - typedef Elf_Dyn_Impl<target_endianness, is64Bits> Elf_Dyn; - typedef Elf_Rel_Impl<target_endianness, is64Bits, false> Elf_Rel; - typedef Elf_Rel_Impl<target_endianness, is64Bits, true> Elf_Rela; - typedef Elf_Verdef_Impl<target_endianness, is64Bits> Elf_Verdef; - typedef Elf_Verdaux_Impl<target_endianness, is64Bits> Elf_Verdaux; - typedef Elf_Verneed_Impl<target_endianness, is64Bits> Elf_Verneed; - typedef Elf_Vernaux_Impl<target_endianness, is64Bits> Elf_Vernaux; - typedef Elf_Versym_Impl<target_endianness, is64Bits> Elf_Versym; - typedef DynRefImpl<target_endianness, is64Bits> DynRef; + LLVM_ELF_IMPORT_TYPES(target_endianness, max_alignment, is64Bits) + + typedef Elf_Ehdr_Impl<target_endianness, max_alignment, is64Bits> Elf_Ehdr; + typedef Elf_Shdr_Impl<target_endianness, max_alignment, is64Bits> Elf_Shdr; + typedef Elf_Sym_Impl<target_endianness, max_alignment, is64Bits> Elf_Sym; + typedef Elf_Dyn_Impl<target_endianness, max_alignment, is64Bits> Elf_Dyn; + typedef + Elf_Rel_Impl<target_endianness, max_alignment, is64Bits, false> Elf_Rel; + typedef + Elf_Rel_Impl<target_endianness, max_alignment, is64Bits, true> Elf_Rela; + typedef + Elf_Verdef_Impl<target_endianness, max_alignment, is64Bits> Elf_Verdef; + typedef + Elf_Verdaux_Impl<target_endianness, max_alignment, is64Bits> Elf_Verdaux; + typedef + Elf_Verneed_Impl<target_endianness, max_alignment, is64Bits> Elf_Verneed; + typedef + Elf_Vernaux_Impl<target_endianness, max_alignment, is64Bits> Elf_Vernaux; + typedef + Elf_Versym_Impl<target_endianness, max_alignment, is64Bits> Elf_Versym; + typedef DynRefImpl<target_endianness, max_alignment, is64Bits> DynRef; typedef content_iterator<DynRef> dyn_iterator; protected: @@ -623,7 +658,7 @@ protected: section_iterator &Res) const; virtual error_code getSymbolValue(DataRefImpl Symb, uint64_t &Val) const; - friend class DynRefImpl<target_endianness, is64Bits>; + friend class DynRefImpl<target_endianness, max_alignment, is64Bits>; virtual error_code getDynNext(DataRefImpl DynData, DynRef &Result) const; virtual error_code getLibraryNext(DataRefImpl Data, LibraryRef &Result) const; @@ -729,8 +764,8 @@ public: // Iterate through the version definitions, and place each Elf_Verdef // in the VersionMap according to its index. -template<support::endianness target_endianness, bool is64Bits> -void ELFObjectFile<target_endianness, is64Bits>:: +template<endianness target_endianness, std::size_t max_alignment, bool is64Bits> +void ELFObjectFile<target_endianness, max_alignment, is64Bits>:: LoadVersionDefs(const Elf_Shdr *sec) const { unsigned vd_size = sec->sh_size; // Size of section in bytes unsigned vd_count = sec->sh_info; // Number of Verdef entries @@ -755,8 +790,8 @@ void ELFObjectFile<target_endianness, is64Bits>:: // Iterate through the versions needed section, and place each Elf_Vernaux // in the VersionMap according to its index. -template<support::endianness target_endianness, bool is64Bits> -void ELFObjectFile<target_endianness, is64Bits>:: +template<endianness target_endianness, std::size_t max_alignment, bool is64Bits> +void ELFObjectFile<target_endianness, max_alignment, is64Bits>:: LoadVersionNeeds(const Elf_Shdr *sec) const { unsigned vn_size = sec->sh_size; // Size of section in bytes unsigned vn_count = sec->sh_info; // Number of Verneed entries @@ -788,8 +823,9 @@ void ELFObjectFile<target_endianness, is64Bits>:: } } -template<support::endianness target_endianness, bool is64Bits> -void ELFObjectFile<target_endianness, is64Bits>::LoadVersionMap() const { +template<endianness target_endianness, std::size_t max_alignment, bool is64Bits> +void ELFObjectFile<target_endianness, max_alignment, is64Bits> + ::LoadVersionMap() const { // If there is no dynamic symtab or version table, there is nothing to do. if (SymbolTableSections[0] == NULL || dot_gnu_version_sec == NULL) return; @@ -810,8 +846,8 @@ void ELFObjectFile<target_endianness, is64Bits>::LoadVersionMap() const { LoadVersionNeeds(dot_gnu_version_r_sec); } -template<support::endianness target_endianness, bool is64Bits> -void ELFObjectFile<target_endianness, is64Bits> +template<endianness target_endianness, std::size_t max_alignment, bool is64Bits> +void ELFObjectFile<target_endianness, max_alignment, is64Bits> ::validateSymbol(DataRefImpl Symb) const { const Elf_Sym *symb = getSymbol(Symb); const Elf_Shdr *SymbolTableSection = SymbolTableSections[Symb.d.b]; @@ -829,8 +865,8 @@ void ELFObjectFile<target_endianness, is64Bits> report_fatal_error("Symb must point to a valid symbol!"); } -template<support::endianness target_endianness, bool is64Bits> -error_code ELFObjectFile<target_endianness, is64Bits> +template<endianness target_endianness, std::size_t max_alignment, bool is64Bits> +error_code ELFObjectFile<target_endianness, max_alignment, is64Bits> ::getSymbolNext(DataRefImpl Symb, SymbolRef &Result) const { validateSymbol(Symb); @@ -857,8 +893,8 @@ error_code ELFObjectFile<target_endianness, is64Bits> return object_error::success; } -template<support::endianness target_endianness, bool is64Bits> -error_code ELFObjectFile<target_endianness, is64Bits> +template<endianness target_endianness, std::size_t max_alignment, bool is64Bits> +error_code ELFObjectFile<target_endianness, max_alignment, is64Bits> ::getSymbolName(DataRefImpl Symb, StringRef &Result) const { validateSymbol(Symb); @@ -866,8 +902,8 @@ error_code ELFObjectFile<target_endianness, is64Bits> return getSymbolName(SymbolTableSections[Symb.d.b], symb, Result); } -template<support::endianness target_endianness, bool is64Bits> -error_code ELFObjectFile<target_endianness, is64Bits> +template<endianness target_endianness, std::size_t max_alignment, bool is64Bits> +error_code ELFObjectFile<target_endianness, max_alignment, is64Bits> ::getSymbolVersion(SymbolRef SymRef, StringRef &Version, bool &IsDefault) const { @@ -878,17 +914,18 @@ error_code ELFObjectFile<target_endianness, is64Bits> Version, IsDefault); } -template<support::endianness target_endianness, bool is64Bits> -ELF::Elf64_Word ELFObjectFile<target_endianness, is64Bits> +template<endianness target_endianness, std::size_t max_alignment, bool is64Bits> +ELF::Elf64_Word ELFObjectFile<target_endianness, max_alignment, is64Bits> ::getSymbolTableIndex(const Elf_Sym *symb) const { if (symb->st_shndx == ELF::SHN_XINDEX) return ExtendedSymbolTable.lookup(symb); return symb->st_shndx; } -template<support::endianness target_endianness, bool is64Bits> -const typename ELFObjectFile<target_endianness, is64Bits>::Elf_Shdr * -ELFObjectFile<target_endianness, is64Bits> +template<endianness target_endianness, std::size_t max_alignment, bool is64Bits> +const typename ELFObjectFile<target_endianness, max_alignment, is64Bits> + ::Elf_Shdr * +ELFObjectFile<target_endianness, max_alignment, is64Bits> ::getSection(const Elf_Sym *symb) const { if (symb->st_shndx == ELF::SHN_XINDEX) return getSection(ExtendedSymbolTable.lookup(symb)); @@ -897,24 +934,27 @@ ELFObjectFile<target_endianness, is64Bits> return getSection(symb->st_shndx); } -template<support::endianness target_endianness, bool is64Bits> -const typename ELFObjectFile<target_endianness, is64Bits>::Elf_Shdr * -ELFObjectFile<target_endianness, is64Bits> +template<endianness target_endianness, std::size_t max_alignment, bool is64Bits> +const typename ELFObjectFile<target_endianness, max_alignment, is64Bits> + ::Elf_Shdr * +ELFObjectFile<target_endianness, max_alignment, is64Bits> ::getElfSection(section_iterator &It) const { llvm::object::DataRefImpl ShdrRef = It->getRawDataRefImpl(); return reinterpret_cast<const Elf_Shdr *>(ShdrRef.p); } -template<support::endianness target_endianness, bool is64Bits> -const typename ELFObjectFile<target_endianness, is64Bits>::Elf_Sym * -ELFObjectFile<target_endianness, is64Bits> +template<endianness target_endianness, std::size_t max_alignment, bool is64Bits> +const typename ELFObjectFile<target_endianness, max_alignment, is64Bits> + ::Elf_Sym * +ELFObjectFile<target_endianness, max_alignment, is64Bits> ::getElfSymbol(symbol_iterator &It) const { return getSymbol(It->getRawDataRefImpl()); } -template<support::endianness target_endianness, bool is64Bits> -const typename ELFObjectFile<target_endianness, is64Bits>::Elf_Sym * -ELFObjectFile<target_endianness, is64Bits> +template<endianness target_endianness, std::size_t max_alignment, bool is64Bits> +const typename ELFObjectFile<target_endianness, max_alignment, is64Bits> + ::Elf_Sym * +ELFObjectFile<target_endianness, max_alignment, is64Bits> ::getElfSymbol(uint32_t index) const { DataRefImpl SymbolData; SymbolData.d.a = index; @@ -922,8 +962,8 @@ ELFObjectFile<target_endianness, is64Bits> return getSymbol(SymbolData); } -template<support::endianness target_endianness, bool is64Bits> -error_code ELFObjectFile<target_endianness, is64Bits> +template<endianness target_endianness, std::size_t max_alignment, bool is64Bits> +error_code ELFObjectFile<target_endianness, max_alignment, is64Bits> ::getSymbolFileOffset(DataRefImpl Symb, uint64_t &Result) const { validateSymbol(Symb); @@ -957,8 +997,8 @@ error_code ELFObjectFile<target_endianness, is64Bits> } } -template<support::endianness target_endianness, bool is64Bits> -error_code ELFObjectFile<target_endianness, is64Bits> +template<endianness target_endianness, std::size_t max_alignment, bool is64Bits> +error_code ELFObjectFile<target_endianness, max_alignment, is64Bits> ::getSymbolAddress(DataRefImpl Symb, uint64_t &Result) const { validateSymbol(Symb); @@ -1001,8 +1041,8 @@ error_code ELFObjectFile<target_endianness, is64Bits> } } -template<support::endianness target_endianness, bool is64Bits> -error_code ELFObjectFile<target_endianness, is64Bits> +template<endianness target_endianness, std::size_t max_alignment, bool is64Bits> +error_code ELFObjectFile<target_endianness, max_alignment, is64Bits> ::getSymbolSize(DataRefImpl Symb, uint64_t &Result) const { validateSymbol(Symb); @@ -1013,8 +1053,8 @@ error_code ELFObjectFile<target_endianness, is64Bits> return object_error::success; } -template<support::endianness target_endianness, bool is64Bits> -error_code ELFObjectFile<target_endianness, is64Bits> +template<endianness target_endianness, std::size_t max_alignment, bool is64Bits> +error_code ELFObjectFile<target_endianness, max_alignment, is64Bits> ::getSymbolNMTypeChar(DataRefImpl Symb, char &Result) const { validateSymbol(Symb); @@ -1078,8 +1118,8 @@ error_code ELFObjectFile<target_endianness, is64Bits> return object_error::success; } -template<support::endianness target_endianness, bool is64Bits> -error_code ELFObjectFile<target_endianness, is64Bits> +template<endianness target_endianness, std::size_t max_alignment, bool is64Bits> +error_code ELFObjectFile<target_endianness, max_alignment, is64Bits> ::getSymbolType(DataRefImpl Symb, SymbolRef::Type &Result) const { validateSymbol(Symb); @@ -1110,8 +1150,8 @@ error_code ELFObjectFile<target_endianness, is64Bits> return object_error::success; } -template<support::endianness target_endianness, bool is64Bits> -error_code ELFObjectFile<target_endianness, is64Bits> +template<endianness target_endianness, std::size_t max_alignment, bool is64Bits> +error_code ELFObjectFile<target_endianness, max_alignment, is64Bits> ::getSymbolFlags(DataRefImpl Symb, uint32_t &Result) const { validateSymbol(Symb); @@ -1145,8 +1185,8 @@ error_code ELFObjectFile<target_endianness, is64Bits> return object_error::success; } -template<support::endianness target_endianness, bool is64Bits> -error_code ELFObjectFile<target_endianness, is64Bits> +template<endianness target_endianness, std::size_t max_alignment, bool is64Bits> +error_code ELFObjectFile<target_endianness, max_alignment, is64Bits> ::getSymbolSection(DataRefImpl Symb, section_iterator &Res) const { validateSymbol(Symb); @@ -1162,8 +1202,8 @@ error_code ELFObjectFile<target_endianness, is64Bits> return object_error::success; } -template<support::endianness target_endianness, bool is64Bits> -error_code ELFObjectFile<target_endianness, is64Bits> +template<endianness target_endianness, std::size_t max_alignment, bool is64Bits> +error_code ELFObjectFile<target_endianness, max_alignment, is64Bits> ::getSymbolValue(DataRefImpl Symb, uint64_t &Val) const { validateSymbol(Symb); @@ -1172,8 + |