diff options
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/elf/include/elf/section_header.hpp | 66 | ||||
| -rw-r--r-- | libs/multiboot2/include/multiboot2/information.hpp | 12 |
2 files changed, 72 insertions, 6 deletions
diff --git a/libs/elf/include/elf/section_header.hpp b/libs/elf/include/elf/section_header.hpp index 0ff5e4b..73e2e7b 100644 --- a/libs/elf/include/elf/section_header.hpp +++ b/libs/elf/include/elf/section_header.hpp @@ -4,20 +4,76 @@ #include "format.hpp" #include <cstdint> +#include <limits> +#include <type_traits> namespace elf { - enum struct section_header_type : std::uint32_t - { - }; + template<format Format> + constexpr auto inline section_header_size = std::numeric_limits<std::size_t>::max(); + + template<> + constexpr auto inline section_header_size<format::elf32> = 40uz; + + template<> + constexpr auto inline section_header_size<format::elf64> = 64uz; template<format Format> struct section_header { - std::uint32_t name_offset; - section_header_type type; + using format_uint = std::conditional_t<Format == format::elf32, std::uint32_t, std::uint64_t>; + + enum struct header_type : std::uint32_t + { + null = 0, ///< Is inactive + program_data = 1, ///< Contains program data + symbol_table = 2, ///< Contains a symbol table + string_table = 3, ///< Contains a string table + relocation_entries_with_addends = 4, ///< Contains relocation information with addends + hash_table = 5, ///< Contains a symbol hash table + dynamic_linking_entries = 6, ///< Contains dynamic linking information + notes = 7, ///< Contains additional notes about the object file + no_content = 8, ///< Contains no data + relocation_entries_without_addends = 9, ///< Contains relocation information without addends + reserved = 10, ///< Reserved for future use + dynamic_linker_symbol_table = 11, ///< Contains the dynamic linker symbol table + init_array = 14, ///< Contains an array of constructor pointers + fini_array = 15, ///< Contains an array of destructor pointers + preinit_array = 16, ///< Contains an array of pre-constructor pointers + group_table = 17, ///< Defines a section group + extended_section_header_indices = 18, ///< Contains extended section header indices + }; + + enum struct header_flags : format_uint + { + writeable = 0x1, ///< Contains writable data + allocated = 0x2, ///< Occupies memory during execution + executable = 0x4, ///< Contains executable instructions + mergeable = 0x10, ///< Contained data may be merged for deduplication + strings = 0x20, ///< Contains null-terminated strings + info_link = 0x40, ///< Contains the section header index of linked section + link_order = 0x80, ///< Must respect linking location relative to linked section + os_specific = 0x100, ///< Must be handled in an OS specific way + group_member = 0x200, ///< Is a member of a section group + thread_local_storage = 0x400, ///< Contains thread local storage data + compressed = 0x800, ///< Is compressed + }; + + std::uint32_t name_offset; ///< Offset into the section header string table, defining the section name + header_type type; ///< Type of this section + header_flags flags; ///< Flags of this section + format_uint virtual_load_address; ///< Virtual address where this section is loaded + format_uint file_offset; ///< Offset of the start of this section's data in the file + format_uint size; ///< Size of this section in memory + std::uint32_t linked_section; ///< Index of a section this section is linked to + std::uint32_t extra_info; ///< Additional information for this section (type and flag dependent) + format_uint alignment; ///< Alignment requirement of this section in memory + format_uint entry_size; ///< Size of the entries inside this section (if any) }; + + static_assert(sizeof(section_header<format::elf32>) == section_header_size<format::elf32>); + static_assert(sizeof(section_header<format::elf64>) == section_header_size<format::elf64>); } // namespace elf #endif
\ No newline at end of file diff --git a/libs/multiboot2/include/multiboot2/information.hpp b/libs/multiboot2/include/multiboot2/information.hpp index d2b4c98..462528d 100644 --- a/libs/multiboot2/include/multiboot2/information.hpp +++ b/libs/multiboot2/include/multiboot2/information.hpp @@ -176,7 +176,17 @@ namespace multiboot2 template<elf::format Format> auto maybe_elf_symbols() const noexcept -> std::optional<elf_symbols<Format>> { - return get<multiboot2::elf_symbols<Format>>(); + return get<multiboot2::elf_symbols<Format>>().and_then( + [](auto x) -> std::optional<multiboot2::elf_symbols<Format>> { + if (x.entry_size == elf::section_header_size<Format>) + { + return std::optional{x}; + } + else + { + return std::nullopt; + } + }); } template<elf::format Format> |