diff options
| author | Owen Anderson <resistor@mac.com> | 2011-07-18 23:25:34 +0000 |
|---|---|---|
| committer | Owen Anderson <resistor@mac.com> | 2011-07-18 23:25:34 +0000 |
| commit | 83c6c4f30e5390913b37ebb22875492fc7200932 (patch) | |
| tree | 3b6a4d2f9cf63d51f7b65350679fb9462654df4b /llvm/lib/Target/ARM/Disassembler | |
| parent | f74cb50cda83cfa3ad847038bb32431933c704f6 (diff) | |
| download | bcm5719-llvm-83c6c4f30e5390913b37ebb22875492fc7200932.tar.gz bcm5719-llvm-83c6c4f30e5390913b37ebb22875492fc7200932.zip | |
Revamp our handling of tLDMIA[_UPD] and tSTMIA[_UPD] to avoid having multiple instructions with the same encoding. This resolves another conflict when bringing up the new-style disassembler.
llvm-svn: 135442
Diffstat (limited to 'llvm/lib/Target/ARM/Disassembler')
| -rw-r--r-- | llvm/lib/Target/ARM/Disassembler/ThumbDisassemblerCore.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/Target/ARM/Disassembler/ThumbDisassemblerCore.h b/llvm/lib/Target/ARM/Disassembler/ThumbDisassemblerCore.h index 9c3ebca52cf..4a790a4ea71 100644 --- a/llvm/lib/Target/ARM/Disassembler/ThumbDisassemblerCore.h +++ b/llvm/lib/Target/ARM/Disassembler/ThumbDisassemblerCore.h @@ -891,8 +891,8 @@ static bool DisassembleThumb1Misc(MCInst &MI, unsigned Opcode, uint32_t insn, static bool DisassembleThumb1LdStMul(bool Ld, MCInst &MI, unsigned Opcode, uint32_t insn, unsigned short NumOps, unsigned &NumOpsAdded, BO B) { - assert((Opcode == ARM::tLDMIA || Opcode == ARM::tLDMIA_UPD || - Opcode == ARM::tSTMIA_UPD) && "Unexpected opcode"); + assert((Opcode == ARM::tLDMIA || Opcode == ARM::tSTMIA) && + "Unexpected opcode"); unsigned tRt = getT1tRt(insn); NumOpsAdded = 0; |
