diff options
author | Owen Anderson <resistor@mac.com> | 2011-08-23 17:51:38 +0000 |
---|---|---|
committer | Owen Anderson <resistor@mac.com> | 2011-08-23 17:51:38 +0000 |
commit | 924bcfc92f4b0d1f9a82456b1f88e4dc89a143e3 (patch) | |
tree | f88bb916c2126375a7e7f0e764c9c0966a6133f0 /llvm/lib/Target/ARM/Disassembler | |
parent | c78e6607b54a7e1e63ac44a17197d0ea15302bb3 (diff) | |
download | bcm5719-llvm-924bcfc92f4b0d1f9a82456b1f88e4dc89a143e3.tar.gz bcm5719-llvm-924bcfc92f4b0d1f9a82456b1f88e4dc89a143e3.zip |
Fix decoding of Thumb2 prefetch instructions, which account for all the remaining Thumb2 decoding failures found by randomized testing so far.
llvm-svn: 138341
Diffstat (limited to 'llvm/lib/Target/ARM/Disassembler')
-rw-r--r-- | llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp b/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp index 5711b69796e..c4b2f613cc7 100644 --- a/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp +++ b/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp @@ -2392,9 +2392,15 @@ static DecodeStatus DecodeT2LoadShift(llvm::MCInst &Inst, unsigned Insn, uint64_t Address, const void *Decoder) { DecodeStatus S = Success; - if (Inst.getOpcode() != ARM::t2PLDs) { - unsigned Rt = fieldFromInstruction32(Insn, 12, 4); - CHECK(S, DecodeGPRRegisterClass(Inst, Rt, Address, Decoder)); + switch (Inst.getOpcode()) { + case ARM::t2PLDs: + case ARM::t2PLDWs: + case ARM::t2PLIs: + break; + default: { + unsigned Rt = fieldFromInstruction32(Insn, 12, 4); + CHECK(S, DecodeGPRRegisterClass(Inst, Rt, Address, Decoder)); + } } unsigned Rn = fieldFromInstruction32(Insn, 16, 4); |