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 | deadd54dc48f7ffd890e44b27b0a883afb26f317 (patch) | |
| tree | b321d53c0fe41517f861ebfb18ca5fe3760828cf | |
| parent | 044c4703572507b1e204f6b90354fac58936f24d (diff) | |
| download | external_llvm-deadd54dc48f7ffd890e44b27b0a883afb26f317.zip external_llvm-deadd54dc48f7ffd890e44b27b0a883afb26f317.tar.gz external_llvm-deadd54dc48f7ffd890e44b27b0a883afb26f317.tar.bz2 | |
Better error-handling for DisassembleThumb2DPModImm() with 2-reg operands where
d==15 is considered illegal. Return false instead of assert().
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@101852 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Target/ARM/Disassembler/ThumbDisassemblerCore.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/Target/ARM/Disassembler/ThumbDisassemblerCore.h b/lib/Target/ARM/Disassembler/ThumbDisassemblerCore.h index 001d0c6..a3d7ffe 100644 --- a/lib/Target/ARM/Disassembler/ThumbDisassemblerCore.h +++ b/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; |