summaryrefslogtreecommitdiffstats
path: root/lldb/source/Core/EmulateInstruction.cpp
diff options
context:
space:
mode:
authorJason Molenda <jmolenda@apple.com>2013-11-04 09:33:30 +0000
committerJason Molenda <jmolenda@apple.com>2013-11-04 09:33:30 +0000
commitb57e4a1bc6054a5495d6671f108914108852105b (patch)
tree0323964656c388cca864bd7eb52bdd1108006c28 /lldb/source/Core/EmulateInstruction.cpp
parentf23b27a837a005c193106c346e139b74a064ec19 (diff)
downloadbcm5719-llvm-b57e4a1bc6054a5495d6671f108914108852105b.tar.gz
bcm5719-llvm-b57e4a1bc6054a5495d6671f108914108852105b.zip
Roll back the changes I made in r193907 which created a new Frame
pure virtual base class and made StackFrame a subclass of that. As I started to build on top of that arrangement today, I found that it wasn't working out like I intended. Instead I'll try sticking with the single StackFrame class -- there's too much code duplication to make a more complicated class hierarchy sensible I think. llvm-svn: 193983
Diffstat (limited to 'lldb/source/Core/EmulateInstruction.cpp')
-rw-r--r--lldb/source/Core/EmulateInstruction.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/lldb/source/Core/EmulateInstruction.cpp b/lldb/source/Core/EmulateInstruction.cpp
index 28c439668a8..bf6c6d88b56 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;
- Frame *frame = (Frame *) baton;
+ StackFrame *frame = (StackFrame *) 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;
- Frame *frame = (Frame *) baton;
+ StackFrame *frame = (StackFrame *) baton;
ProcessSP process_sp (frame->CalculateProcess());
if (process_sp)
@@ -335,7 +335,7 @@ EmulateInstruction::ReadRegisterFrame (EmulateInstruction *instruction,
if (!baton)
return false;
- Frame *frame = (Frame *) baton;
+ StackFrame *frame = (StackFrame *) baton;
return frame->GetRegisterContext()->ReadRegister (reg_info, reg_value);
}
@@ -349,7 +349,7 @@ EmulateInstruction::WriteRegisterFrame (EmulateInstruction *instruction,
if (!baton)
return false;
- Frame *frame = (Frame *) baton;
+ StackFrame *frame = (StackFrame *) baton;
return frame->GetRegisterContext()->WriteRegister (reg_info, reg_value);
}
OpenPOWER on IntegriCloud