diff options
Diffstat (limited to 'lldb/source/Plugins/Process')
14 files changed, 45 insertions, 42 deletions
diff --git a/lldb/source/Plugins/Process/MacOSX-User/source/MacOSX/MachException.cpp b/lldb/source/Plugins/Process/MacOSX-User/source/MacOSX/MachException.cpp index e9756881886..3c049f67739 100644 --- a/lldb/source/Plugins/Process/MacOSX-User/source/MacOSX/MachException.cpp +++ b/lldb/source/Plugins/Process/MacOSX-User/source/MacOSX/MachException.cpp @@ -369,7 +369,7 @@ MachException::Message::Reply(task_t task, pid_t pid, int signal) else err.Clear(); - if (log && log->GetMask().Test(PD_LOG_EXCEPTIONS) || err.Fail()) + if (log && (log->GetMask().Test(PD_LOG_EXCEPTIONS) || err.Fail())) err.PutToLog(log.get(), "::ptrace (request = PT_THUPDATE, pid = %i, tid = 0x%4.4x, signal = %i)", state_pid, state.thread_port, signal); } diff --git a/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_arm.cpp b/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_arm.cpp index cac805ef560..35805b52d7e 100644 --- a/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_arm.cpp +++ b/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_arm.cpp @@ -186,7 +186,7 @@ RegisterContextMach_arm::~RegisterContextMach_arm() #define DEFINE_DBG(reg, i) #reg, NULL, sizeof(((RegisterContextMach_arm::DBG *)NULL)->reg[i]), DBG_OFFSET(reg[i]), eEncodingUint, eFormatHex, { LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, dbg_##reg##i } #define REG_CONTEXT_SIZE (sizeof (RegisterContextMach_arm::GPR) + sizeof (RegisterContextMach_arm::FPU) + sizeof (RegisterContextMach_arm::EXC)) // General purpose registers -static lldb::RegisterInfo +static RegisterInfo g_register_infos[] = { // NAME ALT SZ OFFSET ENCODING FORMAT COMPILER DWARF GENERIC LLDB NATIVE diff --git a/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_arm.h b/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_arm.h index 3f9654c72c8..ef4b7af4e82 100644 --- a/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_arm.h +++ b/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_arm.h @@ -65,13 +65,13 @@ public: virtual size_t GetRegisterCount (); - virtual const lldb::RegisterInfo * + virtual const lldb_private::RegisterInfo * GetRegisterInfoAtIndex (uint32_t reg); virtual size_t GetRegisterSetCount (); - virtual const lldb::RegisterSet * + virtual const lldb_private::RegisterSet * GetRegisterSet (uint32_t set); virtual bool @@ -297,7 +297,7 @@ protected: static size_t GetRegisterInfosCount (); - static const lldb::RegisterInfo * + static const lldb_private::RegisterInfo * GetRegisterInfos (); }; diff --git a/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_i386.h b/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_i386.h index 7a3c5dad08b..969fa9a1417 100644 --- a/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_i386.h +++ b/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_i386.h @@ -33,13 +33,13 @@ public: virtual size_t GetRegisterCount (); - virtual const lldb::RegisterInfo * + virtual const lldb_private::RegisterInfo * GetRegisterInfoAtIndex (uint32_t reg); virtual size_t GetRegisterSetCount (); - virtual const lldb::RegisterSet * + virtual const lldb_private::RegisterSet * GetRegisterSet (uint32_t set); virtual bool @@ -249,7 +249,7 @@ protected: static size_t GetRegisterInfosCount (); - static const lldb::RegisterInfo * + static const lldb_private::RegisterInfo * GetRegisterInfos (); }; diff --git a/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_x86_64.cpp b/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_x86_64.cpp index 9995b0d2da0..098a168ed38 100644 --- a/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_x86_64.cpp +++ b/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_x86_64.cpp @@ -342,7 +342,7 @@ RegisterContextMach_x86_64::GetRegisterInfosCount () return k_num_register_infos; } -const RegisterInfo * +const lldb_private::RegisterInfo * RegisterContextMach_x86_64::GetRegisterInfos () { return g_register_infos; diff --git a/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_x86_64.h b/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_x86_64.h index 316575c9aa7..5b0bdc7ed31 100644 --- a/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_x86_64.h +++ b/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_x86_64.h @@ -32,13 +32,13 @@ public: virtual size_t GetRegisterCount (); - virtual const lldb::RegisterInfo * + virtual const lldb_private::RegisterInfo * GetRegisterInfoAtIndex (uint32_t reg); virtual size_t GetRegisterSetCount (); - virtual const lldb::RegisterSet * + virtual const lldb_private::RegisterSet * GetRegisterSet (uint32_t set); virtual bool @@ -253,7 +253,7 @@ protected: static size_t GetRegisterInfosCount (); - static const lldb::RegisterInfo * + static const lldb_private::RegisterInfo * GetRegisterInfos (); }; diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextLLDB.h b/lldb/source/Plugins/Process/Utility/RegisterContextLLDB.h index f75a9b84fc5..ac2c5609cdc 100644 --- a/lldb/source/Plugins/Process/Utility/RegisterContextLLDB.h +++ b/lldb/source/Plugins/Process/Utility/RegisterContextLLDB.h @@ -40,13 +40,13 @@ public: virtual size_t GetRegisterCount (); - virtual const lldb::RegisterInfo * + virtual const lldb_private::RegisterInfo * GetRegisterInfoAtIndex (uint32_t reg); virtual size_t GetRegisterSetCount (); - virtual const lldb::RegisterSet * + virtual const lldb_private::RegisterSet * GetRegisterSet (uint32_t reg_set); virtual bool diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp index 4a84e46e2cf..851d924c661 100644 --- a/lldb/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp +++ b/lldb/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp @@ -57,7 +57,7 @@ RegisterContextMacOSXFrameBackchain::GetRegisterCount () return m_thread.GetRegisterContext()->GetRegisterCount(); } -const lldb::RegisterInfo * +const RegisterInfo * RegisterContextMacOSXFrameBackchain::GetRegisterInfoAtIndex (uint32_t reg) { return m_thread.GetRegisterContext()->GetRegisterInfoAtIndex(reg); @@ -71,7 +71,7 @@ RegisterContextMacOSXFrameBackchain::GetRegisterSetCount () -const lldb::RegisterSet * +const RegisterSet * RegisterContextMacOSXFrameBackchain::GetRegisterSet (uint32_t reg_set) { return m_thread.GetRegisterContext()->GetRegisterSet (reg_set); diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.h b/lldb/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.h index 7997a23a194..bc7c2a0e90a 100644 --- a/lldb/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.h +++ b/lldb/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.h @@ -41,13 +41,13 @@ public: virtual size_t GetRegisterCount (); - virtual const lldb::RegisterInfo * + virtual const lldb_private::RegisterInfo * GetRegisterInfoAtIndex (uint32_t reg); virtual size_t GetRegisterSetCount (); - virtual const lldb::RegisterSet * + virtual const lldb_private::RegisterSet * GetRegisterSet (uint32_t reg_set); virtual bool diff --git a/lldb/source/Plugins/Process/Utility/UnwindLLDB.h b/lldb/source/Plugins/Process/Utility/UnwindLLDB.h index 1c01a3dbc74..97b08826206 100644 --- a/lldb/source/Plugins/Process/Utility/UnwindLLDB.h +++ b/lldb/source/Plugins/Process/Utility/UnwindLLDB.h @@ -12,7 +12,7 @@ #include <vector> -#include "lldb/lldb-include.h" +#include "lldb/lldb-public.h" #include "lldb/Symbol/FuncUnwinders.h" #include "lldb/Symbol/UnwindPlan.h" #include "lldb/Target/RegisterContext.h" diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp index e158e5c6237..f8a0600fb81 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp @@ -859,7 +859,7 @@ GDBRemoteCommunicationClient::GetHostInfo () { if (cpu != LLDB_INVALID_CPUTYPE) { - m_host_arch.SetArchitecture (lldb::eArchTypeMachO, cpu, sub); + m_host_arch.SetArchitecture (eArchTypeMachO, cpu, sub); if (pointer_byte_size) { assert (pointer_byte_size == m_host_arch.GetAddressByteSize()); @@ -943,7 +943,7 @@ GDBRemoteCommunicationClient::SendAttach const lldb_private::ArchSpec & GDBRemoteCommunicationClient::GetHostArchitecture () { - if (m_supports_qHostInfo == lldb::eLazyBoolCalculate) + if (m_supports_qHostInfo == eLazyBoolCalculate) GetHostInfo (); return m_host_arch; } diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.h b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.h index 410d80de316..39ddb622218 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.h +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.h @@ -237,15 +237,15 @@ protected: //------------------------------------------------------------------ // Classes that inherit from GDBRemoteCommunicationClient can see and modify these //------------------------------------------------------------------ - lldb::LazyBool m_supports_not_sending_acks; - lldb::LazyBool m_supports_thread_suffix; - lldb::LazyBool m_supports_qHostInfo; - lldb::LazyBool m_supports_vCont_all; - lldb::LazyBool m_supports_vCont_any; - lldb::LazyBool m_supports_vCont_c; - lldb::LazyBool m_supports_vCont_C; - lldb::LazyBool m_supports_vCont_s; - lldb::LazyBool m_supports_vCont_S; + lldb_private::LazyBool m_supports_not_sending_acks; + lldb_private::LazyBool m_supports_thread_suffix; + lldb_private::LazyBool m_supports_qHostInfo; + lldb_private::LazyBool m_supports_vCont_all; + lldb_private::LazyBool m_supports_vCont_any; + lldb_private::LazyBool m_supports_vCont_c; + lldb_private::LazyBool m_supports_vCont_C; + lldb_private::LazyBool m_supports_vCont_s; + lldb_private::LazyBool m_supports_vCont_S; // If we need to send a packet while the target is running, the m_async_XXX // member variables take care of making this happen. diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp index 73d3535499a..556fa511b3a 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp @@ -92,7 +92,7 @@ GDBRemoteRegisterContext::GetRegisterCount () return m_reg_info.GetNumRegisters (); } -const lldb::RegisterInfo * +const RegisterInfo * GDBRemoteRegisterContext::GetRegisterInfoAtIndex (uint32_t reg) { return m_reg_info.GetRegisterInfoAtIndex (reg); @@ -106,7 +106,7 @@ GDBRemoteRegisterContext::GetRegisterSetCount () -const lldb::RegisterSet * +const RegisterSet * GDBRemoteRegisterContext::GetRegisterSet (uint32_t reg_set) { return m_reg_info.GetRegisterSet (reg_set); @@ -474,7 +474,7 @@ GDBRemoteRegisterContext::ConvertRegisterKindToRegisterNumber (uint32_t kind, ui void GDBRemoteDynamicRegisterInfo::HardcodeARMRegisters() { - static lldb::RegisterInfo + static RegisterInfo g_register_infos[] = { // NAME ALT SZ OFF ENCODING FORMAT COMPILER DWARF GENERIC GDB LLDB NATIVE @@ -555,7 +555,7 @@ GDBRemoteDynamicRegisterInfo::HardcodeARMRegisters() { "d30", NULL, 8, 420, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d30, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, 73 }}, { "d31", NULL, 8, 428, eEncodingIEEE754, eFormatFloat, { LLDB_INVALID_REGNUM, dwarf_d31, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, 74 }}, }; - static const uint32_t num_registers = sizeof (g_register_infos)/sizeof (lldb::RegisterInfo); + static const uint32_t num_registers = sizeof (g_register_infos)/sizeof (RegisterInfo); static ConstString gpr_reg_set ("General Purpose Registers"); static ConstString vfp_reg_set ("Floating Point Registers"); for (uint32_t i=0; i<num_registers; ++i) diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.h b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.h index ac6bbe5c95d..3848ffcd50d 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.h +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.h @@ -46,7 +46,10 @@ public: } void - AddRegister (lldb::RegisterInfo ®_info, lldb_private::ConstString ®_name, lldb_private::ConstString ®_alt_name, lldb_private::ConstString &set_name) + AddRegister (lldb_private::RegisterInfo ®_info, + lldb_private::ConstString ®_name, + lldb_private::ConstString ®_alt_name, + lldb_private::ConstString &set_name) { const uint32_t reg_num = m_regs.size(); m_reg_names.push_back (reg_name); @@ -94,7 +97,7 @@ public: return m_reg_data_byte_size; } - const lldb::RegisterInfo * + const lldb_private::RegisterInfo * GetRegisterInfoAtIndex (uint32_t i) const { if (i < m_regs.size()) @@ -102,7 +105,7 @@ public: return NULL; } - const lldb::RegisterSet * + const lldb_private::RegisterSet * GetRegisterSet (uint32_t i) const { if (i < m_sets.size()) @@ -122,7 +125,7 @@ public: m_set_names.push_back(set_name); m_set_reg_nums.resize(m_set_reg_nums.size()+1); - lldb::RegisterSet new_set = { set_name.AsCString(), NULL, 0, NULL }; + lldb_private::RegisterSet new_set = { set_name.AsCString(), NULL, 0, NULL }; m_sets.push_back (new_set); return m_sets.size() - 1; } @@ -157,8 +160,8 @@ protected: //------------------------------------------------------------------ // Classes that inherit from GDBRemoteRegisterContext can see and modify these //------------------------------------------------------------------ - typedef std::vector <lldb::RegisterInfo> reg_collection; - typedef std::vector <lldb::RegisterSet> set_collection; + typedef std::vector <lldb_private::RegisterInfo> reg_collection; + typedef std::vector <lldb_private::RegisterSet> set_collection; typedef std::vector <uint32_t> reg_num_collection; typedef std::vector <reg_num_collection> set_reg_num_collection; typedef std::vector <lldb_private::ConstString> name_collection; @@ -195,13 +198,13 @@ public: virtual size_t GetRegisterCount (); - virtual const lldb::RegisterInfo * + virtual const lldb_private::RegisterInfo * GetRegisterInfoAtIndex (uint32_t reg); virtual size_t GetRegisterSetCount (); - virtual const lldb::RegisterSet * + virtual const lldb_private::RegisterSet * GetRegisterSet (uint32_t reg_set); virtual bool |
