diff options
author | Andreas Kling <kling@serenityos.org> | 2020-03-08 10:36:51 +0100 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2020-03-08 13:06:51 +0100 |
commit | b1058b33fb32cb398d1723eb6fe59c27dc7967cc (patch) | |
tree | 49f0e5af7b7e37afd80a6dedf655917bf51ed915 /Libraries/LibELF | |
parent | b98d8ad5b01c41efff24faffe94918435194257a (diff) | |
download | serenity-b1058b33fb32cb398d1723eb6fe59c27dc7967cc.zip |
AK: Add global FlatPtr typedef. It's u32 or u64, based on sizeof(void*)
Use this instead of uintptr_t throughout the codebase. This makes it
possible to pass a FlatPtr to something that has u32 and u64 overloads.
Diffstat (limited to 'Libraries/LibELF')
-rw-r--r-- | Libraries/LibELF/ELFDynamicObject.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Libraries/LibELF/ELFDynamicObject.h b/Libraries/LibELF/ELFDynamicObject.h index 80eb9db281..8618d721d0 100644 --- a/Libraries/LibELF/ELFDynamicObject.h +++ b/Libraries/LibELF/ELFDynamicObject.h @@ -228,32 +228,32 @@ private: unsigned m_symbol_count { 0 }; // Begin Section information collected from DT_* entries - uintptr_t m_init_offset { 0 }; - uintptr_t m_fini_offset { 0 }; + FlatPtr m_init_offset { 0 }; + FlatPtr m_fini_offset { 0 }; - uintptr_t m_init_array_offset { 0 }; + FlatPtr m_init_array_offset { 0 }; size_t m_init_array_size { 0 }; - uintptr_t m_fini_array_offset { 0 }; + FlatPtr m_fini_array_offset { 0 }; size_t m_fini_array_size { 0 }; - uintptr_t m_hash_table_offset { 0 }; + FlatPtr m_hash_table_offset { 0 }; - uintptr_t m_string_table_offset { 0 }; + FlatPtr m_string_table_offset { 0 }; size_t m_size_of_string_table { 0 }; - uintptr_t m_symbol_table_offset { 0 }; + FlatPtr m_symbol_table_offset { 0 }; size_t m_size_of_symbol_table_entry { 0 }; Elf32_Sword m_procedure_linkage_table_relocation_type { -1 }; - uintptr_t m_plt_relocation_offset_location { 0 }; // offset of PLT relocations, at end of relocations + FlatPtr m_plt_relocation_offset_location { 0 }; // offset of PLT relocations, at end of relocations size_t m_size_of_plt_relocation_entry_list { 0 }; - uintptr_t m_procedure_linkage_table_offset { 0 }; + FlatPtr m_procedure_linkage_table_offset { 0 }; // NOTE: We'll only ever either RELA or REL entries, not both (thank god) // NOTE: The x86 ABI will only ever genrerate REL entries. size_t m_number_of_relocations { 0 }; size_t m_size_of_relocation_entry { 0 }; size_t m_size_of_relocation_table { 0 }; - uintptr_t m_relocation_table_offset { 0 }; + FlatPtr m_relocation_table_offset { 0 }; // DT_FLAGS Elf32_Word m_dt_flags { 0 }; |