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

LibCoreDump: Use "eip - 1" when creating backtrace entries

Browse source 
We need to do this because the return address from a function frame is
the instruction that comes after the 'call' instruction.
This commit is contained in:
Itamar 2021-06-19 11:32:08 +03:00 • committed by Andreas Kling
parent d26f4f9e8c
commit a45ce0c6eb
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Userland/Libraries/LibCoreDump/Backtrace.cpp
View file

@ -54,7 +54,10 @@ Backtrace::Backtrace(const Reader& coredump, const ELF::Core::ThreadInfo& thread
uint32_t* ebp = (uint32_t*)m_thread_info.regs.ebp; uint32_t* ebp = (uint32_t*)m_thread_info.regs.ebp;
uint32_t* eip = (uint32_t*)m_thread_info.regs.eip; uint32_t* eip = (uint32_t*)m_thread_info.regs.eip;
while (ebp && eip) { while (ebp && eip) {
add_entry(coredump, (FlatPtr)eip); // We use eip - 1 because the return address from a function frame
// is the instruction that comes after the 'call' instruction.
VERIFY((FlatPtr)eip > 0);
add_entry(coredump, (FlatPtr)eip - 1);
auto next_eip = coredump.peek_memory((FlatPtr)(ebp + 1)); auto next_eip = coredump.peek_memory((FlatPtr)(ebp + 1));
auto next_ebp = coredump.peek_memory((FlatPtr)(ebp)); auto next_ebp = coredump.peek_memory((FlatPtr)(ebp));
if (!next_eip.has_value() || !next_ebp.has_value()) if (!next_eip.has_value() || !next_ebp.has_value())