2010-06-09 00:52:24 +08:00
|
|
|
//===-- ThreadPlanStepInRange.cpp -------------------------------*- C++ -*-===//
|
|
|
|
//
|
|
|
|
// The LLVM Compiler Infrastructure
|
|
|
|
//
|
|
|
|
// This file is distributed under the University of Illinois Open Source
|
|
|
|
// License. See LICENSE.TXT for details.
|
|
|
|
//
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
|
|
|
|
#include "lldb/Target/ThreadPlanStepInRange.h"
|
|
|
|
|
|
|
|
// C Includes
|
|
|
|
// C++ Includes
|
|
|
|
// Other libraries and framework includes
|
|
|
|
// Project includes
|
|
|
|
|
|
|
|
#include "lldb/lldb-private-log.h"
|
|
|
|
#include "lldb/Core/Log.h"
|
|
|
|
#include "lldb/Core/Stream.h"
|
2010-07-10 10:27:39 +08:00
|
|
|
#include "lldb/Symbol/Symbol.h"
|
2010-09-16 08:58:09 +08:00
|
|
|
#include "lldb/Symbol/Function.h"
|
2010-06-09 00:52:24 +08:00
|
|
|
#include "lldb/Target/Process.h"
|
|
|
|
#include "lldb/Target/RegisterContext.h"
|
2011-02-16 05:59:32 +08:00
|
|
|
#include "lldb/Target/Target.h"
|
2010-06-09 00:52:24 +08:00
|
|
|
#include "lldb/Target/Thread.h"
|
|
|
|
#include "lldb/Target/ThreadPlanStepOut.h"
|
|
|
|
#include "lldb/Target/ThreadPlanStepThrough.h"
|
2010-07-10 10:27:39 +08:00
|
|
|
#include "lldb/Core/RegularExpression.h"
|
2010-06-09 00:52:24 +08:00
|
|
|
|
|
|
|
using namespace lldb;
|
|
|
|
using namespace lldb_private;
|
|
|
|
|
|
|
|
uint32_t ThreadPlanStepInRange::s_default_flag_values = ThreadPlanShouldStopHere::eAvoidNoDebug;
|
|
|
|
|
|
|
|
//----------------------------------------------------------------------
|
|
|
|
// ThreadPlanStepInRange: Step through a stack range, either stepping over or into
|
|
|
|
// based on the value of \a type.
|
|
|
|
//----------------------------------------------------------------------
|
|
|
|
|
|
|
|
ThreadPlanStepInRange::ThreadPlanStepInRange
|
|
|
|
(
|
|
|
|
Thread &thread,
|
|
|
|
const AddressRange &range,
|
|
|
|
const SymbolContext &addr_context,
|
|
|
|
lldb::RunMode stop_others
|
|
|
|
) :
|
2010-06-19 12:45:32 +08:00
|
|
|
ThreadPlanStepRange (ThreadPlan::eKindStepInRange, "Step Range stepping in", thread, range, addr_context, stop_others),
|
2010-09-16 08:58:09 +08:00
|
|
|
ThreadPlanShouldStopHere (this, ThreadPlanStepInRange::DefaultShouldStopHereCallback, NULL),
|
2012-09-07 09:11:44 +08:00
|
|
|
m_step_past_prologue (true),
|
|
|
|
m_virtual_step (false)
|
2010-06-09 00:52:24 +08:00
|
|
|
{
|
|
|
|
SetFlagsToDefault ();
|
|
|
|
}
|
|
|
|
|
Fixed a few bugs in the "step in" thread plan logic.
Added a "step-in-target" flag to "thread step-in" so if you have something like:
Process 28464 stopped
* thread #1: tid = 0x1c03, function: main , stop reason = breakpoint 1.1
frame #0: 0x0000000100000e08 a.out`main at main.c:62
61
-> 62 int A6 = complex (a(4), b(5), c(6)); // Stop here to step targetting b and hitting breakpoint.
63
and you want to get into "complex" skipping a, b and c, you can do:
(lldb) step -t complex
Process 28464 stopped
* thread #1: tid = 0x1c03, function: complex , stop reason = step in
frame #0: 0x0000000100000d0d a.out`complex at main.c:44
41
42 int complex (int first, int second, int third)
43 {
-> 44 return first + second + third; // Step in targetting complex should stop here
45 }
46
47 int main (int argc, char const *argv[])
llvm-svn: 170008
2012-12-13 03:58:40 +08:00
|
|
|
ThreadPlanStepInRange::ThreadPlanStepInRange
|
|
|
|
(
|
|
|
|
Thread &thread,
|
|
|
|
const AddressRange &range,
|
|
|
|
const SymbolContext &addr_context,
|
|
|
|
const char *step_into_target,
|
|
|
|
lldb::RunMode stop_others
|
|
|
|
) :
|
|
|
|
ThreadPlanStepRange (ThreadPlan::eKindStepInRange, "Step Range stepping in", thread, range, addr_context, stop_others),
|
|
|
|
ThreadPlanShouldStopHere (this, ThreadPlanStepInRange::DefaultShouldStopHereCallback, NULL),
|
|
|
|
m_step_past_prologue (true),
|
|
|
|
m_virtual_step (false),
|
|
|
|
m_step_into_target (step_into_target)
|
|
|
|
{
|
|
|
|
SetFlagsToDefault ();
|
|
|
|
}
|
|
|
|
|
2010-06-09 00:52:24 +08:00
|
|
|
ThreadPlanStepInRange::~ThreadPlanStepInRange ()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
ThreadPlanStepInRange::GetDescription (Stream *s, lldb::DescriptionLevel level)
|
|
|
|
{
|
|
|
|
if (level == lldb::eDescriptionLevelBrief)
|
|
|
|
s->Printf("step in");
|
|
|
|
else
|
|
|
|
{
|
|
|
|
s->Printf ("Stepping through range (stepping into functions): ");
|
2011-10-15 08:24:48 +08:00
|
|
|
DumpRanges(s);
|
2013-07-19 05:48:26 +08:00
|
|
|
const char *step_into_target = m_step_into_target.AsCString();
|
|
|
|
if (step_into_target && step_into_target[0] != '\0')
|
|
|
|
s->Printf (" targeting %s.", m_step_into_target.AsCString());
|
|
|
|
else
|
|
|
|
s->PutChar('.');
|
2010-06-09 00:52:24 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
bool
|
|
|
|
ThreadPlanStepInRange::ShouldStop (Event *event_ptr)
|
|
|
|
{
|
2013-03-28 07:08:40 +08:00
|
|
|
Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP));
|
2010-06-09 00:52:24 +08:00
|
|
|
|
|
|
|
if (log)
|
|
|
|
{
|
|
|
|
StreamString s;
|
2011-02-16 05:59:32 +08:00
|
|
|
s.Address (m_thread.GetRegisterContext()->GetPC(),
|
2012-02-21 08:09:25 +08:00
|
|
|
m_thread.CalculateTarget()->GetArchitecture().GetAddressByteSize());
|
2010-06-09 00:52:24 +08:00
|
|
|
log->Printf("ThreadPlanStepInRange reached %s.", s.GetData());
|
|
|
|
}
|
|
|
|
|
2011-12-03 09:52:59 +08:00
|
|
|
if (IsPlanComplete())
|
|
|
|
return true;
|
|
|
|
|
2013-07-19 05:48:26 +08:00
|
|
|
m_no_more_plans = false;
|
|
|
|
if (m_sub_plan_sp && m_sub_plan_sp->IsPlanComplete())
|
|
|
|
{
|
|
|
|
if (!m_sub_plan_sp->PlanSucceeded())
|
|
|
|
{
|
|
|
|
SetPlanComplete();
|
|
|
|
m_no_more_plans = true;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
m_sub_plan_sp.reset();
|
|
|
|
}
|
|
|
|
|
2012-09-07 09:11:44 +08:00
|
|
|
if (m_virtual_step)
|
2010-11-05 08:18:21 +08:00
|
|
|
{
|
2012-09-07 09:11:44 +08:00
|
|
|
// If we've just completed a virtual step, all we need to do is check for a ShouldStopHere plan, and otherwise
|
|
|
|
// we're done.
|
2013-07-19 05:48:26 +08:00
|
|
|
m_sub_plan_sp = InvokeShouldStopHereCallback();
|
2010-11-05 08:18:21 +08:00
|
|
|
}
|
2012-09-07 09:11:44 +08:00
|
|
|
else
|
2010-11-05 08:18:21 +08:00
|
|
|
{
|
2012-10-26 06:30:09 +08:00
|
|
|
// Stepping through should be done running other threads in general, since we're setting a breakpoint and
|
|
|
|
// continuing. So only stop others if we are explicitly told to do so.
|
2012-03-09 12:10:47 +08:00
|
|
|
|
2012-09-07 09:11:44 +08:00
|
|
|
bool stop_others;
|
2012-10-26 06:30:09 +08:00
|
|
|
if (m_stop_others == lldb::eOnlyThisThread)
|
2012-09-07 09:11:44 +08:00
|
|
|
stop_others = false;
|
2012-10-26 06:30:09 +08:00
|
|
|
else
|
|
|
|
stop_others = true;
|
2010-09-16 08:58:09 +08:00
|
|
|
|
2012-09-07 09:11:44 +08:00
|
|
|
FrameComparison frame_order = CompareCurrentFrameToStartFrame();
|
|
|
|
|
|
|
|
if (frame_order == eFrameCompareOlder)
|
|
|
|
{
|
|
|
|
// If we're in an older frame then we should stop.
|
|
|
|
//
|
|
|
|
// A caveat to this is if we think the frame is older but we're actually in a trampoline.
|
|
|
|
// I'm going to make the assumption that you wouldn't RETURN to a trampoline. So if we are
|
|
|
|
// in a trampoline we think the frame is older because the trampoline confused the backtracer.
|
2013-07-19 05:48:26 +08:00
|
|
|
m_sub_plan_sp = m_thread.QueueThreadPlanForStepThrough (m_stack_id, false, stop_others);
|
|
|
|
if (!m_sub_plan_sp)
|
2012-09-07 09:11:44 +08:00
|
|
|
return true;
|
|
|
|
else if (log)
|
2010-09-16 08:58:09 +08:00
|
|
|
{
|
2012-09-07 09:11:44 +08:00
|
|
|
log->Printf("Thought I stepped out, but in fact arrived at a trampoline.");
|
2010-09-16 08:58:09 +08:00
|
|
|
}
|
2012-09-07 09:11:44 +08:00
|
|
|
|
|
|
|
}
|
|
|
|
else if (frame_order == eFrameCompareEqual && InSymbol())
|
|
|
|
{
|
|
|
|
// If we are not in a place we should step through, we're done.
|
|
|
|
// One tricky bit here is that some stubs don't push a frame, so we have to check
|
|
|
|
// both the case of a frame that is younger, or the same as this frame.
|
|
|
|
// However, if the frame is the same, and we are still in the symbol we started
|
|
|
|
// in, the we don't need to do this. This first check isn't strictly necessary,
|
|
|
|
// but it is more efficient.
|
|
|
|
|
|
|
|
// If we're still in the range, keep going, either by running to the next branch breakpoint, or by
|
|
|
|
// stepping.
|
|
|
|
if (InRange())
|
2010-09-16 08:58:09 +08:00
|
|
|
{
|
2012-09-07 09:11:44 +08:00
|
|
|
SetNextBranchBreakpoint();
|
|
|
|
return false;
|
2010-09-16 08:58:09 +08:00
|
|
|
}
|
2012-09-07 09:11:44 +08:00
|
|
|
|
|
|
|
SetPlanComplete();
|
Fixed a few bugs in the "step in" thread plan logic.
Added a "step-in-target" flag to "thread step-in" so if you have something like:
Process 28464 stopped
* thread #1: tid = 0x1c03, function: main , stop reason = breakpoint 1.1
frame #0: 0x0000000100000e08 a.out`main at main.c:62
61
-> 62 int A6 = complex (a(4), b(5), c(6)); // Stop here to step targetting b and hitting breakpoint.
63
and you want to get into "complex" skipping a, b and c, you can do:
(lldb) step -t complex
Process 28464 stopped
* thread #1: tid = 0x1c03, function: complex , stop reason = step in
frame #0: 0x0000000100000d0d a.out`complex at main.c:44
41
42 int complex (int first, int second, int third)
43 {
-> 44 return first + second + third; // Step in targetting complex should stop here
45 }
46
47 int main (int argc, char const *argv[])
llvm-svn: 170008
2012-12-13 03:58:40 +08:00
|
|
|
m_no_more_plans = true;
|
2012-09-07 09:11:44 +08:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
// If we get to this point, we're not going to use a previously set "next branch" breakpoint, so delete it:
|
|
|
|
ClearNextBranchBreakpoint();
|
|
|
|
|
|
|
|
// We may have set the plan up above in the FrameIsOlder section:
|
|
|
|
|
2013-07-19 05:48:26 +08:00
|
|
|
if (!m_sub_plan_sp)
|
|
|
|
m_sub_plan_sp = m_thread.QueueThreadPlanForStepThrough (m_stack_id, false, stop_others);
|
2012-09-07 09:11:44 +08:00
|
|
|
|
|
|
|
if (log)
|
|
|
|
{
|
2013-07-19 05:48:26 +08:00
|
|
|
if (m_sub_plan_sp)
|
|
|
|
log->Printf ("Found a step through plan: %s", m_sub_plan_sp->GetName());
|
2012-09-07 09:11:44 +08:00
|
|
|
else
|
|
|
|
log->Printf ("No step through plan found.");
|
|
|
|
}
|
|
|
|
|
|
|
|
// If not, give the "should_stop" callback a chance to push a plan to get us out of here.
|
|
|
|
// But only do that if we actually have stepped in.
|
2013-07-19 05:48:26 +08:00
|
|
|
if (!m_sub_plan_sp && frame_order == eFrameCompareYounger)
|
|
|
|
m_sub_plan_sp = InvokeShouldStopHereCallback();
|
2012-09-07 09:11:44 +08:00
|
|
|
|
|
|
|
// If we've stepped in and we are going to stop here, check to see if we were asked to
|
|
|
|
// run past the prologue, and if so do that.
|
|
|
|
|
2013-07-19 05:48:26 +08:00
|
|
|
if (!m_sub_plan_sp && frame_order == eFrameCompareYounger && m_step_past_prologue)
|
2012-09-07 09:11:44 +08:00
|
|
|
{
|
2013-11-04 17:33:30 +08:00
|
|
|
lldb::StackFrameSP curr_frame = m_thread.GetStackFrameAtIndex(0);
|
2012-09-07 09:11:44 +08:00
|
|
|
if (curr_frame)
|
2010-09-16 08:58:09 +08:00
|
|
|
{
|
2012-09-07 09:11:44 +08:00
|
|
|
size_t bytes_to_skip = 0;
|
|
|
|
lldb::addr_t curr_addr = m_thread.GetRegisterContext()->GetPC();
|
|
|
|
Address func_start_address;
|
|
|
|
|
|
|
|
SymbolContext sc = curr_frame->GetSymbolContext (eSymbolContextFunction | eSymbolContextSymbol);
|
|
|
|
|
|
|
|
if (sc.function)
|
|
|
|
{
|
|
|
|
func_start_address = sc.function->GetAddressRange().GetBaseAddress();
|
|
|
|
if (curr_addr == func_start_address.GetLoadAddress(m_thread.CalculateTarget().get()))
|
|
|
|
bytes_to_skip = sc.function->GetPrologueByteSize();
|
|
|
|
}
|
|
|
|
else if (sc.symbol)
|
|
|
|
{
|
|
|
|
func_start_address = sc.symbol->GetAddress();
|
|
|
|
if (curr_addr == func_start_address.GetLoadAddress(m_thread.CalculateTarget().get()))
|
|
|
|
bytes_to_skip = sc.symbol->GetPrologueByteSize();
|
|
|
|
}
|
|
|
|
|
|
|
|
if (bytes_to_skip != 0)
|
|
|
|
{
|
|
|
|
func_start_address.Slide (bytes_to_skip);
|
|
|
|
log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP);
|
|
|
|
if (log)
|
|
|
|
log->Printf ("Pushing past prologue ");
|
|
|
|
|
2013-07-19 05:48:26 +08:00
|
|
|
m_sub_plan_sp = m_thread.QueueThreadPlanForRunToAddress(false, func_start_address,true);
|
2012-09-07 09:11:44 +08:00
|
|
|
}
|
2010-09-16 08:58:09 +08:00
|
|
|
}
|
|
|
|
}
|
2012-09-07 09:11:44 +08:00
|
|
|
}
|
2010-09-16 08:58:09 +08:00
|
|
|
|
2013-07-19 05:48:26 +08:00
|
|
|
if (!m_sub_plan_sp)
|
2010-09-16 08:58:09 +08:00
|
|
|
{
|
2010-06-09 00:52:24 +08:00
|
|
|
m_no_more_plans = true;
|
|
|
|
SetPlanComplete();
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
m_no_more_plans = false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
ThreadPlanStepInRange::SetFlagsToDefault ()
|
|
|
|
{
|
|
|
|
GetFlags().Set(ThreadPlanStepInRange::s_default_flag_values);
|
|
|
|
}
|
|
|
|
|
2010-07-10 10:27:39 +08:00
|
|
|
void
|
|
|
|
ThreadPlanStepInRange::SetAvoidRegexp(const char *name)
|
|
|
|
{
|
|
|
|
if (m_avoid_regexp_ap.get() == NULL)
|
|
|
|
m_avoid_regexp_ap.reset (new RegularExpression(name));
|
|
|
|
|
|
|
|
m_avoid_regexp_ap->Compile (name);
|
|
|
|
}
|
|
|
|
|
2010-06-09 00:52:24 +08:00
|
|
|
void
|
|
|
|
ThreadPlanStepInRange::SetDefaultFlagValue (uint32_t new_value)
|
|
|
|
{
|
|
|
|
// TODO: Should we test this for sanity?
|
|
|
|
ThreadPlanStepInRange::s_default_flag_values = new_value;
|
|
|
|
}
|
|
|
|
|
2010-07-10 10:27:39 +08:00
|
|
|
bool
|
|
|
|
ThreadPlanStepInRange::FrameMatchesAvoidRegexp ()
|
|
|
|
{
|
2013-11-04 17:33:30 +08:00
|
|
|
StackFrame *frame = GetThread().GetStackFrameAtIndex(0).get();
|
2010-07-10 10:27:39 +08:00
|
|
|
|
2012-08-23 01:17:09 +08:00
|
|
|
const RegularExpression *avoid_regexp_to_use = m_avoid_regexp_ap.get();
|
2010-09-08 11:14:33 +08:00
|
|
|
if (avoid_regexp_to_use == NULL)
|
|
|
|
avoid_regexp_to_use = GetThread().GetSymbolsToAvoidRegexp();
|
|
|
|
|
|
|
|
if (avoid_regexp_to_use != NULL)
|
2010-07-10 10:27:39 +08:00
|
|
|
{
|
2012-07-13 08:19:40 +08:00
|
|
|
SymbolContext sc = frame->GetSymbolContext(eSymbolContextFunction|eSymbolContextBlock|eSymbolContextSymbol);
|
2010-07-10 10:27:39 +08:00
|
|
|
if (sc.symbol != NULL)
|
|
|
|
{
|
2012-07-13 08:19:40 +08:00
|
|
|
const char *frame_function_name = sc.GetFunctionName().GetCString();
|
|
|
|
if (frame_function_name)
|
2013-03-15 05:44:36 +08:00
|
|
|
{
|
2013-03-15 06:00:18 +08:00
|
|
|
size_t num_matches = 0;
|
2013-03-28 07:08:40 +08:00
|
|
|
Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP));
|
2013-03-15 06:00:18 +08:00
|
|
|
if (log)
|
|
|
|
num_matches = 1;
|
2013-04-04 05:37:16 +08:00
|
|
|
|
|
|
|
RegularExpression::Match regex_match(num_matches);
|
|
|
|
|
|
|
|
bool return_value = avoid_regexp_to_use->Execute(frame_function_name, ®ex_match);
|
2013-03-15 05:44:36 +08:00
|
|
|
if (return_value)
|
|
|
|
{
|
|
|
|
if (log)
|
2013-03-15 06:00:18 +08:00
|
|
|
{
|
|
|
|
std::string match;
|
2013-04-04 05:37:16 +08:00
|
|
|
regex_match.GetMatchAtIndex(frame_function_name,0, match);
|
2013-03-15 06:00:18 +08:00
|
|
|
log->Printf ("Stepping out of function \"%s\" because it matches the avoid regexp \"%s\" - match substring: \"%s\".",
|
2013-03-15 05:44:36 +08:00
|
|
|
frame_function_name,
|
2013-03-15 06:00:18 +08:00
|
|
|
avoid_regexp_to_use->GetText(),
|
|
|
|
match.c_str());
|
|
|
|
}
|
2013-03-15 05:44:36 +08:00
|
|
|
|
|
|
|
}
|
|
|
|
return return_value;
|
|
|
|
}
|
2010-07-10 10:27:39 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2013-07-19 05:48:26 +08:00
|
|
|
ThreadPlanSP
|
2010-06-09 00:52:24 +08:00
|
|
|
ThreadPlanStepInRange::DefaultShouldStopHereCallback (ThreadPlan *current_plan, Flags &flags, void *baton)
|
|
|
|
{
|
2010-07-10 10:27:39 +08:00
|
|
|
bool should_step_out = false;
|
2013-11-04 17:33:30 +08:00
|
|
|
StackFrame *frame = current_plan->GetThread().GetStackFrameAtIndex(0).get();
|
2013-03-28 07:08:40 +08:00
|
|
|
Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP));
|
2010-07-10 10:27:39 +08:00
|
|
|
|
2010-10-27 11:32:59 +08:00
|
|
|
if (flags.Test(eAvoidNoDebug))
|
2010-06-09 00:52:24 +08:00
|
|
|
{
|
|
|
|
if (!frame->HasDebugInformation())
|
2010-09-15 08:06:51 +08:00
|
|
|
{
|
|
|
|
if (log)
|
|
|
|
log->Printf ("Stepping out of frame with no debug info");
|
|
|
|
|
2010-07-10 10:27:39 +08:00
|
|
|
should_step_out = true;
|
2010-09-15 08:06:51 +08:00
|
|
|
}
|
2010-07-10 10:27:39 +08:00
|
|
|
}
|
|
|
|
|
Fixed a few bugs in the "step in" thread plan logic.
Added a "step-in-target" flag to "thread step-in" so if you have something like:
Process 28464 stopped
* thread #1: tid = 0x1c03, function: main , stop reason = breakpoint 1.1
frame #0: 0x0000000100000e08 a.out`main at main.c:62
61
-> 62 int A6 = complex (a(4), b(5), c(6)); // Stop here to step targetting b and hitting breakpoint.
63
and you want to get into "complex" skipping a, b and c, you can do:
(lldb) step -t complex
Process 28464 stopped
* thread #1: tid = 0x1c03, function: complex , stop reason = step in
frame #0: 0x0000000100000d0d a.out`complex at main.c:44
41
42 int complex (int first, int second, int third)
43 {
-> 44 return first + second + third; // Step in targetting complex should stop here
45 }
46
47 int main (int argc, char const *argv[])
llvm-svn: 170008
2012-12-13 03:58:40 +08:00
|
|
|
if (current_plan->GetKind() == eKindStepInRange)
|
2010-07-10 10:27:39 +08:00
|
|
|
{
|
Fixed a few bugs in the "step in" thread plan logic.
Added a "step-in-target" flag to "thread step-in" so if you have something like:
Process 28464 stopped
* thread #1: tid = 0x1c03, function: main , stop reason = breakpoint 1.1
frame #0: 0x0000000100000e08 a.out`main at main.c:62
61
-> 62 int A6 = complex (a(4), b(5), c(6)); // Stop here to step targetting b and hitting breakpoint.
63
and you want to get into "complex" skipping a, b and c, you can do:
(lldb) step -t complex
Process 28464 stopped
* thread #1: tid = 0x1c03, function: complex , stop reason = step in
frame #0: 0x0000000100000d0d a.out`complex at main.c:44
41
42 int complex (int first, int second, int third)
43 {
-> 44 return first + second + third; // Step in targetting complex should stop here
45 }
46
47 int main (int argc, char const *argv[])
llvm-svn: 170008
2012-12-13 03:58:40 +08:00
|
|
|
ThreadPlanStepInRange *step_in_range_plan = static_cast<ThreadPlanStepInRange *> (current_plan);
|
|
|
|
if (step_in_range_plan->m_step_into_target)
|
|
|
|
{
|
|
|
|
SymbolContext sc = frame->GetSymbolContext(eSymbolContextFunction|eSymbolContextBlock|eSymbolContextSymbol);
|
|
|
|
if (sc.symbol != NULL)
|
|
|
|
{
|
|
|
|
// First try an exact match, since that's cheap with ConstStrings. Then do a strstr compare.
|
|
|
|
if (step_in_range_plan->m_step_into_target == sc.GetFunctionName())
|
|
|
|
{
|
|
|
|
should_step_out = false;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
const char *target_name = step_in_range_plan->m_step_into_target.AsCString();
|
|
|
|
const char *function_name = sc.GetFunctionName().AsCString();
|
|
|
|
|
|
|
|
if (function_name == NULL)
|
|
|
|
should_step_out = true;
|
|
|
|
else if (strstr (function_name, target_name) == NULL)
|
|
|
|
should_step_out = true;
|
|
|
|
}
|
2013-03-15 05:44:36 +08:00
|
|
|
if (log && should_step_out)
|
|
|
|
log->Printf("Stepping out of frame %s which did not match step into target %s.",
|
|
|
|
sc.GetFunctionName().AsCString(),
|
|
|
|
step_in_range_plan->m_step_into_target.AsCString());
|
Fixed a few bugs in the "step in" thread plan logic.
Added a "step-in-target" flag to "thread step-in" so if you have something like:
Process 28464 stopped
* thread #1: tid = 0x1c03, function: main , stop reason = breakpoint 1.1
frame #0: 0x0000000100000e08 a.out`main at main.c:62
61
-> 62 int A6 = complex (a(4), b(5), c(6)); // Stop here to step targetting b and hitting breakpoint.
63
and you want to get into "complex" skipping a, b and c, you can do:
(lldb) step -t complex
Process 28464 stopped
* thread #1: tid = 0x1c03, function: complex , stop reason = step in
frame #0: 0x0000000100000d0d a.out`complex at main.c:44
41
42 int complex (int first, int second, int third)
43 {
-> 44 return first + second + third; // Step in targetting complex should stop here
45 }
46
47 int main (int argc, char const *argv[])
llvm-svn: 170008
2012-12-13 03:58:40 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!should_step_out)
|
2010-06-09 00:52:24 +08:00
|
|
|
{
|
2013-03-15 05:44:36 +08:00
|
|
|
ThreadPlanStepInRange *step_in_range_plan = static_cast<ThreadPlanStepInRange *> (current_plan);
|
|
|
|
// Don't log the should_step_out here, it's easier to do it in FrameMatchesAvoidRegexp.
|
|
|
|
should_step_out = step_in_range_plan->FrameMatchesAvoidRegexp ();
|
2010-06-09 00:52:24 +08:00
|
|
|
}
|
|
|
|
}
|
2010-07-10 10:27:39 +08:00
|
|
|
|
Fixed a few bugs in the "step in" thread plan logic.
Added a "step-in-target" flag to "thread step-in" so if you have something like:
Process 28464 stopped
* thread #1: tid = 0x1c03, function: main , stop reason = breakpoint 1.1
frame #0: 0x0000000100000e08 a.out`main at main.c:62
61
-> 62 int A6 = complex (a(4), b(5), c(6)); // Stop here to step targetting b and hitting breakpoint.
63
and you want to get into "complex" skipping a, b and c, you can do:
(lldb) step -t complex
Process 28464 stopped
* thread #1: tid = 0x1c03, function: complex , stop reason = step in
frame #0: 0x0000000100000d0d a.out`complex at main.c:44
41
42 int complex (int first, int second, int third)
43 {
-> 44 return first + second + third; // Step in targetting complex should stop here
45 }
46
47 int main (int argc, char const *argv[])
llvm-svn: 170008
2012-12-13 03:58:40 +08:00
|
|
|
|
2010-07-10 10:27:39 +08:00
|
|
|
if (should_step_out)
|
|
|
|
{
|
|
|
|
// FIXME: Make sure the ThreadPlanForStepOut does the right thing with inlined functions.
|
2012-10-26 06:30:09 +08:00
|
|
|
// We really should have all plans take the tri-state for "stop others" so we can do the right
|
|
|
|
// thing. For now let's be safe and always run others when we are likely to run arbitrary code.
|
|
|
|
const bool stop_others = false;
|
2011-01-21 14:11:58 +08:00
|
|
|
return current_plan->GetThread().QueueThreadPlanForStepOut (false,
|
|
|
|
NULL,
|
|
|
|
true,
|
2012-10-26 06:30:09 +08:00
|
|
|
stop_others,
|
2011-01-21 14:11:58 +08:00
|
|
|
eVoteNo,
|
|
|
|
eVoteNoOpinion,
|
|
|
|
0); // Frame index
|
2010-07-10 10:27:39 +08:00
|
|
|
}
|
2010-06-09 00:52:24 +08:00
|
|
|
|
2013-07-19 05:48:26 +08:00
|
|
|
return ThreadPlanSP();
|
2010-06-09 00:52:24 +08:00
|
|
|
}
|
2012-05-02 02:38:37 +08:00
|
|
|
|
|
|
|
bool
|
Figure out the reply to "PlanExplainsStop" once when we stop and then use the cached
value. This fixes problems, for instance, with the StepRange plans, where they know that
they explained the stop because they were at their "run to here" breakpoint, then deleted
that breakpoint, so when they got asked again, doh! I had done this for a couple of plans
in an ad hoc fashion, this just formalizes it.
Also add a "ResumeRequested" in Process so that the code in the completion handlers can
tell the ShouldStop logic they want to resume rather than just directly resuming. That allows
us to handle resuming in a more controlled fashion.
Also, SetPublicState can take a "restarted" flag, so that it doesn't drop the run lock when
the target was immediately restarted.
--This line, and those below , will be ignored--
M test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
M include/lldb/Target/ThreadList.h
M include/lldb/Target/ThreadPlanStepOut.h
M include/lldb/Target/Thread.h
M include/lldb/Target/ThreadPlanBase.h
M include/lldb/Target/ThreadPlanStepThrough.h
M include/lldb/Target/ThreadPlanStepInstruction.h
M include/lldb/Target/ThreadPlanStepInRange.h
M include/lldb/Target/ThreadPlanStepOverBreakpoint.h
M include/lldb/Target/ThreadPlanStepUntil.h
M include/lldb/Target/StopInfo.h
M include/lldb/Target/Process.h
M include/lldb/Target/ThreadPlanRunToAddress.h
M include/lldb/Target/ThreadPlan.h
M include/lldb/Target/ThreadPlanCallFunction.h
M include/lldb/Target/ThreadPlanStepOverRange.h
M source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.h
M source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.cpp
M source/Target/StopInfo.cpp
M source/Target/Process.cpp
M source/Target/ThreadPlanRunToAddress.cpp
M source/Target/ThreadPlan.cpp
M source/Target/ThreadPlanCallFunction.cpp
M source/Target/ThreadPlanStepOverRange.cpp
M source/Target/ThreadList.cpp
M source/Target/ThreadPlanStepOut.cpp
M source/Target/Thread.cpp
M source/Target/ThreadPlanBase.cpp
M source/Target/ThreadPlanStepThrough.cpp
M source/Target/ThreadPlanStepInstruction.cpp
M source/Target/ThreadPlanStepInRange.cpp
M source/Target/ThreadPlanStepOverBreakpoint.cpp
M source/Target/ThreadPlanStepUntil.cpp
M lldb.xcodeproj/xcshareddata/xcschemes/Run Testsuite.xcscheme
llvm-svn: 181381
2013-05-08 08:35:16 +08:00
|
|
|
ThreadPlanStepInRange::DoPlanExplainsStop (Event *event_ptr)
|
2012-05-02 02:38:37 +08:00
|
|
|
{
|
|
|
|
// We always explain a stop. Either we've just done a single step, in which
|
|
|
|
// case we'll do our ordinary processing, or we stopped for some
|
|
|
|
// reason that isn't handled by our sub-plans, in which case we want to just stop right
|
|
|
|
// away.
|
Fixed a few bugs in the "step in" thread plan logic.
Added a "step-in-target" flag to "thread step-in" so if you have something like:
Process 28464 stopped
* thread #1: tid = 0x1c03, function: main , stop reason = breakpoint 1.1
frame #0: 0x0000000100000e08 a.out`main at main.c:62
61
-> 62 int A6 = complex (a(4), b(5), c(6)); // Stop here to step targetting b and hitting breakpoint.
63
and you want to get into "complex" skipping a, b and c, you can do:
(lldb) step -t complex
Process 28464 stopped
* thread #1: tid = 0x1c03, function: complex , stop reason = step in
frame #0: 0x0000000100000d0d a.out`complex at main.c:44
41
42 int complex (int first, int second, int third)
43 {
-> 44 return first + second + third; // Step in targetting complex should stop here
45 }
46
47 int main (int argc, char const *argv[])
llvm-svn: 170008
2012-12-13 03:58:40 +08:00
|
|
|
// In general, we don't want to mark the plan as complete for unexplained stops.
|
|
|
|
// For instance, if you step in to some code with no debug info, so you step out
|
|
|
|
// and in the course of that hit a breakpoint, then you want to stop & show the user
|
|
|
|
// the breakpoint, but not unship the step in plan, since you still may want to complete that
|
|
|
|
// plan when you continue. This is particularly true when doing "step in to target function."
|
|
|
|
// stepping.
|
2012-05-02 02:38:37 +08:00
|
|
|
//
|
|
|
|
// The only variation is that if we are doing "step by running to next branch" in which case
|
|
|
|
// if we hit our branch breakpoint we don't set the plan to complete.
|
Figure out the reply to "PlanExplainsStop" once when we stop and then use the cached
value. This fixes problems, for instance, with the StepRange plans, where they know that
they explained the stop because they were at their "run to here" breakpoint, then deleted
that breakpoint, so when they got asked again, doh! I had done this for a couple of plans
in an ad hoc fashion, this just formalizes it.
Also add a "ResumeRequested" in Process so that the code in the completion handlers can
tell the ShouldStop logic they want to resume rather than just directly resuming. That allows
us to handle resuming in a more controlled fashion.
Also, SetPublicState can take a "restarted" flag, so that it doesn't drop the run lock when
the target was immediately restarted.
--This line, and those below , will be ignored--
M test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
M include/lldb/Target/ThreadList.h
M include/lldb/Target/ThreadPlanStepOut.h
M include/lldb/Target/Thread.h
M include/lldb/Target/ThreadPlanBase.h
M include/lldb/Target/ThreadPlanStepThrough.h
M include/lldb/Target/ThreadPlanStepInstruction.h
M include/lldb/Target/ThreadPlanStepInRange.h
M include/lldb/Target/ThreadPlanStepOverBreakpoint.h
M include/lldb/Target/ThreadPlanStepUntil.h
M include/lldb/Target/StopInfo.h
M include/lldb/Target/Process.h
M include/lldb/Target/ThreadPlanRunToAddress.h
M include/lldb/Target/ThreadPlan.h
M include/lldb/Target/ThreadPlanCallFunction.h
M include/lldb/Target/ThreadPlanStepOverRange.h
M source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.h
M source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.cpp
M source/Target/StopInfo.cpp
M source/Target/Process.cpp
M source/Target/ThreadPlanRunToAddress.cpp
M source/Target/ThreadPlan.cpp
M source/Target/ThreadPlanCallFunction.cpp
M source/Target/ThreadPlanStepOverRange.cpp
M source/Target/ThreadList.cpp
M source/Target/ThreadPlanStepOut.cpp
M source/Target/Thread.cpp
M source/Target/ThreadPlanBase.cpp
M source/Target/ThreadPlanStepThrough.cpp
M source/Target/ThreadPlanStepInstruction.cpp
M source/Target/ThreadPlanStepInRange.cpp
M source/Target/ThreadPlanStepOverBreakpoint.cpp
M source/Target/ThreadPlanStepUntil.cpp
M lldb.xcodeproj/xcshareddata/xcschemes/Run Testsuite.xcscheme
llvm-svn: 181381
2013-05-08 08:35:16 +08:00
|
|
|
|
|
|
|
bool return_value;
|
2012-05-02 02:38:37 +08:00
|
|
|
|
2012-09-07 09:11:44 +08:00
|
|
|
if (m_virtual_step)
|
2012-05-02 02:38:37 +08:00
|
|
|
{
|
Figure out the reply to "PlanExplainsStop" once when we stop and then use the cached
value. This fixes problems, for instance, with the StepRange plans, where they know that
they explained the stop because they were at their "run to here" breakpoint, then deleted
that breakpoint, so when they got asked again, doh! I had done this for a couple of plans
in an ad hoc fashion, this just formalizes it.
Also add a "ResumeRequested" in Process so that the code in the completion handlers can
tell the ShouldStop logic they want to resume rather than just directly resuming. That allows
us to handle resuming in a more controlled fashion.
Also, SetPublicState can take a "restarted" flag, so that it doesn't drop the run lock when
the target was immediately restarted.
--This line, and those below , will be ignored--
M test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
M include/lldb/Target/ThreadList.h
M include/lldb/Target/ThreadPlanStepOut.h
M include/lldb/Target/Thread.h
M include/lldb/Target/ThreadPlanBase.h
M include/lldb/Target/ThreadPlanStepThrough.h
M include/lldb/Target/ThreadPlanStepInstruction.h
M include/lldb/Target/ThreadPlanStepInRange.h
M include/lldb/Target/ThreadPlanStepOverBreakpoint.h
M include/lldb/Target/ThreadPlanStepUntil.h
M include/lldb/Target/StopInfo.h
M include/lldb/Target/Process.h
M include/lldb/Target/ThreadPlanRunToAddress.h
M include/lldb/Target/ThreadPlan.h
M include/lldb/Target/ThreadPlanCallFunction.h
M include/lldb/Target/ThreadPlanStepOverRange.h
M source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.h
M source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.cpp
M source/Target/StopInfo.cpp
M source/Target/Process.cpp
M source/Target/ThreadPlanRunToAddress.cpp
M source/Target/ThreadPlan.cpp
M source/Target/ThreadPlanCallFunction.cpp
M source/Target/ThreadPlanStepOverRange.cpp
M source/Target/ThreadList.cpp
M source/Target/ThreadPlanStepOut.cpp
M source/Target/Thread.cpp
M source/Target/ThreadPlanBase.cpp
M source/Target/ThreadPlanStepThrough.cpp
M source/Target/ThreadPlanStepInstruction.cpp
M source/Target/ThreadPlanStepInRange.cpp
M source/Target/ThreadPlanStepOverBreakpoint.cpp
M source/Target/ThreadPlanStepUntil.cpp
M lldb.xcodeproj/xcshareddata/xcschemes/Run Testsuite.xcscheme
llvm-svn: 181381
2013-05-08 08:35:16 +08:00
|
|
|
return_value = true;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2013-06-04 09:40:51 +08:00
|
|
|
StopInfoSP stop_info_sp = GetPrivateStopInfo ();
|
Figure out the reply to "PlanExplainsStop" once when we stop and then use the cached
value. This fixes problems, for instance, with the StepRange plans, where they know that
they explained the stop because they were at their "run to here" breakpoint, then deleted
that breakpoint, so when they got asked again, doh! I had done this for a couple of plans
in an ad hoc fashion, this just formalizes it.
Also add a "ResumeRequested" in Process so that the code in the completion handlers can
tell the ShouldStop logic they want to resume rather than just directly resuming. That allows
us to handle resuming in a more controlled fashion.
Also, SetPublicState can take a "restarted" flag, so that it doesn't drop the run lock when
the target was immediately restarted.
--This line, and those below , will be ignored--
M test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
M include/lldb/Target/ThreadList.h
M include/lldb/Target/ThreadPlanStepOut.h
M include/lldb/Target/Thread.h
M include/lldb/Target/ThreadPlanBase.h
M include/lldb/Target/ThreadPlanStepThrough.h
M include/lldb/Target/ThreadPlanStepInstruction.h
M include/lldb/Target/ThreadPlanStepInRange.h
M include/lldb/Target/ThreadPlanStepOverBreakpoint.h
M include/lldb/Target/ThreadPlanStepUntil.h
M include/lldb/Target/StopInfo.h
M include/lldb/Target/Process.h
M include/lldb/Target/ThreadPlanRunToAddress.h
M include/lldb/Target/ThreadPlan.h
M include/lldb/Target/ThreadPlanCallFunction.h
M include/lldb/Target/ThreadPlanStepOverRange.h
M source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.h
M source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.cpp
M source/Target/StopInfo.cpp
M source/Target/Process.cpp
M source/Target/ThreadPlanRunToAddress.cpp
M source/Target/ThreadPlan.cpp
M source/Target/ThreadPlanCallFunction.cpp
M source/Target/ThreadPlanStepOverRange.cpp
M source/Target/ThreadList.cpp
M source/Target/ThreadPlanStepOut.cpp
M source/Target/Thread.cpp
M source/Target/ThreadPlanBase.cpp
M source/Target/ThreadPlanStepThrough.cpp
M source/Target/ThreadPlanStepInstruction.cpp
M source/Target/ThreadPlanStepInRange.cpp
M source/Target/ThreadPlanStepOverBreakpoint.cpp
M source/Target/ThreadPlanStepUntil.cpp
M lldb.xcodeproj/xcshareddata/xcschemes/Run Testsuite.xcscheme
llvm-svn: 181381
2013-05-08 08:35:16 +08:00
|
|
|
if (stop_info_sp)
|
2012-05-02 02:38:37 +08:00
|
|
|
{
|
Figure out the reply to "PlanExplainsStop" once when we stop and then use the cached
value. This fixes problems, for instance, with the StepRange plans, where they know that
they explained the stop because they were at their "run to here" breakpoint, then deleted
that breakpoint, so when they got asked again, doh! I had done this for a couple of plans
in an ad hoc fashion, this just formalizes it.
Also add a "ResumeRequested" in Process so that the code in the completion handlers can
tell the ShouldStop logic they want to resume rather than just directly resuming. That allows
us to handle resuming in a more controlled fashion.
Also, SetPublicState can take a "restarted" flag, so that it doesn't drop the run lock when
the target was immediately restarted.
--This line, and those below , will be ignored--
M test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
M include/lldb/Target/ThreadList.h
M include/lldb/Target/ThreadPlanStepOut.h
M include/lldb/Target/Thread.h
M include/lldb/Target/ThreadPlanBase.h
M include/lldb/Target/ThreadPlanStepThrough.h
M include/lldb/Target/ThreadPlanStepInstruction.h
M include/lldb/Target/ThreadPlanStepInRange.h
M include/lldb/Target/ThreadPlanStepOverBreakpoint.h
M include/lldb/Target/ThreadPlanStepUntil.h
M include/lldb/Target/StopInfo.h
M include/lldb/Target/Process.h
M include/lldb/Target/ThreadPlanRunToAddress.h
M include/lldb/Target/ThreadPlan.h
M include/lldb/Target/ThreadPlanCallFunction.h
M include/lldb/Target/ThreadPlanStepOverRange.h
M source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.h
M source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.cpp
M source/Target/StopInfo.cpp
M source/Target/Process.cpp
M source/Target/ThreadPlanRunToAddress.cpp
M source/Target/ThreadPlan.cpp
M source/Target/ThreadPlanCallFunction.cpp
M source/Target/ThreadPlanStepOverRange.cpp
M source/Target/ThreadList.cpp
M source/Target/ThreadPlanStepOut.cpp
M source/Target/Thread.cpp
M source/Target/ThreadPlanBase.cpp
M source/Target/ThreadPlanStepThrough.cpp
M source/Target/ThreadPlanStepInstruction.cpp
M source/Target/ThreadPlanStepInRange.cpp
M source/Target/ThreadPlanStepOverBreakpoint.cpp
M source/Target/ThreadPlanStepUntil.cpp
M lldb.xcodeproj/xcshareddata/xcschemes/Run Testsuite.xcscheme
llvm-svn: 181381
2013-05-08 08:35:16 +08:00
|
|
|
StopReason reason = stop_info_sp->GetStopReason();
|
|
|
|
|
|
|
|
switch (reason)
|
2012-09-01 09:02:41 +08:00
|
|
|
{
|
Figure out the reply to "PlanExplainsStop" once when we stop and then use the cached
value. This fixes problems, for instance, with the StepRange plans, where they know that
they explained the stop because they were at their "run to here" breakpoint, then deleted
that breakpoint, so when they got asked again, doh! I had done this for a couple of plans
in an ad hoc fashion, this just formalizes it.
Also add a "ResumeRequested" in Process so that the code in the completion handlers can
tell the ShouldStop logic they want to resume rather than just directly resuming. That allows
us to handle resuming in a more controlled fashion.
Also, SetPublicState can take a "restarted" flag, so that it doesn't drop the run lock when
the target was immediately restarted.
--This line, and those below , will be ignored--
M test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
M include/lldb/Target/ThreadList.h
M include/lldb/Target/ThreadPlanStepOut.h
M include/lldb/Target/Thread.h
M include/lldb/Target/ThreadPlanBase.h
M include/lldb/Target/ThreadPlanStepThrough.h
M include/lldb/Target/ThreadPlanStepInstruction.h
M include/lldb/Target/ThreadPlanStepInRange.h
M include/lldb/Target/ThreadPlanStepOverBreakpoint.h
M include/lldb/Target/ThreadPlanStepUntil.h
M include/lldb/Target/StopInfo.h
M include/lldb/Target/Process.h
M include/lldb/Target/ThreadPlanRunToAddress.h
M include/lldb/Target/ThreadPlan.h
M include/lldb/Target/ThreadPlanCallFunction.h
M include/lldb/Target/ThreadPlanStepOverRange.h
M source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.h
M source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.cpp
M source/Target/StopInfo.cpp
M source/Target/Process.cpp
M source/Target/ThreadPlanRunToAddress.cpp
M source/Target/ThreadPlan.cpp
M source/Target/ThreadPlanCallFunction.cpp
M source/Target/ThreadPlanStepOverRange.cpp
M source/Target/ThreadList.cpp
M source/Target/ThreadPlanStepOut.cpp
M source/Target/Thread.cpp
M source/Target/ThreadPlanBase.cpp
M source/Target/ThreadPlanStepThrough.cpp
M source/Target/ThreadPlanStepInstruction.cpp
M source/Target/ThreadPlanStepInRange.cpp
M source/Target/ThreadPlanStepOverBreakpoint.cpp
M source/Target/ThreadPlanStepUntil.cpp
M lldb.xcodeproj/xcshareddata/xcschemes/Run Testsuite.xcscheme
llvm-svn: 181381
2013-05-08 08:35:16 +08:00
|
|
|
case eStopReasonBreakpoint:
|
|
|
|
if (NextRangeBreakpointExplainsStop(stop_info_sp))
|
|
|
|
{
|
|
|
|
return_value = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case eStopReasonWatchpoint:
|
|
|
|
case eStopReasonSignal:
|
|
|
|
case eStopReasonException:
|
|
|
|
case eStopReasonExec:
|
|
|
|
case eStopReasonThreadExiting:
|
|
|
|
{
|
|
|
|
Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP));
|
|
|
|
if (log)
|
|
|
|
log->PutCString ("ThreadPlanStepInRange got asked if it explains the stop for some reason other than step.");
|
|
|
|
}
|
|
|
|
return_value = false;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return_value = true;
|
|
|
|
break;
|
2012-09-01 09:02:41 +08:00
|
|
|
}
|
2012-05-02 02:38:37 +08:00
|
|
|
}
|
Figure out the reply to "PlanExplainsStop" once when we stop and then use the cached
value. This fixes problems, for instance, with the StepRange plans, where they know that
they explained the stop because they were at their "run to here" breakpoint, then deleted
that breakpoint, so when they got asked again, doh! I had done this for a couple of plans
in an ad hoc fashion, this just formalizes it.
Also add a "ResumeRequested" in Process so that the code in the completion handlers can
tell the ShouldStop logic they want to resume rather than just directly resuming. That allows
us to handle resuming in a more controlled fashion.
Also, SetPublicState can take a "restarted" flag, so that it doesn't drop the run lock when
the target was immediately restarted.
--This line, and those below , will be ignored--
M test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
M include/lldb/Target/ThreadList.h
M include/lldb/Target/ThreadPlanStepOut.h
M include/lldb/Target/Thread.h
M include/lldb/Target/ThreadPlanBase.h
M include/lldb/Target/ThreadPlanStepThrough.h
M include/lldb/Target/ThreadPlanStepInstruction.h
M include/lldb/Target/ThreadPlanStepInRange.h
M include/lldb/Target/ThreadPlanStepOverBreakpoint.h
M include/lldb/Target/ThreadPlanStepUntil.h
M include/lldb/Target/StopInfo.h
M include/lldb/Target/Process.h
M include/lldb/Target/ThreadPlanRunToAddress.h
M include/lldb/Target/ThreadPlan.h
M include/lldb/Target/ThreadPlanCallFunction.h
M include/lldb/Target/ThreadPlanStepOverRange.h
M source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.h
M source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.cpp
M source/Target/StopInfo.cpp
M source/Target/Process.cpp
M source/Target/ThreadPlanRunToAddress.cpp
M source/Target/ThreadPlan.cpp
M source/Target/ThreadPlanCallFunction.cpp
M source/Target/ThreadPlanStepOverRange.cpp
M source/Target/ThreadList.cpp
M source/Target/ThreadPlanStepOut.cpp
M source/Target/Thread.cpp
M source/Target/ThreadPlanBase.cpp
M source/Target/ThreadPlanStepThrough.cpp
M source/Target/ThreadPlanStepInstruction.cpp
M source/Target/ThreadPlanStepInRange.cpp
M source/Target/ThreadPlanStepOverBreakpoint.cpp
M source/Target/ThreadPlanStepUntil.cpp
M lldb.xcodeproj/xcshareddata/xcschemes/Run Testsuite.xcscheme
llvm-svn: 181381
2013-05-08 08:35:16 +08:00
|
|
|
else
|
|
|
|
return_value = true;
|
2012-05-02 02:38:37 +08:00
|
|
|
}
|
Figure out the reply to "PlanExplainsStop" once when we stop and then use the cached
value. This fixes problems, for instance, with the StepRange plans, where they know that
they explained the stop because they were at their "run to here" breakpoint, then deleted
that breakpoint, so when they got asked again, doh! I had done this for a couple of plans
in an ad hoc fashion, this just formalizes it.
Also add a "ResumeRequested" in Process so that the code in the completion handlers can
tell the ShouldStop logic they want to resume rather than just directly resuming. That allows
us to handle resuming in a more controlled fashion.
Also, SetPublicState can take a "restarted" flag, so that it doesn't drop the run lock when
the target was immediately restarted.
--This line, and those below , will be ignored--
M test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
M include/lldb/Target/ThreadList.h
M include/lldb/Target/ThreadPlanStepOut.h
M include/lldb/Target/Thread.h
M include/lldb/Target/ThreadPlanBase.h
M include/lldb/Target/ThreadPlanStepThrough.h
M include/lldb/Target/ThreadPlanStepInstruction.h
M include/lldb/Target/ThreadPlanStepInRange.h
M include/lldb/Target/ThreadPlanStepOverBreakpoint.h
M include/lldb/Target/ThreadPlanStepUntil.h
M include/lldb/Target/StopInfo.h
M include/lldb/Target/Process.h
M include/lldb/Target/ThreadPlanRunToAddress.h
M include/lldb/Target/ThreadPlan.h
M include/lldb/Target/ThreadPlanCallFunction.h
M include/lldb/Target/ThreadPlanStepOverRange.h
M source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.h
M source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.cpp
M source/Target/StopInfo.cpp
M source/Target/Process.cpp
M source/Target/ThreadPlanRunToAddress.cpp
M source/Target/ThreadPlan.cpp
M source/Target/ThreadPlanCallFunction.cpp
M source/Target/ThreadPlanStepOverRange.cpp
M source/Target/ThreadList.cpp
M source/Target/ThreadPlanStepOut.cpp
M source/Target/Thread.cpp
M source/Target/ThreadPlanBase.cpp
M source/Target/ThreadPlanStepThrough.cpp
M source/Target/ThreadPlanStepInstruction.cpp
M source/Target/ThreadPlanStepInRange.cpp
M source/Target/ThreadPlanStepOverBreakpoint.cpp
M source/Target/ThreadPlanStepUntil.cpp
M lldb.xcodeproj/xcshareddata/xcschemes/Run Testsuite.xcscheme
llvm-svn: 181381
2013-05-08 08:35:16 +08:00
|
|
|
|
|
|
|
return return_value;
|
2012-05-02 02:38:37 +08:00
|
|
|
}
|
2012-09-01 09:02:41 +08:00
|
|
|
|
|
|
|
bool
|
Figure out the reply to "PlanExplainsStop" once when we stop and then use the cached
value. This fixes problems, for instance, with the StepRange plans, where they know that
they explained the stop because they were at their "run to here" breakpoint, then deleted
that breakpoint, so when they got asked again, doh! I had done this for a couple of plans
in an ad hoc fashion, this just formalizes it.
Also add a "ResumeRequested" in Process so that the code in the completion handlers can
tell the ShouldStop logic they want to resume rather than just directly resuming. That allows
us to handle resuming in a more controlled fashion.
Also, SetPublicState can take a "restarted" flag, so that it doesn't drop the run lock when
the target was immediately restarted.
--This line, and those below , will be ignored--
M test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
M include/lldb/Target/ThreadList.h
M include/lldb/Target/ThreadPlanStepOut.h
M include/lldb/Target/Thread.h
M include/lldb/Target/ThreadPlanBase.h
M include/lldb/Target/ThreadPlanStepThrough.h
M include/lldb/Target/ThreadPlanStepInstruction.h
M include/lldb/Target/ThreadPlanStepInRange.h
M include/lldb/Target/ThreadPlanStepOverBreakpoint.h
M include/lldb/Target/ThreadPlanStepUntil.h
M include/lldb/Target/StopInfo.h
M include/lldb/Target/Process.h
M include/lldb/Target/ThreadPlanRunToAddress.h
M include/lldb/Target/ThreadPlan.h
M include/lldb/Target/ThreadPlanCallFunction.h
M include/lldb/Target/ThreadPlanStepOverRange.h
M source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.h
M source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.cpp
M source/Target/StopInfo.cpp
M source/Target/Process.cpp
M source/Target/ThreadPlanRunToAddress.cpp
M source/Target/ThreadPlan.cpp
M source/Target/ThreadPlanCallFunction.cpp
M source/Target/ThreadPlanStepOverRange.cpp
M source/Target/ThreadList.cpp
M source/Target/ThreadPlanStepOut.cpp
M source/Target/Thread.cpp
M source/Target/ThreadPlanBase.cpp
M source/Target/ThreadPlanStepThrough.cpp
M source/Target/ThreadPlanStepInstruction.cpp
M source/Target/ThreadPlanStepInRange.cpp
M source/Target/ThreadPlanStepOverBreakpoint.cpp
M source/Target/ThreadPlanStepUntil.cpp
M lldb.xcodeproj/xcshareddata/xcschemes/Run Testsuite.xcscheme
llvm-svn: 181381
2013-05-08 08:35:16 +08:00
|
|
|
ThreadPlanStepInRange::DoWillResume (lldb::StateType resume_state, bool current_plan)
|
2012-09-01 09:02:41 +08:00
|
|
|
{
|
|
|
|
if (resume_state == eStateStepping && current_plan)
|
|
|
|
{
|
|
|
|
// See if we are about to step over a virtual inlined call.
|
|
|
|
bool step_without_resume = m_thread.DecrementCurrentInlinedDepth();
|
|
|
|
if (step_without_resume)
|
|
|
|
{
|
2013-03-28 07:08:40 +08:00
|
|
|
Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP));
|
2012-09-01 09:02:41 +08:00
|
|
|
if (log)
|
Figure out the reply to "PlanExplainsStop" once when we stop and then use the cached
value. This fixes problems, for instance, with the StepRange plans, where they know that
they explained the stop because they were at their "run to here" breakpoint, then deleted
that breakpoint, so when they got asked again, doh! I had done this for a couple of plans
in an ad hoc fashion, this just formalizes it.
Also add a "ResumeRequested" in Process so that the code in the completion handlers can
tell the ShouldStop logic they want to resume rather than just directly resuming. That allows
us to handle resuming in a more controlled fashion.
Also, SetPublicState can take a "restarted" flag, so that it doesn't drop the run lock when
the target was immediately restarted.
--This line, and those below , will be ignored--
M test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
M include/lldb/Target/ThreadList.h
M include/lldb/Target/ThreadPlanStepOut.h
M include/lldb/Target/Thread.h
M include/lldb/Target/ThreadPlanBase.h
M include/lldb/Target/ThreadPlanStepThrough.h
M include/lldb/Target/ThreadPlanStepInstruction.h
M include/lldb/Target/ThreadPlanStepInRange.h
M include/lldb/Target/ThreadPlanStepOverBreakpoint.h
M include/lldb/Target/ThreadPlanStepUntil.h
M include/lldb/Target/StopInfo.h
M include/lldb/Target/Process.h
M include/lldb/Target/ThreadPlanRunToAddress.h
M include/lldb/Target/ThreadPlan.h
M include/lldb/Target/ThreadPlanCallFunction.h
M include/lldb/Target/ThreadPlanStepOverRange.h
M source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.h
M source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.cpp
M source/Target/StopInfo.cpp
M source/Target/Process.cpp
M source/Target/ThreadPlanRunToAddress.cpp
M source/Target/ThreadPlan.cpp
M source/Target/ThreadPlanCallFunction.cpp
M source/Target/ThreadPlanStepOverRange.cpp
M source/Target/ThreadList.cpp
M source/Target/ThreadPlanStepOut.cpp
M source/Target/Thread.cpp
M source/Target/ThreadPlanBase.cpp
M source/Target/ThreadPlanStepThrough.cpp
M source/Target/ThreadPlanStepInstruction.cpp
M source/Target/ThreadPlanStepInRange.cpp
M source/Target/ThreadPlanStepOverBreakpoint.cpp
M source/Target/ThreadPlanStepUntil.cpp
M lldb.xcodeproj/xcshareddata/xcschemes/Run Testsuite.xcscheme
llvm-svn: 181381
2013-05-08 08:35:16 +08:00
|
|
|
log->Printf ("ThreadPlanStepInRange::DoWillResume: returning false, inline_depth: %d",
|
2012-09-01 09:02:41 +08:00
|
|
|
m_thread.GetCurrentInlinedDepth());
|
|
|
|
SetStopInfo(StopInfo::CreateStopReasonToTrace(m_thread));
|
2012-09-07 09:11:44 +08:00
|
|
|
|
|
|
|
// FIXME: Maybe it would be better to create a InlineStep stop reason, but then
|
|
|
|
// the whole rest of the world would have to handle that stop reason.
|
|
|
|
m_virtual_step = true;
|
2012-09-01 09:02:41 +08:00
|
|
|
}
|
|
|
|
return !step_without_resume;
|
|
|
|
}
|
Figure out the reply to "PlanExplainsStop" once when we stop and then use the cached
value. This fixes problems, for instance, with the StepRange plans, where they know that
they explained the stop because they were at their "run to here" breakpoint, then deleted
that breakpoint, so when they got asked again, doh! I had done this for a couple of plans
in an ad hoc fashion, this just formalizes it.
Also add a "ResumeRequested" in Process so that the code in the completion handlers can
tell the ShouldStop logic they want to resume rather than just directly resuming. That allows
us to handle resuming in a more controlled fashion.
Also, SetPublicState can take a "restarted" flag, so that it doesn't drop the run lock when
the target was immediately restarted.
--This line, and those below , will be ignored--
M test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
M include/lldb/Target/ThreadList.h
M include/lldb/Target/ThreadPlanStepOut.h
M include/lldb/Target/Thread.h
M include/lldb/Target/ThreadPlanBase.h
M include/lldb/Target/ThreadPlanStepThrough.h
M include/lldb/Target/ThreadPlanStepInstruction.h
M include/lldb/Target/ThreadPlanStepInRange.h
M include/lldb/Target/ThreadPlanStepOverBreakpoint.h
M include/lldb/Target/ThreadPlanStepUntil.h
M include/lldb/Target/StopInfo.h
M include/lldb/Target/Process.h
M include/lldb/Target/ThreadPlanRunToAddress.h
M include/lldb/Target/ThreadPlan.h
M include/lldb/Target/ThreadPlanCallFunction.h
M include/lldb/Target/ThreadPlanStepOverRange.h
M source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.h
M source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.cpp
M source/Target/StopInfo.cpp
M source/Target/Process.cpp
M source/Target/ThreadPlanRunToAddress.cpp
M source/Target/ThreadPlan.cpp
M source/Target/ThreadPlanCallFunction.cpp
M source/Target/ThreadPlanStepOverRange.cpp
M source/Target/ThreadList.cpp
M source/Target/ThreadPlanStepOut.cpp
M source/Target/Thread.cpp
M source/Target/ThreadPlanBase.cpp
M source/Target/ThreadPlanStepThrough.cpp
M source/Target/ThreadPlanStepInstruction.cpp
M source/Target/ThreadPlanStepInRange.cpp
M source/Target/ThreadPlanStepOverBreakpoint.cpp
M source/Target/ThreadPlanStepUntil.cpp
M lldb.xcodeproj/xcshareddata/xcschemes/Run Testsuite.xcscheme
llvm-svn: 181381
2013-05-08 08:35:16 +08:00
|
|
|
return true;
|
2012-09-01 09:02:41 +08:00
|
|
|
}
|
2013-05-14 23:20:12 +08:00
|
|
|
|
|
|
|
bool
|
|
|
|
ThreadPlanStepInRange::IsVirtualStep()
|
|
|
|
{
|
|
|
|
return m_virtual_step;
|
|
|
|
}
|