RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 12:17:35 +00:00
Code Issues Activity Actions

LibELF: Ignore $x/$d special symbols when symbolicating AArch64 ELF

Browse source 
Similarly, ignore STT_SECTION symbols, which show up as the empty
string.

This change makes AArch64 backtraces symbolicate correctly.
This commit is contained in:
Daniel Bertalan 2023-05-30 15:36:44 +02:00 • committed by Andreas Kling
parent fb11645a9b
commit 23be1c5482
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Userland/Libraries/LibELF/Image.cpp
View file

@ -421,7 +421,16 @@ Optional<Image::Symbol> Image::find_symbol(FlatPtr address, u32* out_offset) con
NEVER_INLINE void Image::sort_symbols() const NEVER_INLINE void Image::sort_symbols() const
{ {
m_sorted_symbols.ensure_capacity(symbol_count()); m_sorted_symbols.ensure_capacity(symbol_count());
for_each_symbol([this](auto const& symbol) { bool const is_aarch64 = header().e_machine == EM_AARCH64;
for_each_symbol([this, is_aarch64](auto const& symbol) {
// The AArch64 ABI marks the boundaries of literal pools in a function with $x/$d.
// https://github.com/ARM-software/abi-aa/blob/2023q1-release/aaelf64/aaelf64.rst#mapping-symbols
// Skip them so we don't accidentally print these instead of function names.
if (is_aarch64 && (symbol.name().starts_with("$x"sv) || symbol.name().starts_with("$d"sv)))
return;
// STT_SECTION has the same address as the first function in the section, but shows up as the empty string.
if (symbol.type() == STT_SECTION)
return;
m_sorted_symbols.append({ symbol.value(), symbol.name(), {}, symbol }); m_sorted_symbols.append({ symbol.value(), symbol.name(), {}, symbol });
}); });
quick_sort(m_sorted_symbols, [](auto& a, auto& b) { quick_sort(m_sorted_symbols, [](auto& a, auto& b) {