From 2161e9f03b9c996e755c45193ee910f41c3f53c6 Mon Sep 17 00:00:00 2001
From: Johnny Chen <johnny.chen@apple.com>
Date: Tue, 20 Apr 2010 01:01:57 +0000
Subject: Better error-handling for DisassembleThumb2DPModImm() with 2-reg
 operands where d==15 is considered illegal.  Return false instead of
 assert().

llvm-svn: 101852
---
 llvm/lib/Target/ARM/Disassembler/ThumbDisassemblerCore.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'llvm/lib/Target/ARM/Disassembler/ThumbDisassemblerCore.h')

diff --git a/llvm/lib/Target/ARM/Disassembler/ThumbDisassemblerCore.h b/llvm/lib/Target/ARM/Disassembler/ThumbDisassemblerCore.h
index 001d0c6dff5..a3d7ffe52e4 100644
--- a/llvm/lib/Target/ARM/Disassembler/ThumbDisassemblerCore.h
+++ b/llvm/lib/Target/ARM/Disassembler/ThumbDisassemblerCore.h
@@ -1413,7 +1413,10 @@ static bool DisassembleThumb2DPModImm(MCInst &MI, unsigned Opcode,
   ++OpIdx;
 
   if (TwoReg) {
-    assert(!NoDstReg && "Internal error");
+    if (NoDstReg) {
+      DEBUG(errs() << "Thumb encoding error: d==15 for DPModImm 2-reg instr.\n");
+      return false;
+    }
     MI.addOperand(MCOperand::CreateReg(getRegisterEnum(B, ARM::GPRRegClassID,
                                                        decodeRn(insn))));
     ++OpIdx;
-- 
cgit v1.2.3