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.

llvm-svn: 128239

4 files changed, 26 insertions, 23 deletions

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 &reg_info, lldb_private::ConstString &reg_name, lldb_private::ConstString &reg_alt_name, lldb_private::ConstString &set_name)
+    AddRegister (lldb_private::RegisterInfo &reg_info, 
+                 lldb_private::ConstString &reg_name, 
+                 lldb_private::ConstString &reg_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