2010-06-09 00:52:24 +08:00
|
|
|
//===-- ThreadPlanStepOverRange.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/ThreadPlanStepOverRange.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"
|
2012-09-01 09:02:41 +08:00
|
|
|
#include "lldb/Symbol/Block.h"
|
2012-11-06 09:14:52 +08:00
|
|
|
#include "lldb/Symbol/CompileUnit.h"
|
2012-09-01 09:02:41 +08:00
|
|
|
#include "lldb/Symbol/Function.h"
|
2012-11-06 09:14:52 +08:00
|
|
|
#include "lldb/Symbol/LineTable.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"
|
|
|
|
|
|
|
|
using namespace lldb_private;
|
2010-11-06 09:53:30 +08:00
|
|
|
using namespace lldb;
|
2010-06-09 00:52:24 +08:00
|
|
|
|
2014-03-13 10:47:14 +08:00
|
|
|
uint32_t ThreadPlanStepOverRange::s_default_flag_values = 0;
|
2010-06-09 00:52:24 +08:00
|
|
|
|
|
|
|
//----------------------------------------------------------------------
|
|
|
|
// ThreadPlanStepOverRange: Step through a stack range, either stepping over or into
|
|
|
|
// based on the value of \a type.
|
|
|
|
//----------------------------------------------------------------------
|
|
|
|
|
|
|
|
ThreadPlanStepOverRange::ThreadPlanStepOverRange
|
|
|
|
(
|
|
|
|
Thread &thread,
|
|
|
|
const AddressRange &range,
|
|
|
|
const SymbolContext &addr_context,
|
2014-03-13 10:47:14 +08:00
|
|
|
lldb::RunMode stop_others,
|
|
|
|
LazyBool step_out_avoids_code_without_debug_info
|
2010-06-09 00:52:24 +08:00
|
|
|
) :
|
2012-09-01 09:02:41 +08:00
|
|
|
ThreadPlanStepRange (ThreadPlan::eKindStepOverRange, "Step range stepping over", thread, range, addr_context, stop_others),
|
2014-03-13 10:47:14 +08:00
|
|
|
ThreadPlanShouldStopHere (this),
|
2012-09-01 09:02:41 +08:00
|
|
|
m_first_resume(true)
|
2010-06-09 00:52:24 +08:00
|
|
|
{
|
2014-03-13 10:47:14 +08:00
|
|
|
SetFlagsToDefault();
|
|
|
|
SetupAvoidNoDebug(step_out_avoids_code_without_debug_info);
|
2010-06-09 00:52:24 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
ThreadPlanStepOverRange::~ThreadPlanStepOverRange ()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
ThreadPlanStepOverRange::GetDescription (Stream *s, lldb::DescriptionLevel level)
|
|
|
|
{
|
|
|
|
if (level == lldb::eDescriptionLevelBrief)
|
2014-09-30 07:17:18 +08:00
|
|
|
{
|
2010-06-09 00:52:24 +08:00
|
|
|
s->Printf("step over");
|
2014-09-30 07:17:18 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
s->Printf ("Stepping over");
|
|
|
|
bool printed_line_info = false;
|
|
|
|
if (m_addr_context.line_entry.IsValid())
|
|
|
|
{
|
|
|
|
s->Printf (" line ");
|
|
|
|
m_addr_context.line_entry.DumpStopContext (s, false);
|
|
|
|
printed_line_info = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!printed_line_info || level == eDescriptionLevelVerbose)
|
2010-06-09 00:52:24 +08:00
|
|
|
{
|
2014-09-30 07:17:18 +08:00
|
|
|
s->Printf (" using ranges: ");
|
|
|
|
DumpRanges(s);
|
2010-06-09 00:52:24 +08:00
|
|
|
}
|
2014-09-30 07:17:18 +08:00
|
|
|
|
|
|
|
s->PutChar('.');
|
2010-06-09 00:52:24 +08:00
|
|
|
}
|
|
|
|
|
2014-03-13 10:47:14 +08:00
|
|
|
void
|
|
|
|
ThreadPlanStepOverRange::SetupAvoidNoDebug(LazyBool step_out_avoids_code_without_debug_info)
|
|
|
|
{
|
|
|
|
bool avoid_nodebug = true;
|
|
|
|
switch (step_out_avoids_code_without_debug_info)
|
|
|
|
{
|
|
|
|
case eLazyBoolYes:
|
|
|
|
avoid_nodebug = true;
|
|
|
|
break;
|
|
|
|
case eLazyBoolNo:
|
|
|
|
avoid_nodebug = false;
|
|
|
|
break;
|
|
|
|
case eLazyBoolCalculate:
|
|
|
|
avoid_nodebug = m_thread.GetStepOutAvoidsNoDebug();
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (avoid_nodebug)
|
|
|
|
GetFlags().Set (ThreadPlanShouldStopHere::eStepOutAvoidNoDebug);
|
|
|
|
else
|
|
|
|
GetFlags().Clear (ThreadPlanShouldStopHere::eStepOutAvoidNoDebug);
|
2014-08-06 09:49:59 +08:00
|
|
|
// Step Over plans should always avoid no-debug on step in. Seems like you shouldn't
|
|
|
|
// have to say this, but a tail call looks more like a step in that a step out, so
|
|
|
|
// we want to catch this case.
|
|
|
|
GetFlags().Set (ThreadPlanShouldStopHere::eStepInAvoidNoDebug);
|
2014-03-13 10:47:14 +08:00
|
|
|
}
|
|
|
|
|
2013-09-18 00:35:45 +08:00
|
|
|
bool
|
|
|
|
ThreadPlanStepOverRange::IsEquivalentContext(const SymbolContext &context)
|
|
|
|
{
|
|
|
|
|
|
|
|
// Match as much as is specified in the m_addr_context:
|
|
|
|
// This is a fairly loose sanity check. Note, sometimes the target doesn't get filled
|
|
|
|
// in so I left out the target check. And sometimes the module comes in as the .o file from the
|
|
|
|
// inlined range, so I left that out too...
|
|
|
|
if (m_addr_context.comp_unit)
|
|
|
|
{
|
|
|
|
if (m_addr_context.comp_unit == context.comp_unit)
|
|
|
|
{
|
|
|
|
if (m_addr_context.function && m_addr_context.function == context.function)
|
|
|
|
{
|
|
|
|
if (m_addr_context.block && m_addr_context.block == context.block)
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (m_addr_context.symbol && m_addr_context.symbol == context.symbol)
|
|
|
|
{
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2010-06-09 00:52:24 +08:00
|
|
|
bool
|
|
|
|
ThreadPlanStepOverRange::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("ThreadPlanStepOverRange reached %s.", s.GetData());
|
|
|
|
}
|
|
|
|
|
|
|
|
// If we're out of the range but in the same frame or in our caller's frame
|
|
|
|
// then we should stop.
|
2012-10-26 06:30:09 +08:00
|
|
|
// When stepping out we only stop others if we are forcing running one thread.
|
2010-06-09 00:52:24 +08:00
|
|
|
bool stop_others;
|
|
|
|
if (m_stop_others == lldb::eOnlyThisThread)
|
|
|
|
stop_others = true;
|
|
|
|
else
|
|
|
|
stop_others = false;
|
|
|
|
|
2013-07-19 05:48:26 +08:00
|
|
|
ThreadPlanSP new_plan_sp;
|
2012-03-01 08:50:50 +08:00
|
|
|
|
|
|
|
FrameComparison frame_order = CompareCurrentFrameToStartFrame();
|
|
|
|
|
|
|
|
if (frame_order == eFrameCompareOlder)
|
2010-11-05 08:18:21 +08:00
|
|
|
{
|
|
|
|
// 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.
|
|
|
|
// As below, we step through first, and then try to figure out how to get back out again.
|
|
|
|
|
2013-07-19 05:48:26 +08:00
|
|
|
new_plan_sp = m_thread.QueueThreadPlanForStepThrough (m_stack_id, false, stop_others);
|
2010-11-05 08:18:21 +08:00
|
|
|
|
2013-07-19 05:48:26 +08:00
|
|
|
if (new_plan_sp && log)
|
2010-11-05 08:18:21 +08:00
|
|
|
log->Printf("Thought I stepped out, but in fact arrived at a trampoline.");
|
|
|
|
}
|
2012-03-01 08:50:50 +08:00
|
|
|
else if (frame_order == eFrameCompareYounger)
|
2010-06-09 00:52:24 +08:00
|
|
|
{
|
2012-03-01 08:50:50 +08:00
|
|
|
// Make sure we really are in a new frame. Do that by unwinding and seeing if the
|
|
|
|
// start function really is our start function...
|
2013-09-18 00:35:45 +08:00
|
|
|
for(uint32_t i = 1;; ++i)
|
2012-03-01 08:50:50 +08:00
|
|
|
{
|
2013-11-04 17:33:30 +08:00
|
|
|
StackFrameSP older_frame_sp = m_thread.GetStackFrameAtIndex(i);
|
2013-09-18 00:35:45 +08:00
|
|
|
if (!older_frame_sp) {
|
|
|
|
// We can't unwind the next frame we should just get out of here & stop...
|
|
|
|
break;
|
2012-07-27 02:23:21 +08:00
|
|
|
}
|
2013-09-18 00:35:45 +08:00
|
|
|
|
|
|
|
const SymbolContext &older_context = older_frame_sp->GetSymbolContext(eSymbolContextEverything);
|
|
|
|
if (IsEquivalentContext(older_context))
|
2012-03-01 08:50:50 +08:00
|
|
|
{
|
2014-03-13 10:47:14 +08:00
|
|
|
new_plan_sp = m_thread.QueueThreadPlanForStepOutNoShouldStop (false,
|
|
|
|
NULL,
|
|
|
|
true,
|
|
|
|
stop_others,
|
|
|
|
eVoteNo,
|
|
|
|
eVoteNoOpinion,
|
|
|
|
0);
|
2013-09-18 00:35:45 +08:00
|
|
|
break;
|
2012-03-01 08:50:50 +08:00
|
|
|
}
|
2013-09-18 00:35:45 +08:00
|
|
|
else
|
2012-03-01 08:50:50 +08:00
|
|
|
{
|
2013-07-19 05:48:26 +08:00
|
|
|
new_plan_sp = m_thread.QueueThreadPlanForStepThrough (m_stack_id, false, stop_others);
|
2014-08-05 09:59:20 +08:00
|
|
|
// If we found a way through, then we should stop recursing.
|
|
|
|
if (new_plan_sp)
|
|
|
|
break;
|
2012-03-01 08:50:50 +08:00
|
|
|
}
|
|
|
|
}
|
2010-06-09 00:52:24 +08:00
|
|
|
}
|
2012-03-09 12:10:47 +08:00
|
|
|
else
|
2010-06-09 00:52:24 +08:00
|
|
|
{
|
2012-03-09 12:10:47 +08:00
|
|
|
// If we're still in the range, keep going.
|
|
|
|
if (InRange())
|
|
|
|
{
|
|
|
|
SetNextBranchBreakpoint();
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (!InSymbol())
|
|
|
|
{
|
|
|
|
// This one is a little tricky. Sometimes we may be in a stub or something similar,
|
|
|
|
// in which case we need to get out of there. But if we are in a stub then it's
|
|
|
|
// likely going to be hard to get out from here. It is probably easiest to step into the
|
|
|
|
// stub, and then it will be straight-forward to step out.
|
2013-07-19 05:48:26 +08:00
|
|
|
new_plan_sp = m_thread.QueueThreadPlanForStepThrough (m_stack_id, false, stop_others);
|
2012-03-09 12:10:47 +08:00
|
|
|
}
|
2012-11-06 09:14:52 +08:00
|
|
|
else
|
|
|
|
{
|
|
|
|
// The current clang (at least through 424) doesn't always get the address range for the
|
|
|
|
// DW_TAG_inlined_subroutines right, so that when you leave the inlined range the line table says
|
|
|
|
// you are still in the source file of the inlining function. This is bad, because now you are missing
|
|
|
|
// the stack frame for the function containing the inlining, and if you sensibly do "finish" to get
|
|
|
|
// out of this function you will instead exit the containing function.
|
|
|
|
// To work around this, we check whether we are still in the source file we started in, and if not assume
|
|
|
|
// it is an error, and push a plan to get us out of this line and back to the containing file.
|
|
|
|
|
|
|
|
if (m_addr_context.line_entry.IsValid())
|
|
|
|
{
|
|
|
|
SymbolContext sc;
|
2013-11-04 17:33:30 +08:00
|
|
|
StackFrameSP frame_sp = m_thread.GetStackFrameAtIndex(0);
|
2012-11-06 09:14:52 +08:00
|
|
|
sc = frame_sp->GetSymbolContext (eSymbolContextEverything);
|
|
|
|
if (sc.line_entry.IsValid())
|
|
|
|
{
|
|
|
|
if (sc.line_entry.file != m_addr_context.line_entry.file
|
|
|
|
&& sc.comp_unit == m_addr_context.comp_unit
|
|
|
|
&& sc.function == m_addr_context.function)
|
|
|
|
{
|
|
|
|
// Okay, find the next occurance of this file in the line table:
|
|
|
|
LineTable *line_table = m_addr_context.comp_unit->GetLineTable();
|
|
|
|
if (line_table)
|
|
|
|
{
|
|
|
|
Address cur_address = frame_sp->GetFrameCodeAddress();
|
|
|
|
uint32_t entry_idx;
|
|
|
|
LineEntry line_entry;
|
|
|
|
if (line_table->FindLineEntryByAddress (cur_address, line_entry, &entry_idx))
|
|
|
|
{
|
|
|
|
LineEntry next_line_entry;
|
|
|
|
bool step_past_remaining_inline = false;
|
|
|
|
if (entry_idx > 0)
|
|
|
|
{
|
|
|
|
// We require the the previous line entry and the current line entry come
|
|
|
|
// from the same file.
|
|
|
|
// The other requirement is that the previous line table entry be part of an
|
|
|
|
// inlined block, we don't want to step past cases where people have inlined
|
|
|
|
// some code fragment by using #include <source-fragment.c> directly.
|
|
|
|
LineEntry prev_line_entry;
|
|
|
|
if (line_table->GetLineEntryAtIndex(entry_idx - 1, prev_line_entry)
|
|
|
|
&& prev_line_entry.file == line_entry.file)
|
|
|
|
{
|
|
|
|
SymbolContext prev_sc;
|
|
|
|
Address prev_address = prev_line_entry.range.GetBaseAddress();
|
|
|
|
prev_address.CalculateSymbolContext(&prev_sc);
|
|
|
|
if (prev_sc.block)
|
|
|
|
{
|
|
|
|
Block *inlined_block = prev_sc.block->GetContainingInlinedBlock();
|
|
|
|
if (inlined_block)
|
|
|
|
{
|
|
|
|
AddressRange inline_range;
|
|
|
|
inlined_block->GetRangeContainingAddress(prev_address, inline_range);
|
|
|
|
if (!inline_range.ContainsFileAddress(cur_address))
|
|
|
|
{
|
|
|
|
|
|
|
|
step_past_remaining_inline = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (step_past_remaining_inline)
|
|
|
|
{
|
|
|
|
uint32_t look_ahead_step = 1;
|
|
|
|
while (line_table->GetLineEntryAtIndex(entry_idx + look_ahead_step, next_line_entry))
|
|
|
|
{
|
|
|
|
// Make sure we haven't wandered out of the function we started from...
|
|
|
|
Address next_line_address = next_line_entry.range.GetBaseAddress();
|
|
|
|
Function *next_line_function = next_line_address.CalculateSymbolContextFunction();
|
|
|
|
if (next_line_function != m_addr_context.function)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (next_line_entry.file == m_addr_context.line_entry.file)
|
|
|
|
{
|
|
|
|
const bool abort_other_plans = false;
|
|
|
|
const bool stop_other_threads = false;
|
2013-07-19 05:48:26 +08:00
|
|
|
new_plan_sp = m_thread.QueueThreadPlanForRunToAddress(abort_other_plans,
|
2012-11-06 09:14:52 +08:00
|
|
|
next_line_address,
|
|
|
|
stop_other_threads);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
look_ahead_step++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2010-06-09 00:52:24 +08:00
|
|
|
}
|
|
|
|
|
2012-03-09 12:10:47 +08:00
|
|
|
// If we get to this point, we're not going to use a previously set "next branch" breakpoint, so delete it:
|
|
|
|
ClearNextBranchBreakpoint();
|
|
|
|
|
2014-03-13 10:47:14 +08:00
|
|
|
|
|
|
|
// If we haven't figured out something to do yet, then ask the ShouldStopHere callback:
|
|
|
|
if (!new_plan_sp)
|
|
|
|
{
|
|
|
|
new_plan_sp = CheckShouldStopHereAndQueueStepOut (frame_order);
|
|
|
|
}
|
2014-09-30 07:17:18 +08:00
|
|
|
|
2013-07-19 05:48:26 +08:00
|
|
|
if (!new_plan_sp)
|
2010-06-09 00:52:24 +08:00
|
|
|
m_no_more_plans = true;
|
|
|
|
else
|
2014-09-30 07:17:18 +08:00
|
|
|
{
|
|
|
|
// Any new plan will be an implementation plan, so mark it private:
|
|
|
|
new_plan_sp->SetPrivate(true);
|
2010-06-09 00:52:24 +08:00
|
|
|
m_no_more_plans = false;
|
2014-09-30 07:17:18 +08:00
|
|
|
}
|
2010-06-09 00:52:24 +08:00
|
|
|
|
2013-07-19 05:48:26 +08:00
|
|
|
if (!new_plan_sp)
|
2010-06-09 00:52:24 +08:00
|
|
|
{
|
|
|
|
// For efficiencies sake, we know we're done here so we don't have to do this
|
|
|
|
// calculation again in MischiefManaged.
|
|
|
|
SetPlanComplete();
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return false;
|
|
|
|
}
|
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
|
|
|
ThreadPlanStepOverRange::DoPlanExplainsStop (Event *event_ptr)
|
2012-05-02 02:38:37 +08:00
|
|
|
{
|
|
|
|
// For crashes, breakpoint hits, signals, etc, let the base plan (or some plan above us)
|
|
|
|
// handle the stop. That way the user can see the stop, step around, and then when they
|
|
|
|
// are done, continue and have their step complete. The exception is if we've hit our
|
|
|
|
// "run to next branch" breakpoint.
|
|
|
|
// Note, unlike the step in range plan, we don't mark ourselves complete if we hit an
|
|
|
|
// unexplained breakpoint/crash.
|
|
|
|
|
2013-03-28 07:08:40 +08:00
|
|
|
Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP));
|
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
|
|
|
bool return_value;
|
|
|
|
|
2012-05-02 02:38:37 +08:00
|
|
|
if (stop_info_sp)
|
|
|
|
{
|
|
|
|
StopReason reason = stop_info_sp->GetStopReason();
|
|
|
|
|
|
|
|
switch (reason)
|
|
|
|
{
|
2012-09-01 09:02:41 +08:00
|
|
|
case eStopReasonTrace:
|
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;
|
2012-09-01 09:02:41 +08:00
|
|
|
break;
|
2012-05-02 02:38:37 +08:00
|
|
|
case eStopReasonBreakpoint:
|
|
|
|
if (NextRangeBreakpointExplainsStop(stop_info_sp))
|
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;
|
2012-05-02 02:38:37 +08:00
|
|
|
else
|
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 = false;
|
2012-05-02 02:38:37 +08:00
|
|
|
break;
|
|
|
|
case eStopReasonWatchpoint:
|
|
|
|
case eStopReasonSignal:
|
|
|
|
case eStopReasonException:
|
2012-12-05 08:16:59 +08:00
|
|
|
case eStopReasonExec:
|
2012-12-21 07:08:03 +08:00
|
|
|
case eStopReasonThreadExiting:
|
2012-09-01 09:02:41 +08:00
|
|
|
default:
|
2012-05-02 02:38:37 +08:00
|
|
|
if (log)
|
|
|
|
log->PutCString ("ThreadPlanStepInRange got asked if it explains the stop for some reason other than step.");
|
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 = false;
|
2012-05-02 02:38:37 +08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
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;
|
|
|
|
|
|
|
|
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
|
|
|
ThreadPlanStepOverRange::DoWillResume (lldb::StateType resume_state, bool current_plan)
|
2012-09-01 09:02:41 +08:00
|
|
|
{
|
|
|
|
if (resume_state != eStateSuspended && m_first_resume)
|
|
|
|
{
|
|
|
|
m_first_resume = false;
|
|
|
|
if (resume_state == eStateStepping && current_plan)
|
|
|
|
{
|
|
|
|
// See if we are about to step over an inlined call in the middle of the inlined stack, if so figure
|
|
|
|
// out its extents and reset our range to step over that.
|
|
|
|
bool in_inlined_stack = m_thread.DecrementCurrentInlinedDepth();
|
|
|
|
if (in_inlined_stack)
|
|
|
|
{
|
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: adjusting range to the frame at inlined depth %d.",
|
2012-09-01 09:02:41 +08:00
|
|
|
m_thread.GetCurrentInlinedDepth());
|
2013-11-04 17:33:30 +08:00
|
|
|
StackFrameSP stack_sp = m_thread.GetStackFrameAtIndex(0);
|
2012-09-01 09:02:41 +08:00
|
|
|
if (stack_sp)
|
|
|
|
{
|
|
|
|
Block *frame_block = stack_sp->GetFrameBlock();
|
|
|
|
lldb::addr_t curr_pc = m_thread.GetRegisterContext()->GetPC();
|
|
|
|
AddressRange my_range;
|
|
|
|
if (frame_block->GetRangeContainingLoadAddress(curr_pc, m_thread.GetProcess()->GetTarget(), my_range))
|
|
|
|
{
|
|
|
|
m_address_ranges.clear();
|
|
|
|
m_address_ranges.push_back(my_range);
|
|
|
|
if (log)
|
|
|
|
{
|
|
|
|
StreamString s;
|
|
|
|
const InlineFunctionInfo *inline_info = frame_block->GetInlinedFunctionInfo();
|
|
|
|
const char *name;
|
|
|
|
if (inline_info)
|
|
|
|
name = inline_info->GetName().AsCString();
|
|
|
|
else
|
|
|
|
name = "<unknown-notinlined>";
|
|
|
|
|
|
|
|
s.Printf ("Stepping over inlined function \"%s\" in inlined stack: ", name);
|
|
|
|
DumpRanges(&s);
|
|
|
|
log->PutCString(s.GetData());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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
|
|
|
}
|
2014-03-13 10:47:14 +08:00
|
|
|
|