diff --git a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp
index 9c55042..59e6d9a 100644
--- a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp
+++ b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp
@@ -74,8 +74,10 @@
     return -1;
 }
 
-DisassemblerLLVM::InstructionLLVM::InstructionLLVM (const Address &addr, EDDisassemblerRef disassembler) :
-    Instruction (addr),
+DisassemblerLLVM::InstructionLLVM::InstructionLLVM (const Address &addr, 
+                                                    AddressClass addr_class,
+                                                    EDDisassemblerRef disassembler) :
+    Instruction (addr, addr_class),
     m_disassembler (disassembler)
 {
 }
@@ -99,6 +101,7 @@
 DisassemblerLLVM::InstructionLLVM::Dump
 (
     Stream *s,
+    uint32_t max_opcode_byte_size,
     bool show_address,
     bool show_bytes,
     const lldb_private::ExecutionContext* exe_ctx,
@@ -131,13 +134,19 @@
             // x86_64 and i386 are the only ones that use bytes right now so
             // pad out the byte dump to be able to always show 15 bytes (3 chars each) 
             // plus a space
-            m_opcode.Dump (s, 15 * 3 + 1);
+            if (max_opcode_byte_size > 0)
+                m_opcode.Dump (s, max_opcode_byte_size * 3 + 1);
+            else
+                m_opcode.Dump (s, 15 * 3 + 1);
         }
         else
         {
             // Else, we have ARM which can show up to a uint32_t 0x00000000 (10 spaces)
             // plus two for padding...
-            m_opcode.Dump (s, 12);
+            if (max_opcode_byte_size > 0)
+                m_opcode.Dump (s, max_opcode_byte_size * 3 + 1);
+            else
+                m_opcode.Dump (s, 12);
         }
     }
 
@@ -329,9 +338,9 @@
 }
 
 size_t
-DisassemblerLLVM::InstructionLLVM::Extract (const Disassembler &disassembler, 
-                                            const lldb_private::DataExtractor &data,
-                                            uint32_t data_offset)
+DisassemblerLLVM::InstructionLLVM::Decode (const Disassembler &disassembler, 
+                                           const lldb_private::DataExtractor &data,
+                                           uint32_t data_offset)
 {
     if (EDCreateInsts(&m_inst, 1, m_disassembler, DataExtractorByteReader, data_offset, (void*)(&data)))
     {
@@ -382,6 +391,7 @@
     case llvm::Triple::x86_64:
         return kEDAssemblySyntaxX86ATT;
     case llvm::Triple::arm:
+    case llvm::Triple::thumb:
         return kEDAssemblySyntaxARMUAL;
     default:
         break;
@@ -411,17 +421,16 @@
         if (EDGetDisassembler(&m_disassembler, arch_triple.c_str(), SyntaxForArchSpec (arch)))
             m_disassembler = NULL;
         llvm::Triple::ArchType llvm_arch = arch.GetTriple().getArch();
+		// Don't have the lldb::Triple::thumb architecture here. If someone specifies
+		// "thumb" as the architecture, we want a thumb only disassembler. But if any
+		// architecture starting with "arm" if specified, we want to auto detect the
+		// arm/thumb code automatically using the AddressClass from section offset 
+		// addresses.
         if (llvm_arch == llvm::Triple::arm)
         {
             if (EDGetDisassembler(&m_disassembler_thumb, "thumb-apple-darwin", kEDAssemblySyntaxARMUAL))
                 m_disassembler_thumb = NULL;
         }
-        else if (llvm_arch == llvm::Triple::thumb)
-        {
-            m_disassembler_thumb = m_disassembler;
-            if (EDGetDisassembler(&m_disassembler, "arm-apple-darwin-unknown", kEDAssemblySyntaxARMUAL))
-                m_disassembler = NULL;
-        }
     }
 }
 
@@ -456,15 +465,18 @@
         // If we have a thumb disassembler, then we have an ARM architecture
         // so we need to check what the instruction address class is to make
         // sure we shouldn't be disassembling as thumb...
+        AddressClass inst_address_class = eAddressClassInvalid;
         if (m_disassembler_thumb)
         {
-            if (inst_addr.GetAddressClass () == eAddressClassCodeAlternateISA)
+            inst_address_class = inst_addr.GetAddressClass ();
+            if (inst_address_class == eAddressClassCodeAlternateISA)
                 use_thumb = true;
         }
         InstructionSP inst_sp (new InstructionLLVM (inst_addr, 
+                                                    inst_address_class,
                                                     use_thumb ? m_disassembler_thumb : m_disassembler));
 
-        size_t inst_byte_size = inst_sp->Extract (*this, data, data_offset);
+        size_t inst_byte_size = inst_sp->Decode (*this, data, data_offset);
 
         if (inst_byte_size == 0)
             break;
diff --git a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h
index 9e01bf3..8408d70 100644
--- a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h
+++ b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.h
@@ -23,6 +23,7 @@
     {
     public:
         InstructionLLVM (const lldb_private::Address &addr,
+                         lldb_private::AddressClass addr_class,
                          EDDisassemblerRef disassembler);
 
         virtual
@@ -30,6 +31,7 @@
 
         virtual void
         Dump (lldb_private::Stream *s,
+              uint32_t max_opcode_byte_size,
               bool show_address,
               bool show_bytes,
               const lldb_private::ExecutionContext* exe_ctx,
@@ -39,9 +41,9 @@
         DoesBranch () const;
 
         virtual size_t
-        Extract (const Disassembler &disassembler,
-                 const lldb_private::DataExtractor &data,
-                 uint32_t data_offset);
+        Decode (const Disassembler &disassembler,
+                const lldb_private::DataExtractor &data,
+                uint32_t data_offset);
 
     protected:
         EDDisassemblerRef m_disassembler;