From 5bca49162cb1403973d59b07c147bb3235fc0226 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Tue, 11 Aug 2020 12:44:35 +0200 Subject: [PATCH] LibELF: Remove unused cruft in ELF::Loader --- Libraries/LibELF/Loader.cpp | 17 ----------------- Libraries/LibELF/Loader.h | 16 ---------------- 2 files changed, 33 deletions(-) diff --git a/Libraries/LibELF/Loader.cpp b/Libraries/LibELF/Loader.cpp index e6b9b3af7a..f851fd9157 100644 --- a/Libraries/LibELF/Loader.cpp +++ b/Libraries/LibELF/Loader.cpp @@ -137,23 +137,6 @@ bool Loader::layout() return !failed; } -char* Loader::symbol_ptr(const char* name) const -{ - char* found_ptr = nullptr; - m_image.for_each_symbol([&](const Image::Symbol symbol) { - if (symbol.type() != STT_FUNC) - return IterationDecision::Continue; - if (symbol.name() != name) - return IterationDecision::Continue; - if (m_image.is_executable()) - found_ptr = (char*)(size_t)symbol.value(); - else - ASSERT_NOT_REACHED(); - return IterationDecision::Break; - }); - return found_ptr; -} - Optional Loader::find_demangled_function(const String& name) const { Optional found; diff --git a/Libraries/LibELF/Loader.h b/Libraries/LibELF/Loader.h index a349800515..c9f4d3435d 100644 --- a/Libraries/LibELF/Loader.h +++ b/Libraries/LibELF/Loader.h @@ -59,7 +59,6 @@ public: return m_image.entry(); } const Image& image() const { return m_image; } - char* symbol_ptr(const char* name) const; Optional find_demangled_function(const String& name) const; bool has_symbols() const { return m_symbol_count; } @@ -71,22 +70,7 @@ private: explicit Loader(const u8*, size_t, bool verbose_logging); bool layout(); - bool perform_relocations(); - void* lookup(const ELF::Image::Symbol&); - char* area_for_section(const ELF::Image::Section&); - char* area_for_section_name(const char*); - struct PtrAndSize { - PtrAndSize() {} - PtrAndSize(char* p, unsigned s) - : ptr(p) - , size(s) - { - } - - char* ptr { nullptr }; - unsigned size { 0 }; - }; Image m_image; size_t m_symbol_count { 0 };