[Lldb-commits] [lldb] r132507 - /lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp

[Johnny Chen]

Author: johnny
Date: Thu Jun  2 18:07:03 2011
New Revision: 132507

URL: http://llvm.org/viewvc/llvm-project?rev=132507&view=rev
Log:
Turn the commented-out assert()'s into appropriate bail-out actions.

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=132507&r1=132506&r2=132507&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp (original)
+++ lldb/trunk/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp Thu Jun  2 18:07:03 2011
@@ -3150,7 +3150,8 @@
         switch (use_encoding) {
         case eEncodingT1:
             // Due to the above special case handling!
-            //assert(shift_type != SRType_ROR);
+            if (shift_type == SRType_ROR)
+                return false;
 
             Rd = Bits32(opcode, 2, 0);
             Rm = Bits32(opcode, 5, 3);
@@ -3159,7 +3160,9 @@
             break;
         case eEncodingT2:
             // A8.6.141 RRX
-            //assert(shift_type != SRType_RRX);
+            // There's no imm form of RRX instructions.
+            if (shift_type == SRType_RRX)
+                return false;
 
             Rd = Bits32(opcode, 11, 8);
             Rm = Bits32(opcode, 3, 0);