summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorKevin Enderby <enderby@apple.com>2013-06-18 20:19:24 +0000
committerKevin Enderby <enderby@apple.com>2013-06-18 20:19:24 +0000
commitbf811d602d1d81b93846c6cbbd1cec85f2f153cb (patch)
tree52f337813efe97124f3cd209b3c673f39fa279d0 /test
parenta3fb49cd851cd3b593fc653dc3ba4434c2e1232f (diff)
downloadllvm-bf811d602d1d81b93846c6cbbd1cec85f2f153cb.tar.gz
llvm-bf811d602d1d81b93846c6cbbd1cec85f2f153cb.tar.bz2
llvm-bf811d602d1d81b93846c6cbbd1cec85f2f153cb.tar.xz
Change the arm assembler to support this from the v7c spec:
"When assembling to the ARM instruction set, the .N qualifier produces an assembler error and the .W qualifier has no effect." In the pre-matcher handler in the asm parser the ".w" (wide) qualifier when in ARM mode is now discarded. And an error message is now produced when the ".n" (narrow) qualifier is used in ARM mode. Test cases for these were added. rdar://14064574 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@184224 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test')
-rw-r--r--test/MC/ARM/basic-arm-instructions.s2
-rw-r--r--test/MC/ARM/diagnostics.s3
2 files changed, 5 insertions, 0 deletions
diff --git a/test/MC/ARM/basic-arm-instructions.s b/test/MC/ARM/basic-arm-instructions.s
index 8aec4b3e60..8335797bc6 100644
--- a/test/MC/ARM/basic-arm-instructions.s
+++ b/test/MC/ARM/basic-arm-instructions.s
@@ -1247,9 +1247,11 @@ Lforward:
@ NOP
@------------------------------------------------------------------------------
nop
+ nop.w
nopgt
@ CHECK: nop @ encoding: [0x00,0xf0,0x20,0xe3]
+@ CHECK: nop @ encoding: [0x00,0xf0,0x20,0xe3]
@ CHECK: nopgt @ encoding: [0x00,0xf0,0x20,0xc3]
diff --git a/test/MC/ARM/diagnostics.s b/test/MC/ARM/diagnostics.s
index b4b73862de..82d6ae3465 100644
--- a/test/MC/ARM/diagnostics.s
+++ b/test/MC/ARM/diagnostics.s
@@ -376,3 +376,6 @@
isb #16
@ CHECK-ERRORS: error: immediate value out of range
@ CHECK-ERRORS: error: immediate value out of range
+
+ nop.n
+@ CHECK-ERRORS: error: instruction with .n (narrow) qualifier not allowed in arm mode