From 88e692e89f817ea357caaac03048350b08e0466c Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Fri, 29 Mar 2013 22:32:22 -0400 Subject: [PATCH] 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. --- src/apps/debugger/controllers/ThreadHandler.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/apps/debugger/controllers/ThreadHandler.cpp b/src/apps/debugger/controllers/ThreadHandler.cpp index c728dba3fd..72e519b70b 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,