1b72fcb7d1
which is now on by default. Frames are gotten from the unwinder as concrete frames, then if inline frames are to be shown, extra information to track and reconstruct these frames is cached with each Thread and exanded as needed. I added an inline height as part of the lldb_private::StackID class, the class that helps us uniquely identify stack frames. This allows for two frames to shared the same call frame address, yet differ only in inline height. Fixed setting breakpoint by address to not require addresses to resolve. A quick example: % cat main.cpp % ./build/Debug/lldb test/stl/a.out Current executable set to 'test/stl/a.out' (x86_64). (lldb) breakpoint set --address 0x0000000100000d31 Breakpoint created: 1: address = 0x0000000100000d31, locations = 1 (lldb) r Launching 'a.out' (x86_64) (lldb) Process 38031 Stopped * thread #1: tid = 0x2e03, pc = 0x0000000100000d31, where = a.out`main [inlined] std::string::_M_data() const at /usr/include/c++/4.2.1/bits/basic_string.h:280, stop reason = breakpoint 1.1, queue = com.apple.main-thread 277 278 _CharT* 279 _M_data() const 280 -> { return _M_dataplus._M_p; } 281 282 _CharT* 283 _M_data(_CharT* __p) (lldb) bt thread #1: tid = 0x2e03, stop reason = breakpoint 1.1, queue = com.apple.main-thread frame #0: pc = 0x0000000100000d31, where = a.out`main [inlined] std::string::_M_data() const at /usr/include/c++/4.2.1/bits/basic_string.h:280 frame #1: pc = 0x0000000100000d31, where = a.out`main [inlined] std::string::_M_rep() const at /usr/include/c++/4.2.1/bits/basic_string.h:288 frame #2: pc = 0x0000000100000d31, where = a.out`main [inlined] std::string::size() const at /usr/include/c++/4.2.1/bits/basic_string.h:606 frame #3: pc = 0x0000000100000d31, where = a.out`main [inlined] operator<< <char, std::char_traits<char>, std::allocator<char> > at /usr/include/c++/4.2.1/bits/basic_string.h:2414 frame #4: pc = 0x0000000100000d31, where = a.out`main + 33 at /Volumes/work/gclayton/Documents/src/lldb/test/stl/main.cpp:14 frame #5: pc = 0x0000000100000d08, where = a.out`start + 52 Each inline frame contains only the variables that they contain and each inlined stack frame is treated as a single entity. llvm-svn: 111877
74 lines
2.1 KiB
C++
74 lines
2.1 KiB
C++
//===-- UnwindLibUnwind.cpp -------------------------------------*- C++ -*-===//
|
|
//
|
|
// The LLVM Compiler Infrastructure
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
// C Includes
|
|
// C++ Includes
|
|
// Other libraries and framework includes
|
|
// Project includes
|
|
#include "lldb/Target/Thread.h"
|
|
#include "UnwindLibUnwind.h"
|
|
#include "LibUnwindRegisterContext.h"
|
|
|
|
using namespace lldb;
|
|
using namespace lldb_private;
|
|
|
|
UnwindLibUnwind::UnwindLibUnwind (Thread &thread, unw_addr_space_t addr_space) :
|
|
Unwind (thread),
|
|
m_addr_space (addr_space),
|
|
m_cursors()
|
|
{
|
|
m_pc_regnum = thread.GetRegisterContext()->ConvertRegisterKindToRegisterNumber (eRegisterKindGeneric, LLDB_REGNUM_GENERIC_PC);
|
|
m_sp_regnum = thread.GetRegisterContext()->ConvertRegisterKindToRegisterNumber (eRegisterKindGeneric, LLDB_REGNUM_GENERIC_SP);
|
|
}
|
|
|
|
uint32_t
|
|
UnwindLibUnwind::GetFrameCount()
|
|
{
|
|
if (m_cursors.empty())
|
|
{
|
|
unw_cursor_t cursor;
|
|
unw_init_remote (&cursor, m_addr_space, &m_thread);
|
|
|
|
m_cursors.push_back (cursor);
|
|
|
|
while (1)
|
|
{
|
|
int stepresult = unw_step (&cursor);
|
|
if (stepresult > 0)
|
|
m_cursors.push_back (cursor);
|
|
else
|
|
break;
|
|
}
|
|
}
|
|
return m_cursors.size();
|
|
}
|
|
|
|
bool
|
|
UnwindLibUnwind::GetFrameInfoAtIndex (uint32_t idx, addr_t& cfa, addr_t& pc)
|
|
{
|
|
const uint32_t frame_count = GetFrameCount();
|
|
if (idx < frame_count)
|
|
{
|
|
int pc_err = unw_get_reg (&m_cursors[idx], m_pc_regnum, &pc);
|
|
int sp_err = unw_get_reg (&m_cursors[idx], m_sp_regnum, &cfa);
|
|
return pc_err == UNW_ESUCCESS && sp_err == UNW_ESUCCESS;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
RegisterContext *
|
|
UnwindLibUnwind::CreateRegisterContextForFrame (StackFrame *frame)
|
|
{
|
|
uint32_t idx = frame->GetConcreteFrameIndex ();
|
|
const uint32_t frame_count = GetFrameCount();
|
|
if (idx < frame_count)
|
|
return new LibUnwindRegisterContext (m_thread, frame, m_cursors[idx]);
|
|
return NULL;
|
|
}
|