Update elf handling in 32-bit, use the larger type to handle both 32 and 64-bit in the same code paths

Author: jeremy-rifkin

src/binary/elf.cpp

@@ -168,7 +168,9 @@ namespace detail {
         const auto& sections = sections_res.unwrap_value();
         for(const auto& section : sections) {
             if(string_view(strtab.data() + section.sh_name) == ".text") {
-                vec.push_back(pc_range{section.sh_addr, section.sh_addr + section.sh_size});
+                vec.push_back(
+                    pc_range{to<frame_ptr>(section.sh_addr), to<frame_ptr>(section.sh_addr + section.sh_size)}
+                );
             }
         }
         return vec;
@@ -330,7 +332,10 @@ namespace detail {
             return internal_error("requested strtab section not a strtab (requested {} of {})", index, file->path());
         }
         entry.data.resize(section.sh_size + 1);
-        auto read_res = file->read_bytes(span<char>{entry.data.data(), section.sh_size}, section.sh_offset);
+        auto read_res = file->read_bytes(
+            span<char>{entry.data.data(), to<std::size_t>(section.sh_size)},
+            section.sh_offset
+        );
         if(!read_res) {
             return read_res.unwrap_error();
         }

src/binary/elf.hpp

@@ -15,10 +15,6 @@
 
 CPPTRACE_BEGIN_NAMESPACE
 namespace detail {
-    using Elf_Addr = std::uintptr_t;
-    using Elf_Off = std::uintptr_t;
-    using Elf_Xword = std::size_t;
-
     // TODO: make methods const and a bunch of members mutable
     class elf {
         std::unique_ptr<base_file> file;
@@ -40,10 +36,10 @@ namespace detail {
         struct section_info {
             uint32_t sh_name;
             uint32_t sh_type;
-            Elf_Addr sh_addr;
-            Elf_Off sh_offset;
-            Elf_Xword sh_size;
-            Elf_Xword sh_entsize;
+            uint64_t sh_addr;
+            uint64_t sh_offset;
+            uint64_t sh_size;
+            uint64_t sh_entsize;
             uint32_t sh_link;
         };
         bool tried_to_load_sections = false;