[llvm-branch-commits] [llvm-branch] r114946 - in /llvm/branches/Apple/Pertwee: ./ include/llvm/IntrinsicsARM.td lib/Target/ARM/ARMInstrInfo.td lib/Target/ARM/ARMInstrThumb2.td

[Bob Wilson]

Author: bwilson
Date: Tue Sep 28 00:17:22 2010
New Revision: 114946

URL: http://llvm.org/viewvc/llvm-project?rev=114946&view=rev
Log:
--- Merging r109813 into '.':
U    include/llvm/IntrinsicsARM.td
U    lib/Target/ARM/ARMInstrInfo.td
U    lib/Target/ARM/ARMInstrThumb2.td

Modified:
    llvm/branches/Apple/Pertwee/   (props changed)
    llvm/branches/Apple/Pertwee/include/llvm/IntrinsicsARM.td
    llvm/branches/Apple/Pertwee/lib/Target/ARM/ARMInstrInfo.td
    llvm/branches/Apple/Pertwee/lib/Target/ARM/ARMInstrThumb2.td

Propchange: llvm/branches/Apple/Pertwee/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 00:17:22 2010
@@ -1 +1 @@
-/llvm/trunk:109842,109879,110152,110170,110233,110248-110249,110254,110269,110279,110366,110589,110614,110687,111149,114941
+/llvm/trunk:109813,109842,109879,110152,110170,110233,110248-110249,110254,110269,110279,110366,110589,110614,110687,111149,114941

Modified: llvm/branches/Apple/Pertwee/include/llvm/IntrinsicsARM.td
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Pertwee/include/llvm/IntrinsicsARM.td?rev=114946&r1=114945&r2=114946&view=diff
==============================================================================
--- llvm/branches/Apple/Pertwee/include/llvm/IntrinsicsARM.td (original)
+++ llvm/branches/Apple/Pertwee/include/llvm/IntrinsicsARM.td Tue Sep 28 00:17:22 2010
@@ -29,6 +29,10 @@
                         [IntrNoMem, Commutative]>;
   def int_arm_qsub : GCCBuiltin<"__builtin_arm_qsub">,
               Intrinsic<[llvm_i32_ty], [llvm_i32_ty, llvm_i32_ty], [IntrNoMem]>;
+  def int_arm_ssat : GCCBuiltin<"__builtin_arm_ssat">,
+              Intrinsic<[llvm_i32_ty], [llvm_i32_ty, llvm_i32_ty], [IntrNoMem]>;
+  def int_arm_usat : GCCBuiltin<"__builtin_arm_usat">,
+              Intrinsic<[llvm_i32_ty], [llvm_i32_ty, llvm_i32_ty], [IntrNoMem]>;
 }
 
 //===----------------------------------------------------------------------===//

Modified: llvm/branches/Apple/Pertwee/lib/Target/ARM/ARMInstrInfo.td
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Pertwee/lib/Target/ARM/ARMInstrInfo.td?rev=114946&r1=114945&r2=114946&view=diff
==============================================================================
--- llvm/branches/Apple/Pertwee/lib/Target/ARM/ARMInstrInfo.td (original)
+++ llvm/branches/Apple/Pertwee/lib/Target/ARM/ARMInstrInfo.td Tue Sep 28 00:17:22 2010
@@ -1835,6 +1835,9 @@
   let Inst{7-4} = 0b0011;
 }
 
+def : ARMV6Pat<(int_arm_ssat GPR:$a, imm:$pos), (SSATlsl imm:$pos, GPR:$a, 0)>;
+def : ARMV6Pat<(int_arm_usat GPR:$a, imm:$pos), (USATlsl imm:$pos, GPR:$a, 0)>;
+
 //===----------------------------------------------------------------------===//
 //  Bitwise Instructions.
 //

Modified: llvm/branches/Apple/Pertwee/lib/Target/ARM/ARMInstrThumb2.td
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Pertwee/lib/Target/ARM/ARMInstrThumb2.td?rev=114946&r1=114945&r2=114946&view=diff
==============================================================================
--- llvm/branches/Apple/Pertwee/lib/Target/ARM/ARMInstrThumb2.td (original)
+++ llvm/branches/Apple/Pertwee/lib/Target/ARM/ARMInstrThumb2.td Tue Sep 28 00:17:22 2010
@@ -1588,6 +1588,9 @@
   let Inst{7-6} = 0b00;    // imm2 = '00'
 }
 
+def : T2Pat<(int_arm_ssat GPR:$a, imm:$pos), (t2SSATlsl imm:$pos, GPR:$a, 0)>;
+def : T2Pat<(int_arm_usat GPR:$a, imm:$pos), (t2USATlsl imm:$pos, GPR:$a, 0)>;
+
 //===----------------------------------------------------------------------===//
 //  Shift and rotate Instructions.
 //