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
205 lines
5.8 KiB
C++
205 lines
5.8 KiB
C++
//===-- ThreadPlanStepInstruction.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/ThreadPlanStepInstruction.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"
|
|
#include "lldb/Target/Process.h"
|
|
#include "lldb/Target/RegisterContext.h"
|
|
#include "lldb/Target/RegisterContext.h"
|
|
#include "lldb/Target/StopInfo.h"
|
|
#include "lldb/Target/Target.h"
|
|
|
|
using namespace lldb;
|
|
using namespace lldb_private;
|
|
|
|
//----------------------------------------------------------------------
|
|
// ThreadPlanStepInstruction: Step over the current instruction
|
|
//----------------------------------------------------------------------
|
|
|
|
ThreadPlanStepInstruction::ThreadPlanStepInstruction
|
|
(
|
|
Thread &thread,
|
|
bool step_over,
|
|
bool stop_other_threads,
|
|
Vote stop_vote,
|
|
Vote run_vote
|
|
) :
|
|
ThreadPlan (ThreadPlan::eKindStepInstruction, "Step over single instruction", thread, stop_vote, run_vote),
|
|
m_instruction_addr (0),
|
|
m_stop_other_threads (stop_other_threads),
|
|
m_step_over (step_over)
|
|
{
|
|
m_instruction_addr = m_thread.GetRegisterContext()->GetPC(0);
|
|
m_stack_id = m_thread.GetStackFrameAtIndex(0)->GetStackID();
|
|
}
|
|
|
|
ThreadPlanStepInstruction::~ThreadPlanStepInstruction ()
|
|
{
|
|
}
|
|
|
|
void
|
|
ThreadPlanStepInstruction::GetDescription (Stream *s, lldb::DescriptionLevel level)
|
|
{
|
|
if (level == lldb::eDescriptionLevelBrief)
|
|
{
|
|
if (m_step_over)
|
|
s->Printf ("instruction step over");
|
|
else
|
|
s->Printf ("instruction step into");
|
|
}
|
|
else
|
|
{
|
|
s->Printf ("Stepping one instruction past ");
|
|
s->Address(m_instruction_addr, sizeof (addr_t));
|
|
if (m_step_over)
|
|
s->Printf(" stepping over calls");
|
|
else
|
|
s->Printf(" stepping into calls");
|
|
}
|
|
}
|
|
|
|
bool
|
|
ThreadPlanStepInstruction::ValidatePlan (Stream *error)
|
|
{
|
|
// Since we read the instruction we're stepping over from the thread,
|
|
// this plan will always work.
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
ThreadPlanStepInstruction::DoPlanExplainsStop (Event *event_ptr)
|
|
{
|
|
StopInfoSP stop_info_sp = GetPrivateStopReason();
|
|
if (stop_info_sp)
|
|
{
|
|
StopReason reason = stop_info_sp->GetStopReason();
|
|
if (reason == eStopReasonTrace || reason == eStopReasonNone)
|
|
return true;
|
|
else
|
|
return false;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
bool
|
|
ThreadPlanStepInstruction::ShouldStop (Event *event_ptr)
|
|
{
|
|
if (m_step_over)
|
|
{
|
|
Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP));
|
|
|
|
StackID cur_frame_zero_id = m_thread.GetStackFrameAtIndex(0)->GetStackID();
|
|
|
|
if (cur_frame_zero_id == m_stack_id || m_stack_id < cur_frame_zero_id)
|
|
{
|
|
if (m_thread.GetRegisterContext()->GetPC(0) != m_instruction_addr)
|
|
{
|
|
SetPlanComplete();
|
|
return true;
|
|
}
|
|
else
|
|
return false;
|
|
}
|
|
else
|
|
{
|
|
// We've stepped in, step back out again:
|
|
StackFrame *return_frame = m_thread.GetStackFrameAtIndex(1).get();
|
|
if (return_frame)
|
|
{
|
|
if (log)
|
|
{
|
|
StreamString s;
|
|
s.PutCString ("Stepped in to: ");
|
|
addr_t stop_addr = m_thread.GetStackFrameAtIndex(0)->GetRegisterContext()->GetPC();
|
|
s.Address (stop_addr, m_thread.CalculateTarget()->GetArchitecture().GetAddressByteSize());
|
|
s.PutCString (" stepping out to: ");
|
|
addr_t return_addr = return_frame->GetRegisterContext()->GetPC();
|
|
s.Address (return_addr, m_thread.CalculateTarget()->GetArchitecture().GetAddressByteSize());
|
|
log->Printf("%s.", s.GetData());
|
|
}
|
|
|
|
// StepInstruction should probably have the tri-state RunMode, but for now it is safer to
|
|
// run others.
|
|
const bool stop_others = false;
|
|
m_thread.QueueThreadPlanForStepOut(false,
|
|
NULL,
|
|
true,
|
|
stop_others,
|
|
eVoteNo,
|
|
eVoteNoOpinion,
|
|
0);
|
|
return false;
|
|
}
|
|
else
|
|
{
|
|
if (log)
|
|
log->Printf("Could not find previous frame, stopping.");
|
|
SetPlanComplete();
|
|
return true;
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
else
|
|
{
|
|
if (m_thread.GetRegisterContext()->GetPC(0) != m_instruction_addr)
|
|
{
|
|
SetPlanComplete();
|
|
return true;
|
|
}
|
|
else
|
|
return false;
|
|
}
|
|
}
|
|
|
|
bool
|
|
ThreadPlanStepInstruction::StopOthers ()
|
|
{
|
|
return m_stop_other_threads;
|
|
}
|
|
|
|
StateType
|
|
ThreadPlanStepInstruction::GetPlanRunState ()
|
|
{
|
|
return eStateStepping;
|
|
}
|
|
|
|
bool
|
|
ThreadPlanStepInstruction::WillStop ()
|
|
{
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
ThreadPlanStepInstruction::MischiefManaged ()
|
|
{
|
|
if (IsPlanComplete())
|
|
{
|
|
Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP));
|
|
if (log)
|
|
log->Printf("Completed single instruction step plan.");
|
|
ThreadPlan::MischiefManaged ();
|
|
return true;
|
|
}
|
|
else
|
|
{
|
|
return false;
|
|
}
|
|
}
|
|
|