From b9c1b51e45b845debb76d8658edabca70ca56079 Mon Sep 17 00:00:00 2001 From: Kate Stone Date: Tue, 6 Sep 2016 20:57:50 +0000 Subject: *** This commit represents a complete reformatting of the LLDB source code *** to conform to clang-format’s LLVM style. This kind of mass change has *** two obvious implications: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Firstly, merging this particular commit into a downstream fork may be a huge effort. Alternatively, it may be worth merging all changes up to this commit, performing the same reformatting operation locally, and then discarding the merge for this particular commit. The commands used to accomplish this reformatting were as follows (with current working directory as the root of the repository): find . \( -iname "*.c" -or -iname "*.cpp" -or -iname "*.h" -or -iname "*.mm" \) -exec clang-format -i {} + find . -iname "*.py" -exec autopep8 --in-place --aggressive --aggressive {} + ; The version of clang-format used was 3.9.0, and autopep8 was 1.2.4. Secondly, “blame” style tools will generally point to this commit instead of a meaningful prior commit. There are alternatives available that will attempt to look through this change and find the appropriate prior commit. YMMV. llvm-svn: 280751 --- .../Plugins/Process/Utility/ThreadMemory.cpp | 171 ++++++++------------- 1 file changed, 68 insertions(+), 103 deletions(-) (limited to 'lldb/source/Plugins/Process/Utility/ThreadMemory.cpp') diff --git a/lldb/source/Plugins/Process/Utility/ThreadMemory.cpp b/lldb/source/Plugins/Process/Utility/ThreadMemory.cpp index 6a7aa626baf..b3cac1c854d 100644 --- a/lldb/source/Plugins/Process/Utility/ThreadMemory.cpp +++ b/lldb/source/Plugins/Process/Utility/ThreadMemory.cpp @@ -1,4 +1,5 @@ -//===-- ThreadMemory.cpp ----------------------------------------------*- C++ -*-===// +//===-- ThreadMemory.cpp ----------------------------------------------*- C++ +//-*-===// // // The LLVM Compiler Infrastructure // @@ -8,133 +9,97 @@ //===----------------------------------------------------------------------===// #include "Plugins/Process/Utility/ThreadMemory.h" +#include "Plugins/Process/Utility/RegisterContextThreadMemory.h" #include "lldb/Target/OperatingSystem.h" -#include "lldb/Target/RegisterContext.h" #include "lldb/Target/Process.h" +#include "lldb/Target/RegisterContext.h" #include "lldb/Target/StopInfo.h" #include "lldb/Target/Unwind.h" -#include "Plugins/Process/Utility/RegisterContextThreadMemory.h" using namespace lldb; using namespace lldb_private; -ThreadMemory::ThreadMemory (Process &process, - tid_t tid, - const ValueObjectSP &thread_info_valobj_sp) : - Thread (process, tid), - m_backing_thread_sp (), - m_thread_info_valobj_sp (thread_info_valobj_sp), - m_name(), - m_queue() -{ -} - +ThreadMemory::ThreadMemory(Process &process, tid_t tid, + const ValueObjectSP &thread_info_valobj_sp) + : Thread(process, tid), m_backing_thread_sp(), + m_thread_info_valobj_sp(thread_info_valobj_sp), m_name(), m_queue() {} -ThreadMemory::ThreadMemory (Process &process, - lldb::tid_t tid, - const char *name, - const char *queue, - lldb::addr_t register_data_addr) : - Thread (process, tid), - m_backing_thread_sp (), - m_thread_info_valobj_sp (), - m_name(), - m_queue(), - m_register_data_addr (register_data_addr) -{ - if (name) - m_name = name; - if (queue) - m_queue = queue; +ThreadMemory::ThreadMemory(Process &process, lldb::tid_t tid, const char *name, + const char *queue, lldb::addr_t register_data_addr) + : Thread(process, tid), m_backing_thread_sp(), m_thread_info_valobj_sp(), + m_name(), m_queue(), m_register_data_addr(register_data_addr) { + if (name) + m_name = name; + if (queue) + m_queue = queue; } +ThreadMemory::~ThreadMemory() { DestroyThread(); } -ThreadMemory::~ThreadMemory() -{ - DestroyThread(); +void ThreadMemory::WillResume(StateType resume_state) { + if (m_backing_thread_sp) + m_backing_thread_sp->WillResume(resume_state); } -void -ThreadMemory::WillResume (StateType resume_state) -{ - if (m_backing_thread_sp) - m_backing_thread_sp->WillResume(resume_state); +void ThreadMemory::ClearStackFrames() { + if (m_backing_thread_sp) + m_backing_thread_sp->ClearStackFrames(); + Thread::ClearStackFrames(); } -void -ThreadMemory::ClearStackFrames () -{ - if (m_backing_thread_sp) - m_backing_thread_sp->ClearStackFrames(); - Thread::ClearStackFrames(); +RegisterContextSP ThreadMemory::GetRegisterContext() { + if (!m_reg_context_sp) + m_reg_context_sp.reset( + new RegisterContextThreadMemory(*this, m_register_data_addr)); + return m_reg_context_sp; } RegisterContextSP -ThreadMemory::GetRegisterContext () -{ - if (!m_reg_context_sp) - m_reg_context_sp.reset (new RegisterContextThreadMemory (*this, m_register_data_addr)); - return m_reg_context_sp; -} +ThreadMemory::CreateRegisterContextForFrame(StackFrame *frame) { + RegisterContextSP reg_ctx_sp; + uint32_t concrete_frame_idx = 0; -RegisterContextSP -ThreadMemory::CreateRegisterContextForFrame (StackFrame *frame) -{ - RegisterContextSP reg_ctx_sp; - uint32_t concrete_frame_idx = 0; - - if (frame) - concrete_frame_idx = frame->GetConcreteFrameIndex (); - - if (concrete_frame_idx == 0) - { - reg_ctx_sp = GetRegisterContext (); - } - else - { - Unwind *unwinder = GetUnwinder (); - if (unwinder) - reg_ctx_sp = unwinder->CreateRegisterContextForFrame (frame); - } - return reg_ctx_sp; + if (frame) + concrete_frame_idx = frame->GetConcreteFrameIndex(); + + if (concrete_frame_idx == 0) { + reg_ctx_sp = GetRegisterContext(); + } else { + Unwind *unwinder = GetUnwinder(); + if (unwinder) + reg_ctx_sp = unwinder->CreateRegisterContextForFrame(frame); + } + return reg_ctx_sp; } -bool -ThreadMemory::CalculateStopInfo () -{ - if (m_backing_thread_sp) - { - lldb::StopInfoSP backing_stop_info_sp (m_backing_thread_sp->GetPrivateStopInfo()); - if (backing_stop_info_sp && backing_stop_info_sp->IsValidForOperatingSystemThread(*this)) - { - backing_stop_info_sp->SetThread (shared_from_this()); - SetStopInfo (backing_stop_info_sp); - return true; - } +bool ThreadMemory::CalculateStopInfo() { + if (m_backing_thread_sp) { + lldb::StopInfoSP backing_stop_info_sp( + m_backing_thread_sp->GetPrivateStopInfo()); + if (backing_stop_info_sp && + backing_stop_info_sp->IsValidForOperatingSystemThread(*this)) { + backing_stop_info_sp->SetThread(shared_from_this()); + SetStopInfo(backing_stop_info_sp); + return true; } - else - { - ProcessSP process_sp (GetProcess()); + } else { + ProcessSP process_sp(GetProcess()); - if (process_sp) - { - OperatingSystem *os = process_sp->GetOperatingSystem (); - if (os) - { - SetStopInfo (os->CreateThreadStopReason (this)); - return true; - } - } + if (process_sp) { + OperatingSystem *os = process_sp->GetOperatingSystem(); + if (os) { + SetStopInfo(os->CreateThreadStopReason(this)); + return true; + } } - return false; + } + return false; } -void -ThreadMemory::RefreshStateAfterStop() -{ - if (m_backing_thread_sp) - return m_backing_thread_sp->RefreshStateAfterStop(); - - if (m_reg_context_sp) - m_reg_context_sp->InvalidateAllRegisters(); +void ThreadMemory::RefreshStateAfterStop() { + if (m_backing_thread_sp) + return m_backing_thread_sp->RefreshStateAfterStop(); + + if (m_reg_context_sp) + m_reg_context_sp->InvalidateAllRegisters(); } -- cgit v1.2.3