Commit 1f6d36ff authored by Tanya Lattner's avatar Tanya Lattner
Browse files

Merge from mainline 

llvm-svn: 37215
parent a5bea192

llvm/include/llvm/IntrinsicsX86.td

+4 −0
Original line number Diff line number Diff line
@@ -702,6 +702,10 @@ let TargetPrefix = "x86" in { // All intrinsics start with "llvm.x86.". 


// Misc.

let TargetPrefix = "x86" in {  // All intrinsics start with "llvm.x86.".

  def int_x86_mmx_maskmovq : GCCBuiltin<"__builtin_ia32_maskmovq">,

              Intrinsic<[llvm_void_ty, llvm_v8i8_ty, llvm_v8i8_ty, llvm_ptr_ty],

                        [IntrWriteMem]>;



  def int_x86_mmx_pmovmskb : GCCBuiltin<"__builtin_ia32_pmovmskb">,

              Intrinsic<[llvm_i32_ty, llvm_v8i8_ty], [IntrNoMem]>;

llvm/lib/Target/X86/X86InstrMMX.td

+3 −1
Original line number Diff line number Diff line
@@ -493,7 +493,9 @@ def MMX_PMOVMSKBrr : MMXI<0xD7, MRMSrcReg, (ops GR32:$dst, VR64:$src), 


// Misc.

def MMX_MASKMOVQ : MMXI<0xF7, MRMDestMem, (ops VR64:$src, VR64:$mask),

                        "maskmovq {$mask, $src|$src, $mask}", []>;

                        "maskmovq {$mask, $src|$src, $mask}",

                        [(int_x86_mmx_maskmovq VR64:$src, VR64:$mask, EDI)]>,

                        Imp<[EDI],[]>;



//===----------------------------------------------------------------------===//

// Alias Instructions