commit 1a8d8cc87d83b6bf63ae817597a827585cfc4c5b
author David Spickett <david.spickett@linaro.org> Tue Jan 05 11:46:18 2021 +0000
committer Copybara-Service <copybara-worker@google.com> Thu Jan 07 14:10:01 2021 -0800
tree f5a47b7c153c882bf2be02a8b77cbb33b8b40782
parent a59dcdc294e2ab4bf288bacaa8784a0369c02512

[lldb][ARM/AArch64] Update disasm flags to latest v8.7a ISA

Add optional memory tagging extension on AArch64.

Use isAArch64() instead of listing the AArch64 triples,
which fixes us not recognising aarch64_be.

Reviewed By: omjavaid

Differential Revision: https://reviews.llvm.org/D94084

GitOrigin-RevId: 801c7866e6d4fba81c97d27ca56c9e05ba7b157a

source/Plugins/Disassembler/LLVMC/DisassemblerLLVMC.cpp

diff --git a/source/Plugins/Disassembler/LLVMC/DisassemblerLLVMC.cpp b/source/Plugins/Disassembler/LLVMC/DisassemblerLLVMC.cpp
index 6427d8d..8a2d323 100644
--- a/source/Plugins/Disassembler/LLVMC/DisassemblerLLVMC.cpp
+++ b/source/Plugins/Disassembler/LLVMC/DisassemblerLLVMC.cpp
@@ -1056,7 +1056,7 @@
       thumb_arch_name.erase(0, 3);
       thumb_arch_name.insert(0, "thumb");
     } else {
-      thumb_arch_name = "thumbv8.2a";
+      thumb_arch_name = "thumbv8.7a";
     }
     thumb_arch.GetTriple().setArchName(llvm::StringRef(thumb_arch_name));
   }
@@ -1068,7 +1068,7 @@
   // specified)
   if (triple.getArch() == llvm::Triple::arm &&
       triple.getSubArch() == llvm::Triple::NoSubArch)
-    triple.setArchName("armv8.2a");
+    triple.setArchName("armv8.7a");
 
   std::string features_str = "";
   const char *triple_str = triple.getTriple().c_str();
@@ -1137,16 +1137,13 @@
       features_str += "+dspr2,";
   }
 
-  // If any AArch64 variant, enable the ARMv8.5 ISA with SVE extensions so we
-  // can disassemble newer instructions.
-  if (triple.getArch() == llvm::Triple::aarch64 || 
-      triple.getArch() == llvm::Triple::aarch64_32)
-    features_str += "+v8.5a,+sve2";
+  // If any AArch64 variant, enable latest ISA with any optional
+  // extensions like SVE.
+  if (triple.isAArch64()) {
+    features_str += "+v8.7a,+sve2,+mte";
 
-  if ((triple.getArch() == llvm::Triple::aarch64 ||
-       triple.getArch() == llvm::Triple::aarch64_32)
-      && triple.getVendor() == llvm::Triple::Apple) {
-    cpu = "apple-latest";
+    if (triple.getVendor() == llvm::Triple::Apple)
+      cpu = "apple-latest";
   }
 
   // We use m_disasm_up.get() to tell whether we are valid or not, so if this