summaryrefslogtreecommitdiffstats
path: root/lldb/source/Core
diff options
context:
space:
mode:
Diffstat (limited to 'lldb/source/Core')
-rw-r--r--lldb/source/Core/Debugger.cpp10
-rw-r--r--lldb/source/Core/Disassembler.cpp6
-rw-r--r--lldb/source/Core/EmulateInstruction.cpp8
-rw-r--r--lldb/source/Core/ValueObject.cpp4
-rw-r--r--lldb/source/Core/ValueObjectRegister.cpp6
-rw-r--r--lldb/source/Core/ValueObjectVariable.cpp2
6 files changed, 18 insertions, 18 deletions
diff --git a/lldb/source/Core/Debugger.cpp b/lldb/source/Core/Debugger.cpp
index 3941d82d47b..ea947a63407 100644
--- a/lldb/source/Core/Debugger.cpp
+++ b/lldb/source/Core/Debugger.cpp
@@ -1137,7 +1137,7 @@ Debugger::FindDebuggerWithID (lldb::user_id_t id)
}
static void
-TestPromptFormats (StackFrame *frame)
+TestPromptFormats (Frame *frame)
{
if (frame == NULL)
return;
@@ -1359,7 +1359,7 @@ static bool RunScriptFormatKeyword(Stream &s, ScriptInterpreter *script_interpre
static ValueObjectSP
ExpandIndexedExpression (ValueObject* valobj,
size_t index,
- StackFrame* frame,
+ Frame* frame,
bool deref_pointer)
{
Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES));
@@ -2112,7 +2112,7 @@ FormatPromptRecurse
{
if (exe_ctx)
{
- StackFrame *frame = exe_ctx->GetFramePtr();
+ Frame *frame = exe_ctx->GetFramePtr();
if (frame)
{
var_name_begin += ::strlen ("frame.");
@@ -2338,7 +2338,7 @@ FormatPromptRecurse
}
else if (IsToken (var_name_begin, "pc-offset}"))
{
- StackFrame *frame = exe_ctx->GetFramePtr();
+ Frame *frame = exe_ctx->GetFramePtr();
var_success = frame != NULL;
if (var_success)
{
@@ -2397,7 +2397,7 @@ FormatPromptRecurse
// If format addr is valid, then we need to print an address
if (reg_num != LLDB_INVALID_REGNUM)
{
- StackFrame *frame = exe_ctx->GetFramePtr();
+ Frame *frame = exe_ctx->GetFramePtr();
// We have a register value to display...
if (reg_num == LLDB_REGNUM_GENERIC_PC && reg_kind == eRegisterKindGeneric)
{
diff --git a/lldb/source/Core/Disassembler.cpp b/lldb/source/Core/Disassembler.cpp
index 7f830acba1f..b82d5ca683d 100644
--- a/lldb/source/Core/Disassembler.cpp
+++ b/lldb/source/Core/Disassembler.cpp
@@ -35,7 +35,7 @@
#include "lldb/Symbol/ObjectFile.h"
#include "lldb/Target/ExecutionContext.h"
#include "lldb/Target/Process.h"
-#include "lldb/Target/StackFrame.h"
+#include "lldb/Target/Frame.h"
#include "lldb/Target/Target.h"
#define DEFAULT_DISASM_BYTE_SIZE 32
@@ -410,7 +410,7 @@ Disassembler::PrintInstructions
AddressRange sc_range;
const Address *pc_addr_ptr = NULL;
ExecutionContextScope *exe_scope = exe_ctx.GetBestExecutionContextScope();
- StackFrame *frame = exe_ctx.GetFramePtr();
+ Frame *frame = exe_ctx.GetFramePtr();
TargetSP target_sp (exe_ctx.GetTargetSP());
SourceManager &source_manager = target_sp ? target_sp->GetSourceManager() : debugger.GetSourceManager();
@@ -518,7 +518,7 @@ Disassembler::Disassemble
)
{
AddressRange range;
- StackFrame *frame = exe_ctx.GetFramePtr();
+ Frame *frame = exe_ctx.GetFramePtr();
if (frame)
{
SymbolContext sc(frame->GetSymbolContext(eSymbolContextFunction | eSymbolContextSymbol));
diff --git a/lldb/source/Core/EmulateInstruction.cpp b/lldb/source/Core/EmulateInstruction.cpp
index bf6c6d88b56..28c439668a8 100644
--- a/lldb/source/Core/EmulateInstruction.cpp
+++ b/lldb/source/Core/EmulateInstruction.cpp
@@ -292,7 +292,7 @@ EmulateInstruction::ReadMemoryFrame (EmulateInstruction *instruction,
if (!baton || dst == NULL || dst_len == 0)
return 0;
- StackFrame *frame = (StackFrame *) baton;
+ Frame *frame = (Frame *) baton;
ProcessSP process_sp (frame->CalculateProcess());
if (process_sp)
@@ -314,7 +314,7 @@ EmulateInstruction::WriteMemoryFrame (EmulateInstruction *instruction,
if (!baton || src == NULL || src_len == 0)
return 0;
- StackFrame *frame = (StackFrame *) baton;
+ Frame *frame = (Frame *) baton;
ProcessSP process_sp (frame->CalculateProcess());
if (process_sp)
@@ -335,7 +335,7 @@ EmulateInstruction::ReadRegisterFrame (EmulateInstruction *instruction,
if (!baton)
return false;
- StackFrame *frame = (StackFrame *) baton;
+ Frame *frame = (Frame *) baton;
return frame->GetRegisterContext()->ReadRegister (reg_info, reg_value);
}
@@ -349,7 +349,7 @@ EmulateInstruction::WriteRegisterFrame (EmulateInstruction *instruction,
if (!baton)
return false;
- StackFrame *frame = (StackFrame *) baton;
+ Frame *frame = (Frame *) baton;
return frame->GetRegisterContext()->WriteRegister (reg_info, reg_value);
}
diff --git a/lldb/source/Core/ValueObject.cpp b/lldb/source/Core/ValueObject.cpp
index d39d21a2a0b..25fa4c2f8a5 100644
--- a/lldb/source/Core/ValueObject.cpp
+++ b/lldb/source/Core/ValueObject.cpp
@@ -3732,7 +3732,7 @@ ValueObject::EvaluationPoint::EvaluationPoint (ExecutionContextScope *exe_scope,
{
m_exe_ctx_ref.SetThreadSP(thread_sp);
- StackFrameSP frame_sp (exe_ctx.GetFrameSP());
+ FrameSP frame_sp (exe_ctx.GetFrameSP());
if (!frame_sp)
{
if (use_selected)
@@ -3816,7 +3816,7 @@ ValueObject::EvaluationPoint::SyncWithProcessState()
{
if (m_exe_ctx_ref.HasFrameRef())
{
- StackFrameSP frame_sp (m_exe_ctx_ref.GetFrameSP());
+ FrameSP frame_sp (m_exe_ctx_ref.GetFrameSP());
if (!frame_sp)
{
// We used to have a frame, but now it is gone
diff --git a/lldb/source/Core/ValueObjectRegister.cpp b/lldb/source/Core/ValueObjectRegister.cpp
index 4f21457519e..ad7a81b29b3 100644
--- a/lldb/source/Core/ValueObjectRegister.cpp
+++ b/lldb/source/Core/ValueObjectRegister.cpp
@@ -77,7 +77,7 @@ ValueObjectRegisterContext::UpdateValue ()
{
m_error.Clear();
ExecutionContext exe_ctx(GetExecutionContextRef());
- StackFrame *frame = exe_ctx.GetFramePtr();
+ Frame *frame = exe_ctx.GetFramePtr();
if (frame)
m_reg_ctx_sp = frame->GetRegisterContext();
else
@@ -177,7 +177,7 @@ ValueObjectRegisterSet::UpdateValue ()
m_error.Clear();
SetValueDidChange (false);
ExecutionContext exe_ctx(GetExecutionContextRef());
- StackFrame *frame = exe_ctx.GetFramePtr();
+ Frame *frame = exe_ctx.GetFramePtr();
if (frame == NULL)
m_reg_ctx_sp.reset();
else
@@ -346,7 +346,7 @@ ValueObjectRegister::UpdateValue ()
{
m_error.Clear();
ExecutionContext exe_ctx(GetExecutionContextRef());
- StackFrame *frame = exe_ctx.GetFramePtr();
+ Frame *frame = exe_ctx.GetFramePtr();
if (frame == NULL)
{
m_reg_ctx_sp.reset();
diff --git a/lldb/source/Core/ValueObjectVariable.cpp b/lldb/source/Core/ValueObjectVariable.cpp
index 3d8b07a3694..f0e88e62c0f 100644
--- a/lldb/source/Core/ValueObjectVariable.cpp
+++ b/lldb/source/Core/ValueObjectVariable.cpp
@@ -263,7 +263,7 @@ ValueObjectVariable::IsInScope ()
if (exe_ctx_ref.HasFrameRef())
{
ExecutionContext exe_ctx (exe_ctx_ref);
- StackFrame *frame = exe_ctx.GetFramePtr();
+ Frame *frame = exe_ctx.GetFramePtr();
if (frame)
{
return m_variable_sp->IsInScope (frame);
OpenPOWER on IntegriCloud