aboutsummaryrefslogtreecommitdiffstats
path: root/test/MC
diff options
context:
space:
mode:
authorJim Grosbach <grosbach@apple.com>2011-07-20 18:39:38 +0000
committerJim Grosbach <grosbach@apple.com>2011-07-20 18:39:38 +0000
commita67851445902d1fc01fa2a37a3dfc347af949f84 (patch)
tree53d6b722625716bfc55e44e23891ef33c182e6f9 /test/MC
parentc3635c2e928a7ecde11398ff272411f6dea2dcd2 (diff)
downloadexternal_llvm-a67851445902d1fc01fa2a37a3dfc347af949f84.zip
external_llvm-a67851445902d1fc01fa2a37a3dfc347af949f84.tar.gz
external_llvm-a67851445902d1fc01fa2a37a3dfc347af949f84.tar.bz2
Consolidate ARM NOP encoding test.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@135600 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/MC')
-rw-r--r--test/MC/ARM/arm_instructions.s11
-rw-r--r--test/MC/ARM/basic-arm-instructions.s9
2 files changed, 9 insertions, 11 deletions
diff --git a/test/MC/ARM/arm_instructions.s b/test/MC/ARM/arm_instructions.s
index 5154e55..87f0611 100644
--- a/test/MC/ARM/arm_instructions.s
+++ b/test/MC/ARM/arm_instructions.s
@@ -1,13 +1,5 @@
@ RUN: llvm-mc -mcpu=cortex-a8 -triple arm-unknown-unknown -show-encoding %s | FileCheck %s
-@ CHECK: nop
-@ CHECK: encoding: [0x00,0xf0,0x20,0xe3]
- nop
-
-@ CHECK: nopeq
-@ CHECK: encoding: [0x00,0xf0,0x20,0x03]
- nopeq
-
@ CHECK: trap
@ CHECK: encoding: [0xfe,0xde,0xff,0xe7]
trap
@@ -109,9 +101,6 @@
@ CHECK: yield @ encoding: [0x01,0xf0,0x20,0xe3]
yield
-@ CHECK: nop @ encoding: [0x00,0xf0,0x20,0xe3]
- nop
-
@ CHECK: cpsie aif @ encoding: [0xc0,0x01,0x08,0xf1]
cpsie aif
diff --git a/test/MC/ARM/basic-arm-instructions.s b/test/MC/ARM/basic-arm-instructions.s
index 652c400..926060b 100644
--- a/test/MC/ARM/basic-arm-instructions.s
+++ b/test/MC/ARM/basic-arm-instructions.s
@@ -881,6 +881,15 @@ _func:
@ CHECK: mvngt r5, r6, asr r7 @ encoding: [0x56,0x57,0xe0,0xc1]
@ CHECK: mvnslt r5, r6, ror r7 @ encoding: [0x76,0x57,0xf0,0xb1]
+@------------------------------------------------------------------------------
+@ NOP
+@------------------------------------------------------------------------------
+ nop
+ nopgt
+
+@ CHECK: nop @ encoding: [0x00,0xf0,0x20,0xe3]
+@ CHECK: nopgt @ encoding: [0x00,0xf0,0x20,0xc3]
+
@------------------------------------------------------------------------------
@ STM*