hrev45427 adds 1 changeset to branch 'master' old head: d5c2d47e5d8e0fb577bf06a6bcb3168a541be87b new head: 88e692e89f817ea357caaac03048350b08e0466c overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=88e692e+%5Ed5c2d47 ---------------------------------------------------------------------------- 88e692e: Ignore calls whose purpose is to calculate the GOT address. - Fixes several false positives where we'd show a return value for the current function. [ Rene Gollent <anevilyak@xxxxxxxxx> ] ---------------------------------------------------------------------------- Revision: hrev45427 Commit: 88e692e89f817ea357caaac03048350b08e0466c URL: http://cgit.haiku-os.org/haiku/commit/?id=88e692e Author: Rene Gollent <anevilyak@xxxxxxxxx> Date: Sat Mar 30 02:32:22 2013 UTC ---------------------------------------------------------------------------- 1 file changed, 2 insertions(+), 1 deletion(-) src/apps/debugger/controllers/ThreadHandler.cpp | 3 ++- ---------------------------------------------------------------------------- diff --git a/src/apps/debugger/controllers/ThreadHandler.cpp b/src/apps/debugger/controllers/ThreadHandler.cpp index c728dba..72e519b 100644 --- a/src/apps/debugger/controllers/ThreadHandler.cpp +++ b/src/apps/debugger/controllers/ThreadHandler.cpp @@ -589,7 +589,8 @@ ThreadHandler::_HandleBreakpointHitStep(CpuState* cpuState) } } - if (fPreviousFrameAddress != 0) { + if (fPreviousFrameAddress != 0 && fSteppedOverFunctionAddress + != cpuState->InstructionPointer()) { TRACE_CONTROL("STEP_OVER: called function address %#" B_PRIx64 ", previous frame address: %#" B_PRIx64 ", frame address: %#" B_PRIx64 ", adding return info\n", fSteppedOverFunctionAddress,