RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-20 11:45:06 +00:00
Code Issues Activity Actions

HackStudio: Make debugger support shared libraries

Browse source
This commit is contained in:
Itamar 2021-01-06 22:00:53 +02:00 • committed by Andreas Kling
parent dcdb68a013
commit 94db04fc12
7 changed files with 55 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

7
DevTools/HackStudio/Debugger/DisassemblyModel.cpp
View file

@ -38,7 +38,10 @@ namespace HackStudio {
DisassemblyModel::DisassemblyModel(const Debug::DebugSession& debug_session, const PtraceRegisters& regs)
{
auto containing_function = debug_session.debug_info().get_containing_function(regs.eip);
auto lib = debug_session.library_at(regs.eip);
if (!lib)
return;
auto containing_function = lib->debug_info->get_containing_function(regs.eip - lib->base_address);
if (!containing_function.has_value()) {
dbgln("Cannot disassemble as the containing function was not found.");
return;
@ -54,7 +57,7 @@ DisassemblyModel::DisassemblyModel(const Debug::DebugSession& debug_session, con
kernel_elf = make<ELF::Image>((const u8*)kernel_file->data(), kernel_file->size());
elf = kernel_elf.ptr();
} else {
elf = &debug_session.elf();
elf = &lib->debug_info->elf();
}
auto symbol = elf->find_symbol(containing_function.value().address_low);