diff options
| author | Owen Anderson <resistor@mac.com> | 2011-08-11 19:00:18 +0000 |
|---|---|---|
| committer | Owen Anderson <resistor@mac.com> | 2011-08-11 19:00:18 +0000 |
| commit | 3477f2cea5341034d154e2fd977c9ab470d609b7 (patch) | |
| tree | 040509ff82a133f1ddbd80be4ac34dff7387a788 | |
| parent | 043c820800e69427fdbd0b5c17b848cb43be6128 (diff) | |
| download | bcm5719-llvm-3477f2cea5341034d154e2fd977c9ab470d609b7.tar.gz bcm5719-llvm-3477f2cea5341034d154e2fd977c9ab470d609b7.zip | |
Tighten decoding of addrmode2 instructions to reject more UNPREDICTABLE cases.
llvm-svn: 137325
| -rw-r--r-- | llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp | 2 | ||||
| -rw-r--r-- | llvm/test/MC/Disassembler/ARM/invalid-LDRB_POST-arm.txt | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp b/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp index 8a85cfade1c..85e48c7165e 100644 --- a/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp +++ b/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp @@ -978,6 +978,8 @@ static bool DecodeAddrMode2IdxInstruction(llvm::MCInst &Inst, unsigned Insn, else if (!P && writeback) idx_mode = ARMII::IndexModePost; + if (writeback && (Rn == 15 || Rn == Rt)) return false; // UNPREDICTABLE + if (reg) { if (!DecodeGPRnopcRegisterClass(Inst, Rm, Address, Decoder)) return false; ARM_AM::ShiftOpc Opc = ARM_AM::lsl; diff --git a/llvm/test/MC/Disassembler/ARM/invalid-LDRB_POST-arm.txt b/llvm/test/MC/Disassembler/ARM/invalid-LDRB_POST-arm.txt index 032021362d3..61d10b0f654 100644 --- a/llvm/test/MC/Disassembler/ARM/invalid-LDRB_POST-arm.txt +++ b/llvm/test/MC/Disassembler/ARM/invalid-LDRB_POST-arm.txt @@ -1,11 +1,10 @@ # RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep {invalid instruction encoding} -# XFAIL: * # Opcode=140 Name=LDRB_POST Format=ARM_FORMAT_LDFRM(6) -# 31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 0 +# 31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 0 # ------------------------------------------------------------------------------------------------- # | 1: 1: 1: 0| 0: 1: 1: 0| 1: 1: 0: 1| 0: 1: 1: 1| 0: 1: 1: 1| 0: 0: 0: 0| 0: 0: 0: 0| 0: 1: 0: 1| # ------------------------------------------------------------------------------------------------- -# +# # if wback && (n == 15 || n == t) then UNPREDICTABLE 0x05 0x70 0xd7 0xe6 |
