[llvm-commits] [llvm] r135600 - in /llvm/trunk/test/MC/ARM: arm_instructions.s basic-arm-instructions.s

[Jim Grosbach]

Author: grosbach
Date: Wed Jul 20 13:39:38 2011
New Revision: 135600

URL: http://llvm.org/viewvc/llvm-project?rev=135600&view=rev
Log:
Consolidate ARM NOP encoding test.

Modified:
    llvm/trunk/test/MC/ARM/arm_instructions.s
    llvm/trunk/test/MC/ARM/basic-arm-instructions.s

Modified: llvm/trunk/test/MC/ARM/arm_instructions.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ARM/arm_instructions.s?rev=135600&r1=135599&r2=135600&view=diff
==============================================================================
--- llvm/trunk/test/MC/ARM/arm_instructions.s (original)
+++ llvm/trunk/test/MC/ARM/arm_instructions.s Wed Jul 20 13:39:38 2011
@@ -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
 

Modified: llvm/trunk/test/MC/ARM/basic-arm-instructions.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ARM/basic-arm-instructions.s?rev=135600&r1=135599&r2=135600&view=diff
==============================================================================
--- llvm/trunk/test/MC/ARM/basic-arm-instructions.s (original)
+++ llvm/trunk/test/MC/ARM/basic-arm-instructions.s Wed Jul 20 13:39:38 2011
@@ -881,6 +881,15 @@
 @ CHECK: mvngt	r5, r6, asr r7          @ encoding: [0x56,0x57,0xe0,0xc1]
 @ CHECK: mvnslt	r5, r6, ror r7          @ encoding: [0x76,0x57,0xf0,0xb1]
 
+ at ------------------------------------------------------------------------------
+@ NOP
+ at ------------------------------------------------------------------------------
+        nop
+        nopgt
+
+@ CHECK: nop @ encoding: [0x00,0xf0,0x20,0xe3]
+@ CHECK: nopgt @ encoding: [0x00,0xf0,0x20,0xc3]
+
 
 @------------------------------------------------------------------------------
 @ STM*