[Lldb-commits] [lldb] r236988 - Fix thumb condition extraction in ARM instrcution emulator

Tamas Berghammer tberghammer at google.com
Mon May 11 05:50:56 PDT 2015


Author: tberghammer
Date: Mon May 11 07:50:56 2015
New Revision: 236988

URL: http://llvm.org/viewvc/llvm-project?rev=236988&view=rev
Log:
Fix thumb condition extraction in ARM instrcution emulator

Modified:
    lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp

Modified: lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp?rev=236988&r1=236987&r2=236988&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp (original)
+++ lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp Mon May 11 07:50:56 2015
@@ -13062,8 +13062,8 @@ EmulateInstructionARM::CurrentCond (cons
             const uint32_t byte_size = m_opcode.GetByteSize();
             if (byte_size == 2)
             {
-                if (Bits32(opcode, 15, 12) == 0x0d && Bits32(opcode, 11, 7) != 0x0f)
-                    return Bits32(opcode, 11, 7);
+                if (Bits32(opcode, 15, 12) == 0x0d && Bits32(opcode, 11, 8) != 0x0f)
+                    return Bits32(opcode, 11, 8);
             }
             else if (byte_size == 4)
             {





More information about the lldb-commits mailing list