lldb - towards AArch64 being recognised as platform architecture

[pawelo]

Summary

This one isn't meant to be complete, it's merely a step into AArch64 direction.
Before this patch, lldb can't even list AArch64 when cross-compiled and started on FoundationV8 emulator:

error: attach failed: '/usr/sbin/sshd' doesn't contain any 'host' platform architectures:
(lldb)

The same goes to lldb-gdbserver (e.g. when started for 'ls' command):

LaunchDebugServerProcess: failed to launch executable ls
error: failed to launch 'ls': 'ls' doesn't contain any 'host' platform architectures:

With this patch applied, "aarch64" is at least listed as platform architecture:

error: attach failed: '/usr/sbin/sshd' doesn't contain any 'host' platform architectures: aarch64, aarch64
(lldb)

LaunchDebugServerProcess: failed to launch executable ls
error: failed to launch 'ls': 'ls' doesn't contain any 'host' platform architectures: aarch64, aarch64

[pawelo]

That's how Linux started on FoundationV8 emulator names itself:

root@genericarmv8:~# uname -m
aarch64
root@genericarmv8:~# uname -a
Linux genericarmv8 3.10.1.0-1-linaro-vexpress64 #1ubuntu1~ci+130718012724 SMP Thu Jul 18 01:30:58 UTC 2013 aarch64 GNU/Linux

[pawelo]

New improved version posted.

[pawelo]

Newer version that fits to recent changes.

[tfiala]

Hey Paul,

Thanks for your patience on these. I'm going to be looking at the two I
see in reviews.llvm.org today.

-Todd

[tfiala]

Hey Paul,

Trying to catch up on the patches that didn't make it in yet. This looks like one of them. Can you shoot me an email with all the changes that are not in yet? Can you also add me as reviewers on them (user tfiala) and rebase them against lldb top of tree? Thanks!

-Todd

[tfiala]

No need to rebase this one. Testing it now.

[tfiala]

LGTM.

Tested on Ubuntu 14.04 x86_64,
MacOSX 10.9.4.

[tfiala]

svn commit
Sending include/lldb/Core/ArchSpec.h
Sending source/Core/ArchSpec.cpp
Transmitting file data ..
Committed revision 216668.

[pawelo]

Hi Todd,

I'm sorry for late response, I'm doing things on the run for last three
days, hopefully things will settle down soon. As for my patches I can see
that most of them are already commited. The ones that are waiting I listed
below:

http://reviews.llvm.org/D4579 - accepted, not commited
http://reviews.llvm.org/D4580 - waiting on Apple review
http://reviews.llvm.org/D4430 - waiting for review
http://reviews.llvm.org/D5089 - newly added

Cheers,
Paul

include/lldb/Core/ArchSpec.h

enum Core
         eCore_thumbv6m,
         eCore_thumbv7,
         eCore_thumbv7s,
         eCore_thumbv7k,
         eCore_thumbv7f,
         eCore_thumbv7m,
         eCore_thumbv7em,
         eCore_arm_arm64,
+        eCore_arm_armv8,
+        eCore_arm_aarch64,
         
         eCore_mips64,
 
         eCore_ppc_generic,
         eCore_ppc_ppc601,
         eCore_ppc_ppc602,
         eCore_ppc_ppc603,
         eCore_ppc_ppc603e,

source/Core/ArchSpec.cpp

static const CoreDefinition g_core_definitions[] =
     { eByteOrderLittle, 4, 2, 4, llvm::Triple::thumb  , ArchSpec::eCore_thumbv6m        , "thumbv6m"  },
     { eByteOrderLittle, 4, 2, 4, llvm::Triple::thumb  , ArchSpec::eCore_thumbv7         , "thumbv7"   },
     { eByteOrderLittle, 4, 2, 4, llvm::Triple::thumb  , ArchSpec::eCore_thumbv7f        , "thumbv7f"  },
     { eByteOrderLittle, 4, 2, 4, llvm::Triple::thumb  , ArchSpec::eCore_thumbv7s        , "thumbv7s"  },
     { eByteOrderLittle, 4, 2, 4, llvm::Triple::thumb  , ArchSpec::eCore_thumbv7k        , "thumbv7k"  },
     { eByteOrderLittle, 4, 2, 4, llvm::Triple::thumb  , ArchSpec::eCore_thumbv7m        , "thumbv7m"  },
     { eByteOrderLittle, 4, 2, 4, llvm::Triple::thumb  , ArchSpec::eCore_thumbv7em       , "thumbv7em" },
     { eByteOrderLittle, 8, 4, 4, llvm::Triple::aarch64, ArchSpec::eCore_arm_arm64       , "arm64"     },
+    { eByteOrderLittle, 8, 4, 4, llvm::Triple::aarch64, ArchSpec::eCore_arm_armv8       , "armv8"     },
+    { eByteOrderLittle, 8, 4, 4, llvm::Triple::aarch64, ArchSpec::eCore_arm_aarch64     , "aarch64"   },
 
     { eByteOrderBig   , 8, 4, 4, llvm::Triple::mips64 , ArchSpec::eCore_mips64          , "mips64"    },
     
     { eByteOrderBig   , 4, 4, 4, llvm::Triple::ppc    , ArchSpec::eCore_ppc_generic     , "ppc"       },
     { eByteOrderBig   , 4, 4, 4, llvm::Triple::ppc    , ArchSpec::eCore_ppc_ppc601      , "ppc601"    },
     { eByteOrderBig   , 4, 4, 4, llvm::Triple::ppc    , ArchSpec::eCore_ppc_ppc602      , "ppc602"    },
     { eByteOrderBig   , 4, 4, 4, llvm::Triple::ppc    , ArchSpec::eCore_ppc_ppc603      , "ppc603"    },
     { eByteOrderBig   , 4, 4, 4, llvm::Triple::ppc    , ArchSpec::eCore_ppc_ppc603e     , "ppc603e"   },

 static const ArchDefinitionEntry g_elf_arch_entries[] =
 {
     { ArchSpec::eCore_sparc_generic   , llvm::ELF::EM_SPARC  , LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu }, // Sparc
     { ArchSpec::eCore_x86_32_i386     , llvm::ELF::EM_386    , LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu }, // Intel 80386
     { ArchSpec::eCore_x86_32_i486     , llvm::ELF::EM_486    , LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu }, // Intel 486 (deprecated)
     { ArchSpec::eCore_ppc_generic     , llvm::ELF::EM_PPC    , LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu }, // PowerPC
     { ArchSpec::eCore_ppc64_generic   , llvm::ELF::EM_PPC64  , LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu }, // PowerPC64
     { ArchSpec::eCore_arm_generic     , llvm::ELF::EM_ARM    , LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu }, // ARM
+    { ArchSpec::eCore_arm_aarch64     , llvm::ELF::EM_AARCH64, LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu }, // ARM64
     { ArchSpec::eCore_sparc9_generic  , llvm::ELF::EM_SPARCV9, LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu }, // SPARC V9
     { ArchSpec::eCore_x86_64_x86_64   , llvm::ELF::EM_X86_64 , LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu }, // AMD64
     { ArchSpec::eCore_mips64          , llvm::ELF::EM_MIPS   , LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu }, // MIPS
     { ArchSpec::eCore_hexagon_generic , llvm::ELF::EM_HEXAGON, LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu }, // HEXAGON
     { ArchSpec::eCore_kalimba ,         llvm::ELF::EM_CSR_KALIMBA, LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu }  // KALIMBA
 
 };
 
case ArchSpec::eCore_x86_64_x86_64h:
         if (!enforce_exact_match)
         {
             try_inverse = false;
             if (core2 == ArchSpec::eCore_x86_64_x86_64)
                 return true;
         }
         break;
 
+    case ArchSpec::eCore_arm_armv8:
+        if (!enforce_exact_match)
+        {
+            if (core2 == ArchSpec::eCore_arm_arm64)
+                return true;
+            if (core2 == ArchSpec::eCore_arm_aarch64)
+                return true;
+            try_inverse = false;
+        }
+        break;
+
+    case ArchSpec::eCore_arm_aarch64:
+        if (!enforce_exact_match)
+        {
+            if (core2 == ArchSpec::eCore_arm_arm64)
+                return true;
+            if (core2 == ArchSpec::eCore_arm_armv8)
+                return true;
+            try_inverse = false;
+        }
+        break;
+
+    case ArchSpec::eCore_arm_arm64:
+        if (!enforce_exact_match)
+        {
+            if (core2 == ArchSpec::eCore_arm_aarch64)
+                return true;
+            if (core2 == ArchSpec::eCore_arm_armv8)
+                return true;
+            try_inverse = false;
+        }
+        break;
+
     default:
         break;
     }
     if (try_inverse)
         return cores_match (core2, core1, false, enforce_exact_match);
     return false;
 }
 
 bool
 lldb_private::operator<(const ArchSpec& lhs, const ArchSpec& rhs)
 {
     const ArchSpec::Core lhs_core = lhs.GetCore ();
     const ArchSpec::Core rhs_core = rhs.GetCore ();
     return lhs_core < rhs_core;
 }