diff options
| author | Amaury de la Vieuville <amaury.dlv@gmail.com> | 2013-06-08 13:38:52 +0000 |
|---|---|---|
| committer | Amaury de la Vieuville <amaury.dlv@gmail.com> | 2013-06-08 13:38:52 +0000 |
| commit | 46e136c952e0242308db2682ba2ec4020cdcd006 (patch) | |
| tree | 2b5ba5013c74cf75cd6e961468e27072e8e7f494 /test | |
| parent | c64835b0c57913b11abd648b76913390e62af8d6 (diff) | |
| download | llvm-46e136c952e0242308db2682ba2ec4020cdcd006.tar.gz llvm-46e136c952e0242308db2682ba2ec4020cdcd006.tar.bz2 llvm-46e136c952e0242308db2682ba2ec4020cdcd006.tar.xz | |
ARM: fix CPS decoding when ambiguous with QADD
Handle the case when the disassembler table can't tell
the difference between some encodings of QADD and CPS.
Add some necessary safe guards in CPS decoding as well.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@183610 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test')
| -rw-r--r-- | test/MC/Disassembler/ARM/basic-arm-instructions.txt | 4 | ||||
| -rw-r--r-- | test/MC/Disassembler/ARM/invalid-CPS-arm.txt | 9 |
2 files changed, 13 insertions, 0 deletions
diff --git a/test/MC/Disassembler/ARM/basic-arm-instructions.txt b/test/MC/Disassembler/ARM/basic-arm-instructions.txt index 92cfe6862e..ae4172b070 100644 --- a/test/MC/Disassembler/ARM/basic-arm-instructions.txt +++ b/test/MC/Disassembler/ARM/basic-arm-instructions.txt @@ -454,10 +454,14 @@ # CHECK: cpsie aif # CHECK: cps #15 # CHECK: cpsid if, #10 +# CHECK: cpsid af, #17 +# CHECK: cpsie f, #26 0xc0 0x01 0x08 0xf1 0x0f 0x00 0x02 0xf1 0xca 0x00 0x0e 0xf1 +0x51 0x01 0x0e 0xf1 +0x5a 0x00 0x0a 0xf1 #------------------------------------------------------------------------------ diff --git a/test/MC/Disassembler/ARM/invalid-CPS-arm.txt b/test/MC/Disassembler/ARM/invalid-CPS-arm.txt new file mode 100644 index 0000000000..e447eb68dd --- /dev/null +++ b/test/MC/Disassembler/ARM/invalid-CPS-arm.txt @@ -0,0 +1,9 @@ +# CPS: various encodings that are ambiguous with other instructions + +# RUN: echo "0x9f 0xff 0x4e 0xf1" | llvm-mc -triple=armv7 -disassemble 2>&1 | FileCheck %s +# RUN: echo "0x80 0x80 0x2c 0xf1" | llvm-mc -triple=armv7 -disassemble 2>&1 | FileCheck %s +# RUN: echo "0xce 0x3f 0x28 0xf1" | llvm-mc -triple=armv7 -disassemble 2>&1 | FileCheck %s +# RUN: echo "0x80 0x00 0x20 0xf1" | llvm-mc -triple=armv7 -disassemble 2>&1 | FileCheck %s +# RUN: echo "0xa0 0x00 0x00 0xf1" | llvm-mc -triple=armv7 -disassemble 2>&1 | FileCheck %s + +# CHECK: invalid instruction encoding |