Fixed the LLDB build so that we can have private types, private enums and
public types and public enums. This was done to keep the SWIG stuff from
parsing all sorts of enums and types that weren't needed, and allows us to
abstract our API better.
git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@128239 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp b/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
index e158e5c..f8a0600 100644
--- a/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
+++ b/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
@@ -859,7 +859,7 @@
{
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 @@
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/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.h b/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.h
index 410d80d..39ddb62 100644
--- a/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.h
+++ b/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.h
@@ -237,15 +237,15 @@
//------------------------------------------------------------------
// 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/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp b/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp
index 73d3535..556fa51 100644
--- a/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp
+++ b/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp
@@ -92,7 +92,7 @@
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 @@
-const lldb::RegisterSet *
+const RegisterSet *
GDBRemoteRegisterContext::GetRegisterSet (uint32_t reg_set)
{
return m_reg_info.GetRegisterSet (reg_set);
@@ -474,7 +474,7 @@
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 @@
{ "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/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.h b/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.h
index ac6bbe5..3848ffc 100644
--- a/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.h
+++ b/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.h
@@ -46,7 +46,10 @@
}
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 @@
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 @@
return NULL;
}
- const lldb::RegisterSet *
+ const lldb_private::RegisterSet *
GetRegisterSet (uint32_t i) const
{
if (i < m_sets.size())
@@ -122,7 +125,7 @@
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 @@
//------------------------------------------------------------------
// 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 @@
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