builtins.c (expand_builtin_cexpi): Use copy_addr_to_reg instead of copy_to_mode_reg...
[gcc.git] / gcc / config / i386 / i386.md
index 551e25d623ebd837ef615db1c42dea0d01f49f0a..0db0222af793e022f81954c63498b645aa813d08 100644 (file)
@@ -1,6 +1,6 @@
 ;; GCC machine description for IA-32 and x86-64.
 ;; Copyright (C) 1988, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-;; 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 ;; Free Software Foundation, Inc.
 ;; Mostly by William Schelter.
 ;; x86_64 support added by Jan Hubicka
@@ -38,6 +38,7 @@
 ;; Z -- likewise, with special suffixes for x87 instructions.
 ;; * -- print a star (in certain assembler syntax)
 ;; A -- print an absolute memory reference.
+;; E -- print address with DImode register names if TARGET_64BIT.
 ;; w -- print the operand as if it's a "word" (HImode) even if it isn't.
 ;; s -- print a shift double count, followed by the assemblers argument
 ;;     delimiter.
 ;; d -- print duplicated register operand for AVX instruction.
 ;; D -- print condition for SSE cmp instruction.
 ;; P -- if PIC, print an @PLT suffix.
+;; p -- print raw symbol name.
 ;; X -- don't print any sort of PIC '@' suffix for a symbol.
 ;; & -- print some in-use local-dynamic symbol name.
 ;; H -- print a memory address offset by 8; used for sse high-parts
 ;; Y -- print condition for XOP pcom* instruction.
 ;; + -- print a branch hint as 'cs' or 'ds' prefix
 ;; ; -- print a semicolon (after prefixes due to bug in older gas).
+;; ~ -- print "i" if TARGET_AVX2, "f" otherwise.
 ;; @ -- print a segment register of thread base pointer load
-
-;; UNSPEC usage:
+;; ^ -- print addr32 prefix if TARGET_64BIT and Pmode != word_mode
 
 (define_c_enum "unspec" [
   ;; Relocation specifiers
   UNSPEC_LD_MPIC       ; load_macho_picbase
   UNSPEC_TRUNC_NOOP
   UNSPEC_DIV_ALREADY_SPLIT
+  UNSPEC_MS_TO_SYSV_CALL
   UNSPEC_CALL_NEEDS_VZEROUPPER
+  UNSPEC_PAUSE
+  UNSPEC_LEA_ADDR
+  UNSPEC_XBEGIN_ABORT
 
   ;; For SSE/MMX support:
   UNSPEC_FIX_NOTRUNC
   UNSPEC_MASKMOV
   UNSPEC_MOVMSK
-  UNSPEC_MOVNT
-  UNSPEC_MOVU
   UNSPEC_RCP
   UNSPEC_RSQRT
-  UNSPEC_SFENCE
-  UNSPEC_PFRCP
-  UNSPEC_PFRCPIT1
-  UNSPEC_PFRCPIT2
-  UNSPEC_PFRSQRT
-  UNSPEC_PFRSQIT1
-  UNSPEC_MFENCE
-  UNSPEC_LFENCE
   UNSPEC_PSADBW
-  UNSPEC_LDDQU
-  UNSPEC_MS_TO_SYSV_CALL
 
   ;; Generic math support
   UNSPEC_COPYSIGN
   UNSPEC_SP_TLS_SET
   UNSPEC_SP_TLS_TEST
 
-  ;; SSSE3
-  UNSPEC_PSHUFB
-  UNSPEC_PSIGN
-  UNSPEC_PALIGNR
-
-  ;; For SSE4A support
-  UNSPEC_EXTRQI
-  UNSPEC_EXTRQ
-  UNSPEC_INSERTQI
-  UNSPEC_INSERTQ
-
-  ;; For SSE4.1 support
-  UNSPEC_BLENDV
-  UNSPEC_INSERTPS
-  UNSPEC_DP
-  UNSPEC_MOVNTDQA
-  UNSPEC_MPSADBW
-  UNSPEC_PHMINPOSUW
-  UNSPEC_PTEST
+  ;; For ROUND support
   UNSPEC_ROUND
 
-  ;; For SSE4.2 support
+  ;; For CRC32 support
   UNSPEC_CRC32
-  UNSPEC_PCMPESTR
-  UNSPEC_PCMPISTR
-
-  ;; For FMA4 support
-  UNSPEC_FMADDSUB
-  UNSPEC_XOP_UNSIGNED_CMP
-  UNSPEC_XOP_TRUEFALSE
-  UNSPEC_XOP_PERMUTE
-  UNSPEC_FRCZ
-
-  ;; For AES support
-  UNSPEC_AESENC
-  UNSPEC_AESENCLAST
-  UNSPEC_AESDEC
-  UNSPEC_AESDECLAST
-  UNSPEC_AESIMC
-  UNSPEC_AESKEYGENASSIST
-
-  ;; For PCLMUL support
-  UNSPEC_PCLMUL
-
-  ;; For AVX support
-  UNSPEC_PCMP
-  UNSPEC_VPERMIL
-  UNSPEC_VPERMIL2
-  UNSPEC_VPERMIL2F128
-  UNSPEC_CAST
-  UNSPEC_VTESTP
-  UNSPEC_VCVTPH2PS
-  UNSPEC_VCVTPS2PH
+
+  ;; For RDRAND support
+  UNSPEC_RDRAND
 
   ;; For BMI support
   UNSPEC_BEXTR
 
-  ;; For RDRAND support
-  UNSPEC_RDRAND
+  ;; For BMI2 support
+  UNSPEC_PDEP
+  UNSPEC_PEXT
 ])
 
 (define_c_enum "unspecv" [
   UNSPECV_BLOCKAGE
   UNSPECV_STACK_PROBE
   UNSPECV_PROBE_STACK_RANGE
-  UNSPECV_EMMS
-  UNSPECV_LDMXCSR
-  UNSPECV_STMXCSR
-  UNSPECV_FEMMS
-  UNSPECV_CLFLUSH
   UNSPECV_ALIGN
-  UNSPECV_MONITOR
-  UNSPECV_MWAIT
-  UNSPECV_CMPXCHG
-  UNSPECV_XCHG
-  UNSPECV_LOCK
   UNSPECV_PROLOGUE_USE
+  UNSPECV_SPLIT_STACK_RETURN
   UNSPECV_CLD
   UNSPECV_NOPS
-  UNSPECV_VZEROALL
-  UNSPECV_VZEROUPPER
   UNSPECV_RDTSC
   UNSPECV_RDTSCP
   UNSPECV_RDPMC
   UNSPECV_RDGSBASE
   UNSPECV_WRFSBASE
   UNSPECV_WRGSBASE
-  UNSPECV_SPLIT_STACK_RETURN
+
+  ;; For RTM support
+  UNSPECV_XBEGIN
+  UNSPECV_XEND
+  UNSPECV_XABORT
+  UNSPECV_XTEST
 ])
 
 ;; Constants to represent rounding modes in the ROUND instruction
 \f
 ;; Processor type.
 (define_attr "cpu" "none,pentium,pentiumpro,geode,k6,athlon,k8,core2,corei7,
-                   atom,generic64,amdfam10,bdver1,btver1"
+                   atom,generic64,amdfam10,bdver1,bdver2,btver1"
   (const (symbol_ref "ix86_schedule")))
 
 ;; A basic instruction type.  Refinements due to arguments to be
 (define_attr "type"
   "other,multi,
    alu,alu1,negnot,imov,imovx,lea,
-   incdec,ishift,ishift1,rotate,rotate1,imul,idiv,
+   incdec,ishift,ishiftx,ishift1,rotate,rotatex,rotate1,imul,imulx,idiv,
    icmp,test,ibr,setcc,icmov,
    push,pop,call,callv,leave,
    str,bitmanip,
 ;; The (bounding maximum) length of an instruction immediate.
 (define_attr "length_immediate" ""
   (cond [(eq_attr "type" "incdec,setcc,icmov,str,lea,other,multi,idiv,leave,
-                          bitmanip")
+                          bitmanip,imulx")
           (const_int 0)
         (eq_attr "unit" "i387,sse,mmx")
           (const_int 0)
-        (eq_attr "type" "alu,alu1,negnot,imovx,ishift,rotate,ishift1,rotate1,
-                         imul,icmp,push,pop")
+        (eq_attr "type" "alu,alu1,negnot,imovx,ishift,ishiftx,ishift1,
+                         rotate,rotatex,rotate1,imul,icmp,push,pop")
           (symbol_ref "ix86_attr_length_immediate_default (insn, true)")
         (eq_attr "type" "imov,test")
           (symbol_ref "ix86_attr_length_immediate_default (insn, false)")
         (eq_attr "type" "call")
-          (if_then_else (match_operand 0 "constant_call_address_operand" "")
+          (if_then_else (match_operand 0 "constant_call_address_operand")
             (const_int 4)
             (const_int 0))
         (eq_attr "type" "callv")
-          (if_then_else (match_operand 1 "constant_call_address_operand" "")
+          (if_then_else (match_operand 1 "constant_call_address_operand")
             (const_int 4)
             (const_int 0))
         ;; We don't know the size before shorten_branches.  Expect
   (cond [(eq_attr "type" "str,other,multi,fxch")
           (const_int 0)
         (and (eq_attr "type" "call")
-             (match_operand 0 "constant_call_address_operand" ""))
+             (match_operand 0 "constant_call_address_operand"))
             (const_int 0)
         (and (eq_attr "type" "callv")
-             (match_operand 1 "constant_call_address_operand" ""))
+             (match_operand 1 "constant_call_address_operand"))
             (const_int 0)
         ]
         (symbol_ref "ix86_attr_length_address_default (insn)")))
 
 ;; Set when REX opcode prefix is used.
 (define_attr "prefix_rex" ""
-  (cond [(eq (symbol_ref "TARGET_64BIT") (const_int 0))
+  (cond [(not (match_test "TARGET_64BIT"))
           (const_int 0)
         (and (eq_attr "mode" "DI")
              (and (eq_attr "type" "!push,pop,call,callv,leave,ibr")
                   (eq_attr "unit" "!mmx")))
           (const_int 1)
         (and (eq_attr "mode" "QI")
-             (ne (symbol_ref "x86_extended_QIreg_mentioned_p (insn)")
-                 (const_int 0)))
+             (match_test "x86_extended_QIreg_mentioned_p (insn)"))
           (const_int 1)
-        (ne (symbol_ref "x86_extended_reg_mentioned_p (insn)")
-            (const_int 0))
+        (match_test "x86_extended_reg_mentioned_p (insn)")
           (const_int 1)
         (and (eq_attr "type" "imovx")
-             (match_operand:QI 1 "ext_QIreg_operand" ""))
+             (match_operand:QI 1 "ext_QIreg_operand"))
           (const_int 1)
        ]
        (const_int 0)))
         (eq_attr "unit" "i387")
           (const_int 0)
          (and (eq_attr "type" "incdec")
-             (and (eq (symbol_ref "TARGET_64BIT") (const_int 0))
-                  (ior (match_operand:SI 1 "register_operand" "")
-                       (match_operand:HI 1 "register_operand" ""))))
+             (and (not (match_test "TARGET_64BIT"))
+                  (ior (match_operand:SI 1 "register_operand")
+                       (match_operand:HI 1 "register_operand"))))
           (const_int 0)
         (and (eq_attr "type" "push")
-             (not (match_operand 1 "memory_operand" "")))
+             (not (match_operand 1 "memory_operand")))
           (const_int 0)
         (and (eq_attr "type" "pop")
-             (not (match_operand 0 "memory_operand" "")))
+             (not (match_operand 0 "memory_operand")))
           (const_int 0)
         (and (eq_attr "type" "imov")
              (and (not (eq_attr "mode" "DI"))
-                  (ior (and (match_operand 0 "register_operand" "")
-                            (match_operand 1 "immediate_operand" ""))
-                       (ior (and (match_operand 0 "ax_reg_operand" "")
-                                 (match_operand 1 "memory_displacement_only_operand" ""))
-                            (and (match_operand 0 "memory_displacement_only_operand" "")
-                                 (match_operand 1 "ax_reg_operand" ""))))))
+                  (ior (and (match_operand 0 "register_operand")
+                            (match_operand 1 "immediate_operand"))
+                       (ior (and (match_operand 0 "ax_reg_operand")
+                                 (match_operand 1 "memory_displacement_only_operand"))
+                            (and (match_operand 0 "memory_displacement_only_operand")
+                                 (match_operand 1 "ax_reg_operand"))))))
           (const_int 0)
         (and (eq_attr "type" "call")
-             (match_operand 0 "constant_call_address_operand" ""))
+             (match_operand 0 "constant_call_address_operand"))
             (const_int 0)
         (and (eq_attr "type" "callv")
-             (match_operand 1 "constant_call_address_operand" ""))
+             (match_operand 1 "constant_call_address_operand"))
             (const_int 0)
         (and (eq_attr "type" "alu,alu1,icmp,test")
-             (match_operand 0 "ax_reg_operand" ""))
+             (match_operand 0 "ax_reg_operand"))
             (symbol_ref "(get_attr_length_immediate (insn) <= (get_attr_mode (insn) != MODE_QI))")
         ]
         (const_int 1)))
                       (attr "length_address")))
         (ior (eq_attr "prefix" "vex")
              (and (eq_attr "prefix" "maybe_vex")
-                   (ne (symbol_ref "TARGET_AVX") (const_int 0))))
+                  (match_test "TARGET_AVX")))
           (plus (attr "length_vex")
                 (plus (attr "length_immediate")
                       (plus (attr "modrm")
         (eq_attr "type" "frndint")
           (const_string "load")
         (eq_attr "type" "push")
-          (if_then_else (match_operand 1 "memory_operand" "")
+          (if_then_else (match_operand 1 "memory_operand")
             (const_string "both")
             (const_string "store"))
         (eq_attr "type" "pop")
-          (if_then_else (match_operand 0 "memory_operand" "")
+          (if_then_else (match_operand 0 "memory_operand")
             (const_string "both")
             (const_string "load"))
         (eq_attr "type" "setcc")
-          (if_then_else (match_operand 0 "memory_operand" "")
+          (if_then_else (match_operand 0 "memory_operand")
             (const_string "store")
             (const_string "none"))
         (eq_attr "type" "icmp,test,ssecmp,ssecomi,mmxcmp,fcmp")
-          (if_then_else (ior (match_operand 0 "memory_operand" "")
-                             (match_operand 1 "memory_operand" ""))
+          (if_then_else (ior (match_operand 0 "memory_operand")
+                             (match_operand 1 "memory_operand"))
             (const_string "load")
             (const_string "none"))
         (eq_attr "type" "ibr")
-          (if_then_else (match_operand 0 "memory_operand" "")
+          (if_then_else (match_operand 0 "memory_operand")
             (const_string "load")
             (const_string "none"))
         (eq_attr "type" "call")
-          (if_then_else (match_operand 0 "constant_call_address_operand" "")
+          (if_then_else (match_operand 0 "constant_call_address_operand")
             (const_string "none")
             (const_string "load"))
         (eq_attr "type" "callv")
-          (if_then_else (match_operand 1 "constant_call_address_operand" "")
+          (if_then_else (match_operand 1 "constant_call_address_operand")
             (const_string "none")
             (const_string "load"))
         (and (eq_attr "type" "alu1,negnot,ishift1,sselog1")
-             (match_operand 1 "memory_operand" ""))
+             (match_operand 1 "memory_operand"))
           (const_string "both")
-        (and (match_operand 0 "memory_operand" "")
-             (match_operand 1 "memory_operand" ""))
+        (and (match_operand 0 "memory_operand")
+             (match_operand 1 "memory_operand"))
           (const_string "both")
-        (match_operand 0 "memory_operand" "")
+        (match_operand 0 "memory_operand")
           (const_string "store")
-        (match_operand 1 "memory_operand" "")
+        (match_operand 1 "memory_operand")
           (const_string "load")
         (and (eq_attr "type"
                 "!alu1,negnot,ishift1,
                   fmov,fcmp,fsgn,
                   sse,ssemov,ssecmp,ssecomi,ssecvt,ssecvt1,sseicvt,sselog1,
                   sseiadd1,mmx,mmxmov,mmxcmp,mmxcvt")
-             (match_operand 2 "memory_operand" ""))
+             (match_operand 2 "memory_operand"))
           (const_string "load")
         (and (eq_attr "type" "icmov,ssemuladd,sse4arg")
-             (match_operand 3 "memory_operand" ""))
+             (match_operand 3 "memory_operand"))
           (const_string "load")
        ]
        (const_string "none")))
   (cond [(eq_attr "type" "other,multi")
           (const_string "unknown")
         (and (eq_attr "type" "icmp,test,imov,alu1,ishift1,rotate1")
-             (and (match_operand 0 "memory_displacement_operand" "")
-                  (match_operand 1 "immediate_operand" "")))
+             (and (match_operand 0 "memory_displacement_operand")
+                  (match_operand 1 "immediate_operand")))
           (const_string "true")
-        (and (eq_attr "type" "alu,ishift,rotate,imul,idiv")
-             (and (match_operand 0 "memory_displacement_operand" "")
-                  (match_operand 2 "immediate_operand" "")))
+        (and (eq_attr "type" "alu,ishift,ishiftx,rotate,rotatex,imul,idiv")
+             (and (match_operand 0 "memory_displacement_operand")
+                  (match_operand 2 "immediate_operand")))
           (const_string "true")
        ]
        (const_string "false")))
 (define_attr "movu" "0,1" (const_string "0"))
 
 ;; Used to control the "enabled" attribute on a per-instruction basis.
-(define_attr "isa" "base,noavx,avx"
+(define_attr "isa" "base,sse2,sse2_noavx,sse3,sse4,sse4_noavx,noavx,avx,bmi2"
   (const_string "base"))
 
 (define_attr "enabled" ""
-  (cond [(eq_attr "isa" "noavx") (symbol_ref "!TARGET_AVX")
+  (cond [(eq_attr "isa" "sse2") (symbol_ref "TARGET_SSE2")
+        (eq_attr "isa" "sse2_noavx")
+          (symbol_ref "TARGET_SSE2 && !TARGET_AVX")
+        (eq_attr "isa" "sse3") (symbol_ref "TARGET_SSE3")
+        (eq_attr "isa" "sse4") (symbol_ref "TARGET_SSE4_1")
+        (eq_attr "isa" "sse4_noavx")
+          (symbol_ref "TARGET_SSE4_1 && !TARGET_AVX")
         (eq_attr "isa" "avx") (symbol_ref "TARGET_AVX")
+        (eq_attr "isa" "noavx") (symbol_ref "!TARGET_AVX")
+        (eq_attr "isa" "bmi2") (symbol_ref "TARGET_BMI2")
        ]
        (const_int 1)))
 
 (define_code_attr comm [(plus "%") (ss_plus "%") (us_plus "%")
                        (minus "") (ss_minus "") (us_minus "")])
 
+;; Mapping of max and min
+(define_code_iterator maxmin [smax smin umax umin])
+
 ;; Mapping of signed max and min
 (define_code_iterator smaxmin [smax smin])
 
 ;; Base name for insn mnemonic.
 (define_code_attr logic [(and "and") (ior "or") (xor "xor")])
 
+;; Mapping of logic-shift operators
+(define_code_iterator any_lshift [ashift lshiftrt])
+
 ;; Mapping of shift-right operators
 (define_code_iterator any_shiftrt [lshiftrt ashiftrt])
 
 ;; Base name for define_insn
-(define_code_attr shiftrt_insn [(lshiftrt "lshr") (ashiftrt "ashr")])
+(define_code_attr shift_insn
+  [(ashift "ashl") (lshiftrt "lshr") (ashiftrt "ashr")])
 
 ;; Base name for insn mnemonic.
-(define_code_attr shiftrt [(lshiftrt "shr") (ashiftrt "sar")])
+(define_code_attr shift [(ashift "sll") (lshiftrt "shr") (ashiftrt "sar")])
+(define_code_attr vshift [(ashift "sll") (lshiftrt "srl") (ashiftrt "sra")])
 
 ;; Mapping of rotate operators
 (define_code_iterator any_rotate [rotate rotatert])
 ;; Used in signed and unsigned widening multiplications.
 (define_code_iterator any_extend [sign_extend zero_extend])
 
-;; Various insn prefixes for signed and unsigned operations.
-(define_code_attr u [(sign_extend "") (zero_extend "u")
-                    (div "") (udiv "u")])
-(define_code_attr s [(sign_extend "s") (zero_extend "u")])
-
-;; Used in signed and unsigned divisions.
-(define_code_iterator any_div [div udiv])
+;; Prefix for insn menmonic.
+(define_code_attr sgnprefix [(sign_extend "i") (zero_extend "")])
 
-;; Instruction prefix for signed and unsigned operations.
-(define_code_attr sgnprefix [(sign_extend "i") (zero_extend "")
-                            (div "i") (udiv "")])
+;; Prefix for define_insn
+(define_code_attr u [(sign_extend "") (zero_extend "u")])
+(define_code_attr s [(sign_extend "s") (zero_extend "u")])
 
-;; 64bit single word integer modes.
+;; All integer modes.
 (define_mode_iterator SWI1248x [QI HI SI DI])
 
-;; 64bit single word integer modes without QImode and HImode.
-(define_mode_iterator SWI48x [SI DI])
+;; All integer modes without QImode.
+(define_mode_iterator SWI248x [HI SI DI])
 
-;; Single word integer modes.
-(define_mode_iterator SWI [QI HI SI (DI "TARGET_64BIT")])
+;; All integer modes without QImode and HImode.
+(define_mode_iterator SWI48x [SI DI])
 
-;; Single word integer modes without SImode and DImode.
+;; All integer modes without SImode and DImode.
 (define_mode_iterator SWI12 [QI HI])
 
-;; Single word integer modes without DImode.
+;; All integer modes without DImode.
 (define_mode_iterator SWI124 [QI HI SI])
 
-;; Single word integer modes without QImode and DImode.
+;; All integer modes without QImode and DImode.
 (define_mode_iterator SWI24 [HI SI])
 
+;; Single word integer modes.
+(define_mode_iterator SWI [QI HI SI (DI "TARGET_64BIT")])
+
 ;; Single word integer modes without QImode.
 (define_mode_iterator SWI248 [HI SI (DI "TARGET_64BIT")])
 
                            (HI "TARGET_HIMODE_MATH")
                            SI (DI "TARGET_64BIT")])
 
-;; Math-dependant single word integer modes without DImode.
+;; Math-dependant integer modes without DImode.
 (define_mode_iterator SWIM124 [(QI "TARGET_QIMODE_MATH")
                               (HI "TARGET_HIMODE_MATH")
                               SI])
 (define_mode_attr r [(QI "q") (HI "r") (SI "r") (DI "r")])
 
 ;; Immediate operand constraint for integer modes.
-(define_mode_attr i [(QI "n") (HI "n") (SI "i") (DI "e")])
+(define_mode_attr i [(QI "n") (HI "n") (SI "e") (DI "e")])
 
 ;; General operand constraint for word modes.
-(define_mode_attr g [(QI "qmn") (HI "rmn") (SI "g") (DI "rme")])
+(define_mode_attr g [(QI "qmn") (HI "rmn") (SI "rme") (DI "rme")])
 
 ;; Immediate operand constraint for double integer modes.
-(define_mode_attr di [(SI "iF") (DI "e")])
+(define_mode_attr di [(SI "nF") (DI "e")])
 
 ;; Immediate operand constraint for shifts.
 (define_mode_attr S [(QI "I") (HI "I") (SI "I") (DI "J") (TI "O")])
 (define_mode_attr general_operand
        [(QI "general_operand")
         (HI "general_operand")
-        (SI "general_operand")
+        (SI "x86_64_general_operand")
         (DI "x86_64_general_operand")
         (TI "x86_64_general_operand")])
 
 (define_mode_attr general_szext_operand
        [(QI "general_operand")
         (HI "general_operand")
-        (SI "general_operand")
+        (SI "x86_64_szext_general_operand")
         (DI "x86_64_szext_general_operand")])
 
 ;; Immediate operand predicate for integer modes.
 (define_mode_attr immediate_operand
        [(QI "immediate_operand")
         (HI "immediate_operand")
-        (SI "immediate_operand")
+        (SI "x86_64_immediate_operand")
         (DI "x86_64_immediate_operand")])
 
 ;; Nonmemory operand predicate for integer modes.
 (define_mode_attr nonmemory_operand
        [(QI "nonmemory_operand")
         (HI "nonmemory_operand")
-        (SI "nonmemory_operand")
+        (SI "x86_64_nonmemory_operand")
         (DI "x86_64_nonmemory_operand")])
 
 ;; Operand predicate for shifts.
 ;; All x87 floating point modes
 (define_mode_iterator X87MODEF [SF DF XF])
 
-;; All integer modes handled by x87 fisttp operator.
-(define_mode_iterator X87MODEI [HI SI DI])
-
-;; All integer modes handled by integer x87 operators.
-(define_mode_iterator X87MODEI12 [HI SI])
-
-;; All integer modes handled by SSE cvtts?2si* operators.
-(define_mode_iterator SSEMODEI24 [SI DI])
-
 ;; SSE instruction suffix for various modes
 (define_mode_attr ssemodesuffix
   [(SF "ss") (DF "sd")
    (V8SF "ps") (V4DF "pd")
    (V4SF "ps") (V2DF "pd")
    (V16QI "b") (V8HI "w") (V4SI "d") (V2DI "q")
-   (V8SI "si")])
+   (V32QI "b") (V16HI "w") (V8SI "d") (V4DI "q")])
 
 ;; SSE vector suffix for floating point modes
 (define_mode_attr ssevecmodesuffix [(SF "ps") (DF "pd")])
 ;; This mode iterator allows :P to be used for patterns that operate on
 ;; pointer-sized quantities.  Exactly one of the two alternatives will match.
 (define_mode_iterator P [(SI "Pmode == SImode") (DI "Pmode == DImode")])
+
+;; This mode iterator allows :W to be used for patterns that operate on
+;; word_mode sized quantities.
+(define_mode_iterator W
+  [(SI "word_mode == SImode") (DI "word_mode == DImode")])
+
+;; This mode iterator allows :PTR to be used for patterns that operate on
+;; ptr_mode sized quantities.
+(define_mode_iterator PTR
+  [(SI "ptr_mode == SImode") (DI "ptr_mode == DImode")])
 \f
 ;; Scheduling descriptions
 
 
 (define_expand "cbranch<mode>4"
   [(set (reg:CC FLAGS_REG)
-       (compare:CC (match_operand:SDWIM 1 "nonimmediate_operand" "")
-                   (match_operand:SDWIM 2 "<general_operand>" "")))
+       (compare:CC (match_operand:SDWIM 1 "nonimmediate_operand")
+                   (match_operand:SDWIM 2 "<general_operand>")))
    (set (pc) (if_then_else
               (match_operator 0 "ordered_comparison_operator"
                [(reg:CC FLAGS_REG) (const_int 0)])
-              (label_ref (match_operand 3 "" ""))
+              (label_ref (match_operand 3))
               (pc)))]
   ""
 {
 
 (define_expand "cstore<mode>4"
   [(set (reg:CC FLAGS_REG)
-       (compare:CC (match_operand:SWIM 2 "nonimmediate_operand" "")
-                   (match_operand:SWIM 3 "<general_operand>" "")))
-   (set (match_operand:QI 0 "register_operand" "")
+       (compare:CC (match_operand:SWIM 2 "nonimmediate_operand")
+                   (match_operand:SWIM 3 "<general_operand>")))
+   (set (match_operand:QI 0 "register_operand")
        (match_operator 1 "ordered_comparison_operator"
          [(reg:CC FLAGS_REG) (const_int 0)]))]
   ""
 
 (define_expand "cmp<mode>_1"
   [(set (reg:CC FLAGS_REG)
-       (compare:CC (match_operand:SWI48 0 "nonimmediate_operand" "")
-                   (match_operand:SWI48 1 "<general_operand>" "")))])
+       (compare:CC (match_operand:SWI48 0 "nonimmediate_operand")
+                   (match_operand:SWI48 1 "<general_operand>")))])
 
 (define_insn "*cmp<mode>_ccno_1"
   [(set (reg FLAGS_REG)
        (compare (match_operand:SWI 0 "nonimmediate_operand" "<r>,?m<r>")
-                (match_operand:SWI 1 "const0_operand" "")))]
+                (match_operand:SWI 1 "const0_operand")))]
   "ix86_match_ccmode (insn, CCNOmode)"
   "@
    test{<imodesuffix>}\t%0, %0
              (match_operand 0 "ext_register_operand" "Q")
              (const_int 8)
              (const_int 8)) 0)
-         (match_operand:QI 1 "const0_operand" "")))]
+         (match_operand:QI 1 "const0_operand")))]
   "ix86_match_ccmode (insn, CCNOmode)"
   "test{b}\t%h0, %h0"
   [(set_attr "type" "test")
        (compare:CC
          (subreg:QI
            (zero_extract:SI
-             (match_operand 0 "ext_register_operand" "")
+             (match_operand 0 "ext_register_operand")
              (const_int 8)
              (const_int 8)) 0)
-         (match_operand:QI 1 "immediate_operand" "")))])
+         (match_operand:QI 1 "immediate_operand")))])
 
 (define_insn "*cmpqi_ext_3_insn"
   [(set (reg FLAGS_REG)
 
 (define_expand "cbranchxf4"
   [(set (reg:CC FLAGS_REG)
-       (compare:CC (match_operand:XF 1 "nonmemory_operand" "")
-                   (match_operand:XF 2 "nonmemory_operand" "")))
+       (compare:CC (match_operand:XF 1 "nonmemory_operand")
+                   (match_operand:XF 2 "nonmemory_operand")))
    (set (pc) (if_then_else
               (match_operator 0 "ix86_fp_comparison_operator"
                [(reg:CC FLAGS_REG)
                 (const_int 0)])
-              (label_ref (match_operand 3 "" ""))
+              (label_ref (match_operand 3))
               (pc)))]
   "TARGET_80387"
 {
 
 (define_expand "cstorexf4"
   [(set (reg:CC FLAGS_REG)
-       (compare:CC (match_operand:XF 2 "nonmemory_operand" "")
-                   (match_operand:XF 3 "nonmemory_operand" "")))
-   (set (match_operand:QI 0 "register_operand" "")
+       (compare:CC (match_operand:XF 2 "nonmemory_operand")
+                   (match_operand:XF 3 "nonmemory_operand")))
+   (set (match_operand:QI 0 "register_operand")
               (match_operator 1 "ix86_fp_comparison_operator"
                [(reg:CC FLAGS_REG)
                 (const_int 0)]))]
 
 (define_expand "cbranch<mode>4"
   [(set (reg:CC FLAGS_REG)
-       (compare:CC (match_operand:MODEF 1 "cmp_fp_expander_operand" "")
-                   (match_operand:MODEF 2 "cmp_fp_expander_operand" "")))
+       (compare:CC (match_operand:MODEF 1 "cmp_fp_expander_operand")
+                   (match_operand:MODEF 2 "cmp_fp_expander_operand")))
    (set (pc) (if_then_else
               (match_operator 0 "ix86_fp_comparison_operator"
                [(reg:CC FLAGS_REG)
                 (const_int 0)])
-              (label_ref (match_operand 3 "" ""))
+              (label_ref (match_operand 3))
               (pc)))]
   "TARGET_80387 || (SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)"
 {
 
 (define_expand "cstore<mode>4"
   [(set (reg:CC FLAGS_REG)
-       (compare:CC (match_operand:MODEF 2 "cmp_fp_expander_operand" "")
-                   (match_operand:MODEF 3 "cmp_fp_expander_operand" "")))
-   (set (match_operand:QI 0 "register_operand" "")
+       (compare:CC (match_operand:MODEF 2 "cmp_fp_expander_operand")
+                   (match_operand:MODEF 3 "cmp_fp_expander_operand")))
+   (set (match_operand:QI 0 "register_operand")
               (match_operator 1 "ix86_fp_comparison_operator"
                [(reg:CC FLAGS_REG)
                 (const_int 0)]))]
 (define_expand "cbranchcc4"
   [(set (pc) (if_then_else
               (match_operator 0 "comparison_operator"
-               [(match_operand 1 "flags_reg_operand" "")
-                (match_operand 2 "const0_operand" "")])
-              (label_ref (match_operand 3 "" ""))
+               [(match_operand 1 "flags_reg_operand")
+                (match_operand 2 "const0_operand")])
+              (label_ref (match_operand 3))
               (pc)))]
   ""
 {
 })
 
 (define_expand "cstorecc4"
-  [(set (match_operand:QI 0 "register_operand" "")
+  [(set (match_operand:QI 0 "register_operand")
               (match_operator 1 "comparison_operator"
-               [(match_operand 2 "flags_reg_operand" "")
-                (match_operand 3 "const0_operand" "")]))]
+               [(match_operand 2 "flags_reg_operand")
+                (match_operand 3 "const0_operand")]))]
   ""
 {
   ix86_expand_setcc (operands[0], GET_CODE (operands[1]),
        (unspec:HI
          [(compare:CCFP
             (match_operand 1 "register_operand" "f")
-            (match_operand 2 "const0_operand" ""))]
+            (match_operand 2 "const0_operand"))]
        UNSPEC_FNSTSW))]
   "X87_FLOAT_MODE_P (GET_MODE (operands[1]))
    && GET_MODE (operands[1]) == GET_MODE (operands[2])"
   [(set_attr "type" "multi")
    (set_attr "unit" "i387")
    (set (attr "mode")
-     (cond [(match_operand:SF 1 "" "")
+     (cond [(match_operand:SF 1)
              (const_string "SF")
-           (match_operand:DF 1 "" "")
+           (match_operand:DF 1)
              (const_string "DF")
           ]
           (const_string "XF")))])
   [(set (reg:CCFP FLAGS_REG)
        (compare:CCFP
          (match_operand 1 "register_operand" "f")
-         (match_operand 2 "const0_operand" "")))
+         (match_operand 2 "const0_operand")))
    (clobber (match_operand:HI 0 "register_operand" "=a"))]
   "X87_FLOAT_MODE_P (GET_MODE (operands[1]))
    && TARGET_SAHF && !TARGET_CMOVE
   [(set_attr "type" "multi")
    (set_attr "unit" "i387")
    (set (attr "mode")
-     (cond [(match_operand:SF 1 "" "")
+     (cond [(match_operand:SF 1)
              (const_string "SF")
-           (match_operand:DF 1 "" "")
+           (match_operand:DF 1)
              (const_string "DF")
           ]
           (const_string "XF")))])
   [(set_attr "type" "multi")
    (set_attr "unit" "i387")
    (set (attr "mode")
-     (cond [(match_operand:SF 1 "" "")
+     (cond [(match_operand:SF 1)
              (const_string "SF")
-           (match_operand:DF 1 "" "")
+           (match_operand:DF 1)
              (const_string "DF")
           ]
           (const_string "XF")))])
   [(set_attr "type" "multi")
    (set_attr "unit" "i387")
    (set (attr "mode")
-     (cond [(match_operand:SF 1 "" "")
+     (cond [(match_operand:SF 1)
              (const_string "SF")
-           (match_operand:DF 1 "" "")
+           (match_operand:DF 1)
              (const_string "DF")
           ]
           (const_string "XF")))])
          [(compare:CCFP
             (match_operand 1 "register_operand" "f")
             (match_operator 3 "float_operator"
-              [(match_operand:X87MODEI12 2 "memory_operand" "m")]))]
+              [(match_operand:SWI24 2 "memory_operand" "m")]))]
          UNSPEC_FNSTSW))]
   "X87_FLOAT_MODE_P (GET_MODE (operands[1]))
    && (TARGET_USE_<MODE>MODE_FIOP || optimize_function_for_size_p (cfun))
        (compare:CCFP
          (match_operand 1 "register_operand" "f")
          (match_operator 3 "float_operator"
-           [(match_operand:X87MODEI12 2 "memory_operand" "m")])))
+           [(match_operand:SWI24 2 "memory_operand" "m")])))
    (clobber (match_operand:HI 0 "register_operand" "=a"))]
   "X87_FLOAT_MODE_P (GET_MODE (operands[1]))
    && TARGET_SAHF && !TARGET_CMOVE
        (unspec:HI [(reg:CCFP FPSR_REG)] UNSPEC_FNSTSW))]
   "TARGET_80387"
   "fnstsw\t%0"
-  [(set (attr "length") (symbol_ref "ix86_attr_length_address_default (insn) + 2"))
+  [(set (attr "length")
+       (symbol_ref "ix86_attr_length_address_default (insn) + 2"))
    (set_attr "mode" "SI")
    (set_attr "unit" "i387")])
 
    (set_attr "mode" "SI")])
 
 ;; Pentium Pro can do steps 1 through 3 in one go.
-;; comi*, ucomi*, fcomi*, ficomi*,fucomi* (i387 instructions set condition codes)
+;; comi*, ucomi*, fcomi*, ficomi*, fucomi*
+;; (these i387 instructions set flags directly)
 (define_insn "*cmpfp_i_mixed"
   [(set (reg:CCFP FLAGS_REG)
        (compare:CCFP (match_operand 0 "register_operand" "f,x")
   [(set_attr "type" "fcmp,ssecomi")
    (set_attr "prefix" "orig,maybe_vex")
    (set (attr "mode")
-     (if_then_else (match_operand:SF 1 "" "")
+     (if_then_else (match_operand:SF 1)
         (const_string "SF")
         (const_string "DF")))
    (set (attr "prefix_rep")
   [(set_attr "type" "ssecomi")
    (set_attr "prefix" "maybe_vex")
    (set (attr "mode")
-     (if_then_else (match_operand:SF 1 "" "")
+     (if_then_else (match_operand:SF 1)
         (const_string "SF")
         (const_string "DF")))
    (set_attr "prefix_rep" "0")
   "* return output_fp_compare (insn, operands, true, false);"
   [(set_attr "type" "fcmp")
    (set (attr "mode")
-     (cond [(match_operand:SF 1 "" "")
+     (cond [(match_operand:SF 1)
              (const_string "SF")
-           (match_operand:DF 1 "" "")
+           (match_operand:DF 1)
              (const_string "DF")
           ]
           (const_string "XF")))
   [(set_attr "type" "fcmp,ssecomi")
    (set_attr "prefix" "orig,maybe_vex")
    (set (attr "mode")
-     (if_then_else (match_operand:SF 1 "" "")
+     (if_then_else (match_operand:SF 1)
         (const_string "SF")
         (const_string "DF")))
    (set (attr "prefix_rep")
   [(set_attr "type" "ssecomi")
    (set_attr "prefix" "maybe_vex")
    (set (attr "mode")
-     (if_then_else (match_operand:SF 1 "" "")
+     (if_then_else (match_operand:SF 1)
         (const_string "SF")
         (const_string "DF")))
    (set_attr "prefix_rep" "0")
   "* return output_fp_compare (insn, operands, true, true);"
   [(set_attr "type" "fcmp")
    (set (attr "mode")
-     (cond [(match_operand:SF 1 "" "")
+     (cond [(match_operand:SF 1)
              (const_string "SF")
-           (match_operand:DF 1 "" "")
+           (match_operand:DF 1)
              (const_string "DF")
           ]
           (const_string "XF")))
 
 (define_insn "*push<mode>2"
   [(set (match_operand:DWI 0 "push_operand" "=<")
-       (match_operand:DWI 1 "general_no_elim_operand" "riF*m"))]
+       (match_operand:DWI 1 "general_no_elim_operand" "riF*o"))]
   ""
-  "#")
+  "#"
+  [(set_attr "type" "multi")
+   (set_attr "mode" "<MODE>")])
 
 (define_split
-  [(set (match_operand:TI 0 "push_operand" "")
-        (match_operand:TI 1 "general_operand" ""))]
+  [(set (match_operand:TI 0 "push_operand")
+        (match_operand:TI 1 "general_operand"))]
   "TARGET_64BIT && reload_completed
    && !SSE_REG_P (operands[1])"
   [(const_int 0)]
 ;; upper part by 32bit move.
 (define_peephole2
   [(match_scratch:DI 2 "r")
-   (set (match_operand:DI 0 "push_operand" "")
-        (match_operand:DI 1 "immediate_operand" ""))]
+   (set (match_operand:DI 0 "push_operand")
+        (match_operand:DI 1 "immediate_operand"))]
   "TARGET_64BIT && !symbolic_operand (operands[1], DImode)
    && !x86_64_immediate_operand (operands[1], DImode)"
   [(set (match_dup 2) (match_dup 1))
 ;; peephole2 pass is not run.
 ;; "&& 1" is needed to keep it from matching the previous pattern.
 (define_peephole2
-  [(set (match_operand:DI 0 "push_operand" "")
-        (match_operand:DI 1 "immediate_operand" ""))]
+  [(set (match_operand:DI 0 "push_operand")
+        (match_operand:DI 1 "immediate_operand"))]
   "TARGET_64BIT && !symbolic_operand (operands[1], DImode)
    && !x86_64_immediate_operand (operands[1], DImode) && 1"
   [(set (match_dup 0) (match_dup 1))
 })
 
 (define_split
-  [(set (match_operand:DI 0 "push_operand" "")
-        (match_operand:DI 1 "immediate_operand" ""))]
+  [(set (match_operand:DI 0 "push_operand")
+        (match_operand:DI 1 "immediate_operand"))]
   "TARGET_64BIT && ((optimize > 0 && flag_peephole2)
                    ? epilogue_completed : reload_completed)
    && !symbolic_operand (operands[1], DImode)
 })
 
 (define_split
-  [(set (match_operand:DI 0 "push_operand" "")
-        (match_operand:DI 1 "general_operand" ""))]
+  [(set (match_operand:DI 0 "push_operand")
+        (match_operand:DI 1 "general_operand"))]
   "!TARGET_64BIT && reload_completed
    && !(MMX_REG_P (operands[1]) || SSE_REG_P (operands[1]))"
   [(const_int 0)]
    (set_attr "mode" "SI")])
 
 (define_insn "*push<mode>2_prologue"
-  [(set (match_operand:P 0 "push_operand" "=<")
-       (match_operand:P 1 "general_no_elim_operand" "r<i>*m"))
+  [(set (match_operand:W 0 "push_operand" "=<")
+       (match_operand:W 1 "general_no_elim_operand" "r<i>*m"))
    (clobber (mem:BLK (scratch)))]
   ""
   "push{<imodesuffix>}\t%1"
    (set_attr "mode" "<MODE>")])
 
 (define_insn "*pop<mode>1"
-  [(set (match_operand:P 0 "nonimmediate_operand" "=r*m")
-       (match_operand:P 1 "pop_operand" ">"))]
+  [(set (match_operand:W 0 "nonimmediate_operand" "=r*m")
+       (match_operand:W 1 "pop_operand" ">"))]
   ""
   "pop{<imodesuffix>}\t%0"
   [(set_attr "type" "pop")
    (set_attr "mode" "<MODE>")])
 
 (define_insn "*pop<mode>1_epilogue"
-  [(set (match_operand:P 0 "nonimmediate_operand" "=r*m")
-       (match_operand:P 1 "pop_operand" ">"))
+  [(set (match_operand:W 0 "nonimmediate_operand" "=r*m")
+       (match_operand:W 1 "pop_operand" ">"))
    (clobber (mem:BLK (scratch)))]
   ""
   "pop{<imodesuffix>}\t%0"
 ;; Move instructions.
 
 (define_expand "movoi"
-  [(set (match_operand:OI 0 "nonimmediate_operand" "")
-       (match_operand:OI 1 "general_operand" ""))]
+  [(set (match_operand:OI 0 "nonimmediate_operand")
+       (match_operand:OI 1 "general_operand"))]
   "TARGET_AVX"
   "ix86_expand_move (OImode, operands); DONE;")
 
 (define_expand "movti"
-  [(set (match_operand:TI 0 "nonimmediate_operand" "")
-       (match_operand:TI 1 "nonimmediate_operand" ""))]
+  [(set (match_operand:TI 0 "nonimmediate_operand")
+       (match_operand:TI 1 "nonimmediate_operand"))]
   "TARGET_64BIT || TARGET_SSE"
 {
   if (TARGET_64BIT)
 ;; 32-bit targets when SSE is present, but doesn't seem to be harmful
 ;; to have around all the time.
 (define_expand "movcdi"
-  [(set (match_operand:CDI 0 "nonimmediate_operand" "")
-       (match_operand:CDI 1 "general_operand" ""))]
+  [(set (match_operand:CDI 0 "nonimmediate_operand")
+       (match_operand:CDI 1 "general_operand"))]
   ""
 {
   if (push_operand (operands[0], CDImode))
 })
 
 (define_expand "mov<mode>"
-  [(set (match_operand:SWI1248x 0 "nonimmediate_operand" "")
-       (match_operand:SWI1248x 1 "general_operand" ""))]
+  [(set (match_operand:SWI1248x 0 "nonimmediate_operand")
+       (match_operand:SWI1248x 1 "general_operand"))]
   ""
   "ix86_expand_move (<MODE>mode, operands); DONE;")
 
 (define_insn "*mov<mode>_xor"
   [(set (match_operand:SWI48 0 "register_operand" "=r")
-       (match_operand:SWI48 1 "const0_operand" ""))
+       (match_operand:SWI48 1 "const0_operand"))
    (clobber (reg:CC FLAGS_REG))]
   "reload_completed"
   "xor{l}\t%k0, %k0"
 
 (define_insn "*mov<mode>_or"
   [(set (match_operand:SWI48 0 "register_operand" "=r")
-       (match_operand:SWI48 1 "const_int_operand" ""))
+       (match_operand:SWI48 1 "const_int_operand"))
    (clobber (reg:CC FLAGS_REG))]
   "reload_completed
    && operands[1] == constm1_rtx"
   switch (which_alternative)
     {
     case 0:
-      return "vxorps\t%0, %0, %0";
+      return standard_sse_constant_opcode (insn, operands[1]);
     case 1:
     case 2:
       if (misaligned_operand (operands[0], OImode)
     case 1:
       return "#";
     case 2:
-      if (get_attr_mode (insn) == MODE_V4SF)
-       return "%vxorps\t%0, %d0";
-      else
-       return "%vpxor\t%0, %d0";
+      return standard_sse_constant_opcode (insn, operands[1]);
     case 3:
     case 4:
       /* TDmode values are passed as TImode on the stack.  Moving them
    (set (attr "mode")
        (cond [(eq_attr "alternative" "2,3")
                 (if_then_else
-                  (ne (symbol_ref "optimize_function_for_size_p (cfun)")
-                      (const_int 0))
+                  (match_test "optimize_function_for_size_p (cfun)")
                   (const_string "V4SF")
                   (const_string "TI"))
               (eq_attr "alternative" "4")
                 (if_then_else
-                  (ior (ne (symbol_ref "TARGET_SSE_TYPELESS_STORES")
-                           (const_int 0))
-                       (ne (symbol_ref "optimize_function_for_size_p (cfun)")
-                           (const_int 0)))
+                  (ior (match_test "TARGET_SSE_TYPELESS_STORES")
+                       (match_test "optimize_function_for_size_p (cfun)"))
                   (const_string "V4SF")
                   (const_string "TI"))]
               (const_string "DI")))])
 
 (define_split
-  [(set (match_operand:TI 0 "nonimmediate_operand" "")
-       (match_operand:TI 1 "general_operand" ""))]
+  [(set (match_operand:TI 0 "nonimmediate_operand")
+       (match_operand:TI 1 "general_operand"))]
   "reload_completed
    && !SSE_REG_P (operands[0]) && !SSE_REG_P (operands[1])"
   [(const_int 0)]
   switch (which_alternative)
     {
     case 0:
-      if (get_attr_mode (insn) == MODE_V4SF)
-       return "%vxorps\t%0, %d0";
-      else
-       return "%vpxor\t%0, %d0";
+      return standard_sse_constant_opcode (insn, operands[1]);
     case 1:
     case 2:
       /* TDmode values are passed as TImode on the stack.  Moving them
   [(set_attr "type" "sselog1,ssemov,ssemov")
    (set_attr "prefix" "maybe_vex")
    (set (attr "mode")
-       (cond [(ior (eq (symbol_ref "TARGET_SSE2") (const_int 0))
-                   (ne (symbol_ref "optimize_function_for_size_p (cfun)")
-                       (const_int 0)))
+       (cond [(ior (not (match_test "TARGET_SSE2"))
+                   (match_test "optimize_function_for_size_p (cfun)"))
                 (const_string "V4SF")
               (and (eq_attr "alternative" "2")
-                   (ne (symbol_ref "TARGET_SSE_TYPELESS_STORES")
-                       (const_int 0)))
+                   (match_test "TARGET_SSE_TYPELESS_STORES"))
                 (const_string "V4SF")]
              (const_string "TI")))])
 
 (define_insn "*movdi_internal_rex64"
   [(set (match_operand:DI 0 "nonimmediate_operand"
-         "=r,r  ,r,m ,!m,*y,*y,?r ,m ,?*Ym,?*y,*x,*x,?r ,m,?*Yi,*x,?*x,?*Ym")
+         "=r,r  ,r,m ,!o,*y,m*y,?*y,?r ,?*Ym,*x,m ,*x,*x,?r ,?*Yi,?*x,?*Ym")
        (match_operand:DI 1 "general_operand"
-         "Z ,rem,i,re,n ,C ,*y,*Ym,*y,r   ,m  ,C ,*x,*Yi,*x,r  ,m ,*Ym,*x"))]
+         "Z ,rem,i,re,n ,C ,*y ,m  ,*Ym,r   ,C ,*x,*x,m ,*Yi,r   ,*Ym,*x"))]
   "TARGET_64BIT && !(MEM_P (operands[0]) && MEM_P (operands[1]))"
 {
   switch (get_attr_type (insn))
        return "movq\t{%1, %0|%0, %1}";
 
     case TYPE_SSELOG1:
-      return "%vpxor\t%0, %d0";
+      return standard_sse_constant_opcode (insn, operands[1]);
 
     case TYPE_MMX:
       return "pxor\t%0, %0";
       return "#";
 
     case TYPE_LEA:
-      return "lea{q}\t{%a1, %0|%0, %a1}";
+      return "lea{q}\t{%E1, %0|%0, %E1}";
 
     default:
       gcc_assert (!flag_pic || LEGITIMATE_PIC_OPERAND_P (operands[1]));
        return "mov{l}\t{%k1, %k0|%k0, %k1}";
       else if (which_alternative == 2)
        return "movabs{q}\t{%1, %0|%0, %1}";
+      else if (ix86_use_lea_for_mov (insn, operands))
+       return "lea{q}\t{%E1, %0|%0, %E1}";
       else
        return "mov{q}\t{%1, %0|%0, %1}";
     }
 }
   [(set (attr "type")
-     (cond [(eq_attr "alternative" "5")
+     (cond [(eq_attr "alternative" "4")
+             (const_string "multi")
+           (eq_attr "alternative" "5")
              (const_string "mmx")
-           (eq_attr "alternative" "6,7,8,9,10")
+           (eq_attr "alternative" "6,7,8,9")
              (const_string "mmxmov")
-           (eq_attr "alternative" "11")
+           (eq_attr "alternative" "10")
              (const_string "sselog1")
-           (eq_attr "alternative" "12,13,14,15,16")
+           (eq_attr "alternative" "11,12,13,14,15")
              (const_string "ssemov")
-           (eq_attr "alternative" "17,18")
+           (eq_attr "alternative" "16,17")
              (const_string "ssecvt")
-           (eq_attr "alternative" "4")
-             (const_string "multi")
-           (match_operand:DI 1 "pic_32bit_operand" "")
+           (match_operand 1 "pic_32bit_operand")
              (const_string "lea")
           ]
           (const_string "imov")))
        (and (eq_attr "alternative" "2") (eq_attr "type" "imov"))
         (const_string "8")
         (const_string "*")))
-   (set_attr "prefix_rex" "*,*,*,*,*,*,*,1,*,1,*,*,*,*,*,*,*,*,*")
-   (set_attr "prefix_data16" "*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,1,*,*,*")
+   (set (attr "prefix_rex")
+     (if_then_else (eq_attr "alternative" "8,9")
+       (const_string "1")
+       (const_string "*")))
+   (set (attr "prefix_data16")
+     (if_then_else (eq_attr "alternative" "11")
+       (const_string "1")
+       (const_string "*")))
    (set (attr "prefix")
-     (if_then_else (eq_attr "alternative" "11,12,13,14,15,16")
+     (if_then_else (eq_attr "alternative" "10,11,12,13,14,15")
        (const_string "maybe_vex")
        (const_string "orig")))
-   (set_attr "mode" "SI,DI,DI,DI,SI,DI,DI,DI,DI,DI,DI,TI,TI,DI,DI,DI,DI,DI,DI")])
+   (set_attr "mode" "SI,DI,DI,DI,SI,DI,DI,DI,DI,DI,TI,DI,TI,DI,DI,DI,DI,DI")])
+
+;; Reload patterns to support multi-word load/store
+;; with non-offsetable address.
+(define_expand "reload_noff_store"
+  [(parallel [(match_operand 0 "memory_operand" "=m")
+              (match_operand 1 "register_operand" "r")
+              (match_operand:DI 2 "register_operand" "=&r")])]
+  "TARGET_64BIT"
+{
+  rtx mem = operands[0];
+  rtx addr = XEXP (mem, 0);
+
+  emit_move_insn (operands[2], addr);
+  mem = replace_equiv_address_nv (mem, operands[2]);
+
+  emit_insn (gen_rtx_SET (VOIDmode, mem, operands[1]));
+  DONE;
+})
+
+(define_expand "reload_noff_load"
+  [(parallel [(match_operand 0 "register_operand" "=r")
+              (match_operand 1 "memory_operand" "m")
+              (match_operand:DI 2 "register_operand" "=r")])]
+  "TARGET_64BIT"
+{
+  rtx mem = operands[1];
+  rtx addr = XEXP (mem, 0);
+
+  emit_move_insn (operands[2], addr);
+  mem = replace_equiv_address_nv (mem, operands[2]);
+
+  emit_insn (gen_rtx_SET (VOIDmode, operands[0], mem));
+  DONE;
+})
 
 ;; Convert impossible stores of immediate to existing instructions.
 ;; First try to get scratch register and go through it.  In case this
 ;; fails, move by 32bit parts.
 (define_peephole2
   [(match_scratch:DI 2 "r")
-   (set (match_operand:DI 0 "memory_operand" "")
-        (match_operand:DI 1 "immediate_operand" ""))]
+   (set (match_operand:DI 0 "memory_operand")
+        (match_operand:DI 1 "immediate_operand"))]
   "TARGET_64BIT && !symbolic_operand (operands[1], DImode)
    && !x86_64_immediate_operand (operands[1], DImode)"
   [(set (match_dup 2) (match_dup 1))
 ;; peephole2 pass is not run.
 ;; "&& 1" is needed to keep it from matching the previous pattern.
 (define_peephole2
-  [(set (match_operand:DI 0 "memory_operand" "")
-        (match_operand:DI 1 "immediate_operand" ""))]
+  [(set (match_operand:DI 0 "memory_operand")
+        (match_operand:DI 1 "immediate_operand"))]
   "TARGET_64BIT && !symbolic_operand (operands[1], DImode)
    && !x86_64_immediate_operand (operands[1], DImode) && 1"
   [(set (match_dup 2) (match_dup 3))
   "split_double_mode (DImode, &operands[0], 2, &operands[2], &operands[4]);")
 
 (define_split
-  [(set (match_operand:DI 0 "memory_operand" "")
-        (match_operand:DI 1 "immediate_operand" ""))]
+  [(set (match_operand:DI 0 "memory_operand")
+        (match_operand:DI 1 "immediate_operand"))]
   "TARGET_64BIT && ((optimize > 0 && flag_peephole2)
                    ? epilogue_completed : reload_completed)
    && !symbolic_operand (operands[1], DImode)
 
 (define_insn "*movdi_internal"
   [(set (match_operand:DI 0 "nonimmediate_operand"
-                       "=r  ,o  ,*y,m*y,*y,*Y2,m  ,*Y2,*Y2,*x,m ,*x,*x")
+         "=r  ,o  ,*y,m*y,*y,*x,m ,*x,*x,*x,m ,*x,*x,?*x,?*Ym")
        (match_operand:DI 1 "general_operand"
-                       "riFo,riF,C ,*y ,m ,C  ,*Y2,*Y2,m  ,C ,*x,*x,m "))]
+         "riFo,riF,C ,*y ,m ,C ,*x,*x,m ,C ,*x,*x,m ,*Ym,*x"))]
   "!TARGET_64BIT && !(MEM_P (operands[0]) && MEM_P (operands[1]))"
-  "@
-   #
-   #
-   pxor\t%0, %0
-   movq\t{%1, %0|%0, %1}
-   movq\t{%1, %0|%0, %1}
-   %vpxor\t%0, %d0
-   %vmovq\t{%1, %0|%0, %1}
-   %vmovdqa\t{%1, %0|%0, %1}
-   %vmovq\t{%1, %0|%0, %1}
-   xorps\t%0, %0
-   movlps\t{%1, %0|%0, %1}
-   movaps\t{%1, %0|%0, %1}
-   movlps\t{%1, %0|%0, %1}"
+{
+  switch (get_attr_type (insn))
+    {
+    case TYPE_SSECVT:
+      if (SSE_REG_P (operands[0]))
+       return "movq2dq\t{%1, %0|%0, %1}";
+      else
+       return "movdq2q\t{%1, %0|%0, %1}";
+
+    case TYPE_SSEMOV:
+      switch (get_attr_mode (insn))
+       {
+       case MODE_TI:
+         return "%vmovdqa\t{%1, %0|%0, %1}";
+       case MODE_DI:
+          return "%vmovq\t{%1, %0|%0, %1}";
+       case MODE_V4SF:
+         return "movaps\t{%1, %0|%0, %1}";
+       case MODE_V2SF:
+         return "movlps\t{%1, %0|%0, %1}";
+       default:
+         gcc_unreachable ();
+       }
+
+    case TYPE_MMXMOV:
+      return "movq\t{%1, %0|%0, %1}";
+
+    case TYPE_SSELOG1:
+      return standard_sse_constant_opcode (insn, operands[1]);
+
+    case TYPE_MMX:
+      return "pxor\t%0, %0";
+
+    case TYPE_MULTI:
+      return "#";
+
+    default:
+      gcc_unreachable ();
+    }
+}
   [(set (attr "isa")
-     (if_then_else (eq_attr "alternative" "9,10,11,12")
-       (const_string "noavx")
-       (const_string "base")))
-   (set_attr "type" "*,*,mmx,mmxmov,mmxmov,sselog1,ssemov,ssemov,ssemov,sselog1,ssemov,ssemov,ssemov")
+     (cond [(eq_attr "alternative" "5,6,7,8,13,14")
+             (const_string "sse2")
+           (eq_attr "alternative" "9,10,11,12")
+             (const_string "noavx")
+          ]
+           (const_string "*")))
+   (set (attr "type")
+     (cond [(eq_attr "alternative" "0,1")
+             (const_string "multi")
+           (eq_attr "alternative" "2")
+             (const_string "mmx")
+           (eq_attr "alternative" "3,4")
+             (const_string "mmxmov")
+           (eq_attr "alternative" "5,9")
+             (const_string "sselog1")
+           (eq_attr "alternative" "13,14")
+             (const_string "ssecvt")
+          ]
+          (const_string "ssemov")))
    (set (attr "prefix")
      (if_then_else (eq_attr "alternative" "5,6,7,8")
        (const_string "maybe_vex")
        (const_string "orig")))
-   (set_attr "mode" "DI,DI,DI,DI,DI,TI,DI,TI,DI,V4SF,V2SF,V4SF,V2SF")])
+   (set_attr "mode" "DI,DI,DI,DI,DI,TI,DI,TI,DI,V4SF,V2SF,V4SF,V2SF,DI,DI")])
 
 (define_split
-  [(set (match_operand:DI 0 "nonimmediate_operand" "")
-        (match_operand:DI 1 "general_operand" ""))]
+  [(set (match_operand:DI 0 "nonimmediate_operand")
+        (match_operand:DI 1 "general_operand"))]
   "!TARGET_64BIT && reload_completed
    && !(MMX_REG_P (operands[0]) || SSE_REG_P (operands[0]))
    && !(MMX_REG_P (operands[1]) || SSE_REG_P (operands[1]))"
   [(set (match_operand:SI 0 "nonimmediate_operand"
                        "=r,m ,*y,*y,?rm,?*y,*x,*x,?r ,m ,?*Yi,*x")
        (match_operand:SI 1 "general_operand"
-                       "g ,ri,C ,*y,*y ,rm ,C ,*x,*Yi,*x,r   ,m "))]
+                       "g ,re,C ,*y,*y ,rm ,C ,*x,*Yi,*x,r   ,m "))]
   "!(MEM_P (operands[0]) && MEM_P (operands[1]))"
 {
   switch (get_attr_type (insn))
     {
     case TYPE_SSELOG1:
-      if (get_attr_mode (insn) == MODE_TI)
-        return "%vpxor\t%0, %d0";
-      return "%vxorps\t%0, %d0";
+      return standard_sse_constant_opcode (insn, operands[1]);
 
     case TYPE_SSEMOV:
       switch (get_attr_mode (insn))
       return "movd\t{%1, %0|%0, %1}";
 
     case TYPE_LEA:
-      return "lea{l}\t{%a1, %0|%0, %a1}";
+      return "lea{l}\t{%E1, %0|%0, %E1}";
 
     default:
       gcc_assert (!flag_pic || LEGITIMATE_PIC_OPERAND_P (operands[1]));
-      return "mov{l}\t{%1, %0|%0, %1}";
+      if (ix86_use_lea_for_mov (insn, operands))
+       return "lea{l}\t{%E1, %0|%0, %E1}";
+      else
+       return "mov{l}\t{%1, %0|%0, %1}";
     }
 }
   [(set (attr "type")
              (const_string "sselog1")
            (eq_attr "alternative" "7,8,9,10,11")
              (const_string "ssemov")
-           (match_operand:DI 1 "pic_32bit_operand" "")
+           (match_operand 1 "pic_32bit_operand")
              (const_string "lea")
           ]
           (const_string "imov")))
              (const_string "DI")
            (eq_attr "alternative" "6,7")
              (if_then_else
-               (eq (symbol_ref "TARGET_SSE2") (const_int 0))
+               (not (match_test "TARGET_SSE2"))
                (const_string "V4SF")
                (const_string "TI"))
            (and (eq_attr "alternative" "8,9,10,11")
-                (eq (symbol_ref "TARGET_SSE2") (const_int 0)))
+                (not (match_test "TARGET_SSE2")))
              (const_string "SF")
           ]
           (const_string "SI")))])
     }
 }
   [(set (attr "type")
-     (cond [(ne (symbol_ref "optimize_function_for_size_p (cfun)")
-               (const_int 0))
+     (cond [(match_test "optimize_function_for_size_p (cfun)")
              (const_string "imov")
            (and (eq_attr "alternative" "0")
-                (ior (eq (symbol_ref "TARGET_PARTIAL_REG_STALL")
-                         (const_int 0))
-                     (eq (symbol_ref "TARGET_HIMODE_MATH")
-                         (const_int 0))))
+                (ior (not (match_test "TARGET_PARTIAL_REG_STALL"))
+                     (not (match_test "TARGET_HIMODE_MATH"))))
              (const_string "imov")
            (and (eq_attr "alternative" "1,2")
-                (match_operand:HI 1 "aligned_operand" ""))
+                (match_operand:HI 1 "aligned_operand"))
              (const_string "imov")
-           (and (ne (symbol_ref "TARGET_MOVX")
-                    (const_int 0))
+           (and (match_test "TARGET_MOVX")
                 (eq_attr "alternative" "0,2"))
              (const_string "imovx")
           ]
       (cond [(eq_attr "type" "imovx")
               (const_string "SI")
             (and (eq_attr "alternative" "1,2")
-                 (match_operand:HI 1 "aligned_operand" ""))
+                 (match_operand:HI 1 "aligned_operand"))
               (const_string "SI")
             (and (eq_attr "alternative" "0")
-                 (ior (eq (symbol_ref "TARGET_PARTIAL_REG_STALL")
-                          (const_int 0))
-                      (eq (symbol_ref "TARGET_HIMODE_MATH")
-                          (const_int 0))))
+                 (ior (not (match_test "TARGET_PARTIAL_REG_STALL"))
+                      (not (match_test "TARGET_HIMODE_MATH"))))
               (const_string "SI")
            ]
            (const_string "HI")))])
 }
   [(set (attr "type")
      (cond [(and (eq_attr "alternative" "5")
-                (not (match_operand:QI 1 "aligned_operand" "")))
+                (not (match_operand:QI 1 "aligned_operand")))
              (const_string "imovx")
-           (ne (symbol_ref "optimize_function_for_size_p (cfun)")
-               (const_int 0))
+           (match_test "optimize_function_for_size_p (cfun)")
              (const_string "imov")
            (and (eq_attr "alternative" "3")
-                (ior (eq (symbol_ref "TARGET_PARTIAL_REG_STALL")
-                         (const_int 0))
-                     (eq (symbol_ref "TARGET_QIMODE_MATH")
-                         (const_int 0))))
+                (ior (not (match_test "TARGET_PARTIAL_REG_STALL"))
+                     (not (match_test "TARGET_QIMODE_MATH"))))
              (const_string "imov")
            (eq_attr "alternative" "3,5")
              (const_string "imovx")
-           (and (ne (symbol_ref "TARGET_MOVX")
-                    (const_int 0))
+           (and (match_test "TARGET_MOVX")
                 (eq_attr "alternative" "2"))
              (const_string "imovx")
           ]
               (const_string "SI")
             (and (eq_attr "type" "imov")
                  (and (eq_attr "alternative" "0,1")
-                      (and (ne (symbol_ref "TARGET_PARTIAL_REG_DEPENDENCY")
-                               (const_int 0))
-                           (and (eq (symbol_ref "optimize_function_for_size_p (cfun)")
-                                    (const_int 0))
-                                (eq (symbol_ref "TARGET_PARTIAL_REG_STALL")
-                                    (const_int 0))))))
+                      (and (match_test "TARGET_PARTIAL_REG_DEPENDENCY")
+                           (and (not (match_test "optimize_function_for_size_p (cfun)"))
+                                (not (match_test "TARGET_PARTIAL_REG_STALL"))))))
               (const_string "SI")
             ;; Avoid partial register stalls when not using QImode arithmetic
             (and (eq_attr "type" "imov")
                  (and (eq_attr "alternative" "0,1")
-                      (and (ne (symbol_ref "TARGET_PARTIAL_REG_STALL")
-                               (const_int 0))
-                           (eq (symbol_ref "TARGET_QIMODE_MATH")
-                               (const_int 0)))))
+                      (and (match_test "TARGET_PARTIAL_REG_STALL")
+                           (not (match_test "TARGET_QIMODE_MATH")))))
               (const_string "SI")
           ]
           (const_string "QI")))])
 ;; into register when rax is not available
 (define_insn "*movabs<mode>_1"
   [(set (mem:SWI1248x (match_operand:DI 0 "x86_64_movabs_operand" "i,r"))
-       (match_operand:SWI1248x 1 "nonmemory_operand" "a,er"))]
-  "TARGET_64BIT && ix86_check_movabs (insn, 0)"
+       (match_operand:SWI1248x 1 "nonmemory_operand" "a,r<i>"))]
+  "TARGET_LP64 && ix86_check_movabs (insn, 0)"
   "@
    movabs{<imodesuffix>}\t{%1, %P0|%P0, %1}
    mov{<imodesuffix>}\t{%1, %a0|%a0, %1}"
 (define_insn "*movabs<mode>_2"
   [(set (match_operand:SWI1248x 0 "register_operand" "=a,r")
         (mem:SWI1248x (match_operand:DI 1 "x86_64_movabs_operand" "i,r")))]
-  "TARGET_64BIT && ix86_check_movabs (insn, 1)"
+  "TARGET_LP64 && ix86_check_movabs (insn, 1)"
   "@
    movabs{<imodesuffix>}\t{%P1, %0|%0, %P1}
    mov{<imodesuffix>}\t{%a1, %0|%0, %a1}"
    (set_attr "athlon_decode" "vector")])
 
 (define_expand "movstrict<mode>"
-  [(set (strict_low_part (match_operand:SWI12 0 "nonimmediate_operand" ""))
-       (match_operand:SWI12 1 "general_operand" ""))]
+  [(set (strict_low_part (match_operand:SWI12 0 "nonimmediate_operand"))
+       (match_operand:SWI12 1 "general_operand"))]
   ""
 {
   if (TARGET_PARTIAL_REG_STALL && optimize_function_for_speed_p (cfun))
 
 (define_insn "*movstrict<mode>_xor"
   [(set (strict_low_part (match_operand:SWI12 0 "register_operand" "+<r>"))
-       (match_operand:SWI12 1 "const0_operand" ""))
+       (match_operand:SWI12 1 "const0_operand"))
    (clobber (reg:CC FLAGS_REG))]
   "reload_completed"
   "xor{<imodesuffix>}\t%0, %0"
     }
 }
   [(set (attr "type")
-     (if_then_else (and (match_operand:QI 0 "register_operand" "")
-                       (ior (not (match_operand:QI 0 "q_regs_operand" ""))
-                            (ne (symbol_ref "TARGET_MOVX")
-                                (const_int 0))))
+     (if_then_else (ior (not (match_operand:QI 0 "QIreg_operand"))
+                       (match_test "TARGET_MOVX"))
        (const_string "imovx")
        (const_string "imov")))
    (set (attr "mode")
     }
 }
   [(set (attr "type")
-     (if_then_else (and (match_operand:QI 0 "register_operand" "")
-                       (ior (not (match_operand:QI 0 "q_regs_operand" ""))
-                            (ne (symbol_ref "TARGET_MOVX")
-                                (const_int 0))))
+     (if_then_else (and (match_operand:QI 0 "register_operand")
+                       (ior (not (match_operand:QI 0 "QIreg_operand"))
+                            (match_test "TARGET_MOVX")))
        (const_string "imovx")
        (const_string "imov")))
    (set (attr "mode")
     }
 }
   [(set (attr "type")
-     (if_then_else (ior (not (match_operand:QI 0 "q_regs_operand" ""))
-                       (ne (symbol_ref "TARGET_MOVX")
-                           (const_int 0)))
+     (if_then_else (ior (not (match_operand:QI 0 "QIreg_operand"))
+                       (match_test "TARGET_MOVX"))
        (const_string "imovx")
        (const_string "imov")))
    (set (attr "mode")
     }
 }
   [(set (attr "type")
-     (if_then_else (and (match_operand:QI 0 "register_operand" "")
-                       (ior (not (match_operand:QI 0 "q_regs_operand" ""))
-                            (ne (symbol_ref "TARGET_MOVX")
-                                (const_int 0))))
+     (if_then_else (and (match_operand:QI 0 "register_operand")
+                       (ior (not (match_operand:QI 0 "QIreg_operand"))
+                            (match_test "TARGET_MOVX")))
        (const_string "imovx")
        (const_string "imov")))
    (set (attr "mode")
        (const_string "QI")))])
 
 (define_expand "mov<mode>_insv_1"
-  [(set (zero_extract:SWI48 (match_operand 0 "ext_register_operand" "")
+  [(set (zero_extract:SWI48 (match_operand 0 "ext_register_operand")
                            (const_int 8)
                            (const_int 8))
-       (match_operand:SWI48 1 "nonmemory_operand" ""))])
+       (match_operand:SWI48 1 "nonmemory_operand"))])
 
 (define_insn "*mov<mode>_insv_1_rex64"
   [(set (zero_extract:SWI48x (match_operand 0 "ext_register_operand" "+Q")
    (set_attr "unit" "sse,*,*")
    (set_attr "mode" "TF,SI,SI")])
 
+;; %%% Kill this when call knows how to work this out.
 (define_split
-  [(set (match_operand:TF 0 "push_operand" "")
-       (match_operand:TF 1 "sse_reg_operand" ""))]
+  [(set (match_operand:TF 0 "push_operand")
+       (match_operand:TF 1 "sse_reg_operand"))]
   "TARGET_SSE2 && reload_completed"
   [(set (reg:P SP_REG) (plus:P (reg:P SP_REG) (const_int -16)))
    (set (mem:TF (reg:P SP_REG)) (match_dup 1))])
 
-(define_split
-  [(set (match_operand:TF 0 "push_operand" "")
-       (match_operand:TF 1 "general_operand" ""))]
-  "TARGET_SSE2 && reload_completed
-   && !SSE_REG_P (operands[1])"
-  [(const_int 0)]
-  "ix86_split_long_move (operands); DONE;")
-
 (define_insn "*pushxf"
   [(set (match_operand:XF 0 "push_operand" "=<,<")
        (match_operand:XF 1 "general_no_elim_operand" "f,ro"))]
 ;; only once, but this ought to be handled elsewhere).
 
 (define_insn "*pushxf_nointeger"
-  [(set (match_operand:XF 0 "push_operand" "=X,X,X")
-       (match_operand:XF 1 "general_no_elim_operand" "f,Fo,*r"))]
+  [(set (match_operand:XF 0 "push_operand" "=<,<")
+       (match_operand:XF 1 "general_no_elim_operand" "f,*rFo"))]
   "optimize_function_for_size_p (cfun)"
 {
   /* This insn should be already split before reg-stack.  */
   gcc_unreachable ();
 }
   [(set_attr "type" "multi")
-   (set_attr "unit" "i387,*,*")
-   (set_attr "mode" "XF,SI,SI")])
+   (set_attr "unit" "i387,*")
+   (set_attr "mode" "XF,SI")])
 
+;; %%% Kill this when call knows how to work this out.
 (define_split
-  [(set (match_operand:XF 0 "push_operand" "")
-       (match_operand:XF 1 "fp_register_operand" ""))]
+  [(set (match_operand:XF 0 "push_operand")
+       (match_operand:XF 1 "fp_register_operand"))]
   "reload_completed"
   [(set (reg:P SP_REG) (plus:P (reg:P SP_REG) (match_dup 2)))
    (set (mem:XF (reg:P SP_REG)) (match_dup 1))]
   "operands[2] = GEN_INT (-GET_MODE_SIZE (XFmode));")
 
-(define_split
-  [(set (match_operand:XF 0 "push_operand" "")
-       (match_operand:XF 1 "general_operand" ""))]
-  "reload_completed
-   && !FP_REG_P (operands[1])"
-  [(const_int 0)]
-  "ix86_split_long_move (operands); DONE;")
+(define_insn "*pushdf_rex64"
+  [(set (match_operand:DF 0 "push_operand" "=<,<,<")
+       (match_operand:DF 1 "general_no_elim_operand" "f,Yd*rFm,x"))]
+  "TARGET_64BIT"
+{
+  /* This insn should be already split before reg-stack.  */
+  gcc_unreachable ();
+}
+  [(set_attr "type" "multi")
+   (set_attr "unit" "i387,*,*")
+   (set_attr "mode" "DF,DI,DF")])
 
 ;; Size of pushdf is 3 (for sub) + 2 (for fstp) + memory operand size.
 ;; Size of pushdf using integer instructions is 2+2*memory operand size
 
 (define_insn "*pushdf"
   [(set (match_operand:DF 0 "push_operand" "=<,<,<")
-       (match_operand:DF 1 "general_no_elim_operand" "f,Yd*rFo,Y2"))]
-  ""
+       (match_operand:DF 1 "general_no_elim_operand" "f,Yd*rFo,x"))]
+  "!TARGET_64BIT"
 {
   /* This insn should be already split before reg-stack.  */
   gcc_unreachable ();
 }
-  [(set_attr "type" "multi")
+  [(set_attr "isa" "*,*,sse2")
+   (set_attr "type" "multi")
    (set_attr "unit" "i387,*,*")
-   (set_attr "mode" "DF,SI,DF")])
+   (set_attr "mode" "DF,DI,DF")])
 
 ;; %%% Kill this when call knows how to work this out.
 (define_split
-  [(set (match_operand:DF 0 "push_operand" "")
-       (match_operand:DF 1 "any_fp_register_operand" ""))]
+  [(set (match_operand:DF 0 "push_operand")
+       (match_operand:DF 1 "any_fp_register_operand"))]
   "reload_completed"
   [(set (reg:P SP_REG) (plus:P (reg:P SP_REG) (const_int -8)))
    (set (mem:DF (reg:P SP_REG)) (match_dup 1))])
 
-(define_split
-  [(set (match_operand:DF 0 "push_operand" "")
-       (match_operand:DF 1 "general_operand" ""))]
-  "reload_completed
-   && !ANY_FP_REG_P (operands[1])"
-  [(const_int 0)]
-  "ix86_split_long_move (operands); DONE;")
-
 (define_insn "*pushsf_rex64"
   [(set (match_operand:SF 0 "push_operand" "=X,X,X")
        (match_operand:SF 1 "nonmemory_no_elim_operand" "f,rF,x"))]
    (set_attr "unit" "i387,*,*")
    (set_attr "mode" "SF,SI,SF")])
 
-(define_split
-  [(set (match_operand:SF 0 "push_operand" "")
-       (match_operand:SF 1 "memory_operand" ""))]
-  "reload_completed
-   && MEM_P (operands[1])
-   && (operands[2] = find_constant_src (insn))"
-  [(set (match_dup 0)
-       (match_dup 2))])
-
 ;; %%% Kill this when call knows how to work this out.
 (define_split
-  [(set (match_operand:SF 0 "push_operand" "")
-       (match_operand:SF 1 "any_fp_register_operand" ""))]
+  [(set (match_operand:SF 0 "push_operand")
+       (match_operand:SF 1 "any_fp_register_operand"))]
   "reload_completed"
   [(set (reg:P SP_REG) (plus:P (reg:P SP_REG) (match_dup 2)))
    (set (mem:SF (reg:P SP_REG)) (match_dup 1))]
-  "operands[2] = GEN_INT (-GET_MODE_SIZE (<MODE>mode));")
+  "operands[2] = GEN_INT (-GET_MODE_SIZE (<P:MODE>mode));")
+
+(define_split
+  [(set (match_operand:SF 0 "push_operand")
+       (match_operand:SF 1 "memory_operand"))]
+  "reload_completed
+   && (operands[2] = find_constant_src (insn))"
+  [(set (match_dup 0) (match_dup 2))])
+
+(define_split
+  [(set (match_operand 0 "push_operand")
+       (match_operand 1 "general_operand"))]
+  "reload_completed
+   && (GET_MODE (operands[0]) == TFmode
+       || GET_MODE (operands[0]) == XFmode
+       || GET_MODE (operands[0]) == DFmode)
+   && !ANY_FP_REG_P (operands[1])"
+  [(const_int 0)]
+  "ix86_split_long_move (operands); DONE;")
 \f
 ;; Floating point move instructions.
 
 (define_expand "movtf"
-  [(set (match_operand:TF 0 "nonimmediate_operand" "")
-       (match_operand:TF 1 "nonimmediate_operand" ""))]
+  [(set (match_operand:TF 0 "nonimmediate_operand")
+       (match_operand:TF 1 "nonimmediate_operand"))]
   "TARGET_SSE2"
 {
   ix86_expand_move (TFmode, operands);
 })
 
 (define_expand "mov<mode>"
-  [(set (match_operand:X87MODEF 0 "nonimmediate_operand" "")
-       (match_operand:X87MODEF 1 "general_operand" ""))]
+  [(set (match_operand:X87MODEF 0 "nonimmediate_operand")
+       (match_operand:X87MODEF 1 "general_operand"))]
   ""
   "ix86_expand_move (<MODE>mode, operands); DONE;")
 
 (define_insn "*movtf_internal"
-  [(set (match_operand:TF 0 "nonimmediate_operand" "=x,m,x,?r,?o")
-       (match_operand:TF 1 "general_operand" "xm,x,C,roF,Fr"))]
+  [(set (match_operand:TF 0 "nonimmediate_operand" "=x,m,x,?*r ,!o")
+       (match_operand:TF 1 "general_operand"      "xm,x,C,*roF,F*r"))]
   "TARGET_SSE2
-   && !(MEM_P (operands[0]) && MEM_P (operands[1]))"
+   && !(MEM_P (operands[0]) && MEM_P (operands[1]))
+   && (!can_create_pseudo_p ()
+       || (ix86_cmodel == CM_MEDIUM || ix86_cmodel == CM_LARGE)
+       || GET_CODE (operands[1]) != CONST_DOUBLE
+       || (optimize_function_for_size_p (cfun)
+          && standard_sse_constant_p (operands[1])
+          && !memory_operand (operands[0], TFmode))
+       || (!TARGET_MEMORY_MISMATCH_STALL
+          && memory_operand (operands[0], TFmode)))"
 {
   switch (which_alternative)
     {
     case 0:
     case 1:
-      if (get_attr_mode (insn) == MODE_V4SF)
-       return "%vmovaps\t{%1, %0|%0, %1}";
+      /* Handle misaligned load/store since we
+         don't have movmisaligntf pattern. */
+      if (misaligned_operand (operands[0], TFmode)
+         || misaligned_operand (operands[1], TFmode))
+       {
+         if (get_attr_mode (insn) == MODE_V4SF)
+           return "%vmovups\t{%1, %0|%0, %1}";
+         else
+           return "%vmovdqu\t{%1, %0|%0, %1}";
+       }
       else
-       return "%vmovdqa\t{%1, %0|%0, %1}";
+       {
+         if (get_attr_mode (insn) == MODE_V4SF)
+           return "%vmovaps\t{%1, %0|%0, %1}";
+         else
+           return "%vmovdqa\t{%1, %0|%0, %1}";
+       }
 
     case 2:
       return standard_sse_constant_opcode (insn, operands[1]);
    (set (attr "mode")
         (cond [(eq_attr "alternative" "0,2")
                 (if_then_else
-                  (ne (symbol_ref "optimize_function_for_size_p (cfun)")
-                      (const_int 0))
+                  (match_test "optimize_function_for_size_p (cfun)")
                   (const_string "V4SF")
                   (const_string "TI"))
               (eq_attr "alternative" "1")
                 (if_then_else
-                  (ior (ne (symbol_ref "TARGET_SSE_TYPELESS_STORES")
-                           (const_int 0))
-                       (ne (symbol_ref "optimize_function_for_size_p (cfun)")
-                           (const_int 0)))
+                  (ior (match_test "TARGET_SSE_TYPELESS_STORES")
+                       (match_test "optimize_function_for_size_p (cfun)"))
                   (const_string "V4SF")
                   (const_string "TI"))]
               (const_string "DI")))])
 
-(define_split
-  [(set (match_operand:TF 0 "nonimmediate_operand" "")
-        (match_operand:TF 1 "general_operand" ""))]
-  "reload_completed
-   && !(SSE_REG_P (operands[0]) || SSE_REG_P (operands[1]))"
-  [(const_int 0)]
-  "ix86_split_long_move (operands); DONE;")
-
+;; Possible store forwarding (partial memory) stall in alternative 4.
 (define_insn "*movxf_internal"
-  [(set (match_operand:XF 0 "nonimmediate_operand" "=f,m,f,Yx*r  ,o")
+  [(set (match_operand:XF 0 "nonimmediate_operand" "=f,m,f,?Yx*r ,!o")
        (match_operand:XF 1 "general_operand"      "fm,f,G,Yx*roF,FYx*r"))]
   "!(MEM_P (operands[0]) && MEM_P (operands[1]))
    && (!can_create_pseudo_p ()
        || (ix86_cmodel == CM_MEDIUM || ix86_cmodel == CM_LARGE)
        || GET_CODE (operands[1]) != CONST_DOUBLE
        || (optimize_function_for_size_p (cfun)
-          && standard_80387_constant_p (operands[1]) > 0)
-       || memory_operand (operands[0], XFmode))"
+          && standard_80387_constant_p (operands[1]) > 0
+          && !memory_operand (operands[0], XFmode))
+       || (!TARGET_MEMORY_MISMATCH_STALL
+          && memory_operand (operands[0], XFmode)))"
 {
   switch (which_alternative)
     {
     case 2:
       return standard_80387_constant_opcode (operands[1]);
 
-    case 3: case 4:
+    case 3:
+    case 4:
       return "#";
+
     default:
       gcc_unreachable ();
     }
   [(set_attr "type" "fmov,fmov,fmov,multi,multi")
    (set_attr "mode" "XF,XF,XF,SI,SI")])
 
-(define_split
-  [(set (match_operand:XF 0 "nonimmediate_operand" "")
-       (match_operand:XF 1 "general_operand" ""))]
-  "reload_completed
-   && !(MEM_P (operands[0]) && MEM_P (operands[1]))
-   && ! (FP_REG_P (operands[0]) ||
-        (GET_CODE (operands[0]) == SUBREG
-         && FP_REG_P (SUBREG_REG (operands[0]))))
-   && ! (FP_REG_P (operands[1]) ||
-        (GET_CODE (operands[1]) == SUBREG
-         && FP_REG_P (SUBREG_REG (operands[1]))))"
-  [(const_int 0)]
-  "ix86_split_long_move (operands); DONE;")
-
 (define_insn "*movdf_internal_rex64"
   [(set (match_operand:DF 0 "nonimmediate_operand"
-               "=f,m,f,r ,m,!r,!m,Y2*x,Y2*x,Y2*x,m   ,Yi,r ")
+               "=f,m,f,?r,?m,?r,!o,x,x,x,m,Yi,r ")
        (match_operand:DF 1 "general_operand"
-               "fm,f,G,rm,r,F ,F ,C   ,Y2*x,m   ,Y2*x,r ,Yi"))]
+               "fm,f,G,rm,r ,F ,F ,C,x,m,x,r ,Yi"))]
   "TARGET_64BIT && !(MEM_P (operands[0]) && MEM_P (operands[1]))
    && (!can_create_pseudo_p ()
        || (ix86_cmodel == CM_MEDIUM || ix86_cmodel == CM_LARGE)
     case 10:
       switch (get_attr_mode (insn))
        {
-       case MODE_V4SF:
-         return "%vmovaps\t{%1, %0|%0, %1}";
        case MODE_V2DF:
-         if (TARGET_SSE_PACKED_SINGLE_INSN_OPTIMAL)
-           return "%vmovaps\t{%1, %0|%0, %1}";
-         else
+         if (!TARGET_SSE_PACKED_SINGLE_INSN_OPTIMAL)
            return "%vmovapd\t{%1, %0|%0, %1}";
-       case MODE_TI:
-         if (TARGET_SSE_PACKED_SINGLE_INSN_OPTIMAL)
-           return "%vmovaps\t{%1, %0|%0, %1}";
-         else
-           return "%vmovdqa\t{%1, %0|%0, %1}";
+       case MODE_V4SF:
+         return "%vmovaps\t{%1, %0|%0, %1}";
+
        case MODE_DI:
          return "%vmovq\t{%1, %0|%0, %1}";
        case MODE_DF:
          if (TARGET_AVX && REG_P (operands[0]) && REG_P (operands[1]))
            return "vmovsd\t{%1, %0, %0|%0, %0, %1}";
-         else
-           return "%vmovsd\t{%1, %0|%0, %1}";
+         return "%vmovsd\t{%1, %0|%0, %1}";
        case MODE_V1DF:
          return "%vmovlpd\t{%1, %d0|%d0, %1}";
        case MODE_V2SF:
       gcc_unreachable();
     }
 }
-  [(set_attr "type" "fmov,fmov,fmov,imov,imov,imov,multi,sselog1,ssemov,ssemov,ssemov,ssemov,ssemov")
+  [(set (attr "type")
+       (cond [(eq_attr "alternative" "0,1,2")
+                (const_string "fmov")
+              (eq_attr "alternative" "3,4,5")
+                (const_string "imov")
+              (eq_attr "alternative" "6")
+                (const_string "multi")
+              (eq_attr "alternative" "7")
+                (const_string "sselog1")
+             ]
+             (const_string "ssemov")))
    (set (attr "modrm")
      (if_then_else
        (and (eq_attr "alternative" "5") (eq_attr "type" "imov"))
               (eq_attr "alternative" "3,4,5,6,11,12")
                 (const_string "DI")
 
-              /* For SSE1, we have many fewer alternatives.  */
-              (eq (symbol_ref "TARGET_SSE2") (const_int 0))
-                (cond [(eq_attr "alternative" "7,8")
-                         (const_string "V4SF")
-                      ]
-                  (const_string "V2SF"))
-
               /* xorps is one byte shorter.  */
               (eq_attr "alternative" "7")
-                (cond [(ne (symbol_ref "optimize_function_for_size_p (cfun)")
-                           (const_int 0))
+                (cond [(match_test "optimize_function_for_size_p (cfun)")
                          (const_string "V4SF")
-                       (ne (symbol_ref "TARGET_SSE_LOAD0_BY_PXOR")
-                           (const_int 0))
+                       (match_test "TARGET_SSE_LOAD0_BY_PXOR")
                          (const_string "TI")
                       ]
                       (const_string "V2DF"))
                  movaps encodes one byte shorter.  */
               (eq_attr "alternative" "8")
                 (cond
-                  [(ne (symbol_ref "optimize_function_for_size_p (cfun)")
-                       (const_int 0))
+                  [(match_test "optimize_function_for_size_p (cfun)")
                      (const_string "V4SF")
-                   (ne (symbol_ref "TARGET_SSE_PARTIAL_REG_DEPENDENCY")
-                       (const_int 0))
+                   (match_test "TARGET_SSE_PARTIAL_REG_DEPENDENCY")
                      (const_string "V2DF")
                   ]
                   (const_string "DF"))
                  of register.  */
               (eq_attr "alternative" "9")
                 (if_then_else
-                  (ne (symbol_ref "TARGET_SSE_SPLIT_REGS")
-                      (const_int 0))
+                  (match_test "TARGET_SSE_SPLIT_REGS")
                   (const_string "V1DF")
                   (const_string "DF"))
              ]
 ;; Possible store forwarding (partial memory) stall in alternative 4.
 (define_insn "*movdf_internal"
   [(set (match_operand:DF 0 "nonimmediate_operand"
-               "=f,m,f,Yd*r  ,o    ,Y2*x,Y2*x,Y2*x,m  ")
+               "=f,m,f,?Yd*r ,!o   ,x,x,x,m,*x,*x,*x,m")
        (match_operand:DF 1 "general_operand"
-               "fm,f,G,Yd*roF,FYd*r,C   ,Y2*x,m   ,Y2*x"))]
+               "fm,f,G,Yd*roF,FYd*r,C,x,m,x,C ,*x,m ,*x"))]
   "!TARGET_64BIT && !(MEM_P (operands[0]) && MEM_P (operands[1]))
    && (!can_create_pseudo_p ()
        || (ix86_cmodel == CM_MEDIUM || ix86_cmodel == CM_LARGE)
        || GET_CODE (operands[1]) != CONST_DOUBLE
-       || (!TARGET_INTEGER_DFMODE_MOVES
+       || (optimize_function_for_size_p (cfun)
           && ((!(TARGET_SSE2 && TARGET_SSE_MATH)
                && standard_80387_constant_p (operands[1]) > 0)
               || (TARGET_SSE2 && TARGET_SSE_MATH
                   && standard_sse_constant_p (operands[1])))
           && !memory_operand (operands[0], DFmode))
-       || ((TARGET_INTEGER_DFMODE_MOVES
-           || !TARGET_MEMORY_MISMATCH_STALL)
+       || (!TARGET_MEMORY_MISMATCH_STALL
           && memory_operand (operands[0], DFmode)))"
 {
   switch (which_alternative)
       return "#";
 
     case 5:
+    case 9:
       return standard_sse_constant_opcode (insn, operands[1]);
 
     case 6:
     case 7:
     case 8:
+    case 10:
+    case 11:
+    case 12:
       switch (get_attr_mode (insn))
        {
-       case MODE_V4SF:
-         return "%vmovaps\t{%1, %0|%0, %1}";
        case MODE_V2DF:
-         if (TARGET_SSE_PACKED_SINGLE_INSN_OPTIMAL)
-           return "%vmovaps\t{%1, %0|%0, %1}";
-         else
+         if (!TARGET_SSE_PACKED_SINGLE_INSN_OPTIMAL)
            return "%vmovapd\t{%1, %0|%0, %1}";
-       case MODE_TI:
-         if (TARGET_SSE_PACKED_SINGLE_INSN_OPTIMAL)
-           return "%vmovaps\t{%1, %0|%0, %1}";
-         else
-           return "%vmovdqa\t{%1, %0|%0, %1}";
+       case MODE_V4SF:
+         return "%vmovaps\t{%1, %0|%0, %1}";
+
        case MODE_DI:
          return "%vmovq\t{%1, %0|%0, %1}";
        case MODE_DF:
          if (TARGET_AVX && REG_P (operands[0]) && REG_P (operands[1]))
            return "vmovsd\t{%1, %0, %0|%0, %0, %1}";
-         else
-           return "%vmovsd\t{%1, %0|%0, %1}";
+         return "%vmovsd\t{%1, %0|%0, %1}";
        case MODE_V1DF:
-         if (TARGET_AVX && REG_P (operands[0]))
-           return "vmovlpd\t{%1, %0, %0|%0, %0, %1}";
-         else
-           return "%vmovlpd\t{%1, %0|%0, %1}";
+         return "%vmovlpd\t{%1, %d0|%d0, %1}";
        case MODE_V2SF:
-         if (TARGET_AVX && REG_P (operands[0]))
-           return "vmovlps\t{%1, %0, %0|%0, %0, %1}";
-         else
-           return "%vmovlps\t{%1, %0|%0, %1}";
+         return "%vmovlps\t{%1, %d0|%d0, %1}";
        default:
          gcc_unreachable ();
        }
       gcc_unreachable ();
     }
 }
-  [(set_attr "type" "fmov,fmov,fmov,multi,multi,sselog1,ssemov,ssemov,ssemov")
+  [(set (attr "isa")
+     (if_then_else (eq_attr "alternative" "5,6,7,8")
+       (const_string "sse2")
+       (const_string "*")))
+   (set (attr "type")
+       (cond [(eq_attr "alternative" "0,1,2")
+                (const_string "fmov")
+              (eq_attr "alternative" "3,4")
+                (const_string "multi")
+              (eq_attr "alternative" "5,9")
+                (const_string "sselog1")
+             ]
+             (const_string "ssemov")))
    (set (attr "prefix")
      (if_then_else (eq_attr "alternative" "0,1,2,3,4")
        (const_string "orig")
                 (const_string "SI")
 
               /* For SSE1, we have many fewer alternatives.  */
-              (eq (symbol_ref "TARGET_SSE2") (const_int 0))
-                (cond [(eq_attr "alternative" "5,6")
-                         (const_string "V4SF")
-                      ]
+              (not (match_test "TARGET_SSE2"))
+                (if_then_else
+                  (eq_attr "alternative" "5,6,9,10")
+                  (const_string "V4SF")
                   (const_string "V2SF"))
 
               /* xorps is one byte shorter.  */
-              (eq_attr "alternative" "5")
-                (cond [(ne (symbol_ref "optimize_function_for_size_p (cfun)")
-                           (const_int 0))
+              (eq_attr "alternative" "5,9")
+                (cond [(match_test "optimize_function_for_size_p (cfun)")
                          (const_string "V4SF")
-                       (ne (symbol_ref "TARGET_SSE_LOAD0_BY_PXOR")
-                           (const_int 0))
+                       (match_test "TARGET_SSE_LOAD0_BY_PXOR")
                          (const_string "TI")
                       ]
                       (const_string "V2DF"))
                  chains, otherwise use short move to avoid extra work.
 
                  movaps encodes one byte shorter.  */
-              (eq_attr "alternative" "6")
+              (eq_attr "alternative" "6,10")
                 (cond
-                  [(ne (symbol_ref "optimize_function_for_size_p (cfun)")
-                       (const_int 0))
+                  [(match_test "optimize_function_for_size_p (cfun)")
                      (const_string "V4SF")
-                   (ne (symbol_ref "TARGET_SSE_PARTIAL_REG_DEPENDENCY")
-                       (const_int 0))
+                   (match_test "TARGET_SSE_PARTIAL_REG_DEPENDENCY")
                      (const_string "V2DF")
                   ]
                   (const_string "DF"))
               /* For architectures resolving dependencies on register
                  parts we may avoid extra work to zero out upper part
                  of register.  */
-              (eq_attr "alternative" "7")
+              (eq_attr "alternative" "7,11")
                 (if_then_else
-                  (ne (symbol_ref "TARGET_SSE_SPLIT_REGS")
-                      (const_int 0))
+                  (match_test "TARGET_SSE_SPLIT_REGS")
                   (const_string "V1DF")
                   (const_string "DF"))
              ]
              (const_string "DF")))])
 
-(define_split
-  [(set (match_operand:DF 0 "nonimmediate_operand" "")
-       (match_operand:DF 1 "general_operand" ""))]
-  "reload_completed
-   && !(MEM_P (operands[0]) && MEM_P (operands[1]))
-   && ! (ANY_FP_REG_P (operands[0]) ||
-        (GET_CODE (operands[0]) == SUBREG
-         && ANY_FP_REG_P (SUBREG_REG (operands[0]))))
-   && ! (ANY_FP_REG_P (operands[1]) ||
-        (GET_CODE (operands[1]) == SUBREG
-         && ANY_FP_REG_P (SUBREG_REG (operands[1]))))"
-  [(const_int 0)]
-  "ix86_split_long_move (operands); DONE;")
-
 (define_insn "*movsf_internal"
   [(set (match_operand:SF 0 "nonimmediate_operand"
-         "=f,m,f,r  ,m ,x,x,x ,m,!*y,!m,!*y,?Yi,?r,!*Ym,!r")
+         "=f,m,f,?r ,?m,x,x,x,m,!*y,!m,!*y,?Yi,?r,!*Ym,!r")
        (match_operand:SF 1 "general_operand"
-         "fm,f,G,rmF,Fr,C,x,xm,x,m  ,*y,*y ,r  ,Yi,r   ,*Ym"))]
+         "fm,f,G,rmF,Fr,C,x,m,x,m  ,*y,*y ,r  ,Yi,r   ,*Ym"))]
   "!(MEM_P (operands[0]) && MEM_P (operands[1]))
    && (!can_create_pseudo_p ()
        || (ix86_cmodel == CM_MEDIUM || ix86_cmodel == CM_LARGE)
     case 6:
       if (get_attr_mode (insn) == MODE_V4SF)
        return "%vmovaps\t{%1, %0|%0, %1}";
-      else
-       return "%vmovss\t{%1, %d0|%d0, %1}";
-    case 7:
-      if (TARGET_AVX && REG_P (operands[1]))
+      if (TARGET_AVX)
        return "vmovss\t{%1, %0, %0|%0, %0, %1}";
-      else
-       return "%vmovss\t{%1, %0|%0, %1}";
+
+    case 7:
     case 8:
       return "%vmovss\t{%1, %0|%0, %1}";
 
-    case 9: case 10: case 14: case 15:
+    case 9:
+    case 10:
+    case 14:
+    case 15:
       return "movd\t{%1, %0|%0, %1}";
 
     case 11:
       return "movq\t{%1, %0|%0, %1}";
 
-    case 12: case 13:
+    case 12:
+    case 13:
       return "%vmovd\t{%1, %0|%0, %1}";
 
     default:
       gcc_unreachable ();
     }
 }
-  [(set_attr "type" "fmov,fmov,fmov,imov,imov,sselog1,ssemov,ssemov,ssemov,mmxmov,mmxmov,mmxmov,ssemov,ssemov,mmxmov,mmxmov")
+  [(set (attr "type")
+       (cond [(eq_attr "alternative" "0,1,2")
+                (const_string "fmov")
+              (eq_attr "alternative" "3,4")
+                (const_string "multi")
+              (eq_attr "alternative" "5")
+                (const_string "sselog1")
+              (eq_attr "alternative" "9,10,11,14,15")
+                (const_string "mmxmov")
+             ]
+             (const_string "ssemov")))
    (set (attr "prefix")
      (if_then_else (eq_attr "alternative" "5,6,7,8,12,13")
        (const_string "maybe_vex")
                 (const_string "SI")
               (eq_attr "alternative" "5")
                 (if_then_else
-                  (and (and (ne (symbol_ref "TARGET_SSE_LOAD0_BY_PXOR")
-                                (const_int 0))
-                            (ne (symbol_ref "TARGET_SSE2")
-                                (const_int 0)))
-                       (eq (symbol_ref "optimize_function_for_size_p (cfun)")
-                           (const_int 0)))
+                  (and (and (match_test "TARGET_SSE_LOAD0_BY_PXOR")
+                            (match_test "TARGET_SSE2"))
+                       (not (match_test "optimize_function_for_size_p (cfun)")))
                   (const_string "TI")
                   (const_string "V4SF"))
               /* For architectures resolving dependencies on
                  to avoid problems on using packed logical operations.  */
               (eq_attr "alternative" "6")
                 (if_then_else
-                  (ior (ne (symbol_ref "TARGET_SSE_PARTIAL_REG_DEPENDENCY")
-                           (const_int 0))
-                       (ne (symbol_ref "TARGET_SSE_SPLIT_REGS")
-                           (const_int 0)))
+                  (ior (match_test "TARGET_SSE_PARTIAL_REG_DEPENDENCY")
+                       (match_test "TARGET_SSE_SPLIT_REGS"))
                   (const_string "V4SF")
                   (const_string "SF"))
               (eq_attr "alternative" "11")
               (const_string "SF")))])
 
 (define_split
-  [(set (match_operand 0 "register_operand" "")
-       (match_operand 1 "memory_operand" ""))]
+  [(set (match_operand 0 "any_fp_register_operand")
+       (match_operand 1 "memory_operand"))]
   "reload_completed
-   && MEM_P (operands[1])
    && (GET_MODE (operands[0]) == TFmode
        || GET_MODE (operands[0]) == XFmode
        || GET_MODE (operands[0]) == DFmode
   [(set (match_dup 0) (match_dup 2))]
 {
   rtx c = operands[2];
-  rtx r = operands[0];
-
-  if (GET_CODE (r) == SUBREG)
-    r = SUBREG_REG (r);
+  int r = REGNO (operands[0]);
 
-  if (SSE_REG_P (r))
-    {
-      if (!standard_sse_constant_p (c))
-       FAIL;
-    }
-  else if (FP_REG_P (r))
-    {
-      if (standard_80387_constant_p (c) < 1)
-       FAIL;
-    }
-  else if (MMX_REG_P (r))
+  if ((SSE_REGNO_P (r) && !standard_sse_constant_p (c))
+      || (FP_REGNO_P (r) && standard_80387_constant_p (c) < 1))
     FAIL;
 })
 
 (define_split
-  [(set (match_operand 0 "register_operand" "")
-       (float_extend (match_operand 1 "memory_operand" "")))]
+  [(set (match_operand 0 "any_fp_register_operand")
+       (float_extend (match_operand 1 "memory_operand")))]
   "reload_completed
-   && MEM_P (operands[1])
    && (GET_MODE (operands[0]) == TFmode
        || GET_MODE (operands[0]) == XFmode
-       || GET_MODE (operands[0]) == DFmode
-       || GET_MODE (operands[0]) == SFmode)
+       || GET_MODE (operands[0]) == DFmode)
    && (operands[2] = find_constant_src (insn))"
   [(set (match_dup 0) (match_dup 2))]
 {
   rtx c = operands[2];
-  rtx r = operands[0];
+  int r = REGNO (operands[0]);
 
-  if (GET_CODE (r) == SUBREG)
-    r = SUBREG_REG (r);
-
-  if (SSE_REG_P (r))
-    {
-      if (!standard_sse_constant_p (c))
-       FAIL;
-    }
-  else if (FP_REG_P (r))
-    {
-      if (standard_80387_constant_p (c) < 1)
-       FAIL;
-    }
-  else if (MMX_REG_P (r))
+  if ((SSE_REGNO_P (r) && !standard_sse_constant_p (c))
+      || (FP_REGNO_P (r) && standard_80387_constant_p (c) < 1))
     FAIL;
 })
 
 ;; Split the load of -0.0 or -1.0 into fldz;fchs or fld1;fchs sequence
 (define_split
-  [(set (match_operand:X87MODEF 0 "register_operand" "")
-       (match_operand:X87MODEF 1 "immediate_operand" ""))]
-  "reload_completed && FP_REGNO_P (REGNO (operands[0]))
+  [(set (match_operand:X87MODEF 0 "fp_register_operand")
+       (match_operand:X87MODEF 1 "immediate_operand"))]
+  "reload_completed
    && (standard_80387_constant_p (operands[1]) == 8
        || standard_80387_constant_p (operands[1]) == 9)"
   [(set (match_dup 0)(match_dup 1))
     operands[1] = CONST1_RTX (<MODE>mode);
 })
 
+(define_split
+  [(set (match_operand 0 "nonimmediate_operand")
+        (match_operand 1 "general_operand"))]
+  "reload_completed
+   && (GET_MODE (operands[0]) == TFmode
+       || GET_MODE (operands[0]) == XFmode
+       || GET_MODE (operands[0]) == DFmode)
+   && !(ANY_FP_REG_P (operands[0]) || ANY_FP_REG_P (operands[1]))"
+  [(const_int 0)]
+  "ix86_split_long_move (operands); DONE;")
+
 (define_insn "swapxf"
   [(set (match_operand:XF 0 "register_operand" "+f")
        (match_operand:XF 1 "register_operand" "+f"))
 ;; Zero extension instructions
 
 (define_expand "zero_extendsidi2"
-  [(set (match_operand:DI 0 "nonimmediate_operand" "")
-       (zero_extend:DI (match_operand:SI 1 "nonimmediate_operand" "")))]
-  ""
-{
-  if (!TARGET_64BIT)
-    {
-      emit_insn (gen_zero_extendsidi2_1 (operands[0], operands[1]));
-      DONE;
-    }
-})
+  [(set (match_operand:DI 0 "nonimmediate_operand")
+       (zero_extend:DI (match_operand:SI 1 "nonimmediate_operand")))])
 
 (define_insn "*zero_extendsidi2_rex64"
-  [(set (match_operand:DI 0 "nonimmediate_operand"  "=r,o,?*Ym,?*y,?*Yi,*Y2")
+  [(set (match_operand:DI 0 "nonimmediate_operand"
+                       "=r ,o,?*Ym,?*y,?*Yi,!*x")
        (zero_extend:DI
-        (match_operand:SI 1 "nonimmediate_operand" "rm,0,r   ,m  ,r   ,m")))]
+        (match_operand:SI 1 "x86_64_zext_general_operand"
+                       "rmZ,0,r   ,m  ,r   ,m*x")))]
   "TARGET_64BIT"
   "@
-   mov\t{%k1, %k0|%k0, %k1}
+   mov{l}\t{%1, %k0|%k0, %1}
    #
    movd\t{%1, %0|%0, %1}
    movd\t{%1, %0|%0, %1}
    %vmovd\t{%1, %0|%0, %1}
    %vmovd\t{%1, %0|%0, %1}"
-  [(set_attr "type" "imovx,imov,mmxmov,mmxmov,ssemov,ssemov")
+  [(set_attr "isa" "*,*,*,*,*,sse2")
+   (set_attr "type" "imovx,multi,mmxmov,mmxmov,ssemov,ssemov")
    (set_attr "prefix" "orig,*,orig,orig,maybe_vex,maybe_vex")
    (set_attr "prefix_0f" "0,*,*,*,*,*")
-   (set_attr "mode" "SI,DI,DI,DI,TI,TI")])
-
-(define_split
-  [(set (match_operand:DI 0 "memory_operand" "")
-       (zero_extend:DI (match_dup 0)))]
-  "TARGET_64BIT"
-  [(set (match_dup 4) (const_int 0))]
-  "split_double_mode (DImode, &operands[0], 1, &operands[3], &operands[4]);")
+   (set_attr "mode" "SI,SI,DI,DI,TI,TI")])
 
-;; %%% Kill me once multi-word ops are sane.
-(define_insn "zero_extendsidi2_1"
-  [(set (match_operand:DI 0 "nonimmediate_operand" "=r,?r,?o,?*Ym,?*y,?*Yi,*Y2")
-       (zero_extend:DI
-        (match_operand:SI 1 "nonimmediate_operand" "0,rm,r ,r   ,m  ,r   ,m")))
-   (clobber (reg:CC FLAGS_REG))]
+(define_insn "*zero_extendsidi2"
+  [(set (match_operand:DI 0 "nonimmediate_operand"
+                       "=ro,?r,?o,?*Ym,?*y,?*Yi,!*x")
+       (zero_extend:DI (match_operand:SI 1 "nonimmediate_operand"
+                       "0  ,rm,r ,r   ,m  ,r   ,m*x")))]
   "!TARGET_64BIT"
   "@
    #
    movd\t{%1, %0|%0, %1}
    %vmovd\t{%1, %0|%0, %1}
    %vmovd\t{%1, %0|%0, %1}"
-  [(set_attr "type" "multi,multi,multi,mmxmov,mmxmov,ssemov,ssemov")
+  [(set_attr "isa" "*,*,*,*,*,*,sse2")
+   (set_attr "type" "multi,multi,multi,mmxmov,mmxmov,ssemov,ssemov")
    (set_attr "prefix" "*,*,*,orig,orig,maybe_vex,maybe_vex")
    (set_attr "mode" "SI,SI,SI,DI,DI,TI,TI")])
 
 (define_split
-  [(set (match_operand:DI 0 "register_operand" "")
-       (zero_extend:DI (match_operand:SI 1 "register_operand" "")))
-   (clobber (reg:CC FLAGS_REG))]
+  [(set (match_operand:DI 0 "memory_operand")
+       (zero_extend:DI (match_operand:SI 1 "memory_operand")))]
+  "reload_completed"
+  [(set (match_dup 4) (const_int 0))]
+  "split_double_mode (DImode, &operands[0], 1, &operands[3], &operands[4]);")
+
+(define_split
+  [(set (match_operand:DI 0 "register_operand")
+       (zero_extend:DI (match_operand:SI 1 "register_operand")))]
   "!TARGET_64BIT && reload_completed
+   && !(MMX_REG_P (operands[0]) || SSE_REG_P (operands[0]))
    && true_regnum (operands[0]) == true_regnum (operands[1])"
   [(set (match_dup 4) (const_int 0))]
   "split_double_mode (DImode, &operands[0], 1, &operands[3], &operands[4]);")
 
 (define_split
-  [(set (match_operand:DI 0 "nonimmediate_operand" "")
-       (zero_extend:DI (match_operand:SI 1 "general_operand" "")))
-   (clobber (reg:CC FLAGS_REG))]
+  [(set (match_operand:DI 0 "nonimmediate_operand")
+       (zero_extend:DI (match_operand:SI 1 "nonimmediate_operand")))]
   "!TARGET_64BIT && reload_completed
+   && !(MEM_P (operands[0]) && MEM_P (operands[1]))
    && !(MMX_REG_P (operands[0]) || SSE_REG_P (operands[0]))"
   [(set (match_dup 3) (match_dup 1))
    (set (match_dup 4) (const_int 0))]
   [(set_attr "type" "imovx")
    (set_attr "mode" "SI")])
 
-(define_expand "zero_extendhisi2"
-  [(set (match_operand:SI 0 "register_operand" "")
-       (zero_extend:SI (match_operand:HI 1 "nonimmediate_operand" "")))]
+(define_expand "zero_extend<mode>si2"
+  [(set (match_operand:SI 0 "register_operand")
+       (zero_extend:SI (match_operand:SWI12 1 "nonimmediate_operand")))]
   ""
 {
   if (TARGET_ZERO_EXTEND_WITH_AND && optimize_function_for_speed_p (cfun))
     {
-      operands[1] = force_reg (HImode, operands[1]);
-      emit_insn (gen_zero_extendhisi2_and (operands[0], operands[1]));
+      operands[1] = force_reg (<MODE>mode, operands[1]);
+      emit_insn (gen_zero_extend<mode>si2_and (operands[0], operands[1]));
       DONE;
     }
 })
 
-(define_insn_and_split "zero_extendhisi2_and"
-  [(set (match_operand:SI 0 "register_operand" "=r")
-       (zero_extend:SI (match_operand:HI 1 "register_operand" "0")))
+(define_insn_and_split "zero_extend<mode>si2_and"
+  [(set (match_operand:SI 0 "register_operand" "=r,?&<r>")
+       (zero_extend:SI
+         (match_operand:SWI12 1 "nonimmediate_operand" "0,<r>m")))
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_ZERO_EXTEND_WITH_AND && optimize_function_for_speed_p (cfun)"
   "#"
   "&& reload_completed"
-  [(parallel [(set (match_dup 0) (and:SI (match_dup 0) (const_int 65535)))
+  [(parallel [(set (match_dup 0) (and:SI (match_dup 0) (match_dup 2)))
              (clobber (reg:CC FLAGS_REG))])]
-  ""
+{
+  if (true_regnum (operands[0]) != true_regnum (operands[1]))
+    {
+      ix86_expand_clear (operands[0]);
+
+      gcc_assert (!TARGET_PARTIAL_REG_STALL);
+      emit_insn (gen_movstrict<mode>
+                 (gen_lowpart (<MODE>mode, operands[0]), operands[1]));
+      DONE;
+    }
+
+  operands[2] = GEN_INT (GET_MODE_MASK (<MODE>mode));
+}
   [(set_attr "type" "alu1")
    (set_attr "mode" "SI")])
 
-(define_insn "*zero_extendhisi2_movzwl"
+(define_insn "*zero_extend<mode>si2"
   [(set (match_operand:SI 0 "register_operand" "=r")
-       (zero_extend:SI (match_operand:HI 1 "nonimmediate_operand" "rm")))]
-  "!TARGET_ZERO_EXTEND_WITH_AND
-   || optimize_function_for_size_p (cfun)"
-  "movz{wl|x}\t{%1, %0|%0, %1}"
+       (zero_extend:SI
+         (match_operand:SWI12 1 "nonimmediate_operand" "<r>m")))]
+  "!(TARGET_ZERO_EXTEND_WITH_AND && optimize_function_for_speed_p (cfun))"
+  "movz{<imodesuffix>l|x}\t{%1, %0|%0, %1}"
   [(set_attr "type" "imovx")
    (set_attr "mode" "SI")])
 
-(define_expand "zero_extendqi<mode>2"
-  [(parallel
-    [(set (match_operand:SWI24 0 "register_operand" "")
-         (zero_extend:SWI24 (match_operand:QI 1 "nonimmediate_operand" "")))
-     (clobber (reg:CC FLAGS_REG))])])
+(define_expand "zero_extendqihi2"
+  [(set (match_operand:HI 0 "register_operand")
+       (zero_extend:HI (match_operand:QI 1 "nonimmediate_operand")))]
+  ""
+{
+  if (TARGET_ZERO_EXTEND_WITH_AND && optimize_function_for_speed_p (cfun))
+    {
+      operands[1] = force_reg (QImode, operands[1]);
+      emit_insn (gen_zero_extendqihi2_and (operands[0], operands[1]));
+      DONE;
+    }
+})
 
-(define_insn "*zero_extendqi<mode>2_and"
-  [(set (match_operand:SWI24 0 "register_operand" "=r,?&q")
-       (zero_extend:SWI24 (match_operand:QI 1 "nonimmediate_operand" "0,qm")))
+(define_insn_and_split "zero_extendqihi2_and"
+  [(set (match_operand:HI 0 "register_operand" "=r,?&q")
+       (zero_extend:HI (match_operand:QI 1 "nonimmediate_operand" "0,qm")))
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_ZERO_EXTEND_WITH_AND && optimize_function_for_speed_p (cfun)"
   "#"
-  [(set_attr "type" "alu1")
-   (set_attr "mode" "<MODE>")])
-
-;; When source and destination does not overlap, clear destination
-;; first and then do the movb
-(define_split
-  [(set (match_operand:SWI24 0 "register_operand" "")
-       (zero_extend:SWI24 (match_operand:QI 1 "nonimmediate_operand" "")))
-   (clobber (reg:CC FLAGS_REG))]
-  "reload_completed
-   && (TARGET_ZERO_EXTEND_WITH_AND && optimize_function_for_speed_p (cfun))
-   && ANY_QI_REG_P (operands[0])
-   && (ANY_QI_REG_P (operands[1]) || MEM_P (operands[1]))
-   && !reg_overlap_mentioned_p (operands[0], operands[1])"
-  [(set (strict_low_part (match_dup 2)) (match_dup 1))]
+  "&& reload_completed"
+  [(parallel [(set (match_dup 0) (and:SI (match_dup 0) (const_int 255)))
+             (clobber (reg:CC FLAGS_REG))])]
 {
-  operands[2] = gen_lowpart (QImode, operands[0]);
-  ix86_expand_clear (operands[0]);
-})
+  if (true_regnum (operands[0]) != true_regnum (operands[1]))
+    {
+      ix86_expand_clear (operands[0]);
 
-(define_insn "*zero_extendqi<mode>2_movzbl_and"
-  [(set (match_operand:SWI24 0 "register_operand" "=r,r")
-       (zero_extend:SWI24 (match_operand:QI 1 "nonimmediate_operand" "qm,0")))
-   (clobber (reg:CC FLAGS_REG))]
-  "!TARGET_ZERO_EXTEND_WITH_AND || optimize_function_for_size_p (cfun)"
-  "#"
-  [(set_attr "type" "imovx,alu1")
-   (set_attr "mode" "<MODE>")])
+      gcc_assert (!TARGET_PARTIAL_REG_STALL);
+      emit_insn (gen_movstrictqi
+                 (gen_lowpart (QImode, operands[0]), operands[1]));
+      DONE;
+    }
 
-;; For the movzbl case strip only the clobber
-(define_split
-  [(set (match_operand:SWI24 0 "register_operand" "")
-       (zero_extend:SWI24 (match_operand:QI 1 "nonimmediate_operand" "")))
-   (clobber (reg:CC FLAGS_REG))]
-  "reload_completed
-   && (!TARGET_ZERO_EXTEND_WITH_AND || optimize_function_for_size_p (cfun))
-   && (!REG_P (operands[1]) || ANY_QI_REG_P (operands[1]))"
-  [(set (match_dup 0)
-       (zero_extend:SWI24 (match_dup 1)))])
+  operands[0] = gen_lowpart (SImode, operands[0]);
+}
+  [(set_attr "type" "alu1")
+   (set_attr "mode" "SI")])
 
 ; zero extend to SImode to avoid partial register stalls
-(define_insn "*zero_extendqi<mode>2_movzbl"
-  [(set (match_operand:SWI24 0 "register_operand" "=r")
-       (zero_extend:SWI24 (match_operand:QI 1 "nonimmediate_operand" "qm")))]
-  "reload_completed
-   && (!TARGET_ZERO_EXTEND_WITH_AND || optimize_function_for_size_p (cfun))"
+(define_insn "*zero_extendqihi2"
+  [(set (match_operand:HI 0 "register_operand" "=r")
+       (zero_extend:HI (match_operand:QI 1 "nonimmediate_operand" "qm")))]
+  "!(TARGET_ZERO_EXTEND_WITH_AND && optimize_function_for_speed_p (cfun))"
   "movz{bl|x}\t{%1, %k0|%k0, %1}"
   [(set_attr "type" "imovx")
    (set_attr "mode" "SI")])
-
-;; Rest is handled by single and.
-(define_split
-  [(set (match_operand:SWI24 0 "register_operand" "")
-       (zero_extend:SWI24 (match_operand:QI 1 "register_operand" "")))
-   (clobber (reg:CC FLAGS_REG))]
-  "reload_completed
-   && true_regnum (operands[0]) == true_regnum (operands[1])"
-  [(parallel [(set (match_dup 0) (and:SWI24 (match_dup 0) (const_int 255)))
-             (clobber (reg:CC FLAGS_REG))])])
 \f
 ;; Sign extension instructions
 
 (define_expand "extendsidi2"
-  [(set (match_operand:DI 0 "register_operand" "")
-       (sign_extend:DI (match_operand:SI 1 "register_operand" "")))]
+  [(set (match_operand:DI 0 "register_operand")
+       (sign_extend:DI (match_operand:SI 1 "register_operand")))]
   ""
 {
   if (!TARGET_64BIT)
 
 ;; Extend to memory case when source register does die.
 (define_split
-  [(set (match_operand:DI 0 "memory_operand" "")
-       (sign_extend:DI (match_operand:SI 1 "register_operand" "")))
+  [(set (match_operand:DI 0 "memory_operand")
+       (sign_extend:DI (match_operand:SI 1 "register_operand")))
    (clobber (reg:CC FLAGS_REG))
-   (clobber (match_operand:SI 2 "register_operand" ""))]
+   (clobber (match_operand:SI 2 "register_operand"))]
   "(reload_completed
     && dead_or_set_p (insn, operands[1])
     && !reg_mentioned_p (operands[1], operands[0]))"
 
 ;; Extend to memory case when source register does not die.
 (define_split
-  [(set (match_operand:DI 0 "memory_operand" "")
-       (sign_extend:DI (match_operand:SI 1 "register_operand" "")))
+  [(set (match_operand:DI 0 "memory_operand")
+       (sign_extend:DI (match_operand:SI 1 "register_operand")))
    (clobber (reg:CC FLAGS_REG))
-   (clobber (match_operand:SI 2 "register_operand" ""))]
+   (clobber (match_operand:SI 2 "register_operand"))]
   "reload_completed"
   [(const_int 0)]
 {
 ;; Extend to register case.  Optimize case where source and destination
 ;; registers match and cases where we can use cltd.
 (define_split
-  [(set (match_operand:DI 0 "register_operand" "")
-       (sign_extend:DI (match_operand:SI 1 "register_operand" "")))
+  [(set (match_operand:DI 0 "register_operand")
+       (sign_extend:DI (match_operand:SI 1 "register_operand")))
    (clobber (reg:CC FLAGS_REG))
-   (clobber (match_scratch:SI 2 ""))]
+   (clobber (match_scratch:SI 2))]
   "reload_completed"
   [(const_int 0)]
 {
 
 ;; %%% Kill these when call knows how to work out a DFmode push earlier.
 (define_split
-  [(set (match_operand:DF 0 "push_operand" "")
-       (float_extend:DF (match_operand:SF 1 "fp_register_operand" "")))]
+  [(set (match_operand:DF 0 "push_operand")
+       (float_extend:DF (match_operand:SF 1 "fp_register_operand")))]
   "reload_completed"
   [(set (reg:P SP_REG) (plus:P (reg:P SP_REG) (const_int -8)))
    (set (mem:DF (reg:P SP_REG)) (float_extend:DF (match_dup 1)))])
 
 (define_split
-  [(set (match_operand:XF 0 "push_operand" "")
-       (float_extend:XF (match_operand:MODEF 1 "fp_register_operand" "")))]
+  [(set (match_operand:XF 0 "push_operand")
+       (float_extend:XF (match_operand:MODEF 1 "fp_register_operand")))]
   "reload_completed"
   [(set (reg:P SP_REG) (plus:P (reg:P SP_REG) (match_dup 2)))
    (set (mem:XF (reg:P SP_REG)) (float_extend:XF (match_dup 1)))]
   "operands[2] = GEN_INT (-GET_MODE_SIZE (XFmode));")
 
 (define_expand "extendsfdf2"
-  [(set (match_operand:DF 0 "nonimmediate_operand" "")
-        (float_extend:DF (match_operand:SF 1 "general_operand" "")))]
+  [(set (match_operand:DF 0 "nonimmediate_operand")
+        (float_extend:DF (match_operand:SF 1 "general_operand")))]
   "TARGET_80387 || (TARGET_SSE2 && TARGET_SSE_MATH)"
 {
   /* ??? Needed for compress_float_constant since all fp constants
    that might lead to ICE on 32bit target.  The sequence unlikely combine
    anyway.  */
 (define_split
-  [(set (match_operand:DF 0 "register_operand" "")
+  [(set (match_operand:DF 0 "register_operand")
         (float_extend:DF
-         (match_operand:SF 1 "nonimmediate_operand" "")))]
+         (match_operand:SF 1 "nonimmediate_operand")))]
   "TARGET_USE_VECTOR_FP_CONVERTS
    && optimize_insn_for_speed_p ()
    && reload_completed && SSE_REG_P (operands[0])"
    (set_attr "mode" "SF,XF")])
 
 (define_expand "extend<mode>xf2"
-  [(set (match_operand:XF 0 "nonimmediate_operand" "")
-        (float_extend:XF (match_operand:MODEF 1 "general_operand" "")))]
+  [(set (match_operand:XF 0 "nonimmediate_operand")
+        (float_extend:XF (match_operand:MODEF 1 "general_operand")))]
   "TARGET_80387"
 {
   /* ??? Needed for compress_float_constant since all fp constants
 ;; Conversion from DFmode to SFmode.
 
 (define_expand "truncdfsf2"
-  [(set (match_operand:SF 0 "nonimmediate_operand" "")
+  [(set (match_operand:SF 0 "nonimmediate_operand")
        (float_truncate:SF
-         (match_operand:DF 1 "nonimmediate_operand" "")))]
+         (match_operand:DF 1 "nonimmediate_operand")))]
   "TARGET_80387 || (TARGET_SSE2 && TARGET_SSE_MATH)"
 {
   if (TARGET_SSE2 && TARGET_SSE_MATH && !TARGET_MIX_SSE_I387)
    that might lead to ICE on 32bit target.  The sequence unlikely combine
    anyway.  */
 (define_split
-  [(set (match_operand:SF 0 "register_operand" "")
+  [(set (match_operand:SF 0 "register_operand")
         (float_truncate:SF
-         (match_operand:DF 1 "nonimmediate_operand" "")))]
+         (match_operand:DF 1 "nonimmediate_operand")))]
   "TARGET_USE_VECTOR_FP_CONVERTS
    && optimize_insn_for_speed_p ()
    && reload_completed && SSE_REG_P (operands[0])"
 })
 
 (define_expand "truncdfsf2_with_temp"
-  [(parallel [(set (match_operand:SF 0 "" "")
-                  (float_truncate:SF (match_operand:DF 1 "" "")))
-             (clobber (match_operand:SF 2 "" ""))])])
+  [(parallel [(set (match_operand:SF 0)
+                  (float_truncate:SF (match_operand:DF 1)))
+             (clobber (match_operand:SF 2))])])
 
 (define_insn "*truncdfsf_fast_mixed"
   [(set (match_operand:SF 0 "nonimmediate_operand"   "=fm,x")
    (set_attr "mode" "SF")])
 
 (define_insn "*truncdfsf_mixed"
-  [(set (match_operand:SF 0 "nonimmediate_operand"   "=m,Y2 ,?f,?x,?*r")
+  [(set (match_operand:SF 0 "nonimmediate_operand"   "=m,x ,?f,?x,?*r")
        (float_truncate:SF
-         (match_operand:DF 1 "nonimmediate_operand" "f ,Y2m,f ,f ,f")))
-   (clobber (match_operand:SF 2 "memory_operand"     "=X,X  ,m ,m ,m"))]
+         (match_operand:DF 1 "nonimmediate_operand" "f ,xm,f ,f ,f")))
+   (clobber (match_operand:SF 2 "memory_operand"     "=X,X ,m ,m ,m"))]
   "TARGET_MIX_SSE_I387"
 {
   switch (which_alternative)
       return "#";
     }
 }
-  [(set_attr "type" "fmov,ssecvt,multi,multi,multi")
+  [(set_attr "isa" "*,sse2,*,*,*")
+   (set_attr "type" "fmov,ssecvt,multi,multi,multi")
    (set_attr "unit" "*,*,i387,i387,i387")
    (set_attr "prefix" "orig,maybe_vex,orig,orig,orig")
    (set_attr "mode" "SF")])
    (set_attr "mode" "SF")])
 
 (define_split
-  [(set (match_operand:SF 0 "register_operand" "")
+  [(set (match_operand:SF 0 "register_operand")
        (float_truncate:SF
-        (match_operand:DF 1 "fp_register_operand" "")))
-   (clobber (match_operand 2 "" ""))]
+        (match_operand:DF 1 "fp_register_operand")))
+   (clobber (match_operand 2))]
   "reload_completed"
   [(set (match_dup 2) (match_dup 1))
    (set (match_dup 0) (match_dup 2))]
 ;; Conversion from XFmode to {SF,DF}mode
 
 (define_expand "truncxf<mode>2"
-  [(parallel [(set (match_operand:MODEF 0 "nonimmediate_operand" "")
+  [(parallel [(set (match_operand:MODEF 0 "nonimmediate_operand")
                   (float_truncate:MODEF
-                    (match_operand:XF 1 "register_operand" "")))
+                    (match_operand:XF 1 "register_operand")))
              (clobber (match_dup 2))])]
   "TARGET_80387"
 {
    (set_attr "mode" "SF")])
 
 (define_insn "*truncxfdf2_mixed"
-  [(set (match_operand:DF 0 "nonimmediate_operand" "=m,?f,?Y2,?*r")
+  [(set (match_operand:DF 0 "nonimmediate_operand" "=m,?f,?x,?*r")
        (float_truncate:DF
          (match_operand:XF 1 "register_operand"   "f ,f ,f  ,f")))
    (clobber (match_operand:DF 2 "memory_operand"   "=X,m ,m  ,m"))]
   gcc_assert (!which_alternative);
   return output_387_reg_move (insn, operands);
 }
-  [(set_attr "type" "fmov,multi,multi,multi")
+  [(set_attr "isa" "*,*,sse2,*")
+   (set_attr "type" "fmov,multi,multi,multi")
    (set_attr "unit" "*,i387,i387,i387")
    (set_attr "mode" "DF")])
 
    (set_attr "mode" "<MODE>")])
 
 (define_split
-  [(set (match_operand:MODEF 0 "register_operand" "")
+  [(set (match_operand:MODEF 0 "register_operand")
        (float_truncate:MODEF
-         (match_operand:XF 1 "register_operand" "")))
-   (clobber (match_operand:MODEF 2 "memory_operand" ""))]
+         (match_operand:XF 1 "register_operand")))
+   (clobber (match_operand:MODEF 2 "memory_operand"))]
   "TARGET_80387 && reload_completed"
   [(set (match_dup 2) (float_truncate:MODEF (match_dup 1)))
    (set (match_dup 0) (match_dup 2))])
 
 (define_split
-  [(set (match_operand:MODEF 0 "memory_operand" "")
+  [(set (match_operand:MODEF 0 "memory_operand")
        (float_truncate:MODEF
-         (match_operand:XF 1 "register_operand" "")))
-   (clobber (match_operand:MODEF 2 "memory_operand" ""))]
+         (match_operand:XF 1 "register_operand")))
+   (clobber (match_operand:MODEF 2 "memory_operand"))]
   "TARGET_80387"
   [(set (match_dup 0) (float_truncate:MODEF (match_dup 1)))])
 \f
 ;; Signed conversion to DImode.
 
 (define_expand "fix_truncxfdi2"
-  [(parallel [(set (match_operand:DI 0 "nonimmediate_operand" "")
-                   (fix:DI (match_operand:XF 1 "register_operand" "")))
+  [(parallel [(set (match_operand:DI 0 "nonimmediate_operand")
+                   (fix:DI (match_operand:XF 1 "register_operand")))
              (clobber (reg:CC FLAGS_REG))])]
   "TARGET_80387"
 {
 })
 
 (define_expand "fix_trunc<mode>di2"
-  [(parallel [(set (match_operand:DI 0 "nonimmediate_operand" "")
-                   (fix:DI (match_operand:MODEF 1 "register_operand" "")))
+  [(parallel [(set (match_operand:DI 0 "nonimmediate_operand")
+                   (fix:DI (match_operand:MODEF 1 "register_operand")))
               (clobber (reg:CC FLAGS_REG))])]
   "TARGET_80387 || (TARGET_64BIT && SSE_FLOAT_MODE_P (<MODE>mode))"
 {
 ;; Signed conversion to SImode.
 
 (define_expand "fix_truncxfsi2"
-  [(parallel [(set (match_operand:SI 0 "nonimmediate_operand" "")
-                   (fix:SI (match_operand:XF 1 "register_operand" "")))
+  [(parallel [(set (match_operand:SI 0 "nonimmediate_operand")
+                   (fix:SI (match_operand:XF 1 "register_operand")))
              (clobber (reg:CC FLAGS_REG))])]
   "TARGET_80387"
 {
 })
 
 (define_expand "fix_trunc<mode>si2"
-  [(parallel [(set (match_operand:SI 0 "nonimmediate_operand" "")
-                  (fix:SI (match_operand:MODEF 1 "register_operand" "")))
+  [(parallel [(set (match_operand:SI 0 "nonimmediate_operand")
+                  (fix:SI (match_operand:MODEF 1 "register_operand")))
              (clobber (reg:CC FLAGS_REG))])]
   "TARGET_80387 || SSE_FLOAT_MODE_P (<MODE>mode)"
 {
 ;; Signed conversion to HImode.
 
 (define_expand "fix_trunc<mode>hi2"
-  [(parallel [(set (match_operand:HI 0 "nonimmediate_operand" "")
-                  (fix:HI (match_operand:X87MODEF 1 "register_operand" "")))
+  [(parallel [(set (match_operand:HI 0 "nonimmediate_operand")
+                  (fix:HI (match_operand:X87MODEF 1 "register_operand")))
               (clobber (reg:CC FLAGS_REG))])]
   "TARGET_80387
    && !(SSE_FLOAT_MODE_P (<MODE>mode) && (!TARGET_FISTTP || TARGET_SSE_MATH))"
 
 (define_expand "fixuns_trunc<mode>si2"
   [(parallel
-    [(set (match_operand:SI 0 "register_operand" "")
+    [(set (match_operand:SI 0 "register_operand")
          (unsigned_fix:SI
-           (match_operand:MODEF 1 "nonimmediate_operand" "")))
+           (match_operand:MODEF 1 "nonimmediate_operand")))
      (use (match_dup 2))
-     (clobber (match_scratch:<ssevecmode> 3 ""))
-     (clobber (match_scratch:<ssevecmode> 4 ""))])]
+     (clobber (match_scratch:<ssevecmode> 3))
+     (clobber (match_scratch:<ssevecmode> 4))])]
   "!TARGET_64BIT && TARGET_SSE2 && TARGET_SSE_MATH"
 {
   enum machine_mode mode = <MODE>mode;
 
 (define_expand "fixuns_trunc<mode>hi2"
   [(set (match_dup 2)
-       (fix:SI (match_operand:MODEF 1 "nonimmediate_operand" "")))
-   (set (match_operand:HI 0 "nonimmediate_operand" "")
+       (fix:SI (match_operand:MODEF 1 "nonimmediate_operand")))
+   (set (match_operand:HI 0 "nonimmediate_operand")
        (subreg:HI (match_dup 2) 0))]
   "SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH"
   "operands[2] = gen_reg_rtx (SImode);")
 
 ;; Shorten x87->SSE reload sequences of fix_trunc?f?i_sse patterns.
 (define_peephole2
-  [(set (match_operand:MODEF 0 "register_operand" "")
-       (match_operand:MODEF 1 "memory_operand" ""))
-   (set (match_operand:SSEMODEI24 2 "register_operand" "")
-       (fix:SSEMODEI24 (match_dup 0)))]
+  [(set (match_operand:MODEF 0 "register_operand")
+       (match_operand:MODEF 1 "memory_operand"))
+   (set (match_operand:SWI48x 2 "register_operand")
+       (fix:SWI48x (match_dup 0)))]
   "TARGET_SHORTEN_X87_SSE
    && !(TARGET_AVOID_VECTOR_DECODE && optimize_insn_for_speed_p ())
    && peep2_reg_dead_p (2, operands[0])"
-  [(set (match_dup 2) (fix:SSEMODEI24 (match_dup 1)))])
+  [(set (match_dup 2) (fix:SWI48x (match_dup 1)))])
 
 ;; Avoid vector decoded forms of the instruction.
 (define_peephole2
-  [(match_scratch:DF 2 "Y2")
-   (set (match_operand:SSEMODEI24 0 "register_operand" "")
-       (fix:SSEMODEI24 (match_operand:DF 1 "memory_operand" "")))]
-  "TARGET_AVOID_VECTOR_DECODE && optimize_insn_for_speed_p ()"
+  [(match_scratch:DF 2 "x")
+   (set (match_operand:SWI48x 0 "register_operand")
+       (fix:SWI48x (match_operand:DF 1 "memory_operand")))]
+  "TARGET_SSE2 && TARGET_AVOID_VECTOR_DECODE && optimize_insn_for_speed_p ()"
   [(set (match_dup 2) (match_dup 1))
-   (set (match_dup 0) (fix:SSEMODEI24 (match_dup 2)))])
+   (set (match_dup 0) (fix:SWI48x (match_dup 2)))])
 
 (define_peephole2
   [(match_scratch:SF 2 "x")
-   (set (match_operand:SSEMODEI24 0 "register_operand" "")
-       (fix:SSEMODEI24 (match_operand:SF 1 "memory_operand" "")))]
+   (set (match_operand:SWI48x 0 "register_operand")
+       (fix:SWI48x (match_operand:SF 1 "memory_operand")))]
   "TARGET_AVOID_VECTOR_DECODE && optimize_insn_for_speed_p ()"
   [(set (match_dup 2) (match_dup 1))
-   (set (match_dup 0) (fix:SSEMODEI24 (match_dup 2)))])
+   (set (match_dup 0) (fix:SWI48x (match_dup 2)))])
 
 (define_insn_and_split "fix_trunc<mode>_fisttp_i387_1"
-  [(set (match_operand:X87MODEI 0 "nonimmediate_operand" "")
-       (fix:X87MODEI (match_operand 1 "register_operand" "")))]
+  [(set (match_operand:SWI248x 0 "nonimmediate_operand")
+       (fix:SWI248x (match_operand 1 "register_operand")))]
   "X87_FLOAT_MODE_P (GET_MODE (operands[1]))
    && TARGET_FISTTP
    && !((SSE_FLOAT_MODE_P (GET_MODE (operands[1]))
    (set_attr "mode" "<MODE>")])
 
 (define_insn "fix_trunc<mode>_i387_fisttp"
-  [(set (match_operand:X87MODEI 0 "memory_operand" "=m")
-       (fix:X87MODEI (match_operand 1 "register_operand" "f")))
+  [(set (match_operand:SWI248x 0 "memory_operand" "=m")
+       (fix:SWI248x (match_operand 1 "register_operand" "f")))
    (clobber (match_scratch:XF 2 "=&1f"))]
   "X87_FLOAT_MODE_P (GET_MODE (operands[1]))
    && TARGET_FISTTP
    (set_attr "mode" "<MODE>")])
 
 (define_insn "fix_trunc<mode>_i387_fisttp_with_temp"
-  [(set (match_operand:X87MODEI 0 "nonimmediate_operand" "=m,?r")
-       (fix:X87MODEI (match_operand 1 "register_operand" "f,f")))
-   (clobber (match_operand:X87MODEI 2 "memory_operand" "=X,m"))
+  [(set (match_operand:SWI248x 0 "nonimmediate_operand" "=m,?r")
+       (fix:SWI248x (match_operand 1 "register_operand" "f,f")))
+   (clobber (match_operand:SWI248x 2 "memory_operand" "=X,m"))
    (clobber (match_scratch:XF 3 "=&1f,&1f"))]
   "X87_FLOAT_MODE_P (GET_MODE (operands[1]))
    && TARGET_FISTTP
    (set_attr "mode" "<MODE>")])
 
 (define_split
-  [(set (match_operand:X87MODEI 0 "register_operand" "")
-       (fix:X87MODEI (match_operand 1 "register_operand" "")))
-   (clobber (match_operand:X87MODEI 2 "memory_operand" ""))
-   (clobber (match_scratch 3 ""))]
+  [(set (match_operand:SWI248x 0 "register_operand")
+       (fix:SWI248x (match_operand 1 "register_operand")))
+   (clobber (match_operand:SWI248x 2 "memory_operand"))
+   (clobber (match_scratch 3))]
   "reload_completed"
-  [(parallel [(set (match_dup 2) (fix:X87MODEI (match_dup 1)))
+  [(parallel [(set (match_dup 2) (fix:SWI248x (match_dup 1)))
              (clobber (match_dup 3))])
    (set (match_dup 0) (match_dup 2))])
 
 (define_split
-  [(set (match_operand:X87MODEI 0 "memory_operand" "")
-       (fix:X87MODEI (match_operand 1 "register_operand" "")))
-   (clobber (match_operand:X87MODEI 2 "memory_operand" ""))
-   (clobber (match_scratch 3 ""))]
+  [(set (match_operand:SWI248x 0 "memory_operand")
+       (fix:SWI248x (match_operand 1 "register_operand")))
+   (clobber (match_operand:SWI248x 2 "memory_operand"))
+   (clobber (match_scratch 3))]
   "reload_completed"
-  [(parallel [(set (match_dup 0) (fix:X87MODEI (match_dup 1)))
+  [(parallel [(set (match_dup 0) (fix:SWI248x (match_dup 1)))
              (clobber (match_dup 3))])])
 
 ;; See the comments in i386.h near OPTIMIZE_MODE_SWITCHING for the description
 ;; clobbering insns can be used. Look at emit_i387_cw_initialization ()
 ;; function in i386.c.
 (define_insn_and_split "*fix_trunc<mode>_i387_1"
-  [(set (match_operand:X87MODEI 0 "nonimmediate_operand" "")
-       (fix:X87MODEI (match_operand 1 "register_operand" "")))
+  [(set (match_operand:SWI248x 0 "nonimmediate_operand")
+       (fix:SWI248x (match_operand 1 "register_operand")))
    (clobber (reg:CC FLAGS_REG))]
   "X87_FLOAT_MODE_P (GET_MODE (operands[1]))
    && !TARGET_FISTTP
    (set_attr "mode" "DI")])
 
 (define_split
-  [(set (match_operand:DI 0 "register_operand" "")
-       (fix:DI (match_operand 1 "register_operand" "")))
-   (use (match_operand:HI 2 "memory_operand" ""))
-   (use (match_operand:HI 3 "memory_operand" ""))
-   (clobber (match_operand:DI 4 "memory_operand" ""))
-   (clobber (match_scratch 5 ""))]
+  [(set (match_operand:DI 0 "register_operand")
+       (fix:DI (match_operand 1 "register_operand")))
+   (use (match_operand:HI 2 "memory_operand"))
+   (use (match_operand:HI 3 "memory_operand"))
+   (clobber (match_operand:DI 4 "memory_operand"))
+   (clobber (match_scratch 5))]
   "reload_completed"
   [(parallel [(set (match_dup 4) (fix:DI (match_dup 1)))
              (use (match_dup 2))
    (set (match_dup 0) (match_dup 4))])
 
 (define_split
-  [(set (match_operand:DI 0 "memory_operand" "")
-       (fix:DI (match_operand 1 "register_operand" "")))
-   (use (match_operand:HI 2 "memory_operand" ""))
-   (use (match_operand:HI 3 "memory_operand" ""))
-   (clobber (match_operand:DI 4 "memory_operand" ""))
-   (clobber (match_scratch 5 ""))]
+  [(set (match_operand:DI 0 "memory_operand")
+       (fix:DI (match_operand 1 "register_operand")))
+   (use (match_operand:HI 2 "memory_operand"))
+   (use (match_operand:HI 3 "memory_operand"))
+   (clobber (match_operand:DI 4 "memory_operand"))
+   (clobber (match_scratch 5))]
   "reload_completed"
   [(parallel [(set (match_dup 0) (fix:DI (match_dup 1)))
              (use (match_dup 2))
              (clobber (match_dup 5))])])
 
 (define_insn "fix_trunc<mode>_i387"
-  [(set (match_operand:X87MODEI12 0 "memory_operand" "=m")
-       (fix:X87MODEI12 (match_operand 1 "register_operand" "f")))
+  [(set (match_operand:SWI24 0 "memory_operand" "=m")
+       (fix:SWI24 (match_operand 1 "register_operand" "f")))
    (use (match_operand:HI 2 "memory_operand" "m"))
    (use (match_operand:HI 3 "memory_operand" "m"))]
   "X87_FLOAT_MODE_P (GET_MODE (operands[1]))
    (set_attr "mode" "<MODE>")])
 
 (define_insn "fix_trunc<mode>_i387_with_temp"
-  [(set (match_operand:X87MODEI12 0 "nonimmediate_operand" "=m,?r")
-       (fix:X87MODEI12 (match_operand 1 "register_operand" "f,f")))
+  [(set (match_operand:SWI24 0 "nonimmediate_operand" "=m,?r")
+       (fix:SWI24 (match_operand 1 "register_operand" "f,f")))
    (use (match_operand:HI 2 "memory_operand" "m,m"))
    (use (match_operand:HI 3 "memory_operand" "m,m"))
-   (clobber (match_operand:X87MODEI12 4 "memory_operand" "=X,m"))]
+   (clobber (match_operand:SWI24 4 "memory_operand" "=X,m"))]
   "X87_FLOAT_MODE_P (GET_MODE (operands[1]))
    && !TARGET_FISTTP
    && !SSE_FLOAT_MODE_P (GET_MODE (operands[1]))"
    (set_attr "mode" "<MODE>")])
 
 (define_split
-  [(set (match_operand:X87MODEI12 0 "register_operand" "")
-       (fix:X87MODEI12 (match_operand 1 "register_operand" "")))
-   (use (match_operand:HI 2 "memory_operand" ""))
-   (use (match_operand:HI 3 "memory_operand" ""))
-   (clobber (match_operand:X87MODEI12 4 "memory_operand" ""))]
+  [(set (match_operand:SWI24 0 "register_operand")
+       (fix:SWI24 (match_operand 1 "register_operand")))
+   (use (match_operand:HI 2 "memory_operand"))
+   (use (match_operand:HI 3 "memory_operand"))
+   (clobber (match_operand:SWI24 4 "memory_operand"))]
   "reload_completed"
-  [(parallel [(set (match_dup 4) (fix:X87MODEI12 (match_dup 1)))
+  [(parallel [(set (match_dup 4) (fix:SWI24 (match_dup 1)))
              (use (match_dup 2))
              (use (match_dup 3))])
    (set (match_dup 0) (match_dup 4))])
 
 (define_split
-  [(set (match_operand:X87MODEI12 0 "memory_operand" "")
-       (fix:X87MODEI12 (match_operand 1 "register_operand" "")))
-   (use (match_operand:HI 2 "memory_operand" ""))
-   (use (match_operand:HI 3 "memory_operand" ""))
-   (clobber (match_operand:X87MODEI12 4 "memory_operand" ""))]
+  [(set (match_operand:SWI24 0 "memory_operand")
+       (fix:SWI24 (match_operand 1 "register_operand")))
+   (use (match_operand:HI 2 "memory_operand"))
+   (use (match_operand:HI 3 "memory_operand"))
+   (clobber (match_operand:SWI24 4 "memory_operand"))]
   "reload_completed"
-  [(parallel [(set (match_dup 0) (fix:X87MODEI12 (match_dup 1)))
+  [(parallel [(set (match_dup 0) (fix:SWI24 (match_dup 1)))
              (use (match_dup 2))
              (use (match_dup 3))])])
 
 ;; wants to be able to do this between registers.
 
 (define_expand "floathi<mode>2"
-  [(set (match_operand:X87MODEF 0 "register_operand" "")
-       (float:X87MODEF (match_operand:HI 1 "nonimmediate_operand" "")))]
+  [(set (match_operand:X87MODEF 0 "register_operand")
+       (float:X87MODEF (match_operand:HI 1 "nonimmediate_operand")))]
   "TARGET_80387
    && (!(SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)
        || TARGET_MIX_SSE_I387)")
 
 ;; Pre-reload splitter to add memory clobber to the pattern.
 (define_insn_and_split "*floathi<mode>2_1"
-  [(set (match_operand:X87MODEF 0 "register_operand" "")
-       (float:X87MODEF (match_operand:HI 1 "register_operand" "")))]
+  [(set (match_operand:X87MODEF 0 "register_operand")
+       (float:X87MODEF (match_operand:HI 1 "register_operand")))]
   "TARGET_80387
    && (!(SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)
        || TARGET_MIX_SSE_I387)
 (define_insn "*floathi<mode>2_i387_with_temp"
   [(set (match_operand:X87MODEF 0 "register_operand" "=f,f")
        (float:X87MODEF (match_operand:HI 1 "nonimmediate_operand" "m,?r")))
-  (clobber (match_operand:HI 2 "memory_operand" "=m,m"))]
+  (clobber (match_operand:HI 2 "memory_operand" "=X,m"))]
   "TARGET_80387
    && (!(SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)
        || TARGET_MIX_SSE_I387)"
    (set_attr "fp_int_src" "true")])
 
 (define_split
-  [(set (match_operand:X87MODEF 0 "register_operand" "")
-       (float:X87MODEF (match_operand:HI 1 "register_operand" "")))
-   (clobber (match_operand:HI 2 "memory_operand" ""))]
+  [(set (match_operand:X87MODEF 0 "register_operand")
+       (float:X87MODEF (match_operand:HI 1 "register_operand")))
+   (clobber (match_operand:HI 2 "memory_operand"))]
   "TARGET_80387
    && (!(SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)
        || TARGET_MIX_SSE_I387)
    (set (match_dup 0) (float:X87MODEF (match_dup 2)))])
 
 (define_split
-  [(set (match_operand:X87MODEF 0 "register_operand" "")
-       (float:X87MODEF (match_operand:HI 1 "memory_operand" "")))
-   (clobber (match_operand:HI 2 "memory_operand" ""))]
+  [(set (match_operand:X87MODEF 0 "register_operand")
+       (float:X87MODEF (match_operand:HI 1 "memory_operand")))
+   (clobber (match_operand:HI 2 "memory_operand"))]
    "TARGET_80387
     && (!(SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)
         || TARGET_MIX_SSE_I387)
     && reload_completed"
   [(set (match_dup 0) (float:X87MODEF (match_dup 1)))])
 
-(define_expand "float<SSEMODEI24:mode><X87MODEF:mode>2"
-  [(set (match_operand:X87MODEF 0 "register_operand" "")
+(define_expand "float<SWI48x:mode><X87MODEF:mode>2"
+  [(set (match_operand:X87MODEF 0 "register_operand")
        (float:X87MODEF
-         (match_operand:SSEMODEI24 1 "nonimmediate_operand" "")))]
+         (match_operand:SWI48x 1 "nonimmediate_operand")))]
   "TARGET_80387
-   || ((<SSEMODEI24:MODE>mode != DImode || TARGET_64BIT)
+   || ((<SWI48x:MODE>mode != DImode || TARGET_64BIT)
        && SSE_FLOAT_MODE_P (<X87MODEF:MODE>mode) && TARGET_SSE_MATH)"
 {
-  if (!((<SSEMODEI24:MODE>mode != DImode || TARGET_64BIT)
+  if (!((<SWI48x:MODE>mode != DImode || TARGET_64BIT)
        && SSE_FLOAT_MODE_P (<X87MODEF:MODE>mode) && TARGET_SSE_MATH)
-      && !X87_ENABLE_FLOAT (<X87MODEF:MODE>mode, <SSEMODEI24:MODE>mode))
+      && !X87_ENABLE_FLOAT (<X87MODEF:MODE>mode, <SWI48x:MODE>mode))
     {
       rtx reg = gen_reg_rtx (XFmode);
       rtx (*insn)(rtx, rtx);
 
-      emit_insn (gen_float<SSEMODEI24:mode>xf2 (reg, operands[1]));
+      emit_insn (gen_float<SWI48x:mode>xf2 (reg, operands[1]));
 
       if (<X87MODEF:MODE>mode == SFmode)
        insn = gen_truncxfsf2;
 })
 
 ;; Pre-reload splitter to add memory clobber to the pattern.
-(define_insn_and_split "*float<SSEMODEI24:mode><X87MODEF:mode>2_1"
-  [(set (match_operand:X87MODEF 0 "register_operand" "")
-       (float:X87MODEF (match_operand:SSEMODEI24 1 "register_operand" "")))]
+(define_insn_and_split "*float<SWI48x:mode><X87MODEF:mode>2_1"
+  [(set (match_operand:X87MODEF 0 "register_operand")
+       (float:X87MODEF (match_operand:SWI48x 1 "register_operand")))]
   "((TARGET_80387
-     && X87_ENABLE_FLOAT (<X87MODEF:MODE>mode, <SSEMODEI24:MODE>mode)
-     && (!((<SSEMODEI24:MODE>mode != DImode || TARGET_64BIT)
+     && X87_ENABLE_FLOAT (<X87MODEF:MODE>mode, <SWI48x:MODE>mode)
+     && (!((<SWI48x:MODE>mode != DImode || TARGET_64BIT)
           && SSE_FLOAT_MODE_P (<X87MODEF:MODE>mode) && TARGET_SSE_MATH)
         || TARGET_MIX_SSE_I387))
-    || ((<SSEMODEI24:MODE>mode != DImode || TARGET_64BIT)
+    || ((<SWI48x:MODE>mode != DImode || TARGET_64BIT)
        && SSE_FLOAT_MODE_P (<X87MODEF:MODE>mode) && TARGET_SSE_MATH
-       && ((<SSEMODEI24:MODE>mode == SImode
+       && ((<SWI48x:MODE>mode == SImode
             && TARGET_SSE2 && TARGET_USE_VECTOR_CONVERTS
             && optimize_function_for_speed_p (cfun)
             && flag_trapping_math)
   [(parallel [(set (match_dup 0) (float:X87MODEF (match_dup 1)))
              (clobber (match_dup 2))])]
 {
-  operands[2] = assign_386_stack_local (<SSEMODEI24:MODE>mode, SLOT_TEMP);
+  operands[2] = assign_386_stack_local (<SWI48x:MODE>mode, SLOT_TEMP);
 
   /* Avoid store forwarding (partial memory) stall penalty
      by passing DImode value through XMM registers.  */
-  if (<SSEMODEI24:MODE>mode == DImode && !TARGET_64BIT
+  if (<SWI48x:MODE>mode == DImode && !TARGET_64BIT
       && TARGET_80387 && TARGET_SSE2 && TARGET_INTER_UNIT_MOVES
       && optimize_function_for_speed_p (cfun))
     {
    (set_attr "bdver1_decode" "*,direct")
    (set_attr "fp_int_src" "true")])
 
-(define_insn "*float<SSEMODEI24:mode><MODEF:mode>2_mixed_with_temp"
+(define_insn "*float<SWI48x:mode><MODEF:mode>2_mixed_with_temp"
   [(set (match_operand:MODEF 0 "register_operand" "=f,f,x,x")
        (float:MODEF
-         (match_operand:SSEMODEI24 1 "nonimmediate_operand" "m,?r,r,m")))
-  (clobber (match_operand:SSEMODEI24 2 "memory_operand" "=X,m,m,X"))]
-  "(<SSEMODEI24:MODE>mode != DImode || TARGET_64BIT)
+         (match_operand:SWI48x 1 "nonimmediate_operand" "m,?r,r,m")))
+   (clobber (match_operand:SWI48x 2 "memory_operand" "=X,m,m,X"))]
+  "(<SWI48x:MODE>mode != DImode || TARGET_64BIT)
    && SSE_FLOAT_MODE_P (<MODEF:MODE>mode) && TARGET_MIX_SSE_I387"
   "#"
   [(set_attr "type" "fmov,multi,sseicvt,sseicvt")
    (set_attr "fp_int_src" "true")])
 
 (define_split
-  [(set (match_operand:MODEF 0 "register_operand" "")
-       (float:MODEF (match_operand:SSEMODEI24 1 "register_operand" "")))
-   (clobber (match_operand:SSEMODEI24 2 "memory_operand" ""))]
-  "(<SSEMODEI24:MODE>mode != DImode || TARGET_64BIT)
+  [(set (match_operand:MODEF 0 "register_operand")
+       (float:MODEF (match_operand:SWI48x 1 "register_operand")))
+   (clobber (match_operand:SWI48x 2 "memory_operand"))]
+  "(<SWI48x:MODE>mode != DImode || TARGET_64BIT)
    && SSE_FLOAT_MODE_P (<MODEF:MODE>mode) && TARGET_MIX_SSE_I387
    && TARGET_INTER_UNIT_CONVERSIONS
    && reload_completed
    && (SSE_REG_P (operands[0])
        || (GET_CODE (operands[0]) == SUBREG
-          && SSE_REG_P (operands[0])))"
+          && SSE_REG_P (SUBREG_REG (operands[0]))))"
   [(set (match_dup 0) (float:MODEF (match_dup 1)))])
 
 (define_split
-  [(set (match_operand:MODEF 0 "register_operand" "")
-       (float:MODEF (match_operand:SSEMODEI24 1 "register_operand" "")))
-   (clobber (match_operand:SSEMODEI24 2 "memory_operand" ""))]
-  "(<SSEMODEI24:MODE>mode != DImode || TARGET_64BIT)
+  [(set (match_operand:MODEF 0 "register_operand")
+       (float:MODEF (match_operand:SWI48x 1 "register_operand")))
+   (clobber (match_operand:SWI48x 2 "memory_operand"))]
+  "(<SWI48x:MODE>mode != DImode || TARGET_64BIT)
    && SSE_FLOAT_MODE_P (<MODEF:MODE>mode) && TARGET_MIX_SSE_I387
    && !(TARGET_INTER_UNIT_CONVERSIONS || optimize_function_for_size_p (cfun))
    && reload_completed
    && (SSE_REG_P (operands[0])
        || (GET_CODE (operands[0]) == SUBREG
-          && SSE_REG_P (operands[0])))"
+          && SSE_REG_P (SUBREG_REG (operands[0]))))"
   [(set (match_dup 2) (match_dup 1))
    (set (match_dup 0) (float:MODEF (match_dup 2)))])
 
-(define_insn "*float<SSEMODEI24:mode><MODEF:mode>2_mixed_interunit"
+(define_insn "*float<SWI48x:mode><MODEF:mode>2_mixed_interunit"
   [(set (match_operand:MODEF 0 "register_operand" "=f,x,x")
        (float:MODEF
-         (match_operand:SSEMODEI24 1 "nonimmediate_operand" "m,r,m")))]
-  "(<SSEMODEI24:MODE>mode != DImode || TARGET_64BIT)
+         (match_operand:SWI48x 1 "nonimmediate_operand" "m,r,m")))]
+  "(<SWI48x:MODE>mode != DImode || TARGET_64BIT)
    && SSE_FLOAT_MODE_P (<MODEF:MODE>mode) && TARGET_MIX_SSE_I387
    && (TARGET_INTER_UNIT_CONVERSIONS || optimize_function_for_size_p (cfun))"
   "@
    fild%Z1\t%1
-   %vcvtsi2<MODEF:ssemodesuffix><SSEMODEI24:rex64suffix>\t{%1, %d0|%d0, %1}
-   %vcvtsi2<MODEF:ssemodesuffix><SSEMODEI24:rex64suffix>\t{%1, %d0|%d0, %1}"
+   %vcvtsi2<MODEF:ssemodesuffix><SWI48x:rex64suffix>\t{%1, %d0|%d0, %1}
+   %vcvtsi2<MODEF:ssemodesuffix><SWI48x:rex64suffix>\t{%1, %d0|%d0, %1}"
   [(set_attr "type" "fmov,sseicvt,sseicvt")
    (set_attr "prefix" "orig,maybe_vex,maybe_vex")
    (set_attr "mode" "<MODEF:MODE>")
    (set (attr "prefix_rex")
      (if_then_else
        (and (eq_attr "prefix" "maybe_vex")
-           (ne (symbol_ref "<SSEMODEI24:MODE>mode == DImode") (const_int 0)))
+           (match_test "<SWI48x:MODE>mode == DImode"))
        (const_string "1")
        (const_string "*")))
    (set_attr "unit" "i387,*,*")
    (set_attr "bdver1_decode" "*,double,direct")
    (set_attr "fp_int_src" "true")])
 
-(define_insn "*float<SSEMODEI24:mode><MODEF:mode>2_mixed_nointerunit"
+(define_insn "*float<SWI48x:mode><MODEF:mode>2_mixed_nointerunit"
   [(set (match_operand:MODEF 0 "register_operand" "=f,x")
        (float:MODEF
-         (match_operand:SSEMODEI24 1 "memory_operand" "m,m")))]
-  "(<SSEMODEI24:MODE>mode != DImode || TARGET_64BIT)
+         (match_operand:SWI48x 1 "memory_operand" "m,m")))]
+  "(<SWI48x:MODE>mode != DImode || TARGET_64BIT)
    && SSE_FLOAT_MODE_P (<MODEF:MODE>mode) && TARGET_MIX_SSE_I387
    && !(TARGET_INTER_UNIT_CONVERSIONS || optimize_function_for_size_p (cfun))"
   "@
    fild%Z1\t%1
-   %vcvtsi2<MODEF:ssemodesuffix><SSEMODEI24:rex64suffix>\t{%1, %d0|%d0, %1}"
+   %vcvtsi2<MODEF:ssemodesuffix><SWI48x:rex64suffix>\t{%1, %d0|%d0, %1}"
   [(set_attr "type" "fmov,sseicvt")
    (set_attr "prefix" "orig,maybe_vex")
    (set_attr "mode" "<MODEF:MODE>")
    (set (attr "prefix_rex")
      (if_then_else
        (and (eq_attr "prefix" "maybe_vex")
-           (ne (symbol_ref "<SSEMODEI24:MODE>mode == DImode") (const_int 0)))
+           (match_test "<SWI48x:MODE>mode == DImode"))
        (const_string "1")
        (const_string "*")))
    (set_attr "athlon_decode" "*,direct")
    (set_attr "fp_int_src" "true")])
 
 (define_split
-  [(set (match_operand:MODEF 0 "register_operand" "")
-       (float:MODEF (match_operand:SI 1 "register_operand" "")))
-   (clobber (match_operand:SI 2 "memory_operand" ""))]
+  [(set (match_operand:MODEF 0 "register_operand")
+       (float:MODEF (match_operand:SI 1 "register_operand")))
+   (clobber (match_operand:SI 2 "memory_operand"))]
   "TARGET_SSE2 && TARGET_SSE_MATH
    && TARGET_USE_VECTOR_CONVERTS && optimize_function_for_speed_p (cfun)
    && reload_completed
    && (SSE_REG_P (operands[0])
        || (GET_CODE (operands[0]) == SUBREG
-          && SSE_REG_P (operands[0])))"
+          && SSE_REG_P (SUBREG_REG (operands[0]))))"
   [(const_int 0)]
 {
   rtx op1 = operands[1];
       emit_insn (gen_sse2_loadld (operands[4],
                                  CONST0_RTX (V4SImode), operands[2]));
     }
-  emit_insn
-    (gen_sse2_cvtdq2<ssevecmodesuffix> (operands[3], operands[4]));
+  if (<ssevecmode>mode == V4SFmode)
+    emit_insn (gen_floatv4siv4sf2 (operands[3], operands[4]));
+  else
+    emit_insn (gen_sse2_cvtdq2pd (operands[3], operands[4]));
   DONE;
 })
 
 (define_split
-  [(set (match_operand:MODEF 0 "register_operand" "")
-       (float:MODEF (match_operand:SI 1 "memory_operand" "")))
-   (clobber (match_operand:SI 2 "memory_operand" ""))]
+  [(set (match_operand:MODEF 0 "register_operand")
+       (float:MODEF (match_operand:SI 1 "memory_operand")))
+   (clobber (match_operand:SI 2 "memory_operand"))]
   "TARGET_SSE2 && TARGET_SSE_MATH
    && TARGET_USE_VECTOR_CONVERTS && optimize_function_for_speed_p (cfun)
    && reload_completed
    && (SSE_REG_P (operands[0])
        || (GET_CODE (operands[0]) == SUBREG
-          && SSE_REG_P (operands[0])))"
+          && SSE_REG_P (SUBREG_REG (operands[0]))))"
   [(const_int 0)]
 {
   operands[3] = simplify_gen_subreg (<ssevecmode>mode, operands[0],
 
   emit_insn (gen_sse2_loadld (operands[4],
                              CONST0_RTX (V4SImode), operands[1]));
-  emit_insn
-    (gen_sse2_cvtdq2<ssevecmodesuffix> (operands[3], operands[4]));
+  if (<ssevecmode>mode == V4SFmode)
+    emit_insn (gen_floatv4siv4sf2 (operands[3], operands[4]));
+  else
+    emit_insn (gen_sse2_cvtdq2pd (operands[3], operands[4]));
   DONE;
 })
 
 (define_split
-  [(set (match_operand:MODEF 0 "register_operand" "")
-       (float:MODEF (match_operand:SI 1 "register_operand" "")))]
+  [(set (match_operand:MODEF 0 "register_operand")
+       (float:MODEF (match_operand:SI 1 "register_operand")))]
   "TARGET_SSE2 && TARGET_SSE_MATH
    && TARGET_USE_VECTOR_CONVERTS && optimize_function_for_speed_p (cfun)
    && reload_completed
    && (SSE_REG_P (operands[0])
        || (GET_CODE (operands[0]) == SUBREG
-          && SSE_REG_P (operands[0])))"
+          && SSE_REG_P (SUBREG_REG (operands[0]))))"
   [(const_int 0)]
 {
   rtx op1 = operands[1];
   if (GET_CODE (op1) == SUBREG)
     op1 = SUBREG_REG (op1);
 
-  if (GENERAL_REG_P (op1) && TARGET_INTER_UNIT_MOVES)
+  if (GENERAL_REG_P (op1))
     {
       operands[4] = simplify_gen_subreg (V4SImode, operands[0], <MODE>mode, 0);
-      emit_insn (gen_sse2_loadld (operands[4],
-                                 CONST0_RTX (V4SImode), operands[1]));
+      if (TARGET_INTER_UNIT_MOVES)
+       emit_insn (gen_sse2_loadld (operands[4],
+                                   CONST0_RTX (V4SImode), operands[1]));
+      else
+       {
+         operands[5] = ix86_force_to_memory (GET_MODE (operands[1]),
+                                             operands[1]);
+         emit_insn (gen_sse2_loadld (operands[4],
+                                     CONST0_RTX (V4SImode), operands[5]));
+         ix86_free_from_memory (GET_MODE (operands[1]));
+       }
     }
   /* We can ignore possible trapping value in the
      high part of SSE register for non-trapping math. */
     operands[4] = simplify_gen_subreg (V4SImode, operands[1], SImode, 0);
   else
     gcc_unreachable ();
-  emit_insn
-    (gen_sse2_cvtdq2<ssevecmodesuffix> (operands[3], operands[4]));
+  if (<ssevecmode>mode == V4SFmode)
+    emit_insn (gen_floatv4siv4sf2 (operands[3], operands[4]));
+  else
+    emit_insn (gen_sse2_cvtdq2pd (operands[3], operands[4]));
   DONE;
 })
 
 (define_split
-  [(set (match_operand:MODEF 0 "register_operand" "")
-       (float:MODEF (match_operand:SI 1 "memory_operand" "")))]
+  [(set (match_operand:MODEF 0 "register_operand")
+       (float:MODEF (match_operand:SI 1 "memory_operand")))]
   "TARGET_SSE2 && TARGET_SSE_MATH
    && TARGET_USE_VECTOR_CONVERTS && optimize_function_for_speed_p (cfun)
    && reload_completed
    && (SSE_REG_P (operands[0])
        || (GET_CODE (operands[0]) == SUBREG
-          && SSE_REG_P (operands[0])))"
+          && SSE_REG_P (SUBREG_REG (operands[0]))))"
   [(const_int 0)]
 {
   operands[3] = simplify_gen_subreg (<ssevecmode>mode, operands[0],
 
   emit_insn (gen_sse2_loadld (operands[4],
                              CONST0_RTX (V4SImode), operands[1]));
-  emit_insn
-    (gen_sse2_cvtdq2<ssevecmodesuffix> (operands[3], operands[4]));
+  if (<ssevecmode>mode == V4SFmode)
+    emit_insn (gen_floatv4siv4sf2 (operands[3], operands[4]));
+  else
+    emit_insn (gen_sse2_cvtdq2pd (operands[3], operands[4]));
   DONE;
 })
 
-(define_insn "*float<SSEMODEI24:mode><MODEF:mode>2_sse_with_temp"
+(define_insn "*float<SWI48x:mode><MODEF:mode>2_sse_with_temp"
   [(set (match_operand:MODEF 0 "register_operand" "=x,x")
        (float:MODEF
-         (match_operand:SSEMODEI24 1 "nonimmediate_operand" "r,m")))
-  (clobber (match_operand:SSEMODEI24 2 "memory_operand" "=m,X"))]
-  "(<SSEMODEI24:MODE>mode != DImode || TARGET_64BIT)
+         (match_operand:SWI48x 1 "nonimmediate_operand" "r,m")))
+  (clobber (match_operand:SWI48x 2 "memory_operand" "=m,X"))]
+  "(<SWI48x:MODE>mode != DImode || TARGET_64BIT)
    && SSE_FLOAT_MODE_P (<MODEF:MODE>mode) && TARGET_SSE_MATH"
   "#"
   [(set_attr "type" "sseicvt")
    (set_attr "bdver1_decode" "double,direct")
    (set_attr "fp_int_src" "true")])
 
-(define_insn "*float<SSEMODEI24:mode><MODEF:mode>2_sse_interunit"
+(define_insn "*float<SWI48x:mode><MODEF:mode>2_sse_interunit"
   [(set (match_operand:MODEF 0 "register_operand" "=x,x")
        (float:MODEF
-         (match_operand:SSEMODEI24 1 "nonimmediate_operand" "r,m")))]
-  "(<SSEMODEI24:MODE>mode != DImode || TARGET_64BIT)
+         (match_operand:SWI48x 1 "nonimmediate_operand" "r,m")))]
+  "(<SWI48x:MODE>mode != DImode || TARGET_64BIT)
    && SSE_FLOAT_MODE_P (<MODEF:MODE>mode) && TARGET_SSE_MATH
    && (TARGET_INTER_UNIT_CONVERSIONS || optimize_function_for_size_p (cfun))"
-  "%vcvtsi2<MODEF:ssemodesuffix><SSEMODEI24:rex64suffix>\t{%1, %d0|%d0, %1}"
+  "%vcvtsi2<MODEF:ssemodesuffix><SWI48x:rex64suffix>\t{%1, %d0|%d0, %1}"
   [(set_attr "type" "sseicvt")
    (set_attr "prefix" "maybe_vex")
    (set_attr "mode" "<MODEF:MODE>")
    (set (attr "prefix_rex")
      (if_then_else
        (and (eq_attr "prefix" "maybe_vex")
-           (ne (symbol_ref "<SSEMODEI24:MODE>mode == DImode") (const_int 0)))
+           (match_test "<SWI48x:MODE>mode == DImode"))
        (const_string "1")
        (const_string "*")))
    (set_attr "athlon_decode" "double,direct")
    (set_attr "fp_int_src" "true")])
 
 (define_split
-  [(set (match_operand:MODEF 0 "register_operand" "")
-       (float:MODEF (match_operand:SSEMODEI24 1 "nonimmediate_operand" "")))
-   (clobber (match_operand:SSEMODEI24 2 "memory_operand" ""))]
-  "(<SSEMODEI24:MODE>mode != DImode || TARGET_64BIT)
+  [(set (match_operand:MODEF 0 "register_operand")
+       (float:MODEF (match_operand:SWI48x 1 "nonimmediate_operand")))
+   (clobber (match_operand:SWI48x 2 "memory_operand"))]
+  "(<SWI48x:MODE>mode != DImode || TARGET_64BIT)
    && SSE_FLOAT_MODE_P (<MODEF:MODE>mode) && TARGET_SSE_MATH
    && (TARGET_INTER_UNIT_CONVERSIONS || optimize_function_for_size_p (cfun))
    && reload_completed
    && (SSE_REG_P (operands[0])
        || (GET_CODE (operands[0]) == SUBREG
-          && SSE_REG_P (operands[0])))"
+          && SSE_REG_P (SUBREG_REG (operands[0]))))"
   [(set (match_dup 0) (float:MODEF (match_dup 1)))])
 
-(define_insn "*float<SSEMODEI24:mode><MODEF:mode>2_sse_nointerunit"
+(define_insn "*float<SWI48x:mode><MODEF:mode>2_sse_nointerunit"
   [(set (match_operand:MODEF 0 "register_operand" "=x")
        (float:MODEF
-         (match_operand:SSEMODEI24 1 "memory_operand" "m")))]
-  "(<SSEMODEI24:MODE>mode != DImode || TARGET_64BIT)
+         (match_operand:SWI48x 1 "memory_operand" "m")))]
+  "(<SWI48x:MODE>mode != DImode || TARGET_64BIT)
    && SSE_FLOAT_MODE_P (<MODEF:MODE>mode) && TARGET_SSE_MATH
    && !(TARGET_INTER_UNIT_CONVERSIONS || optimize_function_for_size_p (cfun))"
-  "%vcvtsi2<MODEF:ssemodesuffix><SSEMODEI24:rex64suffix>\t{%1, %d0|%d0, %1}"
+  "%vcvtsi2<MODEF:ssemodesuffix><SWI48x:rex64suffix>\t{%1, %d0|%d0, %1}"
   [(set_attr "type" "sseicvt")
    (set_attr "prefix" "maybe_vex")
    (set_attr "mode" "<MODEF:MODE>")
    (set (attr "prefix_rex")
      (if_then_else
        (and (eq_attr "prefix" "maybe_vex")
-           (ne (symbol_ref "<SSEMODEI24:MODE>mode == DImode") (const_int 0)))
+           (match_test "<SWI48x:MODE>mode == DImode"))
        (const_string "1")
        (const_string "*")))
    (set_attr "athlon_decode" "direct")
    (set_attr "fp_int_src" "true")])
 
 (define_split
-  [(set (match_operand:MODEF 0 "register_operand" "")
-       (float:MODEF (match_operand:SSEMODEI24 1 "register_operand" "")))
-   (clobber (match_operand:SSEMODEI24 2 "memory_operand" ""))]
-  "(<SSEMODEI24:MODE>mode != DImode || TARGET_64BIT)
+  [(set (match_operand:MODEF 0 "register_operand")
+       (float:MODEF (match_operand:SWI48x 1 "register_operand")))
+   (clobber (match_operand:SWI48x 2 "memory_operand"))]
+  "(<SWI48x:MODE>mode != DImode || TARGET_64BIT)
    && SSE_FLOAT_MODE_P (<MODEF:MODE>mode) && TARGET_SSE_MATH
    && !(TARGET_INTER_UNIT_CONVERSIONS || optimize_function_for_size_p (cfun))
    && reload_completed
    && (SSE_REG_P (operands[0])
        || (GET_CODE (operands[0]) == SUBREG
-          && SSE_REG_P (operands[0])))"
+          && SSE_REG_P (SUBREG_REG (operands[0]))))"
   [(set (match_dup 2) (match_dup 1))
    (set (match_dup 0) (float:MODEF (match_dup 2)))])
 
 (define_split
-  [(set (match_operand:MODEF 0 "register_operand" "")
-       (float:MODEF (match_operand:SSEMODEI24 1 "memory_operand" "")))
-   (clobber (match_operand:SSEMODEI24 2 "memory_operand" ""))]
-  "(<SSEMODEI24:MODE>mode != DImode || TARGET_64BIT)
+  [(set (match_operand:MODEF 0 "register_operand")
+       (float:MODEF (match_operand:SWI48x 1 "memory_operand")))
+   (clobber (match_operand:SWI48x 2 "memory_operand"))]
+  "(<SWI48x:MODE>mode != DImode || TARGET_64BIT)
    && SSE_FLOAT_MODE_P (<MODEF:MODE>mode) && TARGET_SSE_MATH
    && reload_completed
    && (SSE_REG_P (operands[0])
        || (GET_CODE (operands[0]) == SUBREG
-          && SSE_REG_P (operands[0])))"
+          && SSE_REG_P (SUBREG_REG (operands[0]))))"
   [(set (match_dup 0) (float:MODEF (match_dup 1)))])
 
-(define_insn "*float<SSEMODEI24:mode><X87MODEF:mode>2_i387_with_temp"
+(define_insn "*float<SWI48x:mode><X87MODEF:mode>2_i387_with_temp"
   [(set (match_operand:X87MODEF 0 "register_operand" "=f,f")
        (float:X87MODEF
-         (match_operand:SSEMODEI24 1 "nonimmediate_operand" "m,?r")))
-  (clobber (match_operand:SSEMODEI24 2 "memory_operand" "=X,m"))]
+         (match_operand:SWI48x 1 "nonimmediate_operand" "m,?r")))
+  (clobber (match_operand:SWI48x 2 "memory_operand" "=X,m"))]
   "TARGET_80387
-   && X87_ENABLE_FLOAT (<X87MODEF:MODE>mode, <SSEMODEI24:MODE>mode)"
+   && X87_ENABLE_FLOAT (<X87MODEF:MODE>mode, <SWI48x:MODE>mode)"
   "@
    fild%Z1\t%1
    #"
    (set_attr "unit" "*,i387")
    (set_attr "fp_int_src" "true")])
 
-(define_insn "*float<SSEMODEI24:mode><X87MODEF:mode>2_i387"
+(define_insn "*float<SWI48x:mode><X87MODEF:mode>2_i387"
   [(set (match_operand:X87MODEF 0 "register_operand" "=f")
        (float:X87MODEF
-         (match_operand:SSEMODEI24 1 "memory_operand" "m")))]
+         (match_operand:SWI48x 1 "memory_operand" "m")))]
   "TARGET_80387
-   && X87_ENABLE_FLOAT (<X87MODEF:MODE>mode, <SSEMODEI24:MODE>mode)"
+   && X87_ENABLE_FLOAT (<X87MODEF:MODE>mode, <SWI48x:MODE>mode)"
   "fild%Z1\t%1"
   [(set_attr "type" "fmov")
    (set_attr "mode" "<X87MODEF:MODE>")
    (set_attr "fp_int_src" "true")])
 
 (define_split
-  [(set (match_operand:X87MODEF 0 "register_operand" "")
-       (float:X87MODEF (match_operand:SSEMODEI24 1 "register_operand" "")))
-   (clobber (match_operand:SSEMODEI24 2 "memory_operand" ""))]
+  [(set (match_operand:X87MODEF 0 "fp_register_operand")
+       (float:X87MODEF (match_operand:SWI48x 1 "register_operand")))
+   (clobber (match_operand:SWI48x 2 "memory_operand"))]
   "TARGET_80387
-   && X87_ENABLE_FLOAT (<X87MODEF:MODE>mode, <SSEMODEI24:MODE>mode)
-   && reload_completed
-   && FP_REG_P (operands[0])"
+   && X87_ENABLE_FLOAT (<X87MODEF:MODE>mode, <SWI48x:MODE>mode)
+   && reload_completed"
   [(set (match_dup 2) (match_dup 1))
    (set (match_dup 0) (float:X87MODEF (match_dup 2)))])
 
 (define_split
-  [(set (match_operand:X87MODEF 0 "register_operand" "")
-       (float:X87MODEF (match_operand:SSEMODEI24 1 "memory_operand" "")))
-   (clobber (match_operand:SSEMODEI24 2 "memory_operand" ""))]
+  [(set (match_operand:X87MODEF 0 "fp_register_operand")
+       (float:X87MODEF (match_operand:SWI48x 1 "memory_operand")))
+   (clobber (match_operand:SWI48x 2 "memory_operand"))]
   "TARGET_80387
-   && X87_ENABLE_FLOAT (<X87MODEF:MODE>mode, <SSEMODEI24:MODE>mode)
-   && reload_completed
-   && FP_REG_P (operands[0])"
+   && X87_ENABLE_FLOAT (<X87MODEF:MODE>mode, <SWI48x:MODE>mode)
+   && reload_completed"
   [(set (match_dup 0) (float:X87MODEF (match_dup 1)))])
 
 ;; Avoid store forwarding (partial memory) stall penalty
    (set_attr "fp_int_src" "true")])
 
 (define_split
-  [(set (match_operand:X87MODEF 0 "register_operand" "")
-       (float:X87MODEF (match_operand:DI 1 "register_operand" "")))
-   (clobber (match_scratch:V4SI 3 ""))
-   (clobber (match_scratch:V4SI 4 ""))
-   (clobber (match_operand:DI 2 "memory_operand" ""))]
+  [(set (match_operand:X87MODEF 0 "fp_register_operand")
+       (float:X87MODEF (match_operand:DI 1 "register_operand")))
+   (clobber (match_scratch:V4SI 3))
+   (clobber (match_scratch:V4SI 4))
+   (clobber (match_operand:DI 2 "memory_operand"))]
   "TARGET_80387 && X87_ENABLE_FLOAT (<X87MODEF:MODE>mode, DImode)
    && TARGET_SSE2 && TARGET_INTER_UNIT_MOVES
    && !TARGET_64BIT && optimize_function_for_speed_p (cfun)
-   && reload_completed
-   && FP_REG_P (operands[0])"
+   && reload_completed"
   [(set (match_dup 2) (match_dup 3))
    (set (match_dup 0) (float:X87MODEF (match_dup 2)))]
 {
 })
 
 (define_split
-  [(set (match_operand:X87MODEF 0 "register_operand" "")
-       (float:X87MODEF (match_operand:DI 1 "memory_operand" "")))
-   (clobber (match_scratch:V4SI 3 ""))
-   (clobber (match_scratch:V4SI 4 ""))
-   (clobber (match_operand:DI 2 "memory_operand" ""))]
+  [(set (match_operand:X87MODEF 0 "fp_register_operand")
+       (float:X87MODEF (match_operand:DI 1 "memory_operand")))
+   (clobber (match_scratch:V4SI 3))
+   (clobber (match_scratch:V4SI 4))
+   (clobber (match_operand:DI 2 "memory_operand"))]
   "TARGET_80387 && X87_ENABLE_FLOAT (<X87MODEF:MODE>mode, DImode)
    && TARGET_SSE2 && TARGET_INTER_UNIT_MOVES
    && !TARGET_64BIT && optimize_function_for_speed_p (cfun)
-   && reload_completed
-   && FP_REG_P (operands[0])"
+   && reload_completed"
   [(set (match_dup 0) (float:X87MODEF (match_dup 1)))])
 
 ;; Avoid store forwarding (partial memory) stall penalty by extending
    (set_attr "mode" "<MODE>")])
 
 (define_split
-  [(set (match_operand:X87MODEF 0 "register_operand" "")
+  [(set (match_operand:X87MODEF 0 "register_operand")
        (unsigned_float:X87MODEF
-         (match_operand:SI 1 "register_operand" "")))
-   (clobber (match_operand:DI 2 "memory_operand" ""))
-   (clobber (match_scratch:SI 3 ""))]
+         (match_operand:SI 1 "register_operand")))
+   (clobber (match_operand:DI 2 "memory_operand"))
+   (clobber (match_scratch:SI 3))]
   "!TARGET_64BIT
    && TARGET_80387 && X87_ENABLE_FLOAT (<X87MODEF:MODE>mode, DImode)
    && TARGET_SSE
   "operands[1] = simplify_gen_subreg (DImode, operands[1], SImode, 0);")
 
 (define_split
-  [(set (match_operand:X87MODEF 0 "register_operand" "")
+  [(set (match_operand:X87MODEF 0 "register_operand")
        (unsigned_float:X87MODEF
-         (match_operand:SI 1 "memory_operand" "")))
-   (clobber (match_operand:DI 2 "memory_operand" ""))
-   (clobber (match_scratch:SI 3 ""))]
+         (match_operand:SI 1 "memory_operand")))
+   (clobber (match_operand:DI 2 "memory_operand"))
+   (clobber (match_scratch:SI 3))]
   "!TARGET_64BIT
    && TARGET_80387 && X87_ENABLE_FLOAT (<X87MODEF:MODE>mode, DImode)
    && TARGET_SSE
 
 (define_expand "floatunssi<mode>2"
   [(parallel
-     [(set (match_operand:X87MODEF 0 "register_operand" "")
+     [(set (match_operand:X87MODEF 0 "register_operand")
           (unsigned_float:X87MODEF
-            (match_operand:SI 1 "nonimmediate_operand" "")))
+            (match_operand:SI 1 "nonimmediate_operand")))
       (clobber (match_dup 2))
-      (clobber (match_scratch:SI 3 ""))])]
+      (clobber (match_scratch:SI 3))])]
   "!TARGET_64BIT
    && ((TARGET_80387 && X87_ENABLE_FLOAT (<X87MODEF:MODE>mode, DImode)
        && TARGET_SSE)
 })
 
 (define_expand "floatunsdisf2"
-  [(use (match_operand:SF 0 "register_operand" ""))
-   (use (match_operand:DI 1 "nonimmediate_operand" ""))]
+  [(use (match_operand:SF 0 "register_operand"))
+   (use (match_operand:DI 1 "nonimmediate_operand"))]
   "TARGET_64BIT && TARGET_SSE_MATH"
   "x86_emit_floatuns (operands); DONE;")
 
 (define_expand "floatunsdidf2"
-  [(use (match_operand:DF 0 "register_operand" ""))
-   (use (match_operand:DI 1 "nonimmediate_operand" ""))]
+  [(use (match_operand:DF 0 "register_operand"))
+   (use (match_operand:DI 1 "nonimmediate_operand"))]
   "(TARGET_64BIT || TARGET_KEEPS_VECTOR_ALIGNED_STACK)
    && TARGET_SSE2 && TARGET_SSE_MATH"
 {
 ;; Add instructions
 
 (define_expand "add<mode>3"
-  [(set (match_operand:SDWIM 0 "nonimmediate_operand" "")
-       (plus:SDWIM (match_operand:SDWIM 1 "nonimmediate_operand" "")
-                   (match_operand:SDWIM 2 "<general_operand>" "")))]
+  [(set (match_operand:SDWIM 0 "nonimmediate_operand")
+       (plus:SDWIM (match_operand:SDWIM 1 "nonimmediate_operand")
+                   (match_operand:SDWIM 2 "<general_operand>")))]
   ""
   "ix86_expand_binary_operator (PLUS, <MODE>mode, operands); DONE;")
 
   [(set_attr "type" "alu")
    (set_attr "mode" "QI")])
 
-(define_insn "*lea_1"
-  [(set (match_operand:P 0 "register_operand" "=r")
-       (match_operand:P 1 "no_seg_address_operand" "p"))]
+(define_insn_and_split "*lea_1"
+  [(set (match_operand:SI 0 "register_operand" "=r")
+       (subreg:SI (match_operand:DI 1 "lea_address_operand" "p") 0))]
+  "TARGET_64BIT"
+  "lea{l}\t{%E1, %0|%0, %E1}"
+  "&& reload_completed && ix86_avoid_lea_for_addr (insn, operands)"
+  [(const_int 0)]
+{
+  ix86_split_lea_for_addr (operands, SImode);
+  DONE;
+}
+  [(set_attr "type" "lea")
+   (set_attr "mode" "SI")])
+
+(define_insn_and_split "*lea<mode>_2"
+  [(set (match_operand:SWI48 0 "register_operand" "=r")
+       (match_operand:SWI48 1 "lea_address_operand" "p"))]
   ""
-  "lea{<imodesuffix>}\t{%a1, %0|%0, %a1}"
+  "lea{<imodesuffix>}\t{%E1, %0|%0, %E1}"
+  "reload_completed && ix86_avoid_lea_for_addr (insn, operands)"
+  [(const_int 0)]
+{
+  ix86_split_lea_for_addr (operands, <MODE>mode);
+  DONE;
+}
   [(set_attr "type" "lea")
    (set_attr "mode" "<MODE>")])
 
-(define_insn "*lea_2"
-  [(set (match_operand:SI 0 "register_operand" "=r")
-       (subreg:SI (match_operand:DI 1 "no_seg_address_operand" "p") 0))]
+(define_insn "*lea_3_zext"
+  [(set (match_operand:DI 0 "register_operand" "=r")
+       (zero_extend:DI
+         (subreg:SI (match_operand:DI 1 "lea_address_operand" "j") 0)))]
   "TARGET_64BIT"
-  "lea{l}\t{%a1, %0|%0, %a1}"
+  "lea{l}\t{%E1, %k0|%k0, %E1}"
   [(set_attr "type" "lea")
    (set_attr "mode" "SI")])
 
-(define_insn "*lea_2_zext"
+(define_insn "*lea_4_zext"
   [(set (match_operand:DI 0 "register_operand" "=r")
        (zero_extend:DI
-         (subreg:SI (match_operand:DI 1 "no_seg_address_operand" "p") 0)))]
+         (match_operand:SI 1 "lea_address_operand" "j")))]
+  "TARGET_64BIT"
+  "lea{l}\t{%E1, %k0|%k0, %E1}"
+  [(set_attr "type" "lea")
+   (set_attr "mode" "SI")])
+
+(define_insn "*lea_5_zext"
+  [(set (match_operand:DI 0 "register_operand" "=r")
+       (and:DI
+         (subreg:DI (match_operand:SI 1 "lea_address_operand" "p") 0)
+         (match_operand:DI 2 "const_32bit_mask" "n")))]
+  "TARGET_64BIT"
+  "lea{l}\t{%E1, %k0|%k0, %E1}"
+  [(set_attr "type" "lea")
+   (set_attr "mode" "SI")])
+
+(define_insn "*lea_6_zext"
+  [(set (match_operand:DI 0 "register_operand" "=r")
+       (and:DI
+         (match_operand:DI 1 "lea_address_operand" "p")
+         (match_operand:DI 2 "const_32bit_mask" "n")))]
   "TARGET_64BIT"
-  "lea{l}\t{%a1, %k0|%k0, %a1}"
+  "lea{l}\t{%E1, %k0|%k0, %E1}"
   [(set_attr "type" "lea")
    (set_attr "mode" "SI")])
 
   [(set (match_operand:SWI48 0 "nonimmediate_operand" "=r,rm,r,r")
        (plus:SWI48
          (match_operand:SWI48 1 "nonimmediate_operand" "%0,0,r,r")
-         (match_operand:SWI48 2 "<general_operand>" "<g>,r<i>,0,l<i>")))
+         (match_operand:SWI48 2 "x86_64_general_operand" "rme,re,0,le")))
    (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (PLUS, <MODE>mode, operands)"
 {
   [(set (attr "type")
      (cond [(eq_attr "alternative" "3")
               (const_string "lea")
-           (match_operand:SWI48 2 "incdec_operand" "")
+           (match_operand:SWI48 2 "incdec_operand")
              (const_string "incdec")
           ]
           (const_string "alu")))
    (set (attr "length_immediate")
       (if_then_else
-       (and (eq_attr "type" "alu") (match_operand 2 "const128_operand" ""))
+       (and (eq_attr "type" "alu") (match_operand 2 "const128_operand"))
        (const_string "1")
        (const_string "*")))
    (set_attr "mode" "<MODE>")])
 ;; operands so proper swapping will be done in reload.  This allow
 ;; patterns constructed from addsi_1 to match.
 
-(define_insn "*addsi_1_zext"
+(define_insn "addsi_1_zext"
   [(set (match_operand:DI 0 "register_operand" "=r,r,r")
        (zero_extend:DI
          (plus:SI (match_operand:SI 1 "nonimmediate_operand" "%0,r,r")
-                  (match_operand:SI 2 "general_operand" "g,0,li"))))
+                  (match_operand:SI 2 "x86_64_general_operand" "rme,0,le"))))
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (PLUS, SImode, operands)"
 {
   [(set (attr "type")
      (cond [(eq_attr "alternative" "2")
              (const_string "lea")
-           (match_operand:SI 2 "incdec_operand" "")
+           (match_operand:SI 2 "incdec_operand")
              (const_string "incdec")
           ]
           (const_string "alu")))
    (set (attr "length_immediate")
       (if_then_else
-       (and (eq_attr "type" "alu") (match_operand 2 "const128_operand" ""))
+       (and (eq_attr "type" "alu") (match_operand 2 "const128_operand"))
        (const_string "1")
        (const_string "*")))
    (set_attr "mode" "SI")])
 
 (define_insn "*addhi_1"
-  [(set (match_operand:HI 0 "nonimmediate_operand" "=rm,r")
-       (plus:HI (match_operand:HI 1 "nonimmediate_operand" "%0,0")
-                (match_operand:HI 2 "general_operand" "rn,rm")))
-   (clobber (reg:CC FLAGS_REG))]
-  "TARGET_PARTIAL_REG_STALL
-   && ix86_binary_operator_ok (PLUS, HImode, operands)"
-{
-  switch (get_attr_type (insn))
-    {
-    case TYPE_INCDEC:
-      if (operands[2] == const1_rtx)
-       return "inc{w}\t%0";
-      else
-        {
-         gcc_assert (operands[2] == constm1_rtx);
-         return "dec{w}\t%0";
-       }
-
-    default:
-      if (x86_maybe_negate_const_int (&operands[2], HImode))
-       return "sub{w}\t{%2, %0|%0, %2}";
-
-      return "add{w}\t{%2, %0|%0, %2}";
-    }
-}
-  [(set (attr "type")
-     (if_then_else (match_operand:HI 2 "incdec_operand" "")
-       (const_string "incdec")
-       (const_string "alu")))
-   (set (attr "length_immediate")
-      (if_then_else
-       (and (eq_attr "type" "alu") (match_operand 2 "const128_operand" ""))
-       (const_string "1")
-       (const_string "*")))
-   (set_attr "mode" "HI")])
-
-(define_insn "*addhi_1_lea"
-  [(set (match_operand:HI 0 "nonimmediate_operand" "=r,rm,r,r")
-       (plus:HI (match_operand:HI 1 "nonimmediate_operand" "%0,0,r,r")
-                (match_operand:HI 2 "general_operand" "rmn,rn,0,ln")))
+  [(set (match_operand:HI 0 "nonimmediate_operand" "=rm,r,r,Yp")
+       (plus:HI (match_operand:HI 1 "nonimmediate_operand" "%0,0,r,Yp")
+                (match_operand:HI 2 "general_operand" "rn,rm,0,ln")))
    (clobber (reg:CC FLAGS_REG))]
-  "!TARGET_PARTIAL_REG_STALL
-   && ix86_binary_operator_ok (PLUS, HImode, operands)"
+  "ix86_binary_operator_ok (PLUS, HImode, operands)"
 {
   switch (get_attr_type (insn))
     {
   [(set (attr "type")
      (cond [(eq_attr "alternative" "3")
               (const_string "lea")
-           (match_operand:HI 2 "incdec_operand" "")
+           (match_operand:HI 2 "incdec_operand")
              (const_string "incdec")
           ]
           (const_string "alu")))
    (set (attr "length_immediate")
       (if_then_else
-       (and (eq_attr "type" "alu") (match_operand 2 "const128_operand" ""))
+       (and (eq_attr "type" "alu") (match_operand 2 "const128_operand"))
        (const_string "1")
        (const_string "*")))
    (set_attr "mode" "HI,HI,HI,SI")])
 
-;; %%% Potential partial reg stall on alternative 2.  What to do?
-(define_insn "*addqi_1"
-  [(set (match_operand:QI 0 "nonimmediate_operand" "=qm,q,r")
-       (plus:QI (match_operand:QI 1 "nonimmediate_operand" "%0,0,0")
-                (match_operand:QI 2 "general_operand" "qn,qmn,rn")))
-   (clobber (reg:CC FLAGS_REG))]
-  "TARGET_PARTIAL_REG_STALL
-   && ix86_binary_operator_ok (PLUS, QImode, operands)"
-{
-  int widen = (which_alternative == 2);
-  switch (get_attr_type (insn))
-    {
-    case TYPE_INCDEC:
-      if (operands[2] == const1_rtx)
-       return widen ? "inc{l}\t%k0" : "inc{b}\t%0";
-      else
-       {
-         gcc_assert (operands[2] == constm1_rtx);
-         return widen ? "dec{l}\t%k0" : "dec{b}\t%0";
-       }
-
-    default:
-      if (x86_maybe_negate_const_int (&operands[2], QImode))
-       {
-         if (widen)
-           return "sub{l}\t{%2, %k0|%k0, %2}";
-         else
-           return "sub{b}\t{%2, %0|%0, %2}";
-       }
-      if (widen)
-        return "add{l}\t{%k2, %k0|%k0, %k2}";
-      else
-        return "add{b}\t{%2, %0|%0, %2}";
-    }
-}
-  [(set (attr "type")
-     (if_then_else (match_operand:QI 2 "incdec_operand" "")
-       (const_string "incdec")
-       (const_string "alu")))
-   (set (attr "length_immediate")
-      (if_then_else
-       (and (eq_attr "type" "alu") (match_operand 2 "const128_operand" ""))
-       (const_string "1")
-       (const_string "*")))
-   (set_attr "mode" "QI,QI,SI")])
-
 ;; %%% Potential partial reg stall on alternatives 3 and 4.  What to do?
-(define_insn "*addqi_1_lea"
-  [(set (match_operand:QI 0 "nonimmediate_operand" "=q,qm,q,r,r,r")
-       (plus:QI (match_operand:QI 1 "nonimmediate_operand" "%0,0,q,0,r,r")
-                (match_operand:QI 2 "general_operand" "qmn,qn,0,rn,0,ln")))
+(define_insn "*addqi_1"
+  [(set (match_operand:QI 0 "nonimmediate_operand" "=qm,q,q,r,r,Yp")
+       (plus:QI (match_operand:QI 1 "nonimmediate_operand" "%0,0,q,0,r,Yp")
+                (match_operand:QI 2 "general_operand" "qn,qm,0,rn,0,ln")))
    (clobber (reg:CC FLAGS_REG))]
-  "!TARGET_PARTIAL_REG_STALL
-   && ix86_binary_operator_ok (PLUS, QImode, operands)"
+  "ix86_binary_operator_ok (PLUS, QImode, operands)"
 {
-  int widen = (which_alternative == 3 || which_alternative == 4);
+  bool widen = (which_alternative == 3 || which_alternative == 4);
 
   switch (get_attr_type (insn))
     {
   [(set (attr "type")
      (cond [(eq_attr "alternative" "5")
               (const_string "lea")
-           (match_operand:QI 2 "incdec_operand" "")
+           (match_operand:QI 2 "incdec_operand")
              (const_string "incdec")
           ]
           (const_string "alu")))
    (set (attr "length_immediate")
       (if_then_else
-       (and (eq_attr "type" "alu") (match_operand 2 "const128_operand" ""))
+       (and (eq_attr "type" "alu") (match_operand 2 "const128_operand"))
        (const_string "1")
        (const_string "*")))
    (set_attr "mode" "QI,QI,QI,SI,SI,SI")])
 (define_insn "*addqi_1_slp"
   [(set (strict_low_part (match_operand:QI 0 "nonimmediate_operand" "+qm,q"))
        (plus:QI (match_dup 0)
-                (match_operand:QI 1 "general_operand" "qn,qnm")))
+                (match_operand:QI 1 "general_operand" "qn,qm")))
    (clobber (reg:CC FLAGS_REG))]
   "(! TARGET_PARTIAL_REG_STALL || optimize_function_for_size_p (cfun))
    && !(MEM_P (operands[0]) && MEM_P (operands[1]))"
     }
 }
   [(set (attr "type")
-     (if_then_else (match_operand:QI 1 "incdec_operand" "")
+     (if_then_else (match_operand:QI 1 "incdec_operand")
        (const_string "incdec")
        (const_string "alu1")))
    (set (attr "memory")
-     (if_then_else (match_operand 1 "memory_operand" "")
+     (if_then_else (match_operand 1 "memory_operand")
         (const_string "load")
         (const_string "none")))
    (set_attr "mode" "QI")])
 
-;; Convert lea to the lea pattern to avoid flags dependency.
+;; Split non destructive adds if we cannot use lea.
+(define_split
+  [(set (match_operand:SWI48 0 "register_operand")
+       (plus:SWI48 (match_operand:SWI48 1 "register_operand")
+              (match_operand:SWI48 2 "nonmemory_operand")))
+   (clobber (reg:CC FLAGS_REG))]
+  "reload_completed && ix86_avoid_lea_for_add (insn, operands)"
+  [(set (match_dup 0) (match_dup 1))
+   (parallel [(set (match_dup 0) (plus:<MODE> (match_dup 0) (match_dup 2)))
+             (clobber (reg:CC FLAGS_REG))])])
+
+;; Convert add to the lea pattern to avoid flags dependency.
 (define_split
-  [(set (match_operand 0 "register_operand" "")
-       (plus (match_operand 1 "register_operand" "")
-              (match_operand 2 "nonmemory_operand" "")))
+  [(set (match_operand:SWI 0 "register_operand")
+       (plus:SWI (match_operand:SWI 1 "register_operand")
+                 (match_operand:SWI 2 "<nonmemory_operand>")))
    (clobber (reg:CC FLAGS_REG))]
   "reload_completed && ix86_lea_for_add_ok (insn, operands)" 
   [(const_int 0)]
 {
+  enum machine_mode mode = <MODE>mode;
   rtx pat;
-  enum machine_mode mode = GET_MODE (operands[0]);
-
-  /* In -fPIC mode the constructs like (const (unspec [symbol_ref]))
-     may confuse gen_lowpart.  */
-  if (mode != Pmode)
-    {
-      operands[1] = gen_lowpart (Pmode, operands[1]);
-      operands[2] = gen_lowpart (Pmode, operands[2]);
-    }
-
-  pat = gen_rtx_PLUS (Pmode, operands[1], operands[2]);
 
   if (GET_MODE_SIZE (mode) < GET_MODE_SIZE (SImode))
-    operands[0] = gen_lowpart (SImode, operands[0]);
+    { 
+      mode = SImode; 
+      operands[0] = gen_lowpart (mode, operands[0]);
+      operands[1] = gen_lowpart (mode, operands[1]);
+      operands[2] = gen_lowpart (mode, operands[2]);
+    }
 
-  if (TARGET_64BIT && mode != Pmode)
-    pat = gen_rtx_SUBREG (SImode, pat, 0);
+  pat = gen_rtx_PLUS (mode, operands[1], operands[2]);
 
   emit_insn (gen_rtx_SET (VOIDmode, operands[0], pat));
   DONE;
 })
 
-;; Convert lea to the lea pattern to avoid flags dependency.
-;; ??? This pattern handles immediate operands that do not satisfy immediate
-;; operand predicate (TARGET_LEGITIMATE_CONSTANT_P) in the previous pattern.
+;; Convert add to the lea pattern to avoid flags dependency.
 (define_split
-  [(set (match_operand:DI 0 "register_operand" "")
-       (plus:DI (match_operand:DI 1 "register_operand" "")
-                (match_operand:DI 2 "x86_64_immediate_operand" "")))
-   (clobber (reg:CC FLAGS_REG))]
-  "TARGET_64BIT && reload_completed 
-   && true_regnum (operands[0]) != true_regnum (operands[1])"
-  [(set (match_dup 0)
-       (plus:DI (match_dup 1) (match_dup 2)))])
-
-;; Convert lea to the lea pattern to avoid flags dependency.
-(define_split
-  [(set (match_operand:DI 0 "register_operand" "")
+  [(set (match_operand:DI 0 "register_operand")
        (zero_extend:DI
-         (plus:SI (match_operand:SI 1 "register_operand" "")
-                  (match_operand:SI 2 "nonmemory_operand" ""))))
+         (plus:SI (match_operand:SI 1 "register_operand")
+                  (match_operand:SI 2 "x86_64_nonmemory_operand"))))
    (clobber (reg:CC FLAGS_REG))]
-  "TARGET_64BIT && reload_completed
-   && ix86_lea_for_add_ok (insn, operands)"
+  "TARGET_64BIT && reload_completed && ix86_lea_for_add_ok (insn, operands)"
   [(set (match_dup 0)
-       (zero_extend:DI (subreg:SI (plus:DI (match_dup 1) (match_dup 2)) 0)))]
-{
-  operands[1] = gen_lowpart (DImode, operands[1]);
-  operands[2] = gen_lowpart (DImode, operands[2]);
-})
+       (zero_extend:DI (plus:SI (match_dup 1) (match_dup 2))))])
 
 (define_insn "*add<mode>_2"
   [(set (reg FLAGS_REG)
     }
 }
   [(set (attr "type")
-     (if_then_else (match_operand:SWI 2 "incdec_operand" "")
+     (if_then_else (match_operand:SWI 2 "incdec_operand")
        (const_string "incdec")
        (const_string "alu")))
    (set (attr "length_immediate")
       (if_then_else
-       (and (eq_attr "type" "alu") (match_operand 2 "const128_operand" ""))
+       (and (eq_attr "type" "alu") (match_operand 2 "const128_operand"))
        (const_string "1")
        (const_string "*")))
    (set_attr "mode" "<MODE>")])
   [(set (reg FLAGS_REG)
        (compare
          (plus:SI (match_operand:SI 1 "nonimmediate_operand" "%0")
-                  (match_operand:SI 2 "general_operand" "g"))
+                  (match_operand:SI 2 "x86_64_general_operand" "rme"))
          (const_int 0)))
    (set (match_operand:DI 0 "register_operand" "=r")
        (zero_extend:DI (plus:SI (match_dup 1) (match_dup 2))))]
     }
 }
   [(set (attr "type")
-     (if_then_else (match_operand:SI 2 "incdec_operand" "")
+     (if_then_else (match_operand:SI 2 "incdec_operand")
        (const_string "incdec")
        (const_string "alu")))
    (set (attr "length_immediate")
       (if_then_else
-       (and (eq_attr "type" "alu") (match_operand 2 "const128_operand" ""))
+       (and (eq_attr "type" "alu") (match_operand 2 "const128_operand"))
        (const_string "1")
        (const_string "*")))
    (set_attr "mode" "SI")])
     }
 }
   [(set (attr "type")
-     (if_then_else (match_operand:SWI 2 "incdec_operand" "")
+     (if_then_else (match_operand:SWI 2 "incdec_operand")
        (const_string "incdec")
        (const_string "alu")))
    (set (attr "length_immediate")
       (if_then_else
-       (and (eq_attr "type" "alu") (match_operand 2 "const128_operand" ""))
+       (and (eq_attr "type" "alu") (match_operand 2 "const128_operand"))
        (const_string "1")
        (const_string "*")))
    (set_attr "mode" "<MODE>")])
 (define_insn "*addsi_3_zext"
   [(set (reg FLAGS_REG)
        (compare
-         (neg:SI (match_operand:SI 2 "general_operand" "g"))
+         (neg:SI (match_operand:SI 2 "x86_64_general_operand" "rme"))
          (match_operand:SI 1 "nonimmediate_operand" "%0")))
    (set (match_operand:DI 0 "register_operand" "=r")
        (zero_extend:DI (plus:SI (match_dup 1) (match_dup 2))))]
     }
 }
   [(set (attr "type")
-     (if_then_else (match_operand:SI 2 "incdec_operand" "")
+     (if_then_else (match_operand:SI 2 "incdec_operand")
        (const_string "incdec")
        (const_string "alu")))
    (set (attr "length_immediate")
       (if_then_else
-       (and (eq_attr "type" "alu") (match_operand 2 "const128_operand" ""))
+       (and (eq_attr "type" "alu") (match_operand 2 "const128_operand"))
        (const_string "1")
        (const_string "*")))
    (set_attr "mode" "SI")])
     }
 }
   [(set (attr "type")
-     (if_then_else (match_operand:DI 2 "incdec_operand" "")
+     (if_then_else (match_operand:DI 2 "incdec_operand")
        (const_string "incdec")
        (const_string "alu")))
    (set (attr "length_immediate")
       (if_then_else
-       (and (eq_attr "type" "alu") (match_operand 2 "const128_operand" ""))
+       (and (eq_attr "type" "alu") (match_operand 2 "const128_operand"))
        (const_string "1")
        (const_string "*")))
    (set_attr "mode" "DI")])
     }
 }
   [(set (attr "type")
-     (if_then_else (match_operand:<MODE> 2 "incdec_operand" "")
+     (if_then_else (match_operand:<MODE> 2 "incdec_operand")
        (const_string "incdec")
        (const_string "alu")))
    (set (attr "length_immediate")
       (if_then_else
-       (and (eq_attr "type" "alu") (match_operand 2 "const128_operand" ""))
+       (and (eq_attr "type" "alu") (match_operand 2 "const128_operand"))
        (const_string "1")
        (const_string "*")))
    (set_attr "mode" "<MODE>")])
     }
 }
   [(set (attr "type")
-     (if_then_else (match_operand:SWI 2 "incdec_operand" "")
+     (if_then_else (match_operand:SWI 2 "incdec_operand")
        (const_string "incdec")
        (const_string "alu")))
    (set (attr "length_immediate")
       (if_then_else
-       (and (eq_attr "type" "alu") (match_operand 2 "const128_operand" ""))
+       (and (eq_attr "type" "alu") (match_operand 2 "const128_operand"))
        (const_string "1")
        (const_string "*")))
    (set_attr "mode" "<MODE>")])
     }
 }
   [(set (attr "type")
-     (if_then_else (match_operand:QI 2 "incdec_operand" "")
+     (if_then_else (match_operand:QI 2 "incdec_operand")
        (const_string "incdec")
        (const_string "alu")))
    (set_attr "modrm" "1")
     }
 }
   [(set (attr "type")
-     (if_then_else (match_operand:QI 2 "incdec_operand" "")
+     (if_then_else (match_operand:QI 2 "incdec_operand")
        (const_string "incdec")
        (const_string "alu")))
    (set_attr "modrm" "1")
   [(set_attr "type" "alu")
    (set_attr "mode" "QI")])
 
-;; The lea patterns for non-Pmodes needs to be matched by
+;; The lea patterns for modes less than 32 bits need to be matched by
 ;; several insns converted to real lea by splitters.
 
 (define_insn_and_split "*lea_general_1"
        (plus (plus (match_operand 1 "index_register_operand" "l")
                    (match_operand 2 "register_operand" "r"))
              (match_operand 3 "immediate_operand" "i")))]
-  "(GET_MODE (operands[0]) == QImode || GET_MODE (operands[0]) == HImode
-    || (TARGET_64BIT && GET_MODE (operands[0]) == SImode))
+  "(GET_MODE (operands[0]) == QImode || GET_MODE (operands[0]) == HImode)
    && (!TARGET_PARTIAL_REG_STALL || optimize_function_for_size_p (cfun))
    && GET_MODE (operands[0]) == GET_MODE (operands[1])
    && GET_MODE (operands[0]) == GET_MODE (operands[2])
   "&& reload_completed"
   [(const_int 0)]
 {
+  enum machine_mode mode = SImode;
   rtx pat;
-  operands[0] = gen_lowpart (SImode, operands[0]);
-  operands[1] = gen_lowpart (Pmode, operands[1]);
-  operands[2] = gen_lowpart (Pmode, operands[2]);
-  operands[3] = gen_lowpart (Pmode, operands[3]);
-  pat = gen_rtx_PLUS (Pmode, gen_rtx_PLUS (Pmode, operands[1], operands[2]),
+
+  operands[0] = gen_lowpart (mode, operands[0]);
+  operands[1] = gen_lowpart (mode, operands[1]);
+  operands[2] = gen_lowpart (mode, operands[2]);
+  operands[3] = gen_lowpart (mode, operands[3]);
+
+  pat = gen_rtx_PLUS (mode, gen_rtx_PLUS (mode, operands[1], operands[2]),
                      operands[3]);
-  if (Pmode != SImode)
-    pat = gen_rtx_SUBREG (SImode, pat, 0);
+
   emit_insn (gen_rtx_SET (VOIDmode, operands[0], pat));
   DONE;
 }
   [(set_attr "type" "lea")
    (set_attr "mode" "SI")])
 
-(define_insn_and_split "*lea_general_1_zext"
-  [(set (match_operand:DI 0 "register_operand" "=r")
-       (zero_extend:DI
-         (plus:SI (plus:SI
-                    (match_operand:SI 1 "index_register_operand" "l")
-                    (match_operand:SI 2 "register_operand" "r"))
-                  (match_operand:SI 3 "immediate_operand" "i"))))]
-  "TARGET_64BIT"
-  "#"
-  "&& reload_completed"
-  [(set (match_dup 0)
-       (zero_extend:DI (subreg:SI (plus:DI (plus:DI (match_dup 1)
-                                                    (match_dup 2))
-                                           (match_dup 3)) 0)))]
-{
-  operands[1] = gen_lowpart (Pmode, operands[1]);
-  operands[2] = gen_lowpart (Pmode, operands[2]);
-  operands[3] = gen_lowpart (Pmode, operands[3]);
-}
-  [(set_attr "type" "lea")
-   (set_attr "mode" "SI")])
-
 (define_insn_and_split "*lea_general_2"
   [(set (match_operand 0 "register_operand" "=r")
        (plus (mult (match_operand 1 "index_register_operand" "l")
-                   (match_operand 2 "const248_operand" "i"))
+                   (match_operand 2 "const248_operand" "n"))
              (match_operand 3 "nonmemory_operand" "ri")))]
-  "(GET_MODE (operands[0]) == QImode || GET_MODE (operands[0]) == HImode
-    || (TARGET_64BIT && GET_MODE (operands[0]) == SImode))
+  "(GET_MODE (operands[0]) == QImode || GET_MODE (operands[0]) == HImode)
    && (!TARGET_PARTIAL_REG_STALL || optimize_function_for_size_p (cfun))
    && GET_MODE (operands[0]) == GET_MODE (operands[1])
    && (GET_MODE (operands[0]) == GET_MODE (operands[3])
   "&& reload_completed"
   [(const_int 0)]
 {
+  enum machine_mode mode = SImode;
   rtx pat;
-  operands[0] = gen_lowpart (SImode, operands[0]);
-  operands[1] = gen_lowpart (Pmode, operands[1]);
-  operands[3] = gen_lowpart (Pmode, operands[3]);
-  pat = gen_rtx_PLUS (Pmode, gen_rtx_MULT (Pmode, operands[1], operands[2]),
-                     operands[3]);
-  if (Pmode != SImode)
-    pat = gen_rtx_SUBREG (SImode, pat, 0);
+
+  operands[0] = gen_lowpart (mode, operands[0]);
+  operands[1] = gen_lowpart (mode, operands[1]);
+  operands[3] = gen_lowpart (mode, operands[3]);
+
+  pat = gen_rtx_PLUS (mode, gen_rtx_MULT (mode, operands[1], operands[2]),
+                     operands[3]);
+
   emit_insn (gen_rtx_SET (VOIDmode, operands[0], pat));
   DONE;
 }
   [(set_attr "type" "lea")
    (set_attr "mode" "SI")])
 
-(define_insn_and_split "*lea_general_2_zext"
-  [(set (match_operand:DI 0 "register_operand" "=r")
-       (zero_extend:DI
-         (plus:SI (mult:SI
-                    (match_operand:SI 1 "index_register_operand" "l")
-                    (match_operand:SI 2 "const248_operand" "n"))
-                  (match_operand:SI 3 "nonmemory_operand" "ri"))))]
-  "TARGET_64BIT"
-  "#"
-  "&& reload_completed"
-  [(set (match_dup 0)
-       (zero_extend:DI (subreg:SI (plus:DI (mult:DI (match_dup 1)
-                                                    (match_dup 2))
-                                           (match_dup 3)) 0)))]
-{
-  operands[1] = gen_lowpart (Pmode, operands[1]);
-  operands[3] = gen_lowpart (Pmode, operands[3]);
-}
-  [(set_attr "type" "lea")
-   (set_attr "mode" "SI")])
-
 (define_insn_and_split "*lea_general_3"
   [(set (match_operand 0 "register_operand" "=r")
        (plus (plus (mult (match_operand 1 "index_register_operand" "l")
-                         (match_operand 2 "const248_operand" "i"))
+                         (match_operand 2 "const248_operand" "n"))
                    (match_operand 3 "register_operand" "r"))
              (match_operand 4 "immediate_operand" "i")))]
-  "(GET_MODE (operands[0]) == QImode || GET_MODE (operands[0]) == HImode
-    || (TARGET_64BIT && GET_MODE (operands[0]) == SImode))
+  "(GET_MODE (operands[0]) == QImode || GET_MODE (operands[0]) == HImode)
    && (!TARGET_PARTIAL_REG_STALL || optimize_function_for_size_p (cfun))
    && GET_MODE (operands[0]) == GET_MODE (operands[1])
    && GET_MODE (operands[0]) == GET_MODE (operands[3])"
   "&& reload_completed"
   [(const_int 0)]
 {
+  enum machine_mode mode = SImode;
   rtx pat;
-  operands[0] = gen_lowpart (SImode, operands[0]);
-  operands[1] = gen_lowpart (Pmode, operands[1]);
-  operands[3] = gen_lowpart (Pmode, operands[3]);
-  operands[4] = gen_lowpart (Pmode, operands[4]);
-  pat = gen_rtx_PLUS (Pmode,
-                     gen_rtx_PLUS (Pmode, gen_rtx_MULT (Pmode, operands[1],
-                                                        operands[2]),
+
+  operands[0] = gen_lowpart (mode, operands[0]);
+  operands[1] = gen_lowpart (mode, operands[1]);
+  operands[3] = gen_lowpart (mode, operands[3]);
+  operands[4] = gen_lowpart (mode, operands[4]);
+
+  pat = gen_rtx_PLUS (mode,
+                     gen_rtx_PLUS (mode,
+                                   gen_rtx_MULT (mode, operands[1],
+                                                       operands[2]),
                                    operands[3]),
                      operands[4]);
-  if (Pmode != SImode)
-    pat = gen_rtx_SUBREG (SImode, pat, 0);
+
   emit_insn (gen_rtx_SET (VOIDmode, operands[0], pat));
   DONE;
 }
   [(set_attr "type" "lea")
    (set_attr "mode" "SI")])
 
-(define_insn_and_split "*lea_general_3_zext"
-  [(set (match_operand:DI 0 "register_operand" "=r")
-       (zero_extend:DI
-         (plus:SI (plus:SI
-                    (mult:SI
-                      (match_operand:SI 1 "index_register_operand" "l")
-                      (match_operand:SI 2 "const248_operand" "n"))
-                    (match_operand:SI 3 "register_operand" "r"))
-                  (match_operand:SI 4 "immediate_operand" "i"))))]
-  "TARGET_64BIT"
+(define_insn_and_split "*lea_general_4"
+  [(set (match_operand 0 "register_operand" "=r")
+       (any_or (ashift
+                 (match_operand 1 "index_register_operand" "l")
+                 (match_operand 2 "const_int_operand" "n"))
+               (match_operand 3 "const_int_operand" "n")))]
+  "(((GET_MODE (operands[0]) == QImode || GET_MODE (operands[0]) == HImode)
+      && (!TARGET_PARTIAL_REG_STALL || optimize_function_for_size_p (cfun)))
+    || GET_MODE (operands[0]) == SImode
+    || (TARGET_64BIT && GET_MODE (operands[0]) == DImode))
+   && GET_MODE (operands[0]) == GET_MODE (operands[1])
+   && ((unsigned HOST_WIDE_INT) INTVAL (operands[2])) - 1 < 3
+   && ((unsigned HOST_WIDE_INT) INTVAL (operands[3])
+       < ((unsigned HOST_WIDE_INT) 1 << INTVAL (operands[2])))"
   "#"
   "&& reload_completed"
-  [(set (match_dup 0)
-       (zero_extend:DI (subreg:SI (plus:DI (plus:DI (mult:DI (match_dup 1)
-                                                             (match_dup 2))
-                                                    (match_dup 3))
-                                           (match_dup 4)) 0)))]
-{
-  operands[1] = gen_lowpart (Pmode, operands[1]);
-  operands[3] = gen_lowpart (Pmode, operands[3]);
-  operands[4] = gen_lowpart (Pmode, operands[4]);
+  [(const_int 0)]
+{
+  enum machine_mode mode = GET_MODE (operands[0]);
+  rtx pat;
+
+  if (GET_MODE_SIZE (mode) < GET_MODE_SIZE (SImode))
+    { 
+      mode = SImode; 
+      operands[0] = gen_lowpart (mode, operands[0]);
+      operands[1] = gen_lowpart (mode, operands[1]);
+    }
+
+  operands[2] = GEN_INT (1 << INTVAL (operands[2]));
+
+  pat = plus_constant (gen_rtx_MULT (mode, operands[1], operands[2]),
+                      INTVAL (operands[3]));
+
+  emit_insn (gen_rtx_SET (VOIDmode, operands[0], pat));
+  DONE;
 }
   [(set_attr "type" "lea")
-   (set_attr "mode" "SI")])
+   (set (attr "mode")
+      (if_then_else (match_operand:DI 0)
+       (const_string "DI")
+       (const_string "SI")))])
 \f
 ;; Subtract instructions
 
 (define_expand "sub<mode>3"
-  [(set (match_operand:SDWIM 0 "nonimmediate_operand" "")
-       (minus:SDWIM (match_operand:SDWIM 1 "nonimmediate_operand" "")
-                    (match_operand:SDWIM 2 "<general_operand>" "")))]
+  [(set (match_operand:SDWIM 0 "nonimmediate_operand")
+       (minus:SDWIM (match_operand:SDWIM 1 "nonimmediate_operand")
+                    (match_operand:SDWIM 2 "<general_operand>")))]
   ""
   "ix86_expand_binary_operator (MINUS, <MODE>mode, operands); DONE;")
 
   [(set (match_operand:DI 0 "register_operand" "=r")
        (zero_extend:DI
          (minus:SI (match_operand:SI 1 "register_operand" "0")
-                   (match_operand:SI 2 "general_operand" "g"))))
+                   (match_operand:SI 2 "x86_64_general_operand" "rme"))))
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (MINUS, SImode, operands)"
   "sub{l}\t{%2, %k0|%k0, %2}"
   [(set (reg FLAGS_REG)
        (compare
          (minus:SI (match_operand:SI 1 "register_operand" "0")
-                   (match_operand:SI 2 "general_operand" "g"))
+                   (match_operand:SI 2 "x86_64_general_operand" "rme"))
          (const_int 0)))
    (set (match_operand:DI 0 "register_operand" "=r")
        (zero_extend:DI
 (define_insn "*subsi_3_zext"
   [(set (reg FLAGS_REG)
        (compare (match_operand:SI 1 "register_operand" "0")
-                (match_operand:SI 2 "general_operand" "g")))
+                (match_operand:SI 2 "x86_64_general_operand" "rme")))
    (set (match_operand:DI 0 "register_operand" "=r")
        (zero_extend:DI
          (minus:SI (match_dup 1)
 
 (define_expand "<plusminus_insn><mode>3_carry"
   [(parallel
-    [(set (match_operand:SWI 0 "nonimmediate_operand" "")
+    [(set (match_operand:SWI 0 "nonimmediate_operand")
          (plusminus:SWI
-           (match_operand:SWI 1 "nonimmediate_operand" "")
+           (match_operand:SWI 1 "nonimmediate_operand")
            (plus:SWI (match_operator:SWI 4 "ix86_carry_flag_operator"
-                      [(match_operand 3 "flags_reg_operand" "")
+                      [(match_operand 3 "flags_reg_operand")
                        (const_int 0)])
-                     (match_operand:SWI 2 "<general_operand>" ""))))
+                     (match_operand:SWI 2 "<general_operand>"))))
      (clobber (reg:CC FLAGS_REG))])]
   "ix86_binary_operator_ok (<CODE>, <MODE>mode, operands)")
 
          (plus:SI (match_operand:SI 1 "nonimmediate_operand" "%0")
                   (plus:SI (match_operator 3 "ix86_carry_flag_operator"
                             [(reg FLAGS_REG) (const_int 0)])
-                           (match_operand:SI 2 "general_operand" "g")))))
+                           (match_operand:SI 2 "x86_64_general_operand" "rme")))))
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (PLUS, SImode, operands)"
   "adc{l}\t{%2, %k0|%k0, %2}"
          (minus:SI (match_operand:SI 1 "register_operand" "0")
                    (plus:SI (match_operator 3 "ix86_carry_flag_operator"
                              [(reg FLAGS_REG) (const_int 0)])
-                            (match_operand:SI 2 "general_operand" "g")))))
+                            (match_operand:SI 2 "x86_64_general_operand" "rme")))))
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (MINUS, SImode, operands)"
   "sbb{l}\t{%2, %k0|%k0, %2}"
        (compare:CCC
          (plusminus:SI
            (match_operand:SI 1 "nonimmediate_operand" "<comm>0")
-           (match_operand:SI 2 "general_operand" "g"))
+           (match_operand:SI 2 "x86_64_general_operand" "rme"))
          (match_dup 1)))
    (set (match_operand:DI 0 "register_operand" "=r")
        (zero_extend:DI (plusminus:SI (match_dup 1) (match_dup 2))))]
 ;; The patterns that match these are at the end of this file.
 
 (define_expand "<plusminus_insn>xf3"
-  [(set (match_operand:XF 0 "register_operand" "")
+  [(set (match_operand:XF 0 "register_operand")
        (plusminus:XF
-         (match_operand:XF 1 "register_operand" "")
-         (match_operand:XF 2 "register_operand" "")))]
+         (match_operand:XF 1 "register_operand")
+         (match_operand:XF 2 "register_operand")))]
   "TARGET_80387")
 
 (define_expand "<plusminus_insn><mode>3"
-  [(set (match_operand:MODEF 0 "register_operand" "")
+  [(set (match_operand:MODEF 0 "register_operand")
        (plusminus:MODEF
-         (match_operand:MODEF 1 "register_operand" "")
-         (match_operand:MODEF 2 "nonimmediate_operand" "")))]
+         (match_operand:MODEF 1 "register_operand")
+         (match_operand:MODEF 2 "nonimmediate_operand")))]
   "(TARGET_80387 && X87_ENABLE_ARITH (<MODE>mode))
     || (SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)")
 \f
 ;; Multiply instructions
 
 (define_expand "mul<mode>3"
-  [(parallel [(set (match_operand:SWIM248 0 "register_operand" "")
+  [(parallel [(set (match_operand:SWIM248 0 "register_operand")
                   (mult:SWIM248
-                    (match_operand:SWIM248 1 "register_operand" "")
-                    (match_operand:SWIM248 2 "<general_operand>" "")))
+                    (match_operand:SWIM248 1 "register_operand")
+                    (match_operand:SWIM248 2 "<general_operand>")))
              (clobber (reg:CC FLAGS_REG))])])
 
 (define_expand "mulqi3"
-  [(parallel [(set (match_operand:QI 0 "register_operand" "")
+  [(parallel [(set (match_operand:QI 0 "register_operand")
                   (mult:QI
-                    (match_operand:QI 1 "register_operand" "")
-                    (match_operand:QI 2 "nonimmediate_operand" "")))
+                    (match_operand:QI 1 "register_operand")
+                    (match_operand:QI 2 "nonimmediate_operand")))
              (clobber (reg:CC FLAGS_REG))])]
   "TARGET_QIMODE_MATH")
 
               (eq_attr "alternative" "1")
                  (const_string "vector")
               (and (eq_attr "alternative" "2")
-                   (match_operand 1 "memory_operand" ""))
+                   (match_operand 1 "memory_operand"))
                  (const_string "vector")]
              (const_string "direct")))
    (set (attr "amdfam10_decode")
        (cond [(and (eq_attr "alternative" "0,1")
-                   (match_operand 1 "memory_operand" ""))
+                   (match_operand 1 "memory_operand"))
                  (const_string "vector")]
              (const_string "direct")))
    (set_attr "bdver1_decode" "direct")
   [(set (match_operand:DI 0 "register_operand" "=r,r,r")
        (zero_extend:DI
          (mult:SI (match_operand:SI 1 "nonimmediate_operand" "%rm,rm,0")
-                  (match_operand:SI 2 "general_operand" "K,i,mr"))))
+                  (match_operand:SI 2 "x86_64_general_operand" "K,e,mr"))))
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT
    && !(MEM_P (operands[1]) && MEM_P (operands[2]))"
               (eq_attr "alternative" "1")
                  (const_string "vector")
               (and (eq_attr "alternative" "2")
-                   (match_operand 1 "memory_operand" ""))
+                   (match_operand 1 "memory_operand"))
                  (const_string "vector")]
              (const_string "direct")))
    (set (attr "amdfam10_decode")
        (cond [(and (eq_attr "alternative" "0,1")
-                   (match_operand 1 "memory_operand" ""))
+                   (match_operand 1 "memory_operand"))
                  (const_string "vector")]
              (const_string "direct")))
    (set_attr "bdver1_decode" "direct")
    (set_attr "mode" "QI")])
 
 (define_expand "<u>mul<mode><dwi>3"
-  [(parallel [(set (match_operand:<DWI> 0 "register_operand" "")
+  [(parallel [(set (match_operand:<DWI> 0 "register_operand")
                   (mult:<DWI>
                     (any_extend:<DWI>
-                      (match_operand:DWIH 1 "nonimmediate_operand" ""))
+                      (match_operand:DWIH 1 "nonimmediate_operand"))
                     (any_extend:<DWI>
-                      (match_operand:DWIH 2 "register_operand" ""))))
+                      (match_operand:DWIH 2 "register_operand"))))
              (clobber (reg:CC FLAGS_REG))])])
 
 (define_expand "<u>mulqihi3"
-  [(parallel [(set (match_operand:HI 0 "register_operand" "")
+  [(parallel [(set (match_operand:HI 0 "register_operand")
                   (mult:HI
                     (any_extend:HI
-                      (match_operand:QI 1 "nonimmediate_operand" ""))
+                      (match_operand:QI 1 "nonimmediate_operand"))
                     (any_extend:HI
-                      (match_operand:QI 2 "register_operand" ""))))
+                      (match_operand:QI 2 "register_operand"))))
              (clobber (reg:CC FLAGS_REG))])]
   "TARGET_QIMODE_MATH")
 
-(define_insn "*<u>mul<mode><dwi>3_1"
+(define_insn "*bmi2_umulditi3_1"
+  [(set (match_operand:DI 0 "register_operand" "=r")
+       (mult:DI
+         (match_operand:DI 2 "nonimmediate_operand" "%d")
+         (match_operand:DI 3 "nonimmediate_operand" "rm")))
+   (set (match_operand:DI 1 "register_operand" "=r")
+       (truncate:DI
+         (lshiftrt:TI
+           (mult:TI (zero_extend:TI (match_dup 2))
+                    (zero_extend:TI (match_dup 3)))
+           (const_int 64))))]
+  "TARGET_64BIT && TARGET_BMI2
+   && !(MEM_P (operands[1]) && MEM_P (operands[2]))"
+  "mulx\t{%3, %0, %1|%1, %0, %3}"
+  [(set_attr "type" "imulx")
+   (set_attr "prefix" "vex")
+   (set_attr "mode" "DI")])
+
+(define_insn "*bmi2_umulsidi3_1"
+  [(set (match_operand:SI 0 "register_operand" "=r")
+       (mult:SI
+         (match_operand:SI 2 "nonimmediate_operand" "%d")
+         (match_operand:SI 3 "nonimmediate_operand" "rm")))
+   (set (match_operand:SI 1 "register_operand" "=r")
+       (truncate:SI
+         (lshiftrt:DI
+           (mult:DI (zero_extend:DI (match_dup 2))
+                    (zero_extend:DI (match_dup 3)))
+           (const_int 32))))]
+  "!TARGET_64BIT && TARGET_BMI2
+   && !(MEM_P (operands[1]) && MEM_P (operands[2]))"
+  "mulx\t{%3, %0, %1|%1, %0, %3}"
+  [(set_attr "type" "imulx")
+   (set_attr "prefix" "vex")
+   (set_attr "mode" "SI")])
+
+(define_insn "*umul<mode><dwi>3_1"
+  [(set (match_operand:<DWI> 0 "register_operand" "=A,r")
+       (mult:<DWI>
+         (zero_extend:<DWI>
+           (match_operand:DWIH 1 "nonimmediate_operand" "%0,d"))
+         (zero_extend:<DWI>
+           (match_operand:DWIH 2 "nonimmediate_operand" "rm,rm"))))
+   (clobber (reg:CC FLAGS_REG))]
+  "!(MEM_P (operands[1]) && MEM_P (operands[2]))"
+  "@
+   mul{<imodesuffix>}\t%2
+   #"
+  [(set_attr "isa" "*,bmi2")
+   (set_attr "type" "imul,imulx")
+   (set_attr "length_immediate" "0,*")
+   (set (attr "athlon_decode")
+       (cond [(eq_attr "alternative" "0")
+                (if_then_else (eq_attr "cpu" "athlon")
+                  (const_string "vector")
+                  (const_string "double"))]
+             (const_string "*")))
+   (set_attr "amdfam10_decode" "double,*")
+   (set_attr "bdver1_decode" "direct,*")
+   (set_attr "prefix" "orig,vex")
+   (set_attr "mode" "<MODE>")])
+
+;; Convert mul to the mulx pattern to avoid flags dependency.
+(define_split
+ [(set (match_operand:<DWI> 0 "register_operand")
+       (mult:<DWI>
+        (zero_extend:<DWI>
+          (match_operand:DWIH 1 "register_operand"))
+        (zero_extend:<DWI>
+          (match_operand:DWIH 2 "nonimmediate_operand"))))
+  (clobber (reg:CC FLAGS_REG))]
+ "TARGET_BMI2 && reload_completed
+  && true_regnum (operands[1]) == DX_REG"
+  [(parallel [(set (match_dup 3)
+                  (mult:DWIH (match_dup 1) (match_dup 2)))
+             (set (match_dup 4)
+                  (truncate:DWIH
+                    (lshiftrt:<DWI>
+                      (mult:<DWI> (zero_extend:<DWI> (match_dup 1))
+                                  (zero_extend:<DWI> (match_dup 2)))
+                      (match_dup 5))))])]
+{
+  split_double_mode (<DWI>mode, &operands[0], 1, &operands[3], &operands[4]);
+
+  operands[5] = GEN_INT (GET_MODE_BITSIZE (<MODE>mode));
+})
+
+(define_insn "*mul<mode><dwi>3_1"
   [(set (match_operand:<DWI> 0 "register_operand" "=A")
        (mult:<DWI>
-         (any_extend:<DWI>
+         (sign_extend:<DWI>
            (match_operand:DWIH 1 "nonimmediate_operand" "%0"))
-         (any_extend:<DWI>
+         (sign_extend:<DWI>
            (match_operand:DWIH 2 "nonimmediate_operand" "rm"))))
    (clobber (reg:CC FLAGS_REG))]
   "!(MEM_P (operands[1]) && MEM_P (operands[2]))"
-  "<sgnprefix>mul{<imodesuffix>}\t%2"
+  "imul{<imodesuffix>}\t%2"
   [(set_attr "type" "imul")
    (set_attr "length_immediate" "0")
    (set (attr "athlon_decode")
    (set_attr "mode" "QI")])
 
 (define_expand "<s>mul<mode>3_highpart"
-  [(parallel [(set (match_operand:SWI48 0 "register_operand" "")
+  [(parallel [(set (match_operand:SWI48 0 "register_operand")
                   (truncate:SWI48
                     (lshiftrt:<DWI>
                       (mult:<DWI>
                         (any_extend:<DWI>
-                          (match_operand:SWI48 1 "nonimmediate_operand" ""))
+                          (match_operand:SWI48 1 "nonimmediate_operand"))
                         (any_extend:<DWI>
-                          (match_operand:SWI48 2 "register_operand" "")))
+                          (match_operand:SWI48 2 "register_operand")))
                       (match_dup 4))))
-             (clobber (match_scratch:SWI48 3 ""))
+             (clobber (match_scratch:SWI48 3))
              (clobber (reg:CC FLAGS_REG))])]
   ""
   "operands[4] = GEN_INT (GET_MODE_BITSIZE (<MODE>mode));")
 ;; The patterns that match these are at the end of this file.
 
 (define_expand "mulxf3"
-  [(set (match_operand:XF 0 "register_operand" "")
-       (mult:XF (match_operand:XF 1 "register_operand" "")
-                (match_operand:XF 2 "register_operand" "")))]
+  [(set (match_operand:XF 0 "register_operand")
+       (mult:XF (match_operand:XF 1 "register_operand")
+                (match_operand:XF 2 "register_operand")))]
   "TARGET_80387")
 
 (define_expand "mul<mode>3"
-  [(set (match_operand:MODEF 0 "register_operand" "")
-       (mult:MODEF (match_operand:MODEF 1 "register_operand" "")
-                   (match_operand:MODEF 2 "nonimmediate_operand" "")))]
+  [(set (match_operand:MODEF 0 "register_operand")
+       (mult:MODEF (match_operand:MODEF 1 "register_operand")
+                   (match_operand:MODEF 2 "nonimmediate_operand")))]
   "(TARGET_80387 && X87_ENABLE_ARITH (<MODE>mode))
     || (SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)")
 \f
 ;; The patterns that match these are at the end of this file.
 
 (define_expand "divxf3"
-  [(set (match_operand:XF 0 "register_operand" "")
-       (div:XF (match_operand:XF 1 "register_operand" "")
-               (match_operand:XF 2 "register_operand" "")))]
+  [(set (match_operand:XF 0 "register_operand")
+       (div:XF (match_operand:XF 1 "register_operand")
+               (match_operand:XF 2 "register_operand")))]
   "TARGET_80387")
 
 (define_expand "divdf3"
-  [(set (match_operand:DF 0 "register_operand" "")
-       (div:DF (match_operand:DF 1 "register_operand" "")
-               (match_operand:DF 2 "nonimmediate_operand" "")))]
+  [(set (match_operand:DF 0 "register_operand")
+       (div:DF (match_operand:DF 1 "register_operand")
+               (match_operand:DF 2 "nonimmediate_operand")))]
    "(TARGET_80387 && X87_ENABLE_ARITH (DFmode))
     || (TARGET_SSE2 && TARGET_SSE_MATH)")
 
 (define_expand "divsf3"
-  [(set (match_operand:SF 0 "register_operand" "")
-       (div:SF (match_operand:SF 1 "register_operand" "")
-               (match_operand:SF 2 "nonimmediate_operand" "")))]
+  [(set (match_operand:SF 0 "register_operand")
+       (div:SF (match_operand:SF 1 "register_operand")
+               (match_operand:SF 2 "nonimmediate_operand")))]
   "(TARGET_80387 && X87_ENABLE_ARITH (SFmode))
     || TARGET_SSE_MATH"
 {
-  if (TARGET_SSE_MATH && TARGET_RECIP && optimize_insn_for_speed_p ()
+  if (TARGET_SSE_MATH
+      && TARGET_RECIP_DIV
+      && optimize_insn_for_speed_p ()
       && flag_finite_math_only && !flag_trapping_math
       && flag_unsafe_math_optimizations)
     {
 ;; Divmod instructions.
 
 (define_expand "divmod<mode>4"
-  [(parallel [(set (match_operand:SWIM248 0 "register_operand" "")
+  [(parallel [(set (match_operand:SWIM248 0 "register_operand")
                   (div:SWIM248
-                    (match_operand:SWIM248 1 "register_operand" "")
-                    (match_operand:SWIM248 2 "nonimmediate_operand" "")))
-             (set (match_operand:SWIM248 3 "register_operand" "")
+                    (match_operand:SWIM248 1 "register_operand")
+                    (match_operand:SWIM248 2 "nonimmediate_operand")))
+             (set (match_operand:SWIM248 3 "register_operand")
                   (mod:SWIM248 (match_dup 1) (match_dup 2)))
              (clobber (reg:CC FLAGS_REG))])])
 
 ;;      else
 ;;        use original integer divide
 (define_split
-  [(set (match_operand:SWI48 0 "register_operand" "")
-       (div:SWI48 (match_operand:SWI48 2 "register_operand" "")
-                   (match_operand:SWI48 3 "nonimmediate_operand" "")))
-   (set (match_operand:SWI48 1 "register_operand" "")
+  [(set (match_operand:SWI48 0 "register_operand")
+       (div:SWI48 (match_operand:SWI48 2 "register_operand")
+                   (match_operand:SWI48 3 "nonimmediate_operand")))
+   (set (match_operand:SWI48 1 "register_operand")
        (mod:SWI48 (match_dup 2) (match_dup 3)))
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_USE_8BIT_IDIV
    (set_attr "mode" "<MODE>")])
 
 (define_expand "divmodqi4"
-  [(parallel [(set (match_operand:QI 0 "register_operand" "")
+  [(parallel [(set (match_operand:QI 0 "register_operand")
                   (div:QI
-                    (match_operand:QI 1 "register_operand" "")
-                    (match_operand:QI 2 "nonimmediate_operand" "")))
-             (set (match_operand:QI 3 "register_operand" "")
+                    (match_operand:QI 1 "register_operand")
+                    (match_operand:QI 2 "nonimmediate_operand")))
+             (set (match_operand:QI 3 "register_operand")
                   (mod:QI (match_dup 1) (match_dup 2)))
              (clobber (reg:CC FLAGS_REG))])]
   "TARGET_QIMODE_MATH"
    (set_attr "mode" "QI")])
 
 (define_expand "udivmod<mode>4"
-  [(parallel [(set (match_operand:SWIM248 0 "register_operand" "")
+  [(parallel [(set (match_operand:SWIM248 0 "register_operand")
                   (udiv:SWIM248
-                    (match_operand:SWIM248 1 "register_operand" "")
-                    (match_operand:SWIM248 2 "nonimmediate_operand" "")))
-             (set (match_operand:SWIM248 3 "register_operand" "")
+                    (match_operand:SWIM248 1 "register_operand")
+                    (match_operand:SWIM248 2 "nonimmediate_operand")))
+             (set (match_operand:SWIM248 3 "register_operand")
                   (umod:SWIM248 (match_dup 1) (match_dup 2)))
              (clobber (reg:CC FLAGS_REG))])])
 
 ;;      else
 ;;        use original integer divide
 (define_split
-  [(set (match_operand:SWI48 0 "register_operand" "")
-       (udiv:SWI48 (match_operand:SWI48 2 "register_operand" "")
-                   (match_operand:SWI48 3 "nonimmediate_operand" "")))
-   (set (match_operand:SWI48 1 "register_operand" "")
+  [(set (match_operand:SWI48 0 "register_operand")
+       (udiv:SWI48 (match_operand:SWI48 2 "register_operand")
+                   (match_operand:SWI48 3 "nonimmediate_operand")))
+   (set (match_operand:SWI48 1 "register_operand")
        (umod:SWI48 (match_dup 2) (match_dup 3)))
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_USE_8BIT_IDIV
    (set_attr "mode" "<MODE>")])
 
 (define_expand "udivmodqi4"
-  [(parallel [(set (match_operand:QI 0 "register_operand" "")
+  [(parallel [(set (match_operand:QI 0 "register_operand")
                   (udiv:QI
-                    (match_operand:QI 1 "register_operand" "")
-                    (match_operand:QI 2 "nonimmediate_operand" "")))
-             (set (match_operand:QI 3 "register_operand" "")
+                    (match_operand:QI 1 "register_operand")
+                    (match_operand:QI 2 "nonimmediate_operand")))
+             (set (match_operand:QI 3 "register_operand")
                   (umod:QI (match_dup 1) (match_dup 2)))
              (clobber (reg:CC FLAGS_REG))])]
   "TARGET_QIMODE_MATH"
 (define_expand "testsi_ccno_1"
   [(set (reg:CCNO FLAGS_REG)
        (compare:CCNO
-         (and:SI (match_operand:SI 0 "nonimmediate_operand" "")
-                 (match_operand:SI 1 "nonmemory_operand" ""))
+         (and:SI (match_operand:SI 0 "nonimmediate_operand")
+                 (match_operand:SI 1 "x86_64_nonmemory_operand"))
          (const_int 0)))])
 
 (define_expand "testqi_ccz_1"
   [(set (reg:CCZ FLAGS_REG)
-        (compare:CCZ (and:QI (match_operand:QI 0 "nonimmediate_operand" "")
-                            (match_operand:QI 1 "nonmemory_operand" ""))
+        (compare:CCZ (and:QI (match_operand:QI 0 "nonimmediate_operand")
+                            (match_operand:QI 1 "nonmemory_operand"))
                 (const_int 0)))])
 
 (define_expand "testdi_ccno_1"
   [(set (reg:CCNO FLAGS_REG)
        (compare:CCNO
-         (and:DI (match_operand:DI 0 "nonimmediate_operand" "")
-                 (match_operand:DI 1 "x86_64_szext_general_operand" ""))
+         (and:DI (match_operand:DI 0 "nonimmediate_operand")
+                 (match_operand:DI 1 "x86_64_szext_general_operand"))
          (const_int 0)))]
   "TARGET_64BIT && !(MEM_P (operands[0]) && MEM_P (operands[1]))")
 
        (compare
         (and:SWI124
          (match_operand:SWI124 0 "nonimmediate_operand" "%!*a,<r>,<r>m")
-         (match_operand:SWI124 1 "general_operand" "<i>,<i>,<r><i>"))
+         (match_operand:SWI124 1 "<general_operand>" "<i>,<i>,<r><i>"))
         (const_int 0)))]
   "ix86_match_ccmode (insn, CCNOmode)
    && !(MEM_P (operands[0]) && MEM_P (operands[1]))"
        (compare:CCNO
          (and:SI
            (zero_extract:SI
-             (match_operand 0 "ext_register_operand" "")
+             (match_operand 0 "ext_register_operand")
              (const_int 8)
              (const_int 8))
-           (match_operand 1 "const_int_operand" ""))
+           (match_operand 1 "const_int_operand"))
          (const_int 0)))])
 
 (define_insn "*testqi_ext_0"
   [(set (reg FLAGS_REG)
         (compare (zero_extract:DI
                   (match_operand 0 "nonimmediate_operand" "rm")
-                  (match_operand:DI 1 "const_int_operand" "")
-                  (match_operand:DI 2 "const_int_operand" ""))
+                  (match_operand:DI 1 "const_int_operand")
+                  (match_operand:DI 2 "const_int_operand"))
                 (const_int 0)))]
   "TARGET_64BIT
    && ix86_match_ccmode (insn, CCNOmode)
   [(set (reg FLAGS_REG)
         (compare (zero_extract:SI
                   (match_operand 0 "nonimmediate_operand" "rm")
-                  (match_operand:SI 1 "const_int_operand" "")
-                  (match_operand:SI 2 "const_int_operand" ""))
+                  (match_operand:SI 1 "const_int_operand")
+                  (match_operand:SI 2 "const_int_operand"))
                 (const_int 0)))]
   "ix86_match_ccmode (insn, CCNOmode)
    && INTVAL (operands[1]) > 0
   "#")
 
 (define_split
-  [(set (match_operand 0 "flags_reg_operand" "")
+  [(set (match_operand 0 "flags_reg_operand")
         (match_operator 1 "compare_operator"
          [(zero_extract
-            (match_operand 2 "nonimmediate_operand" "")
-            (match_operand 3 "const_int_operand" "")
-            (match_operand 4 "const_int_operand" ""))
+            (match_operand 2 "nonimmediate_operand")
+            (match_operand 3 "const_int_operand")
+            (match_operand 4 "const_int_operand"))
           (const_int 0)]))]
   "ix86_match_ccmode (insn, CCNOmode)"
   [(set (match_dup 0) (match_op_dup 1 [(match_dup 2) (const_int 0)]))]
 ;; Do the conversion only post-reload to avoid limiting of the register class
 ;; to QI regs.
 (define_split
-  [(set (match_operand 0 "flags_reg_operand" "")
+  [(set (match_operand 0 "flags_reg_operand")
        (match_operator 1 "compare_operator"
-         [(and (match_operand 2 "register_operand" "")
-               (match_operand 3 "const_int_operand" ""))
+         [(and (match_operand 2 "register_operand")
+               (match_operand 3 "const_int_operand"))
           (const_int 0)]))]
    "reload_completed
     && QI_REG_P (operands[2])
          [(and:SI (zero_extract:SI (match_dup 2) (const_int 8) (const_int 8))
                   (match_dup 3))
           (const_int 0)]))]
-  "operands[2] = gen_lowpart (SImode, operands[2]);
-   operands[3] = gen_int_mode (INTVAL (operands[3]) >> 8, SImode);")
+{
+  operands[2] = gen_lowpart (SImode, operands[2]);
+  operands[3] = gen_int_mode (INTVAL (operands[3]) >> 8, SImode);
+})
 
 (define_split
-  [(set (match_operand 0 "flags_reg_operand" "")
+  [(set (match_operand 0 "flags_reg_operand")
        (match_operator 1 "compare_operator"
-         [(and (match_operand 2 "nonimmediate_operand" "")
-               (match_operand 3 "const_int_operand" ""))
+         [(and (match_operand 2 "nonimmediate_operand")
+               (match_operand 3 "const_int_operand"))
           (const_int 0)]))]
    "reload_completed
     && GET_MODE (operands[2]) != QImode
   [(set (match_dup 0)
        (match_op_dup 1 [(and:QI (match_dup 2) (match_dup 3))
                         (const_int 0)]))]
-  "operands[2] = gen_lowpart (QImode, operands[2]);
-   operands[3] = gen_lowpart (QImode, operands[3]);")
+{
+  operands[2] = gen_lowpart (QImode, operands[2]);
+  operands[3] = gen_lowpart (QImode, operands[3]);
+})
 
 ;; %%% This used to optimize known byte-wide and operations to memory,
 ;; and sometimes to QImode registers.  If this is considered useful,
 ;; it should be done with splitters.
 
 (define_expand "and<mode>3"
-  [(set (match_operand:SWIM 0 "nonimmediate_operand" "")
-       (and:SWIM (match_operand:SWIM 1 "nonimmediate_operand" "")
-                 (match_operand:SWIM 2 "<general_szext_operand>" "")))]
+  [(set (match_operand:SWIM 0 "nonimmediate_operand")
+       (and:SWIM (match_operand:SWIM 1 "nonimmediate_operand")
+                 (match_operand:SWIM 2 "<general_szext_operand>")))]
   ""
   "ix86_expand_binary_operator (AND, <MODE>mode, operands); DONE;")
 
   switch (get_attr_type (insn))
     {
     case TYPE_IMOVX:
-      {
-       enum machine_mode mode;
-
-       gcc_assert (CONST_INT_P (operands[2]));
-        if (INTVAL (operands[2]) == 0xff)
-         mode = QImode;
-       else
-         {
-           gcc_assert (INTVAL (operands[2]) == 0xffff);
-           mode = HImode;
-         }
-
-       operands[1] = gen_lowpart (mode, operands[1]);
-       if (mode == QImode)
-         return "movz{bl|x}\t{%1, %k0|%k0, %1}";
-       else
-         return "movz{wl|x}\t{%1, %k0|%k0, %1}";
-      }
+      return "#";
 
     default:
       gcc_assert (rtx_equal_p (operands[0], operands[1]));
    (set (attr "prefix_rex")
      (if_then_else
        (and (eq_attr "type" "imovx")
-           (and (ne (symbol_ref "INTVAL (operands[2]) == 0xff") (const_int 0))
-                (match_operand 1 "ext_QIreg_operand" "")))
+           (and (match_test "INTVAL (operands[2]) == 0xff")
+                (match_operand 1 "ext_QIreg_operand")))
        (const_string "1")
        (const_string "*")))
    (set_attr "mode" "SI,DI,DI,SI")])
 
 (define_insn "*andsi_1"
-  [(set (match_operand:SI 0 "nonimmediate_operand" "=rm,r,r")
+  [(set (match_operand:SI 0 "nonimmediate_operand" "=rm,r,Ya")
        (and:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0,qm")
-               (match_operand:SI 2 "general_operand" "ri,rm,L")))
+               (match_operand:SI 2 "x86_64_general_operand" "re,rm,L")))
    (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (AND, SImode, operands)"
 {
   switch (get_attr_type (insn))
     {
     case TYPE_IMOVX:
-      {
-       enum machine_mode mode;
-
-       gcc_assert (CONST_INT_P (operands[2]));
-        if (INTVAL (operands[2]) == 0xff)
-         mode = QImode;
-       else
-         {
-           gcc_assert (INTVAL (operands[2]) == 0xffff);
-           mode = HImode;
-         }
-
-       operands[1] = gen_lowpart (mode, operands[1]);
-       if (mode == QImode)
-         return "movz{bl|x}\t{%1, %0|%0, %1}";
-       else
-         return "movz{wl|x}\t{%1, %0|%0, %1}";
-      }
+      return "#";
 
     default:
       gcc_assert (rtx_equal_p (operands[0], operands[1]));
    (set (attr "prefix_rex")
      (if_then_else
        (and (eq_attr "type" "imovx")
-           (and (ne (symbol_ref "INTVAL (operands[2]) == 0xff") (const_int 0))
-                (match_operand 1 "ext_QIreg_operand" "")))
+           (and (match_test "INTVAL (operands[2]) == 0xff")
+                (match_operand 1 "ext_QIreg_operand")))
        (const_string "1")
        (const_string "*")))
    (set_attr "length_immediate" "*,*,0")
   [(set (match_operand:DI 0 "register_operand" "=r")
        (zero_extend:DI
          (and:SI (match_operand:SI 1 "nonimmediate_operand" "%0")
-                 (match_operand:SI 2 "general_operand" "g"))))
+                 (match_operand:SI 2 "x86_64_general_operand" "rme"))))
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (AND, SImode, operands)"
   "and{l}\t{%2, %k0|%k0, %2}"
    (set_attr "mode" "SI")])
 
 (define_insn "*andhi_1"
-  [(set (match_operand:HI 0 "nonimmediate_operand" "=rm,r,r")
+  [(set (match_operand:HI 0 "nonimmediate_operand" "=rm,r,Ya")
        (and:HI (match_operand:HI 1 "nonimmediate_operand" "%0,0,qm")
                (match_operand:HI 2 "general_operand" "rn,rm,L")))
    (clobber (reg:CC FLAGS_REG))]
   switch (get_attr_type (insn))
     {
     case TYPE_IMOVX:
-      gcc_assert (CONST_INT_P (operands[2]));
-      gcc_assert (INTVAL (operands[2]) == 0xff);
-      return "movz{bl|x}\t{%b1, %k0|%k0, %b1}";
+      return "#";
 
     default:
       gcc_assert (rtx_equal_p (operands[0], operands[1]));
-
       return "and{w}\t{%2, %0|%0, %2}";
     }
 }
    (set (attr "prefix_rex")
      (if_then_else
        (and (eq_attr "type" "imovx")
-           (match_operand 1 "ext_QIreg_operand" ""))
+           (match_operand 1 "ext_QIreg_operand"))
        (const_string "1")
        (const_string "*")))
    (set_attr "mode" "HI,HI,SI")])
    (set_attr "mode" "QI")])
 
 (define_split
-  [(set (match_operand 0 "register_operand" "")
+  [(set (match_operand:SWI248 0 "register_operand")
+       (and:SWI248 (match_operand:SWI248 1 "nonimmediate_operand")
+                   (match_operand:SWI248 2 "const_int_operand")))
+   (clobber (reg:CC FLAGS_REG))]
+  "reload_completed
+   && true_regnum (operands[0]) != true_regnum (operands[1])"
+  [(const_int 0)]
+{
+  enum machine_mode mode;
+
+  if (INTVAL (operands[2]) == (HOST_WIDE_INT) 0xffffffff)
+    mode = SImode;
+  else if (INTVAL (operands[2]) == 0xffff)
+    mode = HImode;
+  else
+    {
+      gcc_assert (INTVAL (operands[2]) == 0xff);
+      mode = QImode;
+    }
+
+  operands[1] = gen_lowpart (mode, operands[1]);
+
+  if (mode == SImode)
+    emit_insn (gen_zero_extendsidi2 (operands[0], operands[1]));
+  else
+    {
+      rtx (*insn) (rtx, rtx);
+
+      /* Zero extend to SImode to avoid partial register stalls.  */
+      operands[0] = gen_lowpart (SImode, operands[0]);
+
+      insn = (mode == HImode) ? gen_zero_extendhisi2 : gen_zero_extendqisi2;
+      emit_insn (insn (operands[0], operands[1]));
+    }
+  DONE;
+})
+
+(define_split
+  [(set (match_operand 0 "register_operand")
        (and (match_dup 0)
             (const_int -65536)))
    (clobber (reg:CC FLAGS_REG))]
   "operands[1] = gen_lowpart (HImode, operands[0]);")
 
 (define_split
-  [(set (match_operand 0 "ext_register_operand" "")
+  [(set (match_operand 0 "ext_register_operand")
        (and (match_dup 0)
             (const_int -256)))
    (clobber (reg:CC FLAGS_REG))]
   "operands[1] = gen_lowpart (QImode, operands[0]);")
 
 (define_split
-  [(set (match_operand 0 "ext_register_operand" "")
+  [(set (match_operand 0 "ext_register_operand")
        (and (match_dup 0)
             (const_int -65281)))
    (clobber (reg:CC FLAGS_REG))]
   [(set (reg FLAGS_REG)
        (compare (and:SWI124
                  (match_operand:SWI124 1 "nonimmediate_operand" "%0,0")
-                 (match_operand:SWI124 2 "general_operand" "<g>,<r><i>"))
+                 (match_operand:SWI124 2 "<general_operand>" "<g>,<r><i>"))
                 (const_int 0)))
    (set (match_operand:SWI124 0 "nonimmediate_operand" "=<r>,<r>m")
        (and:SWI124 (match_dup 1) (match_dup 2)))]
   [(set (reg FLAGS_REG)
        (compare (and:SI
                  (match_operand:SI 1 "nonimmediate_operand" "%0")
-                 (match_operand:SI 2 "general_operand" "g"))
+                 (match_operand:SI 2 "x86_64_general_operand" "rme"))
                 (const_int 0)))
    (set (match_operand:DI 0 "register_operand" "=r")
        (zero_extend:DI (and:SI (match_dup 1) (match_dup 2))))]
 ;; of memory mismatch stalls.  We may want to do the splitting for optimizing
 ;; for size, but that can (should?) be handled by generic code instead.
 (define_split
-  [(set (match_operand 0 "register_operand" "")
-       (and (match_operand 1 "register_operand" "")
-            (match_operand 2 "const_int_operand" "")))
+  [(set (match_operand 0 "register_operand")
+       (and (match_operand 1 "register_operand")
+            (match_operand 2 "const_int_operand")))
    (clobber (reg:CC FLAGS_REG))]
    "reload_completed
     && QI_REG_P (operands[0])
                                            (const_int 8) (const_int 8))
                           (match_dup 2)))
              (clobber (reg:CC FLAGS_REG))])]
-  "operands[0] = gen_lowpart (SImode, operands[0]);
-   operands[1] = gen_lowpart (SImode, operands[1]);
-   operands[2] = gen_int_mode ((INTVAL (operands[2]) >> 8) & 0xff, SImode);")
+{
+  operands[0] = gen_lowpart (SImode, operands[0]);
+  operands[1] = gen_lowpart (SImode, operands[1]);
+  operands[2] = gen_int_mode ((INTVAL (operands[2]) >> 8) & 0xff, SImode);
+})
 
 ;; Since AND can be encoded with sign extended immediate, this is only
 ;; profitable when 7th bit is not set.
 (define_split
-  [(set (match_operand 0 "register_operand" "")
-       (and (match_operand 1 "general_operand" "")
-            (match_operand 2 "const_int_operand" "")))
+  [(set (match_operand 0 "register_operand")
+       (and (match_operand 1 "general_operand")
+            (match_operand 2 "const_int_operand")))
    (clobber (reg:CC FLAGS_REG))]
    "reload_completed
     && ANY_QI_REG_P (operands[0])
                   (and:QI (match_dup 1)
                           (match_dup 2)))
              (clobber (reg:CC FLAGS_REG))])]
-  "operands[0] = gen_lowpart (QImode, operands[0]);
-   operands[1] = gen_lowpart (QImode, operands[1]);
-   operands[2] = gen_lowpart (QImode, operands[2]);")
+{
+  operands[0] = gen_lowpart (QImode, operands[0]);
+  operands[1] = gen_lowpart (QImode, operands[1]);
+  operands[2] = gen_lowpart (QImode, operands[2]);
+})
 \f
 ;; Logical inclusive and exclusive OR instructions
 
 ;; If this is considered useful, it should be done with splitters.
 
 (define_expand "<code><mode>3"
-  [(set (match_operand:SWIM 0 "nonimmediate_operand" "")
-       (any_or:SWIM (match_operand:SWIM 1 "nonimmediate_operand" "")
-                    (match_operand:SWIM 2 "<general_operand>" "")))]
+  [(set (match_operand:SWIM 0 "nonimmediate_operand")
+       (any_or:SWIM (match_operand:SWIM 1 "nonimmediate_operand")
+                    (match_operand:SWIM 2 "<general_operand>")))]
   ""
   "ix86_expand_binary_operator (<CODE>, <MODE>mode, operands); DONE;")
 
   [(set (match_operand:DI 0 "register_operand" "=r")
        (zero_extend:DI
         (any_or:SI (match_operand:SI 1 "nonimmediate_operand" "%0")
-                   (match_operand:SI 2 "general_operand" "g"))))
+                   (match_operand:SI 2 "x86_64_general_operand" "rme"))))
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (<CODE>, SImode, operands)"
   "<logic>{l}\t{%2, %k0|%k0, %2}"
 (define_insn "*<code>si_2_zext"
   [(set (reg FLAGS_REG)
        (compare (any_or:SI (match_operand:SI 1 "nonimmediate_operand" "%0")
-                           (match_operand:SI 2 "general_operand" "g"))
+                           (match_operand:SI 2 "x86_64_general_operand" "rme"))
                 (const_int 0)))
    (set (match_operand:DI 0 "register_operand" "=r")
        (zero_extend:DI (any_or:SI (match_dup 1) (match_dup 2))))]
    (set_attr "mode" "QI")])
 
 (define_split
-  [(set (match_operand 0 "register_operand" "")
-       (any_or (match_operand 1 "register_operand" "")
-               (match_operand 2 "const_int_operand" "")))
+  [(set (match_operand 0 "register_operand")
+       (any_or (match_operand 1 "register_operand")
+               (match_operand 2 "const_int_operand")))
    (clobber (reg:CC FLAGS_REG))]
    "reload_completed
     && QI_REG_P (operands[0])
                                               (const_int 8) (const_int 8))
                              (match_dup 2)))
              (clobber (reg:CC FLAGS_REG))])]
-  "operands[0] = gen_lowpart (SImode, operands[0]);
-   operands[1] = gen_lowpart (SImode, operands[1]);
-   operands[2] = gen_int_mode ((INTVAL (operands[2]) >> 8) & 0xff, SImode);")
+{
+  operands[0] = gen_lowpart (SImode, operands[0]);
+  operands[1] = gen_lowpart (SImode, operands[1]);
+  operands[2] = gen_int_mode ((INTVAL (operands[2]) >> 8) & 0xff, SImode);
+})
 
 ;; Since OR can be encoded with sign extended immediate, this is only
 ;; profitable when 7th bit is set.
 (define_split
-  [(set (match_operand 0 "register_operand" "")
-       (any_or (match_operand 1 "general_operand" "")
-               (match_operand 2 "const_int_operand" "")))
+  [(set (match_operand 0 "register_operand")
+       (any_or (match_operand 1 "general_operand")
+               (match_operand 2 "const_int_operand")))
    (clobber (reg:CC FLAGS_REG))]
    "reload_completed
     && ANY_QI_REG_P (operands[0])
                   (any_or:QI (match_dup 1)
                              (match_dup 2)))
              (clobber (reg:CC FLAGS_REG))])]
-  "operands[0] = gen_lowpart (QImode, operands[0]);
-   operands[1] = gen_lowpart (QImode, operands[1]);
-   operands[2] = gen_lowpart (QImode, operands[2]);")
+{
+  operands[0] = gen_lowpart (QImode, operands[0]);
+  operands[1] = gen_lowpart (QImode, operands[1]);
+  operands[2] = gen_lowpart (QImode, operands[2]);
+})
 
 (define_expand "xorqi_cc_ext_1"
   [(parallel [
          (compare:CCNO
            (xor:SI
              (zero_extract:SI
-               (match_operand 1 "ext_register_operand" "")
+               (match_operand 1 "ext_register_operand")
                (const_int 8)
                (const_int 8))
-             (match_operand:QI 2 "general_operand" ""))
+             (match_operand:QI 2 "general_operand"))
            (const_int 0)))
-     (set (zero_extract:SI (match_operand 0 "ext_register_operand" "")
+     (set (zero_extract:SI (match_operand 0 "ext_register_operand")
                           (const_int 8)
                           (const_int 8))
          (xor:SI
 ;; Negation instructions
 
 (define_expand "neg<mode>2"
-  [(set (match_operand:SDWIM 0 "nonimmediate_operand" "")
-       (neg:SDWIM (match_operand:SDWIM 1 "nonimmediate_operand" "")))]
+  [(set (match_operand:SDWIM 0 "nonimmediate_operand")
+       (neg:SDWIM (match_operand:SDWIM 1 "nonimmediate_operand")))]
   ""
   "ix86_expand_unary_operator (NEG, <MODE>mode, operands); DONE;")
 
 ;; Changing of sign for FP values is doable using integer unit too.
 
 (define_expand "<code><mode>2"
-  [(set (match_operand:X87MODEF 0 "register_operand" "")
-       (absneg:X87MODEF (match_operand:X87MODEF 1 "register_operand" "")))]
+  [(set (match_operand:X87MODEF 0 "register_operand")
+       (absneg:X87MODEF (match_operand:X87MODEF 1 "register_operand")))]
   "TARGET_80387 || (SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)"
   "ix86_expand_fp_absneg_operator (<CODE>, <MODE>mode, operands); DONE;")
 
   [(set (match_operand:X87MODEF 0 "register_operand" "=f,!r")
        (match_operator:X87MODEF 3 "absneg_operator"
          [(match_operand:X87MODEF 1 "register_operand" "0,0")]))
-   (use (match_operand 2 "" ""))
+   (use (match_operand 2))
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_80387 && !(SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)"
   "#")
 
 (define_expand "<code>tf2"
-  [(set (match_operand:TF 0 "register_operand" "")
-       (absneg:TF (match_operand:TF 1 "register_operand" "")))]
+  [(set (match_operand:TF 0 "register_operand")
+       (absneg:TF (match_operand:TF 1 "register_operand")))]
   "TARGET_SSE2"
   "ix86_expand_fp_absneg_operator (<CODE>, TFmode, operands); DONE;")
 
 ;; Splitters for fp abs and neg.
 
 (define_split
-  [(set (match_operand 0 "fp_register_operand" "")
+  [(set (match_operand 0 "fp_register_operand")
        (match_operator 1 "absneg_operator" [(match_dup 0)]))
-   (use (match_operand 2 "" ""))
+   (use (match_operand 2))
    (clobber (reg:CC FLAGS_REG))]
   "reload_completed"
   [(set (match_dup 0) (match_op_dup 1 [(match_dup 0)]))])
 
 (define_split
-  [(set (match_operand 0 "register_operand" "")
+  [(set (match_operand 0 "register_operand")
        (match_operator 3 "absneg_operator"
-         [(match_operand 1 "register_operand" "")]))
-   (use (match_operand 2 "nonimmediate_operand" ""))
+         [(match_operand 1 "register_operand")]))
+   (use (match_operand 2 "nonimmediate_operand"))
    (clobber (reg:CC FLAGS_REG))]
   "reload_completed && SSE_REG_P (operands[0])"
   [(set (match_dup 0) (match_dup 3))]
 })
 
 (define_split
-  [(set (match_operand:SF 0 "register_operand" "")
+  [(set (match_operand:SF 0 "register_operand")
        (match_operator:SF 1 "absneg_operator" [(match_dup 0)]))
-   (use (match_operand:V4SF 2 "" ""))
+   (use (match_operand:V4SF 2))
    (clobber (reg:CC FLAGS_REG))]
   "reload_completed"
   [(parallel [(set (match_dup 0) (match_dup 1))
 })
 
 (define_split
-  [(set (match_operand:DF 0 "register_operand" "")
+  [(set (match_operand:DF 0 "register_operand")
        (match_operator:DF 1 "absneg_operator" [(match_dup 0)]))
-   (use (match_operand 2 "" ""))
+   (use (match_operand 2))
    (clobber (reg:CC FLAGS_REG))]
   "reload_completed"
   [(parallel [(set (match_dup 0) (match_dup 1))
 })
 
 (define_split
-  [(set (match_operand:XF 0 "register_operand" "")
+  [(set (match_operand:XF 0 "register_operand")
        (match_operator:XF 1 "absneg_operator" [(match_dup 0)]))
-   (use (match_operand 2 "" ""))
+   (use (match_operand 2))
    (clobber (reg:CC FLAGS_REG))]
   "reload_completed"
   [(parallel [(set (match_dup 0) (match_dup 1))
 (define_mode_attr CSGNVMODE [(SF "V4SF") (DF "V2DF") (TF "TF")])
 
 (define_expand "copysign<mode>3"
-  [(match_operand:CSGNMODE 0 "register_operand" "")
-   (match_operand:CSGNMODE 1 "nonmemory_operand" "")
-   (match_operand:CSGNMODE 2 "register_operand" "")]
+  [(match_operand:CSGNMODE 0 "register_operand")
+   (match_operand:CSGNMODE 1 "nonmemory_operand")
+   (match_operand:CSGNMODE 2 "register_operand")]
   "(SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)
    || (TARGET_SSE2 && (<MODE>mode == TFmode))"
   "ix86_expand_copysign (operands); DONE;")
   "#")
 
 (define_split
-  [(set (match_operand:CSGNMODE 0 "register_operand" "")
+  [(set (match_operand:CSGNMODE 0 "register_operand")
        (unspec:CSGNMODE
-         [(match_operand:CSGNMODE 2 "register_operand" "")
-          (match_operand:CSGNMODE 3 "register_operand" "")
-          (match_operand:<CSGNVMODE> 4 "" "")
-          (match_operand:<CSGNVMODE> 5 "" "")]
+         [(match_operand:CSGNMODE 2 "register_operand")
+          (match_operand:CSGNMODE 3 "register_operand")
+          (match_operand:<CSGNVMODE> 4)
+          (match_operand:<CSGNVMODE> 5)]
          UNSPEC_COPYSIGN))
-   (clobber (match_scratch:<CSGNVMODE> 1 ""))]
+   (clobber (match_scratch:<CSGNVMODE> 1))]
   "((SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)
     || (TARGET_SSE2 && (<MODE>mode == TFmode)))
    && reload_completed"
 ;; One complement instructions
 
 (define_expand "one_cmpl<mode>2"
-  [(set (match_operand:SWIM 0 "nonimmediate_operand" "")
-       (not:SWIM (match_operand:SWIM 1 "nonimmediate_operand" "")))]
+  [(set (match_operand:SWIM 0 "nonimmediate_operand")
+       (not:SWIM (match_operand:SWIM 1 "nonimmediate_operand")))]
   ""
   "ix86_expand_unary_operator (NOT, <MODE>mode, operands); DONE;")
 
    (set_attr "mode" "<MODE>")])
 
 (define_split
-  [(set (match_operand 0 "flags_reg_operand" "")
+  [(set (match_operand 0 "flags_reg_operand")
        (match_operator 2 "compare_operator"
-         [(not:SWI (match_operand:SWI 3 "nonimmediate_operand" ""))
+         [(not:SWI (match_operand:SWI 3 "nonimmediate_operand"))
           (const_int 0)]))
-   (set (match_operand:SWI 1 "nonimmediate_operand" "")
+   (set (match_operand:SWI 1 "nonimmediate_operand")
        (not:SWI (match_dup 3)))]
   "ix86_match_ccmode (insn, CCNOmode)"
   [(parallel [(set (match_dup 0)
    (set_attr "mode" "SI")])
 
 (define_split
-  [(set (match_operand 0 "flags_reg_operand" "")
+  [(set (match_operand 0 "flags_reg_operand")
        (match_operator 2 "compare_operator"
-         [(not:SI (match_operand:SI 3 "register_operand" ""))
+         [(not:SI (match_operand:SI 3 "register_operand"))
           (const_int 0)]))
-   (set (match_operand:DI 1 "register_operand" "")
+   (set (match_operand:DI 1 "register_operand")
        (zero_extend:DI (not:SI (match_dup 3))))]
   "ix86_match_ccmode (insn, CCNOmode)"
   [(parallel [(set (match_dup 0)
 ;; than 31.
 
 (define_expand "ashl<mode>3"
-  [(set (match_operand:SDWIM 0 "<shift_operand>" "")
-       (ashift:SDWIM (match_operand:SDWIM 1 "<ashl_input_operand>" "")
-                     (match_operand:QI 2 "nonmemory_operand" "")))]
+  [(set (match_operand:SDWIM 0 "<shift_operand>")
+       (ashift:SDWIM (match_operand:SDWIM 1 "<ashl_input_operand>")
+                     (match_operand:QI 2 "nonmemory_operand")))]
   ""
   "ix86_expand_binary_operator (ASHIFT, <MODE>mode, operands); DONE;")
 
   [(set_attr "type" "multi")])
 
 (define_split
-  [(set (match_operand:DWI 0 "register_operand" "")
-       (ashift:DWI (match_operand:DWI 1 "nonmemory_operand" "")
-                   (match_operand:QI 2 "nonmemory_operand" "")))
+  [(set (match_operand:DWI 0 "register_operand")
+       (ashift:DWI (match_operand:DWI 1 "nonmemory_operand")
+                   (match_operand:QI 2 "nonmemory_operand")))
    (clobber (reg:CC FLAGS_REG))]
   "(optimize && flag_peephole2) ? epilogue_completed : reload_completed"
   [(const_int 0)]
 
 (define_peephole2
   [(match_scratch:DWIH 3 "r")
-   (parallel [(set (match_operand:<DWI> 0 "register_operand" "")
+   (parallel [(set (match_operand:<DWI> 0 "register_operand")
                   (ashift:<DWI>
-                    (match_operand:<DWI> 1 "nonmemory_operand" "")
-                    (match_operand:QI 2 "nonmemory_operand" "")))
+                    (match_operand:<DWI> 1 "nonmemory_operand")
+                    (match_operand:QI 2 "nonmemory_operand")))
              (clobber (reg:CC FLAGS_REG))])
    (match_dup 3)]
   "TARGET_CMOVE"
 
 (define_expand "x86_shift<mode>_adj_1"
   [(set (reg:CCZ FLAGS_REG)
-       (compare:CCZ (and:QI (match_operand:QI 2 "register_operand" "")
+       (compare:CCZ (and:QI (match_operand:QI 2 "register_operand")
                             (match_dup 4))
                     (const_int 0)))
-   (set (match_operand:SWI48 0 "register_operand" "")
+   (set (match_operand:SWI48 0 "register_operand")
         (if_then_else:SWI48 (ne (reg:CCZ FLAGS_REG) (const_int 0))
-                           (match_operand:SWI48 1 "register_operand" "")
+                           (match_operand:SWI48 1 "register_operand")
                            (match_dup 0)))
    (set (match_dup 1)
        (if_then_else:SWI48 (ne (reg:CCZ FLAGS_REG) (const_int 0))
-                           (match_operand:SWI48 3 "register_operand" "r")
+                           (match_operand:SWI48 3 "register_operand")
                            (match_dup 1)))]
   "TARGET_CMOVE"
   "operands[4] = GEN_INT (GET_MODE_BITSIZE (<MODE>mode));")
 
 (define_expand "x86_shift<mode>_adj_2"
-  [(use (match_operand:SWI48 0 "register_operand" ""))
-   (use (match_operand:SWI48 1 "register_operand" ""))
-   (use (match_operand:QI 2 "register_operand" ""))]
+  [(use (match_operand:SWI48 0 "register_operand"))
+   (use (match_operand:SWI48 1 "register_operand"))
+   (use (match_operand:QI 2 "register_operand"))]
   ""
 {
   rtx label = gen_label_rtx ();
   [(set_attr "type" "ishift")
    (set_attr "mode" "<MODE>")])
 
+(define_insn "*bmi2_ashl<mode>3_1"
+  [(set (match_operand:SWI48 0 "register_operand" "=r")
+       (ashift:SWI48 (match_operand:SWI48 1 "nonimmediate_operand" "rm")
+                     (match_operand:SWI48 2 "register_operand" "r")))]
+  "TARGET_BMI2"
+  "shlx\t{%2, %1, %0|%0, %1, %2}"
+  [(set_attr "type" "ishiftx")
+   (set_attr "mode" "<MODE>")])
+
 (define_insn "*ashl<mode>3_1"
-  [(set (match_operand:SWI48 0 "nonimmediate_operand" "=rm,r")
-       (ashift:SWI48 (match_operand:SWI48 1 "nonimmediate_operand" "0,l")
-                     (match_operand:QI 2 "nonmemory_operand" "c<S>,M")))
+  [(set (match_operand:SWI48 0 "nonimmediate_operand" "=rm,r,r")
+       (ashift:SWI48 (match_operand:SWI48 1 "nonimmediate_operand" "0,l,rm")
+                     (match_operand:QI 2 "nonmemory_operand" "c<S>,M,r")))
    (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (ASHIFT, <MODE>mode, operands)"
 {
   switch (get_attr_type (insn))
     {
     case TYPE_LEA:
+    case TYPE_ISHIFTX:
       return "#";
 
     case TYPE_ALU:
        return "sal{<imodesuffix>}\t{%2, %0|%0, %2}";
     }
 }
-  [(set (attr "type")
+  [(set_attr "isa" "*,*,bmi2")
+   (set (attr "type")
      (cond [(eq_attr "alternative" "1")
              (const_string "lea")
-            (and (and (ne (symbol_ref "TARGET_DOUBLE_WITH_ADD")
-                         (const_int 0))
-                     (match_operand 0 "register_operand" ""))
-                (match_operand 2 "const1_operand" ""))
+           (eq_attr "alternative" "2")
+             (const_string "ishiftx")
+            (and (and (match_test "TARGET_DOUBLE_WITH_ADD")
+                     (match_operand 0 "register_operand"))
+                (match_operand 2 "const1_operand"))
              (const_string "alu")
           ]
           (const_string "ishift")))
      (if_then_else
        (ior (eq_attr "type" "alu")
            (and (eq_attr "type" "ishift")
-                (and (match_operand 2 "const1_operand" "")
-                     (ne (symbol_ref "TARGET_SHIFT1 || optimize_function_for_size_p (cfun)")
-                         (const_int 0)))))
+                (and (match_operand 2 "const1_operand")
+                     (ior (match_test "TARGET_SHIFT1")
+                          (match_test "optimize_function_for_size_p (cfun)")))))
        (const_string "0")
        (const_string "*")))
    (set_attr "mode" "<MODE>")])
 
+;; Convert shift to the shiftx pattern to avoid flags dependency.
+(define_split
+  [(set (match_operand:SWI48 0 "register_operand")
+       (ashift:SWI48 (match_operand:SWI48 1 "nonimmediate_operand")
+                     (match_operand:QI 2 "register_operand")))
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_BMI2 && reload_completed"
+  [(set (match_dup 0)
+       (ashift:SWI48 (match_dup 1) (match_dup 2)))]
+  "operands[2] = gen_lowpart (<MODE>mode, operands[2]);")
+
+(define_insn "*bmi2_ashlsi3_1_zext"
+  [(set (match_operand:DI 0 "register_operand" "=r")
+       (zero_extend:DI
+         (ashift:SI (match_operand:SI 1 "nonimmediate_operand" "rm")
+                    (match_operand:SI 2 "register_operand" "r"))))]
+  "TARGET_64BIT && TARGET_BMI2"
+  "shlx\t{%2, %1, %k0|%k0, %1, %2}"
+  [(set_attr "type" "ishiftx")
+   (set_attr "mode" "SI")])
+
 (define_insn "*ashlsi3_1_zext"
-  [(set (match_operand:DI 0 "register_operand" "=r,r")
+  [(set (match_operand:DI 0 "register_operand" "=r,r,r")
        (zero_extend:DI
-         (ashift:SI (match_operand:SI 1 "register_operand" "0,l")
-                    (match_operand:QI 2 "nonmemory_operand" "cI,M"))))
+         (ashift:SI (match_operand:SI 1 "nonimmediate_operand" "0,l,rm")
+                    (match_operand:QI 2 "nonmemory_operand" "cI,M,r"))))
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (ASHIFT, SImode, operands)"
 {
   switch (get_attr_type (insn))
     {
     case TYPE_LEA:
+    case TYPE_ISHIFTX:
       return "#";
 
     case TYPE_ALU:
        return "sal{l}\t{%2, %k0|%k0, %2}";
     }
 }
-  [(set (attr "type")
+  [(set_attr "isa" "*,*,bmi2")
+   (set (attr "type")
      (cond [(eq_attr "alternative" "1")
              (const_string "lea")
-            (and (ne (symbol_ref "TARGET_DOUBLE_WITH_ADD")
-                    (const_int 0))
-                (match_operand 2 "const1_operand" ""))
+           (eq_attr "alternative" "2")
+             (const_string "ishiftx")
+            (and (match_test "TARGET_DOUBLE_WITH_ADD")
+                (match_operand 2 "const1_operand"))
              (const_string "alu")
           ]
           (const_string "ishift")))
      (if_then_else
        (ior (eq_attr "type" "alu")
            (and (eq_attr "type" "ishift")
-                (and (match_operand 2 "const1_operand" "")
-                     (ne (symbol_ref "TARGET_SHIFT1 || optimize_function_for_size_p (cfun)")
-                         (const_int 0)))))
+                (and (match_operand 2 "const1_operand")
+                     (ior (match_test "TARGET_SHIFT1")
+                          (match_test "optimize_function_for_size_p (cfun)")))))
        (const_string "0")
        (const_string "*")))
    (set_attr "mode" "SI")])
 
-(define_insn "*ashlhi3_1"
-  [(set (match_operand:HI 0 "nonimmediate_operand" "=rm")
-       (ashift:HI (match_operand:HI 1 "nonimmediate_operand" "0")
-                  (match_operand:QI 2 "nonmemory_operand" "cI")))
+;; Convert shift to the shiftx pattern to avoid flags dependency.
+(define_split
+  [(set (match_operand:DI 0 "register_operand")
+       (zero_extend:DI
+         (ashift:SI (match_operand:SI 1 "nonimmediate_operand")
+                    (match_operand:QI 2 "register_operand"))))
    (clobber (reg:CC FLAGS_REG))]
-  "TARGET_PARTIAL_REG_STALL
-   && ix86_binary_operator_ok (ASHIFT, HImode, operands)"
-{
-  switch (get_attr_type (insn))
-    {
-    case TYPE_ALU:
-      gcc_assert (operands[2] == const1_rtx);
-      return "add{w}\t%0, %0";
-
-    default:
-      if (operands[2] == const1_rtx
-         && (TARGET_SHIFT1 || optimize_function_for_size_p (cfun)))
-       return "sal{w}\t%0";
-      else
-       return "sal{w}\t{%2, %0|%0, %2}";
-    }
-}
-  [(set (attr "type")
-     (cond [(and (and (ne (symbol_ref "TARGET_DOUBLE_WITH_ADD")
-                         (const_int 0))
-                     (match_operand 0 "register_operand" ""))
-                (match_operand 2 "const1_operand" ""))
-             (const_string "alu")
-          ]
-          (const_string "ishift")))
-   (set (attr "length_immediate")
-     (if_then_else
-       (ior (eq_attr "type" "alu")
-           (and (eq_attr "type" "ishift")
-                (and (match_operand 2 "const1_operand" "")
-                     (ne (symbol_ref "TARGET_SHIFT1 || optimize_function_for_size_p (cfun)")
-                         (const_int 0)))))
-       (const_string "0")
-       (const_string "*")))
-   (set_attr "mode" "HI")])
+  "TARGET_64BIT && TARGET_BMI2 && reload_completed"
+  [(set (match_dup 0)
+       (zero_extend:DI (ashift:SI (match_dup 1) (match_dup 2))))]
+  "operands[2] = gen_lowpart (SImode, operands[2]);")
 
-(define_insn "*ashlhi3_1_lea"
-  [(set (match_operand:HI 0 "nonimmediate_operand" "=rm,r")
+(define_insn "*ashlhi3_1"
+  [(set (match_operand:HI 0 "nonimmediate_operand" "=rm,Yp")
        (ashift:HI (match_operand:HI 1 "nonimmediate_operand" "0,l")
                   (match_operand:QI 2 "nonmemory_operand" "cI,M")))
    (clobber (reg:CC FLAGS_REG))]
-  "!TARGET_PARTIAL_REG_STALL
-   && ix86_binary_operator_ok (ASHIFT, HImode, operands)"
+  "ix86_binary_operator_ok (ASHIFT, HImode, operands)"
 {
   switch (get_attr_type (insn))
     {
   [(set (attr "type")
      (cond [(eq_attr "alternative" "1")
              (const_string "lea")
-            (and (and (ne (symbol_ref "TARGET_DOUBLE_WITH_ADD")
-                         (const_int 0))
-                     (match_operand 0 "register_operand" ""))
-                (match_operand 2 "const1_operand" ""))
+            (and (and (match_test "TARGET_DOUBLE_WITH_ADD")
+                     (match_operand 0 "register_operand"))
+                (match_operand 2 "const1_operand"))
              (const_string "alu")
           ]
           (const_string "ishift")))
      (if_then_else
        (ior (eq_attr "type" "alu")
            (and (eq_attr "type" "ishift")
-                (and (match_operand 2 "const1_operand" "")
-                     (ne (symbol_ref "TARGET_SHIFT1 || optimize_function_for_size_p (cfun)")
-                         (const_int 0)))))
+                (and (match_operand 2 "const1_operand")
+                     (ior (match_test "TARGET_SHIFT1")
+                          (match_test "optimize_function_for_size_p (cfun)")))))
        (const_string "0")
        (const_string "*")))
    (set_attr "mode" "HI,SI")])
 
+;; %%% Potential partial reg stall on alternative 1.  What to do?
 (define_insn "*ashlqi3_1"
-  [(set (match_operand:QI 0 "nonimmediate_operand" "=qm,r")
-       (ashift:QI (match_operand:QI 1 "nonimmediate_operand" "0,0")
-                  (match_operand:QI 2 "nonmemory_operand" "cI,cI")))
-   (clobber (reg:CC FLAGS_REG))]
-  "TARGET_PARTIAL_REG_STALL
-   && ix86_binary_operator_ok (ASHIFT, QImode, operands)"
-{
-  switch (get_attr_type (insn))
-    {
-    case TYPE_ALU:
-      gcc_assert (operands[2] == const1_rtx);
-      if (REG_P (operands[1]) && !ANY_QI_REG_P (operands[1]))
-        return "add{l}\t%k0, %k0";
-      else
-        return "add{b}\t%0, %0";
-
-    default:
-      if (operands[2] == const1_rtx
-         && (TARGET_SHIFT1 || optimize_function_for_size_p (cfun)))
-       {
-         if (get_attr_mode (insn) == MODE_SI)
-           return "sal{l}\t%k0";
-         else
-           return "sal{b}\t%0";
-       }
-      else
-       {
-         if (get_attr_mode (insn) == MODE_SI)
-           return "sal{l}\t{%2, %k0|%k0, %2}";
-         else
-           return "sal{b}\t{%2, %0|%0, %2}";
-       }
-    }
-}
-  [(set (attr "type")
-     (cond [(and (and (ne (symbol_ref "TARGET_DOUBLE_WITH_ADD")
-                         (const_int 0))
-                     (match_operand 0 "register_operand" ""))
-                (match_operand 2 "const1_operand" ""))
-             (const_string "alu")
-          ]
-          (const_string "ishift")))
-   (set (attr "length_immediate")
-     (if_then_else
-       (ior (eq_attr "type" "alu")
-           (and (eq_attr "type" "ishift")
-                (and (match_operand 2 "const1_operand" "")
-                     (ne (symbol_ref "TARGET_SHIFT1 || optimize_function_for_size_p (cfun)")
-                         (const_int 0)))))
-       (const_string "0")
-       (const_string "*")))
-   (set_attr "mode" "QI,SI")])
-
-;; %%% Potential partial reg stall on alternative 2.  What to do?
-(define_insn "*ashlqi3_1_lea"
-  [(set (match_operand:QI 0 "nonimmediate_operand" "=qm,r,r")
+  [(set (match_operand:QI 0 "nonimmediate_operand" "=qm,r,Yp")
        (ashift:QI (match_operand:QI 1 "nonimmediate_operand" "0,0,l")
                   (match_operand:QI 2 "nonmemory_operand" "cI,cI,M")))
    (clobber (reg:CC FLAGS_REG))]
-  "!TARGET_PARTIAL_REG_STALL
-   && ix86_binary_operator_ok (ASHIFT, QImode, operands)"
+  "ix86_binary_operator_ok (ASHIFT, QImode, operands)"
 {
   switch (get_attr_type (insn))
     {
   [(set (attr "type")
      (cond [(eq_attr "alternative" "2")
              (const_string "lea")
-            (and (and (ne (symbol_ref "TARGET_DOUBLE_WITH_ADD")
-                         (const_int 0))
-                     (match_operand 0 "register_operand" ""))
-                (match_operand 2 "const1_operand" ""))
+            (and (and (match_test "TARGET_DOUBLE_WITH_ADD")
+                     (match_operand 0 "register_operand"))
+                (match_operand 2 "const1_operand"))
              (const_string "alu")
           ]
           (const_string "ishift")))
      (if_then_else
        (ior (eq_attr "type" "alu")
            (and (eq_attr "type" "ishift")
-                (and (match_operand 2 "const1_operand" "")
-                     (ne (symbol_ref "TARGET_SHIFT1 || optimize_function_for_size_p (cfun)")
-                         (const_int 0)))))
+                (and (match_operand 2 "const1_operand")
+                     (ior (match_test "TARGET_SHIFT1")
+                          (match_test "optimize_function_for_size_p (cfun)")))))
        (const_string "0")
        (const_string "*")))
    (set_attr "mode" "QI,SI,SI")])
     }
 }
   [(set (attr "type")
-     (cond [(and (and (ne (symbol_ref "TARGET_DOUBLE_WITH_ADD")
-                         (const_int 0))
-                     (match_operand 0 "register_operand" ""))
-                (match_operand 1 "const1_operand" ""))
+     (cond [(and (and (match_test "TARGET_DOUBLE_WITH_ADD")
+                     (match_operand 0 "register_operand"))
+                (match_operand 1 "const1_operand"))
              (const_string "alu")
           ]
           (const_string "ishift1")))
      (if_then_else
        (ior (eq_attr "type" "alu")
            (and (eq_attr "type" "ishift1")
-                (and (match_operand 1 "const1_operand" "")
-                     (ne (symbol_ref "TARGET_SHIFT1 || optimize_function_for_size_p (cfun)")
-                         (const_int 0)))))
+                (and (match_operand 1 "const1_operand")
+                     (ior (match_test "TARGET_SHIFT1")
+                          (match_test "optimize_function_for_size_p (cfun)")))))
        (const_string "0")
        (const_string "*")))
    (set_attr "mode" "QI")])
 
-;; Convert lea to the lea pattern to avoid flags dependency.
+;; Convert ashift to the lea pattern to avoid flags dependency.
 (define_split
-  [(set (match_operand 0 "register_operand" "")
-       (ashift (match_operand 1 "index_register_operand" "")
-                (match_operand:QI 2 "const_int_operand" "")))
+  [(set (match_operand 0 "register_operand")
+       (ashift (match_operand 1 "index_register_operand")
+                (match_operand:QI 2 "const_int_operand")))
    (clobber (reg:CC FLAGS_REG))]
-  "reload_completed
+  "GET_MODE (operands[0]) == GET_MODE (operands[1])
+   && reload_completed
    && true_regnum (operands[0]) != true_regnum (operands[1])"
   [(const_int 0)]
 {
-  rtx pat;
   enum machine_mode mode = GET_MODE (operands[0]);
-
-  if (mode != Pmode)
-    operands[1] = gen_lowpart (Pmode, operands[1]);
-  operands[2] = gen_int_mode (1 << INTVAL (operands[2]), Pmode);
-
-  pat = gen_rtx_MULT (Pmode, operands[1], operands[2]);
+  rtx pat;
 
   if (GET_MODE_SIZE (mode) < GET_MODE_SIZE (SImode))
-    operands[0] = gen_lowpart (SImode, operands[0]);
+    { 
+      mode = SImode; 
+      operands[0] = gen_lowpart (mode, operands[0]);
+      operands[1] = gen_lowpart (mode, operands[1]);
+    }
+
+  operands[2] = gen_int_mode (1 << INTVAL (operands[2]), mode);
 
-  if (TARGET_64BIT && mode != Pmode)
-    pat = gen_rtx_SUBREG (SImode, pat, 0);
+  pat = gen_rtx_MULT (mode, operands[1], operands[2]);
 
   emit_insn (gen_rtx_SET (VOIDmode, operands[0], pat));
   DONE;
 })
 
-;; Convert lea to the lea pattern to avoid flags dependency.
+;; Convert ashift to the lea pattern to avoid flags dependency.
 (define_split
-  [(set (match_operand:DI 0 "register_operand" "")
+  [(set (match_operand:DI 0 "register_operand")
        (zero_extend:DI
-         (ashift:SI (match_operand:SI 1 "index_register_operand" "")
-                    (match_operand:QI 2 "const_int_operand" ""))))
+         (ashift:SI (match_operand:SI 1 "index_register_operand")
+                    (match_operand:QI 2 "const_int_operand"))))
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && reload_completed
    && true_regnum (operands[0]) != true_regnum (operands[1])"
     }
 }
   [(set (attr "type")
-     (cond [(and (and (ne (symbol_ref "TARGET_DOUBLE_WITH_ADD")
-                         (const_int 0))
-                     (match_operand 0 "register_operand" ""))
-                (match_operand 2 "const1_operand" ""))
+     (cond [(and (and (match_test "TARGET_DOUBLE_WITH_ADD")
+                     (match_operand 0 "register_operand"))
+                (match_operand 2 "const1_operand"))
              (const_string "alu")
           ]
           (const_string "ishift")))
      (if_then_else
        (ior (eq_attr "type" "alu")
            (and (eq_attr "type" "ishift")
-                (and (match_operand 2 "const1_operand" "")
-                     (ne (symbol_ref "TARGET_SHIFT1 || optimize_function_for_size_p (cfun)")
-                         (const_int 0)))))
+                (and (match_operand 2 "const1_operand")
+                     (ior (match_test "TARGET_SHIFT1")
+                          (match_test "optimize_function_for_size_p (cfun)")))))
        (const_string "0")
        (const_string "*")))
    (set_attr "mode" "<MODE>")])
     }
 }
   [(set (attr "type")
-     (cond [(and (ne (symbol_ref "TARGET_DOUBLE_WITH_ADD")
-                    (const_int 0))
-                (match_operand 2 "const1_operand" ""))
+     (cond [(and (match_test "TARGET_DOUBLE_WITH_ADD")
+                (match_operand 2 "const1_operand"))
              (const_string "alu")
           ]
           (const_string "ishift")))
      (if_then_else
        (ior (eq_attr "type" "alu")
            (and (eq_attr "type" "ishift")
-                (and (match_operand 2 "const1_operand" "")
-                     (ne (symbol_ref "TARGET_SHIFT1 || optimize_function_for_size_p (cfun)")
-                         (const_int 0)))))
+                (and (match_operand 2 "const1_operand")
+                     (ior (match_test "TARGET_SHIFT1")
+                          (match_test "optimize_function_for_size_p (cfun)")))))
        (const_string "0")
        (const_string "*")))
    (set_attr "mode" "SI")])
     }
 }
   [(set (attr "type")
-     (cond [(and (and (ne (symbol_ref "TARGET_DOUBLE_WITH_ADD")
-                         (const_int 0))
-                     (match_operand 0 "register_operand" ""))
-                (match_operand 2 "const1_operand" ""))
+     (cond [(and (and (match_test "TARGET_DOUBLE_WITH_ADD")
+                     (match_operand 0 "register_operand"))
+                (match_operand 2 "const1_operand"))
              (const_string "alu")
           ]
           (const_string "ishift")))
      (if_then_else
        (ior (eq_attr "type" "alu")
            (and (eq_attr "type" "ishift")
-                (and (match_operand 2 "const1_operand" "")
-                     (ne (symbol_ref "TARGET_SHIFT1 || optimize_function_for_size_p (cfun)")
-                         (const_int 0)))))
+                (and (match_operand 2 "const1_operand")
+                     (ior (match_test "TARGET_SHIFT1")
+                          (match_test "optimize_function_for_size_p (cfun)")))))
        (const_string "0")
        (const_string "*")))
    (set_attr "mode" "<MODE>")])
 
 ;; See comment above `ashl<mode>3' about how this works.
 
-(define_expand "<shiftrt_insn><mode>3"
-  [(set (match_operand:SDWIM 0 "<shift_operand>" "")
-       (any_shiftrt:SDWIM (match_operand:SDWIM 1 "<shift_operand>" "")
-                          (match_operand:QI 2 "nonmemory_operand" "")))]
+(define_expand "<shift_insn><mode>3"
+  [(set (match_operand:SDWIM 0 "<shift_operand>")
+       (any_shiftrt:SDWIM (match_operand:SDWIM 1 "<shift_operand>")
+                          (match_operand:QI 2 "nonmemory_operand")))]
   ""
   "ix86_expand_binary_operator (<CODE>, <MODE>mode, operands); DONE;")
 
 ;; Avoid useless masking of count operand.
-(define_insn_and_split "*<shiftrt_insn><mode>3_mask"
+(define_insn_and_split "*<shift_insn><mode>3_mask"
   [(set (match_operand:SWI48 0 "nonimmediate_operand" "=rm")
        (any_shiftrt:SWI48
          (match_operand:SWI48 1 "nonimmediate_operand" "0")
   [(set_attr "type" "ishift")
    (set_attr "mode" "<MODE>")])
 
-(define_insn_and_split "*<shiftrt_insn><mode>3_doubleword"
+(define_insn_and_split "*<shift_insn><mode>3_doubleword"
   [(set (match_operand:DWI 0 "register_operand" "=r")
        (any_shiftrt:DWI (match_operand:DWI 1 "register_operand" "0")
                         (match_operand:QI 2 "nonmemory_operand" "<S>c")))
   "#"
   "(optimize && flag_peephole2) ? epilogue_completed : reload_completed"
   [(const_int 0)]
-  "ix86_split_<shiftrt_insn> (operands, NULL_RTX, <MODE>mode); DONE;"
+  "ix86_split_<shift_insn> (operands, NULL_RTX, <MODE>mode); DONE;"
   [(set_attr "type" "multi")])
 
 ;; By default we don't ask for a scratch register, because when DWImode
 
 (define_peephole2
   [(match_scratch:DWIH 3 "r")
-   (parallel [(set (match_operand:<DWI> 0 "register_operand" "")
+   (parallel [(set (match_operand:<DWI> 0 "register_operand")
                   (any_shiftrt:<DWI>
-                    (match_operand:<DWI> 1 "register_operand" "")
-                    (match_operand:QI 2 "nonmemory_operand" "")))
+                    (match_operand:<DWI> 1 "register_operand")
+                    (match_operand:QI 2 "nonmemory_operand")))
              (clobber (reg:CC FLAGS_REG))])
    (match_dup 3)]
   "TARGET_CMOVE"
   [(const_int 0)]
-  "ix86_split_<shiftrt_insn> (operands, operands[3], <DWI>mode); DONE;")
+  "ix86_split_<shift_insn> (operands, operands[3], <DWI>mode); DONE;")
 
 (define_insn "x86_64_shrd"
   [(set (match_operand:DI 0 "nonimmediate_operand" "+r*m")
 (define_insn "ashrdi3_cvt"
   [(set (match_operand:DI 0 "nonimmediate_operand" "=*d,rm")
        (ashiftrt:DI (match_operand:DI 1 "nonimmediate_operand" "*a,0")
-                    (match_operand:QI 2 "const_int_operand" "")))
+                    (match_operand:QI 2 "const_int_operand")))
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && INTVAL (operands[2]) == 63
    && (TARGET_USE_CLTD || optimize_function_for_size_p (cfun))
 (define_insn "ashrsi3_cvt"
   [(set (match_operand:SI 0 "nonimmediate_operand" "=*d,rm")
        (ashiftrt:SI (match_operand:SI 1 "nonimmediate_operand" "*a,0")
-                    (match_operand:QI 2 "const_int_operand" "")))
+                    (match_operand:QI 2 "const_int_operand")))
    (clobber (reg:CC FLAGS_REG))]
   "INTVAL (operands[2]) == 31
    && (TARGET_USE_CLTD || optimize_function_for_size_p (cfun))
   [(set (match_operand:DI 0 "register_operand" "=*d,r")
        (zero_extend:DI
          (ashiftrt:SI (match_operand:SI 1 "register_operand" "*a,0")
-                      (match_operand:QI 2 "const_int_operand" ""))))
+                      (match_operand:QI 2 "const_int_operand"))))
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && INTVAL (operands[2]) == 31
    && (TARGET_USE_CLTD || optimize_function_for_size_p (cfun))
    (set_attr "mode" "SI")])
 
 (define_expand "x86_shift<mode>_adj_3"
-  [(use (match_operand:SWI48 0 "register_operand" ""))
-   (use (match_operand:SWI48 1 "register_operand" ""))
-   (use (match_operand:QI 2 "register_operand" ""))]
+  [(use (match_operand:SWI48 0 "register_operand"))
+   (use (match_operand:SWI48 1 "register_operand"))
+   (use (match_operand:QI 2 "register_operand"))]
   ""
 {
   rtx label = gen_label_rtx ();
   DONE;
 })
 
-(define_insn "*<shiftrt_insn><mode>3_1"
-  [(set (match_operand:SWI 0 "nonimmediate_operand" "=<r>m")
-       (any_shiftrt:SWI (match_operand:SWI 1 "nonimmediate_operand" "0")
-                        (match_operand:QI 2 "nonmemory_operand" "c<S>")))
+(define_insn "*bmi2_<shift_insn><mode>3_1"
+  [(set (match_operand:SWI48 0 "register_operand" "=r")
+       (any_shiftrt:SWI48 (match_operand:SWI48 1 "nonimmediate_operand" "rm")
+                          (match_operand:SWI48 2 "register_operand" "r")))]
+  "TARGET_BMI2"
+  "<shift>x\t{%2, %1, %0|%0, %1, %2}"
+  [(set_attr "type" "ishiftx")
+   (set_attr "mode" "<MODE>")])
+
+(define_insn "*<shift_insn><mode>3_1"
+  [(set (match_operand:SWI48 0 "nonimmediate_operand" "=rm,r")
+       (any_shiftrt:SWI48
+         (match_operand:SWI48 1 "nonimmediate_operand" "0,rm")
+         (match_operand:QI 2 "nonmemory_operand" "c<S>,r")))
    (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (<CODE>, <MODE>mode, operands)"
 {
-  if (operands[2] == const1_rtx
-      && (TARGET_SHIFT1 || optimize_function_for_size_p (cfun)))
-    return "<shiftrt>{<imodesuffix>}\t%0";
-  else
-    return "<shiftrt>{<imodesuffix>}\t{%2, %0|%0, %2}";
+  switch (get_attr_type (insn))
+    {
+    case TYPE_ISHIFTX:
+      return "#";
+
+    default:
+      if (operands[2] == const1_rtx
+         && (TARGET_SHIFT1 || optimize_function_for_size_p (cfun)))
+       return "<shift>{<imodesuffix>}\t%0";
+      else
+       return "<shift>{<imodesuffix>}\t{%2, %0|%0, %2}";
+    }
 }
-  [(set_attr "type" "ishift")
+  [(set_attr "isa" "*,bmi2")
+   (set_attr "type" "ishift,ishiftx")
    (set (attr "length_immediate")
      (if_then_else
-       (and (match_operand 2 "const1_operand" "")
-           (ne (symbol_ref "TARGET_SHIFT1 || optimize_function_for_size_p (cfun)")
-               (const_int 0)))
+       (and (match_operand 2 "const1_operand")
+           (ior (match_test "TARGET_SHIFT1")
+                (match_test "optimize_function_for_size_p (cfun)")))
        (const_string "0")
        (const_string "*")))
    (set_attr "mode" "<MODE>")])
 
-(define_insn "*<shiftrt_insn>si3_1_zext"
+;; Convert shift to the shiftx pattern to avoid flags dependency.
+(define_split
+  [(set (match_operand:SWI48 0 "register_operand")
+       (any_shiftrt:SWI48 (match_operand:SWI48 1 "nonimmediate_operand")
+                          (match_operand:QI 2 "register_operand")))
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_BMI2 && reload_completed"
+  [(set (match_dup 0)
+       (any_shiftrt:SWI48 (match_dup 1) (match_dup 2)))]
+  "operands[2] = gen_lowpart (<MODE>mode, operands[2]);")
+
+(define_insn "*bmi2_<shift_insn>si3_1_zext"
   [(set (match_operand:DI 0 "register_operand" "=r")
        (zero_extend:DI
-         (any_shiftrt:SI (match_operand:SI 1 "register_operand" "0")
-                         (match_operand:QI 2 "nonmemory_operand" "cI"))))
+         (any_shiftrt:SI (match_operand:SI 1 "nonimmediate_operand" "rm")
+                         (match_operand:SI 2 "register_operand" "r"))))]
+  "TARGET_64BIT && TARGET_BMI2"
+  "<shift>x\t{%2, %1, %k0|%k0, %1, %2}"
+  [(set_attr "type" "ishiftx")
+   (set_attr "mode" "SI")])
+
+(define_insn "*<shift_insn>si3_1_zext"
+  [(set (match_operand:DI 0 "register_operand" "=r,r")
+       (zero_extend:DI
+         (any_shiftrt:SI (match_operand:SI 1 "nonimmediate_operand" "0,rm")
+                         (match_operand:QI 2 "nonmemory_operand" "cI,r"))))
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (<CODE>, SImode, operands)"
+{
+  switch (get_attr_type (insn))
+    {
+    case TYPE_ISHIFTX:
+      return "#";
+
+    default:
+      if (operands[2] == const1_rtx
+         && (TARGET_SHIFT1 || optimize_function_for_size_p (cfun)))
+       return "<shift>{l}\t%k0";
+      else
+       return "<shift>{l}\t{%2, %k0|%k0, %2}";
+    }
+}
+  [(set_attr "isa" "*,bmi2")
+   (set_attr "type" "ishift,ishiftx")
+   (set (attr "length_immediate")
+     (if_then_else
+       (and (match_operand 2 "const1_operand")
+           (ior (match_test "TARGET_SHIFT1")
+                (match_test "optimize_function_for_size_p (cfun)")))
+       (const_string "0")
+       (const_string "*")))
+   (set_attr "mode" "SI")])
+
+;; Convert shift to the shiftx pattern to avoid flags dependency.
+(define_split
+  [(set (match_operand:DI 0 "register_operand")
+       (zero_extend:DI
+         (any_shiftrt:SI (match_operand:SI 1 "nonimmediate_operand")
+                         (match_operand:QI 2 "register_operand"))))
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_64BIT && TARGET_BMI2 && reload_completed"
+  [(set (match_dup 0)
+       (zero_extend:DI (any_shiftrt:SI (match_dup 1) (match_dup 2))))]
+  "operands[2] = gen_lowpart (SImode, operands[2]);")
+
+(define_insn "*<shift_insn><mode>3_1"
+  [(set (match_operand:SWI12 0 "nonimmediate_operand" "=<r>m")
+       (any_shiftrt:SWI12
+         (match_operand:SWI12 1 "nonimmediate_operand" "0")
+         (match_operand:QI 2 "nonmemory_operand" "c<S>")))
+   (clobber (reg:CC FLAGS_REG))]
+  "ix86_binary_operator_ok (<CODE>, <MODE>mode, operands)"
 {
   if (operands[2] == const1_rtx
       && (TARGET_SHIFT1 || optimize_function_for_size_p (cfun)))
-    return "<shiftrt>{l}\t%k0";
+    return "<shift>{<imodesuffix>}\t%0";
   else
-    return "<shiftrt>{l}\t{%2, %k0|%k0, %2}";
+    return "<shift>{<imodesuffix>}\t{%2, %0|%0, %2}";
 }
   [(set_attr "type" "ishift")
    (set (attr "length_immediate")
      (if_then_else
-       (and (match_operand 2 "const1_operand" "")
-           (ne (symbol_ref "TARGET_SHIFT1 || optimize_function_for_size_p (cfun)")
-               (const_int 0)))
+       (and (match_operand 2 "const1_operand")
+           (ior (match_test "TARGET_SHIFT1")
+                (match_test "optimize_function_for_size_p (cfun)")))
        (const_string "0")
        (const_string "*")))
-   (set_attr "mode" "SI")])
+   (set_attr "mode" "<MODE>")])
 
-(define_insn "*<shiftrt_insn>qi3_1_slp"
+(define_insn "*<shift_insn>qi3_1_slp"
   [(set (strict_low_part (match_operand:QI 0 "nonimmediate_operand" "+qm"))
        (any_shiftrt:QI (match_dup 0)
                        (match_operand:QI 1 "nonmemory_operand" "cI")))
 {
   if (operands[1] == const1_rtx
       && (TARGET_SHIFT1 || optimize_function_for_size_p (cfun)))
-    return "<shiftrt>{b}\t%0";
+    return "<shift>{b}\t%0";
   else
-    return "<shiftrt>{b}\t{%1, %0|%0, %1}";
+    return "<shift>{b}\t{%1, %0|%0, %1}";
 }
   [(set_attr "type" "ishift1")
    (set (attr "length_immediate")
      (if_then_else
-       (and (match_operand 1 "const1_operand" "")
-           (ne (symbol_ref "TARGET_SHIFT1 || optimize_function_for_size_p (cfun)")
-               (const_int 0)))
+       (and (match_operand 1 "const1_operand")
+           (ior (match_test "TARGET_SHIFT1")
+                (match_test "optimize_function_for_size_p (cfun)")))
        (const_string "0")
        (const_string "*")))
    (set_attr "mode" "QI")])
 ;; This pattern can't accept a variable shift count, since shifts by
 ;; zero don't affect the flags.  We assume that shifts by constant
 ;; zero are optimized away.
-(define_insn "*<shiftrt_insn><mode>3_cmp"
+(define_insn "*<shift_insn><mode>3_cmp"
   [(set (reg FLAGS_REG)
        (compare
          (any_shiftrt:SWI
 {
   if (operands[2] == const1_rtx
       && (TARGET_SHIFT1 || optimize_function_for_size_p (cfun)))
-    return "<shiftrt>{<imodesuffix>}\t%0";
+    return "<shift>{<imodesuffix>}\t%0";
   else
-    return "<shiftrt>{<imodesuffix>}\t{%2, %0|%0, %2}";
+    return "<shift>{<imodesuffix>}\t{%2, %0|%0, %2}";
 }
   [(set_attr "type" "ishift")
    (set (attr "length_immediate")
      (if_then_else
-       (and (match_operand 2 "const1_operand" "")
-           (ne (symbol_ref "TARGET_SHIFT1 || optimize_function_for_size_p (cfun)")
-               (const_int 0)))
+       (and (match_operand 2 "const1_operand")
+           (ior (match_test "TARGET_SHIFT1")
+                (match_test "optimize_function_for_size_p (cfun)")))
        (const_string "0")
        (const_string "*")))
    (set_attr "mode" "<MODE>")])
 
-(define_insn "*<shiftrt_insn>si3_cmp_zext"
+(define_insn "*<shift_insn>si3_cmp_zext"
   [(set (reg FLAGS_REG)
        (compare
          (any_shiftrt:SI (match_operand:SI 1 "register_operand" "0")
 {
   if (operands[2] == const1_rtx
       && (TARGET_SHIFT1 || optimize_function_for_size_p (cfun)))
-    return "<shiftrt>{l}\t%k0";
+    return "<shift>{l}\t%k0";
   else
-    return "<shiftrt>{l}\t{%2, %k0|%k0, %2}";
+    return "<shift>{l}\t{%2, %k0|%k0, %2}";
 }
   [(set_attr "type" "ishift")
    (set (attr "length_immediate")
      (if_then_else
-       (and (match_operand 2 "const1_operand" "")
-           (ne (symbol_ref "TARGET_SHIFT1 || optimize_function_for_size_p (cfun)")
-               (const_int 0)))
+       (and (match_operand 2 "const1_operand")
+           (ior (match_test "TARGET_SHIFT1")
+                (match_test "optimize_function_for_size_p (cfun)")))
        (const_string "0")
        (const_string "*")))
    (set_attr "mode" "SI")])
 
-(define_insn "*<shiftrt_insn><mode>3_cconly"
+(define_insn "*<shift_insn><mode>3_cconly"
   [(set (reg FLAGS_REG)
        (compare
          (any_shiftrt:SWI
 {
   if (operands[2] == const1_rtx
       && (TARGET_SHIFT1 || optimize_function_for_size_p (cfun)))
-    return "<shiftrt>{<imodesuffix>}\t%0";
+    return "<shift>{<imodesuffix>}\t%0";
   else
-    return "<shiftrt>{<imodesuffix>}\t{%2, %0|%0, %2}";
+    return "<shift>{<imodesuffix>}\t{%2, %0|%0, %2}";
 }
   [(set_attr "type" "ishift")
    (set (attr "length_immediate")
      (if_then_else
-       (and (match_operand 2 "const1_operand" "")
-           (ne (symbol_ref "TARGET_SHIFT1 || optimize_function_for_size_p (cfun)")
-               (const_int 0)))
+       (and (match_operand 2 "const1_operand")
+           (ior (match_test "TARGET_SHIFT1")
+                (match_test "optimize_function_for_size_p (cfun)")))
        (const_string "0")
        (const_string "*")))
    (set_attr "mode" "<MODE>")])
 ;; Rotate instructions
 
 (define_expand "<rotate_insn>ti3"
-  [(set (match_operand:TI 0 "register_operand" "")
-       (any_rotate:TI (match_operand:TI 1 "register_operand" "")
-                      (match_operand:QI 2 "nonmemory_operand" "")))]
+  [(set (match_operand:TI 0 "register_operand")
+       (any_rotate:TI (match_operand:TI 1 "register_operand")
+                      (match_operand:QI 2 "nonmemory_operand")))]
   "TARGET_64BIT"
 {
   if (const_1_to_63_operand (operands[2], VOIDmode))
 })
 
 (define_expand "<rotate_insn>di3"
-  [(set (match_operand:DI 0 "shiftdi_operand" "")
-       (any_rotate:DI (match_operand:DI 1 "shiftdi_operand" "")
-                      (match_operand:QI 2 "nonmemory_operand" "")))]
+  [(set (match_operand:DI 0 "shiftdi_operand")
+       (any_rotate:DI (match_operand:DI 1 "shiftdi_operand")
+                      (match_operand:QI 2 "nonmemory_operand")))]
  ""
 {
   if (TARGET_64BIT)
 })
 
 (define_expand "<rotate_insn><mode>3"
-  [(set (match_operand:SWIM124 0 "nonimmediate_operand" "")
-       (any_rotate:SWIM124 (match_operand:SWIM124 1 "nonimmediate_operand" "")
-                           (match_operand:QI 2 "nonmemory_operand" "")))]
+  [(set (match_operand:SWIM124 0 "nonimmediate_operand")
+       (any_rotate:SWIM124 (match_operand:SWIM124 1 "nonimmediate_operand")
+                           (match_operand:QI 2 "nonmemory_operand")))]
   ""
   "ix86_expand_binary_operator (<CODE>, <MODE>mode, operands); DONE;")
 
   split_double_mode (<DWI>mode, &operands[0], 1, &operands[4], &operands[5]);
 })
 
+(define_insn "*bmi2_rorx<mode>3_1"
+  [(set (match_operand:SWI48 0 "register_operand" "=r")
+       (rotatert:SWI48 (match_operand:SWI48 1 "nonimmediate_operand" "rm")
+                       (match_operand:QI 2 "immediate_operand" "<S>")))]
+  "TARGET_BMI2"
+  "rorx\t{%2, %1, %0|%0, %1, %2}"
+  [(set_attr "type" "rotatex")
+   (set_attr "mode" "<MODE>")])
+
 (define_insn "*<rotate_insn><mode>3_1"
-  [(set (match_operand:SWI 0 "nonimmediate_operand" "=<r>m")
-       (any_rotate:SWI (match_operand:SWI 1 "nonimmediate_operand" "0")
-                       (match_operand:QI 2 "nonmemory_operand" "c<S>")))
+  [(set (match_operand:SWI48 0 "nonimmediate_operand" "=rm,r")
+       (any_rotate:SWI48
+         (match_operand:SWI48 1 "nonimmediate_operand" "0,rm")
+         (match_operand:QI 2 "nonmemory_operand" "c<S>,<S>")))
    (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (<CODE>, <MODE>mode, operands)"
 {
-  if (operands[2] == const1_rtx
-      && (TARGET_SHIFT1 || optimize_function_for_size_p (cfun)))
-    return "<rotate>{<imodesuffix>}\t%0";
-  else
-    return "<rotate>{<imodesuffix>}\t{%2, %0|%0, %2}";
+  switch (get_attr_type (insn))
+    {
+    case TYPE_ROTATEX:
+      return "#";
+
+    default:
+      if (operands[2] == const1_rtx
+         && (TARGET_SHIFT1 || optimize_function_for_size_p (cfun)))
+       return "<rotate>{<imodesuffix>}\t%0";
+      else
+       return "<rotate>{<imodesuffix>}\t{%2, %0|%0, %2}";
+    }
 }
-  [(set_attr "type" "rotate")
+  [(set_attr "isa" "*,bmi2")
+   (set_attr "type" "rotate,rotatex")
    (set (attr "length_immediate")
      (if_then_else
-       (and (match_operand 2 "const1_operand" "")
-           (ne (symbol_ref "TARGET_SHIFT1 || optimize_function_for_size_p (cfun)")
-               (const_int 0)))
+       (and (eq_attr "type" "rotate")
+           (and (match_operand 2 "const1_operand")
+                (ior (match_test "TARGET_SHIFT1")
+                     (match_test "optimize_function_for_size_p (cfun)"))))
        (const_string "0")
        (const_string "*")))
    (set_attr "mode" "<MODE>")])
 
-(define_insn "*<rotate_insn>si3_1_zext"
+;; Convert rotate to the rotatex pattern to avoid flags dependency.
+(define_split
+  [(set (match_operand:SWI48 0 "register_operand")
+       (rotate:SWI48 (match_operand:SWI48 1 "nonimmediate_operand")
+                     (match_operand:QI 2 "immediate_operand")))
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_BMI2 && reload_completed"
+  [(set (match_dup 0)
+       (rotatert:SWI48 (match_dup 1) (match_dup 2)))]
+{
+  operands[2]
+    = GEN_INT (GET_MODE_BITSIZE (<MODE>mode) - INTVAL (operands[2]));
+})
+
+(define_split
+  [(set (match_operand:SWI48 0 "register_operand")
+       (rotatert:SWI48 (match_operand:SWI48 1 "nonimmediate_operand")
+                       (match_operand:QI 2 "immediate_operand")))
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_BMI2 && reload_completed"
+  [(set (match_dup 0)
+       (rotatert:SWI48 (match_dup 1) (match_dup 2)))])
+
+(define_insn "*bmi2_rorxsi3_1_zext"
   [(set (match_operand:DI 0 "register_operand" "=r")
        (zero_extend:DI
-         (any_rotate:SI (match_operand:SI 1 "register_operand" "0")
-                        (match_operand:QI 2 "nonmemory_operand" "cI"))))
+         (rotatert:SI (match_operand:SI 1 "nonimmediate_operand" "rm")
+                      (match_operand:QI 2 "immediate_operand" "I"))))]
+  "TARGET_64BIT && TARGET_BMI2"
+  "rorx\t{%2, %1, %k0|%k0, %1, %2}"
+  [(set_attr "type" "rotatex")
+   (set_attr "mode" "SI")])
+
+(define_insn "*<rotate_insn>si3_1_zext"
+  [(set (match_operand:DI 0 "register_operand" "=r,r")
+       (zero_extend:DI
+         (any_rotate:SI (match_operand:SI 1 "nonimmediate_operand" "0,rm")
+                        (match_operand:QI 2 "nonmemory_operand" "cI,I"))))
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (<CODE>, SImode, operands)"
 {
-    if (operands[2] == const1_rtx
-       && (TARGET_SHIFT1 || optimize_function_for_size_p (cfun)))
-    return "<rotate>{l}\t%k0";
+  switch (get_attr_type (insn))
+    {
+    case TYPE_ROTATEX:
+      return "#";
+
+    default:
+      if (operands[2] == const1_rtx
+         && (TARGET_SHIFT1 || optimize_function_for_size_p (cfun)))
+       return "<rotate>{l}\t%k0";
+      else
+       return "<rotate>{l}\t{%2, %k0|%k0, %2}";
+    }
+}
+  [(set_attr "isa" "*,bmi2")
+   (set_attr "type" "rotate,rotatex")
+   (set (attr "length_immediate")
+     (if_then_else
+       (and (eq_attr "type" "rotate")
+           (and (match_operand 2 "const1_operand")
+                (ior (match_test "TARGET_SHIFT1")
+                     (match_test "optimize_function_for_size_p (cfun)"))))
+       (const_string "0")
+       (const_string "*")))
+   (set_attr "mode" "SI")])
+
+;; Convert rotate to the rotatex pattern to avoid flags dependency.
+(define_split
+  [(set (match_operand:DI 0 "register_operand")
+       (zero_extend:DI
+         (rotate:SI (match_operand:SI 1 "nonimmediate_operand")
+                    (match_operand:QI 2 "immediate_operand"))))
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_64BIT && TARGET_BMI2 && reload_completed"
+  [(set (match_dup 0)
+       (zero_extend:DI (rotatert:SI (match_dup 1) (match_dup 2))))]
+{
+  operands[2]
+    = GEN_INT (GET_MODE_BITSIZE (SImode) - INTVAL (operands[2]));
+})
+
+(define_split
+  [(set (match_operand:DI 0 "register_operand")
+       (zero_extend:DI
+         (rotatert:SI (match_operand:SI 1 "nonimmediate_operand")
+                      (match_operand:QI 2 "immediate_operand"))))
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_64BIT && TARGET_BMI2 && reload_completed"
+  [(set (match_dup 0)
+       (zero_extend:DI (rotatert:SI (match_dup 1) (match_dup 2))))])
+
+(define_insn "*<rotate_insn><mode>3_1"
+  [(set (match_operand:SWI12 0 "nonimmediate_operand" "=<r>m")
+       (any_rotate:SWI12 (match_operand:SWI12 1 "nonimmediate_operand" "0")
+                         (match_operand:QI 2 "nonmemory_operand" "c<S>")))
+   (clobber (reg:CC FLAGS_REG))]
+  "ix86_binary_operator_ok (<CODE>, <MODE>mode, operands)"
+{
+  if (operands[2] == const1_rtx
+      && (TARGET_SHIFT1 || optimize_function_for_size_p (cfun)))
+    return "<rotate>{<imodesuffix>}\t%0";
   else
-    return "<rotate>{l}\t{%2, %k0|%k0, %2}";
+    return "<rotate>{<imodesuffix>}\t{%2, %0|%0, %2}";
 }
   [(set_attr "type" "rotate")
    (set (attr "length_immediate")
      (if_then_else
-       (and (match_operand 2 "const1_operand" "")
-           (ne (symbol_ref "TARGET_SHIFT1 || optimize_function_for_size_p (cfun)")
-               (const_int 0)))
+       (and (match_operand 2 "const1_operand")
+           (ior (match_test "TARGET_SHIFT1")
+                (match_test "optimize_function_for_size_p (cfun)")))
        (const_string "0")
        (const_string "*")))
-   (set_attr "mode" "SI")])
+   (set_attr "mode" "<MODE>")])
 
 (define_insn "*<rotate_insn>qi3_1_slp"
   [(set (strict_low_part (match_operand:QI 0 "nonimmediate_operand" "+qm"))
   [(set_attr "type" "rotate1")
    (set (attr "length_immediate")
      (if_then_else
-       (and (match_operand 1 "const1_operand" "")
-           (ne (symbol_ref "TARGET_SHIFT1 || optimize_function_for_size_p (cfun)")
-               (const_int 0)))
+       (and (match_operand 1 "const1_operand")
+           (ior (match_test "TARGET_SHIFT1")
+                (match_test "optimize_function_for_size_p (cfun)")))
        (const_string "0")
        (const_string "*")))
    (set_attr "mode" "QI")])
 
 (define_split
- [(set (match_operand:HI 0 "register_operand" "")
+ [(set (match_operand:HI 0 "register_operand")
        (any_rotate:HI (match_dup 0) (const_int 8)))
   (clobber (reg:CC FLAGS_REG))]
  "reload_completed
 ;; Bit set / bit test instructions
 
 (define_expand "extv"
-  [(set (match_operand:SI 0 "register_operand" "")
-       (sign_extract:SI (match_operand:SI 1 "register_operand" "")
-                        (match_operand:SI 2 "const8_operand" "")
-                        (match_operand:SI 3 "const8_operand" "")))]
+  [(set (match_operand:SI 0 "register_operand")
+       (sign_extract:SI (match_operand:SI 1 "register_operand")
+                        (match_operand:SI 2 "const8_operand")
+                        (match_operand:SI 3 "const8_operand")))]
   ""
 {
   /* Handle extractions from %ah et al.  */
 })
 
 (define_expand "extzv"
-  [(set (match_operand:SI 0 "register_operand" "")
-       (zero_extract:SI (match_operand 1 "ext_register_operand" "")
-                        (match_operand:SI 2 "const8_operand" "")
-                        (match_operand:SI 3 "const8_operand" "")))]
+  [(set (match_operand:SI 0 "register_operand")
+       (zero_extract:SI (match_operand 1 "ext_register_operand")
+                        (match_operand:SI 2 "const8_operand")
+                        (match_operand:SI 3 "const8_operand")))]
   ""
 {
   /* Handle extractions from %ah et al.  */
 })
 
 (define_expand "insv"
-  [(set (zero_extract (match_operand 0 "register_operand" "")
-                     (match_operand 1 "const_int_operand" "")
-                     (match_operand 2 "const_int_operand" ""))
-        (match_operand 3 "register_operand" ""))]
+  [(set (zero_extract (match_operand 0 "register_operand")
+                     (match_operand 1 "const_int_operand")
+                     (match_operand 2 "const_int_operand"))
+        (match_operand 3 "register_operand"))]
   ""
 {
   rtx (*gen_mov_insv_1) (rtx, rtx);
 (define_insn "*btsq"
   [(set (zero_extract:DI (match_operand:DI 0 "register_operand" "+r")
                         (const_int 1)
-                        (match_operand:DI 1 "const_0_to_63_operand" ""))
+                        (match_operand:DI 1 "const_0_to_63_operand"))
        (const_int 1))
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && (TARGET_USE_BT || reload_completed)"
 (define_insn "*btrq"
   [(set (zero_extract:DI (match_operand:DI 0 "register_operand" "+r")
                         (const_int 1)
-                        (match_operand:DI 1 "const_0_to_63_operand" ""))
+                        (match_operand:DI 1 "const_0_to_63_operand"))
        (const_int 0))
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && (TARGET_USE_BT || reload_completed)"
 (define_insn "*btcq"
   [(set (zero_extract:DI (match_operand:DI 0 "register_operand" "+r")
                         (const_int 1)
-                        (match_operand:DI 1 "const_0_to_63_operand" ""))
+                        (match_operand:DI 1 "const_0_to_63_operand"))
        (not:DI (zero_extract:DI (match_dup 0) (const_int 1) (match_dup 1))))
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && (TARGET_USE_BT || reload_completed)"
 (define_peephole2
   [(match_scratch:DI 2 "r")
    (parallel [(set (zero_extract:DI
-                    (match_operand:DI 0 "register_operand" "")
+                    (match_operand:DI 0 "register_operand")
                     (const_int 1)
-                    (match_operand:DI 1 "const_0_to_63_operand" ""))
+                    (match_operand:DI 1 "const_0_to_63_operand"))
                   (const_int 1))
              (clobber (reg:CC FLAGS_REG))])]
   "TARGET_64BIT && !TARGET_USE_BT"
 (define_peephole2
   [(match_scratch:DI 2 "r")
    (parallel [(set (zero_extract:DI
-                    (match_operand:DI 0 "register_operand" "")
+                    (match_operand:DI 0 "register_operand")
                     (const_int 1)
-                    (match_operand:DI 1 "const_0_to_63_operand" ""))
+                    (match_operand:DI 1 "const_0_to_63_operand"))
                   (const_int 0))
              (clobber (reg:CC FLAGS_REG))])]
   "TARGET_64BIT && !TARGET_USE_BT"
 (define_peephole2
   [(match_scratch:DI 2 "r")
    (parallel [(set (zero_extract:DI
-                    (match_operand:DI 0 "register_operand" "")
+                    (match_operand:DI 0 "register_operand")
                     (const_int 1)
-                    (match_operand:DI 1 "const_0_to_63_operand" ""))
+                    (match_operand:DI 1 "const_0_to_63_operand"))
              (not:DI (zero_extract:DI
                        (match_dup 0) (const_int 1) (match_dup 1))))
              (clobber (reg:CC FLAGS_REG))])]
          (zero_extract:SWI48
            (match_operand:SWI48 0 "register_operand" "r")
            (const_int 1)
-           (match_operand:SWI48 1 "nonmemory_operand" "rN"))
+           (match_operand:SWI48 1 "x86_64_nonmemory_operand" "rN"))
          (const_int 0)))]
   "TARGET_USE_BT || optimize_function_for_size_p (cfun)"
   "bt{<imodesuffix>}\t{%1, %0|%0, %1}"
 ;;     sete    %al
 
 (define_split
-  [(set (match_operand:QI 0 "nonimmediate_operand" "")
+  [(set (match_operand:QI 0 "nonimmediate_operand")
        (ne:QI (match_operator 1 "ix86_comparison_operator"
                 [(reg FLAGS_REG) (const_int 0)])
            (const_int 0)))]
   "PUT_MODE (operands[1], QImode);")
 
 (define_split
-  [(set (strict_low_part (match_operand:QI 0 "nonimmediate_operand" ""))
+  [(set (strict_low_part (match_operand:QI 0 "nonimmediate_operand"))
        (ne:QI (match_operator 1 "ix86_comparison_operator"
                 [(reg FLAGS_REG) (const_int 0)])
            (const_int 0)))]
   "PUT_MODE (operands[1], QImode);")
 
 (define_split
-  [(set (match_operand:QI 0 "nonimmediate_operand" "")
+  [(set (match_operand:QI 0 "nonimmediate_operand")
        (eq:QI (match_operator 1 "ix86_comparison_operator"
                 [(reg FLAGS_REG) (const_int 0)])
            (const_int 0)))]
 })
 
 (define_split
-  [(set (strict_low_part (match_operand:QI 0 "nonimmediate_operand" ""))
+  [(set (strict_low_part (match_operand:QI 0 "nonimmediate_operand"))
        (eq:QI (match_operator 1 "ix86_comparison_operator"
                 [(reg FLAGS_REG) (const_int 0)])
            (const_int 0)))]
   [(set (pc)
        (if_then_else (match_operator 1 "ix86_comparison_operator"
                                      [(reg FLAGS_REG) (const_int 0)])
-                     (label_ref (match_operand 0 "" ""))
+                     (label_ref (match_operand 0))
                      (pc)))]
   ""
   "%+j%C1\t%l0"
        (if_then_else (match_operator 1 "ix86_comparison_operator"
                                      [(reg FLAGS_REG) (const_int 0)])
                      (pc)
-                     (label_ref (match_operand 0 "" ""))))]
+                     (label_ref (match_operand 0))))]
   ""
   "%+j%c1\t%l0"
   [(set_attr "type" "ibr")
        (if_then_else (ne (match_operator 0 "ix86_comparison_operator"
                                      [(reg FLAGS_REG) (const_int 0)])
                          (const_int 0))
-                     (label_ref (match_operand 1 "" ""))
+                     (label_ref (match_operand 1))
                      (pc)))]
   ""
   [(set (pc)
        (if_then_else (eq (match_operator 0 "ix86_comparison_operator"
                                      [(reg FLAGS_REG) (const_int 0)])
                          (const_int 0))
-                     (label_ref (match_operand 1 "" ""))
+                     (label_ref (match_operand 1))
                      (pc)))]
   ""
   [(set (pc)
                           (zero_extend:SI
                             (match_operand:QI 2 "register_operand" "r")))
                         (const_int 0)])
-                     (label_ref (match_operand 3 "" ""))
+                     (label_ref (match_operand 3))
                      (pc)))
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_USE_BT || optimize_function_for_size_p (cfun)"
                           (and:SI
                             (match_operand:SI 2 "register_operand" "r")
                             (match_operand:SI 3 "const_int_operand" "n")))])
-                     (label_ref (match_operand 4 "" ""))
+                     (label_ref (match_operand 4))
                      (pc)))
    (clobber (reg:CC FLAGS_REG))]
   "(TARGET_USE_BT || optimize_function_for_size_p (cfun))
                             (match_operand:QI 2 "register_operand" "r"))
                           (const_int 1))
                         (const_int 0)])
-                     (label_ref (match_operand 3 "" ""))
+                     (label_ref (match_operand 3))
                      (pc)))
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_USE_BT || optimize_function_for_size_p (cfun)"
                     (match_operand:SI 3 "const_int_operand" "n")) 0))
               (const_int 1))
             (const_int 0)])
-         (label_ref (match_operand 4 "" ""))
+         (label_ref (match_operand 4))
          (pc)))
    (clobber (reg:CC FLAGS_REG))]
   "(TARGET_USE_BT || optimize_function_for_size_p (cfun))
        (if_then_else (match_operator 0 "ix86_fp_comparison_operator"
                        [(match_operand 1 "register_operand" "f")
                         (match_operand 2 "nonimmediate_operand" "fm")])
-         (label_ref (match_operand 3 "" ""))
+         (label_ref (match_operand 3))
          (pc)))
    (clobber (reg:CCFP FPSR_REG))
    (clobber (reg:CCFP FLAGS_REG))
                        [(match_operand 1 "register_operand" "f")
                         (match_operand 2 "nonimmediate_operand" "fm")])
          (pc)
-         (label_ref (match_operand 3 "" ""))))
+         (label_ref (match_operand 3))))
    (clobber (reg:CCFP FPSR_REG))
    (clobber (reg:CCFP FLAGS_REG))
    (clobber (match_scratch:HI 4 "=a"))]
        (if_then_else (match_operator 0 "ix86_fp_comparison_operator"
                        [(match_operand 1 "register_operand" "f")
                         (match_operand 2 "register_operand" "f")])
-         (label_ref (match_operand 3 "" ""))
+         (label_ref (match_operand 3))
          (pc)))
    (clobber (reg:CCFP FPSR_REG))
    (clobber (reg:CCFP FLAGS_REG))
                        [(match_operand 1 "register_operand" "f")
                         (match_operand 2 "register_operand" "f")])
          (pc)
-         (label_ref (match_operand 3 "" ""))))
+         (label_ref (match_operand 3))))
    (clobber (reg:CCFP FPSR_REG))
    (clobber (reg:CCFP FLAGS_REG))
    (clobber (match_scratch:HI 4 "=a"))]
   [(set (pc)
        (if_then_else (match_operator 0 "ix86_fp_comparison_operator"
                        [(match_operand 1 "register_operand" "f")
-                        (match_operand 2 "const0_operand" "")])
-         (label_ref (match_operand 3 "" ""))
+                        (match_operand 2 "const0_operand")])
+         (label_ref (match_operand 3))
          (pc)))
    (clobber (reg:CCFP FPSR_REG))
    (clobber (reg:CCFP FLAGS_REG))
 (define_split
   [(set (pc)
        (if_then_else (match_operator 0 "ix86_fp_comparison_operator"
-                       [(match_operand 1 "register_operand" "")
-                        (match_operand 2 "nonimmediate_operand" "")])
-         (match_operand 3 "" "")
-         (match_operand 4 "" "")))
+                       [(match_operand 1 "register_operand")
+                        (match_operand 2 "nonimmediate_operand")])
+         (match_operand 3)
+         (match_operand 4)))
    (clobber (reg:CCFP FPSR_REG))
    (clobber (reg:CCFP FLAGS_REG))]
   "reload_completed"
 (define_split
   [(set (pc)
        (if_then_else (match_operator 0 "ix86_fp_comparison_operator"
-                       [(match_operand 1 "register_operand" "")
-                        (match_operand 2 "general_operand" "")])
-         (match_operand 3 "" "")
-         (match_operand 4 "" "")))
+                       [(match_operand 1 "register_operand")
+                        (match_operand 2 "general_operand")])
+         (match_operand 3)
+         (match_operand 4)))
    (clobber (reg:CCFP FPSR_REG))
    (clobber (reg:CCFP FLAGS_REG))
    (clobber (match_scratch:HI 5 "=a"))]
        (if_then_else
          (match_operator 0 "ix86_swapped_fp_comparison_operator"
            [(match_operator 1 "float_operator"
-             [(match_operand:X87MODEI12 2 "nonimmediate_operand" "m,?r")])
+             [(match_operand:SWI24 2 "nonimmediate_operand" "m,?r")])
             (match_operand 3 "register_operand" "f,f")])
-         (label_ref (match_operand 4 "" ""))
+         (label_ref (match_operand 4))
          (pc)))
    (clobber (reg:CCFP FPSR_REG))
    (clobber (reg:CCFP FLAGS_REG))
        (if_then_else
          (match_operator 0 "ix86_swapped_fp_comparison_operator"
            [(match_operator 1 "float_operator"
-             [(match_operand:X87MODEI12 2 "memory_operand" "")])
-            (match_operand 3 "register_operand" "")])
-         (match_operand 4 "" "")
-         (match_operand 5 "" "")))
+             [(match_operand:SWI24 2 "memory_operand")])
+            (match_operand 3 "register_operand")])
+         (match_operand 4)
+         (match_operand 5)))
    (clobber (reg:CCFP FPSR_REG))
    (clobber (reg:CCFP FLAGS_REG))
    (clobber (match_scratch:HI 6 "=a"))]
        (if_then_else
          (match_operator 0 "ix86_swapped_fp_comparison_operator"
            [(match_operator 1 "float_operator"
-             [(match_operand:X87MODEI12 2 "register_operand" "")])
-            (match_operand 3 "register_operand" "")])
-         (match_operand 4 "" "")
-         (match_operand 5 "" "")))
+             [(match_operand:SWI24 2 "register_operand")])
+            (match_operand 3 "register_operand")])
+         (match_operand 4)
+         (match_operand 5)))
    (clobber (reg:CCFP FPSR_REG))
    (clobber (reg:CCFP FLAGS_REG))
    (clobber (match_scratch:HI 6 "=a"))]
 
 (define_insn "jump"
   [(set (pc)
-       (label_ref (match_operand 0 "" "")))]
+       (label_ref (match_operand 0)))]
   ""
   "jmp\t%l0"
   [(set_attr "type" "ibr")
    (set_attr "modrm" "0")])
 
 (define_expand "indirect_jump"
-  [(set (pc) (match_operand 0 "nonimmediate_operand" ""))]
+  [(set (pc) (match_operand 0 "indirect_branch_operand"))]
   ""
-  "")
+{
+  if (TARGET_X32)
+    operands[0] = convert_memory_address (word_mode, operands[0]);
+})
 
 (define_insn "*indirect_jump"
-  [(set (pc) (match_operand:P 0 "nonimmediate_operand" "rm"))]
+  [(set (pc) (match_operand:W 0 "indirect_branch_operand" "rw"))]
   ""
   "jmp\t%A0"
   [(set_attr "type" "ibr")
    (set_attr "length_immediate" "0")])
 
 (define_expand "tablejump"
-  [(parallel [(set (pc) (match_operand 0 "nonimmediate_operand" ""))
-             (use (label_ref (match_operand 1 "" "")))])]
+  [(parallel [(set (pc) (match_operand 0 "indirect_branch_operand"))
+             (use (label_ref (match_operand 1)))])]
   ""
 {
   /* In PIC mode, the table entries are stored GOT (32-bit) or PC (64-bit)
       operands[0] = expand_simple_binop (Pmode, code, op0, op1, NULL_RTX, 0,
                                         OPTAB_DIRECT);
     }
+
+  if (TARGET_X32)
+    operands[0] = convert_memory_address (word_mode, operands[0]);
 })
 
 (define_insn "*tablejump_1"
-  [(set (pc) (match_operand:P 0 "nonimmediate_operand" "rm"))
-   (use (label_ref (match_operand 1 "" "")))]
+  [(set (pc) (match_operand:W 0 "indirect_branch_operand" "rw"))
+   (use (label_ref (match_operand 1)))]
   ""
   "jmp\t%A0"
   [(set_attr "type" "ibr")
 ;; Convert setcc + movzbl to xor + setcc if operands don't overlap.
 
 (define_peephole2
-  [(set (reg FLAGS_REG) (match_operand 0 "" ""))
-   (set (match_operand:QI 1 "register_operand" "")
+  [(set (reg FLAGS_REG) (match_operand 0))
+   (set (match_operand:QI 1 "register_operand")
        (match_operator:QI 2 "ix86_comparison_operator"
          [(reg FLAGS_REG) (const_int 0)]))
-   (set (match_operand 3 "q_regs_operand" "")
+   (set (match_operand 3 "q_regs_operand")
        (zero_extend (match_dup 1)))]
   "(peep2_reg_dead_p (3, operands[1])
     || operands_match_p (operands[1], operands[3]))
   ix86_expand_clear (operands[3]);
 })
 
-;; Similar, but match zero_extendhisi2_and, which adds a clobber.
-
 (define_peephole2
-  [(set (reg FLAGS_REG) (match_operand 0 "" ""))
-   (set (match_operand:QI 1 "register_operand" "")
+  [(parallel [(set (reg FLAGS_REG) (match_operand 0))
+             (match_operand 4)])
+   (set (match_operand:QI 1 "register_operand")
        (match_operator:QI 2 "ix86_comparison_operator"
          [(reg FLAGS_REG) (const_int 0)]))
-   (parallel [(set (match_operand 3 "q_regs_operand" "")
-                  (zero_extend (match_dup 1)))
-             (clobber (reg:CC FLAGS_REG))])]
+   (set (match_operand 3 "q_regs_operand")
+       (zero_extend (match_dup 1)))]
   "(peep2_reg_dead_p (3, operands[1])
     || operands_match_p (operands[1], operands[3]))
    && ! reg_overlap_mentioned_p (operands[3], operands[0])"
+  [(parallel [(set (match_dup 5) (match_dup 0))
+             (match_dup 4)])
+   (set (strict_low_part (match_dup 6))
+       (match_dup 2))]
+{
+  operands[5] = gen_rtx_REG (GET_MODE (operands[0]), FLAGS_REG);
+  operands[6] = gen_lowpart (QImode, operands[3]);
+  ix86_expand_clear (operands[3]);
+})
+
+;; Similar, but match zero extend with andsi3.
+
+(define_peephole2
+  [(set (reg FLAGS_REG) (match_operand 0))
+   (set (match_operand:QI 1 "register_operand")
+       (match_operator:QI 2 "ix86_comparison_operator"
+         [(reg FLAGS_REG) (const_int 0)]))
+   (parallel [(set (match_operand:SI 3 "q_regs_operand")
+                  (and:SI (match_dup 3) (const_int 255)))
+             (clobber (reg:CC FLAGS_REG))])]
+  "REGNO (operands[1]) == REGNO (operands[3])
+   && ! reg_overlap_mentioned_p (operands[3], operands[0])"
   [(set (match_dup 4) (match_dup 0))
    (set (strict_low_part (match_dup 5))
        (match_dup 2))]
   operands[5] = gen_lowpart (QImode, operands[3]);
   ix86_expand_clear (operands[3]);
 })
+
+(define_peephole2
+  [(parallel [(set (reg FLAGS_REG) (match_operand 0))
+             (match_operand 4)])
+   (set (match_operand:QI 1 "register_operand")
+       (match_operator:QI 2 "ix86_comparison_operator"
+         [(reg FLAGS_REG) (const_int 0)]))
+   (parallel [(set (match_operand 3 "q_regs_operand")
+                  (zero_extend (match_dup 1)))
+             (clobber (reg:CC FLAGS_REG))])]
+  "(peep2_reg_dead_p (3, operands[1])
+    || operands_match_p (operands[1], operands[3]))
+   && ! reg_overlap_mentioned_p (operands[3], operands[0])"
+  [(parallel [(set (match_dup 5) (match_dup 0))
+             (match_dup 4)])
+   (set (strict_low_part (match_dup 6))
+       (match_dup 2))]
+{
+  operands[5] = gen_rtx_REG (GET_MODE (operands[0]), FLAGS_REG);
+  operands[6] = gen_lowpart (QImode, operands[3]);
+  ix86_expand_clear (operands[3]);
+})
 \f
 ;; Call instructions.
 
 ;; Call subroutine returning no value.
 
 (define_expand "call"
-  [(call (match_operand:QI 0 "" "")
-        (match_operand 1 "" ""))
-   (use (match_operand 2 "" ""))]
+  [(call (match_operand:QI 0)
+        (match_operand 1))
+   (use (match_operand 2))]
   ""
 {
   ix86_expand_call (NULL, operands[0], operands[1],
 })
 
 (define_expand "sibcall"
-  [(call (match_operand:QI 0 "" "")
-        (match_operand 1 "" ""))
-   (use (match_operand 2 "" ""))]
+  [(call (match_operand:QI 0)
+        (match_operand 1))
+   (use (match_operand 2))]
   ""
 {
   ix86_expand_call (NULL, operands[0], operands[1],
 })
 
 (define_insn_and_split "*call_vzeroupper"
-  [(call (mem:QI (match_operand:P 0 "call_insn_operand" "<c>zm"))
-        (match_operand 1 "" ""))
-   (unspec [(match_operand 2 "const_int_operand" "")]
+  [(call (mem:QI (match_operand:W 0 "call_insn_operand" "<c>zw"))
+        (match_operand 1))
+   (unspec [(match_operand 2 "const_int_operand")]
           UNSPEC_CALL_NEEDS_VZEROUPPER)]
   "TARGET_VZEROUPPER && !SIBLING_CALL_P (insn)"
   "#"
   [(set_attr "type" "call")])
 
 (define_insn "*call"
-  [(call (mem:QI (match_operand:P 0 "call_insn_operand" "<c>zm"))
-        (match_operand 1 "" ""))]
+  [(call (mem:QI (match_operand:W 0 "call_insn_operand" "<c>zw"))
+        (match_operand 1))]
   "!SIBLING_CALL_P (insn)"
   "* return ix86_output_call_insn (insn, operands[0]);"
   [(set_attr "type" "call")])
 
 (define_insn_and_split "*call_rex64_ms_sysv_vzeroupper"
-  [(parallel
-    [(call (mem:QI (match_operand:DI 0 "call_insn_operand" "rzm"))
-          (match_operand 1 "" ""))
-     (unspec [(const_int 0)] UNSPEC_MS_TO_SYSV_CALL)
-     (clobber (reg:TI XMM6_REG))
-     (clobber (reg:TI XMM7_REG))
-     (clobber (reg:TI XMM8_REG))
-     (clobber (reg:TI XMM9_REG))
-     (clobber (reg:TI XMM10_REG))
-     (clobber (reg:TI XMM11_REG))
-     (clobber (reg:TI XMM12_REG))
-     (clobber (reg:TI XMM13_REG))
-     (clobber (reg:TI XMM14_REG))
-     (clobber (reg:TI XMM15_REG))
-     (clobber (reg:DI SI_REG))
-     (clobber (reg:DI DI_REG))])
-   (unspec [(match_operand 2 "const_int_operand" "")]
+  [(call (mem:QI (match_operand:DI 0 "call_insn_operand" "rzw"))
+        (match_operand 1))
+   (unspec [(const_int 0)] UNSPEC_MS_TO_SYSV_CALL)
+   (clobber (reg:TI XMM6_REG))
+   (clobber (reg:TI XMM7_REG))
+   (clobber (reg:TI XMM8_REG))
+   (clobber (reg:TI XMM9_REG))
+   (clobber (reg:TI XMM10_REG))
+   (clobber (reg:TI XMM11_REG))
+   (clobber (reg:TI XMM12_REG))
+   (clobber (reg:TI XMM13_REG))
+   (clobber (reg:TI XMM14_REG))
+   (clobber (reg:TI XMM15_REG))
+   (clobber (reg:DI SI_REG))
+   (clobber (reg:DI DI_REG))
+   (unspec [(match_operand 2 "const_int_operand")]
           UNSPEC_CALL_NEEDS_VZEROUPPER)]
   "TARGET_VZEROUPPER && TARGET_64BIT && !SIBLING_CALL_P (insn)"
   "#"
   [(set_attr "type" "call")])
 
 (define_insn "*call_rex64_ms_sysv"
-  [(call (mem:QI (match_operand:DI 0 "call_insn_operand" "rzm"))
-        (match_operand 1 "" ""))
+  [(call (mem:QI (match_operand:DI 0 "call_insn_operand" "rzw"))
+        (match_operand 1))
    (unspec [(const_int 0)] UNSPEC_MS_TO_SYSV_CALL)
    (clobber (reg:TI XMM6_REG))
    (clobber (reg:TI XMM7_REG))
   [(set_attr "type" "call")])
 
 (define_insn_and_split "*sibcall_vzeroupper"
-  [(call (mem:QI (match_operand:P 0 "sibcall_insn_operand" "Uz"))
-        (match_operand 1 "" ""))
-   (unspec [(match_operand 2 "const_int_operand" "")]
+  [(call (mem:QI (match_operand:W 0 "sibcall_insn_operand" "Uz"))
+        (match_operand 1))
+   (unspec [(match_operand 2 "const_int_operand")]
           UNSPEC_CALL_NEEDS_VZEROUPPER)]
   "TARGET_VZEROUPPER && SIBLING_CALL_P (insn)"
   "#"
   [(set_attr "type" "call")])
 
 (define_insn "*sibcall"
-  [(call (mem:QI (match_operand:P 0 "sibcall_insn_operand" "Uz"))
-        (match_operand 1 "" ""))]
+  [(call (mem:QI (match_operand:W 0 "sibcall_insn_operand" "Uz"))
+        (match_operand 1))]
   "SIBLING_CALL_P (insn)"
   "* return ix86_output_call_insn (insn, operands[0]);"
   [(set_attr "type" "call")])
 
 (define_expand "call_pop"
-  [(parallel [(call (match_operand:QI 0 "" "")
-                   (match_operand:SI 1 "" ""))
+  [(parallel [(call (match_operand:QI 0)
+                   (match_operand:SI 1))
              (set (reg:SI SP_REG)
                   (plus:SI (reg:SI SP_REG)
-                           (match_operand:SI 3 "" "")))])]
+                           (match_operand:SI 3)))])]
   "!TARGET_64BIT"
 {
   ix86_expand_call (NULL, operands[0], operands[1],
 })
 
 (define_insn_and_split "*call_pop_vzeroupper"
-  [(parallel
-    [(call (mem:QI (match_operand:SI 0 "call_insn_operand" "lzm"))
-          (match_operand:SI 1 "" ""))
-     (set (reg:SI SP_REG)
-         (plus:SI (reg:SI SP_REG)
-                  (match_operand:SI 2 "immediate_operand" "i")))])
-   (unspec [(match_operand 3 "const_int_operand" "")]
+  [(call (mem:QI (match_operand:SI 0 "call_insn_operand" "lzm"))
+        (match_operand 1))
+   (set (reg:SI SP_REG)
+       (plus:SI (reg:SI SP_REG)
+                (match_operand:SI 2 "immediate_operand" "i")))
+   (unspec [(match_operand 3 "const_int_operand")]
           UNSPEC_CALL_NEEDS_VZEROUPPER)]
   "TARGET_VZEROUPPER && !TARGET_64BIT && !SIBLING_CALL_P (insn)"
   "#"
 
 (define_insn "*call_pop"
   [(call (mem:QI (match_operand:SI 0 "call_insn_operand" "lzm"))
-        (match_operand 1 "" ""))
+        (match_operand 1))
    (set (reg:SI SP_REG)
        (plus:SI (reg:SI SP_REG)
                 (match_operand:SI 2 "immediate_operand" "i")))]
   [(set_attr "type" "call")])
 
 (define_insn_and_split "*sibcall_pop_vzeroupper"
- [(parallel
-   [(call (mem:QI (match_operand:SI 0 "sibcall_insn_operand" "Uz"))
-         (match_operand 1 "" ""))
-     (set (reg:SI SP_REG)
-         (plus:SI (reg:SI SP_REG)
-                  (match_operand:SI 2 "immediate_operand" "i")))])
-   (unspec [(match_operand 3 "const_int_operand" "")]
+  [(call (mem:QI (match_operand:SI 0 "sibcall_insn_operand" "Uz"))
+        (match_operand 1))
+   (set (reg:SI SP_REG)
+       (plus:SI (reg:SI SP_REG)
+                (match_operand:SI 2 "immediate_operand" "i")))
+   (unspec [(match_operand 3 "const_int_operand")]
           UNSPEC_CALL_NEEDS_VZEROUPPER)]
   "TARGET_VZEROUPPER && !TARGET_64BIT && SIBLING_CALL_P (insn)"
   "#"
 
 (define_insn "*sibcall_pop"
   [(call (mem:QI (match_operand:SI 0 "sibcall_insn_operand" "Uz"))
-        (match_operand 1 "" ""))
+        (match_operand 1))
    (set (reg:SI SP_REG)
        (plus:SI (reg:SI SP_REG)
                 (match_operand:SI 2 "immediate_operand" "i")))]
 ;; Call subroutine, returning value in operand 0
 
 (define_expand "call_value"
-  [(set (match_operand 0 "" "")
-       (call (match_operand:QI 1 "" "")
-             (match_operand 2 "" "")))
-   (use (match_operand 3 "" ""))]
+  [(set (match_operand 0)
+       (call (match_operand:QI 1)
+             (match_operand 2)))
+   (use (match_operand 3))]
   ""
 {
   ix86_expand_call (operands[0], operands[1], operands[2],
 })
 
 (define_expand "sibcall_value"
-  [(set (match_operand 0 "" "")
-       (call (match_operand:QI 1 "" "")
-             (match_operand 2 "" "")))
-   (use (match_operand 3 "" ""))]
+  [(set (match_operand 0)
+       (call (match_operand:QI 1)
+             (match_operand 2)))
+   (use (match_operand 3))]
   ""
 {
   ix86_expand_call (operands[0], operands[1], operands[2],
 })
 
 (define_insn_and_split "*call_value_vzeroupper"
-  [(set (match_operand 0 "" "")
-       (call (mem:QI (match_operand:P 1 "call_insn_operand" "<c>zm"))
-             (match_operand 2 "" "")))
-   (unspec [(match_operand 3 "const_int_operand" "")]
+  [(set (match_operand 0)
+       (call (mem:QI (match_operand:W 1 "call_insn_operand" "<c>zw"))
+             (match_operand 2)))
+   (unspec [(match_operand 3 "const_int_operand")]
           UNSPEC_CALL_NEEDS_VZEROUPPER)]
   "TARGET_VZEROUPPER && !SIBLING_CALL_P (insn)"
   "#"
   [(set_attr "type" "callv")])
 
 (define_insn "*call_value"
-  [(set (match_operand 0 "" "")
-       (call (mem:QI (match_operand:P 1 "call_insn_operand" "<c>zm"))
-             (match_operand 2 "" "")))]
+  [(set (match_operand 0)
+       (call (mem:QI (match_operand:W 1 "call_insn_operand" "<c>zw"))
+             (match_operand 2)))]
   "!SIBLING_CALL_P (insn)"
   "* return ix86_output_call_insn (insn, operands[1]);"
   [(set_attr "type" "callv")])
 
 (define_insn_and_split "*sibcall_value_vzeroupper"
-  [(set (match_operand 0 "" "")
-       (call (mem:QI (match_operand:P 1 "sibcall_insn_operand" "Uz"))
-             (match_operand 2 "" "")))
-   (unspec [(match_operand 3 "const_int_operand" "")]
+  [(set (match_operand 0)
+       (call (mem:QI (match_operand:W 1 "sibcall_insn_operand" "Uz"))
+             (match_operand 2)))
+   (unspec [(match_operand 3 "const_int_operand")]
           UNSPEC_CALL_NEEDS_VZEROUPPER)]
   "TARGET_VZEROUPPER && SIBLING_CALL_P (insn)"
   "#"
   [(set_attr "type" "callv")])
 
 (define_insn "*sibcall_value"
-  [(set (match_operand 0 "" "")
-       (call (mem:QI (match_operand:P 1 "sibcall_insn_operand" "Uz"))
-             (match_operand 2 "" "")))]
+  [(set (match_operand 0)
+       (call (mem:QI (match_operand:W 1 "sibcall_insn_operand" "Uz"))
+             (match_operand 2)))]
   "SIBLING_CALL_P (insn)"
   "* return ix86_output_call_insn (insn, operands[1]);"
   [(set_attr "type" "callv")])
 
 (define_insn_and_split "*call_value_rex64_ms_sysv_vzeroupper"
-  [(parallel
-    [(set (match_operand 0 "" "")
-         (call (mem:QI (match_operand:DI 1 "call_insn_operand" "rzm"))
-               (match_operand 2 "" "")))
-     (unspec [(const_int 0)] UNSPEC_MS_TO_SYSV_CALL)
-     (clobber (reg:TI XMM6_REG))
-     (clobber (reg:TI XMM7_REG))
-     (clobber (reg:TI XMM8_REG))
-     (clobber (reg:TI XMM9_REG))
-     (clobber (reg:TI XMM10_REG))
-     (clobber (reg:TI XMM11_REG))
-     (clobber (reg:TI XMM12_REG))
-     (clobber (reg:TI XMM13_REG))
-     (clobber (reg:TI XMM14_REG))
-     (clobber (reg:TI XMM15_REG))
-     (clobber (reg:DI SI_REG))
-     (clobber (reg:DI DI_REG))])
-   (unspec [(match_operand 3 "const_int_operand" "")]
+  [(set (match_operand 0)
+       (call (mem:QI (match_operand:DI 1 "call_insn_operand" "rzw"))
+             (match_operand 2)))
+   (unspec [(const_int 0)] UNSPEC_MS_TO_SYSV_CALL)
+   (clobber (reg:TI XMM6_REG))
+   (clobber (reg:TI XMM7_REG))
+   (clobber (reg:TI XMM8_REG))
+   (clobber (reg:TI XMM9_REG))
+   (clobber (reg:TI XMM10_REG))
+   (clobber (reg:TI XMM11_REG))
+   (clobber (reg:TI XMM12_REG))
+   (clobber (reg:TI XMM13_REG))
+   (clobber (reg:TI XMM14_REG))
+   (clobber (reg:TI XMM15_REG))
+   (clobber (reg:DI SI_REG))
+   (clobber (reg:DI DI_REG))
+   (unspec [(match_operand 3 "const_int_operand")]
           UNSPEC_CALL_NEEDS_VZEROUPPER)]
   "TARGET_VZEROUPPER && TARGET_64BIT && !SIBLING_CALL_P (insn)"
   "#"
   [(set_attr "type" "callv")])
 
 (define_insn "*call_value_rex64_ms_sysv"
-  [(set (match_operand 0 "" "")
-       (call (mem:QI (match_operand:DI 1 "call_insn_operand" "rzm"))
-             (match_operand 2 "" "")))
+  [(set (match_operand 0)
+       (call (mem:QI (match_operand:DI 1 "call_insn_operand" "rzw"))
+             (match_operand 2)))
    (unspec [(const_int 0)] UNSPEC_MS_TO_SYSV_CALL)
    (clobber (reg:TI XMM6_REG))
    (clobber (reg:TI XMM7_REG))
   [(set_attr "type" "callv")])
 
 (define_expand "call_value_pop"
-  [(parallel [(set (match_operand 0 "" "")
-                  (call (match_operand:QI 1 "" "")
-                        (match_operand:SI 2 "" "")))
+  [(parallel [(set (match_operand 0)
+                  (call (match_operand:QI 1)
+                        (match_operand:SI 2)))
              (set (reg:SI SP_REG)
                   (plus:SI (reg:SI SP_REG)
-                           (match_operand:SI 4 "" "")))])]
+                           (match_operand:SI 4)))])]
   "!TARGET_64BIT"
 {
   ix86_expand_call (operands[0], operands[1], operands[2],
 })
 
 (define_insn_and_split "*call_value_pop_vzeroupper"
-  [(parallel
-    [(set (match_operand 0 "" "")
-         (call (mem:QI (match_operand:SI 1 "call_insn_operand" "lzm"))
-               (match_operand 2 "" "")))
-     (set (reg:SI SP_REG)
-         (plus:SI (reg:SI SP_REG)
-                  (match_operand:SI 3 "immediate_operand" "i")))])
-   (unspec [(match_operand 4 "const_int_operand" "")]
+  [(set (match_operand 0)
+       (call (mem:QI (match_operand:SI 1 "call_insn_operand" "lzm"))
+             (match_operand 2)))
+   (set (reg:SI SP_REG)
+       (plus:SI (reg:SI SP_REG)
+                (match_operand:SI 3 "immediate_operand" "i")))
+   (unspec [(match_operand 4 "const_int_operand")]
           UNSPEC_CALL_NEEDS_VZEROUPPER)]
   "TARGET_VZEROUPPER && !TARGET_64BIT && !SIBLING_CALL_P (insn)"
   "#"
   [(set_attr "type" "callv")])
 
 (define_insn "*call_value_pop"
-  [(set (match_operand 0 "" "")
+  [(set (match_operand 0)
        (call (mem:QI (match_operand:SI 1 "call_insn_operand" "lzm"))
-             (match_operand 2 "" "")))
+             (match_operand 2)))
    (set (reg:SI SP_REG)
        (plus:SI (reg:SI SP_REG)
                 (match_operand:SI 3 "immediate_operand" "i")))]
   [(set_attr "type" "callv")])
 
 (define_insn_and_split "*sibcall_value_pop_vzeroupper"
- [(parallel
-   [(set (match_operand 0 "" "")
-         (call (mem:QI (match_operand:SI 1 "sibcall_insn_operand" "Uz"))
-               (match_operand 2 "" "")))
-     (set (reg:SI SP_REG)
-         (plus:SI (reg:SI SP_REG)
-                  (match_operand:SI 3 "immediate_operand" "i")))])
-   (unspec [(match_operand 4 "const_int_operand" "")]
+  [(set (match_operand 0)
+       (call (mem:QI (match_operand:SI 1 "sibcall_insn_operand" "Uz"))
+             (match_operand 2)))
+   (set (reg:SI SP_REG)
+       (plus:SI (reg:SI SP_REG)
+                (match_operand:SI 3 "immediate_operand" "i")))
+   (unspec [(match_operand 4 "const_int_operand")]
           UNSPEC_CALL_NEEDS_VZEROUPPER)]
   "TARGET_VZEROUPPER && !TARGET_64BIT && SIBLING_CALL_P (insn)"
   "#"
   [(set_attr "type" "callv")])
 
 (define_insn "*sibcall_value_pop"
-  [(set (match_operand 0 "" "")
+  [(set (match_operand 0)
        (call (mem:QI (match_operand:SI 1 "sibcall_insn_operand" "Uz"))
-             (match_operand 2 "" "")))
+             (match_operand 2)))
    (set (reg:SI SP_REG)
        (plus:SI (reg:SI SP_REG)
                 (match_operand:SI 3 "immediate_operand" "i")))]
 ;; Call subroutine returning any type.
 
 (define_expand "untyped_call"
-  [(parallel [(call (match_operand 0 "" "")
+  [(parallel [(call (match_operand 0)
                    (const_int 0))
-             (match_operand 1 "" "")
-             (match_operand 2 "" "")])]
+             (match_operand 1)
+             (match_operand 2)])]
   ""
 {
   int i;
 })
 
 (define_insn "*memory_blockage"
-  [(set (match_operand:BLK 0 "" "")
+  [(set (match_operand:BLK 0)
        (unspec:BLK [(match_dup 0)] UNSPEC_MEMORY_BLOCKAGE))]
   ""
   ""
 ;; As USE insns aren't meaningful after reload, this is used instead
 ;; to prevent deleting instructions setting registers for PIC code
 (define_insn "prologue_use"
-  [(unspec_volatile [(match_operand 0 "" "")] UNSPECV_PROLOGUE_USE)]
+  [(unspec_volatile [(match_operand 0)] UNSPECV_PROLOGUE_USE)]
   ""
   ""
   [(set_attr "length" "0")])
 ;; See comments for ix86_can_use_return_insn_p in i386.c.
 
 (define_expand "return"
-  [(return)]
+  [(simple_return)]
   "ix86_can_use_return_insn_p ()"
 {
+  ix86_maybe_emit_epilogue_vzeroupper ();
+  if (crtl->args.pops_args)
+    {
+      rtx popc = GEN_INT (crtl->args.pops_args);
+      emit_jump_insn (gen_simple_return_pop_internal (popc));
+      DONE;
+    }
+})
+
+;; We need to disable this for TARGET_SEH, as otherwise
+;; shrink-wrapped prologue gets enabled too.  This might exceed
+;; the maximum size of prologue in unwind information.
+
+(define_expand "simple_return"
+  [(simple_return)]
+  "!TARGET_SEH"
+{
+  ix86_maybe_emit_epilogue_vzeroupper ();
   if (crtl->args.pops_args)
     {
       rtx popc = GEN_INT (crtl->args.pops_args);
-      emit_jump_insn (gen_return_pop_internal (popc));
+      emit_jump_insn (gen_simple_return_pop_internal (popc));
       DONE;
     }
 })
 
-(define_insn "return_internal"
-  [(return)]
+(define_insn "simple_return_internal"
+  [(simple_return)]
   "reload_completed"
   "ret"
   [(set_attr "length" "1")
 ;; Used by x86_machine_dependent_reorg to avoid penalty on single byte RET
 ;; instruction Athlon and K8 have.
 
-(define_insn "return_internal_long"
-  [(return)
+(define_insn "simple_return_internal_long"
+  [(simple_return)
    (unspec [(const_int 0)] UNSPEC_REP)]
   "reload_completed"
   "rep\;ret"
    (set_attr "prefix_rep" "1")
    (set_attr "modrm" "0")])
 
-(define_insn "return_pop_internal"
-  [(return)
-   (use (match_operand:SI 0 "const_int_operand" ""))]
+(define_insn "simple_return_pop_internal"
+  [(simple_return)
+   (use (match_operand:SI 0 "const_int_operand"))]
   "reload_completed"
   "ret\t%0"
   [(set_attr "length" "3")
    (set_attr "length_immediate" "2")
    (set_attr "modrm" "0")])
 
-(define_insn "return_indirect_internal"
-  [(return)
+(define_insn "simple_return_indirect_internal"
+  [(simple_return)
    (use (match_operand:SI 0 "register_operand" "r"))]
   "reload_completed"
   "jmp\t%A0"
 
 ;; Generate nops.  Operand 0 is the number of nops, up to 8.
 (define_insn "nops"
-  [(unspec_volatile [(match_operand 0 "const_int_operand" "")]
+  [(unspec_volatile [(match_operand 0 "const_int_operand")]
                    UNSPECV_NOPS)]
   "reload_completed"
 {
 ;; block on K8.
 
 (define_insn "pad"
-  [(unspec_volatile [(match_operand 0 "" "")] UNSPECV_ALIGN)]
+  [(unspec_volatile [(match_operand 0)] UNSPECV_ALIGN)]
   ""
 {
 #ifdef ASM_OUTPUT_MAX_SKIP_PAD
 
 (define_insn "set_got_labelled"
   [(set (match_operand:SI 0 "register_operand" "=r")
-       (unspec:SI [(label_ref (match_operand 1 "" ""))]
+       (unspec:SI [(label_ref (match_operand 1))]
         UNSPEC_SET_GOT))
    (clobber (reg:CC FLAGS_REG))]
   "!TARGET_64BIT"
 
 (define_insn "set_rip_rex64"
   [(set (match_operand:DI 0 "register_operand" "=r")
-       (unspec:DI [(label_ref (match_operand 1 "" ""))] UNSPEC_SET_RIP))]
+       (unspec:DI [(label_ref (match_operand 1))] UNSPEC_SET_RIP))]
   "TARGET_64BIT"
   "lea{q}\t{%l1(%%rip), %0|%0, %l1[rip]}"
   [(set_attr "type" "lea")
 (define_insn "set_got_offset_rex64"
   [(set (match_operand:DI 0 "register_operand" "=r")
        (unspec:DI
-         [(label_ref (match_operand 1 "" ""))]
+         [(label_ref (match_operand 1))]
          UNSPEC_SET_GOT_OFFSET))]
-  "TARGET_64BIT"
+  "TARGET_LP64"
   "movabs{q}\t{$_GLOBAL_OFFSET_TABLE_-%l1, %0|%0, OFFSET FLAT:_GLOBAL_OFFSET_TABLE_-%l1}"
   [(set_attr "type" "imov")
    (set_attr "length_immediate" "0")
   "ix86_expand_epilogue (0); DONE;")
 
 (define_expand "eh_return"
-  [(use (match_operand 0 "register_operand" ""))]
+  [(use (match_operand 0 "register_operand"))]
   ""
 {
   rtx tmp, sa = EH_RETURN_STACKADJ_RTX, ra = operands[0];
 ;; In order to support the call/return predictor, we use a return
 ;; instruction which the middle-end doesn't see.
 (define_insn "split_stack_return"
-  [(unspec_volatile [(match_operand:SI 0 "const_int_operand" "")]
+  [(unspec_volatile [(match_operand:SI 0 "const_int_operand")]
                     UNSPECV_SPLIT_STACK_RETURN)]
   ""
 {
   [(set_attr "atom_unit" "jeu")
    (set_attr "modrm" "0")
    (set (attr "length")
-       (if_then_else (match_operand:SI 0 "const0_operand" "")
+       (if_then_else (match_operand:SI 0 "const0_operand")
                      (const_int 1)
                      (const_int 3)))
    (set (attr "length_immediate")
-       (if_then_else (match_operand:SI 0 "const0_operand" "")
+       (if_then_else (match_operand:SI 0 "const0_operand")
                      (const_int 0)
                      (const_int 2)))])
 
 (define_expand "split_stack_space_check"
   [(set (pc) (if_then_else
              (ltu (minus (reg SP_REG)
-                         (match_operand 0 "register_operand" ""))
+                         (match_operand 0 "register_operand"))
                   (unspec [(const_int 0)] UNSPEC_STACK_CHECK))
-             (label_ref (match_operand 1 "" ""))
+             (label_ref (match_operand 1))
              (pc)))]
   ""
 {
   [(set (match_dup 2) (const_int -1))
    (parallel [(set (reg:CCZ FLAGS_REG)
                   (compare:CCZ
-                    (match_operand:SWI48 1 "nonimmediate_operand" "")
+                    (match_operand:SWI48 1 "nonimmediate_operand")
                     (const_int 0)))
-             (set (match_operand:SWI48 0 "register_operand" "")
+             (set (match_operand:SWI48 0 "register_operand")
                   (ctz:SWI48 (match_dup 1)))])
    (set (match_dup 0) (if_then_else:SWI48
                        (eq (reg:CCZ FLAGS_REG) (const_int 0))
 
 (define_expand "clz<mode>2"
   [(parallel
-     [(set (match_operand:SWI248 0 "register_operand" "")
+     [(set (match_operand:SWI248 0 "register_operand")
           (minus:SWI248
             (match_dup 2)
-            (clz:SWI248 (match_operand:SWI248 1 "nonimmediate_operand" ""))))
+            (clz:SWI248 (match_operand:SWI248 1 "nonimmediate_operand"))))
       (clobber (reg:CC FLAGS_REG))])
    (parallel
      [(set (match_dup 0) (xor:SWI248 (match_dup 0) (match_dup 2)))
       (clobber (reg:CC FLAGS_REG))])]
   ""
 {
-  if (TARGET_ABM)
+  if (TARGET_LZCNT)
     {
-      emit_insn (gen_clz<mode>2_abm (operands[0], operands[1]));
+      emit_insn (gen_clz<mode>2_lzcnt (operands[0], operands[1]));
       DONE;
     }
   operands[2] = GEN_INT (GET_MODE_BITSIZE (<MODE>mode)-1);
 })
 
-(define_insn "clz<mode>2_abm"
+(define_insn "clz<mode>2_lzcnt"
   [(set (match_operand:SWI248 0 "register_operand" "=r")
        (clz:SWI248 (match_operand:SWI248 1 "nonimmediate_operand" "rm")))
    (clobber (reg:CC FLAGS_REG))]
-  "TARGET_ABM || TARGET_BMI"
+  "TARGET_LZCNT"
   "lzcnt{<imodesuffix>}\t{%1, %0|%0, %1}"
   [(set_attr "prefix_rep" "1")
    (set_attr "type" "bitmanip")
 
 (define_insn "bmi_bextr_<mode>"
   [(set (match_operand:SWI48 0 "register_operand" "=r")
-        (unspec:SWI48 [(match_operand:SWI48 1 "nonimmediate_operand" "rm")
-                       (match_operand:SWI48 2 "register_operand" "r")]
+        (unspec:SWI48 [(match_operand:SWI48 1 "register_operand" "r")
+                       (match_operand:SWI48 2 "nonimmediate_operand" "rm")]
                        UNSPEC_BEXTR))
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_BMI"
   [(set_attr "type" "bitmanip")
    (set_attr "mode" "<MODE>")])
 
+;; BMI2 instructions.
+(define_insn "bmi2_bzhi_<mode>3"
+  [(set (match_operand:SWI48 0 "register_operand" "=r")
+       (and:SWI48 (match_operand:SWI48 1 "register_operand" "r")
+                  (lshiftrt:SWI48 (const_int -1)
+                                  (match_operand:SWI48 2 "nonimmediate_operand" "rm"))))
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_BMI2"
+  "bzhi\t{%2, %1, %0|%0, %1, %2}"
+  [(set_attr "type" "bitmanip")
+   (set_attr "prefix" "vex")
+   (set_attr "mode" "<MODE>")])
+
+(define_insn "bmi2_pdep_<mode>3"
+  [(set (match_operand:SWI48 0 "register_operand" "=r")
+        (unspec:SWI48 [(match_operand:SWI48 1 "register_operand" "r")
+                       (match_operand:SWI48 2 "nonimmediate_operand" "rm")]
+                       UNSPEC_PDEP))]
+  "TARGET_BMI2"
+  "pdep\t{%2, %1, %0|%0, %1, %2}"
+  [(set_attr "type" "bitmanip")
+   (set_attr "prefix" "vex")
+   (set_attr "mode" "<MODE>")])
+
+(define_insn "bmi2_pext_<mode>3"
+  [(set (match_operand:SWI48 0 "register_operand" "=r")
+        (unspec:SWI48 [(match_operand:SWI48 1 "register_operand" "r")
+                       (match_operand:SWI48 2 "nonimmediate_operand" "rm")]
+                       UNSPEC_PEXT))]
+  "TARGET_BMI2"
+  "pext\t{%2, %1, %0|%0, %1, %2}"
+  [(set_attr "type" "bitmanip")
+   (set_attr "prefix" "vex")
+   (set_attr "mode" "<MODE>")])
+
 ;; TBM instructions.
 (define_insn "tbm_bextri_<mode>"
   [(set (match_operand:SWI48 0 "register_operand" "=r")
    (set_attr "mode" "SI")])
 
 (define_expand "bswap<mode>2"
-  [(set (match_operand:SWI48 0 "register_operand" "")
-       (bswap:SWI48 (match_operand:SWI48 1 "register_operand" "")))]
+  [(set (match_operand:SWI48 0 "register_operand")
+       (bswap:SWI48 (match_operand:SWI48 1 "register_operand")))]
   ""
 {
   if (<MODE>mode == SImode && !(TARGET_BSWAP || TARGET_MOVBE))
    (set_attr "mode" "HI")])
 
 (define_expand "paritydi2"
-  [(set (match_operand:DI 0 "register_operand" "")
-       (parity:DI (match_operand:DI 1 "register_operand" "")))]
+  [(set (match_operand:DI 0 "register_operand")
+       (parity:DI (match_operand:DI 1 "register_operand")))]
   "! TARGET_POPCNT"
 {
   rtx scratch = gen_reg_rtx (QImode);
 })
 
 (define_expand "paritysi2"
-  [(set (match_operand:SI 0 "register_operand" "")
-       (parity:SI (match_operand:SI 1 "register_operand" "")))]
+  [(set (match_operand:SI 0 "register_operand")
+       (parity:SI (match_operand:SI 1 "register_operand")))]
   "! TARGET_POPCNT"
 {
   rtx scratch = gen_reg_rtx (QImode);
   "xor{b}\t{%h0, %b0|%b0, %h0}"
   [(set_attr "length" "2")
    (set_attr "mode" "HI")])
+
 \f
 ;; Thread-local storage patterns for ELF.
 ;;
   [(set (match_operand:SI 0 "register_operand" "=a")
        (unspec:SI
         [(match_operand:SI 1 "register_operand" "b")
-         (match_operand:SI 2 "tls_symbolic_operand" "")
-         (match_operand:SI 3 "constant_call_address_operand" "z")]
+         (match_operand 2 "tls_symbolic_operand")
+         (match_operand 3 "constant_call_address_operand" "z")]
         UNSPEC_TLS_GD))
    (clobber (match_scratch:SI 4 "=d"))
    (clobber (match_scratch:SI 5 "=c"))
   "!TARGET_64BIT && TARGET_GNU_TLS"
 {
   output_asm_insn
-    ("lea{l}\t{%a2@tlsgd(,%1,1), %0|%0, %a2@tlsgd[%1*1]}", operands);
+    ("lea{l}\t{%E2@tlsgd(,%1,1), %0|%0, %E2@tlsgd[%1*1]}", operands);
+  if (TARGET_SUN_TLS)
+#ifdef HAVE_AS_IX86_TLSGDPLT
+    return "call\t%a2@tlsgdplt";
+#else
+    return "call\t%p3@plt";
+#endif
   return "call\t%P3";
 }
   [(set_attr "type" "multi")
 
 (define_expand "tls_global_dynamic_32"
   [(parallel
-    [(set (match_operand:SI 0 "register_operand" "")
-         (unspec:SI [(match_operand:SI 2 "register_operand" "")
-                     (match_operand:SI 1 "tls_symbolic_operand" "")
-                     (match_operand:SI 3 "constant_call_address_operand" "")]
+    [(set (match_operand:SI 0 "register_operand")
+         (unspec:SI [(match_operand:SI 2 "register_operand")
+                     (match_operand 1 "tls_symbolic_operand")
+                     (match_operand 3 "constant_call_address_operand")]
                     UNSPEC_TLS_GD))
-     (clobber (match_scratch:SI 4 ""))
-     (clobber (match_scratch:SI 5 ""))
+     (clobber (match_scratch:SI 4))
+     (clobber (match_scratch:SI 5))
      (clobber (reg:CC FLAGS_REG))])])
 
-(define_insn "*tls_global_dynamic_64"
-  [(set (match_operand:DI 0 "register_operand" "=a")
-       (call:DI
-        (mem:QI (match_operand:DI 2 "constant_call_address_operand" "z"))
-        (match_operand:DI 3 "" "")))
-   (unspec:DI [(match_operand:DI 1 "tls_symbolic_operand" "")]
-             UNSPEC_TLS_GD)]
+(define_insn "*tls_global_dynamic_64_<mode>"
+  [(set (match_operand:P 0 "register_operand" "=a")
+       (call:P
+        (mem:QI (match_operand 2 "constant_call_address_operand" "z"))
+        (match_operand 3)))
+   (unspec:P [(match_operand 1 "tls_symbolic_operand")]
+            UNSPEC_TLS_GD)]
   "TARGET_64BIT"
 {
-  fputs (ASM_BYTE "0x66\n", asm_out_file);
+  if (!TARGET_X32)
+    fputs (ASM_BYTE "0x66\n", asm_out_file);
   output_asm_insn
-    ("lea{q}\t{%a1@tlsgd(%%rip), %%rdi|rdi, %a1@tlsgd[rip]}", operands);
+    ("lea{q}\t{%E1@tlsgd(%%rip), %%rdi|rdi, %E1@tlsgd[rip]}", operands);
   fputs (ASM_SHORT "0x6666\n", asm_out_file);
   fputs ("\trex64\n", asm_out_file);
+  if (TARGET_SUN_TLS)
+    return "call\t%p2@plt";
   return "call\t%P2";
 }
   [(set_attr "type" "multi")
-   (set_attr "length" "16")])
+   (set (attr "length")
+       (symbol_ref "TARGET_X32 ? 15 : 16"))])
 
-(define_expand "tls_global_dynamic_64"
+(define_expand "tls_global_dynamic_64_<mode>"
   [(parallel
-    [(set (match_operand:DI 0 "register_operand" "")
-         (call:DI
-          (mem:QI (match_operand:DI 2 "constant_call_address_operand" ""))
+    [(set (match_operand:P 0 "register_operand")
+         (call:P
+          (mem:QI (match_operand 2 "constant_call_address_operand"))
           (const_int 0)))
-     (unspec:DI [(match_operand:DI 1 "tls_symbolic_operand" "")]
-               UNSPEC_TLS_GD)])])
+     (unspec:P [(match_operand 1 "tls_symbolic_operand")]
+              UNSPEC_TLS_GD)])]
+  "TARGET_64BIT")
 
 (define_insn "*tls_local_dynamic_base_32_gnu"
   [(set (match_operand:SI 0 "register_operand" "=a")
        (unspec:SI
         [(match_operand:SI 1 "register_operand" "b")
-         (match_operand:SI 2 "constant_call_address_operand" "z")]
+         (match_operand 2 "constant_call_address_operand" "z")]
         UNSPEC_TLS_LD_BASE))
    (clobber (match_scratch:SI 3 "=d"))
    (clobber (match_scratch:SI 4 "=c"))
 {
   output_asm_insn
     ("lea{l}\t{%&@tlsldm(%1), %0|%0, %&@tlsldm[%1]}", operands);
+  if (TARGET_SUN_TLS)
+#ifdef HAVE_AS_IX86_TLSLDMPLT
+    return "call\t%&@tlsldmplt";
+#else
+    return "call\t%p2@plt";
+#endif
   return "call\t%P2";
 }
   [(set_attr "type" "multi")
 
 (define_expand "tls_local_dynamic_base_32"
   [(parallel
-     [(set (match_operand:SI 0 "register_operand" "")
+     [(set (match_operand:SI 0 "register_operand")
           (unspec:SI
-           [(match_operand:SI 1 "register_operand" "")
-            (match_operand:SI 2 "constant_call_address_operand" "")]
+           [(match_operand:SI 1 "register_operand")
+            (match_operand 2 "constant_call_address_operand")]
            UNSPEC_TLS_LD_BASE))
-      (clobber (match_scratch:SI 3 ""))
-      (clobber (match_scratch:SI 4 ""))
+      (clobber (match_scratch:SI 3))
+      (clobber (match_scratch:SI 4))
       (clobber (reg:CC FLAGS_REG))])])
 
-(define_insn "*tls_local_dynamic_base_64"
-  [(set (match_operand:DI 0 "register_operand" "=a")
-       (call:DI
-        (mem:QI (match_operand:DI 1 "constant_call_address_operand" "z"))
-        (match_operand:DI 2 "" "")))
-   (unspec:DI [(const_int 0)] UNSPEC_TLS_LD_BASE)]
+(define_insn "*tls_local_dynamic_base_64_<mode>"
+  [(set (match_operand:P 0 "register_operand" "=a")
+       (call:P
+        (mem:QI (match_operand 1 "constant_call_address_operand" "z"))
+        (match_operand 2)))
+   (unspec:P [(const_int 0)] UNSPEC_TLS_LD_BASE)]
   "TARGET_64BIT"
 {
   output_asm_insn
     ("lea{q}\t{%&@tlsld(%%rip), %%rdi|rdi, %&@tlsld[rip]}", operands);
+  if (TARGET_SUN_TLS)
+    return "call\t%p1@plt";
   return "call\t%P1";
 }
   [(set_attr "type" "multi")
    (set_attr "length" "12")])
 
-(define_expand "tls_local_dynamic_base_64"
+(define_expand "tls_local_dynamic_base_64_<mode>"
   [(parallel
-     [(set (match_operand:DI 0 "register_operand" "")
-          (call:DI
-           (mem:QI (match_operand:DI 1 "constant_call_address_operand" ""))
+     [(set (match_operand:P 0 "register_operand")
+          (call:P
+           (mem:QI (match_operand 1 "constant_call_address_operand"))
            (const_int 0)))
-      (unspec:DI [(const_int 0)] UNSPEC_TLS_LD_BASE)])])
+      (unspec:P [(const_int 0)] UNSPEC_TLS_LD_BASE)])]
+  "TARGET_64BIT")
 
 ;; Local dynamic of a single variable is a lose.  Show combine how
 ;; to convert that back to global dynamic.
   [(set (match_operand:SI 0 "register_operand" "=a")
        (plus:SI
         (unspec:SI [(match_operand:SI 1 "register_operand" "b")
-                    (match_operand:SI 2 "constant_call_address_operand" "z")]
+                    (match_operand 2 "constant_call_address_operand" "z")]
                    UNSPEC_TLS_LD_BASE)
         (const:SI (unspec:SI
-                   [(match_operand:SI 3 "tls_symbolic_operand" "")]
+                   [(match_operand 3 "tls_symbolic_operand")]
                    UNSPEC_DTPOFF))))
    (clobber (match_scratch:SI 4 "=d"))
    (clobber (match_scratch:SI 5 "=c"))
 (define_mode_attr tp_seg [(SI "gs") (DI "fs")])
 
 ;; Load and add the thread base pointer from %<tp_seg>:0.
+(define_insn "*load_tp_x32"
+  [(set (match_operand:SI 0 "register_operand" "=r")
+       (unspec:SI [(const_int 0)] UNSPEC_TP))]
+  "TARGET_X32"
+  "mov{l}\t{%%fs:0, %0|%0, DWORD PTR fs:0}"
+  [(set_attr "type" "imov")
+   (set_attr "modrm" "0")
+   (set_attr "length" "7")
+   (set_attr "memory" "load")
+   (set_attr "imm_disp" "false")])
+
+(define_insn "*load_tp_x32_zext"
+  [(set (match_operand:DI 0 "register_operand" "=r")
+       (zero_extend:DI (unspec:SI [(const_int 0)] UNSPEC_TP)))]
+  "TARGET_X32"
+  "mov{l}\t{%%fs:0, %k0|%k0, DWORD PTR fs:0}"
+  [(set_attr "type" "imov")
+   (set_attr "modrm" "0")
+   (set_attr "length" "7")
+   (set_attr "memory" "load")
+   (set_attr "imm_disp" "false")])
+
 (define_insn "*load_tp_<mode>"
   [(set (match_operand:P 0 "register_operand" "=r")
        (unspec:P [(const_int 0)] UNSPEC_TP))]
-  ""
+  "!TARGET_X32"
   "mov{<imodesuffix>}\t{%%<tp_seg>:0, %0|%0, <iptrsize> PTR <tp_seg>:0}"
   [(set_attr "type" "imov")
    (set_attr "modrm" "0")
    (set_attr "memory" "load")
    (set_attr "imm_disp" "false")])
 
+(define_insn "*add_tp_x32"
+  [(set (match_operand:SI 0 "register_operand" "=r")
+       (plus:SI (unspec:SI [(const_int 0)] UNSPEC_TP)
+                (match_operand:SI 1 "register_operand" "0")))
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_X32"
+  "add{l}\t{%%fs:0, %0|%0, DWORD PTR fs:0}"
+  [(set_attr "type" "alu")
+   (set_attr "modrm" "0")
+   (set_attr "length" "7")
+   (set_attr "memory" "load")
+   (set_attr "imm_disp" "false")])
+
+(define_insn "*add_tp_x32_zext"
+  [(set (match_operand:DI 0 "register_operand" "=r")
+       (zero_extend:DI
+         (plus:SI (unspec:SI [(const_int 0)] UNSPEC_TP)
+                  (match_operand:SI 1 "register_operand" "0"))))
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_X32"
+  "add{l}\t{%%fs:0, %k0|%k0, DWORD PTR fs:0}"
+  [(set_attr "type" "alu")
+   (set_attr "modrm" "0")
+   (set_attr "length" "7")
+   (set_attr "memory" "load")
+   (set_attr "imm_disp" "false")])
+
 (define_insn "*add_tp_<mode>"
   [(set (match_operand:P 0 "register_operand" "=r")
        (plus:P (unspec:P [(const_int 0)] UNSPEC_TP)
                (match_operand:P 1 "register_operand" "0")))
    (clobber (reg:CC FLAGS_REG))]
-  ""
+  "!TARGET_X32"
   "add{<imodesuffix>}\t{%%<tp_seg>:0, %0|%0, <iptrsize> PTR <tp_seg>:0}"
   [(set_attr "type" "alu")
    (set_attr "modrm" "0")
 (define_insn "tls_initial_exec_64_sun"
   [(set (match_operand:DI 0 "register_operand" "=a")
        (unspec:DI
-        [(match_operand:DI 1 "tls_symbolic_operand" "")]
+        [(match_operand 1 "tls_symbolic_operand")]
         UNSPEC_TLS_IE_SUN))
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && TARGET_SUN_TLS"
 {
   output_asm_insn
-    ("mov{q}\t{%%fs:0, %0|%0, QWORD PTR fs:0}", operands)
+    ("mov{q}\t{%%fs:0, %0|%0, QWORD PTR fs:0}", operands);
   return "add{q}\t{%a1@gottpoff(%%rip), %0|%0, %a1@gottpoff[rip]}";
 }
   [(set_attr "type" "multi")])
 
 (define_expand "tls_dynamic_gnu2_32"
   [(set (match_dup 3)
-       (plus:SI (match_operand:SI 2 "register_operand" "")
+       (plus:SI (match_operand:SI 2 "register_operand")
                 (const:SI
-                 (unspec:SI [(match_operand:SI 1 "tls_symbolic_operand" "")]
+                 (unspec:SI [(match_operand 1 "tls_symbolic_operand")]
                             UNSPEC_TLSDESC))))
    (parallel
-    [(set (match_operand:SI 0 "register_operand" "")
+    [(set (match_operand:SI 0 "register_operand")
          (unspec:SI [(match_dup 1) (match_dup 3)
                      (match_dup 2) (reg:SI SP_REG)]
                      UNSPEC_TLSDESC))
   ix86_tls_descriptor_calls_expanded_in_cfun = true;
 })
 
-(define_insn "*tls_dynamic_lea_32"
+(define_insn "*tls_dynamic_gnu2_lea_32"
   [(set (match_operand:SI 0 "register_operand" "=r")
        (plus:SI (match_operand:SI 1 "register_operand" "b")
                 (const:SI
-                 (unspec:SI [(match_operand:SI 2 "tls_symbolic_operand" "")]
+                 (unspec:SI [(match_operand 2 "tls_symbolic_operand")]
                              UNSPEC_TLSDESC))))]
   "!TARGET_64BIT && TARGET_GNU2_TLS"
-  "lea{l}\t{%a2@TLSDESC(%1), %0|%0, %a2@TLSDESC[%1]}"
+  "lea{l}\t{%E2@TLSDESC(%1), %0|%0, %E2@TLSDESC[%1]}"
   [(set_attr "type" "lea")
    (set_attr "mode" "SI")
    (set_attr "length" "6")
    (set_attr "length_address" "4")])
 
-(define_insn "*tls_dynamic_call_32"
+(define_insn "*tls_dynamic_gnu2_call_32"
   [(set (match_operand:SI 0 "register_operand" "=a")
-       (unspec:SI [(match_operand:SI 1 "tls_symbolic_operand" "")
+       (unspec:SI [(match_operand 1 "tls_symbolic_operand")
                    (match_operand:SI 2 "register_operand" "0")
                    ;; we have to make sure %ebx still points to the GOT
                    (match_operand:SI 3 "register_operand" "b")
 (define_insn_and_split "*tls_dynamic_gnu2_combine_32"
   [(set (match_operand:SI 0 "register_operand" "=&a")
        (plus:SI
-        (unspec:SI [(match_operand:SI 3 "tls_modbase_operand" "")
-                    (match_operand:SI 4 "" "")
+        (unspec:SI [(match_operand 3 "tls_modbase_operand")
+                    (match_operand:SI 4)
                     (match_operand:SI 2 "register_operand" "b")
                     (reg:SI SP_REG)]
                    UNSPEC_TLSDESC)
         (const:SI (unspec:SI
-                   [(match_operand:SI 1 "tls_symbolic_operand" "")]
+                   [(match_operand 1 "tls_symbolic_operand")]
                    UNSPEC_DTPOFF))))
    (clobber (reg:CC FLAGS_REG))]
   "!TARGET_64BIT && TARGET_GNU2_TLS"
 
 (define_expand "tls_dynamic_gnu2_64"
   [(set (match_dup 2)
-       (unspec:DI [(match_operand:DI 1 "tls_symbolic_operand" "")]
+       (unspec:DI [(match_operand 1 "tls_symbolic_operand")]
                   UNSPEC_TLSDESC))
    (parallel
-    [(set (match_operand:DI 0 "register_operand" "")
+    [(set (match_operand:DI 0 "register_operand")
          (unspec:DI [(match_dup 1) (match_dup 2) (reg:DI SP_REG)]
                     UNSPEC_TLSDESC))
      (clobber (reg:CC FLAGS_REG))])]
   ix86_tls_descriptor_calls_expanded_in_cfun = true;
 })
 
-(define_insn "*tls_dynamic_lea_64"
+(define_insn "*tls_dynamic_gnu2_lea_64"
   [(set (match_operand:DI 0 "register_operand" "=r")
-       (unspec:DI [(match_operand:DI 1 "tls_symbolic_operand" "")]
+       (unspec:DI [(match_operand 1 "tls_symbolic_operand")]
                   UNSPEC_TLSDESC))]
   "TARGET_64BIT && TARGET_GNU2_TLS"
-  "lea{q}\t{%a1@TLSDESC(%%rip), %0|%0, %a1@TLSDESC[rip]}"
+  "lea{q}\t{%E1@TLSDESC(%%rip), %0|%0, %E1@TLSDESC[rip]}"
   [(set_attr "type" "lea")
    (set_attr "mode" "DI")
    (set_attr "length" "7")
    (set_attr "length_address" "4")])
 
-(define_insn "*tls_dynamic_call_64"
+(define_insn "*tls_dynamic_gnu2_call_64"
   [(set (match_operand:DI 0 "register_operand" "=a")
-       (unspec:DI [(match_operand:DI 1 "tls_symbolic_operand" "")
+       (unspec:DI [(match_operand 1 "tls_symbolic_operand")
                    (match_operand:DI 2 "register_operand" "0")
                    (reg:DI SP_REG)]
                   UNSPEC_TLSDESC))
 (define_insn_and_split "*tls_dynamic_gnu2_combine_64"
   [(set (match_operand:DI 0 "register_operand" "=&a")
        (plus:DI
-        (unspec:DI [(match_operand:DI 2 "tls_modbase_operand" "")
-                    (match_operand:DI 3 "" "")
+        (unspec:DI [(match_operand 2 "tls_modbase_operand")
+                    (match_operand:DI 3)
                     (reg:DI SP_REG)]
                    UNSPEC_TLSDESC)
         (const:DI (unspec:DI
-                   [(match_operand:DI 1 "tls_symbolic_operand" "")]
+                   [(match_operand 1 "tls_symbolic_operand")]
                    UNSPEC_DTPOFF))))
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && TARGET_GNU2_TLS"
   "* return output_387_binary_op (insn, operands);"
   [(set (attr "type")
        (if_then_else (eq_attr "alternative" "1,2")
-          (if_then_else (match_operand:MODEF 3 "mult_operator" "")
+          (if_then_else (match_operand:MODEF 3 "mult_operator")
              (const_string "ssemul")
              (const_string "sseadd"))
-          (if_then_else (match_operand:MODEF 3 "mult_operator" "")
+          (if_then_else (match_operand:MODEF 3 "mult_operator")
              (const_string "fmul")
              (const_string "fop"))))
-   (set_attr "isa" "base,noavx,avx")
+   (set_attr "isa" "*,noavx,avx")
    (set_attr "prefix" "orig,orig,vex")
    (set_attr "mode" "<MODE>")])
 
    && !(MEM_P (operands[1]) && MEM_P (operands[2]))"
   "* return output_387_binary_op (insn, operands);"
   [(set (attr "type")
-        (if_then_else (match_operand:MODEF 3 "mult_operator" "")
+        (if_then_else (match_operand:MODEF 3 "mult_operator")
           (const_string "ssemul")
           (const_string "sseadd")))
    (set_attr "isa" "noavx,avx")
    && !(MEM_P (operands[1]) && MEM_P (operands[2]))"
   "* return output_387_binary_op (insn, operands);"
   [(set (attr "type")
-       (if_then_else (match_operand:MODEF 3 "mult_operator" "")
+       (if_then_else (match_operand:MODEF 3 "mult_operator")
           (const_string "fmul")
           (const_string "fop")))
    (set_attr "mode" "<MODE>")])
   "* return output_387_binary_op (insn, operands);"
   [(set (attr "type")
         (cond [(and (eq_attr "alternative" "2,3")
-                   (match_operand:MODEF 3 "mult_operator" ""))
+                   (match_operand:MODEF 3 "mult_operator"))
                  (const_string "ssemul")
               (and (eq_attr "alternative" "2,3")
-                   (match_operand:MODEF 3 "div_operator" ""))
+                   (match_operand:MODEF 3 "div_operator"))
                  (const_string "ssediv")
               (eq_attr "alternative" "2,3")
                  (const_string "sseadd")
-              (match_operand:MODEF 3 "mult_operator" "")
+              (match_operand:MODEF 3 "mult_operator")
                  (const_string "fmul")
-               (match_operand:MODEF 3 "div_operator" "")
+               (match_operand:MODEF 3 "div_operator")
                  (const_string "fdiv")
               ]
               (const_string "fop")))
-   (set_attr "isa" "base,base,noavx,avx")
+   (set_attr "isa" "*,*,noavx,avx")
    (set_attr "prefix" "orig,orig,orig,vex")
    (set_attr "mode" "<MODE>")])
 
    && !COMMUTATIVE_ARITH_P (operands[3])"
   "* return output_387_binary_op (insn, operands);"
   [(set (attr "type")
-        (cond [(match_operand:MODEF 3 "mult_operator" "")
+        (cond [(match_operand:MODEF 3 "mult_operator")
                  (const_string "ssemul")
-              (match_operand:MODEF 3 "div_operator" "")
+              (match_operand:MODEF 3 "div_operator")
                  (const_string "ssediv")
               ]
               (const_string "sseadd")))
    && !(MEM_P (operands[1]) && MEM_P (operands[2]))"
   "* return output_387_binary_op (insn, operands);"
   [(set (attr "type")
-        (cond [(match_operand:MODEF 3 "mult_operator" "")
+        (cond [(match_operand:MODEF 3 "mult_operator")
                  (const_string "fmul")
-               (match_operand:MODEF 3 "div_operator" "")
+               (match_operand:MODEF 3 "div_operator")
                  (const_string "fdiv")
               ]
               (const_string "fop")))
   [(set (match_operand:MODEF 0 "register_operand" "=f,f")
        (match_operator:MODEF 3 "binary_fp_operator"
          [(float:MODEF
-            (match_operand:X87MODEI12 1 "nonimmediate_operand" "m,?r"))
+            (match_operand:SWI24 1 "nonimmediate_operand" "m,?r"))
           (match_operand:MODEF 2 "register_operand" "0,0")]))]
-  "TARGET_80387 && X87_ENABLE_FLOAT (<MODEF:MODE>mode, <X87MODEI12:MODE>mode)
+  "TARGET_80387 && X87_ENABLE_FLOAT (<MODEF:MODE>mode, <SWI24:MODE>mode)
    && !(SSE_FLOAT_MODE_P (<MODEF:MODE>mode) && TARGET_SSE_MATH)
-   && (TARGET_USE_<X87MODEI12:MODE>MODE_FIOP || optimize_function_for_size_p (cfun))"
+   && (TARGET_USE_<SWI24:MODE>MODE_FIOP || optimize_function_for_size_p (cfun))"
   "* return which_alternative ? \"#\" : output_387_binary_op (insn, operands);"
   [(set (attr "type")
-        (cond [(match_operand:MODEF 3 "mult_operator" "")
+        (cond [(match_operand:MODEF 3 "mult_operator")
                  (const_string "fmul")
-               (match_operand:MODEF 3 "div_operator" "")
+               (match_operand:MODEF 3 "div_operator")
                  (const_string "fdiv")
               ]
               (const_string "fop")))
    (set_attr "fp_int_src" "true")
-   (set_attr "mode" "<X87MODEI12:MODE>")])
+   (set_attr "mode" "<SWI24:MODE>")])
 
 (define_insn "*fop_<MODEF:mode>_3_i387"
   [(set (match_operand:MODEF 0 "register_operand" "=f,f")
        (match_operator:MODEF 3 "binary_fp_operator"
          [(match_operand:MODEF 1 "register_operand" "0,0")
           (float:MODEF
-            (match_operand:X87MODEI12 2 "nonimmediate_operand" "m,?r"))]))]
-  "TARGET_80387 && X87_ENABLE_FLOAT (<MODEF:MODE>mode, <X87MODEI12:MODE>mode)
+            (match_operand:SWI24 2 "nonimmediate_operand" "m,?r"))]))]
+  "TARGET_80387 && X87_ENABLE_FLOAT (<MODEF:MODE>mode, <SWI24:MODE>mode)
    && !(SSE_FLOAT_MODE_P (<MODEF:MODE>mode) && TARGET_SSE_MATH)
-   && (TARGET_USE_<X87MODEI12:MODE>MODE_FIOP || optimize_function_for_size_p (cfun))"
+   && (TARGET_USE_<SWI24:MODE>MODE_FIOP || optimize_function_for_size_p (cfun))"
   "* return which_alternative ? \"#\" : output_387_binary_op (insn, operands);"
   [(set (attr "type")
-        (cond [(match_operand:MODEF 3 "mult_operator" "")
+        (cond [(match_operand:MODEF 3 "mult_operator")
                  (const_string "fmul")
-               (match_operand:MODEF 3 "div_operator" "")
+               (match_operand:MODEF 3 "div_operator")
                  (const_string "fdiv")
               ]
               (const_string "fop")))
    && !(MEM_P (operands[1]) && MEM_P (operands[2]))"
   "* return output_387_binary_op (insn, operands);"
   [(set (attr "type")
-        (cond [(match_operand:DF 3 "mult_operator" "")
+        (cond [(match_operand:DF 3 "mult_operator")
                  (const_string "fmul")
-               (match_operand:DF 3 "div_operator" "")
+               (match_operand:DF 3 "div_operator")
                  (const_string "fdiv")
               ]
               (const_string "fop")))
    && !(TARGET_SSE2 && TARGET_SSE_MATH)"
   "* return output_387_binary_op (insn, operands);"
   [(set (attr "type")
-        (cond [(match_operand:DF 3 "mult_operator" "")
+        (cond [(match_operand:DF 3 "mult_operator")
                  (const_string "fmul")
-               (match_operand:DF 3 "div_operator" "")
+               (match_operand:DF 3 "div_operator")
                  (const_string "fdiv")
               ]
               (const_string "fop")))
    && !(TARGET_SSE2 && TARGET_SSE_MATH)"
   "* return output_387_binary_op (insn, operands);"
   [(set (attr "type")
-        (cond [(match_operand:DF 3 "mult_operator" "")
+        (cond [(match_operand:DF 3 "mult_operator")
                  (const_string "fmul")
-               (match_operand:DF 3 "div_operator" "")
+               (match_operand:DF 3 "div_operator")
                  (const_string "fdiv")
               ]
               (const_string "fop")))
    && COMMUTATIVE_ARITH_P (operands[3])"
   "* return output_387_binary_op (insn, operands);"
   [(set (attr "type")
-        (if_then_else (match_operand:XF 3 "mult_operator" "")
+        (if_then_else (match_operand:XF 3 "mult_operator")
            (const_string "fmul")
            (const_string "fop")))
    (set_attr "mode" "XF")])
    && !COMMUTATIVE_ARITH_P (operands[3])"
   "* return output_387_binary_op (insn, operands);"
   [(set (attr "type")
-        (cond [(match_operand:XF 3 "mult_operator" "")
+        (cond [(match_operand:XF 3 "mult_operator")
                  (const_string "fmul")
-               (match_operand:XF 3 "div_operator" "")
+               (match_operand:XF 3 "div_operator")
                  (const_string "fdiv")
               ]
               (const_string "fop")))
   [(set (match_operand:XF 0 "register_operand" "=f,f")
        (match_operator:XF 3 "binary_fp_operator"
          [(float:XF
-            (match_operand:X87MODEI12 1 "nonimmediate_operand" "m,?r"))
+            (match_operand:SWI24 1 "nonimmediate_operand" "m,?r"))
           (match_operand:XF 2 "register_operand" "0,0")]))]
   "TARGET_80387 && (TARGET_USE_<MODE>MODE_FIOP || optimize_function_for_size_p (cfun))"
   "* return which_alternative ? \"#\" : output_387_binary_op (insn, operands);"
   [(set (attr "type")
-        (cond [(match_operand:XF 3 "mult_operator" "")
+        (cond [(match_operand:XF 3 "mult_operator")
                  (const_string "fmul")
-               (match_operand:XF 3 "div_operator" "")
+               (match_operand:XF 3 "div_operator")
                  (const_string "fdiv")
               ]
               (const_string "fop")))
        (match_operator:XF 3 "binary_fp_operator"
          [(match_operand:XF 1 "register_operand" "0,0")
           (float:XF
-            (match_operand:X87MODEI12 2 "nonimmediate_operand" "m,?r"))]))]
+            (match_operand:SWI24 2 "nonimmediate_operand" "m,?r"))]))]
   "TARGET_80387 && (TARGET_USE_<MODE>MODE_FIOP || optimize_function_for_size_p (cfun))"
   "* return which_alternative ? \"#\" : output_387_binary_op (insn, operands);"
   [(set (attr "type")
-        (cond [(match_operand:XF 3 "mult_operator" "")
+        (cond [(match_operand:XF 3 "mult_operator")
                  (const_string "fmul")
-               (match_operand:XF 3 "div_operator" "")
+               (match_operand:XF 3 "div_operator")
                  (const_string "fdiv")
               ]
               (const_string "fop")))
   "TARGET_80387"
   "* return output_387_binary_op (insn, operands);"
   [(set (attr "type")
-        (cond [(match_operand:XF 3 "mult_operator" "")
+        (cond [(match_operand:XF 3 "mult_operator")
                  (const_string "fmul")
-               (match_operand:XF 3 "div_operator" "")
+               (match_operand:XF 3 "div_operator")
                  (const_string "fdiv")
               ]
               (const_string "fop")))
   "TARGET_80387"
   "* return output_387_binary_op (insn, operands);"
   [(set (attr "type")
-        (cond [(match_operand:XF 3 "mult_operator" "")
+        (cond [(match_operand:XF 3 "mult_operator")
                  (const_string "fmul")
-               (match_operand:XF 3 "div_operator" "")
+               (match_operand:XF 3 "div_operator")
                  (const_string "fdiv")
               ]
               (const_string "fop")))
   "TARGET_80387"
   "* return output_387_binary_op (insn, operands);"
   [(set (attr "type")
-        (cond [(match_operand:XF 3 "mult_operator" "")
+        (cond [(match_operand:XF 3 "mult_operator")
                  (const_string "fmul")
-               (match_operand:XF 3 "div_operator" "")
+               (match_operand:XF 3 "div_operator")
                  (const_string "fdiv")
               ]
               (const_string "fop")))
    (set_attr "mode" "<MODE>")])
 
 (define_split
-  [(set (match_operand 0 "register_operand" "")
+  [(set (match_operand 0 "register_operand")
        (match_operator 3 "binary_fp_operator"
-          [(float (match_operand:X87MODEI12 1 "register_operand" ""))
-           (match_operand 2 "register_operand" "")]))]
+          [(float (match_operand:SWI24 1 "register_operand"))
+           (match_operand 2 "register_operand")]))]
   "reload_completed
    && X87_FLOAT_MODE_P (GET_MODE (operands[0]))
    && X87_ENABLE_FLOAT (GET_MODE (operands[0]), GET_MODE (operands[1]))"
 })
 
 (define_split
-  [(set (match_operand 0 "register_operand" "")
+  [(set (match_operand 0 "register_operand")
        (match_operator 3 "binary_fp_operator"
-          [(match_operand 1 "register_operand" "")
-           (float (match_operand:X87MODEI12 2 "register_operand" ""))]))]
+          [(match_operand 1 "register_operand")
+           (float (match_operand:SWI24 2 "register_operand"))]))]
   "reload_completed
    && X87_FLOAT_MODE_P (GET_MODE (operands[0]))
    && X87_ENABLE_FLOAT (GET_MODE (operands[0]), GET_MODE (operands[2]))"
    (set_attr "mode" "SF")])
 
 (define_expand "rsqrtsf2"
-  [(set (match_operand:SF 0 "register_operand" "")
-       (unspec:SF [(match_operand:SF 1 "nonimmediate_operand" "")]
+  [(set (match_operand:SF 0 "register_operand")
+       (unspec:SF [(match_operand:SF 1 "nonimmediate_operand")]
                   UNSPEC_RSQRT))]
   "TARGET_SSE_MATH"
 {
    (set_attr "bdver1_decode" "*")])
 
 (define_expand "sqrt<mode>2"
-  [(set (match_operand:MODEF 0 "register_operand" "")
+  [(set (match_operand:MODEF 0 "register_operand")
        (sqrt:MODEF
-         (match_operand:MODEF 1 "nonimmediate_operand" "")))]
+         (match_operand:MODEF 1 "nonimmediate_operand")))]
   "(TARGET_USE_FANCY_MATH_387 && X87_ENABLE_ARITH (<MODE>mode))
    || (SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)"
 {
   if (<MODE>mode == SFmode
-      && TARGET_SSE_MATH && TARGET_RECIP && !optimize_function_for_size_p (cfun)
+      && TARGET_SSE_MATH
+      && TARGET_RECIP_SQRT
+      && !optimize_function_for_size_p (cfun)
       && flag_finite_math_only && !flag_trapping_math
       && flag_unsafe_math_optimizations)
     {
    (set_attr "mode" "XF")])
 
 (define_expand "fmodxf3"
-  [(use (match_operand:XF 0 "register_operand" ""))
-   (use (match_operand:XF 1 "general_operand" ""))
-   (use (match_operand:XF 2 "general_operand" ""))]
+  [(use (match_operand:XF 0 "register_operand"))
+   (use (match_operand:XF 1 "general_operand"))
+   (use (match_operand:XF 2 "general_operand"))]
   "TARGET_USE_FANCY_MATH_387"
 {
   rtx label = gen_label_rtx ();
 })
 
 (define_expand "fmod<mode>3"
-  [(use (match_operand:MODEF 0 "register_operand" ""))
-   (use (match_operand:MODEF 1 "general_operand" ""))
-   (use (match_operand:MODEF 2 "general_operand" ""))]
+  [(use (match_operand:MODEF 0 "register_operand"))
+   (use (match_operand:MODEF 1 "general_operand"))
+   (use (match_operand:MODEF 2 "general_operand"))]
   "TARGET_USE_FANCY_MATH_387"
 {
   rtx (*gen_truncxf) (rtx, rtx);
    (set_attr "mode" "XF")])
 
 (define_expand "remainderxf3"
-  [(use (match_operand:XF 0 "register_operand" ""))
-   (use (match_operand:XF 1 "general_operand" ""))
-   (use (match_operand:XF 2 "general_operand" ""))]
+  [(use (match_operand:XF 0 "register_operand"))
+   (use (match_operand:XF 1 "general_operand"))
+   (use (match_operand:XF 2 "general_operand"))]
   "TARGET_USE_FANCY_MATH_387"
 {
   rtx label = gen_label_rtx ();
 })
 
 (define_expand "remainder<mode>3"
-  [(use (match_operand:MODEF 0 "register_operand" ""))
-   (use (match_operand:MODEF 1 "general_operand" ""))
-   (use (match_operand:MODEF 2 "general_operand" ""))]
+  [(use (match_operand:MODEF 0 "register_operand"))
+   (use (match_operand:MODEF 1 "general_operand"))
+   (use (match_operand:MODEF 2 "general_operand"))]
   "TARGET_USE_FANCY_MATH_387"
 {
   rtx (*gen_truncxf) (rtx, rtx);
    (set_attr "mode" "XF")])
 
 (define_split
-  [(set (match_operand:XF 0 "register_operand" "")
-       (unspec:XF [(match_operand:XF 2 "register_operand" "")]
+  [(set (match_operand:XF 0 "register_operand")
+       (unspec:XF [(match_operand:XF 2 "register_operand")]
                   UNSPEC_SINCOS_COS))
-   (set (match_operand:XF 1 "register_operand" "")
+   (set (match_operand:XF 1 "register_operand")
        (unspec:XF [(match_dup 2)] UNSPEC_SINCOS_SIN))]
   "find_regno_note (insn, REG_UNUSED, REGNO (operands[0]))
    && can_create_pseudo_p ()"
   [(set (match_dup 1) (unspec:XF [(match_dup 2)] UNSPEC_SIN))])
 
 (define_split
-  [(set (match_operand:XF 0 "register_operand" "")
-       (unspec:XF [(match_operand:XF 2 "register_operand" "")]
+  [(set (match_operand:XF 0 "register_operand")
+       (unspec:XF [(match_operand:XF 2 "register_operand")]
                   UNSPEC_SINCOS_COS))
-   (set (match_operand:XF 1 "register_operand" "")
+   (set (match_operand:XF 1 "register_operand")
        (unspec:XF [(match_dup 2)] UNSPEC_SINCOS_SIN))]
   "find_regno_note (insn, REG_UNUSED, REGNO (operands[1]))
    && can_create_pseudo_p ()"
    (set_attr "mode" "XF")])
 
 (define_split
-  [(set (match_operand:XF 0 "register_operand" "")
+  [(set (match_operand:XF 0 "register_operand")
        (unspec:XF [(float_extend:XF
-                     (match_operand:MODEF 2 "register_operand" ""))]
+                     (match_operand:MODEF 2 "register_operand"))]
                   UNSPEC_SINCOS_COS))
-   (set (match_operand:XF 1 "register_operand" "")
+   (set (match_operand:XF 1 "register_operand")
        (unspec:XF [(float_extend:XF (match_dup 2))] UNSPEC_SINCOS_SIN))]
   "find_regno_note (insn, REG_UNUSED, REGNO (operands[0]))
    && can_create_pseudo_p ()"
        (unspec:XF [(float_extend:XF (match_dup 2))] UNSPEC_SIN))])
 
 (define_split
-  [(set (match_operand:XF 0 "register_operand" "")
+  [(set (match_operand:XF 0 "register_operand")
        (unspec:XF [(float_extend:XF
-                     (match_operand:MODEF 2 "register_operand" ""))]
+                     (match_operand:MODEF 2 "register_operand"))]
                   UNSPEC_SINCOS_COS))
-   (set (match_operand:XF 1 "register_operand" "")
+   (set (match_operand:XF 1 "register_operand")
        (unspec:XF [(float_extend:XF (match_dup 2))] UNSPEC_SINCOS_SIN))]
   "find_regno_note (insn, REG_UNUSED, REGNO (operands[1]))
    && can_create_pseudo_p ()"
        (unspec:XF [(float_extend:XF (match_dup 2))] UNSPEC_COS))])
 
 (define_expand "sincos<mode>3"
-  [(use (match_operand:MODEF 0 "register_operand" ""))
-   (use (match_operand:MODEF 1 "register_operand" ""))
-   (use (match_operand:MODEF 2 "register_operand" ""))]
+  [(use (match_operand:MODEF 0 "register_operand"))
+   (use (match_operand:MODEF 1 "register_operand"))
+   (use (match_operand:MODEF 2 "register_operand"))]
   "TARGET_USE_FANCY_MATH_387
    && (!(SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)
        || TARGET_MIX_SSE_I387)
    (set_attr "mode" "XF")])
 
 (define_expand "tanxf2"
-  [(use (match_operand:XF 0 "register_operand" ""))
-   (use (match_operand:XF 1 "register_operand" ""))]
+  [(use (match_operand:XF 0 "register_operand"))
+   (use (match_operand:XF 1 "register_operand"))]
   "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
 {
 })
 
 (define_expand "tan<mode>2"
-  [(use (match_operand:MODEF 0 "register_operand" ""))
-   (use (match_operand:MODEF 1 "register_operand" ""))]
+  [(use (match_operand:MODEF 0 "register_operand"))
+   (use (match_operand:MODEF 1 "register_operand"))]
   "TARGET_USE_FANCY_MATH_387
    && (!(SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)
        || TARGET_MIX_SSE_I387)
    (set_attr "mode" "XF")])
 
 (define_expand "atan2xf3"
-  [(parallel [(set (match_operand:XF 0 "register_operand" "")
-                  (unspec:XF [(match_operand:XF 2 "register_operand" "")
-                              (match_operand:XF 1 "register_operand" "")]
+  [(parallel [(set (match_operand:XF 0 "register_operand")
+                  (unspec:XF [(match_operand:XF 2 "register_operand")
+                              (match_operand:XF 1 "register_operand")]
                              UNSPEC_FPATAN))
-             (clobber (match_scratch:XF 3 ""))])]
+             (clobber (match_scratch:XF 3))])]
   "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations")
 
 (define_expand "atan2<mode>3"
-  [(use (match_operand:MODEF 0 "register_operand" ""))
-   (use (match_operand:MODEF 1 "register_operand" ""))
-   (use (match_operand:MODEF 2 "register_operand" ""))]
+  [(use (match_operand:MODEF 0 "register_operand"))
+   (use (match_operand:MODEF 1 "register_operand"))
+   (use (match_operand:MODEF 2 "register_operand"))]
   "TARGET_USE_FANCY_MATH_387
    && (!(SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)
        || TARGET_MIX_SSE_I387)
 })
 
 (define_expand "atanxf2"
-  [(parallel [(set (match_operand:XF 0 "register_operand" "")
+  [(parallel [(set (match_operand:XF 0 "register_operand")
                   (unspec:XF [(match_dup 2)
-                              (match_operand:XF 1 "register_operand" "")]
+                              (match_operand:XF 1 "register_operand")]
                              UNSPEC_FPATAN))
-             (clobber (match_scratch:XF 3 ""))])]
+             (clobber (match_scratch:XF 3))])]
   "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
 {
 })
 
 (define_expand "atan<mode>2"
-  [(use (match_operand:MODEF 0 "register_operand" ""))
-   (use (match_operand:MODEF 1 "register_operand" ""))]
+  [(use (match_operand:MODEF 0 "register_operand"))
+   (use (match_operand:MODEF 1 "register_operand"))]
   "TARGET_USE_FANCY_MATH_387
    && (!(SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)
        || TARGET_MIX_SSE_I387)
 
 (define_expand "asinxf2"
   [(set (match_dup 2)
-       (mult:XF (match_operand:XF 1 "register_operand" "")
+       (mult:XF (match_operand:XF 1 "register_operand")
                 (match_dup 1)))
    (set (match_dup 4) (minus:XF (match_dup 3) (match_dup 2)))
    (set (match_dup 5) (sqrt:XF (match_dup 4)))
-   (parallel [(set (match_operand:XF 0 "register_operand" "")
+   (parallel [(set (match_operand:XF 0 "register_operand")
                   (unspec:XF [(match_dup 5) (match_dup 1)]
                              UNSPEC_FPATAN))
-             (clobber (match_scratch:XF 6 ""))])]
+             (clobber (match_scratch:XF 6))])]
   "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
 {
 })
 
 (define_expand "asin<mode>2"
-  [(use (match_operand:MODEF 0 "register_operand" ""))
-   (use (match_operand:MODEF 1 "general_operand" ""))]
+  [(use (match_operand:MODEF 0 "register_operand"))
+   (use (match_operand:MODEF 1 "general_operand"))]
  "TARGET_USE_FANCY_MATH_387
    && (!(SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)
        || TARGET_MIX_SSE_I387)
 
 (define_expand "acosxf2"
   [(set (match_dup 2)
-       (mult:XF (match_operand:XF 1 "register_operand" "")
+       (mult:XF (match_operand:XF 1 "register_operand")
                 (match_dup 1)))
    (set (match_dup 4) (minus:XF (match_dup 3) (match_dup 2)))
    (set (match_dup 5) (sqrt:XF (match_dup 4)))
-   (parallel [(set (match_operand:XF 0 "register_operand" "")
+   (parallel [(set (match_operand:XF 0 "register_operand")
                   (unspec:XF [(match_dup 1) (match_dup 5)]
                              UNSPEC_FPATAN))
-             (clobber (match_scratch:XF 6 ""))])]
+             (clobber (match_scratch:XF 6))])]
   "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
 {
 })
 
 (define_expand "acos<mode>2"
-  [(use (match_operand:MODEF 0 "register_operand" ""))
-   (use (match_operand:MODEF 1 "general_operand" ""))]
+  [(use (match_operand:MODEF 0 "register_operand"))
+   (use (match_operand:MODEF 1 "general_operand"))]
  "TARGET_USE_FANCY_MATH_387
    && (!(SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)
        || TARGET_MIX_SSE_I387)
    (set_attr "mode" "XF")])
 
 (define_expand "logxf2"
-  [(parallel [(set (match_operand:XF 0 "register_operand" "")
-                  (unspec:XF [(match_operand:XF 1 "register_operand" "")
+  [(parallel [(set (match_operand:XF 0 "register_operand")
+                  (unspec:XF [(match_operand:XF 1 "register_operand")
                               (match_dup 2)] UNSPEC_FYL2X))
-             (clobber (match_scratch:XF 3 ""))])]
+             (clobber (match_scratch:XF 3))])]
   "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
 {
 })
 
 (define_expand "log<mode>2"
-  [(use (match_operand:MODEF 0 "register_operand" ""))
-   (use (match_operand:MODEF 1 "register_operand" ""))]
+  [(use (match_operand:MODEF 0 "register_operand"))
+   (use (match_operand:MODEF 1 "register_operand"))]
   "TARGET_USE_FANCY_MATH_387
    && (!(SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)
        || TARGET_MIX_SSE_I387)
 })
 
 (define_expand "log10xf2"
-  [(parallel [(set (match_operand:XF 0 "register_operand" "")
-                  (unspec:XF [(match_operand:XF 1 "register_operand" "")
+  [(parallel [(set (match_operand:XF 0 "register_operand")
+                  (unspec:XF [(match_operand:XF 1 "register_operand")
                               (match_dup 2)] UNSPEC_FYL2X))
-             (clobber (match_scratch:XF 3 ""))])]
+             (clobber (match_scratch:XF 3))])]
   "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
 {
 })
 
 (define_expand "log10<mode>2"
-  [(use (match_operand:MODEF 0 "register_operand" ""))
-   (use (match_operand:MODEF 1 "register_operand" ""))]
+  [(use (match_operand:MODEF 0 "register_operand"))
+   (use (match_operand:MODEF 1 "register_operand"))]
   "TARGET_USE_FANCY_MATH_387
    && (!(SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)
        || TARGET_MIX_SSE_I387)
 })
 
 (define_expand "log2xf2"
-  [(parallel [(set (match_operand:XF 0 "register_operand" "")
-                  (unspec:XF [(match_operand:XF 1 "register_operand" "")
+  [(parallel [(set (match_operand:XF 0 "register_operand")
+                  (unspec:XF [(match_operand:XF 1 "register_operand")
                               (match_dup 2)] UNSPEC_FYL2X))
-             (clobber (match_scratch:XF 3 ""))])]
+             (clobber (match_scratch:XF 3))])]
   "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
 {
 })
 
 (define_expand "log2<mode>2"
-  [(use (match_operand:MODEF 0 "register_operand" ""))
-   (use (match_operand:MODEF 1 "register_operand" ""))]
+  [(use (match_operand:MODEF 0 "register_operand"))
+   (use (match_operand:MODEF 1 "register_operand"))]
   "TARGET_USE_FANCY_MATH_387
    && (!(SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)
        || TARGET_MIX_SSE_I387)
    (set_attr "mode" "XF")])
 
 (define_expand "log1pxf2"
-  [(use (match_operand:XF 0 "register_operand" ""))
-   (use (match_operand:XF 1 "register_operand" ""))]
+  [(use (match_operand:XF 0 "register_operand"))
+   (use (match_operand:XF 1 "register_operand"))]
   "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
 {
 })
 
 (define_expand "log1p<mode>2"
-  [(use (match_operand:MODEF 0 "register_operand" ""))
-   (use (match_operand:MODEF 1 "register_operand" ""))]
+  [(use (match_operand:MODEF 0 "register_operand"))
+   (use (match_operand:MODEF 1 "register_operand"))]
   "TARGET_USE_FANCY_MATH_387
    && (!(SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)
        || TARGET_MIX_SSE_I387)
 
 (define_expand "logbxf2"
   [(parallel [(set (match_dup 2)
-                  (unspec:XF [(match_operand:XF 1 "register_operand" "")]
+                  (unspec:XF [(match_operand:XF 1 "register_operand")]
                              UNSPEC_XTRACT_FRACT))
-             (set (match_operand:XF 0 "register_operand" "")
+             (set (match_operand:XF 0 "register_operand")
                   (unspec:XF [(match_dup 1)] UNSPEC_XTRACT_EXP))])]
   "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
   "operands[2] = gen_reg_rtx (XFmode);")
 
 (define_expand "logb<mode>2"
-  [(use (match_operand:MODEF 0 "register_operand" ""))
-   (use (match_operand:MODEF 1 "register_operand" ""))]
+  [(use (match_operand:MODEF 0 "register_operand"))
+   (use (match_operand:MODEF 1 "register_operand"))]
   "TARGET_USE_FANCY_MATH_387
    && (!(SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)
        || TARGET_MIX_SSE_I387)
 })
 
 (define_expand "ilogbxf2"
-  [(use (match_operand:SI 0 "register_operand" ""))
-   (use (match_operand:XF 1 "register_operand" ""))]
+  [(use (match_operand:SI 0 "register_operand"))
+   (use (match_operand:XF 1 "register_operand"))]
   "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
 {
 })
 
 (define_expand "ilogb<mode>2"
-  [(use (match_operand:SI 0 "register_operand" ""))
-   (use (match_operand:MODEF 1 "register_operand" ""))]
+  [(use (match_operand:SI 0 "register_operand"))
+   (use (match_operand:MODEF 1 "register_operand"))]
   "TARGET_USE_FANCY_MATH_387
    && (!(SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)
        || TARGET_MIX_SSE_I387)
    (set_attr "mode" "XF")])
 
 (define_expand "expNcorexf3"
-  [(set (match_dup 3) (mult:XF (match_operand:XF 1 "register_operand" "")
-                              (match_operand:XF 2 "register_operand" "")))
+  [(set (match_dup 3) (mult:XF (match_operand:XF 1 "register_operand")
+                              (match_operand:XF 2 "register_operand")))
    (set (match_dup 4) (unspec:XF [(match_dup 3)] UNSPEC_FRNDINT))
    (set (match_dup 5) (minus:XF (match_dup 3) (match_dup 4)))
    (set (match_dup 6) (unspec:XF [(match_dup 5)] UNSPEC_F2XM1))
    (set (match_dup 8) (plus:XF (match_dup 6) (match_dup 7)))
-   (parallel [(set (match_operand:XF 0 "register_operand" "")
+   (parallel [(set (match_operand:XF 0 "register_operand")
                   (unspec:XF [(match_dup 8) (match_dup 4)]
                              UNSPEC_FSCALE_FRACT))
              (set (match_dup 9)
 })
 
 (define_expand "expxf2"
-  [(use (match_operand:XF 0 "register_operand" ""))
-   (use (match_operand:XF 1 "register_operand" ""))]
+  [(use (match_operand:XF 0 "register_operand"))
+   (use (match_operand:XF 1 "register_operand"))]
   "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
 {
 })
 
 (define_expand "exp<mode>2"
-  [(use (match_operand:MODEF 0 "register_operand" ""))
-   (use (match_operand:MODEF 1 "general_operand" ""))]
+  [(use (match_operand:MODEF 0 "register_operand"))
+   (use (match_operand:MODEF 1 "general_operand"))]
  "TARGET_USE_FANCY_MATH_387
    && (!(SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)
        || TARGET_MIX_SSE_I387)
 })
 
 (define_expand "exp10xf2"
-  [(use (match_operand:XF 0 "register_operand" ""))
-   (use (match_operand:XF 1 "register_operand" ""))]
+  [(use (match_operand:XF 0 "register_operand"))
+   (use (match_operand:XF 1 "register_operand"))]
   "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
 {
 })
 
 (define_expand "exp10<mode>2"
-  [(use (match_operand:MODEF 0 "register_operand" ""))
-   (use (match_operand:MODEF 1 "general_operand" ""))]
+  [(use (match_operand:MODEF 0 "register_operand"))
+   (use (match_operand:MODEF 1 "general_operand"))]
  "TARGET_USE_FANCY_MATH_387
    && (!(SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)
        || TARGET_MIX_SSE_I387)
 })
 
 (define_expand "exp2xf2"
-  [(use (match_operand:XF 0 "register_operand" ""))
-   (use (match_operand:XF 1 "register_operand" ""))]
+  [(use (match_operand:XF 0 "register_operand"))
+   (use (match_operand:XF 1 "register_operand"))]
   "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
 {
 })
 
 (define_expand "exp2<mode>2"
-  [(use (match_operand:MODEF 0 "register_operand" ""))
-   (use (match_operand:MODEF 1 "general_operand" ""))]
+  [(use (match_operand:MODEF 0 "register_operand"))
+   (use (match_operand:MODEF 1 "general_operand"))]
  "TARGET_USE_FANCY_MATH_387
    && (!(SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)
        || TARGET_MIX_SSE_I387)
 })
 
 (define_expand "expm1xf2"
-  [(set (match_dup 3) (mult:XF (match_operand:XF 1 "register_operand" "")
+  [(set (match_dup 3) (mult:XF (match_operand:XF 1 "register_operand")
                               (match_dup 2)))
    (set (match_dup 4) (unspec:XF [(match_dup 3)] UNSPEC_FRNDINT))
    (set (match_dup 5) (minus:XF (match_dup 3) (match_dup 4)))
                              UNSPEC_FSCALE_EXP))])
    (set (match_dup 12) (minus:XF (match_dup 10)
                                 (float_extend:XF (match_dup 13))))
-   (set (match_operand:XF 0 "register_operand" "")
+   (set (match_operand:XF 0 "register_operand")
        (plus:XF (match_dup 12) (match_dup 7)))]
   "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
 })
 
 (define_expand "expm1<mode>2"
-  [(use (match_operand:MODEF 0 "register_operand" ""))
-   (use (match_operand:MODEF 1 "general_operand" ""))]
+  [(use (match_operand:MODEF 0 "register_operand"))
+   (use (match_operand:MODEF 1 "general_operand"))]
  "TARGET_USE_FANCY_MATH_387
    && (!(SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)
        || TARGET_MIX_SSE_I387)
 
 (define_expand "ldexpxf3"
   [(set (match_dup 3)
-       (float:XF (match_operand:SI 2 "register_operand" "")))
-   (parallel [(set (match_operand:XF 0 " register_operand" "")
-                  (unspec:XF [(match_operand:XF 1 "register_operand" "")
+       (float:XF (match_operand:SI 2 "register_operand")))
+   (parallel [(set (match_operand:XF 0 " register_operand")
+                  (unspec:XF [(match_operand:XF 1 "register_operand")
                               (match_dup 3)]
                              UNSPEC_FSCALE_FRACT))
              (set (match_dup 4)
 })
 
 (define_expand "ldexp<mode>3"
-  [(use (match_operand:MODEF 0 "register_operand" ""))
-   (use (match_operand:MODEF 1 "general_operand" ""))
-   (use (match_operand:SI 2 "register_operand" ""))]
+  [(use (match_operand:MODEF 0 "register_operand"))
+   (use (match_operand:MODEF 1 "general_operand"))
+   (use (match_operand:SI 2 "register_operand"))]
  "TARGET_USE_FANCY_MATH_387
    && (!(SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)
        || TARGET_MIX_SSE_I387)
 })
 
 (define_expand "scalbxf3"
-  [(parallel [(set (match_operand:XF 0 " register_operand" "")
-                  (unspec:XF [(match_operand:XF 1 "register_operand" "")
-                              (match_operand:XF 2 "register_operand" "")]
+  [(parallel [(set (match_operand:XF 0 " register_operand")
+                  (unspec:XF [(match_operand:XF 1 "register_operand")
+                              (match_operand:XF 2 "register_operand")]
                              UNSPEC_FSCALE_FRACT))
              (set (match_dup 3)
                   (unspec:XF [(match_dup 1) (match_dup 2)]
 })
 
 (define_expand "scalb<mode>3"
-  [(use (match_operand:MODEF 0 "register_operand" ""))
-   (use (match_operand:MODEF 1 "general_operand" ""))
-   (use (match_operand:MODEF 2 "general_operand" ""))]
+  [(use (match_operand:MODEF 0 "register_operand"))
+   (use (match_operand:MODEF 1 "general_operand"))
+   (use (match_operand:MODEF 2 "general_operand"))]
  "TARGET_USE_FANCY_MATH_387
    && (!(SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)
        || TARGET_MIX_SSE_I387)
 })
 
 (define_expand "significandxf2"
-  [(parallel [(set (match_operand:XF 0 "register_operand" "")
-                  (unspec:XF [(match_operand:XF 1 "register_operand" "")]
+  [(parallel [(set (match_operand:XF 0 "register_operand")
+                  (unspec:XF [(match_operand:XF 1 "register_operand")]
                              UNSPEC_XTRACT_FRACT))
              (set (match_dup 2)
                   (unspec:XF [(match_dup 1)] UNSPEC_XTRACT_EXP))])]
   "operands[2] = gen_reg_rtx (XFmode);")
 
 (define_expand "significand<mode>2"
-  [(use (match_operand:MODEF 0 "register_operand" ""))
-   (use (match_operand:MODEF 1 "register_operand" ""))]
+  [(use (match_operand:MODEF 0 "register_operand"))
+   (use (match_operand:MODEF 1 "register_operand"))]
   "TARGET_USE_FANCY_MATH_387
    && (!(SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)
        || TARGET_MIX_SSE_I387)
    (set_attr "mode" "XF")])
 
 (define_expand "rint<mode>2"
-  [(use (match_operand:MODEF 0 "register_operand" ""))
-   (use (match_operand:MODEF 1 "register_operand" ""))]
+  [(use (match_operand:MODEF 0 "register_operand"))
+   (use (match_operand:MODEF 1 "register_operand"))]
   "(TARGET_USE_FANCY_MATH_387
     && (!(SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)
        || TARGET_MIX_SSE_I387)
   if (SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH
       && !flag_trapping_math)
     {
-      if (!TARGET_ROUND && optimize_insn_for_size_p ())
-       FAIL;
       if (TARGET_ROUND)
        emit_insn (gen_sse4_1_round<mode>2
                   (operands[0], operands[1], GEN_INT (ROUND_MXCSR)));
+      else if (optimize_insn_for_size_p ())
+        FAIL;
       else
-       ix86_expand_rint (operand0, operand1);
+       ix86_expand_rint (operands[0], operands[1]);
     }
   else
     {
 })
 
 (define_expand "round<mode>2"
-  [(match_operand:MODEF 0 "register_operand" "")
-   (match_operand:MODEF 1 "nonimmediate_operand" "")]
-  "SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH
-   && !flag_trapping_math && !flag_rounding_math"
+  [(match_operand:X87MODEF 0 "register_operand")
+   (match_operand:X87MODEF 1 "nonimmediate_operand")]
+  "(TARGET_USE_FANCY_MATH_387
+    && (!(SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)
+       || TARGET_MIX_SSE_I387)
+    && flag_unsafe_math_optimizations)
+   || (SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH
+       && !flag_trapping_math && !flag_rounding_math)"
 {
   if (optimize_insn_for_size_p ())
     FAIL;
-  if (TARGET_64BIT || (<MODE>mode != DFmode))
-    ix86_expand_round (operand0, operand1);
+
+  if (SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH
+      && !flag_trapping_math && !flag_rounding_math)
+    {
+      if (TARGET_ROUND)
+        {
+         operands[1] = force_reg (<MODE>mode, operands[1]);
+         ix86_expand_round_sse4 (operands[0], operands[1]);
+       }
+      else if (TARGET_64BIT || (<MODE>mode != DFmode))
+       ix86_expand_round (operands[0], operands[1]);
+      else
+       ix86_expand_rounddf_32 (operands[0], operands[1]);
+    }
   else
-    ix86_expand_rounddf_32 (operand0, operand1);
+    {
+      operands[1] = force_reg (<MODE>mode, operands[1]);
+      ix86_emit_i387_round (operands[0], operands[1]);
+    }
   DONE;
 })
 
 (define_insn_and_split "*fistdi2_1"
-  [(set (match_operand:DI 0 "nonimmediate_operand" "")
-       (unspec:DI [(match_operand:XF 1 "register_operand" "")]
+  [(set (match_operand:DI 0 "nonimmediate_operand")
+       (unspec:DI [(match_operand:XF 1 "register_operand")]
                   UNSPEC_FIST))]
   "TARGET_USE_FANCY_MATH_387
    && can_create_pseudo_p ()"
    (set_attr "mode" "DI")])
 
 (define_split
-  [(set (match_operand:DI 0 "register_operand" "")
-       (unspec:DI [(match_operand:XF 1 "register_operand" "")]
+  [(set (match_operand:DI 0 "register_operand")
+       (unspec:DI [(match_operand:XF 1 "register_operand")]
                   UNSPEC_FIST))
-   (clobber (match_operand:DI 2 "memory_operand" ""))
-   (clobber (match_scratch 3 ""))]
+   (clobber (match_operand:DI 2 "memory_operand"))
+   (clobber (match_scratch 3))]
   "reload_completed"
   [(parallel [(set (match_dup 2) (unspec:DI [(match_dup 1)] UNSPEC_FIST))
              (clobber (match_dup 3))])
    (set (match_dup 0) (match_dup 2))])
 
 (define_split
-  [(set (match_operand:DI 0 "memory_operand" "")
-       (unspec:DI [(match_operand:XF 1 "register_operand" "")]
+  [(set (match_operand:DI 0 "memory_operand")
+       (unspec:DI [(match_operand:XF 1 "register_operand")]
                   UNSPEC_FIST))
-   (clobber (match_operand:DI 2 "memory_operand" ""))
-   (clobber (match_scratch 3 ""))]
+   (clobber (match_operand:DI 2 "memory_operand"))
+   (clobber (match_scratch 3))]
   "reload_completed"
   [(parallel [(set (match_dup 0) (unspec:DI [(match_dup 1)] UNSPEC_FIST))
              (clobber (match_dup 3))])])
 
 (define_insn_and_split "*fist<mode>2_1"
-  [(set (match_operand:X87MODEI12 0 "register_operand" "")
-       (unspec:X87MODEI12 [(match_operand:XF 1 "register_operand" "")]
-                          UNSPEC_FIST))]
+  [(set (match_operand:SWI24 0 "register_operand")
+       (unspec:SWI24 [(match_operand:XF 1 "register_operand")]
+                     UNSPEC_FIST))]
   "TARGET_USE_FANCY_MATH_387
    && can_create_pseudo_p ()"
   "#"
    (set_attr "mode" "<MODE>")])
 
 (define_insn "fist<mode>2"
-  [(set (match_operand:X87MODEI12 0 "memory_operand" "=m")
-       (unspec:X87MODEI12 [(match_operand:XF 1 "register_operand" "f")]
-                          UNSPEC_FIST))]
+  [(set (match_operand:SWI24 0 "memory_operand" "=m")
+       (unspec:SWI24 [(match_operand:XF 1 "register_operand" "f")]
+                     UNSPEC_FIST))]
   "TARGET_USE_FANCY_MATH_387"
   "* return output_fix_trunc (insn, operands, false);"
   [(set_attr "type" "fpspc")
    (set_attr "mode" "<MODE>")])
 
 (define_insn "fist<mode>2_with_temp"
-  [(set (match_operand:X87MODEI12 0 "register_operand" "=r")
-       (unspec:X87MODEI12 [(match_operand:XF 1 "register_operand" "f")]
-                          UNSPEC_FIST))
-   (clobber (match_operand:X87MODEI12 2 "memory_operand" "=m"))]
+  [(set (match_operand:SWI24 0 "register_operand" "=r")
+       (unspec:SWI24 [(match_operand:XF 1 "register_operand" "f")]
+                     UNSPEC_FIST))
+   (clobber (match_operand:SWI24 2 "memory_operand" "=m"))]
   "TARGET_USE_FANCY_MATH_387"
   "#"
   [(set_attr "type" "fpspc")
    (set_attr "mode" "<MODE>")])
 
 (define_split
-  [(set (match_operand:X87MODEI12 0 "register_operand" "")
-       (unspec:X87MODEI12 [(match_operand:XF 1 "register_operand" "")]
-                          UNSPEC_FIST))
-   (clobber (match_operand:X87MODEI12 2 "memory_operand" ""))]
+  [(set (match_operand:SWI24 0 "register_operand")
+       (unspec:SWI24 [(match_operand:XF 1 "register_operand")]
+                     UNSPEC_FIST))
+   (clobber (match_operand:SWI24 2 "memory_operand"))]
   "reload_completed"
-  [(set (match_dup 2) (unspec:X87MODEI12 [(match_dup 1)] UNSPEC_FIST))
+  [(set (match_dup 2) (unspec:SWI24 [(match_dup 1)] UNSPEC_FIST))
    (set (match_dup 0) (match_dup 2))])
 
 (define_split
-  [(set (match_operand:X87MODEI12 0 "memory_operand" "")
-       (unspec:X87MODEI12 [(match_operand:XF 1 "register_operand" "")]
-                          UNSPEC_FIST))
-   (clobber (match_operand:X87MODEI12 2 "memory_operand" ""))]
+  [(set (match_operand:SWI24 0 "memory_operand")
+       (unspec:SWI24 [(match_operand:XF 1 "register_operand")]
+                     UNSPEC_FIST))
+   (clobber (match_operand:SWI24 2 "memory_operand"))]
   "reload_completed"
-  [(set (match_dup 0) (unspec:X87MODEI12 [(match_dup 1)] UNSPEC_FIST))])
+  [(set (match_dup 0) (unspec:SWI24 [(match_dup 1)] UNSPEC_FIST))])
 
 (define_expand "lrintxf<mode>2"
-  [(set (match_operand:X87MODEI 0 "nonimmediate_operand" "")
-     (unspec:X87MODEI [(match_operand:XF 1 "register_operand" "")]
-                     UNSPEC_FIST))]
+  [(set (match_operand:SWI248x 0 "nonimmediate_operand")
+     (unspec:SWI248x [(match_operand:XF 1 "register_operand")]
+                    UNSPEC_FIST))]
   "TARGET_USE_FANCY_MATH_387")
 
-(define_expand "lrint<MODEF:mode><SSEMODEI24:mode>2"
-  [(set (match_operand:SSEMODEI24 0 "nonimmediate_operand" "")
-     (unspec:SSEMODEI24 [(match_operand:MODEF 1 "register_operand" "")]
+(define_expand "lrint<MODEF:mode><SWI48x:mode>2"
+  [(set (match_operand:SWI48x 0 "nonimmediate_operand")
+     (unspec:SWI48x [(match_operand:MODEF 1 "register_operand")]
                        UNSPEC_FIX_NOTRUNC))]
   "SSE_FLOAT_MODE_P (<MODEF:MODE>mode) && TARGET_SSE_MATH
-   && ((<SSEMODEI24:MODE>mode != DImode) || TARGET_64BIT)")
+   && ((<SWI48x:MODE>mode != DImode) || TARGET_64BIT)")
 
-(define_expand "lround<MODEF:mode><SSEMODEI24:mode>2"
-  [(match_operand:SSEMODEI24 0 "nonimmediate_operand" "")
-   (match_operand:MODEF 1 "register_operand" "")]
-  "SSE_FLOAT_MODE_P (<MODEF:MODE>mode) && TARGET_SSE_MATH
-   && ((<SSEMODEI24:MODE>mode != DImode) || TARGET_64BIT)
-   && !flag_trapping_math && !flag_rounding_math"
+(define_expand "lround<X87MODEF:mode><SWI248x:mode>2"
+  [(match_operand:SWI248x 0 "nonimmediate_operand")
+   (match_operand:X87MODEF 1 "register_operand")]
+  "(TARGET_USE_FANCY_MATH_387
+    && (!(SSE_FLOAT_MODE_P (<X87MODEF:MODE>mode) && TARGET_SSE_MATH)
+       || TARGET_MIX_SSE_I387)
+    && flag_unsafe_math_optimizations)
+   || (SSE_FLOAT_MODE_P (<X87MODEF:MODE>mode) && TARGET_SSE_MATH
+       && <SWI248x:MODE>mode != HImode 
+       && ((<SWI248x:MODE>mode != DImode) || TARGET_64BIT)
+       && !flag_trapping_math && !flag_rounding_math)"
 {
   if (optimize_insn_for_size_p ())
     FAIL;
-  ix86_expand_lround (operand0, operand1);
+
+  if (SSE_FLOAT_MODE_P (<X87MODEF:MODE>mode) && TARGET_SSE_MATH
+      && <SWI248x:MODE>mode != HImode
+      && ((<SWI248x:MODE>mode != DImode) || TARGET_64BIT)
+      && !flag_trapping_math && !flag_rounding_math)
+    ix86_expand_lround (operands[0], operands[1]);
+  else
+    ix86_emit_i387_round (operands[0], operands[1]);
   DONE;
 })
 
 ;; Rounding mode control word calculation could clobber FLAGS_REG.
 (define_insn_and_split "frndintxf2_floor"
-  [(set (match_operand:XF 0 "register_operand" "")
-       (unspec:XF [(match_operand:XF 1 "register_operand" "")]
+  [(set (match_operand:XF 0 "register_operand")
+       (unspec:XF [(match_operand:XF 1 "register_operand")]
         UNSPEC_FRNDINT_FLOOR))
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_USE_FANCY_MATH_387
    (set_attr "mode" "XF")])
 
 (define_expand "floorxf2"
-  [(use (match_operand:XF 0 "register_operand" ""))
-   (use (match_operand:XF 1 "register_operand" ""))]
+  [(use (match_operand:XF 0 "register_operand"))
+   (use (match_operand:XF 1 "register_operand"))]
   "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
 {
 })
 
 (define_expand "floor<mode>2"
-  [(use (match_operand:MODEF 0 "register_operand" ""))
-   (use (match_operand:MODEF 1 "register_operand" ""))]
+  [(use (match_operand:MODEF 0 "register_operand"))
+   (use (match_operand:MODEF 1 "register_operand"))]
   "(TARGET_USE_FANCY_MATH_387
     && (!(SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)
        || TARGET_MIX_SSE_I387)
        && !flag_trapping_math)"
 {
   if (SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH
-      && !flag_trapping_math
-      && (TARGET_ROUND || optimize_insn_for_speed_p ()))
+      && !flag_trapping_math)
     {
-      if (!TARGET_ROUND && optimize_insn_for_size_p ())
-       FAIL;
       if (TARGET_ROUND)
        emit_insn (gen_sse4_1_round<mode>2
                   (operands[0], operands[1], GEN_INT (ROUND_FLOOR)));
+      else if (optimize_insn_for_size_p ())
+        FAIL;
       else if (TARGET_64BIT || (<MODE>mode != DFmode))
-       ix86_expand_floorceil (operand0, operand1, true);
+       ix86_expand_floorceil (operands[0], operands[1], true);
       else
-       ix86_expand_floorceildf_32 (operand0, operand1, true);
+       ix86_expand_floorceildf_32 (operands[0], operands[1], true);
     }
   else
     {
 })
 
 (define_insn_and_split "*fist<mode>2_floor_1"
-  [(set (match_operand:X87MODEI 0 "nonimmediate_operand" "")
-       (unspec:X87MODEI [(match_operand:XF 1 "register_operand" "")]
-        UNSPEC_FIST_FLOOR))
+  [(set (match_operand:SWI248x 0 "nonimmediate_operand")
+       (unspec:SWI248x [(match_operand:XF 1 "register_operand")]
+                       UNSPEC_FIST_FLOOR))
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations
 (define_insn "fistdi2_floor"
   [(set (match_operand:DI 0 "memory_operand" "=m")
        (unspec:DI [(match_operand:XF 1 "register_operand" "f")]
-        UNSPEC_FIST_FLOOR))
+                  UNSPEC_FIST_FLOOR))
    (use (match_operand:HI 2 "memory_operand" "m"))
    (use (match_operand:HI 3 "memory_operand" "m"))
    (clobber (match_scratch:XF 4 "=&1f"))]
 (define_insn "fistdi2_floor_with_temp"
   [(set (match_operand:DI 0 "nonimmediate_operand" "=m,?r")
        (unspec:DI [(match_operand:XF 1 "register_operand" "f,f")]
-        UNSPEC_FIST_FLOOR))
+                  UNSPEC_FIST_FLOOR))
    (use (match_operand:HI 2 "memory_operand" "m,m"))
    (use (match_operand:HI 3 "memory_operand" "m,m"))
    (clobber (match_operand:DI 4 "memory_operand" "=X,m"))
    (set_attr "mode" "DI")])
 
 (define_split
-  [(set (match_operand:DI 0 "register_operand" "")
-       (unspec:DI [(match_operand:XF 1 "register_operand" "")]
-        UNSPEC_FIST_FLOOR))
-   (use (match_operand:HI 2 "memory_operand" ""))
-   (use (match_operand:HI 3 "memory_operand" ""))
-   (clobber (match_operand:DI 4 "memory_operand" ""))
-   (clobber (match_scratch 5 ""))]
+  [(set (match_operand:DI 0 "register_operand")
+       (unspec:DI [(match_operand:XF 1 "register_operand")]
+                  UNSPEC_FIST_FLOOR))
+   (use (match_operand:HI 2 "memory_operand"))
+   (use (match_operand:HI 3 "memory_operand"))
+   (clobber (match_operand:DI 4 "memory_operand"))
+   (clobber (match_scratch 5))]
   "reload_completed"
-  [(parallel [(set (match_dup 4) (unspec:DI [(match_dup 1)] UNSPEC_FIST_FLOOR))
+  [(parallel [(set (match_dup 4)
+                  (unspec:DI [(match_dup 1)] UNSPEC_FIST_FLOOR))
              (use (match_dup 2))
              (use (match_dup 3))
              (clobber (match_dup 5))])
    (set (match_dup 0) (match_dup 4))])
 
 (define_split
-  [(set (match_operand:DI 0 "memory_operand" "")
-       (unspec:DI [(match_operand:XF 1 "register_operand" "")]
-        UNSPEC_FIST_FLOOR))
-   (use (match_operand:HI 2 "memory_operand" ""))
-   (use (match_operand:HI 3 "memory_operand" ""))
-   (clobber (match_operand:DI 4 "memory_operand" ""))
-   (clobber (match_scratch 5 ""))]
+  [(set (match_operand:DI 0 "memory_operand")
+       (unspec:DI [(match_operand:XF 1 "register_operand")]
+                  UNSPEC_FIST_FLOOR))
+   (use (match_operand:HI 2 "memory_operand"))
+   (use (match_operand:HI 3 "memory_operand"))
+   (clobber (match_operand:DI 4 "memory_operand"))
+   (clobber (match_scratch 5))]
   "reload_completed"
-  [(parallel [(set (match_dup 0) (unspec:DI [(match_dup 1)] UNSPEC_FIST_FLOOR))
+  [(parallel [(set (match_dup 0)
+                  (unspec:DI [(match_dup 1)] UNSPEC_FIST_FLOOR))
              (use (match_dup 2))
              (use (match_dup 3))
              (clobber (match_dup 5))])])
 
 (define_insn "fist<mode>2_floor"
-  [(set (match_operand:X87MODEI12 0 "memory_operand" "=m")
-       (unspec:X87MODEI12 [(match_operand:XF 1 "register_operand" "f")]
-        UNSPEC_FIST_FLOOR))
+  [(set (match_operand:SWI24 0 "memory_operand" "=m")
+       (unspec:SWI24 [(match_operand:XF 1 "register_operand" "f")]
+                     UNSPEC_FIST_FLOOR))
    (use (match_operand:HI 2 "memory_operand" "m"))
    (use (match_operand:HI 3 "memory_operand" "m"))]
   "TARGET_USE_FANCY_MATH_387
    (set_attr "mode" "<MODE>")])
 
 (define_insn "fist<mode>2_floor_with_temp"
-  [(set (match_operand:X87MODEI12 0 "nonimmediate_operand" "=m,?r")
-       (unspec:X87MODEI12 [(match_operand:XF 1 "register_operand" "f,f")]
-        UNSPEC_FIST_FLOOR))
+  [(set (match_operand:SWI24 0 "nonimmediate_operand" "=m,?r")
+       (unspec:SWI24 [(match_operand:XF 1 "register_operand" "f,f")]
+                     UNSPEC_FIST_FLOOR))
    (use (match_operand:HI 2 "memory_operand" "m,m"))
    (use (match_operand:HI 3 "memory_operand" "m,m"))
-   (clobber (match_operand:X87MODEI12 4 "memory_operand" "=X,m"))]
+   (clobber (match_operand:SWI24 4 "memory_operand" "=X,m"))]
   "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
   "#"
    (set_attr "mode" "<MODE>")])
 
 (define_split
-  [(set (match_operand:X87MODEI12 0 "register_operand" "")
-       (unspec:X87MODEI12 [(match_operand:XF 1 "register_operand" "")]
-        UNSPEC_FIST_FLOOR))
-   (use (match_operand:HI 2 "memory_operand" ""))
-   (use (match_operand:HI 3 "memory_operand" ""))
-   (clobber (match_operand:X87MODEI12 4 "memory_operand" ""))]
+  [(set (match_operand:SWI24 0 "register_operand")
+       (unspec:SWI24 [(match_operand:XF 1 "register_operand")]
+                     UNSPEC_FIST_FLOOR))
+   (use (match_operand:HI 2 "memory_operand"))
+   (use (match_operand:HI 3 "memory_operand"))
+   (clobber (match_operand:SWI24 4 "memory_operand"))]
   "reload_completed"
-  [(parallel [(set (match_dup 4) (unspec:X87MODEI12 [(match_dup 1)]
-                                 UNSPEC_FIST_FLOOR))
+  [(parallel [(set (match_dup 4)
+                  (unspec:SWI24 [(match_dup 1)] UNSPEC_FIST_FLOOR))
              (use (match_dup 2))
              (use (match_dup 3))])
    (set (match_dup 0) (match_dup 4))])
 
 (define_split
-  [(set (match_operand:X87MODEI12 0 "memory_operand" "")
-       (unspec:X87MODEI12 [(match_operand:XF 1 "register_operand" "")]
-        UNSPEC_FIST_FLOOR))
-   (use (match_operand:HI 2 "memory_operand" ""))
-   (use (match_operand:HI 3 "memory_operand" ""))
-   (clobber (match_operand:X87MODEI12 4 "memory_operand" ""))]
+  [(set (match_operand:SWI24 0 "memory_operand")
+       (unspec:SWI24 [(match_operand:XF 1 "register_operand")]
+                     UNSPEC_FIST_FLOOR))
+   (use (match_operand:HI 2 "memory_operand"))
+   (use (match_operand:HI 3 "memory_operand"))
+   (clobber (match_operand:SWI24 4 "memory_operand"))]
   "reload_completed"
-  [(parallel [(set (match_dup 0) (unspec:X87MODEI12 [(match_dup 1)]
-                                 UNSPEC_FIST_FLOOR))
+  [(parallel [(set (match_dup 0)
+                  (unspec:SWI24 [(match_dup 1)] UNSPEC_FIST_FLOOR))
              (use (match_dup 2))
              (use (match_dup 3))])])
 
 (define_expand "lfloorxf<mode>2"
-  [(parallel [(set (match_operand:X87MODEI 0 "nonimmediate_operand" "")
-                  (unspec:X87MODEI [(match_operand:XF 1 "register_operand" "")]
-                   UNSPEC_FIST_FLOOR))
+  [(parallel [(set (match_operand:SWI248x 0 "nonimmediate_operand")
+                  (unspec:SWI248x [(match_operand:XF 1 "register_operand")]
+                                  UNSPEC_FIST_FLOOR))
              (clobber (reg:CC FLAGS_REG))])]
   "TARGET_USE_FANCY_MATH_387
    && (!TARGET_SSE_MATH || TARGET_MIX_SSE_I387)
    && flag_unsafe_math_optimizations")
 
 (define_expand "lfloor<MODEF:mode><SWI48:mode>2"
-  [(match_operand:SWI48 0 "nonimmediate_operand" "")
-   (match_operand:MODEF 1 "register_operand" "")]
+  [(match_operand:SWI48 0 "nonimmediate_operand")
+   (match_operand:MODEF 1 "register_operand")]
   "SSE_FLOAT_MODE_P (<MODEF:MODE>mode) && TARGET_SSE_MATH
    && !flag_trapping_math"
 {
   if (TARGET_64BIT && optimize_insn_for_size_p ())
     FAIL;
-  ix86_expand_lfloorceil (operand0, operand1, true);
+  ix86_expand_lfloorceil (operands[0], operands[1], true);
   DONE;
 })
 
 ;; Rounding mode control word calculation could clobber FLAGS_REG.
 (define_insn_and_split "frndintxf2_ceil"
-  [(set (match_operand:XF 0 "register_operand" "")
-       (unspec:XF [(match_operand:XF 1 "register_operand" "")]
+  [(set (match_operand:XF 0 "register_operand")
+       (unspec:XF [(match_operand:XF 1 "register_operand")]
         UNSPEC_FRNDINT_CEIL))
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_USE_FANCY_MATH_387
    (set_attr "mode" "XF")])
 
 (define_expand "ceilxf2"
-  [(use (match_operand:XF 0 "register_operand" ""))
-   (use (match_operand:XF 1 "register_operand" ""))]
+  [(use (match_operand:XF 0 "register_operand"))
+   (use (match_operand:XF 1 "register_operand"))]
   "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
 {
 })
 
 (define_expand "ceil<mode>2"
-  [(use (match_operand:MODEF 0 "register_operand" ""))
-   (use (match_operand:MODEF 1 "register_operand" ""))]
+  [(use (match_operand:MODEF 0 "register_operand"))
+   (use (match_operand:MODEF 1 "register_operand"))]
   "(TARGET_USE_FANCY_MATH_387
     && (!(SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)
        || TARGET_MIX_SSE_I387)
        && !flag_trapping_math)"
 {
   if (SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH
-      && !flag_trapping_math
-      && (TARGET_ROUND || optimize_insn_for_speed_p ()))
+      && !flag_trapping_math)
     {
       if (TARGET_ROUND)
        emit_insn (gen_sse4_1_round<mode>2
       else if (optimize_insn_for_size_p ())
        FAIL;
       else if (TARGET_64BIT || (<MODE>mode != DFmode))
-       ix86_expand_floorceil (operand0, operand1, false);
+       ix86_expand_floorceil (operands[0], operands[1], false);
       else
-       ix86_expand_floorceildf_32 (operand0, operand1, false);
+       ix86_expand_floorceildf_32 (operands[0], operands[1], false);
     }
   else
     {
 })
 
 (define_insn_and_split "*fist<mode>2_ceil_1"
-  [(set (match_operand:X87MODEI 0 "nonimmediate_operand" "")
-       (unspec:X87MODEI [(match_operand:XF 1 "register_operand" "")]
-        UNSPEC_FIST_CEIL))
+  [(set (match_operand:SWI248x 0 "nonimmediate_operand")
+       (unspec:SWI248x [(match_operand:XF 1 "register_operand")]
+                       UNSPEC_FIST_CEIL))
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations
 (define_insn "fistdi2_ceil"
   [(set (match_operand:DI 0 "memory_operand" "=m")
        (unspec:DI [(match_operand:XF 1 "register_operand" "f")]
-        UNSPEC_FIST_CEIL))
+                  UNSPEC_FIST_CEIL))
    (use (match_operand:HI 2 "memory_operand" "m"))
    (use (match_operand:HI 3 "memory_operand" "m"))
    (clobber (match_scratch:XF 4 "=&1f"))]
 (define_insn "fistdi2_ceil_with_temp"
   [(set (match_operand:DI 0 "nonimmediate_operand" "=m,?r")
        (unspec:DI [(match_operand:XF 1 "register_operand" "f,f")]
-        UNSPEC_FIST_CEIL))
+                  UNSPEC_FIST_CEIL))
    (use (match_operand:HI 2 "memory_operand" "m,m"))
    (use (match_operand:HI 3 "memory_operand" "m,m"))
    (clobber (match_operand:DI 4 "memory_operand" "=X,m"))
    (set_attr "mode" "DI")])
 
 (define_split
-  [(set (match_operand:DI 0 "register_operand" "")
-       (unspec:DI [(match_operand:XF 1 "register_operand" "")]
-        UNSPEC_FIST_CEIL))
-   (use (match_operand:HI 2 "memory_operand" ""))
-   (use (match_operand:HI 3 "memory_operand" ""))
-   (clobber (match_operand:DI 4 "memory_operand" ""))
-   (clobber (match_scratch 5 ""))]
+  [(set (match_operand:DI 0 "register_operand")
+       (unspec:DI [(match_operand:XF 1 "register_operand")]
+                  UNSPEC_FIST_CEIL))
+   (use (match_operand:HI 2 "memory_operand"))
+   (use (match_operand:HI 3 "memory_operand"))
+   (clobber (match_operand:DI 4 "memory_operand"))
+   (clobber (match_scratch 5))]
   "reload_completed"
-  [(parallel [(set (match_dup 4) (unspec:DI [(match_dup 1)] UNSPEC_FIST_CEIL))
+  [(parallel [(set (match_dup 4)
+                  (unspec:DI [(match_dup 1)] UNSPEC_FIST_CEIL))
              (use (match_dup 2))
              (use (match_dup 3))
              (clobber (match_dup 5))])
    (set (match_dup 0) (match_dup 4))])
 
 (define_split
-  [(set (match_operand:DI 0 "memory_operand" "")
-       (unspec:DI [(match_operand:XF 1 "register_operand" "")]
-        UNSPEC_FIST_CEIL))
-   (use (match_operand:HI 2 "memory_operand" ""))
-   (use (match_operand:HI 3 "memory_operand" ""))
-   (clobber (match_operand:DI 4 "memory_operand" ""))
-   (clobber (match_scratch 5 ""))]
+  [(set (match_operand:DI 0 "memory_operand")
+       (unspec:DI [(match_operand:XF 1 "register_operand")]
+                  UNSPEC_FIST_CEIL))
+   (use (match_operand:HI 2 "memory_operand"))
+   (use (match_operand:HI 3 "memory_operand"))
+   (clobber (match_operand:DI 4 "memory_operand"))
+   (clobber (match_scratch 5))]
   "reload_completed"
-  [(parallel [(set (match_dup 0) (unspec:DI [(match_dup 1)] UNSPEC_FIST_CEIL))
+  [(parallel [(set (match_dup 0)
+                  (unspec:DI [(match_dup 1)] UNSPEC_FIST_CEIL))
              (use (match_dup 2))
              (use (match_dup 3))
              (clobber (match_dup 5))])])
 
 (define_insn "fist<mode>2_ceil"
-  [(set (match_operand:X87MODEI12 0 "memory_operand" "=m")
-       (unspec:X87MODEI12 [(match_operand:XF 1 "register_operand" "f")]
-        UNSPEC_FIST_CEIL))
+  [(set (match_operand:SWI24 0 "memory_operand" "=m")
+       (unspec:SWI24 [(match_operand:XF 1 "register_operand" "f")]
+                     UNSPEC_FIST_CEIL))
    (use (match_operand:HI 2 "memory_operand" "m"))
    (use (match_operand:HI 3 "memory_operand" "m"))]
   "TARGET_USE_FANCY_MATH_387
    (set_attr "mode" "<MODE>")])
 
 (define_insn "fist<mode>2_ceil_with_temp"
-  [(set (match_operand:X87MODEI12 0 "nonimmediate_operand" "=m,?r")
-       (unspec:X87MODEI12 [(match_operand:XF 1 "register_operand" "f,f")]
-        UNSPEC_FIST_CEIL))
+  [(set (match_operand:SWI24 0 "nonimmediate_operand" "=m,?r")
+       (unspec:SWI24 [(match_operand:XF 1 "register_operand" "f,f")]
+                     UNSPEC_FIST_CEIL))
    (use (match_operand:HI 2 "memory_operand" "m,m"))
    (use (match_operand:HI 3 "memory_operand" "m,m"))
-   (clobber (match_operand:X87MODEI12 4 "memory_operand" "=X,m"))]
+   (clobber (match_operand:SWI24 4 "memory_operand" "=X,m"))]
   "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
   "#"
    (set_attr "mode" "<MODE>")])
 
 (define_split
-  [(set (match_operand:X87MODEI12 0 "register_operand" "")
-       (unspec:X87MODEI12 [(match_operand:XF 1 "register_operand" "")]
-        UNSPEC_FIST_CEIL))
-   (use (match_operand:HI 2 "memory_operand" ""))
-   (use (match_operand:HI 3 "memory_operand" ""))
-   (clobber (match_operand:X87MODEI12 4 "memory_operand" ""))]
+  [(set (match_operand:SWI24 0 "register_operand")
+       (unspec:SWI24 [(match_operand:XF 1 "register_operand")]
+                     UNSPEC_FIST_CEIL))
+   (use (match_operand:HI 2 "memory_operand"))
+   (use (match_operand:HI 3 "memory_operand"))
+   (clobber (match_operand:SWI24 4 "memory_operand"))]
   "reload_completed"
-  [(parallel [(set (match_dup 4) (unspec:X87MODEI12 [(match_dup 1)]
-                                 UNSPEC_FIST_CEIL))
+  [(parallel [(set (match_dup 4)
+                  (unspec:SWI24 [(match_dup 1)] UNSPEC_FIST_CEIL))
              (use (match_dup 2))
              (use (match_dup 3))])
    (set (match_dup 0) (match_dup 4))])
 
 (define_split
-  [(set (match_operand:X87MODEI12 0 "memory_operand" "")
-       (unspec:X87MODEI12 [(match_operand:XF 1 "register_operand" "")]
-        UNSPEC_FIST_CEIL))
-   (use (match_operand:HI 2 "memory_operand" ""))
-   (use (match_operand:HI 3 "memory_operand" ""))
-   (clobber (match_operand:X87MODEI12 4 "memory_operand" ""))]
+  [(set (match_operand:SWI24 0 "memory_operand")
+       (unspec:SWI24 [(match_operand:XF 1 "register_operand")]
+                     UNSPEC_FIST_CEIL))
+   (use (match_operand:HI 2 "memory_operand"))
+   (use (match_operand:HI 3 "memory_operand"))
+   (clobber (match_operand:SWI24 4 "memory_operand"))]
   "reload_completed"
-  [(parallel [(set (match_dup 0) (unspec:X87MODEI12 [(match_dup 1)]
-                                 UNSPEC_FIST_CEIL))
+  [(parallel [(set (match_dup 0)
+                  (unspec:SWI24 [(match_dup 1)] UNSPEC_FIST_CEIL))
              (use (match_dup 2))
              (use (match_dup 3))])])
 
 (define_expand "lceilxf<mode>2"
-  [(parallel [(set (match_operand:X87MODEI 0 "nonimmediate_operand" "")
-                  (unspec:X87MODEI [(match_operand:XF 1 "register_operand" "")]
-                   UNSPEC_FIST_CEIL))
+  [(parallel [(set (match_operand:SWI248x 0 "nonimmediate_operand")
+                  (unspec:SWI248x [(match_operand:XF 1 "register_operand")]
+                                  UNSPEC_FIST_CEIL))
              (clobber (reg:CC FLAGS_REG))])]
   "TARGET_USE_FANCY_MATH_387
    && (!TARGET_SSE_MATH || TARGET_MIX_SSE_I387)
    && flag_unsafe_math_optimizations")
 
 (define_expand "lceil<MODEF:mode><SWI48:mode>2"
-  [(match_operand:SWI48 0 "nonimmediate_operand" "")
-   (match_operand:MODEF 1 "register_operand" "")]
+  [(match_operand:SWI48 0 "nonimmediate_operand")
+   (match_operand:MODEF 1 "register_operand")]
   "SSE_FLOAT_MODE_P (<MODEF:MODE>mode) && TARGET_SSE_MATH
    && !flag_trapping_math"
 {
-  ix86_expand_lfloorceil (operand0, operand1, false);
+  ix86_expand_lfloorceil (operands[0], operands[1], false);
   DONE;
 })
 
 ;; Rounding mode control word calculation could clobber FLAGS_REG.
 (define_insn_and_split "frndintxf2_trunc"
-  [(set (match_operand:XF 0 "register_operand" "")
-       (unspec:XF [(match_operand:XF 1 "register_operand" "")]
+  [(set (match_operand:XF 0 "register_operand")
+       (unspec:XF [(match_operand:XF 1 "register_operand")]
         UNSPEC_FRNDINT_TRUNC))
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_USE_FANCY_MATH_387
    (set_attr "mode" "XF")])
 
 (define_expand "btruncxf2"
-  [(use (match_operand:XF 0 "register_operand" ""))
-   (use (match_operand:XF 1 "register_operand" ""))]
+  [(use (match_operand:XF 0 "register_operand"))
+   (use (match_operand:XF 1 "register_operand"))]
   "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
 {
 })
 
 (define_expand "btrunc<mode>2"
-  [(use (match_operand:MODEF 0 "register_operand" ""))
-   (use (match_operand:MODEF 1 "register_operand" ""))]
+  [(use (match_operand:MODEF 0 "register_operand"))
+   (use (match_operand:MODEF 1 "register_operand"))]
   "(TARGET_USE_FANCY_MATH_387
     && (!(SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)
        || TARGET_MIX_SSE_I387)
        && !flag_trapping_math)"
 {
   if (SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH
-      && !flag_trapping_math
-      && (TARGET_ROUND || optimize_insn_for_speed_p ()))
+      && !flag_trapping_math)
     {
       if (TARGET_ROUND)
        emit_insn (gen_sse4_1_round<mode>2
       else if (optimize_insn_for_size_p ())
        FAIL;
       else if (TARGET_64BIT || (<MODE>mode != DFmode))
-       ix86_expand_trunc (operand0, operand1);
+       ix86_expand_trunc (operands[0], operands[1]);
       else
-       ix86_expand_truncdf_32 (operand0, operand1);
+       ix86_expand_truncdf_32 (operands[0], operands[1]);
     }
   else
     {
 
 ;; Rounding mode control word calculation could clobber FLAGS_REG.
 (define_insn_and_split "frndintxf2_mask_pm"
-  [(set (match_operand:XF 0 "register_operand" "")
-       (unspec:XF [(match_operand:XF 1 "register_operand" "")]
+  [(set (match_operand:XF 0 "register_operand")
+       (unspec:XF [(match_operand:XF 1 "register_operand")]
         UNSPEC_FRNDINT_MASK_PM))
    (clobber (reg:CC FLAGS_REG))]
   "TARGET_USE_FANCY_MATH_387
    (set_attr "mode" "XF")])
 
 (define_expand "nearbyintxf2"
-  [(use (match_operand:XF 0 "register_operand" ""))
-   (use (match_operand:XF 1 "register_operand" ""))]
+  [(use (match_operand:XF 0 "register_operand"))
+   (use (match_operand:XF 1 "register_operand"))]
   "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
 {
 })
 
 (define_expand "nearbyint<mode>2"
-  [(use (match_operand:MODEF 0 "register_operand" ""))
-   (use (match_operand:MODEF 1 "register_operand" ""))]
+  [(use (match_operand:MODEF 0 "register_operand"))
+   (use (match_operand:MODEF 1 "register_operand"))]
   "TARGET_USE_FANCY_MATH_387
    && (!(SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)
        || TARGET_MIX_SSE_I387)
    (set_attr "mode" "<MODE>")])
 
 (define_insn_and_split "fxam<mode>2_i387_with_temp"
-  [(set (match_operand:HI 0 "register_operand" "")
+  [(set (match_operand:HI 0 "register_operand")
        (unspec:HI
-         [(match_operand:MODEF 1 "memory_operand" "")]
+         [(match_operand:MODEF 1 "memory_operand")]
          UNSPEC_FXAM_MEM))]
   "TARGET_USE_FANCY_MATH_387
    && can_create_pseudo_p ()"
    (set_attr "mode" "<MODE>")])
 
 (define_expand "isinfxf2"
-  [(use (match_operand:SI 0 "register_operand" ""))
-   (use (match_operand:XF 1 "register_operand" ""))]
+  [(use (match_operand:SI 0 "register_operand"))
+   (use (match_operand:XF 1 "register_operand"))]
   "TARGET_USE_FANCY_MATH_387
    && TARGET_C99_FUNCTIONS"
 {
 })
 
 (define_expand "isinf<mode>2"
-  [(use (match_operand:SI 0 "register_operand" ""))
-   (use (match_operand:MODEF 1 "nonimmediate_operand" ""))]
+  [(use (match_operand:SI 0 "register_operand"))
+   (use (match_operand:MODEF 1 "nonimmediate_operand"))]
   "TARGET_USE_FANCY_MATH_387
    && TARGET_C99_FUNCTIONS
    && !(SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)"
 })
 
 (define_expand "signbitxf2"
-  [(use (match_operand:SI 0 "register_operand" ""))
-   (use (match_operand:XF 1 "register_operand" ""))]
+  [(use (match_operand:SI 0 "register_operand"))
+   (use (match_operand:XF 1 "register_operand"))]
   "TARGET_USE_FANCY_MATH_387"
 {
   rtx scratch = gen_reg_rtx (HImode);
 ;; Use movmskpd in SSE mode to avoid store forwarding stall
 ;; for 32bit targets and movq+shrq sequence for 64bit targets.
 (define_expand "signbitdf2"
-  [(use (match_operand:SI 0 "register_operand" ""))
-   (use (match_operand:DF 1 "register_operand" ""))]
+  [(use (match_operand:SI 0 "register_operand"))
+   (use (match_operand:DF 1 "register_operand"))]
   "TARGET_USE_FANCY_MATH_387
    || (SSE_FLOAT_MODE_P (DFmode) && TARGET_SSE_MATH)"
 {
 })
 
 (define_expand "signbitsf2"
-  [(use (match_operand:SI 0 "register_operand" ""))
-   (use (match_operand:SF 1 "register_operand" ""))]
+  [(use (match_operand:SI 0 "register_operand"))
+   (use (match_operand:SF 1 "register_operand"))]
   "TARGET_USE_FANCY_MATH_387
    && !(SSE_FLOAT_MODE_P (SFmode) && TARGET_SSE_MATH)"
 {
    (set_attr "modrm" "0")])
 
 (define_expand "movmem<mode>"
-  [(use (match_operand:BLK 0 "memory_operand" ""))
-   (use (match_operand:BLK 1 "memory_operand" ""))
-   (use (match_operand:SWI48 2 "nonmemory_operand" ""))
-   (use (match_operand:SWI48 3 "const_int_operand" ""))
-   (use (match_operand:SI 4 "const_int_operand" ""))
-   (use (match_operand:SI 5 "const_int_operand" ""))]
+  [(use (match_operand:BLK 0 "memory_operand"))
+   (use (match_operand:BLK 1 "memory_operand"))
+   (use (match_operand:SWI48 2 "nonmemory_operand"))
+   (use (match_operand:SWI48 3 "const_int_operand"))
+   (use (match_operand:SI 4 "const_int_operand"))
+   (use (match_operand:SI 5 "const_int_operand"))]
   ""
 {
  if (ix86_expand_movmem (operands[0], operands[1], operands[2], operands[3],
 ;; Handle this case here to simplify previous expander.
 
 (define_expand "strmov"
-  [(set (match_dup 4) (match_operand 3 "memory_operand" ""))
-   (set (match_operand 1 "memory_operand" "") (match_dup 4))
-   (parallel [(set (match_operand 0 "register_operand" "") (match_dup 5))
+  [(set (match_dup 4) (match_operand 3 "memory_operand"))
+   (set (match_operand 1 "memory_operand") (match_dup 4))
+   (parallel [(set (match_operand 0 "register_operand") (match_dup 5))
              (clobber (reg:CC FLAGS_REG))])
-   (parallel [(set (match_operand 2 "register_operand" "") (match_dup 6))
+   (parallel [(set (match_operand 2 "register_operand") (match_dup 6))
              (clobber (reg:CC FLAGS_REG))])]
   ""
 {
 })
 
 (define_expand "strmov_singleop"
-  [(parallel [(set (match_operand 1 "memory_operand" "")
-                  (match_operand 3 "memory_operand" ""))
-             (set (match_operand 0 "register_operand" "")
-                  (match_operand 4 "" ""))
-             (set (match_operand 2 "register_operand" "")
-                  (match_operand 5 "" ""))])]
+  [(parallel [(set (match_operand 1 "memory_operand")
+                  (match_operand 3 "memory_operand"))
+             (set (match_operand 0 "register_operand")
+                  (match_operand 4))
+             (set (match_operand 2 "register_operand")
+                  (match_operand 5))])]
   ""
   "ix86_current_function_needs_cld = 1;")
 
 (define_insn "*strmovdi_rex_1"
-  [(set (mem:DI (match_operand:DI 2 "register_operand" "0"))
-       (mem:DI (match_operand:DI 3 "register_operand" "1")))
-   (set (match_operand:DI 0 "register_operand" "=D")
-       (plus:DI (match_dup 2)
-                (const_int 8)))
-   (set (match_operand:DI 1 "register_operand" "=S")
-       (plus:DI (match_dup 3)
-                (const_int 8)))]
-  "TARGET_64BIT"
-  "movsq"
+  [(set (mem:DI (match_operand:P 2 "register_operand" "0"))
+       (mem:DI (match_operand:P 3 "register_operand" "1")))
+   (set (match_operand:P 0 "register_operand" "=D")
+       (plus:P (match_dup 2)
+               (const_int 8)))
+   (set (match_operand:P 1 "register_operand" "=S")
+       (plus:P (match_dup 3)
+               (const_int 8)))]
+  "TARGET_64BIT
+   && !(fixed_regs[SI_REG] || fixed_regs[DI_REG])"
+  "%^movsq"
   [(set_attr "type" "str")
    (set_attr "memory" "both")
    (set_attr "mode" "DI")])
    (set (match_operand:P 1 "register_operand" "=S")
        (plus:P (match_dup 3)
                (const_int 4)))]
-  ""
-  "movs{l|d}"
+  "!(fixed_regs[SI_REG] || fixed_regs[DI_REG])"
+  "%^movs{l|d}"
   [(set_attr "type" "str")
    (set_attr "memory" "both")
    (set_attr "mode" "SI")])
    (set (match_operand:P 1 "register_operand" "=S")
        (plus:P (match_dup 3)
                (const_int 2)))]
-  ""
-  "movsw"
+  "!(fixed_regs[SI_REG] || fixed_regs[DI_REG])"
+  "%^movsw"
   [(set_attr "type" "str")
    (set_attr "memory" "both")
    (set_attr "mode" "HI")])
    (set (match_operand:P 1 "register_operand" "=S")
        (plus:P (match_dup 3)
                (const_int 1)))]
-  ""
-  "movsb"
+  "!(fixed_regs[SI_REG] || fixed_regs[DI_REG])"
+  "%^movsb"
   [(set_attr "type" "str")
    (set_attr "memory" "both")
    (set (attr "prefix_rex")
        (if_then_else
-         (ne (symbol_ref "<P:MODE>mode == DImode") (const_int 0))
+         (match_test "<P:MODE>mode == DImode")
          (const_string "0")
          (const_string "*")))
    (set_attr "mode" "QI")])
 
 (define_expand "rep_mov"
-  [(parallel [(set (match_operand 4 "register_operand" "") (const_int 0))
-             (set (match_operand 0 "register_operand" "")
-                  (match_operand 5 "" ""))
-             (set (match_operand 2 "register_operand" "")
-                  (match_operand 6 "" ""))
-             (set (match_operand 1 "memory_operand" "")
-                  (match_operand 3 "memory_operand" ""))
+  [(parallel [(set (match_operand 4 "register_operand") (const_int 0))
+             (set (match_operand 0 "register_operand")
+                  (match_operand 5))
+             (set (match_operand 2 "register_operand")
+                  (match_operand 6))
+             (set (match_operand 1 "memory_operand")
+                  (match_operand 3 "memory_operand"))
              (use (match_dup 4))])]
   ""
   "ix86_current_function_needs_cld = 1;")
 
 (define_insn "*rep_movdi_rex64"
-  [(set (match_operand:DI 2 "register_operand" "=c") (const_int 0))
-   (set (match_operand:DI 0 "register_operand" "=D")
-        (plus:DI (ashift:DI (match_operand:DI 5 "register_operand" "2")
-                           (const_int 3))
-                (match_operand:DI 3 "register_operand" "0")))
-   (set (match_operand:DI 1 "register_operand" "=S")
-        (plus:DI (ashift:DI (match_dup 5) (const_int 3))
-                (match_operand:DI 4 "register_operand" "1")))
+  [(set (match_operand:P 2 "register_operand" "=c") (const_int 0))
+   (set (match_operand:P 0 "register_operand" "=D")
+        (plus:P (ashift:P (match_operand:P 5 "register_operand" "2")
+                         (const_int 3))
+               (match_operand:P 3 "register_operand" "0")))
+   (set (match_operand:P 1 "register_operand" "=S")
+        (plus:P (ashift:P (match_dup 5) (const_int 3))
+               (match_operand:P 4 "register_operand" "1")))
    (set (mem:BLK (match_dup 3))
        (mem:BLK (match_dup 4)))
    (use (match_dup 5))]
-  "TARGET_64BIT"
-  "rep{%;} movsq"
+  "TARGET_64BIT
+   && !(fixed_regs[CX_REG] || fixed_regs[SI_REG] || fixed_regs[DI_REG])"
+  "%^rep{%;} movsq"
   [(set_attr "type" "str")
    (set_attr "prefix_rep" "1")
    (set_attr "memory" "both")
    (set (mem:BLK (match_dup 3))
        (mem:BLK (match_dup 4)))
    (use (match_dup 5))]
-  ""
-  "rep{%;} movs{l|d}"
+  "!(fixed_regs[CX_REG] || fixed_regs[SI_REG] || fixed_regs[DI_REG])"
+  "%^rep{%;} movs{l|d}"
   [(set_attr "type" "str")
    (set_attr "prefix_rep" "1")
    (set_attr "memory" "both")
    (set (mem:BLK (match_dup 3))
        (mem:BLK (match_dup 4)))
    (use (match_dup 5))]
-  ""
-  "rep{%;} movsb"
+  "!(fixed_regs[CX_REG] || fixed_regs[SI_REG] || fixed_regs[DI_REG])"
+  "%^rep{%;} movsb"
   [(set_attr "type" "str")
    (set_attr "prefix_rep" "1")
    (set_attr "memory" "both")
    (set_attr "mode" "QI")])
 
 (define_expand "setmem<mode>"
-   [(use (match_operand:BLK 0 "memory_operand" ""))
-    (use (match_operand:SWI48 1 "nonmemory_operand" ""))
-    (use (match_operand:QI 2 "nonmemory_operand" ""))
-    (use (match_operand 3 "const_int_operand" ""))
-    (use (match_operand:SI 4 "const_int_operand" ""))
-    (use (match_operand:SI 5 "const_int_operand" ""))]
+   [(use (match_operand:BLK 0 "memory_operand"))
+    (use (match_operand:SWI48 1 "nonmemory_operand"))
+    (use (match_operand:QI 2 "nonmemory_operand"))
+    (use (match_operand 3 "const_int_operand"))
+    (use (match_operand:SI 4 "const_int_operand"))
+    (use (match_operand:SI 5 "const_int_operand"))]
   ""
 {
  if (ix86_expand_setmem (operands[0], operands[1],
 ;; Handle this case here to simplify previous expander.
 
 (define_expand "strset"
-  [(set (match_operand 1 "memory_operand" "")
-       (match_operand 2 "register_operand" ""))
-   (parallel [(set (match_operand 0 "register_operand" "")
+  [(set (match_operand 1 "memory_operand")
+       (match_operand 2 "register_operand"))
+   (parallel [(set (match_operand 0 "register_operand")
                   (match_dup 3))
              (clobber (reg:CC FLAGS_REG))])]
   ""
   operands[3] = gen_rtx_PLUS (Pmode, operands[0],
                              GEN_INT (GET_MODE_SIZE (GET_MODE
                                                      (operands[2]))));
-  if (TARGET_SINGLE_STRINGOP || optimize_insn_for_size_p ())
+  /* Can't use this if the user has appropriated eax or edi.  */
+  if ((TARGET_SINGLE_STRINGOP || optimize_insn_for_size_p ())
+      && !(fixed_regs[AX_REG] || fixed_regs[DI_REG]))
     {
       emit_insn (gen_strset_singleop (operands[0], operands[1], operands[2],
                                      operands[3]));
 })
 
 (define_expand "strset_singleop"
-  [(parallel [(set (match_operand 1 "memory_operand" "")
-                  (match_operand 2 "register_operand" ""))
-             (set (match_operand 0 "register_operand" "")
-                  (match_operand 3 "" ""))])]
+  [(parallel [(set (match_operand 1 "memory_operand")
+                  (match_operand 2 "register_operand"))
+             (set (match_operand 0 "register_operand")
+                  (match_operand 3))])]
   ""
   "ix86_current_function_needs_cld = 1;")
 
 (define_insn "*strsetdi_rex_1"
-  [(set (mem:DI (match_operand:DI 1 "register_operand" "0"))
+  [(set (mem:DI (match_operand:P 1 "register_operand" "0"))
        (match_operand:DI 2 "register_operand" "a"))
-   (set (match_operand:DI 0 "register_operand" "=D")
-       (plus:DI (match_dup 1)
-                (const_int 8)))]
-  "TARGET_64BIT"
-  "stosq"
+   (set (match_operand:P 0 "register_operand" "=D")
+       (plus:P (match_dup 1)
+               (const_int 8)))]
+  "TARGET_64BIT
+   && !(fixed_regs[AX_REG] || fixed_regs[DI_REG])"
+  "%^stosq"
   [(set_attr "type" "str")
    (set_attr "memory" "store")
    (set_attr "mode" "DI")])
    (set (match_operand:P 0 "register_operand" "=D")
        (plus:P (match_dup 1)
                (const_int 4)))]
-  ""
-  "stos{l|d}"
+  "!(fixed_regs[AX_REG] || fixed_regs[DI_REG])"
+  "%^stos{l|d}"
   [(set_attr "type" "str")
    (set_attr "memory" "store")
    (set_attr "mode" "SI")])
    (set (match_operand:P 0 "register_operand" "=D")
        (plus:P (match_dup 1)
                (const_int 2)))]
-  ""
-  "stosw"
+  "!(fixed_regs[AX_REG] || fixed_regs[DI_REG])"
+  "%^stosw"
   [(set_attr "type" "str")
    (set_attr "memory" "store")
    (set_attr "mode" "HI")])
    (set (match_operand:P 0 "register_operand" "=D")
        (plus:P (match_dup 1)
                (const_int 1)))]
-  ""
-  "stosb"
+  "!(fixed_regs[AX_REG] || fixed_regs[DI_REG])"
+  "%^stosb"
   [(set_attr "type" "str")
    (set_attr "memory" "store")
    (set (attr "prefix_rex")
        (if_then_else
-         (ne (symbol_ref "<P:MODE>mode == DImode") (const_int 0))
+         (match_test "<P:MODE>mode == DImode")
          (const_string "0")
          (const_string "*")))
    (set_attr "mode" "QI")])
 
 (define_expand "rep_stos"
-  [(parallel [(set (match_operand 1 "register_operand" "") (const_int 0))
-             (set (match_operand 0 "register_operand" "")
-                  (match_operand 4 "" ""))
-             (set (match_operand 2 "memory_operand" "") (const_int 0))
-             (use (match_operand 3 "register_operand" ""))
+  [(parallel [(set (match_operand 1 "register_operand") (const_int 0))
+             (set (match_operand 0 "register_operand")
+                  (match_operand 4))
+             (set (match_operand 2 "memory_operand") (const_int 0))
+             (use (match_operand 3 "register_operand"))
              (use (match_dup 1))])]
   ""
   "ix86_current_function_needs_cld = 1;")
 
 (define_insn "*rep_stosdi_rex64"
-  [(set (match_operand:DI 1 "register_operand" "=c") (const_int 0))
-   (set (match_operand:DI 0 "register_operand" "=D")
-        (plus:DI (ashift:DI (match_operand:DI 4 "register_operand" "1")
-                           (const_int 3))
-                (match_operand:DI 3 "register_operand" "0")))
+  [(set (match_operand:P 1 "register_operand" "=c") (const_int 0))
+   (set (match_operand:P 0 "register_operand" "=D")
+        (plus:P (ashift:P (match_operand:P 4 "register_operand" "1")
+                         (const_int 3))
+                (match_operand:P 3 "register_operand" "0")))
    (set (mem:BLK (match_dup 3))
        (const_int 0))
    (use (match_operand:DI 2 "register_operand" "a"))
    (use (match_dup 4))]
-  "TARGET_64BIT"
-  "rep{%;} stosq"
+  "TARGET_64BIT
+   && !(fixed_regs[AX_REG] || fixed_regs[CX_REG] || fixed_regs[DI_REG])"
+  "%^rep{%;} stosq"
   [(set_attr "type" "str")
    (set_attr "prefix_rep" "1")
    (set_attr "memory" "store")
        (const_int 0))
    (use (match_operand:SI 2 "register_operand" "a"))
    (use (match_dup 4))]
-  ""
-  "rep{%;} stos{l|d}"
+  "!(fixed_regs[AX_REG] || fixed_regs[CX_REG] || fixed_regs[DI_REG])"
+  "%^rep{%;} stos{l|d}"
   [(set_attr "type" "str")
    (set_attr "prefix_rep" "1")
    (set_attr "memory" "store")
        (const_int 0))
    (use (match_operand:QI 2 "register_operand" "a"))
    (use (match_dup 4))]
-  ""
-  "rep{%;} stosb"
+  "!(fixed_regs[AX_REG] || fixed_regs[CX_REG] || fixed_regs[DI_REG])"
+  "%^rep{%;} stosb"
   [(set_attr "type" "str")
    (set_attr "prefix_rep" "1")
    (set_attr "memory" "store")
    (set (attr "prefix_rex")
        (if_then_else
-         (ne (symbol_ref "<P:MODE>mode == DImode") (const_int 0))
+         (match_test "<P:MODE>mode == DImode")
          (const_string "0")
          (const_string "*")))
    (set_attr "mode" "QI")])
 
 (define_expand "cmpstrnsi"
-  [(set (match_operand:SI 0 "register_operand" "")
-       (compare:SI (match_operand:BLK 1 "general_operand" "")
-                   (match_operand:BLK 2 "general_operand" "")))
-   (use (match_operand 3 "general_operand" ""))
-   (use (match_operand 4 "immediate_operand" ""))]
+  [(set (match_operand:SI 0 "register_operand")
+       (compare:SI (match_operand:BLK 1 "general_operand")
+                   (match_operand:BLK 2 "general_operand")))
+   (use (match_operand 3 "general_operand"))
+   (use (match_operand 4 "immediate_operand"))]
   ""
 {
   rtx addr1, addr2, out, outlow, count, countreg, align;
   if (optimize_insn_for_size_p () && !TARGET_INLINE_ALL_STRINGOPS)
     FAIL;
 
-  /* Can't use this if the user has appropriated esi or edi.  */
-  if (fixed_regs[SI_REG] || fixed_regs[DI_REG])
+  /* Can't use this if the user has appropriated ecx, esi or edi.  */
+  if (fixed_regs[CX_REG] || fixed_regs[SI_REG] || fixed_regs[DI_REG])
     FAIL;
 
   out = operands[0];
   if (!REG_P (out))
     out = gen_reg_rtx (SImode);
 
-  addr1 = copy_to_mode_reg (Pmode, XEXP (operands[1], 0));
-  addr2 = copy_to_mode_reg (Pmode, XEXP (operands[2], 0));
+  addr1 = copy_addr_to_reg (XEXP (operands[1], 0));
+  addr2 = copy_addr_to_reg (XEXP (operands[2], 0));
   if (addr1 != XEXP (operands[1], 0))
     operands[1] = replace_equiv_address_nv (operands[1], addr1);
   if (addr2 != XEXP (operands[2], 0))
        (gtu:QI (reg:CC FLAGS_REG) (const_int 0)))
    (set (match_dup 2)
        (ltu:QI (reg:CC FLAGS_REG) (const_int 0)))
-   (parallel [(set (match_operand:QI 0 "register_operand" "")
+   (parallel [(set (match_operand:QI 0 "register_operand")
                   (minus:QI (match_dup 1)
                             (match_dup 2)))
              (clobber (reg:CC FLAGS_REG))])]
 
 (define_expand "cmpstrnqi_nz_1"
   [(parallel [(set (reg:CC FLAGS_REG)
-                  (compare:CC (match_operand 4 "memory_operand" "")
-                              (match_operand 5 "memory_operand" "")))
-             (use (match_operand 2 "register_operand" ""))
-             (use (match_operand:SI 3 "immediate_operand" ""))
-             (clobber (match_operand 0 "register_operand" ""))
-             (clobber (match_operand 1 "register_operand" ""))
+                  (compare:CC (match_operand 4 "memory_operand")
+                              (match_operand 5 "memory_operand")))
+             (use (match_operand 2 "register_operand"))
+             (use (match_operand:SI 3 "immediate_operand"))
+             (clobber (match_operand 0 "register_operand"))
+             (clobber (match_operand 1 "register_operand"))
              (clobber (match_dup 2))])]
   ""
   "ix86_current_function_needs_cld = 1;")
    (clobber (match_operand:P 0 "register_operand" "=S"))
    (clobber (match_operand:P 1 "register_operand" "=D"))
    (clobber (match_operand:P 2 "register_operand" "=c"))]
-  ""
-  "repz{%;} cmpsb"
+  "!(fixed_regs[CX_REG] || fixed_regs[SI_REG] || fixed_regs[DI_REG])"
+  "%^repz{%;} cmpsb"
   [(set_attr "type" "str")
    (set_attr "mode" "QI")
    (set (attr "prefix_rex")
        (if_then_else
-         (ne (symbol_ref "<P:MODE>mode == DImode") (const_int 0))
+         (match_test "<P:MODE>mode == DImode")
          (const_string "0")
          (const_string "*")))
    (set_attr "prefix_rep" "1")])
 
 (define_expand "cmpstrnqi_1"
   [(parallel [(set (reg:CC FLAGS_REG)
-               (if_then_else:CC (ne (match_operand 2 "register_operand" "")
+               (if_then_else:CC (ne (match_operand 2 "register_operand")
                                     (const_int 0))
-                 (compare:CC (match_operand 4 "memory_operand" "")
-                             (match_operand 5 "memory_operand" ""))
+                 (compare:CC (match_operand 4 "memory_operand")
+                             (match_operand 5 "memory_operand"))
                  (const_int 0)))
-             (use (match_operand:SI 3 "immediate_operand" ""))
+             (use (match_operand:SI 3 "immediate_operand"))
              (use (reg:CC FLAGS_REG))
-             (clobber (match_operand 0 "register_operand" ""))
-             (clobber (match_operand 1 "register_operand" ""))
+             (clobber (match_operand 0 "register_operand"))
+             (clobber (match_operand 1 "register_operand"))
              (clobber (match_dup 2))])]
   ""
   "ix86_current_function_needs_cld = 1;")
    (clobber (match_operand:P 0 "register_operand" "=S"))
    (clobber (match_operand:P 1 "register_operand" "=D"))
    (clobber (match_operand:P 2 "register_operand" "=c"))]
-  ""
-  "repz{%;} cmpsb"
+  "!(fixed_regs[CX_REG] || fixed_regs[SI_REG] || fixed_regs[DI_REG])"
+  "%^repz{%;} cmpsb"
   [(set_attr "type" "str")
    (set_attr "mode" "QI")
    (set (attr "prefix_rex")
        (if_then_else
-         (ne (symbol_ref "<P:MODE>mode == DImode") (const_int 0))
+         (match_test "<P:MODE>mode == DImode")
          (const_string "0")
          (const_string "*")))
    (set_attr "prefix_rep" "1")])
 
 (define_expand "strlen<mode>"
-  [(set (match_operand:SWI48x 0 "register_operand" "")
-       (unspec:SWI48x [(match_operand:BLK 1 "general_operand" "")
-                       (match_operand:QI 2 "immediate_operand" "")
-                       (match_operand 3 "immediate_operand" "")]
-                      UNSPEC_SCAS))]
+  [(set (match_operand:P 0 "register_operand")
+       (unspec:P [(match_operand:BLK 1 "general_operand")
+                  (match_operand:QI 2 "immediate_operand")
+                  (match_operand 3 "immediate_operand")]
+                 UNSPEC_SCAS))]
   ""
 {
  if (ix86_expand_strlen (operands[0], operands[1], operands[2], operands[3]))
 })
 
 (define_expand "strlenqi_1"
-  [(parallel [(set (match_operand 0 "register_operand" "")
-                  (match_operand 2 "" ""))
-             (clobber (match_operand 1 "register_operand" ""))
+  [(parallel [(set (match_operand 0 "register_operand")
+                  (match_operand 2))
+             (clobber (match_operand 1 "register_operand"))
              (clobber (reg:CC FLAGS_REG))])]
   ""
   "ix86_current_function_needs_cld = 1;")
                   (match_operand:P 4 "register_operand" "0")] UNSPEC_SCAS))
    (clobber (match_operand:P 1 "register_operand" "=D"))
    (clobber (reg:CC FLAGS_REG))]
-  ""
-  "repnz{%;} scasb"
+  "!(fixed_regs[AX_REG] || fixed_regs[CX_REG] || fixed_regs[DI_REG])"
+  "%^repnz{%;} scasb"
   [(set_attr "type" "str")
    (set_attr "mode" "QI")
    (set (attr "prefix_rex")
        (if_then_else
-         (ne (symbol_ref "<P:MODE>mode == DImode") (const_int 0))
+         (match_test "<P:MODE>mode == DImode")
          (const_string "0")
          (const_string "*")))
    (set_attr "prefix_rep" "1")])
 (define_peephole2
   [(parallel[
      (set (reg:CC FLAGS_REG)
-         (compare:CC (mem:BLK (match_operand 4 "register_operand" ""))
-                     (mem:BLK (match_operand 5 "register_operand" ""))))
-     (use (match_operand 6 "register_operand" ""))
-     (use (match_operand:SI 3 "immediate_operand" ""))
-     (clobber (match_operand 0 "register_operand" ""))
-     (clobber (match_operand 1 "register_operand" ""))
-     (clobber (match_operand 2 "register_operand" ""))])
-   (set (match_operand:QI 7 "register_operand" "")
+         (compare:CC (mem:BLK (match_operand 4 "register_operand"))
+                     (mem:BLK (match_operand 5 "register_operand"))))
+     (use (match_operand 6 "register_operand"))
+     (use (match_operand:SI 3 "immediate_operand"))
+     (clobber (match_operand 0 "register_operand"))
+     (clobber (match_operand 1 "register_operand"))
+     (clobber (match_operand 2 "register_operand"))])
+   (set (match_operand:QI 7 "register_operand")
        (gtu:QI (reg:CC FLAGS_REG) (const_int 0)))
-   (set (match_operand:QI 8 "register_operand" "")
+   (set (match_operand:QI 8 "register_operand")
        (ltu:QI (reg:CC FLAGS_REG) (const_int 0)))
    (set (reg FLAGS_REG)
        (compare (match_dup 7) (match_dup 8)))
 (define_peephole2
   [(parallel[
      (set (reg:CC FLAGS_REG)
-         (if_then_else:CC (ne (match_operand 6 "register_operand" "")
+         (if_then_else:CC (ne (match_operand 6 "register_operand")
                               (const_int 0))
-           (compare:CC (mem:BLK (match_operand 4 "register_operand" ""))
-                       (mem:BLK (match_operand 5 "register_operand" "")))
+           (compare:CC (mem:BLK (match_operand 4 "register_operand"))
+                       (mem:BLK (match_operand 5 "register_operand")))
            (const_int 0)))
-     (use (match_operand:SI 3 "immediate_operand" ""))
+     (use (match_operand:SI 3 "immediate_operand"))
      (use (reg:CC FLAGS_REG))
-     (clobber (match_operand 0 "register_operand" ""))
-     (clobber (match_operand 1 "register_operand" ""))
-     (clobber (match_operand 2 "register_operand" ""))])
-   (set (match_operand:QI 7 "register_operand" "")
+     (clobber (match_operand 0 "register_operand"))
+     (clobber (match_operand 1 "register_operand"))
+     (clobber (match_operand 2 "register_operand"))])
+   (set (match_operand:QI 7 "register_operand")
        (gtu:QI (reg:CC FLAGS_REG) (const_int 0)))
-   (set (match_operand:QI 8 "register_operand" "")
+   (set (match_operand:QI 8 "register_operand")
        (ltu:QI (reg:CC FLAGS_REG) (const_int 0)))
    (set (reg FLAGS_REG)
        (compare (match_dup 7) (match_dup 8)))
 ;; Conditional move instructions.
 
 (define_expand "mov<mode>cc"
-  [(set (match_operand:SWIM 0 "register_operand" "")
-       (if_then_else:SWIM (match_operand 1 "ordered_comparison_operator" "")
-                          (match_operand:SWIM 2 "general_operand" "")
-                          (match_operand:SWIM 3 "general_operand" "")))]
+  [(set (match_operand:SWIM 0 "register_operand")
+       (if_then_else:SWIM (match_operand 1 "ordered_comparison_operator")
+                          (match_operand:SWIM 2 "<general_operand>")
+                          (match_operand:SWIM 3 "<general_operand>")))]
   ""
   "if (ix86_expand_int_movcc (operands)) DONE; else FAIL;")
 
 
 (define_expand "x86_mov<mode>cc_0_m1"
   [(parallel
-    [(set (match_operand:SWI48 0 "register_operand" "")
+    [(set (match_operand:SWI48 0 "register_operand")
          (if_then_else:SWI48
            (match_operator:SWI48 2 "ix86_carry_flag_operator"
-            [(match_operand 1 "flags_reg_operand" "")
+            [(match_operand 1 "flags_reg_operand")
              (const_int 0)])
            (const_int -1)
            (const_int 0)))
 (define_insn_and_split "*movqicc_noc"
   [(set (match_operand:QI 0 "register_operand" "=r,r")
        (if_then_else:QI (match_operator 1 "ix86_comparison_operator"
-                          [(match_operand 4 "flags_reg_operand" "")
+                          [(match_operand 4 "flags_reg_operand")
                            (const_int 0)])
                      (match_operand:QI 2 "register_operand" "r,0")
                      (match_operand:QI 3 "register_operand" "0,r")))]
    (set_attr "mode" "SI")])
 
 (define_expand "mov<mode>cc"
-  [(set (match_operand:X87MODEF 0 "register_operand" "")
+  [(set (match_operand:X87MODEF 0 "register_operand")
        (if_then_else:X87MODEF
-         (match_operand 1 "ix86_fp_comparison_operator" "")
-         (match_operand:X87MODEF 2 "register_operand" "")
-         (match_operand:X87MODEF 3 "register_operand" "")))]
+         (match_operand 1 "ix86_fp_comparison_operator")
+         (match_operand:X87MODEF 2 "register_operand")
+         (match_operand:X87MODEF 3 "register_operand")))]
   "(TARGET_80387 && TARGET_CMOVE)
    || (SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH)"
   "if (ix86_expand_fp_movcc (operands)) DONE; else FAIL;")
    (set_attr "mode" "DF,DF,DI,DI")])
 
 (define_split
-  [(set (match_operand:DF 0 "register_and_not_any_fp_reg_operand" "")
+  [(set (match_operand:DF 0 "register_and_not_any_fp_reg_operand")
        (if_then_else:DF (match_operator 1 "fcmov_comparison_operator"
-                               [(match_operand 4 "flags_reg_operand" "")
+                               [(match_operand 4 "flags_reg_operand")
                                 (const_int 0)])
-                     (match_operand:DF 2 "nonimmediate_operand" "")
-                     (match_operand:DF 3 "nonimmediate_operand" "")))]
+                     (match_operand:DF 2 "nonimmediate_operand")
+                     (match_operand:DF 3 "nonimmediate_operand")))]
   "!TARGET_64BIT && reload_completed"
   [(set (match_dup 2)
        (if_then_else:SI (match_op_dup 1 [(match_dup 4) (const_int 0)])
 ;;
 ;; Actually we only match the last two instructions for simplicity.
 (define_peephole2
-  [(set (match_operand 0 "fp_register_operand" "")
-       (match_operand 1 "fp_register_operand" ""))
+  [(set (match_operand 0 "fp_register_operand")
+       (match_operand 1 "fp_register_operand"))
    (set (match_dup 0)
        (match_operator 2 "binary_fp_operator"
           [(match_dup 0)
-           (match_operand 3 "memory_operand" "")]))]
+           (match_operand 3 "memory_operand")]))]
   "REGNO (operands[0]) != REGNO (operands[1])"
   [(set (match_dup 0) (match_dup 3))
    (set (match_dup 0) (match_dup 4))]
 
   ;; The % modifier is not operational anymore in peephole2's, so we have to
   ;; swap the operands manually in the case of addition and multiplication.
-  "if (COMMUTATIVE_ARITH_P (operands[2]))
-     operands[4] = gen_rtx_fmt_ee (GET_CODE (operands[2]),
-                                  GET_MODE (operands[2]),
-                                  operands[0], operands[1]);
-   else
-     operands[4] = gen_rtx_fmt_ee (GET_CODE (operands[2]),
-                                  GET_MODE (operands[2]),
-                                  operands[1], operands[0]);")
+{
+  rtx op0, op1;
+
+  if (COMMUTATIVE_ARITH_P (operands[2]))
+    op0 = operands[0], op1 = operands[1];
+  else
+    op0 = operands[1], op1 = operands[0];
+
+  operands[4] = gen_rtx_fmt_ee (GET_CODE (operands[2]),
+                               GET_MODE (operands[2]),
+                               op0, op1);
+})
 
 ;; Conditional addition patterns
 (define_expand "add<mode>cc"
-  [(match_operand:SWI 0 "register_operand" "")
-   (match_operand 1 "ordered_comparison_operator" "")
-   (match_operand:SWI 2 "register_operand" "")
-   (match_operand:SWI 3 "const_int_operand" "")]
+  [(match_operand:SWI 0 "register_operand")
+   (match_operand 1 "ordered_comparison_operator")
+   (match_operand:SWI 2 "register_operand")
+   (match_operand:SWI 3 "const_int_operand")]
   ""
   "if (ix86_expand_int_addcc (operands)) DONE; else FAIL;")
 \f
 
     default:
       operands[2] = SET_SRC (XVECEXP (PATTERN (insn), 0, 0));
-      return "lea{<imodesuffix>}\t{%a2, %0|%0, %a2}";
+      return "lea{<imodesuffix>}\t{%E2, %0|%0, %E2}";
     }
 }
   [(set (attr "type")
        (cond [(and (eq_attr "alternative" "0")
-                   (eq (symbol_ref "TARGET_OPT_AGU") (const_int 0)))
+                   (not (match_test "TARGET_OPT_AGU")))
                 (const_string "alu")
-              (match_operand:<MODE> 2 "const0_operand" "")
+              (match_operand:<MODE> 2 "const0_operand")
                 (const_string "imov")
              ]
              (const_string "lea")))
        (cond [(eq_attr "type" "imov")
                 (const_string "0")
               (and (eq_attr "type" "alu")
-                   (match_operand 2 "const128_operand" ""))
+                   (match_operand 2 "const128_operand"))
                 (const_string "1")
              ]
              (const_string "*")))
    (set_attr "length" "5")])
 
 (define_expand "allocate_stack"
-  [(match_operand 0 "register_operand" "")
-   (match_operand 1 "general_operand" "")]
+  [(match_operand 0 "register_operand")
+   (match_operand 1 "general_operand")]
   "ix86_target_stack_probe ()"
 {
   rtx x;
     }
   else
     {
-      x = copy_to_mode_reg (Pmode, operands[1]);
+      x = copy_addr_to_reg (operands[1]);
       if (TARGET_64BIT)
         emit_insn (gen_allocate_stack_worker_probe_di (x, x));
       else
 
 ;; Use IOR for stack probes, this is shorter.
 (define_expand "probe_stack"
-  [(match_operand 0 "memory_operand" "")]
+  [(match_operand 0 "memory_operand")]
   ""
 {
   rtx (*gen_ior3) (rtx, rtx, rtx);
   [(set_attr "type" "multi")])
 
 (define_expand "builtin_setjmp_receiver"
-  [(label_ref (match_operand 0 "" ""))]
+  [(label_ref (match_operand 0))]
   "!TARGET_64BIT && flag_pic"
 {
 #if TARGET_MACHO
 ;; Avoid redundant prefixes by splitting HImode arithmetic to SImode.
 
 (define_split
-  [(set (match_operand 0 "register_operand" "")
+  [(set (match_operand 0 "register_operand")
        (match_operator 3 "promotable_binary_operator"
-          [(match_operand 1 "register_operand" "")
-           (match_operand 2 "aligned_operand" "")]))
+          [(match_operand 1 "register_operand")
+           (match_operand 2 "aligned_operand")]))
    (clobber (reg:CC FLAGS_REG))]
   "! TARGET_PARTIAL_REG_STALL && reload_completed
    && ((GET_MODE (operands[0]) == HImode
   [(parallel [(set (match_dup 0)
                   (match_op_dup 3 [(match_dup 1) (match_dup 2)]))
              (clobber (reg:CC FLAGS_REG))])]
-  "operands[0] = gen_lowpart (SImode, operands[0]);
-   operands[1] = gen_lowpart (SImode, operands[1]);
-   if (GET_CODE (operands[3]) != ASHIFT)
-     operands[2] = gen_lowpart (SImode, operands[2]);
-   PUT_MODE (operands[3], SImode);")
+{
+  operands[0] = gen_lowpart (SImode, operands[0]);
+  operands[1] = gen_lowpart (SImode, operands[1]);
+  if (GET_CODE (operands[3]) != ASHIFT)
+    operands[2] = gen_lowpart (SImode, operands[2]);
+  PUT_MODE (operands[3], SImode);
+})
 
 ; Promote the QImode tests, as i386 has encoding of the AND
 ; instruction with 32-bit sign-extended immediate and thus the
 ; instruction size is unchanged, except in the %eax case for
 ; which it is increased by one byte, hence the ! optimize_size.
 (define_split
-  [(set (match_operand 0 "flags_reg_operand" "")
+  [(set (match_operand 0 "flags_reg_operand")
        (match_operator 2 "compare_operator"
-         [(and (match_operand 3 "aligned_operand" "")
-               (match_operand 4 "const_int_operand" ""))
+         [(and (match_operand 3 "aligned_operand")
+               (match_operand 4 "const_int_operand"))
           (const_int 0)]))
-   (set (match_operand 1 "register_operand" "")
+   (set (match_operand 1 "register_operand")
        (and (match_dup 3) (match_dup 4)))]
   "! TARGET_PARTIAL_REG_STALL && reload_completed
    && optimize_insn_for_speed_p ()
 ; the instruction size would at least double, which is not what we
 ; want even with ! optimize_size.
 (define_split
-  [(set (match_operand 0 "flags_reg_operand" "")
+  [(set (match_operand 0 "flags_reg_operand")
        (match_operator 1 "compare_operator"
-         [(and (match_operand:HI 2 "aligned_operand" "")
-               (match_operand:HI 3 "const_int_operand" ""))
+         [(and (match_operand:HI 2 "aligned_operand")
+               (match_operand:HI 3 "const_int_operand"))
           (const_int 0)]))]
   "! TARGET_PARTIAL_REG_STALL && reload_completed
    && ! TARGET_FAST_PREFIX
 })
 
 (define_split
-  [(set (match_operand 0 "register_operand" "")
-       (neg (match_operand 1 "register_operand" "")))
+  [(set (match_operand 0 "register_operand")
+       (neg (match_operand 1 "register_operand")))
    (clobber (reg:CC FLAGS_REG))]
   "! TARGET_PARTIAL_REG_STALL && reload_completed
    && (GET_MODE (operands[0]) == HImode
   [(parallel [(set (match_dup 0)
                   (neg:SI (match_dup 1)))
              (clobber (reg:CC FLAGS_REG))])]
-  "operands[0] = gen_lowpart (SImode, operands[0]);
-   operands[1] = gen_lowpart (SImode, operands[1]);")
+{
+  operands[0] = gen_lowpart (SImode, operands[0]);
+  operands[1] = gen_lowpart (SImode, operands[1]);
+})
 
 (define_split
-  [(set (match_operand 0 "register_operand" "")
-       (not (match_operand 1 "register_operand" "")))]
+  [(set (match_operand 0 "register_operand")
+       (not (match_operand 1 "register_operand")))]
   "! TARGET_PARTIAL_REG_STALL && reload_completed
    && (GET_MODE (operands[0]) == HImode
        || (GET_MODE (operands[0]) == QImode
               || optimize_insn_for_size_p ())))"
   [(set (match_dup 0)
        (not:SI (match_dup 1)))]
-  "operands[0] = gen_lowpart (SImode, operands[0]);
-   operands[1] = gen_lowpart (SImode, operands[1]);")
+{
+  operands[0] = gen_lowpart (SImode, operands[0]);
+  operands[1] = gen_lowpart (SImode, operands[1]);
+})
 
 (define_split
-  [(set (match_operand 0 "register_operand" "")
+  [(set (match_operand 0 "register_operand")
        (if_then_else (match_operator 1 "ordered_comparison_operator"
                                [(reg FLAGS_REG) (const_int 0)])
-                     (match_operand 2 "register_operand" "")
-                     (match_operand 3 "register_operand" "")))]
+                     (match_operand 2 "register_operand")
+                     (match_operand 3 "register_operand")))]
   "! TARGET_PARTIAL_REG_STALL && TARGET_CMOVE
    && (GET_MODE (operands[0]) == HImode
        || (GET_MODE (operands[0]) == QImode
               || optimize_insn_for_size_p ())))"
   [(set (match_dup 0)
        (if_then_else:SI (match_dup 1) (match_dup 2) (match_dup 3)))]
-  "operands[0] = gen_lowpart (SImode, operands[0]);
-   operands[2] = gen_lowpart (SImode, operands[2]);
-   operands[3] = gen_lowpart (SImode, operands[3]);")
+{
+  operands[0] = gen_lowpart (SImode, operands[0]);
+  operands[2] = gen_lowpart (SImode, operands[2]);
+  operands[3] = gen_lowpart (SImode, operands[3]);
+})
 \f
 ;; RTL Peephole optimizations, run before sched2.  These primarily look to
 ;; transform a complex memory operation into two memory to register operations.
 
 ;; Don't push memory operands
 (define_peephole2
-  [(set (match_operand:SWI 0 "push_operand" "")
-       (match_operand:SWI 1 "memory_operand" ""))
+  [(set (match_operand:SWI 0 "push_operand")
+       (match_operand:SWI 1 "memory_operand"))
    (match_scratch:SWI 2 "<r>")]
-  "optimize_insn_for_speed_p () && !TARGET_PUSH_MEMORY
+  "!(TARGET_PUSH_MEMORY || optimize_insn_for_size_p ())
    && !RTX_FRAME_RELATED_P (peep2_next_insn (0))"
   [(set (match_dup 2) (match_dup 1))
    (set (match_dup 0) (match_dup 2))])
 ;; We need to handle SFmode only, because DFmode and XFmode are split to
 ;; SImode pushes.
 (define_peephole2
-  [(set (match_operand:SF 0 "push_operand" "")
-       (match_operand:SF 1 "memory_operand" ""))
+  [(set (match_operand:SF 0 "push_operand")
+       (match_operand:SF 1 "memory_operand"))
    (match_scratch:SF 2 "r")]
-  "optimize_insn_for_speed_p () && !TARGET_PUSH_MEMORY
+  "!(TARGET_PUSH_MEMORY || optimize_insn_for_size_p ())
    && !RTX_FRAME_RELATED_P (peep2_next_insn (0))"
   [(set (match_dup 2) (match_dup 1))
    (set (match_dup 0) (match_dup 2))])
 ;; gets too big.
 (define_peephole2
   [(match_scratch:SWI124 1 "<r>")
-   (set (match_operand:SWI124 0 "memory_operand" "")
+   (set (match_operand:SWI124 0 "memory_operand")
         (const_int 0))]
   "optimize_insn_for_speed_p ()
    && !TARGET_USE_MOV0
 
 (define_peephole2
   [(match_scratch:SWI124 2 "<r>")
-   (set (match_operand:SWI124 0 "memory_operand" "")
-        (match_operand:SWI124 1 "immediate_operand" ""))]
+   (set (match_operand:SWI124 0 "memory_operand")
+        (match_operand:SWI124 1 "immediate_operand"))]
   "optimize_insn_for_speed_p ()
    && TARGET_SPLIT_LONG_MOVES
    && get_attr_length (insn) >= ix86_cur_cost ()->large_insn"
 
 ;; Don't compare memory with zero, load and use a test instead.
 (define_peephole2
-  [(set (match_operand 0 "flags_reg_operand" "")
+  [(set (match_operand 0 "flags_reg_operand")
        (match_operator 1 "compare_operator"
-         [(match_operand:SI 2 "memory_operand" "")
+         [(match_operand:SI 2 "memory_operand")
           (const_int 0)]))
    (match_scratch:SI 3 "r")]
   "optimize_insn_for_speed_p () && ix86_match_ccmode (insn, CCNOmode)"
 ;; lifetime information then.
 
 (define_peephole2
-  [(set (match_operand:SWI124 0 "nonimmediate_operand" "")
-       (not:SWI124 (match_operand:SWI124 1 "nonimmediate_operand" "")))]
+  [(set (match_operand:SWI124 0 "nonimmediate_operand")
+       (not:SWI124 (match_operand:SWI124 1 "nonimmediate_operand")))]
   "optimize_insn_for_speed_p ()
    && ((TARGET_NOT_UNPAIRABLE
        && (!MEM_P (operands[0])
 ;; versions if we're concerned about partial register stalls.
 
 (define_peephole2
-  [(set (match_operand 0 "flags_reg_operand" "")
+  [(set (match_operand 0 "flags_reg_operand")
        (match_operator 1 "compare_operator"
-         [(and:SI (match_operand:SI 2 "register_operand" "")
-                  (match_operand:SI 3 "immediate_operand" ""))
+         [(and:SI (match_operand:SI 2 "register_operand")
+                  (match_operand:SI 3 "immediate_operand"))
           (const_int 0)]))]
   "ix86_match_ccmode (insn, CCNOmode)
    && (true_regnum (operands[2]) != AX_REG
 ;; on ! TARGET_PARTIAL_REG_STALL
 
 (define_peephole2
-  [(set (match_operand 0 "flags_reg_operand" "")
+  [(set (match_operand 0 "flags_reg_operand")
        (match_operator 1 "compare_operator"
-         [(and:QI (match_operand:QI 2 "register_operand" "")
-                  (match_operand:QI 3 "immediate_operand" ""))
+         [(and:QI (match_operand:QI 2 "register_operand")
+                  (match_operand:QI 3 "immediate_operand"))
           (const_int 0)]))]
   "! TARGET_PARTIAL_REG_STALL
    && ix86_match_ccmode (insn, CCNOmode)
           (and:QI (match_dup 2) (match_dup 3)))])])
 
 (define_peephole2
-  [(set (match_operand 0 "flags_reg_operand" "")
+  [(set (match_operand 0 "flags_reg_operand")
        (match_operator 1 "compare_operator"
          [(and:SI
             (zero_extract:SI
-              (match_operand 2 "ext_register_operand" "")
+              (match_operand 2 "ext_register_operand")
               (const_int 8)
               (const_int 8))
-            (match_operand 3 "const_int_operand" ""))
+            (match_operand 3 "const_int_operand"))
           (const_int 0)]))]
   "! TARGET_PARTIAL_REG_STALL
    && ix86_match_ccmode (insn, CCNOmode)
 ;; Don't do logical operations with memory inputs.
 (define_peephole2
   [(match_scratch:SI 2 "r")
-   (parallel [(set (match_operand:SI 0 "register_operand" "")
+   (parallel [(set (match_operand:SI 0 "register_operand")
                    (match_operator:SI 3 "arith_or_logical_operator"
                      [(match_dup 0)
-                      (match_operand:SI 1 "memory_operand" "")]))
+                      (match_operand:SI 1 "memory_operand")]))
               (clobber (reg:CC FLAGS_REG))])]
-  "optimize_insn_for_speed_p () && ! TARGET_READ_MODIFY"
+  "!(TARGET_READ_MODIFY || optimize_insn_for_size_p ())"
   [(set (match_dup 2) (match_dup 1))
    (parallel [(set (match_dup 0)
                    (match_op_dup 3 [(match_dup 0) (match_dup 2)]))
 
 (define_peephole2
   [(match_scratch:SI 2 "r")
-   (parallel [(set (match_operand:SI 0 "register_operand" "")
+   (parallel [(set (match_operand:SI 0 "register_operand")
                    (match_operator:SI 3 "arith_or_logical_operator"
-                     [(match_operand:SI 1 "memory_operand" "")
+                     [(match_operand:SI 1 "memory_operand")
                       (match_dup 0)]))
               (clobber (reg:CC FLAGS_REG))])]
-  "optimize_insn_for_speed_p () && ! TARGET_READ_MODIFY"
+  "!(TARGET_READ_MODIFY || optimize_insn_for_size_p ())"
   [(set (match_dup 2) (match_dup 1))
    (parallel [(set (match_dup 0)
                    (match_op_dup 3 [(match_dup 2) (match_dup 0)]))
 ;; refers to the destination of the load!
 
 (define_peephole2
-  [(set (match_operand:SI 0 "register_operand" "")
-        (match_operand:SI 1 "register_operand" ""))
+  [(set (match_operand:SI 0 "register_operand")
+        (match_operand:SI 1 "register_operand"))
    (parallel [(set (match_dup 0)
                    (match_operator:SI 3 "commutative_operator"
                      [(match_dup 0)
-                      (match_operand:SI 2 "memory_operand" "")]))
+                      (match_operand:SI 2 "memory_operand")]))
               (clobber (reg:CC FLAGS_REG))])]
   "REGNO (operands[0]) != REGNO (operands[1])
    && GENERAL_REGNO_P (REGNO (operands[0]))
   "operands[4] = replace_rtx (operands[2], operands[0], operands[1]);")
 
 (define_peephole2
-  [(set (match_operand 0 "register_operand" "")
-        (match_operand 1 "register_operand" ""))
+  [(set (match_operand 0 "register_operand")
+        (match_operand 1 "register_operand"))
    (set (match_dup 0)
                    (match_operator 3 "commutative_operator"
                      [(match_dup 0)
-                      (match_operand 2 "memory_operand" "")]))]
+                      (match_operand 2 "memory_operand")]))]
   "REGNO (operands[0]) != REGNO (operands[1])
    && ((MMX_REG_P (operands[0]) && MMX_REG_P (operands[1])) 
        || (SSE_REG_P (operands[0]) && SSE_REG_P (operands[1])))"
 
 (define_peephole2
   [(match_scratch:SI 2 "r")
-   (parallel [(set (match_operand:SI 0 "memory_operand" "")
+   (parallel [(set (match_operand:SI 0 "memory_operand")
                    (match_operator:SI 3 "arith_or_logical_operator"
                      [(match_dup 0)
-                      (match_operand:SI 1 "nonmemory_operand" "")]))
+                      (match_operand:SI 1 "nonmemory_operand")]))
               (clobber (reg:CC FLAGS_REG))])]
-  "optimize_insn_for_speed_p () && ! TARGET_READ_MODIFY_WRITE
+  "!(TARGET_READ_MODIFY_WRITE || optimize_insn_for_size_p ())
    /* Do not split stack checking probes.  */
    && GET_CODE (operands[3]) != IOR && operands[1] != const0_rtx"
   [(set (match_dup 2) (match_dup 0))
 
 (define_peephole2
   [(match_scratch:SI 2 "r")
-   (parallel [(set (match_operand:SI 0 "memory_operand" "")
+   (parallel [(set (match_operand:SI 0 "memory_operand")
                    (match_operator:SI 3 "arith_or_logical_operator"
-                     [(match_operand:SI 1 "nonmemory_operand" "")
+                     [(match_operand:SI 1 "nonmemory_operand")
                       (match_dup 0)]))
               (clobber (reg:CC FLAGS_REG))])]
-  "optimize_insn_for_speed_p () && ! TARGET_READ_MODIFY_WRITE
+  "!(TARGET_READ_MODIFY_WRITE || optimize_insn_for_size_p ())
    /* Do not split stack checking probes.  */
    && GET_CODE (operands[3]) != IOR && operands[1] != const0_rtx"
   [(set (match_dup 2) (match_dup 0))
               (clobber (reg:CC FLAGS_REG))])
    (set (match_dup 0) (match_dup 2))])
 
+;; Attempt to use arith or logical operations with memory outputs with
+;; setting of flags.
+(define_peephole2
+  [(set (match_operand:SWI 0 "register_operand")
+       (match_operand:SWI 1 "memory_operand"))
+   (parallel [(set (match_dup 0)
+                  (match_operator:SWI 3 "plusminuslogic_operator"
+                    [(match_dup 0)
+                     (match_operand:SWI 2 "<nonmemory_operand>")]))
+             (clobber (reg:CC FLAGS_REG))])
+   (set (match_dup 1) (match_dup 0))
+   (set (reg FLAGS_REG) (compare (match_dup 0) (const_int 0)))]
+  "(TARGET_READ_MODIFY_WRITE || optimize_insn_for_size_p ())
+   && peep2_reg_dead_p (4, operands[0])
+   && !reg_overlap_mentioned_p (operands[0], operands[1])
+   && ix86_match_ccmode (peep2_next_insn (3),
+                        (GET_CODE (operands[3]) == PLUS
+                         || GET_CODE (operands[3]) == MINUS)
+                        ? CCGOCmode : CCNOmode)"
+  [(parallel [(set (match_dup 4) (match_dup 5))
+             (set (match_dup 1) (match_op_dup 3 [(match_dup 1)
+                                                 (match_dup 2)]))])]
+{
+  operands[4] = SET_DEST (PATTERN (peep2_next_insn (3)));
+  operands[5] = gen_rtx_fmt_ee (GET_CODE (operands[3]), <MODE>mode,
+                               copy_rtx (operands[1]),
+                               copy_rtx (operands[2]));
+  operands[5] = gen_rtx_COMPARE (GET_MODE (operands[4]),
+                                operands[5], const0_rtx);
+})
+
+(define_peephole2
+  [(parallel [(set (match_operand:SWI 0 "register_operand")
+                  (match_operator:SWI 2 "plusminuslogic_operator"
+                    [(match_dup 0)
+                     (match_operand:SWI 1 "memory_operand")]))
+             (clobber (reg:CC FLAGS_REG))])
+   (set (match_dup 1) (match_dup 0))
+   (set (reg FLAGS_REG) (compare (match_dup 0) (const_int 0)))]
+  "(TARGET_READ_MODIFY_WRITE || optimize_insn_for_size_p ())
+   && GET_CODE (operands[2]) != MINUS
+   && peep2_reg_dead_p (3, operands[0])
+   && !reg_overlap_mentioned_p (operands[0], operands[1])
+   && ix86_match_ccmode (peep2_next_insn (2),
+                        GET_CODE (operands[2]) == PLUS
+                        ? CCGOCmode : CCNOmode)"
+  [(parallel [(set (match_dup 3) (match_dup 4))
+             (set (match_dup 1) (match_op_dup 2 [(match_dup 1)
+                                                 (match_dup 0)]))])]
+{
+  operands[3] = SET_DEST (PATTERN (peep2_next_insn (2)));
+  operands[4] = gen_rtx_fmt_ee (GET_CODE (operands[2]), <MODE>mode,
+                               copy_rtx (operands[1]),
+                               copy_rtx (operands[0]));
+  operands[4] = gen_rtx_COMPARE (GET_MODE (operands[3]),
+                                operands[4], const0_rtx);
+})
+
+(define_peephole2
+  [(set (match_operand:SWI12 0 "register_operand")
+       (match_operand:SWI12 1 "memory_operand"))
+   (parallel [(set (match_operand:SI 4 "register_operand")
+                  (match_operator:SI 3 "plusminuslogic_operator"
+                    [(match_dup 4)
+                     (match_operand:SI 2 "nonmemory_operand")]))
+             (clobber (reg:CC FLAGS_REG))])
+   (set (match_dup 1) (match_dup 0))
+   (set (reg FLAGS_REG) (compare (match_dup 0) (const_int 0)))]
+  "(TARGET_READ_MODIFY_WRITE || optimize_insn_for_size_p ())
+   && REG_P (operands[0]) && REG_P (operands[4])
+   && REGNO (operands[0]) == REGNO (operands[4])
+   && peep2_reg_dead_p (4, operands[0])
+   && (<MODE>mode != QImode
+       || immediate_operand (operands[2], SImode)
+       || q_regs_operand (operands[2], SImode))
+   && !reg_overlap_mentioned_p (operands[0], operands[1])
+   && ix86_match_ccmode (peep2_next_insn (3),
+                        (GET_CODE (operands[3]) == PLUS
+                         || GET_CODE (operands[3]) == MINUS)
+                        ? CCGOCmode : CCNOmode)"
+  [(parallel [(set (match_dup 4) (match_dup 5))
+             (set (match_dup 1) (match_dup 6))])]
+{
+  operands[2] = gen_lowpart (<MODE>mode, operands[2]);
+  operands[4] = SET_DEST (PATTERN (peep2_next_insn (3)));
+  operands[5] = gen_rtx_fmt_ee (GET_CODE (operands[3]), <MODE>mode,
+                               copy_rtx (operands[1]), operands[2]);
+  operands[5] = gen_rtx_COMPARE (GET_MODE (operands[4]),
+                                operands[5], const0_rtx);
+  operands[6] = gen_rtx_fmt_ee (GET_CODE (operands[3]), <MODE>mode,
+                               copy_rtx (operands[1]),
+                               copy_rtx (operands[2]));
+})
+
 ;; Attempt to always use XOR for zeroing registers.
 (define_peephole2
-  [(set (match_operand 0 "register_operand" "")
-       (match_operand 1 "const0_operand" ""))]
+  [(set (match_operand 0 "register_operand")
+       (match_operand 1 "const0_operand"))]
   "GET_MODE_SIZE (GET_MODE (operands[0])) <= UNITS_PER_WORD
    && (! TARGET_USE_MOV0 || optimize_insn_for_size_p ())
    && GENERAL_REG_P (operands[0])
   "operands[0] = gen_lowpart (word_mode, operands[0]);")
 
 (define_peephole2
-  [(set (strict_low_part (match_operand 0 "register_operand" ""))
+  [(set (strict_low_part (match_operand 0 "register_operand"))
        (const_int 0))]
   "(GET_MODE (operands[0]) == QImode
     || GET_MODE (operands[0]) == HImode)
 
 ;; For HI, SI and DI modes, or $-1,reg is smaller than mov $-1,reg.
 (define_peephole2
-  [(set (match_operand:SWI248 0 "register_operand" "")
+  [(set (match_operand:SWI248 0 "register_operand")
        (const_int -1))]
   "(optimize_insn_for_size_p () || TARGET_MOVE_M1_VIA_OR)
    && peep2_regno_dead_p (0, FLAGS_REG)"
 ;; These can be created by move expanders.
 
 (define_peephole2
-  [(set (match_operand:SWI48 0 "register_operand" "")
+  [(set (match_operand:SWI48 0 "register_operand")
        (plus:SWI48 (match_dup 0)
-                   (match_operand:SWI48 1 "<nonmemory_operand>" "")))]
+                   (match_operand:SWI48 1 "<nonmemory_operand>")))]
   "peep2_regno_dead_p (0, FLAGS_REG)"
   [(parallel [(set (match_dup 0) (plus:SWI48 (match_dup 0) (match_dup 1)))
              (clobber (reg:CC FLAGS_REG))])])
 
 (define_peephole2
-  [(set (match_operand:SI 0 "register_operand" "")
-       (subreg:SI (plus:DI (match_operand:DI 1 "register_operand" "")
-                           (match_operand:DI 2 "nonmemory_operand" "")) 0))]
+  [(set (match_operand:SI 0 "register_operand")
+       (subreg:SI (plus:DI (match_operand:DI 1 "register_operand")
+                           (match_operand:DI 2 "nonmemory_operand")) 0))]
   "TARGET_64BIT
    && peep2_regno_dead_p (0, FLAGS_REG)
    && REGNO (operands[0]) == REGNO (operands[1])"
   "operands[2] = gen_lowpart (SImode, operands[2]);")
 
 (define_peephole2
-  [(set (match_operand:SWI48 0 "register_operand" "")
+  [(set (match_operand:SWI48 0 "register_operand")
        (mult:SWI48 (match_dup 0)
-                   (match_operand:SWI48 1 "const_int_operand" "")))]
+                   (match_operand:SWI48 1 "const_int_operand")))]
   "exact_log2 (INTVAL (operands[1])) >= 0
    && peep2_regno_dead_p (0, FLAGS_REG)"
   [(parallel [(set (match_dup 0) (ashift:SWI48 (match_dup 0) (match_dup 2)))
   "operands[2] = GEN_INT (exact_log2 (INTVAL (operands[1])));")
 
 (define_peephole2
-  [(set (match_operand:SI 0 "register_operand" "")
-       (subreg:SI (mult:DI (match_operand:DI 1 "register_operand" "")
-                  (match_operand:DI 2 "const_int_operand" "")) 0))]
+  [(set (match_operand:SI 0 "register_operand")
+       (subreg:SI (mult:DI (match_operand:DI 1 "register_operand")
+                  (match_operand:DI 2 "const_int_operand")) 0))]
   "TARGET_64BIT
    && exact_log2 (INTVAL (operands[2])) >= 0
    && REGNO (operands[0]) == REGNO (operands[1])
 ;; alternative when no register is available later.
 
 (define_peephole2
-  [(match_scratch:P 1 "r")
+  [(match_scratch:W 1 "r")
    (parallel [(set (reg:P SP_REG)
                   (plus:P (reg:P SP_REG)
-                          (match_operand:P 0 "const_int_operand" "")))
+                          (match_operand:P 0 "const_int_operand")))
              (clobber (reg:CC FLAGS_REG))
              (clobber (mem:BLK (scratch)))])]
   "(TARGET_SINGLE_PUSH || optimize_insn_for_size_p ())
-   && INTVAL (operands[0]) == -GET_MODE_SIZE (Pmode)"
+   && INTVAL (operands[0]) == -GET_MODE_SIZE (word_mode)"
   [(clobber (match_dup 1))
-   (parallel [(set (mem:P (pre_dec:P (reg:P SP_REG))) (match_dup 1))
+   (parallel [(set (mem:W (pre_dec:P (reg:P SP_REG))) (match_dup 1))
              (clobber (mem:BLK (scratch)))])])
 
 (define_peephole2
-  [(match_scratch:P 1 "r")
+  [(match_scratch:W 1 "r")
    (parallel [(set (reg:P SP_REG)
                   (plus:P (reg:P SP_REG)
-                          (match_operand:P 0 "const_int_operand" "")))
+                          (match_operand:P 0 "const_int_operand")))
              (clobber (reg:CC FLAGS_REG))
              (clobber (mem:BLK (scratch)))])]
   "(TARGET_DOUBLE_PUSH || optimize_insn_for_size_p ())
-   && INTVAL (operands[0]) == -2*GET_MODE_SIZE (Pmode)"
+   && INTVAL (operands[0]) == -2*GET_MODE_SIZE (word_mode)"
   [(clobber (match_dup 1))
-   (set (mem:P (pre_dec:P (reg:P SP_REG))) (match_dup 1))
-   (parallel [(set (mem:P (pre_dec:P (reg:P SP_REG))) (match_dup 1))
+   (set (mem:W (pre_dec:P (reg:P SP_REG))) (match_dup 1))
+   (parallel [(set (mem:W (pre_dec:P (reg:P SP_REG))) (match_dup 1))
              (clobber (mem:BLK (scratch)))])])
 
 ;; Convert esp subtractions to push.
 (define_peephole2
-  [(match_scratch:P 1 "r")
+  [(match_scratch:W 1 "r")
    (parallel [(set (reg:P SP_REG)
                   (plus:P (reg:P SP_REG)
-                          (match_operand:P 0 "const_int_operand" "")))
+                          (match_operand:P 0 "const_int_operand")))
              (clobber (reg:CC FLAGS_REG))])]
   "(TARGET_SINGLE_PUSH || optimize_insn_for_size_p ())
-   && INTVAL (operands[0]) == -GET_MODE_SIZE (Pmode)"
+   && INTVAL (operands[0]) == -GET_MODE_SIZE (word_mode)"
   [(clobber (match_dup 1))
-   (set (mem:P (pre_dec:P (reg:P SP_REG))) (match_dup 1))])
+   (set (mem:W (pre_dec:P (reg:P SP_REG))) (match_dup 1))])
 
 (define_peephole2
-  [(match_scratch:P 1 "r")
+  [(match_scratch:W 1 "r")
    (parallel [(set (reg:P SP_REG)
                   (plus:P (reg:P SP_REG)
-                          (match_operand:P 0 "const_int_operand" "")))
+                          (match_operand:P 0 "const_int_operand")))
              (clobber (reg:CC FLAGS_REG))])]
   "(TARGET_DOUBLE_PUSH || optimize_insn_for_size_p ())
-   && INTVAL (operands[0]) == -2*GET_MODE_SIZE (Pmode)"
+   && INTVAL (operands[0]) == -2*GET_MODE_SIZE (word_mode)"
   [(clobber (match_dup 1))
-   (set (mem:P (pre_dec:P (reg:P SP_REG))) (match_dup 1))
-   (set (mem:P (pre_dec:P (reg:P SP_REG))) (match_dup 1))])
+   (set (mem:W (pre_dec:P (reg:P SP_REG))) (match_dup 1))
+   (set (mem:W (pre_dec:P (reg:P SP_REG))) (match_dup 1))])
 
 ;; Convert epilogue deallocator to pop.
 (define_peephole2
-  [(match_scratch:P 1 "r")
+  [(match_scratch:W 1 "r")
    (parallel [(set (reg:P SP_REG)
                   (plus:P (reg:P SP_REG)
-                          (match_operand:P 0 "const_int_operand" "")))
+                          (match_operand:P 0 "const_int_operand")))
              (clobber (reg:CC FLAGS_REG))
              (clobber (mem:BLK (scratch)))])]
   "(TARGET_SINGLE_POP || optimize_insn_for_size_p ())
-   && INTVAL (operands[0]) == GET_MODE_SIZE (Pmode)"
-  [(parallel [(set (match_dup 1) (mem:P (post_inc:P (reg:P SP_REG))))
+   && INTVAL (operands[0]) == GET_MODE_SIZE (word_mode)"
+  [(parallel [(set (match_dup 1) (mem:W (post_inc:P (reg:P SP_REG))))
              (clobber (mem:BLK (scratch)))])])
 
 ;; Two pops case is tricky, since pop causes dependency
 ;; on destination register.  We use two registers if available.
 (define_peephole2
-  [(match_scratch:P 1 "r")
-   (match_scratch:P 2 "r")
+  [(match_scratch:W 1 "r")
+   (match_scratch:W 2 "r")
    (parallel [(set (reg:P SP_REG)
                   (plus:P (reg:P SP_REG)
-                          (match_operand:P 0 "const_int_operand" "")))
+                          (match_operand:P 0 "const_int_operand")))
              (clobber (reg:CC FLAGS_REG))
              (clobber (mem:BLK (scratch)))])]
   "(TARGET_DOUBLE_POP || optimize_insn_for_size_p ())
-   && INTVAL (operands[0]) == 2*GET_MODE_SIZE (Pmode)"
-  [(parallel [(set (match_dup 1) (mem:P (post_inc:P (reg:P SP_REG))))
+   && INTVAL (operands[0]) == 2*GET_MODE_SIZE (word_mode)"
+  [(parallel [(set (match_dup 1) (mem:W (post_inc:P (reg:P SP_REG))))
              (clobber (mem:BLK (scratch)))])
-   (set (match_dup 2) (mem:P (post_inc:P (reg:P SP_REG))))])
+   (set (match_dup 2) (mem:W (post_inc:P (reg:P SP_REG))))])
 
 (define_peephole2
-  [(match_scratch:P 1 "r")
+  [(match_scratch:W 1 "r")
    (parallel [(set (reg:P SP_REG)
                   (plus:P (reg:P SP_REG)
-                          (match_operand:P 0 "const_int_operand" "")))
+                          (match_operand:P 0 "const_int_operand")))
              (clobber (reg:CC FLAGS_REG))
              (clobber (mem:BLK (scratch)))])]
   "optimize_insn_for_size_p ()
-   && INTVAL (operands[0]) == 2*GET_MODE_SIZE (Pmode)"
-  [(parallel [(set (match_dup 1) (mem:P (post_inc:P (reg:P SP_REG))))
+   && INTVAL (operands[0]) == 2*GET_MODE_SIZE (word_mode)"
+  [(parallel [(set (match_dup 1) (mem:W (post_inc:P (reg:P SP_REG))))
              (clobber (mem:BLK (scratch)))])
-   (set (match_dup 1) (mem:P (post_inc:P (reg:P SP_REG))))])
+   (set (match_dup 1) (mem:W (post_inc:P (reg:P SP_REG))))])
 
 ;; Convert esp additions to pop.
 (define_peephole2
-  [(match_scratch:P 1 "r")
+  [(match_scratch:W 1 "r")
    (parallel [(set (reg:P SP_REG)
                   (plus:P (reg:P SP_REG)
-                          (match_operand:P 0 "const_int_operand" "")))
+                          (match_operand:P 0 "const_int_operand")))
              (clobber (reg:CC FLAGS_REG))])]
-  "INTVAL (operands[0]) == GET_MODE_SIZE (Pmode)"
-  [(set (match_dup 1) (mem:P (post_inc:P (reg:P SP_REG))))])
+  "INTVAL (operands[0]) == GET_MODE_SIZE (word_mode)"
+  [(set (match_dup 1) (mem:W (post_inc:P (reg:P SP_REG))))])
 
 ;; Two pops case is tricky, since pop causes dependency
 ;; on destination register.  We use two registers if available.
 (define_peephole2
-  [(match_scratch:P 1 "r")
-   (match_scratch:P 2 "r")
+  [(match_scratch:W 1 "r")
+   (match_scratch:W 2 "r")
    (parallel [(set (reg:P SP_REG)
                   (plus:P (reg:P SP_REG)
-                          (match_operand:P 0 "const_int_operand" "")))
+                          (match_operand:P 0 "const_int_operand")))
              (clobber (reg:CC FLAGS_REG))])]
-  "INTVAL (operands[0]) == 2*GET_MODE_SIZE (Pmode)"
-  [(set (match_dup 1) (mem:P (post_inc:P (reg:P SP_REG))))
-   (set (match_dup 2) (mem:P (post_inc:P (reg:P SP_REG))))])
+  "INTVAL (operands[0]) == 2*GET_MODE_SIZE (word_mode)"
+  [(set (match_dup 1) (mem:W (post_inc:P (reg:P SP_REG))))
+   (set (match_dup 2) (mem:W (post_inc:P (reg:P SP_REG))))])
 
 (define_peephole2
-  [(match_scratch:P 1 "r")
+  [(match_scratch:W 1 "r")
    (parallel [(set (reg:P SP_REG)
                   (plus:P (reg:P SP_REG)
-                          (match_operand:P 0 "const_int_operand" "")))
+                          (match_operand:P 0 "const_int_operand")))
              (clobber (reg:CC FLAGS_REG))])]
   "optimize_insn_for_size_p ()
-   && INTVAL (operands[0]) == 2*GET_MODE_SIZE (Pmode)"
-  [(set (match_dup 1) (mem:P (post_inc:P (reg:P SP_REG))))
-   (set (match_dup 1) (mem:P (post_inc:P (reg:P SP_REG))))])
+   && INTVAL (operands[0]) == 2*GET_MODE_SIZE (word_mode)"
+  [(set (match_dup 1) (mem:W (post_inc:P (reg:P SP_REG))))
+   (set (match_dup 1) (mem:W (post_inc:P (reg:P SP_REG))))])
 \f
 ;; Convert compares with 1 to shorter inc/dec operations when CF is not
 ;; required and register dies.  Similarly for 128 to -128.
 (define_peephole2
-  [(set (match_operand 0 "flags_reg_operand" "")
+  [(set (match_operand 0 "flags_reg_operand")
        (match_operator 1 "compare_operator"
-         [(match_operand 2 "register_operand" "")
-          (match_operand 3 "const_int_operand" "")]))]
+         [(match_operand 2 "register_operand")
+          (match_operand 3 "const_int_operand")]))]
   "(((!TARGET_FUSE_CMP_AND_BRANCH || optimize_insn_for_size_p ())
      && incdec_operand (operands[3], GET_MODE (operands[3])))
     || (!TARGET_FUSE_CMP_AND_BRANCH
 ;; Convert imul by three, five and nine into lea
 (define_peephole2
   [(parallel
-    [(set (match_operand:SWI48 0 "register_operand" "")
-         (mult:SWI48 (match_operand:SWI48 1 "register_operand" "")
-                     (match_operand:SWI48 2 "const_int_operand" "")))
+    [(set (match_operand:SWI48 0 "register_operand")
+         (mult:SWI48 (match_operand:SWI48 1 "register_operand")
+                     (match_operand:SWI48 2 "const359_operand")))
      (clobber (reg:CC FLAGS_REG))])]
-  "INTVAL (operands[2]) == 3
-   || INTVAL (operands[2]) == 5
-   || INTVAL (operands[2]) == 9"
+  "!TARGET_PARTIAL_REG_STALL
+   || <MODE>mode == SImode
+   || optimize_function_for_size_p (cfun)"
   [(set (match_dup 0)
        (plus:SWI48 (mult:SWI48 (match_dup 1) (match_dup 2))
                    (match_dup 1)))]
 
 (define_peephole2
   [(parallel
-    [(set (match_operand:SWI48 0 "register_operand" "")
-         (mult:SWI48 (match_operand:SWI48 1 "nonimmediate_operand" "")
-                     (match_operand:SWI48 2 "const_int_operand" "")))
+    [(set (match_operand:SWI48 0 "register_operand")
+         (mult:SWI48 (match_operand:SWI48 1 "nonimmediate_operand")
+                     (match_operand:SWI48 2 "const359_operand")))
      (clobber (reg:CC FLAGS_REG))])]
   "optimize_insn_for_speed_p ()
-   && (INTVAL (operands[2]) == 3
-       || INTVAL (operands[2]) == 5
-       || INTVAL (operands[2]) == 9)"
+   && (!TARGET_PARTIAL_REG_STALL || <MODE>mode == SImode)"
   [(set (match_dup 0) (match_dup 1))
    (set (match_dup 0)
        (plus:SWI48 (mult:SWI48 (match_dup 0) (match_dup 2))
 ;; imul $32bit_imm, reg, reg is direct decoded.
 (define_peephole2
   [(match_scratch:SWI48 3 "r")
-   (parallel [(set (match_operand:SWI48 0 "register_operand" "")
-                  (mult:SWI48 (match_operand:SWI48 1 "memory_operand" "")
-                              (match_operand:SWI48 2 "immediate_operand" "")))
+   (parallel [(set (match_operand:SWI48 0 "register_operand")
+                  (mult:SWI48 (match_operand:SWI48 1 "memory_operand")
+                              (match_operand:SWI48 2 "immediate_operand")))
              (clobber (reg:CC FLAGS_REG))])]
   "TARGET_SLOW_IMUL_IMM32_MEM && optimize_insn_for_speed_p ()
    && !satisfies_constraint_K (operands[2])"
 
 (define_peephole2
   [(match_scratch:SI 3 "r")
-   (parallel [(set (match_operand:DI 0 "register_operand" "")
+   (parallel [(set (match_operand:DI 0 "register_operand")
                   (zero_extend:DI
-                    (mult:SI (match_operand:SI 1 "memory_operand" "")
-                             (match_operand:SI 2 "immediate_operand" ""))))
+                    (mult:SI (match_operand:SI 1 "memory_operand")
+                             (match_operand:SI 2 "immediate_operand"))))
              (clobber (reg:CC FLAGS_REG))])]
   "TARGET_64BIT
    && TARGET_SLOW_IMUL_IMM32_MEM && optimize_insn_for_speed_p ()
 ;; It would be better to force assembler to encode instruction using long
 ;; immediate, but there is apparently no way to do so.
 (define_peephole2
-  [(parallel [(set (match_operand:SWI248 0 "register_operand" "")
+  [(parallel [(set (match_operand:SWI248 0 "register_operand")
                   (mult:SWI248
-                   (match_operand:SWI248 1 "nonimmediate_operand" "")
-                   (match_operand:SWI248 2 "const_int_operand" "")))
+                   (match_operand:SWI248 1 "nonimmediate_operand")
+                   (match_operand:SWI248 2 "const_int_operand")))
              (clobber (reg:CC FLAGS_REG))])
    (match_scratch:SWI248 3 "r")]
   "TARGET_SLOW_IMUL_IMM8 && optimize_insn_for_speed_p ()
 ;;  leal    (%edx,%eax,4), %eax
 
 (define_peephole2
-  [(match_scratch:P 5 "r")
-   (parallel [(set (match_operand 0 "register_operand" "")
-                  (ashift (match_operand 1 "register_operand" "")
-                          (match_operand 2 "const_int_operand" "")))
+  [(match_scratch:W 5 "r")
+   (parallel [(set (match_operand 0 "register_operand")
+                  (ashift (match_operand 1 "register_operand")
+                          (match_operand 2 "const_int_operand")))
               (clobber (reg:CC FLAGS_REG))])
-   (parallel [(set (match_operand 3 "register_operand" "")
+   (parallel [(set (match_operand 3 "register_operand")
                   (plus (match_dup 0)
-                        (match_operand 4 "x86_64_general_operand" "")))
+                        (match_operand 4 "x86_64_general_operand")))
                   (clobber (reg:CC FLAGS_REG))])]
   "IN_RANGE (INTVAL (operands[2]), 1, 3)
    /* Validate MODE for lea.  */
   enum machine_mode op1mode = GET_MODE (operands[1]);
   enum machine_mode mode = op1mode == DImode ? DImode : SImode;
   int scale = 1 << INTVAL (operands[2]);
-  rtx index = gen_lowpart (Pmode, operands[1]);
-  rtx base = gen_lowpart (Pmode, operands[5]);
+  rtx index = gen_lowpart (word_mode, operands[1]);
+  rtx base = gen_lowpart (word_mode, operands[5]);
   rtx dest = gen_lowpart (mode, operands[3]);
 
-  operands[1] = gen_rtx_PLUS (Pmode, base,
-                             gen_rtx_MULT (Pmode, index, GEN_INT (scale)));
+  operands[1] = gen_rtx_PLUS (word_mode, base,
+                             gen_rtx_MULT (word_mode, index, GEN_INT (scale)));
   operands[5] = base;
-  if (mode != Pmode)
+  if (mode != word_mode)
     operands[1] = gen_rtx_SUBREG (mode, operands[1], 0);
-  if (op1mode != Pmode)
+  if (op1mode != word_mode)
     operands[5] = gen_rtx_SUBREG (op1mode, operands[5], 0);
   operands[0] = dest;
 })
   [(set_attr "length" "2")])
 
 (define_expand "prefetch"
-  [(prefetch (match_operand 0 "address_operand" "")
-            (match_operand:SI 1 "const_int_operand" "")
-            (match_operand:SI 2 "const_int_operand" ""))]
+  [(prefetch (match_operand 0 "address_operand")
+            (match_operand:SI 1 "const_int_operand")
+            (match_operand:SI 2 "const_int_operand"))]
   "TARGET_PREFETCH_SSE || TARGET_3DNOW"
 {
   int rw = INTVAL (operands[1]);
 (define_insn "*prefetch_sse_<mode>"
   [(prefetch (match_operand:P 0 "address_operand" "p")
             (const_int 0)
-            (match_operand:SI 1 "const_int_operand" ""))]
+            (match_operand:SI 1 "const_int_operand"))]
   "TARGET_PREFETCH_SSE"
 {
   static const char * const patterns[4] = {
    (set_attr "memory" "none")])
 
 (define_expand "stack_protect_set"
-  [(match_operand 0 "memory_operand" "")
-   (match_operand 1 "memory_operand" "")]
+  [(match_operand 0 "memory_operand")
+   (match_operand 1 "memory_operand")]
   ""
 {
   rtx (*insn)(rtx, rtx);
 
 #ifdef TARGET_THREAD_SSP_OFFSET
   operands[1] = GEN_INT (TARGET_THREAD_SSP_OFFSET);
-  insn = (TARGET_64BIT
+  insn = (TARGET_LP64
          ? gen_stack_tls_protect_set_di
          : gen_stack_tls_protect_set_si);
 #else
-  insn = (TARGET_64BIT
+  insn = (TARGET_LP64
          ? gen_stack_protect_set_di
          : gen_stack_protect_set_si);
 #endif
 })
 
 (define_insn "stack_protect_set_<mode>"
-  [(set (match_operand:P 0 "memory_operand" "=m")
-       (unspec:P [(match_operand:P 1 "memory_operand" "m")] UNSPEC_SP_SET))
-   (set (match_scratch:P 2 "=&r") (const_int 0))
+  [(set (match_operand:PTR 0 "memory_operand" "=m")
+       (unspec:PTR [(match_operand:PTR 1 "memory_operand" "m")]
+                   UNSPEC_SP_SET))
+   (set (match_scratch:PTR 2 "=&r") (const_int 0))
    (clobber (reg:CC FLAGS_REG))]
   ""
   "mov{<imodesuffix>}\t{%1, %2|%2, %1}\;mov{<imodesuffix>}\t{%2, %0|%0, %2}\;xor{l}\t%k2, %k2"
   [(set_attr "type" "multi")])
 
 (define_insn "stack_tls_protect_set_<mode>"
-  [(set (match_operand:P 0 "memory_operand" "=m")
-       (unspec:P [(match_operand:P 1 "const_int_operand" "i")]
-                 UNSPEC_SP_TLS_SET))
-   (set (match_scratch:P 2 "=&r") (const_int 0))
+  [(set (match_operand:PTR 0 "memory_operand" "=m")
+       (unspec:PTR [(match_operand:PTR 1 "const_int_operand" "i")]
+                   UNSPEC_SP_TLS_SET))
+   (set (match_scratch:PTR 2 "=&r") (const_int 0))
    (clobber (reg:CC FLAGS_REG))]
   ""
   "mov{<imodesuffix>}\t{%@:%P1, %2|%2, <iptrsize> PTR %@:%P1}\;mov{<imodesuffix>}\t{%2, %0|%0, %2}\;xor{l}\t%k2, %k2"
   [(set_attr "type" "multi")])
 
 (define_expand "stack_protect_test"
-  [(match_operand 0 "memory_operand" "")
-   (match_operand 1 "memory_operand" "")
-   (match_operand 2 "" "")]
+  [(match_operand 0 "memory_operand")
+   (match_operand 1 "memory_operand")
+   (match_operand 2)]
   ""
 {
   rtx flags = gen_rtx_REG (CCZmode, FLAGS_REG);
 
 #ifdef TARGET_THREAD_SSP_OFFSET
   operands[1] = GEN_INT (TARGET_THREAD_SSP_OFFSET);
-  insn = (TARGET_64BIT
+  insn = (TARGET_LP64
          ? gen_stack_tls_protect_test_di
          : gen_stack_tls_protect_test_si);
 #else
-  insn = (TARGET_64BIT
+  insn = (TARGET_LP64
          ? gen_stack_protect_test_di
          : gen_stack_protect_test_si);
 #endif
 })
 
 (define_insn "stack_protect_test_<mode>"
-  [(set (match_operand:CCZ 0 "flags_reg_operand" "")
-       (unspec:CCZ [(match_operand:P 1 "memory_operand" "m")
-                    (match_operand:P 2 "memory_operand" "m")]
+  [(set (match_operand:CCZ 0 "flags_reg_operand")
+       (unspec:CCZ [(match_operand:PTR 1 "memory_operand" "m")
+                    (match_operand:PTR 2 "memory_operand" "m")]
                    UNSPEC_SP_TEST))
-   (clobber (match_scratch:P 3 "=&r"))]
+   (clobber (match_scratch:PTR 3 "=&r"))]
   ""
   "mov{<imodesuffix>}\t{%1, %3|%3, %1}\;xor{<imodesuffix>}\t{%2, %3|%3, %2}"
   [(set_attr "type" "multi")])
 
 (define_insn "stack_tls_protect_test_<mode>"
-  [(set (match_operand:CCZ 0 "flags_reg_operand" "")
-       (unspec:CCZ [(match_operand:P 1 "memory_operand" "m")
-                    (match_operand:P 2 "const_int_operand" "i")]
+  [(set (match_operand:CCZ 0 "flags_reg_operand")
+       (unspec:CCZ [(match_operand:PTR 1 "memory_operand" "m")
+                    (match_operand:PTR 2 "const_int_operand" "i")]
                    UNSPEC_SP_TLS_TEST))
-   (clobber (match_scratch:P 3 "=r"))]
+   (clobber (match_scratch:PTR 3 "=r"))]
   ""
   "mov{<imodesuffix>}\t{%1, %3|%3, %1}\;xor{<imodesuffix>}\t{%@:%P2, %3|%3, <iptrsize> PTR %@:%P2}"
   [(set_attr "type" "multi")])
    (set_attr "prefix_rep" "1")
    (set_attr "prefix_extra" "1")
    (set (attr "prefix_data16")
-     (if_then_else (match_operand:HI 2 "" "")
+     (if_then_else (match_operand:HI 2)
        (const_string "1")
        (const_string "*")))
    (set (attr "prefix_rex")
-     (if_then_else (match_operand:QI 2 "ext_QIreg_operand" "")
+     (if_then_else (match_operand:QI 2 "ext_QIreg_operand")
        (const_string "1")
        (const_string "*")))
    (set_attr "mode" "SI")])
    (set_attr "mode" "DI")])
 
 (define_expand "rdpmc"
-  [(match_operand:DI 0 "register_operand" "")
-   (match_operand:SI 1 "register_operand" "")]
+  [(match_operand:DI 0 "register_operand")
+   (match_operand:SI 1 "register_operand")]
   ""
 {
   rtx reg = gen_reg_rtx (DImode);
    (set_attr "length" "2")])
 
 (define_expand "rdtsc"
-  [(set (match_operand:DI 0 "register_operand" "")
+  [(set (match_operand:DI 0 "register_operand")
        (unspec_volatile:DI [(const_int 0)] UNSPECV_RDTSC))]
   ""
 {
    (set_attr "length" "2")])
 
 (define_expand "rdtscp"
-  [(match_operand:DI 0 "register_operand" "")
-   (match_operand:SI 1 "memory_operand" "")]
+  [(match_operand:DI 0 "register_operand")
+   (match_operand:SI 1 "memory_operand")]
   ""
 {
   rtx di = gen_rtx_UNSPEC_VOLATILE (DImode,
 {
   rtx (*insn)(rtx);
 
-  insn = (TARGET_64BIT
+  insn = (Pmode == DImode
          ? gen_lwp_slwpcbdi
          : gen_lwp_slwpcbsi);
 
                     (match_operand:SI 3 "const_int_operand" "i")]
                    UNSPECV_LWPVAL_INTRINSIC)]
   "TARGET_LWP"
-  "/* Avoid unused variable warning.  */
-   (void) operand0;")
+  ;; Avoid unused variable warning.
+  "(void) operands[0];")
 
 (define_insn "*lwp_lwpval<mode>3_1"
   [(unspec_volatile [(match_operand:SWI48 0 "register_operand" "r")
   [(set_attr "type" "other")
    (set_attr "prefix_extra" "1")])
 
+(define_expand "pause"
+  [(set (match_dup 0)
+       (unspec:BLK [(match_dup 0)] UNSPEC_PAUSE))]
+  ""
+{
+  operands[0] = gen_rtx_MEM (BLKmode, gen_rtx_SCRATCH (Pmode));
+  MEM_VOLATILE_P (operands[0]) = 1;
+})
+
+;; Use "rep; nop", instead of "pause", to support older assemblers.
+;; They have the same encoding.
+(define_insn "*pause"
+  [(set (match_operand:BLK 0)
+       (unspec:BLK [(match_dup 0)] UNSPEC_PAUSE))]
+  ""
+  "rep; nop"
+  [(set_attr "length" "2")
+   (set_attr "memory" "unknown")])
+
+(define_expand "xbegin"
+  [(set (match_operand:SI 0 "register_operand")
+       (unspec_volatile:SI [(match_dup 1)] UNSPECV_XBEGIN))]
+  "TARGET_RTM"
+{
+  rtx label = gen_label_rtx ();
+
+  operands[1] = force_reg (SImode, constm1_rtx);
+
+  emit_jump_insn (gen_xbegin_1 (operands[0], operands[1], label));
+
+  emit_label (label);
+  LABEL_NUSES (label) = 1;
+
+  DONE;
+})
+
+(define_insn "xbegin_1"
+  [(set (pc)
+       (if_then_else (ne (unspec [(const_int 0)] UNSPEC_XBEGIN_ABORT)
+                         (const_int 0))
+                     (label_ref (match_operand 2))
+                     (pc)))
+   (set (match_operand:SI 0 "register_operand" "=a")
+       (unspec_volatile:SI [(match_operand:SI 1 "register_operand" "0")]
+                           UNSPECV_XBEGIN))]
+  "TARGET_RTM"
+  "xbegin\t%l2"
+  [(set_attr "type" "other")
+   (set_attr "length" "6")])
+
+(define_insn "xend"
+  [(unspec_volatile [(const_int 0)] UNSPECV_XEND)]
+  "TARGET_RTM"
+  "xend"
+  [(set_attr "type" "other")
+   (set_attr "length" "3")])
+
+(define_insn "xabort"
+  [(unspec_volatile [(match_operand:SI 0 "const_0_to_255_operand" "n")]
+                   UNSPECV_XABORT)]
+  "TARGET_RTM"
+  "xabort\t%0"
+  [(set_attr "type" "other")
+   (set_attr "length" "3")])
+
+(define_expand "xtest"
+  [(set (match_operand:QI 0 "register_operand")
+       (unspec_volatile:QI [(const_int 0)] UNSPECV_XTEST))]
+  "TARGET_RTM"
+{
+  emit_insn (gen_xtest_1 ());
+
+  ix86_expand_setcc (operands[0], EQ,
+                    gen_rtx_REG (CCZmode, FLAGS_REG), const0_rtx);
+  DONE;
+})
+
+(define_insn "xtest_1"
+  [(set (reg:CCZ FLAGS_REG)
+       (unspec_volatile:CCZ [(const_int 0)] UNSPECV_XTEST))]
+  "TARGET_RTM"
+  "xtest"
+  [(set_attr "type" "other")
+   (set_attr "length" "3")])
+
 (include "mmx.md")
 (include "sse.md")
 (include "sync.md")