system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-10-16 21:04:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

LibX86: Take load base address into consideration during disassembly

Browse source 
Since our executables are position-independent, the address values
extraced from processes don't correspond to their values within the ELF
file. We have to offset the absolute addresses by the load base address
to get the relative symbol that we need for disassembly.
This commit is contained in:
Daniel Bertalan 2021-10-25 11:09:33 +02:00 committed by Andreas Kling
parent 7c27ba1240
commit 15a14d3d21
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Userland/DevTools/Profiler/DisassemblyModel.cpp
View file

@ -87,7 +87,7 @@ DisassemblyModel::DisassemblyModel(Profile& profile, ProfileNode& node)
auto symbol_offset_from_function_start = node.address() - base_address - symbol->value();
auto view = symbol.value().raw_data().substring_view(symbol_offset_from_function_start);
X86::ELFSymbolProvider symbol_provider(*elf);
X86::ELFSymbolProvider symbol_provider(*elf, base_address);
X86::SimpleInstructionStream stream((const u8*)view.characters_without_null_termination(), view.length());
X86::Disassembler disassembler(stream);

8
Userland/Libraries/LibX86/ELFSymbolProvider.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, the SerenityOS developers.
* Copyright (c) 2020-2021, the SerenityOS developers.
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@ -13,17 +13,19 @@ namespace X86 {
class ELFSymbolProvider final : public SymbolProvider {
public:
ELFSymbolProvider(const ELF::Image& elf)
ELFSymbolProvider(const ELF::Image& elf, FlatPtr base_address = 0)
: m_elf(elf)
, m_base_address(base_address)
{
}
virtual String symbolicate(FlatPtr address, u32* offset = nullptr) const override
{
return m_elf.symbolicate(address, offset);
return m_elf.symbolicate(address - m_base_address, offset);
}
private:
const ELF::Image& m_elf;
FlatPtr m_base_address;
};
}