Change "Current" as in GetCurrentThread, GetCurrentStackFrame, etc, to "Selected" i.e. GetSelectedThread. Selected makes more sense, since these are set by some user action (a selection). I didn't change "CurrentProcess" since this is always controlled by the target, and a given target can only have one process, so it really can't be selected.
git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@112221 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/API/SBCommandInterpreter.cpp b/source/API/SBCommandInterpreter.cpp
index 27e542c..b2cb639 100644
--- a/source/API/SBCommandInterpreter.cpp
+++ b/source/API/SBCommandInterpreter.cpp
@@ -166,7 +166,7 @@
if (m_opaque_ptr)
{
Debugger &debugger = m_opaque_ptr->GetDebugger();
- Target *target = debugger.GetCurrentTarget().get();
+ Target *target = debugger.GetSelectedTarget().get();
if (target)
process.SetProcess(target->GetProcessSP());
}
diff --git a/source/API/SBDebugger.cpp b/source/API/SBDebugger.cpp
index a07a8ae..73f125b 100644
--- a/source/API/SBDebugger.cpp
+++ b/source/API/SBDebugger.cpp
@@ -215,16 +215,16 @@
bool is_stopped = StateIsStoppedState (event_state);
if (!is_stopped)
- process.ReportCurrentState (event, out);
+ process.ReportEventState (event, out);
}
}
void
-SBDebugger::UpdateCurrentThread (SBProcess &process)
+SBDebugger::UpdateSelectedThread (SBProcess &process)
{
if (process.IsValid())
{
- SBThread curr_thread = process.GetCurrentThread ();
+ SBThread curr_thread = process.GetSelectedThread ();
SBThread thread;
StopReason curr_thread_stop_reason = eStopReasonInvalid;
if (curr_thread.IsValid())
@@ -270,9 +270,9 @@
}
}
if (plan_thread.IsValid())
- process.SetCurrentThreadByID (plan_thread.GetThreadID());
+ process.SetSelectedThreadByID (plan_thread.GetThreadID());
else if (other_thread.IsValid())
- process.SetCurrentThreadByID (other_thread.GetThreadID());
+ process.SetSelectedThreadByID (other_thread.GetThreadID());
else
{
if (curr_thread.IsValid())
@@ -281,7 +281,7 @@
thread = process.GetThreadAtIndex(0);
if (thread.IsValid())
- process.SetCurrentThreadByID (thread.GetThreadID());
+ process.SetSelectedThreadByID (thread.GetThreadID());
}
}
}
@@ -415,7 +415,7 @@
if (error.Success())
{
- m_opaque_sp->GetTargetList().SetCurrentTarget (target_sp.get());
+ m_opaque_sp->GetTargetList().SetSelectedTarget (target_sp.get());
target.reset(target_sp);
}
}
@@ -450,7 +450,7 @@
if (error.Success())
{
- m_opaque_sp->GetTargetList().SetCurrentTarget (target_sp.get());
+ m_opaque_sp->GetTargetList().SetSelectedTarget (target_sp.get());
target.reset (target_sp);
}
}
@@ -509,11 +509,11 @@
}
SBTarget
-SBDebugger::GetCurrentTarget ()
+SBDebugger::GetSelectedTarget ()
{
SBTarget sb_target;
if (m_opaque_sp)
- sb_target.reset(m_opaque_sp->GetTargetList().GetCurrentTarget ());
+ sb_target.reset(m_opaque_sp->GetTargetList().GetSelectedTarget ());
return sb_target;
}
diff --git a/source/API/SBProcess.cpp b/source/API/SBProcess.cpp
index 7db5591..b3b083e 100644
--- a/source/API/SBProcess.cpp
+++ b/source/API/SBProcess.cpp
@@ -97,11 +97,11 @@
}
SBThread
-SBProcess::GetCurrentThread () const
+SBProcess::GetSelectedThread () const
{
SBThread sb_thread;
if (m_opaque_sp)
- sb_thread.SetThread (m_opaque_sp->GetThreadList().GetCurrentThread());
+ sb_thread.SetThread (m_opaque_sp->GetThreadList().GetSelectedThread());
return sb_thread;
}
@@ -152,7 +152,7 @@
}
void
-SBProcess::ReportCurrentState (const SBEvent &event, FILE *out) const
+SBProcess::ReportEventState (const SBEvent &event, FILE *out) const
{
if (out == NULL)
return;
@@ -173,7 +173,7 @@
}
void
-SBProcess::AppendCurrentStateReport (const SBEvent &event, SBCommandReturnObject &result)
+SBProcess::AppendEventStateReport (const SBEvent &event, SBCommandReturnObject &result)
{
if (m_opaque_sp != NULL)
{
@@ -190,18 +190,18 @@
}
bool
-SBProcess::SetCurrentThread (const SBThread &thread)
+SBProcess::SetSelectedThread (const SBThread &thread)
{
if (m_opaque_sp != NULL)
- return m_opaque_sp->GetThreadList().SetCurrentThreadByID (thread.GetThreadID());
+ return m_opaque_sp->GetThreadList().SetSelectedThreadByID (thread.GetThreadID());
return false;
}
bool
-SBProcess::SetCurrentThreadByID (uint32_t tid)
+SBProcess::SetSelectedThreadByID (uint32_t tid)
{
if (m_opaque_sp != NULL)
- return m_opaque_sp->GetThreadList().SetCurrentThreadByID (tid);
+ return m_opaque_sp->GetThreadList().SetSelectedThreadByID (tid);
return false;
}
@@ -274,7 +274,7 @@
{
state = m_opaque_sp->WaitForStateChangedEvents (NULL, event_sp);
SBEvent event (event_sp);
- AppendCurrentStateReport (event, result);
+ AppendEventStateReport (event, result);
state_changed = true;
}
}
diff --git a/source/API/SBTarget.cpp b/source/API/SBTarget.cpp
index b12a5ae..c863bc7 100644
--- a/source/API/SBTarget.cpp
+++ b/source/API/SBTarget.cpp
@@ -167,17 +167,6 @@
}
bool
-SBTarget::MakeCurrentTarget ()
-{
- if (m_opaque_sp)
- {
- m_opaque_sp->GetDebugger().GetTargetList().SetCurrentTarget (m_opaque_sp.get());
- return true;
- }
- return false;
-}
-
-bool
SBTarget::operator == (const SBTarget &rhs) const
{
return m_opaque_sp.get() == rhs.m_opaque_sp.get();
diff --git a/source/API/SBThread.cpp b/source/API/SBThread.cpp
index 087e29e..49a2150 100644
--- a/source/API/SBThread.cpp
+++ b/source/API/SBThread.cpp
@@ -219,7 +219,7 @@
void
-SBThread::DisplayFramesForCurrentContext (FILE *out,
+SBThread::DisplayFramesForSelectedContext (FILE *out,
FILE *err,
uint32_t first_frame,
uint32_t num_frames,
@@ -247,7 +247,7 @@
break;
SBFrame sb_frame (frame_sp);
- if (DisplaySingleFrameForCurrentContext (out,
+ if (DisplaySingleFrameForSelectedContext (out,
err,
sb_frame,
show_frame_info,
@@ -260,13 +260,13 @@
}
bool
-SBThread::DisplaySingleFrameForCurrentContext (FILE *out,
- FILE *err,
- SBFrame &frame,
- bool show_frame_info,
- bool show_source,
- uint32_t source_lines_after,
- uint32_t source_lines_before)
+SBThread::DisplaySingleFrameForSelectedContext (FILE *out,
+ FILE *err,
+ SBFrame &frame,
+ bool show_frame_info,
+ bool show_source,
+ uint32_t source_lines_after,
+ uint32_t source_lines_before)
{
bool success = false;
@@ -349,7 +349,7 @@
Process &process = m_opaque_sp->GetProcess();
// Why do we need to set the current thread by ID here???
- process.GetThreadList().SetCurrentThreadByID (m_opaque_sp->GetID());
+ process.GetThreadList().SetSelectedThreadByID (m_opaque_sp->GetID());
process.Resume();
}
}
@@ -383,7 +383,7 @@
Process &process = m_opaque_sp->GetProcess();
// Why do we need to set the current thread by ID here???
- process.GetThreadList().SetCurrentThreadByID (m_opaque_sp->GetID());
+ process.GetThreadList().SetSelectedThreadByID (m_opaque_sp->GetID());
process.Resume();
}
@@ -400,7 +400,7 @@
m_opaque_sp->QueueThreadPlanForStepOut (abort_other_plans, NULL, false, stop_other_threads, eVoteYes, eVoteNoOpinion);
Process &process = m_opaque_sp->GetProcess();
- process.GetThreadList().SetCurrentThreadByID (m_opaque_sp->GetID());
+ process.GetThreadList().SetSelectedThreadByID (m_opaque_sp->GetID());
process.Resume();
}
}
@@ -412,7 +412,7 @@
{
m_opaque_sp->QueueThreadPlanForStepSingleInstruction (step_over, true, true);
Process &process = m_opaque_sp->GetProcess();
- process.GetThreadList().SetCurrentThreadByID (m_opaque_sp->GetID());
+ process.GetThreadList().SetSelectedThreadByID (m_opaque_sp->GetID());
process.Resume();
}
}
@@ -429,7 +429,7 @@
m_opaque_sp->QueueThreadPlanForRunToAddress (abort_other_plans, target_addr, stop_other_threads);
Process &process = m_opaque_sp->GetProcess();
- process.GetThreadList().SetCurrentThreadByID (m_opaque_sp->GetID());
+ process.GetThreadList().SetSelectedThreadByID (m_opaque_sp->GetID());
process.Resume();
}
diff --git a/source/API/SBValue.cpp b/source/API/SBValue.cpp
index e381246..c7839cb 100644
--- a/source/API/SBValue.cpp
+++ b/source/API/SBValue.cpp
@@ -302,42 +302,6 @@
return is_ptr_type;
}
-
-//lldb_private::ExecutionContext
-//SBValue::GetCurrentExecutionContext ()
-//{
-// lldb_private::Process *process = NULL;
-// lldb_private::Thread *thread = NULL;
-// lldb_private::StackFrame *frame = NULL;
-//
-// SBTarget sb_target = SBDebugger::GetCurrentTarget();
-// if (sb_target.IsValid())
-// {
-// SBProcess sb_process = sb_target.GetProcess();
-// if (sb_process.IsValid())
-// {
-// process = sb_process.get();
-// SBThread sb_thread = sb_process.GetCurrentThread();
-// if (sb_thread.IsValid())
-// {
-// thread = sb_thread.GetLLDBObjectPtr();
-// frame = thread->GetStackFrameAtIndex(0).get();
-// lldb_private::ExecutionContext exe_context (process, thread, frame);
-// return exe_context;
-// }
-// else
-// {
-// lldb_private::ExecutionContext exe_context (process, NULL, NULL);
-// return exe_context;
-// }
-// }
-// }
-//
-// lldb_private::ExecutionContext exe_context (NULL, NULL, NULL);
-// return exe_context;
-//}
-//
-//
void *
SBValue::GetOpaqueType()
{