[llvm-commits] [llvm] r118963 - /llvm/trunk/lib/Target/ARM/ARMInstrInfo.td

[Jim Grosbach]

Author: grosbach
Date: Fri Nov 12 19:07:20 2010
New Revision: 118963

URL: http://llvm.org/viewvc/llvm-project?rev=118963&view=rev
Log:
Continue ARM indexed load refactoring. Multiclass for LDR{B} pre/post indexed
instructions.

Modified:
    llvm/trunk/lib/Target/ARM/ARMInstrInfo.td

Modified: llvm/trunk/lib/Target/ARM/ARMInstrInfo.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMInstrInfo.td?rev=118963&r1=118962&r2=118963&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMInstrInfo.td (original)
+++ llvm/trunk/lib/Target/ARM/ARMInstrInfo.td Fri Nov 12 19:07:20 2010
@@ -1546,16 +1546,20 @@
                  []>, Requires<[IsARM, HasV5TE]>;
 
 // Indexed loads
-def LDR_PRE  : AI2ldstidx<1, 0, 1, (outs GPR:$Rt, GPR:$Rn_wb),
-                     (ins addrmode2:$addr), IndexModePre, LdFrm, IIC_iLoad_ru,
-                     "ldr", "\t$Rt, $addr!", "$addr.base = $Rn_wb", []> {
-  let Inst{21} = 1; // W bit (overwrite)
+multiclass AI2_ldridx<bit isByte, InstrItinClass itin, string opc> {
+  def _PRE  : AI2ldstidx<1, isByte, 1, (outs GPR:$Rt, GPR:$Rn_wb),
+                      (ins addrmode2:$addr), IndexModePre, LdFrm, itin,
+                      opc, "\t$Rt, $addr!", "$addr.base = $Rn_wb", []> {
+    let Inst{21} = 1; // W bit (overwrite)
+  }
+  def _POST : AI2ldstidx<1, isByte, 0, (outs GPR:$Rt, GPR:$Rn_wb),
+                      (ins GPR:$Rn, am2offset:$offset),
+                      IndexModePost, LdFrm, itin,
+                      opc, "\t$Rt, [$Rn], $offset", "$Rn = $Rn_wb", []>;
 }
 
-def LDR_POST : AI2ldstidx<1, 0, 0, (outs GPR:$Rt, GPR:$Rn_wb),
-                     (ins GPR:$Rn, am2offset:$offset), IndexModePost,
-                      LdFrm, IIC_iLoad_ru,
-                     "ldr", "\t$Rt, [$Rn], $offset", "$Rn = $Rn_wb", []>;
+defm LDR  : AI2_ldridx<0, IIC_iLoad_ru, "ldr">;
+defm LDRB : AI2_ldridx<1, IIC_iLoad_bh_ru, "ldrb">;
 
 def LDRH_PRE  : AI3ldhpr<(outs GPR:$Rt, GPR:$Rn_wb),
                      (ins addrmode3:$addr), LdMiscFrm, IIC_iLoad_bh_ru,
@@ -1565,16 +1569,6 @@
                   (ins GPR:$Rn,am3offset:$offset), LdMiscFrm, IIC_iLoad_bh_ru,
                     "ldrh", "\t$Rt, [$Rn], $offset", "$Rn = $Rn_wb", []>;
 
-def LDRB_PRE  : AI2ldstidx<1, 1, 1, (outs GPR:$Rt, GPR:$Rn_wb),
-                     (ins addrmode2:$addr), IndexModePre, LdFrm,
-                      IIC_iLoad_bh_ru,
-                     "ldrb", "\t$Rt, $addr!", "$addr.base = $Rn_wb", []>;
-
-def LDRB_POST : AI2ldstidx<1, 1, 0, (outs GPR:$Rt, GPR:$Rn_wb),
-                     (ins GPR:$Rn,am2offset:$offset), IndexModePost,
-                     LdFrm, IIC_iLoad_bh_ru,
-                    "ldrb", "\t$Rt, [$Rn], $offset", "$Rn = $Rn_wb", []>;
-
 def LDRSH_PRE : AI3ldshpr<(outs GPR:$Rt, GPR:$Rn_wb),
                       (ins addrmode3:$addr), LdMiscFrm, IIC_iLoad_bh_ru,
                       "ldrsh", "\t$Rt, $addr!", "$addr.base = $Rn_wb", []>;