Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Properly handle recursive case for Step Over.

Browse Source 
When stepping over, check to ensure that we're in the same call
frame that we started in. If not, reinstate the temporary breakpoint
and continue running.
This commit is contained in:
Rene Gollent 2011-12-13 18:32:30 -05:00
parent 96587f1356
commit c3946ba021
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/apps/debugger/ThreadHandler.cpp
View File

@ -324,6 +324,7 @@ ThreadHandler::HandleThreadAction(uint32 action)
fStepMode = STEP_INTO;
_SingleStepThread(frame->GetCpuState()->InstructionPointer());
} else {
fPreviousFrameAddress = cpuState->StackFramePointer();
// step over
fStepMode = STEP_OVER;
if (!_DoStepOver(frame->GetCpuState()))
@ -557,6 +558,18 @@ ThreadHandler::_HandleBreakpointHitStep(CpuState* cpuState)
switch (fStepMode) {
case STEP_OVER:
{
// If we're in the same frame we started in, keep executing.
if (cpuState->StackFramePointer() != fPreviousFrameAddress)
{
status_t error = _InstallTemporaryBreakpoint(
cpuState->InstructionPointer());
if (error != B_OK)
_StepFallback();
else
_RunThread(cpuState->InstructionPointer());
return true;
}
// If we're still in the statement, we continue single-stepping,
// otherwise we're done.
if (fStepStatement->ContainsAddress(
@ -565,11 +578,9 @@ ThreadHandler::_HandleBreakpointHitStep(CpuState* cpuState)
_StepFallback();
return true;
}
// TODO: this needs to handle recursive cases properly as
// STEP_OUT does, we need to have exited the statement
// *and* be back in the call frame we started in.
fPreviousFrameAddress = 0;
return false;
}
case STEP_INTO:
// Should never happen -- we don't set a breakpoint in this case.