diff options
author | Johnny Chen <johnny.chen@apple.com> | 2010-04-20 01:01:57 +0000 |
---|---|---|
committer | Johnny Chen <johnny.chen@apple.com> | 2010-04-20 01:01:57 +0000 |
commit | 2161e9f03b9c996e755c45193ee910f41c3f53c6 (patch) | |
tree | df5774d96f43155a07e0801801fbd8e17f65b347 /llvm/lib/Target/ARM/Disassembler/ThumbDisassemblerCore.h | |
parent | 64831c6a4c9e3af4a383383f8fcbefbfb107606e (diff) | |
download | bcm5719-llvm-2161e9f03b9c996e755c45193ee910f41c3f53c6.tar.gz bcm5719-llvm-2161e9f03b9c996e755c45193ee910f41c3f53c6.zip |
Better error-handling for DisassembleThumb2DPModImm() with 2-reg operands where
d==15 is considered illegal. Return false instead of assert().
llvm-svn: 101852
Diffstat (limited to 'llvm/lib/Target/ARM/Disassembler/ThumbDisassemblerCore.h')
-rw-r--r-- | llvm/lib/Target/ARM/Disassembler/ThumbDisassemblerCore.h | 5 |
1 files changed, 4 insertions, 1 deletions
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; |