summaryrefslogtreecommitdiffstats
path: root/llvm/test
diff options
context:
space:
mode:
authorAmaury de la Vieuville <amaury.dlv@gmail.com>2013-06-24 09:11:53 +0000
committerAmaury de la Vieuville <amaury.dlv@gmail.com>2013-06-24 09:11:53 +0000
commitf2f00b4e2815523dcabed451e9281a743cd69d3a (patch)
tree5c96db336f32217b9f59f3087c378684c1525f6c /llvm/test
parent2f0ac8d961cc791ffa59ca101c4687498ac27ff8 (diff)
downloadbcm5719-llvm-f2f00b4e2815523dcabed451e9281a743cd69d3a.tar.gz
bcm5719-llvm-f2f00b4e2815523dcabed451e9281a743cd69d3a.zip
ARM: fix thumb1 nop decoding
In thumb1, NOP is a pseudo-instruction equivalent to mov r8, r8. However the disassembler should not use this alias. llvm-svn: 184703
Diffstat (limited to 'llvm/test')
-rw-r--r--llvm/test/MC/ARM/thumb-nop.s2
-rw-r--r--llvm/test/MC/ARM/thumb.s2
-rw-r--r--llvm/test/MC/Disassembler/ARM/thumb1.txt10
3 files changed, 4 insertions, 10 deletions
diff --git a/llvm/test/MC/ARM/thumb-nop.s b/llvm/test/MC/ARM/thumb-nop.s
index 0b580ea14a9..66f61a6e0b0 100644
--- a/llvm/test/MC/ARM/thumb-nop.s
+++ b/llvm/test/MC/ARM/thumb-nop.s
@@ -5,5 +5,5 @@
nop
-@ CHECK-V6: nop @ encoding: [0xc0,0x46]
+@ CHECK-V6: mov r8, r8 @ encoding: [0xc0,0x46]
@ CHECK-V7: nop @ encoding: [0x00,0xbf]
diff --git a/llvm/test/MC/ARM/thumb.s b/llvm/test/MC/ARM/thumb.s
index 2223bdcd467..9a725410c3d 100644
--- a/llvm/test/MC/ARM/thumb.s
+++ b/llvm/test/MC/ARM/thumb.s
@@ -42,7 +42,7 @@
@ CHECK: bkpt #2 @ encoding: [0x02,0xbe]
nop
-@ CHECK: nop @ encoding: [0xc0,0x46]
+@ CHECK: mov r8, r8 @ encoding: [0xc0,0x46]
cpsie aif
@ CHECK: cpsie aif @ encoding: [0x67,0xb6]
diff --git a/llvm/test/MC/Disassembler/ARM/thumb1.txt b/llvm/test/MC/Disassembler/ARM/thumb1.txt
index de9596aab73..7362d9b9b2d 100644
--- a/llvm/test/MC/Disassembler/ARM/thumb1.txt
+++ b/llvm/test/MC/Disassembler/ARM/thumb1.txt
@@ -279,9 +279,11 @@
#------------------------------------------------------------------------------
# CHECK: mov r3, r4
# CHECK: movs r1, r3
+# CHECK: mov r8, r8
0x23 0x46
0x19 0x00
+0xc0 0x46
#------------------------------------------------------------------------------
@@ -310,14 +312,6 @@
#------------------------------------------------------------------------------
-# NOP
-#------------------------------------------------------------------------------
-# CHECK: nop
-
-0xc0 0x46
-
-
-#------------------------------------------------------------------------------
# ORR
#------------------------------------------------------------------------------
# CHECK: orrs r3, r4
OpenPOWER on IntegriCloud