[lldb-dev] [PATCH] Linux: We have no macho/machine.h, so define our own enum

[arvid.picciani]

diff --git a/include/lldb/lldb-enumerations.h b/include/lldb/lldb-enumerations.h
index 2426ead..86e3ecd 100644
--- a/include/lldb/lldb-enumerations.h
+++ b/include/lldb/lldb-enumerations.h
@@ -503,6 +503,18 @@ typedef enum VarSetOperationType
     eVarSetOperationInvalid
 } VarSetOperationType;
 
+#ifndef CPU_ARCH_ABI64
+#define CPU_ARCH_MASK  0xff000000
+#define CPU_ARCH_ABI64 0x01000000
+#endif
+
+typedef enum CpuType
+{
+    eCpuTypeX86 = 7,
+    eCpuTypeI386 = eCpuTypeX86,
+    eCpuTypeX86_64 = (eCpuTypeX86 | CPU_ARCH_ABI64)
+} CpuType;
+
 } // namespace lldb
 
 
diff --git a/source/Plugins/Process/Utility/ArchDefaultUnwindPlan-x86.cpp b/source/Plugins/Process/Utility/ArchDefaultUnwindPlan-x86.cpp
index 51a2d49..f63d5a5 100644
--- a/source/Plugins/Process/Utility/ArchDefaultUnwindPlan-x86.cpp
+++ b/source/Plugins/Process/Utility/ArchDefaultUnwindPlan-x86.cpp
@@ -21,11 +21,11 @@ using namespace lldb_private;
 lldb_private::UnwindPlan*
 ArchDefaultUnwindPlan_x86::GetArchDefaultUnwindPlan (Thread& thread, Address current_pc)
 {
-    if (m_cpu == CPU_TYPE_X86_64)
+    if (m_cpu == eCpuTypeX86_64)
     {
         return &m_64bit_default;
     }
-    if (m_cpu == CPU_TYPE_I386)
+    if (m_cpu == eCpuTypeI386)
     {
         return &m_32bit_default;
     }
@@ -36,7 +36,7 @@ lldb_private::ArchDefaultUnwindPlan *
 ArchDefaultUnwindPlan_x86::CreateInstance (const lldb_private::ArchSpec &arch)
 {
    uint32_t cpu = arch.GetCPUType ();
-   if (cpu != CPU_TYPE_X86_64 && cpu != CPU_TYPE_I386)
+   if (cpu != eCpuTypeX86_64 && cpu != eCpuTypeI386)
        return NULL;
 
    return new ArchDefaultUnwindPlan_x86 (cpu);
diff --git a/source/Plugins/Process/Utility/ArchVolatileRegs-x86.cpp b/source/Plugins/Process/Utility/ArchVolatileRegs-x86.cpp
index 59b6ca0..787724d 100644
--- a/source/Plugins/Process/Utility/ArchVolatileRegs-x86.cpp
+++ b/source/Plugins/Process/Utility/ArchVolatileRegs-x86.cpp
@@ -35,7 +35,7 @@ lldb_private::ArchVolatileRegs *
 ArchVolatileRegs_x86::CreateInstance (const lldb_private::ArchSpec &arch)
 {
    uint32_t cpu = arch.GetCPUType ();
-   if (cpu != CPU_TYPE_X86_64 && cpu != CPU_TYPE_I386)
+   if (cpu != eCpuTypeX86_64 && cpu != eCpuTypeI386)
        return NULL;
 
    return new ArchVolatileRegs_x86 (cpu);
@@ -78,7 +78,7 @@ ArchVolatileRegs_x86::initialize_regset(Thread& thread)
     
     const char **names;
     int namecount;
-    if (m_cpu == CPU_TYPE_X86_64)
+    if (m_cpu == eCpuTypeX86_64)
     {
         names = x86_64_regnames;
         namecount = sizeof (x86_64_regnames) / sizeof (char *);

diff --git a/source/Plugins/Process/Utility/UnwindAssemblyProfiler-x86.cpp b/source/Plugins/Process/Utility/UnwindAssemblyProfiler-x86.cpp
index 21a01f8..575556c 100644
--- a/source/Plugins/Process/Utility/UnwindAssemblyProfiler-x86.cpp
+++ b/source/Plugins/Process/Utility/UnwindAssemblyProfiler-x86.cpp
@@ -726,10 +726,10 @@ lldb_private::UnwindAssemblyProfiler *
 UnwindAssemblyProfiler_x86::CreateInstance (const lldb_private::ArchSpec &arch)
 {
    uint32_t cpu = arch.GetCPUType ();
-   if (cpu != CPU_TYPE_X86_64 && cpu != CPU_TYPE_I386)
+   if (cpu != eCpuTypeX86_64 && cpu != eCpuTypeI386)
        return NULL;
 
-   return new UnwindAssemblyProfiler_x86 (cpu == CPU_TYPE_X86_64 ? k_x86_64 : k_i386);
+   return new UnwindAssemblyProfiler_x86 (cpu == eCpuTypeX86_64 ? k_x86_64 : k_i386);
 }
 
 

_______________________________________________
lldb-dev mailing list
lldb-dev@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/lldb-dev