Cleaned up the inline stack frame code one more time to prepare for inlined
code stepping. Also we now store the stack frames for the current and previous
stops in the thread in std::auto_ptr objects. When we create a thread stack
frame list we pass the previous frame into it so it can re-use the frames
and maintain will allow for variable changes to be detected. I will implement
the stack frame reuse next.
git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@112152 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/Target/StackID.cpp b/source/Target/StackID.cpp
index 78543fa..6d34d3b 100644
--- a/source/Target/StackID.cpp
+++ b/source/Target/StackID.cpp
@@ -16,84 +16,27 @@
using namespace lldb_private;
-//----------------------------------------------------------------------
-// StackID constructor
-//----------------------------------------------------------------------
-StackID::StackID() :
- m_start_address(),
- m_cfa (0),
- m_inline_height (0)
-{
-}
-
-//----------------------------------------------------------------------
-// StackID constructor with args
-//----------------------------------------------------------------------
-StackID::StackID (const Address& start_address, lldb::addr_t cfa, uint32_t inline_id) :
- m_start_address (start_address),
- m_cfa (cfa),
- m_inline_height (inline_id)
-{
-}
-
-StackID::StackID (lldb::addr_t cfa, uint32_t inline_id) :
- m_start_address (),
- m_cfa (cfa),
- m_inline_height (inline_id)
-{
-}
-
-//----------------------------------------------------------------------
-// StackID copy constructor
-//----------------------------------------------------------------------
-StackID::StackID(const StackID& rhs) :
- m_start_address (rhs.m_start_address),
- m_cfa (rhs.m_cfa),
- m_inline_height (rhs.m_inline_height)
-{
-}
-
-//----------------------------------------------------------------------
-// StackID assignment operator
-//----------------------------------------------------------------------
-const StackID&
-StackID::operator=(const StackID& rhs)
-{
- if (this != &rhs)
- {
- m_start_address = rhs.m_start_address;
- m_cfa = rhs.m_cfa;
- m_inline_height = rhs.m_inline_height;
- }
- return *this;
-}
-
-//----------------------------------------------------------------------
-// Destructor
-//----------------------------------------------------------------------
-StackID::~StackID()
-{
-}
bool
lldb_private::operator== (const StackID& lhs, const StackID& rhs)
{
- return lhs.GetCallFrameAddress() == rhs.GetCallFrameAddress() &&
- lhs.GetInlineHeight() == rhs.GetInlineHeight() &&
- lhs.GetStartAddress() == rhs.GetStartAddress();
+ return lhs.GetCallFrameAddress() == rhs.GetCallFrameAddress() &&
+ lhs.GetInlineBlockID() == rhs.GetInlineBlockID() &&
+ lhs.GetStartAddress() == rhs.GetStartAddress();
}
bool
lldb_private::operator!= (const StackID& lhs, const StackID& rhs)
{
- return lhs.GetCallFrameAddress() != rhs.GetCallFrameAddress() ||
- lhs.GetInlineHeight() != rhs.GetInlineHeight() ||
- lhs.GetStartAddress() != rhs.GetStartAddress();
+ return lhs.GetCallFrameAddress() != rhs.GetCallFrameAddress() ||
+ lhs.GetInlineBlockID() != rhs.GetInlineBlockID() ||
+ lhs.GetStartAddress() != rhs.GetStartAddress();
}
bool
lldb_private::operator< (const StackID& lhs, const StackID& rhs)
{
- return lhs.GetCallFrameAddress() < rhs.GetCallFrameAddress();
+ if (lhs.GetCallFrameAddress() < rhs.GetCallFrameAddress())
+ return true;
+ return lhs.GetInlineBlockID() < rhs.GetInlineBlockID();
}
-