From a3ad94edd406b9abc26493761764d4034dda69fa Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Wed, 29 Nov 2006 17:56:40 +0000 Subject: Hash tables, dynamic section, i386 PLT, gold_assert. --- elfcpp/elfcpp.h | 26 ++++++++++++++++++++++++++ elfcpp/elfcpp_file.h | 23 +++++++++++++++++++++++ elfcpp/elfcpp_swap.h | 34 +++++++++++++++++----------------- 3 files changed, 66 insertions(+), 17 deletions(-) (limited to 'elfcpp') diff --git a/elfcpp/elfcpp.h b/elfcpp/elfcpp.h index afbd74d..ba85b3d 100644 --- a/elfcpp/elfcpp.h +++ b/elfcpp/elfcpp.h @@ -1304,6 +1304,32 @@ class Dyn const internal::Dyn_data* p_; }; +// Write class for an entry in the SHT_DYNAMIC section. + +template +class Dyn_write +{ + public: + Dyn_write(unsigned char* p) + : p_(reinterpret_cast*>(p)) + { } + + void + put_d_tag(typename Elf_types::Elf_Swxword v) + { this->p_->d_tag = Convert::convert_host(v); } + + void + put_d_val(typename Elf_types::Elf_WXword v) + { this->p_->d_val = Convert::convert_host(v); } + + void + put_d_ptr(typename Elf_types::Elf_Addr v) + { this->p_->d_val = Convert::convert_host(v); } + + private: + internal::Dyn_data* p_; +}; + // Accessor classes for entries in the ELF SHT_GNU_verdef section. template diff --git a/elfcpp/elfcpp_file.h b/elfcpp/elfcpp_file.h index 043c269..c9563ee 100644 --- a/elfcpp/elfcpp_file.h +++ b/elfcpp/elfcpp_file.h @@ -102,6 +102,10 @@ class Elf_file typename File::Location section_contents(unsigned int shndx); + // Return the flags of section SHNDX. + typename Elf_types::Elf_WXword + section_flags(unsigned int shndx); + private: // Shared constructor code. void @@ -250,6 +254,25 @@ Elf_file::section_contents(unsigned int shndx) return typename File::Location(shdr.get_sh_offset(), shdr.get_sh_size()); } +// Return the section flags of section SHNDX. + +template +typename Elf_types::Elf_WXword +Elf_file::section_flags(unsigned int shndx) +{ + File* const file = this->file_; + + if (shndx >= this->shnum()) + file->error(_("section_flags: bad shndx %u >= %u"), + shndx, this->shnum()); + + typename File::View v(file->view(this->section_header_offset(shndx), + This::shdr_size)); + + Ef_shdr shdr(v.data()); + return shdr.get_sh_flags(); +} + } // End namespace elfcpp. #endif // !defined(ELFCPP_FILE_H) diff --git a/elfcpp/elfcpp_swap.h b/elfcpp/elfcpp_swap.h index 979108e..71b02eb 100644 --- a/elfcpp/elfcpp_swap.h +++ b/elfcpp/elfcpp_swap.h @@ -180,9 +180,9 @@ struct Swap<8, big_endian> // Swap_unaligned is a template based on size and on whether the // target is big endian. It defines the type Valtype and the -// functions readval_unaligned and writeval_unaligned. The functions -// read and write values of the appropriate size out of buffers which -// may be misaligned. +// functions readval and writeval. The functions read and write +// values of the appropriate size out of buffers which may be +// misaligned. template struct Swap_unaligned; @@ -193,11 +193,11 @@ struct Swap_unaligned<8, big_endian> typedef typename Valtype_base<8>::Valtype Valtype; static inline Valtype - readval_unaligned(const unsigned char* wv) + readval(const unsigned char* wv) { return *wv; } static inline void - writeval_unaligned(unsigned char* wv, Valtype v) + writeval(unsigned char* wv, Valtype v) { *wv = v; } }; @@ -207,13 +207,13 @@ struct Swap_unaligned<16, false> typedef Valtype_base<16>::Valtype Valtype; static inline Valtype - readval_unaligned(const unsigned char* wv) + readval(const unsigned char* wv) { return (wv[1] << 8) | wv[0]; } static inline void - writeval_unaligned(unsigned char* wv, Valtype v) + writeval(unsigned char* wv, Valtype v) { wv[1] = v >> 8; wv[0] = v; @@ -226,13 +226,13 @@ struct Swap_unaligned<16, true> typedef Valtype_base<16>::Valtype Valtype; static inline Valtype - readval_unaligned(const unsigned char* wv) + readval(const unsigned char* wv) { return (wv[0] << 8) | wv[1]; } static inline void - writeval_unaligned(unsigned char* wv, Valtype v) + writeval(unsigned char* wv, Valtype v) { wv[0] = v >> 8; wv[1] = v; @@ -245,13 +245,13 @@ struct Swap_unaligned<32, false> typedef Valtype_base<32>::Valtype Valtype; static inline Valtype - readval_unaligned(const unsigned char* wv) + readval(const unsigned char* wv) { return (wv[3] << 24) | (wv[2] << 16) | (wv[1] << 8) | wv[0]; } static inline void - writeval_unaligned(unsigned char* wv, Valtype v) + writeval(unsigned char* wv, Valtype v) { wv[3] = v >> 24; wv[2] = v >> 16; @@ -266,13 +266,13 @@ struct Swap_unaligned<32, true> typedef Valtype_base<32>::Valtype Valtype; static inline Valtype - readval_unaligned(const unsigned char* wv) + readval(const unsigned char* wv) { return (wv[0] << 24) | (wv[1] << 16) | (wv[2] << 8) | wv[3]; } static inline void - writeval_unaligned(unsigned char* wv, Valtype v) + writeval(unsigned char* wv, Valtype v) { wv[0] = v >> 24; wv[1] = v >> 16; @@ -287,7 +287,7 @@ struct Swap_unaligned<64, false> typedef Valtype_base<64>::Valtype Valtype; static inline Valtype - readval_unaligned(const unsigned char* wv) + readval(const unsigned char* wv) { return ((static_cast(wv[7]) << 56) | (static_cast(wv[6]) << 48) @@ -300,7 +300,7 @@ struct Swap_unaligned<64, false> } static inline void - writeval_unaligned(unsigned char* wv, Valtype v) + writeval(unsigned char* wv, Valtype v) { wv[7] = v >> 56; wv[6] = v >> 48; @@ -319,7 +319,7 @@ struct Swap_unaligned<64, true> typedef Valtype_base<64>::Valtype Valtype; static inline Valtype - readval_unaligned(const unsigned char* wv) + readval(const unsigned char* wv) { return ((static_cast(wv[0]) << 56) | (static_cast(wv[1]) << 48) @@ -332,7 +332,7 @@ struct Swap_unaligned<64, true> } static inline void - writeval_unaligned(unsigned char* wv, Valtype v) + writeval(unsigned char* wv, Valtype v) { wv[7] = v >> 56; wv[6] = v >> 48; -- cgit v1.1