[Lldb-commits] [lldb] r246649 - Only create alternative thumb disassembler if the main one is arm

[Tamas Berghammer via lldb-commits]

Author: tberghammer
Date: Wed Sep  2 08:31:18 2015
New Revision: 246649

URL: http://llvm.org/viewvc/llvm-project?rev=246649&view=rev
Log:
Only create alternative thumb disassembler if the main one is arm

This fixes a regression caused by r245645 where creating alternative
thumb disassembler was enabled even when the main disassembler is
already thumb.

Modified:
    lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp

Modified: lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp?rev=246649&r1=246648&r2=246649&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp (original)
+++ lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp Wed Sep  2 08:31:18 2015
@@ -648,7 +648,7 @@ DisassemblerLLVMC::DisassemblerLLVMC (co
     }
 
     ArchSpec thumb_arch(arch);
-    if (triple.getArch() == llvm::Triple::arm || triple.getArch() == llvm::Triple::thumb)
+    if (triple.getArch() == llvm::Triple::arm)
     {
         std::string thumb_arch_name (thumb_arch.GetTriple().getArchName().str());
         // Replace "arm" with "thumb" so we get all thumb variants correct
@@ -751,7 +751,7 @@ DisassemblerLLVMC::DisassemblerLLVMC (co
     }
 
     // For arm CPUs that can execute arm or thumb instructions, also create a thumb instruction disassembler.
-    if (triple.getArch() == llvm::Triple::arm || triple.getArch() == llvm::Triple::thumb)
+    if (triple.getArch() == llvm::Triple::arm)
     {
         std::string thumb_triple(thumb_arch.GetTriple().getTriple());
         m_alternate_disasm_ap.reset(new LLVMCDisassembler(thumb_triple.c_str(), "", "", flavor, *this));