Add kalimba sub-architecture variants to llvm::Triple

[mg11]

Summary

The kalimba architecture currently has 3 important variants. I need to add support to recognise those variants into lldb. This patch adds the required variants as SubArchs and provides the relevant mappings when parsing the architecture part of a Triple string.

[echristo]

Inline comment.

lib/Support/Triple.cpp

250

Do you have a lot of things that begin with kalimba?

[mg11]

"Do you have a lot of things that begin with kalimba?"

We currently have 3 such things: kalimba3, kalimba4 and kalimba5, where those strings are embedded at the front of the triple string passed back over gdb-remote to lldb. E.g. "kalimba4-csr-unknown". The number being reflective of the architecture revision of the kalimba processor.

I had originally chosen the ".Cases" construct to parse my string, however I subsequently changed this to ".StartsWith" to reduce verbosity. Both the ways achieved my goal at the time, so I don't really mind which is used by parseArch.

[echristo]

OK then. Normally I'd suggest we keep it simple and parse each of them separately, but if you expect to have a lot of architectures such that you are going to need to do this for each then go ahead. Otherwise grab each separately. Either way the patch is OK.

-eric

[mg11]

Eric Christopher wrote:

OK then. Normally I'd suggest we keep it simple and parse each of them separately, but if you expect to have a lot of architectures such that you are going to need to do this for each then go ahead. Otherwise grab each separately. Either way the patch is OK.

-eric

http://reviews.llvm.org/D5115

To report this email as spam click https://www.mailcontrol.com/sr/MZbqvYs5QwJvpeaetUwhCQ== .

Thanks Eric

I've rebased my original diff against the trunk and submitted it.

Matt

Member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom
More information can be found at www.csr.com. Keep up to date with CSR on our technical blog, www.csr.com/blog, CSR people blog, www.csr.com/people, YouTube, www.youtube.com/user/CSRplc, Facebook, www.facebook.com/pages/CSR/191038434253534, or follow us on Twitter at www.twitter.com/CSR_plc.
New for 2014, you can now access the wide range of products powered by aptX at www.aptx.com.

[Eugene.Zelenko]

Committed in r217229.

include/llvm/ADT/Triple.h

enum SubArchType {
     ARMSubArch_v7em,
     ARMSubArch_v7m,
     ARMSubArch_v7s,
     ARMSubArch_v6,
     ARMSubArch_v6m,
     ARMSubArch_v6t2,
     ARMSubArch_v5,
     ARMSubArch_v5te,
-    ARMSubArch_v4t
+    ARMSubArch_v4t,
+
+    KalimbaSubArch_v3,
+    KalimbaSubArch_v4,
+    KalimbaSubArch_v5
   };
   enum VendorType {
     UnknownVendor,
 
     Apple,
     PC,
     SCEI,
     BGP,

lib/Support/Triple.cpp

return StringSwitch<Triple::ArchType>(ArchName)
     .Case("tce", Triple::tce)
     .Case("xcore", Triple::xcore)
     .Case("nvptx", Triple::nvptx)
     .Case("nvptx64", Triple::nvptx64)
     .Case("le32", Triple::le32)
     .Case("amdil", Triple::amdil)
     .Case("spir", Triple::spir)
     .Case("spir64", Triple::spir64)
-    .Case("kalimba", Triple::kalimba)
+    .StartsWith("kalimba", Triple::kalimba)
     .Default(Triple::UnknownArch);
 }
 
 static Triple::VendorType parseVendor(StringRef VendorName) {
   return StringSwitch<Triple::VendorType>(VendorName)
     .Case("apple", Triple::Apple)
     .Case("pc", Triple::PC)
     .Case("scei", Triple::SCEI)
return StringSwitch<Triple::SubArchType>(SubArchName)
     .EndsWith("v6", Triple::ARMSubArch_v6)
     .EndsWith("v6m", Triple::ARMSubArch_v6m)
     .EndsWith("v6t2", Triple::ARMSubArch_v6t2)
     .EndsWith("v5", Triple::ARMSubArch_v5)
     .EndsWith("v5e", Triple::ARMSubArch_v5)
     .EndsWith("v5t", Triple::ARMSubArch_v5)
     .EndsWith("v5te", Triple::ARMSubArch_v5te)
     .EndsWith("v4t", Triple::ARMSubArch_v4t)
+
+    .EndsWith("kalimba3", Triple::KalimbaSubArch_v3)
+    .EndsWith("kalimba4", Triple::KalimbaSubArch_v4)
+    .EndsWith("kalimba5", Triple::KalimbaSubArch_v5)
+
     .Default(Triple::NoSubArch);
 }
 
 static const char *getObjectFormatTypeName(Triple::ObjectFormatType Kind) {
   switch (Kind) {
   case Triple::UnknownObjectFormat: return "";
   case Triple::COFF: return "coff";
   case Triple::ELF: return "elf";