Turn the commented-out assert()'s into appropriate bail-out actions.
git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@132507 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp b/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp
index e9237ac..04383cc 100644
--- a/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp
+++ b/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp
@@ -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);