[llvm-commits] [llvm] r137864 - in /llvm/trunk: lib/Target/ARM/ARMInstrThumb.td test/CodeGen/ARM/select.ll test/MC/ARM/basic-thumb-instructions.s

[Jim Grosbach]

Author: grosbach
Date: Wed Aug 17 15:37:40 2011
New Revision: 137864

URL: http://llvm.org/viewvc/llvm-project?rev=137864&view=rev
Log:
Thumb assembly parsing and encoding for ADR.

Modified:
    llvm/trunk/lib/Target/ARM/ARMInstrThumb.td
    llvm/trunk/test/CodeGen/ARM/select.ll
    llvm/trunk/test/MC/ARM/basic-thumb-instructions.s

Modified: llvm/trunk/lib/Target/ARM/ARMInstrThumb.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMInstrThumb.td?rev=137864&r1=137863&r2=137864&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMInstrThumb.td (original)
+++ llvm/trunk/lib/Target/ARM/ARMInstrThumb.td Wed Aug 17 15:37:40 2011
@@ -1189,7 +1189,7 @@
 // assembler.
 
 def tADR : T1I<(outs tGPR:$Rd), (ins t_adrlabel:$addr, pred:$p),
-               IIC_iALUi, "adr{$p}\t$Rd, #$addr", []>,
+               IIC_iALUi, "adr{$p}\t$Rd, $addr", []>,
                T1Encoding<{1,0,1,0,0,?}> {
   bits<3> Rd;
   bits<8> addr;

Modified: llvm/trunk/test/CodeGen/ARM/select.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/select.ll?rev=137864&r1=137863&r2=137864&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/select.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/select.ll Wed Aug 17 15:37:40 2011
@@ -81,7 +81,7 @@
 ; CHECK-NEON-NEXT: cmp    r0, [[REGISTER_1]]
 ; CHECK-NEON-NEXT: it     eq
 ; CHECK-NEON-NEXT: moveq  [[REGISTER_2]], #4
-; CHECK-NEON-NEXT: adr    [[REGISTER_3:r[0-9]+]], #LCPI
+; CHECK-NEON-NEXT: adr    [[REGISTER_3:r[0-9]+]], LCPI
 ; CHECK-NEON-NEXT: ldr
 ; CHECK-NEON:      bx
 

Modified: llvm/trunk/test/MC/ARM/basic-thumb-instructions.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ARM/basic-thumb-instructions.s?rev=137864&r1=137863&r2=137864&view=diff
==============================================================================
--- llvm/trunk/test/MC/ARM/basic-thumb-instructions.s (original)
+++ llvm/trunk/test/MC/ARM/basic-thumb-instructions.s Wed Aug 17 15:37:40 2011
@@ -47,3 +47,12 @@
 @------------------------------------------------------------------------------
 @ FIXME: ADD (SP plus register)
 @------------------------------------------------------------------------------
+
+
+ at ------------------------------------------------------------------------------
+@ ADR
+ at ------------------------------------------------------------------------------
+        adr r2, _baz
+
+@ CHECK: adr	r2, _baz                @ encoding: [A,0xa2]
+            @   fixup A - offset: 0, value: _baz, kind: fixup_thumb_adr_pcrel_10