diff options
Diffstat (limited to 'source/Target/Thread.cpp')
| -rw-r--r-- | source/Target/Thread.cpp | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/source/Target/Thread.cpp b/source/Target/Thread.cpp index 6fd5cdf..29ba86a 100644 --- a/source/Target/Thread.cpp +++ b/source/Target/Thread.cpp @@ -7,9 +7,6 @@ // //===----------------------------------------------------------------------===// -#include "lldb/lldb-python.h" - -#include "lldb/lldb-private-log.h" #include "lldb/Breakpoint/BreakpointLocation.h" #include "lldb/Core/Debugger.h" #include "lldb/Core/Log.h" @@ -20,7 +17,10 @@ #include "lldb/Core/RegularExpression.h" #include "lldb/Host/Host.h" #include "lldb/Interpreter/OptionValueFileSpecList.h" +#include "lldb/Interpreter/OptionValueProperties.h" +#include "lldb/Interpreter/Property.h" #include "lldb/Symbol/Function.h" +#include "lldb/Target/ABI.h" #include "lldb/Target/DynamicLoader.h" #include "lldb/Target/ExecutionContext.h" #include "lldb/Target/ObjCLanguageRuntime.h" @@ -655,11 +655,6 @@ Thread::SetupForResume () // telling the current plan it will resume, since we might change what the current // plan is. -// StopReason stop_reason = lldb::eStopReasonInvalid; -// StopInfoSP stop_info_sp = GetStopInfo(); -// if (stop_info_sp.get()) -// stop_reason = stop_info_sp->GetStopReason(); -// if (stop_reason == lldb::eStopReasonBreakpoint) lldb::RegisterContextSP reg_ctx_sp (GetRegisterContext()); if (reg_ctx_sp) { @@ -725,7 +720,7 @@ Thread::ShouldResume (StateType resume_state) // the target, 'cause that slows down single stepping. So assume that if we got to the point where // we're about to resume, and we haven't yet had to fetch the stop reason, then it doesn't need to know // about the fact that we are resuming... - const uint32_t process_stop_id = GetProcess()->GetStopID(); + const uint32_t process_stop_id = GetProcess()->GetStopID(); if (m_stop_info_stop_id == process_stop_id && (m_stop_info_sp && m_stop_info_sp->IsValid())) { @@ -1211,7 +1206,7 @@ Thread::GetReturnValueObject () ValueObjectSP return_valobj_sp; return_valobj_sp = m_completed_plan_stack[i]->GetReturnValueObject(); if (return_valobj_sp) - return return_valobj_sp; + return return_valobj_sp; } } return ValueObjectSP(); @@ -1227,7 +1222,7 @@ Thread::GetExpressionVariable () ClangExpressionVariableSP expression_variable_sp; expression_variable_sp = m_completed_plan_stack[i]->GetExpressionVariable(); if (expression_variable_sp) - return expression_variable_sp; + return expression_variable_sp; } } return ClangExpressionVariableSP(); @@ -2207,8 +2202,7 @@ Thread::GetDescription (Stream &strm, lldb::DescriptionLevel level, bool print_j strm.Printf("\n"); StructuredData::ObjectSP thread_info = GetExtendedInfo(); - StructuredData::ObjectSP stop_info = m_stop_info_sp->GetExtendedInfo(); - + if (print_json_thread || print_json_stopinfo) { if (thread_info && print_json_thread) @@ -2216,13 +2210,17 @@ Thread::GetDescription (Stream &strm, lldb::DescriptionLevel level, bool print_j thread_info->Dump (strm); strm.Printf("\n"); } - - if (stop_info && print_json_stopinfo) + + if (print_json_stopinfo && m_stop_info_sp) { - stop_info->Dump (strm); - strm.Printf("\n"); + StructuredData::ObjectSP stop_info = m_stop_info_sp->GetExtendedInfo(); + if (stop_info) + { + stop_info->Dump (strm); + strm.Printf("\n"); + } } - + return true; } @@ -2315,7 +2313,10 @@ Thread::GetUnwinder () case llvm::Triple::arm: case llvm::Triple::aarch64: case llvm::Triple::thumb: + case llvm::Triple::mips: + case llvm::Triple::mipsel: case llvm::Triple::mips64: + case llvm::Triple::mips64el: case llvm::Triple::ppc: case llvm::Triple::ppc64: case llvm::Triple::hexagon: |
