OSDN Git Service

* testsuite/libffi.special/special.exp (cxx_options): Add
[pf3gnuchains/gcc-fork.git] / gcc / config / i386 / i386.md
index 309ec17..194c218 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
+;; 2001, 2002, 2003, 2004, 2005
 ;; Free Software Foundation, Inc.
 ;; Mostly by William Schelter.
 ;; x86_64 support added by Jan Hubicka
@@ -63,7 +63,6 @@
    (UNSPEC_INDNTPOFF           8)
 
    ; Prologue support
-   (UNSPEC_STACK_PROBE         10)
    (UNSPEC_STACK_ALLOC         11)
    (UNSPEC_SET_GOT             12)
    (UNSPEC_SSE_PROLOGUE_SAVE   13)
@@ -85,6 +84,7 @@
 
    ; For SSE/MMX support:
    (UNSPEC_FIX                 30)
+   (UNSPEC_FIX_NOTRUNC         31)
    (UNSPEC_MASKMOV             32)
    (UNSPEC_MOVMSK              33)
    (UNSPEC_MOVNT               34)
    ; x87 Floating point
    (UNSPEC_FPATAN              65)
    (UNSPEC_FYL2X               66)
-   (UNSPEC_FSCALE              67)
+   (UNSPEC_FYL2XP1             67)
    (UNSPEC_FRNDINT             68)
    (UNSPEC_F2XM1               69)
 
+   ; x87 Double output FP
+   (UNSPEC_SINCOS_COS          80)
+   (UNSPEC_SINCOS_SIN          81)
+   (UNSPEC_TAN_ONE             82)
+   (UNSPEC_TAN_TAN             83)
+   (UNSPEC_XTRACT_FRACT                84)
+   (UNSPEC_XTRACT_EXP          85)
+   (UNSPEC_FSCALE_FRACT                86)
+   (UNSPEC_FSCALE_EXP          87)
+   (UNSPEC_FPREM_F             88)
+   (UNSPEC_FPREM_U             89)
+   (UNSPEC_FPREM1_F            90)
+   (UNSPEC_FPREM1_U            91)
+
+   ; x87 Rounding
+   (UNSPEC_FRNDINT_FLOOR       96)
+   (UNSPEC_FRNDINT_CEIL        97)
+   (UNSPEC_FRNDINT_TRUNC       98)
+   (UNSPEC_FRNDINT_MASK_PM     99)
+
    ; REP instruction
    (UNSPEC_REP                 75)
+
+   (UNSPEC_EH_RETURN           76)
   ])
 
 (define_constants
   [(UNSPECV_BLOCKAGE           0)
-   (UNSPECV_EH_RETURN          13)
+   (UNSPECV_STACK_PROBE                10)
    (UNSPECV_EMMS               31)
    (UNSPECV_LDMXCSR            37)
    (UNSPECV_STMXCSR            40)
    (UNSPECV_MWAIT              70)
   ])
 
+;; Registers by name.
+(define_constants
+  [(BP_REG                      6)
+   (SP_REG                      7)
+   (FLAGS_REG                  17)
+   (FPSR_REG                   18)
+   (DIRFLAG_REG                        19)
+  ])
+
 ;; Insns whose names begin with "x86_" are emitted by gen_FOO calls
 ;; from i386.c.
 
 \f
 ;; Processor type.  This attribute must exactly match the processor_type
 ;; enumeration in i386.h.
-(define_attr "cpu" "i386,i486,pentium,pentiumpro,k6,athlon,pentium4,k8"
+(define_attr "cpu" "i386,i486,pentium,pentiumpro,k6,athlon,pentium4,k8,nocona"
   (const (symbol_ref "ix86_tune")))
 
 ;; A basic instruction type.  Refinements due to arguments to be
    icmp,test,ibr,setcc,icmov,
    push,pop,call,callv,leave,
    str,cld,
-   fmov,fop,fsgn,fmul,fdiv,fpspc,fcmov,fcmp,fxch,fistp,
-   sselog,sseiadd,sseishft,sseimul,
+   fmov,fop,fsgn,fmul,fdiv,fpspc,fcmov,fcmp,fxch,fistp,frndint,
+   sselog,sselog1,sseiadd,sseishft,sseimul,
    sse,ssemov,sseadd,ssemul,ssecmp,ssecomi,ssecvt,sseicvt,ssediv,
    mmx,mmxmov,mmxadd,mmxmul,mmxcmp,mmxcvt,mmxshft"
   (const_string "other"))
 
 ;; Main data type used by the insn
 (define_attr "mode"
-  "unknown,none,QI,HI,SI,DI,SF,DF,XF,TI,V4SF,V2DF,V2SF"
+  "unknown,none,QI,HI,SI,DI,SF,DF,XF,TI,V4SF,V2DF,V2SF,V1DF"
   (const_string "unknown"))
 
 ;; The CPU unit operations uses.
 (define_attr "unit" "integer,i387,sse,mmx,unknown"
-  (cond [(eq_attr "type" "fmov,fop,fsgn,fmul,fdiv,fpspc,fcmov,fcmp,fxch,fistp")
+  (cond [(eq_attr "type" "fmov,fop,fsgn,fmul,fdiv,fpspc,fcmov,fcmp,fxch,fistp,frndint")
           (const_string "i387")
-        (eq_attr "type" "sselog,sseiadd,sseishft,sseimul,
+        (eq_attr "type" "sselog,sselog1,sseiadd,sseishft,sseimul,
                          sse,ssemov,sseadd,ssemul,ssecmp,ssecomi,ssecvt,sseicvt,ssediv")
           (const_string "sse")
         (eq_attr "type" "mmx,mmxmov,mmxadd,mmxmul,mmxcmp,mmxcvt,mmxshft")
     (const_int 1)
     (const_int 0)))
 
-;; Set when 0f opcode prefix is used.
+;; Set when REX opcode prefix is used.
 (define_attr "prefix_rex" ""
   (cond [(and (eq_attr "mode" "DI")
              (eq_attr "type" "!push,pop,call,callv,leave,ibr"))
         (const_int 1)))
 
 ;; The (bounding maximum) length of an instruction in bytes.
-;; ??? fistp is in fact fldcw/fistp/fldcw sequence.  Later we may want
-;; to split it and compute proper length as for other insns.
+;; ??? fistp and frndint are in fact fldcw/{fistp,frndint}/fldcw sequences.
+;; Later we may want to split them and compute proper length as for
+;; other insns.
 (define_attr "length" ""
-  (cond [(eq_attr "type" "other,multi,fistp")
+  (cond [(eq_attr "type" "other,multi,fistp,frndint")
           (const_int 16)
         (eq_attr "type" "fcmp")
           (const_int 4)
           (const_string "none")
         (eq_attr "type" "fistp,leave")
           (const_string "both")
+        (eq_attr "type" "frndint")
+          (const_string "load")
         (eq_attr "type" "push")
           (if_then_else (match_operand 1 "memory_operand" "")
             (const_string "both")
           (if_then_else (match_operand 1 "constant_call_address_operand" "")
             (const_string "none")
             (const_string "load"))
-        (and (eq_attr "type" "alu1,negnot,ishift1")
+        (and (eq_attr "type" "alu1,negnot,ishift1,sselog1")
              (match_operand 1 "memory_operand" ""))
           (const_string "both")
         (and (match_operand 0 "memory_operand" "")
                 "!alu1,negnot,ishift1,
                   imov,imovx,icmp,test,
                   fmov,fcmp,fsgn,
-                  sse,ssemov,ssecmp,ssecomi,ssecvt,sseicvt,
+                  sse,ssemov,ssecmp,ssecomi,ssecvt,sseicvt,sselog1,
                   mmx,mmxmov,mmxcmp,mmxcvt")
              (match_operand 2 "memory_operand" ""))
           (const_string "load")
 (define_attr "fp_int_src" "false,true"
   (const_string "false"))
 
+;; Defines rounding mode of an FP operation.
+
+(define_attr "i387_cw" "floor,ceil,trunc,mask_pm,uninitialized,any"
+  (const_string "any"))
+
 ;; Describe a user's asm statement.
 (define_asm_attributes
   [(set_attr "length" "128")
    (set_attr "type" "multi")])
 \f
+;; Scheduling descriptions
+
 (include "pentium.md")
 (include "ppro.md")
 (include "k6.md")
 (include "athlon.md")
+
+\f
+;; Operand and operator predicates
+
+(include "predicates.md")
+
 \f
 ;; Compare instructions.
 
 ;; after the cmp) will actually emit the cmpM.
 
 (define_expand "cmpdi"
-  [(set (reg:CC 17)
+  [(set (reg:CC FLAGS_REG)
        (compare:CC (match_operand:DI 0 "nonimmediate_operand" "")
                    (match_operand:DI 1 "x86_64_general_operand" "")))]
   ""
 })
 
 (define_expand "cmpsi"
-  [(set (reg:CC 17)
+  [(set (reg:CC FLAGS_REG)
        (compare:CC (match_operand:SI 0 "cmpsi_operand" "")
                    (match_operand:SI 1 "general_operand" "")))]
   ""
 })
 
 (define_expand "cmphi"
-  [(set (reg:CC 17)
+  [(set (reg:CC FLAGS_REG)
        (compare:CC (match_operand:HI 0 "nonimmediate_operand" "")
                    (match_operand:HI 1 "general_operand" "")))]
   ""
 })
 
 (define_expand "cmpqi"
-  [(set (reg:CC 17)
+  [(set (reg:CC FLAGS_REG)
        (compare:CC (match_operand:QI 0 "nonimmediate_operand" "")
                    (match_operand:QI 1 "general_operand" "")))]
   "TARGET_QIMODE_MATH"
 })
 
 (define_insn "cmpdi_ccno_1_rex64"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (match_operand:DI 0 "nonimmediate_operand" "r,?mr")
                 (match_operand:DI 1 "const0_operand" "n,n")))]
   "TARGET_64BIT && ix86_match_ccmode (insn, CCNOmode)"
    (set_attr "mode" "DI")])
 
 (define_insn "*cmpdi_minus_1_rex64"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (minus:DI (match_operand:DI 0 "nonimmediate_operand" "rm,r")
                           (match_operand:DI 1 "x86_64_general_operand" "re,mr"))
                 (const_int 0)))]
    (set_attr "mode" "DI")])
 
 (define_expand "cmpdi_1_rex64"
-  [(set (reg:CC 17)
+  [(set (reg:CC FLAGS_REG)
        (compare:CC (match_operand:DI 0 "nonimmediate_operand" "")
                    (match_operand:DI 1 "general_operand" "")))]
   "TARGET_64BIT"
   "")
 
 (define_insn "cmpdi_1_insn_rex64"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (match_operand:DI 0 "nonimmediate_operand" "mr,r")
                 (match_operand:DI 1 "x86_64_general_operand" "re,mr")))]
   "TARGET_64BIT && ix86_match_ccmode (insn, CCmode)"
 
 
 (define_insn "*cmpsi_ccno_1"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (match_operand:SI 0 "nonimmediate_operand" "r,?mr")
                 (match_operand:SI 1 "const0_operand" "n,n")))]
   "ix86_match_ccmode (insn, CCNOmode)"
    (set_attr "mode" "SI")])
 
 (define_insn "*cmpsi_minus_1"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (minus:SI (match_operand:SI 0 "nonimmediate_operand" "rm,r")
                           (match_operand:SI 1 "general_operand" "ri,mr"))
                 (const_int 0)))]
    (set_attr "mode" "SI")])
 
 (define_expand "cmpsi_1"
-  [(set (reg:CC 17)
+  [(set (reg:CC FLAGS_REG)
        (compare:CC (match_operand:SI 0 "nonimmediate_operand" "rm,r")
                    (match_operand:SI 1 "general_operand" "ri,mr")))]
   ""
   "")
 
 (define_insn "*cmpsi_1_insn"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (match_operand:SI 0 "nonimmediate_operand" "rm,r")
                 (match_operand:SI 1 "general_operand" "ri,mr")))]
   "(GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)
    (set_attr "mode" "SI")])
 
 (define_insn "*cmphi_ccno_1"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (match_operand:HI 0 "nonimmediate_operand" "r,?mr")
                 (match_operand:HI 1 "const0_operand" "n,n")))]
   "ix86_match_ccmode (insn, CCNOmode)"
    (set_attr "mode" "HI")])
 
 (define_insn "*cmphi_minus_1"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (minus:HI (match_operand:HI 0 "nonimmediate_operand" "rm,r")
                           (match_operand:HI 1 "general_operand" "ri,mr"))
                 (const_int 0)))]
    (set_attr "mode" "HI")])
 
 (define_insn "*cmphi_1"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (match_operand:HI 0 "nonimmediate_operand" "rm,r")
                 (match_operand:HI 1 "general_operand" "ri,mr")))]
   "(GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)
    (set_attr "mode" "HI")])
 
 (define_insn "*cmpqi_ccno_1"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (match_operand:QI 0 "nonimmediate_operand" "q,?mq")
                 (match_operand:QI 1 "const0_operand" "n,n")))]
   "ix86_match_ccmode (insn, CCNOmode)"
    (set_attr "mode" "QI")])
 
 (define_insn "*cmpqi_1"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (match_operand:QI 0 "nonimmediate_operand" "qm,q")
                 (match_operand:QI 1 "general_operand" "qi,mq")))]
   "(GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)
    (set_attr "mode" "QI")])
 
 (define_insn "*cmpqi_minus_1"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (minus:QI (match_operand:QI 0 "nonimmediate_operand" "qm,q")
                           (match_operand:QI 1 "general_operand" "qi,mq"))
                 (const_int 0)))]
    (set_attr "mode" "QI")])
 
 (define_insn "*cmpqi_ext_1"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (match_operand:QI 0 "general_operand" "Qm")
          (subreg:QI
    (set_attr "mode" "QI")])
 
 (define_insn "*cmpqi_ext_1_rex64"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (match_operand:QI 0 "register_operand" "Q")
          (subreg:QI
    (set_attr "mode" "QI")])
 
 (define_insn "*cmpqi_ext_2"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (subreg:QI
            (zero_extract:SI
    (set_attr "mode" "QI")])
 
 (define_expand "cmpqi_ext_3"
-  [(set (reg:CC 17)
+  [(set (reg:CC FLAGS_REG)
        (compare:CC
          (subreg:QI
            (zero_extract:SI
   "")
 
 (define_insn "cmpqi_ext_3_insn"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (subreg:QI
            (zero_extract:SI
    (set_attr "mode" "QI")])
 
 (define_insn "cmpqi_ext_3_insn_rex64"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (subreg:QI
            (zero_extract:SI
    (set_attr "mode" "QI")])
 
 (define_insn "*cmpqi_ext_4"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (subreg:QI
            (zero_extract:SI
 ;; the old patterns did, but with many more of them.
 
 (define_expand "cmpxf"
-  [(set (reg:CC 17)
+  [(set (reg:CC FLAGS_REG)
        (compare:CC (match_operand:XF 0 "cmp_fp_expander_operand" "")
                    (match_operand:XF 1 "cmp_fp_expander_operand" "")))]
   "TARGET_80387"
 })
 
 (define_expand "cmpdf"
-  [(set (reg:CC 17)
+  [(set (reg:CC FLAGS_REG)
        (compare:CC (match_operand:DF 0 "cmp_fp_expander_operand" "")
                    (match_operand:DF 1 "cmp_fp_expander_operand" "")))]
   "TARGET_80387 || TARGET_SSE2"
 })
 
 (define_expand "cmpsf"
-  [(set (reg:CC 17)
+  [(set (reg:CC FLAGS_REG)
        (compare:CC (match_operand:SF 0 "cmp_fp_expander_operand" "")
                    (match_operand:SF 1 "cmp_fp_expander_operand" "")))]
   "TARGET_80387 || TARGET_SSE"
 ;; CCFPmode    compare with exceptions
 ;; CCFPUmode   compare with no exceptions
 
-;; %%% It is an unfortunate fact that ftst has no non-popping variant,
-;; and that fp moves clobber the condition codes, and that there is
-;; currently no way to describe this fact to reg-stack.  So there are
-;; no splitters yet for this.
-
-;; %%% YIKES!  This scheme does not retain a strong connection between 
-;; the real compare and the ultimate cc0 user, so CC_REVERSE does not
-;; work!  Only allow tos/mem with tos in op 0.
-;;
-;; Hmm, of course, this is what the actual _hardware_ does.  Perhaps
-;; things aren't as bad as they sound...
+;; We may not use "#" to split and emit these, since the REG_DEAD notes
+;; used to manage the reg stack popping would not be preserved.
 
-(define_insn "*cmpfp_0"
+(define_insn "*cmpfp_0_sf"
   [(set (match_operand:HI 0 "register_operand" "=a")
        (unspec:HI
-         [(compare:CCFP (match_operand 1 "register_operand" "f")
-                        (match_operand 2 "const0_operand" "X"))]
-         UNSPEC_FNSTSW))]
-  "TARGET_80387
-   && FLOAT_MODE_P (GET_MODE (operands[1]))
-   && GET_MODE (operands[1]) == GET_MODE (operands[2])"
-{
-  if (find_regno_note (insn, REG_DEAD, REGNO (operands[1])))
-    return "ftst\;fnstsw\t%0\;fstp\t%y0";
-  else
-    return "ftst\;fnstsw\t%0";
-}
+         [(compare:CCFP
+            (match_operand:SF 1 "register_operand" "f")
+            (match_operand:SF 2 "const0_operand" "X"))]
+       UNSPEC_FNSTSW))]
+  "TARGET_80387"
+  "* return output_fp_compare (insn, operands, 0, 0);"
   [(set_attr "type" "multi")
-   (set (attr "mode")
-     (cond [(match_operand:SF 1 "" "")
-             (const_string "SF")
-           (match_operand:DF 1 "" "")
-             (const_string "DF")
-          ]
-          (const_string "XF")))])
+   (set_attr "mode" "SF")])
 
-;; We may not use "#" to split and emit these, since the REG_DEAD notes
-;; used to manage the reg stack popping would not be preserved.
+(define_insn "*cmpfp_0_df"
+  [(set (match_operand:HI 0 "register_operand" "=a")
+       (unspec:HI
+         [(compare:CCFP
+            (match_operand:DF 1 "register_operand" "f")
+            (match_operand:DF 2 "const0_operand" "X"))]
+       UNSPEC_FNSTSW))]
+  "TARGET_80387"
+  "* return output_fp_compare (insn, operands, 0, 0);"
+  [(set_attr "type" "multi")
+   (set_attr "mode" "DF")])
 
-(define_insn "*cmpfp_2_sf"
-  [(set (reg:CCFP 18)
-       (compare:CCFP
-         (match_operand:SF 0 "register_operand" "f")
-         (match_operand:SF 1 "nonimmediate_operand" "fm")))]
+(define_insn "*cmpfp_0_xf"
+  [(set (match_operand:HI 0 "register_operand" "=a")
+       (unspec:HI
+         [(compare:CCFP
+            (match_operand:XF 1 "register_operand" "f")
+            (match_operand:XF 2 "const0_operand" "X"))]
+       UNSPEC_FNSTSW))]
   "TARGET_80387"
   "* return output_fp_compare (insn, operands, 0, 0);"
-  [(set_attr "type" "fcmp")
-   (set_attr "mode" "SF")])
+  [(set_attr "type" "multi")
+   (set_attr "mode" "XF")])
 
-(define_insn "*cmpfp_2_sf_1"
+(define_insn "*cmpfp_sf"
   [(set (match_operand:HI 0 "register_operand" "=a")
        (unspec:HI
          [(compare:CCFP
             (match_operand:SF 2 "nonimmediate_operand" "fm"))]
          UNSPEC_FNSTSW))]
   "TARGET_80387"
-  "* return output_fp_compare (insn, operands, 2, 0);"
-  [(set_attr "type" "fcmp")
-   (set_attr "mode" "SF")])
-
-(define_insn "*cmpfp_2_df"
-  [(set (reg:CCFP 18)
-       (compare:CCFP
-         (match_operand:DF 0 "register_operand" "f")
-         (match_operand:DF 1 "nonimmediate_operand" "fm")))]
-  "TARGET_80387"
   "* return output_fp_compare (insn, operands, 0, 0);"
-  [(set_attr "type" "fcmp")
-   (set_attr "mode" "DF")])
+  [(set_attr "type" "multi")
+   (set_attr "mode" "SF")])
 
-(define_insn "*cmpfp_2_df_1"
+(define_insn "*cmpfp_df"
   [(set (match_operand:HI 0 "register_operand" "=a")
        (unspec:HI
          [(compare:CCFP
             (match_operand:DF 2 "nonimmediate_operand" "fm"))]
          UNSPEC_FNSTSW))]
   "TARGET_80387"
-  "* return output_fp_compare (insn, operands, 2, 0);"
+  "* return output_fp_compare (insn, operands, 0, 0);"
   [(set_attr "type" "multi")
    (set_attr "mode" "DF")])
 
-(define_insn "*cmpfp_2_xf"
-  [(set (reg:CCFP 18)
-       (compare:CCFP
-         (match_operand:XF 0 "register_operand" "f")
-         (match_operand:XF 1 "register_operand" "f")))]
-  "TARGET_80387"
-  "* return output_fp_compare (insn, operands, 0, 0);"
-  [(set_attr "type" "fcmp")
-   (set_attr "mode" "XF")])
-
-(define_insn "*cmpfp_2_xf_1"
+(define_insn "*cmpfp_xf"
   [(set (match_operand:HI 0 "register_operand" "=a")
        (unspec:HI
          [(compare:CCFP
             (match_operand:XF 2 "register_operand" "f"))]
          UNSPEC_FNSTSW))]
   "TARGET_80387"
-  "* return output_fp_compare (insn, operands, 2, 0);"
+  "* return output_fp_compare (insn, operands, 0, 0);"
   [(set_attr "type" "multi")
    (set_attr "mode" "XF")])
 
-(define_insn "*cmpfp_2u"
-  [(set (reg:CCFPU 18)
-       (compare:CCFPU
-         (match_operand 0 "register_operand" "f")
-         (match_operand 1 "register_operand" "f")))]
-  "TARGET_80387
-   && FLOAT_MODE_P (GET_MODE (operands[0]))
-   && GET_MODE (operands[0]) == GET_MODE (operands[1])"
-  "* return output_fp_compare (insn, operands, 0, 1);"
-  [(set_attr "type" "fcmp")
-   (set (attr "mode")
-     (cond [(match_operand:SF 1 "" "")
-             (const_string "SF")
-           (match_operand:DF 1 "" "")
-             (const_string "DF")
-          ]
-          (const_string "XF")))])
-
-(define_insn "*cmpfp_2u_1"
+(define_insn "*cmpfp_u"
   [(set (match_operand:HI 0 "register_operand" "=a")
        (unspec:HI
          [(compare:CCFPU
   "TARGET_80387
    && FLOAT_MODE_P (GET_MODE (operands[1]))
    && GET_MODE (operands[1]) == GET_MODE (operands[2])"
-  "* return output_fp_compare (insn, operands, 2, 1);"
+  "* return output_fp_compare (insn, operands, 0, 1);"
   [(set_attr "type" "multi")
    (set (attr "mode")
      (cond [(match_operand:SF 1 "" "")
           ]
           (const_string "XF")))])
 
-;; Patterns to match the SImode-in-memory ficom instructions.
-;;
-;; %%% Play games with accepting gp registers, as otherwise we have to
-;; force them to memory during rtl generation, which is no good.  We
-;; can get rid of this once we teach reload to do memory input reloads 
-;; via pushes.
-
-(define_insn "*ficom_1"
-  [(set (reg:CCFP 18)
-       (compare:CCFP
-         (match_operand 0 "register_operand" "f,f")
-         (float (match_operand:SI 1 "nonimmediate_operand" "m,?r"))))]
-  "0 && TARGET_80387 && FLOAT_MODE_P (GET_MODE (operands[0]))
-   && GET_MODE (XEXP (SET_SRC (PATTERN (insn)), 1)) == GET_MODE (operands[0])"
-  "#")
-
-;; Split the not-really-implemented gp register case into a
-;; push-op-pop sequence.
-;;
-;; %%% This is most efficient, but am I gonna get in trouble
-;; for separating cc0_setter and cc0_user?
-
-(define_split
-  [(set (reg:CCFP 18)
-       (compare:CCFP
-         (match_operand:SF 0 "register_operand" "")
-         (float (match_operand:SI 1 "register_operand" ""))))]
-  "0 && TARGET_80387 && reload_completed"
-  [(set (mem:SI (pre_dec:SI (reg:SI 7))) (match_dup 1))
-   (set (reg:CCFP 18) (compare:CCFP (match_dup 0) (match_dup 2)))
-   (parallel [(set (match_dup 1) (mem:SI (reg:SI 7)))
-              (set (reg:SI 7) (plus:SI (reg:SI 7) (const_int 4)))])]
-  "operands[2] = gen_rtx_MEM (Pmode, stack_pointer_rtx);
-   operands[2] = gen_rtx_FLOAT (GET_MODE (operands[0]), operands[2]);")
+(define_insn "*cmpfp_si"
+  [(set (match_operand:HI 0 "register_operand" "=a")
+       (unspec:HI
+         [(compare:CCFP
+            (match_operand 1 "register_operand" "f")
+            (match_operator 3 "float_operator"
+              [(match_operand:SI 2 "memory_operand" "m")]))]
+         UNSPEC_FNSTSW))]
+  "TARGET_80387 && TARGET_USE_FIOP
+   && FLOAT_MODE_P (GET_MODE (operands[1]))
+   && (GET_MODE (operands [3]) == GET_MODE (operands[1]))"
+  "* return output_fp_compare (insn, operands, 0, 0);"
+  [(set_attr "type" "multi")
+   (set_attr "fp_int_src" "true")
+   (set_attr "mode" "SI")])
 
 ;; FP compares, step 2
 ;; Move the fpsw to ax.
 
-(define_insn "*x86_fnstsw_1"
+(define_insn "x86_fnstsw_1"
   [(set (match_operand:HI 0 "register_operand" "=a")
-       (unspec:HI [(reg 18)] UNSPEC_FNSTSW))]
+       (unspec:HI [(reg:CCFP FPSR_REG)] UNSPEC_FNSTSW))]
   "TARGET_80387"
   "fnstsw\t%0"
   [(set_attr "length" "2")
    (set_attr "mode" "SI")
-   (set_attr "unit" "i387")
-   (set_attr "ppro_uops" "few")])
+   (set_attr "unit" "i387")])
 
 ;; FP compares, step 3
 ;; Get ax into flags, general case.
 
 (define_insn "x86_sahf_1"
-  [(set (reg:CC 17)
+  [(set (reg:CC FLAGS_REG)
        (unspec:CC [(match_operand:HI 0 "register_operand" "a")] UNSPEC_SAHF))]
   "!TARGET_64BIT"
   "sahf"
   [(set_attr "length" "1")
    (set_attr "athlon_decode" "vector")
-   (set_attr "mode" "SI")
-   (set_attr "ppro_uops" "one")])
+   (set_attr "mode" "SI")])
 
 ;; Pentium Pro can do steps 1 through 3 in one go.
 
 (define_insn "*cmpfp_i"
-  [(set (reg:CCFP 17)
+  [(set (reg:CCFP FLAGS_REG)
        (compare:CCFP (match_operand 0 "register_operand" "f")
                      (match_operand 1 "register_operand" "f")))]
   "TARGET_80387 && TARGET_CMOVE
    && !SSE_FLOAT_MODE_P (GET_MODE (operands[0]))
    && FLOAT_MODE_P (GET_MODE (operands[0]))
-   && GET_MODE (operands[0]) == GET_MODE (operands[0])"
+   && GET_MODE (operands[0]) == GET_MODE (operands[1])"
   "* return output_fp_compare (insn, operands, 1, 0);"
   [(set_attr "type" "fcmp")
    (set (attr "mode")
    (set_attr "athlon_decode" "vector")])
 
 (define_insn "*cmpfp_i_sse"
-  [(set (reg:CCFP 17)
+  [(set (reg:CCFP FLAGS_REG)
        (compare:CCFP (match_operand 0 "register_operand" "f#x,x#f")
                      (match_operand 1 "nonimmediate_operand" "f#x,xm#f")))]
   "TARGET_80387
    && SSE_FLOAT_MODE_P (GET_MODE (operands[0]))
-   && GET_MODE (operands[0]) == GET_MODE (operands[0])"
+   && GET_MODE (operands[0]) == GET_MODE (operands[1])"
   "* return output_fp_compare (insn, operands, 1, 0);"
   [(set_attr "type" "fcmp,ssecomi")
    (set (attr "mode")
    (set_attr "athlon_decode" "vector")])
 
 (define_insn "*cmpfp_i_sse_only"
-  [(set (reg:CCFP 17)
+  [(set (reg:CCFP FLAGS_REG)
        (compare:CCFP (match_operand 0 "register_operand" "x")
                      (match_operand 1 "nonimmediate_operand" "xm")))]
   "SSE_FLOAT_MODE_P (GET_MODE (operands[0]))
-   && GET_MODE (operands[0]) == GET_MODE (operands[0])"
+   && GET_MODE (operands[0]) == GET_MODE (operands[1])"
   "* return output_fp_compare (insn, operands, 1, 0);"
   [(set_attr "type" "ssecomi")
    (set (attr "mode")
    (set_attr "athlon_decode" "vector")])
 
 (define_insn "*cmpfp_iu"
-  [(set (reg:CCFPU 17)
+  [(set (reg:CCFPU FLAGS_REG)
        (compare:CCFPU (match_operand 0 "register_operand" "f")
                       (match_operand 1 "register_operand" "f")))]
   "TARGET_80387 && TARGET_CMOVE
    (set_attr "athlon_decode" "vector")])
 
 (define_insn "*cmpfp_iu_sse"
-  [(set (reg:CCFPU 17)
+  [(set (reg:CCFPU FLAGS_REG)
        (compare:CCFPU (match_operand 0 "register_operand" "f#x,x#f")
                       (match_operand 1 "nonimmediate_operand" "f#x,xm#f")))]
   "TARGET_80387
    (set_attr "athlon_decode" "vector")])
 
 (define_insn "*cmpfp_iu_sse_only"
-  [(set (reg:CCFPU 17)
+  [(set (reg:CCFPU FLAGS_REG)
        (compare:CCFPU (match_operand 0 "register_operand" "x")
                       (match_operand 1 "nonimmediate_operand" "xm")))]
   "SSE_FLOAT_MODE_P (GET_MODE (operands[0]))
 
 (define_insn "*popsi1_epilogue"
   [(set (match_operand:SI 0 "nonimmediate_operand" "=r*m")
-       (mem:SI (reg:SI 7)))
-   (set (reg:SI 7)
-       (plus:SI (reg:SI 7) (const_int 4)))
+       (mem:SI (reg:SI SP_REG)))
+   (set (reg:SI SP_REG)
+       (plus:SI (reg:SI SP_REG) (const_int 4)))
    (clobber (mem:BLK (scratch)))]
   "!TARGET_64BIT"
   "pop{l}\t%0"
 
 (define_insn "popsi1"
   [(set (match_operand:SI 0 "nonimmediate_operand" "=r*m")
-       (mem:SI (reg:SI 7)))
-   (set (reg:SI 7)
-       (plus:SI (reg:SI 7) (const_int 4)))]
+       (mem:SI (reg:SI SP_REG)))
+   (set (reg:SI SP_REG)
+       (plus:SI (reg:SI SP_REG) (const_int 4)))]
   "!TARGET_64BIT"
   "pop{l}\t%0"
   [(set_attr "type" "pop")
 (define_insn "*movsi_xor"
   [(set (match_operand:SI 0 "register_operand" "=r")
        (match_operand:SI 1 "const0_operand" "i"))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "reload_completed && (!TARGET_USE_MOV0 || optimize_size)"
   "xor{l}\t{%0, %0|%0, %0}"
   [(set_attr "type" "alu1")
 (define_insn "*movsi_or"
   [(set (match_operand:SI 0 "register_operand" "=r")
        (match_operand:SI 1 "immediate_operand" "i"))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "reload_completed
    && operands[1] == constm1_rtx
    && (TARGET_PENTIUM || optimize_size)"
    (set_attr "length_immediate" "1")])
 
 (define_insn "*movsi_1"
-  [(set (match_operand:SI 0 "nonimmediate_operand" "=r,m,!*y,!rm,!*y,!*Y,!rm,!*Y")
-       (match_operand:SI 1 "general_operand" "rinm,rin,*y,*y,rm,*Y,*Y,rm"))]
+  [(set (match_operand:SI 0 "nonimmediate_operand"
+                       "=r  ,m  ,!*y,!rm,!*y,!*x,!rm,!*x")
+       (match_operand:SI 1 "general_operand"
+                       "rinm,rin,*y ,*y ,rm ,*x ,*x ,rm"))]
   "(TARGET_INTER_UNIT_MOVES || optimize_size)
    && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)"
 {
    (set_attr "mode" "SI,SI,DI,SI,SI,TI,SI,SI")])
 
 (define_insn "*movsi_1_nointernunit"
-  [(set (match_operand:SI 0 "nonimmediate_operand" "=r,m,!*y,!m,!*y,!*Y,!m,!*Y")
-       (match_operand:SI 1 "general_operand" "rinm,rin,*y,*y,m,*Y,*Y,m"))]
+  [(set (match_operand:SI 0 "nonimmediate_operand"
+                       "=r  ,m  ,!*y,!m,!*y,!*x,!m,!*x")
+       (match_operand:SI 1 "general_operand"
+                       "rinm,rin,*y ,*y,m  ,*x ,*x,m"))]
   "(!TARGET_INTER_UNIT_MOVES && !optimize_size)
    && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)"
 {
   ""
   "xchg{l}\t%1, %0"
   [(set_attr "type" "imov")
-   (set_attr "pent_pair" "np")
-   (set_attr "athlon_decode" "vector")
    (set_attr "mode" "SI")
-   (set_attr "modrm" "0")
-   (set_attr "ppro_uops" "few")])
+   (set_attr "pent_pair" "np")
+   (set_attr "athlon_decode" "vector")])
 
 (define_expand "movhi"
   [(set (match_operand:HI 0 "nonimmediate_operand" "")
        (match_operand:HI 1 "register_operand" "+r"))
    (set (match_dup 1)
        (match_dup 0))]
-  "TARGET_PARTIAL_REG_STALL"
-  "xchg{w}\t%1, %0"
+  "!TARGET_PARTIAL_REG_STALL || optimize_size"
+  "xchg{l}\t%k1, %k0"
   [(set_attr "type" "imov")
+   (set_attr "mode" "SI")
    (set_attr "pent_pair" "np")
-   (set_attr "mode" "HI")
-   (set_attr "modrm" "0")
-   (set_attr "ppro_uops" "few")])
+   (set_attr "athlon_decode" "vector")])
 
 (define_insn "*swaphi_2"
   [(set (match_operand:HI 0 "register_operand" "+r")
        (match_operand:HI 1 "register_operand" "+r"))
    (set (match_dup 1)
        (match_dup 0))]
-  "TARGET_PARTIAL_REG_STALL"
-  "xchg{l}\t%k1, %k0"
+  "TARGET_PARTIAL_REG_STALL"
+  "xchg{w}\t%1, %0"
   [(set_attr "type" "imov")
+   (set_attr "mode" "HI")
    (set_attr "pent_pair" "np")
-   (set_attr "mode" "SI")
-   (set_attr "modrm" "0")
-   (set_attr "ppro_uops" "few")])
+   (set_attr "athlon_decode" "vector")])
 
 (define_expand "movstricthi"
   [(set (strict_low_part (match_operand:HI 0 "nonimmediate_operand" ""))
 (define_insn "*movstricthi_xor"
   [(set (strict_low_part (match_operand:HI 0 "register_operand" "+r"))
        (match_operand:HI 1 "const0_operand" "i"))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "reload_completed
    && ((!TARGET_USE_MOV0 && !TARGET_PARTIAL_REG_STALL) || optimize_size)"
   "xor{w}\t{%0, %0|%0, %0}"
             (eq_attr "type" "imovx")
               (const_string "SI")
             (and (eq_attr "type" "imov")
-                 (and (eq_attr "alternative" "0,1,2")
+                 (and (eq_attr "alternative" "0,1")
                       (ne (symbol_ref "TARGET_PARTIAL_REG_DEPENDENCY")
                           (const_int 0))))
               (const_string "SI")
             ;; Avoid partial register stalls when not using QImode arithmetic
             (and (eq_attr "type" "imov")
-                 (and (eq_attr "alternative" "0,1,2")
+                 (and (eq_attr "alternative" "0,1")
                       (and (ne (symbol_ref "TARGET_PARTIAL_REG_STALL")
                                (const_int 0))
                            (eq (symbol_ref "TARGET_QIMODE_MATH")
   DONE;
 })
 
-(define_insn "*swapqi"
+(define_insn "*swapqi_1"
   [(set (match_operand:QI 0 "register_operand" "+r")
        (match_operand:QI 1 "register_operand" "+r"))
    (set (match_dup 1)
        (match_dup 0))]
-  ""
-  "xchg{b}\t%1, %0"
+  "!TARGET_PARTIAL_REG_STALL || optimize_size"
+  "xchg{l}\t%k1, %k0"
   [(set_attr "type" "imov")
+   (set_attr "mode" "SI")
    (set_attr "pent_pair" "np")
+   (set_attr "athlon_decode" "vector")])
+
+(define_insn "*swapqi_2"
+  [(set (match_operand:QI 0 "register_operand" "+q")
+       (match_operand:QI 1 "register_operand" "+q"))
+   (set (match_dup 1)
+       (match_dup 0))]
+  "TARGET_PARTIAL_REG_STALL"
+  "xchg{b}\t%1, %0"
+  [(set_attr "type" "imov")
    (set_attr "mode" "QI")
-   (set_attr "modrm" "0")
-   (set_attr "ppro_uops" "few")])
+   (set_attr "pent_pair" "np")
+   (set_attr "athlon_decode" "vector")])
 
 (define_expand "movstrictqi"
   [(set (strict_low_part (match_operand:QI 0 "nonimmediate_operand" ""))
 (define_insn "*movstrictqi_xor"
   [(set (strict_low_part (match_operand:QI 0 "q_regs_operand" "+q"))
        (match_operand:QI 1 "const0_operand" "i"))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "reload_completed && (!TARGET_USE_MOV0 || optimize_size)"
   "xor{b}\t{%0, %0|%0, %0}"
   [(set_attr "type" "alu1")
   [(set_attr "type" "imov")
    (set_attr "mode" "QI")])
 
-(define_insn "*movsi_insv_1_rex64"
-  [(set (zero_extract:SI (match_operand 0 "ext_register_operand" "+Q")
+(define_insn "movdi_insv_1_rex64"
+  [(set (zero_extract:DI (match_operand 0 "ext_register_operand" "+Q")
                         (const_int 8)
                         (const_int 8))
-       (match_operand:SI 1 "nonmemory_operand" "Qn"))]
+       (match_operand:DI 1 "nonmemory_operand" "Qn"))]
   "TARGET_64BIT"
   "mov{b}\t{%b1, %h0|%h0, %b1}"
   [(set_attr "type" "imov")
   "!TARGET_64BIT"
   "#")
 
-(define_insn "pushdi2_rex64"
+(define_insn "*pushdi2_rex64"
   [(set (match_operand:DI 0 "push_operand" "=<,!<")
        (match_operand:DI 1 "general_no_elim_operand" "re*m,n"))]
   "TARGET_64BIT"
 
 ;; We need to define this as both peepholer and splitter for case
 ;; 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" ""))]
 (define_split
   [(set (match_operand:DI 0 "push_operand" "")
         (match_operand:DI 1 "immediate_operand" ""))]
-  "TARGET_64BIT && (flow2_completed || (reload_completed && !flag_peephole2))
+  "TARGET_64BIT && (flag_peephole2 ? flow2_completed : reload_completed)
    && !symbolic_operand (operands[1], DImode)
    && !x86_64_immediate_operand (operands[1], DImode)"
   [(set (match_dup 0) (match_dup 1))
 
 (define_insn "*popdi1_epilogue_rex64"
   [(set (match_operand:DI 0 "nonimmediate_operand" "=r*m")
-       (mem:DI (reg:DI 7)))
-   (set (reg:DI 7)
-       (plus:DI (reg:DI 7) (const_int 8)))
+       (mem:DI (reg:DI SP_REG)))
+   (set (reg:DI SP_REG)
+       (plus:DI (reg:DI SP_REG) (const_int 8)))
    (clobber (mem:BLK (scratch)))]
   "TARGET_64BIT"
   "pop{q}\t%0"
 
 (define_insn "popdi1"
   [(set (match_operand:DI 0 "nonimmediate_operand" "=r*m")
-       (mem:DI (reg:DI 7)))
-   (set (reg:DI 7)
-       (plus:DI (reg:DI 7) (const_int 8)))]
+       (mem:DI (reg:DI SP_REG)))
+   (set (reg:DI SP_REG)
+       (plus:DI (reg:DI SP_REG) (const_int 8)))]
   "TARGET_64BIT"
   "pop{q}\t%0"
   [(set_attr "type" "pop")
 (define_insn "*movdi_xor_rex64"
   [(set (match_operand:DI 0 "register_operand" "=r")
        (match_operand:DI 1 "const0_operand" "i"))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && (!TARGET_USE_MOV0 || optimize_size)
    && reload_completed"
   "xor{l}\t{%k0, %k0|%k0, %k0}"
 (define_insn "*movdi_or_rex64"
   [(set (match_operand:DI 0 "register_operand" "=r")
        (match_operand:DI 1 "const_int_operand" "i"))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && (TARGET_PENTIUM || optimize_size)
    && reload_completed
    && operands[1] == constm1_rtx"
    (set_attr "length_immediate" "1")])
 
 (define_insn "*movdi_2"
-  [(set (match_operand:DI 0 "nonimmediate_operand" "=r,o,!m*y,!*y,!m,!*Y,!*Y")
-       (match_operand:DI 1 "general_operand" "riFo,riF,*y,m,*Y,*Y,m"))]
+  [(set (match_operand:DI 0 "nonimmediate_operand"
+                                       "=r  ,o  ,m*y,*y,m ,*Y,*Y,m ,*x,*x")
+       (match_operand:DI 1 "general_operand"
+                                       "riFo,riF,*y ,m ,*Y,*Y,m ,*x,*x,m "))]
   "!TARGET_64BIT
    && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)"
   "@
    movq\t{%1, %0|%0, %1}
    movq\t{%1, %0|%0, %1}
    movdqa\t{%1, %0|%0, %1}
-   movq\t{%1, %0|%0, %1}"
-  [(set_attr "type" "*,*,mmx,mmx,ssemov,ssemov,ssemov")
-   (set_attr "mode" "DI,DI,DI,DI,DI,TI,DI")])
+   movq\t{%1, %0|%0, %1}
+   movlps\t{%1, %0|%0, %1}
+   movaps\t{%1, %0|%0, %1}
+   movlps\t{%1, %0|%0, %1}"
+  [(set_attr "type" "*,*,mmx,mmx,ssemov,ssemov,ssemov,ssemov,ssemov,ssemov")
+   (set_attr "mode" "DI,DI,DI,DI,DI,TI,DI,V2SF,V4SF,V2SF")])
 
 (define_split
   [(set (match_operand:DI 0 "push_operand" "")
   "ix86_split_long_move (operands); DONE;")
 
 (define_insn "*movdi_1_rex64"
-  [(set (match_operand:DI 0 "nonimmediate_operand" "=r,r,r,mr,!mr,!*y,!rm,!*y,!*Y,!rm,!*Y")
-       (match_operand:DI 1 "general_operand" "Z,rem,i,re,n,*y,*y,rm,*Y,*Y,rm"))]
+  [(set (match_operand:DI 0 "nonimmediate_operand"
+               "=r,r  ,r,mr,!mr,!*y,!rm,!*y,!*x,!rm,!*x,!*x,!*y")
+       (match_operand:DI 1 "general_operand"
+               "Z ,rem,i,re,n  ,*y ,*y ,rm ,*x ,*x ,rm ,*y ,*x"))]
   "TARGET_64BIT
    && (TARGET_INTER_UNIT_MOVES || optimize_size)
    && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)"
 {
   switch (get_attr_type (insn))
     {
+    case TYPE_SSECVT:
+      if (which_alternative == 11)
+       return "movq2dq\t{%1, %0|%0, %1}";
+      else
+       return "movdq2q\t{%1, %0|%0, %1}";
     case TYPE_SSEMOV:
       if (get_attr_mode (insn) == MODE_TI)
          return "movdqa\t{%1, %0|%0, %1}";
              (const_string "mmxmov")
            (eq_attr "alternative" "8,9,10")
              (const_string "ssemov")
+           (eq_attr "alternative" "11,12")
+             (const_string "ssecvt")
            (eq_attr "alternative" "4")
              (const_string "multi")
            (and (ne (symbol_ref "flag_pic") (const_int 0))
              (const_string "lea")
           ]
           (const_string "imov")))
-   (set_attr "modrm" "*,0,0,*,*,*,*,*,*,*,*")
-   (set_attr "length_immediate" "*,4,8,*,*,*,*,*,*,*,*")
-   (set_attr "mode" "SI,DI,DI,DI,SI,DI,DI,DI,TI,DI,DI")])
+   (set_attr "modrm" "*,0,0,*,*,*,*,*,*,*,*,*,*")
+   (set_attr "length_immediate" "*,4,8,*,*,*,*,*,*,*,*,*,*")
+   (set_attr "mode" "SI,DI,DI,DI,SI,DI,DI,DI,TI,DI,DI,DI,DI")])
 
 (define_insn "*movdi_1_rex64_nointerunit"
-  [(set (match_operand:DI 0 "nonimmediate_operand" "=r,r,r,mr,!mr,!*y,!m,!*y,!*Y,!m,!*Y")
-       (match_operand:DI 1 "general_operand" "Z,rem,i,re,n,*y,*y,m,*Y,*Y,m"))]
+  [(set (match_operand:DI 0 "nonimmediate_operand"
+               "=r,r ,r,mr,!mr,!*y,!m,!*y,!*Y,!m,!*Y")
+       (match_operand:DI 1 "general_operand"
+               "Z,rem,i,re,n  ,*y ,*y,m  ,*Y ,*Y,m"))]
   "TARGET_64BIT
    && (!TARGET_INTER_UNIT_MOVES && !optimize_size)
    && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)"
 
 ;; We need to define this as both peepholer and splitter for case
 ;; 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" ""))]
 (define_split
   [(set (match_operand:DI 0 "memory_operand" "")
         (match_operand:DI 1 "immediate_operand" ""))]
-  "TARGET_64BIT && (flow2_completed || (reload_completed && !flag_peephole2))
+  "TARGET_64BIT && (flag_peephole2 ? flow2_completed : reload_completed)
    && !symbolic_operand (operands[1], DImode)
    && !x86_64_immediate_operand (operands[1], DImode)"
   [(set (match_dup 2) (match_dup 3))
   "TARGET_64BIT"
   "xchg{q}\t%1, %0"
   [(set_attr "type" "imov")
-   (set_attr "pent_pair" "np")
-   (set_attr "athlon_decode" "vector")
    (set_attr "mode" "DI")
-   (set_attr "modrm" "0")
-   (set_attr "ppro_uops" "few")])
+   (set_attr "pent_pair" "np")
+   (set_attr "athlon_decode" "vector")])
+
+(define_expand "movti"
+  [(set (match_operand:TI 0 "nonimmediate_operand" "")
+       (match_operand:TI 1 "nonimmediate_operand" ""))]
+  "TARGET_SSE || TARGET_64BIT"
+{
+  if (TARGET_64BIT)
+    ix86_expand_move (TImode, operands);
+  else
+    ix86_expand_vector_move (TImode, operands);
+  DONE;
+})
+
+(define_insn "*movti_internal"
+  [(set (match_operand:TI 0 "nonimmediate_operand" "=x,x,m")
+       (match_operand:TI 1 "vector_move_operand" "C,xm,x"))]
+  "TARGET_SSE && !TARGET_64BIT
+   && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)"
+{
+  switch (which_alternative)
+    {
+    case 0:
+      if (get_attr_mode (insn) == MODE_V4SF)
+       return "xorps\t%0, %0";
+      else
+       return "pxor\t%0, %0";
+    case 1:
+    case 2:
+      if (get_attr_mode (insn) == MODE_V4SF)
+       return "movaps\t{%1, %0|%0, %1}";
+      else
+       return "movdqa\t{%1, %0|%0, %1}";
+    default:
+      abort ();
+    }
+}
+  [(set_attr "type" "ssemov,ssemov,ssemov")
+   (set (attr "mode")
+        (cond [(eq (symbol_ref "TARGET_SSE2") (const_int 0))
+                (const_string "V4SF")
+
+              (eq_attr "alternative" "0,1")
+                (if_then_else
+                  (ne (symbol_ref "optimize_size")
+                      (const_int 0))
+                  (const_string "V4SF")
+                  (const_string "TI"))
+              (eq_attr "alternative" "2")
+                (if_then_else
+                  (ne (symbol_ref "optimize_size")
+                      (const_int 0))
+                  (const_string "V4SF")
+                  (const_string "TI"))]
+              (const_string "TI")))])
+
+(define_insn "*movti_rex64"
+  [(set (match_operand:TI 0 "nonimmediate_operand" "=r,o,x,x,xm")
+       (match_operand:TI 1 "general_operand" "riFo,riF,C,xm,x"))]
+  "TARGET_64BIT
+   && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)"
+{
+  switch (which_alternative)
+    {
+    case 0:
+    case 1:
+      return "#";
+    case 2:
+      if (get_attr_mode (insn) == MODE_V4SF)
+       return "xorps\t%0, %0";
+      else
+       return "pxor\t%0, %0";
+    case 3:
+    case 4:
+      if (get_attr_mode (insn) == MODE_V4SF)
+       return "movaps\t{%1, %0|%0, %1}";
+      else
+       return "movdqa\t{%1, %0|%0, %1}";
+    default:
+      abort ();
+    }
+}
+  [(set_attr "type" "*,*,ssemov,ssemov,ssemov")
+   (set (attr "mode")
+        (cond [(eq_attr "alternative" "2,3")
+                (if_then_else
+                  (ne (symbol_ref "optimize_size")
+                      (const_int 0))
+                  (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_size")
+                           (const_int 0)))
+                  (const_string "V4SF")
+                  (const_string "TI"))]
+              (const_string "DI")))])
+
+(define_split
+  [(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)]
+  "ix86_split_long_move (operands); DONE;")
 
-  
 (define_expand "movsf"
   [(set (match_operand:SF 0 "nonimmediate_operand" "")
        (match_operand:SF 1 "general_operand" ""))]
   [(set (match_operand:SF 0 "push_operand" "")
        (match_operand:SF 1 "any_fp_register_operand" ""))]
   "!TARGET_64BIT"
-  [(set (reg:SI 7) (plus:SI (reg:SI 7) (const_int -4)))
-   (set (mem:SF (reg:SI 7)) (match_dup 1))])
+  [(set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG) (const_int -4)))
+   (set (mem:SF (reg:SI SP_REG)) (match_dup 1))])
 
 (define_split
   [(set (match_operand:SF 0 "push_operand" "")
        (match_operand:SF 1 "any_fp_register_operand" ""))]
   "TARGET_64BIT"
-  [(set (reg:DI 7) (plus:DI (reg:DI 7) (const_int -8)))
-   (set (mem:SF (reg:DI 7)) (match_dup 1))])
+  [(set (reg:DI SP_REG) (plus:DI (reg:DI SP_REG) (const_int -8)))
+   (set (mem:SF (reg:DI SP_REG)) (match_dup 1))])
 
 (define_insn "*movsf_1"
-  [(set (match_operand:SF 0 "nonimmediate_operand" "=f#xr,m,f#xr,r#xf,m,x#rf,x#rf,x#rf,m,!*y,!rm,!*y")
-       (match_operand:SF 1 "general_operand" "fm#rx,f#rx,G,rmF#fx,Fr#fx,C,x,xm#rf,x#rf,rm,*y,*y"))]
+  [(set (match_operand:SF 0 "nonimmediate_operand"
+         "=f#xr,m   ,f#xr,r#xf  ,m    ,x#rf,x#rf,x#rf ,m   ,!*y,!rm,!*y")
+       (match_operand:SF 1 "general_operand"
+         "fm#rx,f#rx,G   ,rmF#fx,Fr#fx,C   ,x   ,xm#rf,x#rf,rm ,*y ,*y"))]
   "(TARGET_INTER_UNIT_MOVES || optimize_size)
    && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)
    && (reload_in_progress || reload_completed
   switch (which_alternative)
     {
     case 0:
-      if (REG_P (operands[1])
-          && find_regno_note (insn, REG_DEAD, REGNO (operands[1])))
-        return "fstp\t%y0";
-      else if (STACK_TOP_P (operands[0]))
-        return "fld%z1\t%y1";
-      else
-        return "fst\t%y0";
+      return output_387_reg_move (insn, operands);
 
     case 1:
       if (find_regno_note (insn, REG_DEAD, REGNO (operands[1])))
                 (if_then_else
                   (ior (ne (symbol_ref "TARGET_SSE_PARTIAL_REG_DEPENDENCY")
                            (const_int 0))
-                       (ne (symbol_ref "TARGET_SSE_PARTIAL_REGS")
+                       (ne (symbol_ref "TARGET_SSE_SPLIT_REGS")
                            (const_int 0)))
                   (const_string "V4SF")
                   (const_string "SF"))
               (const_string "SF")))])
 
 (define_insn "*movsf_1_nointerunit"
-  [(set (match_operand:SF 0 "nonimmediate_operand" "=f#xr,m,f#xr,r#xf,m,x#rf,x#rf,x#rf,m,!*y,!m,!*y")
-       (match_operand:SF 1 "general_operand" "fm#rx,f#rx,G,rmF#fx,Fr#fx,C,x,xm#rf,x#rf,m,*y,*y"))]
+  [(set (match_operand:SF 0 "nonimmediate_operand"
+         "=f#xr,m   ,f#xr,r#xf  ,m    ,x#rf,x#rf,x#rf ,m   ,!*y,!m,!*y")
+       (match_operand:SF 1 "general_operand"
+         "fm#rx,f#rx,G   ,rmF#fx,Fr#fx,C   ,x   ,xm#rf,x#rf,m  ,*y,*y"))]
   "(!TARGET_INTER_UNIT_MOVES && !optimize_size)
    && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)
    && (reload_in_progress || reload_completed
   switch (which_alternative)
     {
     case 0:
-      if (REG_P (operands[1])
-          && find_regno_note (insn, REG_DEAD, REGNO (operands[1])))
-       {
-         if (REGNO (operands[0]) == FIRST_STACK_REG
-             && TARGET_USE_FFREEP)
-           return "ffreep\t%y0";
-          return "fstp\t%y0";
-       }
-      else if (STACK_TOP_P (operands[0]))
-        return "fld%z1\t%y1";
-      else
-        return "fst\t%y0";
+      return output_387_reg_move (insn, operands);
 
     case 1:
       if (find_regno_note (insn, REG_DEAD, REGNO (operands[1])))
                 (if_then_else
                   (ior (ne (symbol_ref "TARGET_SSE_PARTIAL_REG_DEPENDENCY")
                            (const_int 0))
-                       (ne (symbol_ref "TARGET_SSE_PARTIAL_REGS")
+                       (ne (symbol_ref "TARGET_SSE_SPLIT_REGS")
                            (const_int 0)))
                   (const_string "V4SF")
                   (const_string "SF"))
               (const_string "SF")))])
 
 (define_insn "*swapsf"
-  [(set (match_operand:SF 0 "register_operand" "+f")
-       (match_operand:SF 1 "register_operand" "+f"))
+  [(set (match_operand:SF 0 "fp_register_operand" "+f")
+       (match_operand:SF 1 "fp_register_operand" "+f"))
    (set (match_dup 1)
        (match_dup 0))]
-  "reload_completed || !TARGET_SSE"
+  "reload_completed || TARGET_80387"
 {
   if (STACK_TOP_P (operands[0]))
     return "fxch\t%1";
   [(set (match_operand:DF 0 "push_operand" "")
        (match_operand:DF 1 "any_fp_register_operand" ""))]
   "!TARGET_64BIT && reload_completed"
-  [(set (reg:SI 7) (plus:SI (reg:SI 7) (const_int -8)))
-   (set (mem:DF (reg:SI 7)) (match_dup 1))]
+  [(set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG) (const_int -8)))
+   (set (mem:DF (reg:SI SP_REG)) (match_dup 1))]
   "")
 
 (define_split
   [(set (match_operand:DF 0 "push_operand" "")
        (match_operand:DF 1 "any_fp_register_operand" ""))]
   "TARGET_64BIT && reload_completed"
-  [(set (reg:DI 7) (plus:DI (reg:DI 7) (const_int -8)))
-   (set (mem:DF (reg:DI 7)) (match_dup 1))]
+  [(set (reg:DI SP_REG) (plus:DI (reg:DI SP_REG) (const_int -8)))
+   (set (mem:DF (reg:DI SP_REG)) (match_dup 1))]
   "")
 
 (define_split
 ;; when optimizing for size.
 
 (define_insn "*movdf_nointeger"
-  [(set (match_operand:DF 0 "nonimmediate_operand" "=f#Y,m,f#Y,*r,o,Y#f,Y#f,Y#f,m")
-       (match_operand:DF 1 "general_operand" "fm#Y,f#Y,G,*roF,F*r,C,Y#f,YHm#f,Y#f"))]
+  [(set (match_operand:DF 0 "nonimmediate_operand"
+                       "=f#Y,m  ,f#Y,*r  ,o  ,Y#f*x,Y#f*x,Y#f*x  ,m    ")
+       (match_operand:DF 1 "general_operand"
+                       "fm#Y,f#Y,G  ,*roF,F*r,C    ,Y#f*x,HmY#f*x,Y#f*x"))]
   "(GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)
    && ((optimize_size || !TARGET_INTEGER_DFMODE_MOVES) && !TARGET_64BIT)
    && (reload_in_progress || reload_completed
   switch (which_alternative)
     {
     case 0:
-      if (REG_P (operands[1])
-          && find_regno_note (insn, REG_DEAD, REGNO (operands[1])))
-       {
-         if (REGNO (operands[0]) == FIRST_STACK_REG
-             && TARGET_USE_FFREEP)
-           return "ffreep\t%y0";
-          return "fstp\t%y0";
-       }
-      else if (STACK_TOP_P (operands[0]))
-        return "fld%z1\t%y1";
-      else
-        return "fst\t%y0";
+      return output_387_reg_move (insn, operands);
 
     case 1:
       if (find_regno_note (insn, REG_DEAD, REGNO (operands[1])))
          abort ();
        }
     case 6:
+    case 7:
+    case 8:
       switch (get_attr_mode (insn))
        {
        case MODE_V4SF:
          return "movaps\t{%1, %0|%0, %1}";
        case MODE_V2DF:
          return "movapd\t{%1, %0|%0, %1}";
+       case MODE_TI:
+         return "movdqa\t{%1, %0|%0, %1}";
+       case MODE_DI:
+         return "movq\t{%1, %0|%0, %1}";
        case MODE_DF:
          return "movsd\t{%1, %0|%0, %1}";
+       case MODE_V1DF:
+         return "movlpd\t{%1, %0|%0, %1}";
+       case MODE_V2SF:
+         return "movlps\t{%1, %0|%0, %1}";
        default:
          abort ();
        }
-    case 7:
-      if (get_attr_mode (insn) == MODE_V2DF)
-       return "movlpd\t{%1, %0|%0, %1}";
-      else
-       return "movsd\t{%1, %0|%0, %1}";
-    case 8:
-      return "movsd\t{%1, %0|%0, %1}";
 
     default:
       abort();
 }
   [(set_attr "type" "fmov,fmov,fmov,multi,multi,ssemov,ssemov,ssemov,ssemov")
    (set (attr "mode")
-        (cond [(eq_attr "alternative" "3,4")
+        (cond [(eq_attr "alternative" "0,1,2")
+                (const_string "DF")
+              (eq_attr "alternative" "3,4")
                 (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")
+                      ]
+                  (const_string "V2SF"))
+
               /* xorps is one byte shorter.  */
               (eq_attr "alternative" "5")
                 (cond [(ne (symbol_ref "optimize_size")
                          (const_string "V4SF")
                        (ne (symbol_ref "TARGET_SSE_LOAD0_BY_PXOR")
                            (const_int 0))
-                         (const_string "TI")]
+                         (const_string "TI")
+                      ]
                       (const_string "V2DF"))
+
               /* For architectures resolving dependencies on
                  whole SSE registers use APD move to break dependency
                  chains, otherwise use short move to avoid extra work.
                  movaps encodes one byte shorter.  */
               (eq_attr "alternative" "6")
                 (cond
-                 [(ne (symbol_ref "optimize_size")
-                      (const_int 0))
-                    (const_string "V4SF")
-                  (ne (symbol_ref "TARGET_SSE_PARTIAL_REG_DEPENDENCY")
-                      (const_int 0))
-                    (const_string "V2DF")]
+                  [(ne (symbol_ref "optimize_size")
+                       (const_int 0))
+                     (const_string "V4SF")
+                   (ne (symbol_ref "TARGET_SSE_PARTIAL_REG_DEPENDENCY")
+                       (const_int 0))
+                     (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")
                 (if_then_else
-                  (ne (symbol_ref "TARGET_SSE_PARTIAL_REGS")
+                  (ne (symbol_ref "TARGET_SSE_SPLIT_REGS")
                       (const_int 0))
-                  (const_string "V2DF")
-                  (const_string "DF"))]
-              (const_string "DF")))])
+                  (const_string "V1DF")
+                  (const_string "DF"))
+             ]
+             (const_string "DF")))])
 
 (define_insn "*movdf_integer"
-  [(set (match_operand:DF 0 "nonimmediate_operand" "=f#Yr,m,f#Yr,r#Yf,o,Y#rf,Y#rf,Y#rf,m")
-       (match_operand:DF 1 "general_operand" "fm#Yr,f#Yr,G,roF#Yf,Fr#Yf,C,Y#rf,Ym#rf,Y#rf"))]
+  [(set (match_operand:DF 0 "nonimmediate_operand"
+               "=f#Yr,m   ,f#Yr,r#Yf  ,o    ,Y#rf*x,Y#rf*x,Y#rf*x,m")
+       (match_operand:DF 1 "general_operand"
+               "fm#Yr,f#Yr,G   ,roF#Yf,Fr#Yf,C     ,Y#rf*x,m     ,Y#rf*x"))]
   "(GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)
    && ((!optimize_size && TARGET_INTEGER_DFMODE_MOVES) || TARGET_64BIT)
    && (reload_in_progress || reload_completed
   switch (which_alternative)
     {
     case 0:
-      if (REG_P (operands[1])
-          && find_regno_note (insn, REG_DEAD, REGNO (operands[1])))
-       {
-         if (REGNO (operands[0]) == FIRST_STACK_REG
-             && TARGET_USE_FFREEP)
-           return "ffreep\t%y0";
-          return "fstp\t%y0";
-       }
-      else if (STACK_TOP_P (operands[0]))
-        return "fld%z1\t%y1";
-      else
-        return "fst\t%y0";
+      return output_387_reg_move (insn, operands);
 
     case 1:
       if (find_regno_note (insn, REG_DEAD, REGNO (operands[1])))
          abort ();
        }
     case 6:
+    case 7:
+    case 8:
       switch (get_attr_mode (insn))
        {
        case MODE_V4SF:
          return "movaps\t{%1, %0|%0, %1}";
        case MODE_V2DF:
          return "movapd\t{%1, %0|%0, %1}";
+       case MODE_TI:
+         return "movdqa\t{%1, %0|%0, %1}";
+       case MODE_DI:
+         return "movq\t{%1, %0|%0, %1}";
        case MODE_DF:
          return "movsd\t{%1, %0|%0, %1}";
+       case MODE_V1DF:
+         return "movlpd\t{%1, %0|%0, %1}";
+       case MODE_V2SF:
+         return "movlps\t{%1, %0|%0, %1}";
        default:
          abort ();
        }
-    case 7:
-      if (get_attr_mode (insn) == MODE_V2DF)
-       return "movlpd\t{%1, %0|%0, %1}";
-      else
-       return "movsd\t{%1, %0|%0, %1}";
-    case 8:
-      return "movsd\t{%1, %0|%0, %1}";
 
     default:
       abort();
 }
   [(set_attr "type" "fmov,fmov,fmov,multi,multi,ssemov,ssemov,ssemov,ssemov")
    (set (attr "mode")
-        (cond [(eq_attr "alternative" "3,4")
+        (cond [(eq_attr "alternative" "0,1,2")
+                (const_string "DF")
+              (eq_attr "alternative" "3,4")
                 (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")
+                      ]
+                  (const_string "V2SF"))
+
               /* xorps is one byte shorter.  */
               (eq_attr "alternative" "5")
                 (cond [(ne (symbol_ref "optimize_size")
                          (const_string "V4SF")
                        (ne (symbol_ref "TARGET_SSE_LOAD0_BY_PXOR")
                            (const_int 0))
-                         (const_string "TI")]
+                         (const_string "TI")
+                      ]
                       (const_string "V2DF"))
+
               /* For architectures resolving dependencies on
                  whole SSE registers use APD move to break dependency
-                 chains, otherwise use short move to avoid extra work.  
+                 chains, otherwise use short move to avoid extra work.
 
                  movaps encodes one byte shorter.  */
               (eq_attr "alternative" "6")
                 (cond
-                 [(ne (symbol_ref "optimize_size")
-                      (const_int 0))
-                    (const_string "V4SF")
-                  (ne (symbol_ref "TARGET_SSE_PARTIAL_REG_DEPENDENCY")
-                      (const_int 0))
-                    (const_string "V2DF")]
+                  [(ne (symbol_ref "optimize_size")
+                       (const_int 0))
+                     (const_string "V4SF")
+                   (ne (symbol_ref "TARGET_SSE_PARTIAL_REG_DEPENDENCY")
+                       (const_int 0))
+                     (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")
                 (if_then_else
-                  (ne (symbol_ref "TARGET_SSE_PARTIAL_REGS")
+                  (ne (symbol_ref "TARGET_SSE_SPLIT_REGS")
                       (const_int 0))
-                  (const_string "V2DF")
-                  (const_string "DF"))]
-              (const_string "DF")))])
+                  (const_string "V1DF")
+                  (const_string "DF"))
+             ]
+             (const_string "DF")))])
 
 (define_split
   [(set (match_operand:DF 0 "nonimmediate_operand" "")
   "ix86_split_long_move (operands); DONE;")
 
 (define_insn "*swapdf"
-  [(set (match_operand:DF 0 "register_operand" "+f")
-       (match_operand:DF 1 "register_operand" "+f"))
+  [(set (match_operand:DF 0 "fp_register_operand" "+f")
+       (match_operand:DF 1 "fp_register_operand" "+f"))
    (set (match_dup 1)
        (match_dup 0))]
-  "reload_completed || !TARGET_SSE2"
+  "reload_completed || TARGET_80387"
 {
   if (STACK_TOP_P (operands[0]))
     return "fxch\t%1";
   [(set (match_operand:XF 0 "push_operand" "")
        (match_operand:XF 1 "any_fp_register_operand" ""))]
   "!TARGET_64BIT"
-  [(set (reg:SI 7) (plus:SI (reg:SI 7) (match_dup 2)))
-   (set (mem:XF (reg:SI 7)) (match_dup 1))]
+  [(set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG) (match_dup 2)))
+   (set (mem:XF (reg:SI SP_REG)) (match_dup 1))]
   "operands[2] = GEN_INT (TARGET_128BIT_LONG_DOUBLE ? -16 : -12);")
 
 (define_split
   [(set (match_operand:XF 0 "push_operand" "")
        (match_operand:XF 1 "any_fp_register_operand" ""))]
   "TARGET_64BIT"
-  [(set (reg:DI 7) (plus:DI (reg:DI 7) (match_dup 2)))
-   (set (mem:XF (reg:DI 7)) (match_dup 1))]
+  [(set (reg:DI SP_REG) (plus:DI (reg:DI SP_REG) (match_dup 2)))
+   (set (mem:XF (reg:DI SP_REG)) (match_dup 1))]
   "operands[2] = GEN_INT (TARGET_128BIT_LONG_DOUBLE ? -16 : -12);")
 
 ;; Do not use integer registers when optimizing for size
   switch (which_alternative)
     {
     case 0:
-      if (REG_P (operands[1])
-          && find_regno_note (insn, REG_DEAD, REGNO (operands[1])))
-       {
-         if (REGNO (operands[0]) == FIRST_STACK_REG
-             && TARGET_USE_FFREEP)
-           return "ffreep\t%y0";
-          return "fstp\t%y0";
-       }
-      else if (STACK_TOP_P (operands[0]))
-        return "fld%z1\t%y1";
-      else
-        return "fst\t%y0";
+      return output_387_reg_move (insn, operands);
 
     case 1:
       /* There is no non-popping store to memory for XFmode.  So if
   switch (which_alternative)
     {
     case 0:
-      if (REG_P (operands[1])
-          && find_regno_note (insn, REG_DEAD, REGNO (operands[1])))
-       {
-         if (REGNO (operands[0]) == FIRST_STACK_REG
-             && TARGET_USE_FFREEP)
-           return "ffreep\t%y0";
-          return "fstp\t%y0";
-       }
-      else if (STACK_TOP_P (operands[0]))
-        return "fld%z1\t%y1";
-      else
-        return "fst\t%y0";
+      return output_387_reg_move (insn, operands);
 
     case 1:
       /* There is no non-popping store to memory for XFmode.  So if
        (match_operand:XF 1 "register_operand" "+f"))
    (set (match_dup 1)
        (match_dup 0))]
-  ""
+  "TARGET_80387"
 {
   if (STACK_TOP_P (operands[0]))
     return "fxch\t%1";
 }
   [(set_attr "type" "fxch")
    (set_attr "mode" "XF")])
+
+(define_expand "movtf"
+  [(set (match_operand:TF 0 "nonimmediate_operand" "")
+       (match_operand:TF 1 "nonimmediate_operand" ""))]
+  "TARGET_64BIT"
+{
+  ix86_expand_move (TFmode, operands);
+  DONE;
+})
+
+(define_insn "*movtf_internal"
+  [(set (match_operand:TF 0 "nonimmediate_operand" "=r,o,x,x,xm")
+       (match_operand:TF 1 "general_operand" "riFo,riF,C,xm,x"))]
+  "TARGET_64BIT
+   && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)"
+{
+  switch (which_alternative)
+    {
+    case 0:
+    case 1:
+      return "#";
+    case 2:
+      if (get_attr_mode (insn) == MODE_V4SF)
+       return "xorps\t%0, %0";
+      else
+       return "pxor\t%0, %0";
+    case 3:
+    case 4:
+      if (get_attr_mode (insn) == MODE_V4SF)
+       return "movaps\t{%1, %0|%0, %1}";
+      else
+       return "movdqa\t{%1, %0|%0, %1}";
+    default:
+      abort ();
+    }
+}
+  [(set_attr "type" "*,*,ssemov,ssemov,ssemov")
+   (set (attr "mode")
+        (cond [(eq_attr "alternative" "2,3")
+                (if_then_else
+                  (ne (symbol_ref "optimize_size")
+                      (const_int 0))
+                  (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_size")
+                           (const_int 0)))
+                  (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;")
 \f
 ;; Zero extension instructions
 
 (define_insn "zero_extendhisi2_and"
   [(set (match_operand:SI 0 "register_operand" "=r")
      (zero_extend:SI (match_operand:HI 1 "register_operand" "0")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_ZERO_EXTEND_WITH_AND && !optimize_size"
   "#"
   [(set_attr "type" "alu1")
 (define_split
   [(set (match_operand:SI 0 "register_operand" "")
        (zero_extend:SI (match_operand:HI 1 "register_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "reload_completed && TARGET_ZERO_EXTEND_WITH_AND && !optimize_size"
   [(parallel [(set (match_dup 0) (and:SI (match_dup 0) (const_int 65535)))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   "")
 
 (define_insn "*zero_extendhisi2_movzwl"
   [(parallel
     [(set (match_operand:HI 0 "register_operand" "")
        (zero_extend:HI (match_operand:QI 1 "nonimmediate_operand" "")))
-     (clobber (reg:CC 17))])]
+     (clobber (reg:CC FLAGS_REG))])]
   ""
   "")
 
 (define_insn "*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 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_ZERO_EXTEND_WITH_AND && !optimize_size"
   "#"
   [(set_attr "type" "alu1")
 (define_insn "*zero_extendqihi2_movzbw_and"
   [(set (match_operand:HI 0 "register_operand" "=r,r")
      (zero_extend:HI (match_operand:QI 1 "nonimmediate_operand" "qm,0")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "!TARGET_ZERO_EXTEND_WITH_AND || optimize_size"
   "#"
   [(set_attr "type" "imovx,alu1")
 (define_split
   [(set (match_operand:HI 0 "register_operand" "")
        (zero_extend:HI (match_operand:QI 1 "nonimmediate_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "reload_completed 
    && (!TARGET_ZERO_EXTEND_WITH_AND || optimize_size)
    && (!REG_P (operands[1]) || ANY_QI_REG_P (operands[1]))"
 (define_split
   [(set (match_operand:HI 0 "register_operand" "")
        (zero_extend:HI (match_operand:QI 1 "nonimmediate_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "reload_completed
    && ANY_QI_REG_P (operands[0])
    && (TARGET_ZERO_EXTEND_WITH_AND && !optimize_size)
 (define_split
   [(set (match_operand:HI 0 "register_operand" "")
        (zero_extend:HI (match_operand:QI 1 "register_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "reload_completed
    && true_regnum (operands[0]) == true_regnum (operands[1])"
   [(parallel [(set (match_dup 0) (and:HI (match_dup 0) (const_int 255)))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   "")
 
 (define_expand "zero_extendqisi2"
   [(parallel
     [(set (match_operand:SI 0 "register_operand" "")
        (zero_extend:SI (match_operand:QI 1 "nonimmediate_operand" "")))
-     (clobber (reg:CC 17))])]
+     (clobber (reg:CC FLAGS_REG))])]
   ""
   "")
 
 (define_insn "*zero_extendqisi2_and"
   [(set (match_operand:SI 0 "register_operand" "=r,?&q")
      (zero_extend:SI (match_operand:QI 1 "nonimmediate_operand" "0,qm")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_ZERO_EXTEND_WITH_AND && !optimize_size"
   "#"
   [(set_attr "type" "alu1")
 (define_insn "*zero_extendqisi2_movzbw_and"
   [(set (match_operand:SI 0 "register_operand" "=r,r")
      (zero_extend:SI (match_operand:QI 1 "nonimmediate_operand" "qm,0")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "!TARGET_ZERO_EXTEND_WITH_AND || optimize_size"
   "#"
   [(set_attr "type" "imovx,alu1")
 (define_split
   [(set (match_operand:SI 0 "register_operand" "")
        (zero_extend:SI (match_operand:QI 1 "nonimmediate_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "reload_completed 
    && (!TARGET_ZERO_EXTEND_WITH_AND || optimize_size)
    && (!REG_P (operands[1]) || ANY_QI_REG_P (operands[1]))"
 (define_split
   [(set (match_operand:SI 0 "register_operand" "")
        (zero_extend:SI (match_operand:QI 1 "nonimmediate_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "reload_completed
    && ANY_QI_REG_P (operands[0])
    && (ANY_QI_REG_P (operands[1]) || GET_CODE (operands[1]) == MEM)
 (define_split
   [(set (match_operand:SI 0 "register_operand" "")
        (zero_extend:SI (match_operand:QI 1 "register_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "reload_completed
    && true_regnum (operands[0]) == true_regnum (operands[1])"
   [(parallel [(set (match_dup 0) (and:SI (match_dup 0) (const_int 255)))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   "")
 
 ;; %%% Kill me once multi-word ops are sane.
 (define_insn "zero_extendsidi2_32"
   [(set (match_operand:DI 0 "nonimmediate_operand" "=r,?r,?*o,!?y,!?Y")
        (zero_extend:DI (match_operand:SI 1 "nonimmediate_operand" "0,rm,r,m,m")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "!TARGET_64BIT && !TARGET_INTER_UNIT_MOVES"
   "@
    #
 (define_insn "*zero_extendsidi2_32_1"
   [(set (match_operand:DI 0 "nonimmediate_operand" "=r,?r,?*o,!?y,!?Y")
        (zero_extend:DI (match_operand:SI 1 "nonimmediate_operand" "0,rm,r,rm,rm")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "!TARGET_64BIT && TARGET_INTER_UNIT_MOVES"
   "@
    #
 (define_split 
   [(set (match_operand:DI 0 "register_operand" "")
        (zero_extend:DI (match_operand:SI 1 "register_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "!TARGET_64BIT && reload_completed
    && true_regnum (operands[0]) == true_regnum (operands[1])"
   [(set (match_dup 4) (const_int 0))]
 (define_split 
   [(set (match_operand:DI 0 "nonimmediate_operand" "")
        (zero_extend:DI (match_operand:SI 1 "general_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "!TARGET_64BIT && reload_completed
    && !SSE_REG_P (operands[0]) && !MMX_REG_P (operands[0])"
   [(set (match_dup 3) (match_dup 1))
 (define_expand "extendsidi2"
   [(parallel [(set (match_operand:DI 0 "register_operand" "")
                   (sign_extend:DI (match_operand:SI 1 "register_operand" "")))
-             (clobber (reg:CC 17))
+             (clobber (reg:CC FLAGS_REG))
              (clobber (match_scratch:SI 2 ""))])]
   ""
 {
 (define_insn "*extendsidi2_1"
   [(set (match_operand:DI 0 "nonimmediate_operand" "=*A,r,?r,?*o")
        (sign_extend:DI (match_operand:SI 1 "register_operand" "0,0,r,r")))
-   (clobber (reg:CC 17))
+   (clobber (reg:CC FLAGS_REG))
    (clobber (match_scratch:SI 2 "=X,X,X,&r"))]
   "!TARGET_64BIT"
   "#")
 (define_split 
   [(set (match_operand:DI 0 "memory_operand" "")
        (sign_extend:DI (match_operand:SI 1 "register_operand" "")))
-   (clobber (reg:CC 17))
+   (clobber (reg:CC FLAGS_REG))
    (clobber (match_operand:SI 2 "register_operand" ""))]
   "(reload_completed
     && dead_or_set_p (insn, operands[1])
     && !reg_mentioned_p (operands[1], operands[0]))"
   [(set (match_dup 3) (match_dup 1))
    (parallel [(set (match_dup 1) (ashiftrt:SI (match_dup 1) (const_int 31)))
-             (clobber (reg:CC 17))])
+             (clobber (reg:CC FLAGS_REG))])
    (set (match_dup 4) (match_dup 1))]
   "split_di (&operands[0], 1, &operands[3], &operands[4]);")
 
 (define_split 
   [(set (match_operand:DI 0 "memory_operand" "")
        (sign_extend:DI (match_operand:SI 1 "register_operand" "")))
-   (clobber (reg:CC 17))
+   (clobber (reg:CC FLAGS_REG))
    (clobber (match_operand:SI 2 "register_operand" ""))]
   "reload_completed"
   [(const_int 0)]
 (define_split 
   [(set (match_operand:DI 0 "register_operand" "")
        (sign_extend:DI (match_operand:SI 1 "register_operand" "")))
-   (clobber (reg:CC 17))
+   (clobber (reg:CC FLAGS_REG))
    (clobber (match_scratch:SI 2 ""))]
   "reload_completed"
   [(const_int 0)]
   [(set (match_operand:DF 0 "push_operand" "")
        (float_extend:DF (match_operand:SF 1 "fp_register_operand" "")))]
   "!TARGET_64BIT"
-  [(set (reg:SI 7) (plus:SI (reg:SI 7) (const_int -8)))
-   (set (mem:DF (reg:SI 7)) (float_extend:DF (match_dup 1)))])
+  [(set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG) (const_int -8)))
+   (set (mem:DF (reg:SI SP_REG)) (float_extend:DF (match_dup 1)))])
 
 (define_split
   [(set (match_operand:DF 0 "push_operand" "")
        (float_extend:DF (match_operand:SF 1 "fp_register_operand" "")))]
   "TARGET_64BIT"
-  [(set (reg:DI 7) (plus:DI (reg:DI 7) (const_int -8)))
-   (set (mem:DF (reg:DI 7)) (float_extend:DF (match_dup 1)))])
+  [(set (reg:DI SP_REG) (plus:DI (reg:DI SP_REG) (const_int -8)))
+   (set (mem:DF (reg:DI SP_REG)) (float_extend:DF (match_dup 1)))])
 
 (define_insn "*dummy_extendsfxf2"
   [(set (match_operand:XF 0 "push_operand" "=<")
   [(set (match_operand:XF 0 "push_operand" "")
        (float_extend:XF (match_operand:SF 1 "fp_register_operand" "")))]
   ""
-  [(set (reg:SI 7) (plus:SI (reg:SI 7) (match_dup 2)))
-   (set (mem:XF (reg:SI 7)) (float_extend:XF (match_dup 1)))]
+  [(set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG) (match_dup 2)))
+   (set (mem:XF (reg:SI SP_REG)) (float_extend:XF (match_dup 1)))]
   "operands[2] = GEN_INT (TARGET_128BIT_LONG_DOUBLE ? -16 : -12);")
 
 (define_split
   [(set (match_operand:XF 0 "push_operand" "")
        (float_extend:XF (match_operand:SF 1 "fp_register_operand" "")))]
   "TARGET_64BIT"
-  [(set (reg:DI 7) (plus:DI (reg:DI 7) (match_dup 2)))
-   (set (mem:DF (reg:DI 7)) (float_extend:XF (match_dup 1)))]
+  [(set (reg:DI SP_REG) (plus:DI (reg:DI SP_REG) (match_dup 2)))
+   (set (mem:DF (reg:DI SP_REG)) (float_extend:XF (match_dup 1)))]
   "operands[2] = GEN_INT (TARGET_128BIT_LONG_DOUBLE ? -16 : -12);")
 
 (define_split
   [(set (match_operand:XF 0 "push_operand" "")
        (float_extend:XF (match_operand:DF 1 "fp_register_operand" "")))]
   ""
-  [(set (reg:SI 7) (plus:SI (reg:SI 7) (match_dup 2)))
-   (set (mem:DF (reg:SI 7)) (float_extend:XF (match_dup 1)))]
+  [(set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG) (match_dup 2)))
+   (set (mem:DF (reg:SI SP_REG)) (float_extend:XF (match_dup 1)))]
   "operands[2] = GEN_INT (TARGET_128BIT_LONG_DOUBLE ? -16 : -12);")
 
 (define_split
   [(set (match_operand:XF 0 "push_operand" "")
        (float_extend:XF (match_operand:DF 1 "fp_register_operand" "")))]
   "TARGET_64BIT"
-  [(set (reg:DI 7) (plus:DI (reg:DI 7) (match_dup 2)))
-   (set (mem:XF (reg:DI 7)) (float_extend:XF (match_dup 1)))]
+  [(set (reg:DI SP_REG) (plus:DI (reg:DI SP_REG) (match_dup 2)))
+   (set (mem:XF (reg:DI SP_REG)) (float_extend:XF (match_dup 1)))]
   "operands[2] = GEN_INT (TARGET_128BIT_LONG_DOUBLE ? -16 : -12);")
 
 (define_expand "extendsfdf2"
   [(set (match_operand:DF 0 "nonimmediate_operand" "")
         (float_extend:DF (match_operand:SF 1 "general_operand" "")))]
-  "TARGET_80387 || TARGET_SSE2"
+  "TARGET_80387 || (TARGET_SSE2 && TARGET_SSE_MATH)"
 {
   /* ??? Needed for compress_float_constant since all fp constants
      are LEGITIMATE_CONSTANT_P.  */
     operands[1] = force_reg (SFmode, operands[1]);
 })
 
-(define_insn "*extendsfdf2_1"
-  [(set (match_operand:DF 0 "nonimmediate_operand" "=f#Y,mf#Y,Y#f")
+(define_insn "*extendsfdf2_mixed"
+  [(set (match_operand:DF 0 "nonimmediate_operand" "=f#Y,m#fY,Y#f")
         (float_extend:DF (match_operand:SF 1 "nonimmediate_operand" "fm#Y,f#Y,mY#f")))]
-  "(TARGET_80387 || TARGET_SSE2)
+  "TARGET_SSE2 && TARGET_MIX_SSE_I387
    && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)"
 {
   switch (which_alternative)
     {
     case 0:
-      if (REG_P (operands[1])
-          && find_regno_note (insn, REG_DEAD, REGNO (operands[1])))
-        return "fstp\t%y0";
-      else if (STACK_TOP_P (operands[0]))
-        return "fld%z1\t%y1";
-      else
-        return "fst\t%y0";
+      return output_387_reg_move (insn, operands);
 
     case 1:
       if (find_regno_note (insn, REG_DEAD, REGNO (operands[1])))
         return "fstp%z0\t%y0";
-
       else
         return "fst%z0\t%y0";
+
     case 2:
       return "cvtss2sd\t{%1, %0|%0, %1}";
 
   [(set_attr "type" "fmov,fmov,ssecvt")
    (set_attr "mode" "SF,XF,DF")])
 
-(define_insn "*extendsfdf2_1_sse_only"
+(define_insn "*extendsfdf2_sse"
   [(set (match_operand:DF 0 "register_operand" "=Y")
         (float_extend:DF (match_operand:SF 1 "nonimmediate_operand" "mY")))]
-  "!TARGET_80387 && TARGET_SSE2
+  "TARGET_SSE2 && TARGET_SSE_MATH
    && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)"
   "cvtss2sd\t{%1, %0|%0, %1}"
   [(set_attr "type" "ssecvt")
    (set_attr "mode" "DF")])
 
+(define_insn "*extendsfdf2_i387"
+  [(set (match_operand:DF 0 "nonimmediate_operand" "=f,m")
+        (float_extend:DF (match_operand:SF 1 "nonimmediate_operand" "fm,f")))]
+  "TARGET_80387
+   && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)"
+{
+  switch (which_alternative)
+    {
+    case 0:
+      return output_387_reg_move (insn, operands);
+
+    case 1:
+      if (find_regno_note (insn, REG_DEAD, REGNO (operands[1])))
+        return "fstp%z0\t%y0";
+      else
+        return "fst%z0\t%y0";
+
+    default:
+      abort ();
+    }
+}
+  [(set_attr "type" "fmov")
+   (set_attr "mode" "SF,XF")])
+
 (define_expand "extendsfxf2"
   [(set (match_operand:XF 0 "nonimmediate_operand" "")
         (float_extend:XF (match_operand:SF 1 "general_operand" "")))]
     operands[1] = force_reg (SFmode, operands[1]);
 })
 
-(define_insn "*extendsfxf2_1"
+(define_insn "*extendsfxf2_i387"
   [(set (match_operand:XF 0 "nonimmediate_operand" "=f,m")
         (float_extend:XF (match_operand:SF 1 "nonimmediate_operand" "fm,f")))]
   "TARGET_80387
   switch (which_alternative)
     {
     case 0:
-      if (REG_P (operands[1])
-          && find_regno_note (insn, REG_DEAD, REGNO (operands[1])))
-        return "fstp\t%y0";
-      else if (STACK_TOP_P (operands[0]))
-        return "fld%z1\t%y1";
-      else
-        return "fst\t%y0";
+      return output_387_reg_move (insn, operands);
 
     case 1:
       /* There is no non-popping store to memory for XFmode.  So if
         we need one, follow the store with a load.  */
-      if (! find_regno_note (insn, REG_DEAD, REGNO (operands[1])))
-        return "fstp%z0\t%y0\n\tfld%z0\t%y0";
-      else
+      if (find_regno_note (insn, REG_DEAD, REGNO (operands[1])))
         return "fstp%z0\t%y0";
+      else
+        return "fstp%z0\t%y0\n\tfld%z0\t%y0";
 
     default:
       abort ();
     operands[1] = force_reg (DFmode, operands[1]);
 })
 
-(define_insn "*extenddfxf2_1"
+(define_insn "*extenddfxf2_i387"
   [(set (match_operand:XF 0 "nonimmediate_operand" "=f,m")
         (float_extend:XF (match_operand:DF 1 "nonimmediate_operand" "fm,f")))]
   "TARGET_80387
   switch (which_alternative)
     {
     case 0:
-      if (REG_P (operands[1])
-          && find_regno_note (insn, REG_DEAD, REGNO (operands[1])))
-        return "fstp\t%y0";
-      else if (STACK_TOP_P (operands[0]))
-        return "fld%z1\t%y1";
-      else
-        return "fst\t%y0";
+      return output_387_reg_move (insn, operands);
 
     case 1:
       /* There is no non-popping store to memory for XFmode.  So if
 ;; insn.  So we pretend we can output to a reg in order to get better
 ;; register preferencing, but we really use a stack slot.
 
-(define_expand "truncdfsf2"
-  [(parallel [(set (match_operand:SF 0 "nonimmediate_operand" "")
-                  (float_truncate:SF
-                   (match_operand:DF 1 "register_operand" "")))
-             (clobber (match_dup 2))])]
-  "TARGET_80387 || TARGET_SSE2"
-  "
-   if (TARGET_80387)
-     operands[2] = assign_386_stack_local (SFmode, 0);
-   else
-     {
-       emit_insn (gen_truncdfsf2_sse_only (operands[0], operands[1]));
-       DONE;
-     }
-")
+;; Conversion from DFmode to SFmode.
 
-(define_insn "*truncdfsf2_1"
-  [(set (match_operand:SF 0 "nonimmediate_operand" "=m,?f#rx,?r#fx,?x#rf")
+(define_expand "truncdfsf2"
+  [(set (match_operand:SF 0 "nonimmediate_operand" "")
        (float_truncate:SF
-        (match_operand:DF 1 "register_operand" "f,f,f,f")))
-   (clobber (match_operand:SF 2 "memory_operand" "=X,m,m,m"))]
-  "TARGET_80387 && !TARGET_SSE2"
+         (match_operand:DF 1 "nonimmediate_operand" "")))]
+  "TARGET_80387 || (TARGET_SSE2 && TARGET_SSE_MATH)"
+{
+  if (MEM_P (operands[0]) && MEM_P (operands[1]))
+    operands[1] = force_reg (DFmode, operands[1]);
+
+  if (TARGET_SSE2 && TARGET_SSE_MATH && !TARGET_MIX_SSE_I387)
+    ;
+  else if (flag_unsafe_math_optimizations)
+    ;
+  else
+    {
+      rtx temp = assign_386_stack_local (SFmode, 0);
+      emit_insn (gen_truncdfsf2_with_temp (operands[0], operands[1], temp));
+      DONE;
+    }
+})
+
+(define_expand "truncdfsf2_with_temp"
+  [(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"   "=m,f,Y")
+        (float_truncate:SF
+          (match_operand:DF 1 "nonimmediate_operand" "f ,f,Ym")))]
+  "TARGET_SSE2 && TARGET_MIX_SSE_I387 && flag_unsafe_math_optimizations"
 {
   switch (which_alternative)
     {
        return "fstp%z0\t%y0";
       else
        return "fst%z0\t%y0";
+    case 1:
+      return output_387_reg_move (insn, operands);
+    case 2:
+      return "cvtsd2ss\t{%1, %0|%0, %1}";
     default:
       abort ();
     }
 }
-  [(set_attr "type" "fmov,multi,multi,multi")
-   (set_attr "mode" "SF,SF,SF,SF")])
+  [(set_attr "type" "fmov,fmov,ssecvt")
+   (set_attr "mode" "SF")])
+
+;; Yes, this one doesn't depend on flag_unsafe_math_optimizations,
+;; because nothing we do here is unsafe.
+(define_insn "*truncdfsf_fast_sse"
+  [(set (match_operand:SF 0 "nonimmediate_operand"   "=Y")
+        (float_truncate:SF
+          (match_operand:DF 1 "nonimmediate_operand" "Ym")))]
+  "TARGET_SSE2 && TARGET_SSE_MATH"
+  "cvtsd2ss\t{%1, %0|%0, %1}"
+  [(set_attr "type" "ssecvt")
+   (set_attr "mode" "SF")])
+
+(define_insn "*truncdfsf_fast_i387"
+  [(set (match_operand:SF 0 "nonimmediate_operand"   "=fm")
+        (float_truncate:SF
+          (match_operand:DF 1 "nonimmediate_operand" "f")))]
+  "TARGET_80387 && flag_unsafe_math_optimizations"
+  "* return output_387_reg_move (insn, operands);"
+  [(set_attr "type" "fmov")
+   (set_attr "mode" "SF")])
 
-(define_insn "*truncdfsf2_1_sse"
-  [(set (match_operand:SF 0 "nonimmediate_operand" "=*!m#fxr,?f#xr,?r#fx,?x#fr,Y#fr")
+(define_insn "*truncdfsf_mixed"
+  [(set (match_operand:SF 0 "nonimmediate_operand"   "=m,?fx*r,Y")
        (float_truncate:SF
-        (match_operand:DF 1 "nonimmediate_operand" "f#Y,f#Y,f#Y,f#Y,mY#f")))
-   (clobber (match_operand:SF 2 "memory_operand" "=X,m,m,m,X"))]
-  "TARGET_80387 && TARGET_SSE2 && !TARGET_SSE_PARTIAL_REGS_FOR_CVTSD2SS"
+         (match_operand:DF 1 "nonimmediate_operand" "f ,f    ,Ym")))
+   (clobber (match_operand:SF 2 "memory_operand"     "=X,m    ,X"))]
+  "TARGET_MIX_SSE_I387"
 {
   switch (which_alternative)
     {
        return "fstp%z0\t%y0";
       else
        return "fst%z0\t%y0";
-    case 4:
+    case 1:
       return "#";
+    case 2:
+      return "cvtsd2ss\t{%1, %0|%0, %1}";
     default:
       abort ();
     }
 }
-  [(set_attr "type" "fmov,multi,multi,multi,ssecvt")
-   (set_attr "mode" "SF,SF,SF,SF,DF")])
+  [(set_attr "type" "fmov,multi,ssecvt")
+   (set_attr "mode" "SF")])
 
-(define_insn "*truncdfsf2_1_sse_nooverlap"
-  [(set (match_operand:SF 0 "nonimmediate_operand" "=*!m,?f#rx,?r#fx,?x#rf,&Y")
+(define_insn "*truncdfsf_i387"
+  [(set (match_operand:SF 0 "nonimmediate_operand" "=m,?fx*r")
        (float_truncate:SF
-        (match_operand:DF 1 "nonimmediate_operand" "f#Y,f#Y,f#Y,f#Y,mY#f")))
-   (clobber (match_operand:SF 2 "memory_operand" "=X,m,m,m,X"))]
-  "TARGET_80387 && TARGET_SSE2 && TARGET_SSE_PARTIAL_REGS_FOR_CVTSD2SS"
+         (match_operand:DF 1 "nonimmediate_operand" "f,f")))
+   (clobber (match_operand:SF 2 "memory_operand" "=X,m"))]
+  "TARGET_80387"
 {
   switch (which_alternative)
     {
        return "fstp%z0\t%y0";
       else
        return "fst%z0\t%y0";
-    case 4:
+    case 1:
       return "#";
     default:
       abort ();
     }
 }
-  [(set_attr "type" "fmov,multi,multi,multi,ssecvt")
-   (set_attr "mode" "SF,SF,SF,SF,DF")])
+  [(set_attr "type" "fmov,multi")
+   (set_attr "mode" "SF")])
+
+(define_split
+  [(set (match_operand:SF 0 "register_operand" "")
+       (float_truncate:SF
+        (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))]
+{
+  operands[1] = gen_rtx_REG (SFmode, true_regnum (operands[1]));
+})
+
+;; Conversion from XFmode to SFmode.
+
+(define_expand "truncxfsf2"
+  [(parallel [(set (match_operand:SF 0 "nonimmediate_operand" "")
+                  (float_truncate:SF
+                   (match_operand:XF 1 "register_operand" "")))
+             (clobber (match_dup 2))])]
+  "TARGET_80387"
+{
+  if (flag_unsafe_math_optimizations)
+    {
+      rtx reg = REG_P (operands[0]) ? operands[0] : gen_reg_rtx (SFmode);
+      emit_insn (gen_truncxfsf2_i387_noop (reg, operands[1]));
+      if (reg != operands[0])
+       emit_move_insn (operands[0], reg);
+      DONE;
+    }
+  else
+    operands[2] = assign_386_stack_local (SFmode, 0);
+})
 
-(define_insn "*truncdfsf2_2"
-  [(set (match_operand:SF 0 "nonimmediate_operand" "=Y,Y,!m")
+(define_insn "*truncxfsf2_mixed"
+  [(set (match_operand:SF 0 "nonimmediate_operand" "=m,?f#rx,?r#fx,?x#rf")
        (float_truncate:SF
-        (match_operand:DF 1 "nonimmediate_operand" "Y,mY,f#Y")))]
-  "TARGET_80387 && TARGET_SSE2 && !TARGET_SSE_PARTIAL_REGS_FOR_CVTSD2SS
-   && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)"
+        (match_operand:XF 1 "register_operand" "f,f,f,f")))
+   (clobber (match_operand:SF 2 "memory_operand" "=X,m,m,m"))]
+  "TARGET_MIX_SSE_I387"
 {
   switch (which_alternative)
     {
     case 0:
-    case 1:
-      return "cvtsd2ss\t{%1, %0|%0, %1}";
-    case 2:
       if (find_regno_note (insn, REG_DEAD, REGNO (operands[1])))
        return "fstp%z0\t%y0";
       else
        return "fst%z0\t%y0";
     default:
-      abort ();
+      abort();
     }
 }
-  [(set_attr "type" "ssecvt,ssecvt,fmov")
-   (set_attr "athlon_decode" "vector,double,*")
-   (set_attr "mode" "SF,SF,SF")])
+  [(set_attr "type" "fmov,multi,multi,multi")
+   (set_attr "mode" "SF")])
+
+(define_insn "truncxfsf2_i387_noop"
+  [(set (match_operand:SF 0 "register_operand" "=f")
+       (float_truncate:SF (match_operand:XF 1 "register_operand" "f")))]
+  "TARGET_80387 && flag_unsafe_math_optimizations"
+{
+  return output_387_reg_move (insn, operands);
+}
+  [(set_attr "type" "fmov")
+   (set_attr "mode" "SF")])
 
-(define_insn "*truncdfsf2_2_nooverlap"
-  [(set (match_operand:SF 0 "nonimmediate_operand" "=&Y,!m")
+(define_insn "*truncxfsf2_i387"
+  [(set (match_operand:SF 0 "nonimmediate_operand" "=m,?f#r,?r#f")
        (float_truncate:SF
-        (match_operand:DF 1 "nonimmediate_operand" "mY,f")))]
-  "TARGET_80387 && TARGET_SSE2 && TARGET_SSE_PARTIAL_REGS_FOR_CVTSD2SS
-   && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)"
+        (match_operand:XF 1 "register_operand" "f,f,f")))
+   (clobber (match_operand:SF 2 "memory_operand" "=X,m,m"))]
+  "TARGET_80387"
 {
   switch (which_alternative)
     {
     case 0:
-      return "#";
-    case 1:
       if (find_regno_note (insn, REG_DEAD, REGNO (operands[1])))
        return "fstp%z0\t%y0";
       else
       abort ();
     }
 }
-  [(set_attr "type" "ssecvt,fmov")
-   (set_attr "mode" "DF,SF")])
+  [(set_attr "type" "fmov,multi,multi")
+   (set_attr "mode" "SF")])
 
-(define_insn "*truncdfsf2_3"
+(define_insn "*truncxfsf2_i387_1"
   [(set (match_operand:SF 0 "memory_operand" "=m")
        (float_truncate:SF
-        (match_operand:DF 1 "register_operand" "f")))]
+        (match_operand:XF 1 "register_operand" "f")))]
   "TARGET_80387"
 {
   if (find_regno_note (insn, REG_DEAD, REGNO (operands[1])))
   [(set_attr "type" "fmov")
    (set_attr "mode" "SF")])
 
-(define_insn "truncdfsf2_sse_only"
-  [(set (match_operand:SF 0 "register_operand" "=Y,Y")
-       (float_truncate:SF
-        (match_operand:DF 1 "nonimmediate_operand" "Y,mY")))]
-  "!TARGET_80387 && TARGET_SSE2 && !TARGET_SSE_PARTIAL_REGS_FOR_CVTSD2SS"
-  "cvtsd2ss\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "athlon_decode" "vector,double")
-   (set_attr "mode" "SF")])
-
-(define_insn "*truncdfsf2_sse_only_nooverlap"
-  [(set (match_operand:SF 0 "register_operand" "=&Y")
+(define_split
+  [(set (match_operand:SF 0 "register_operand" "")
        (float_truncate:SF
-        (match_operand:DF 1 "nonimmediate_operand" "mY")))]
-  "!TARGET_80387 && TARGET_SSE2 && TARGET_SSE_PARTIAL_REGS_FOR_CVTSD2SS"
-  "#"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "DF")])
+        (match_operand:XF 1 "register_operand" "")))
+   (clobber (match_operand:SF 2 "memory_operand" ""))]
+  "TARGET_80387 && reload_completed"
+  [(set (match_dup 2) (float_truncate:SF (match_dup 1)))
+   (set (match_dup 0) (match_dup 2))]
+  "")
 
 (define_split
   [(set (match_operand:SF 0 "memory_operand" "")
        (float_truncate:SF
-        (match_operand:DF 1 "register_operand" "")))
+        (match_operand:XF 1 "register_operand" "")))
    (clobber (match_operand:SF 2 "memory_operand" ""))]
   "TARGET_80387"
   [(set (match_dup 0) (float_truncate:SF (match_dup 1)))]
   "")
 
-; Avoid possible reformatting penalty on the destination by first
-; zeroing it out
-(define_split
-  [(set (match_operand:SF 0 "register_operand" "")
-       (float_truncate:SF
-        (match_operand:DF 1 "nonimmediate_operand" "")))
-   (clobber (match_operand 2 "" ""))]
-  "TARGET_80387 && reload_completed
-   && SSE_REG_P (operands[0])
-   && !STACK_REG_P (operands[1])"
-  [(const_int 0)]
-{
-  rtx src, dest;
-  if (!TARGET_SSE_PARTIAL_REGS_FOR_CVTSD2SS)
-    emit_insn (gen_truncdfsf2_sse_only (operands[0], operands[1]));
-  else
-    {
-      dest = simplify_gen_subreg (V4SFmode, operands[0], SFmode, 0);
-      src = simplify_gen_subreg (V2DFmode, operands[1], DFmode, 0);
-      /* simplify_gen_subreg refuses to widen memory references.  */
-      if (GET_CODE (src) == SUBREG)
-       alter_subreg (&src);
-      if (reg_overlap_mentioned_p (operands[0], operands[1]))
-       abort ();
-      emit_insn (gen_sse_clrv4sf (dest, CONST0_RTX (V4SFmode)));
-      emit_insn (gen_cvtsd2ss (dest, dest, src));
-    }
-  DONE;
-})
-
-(define_split
-  [(set (match_operand:SF 0 "register_operand" "")
-       (float_truncate:SF
-        (match_operand:DF 1 "nonimmediate_operand" "")))]
-  "TARGET_80387 && reload_completed
-   && SSE_REG_P (operands[0]) && TARGET_SSE_PARTIAL_REGS_FOR_CVTSD2SS"
-  [(const_int 0)]
-{
-  rtx src, dest;
-  dest = simplify_gen_subreg (V4SFmode, operands[0], SFmode, 0);
-  src = simplify_gen_subreg (V2DFmode, operands[1], DFmode, 0);
-  /* simplify_gen_subreg refuses to widen memory references.  */
-  if (GET_CODE (src) == SUBREG)
-    alter_subreg (&src);
-  if (reg_overlap_mentioned_p (operands[0], operands[1]))
-    abort ();
-  emit_insn (gen_sse_clrv4sf (dest, CONST0_RTX (V4SFmode)));
-  emit_insn (gen_cvtsd2ss (dest, dest, src));
-  DONE;
-})
-
-(define_split
-  [(set (match_operand:SF 0 "register_operand" "")
-       (float_truncate:SF
-        (match_operand:DF 1 "fp_register_operand" "")))
-   (clobber (match_operand:SF 2 "memory_operand" ""))]
-  "TARGET_80387 && reload_completed"
-  [(set (match_dup 2) (float_truncate:SF (match_dup 1)))
-   (set (match_dup 0) (match_dup 2))]
-  "")
+;; Conversion from XFmode to DFmode.
 
-(define_expand "truncxfsf2"
-  [(parallel [(set (match_operand:SF 0 "nonimmediate_operand" "")
-                  (float_truncate:SF
+(define_expand "truncxfdf2"
+  [(parallel [(set (match_operand:DF 0 "nonimmediate_operand" "")
+                  (float_truncate:DF
                    (match_operand:XF 1 "register_operand" "")))
              (clobber (match_dup 2))])]
   "TARGET_80387"
-  "operands[2] = assign_386_stack_local (SFmode, 0);")
+{
+  if (flag_unsafe_math_optimizations)
+    {
+      rtx reg = REG_P (operands[0]) ? operands[0] : gen_reg_rtx (DFmode);
+      emit_insn (gen_truncxfdf2_i387_noop (reg, operands[1]));
+      if (reg != operands[0])
+       emit_move_insn (operands[0], reg);
+      DONE;
+    }
+  else
+    operands[2] = assign_386_stack_local (DFmode, 0);
+})
 
-(define_insn "*truncxfsf2_1"
-  [(set (match_operand:SF 0 "nonimmediate_operand" "=m,?f#rx,?r#fx,?x#rf")
-       (float_truncate:SF
+(define_insn "*truncxfdf2_mixed"
+  [(set (match_operand:DF 0 "nonimmediate_operand" "=m,?f#rY,?r#fY,?Y#rf")
+       (float_truncate:DF
         (match_operand:XF 1 "register_operand" "f,f,f,f")))
-   (clobber (match_operand:SF 2 "memory_operand" "=X,m,m,m"))]
-  "TARGET_80387"
+   (clobber (match_operand:DF 2 "memory_operand" "=X,m,m,m"))]
+  "TARGET_SSE2 && TARGET_MIX_SSE_I387"
 {
   switch (which_alternative)
     {
     default:
       abort();
     }
+  abort ();
 }
   [(set_attr "type" "fmov,multi,multi,multi")
-   (set_attr "mode" "SF")])
+   (set_attr "mode" "DF")])
 
-(define_insn "*truncxfsf2_2"
-  [(set (match_operand:SF 0 "memory_operand" "=m")
-       (float_truncate:SF
-        (match_operand:XF 1 "register_operand" "f")))]
-  "TARGET_80387"
+(define_insn "truncxfdf2_i387_noop"
+  [(set (match_operand:DF 0 "register_operand" "=f")
+       (float_truncate:DF (match_operand:XF 1 "register_operand" "f")))]
+  "TARGET_80387 && flag_unsafe_math_optimizations"
 {
-  if (find_regno_note (insn, REG_DEAD, REGNO (operands[1])))
-    return "fstp%z0\t%y0";
-  else
-    return "fst%z0\t%y0";
+  return output_387_reg_move (insn, operands);
 }
   [(set_attr "type" "fmov")
-   (set_attr "mode" "SF")])
-
-(define_split
-  [(set (match_operand:SF 0 "memory_operand" "")
-       (float_truncate:SF
-        (match_operand:XF 1 "register_operand" "")))
-   (clobber (match_operand:SF 2 "memory_operand" ""))]
-  "TARGET_80387"
-  [(set (match_dup 0) (float_truncate:SF (match_dup 1)))]
-  "")
-
-(define_split
-  [(set (match_operand:SF 0 "register_operand" "")
-       (float_truncate:SF
-        (match_operand:XF 1 "register_operand" "")))
-   (clobber (match_operand:SF 2 "memory_operand" ""))]
-  "TARGET_80387 && reload_completed"
-  [(set (match_dup 2) (float_truncate:SF (match_dup 1)))
-   (set (match_dup 0) (match_dup 2))]
-  "")
-
-(define_expand "truncxfdf2"
-  [(parallel [(set (match_operand:DF 0 "nonimmediate_operand" "")
-                  (float_truncate:DF
-                   (match_operand:XF 1 "register_operand" "")))
-             (clobber (match_dup 2))])]
-  "TARGET_80387"
-  "operands[2] = assign_386_stack_local (DFmode, 0);")
+   (set_attr "mode" "DF")])
 
-(define_insn "*truncxfdf2_1"
-  [(set (match_operand:DF 0 "nonimmediate_operand" "=m,?f#rY,?r#fY,?Y#rf")
+(define_insn "*truncxfdf2_i387"
+  [(set (match_operand:DF 0 "nonimmediate_operand" "=m,?f#r,?r#f")
        (float_truncate:DF
-        (match_operand:XF 1 "register_operand" "f,f,f,f")))
-   (clobber (match_operand:DF 2 "memory_operand" "=X,m,m,m"))]
+        (match_operand:XF 1 "register_operand" "f,f,f")))
+   (clobber (match_operand:DF 2 "memory_operand" "=X,m,m"))]
   "TARGET_80387"
 {
   switch (which_alternative)
       else
        return "fst%z0\t%y0";
     default:
-      abort();
+      abort ();
     }
-  abort ();
 }
-  [(set_attr "type" "fmov,multi,multi,multi")
+  [(set_attr "type" "fmov,multi,multi")
    (set_attr "mode" "DF")])
 
-(define_insn "*truncxfdf2_2"
+(define_insn "*truncxfdf2_i387_1"
   [(set (match_operand:DF 0 "memory_operand" "=m")
        (float_truncate:DF
          (match_operand:XF 1 "register_operand" "f")))]
    (set_attr "mode" "DF")])
 
 (define_split
-  [(set (match_operand:DF 0 "memory_operand" "")
+  [(set (match_operand:DF 0 "register_operand" "")
        (float_truncate:DF
         (match_operand:XF 1 "register_operand" "")))
    (clobber (match_operand:DF 2 "memory_operand" ""))]
-  "TARGET_80387"
-  [(set (match_dup 0) (float_truncate:DF (match_dup 1)))]
+  "TARGET_80387 && reload_completed"
+  [(set (match_dup 2) (float_truncate:DF (match_dup 1)))
+   (set (match_dup 0) (match_dup 2))]
   "")
 
 (define_split
-  [(set (match_operand:DF 0 "register_operand" "")
+  [(set (match_operand:DF 0 "memory_operand" "")
        (float_truncate:DF
         (match_operand:XF 1 "register_operand" "")))
    (clobber (match_operand:DF 2 "memory_operand" ""))]
-  "TARGET_80387 && reload_completed"
-  [(set (match_dup 2) (float_truncate:DF (match_dup 1)))
-   (set (match_dup 0) (match_dup 2))]
+  "TARGET_80387"
+  [(set (match_dup 0) (float_truncate:DF (match_dup 1)))]
   "")
-
 \f
 ;; %%% Break up all these bad boys.
 
 (define_expand "fix_truncxfdi2"
   [(parallel [(set (match_operand:DI 0 "nonimmediate_operand" "")
                    (fix:DI (match_operand:XF 1 "register_operand" "")))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   "TARGET_80387"
   "")
 
 (define_expand "fix_truncdfdi2"
   [(parallel [(set (match_operand:DI 0 "nonimmediate_operand" "")
                    (fix:DI (match_operand:DF 1 "register_operand" "")))
-              (clobber (reg:CC 17))])]
-  "TARGET_80387 || (TARGET_SSE2 && TARGET_64BIT)"
+              (clobber (reg:CC FLAGS_REG))])]
+  "TARGET_80387 || (TARGET_64BIT && TARGET_SSE2)"
 {
   if (TARGET_64BIT && TARGET_SSE2)
    {
 (define_expand "fix_truncsfdi2"
   [(parallel [(set (match_operand:DI 0 "nonimmediate_operand" "")
                   (fix:DI (match_operand:SF 1 "register_operand" "")))
-              (clobber (reg:CC 17))])] 
-  "TARGET_80387 || (TARGET_SSE && TARGET_64BIT)"
+              (clobber (reg:CC FLAGS_REG))])] 
+  "TARGET_80387 || (TARGET_64BIT && TARGET_SSE)"
 {
-  if (TARGET_SSE && TARGET_64BIT)
+  if (TARGET_64BIT && TARGET_SSE)
    {
      rtx out = REG_P (operands[0]) ? operands[0] : gen_reg_rtx (DImode);
      emit_insn (gen_fix_truncsfdi_sse (out, operands[1]));
 
 ;; See the comments in i386.h near OPTIMIZE_MODE_SWITCHING for the description
 ;; of the machinery.
-(define_insn_and_split "*fix_truncdi_1"
+(define_insn_and_split "*fix_truncdi_i387"
   [(set (match_operand:DI 0 "nonimmediate_operand" "=m,?r")
        (fix:DI (match_operand 1 "register_operand" "f,f")))
-       (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_80387 && FLOAT_MODE_P (GET_MODE (operands[1]))
    && !reload_completed && !reload_in_progress
    && (!SSE_FLOAT_MODE_P (GET_MODE (operands[1])) || !TARGET_64BIT)"
   DONE;
 }
   [(set_attr "type" "fistp")
+   (set_attr "i387_cw" "trunc")
    (set_attr "mode" "DI")])
 
 (define_insn "fix_truncdi_nomemory"
    && (!SSE_FLOAT_MODE_P (GET_MODE (operands[1])) || !TARGET_64BIT)"
   "#"
   [(set_attr "type" "fistp")
+   (set_attr "i387_cw" "trunc")
    (set_attr "mode" "DI")])
 
 (define_insn "fix_truncdi_memory"
    (clobber (match_scratch:DF 4 "=&1f"))]
   "TARGET_80387 && FLOAT_MODE_P (GET_MODE (operands[1]))
    && (!SSE_FLOAT_MODE_P (GET_MODE (operands[1])) || !TARGET_64BIT)"
-  "* operands[5] = operands[4]; return output_fix_trunc (insn, operands);"
+  "* return output_fix_trunc (insn, operands);"
   [(set_attr "type" "fistp")
+   (set_attr "i387_cw" "trunc")
    (set_attr "mode" "DI")])
 
 (define_split 
 (define_expand "fix_truncxfsi2"
   [(parallel [(set (match_operand:SI 0 "nonimmediate_operand" "")
                   (fix:SI (match_operand:XF 1 "register_operand" "")))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   "TARGET_80387"
   "")
 
 (define_expand "fix_truncdfsi2"
   [(parallel [(set (match_operand:SI 0 "nonimmediate_operand" "")
                   (fix:SI (match_operand:DF 1 "register_operand" "")))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   "TARGET_80387 || TARGET_SSE2"
 {
   if (TARGET_SSE2)
 (define_expand "fix_truncsfsi2"
   [(parallel [(set (match_operand:SI 0 "nonimmediate_operand" "")
                   (fix:SI (match_operand:SF 1 "register_operand" "")))
-             (clobber (reg:CC 17))])] 
+             (clobber (reg:CC FLAGS_REG))])] 
   "TARGET_80387 || TARGET_SSE"
 {
   if (TARGET_SSE)
 
 ;; See the comments in i386.h near OPTIMIZE_MODE_SWITCHING for the description
 ;; of the machinery.
-(define_insn_and_split "*fix_truncsi_1"
+(define_insn_and_split "*fix_truncsi_i387"
   [(set (match_operand:SI 0 "nonimmediate_operand" "=m,?r")
        (fix:SI (match_operand 1 "register_operand" "f,f")))
-        (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_80387 && FLOAT_MODE_P (GET_MODE (operands[1]))
    && !reload_completed && !reload_in_progress
    && !SSE_FLOAT_MODE_P (GET_MODE (operands[1]))"
   DONE;
 }
   [(set_attr "type" "fistp")
+   (set_attr "i387_cw" "trunc")
    (set_attr "mode" "SI")])
 
 (define_insn "fix_truncsi_nomemory"
    && !SSE_FLOAT_MODE_P (GET_MODE (operands[1]))"
   "#"
   [(set_attr "type" "fistp")
+   (set_attr "i387_cw" "trunc")
    (set_attr "mode" "SI")])
 
 (define_insn "fix_truncsi_memory"
    && !SSE_FLOAT_MODE_P (GET_MODE (operands[1]))"
   "* return output_fix_trunc (insn, operands);"
   [(set_attr "type" "fistp")
+   (set_attr "i387_cw" "trunc")
    (set_attr "mode" "SI")])
 
 ;; When SSE available, it is always faster to use it!
 (define_expand "fix_truncxfhi2"
   [(parallel [(set (match_operand:HI 0 "nonimmediate_operand" "")
                    (fix:HI (match_operand:XF 1 "register_operand" "")))
-              (clobber (reg:CC 17))])] 
+              (clobber (reg:CC FLAGS_REG))])] 
   "TARGET_80387"
   "")
 
 (define_expand "fix_truncdfhi2"
   [(parallel [(set (match_operand:HI 0 "nonimmediate_operand" "")
                   (fix:HI (match_operand:DF 1 "register_operand" "")))
-              (clobber (reg:CC 17))])]
+              (clobber (reg:CC FLAGS_REG))])]
   "TARGET_80387 && !TARGET_SSE2"
   "")
 
 (define_expand "fix_truncsfhi2"
   [(parallel [(set (match_operand:HI 0 "nonimmediate_operand" "")
                   (fix:HI (match_operand:SF 1 "register_operand" "")))
-               (clobber (reg:CC 17))])]
+               (clobber (reg:CC FLAGS_REG))])]
   "TARGET_80387 && !TARGET_SSE"
   "")
 
 ;; See the comments in i386.h near OPTIMIZE_MODE_SWITCHING for the description
 ;; of the machinery.
-(define_insn_and_split "*fix_trunchi_1"
+(define_insn_and_split "*fix_trunchi_i387"
   [(set (match_operand:HI 0 "nonimmediate_operand" "=m,?r")
        (fix:HI (match_operand 1 "register_operand" "f,f")))
-        (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_80387 && FLOAT_MODE_P (GET_MODE (operands[1]))
    && !reload_completed && !reload_in_progress
    && !SSE_FLOAT_MODE_P (GET_MODE (operands[1]))"
   "#"
-  ""
+  "&& 1"
   [(const_int 0)]
 {
   ix86_optimize_mode_switching = 1;
   DONE;
 }
   [(set_attr "type" "fistp")
+   (set_attr "i387_cw" "trunc")
    (set_attr "mode" "HI")])
 
 (define_insn "fix_trunchi_nomemory"
    && !SSE_FLOAT_MODE_P (GET_MODE (operands[1]))"
   "#"
   [(set_attr "type" "fistp")
+   (set_attr "i387_cw" "trunc")
    (set_attr "mode" "HI")])
 
 (define_insn "fix_trunchi_memory"
    && !SSE_FLOAT_MODE_P (GET_MODE (operands[1]))"
   "* return output_fix_trunc (insn, operands);"
   [(set_attr "type" "fistp")
+   (set_attr "i387_cw" "trunc")
    (set_attr "mode" "HI")])
 
 (define_split 
    (set (match_dup 0) (match_dup 4))]
   "")
 
-;; %% Not used yet.
 (define_insn "x86_fnstcw_1"
   [(set (match_operand:HI 0 "memory_operand" "=m")
-       (unspec:HI [(reg:HI 18)] UNSPEC_FSTCW))]
+       (unspec:HI [(reg:HI FPSR_REG)] UNSPEC_FSTCW))]
   "TARGET_80387"
   "fnstcw\t%0"
   [(set_attr "length" "2")
    (set_attr "mode" "HI")
-   (set_attr "unit" "i387")
-   (set_attr "ppro_uops" "few")])
+   (set_attr "unit" "i387")])
 
 (define_insn "x86_fldcw_1"
-  [(set (reg:HI 18)
+  [(set (reg:HI FPSR_REG)
        (unspec:HI [(match_operand:HI 0 "memory_operand" "m")] UNSPEC_FLDCW))]
   "TARGET_80387"
   "fldcw\t%0"
   [(set_attr "length" "2")
    (set_attr "mode" "HI")
    (set_attr "unit" "i387")
-   (set_attr "athlon_decode" "vector")
-   (set_attr "ppro_uops" "few")])
+   (set_attr "athlon_decode" "vector")])
 \f
 ;; Conversion between fixed point and floating point.
 
 (define_expand "floathisf2"
   [(set (match_operand:SF 0 "register_operand" "")
        (float:SF (match_operand:HI 1 "nonimmediate_operand" "")))]
-  "TARGET_SSE || TARGET_80387"
+  "TARGET_80387 || TARGET_SSE_MATH"
 {
-  if (TARGET_SSE && TARGET_SSE_MATH)
+  if (TARGET_SSE_MATH)
     {
       emit_insn (gen_floatsisf2 (operands[0],
                                 convert_to_mode (SImode, operands[1], 0)));
     }
 })
 
-(define_insn "*floathisf2_1"
+(define_insn "*floathisf2_i387"
   [(set (match_operand:SF 0 "register_operand" "=f,f")
-       (float:SF (match_operand:HI 1 "nonimmediate_operand" "m,r")))]
-  "TARGET_80387 && (!TARGET_SSE || !TARGET_SSE_MATH)"
+       (float:SF (match_operand:HI 1 "nonimmediate_operand" "m,?r")))]
+  "TARGET_80387 && (!TARGET_SSE_MATH || TARGET_MIX_SSE_I387)"
   "@
    fild%z1\t%1
    #"
 (define_expand "floatsisf2"
   [(set (match_operand:SF 0 "register_operand" "")
        (float:SF (match_operand:SI 1 "nonimmediate_operand" "")))]
-  "TARGET_SSE || TARGET_80387"
+  "TARGET_80387 || TARGET_SSE_MATH"
   "")
 
-(define_insn "*floatsisf2_i387"
+(define_insn "*floatsisf2_mixed"
   [(set (match_operand:SF 0 "register_operand" "=f#x,?f#x,x#f,x#f")
        (float:SF (match_operand:SI 1 "nonimmediate_operand" "m,r,r,mr")))]
-  "TARGET_80387 && (!TARGET_SSE || TARGET_MIX_SSE_I387)"
+  "TARGET_MIX_SSE_I387"
   "@
    fild%z1\t%1
    #
 (define_insn "*floatsisf2_sse"
   [(set (match_operand:SF 0 "register_operand" "=x,x")
        (float:SF (match_operand:SI 1 "nonimmediate_operand" "r,mr")))]
-  "TARGET_SSE"
+  "TARGET_SSE_MATH"
   "cvtsi2ss\t{%1, %0|%0, %1}"
   [(set_attr "type" "sseicvt")
    (set_attr "mode" "SF")
    (set_attr "athlon_decode" "vector,double")
    (set_attr "fp_int_src" "true")])
 
-; Avoid possible reformatting penalty on the destination by first
-; zeroing it out
-(define_split
-  [(set (match_operand:SF 0 "register_operand" "")
-       (float:SF (match_operand:SI 1 "nonimmediate_operand" "")))]
-  "TARGET_80387 && reload_completed && TARGET_SSE_PARTIAL_REGS
-   && SSE_REG_P (operands[0])"
-  [(const_int 0)]
-{
-  rtx dest;
-  dest = simplify_gen_subreg (V4SFmode, operands[0], SFmode, 0);
-  emit_insn (gen_sse_clrv4sf (dest, CONST0_RTX (V4SFmode)));
-  emit_insn (gen_cvtsi2ss (dest, dest, operands[1]));
-  DONE;
-})
-
-(define_expand "floatdisf2"
-  [(set (match_operand:SF 0 "register_operand" "")
-       (float:SF (match_operand:DI 1 "nonimmediate_operand" "")))]
-  "(TARGET_64BIT && TARGET_SSE) || TARGET_80387"
-  "")
-
-(define_insn "*floatdisf2_i387_only"
-  [(set (match_operand:SF 0 "register_operand" "=f,?f")
-       (float:SF (match_operand:DI 1 "nonimmediate_operand" "m,r")))]
-  "TARGET_80387 && (!TARGET_SSE || !TARGET_64BIT || TARGET_MIX_SSE_I387)"
+(define_insn "*floatsisf2_i387"
+  [(set (match_operand:SF 0 "register_operand" "=f,f")
+       (float:SF (match_operand:SI 1 "nonimmediate_operand" "m,?r")))]
+  "TARGET_80387"
   "@
    fild%z1\t%1
    #"
    (set_attr "mode" "SF")
    (set_attr "fp_int_src" "true")])
 
-(define_insn "*floatdisf2_i387"
+(define_expand "floatdisf2"
+  [(set (match_operand:SF 0 "register_operand" "")
+       (float:SF (match_operand:DI 1 "nonimmediate_operand" "")))]
+  "TARGET_80387 || (TARGET_64BIT && TARGET_SSE_MATH)"
+  "")
+
+(define_insn "*floatdisf2_mixed"
   [(set (match_operand:SF 0 "register_operand" "=f#x,?f#x,x#f,x#f")
        (float:SF (match_operand:DI 1 "nonimmediate_operand" "m,r,r,mr")))]
-  "TARGET_64BIT && TARGET_80387 && (!TARGET_SSE || TARGET_MIX_SSE_I387)"
+  "TARGET_64BIT && TARGET_MIX_SSE_I387"
   "@
    fild%z1\t%1
    #
 (define_insn "*floatdisf2_sse"
   [(set (match_operand:SF 0 "register_operand" "=x,x")
        (float:SF (match_operand:DI 1 "nonimmediate_operand" "r,mr")))]
-  "TARGET_64BIT && TARGET_SSE"
+  "TARGET_64BIT && TARGET_SSE_MATH"
   "cvtsi2ss{q}\t{%1, %0|%0, %1}"
   [(set_attr "type" "sseicvt")
    (set_attr "mode" "SF")
    (set_attr "athlon_decode" "vector,double")
    (set_attr "fp_int_src" "true")])
 
-; Avoid possible reformatting penalty on the destination by first
-; zeroing it out
-(define_split
-  [(set (match_operand:SF 0 "register_operand" "")
-       (float:SF (match_operand:DI 1 "nonimmediate_operand" "")))]
-  "TARGET_80387 && reload_completed && TARGET_SSE_PARTIAL_REGS
-   && SSE_REG_P (operands[0])"
-  [(const_int 0)]
-{
-  rtx dest;
-  dest = simplify_gen_subreg (V4SFmode, operands[0], SFmode, 0);
-  emit_insn (gen_sse_clrv4sf (dest, CONST0_RTX (V4SFmode)));
-  emit_insn (gen_cvtsi2ssq (dest, dest, operands[1]));
-  DONE;
-})
+(define_insn "*floatdisf2_i387"
+  [(set (match_operand:SF 0 "register_operand" "=f,f")
+       (float:SF (match_operand:DI 1 "nonimmediate_operand" "m,?r")))]
+  "TARGET_80387"
+  "@
+   fild%z1\t%1
+   #"
+  [(set_attr "type" "fmov,multi")
+   (set_attr "mode" "SF")
+   (set_attr "fp_int_src" "true")])
 
 (define_expand "floathidf2"
   [(set (match_operand:DF 0 "register_operand" "")
        (float:DF (match_operand:HI 1 "nonimmediate_operand" "")))]
-  "TARGET_SSE2 || TARGET_80387"
+  "TARGET_80387 || (TARGET_SSE2 && TARGET_SSE_MATH)"
 {
-  if (TARGET_SSE && TARGET_SSE_MATH)
+  if (TARGET_SSE2 && TARGET_SSE_MATH)
     {
       emit_insn (gen_floatsidf2 (operands[0],
                                 convert_to_mode (SImode, operands[1], 0)));
     }
 })
 
-(define_insn "*floathidf2_1"
+(define_insn "*floathidf2_i387"
   [(set (match_operand:DF 0 "register_operand" "=f,f")
-       (float:DF (match_operand:HI 1 "nonimmediate_operand" "m,r")))]
-  "TARGET_80387 && (!TARGET_SSE2 || !TARGET_SSE_MATH)"
+       (float:DF (match_operand:HI 1 "nonimmediate_operand" "m,?r")))]
+  "TARGET_80387 && (!(TARGET_SSE2 && TARGET_SSE_MATH) || TARGET_MIX_SSE_I387)"
   "@
    fild%z1\t%1
    #"
 (define_expand "floatsidf2"
   [(set (match_operand:DF 0 "register_operand" "")
        (float:DF (match_operand:SI 1 "nonimmediate_operand" "")))]
-  "TARGET_80387 || TARGET_SSE2"
+  "TARGET_80387 || (TARGET_SSE2 && TARGET_SSE_MATH)"
   "")
 
-(define_insn "*floatsidf2_i387"
+(define_insn "*floatsidf2_mixed"
   [(set (match_operand:DF 0 "register_operand" "=f#Y,?f#Y,Y#f,Y#f")
        (float:DF (match_operand:SI 1 "nonimmediate_operand" "m,r,r,mr")))]
-  "TARGET_80387 && (!TARGET_SSE2 || TARGET_MIX_SSE_I387)"
+  "TARGET_SSE2 && TARGET_MIX_SSE_I387"
   "@
    fild%z1\t%1
    #
 (define_insn "*floatsidf2_sse"
   [(set (match_operand:DF 0 "register_operand" "=Y,Y")
        (float:DF (match_operand:SI 1 "nonimmediate_operand" "r,mr")))]
-  "TARGET_SSE2"
+  "TARGET_SSE2 && TARGET_SSE_MATH"
   "cvtsi2sd\t{%1, %0|%0, %1}"
   [(set_attr "type" "sseicvt")
    (set_attr "mode" "DF")
    (set_attr "athlon_decode" "double,direct")
    (set_attr "fp_int_src" "true")])
 
-(define_expand "floatdidf2"
-  [(set (match_operand:DF 0 "register_operand" "")
-       (float:DF (match_operand:DI 1 "nonimmediate_operand" "")))]
-  "(TARGET_64BIT && TARGET_SSE2) || TARGET_80387"
-  "")
-
-(define_insn "*floatdidf2_i387_only"
-  [(set (match_operand:DF 0 "register_operand" "=f,?f")
-       (float:DF (match_operand:DI 1 "nonimmediate_operand" "m,r")))]
-  "TARGET_80387 && (!TARGET_SSE2 || !TARGET_64BIT)"
+(define_insn "*floatsidf2_i387"
+  [(set (match_operand:DF 0 "register_operand" "=f,f")
+       (float:DF (match_operand:SI 1 "nonimmediate_operand" "m,?r")))]
+  "TARGET_80387"
   "@
    fild%z1\t%1
    #"
    (set_attr "mode" "DF")
    (set_attr "fp_int_src" "true")])
 
-(define_insn "*floatdidf2_i387"
+(define_expand "floatdidf2"
+  [(set (match_operand:DF 0 "register_operand" "")
+       (float:DF (match_operand:DI 1 "nonimmediate_operand" "")))]
+  "TARGET_80387 || (TARGET_64BIT && TARGET_SSE2 && TARGET_SSE_MATH)"
+  "")
+
+(define_insn "*floatdidf2_mixed"
   [(set (match_operand:DF 0 "register_operand" "=f#Y,?f#Y,Y#f,Y#f")
        (float:DF (match_operand:DI 1 "nonimmediate_operand" "m,r,r,mr")))]
-  "TARGET_64BIT && TARGET_80387 && (!TARGET_SSE2 || TARGET_MIX_SSE_I387)"
+  "TARGET_64BIT && TARGET_SSE2 && TARGET_MIX_SSE_I387"
   "@
    fild%z1\t%1
    #
 (define_insn "*floatdidf2_sse"
   [(set (match_operand:DF 0 "register_operand" "=Y,Y")
        (float:DF (match_operand:DI 1 "nonimmediate_operand" "r,mr")))]
-  "TARGET_SSE2"
+  "TARGET_64BIT && TARGET_SSE2 && TARGET_SSE_MATH"
   "cvtsi2sd{q}\t{%1, %0|%0, %1}"
   [(set_attr "type" "sseicvt")
    (set_attr "mode" "DF")
    (set_attr "athlon_decode" "double,direct")
    (set_attr "fp_int_src" "true")])
 
+(define_insn "*floatdidf2_i387"
+  [(set (match_operand:DF 0 "register_operand" "=f,f")
+       (float:DF (match_operand:DI 1 "nonimmediate_operand" "m,?r")))]
+  "TARGET_80387"
+  "@
+   fild%z1\t%1
+   #"
+  [(set_attr "type" "fmov,multi")
+   (set_attr "mode" "DF")
+   (set_attr "fp_int_src" "true")])
+
 (define_insn "floathixf2"
   [(set (match_operand:XF 0 "register_operand" "=f,f")
-       (float:XF (match_operand:HI 1 "nonimmediate_operand" "m,r")))]
+       (float:XF (match_operand:HI 1 "nonimmediate_operand" "m,?r")))]
   "TARGET_80387"
   "@
    fild%z1\t%1
 
 (define_insn "floatsixf2"
   [(set (match_operand:XF 0 "register_operand" "=f,f")
-       (float:XF (match_operand:SI 1 "nonimmediate_operand" "m,r")))]
+       (float:XF (match_operand:SI 1 "nonimmediate_operand" "m,?r")))]
   "TARGET_80387"
   "@
    fild%z1\t%1
 
 (define_insn "floatdixf2"
   [(set (match_operand:XF 0 "register_operand" "=f,f")
-       (float:XF (match_operand:DI 1 "nonimmediate_operand" "m,r")))]
+       (float:XF (match_operand:DI 1 "nonimmediate_operand" "m,?r")))]
   "TARGET_80387"
   "@
    fild%z1\t%1
 (define_split
   [(set (match_operand 0 "fp_register_operand" "")
        (float (match_operand 1 "register_operand" "")))]
-  "reload_completed && FLOAT_MODE_P (GET_MODE (operands[0]))"
+  "reload_completed
+   && TARGET_80387
+   && FLOAT_MODE_P (GET_MODE (operands[0]))"
   [(const_int 0)]
 {
   operands[2] = ix86_force_to_memory (GET_MODE (operands[1]), operands[1]);
 (define_expand "floatunssisf2"
   [(use (match_operand:SF 0 "register_operand" ""))
    (use (match_operand:SI 1 "register_operand" ""))]
-  "TARGET_SSE && TARGET_SSE_MATH && !TARGET_64BIT"
+  "!TARGET_64BIT && TARGET_SSE_MATH"
   "x86_emit_floatuns (operands); DONE;")
 
 (define_expand "floatunsdisf2"
   [(use (match_operand:SF 0 "register_operand" ""))
    (use (match_operand:DI 1 "register_operand" ""))]
-  "TARGET_SSE && TARGET_SSE_MATH && TARGET_64BIT"
+  "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 "register_operand" ""))]
-  "TARGET_SSE2 && TARGET_SSE_MATH && TARGET_64BIT"
+  "TARGET_64BIT && TARGET_SSE2 && TARGET_SSE_MATH"
   "x86_emit_floatuns (operands); DONE;")
 \f
 ;; SSE extract/set expanders
 
-(define_expand "vec_setv2df"
-  [(match_operand:V2DF 0 "register_operand" "")
-   (match_operand:DF 1 "register_operand" "")
-   (match_operand 2 "const_int_operand" "")]
-  "TARGET_SSE2"
-{
-  switch (INTVAL (operands[2]))
-    {
-    case 0:
-      emit_insn (gen_sse2_movsd (operands[0], operands[0],
-                                simplify_gen_subreg (V2DFmode, operands[1],
-                                                     DFmode, 0)));
-      break;
-    case 1:
-      {
-       rtx op1 = simplify_gen_subreg (V2DFmode, operands[1], DFmode, 0);
+\f
+;; Add instructions
 
-       emit_insn (gen_sse2_unpcklpd (operands[0], operands[0], op1));
-      }
-      break;
-    default:
-      abort ();
-    }
-  DONE;
-})
+;; %%% splits for addsidi3
+;  [(set (match_operand:DI 0 "nonimmediate_operand" "")
+;      (plus:DI (match_operand:DI 1 "general_operand" "")
+;               (zero_extend:DI (match_operand:SI 2 "general_operand" ""))))]
 
-(define_expand "vec_extractv2df"
-  [(match_operand:DF 0 "register_operand" "")
-   (match_operand:V2DF 1 "register_operand" "")
-   (match_operand 2 "const_int_operand" "")]
-  "TARGET_SSE2"
-{
-  switch (INTVAL (operands[2]))
-    {
-    case 0:
-      emit_move_insn (operands[0], gen_lowpart (DFmode, operands[1]));
-      break;
-    case 1:
-      {
-       rtx dest = simplify_gen_subreg (V2DFmode, operands[0], DFmode, 0);
+(define_expand "adddi3"
+  [(set (match_operand:DI 0 "nonimmediate_operand" "")
+       (plus:DI (match_operand:DI 1 "nonimmediate_operand" "")
+                (match_operand:DI 2 "x86_64_general_operand" "")))
+   (clobber (reg:CC FLAGS_REG))]
+  ""
+  "ix86_expand_binary_operator (PLUS, DImode, operands); DONE;")
 
-       emit_insn (gen_sse2_unpckhpd (dest, operands[1], operands[1]));
-      }
-      break;
-    default:
-      abort ();
-    }
-  DONE;
-})
+(define_insn "*adddi3_1"
+  [(set (match_operand:DI 0 "nonimmediate_operand" "=r,o")
+       (plus:DI (match_operand:DI 1 "nonimmediate_operand" "%0,0")
+                (match_operand:DI 2 "general_operand" "roiF,riF")))
+   (clobber (reg:CC FLAGS_REG))]
+  "!TARGET_64BIT && ix86_binary_operator_ok (PLUS, DImode, operands)"
+  "#")
 
-(define_expand "vec_initv2df"
-  [(match_operand:V2DF 0 "register_operand" "")
-   (match_operand 1 "" "")]
-  "TARGET_SSE2"
-{
-  ix86_expand_vector_init (operands[0], operands[1]);
-  DONE;
-})
-
-(define_expand "vec_setv4sf"
-  [(match_operand:V4SF 0 "register_operand" "")
-   (match_operand:SF 1 "register_operand" "")
-   (match_operand 2 "const_int_operand" "")]
-  "TARGET_SSE"
-{
-  switch (INTVAL (operands[2]))
-    {
-    case 0:
-      emit_insn (gen_sse_movss (operands[0], operands[0],
-                               simplify_gen_subreg (V4SFmode, operands[1],
-                                                    SFmode, 0)));
-      break;
-    case 1:
-      {
-       rtx op1 = simplify_gen_subreg (V4SFmode, operands[1], SFmode, 0);
-       rtx tmp = gen_reg_rtx (V4SFmode);
-        emit_move_insn (tmp, operands[0]);
-       emit_insn (gen_sse_unpcklps (operands[0], operands[0], operands[0]));
-       emit_insn (gen_sse_movss (operands[0], operands[0], op1));
-        emit_insn (gen_sse_shufps (operands[0], operands[0], tmp,
-                                   GEN_INT (1 + (0<<2) + (2<<4) + (3<<6))));
-      }
-    case 2:
-      {
-        rtx op1 = simplify_gen_subreg (V4SFmode, operands[1], SFmode, 0);
-        rtx tmp = gen_reg_rtx (V4SFmode);
-
-        emit_move_insn (tmp, operands[0]);
-        emit_insn (gen_sse_movss (tmp, tmp, op1));
-        emit_insn (gen_sse_shufps (operands[0], operands[0], tmp,
-                                   GEN_INT (0 + (1<<2) + (0<<4) + (3<<6))));
-      }
-      break;
-    case 3:
-      {
-        rtx op1 = simplify_gen_subreg (V4SFmode, operands[1], SFmode, 0);
-        rtx tmp = gen_reg_rtx (V4SFmode);
-
-        emit_move_insn (tmp, operands[0]);
-        emit_insn (gen_sse_movss (tmp, tmp, op1));
-        emit_insn (gen_sse_shufps (operands[0], operands[0], tmp,
-                                   GEN_INT (0 + (1<<2) + (2<<4) + (0<<6))));
-      }
-      break;
-    default:
-      abort ();
-    }
-  DONE;
-})
-
-(define_expand "vec_extractv4sf"
-  [(match_operand:SF 0 "register_operand" "")
-   (match_operand:V4SF 1 "register_operand" "")
-   (match_operand 2 "const_int_operand" "")]
-  "TARGET_SSE"
-{
-  switch (INTVAL (operands[2]))
-    {
-    case 0:
-      emit_move_insn (operands[0], gen_lowpart (SFmode, operands[1]));
-      break;
-    case 1:
-      {
-       rtx op0 = simplify_gen_subreg (V4SFmode, operands[1], SFmode, 0);
-       rtx tmp = gen_reg_rtx (V4SFmode);
-        emit_move_insn (tmp, operands[1]);
-        emit_insn (gen_sse_shufps (op0, tmp, tmp,
-                                   const1_rtx));
-      }
-    case 2:
-      {
-       rtx op0 = simplify_gen_subreg (V4SFmode, operands[1], SFmode, 0);
-       rtx tmp = gen_reg_rtx (V4SFmode);
-        emit_move_insn (tmp, operands[1]);
-        emit_insn (gen_sse_unpckhps (op0, tmp, tmp));
-      }
-    case 3:
-      {
-       rtx op0 = simplify_gen_subreg (V4SFmode, operands[1], SFmode, 0);
-       rtx tmp = gen_reg_rtx (V4SFmode);
-        emit_move_insn (tmp, operands[1]);
-        emit_insn (gen_sse_shufps (op0, tmp, tmp,
-                                   GEN_INT (3)));
-      }
-    default:
-      abort ();
-    }
-  DONE;
-})
-
-(define_expand "vec_initv4sf"
-  [(match_operand:V4SF 0 "register_operand" "")
-   (match_operand 1 "" "")]
-  "TARGET_SSE"
-{
-  ix86_expand_vector_init (operands[0], operands[1]);
-  DONE;
-})
-\f
-;; Add instructions
-
-;; %%% splits for addsidi3
-;  [(set (match_operand:DI 0 "nonimmediate_operand" "")
-;      (plus:DI (match_operand:DI 1 "general_operand" "")
-;               (zero_extend:DI (match_operand:SI 2 "general_operand" ""))))]
-
-(define_expand "adddi3"
-  [(set (match_operand:DI 0 "nonimmediate_operand" "")
-       (plus:DI (match_operand:DI 1 "nonimmediate_operand" "")
-                (match_operand:DI 2 "x86_64_general_operand" "")))
-   (clobber (reg:CC 17))]
-  ""
-  "ix86_expand_binary_operator (PLUS, DImode, operands); DONE;")
-
-(define_insn "*adddi3_1"
-  [(set (match_operand:DI 0 "nonimmediate_operand" "=r,o")
-       (plus:DI (match_operand:DI 1 "nonimmediate_operand" "%0,0")
-                (match_operand:DI 2 "general_operand" "roiF,riF")))
-   (clobber (reg:CC 17))]
-  "!TARGET_64BIT && ix86_binary_operator_ok (PLUS, DImode, operands)"
-  "#")
-
-(define_split
-  [(set (match_operand:DI 0 "nonimmediate_operand" "")
-       (plus:DI (match_operand:DI 1 "nonimmediate_operand" "")
-                (match_operand:DI 2 "general_operand" "")))
-   (clobber (reg:CC 17))]
-  "!TARGET_64BIT && reload_completed"
-  [(parallel [(set (reg:CC 17) (unspec:CC [(match_dup 1) (match_dup 2)]
-                                         UNSPEC_ADD_CARRY))
-             (set (match_dup 0) (plus:SI (match_dup 1) (match_dup 2)))])
-   (parallel [(set (match_dup 3)
-                  (plus:SI (plus:SI (ltu:SI (reg:CC 17) (const_int 0))
-                                    (match_dup 4))
-                           (match_dup 5)))
-             (clobber (reg:CC 17))])]
-  "split_di (operands+0, 1, operands+0, operands+3);
-   split_di (operands+1, 1, operands+1, operands+4);
-   split_di (operands+2, 1, operands+2, operands+5);")
+(define_split
+  [(set (match_operand:DI 0 "nonimmediate_operand" "")
+       (plus:DI (match_operand:DI 1 "nonimmediate_operand" "")
+                (match_operand:DI 2 "general_operand" "")))
+   (clobber (reg:CC FLAGS_REG))]
+  "!TARGET_64BIT && reload_completed"
+  [(parallel [(set (reg:CC FLAGS_REG) (unspec:CC [(match_dup 1) (match_dup 2)]
+                                         UNSPEC_ADD_CARRY))
+             (set (match_dup 0) (plus:SI (match_dup 1) (match_dup 2)))])
+   (parallel [(set (match_dup 3)
+                  (plus:SI (plus:SI (ltu:SI (reg:CC FLAGS_REG) (const_int 0))
+                                    (match_dup 4))
+                           (match_dup 5)))
+             (clobber (reg:CC FLAGS_REG))])]
+  "split_di (operands+0, 1, operands+0, operands+3);
+   split_di (operands+1, 1, operands+1, operands+4);
+   split_di (operands+2, 1, operands+2, operands+5);")
 
 (define_insn "adddi3_carry_rex64"
   [(set (match_operand:DI 0 "nonimmediate_operand" "=rm,r")
          (plus:DI (plus:DI (match_operand:DI 3 "ix86_carry_flag_operator" "")
                            (match_operand:DI 1 "nonimmediate_operand" "%0,0"))
                   (match_operand:DI 2 "x86_64_general_operand" "re,rm")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (PLUS, DImode, operands)"
   "adc{q}\t{%2, %0|%0, %2}"
   [(set_attr "type" "alu")
    (set_attr "pent_pair" "pu")
-   (set_attr "mode" "DI")
-   (set_attr "ppro_uops" "few")])
+   (set_attr "mode" "DI")])
 
 (define_insn "*adddi3_cc_rex64"
-  [(set (reg:CC 17)
+  [(set (reg:CC FLAGS_REG)
        (unspec:CC [(match_operand:DI 1 "nonimmediate_operand" "%0,0")
                    (match_operand:DI 2 "x86_64_general_operand" "re,rm")]
                   UNSPEC_ADD_CARRY))
          (plus:QI (plus:QI (match_operand:QI 3 "ix86_carry_flag_operator" "")
                            (match_operand:QI 1 "nonimmediate_operand" "%0,0"))
                   (match_operand:QI 2 "general_operand" "qi,qm")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (PLUS, QImode, operands)"
   "adc{b}\t{%2, %0|%0, %2}"
   [(set_attr "type" "alu")
    (set_attr "pent_pair" "pu")
-   (set_attr "mode" "QI")
-   (set_attr "ppro_uops" "few")])
+   (set_attr "mode" "QI")])
 
 (define_insn "addhi3_carry"
   [(set (match_operand:HI 0 "nonimmediate_operand" "=rm,r")
          (plus:HI (plus:HI (match_operand:HI 3 "ix86_carry_flag_operator" "")
                            (match_operand:HI 1 "nonimmediate_operand" "%0,0"))
                   (match_operand:HI 2 "general_operand" "ri,rm")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (PLUS, HImode, operands)"
   "adc{w}\t{%2, %0|%0, %2}"
   [(set_attr "type" "alu")
    (set_attr "pent_pair" "pu")
-   (set_attr "mode" "HI")
-   (set_attr "ppro_uops" "few")])
+   (set_attr "mode" "HI")])
 
 (define_insn "addsi3_carry"
   [(set (match_operand:SI 0 "nonimmediate_operand" "=rm,r")
          (plus:SI (plus:SI (match_operand:SI 3 "ix86_carry_flag_operator" "")
                            (match_operand:SI 1 "nonimmediate_operand" "%0,0"))
                   (match_operand:SI 2 "general_operand" "ri,rm")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (PLUS, SImode, operands)"
   "adc{l}\t{%2, %0|%0, %2}"
   [(set_attr "type" "alu")
    (set_attr "pent_pair" "pu")
-   (set_attr "mode" "SI")
-   (set_attr "ppro_uops" "few")])
+   (set_attr "mode" "SI")])
 
 (define_insn "*addsi3_carry_zext"
   [(set (match_operand:DI 0 "register_operand" "=r")
            (plus:SI (plus:SI (match_operand:SI 3 "ix86_carry_flag_operator" "")
                              (match_operand:SI 1 "nonimmediate_operand" "%0"))
                     (match_operand:SI 2 "general_operand" "rim"))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (PLUS, SImode, operands)"
   "adc{l}\t{%2, %k0|%k0, %2}"
   [(set_attr "type" "alu")
    (set_attr "pent_pair" "pu")
-   (set_attr "mode" "SI")
-   (set_attr "ppro_uops" "few")])
+   (set_attr "mode" "SI")])
 
 (define_insn "*addsi3_cc"
-  [(set (reg:CC 17)
+  [(set (reg:CC FLAGS_REG)
        (unspec:CC [(match_operand:SI 1 "nonimmediate_operand" "%0,0")
                    (match_operand:SI 2 "general_operand" "ri,rm")]
                   UNSPEC_ADD_CARRY))
    (set_attr "mode" "SI")])
 
 (define_insn "addqi3_cc"
-  [(set (reg:CC 17)
+  [(set (reg:CC FLAGS_REG)
        (unspec:CC [(match_operand:QI 1 "nonimmediate_operand" "%0,0")
                    (match_operand:QI 2 "general_operand" "qi,qm")]
                   UNSPEC_ADD_CARRY))
   [(parallel [(set (match_operand:SI 0 "nonimmediate_operand" "")
                   (plus:SI (match_operand:SI 1 "nonimmediate_operand" "")
                            (match_operand:SI 2 "general_operand" "")))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   ""
   "ix86_expand_binary_operator (PLUS, SImode, operands); DONE;")
 
 
 (define_insn_and_split "*lea_general_1"
   [(set (match_operand 0 "register_operand" "=r")
-       (plus (plus (match_operand 1 "index_register_operand" "r")
+       (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
 (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" "r")
+         (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"
 
 (define_insn_and_split "*lea_general_2"
   [(set (match_operand 0 "register_operand" "=r")
-       (plus (mult (match_operand 1 "index_register_operand" "r")
+       (plus (mult (match_operand 1 "index_register_operand" "l")
                    (match_operand 2 "const248_operand" "i"))
              (match_operand 3 "nonmemory_operand" "ri")))]
   "(GET_MODE (operands[0]) == QImode || GET_MODE (operands[0]) == HImode
 (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" "r")
+         (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"
 
 (define_insn_and_split "*lea_general_3"
   [(set (match_operand 0 "register_operand" "=r")
-       (plus (plus (mult (match_operand 1 "index_register_operand" "r")
+       (plus (plus (mult (match_operand 1 "index_register_operand" "l")
                          (match_operand 2 "const248_operand" "i"))
                    (match_operand 3 "register_operand" "r"))
              (match_operand 4 "immediate_operand" "i")))]
 (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" "r")
-                                    (match_operand:SI 2 "const248_operand" "n"))
+         (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 "*adddi_1_rex64"
   [(set (match_operand:DI 0 "nonimmediate_operand" "=r,rm,r")
        (plus:DI (match_operand:DI 1 "nonimmediate_operand" "%0,0,r")
-                (match_operand:DI 2 "x86_64_general_operand" "rme,re,re")))
-   (clobber (reg:CC 17))]
+                (match_operand:DI 2 "x86_64_general_operand" "rme,re,le")))
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (PLUS, DImode, operands)"
 {
   switch (get_attr_type (insn))
   [(set (match_operand:DI 0 "register_operand" "")
        (plus:DI (match_operand:DI 1 "register_operand" "")
                 (match_operand:DI 2 "x86_64_nonmemory_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && reload_completed
    && true_regnum (operands[0]) != true_regnum (operands[1])"
   [(set (match_dup 0)
   "")
 
 (define_insn "*adddi_2_rex64"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (plus:DI (match_operand:DI 1 "nonimmediate_operand" "%0,0")
                   (match_operand:DI 2 "x86_64_general_operand" "rme,re"))
    (set_attr "mode" "DI")])
 
 (define_insn "*adddi_3_rex64"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (neg:DI (match_operand:DI 2 "x86_64_general_operand" "rme"))
                 (match_operand:DI 1 "x86_64_general_operand" "%0")))
    (clobber (match_scratch:DI 0 "=r"))]
 ; Also carry flag is reversed compared to cmp, so this conversion is valid
 ; only for comparisons not depending on it.
 (define_insn "*adddi_4_rex64"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (match_operand:DI 1 "nonimmediate_operand" "0")
                 (match_operand:DI 2 "x86_64_immediate_operand" "e")))
    (clobber (match_scratch:DI 0 "=rm"))]
    (set_attr "mode" "DI")])
 
 (define_insn "*adddi_5_rex64"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (plus:DI (match_operand:DI 1 "nonimmediate_operand" "%0")
                   (match_operand:DI 2 "x86_64_general_operand" "rme"))
 (define_insn "*addsi_1"
   [(set (match_operand:SI 0 "nonimmediate_operand" "=r,rm,r")
        (plus:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0,r")
-                (match_operand:SI 2 "general_operand" "rmni,rni,rni")))
-   (clobber (reg:CC 17))]
+                (match_operand:SI 2 "general_operand" "rmni,rni,lni")))
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (PLUS, SImode, operands)"
 {
   switch (get_attr_type (insn))
   [(set (match_operand 0 "register_operand" "")
        (plus (match_operand 1 "register_operand" "")
               (match_operand 2 "nonmemory_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "reload_completed
    && true_regnum (operands[0]) != true_regnum (operands[1])"
   [(const_int 0)]
   [(set (match_operand:DI 0 "register_operand" "=r,r")
        (zero_extend:DI
          (plus:SI (match_operand:SI 1 "nonimmediate_operand" "%0,r")
-                  (match_operand:SI 2 "general_operand" "rmni,rni"))))
-   (clobber (reg:CC 17))]
+                  (match_operand:SI 2 "general_operand" "rmni,lni"))))
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (PLUS, SImode, operands)"
 {
   switch (get_attr_type (insn))
        (zero_extend:DI
          (plus:SI (match_operand:SI 1 "register_operand" "")
                   (match_operand:SI 2 "nonmemory_operand" ""))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && reload_completed
    && true_regnum (operands[0]) != true_regnum (operands[1])"
   [(set (match_dup 0)
 })
 
 (define_insn "*addsi_2"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (plus:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0")
                   (match_operand:SI 2 "general_operand" "rmni,rni"))
 
 ;; See comment for addsi_1_zext why we do use nonimmediate_operand
 (define_insn "*addsi_2_zext"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (plus:SI (match_operand:SI 1 "nonimmediate_operand" "%0")
                   (match_operand:SI 2 "general_operand" "rmni"))
    (set_attr "mode" "SI")])
 
 (define_insn "*addsi_3"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (neg:SI (match_operand:SI 2 "general_operand" "rmni"))
                 (match_operand:SI 1 "nonimmediate_operand" "%0")))
    (clobber (match_scratch:SI 0 "=r"))]
 
 ;; See comment for addsi_1_zext why we do use nonimmediate_operand
 (define_insn "*addsi_3_zext"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (neg:SI (match_operand:SI 2 "general_operand" "rmni"))
                 (match_operand:SI 1 "nonimmediate_operand" "%0")))
    (set (match_operand:DI 0 "register_operand" "=r")
 ; Also carry flag is reversed compared to cmp, so this conversion is valid
 ; only for comparisons not depending on it.
 (define_insn "*addsi_4"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (match_operand:SI 1 "nonimmediate_operand" "0")
                 (match_operand:SI 2 "const_int_operand" "n")))
    (clobber (match_scratch:SI 0 "=rm"))]
    (set_attr "mode" "SI")])
 
 (define_insn "*addsi_5"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (plus:SI (match_operand:SI 1 "nonimmediate_operand" "%0")
                   (match_operand:SI 2 "general_operand" "rmni"))
   [(parallel [(set (match_operand:HI 0 "nonimmediate_operand" "")
                   (plus:HI (match_operand:HI 1 "nonimmediate_operand" "")
                            (match_operand:HI 2 "general_operand" "")))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   "TARGET_HIMODE_MATH"
   "ix86_expand_binary_operator (PLUS, HImode, operands); DONE;")
 
 (define_insn "*addhi_1_lea"
   [(set (match_operand:HI 0 "nonimmediate_operand" "=rm,r,r")
        (plus:HI (match_operand:HI 1 "nonimmediate_operand" "%0,0,r")
-                (match_operand:HI 2 "general_operand" "ri,rm,rni")))
-   (clobber (reg:CC 17))]
+                (match_operand:HI 2 "general_operand" "ri,rm,lni")))
+   (clobber (reg:CC FLAGS_REG))]
   "!TARGET_PARTIAL_REG_STALL
    && ix86_binary_operator_ok (PLUS, HImode, operands)"
 {
   [(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" "ri,rm")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_PARTIAL_REG_STALL
    && ix86_binary_operator_ok (PLUS, HImode, operands)"
 {
    (set_attr "mode" "HI")])
 
 (define_insn "*addhi_2"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (plus:HI (match_operand:HI 1 "nonimmediate_operand" "%0,0")
                   (match_operand:HI 2 "general_operand" "rmni,rni"))
    (set_attr "mode" "HI")])
 
 (define_insn "*addhi_3"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (neg:HI (match_operand:HI 2 "general_operand" "rmni"))
                 (match_operand:HI 1 "nonimmediate_operand" "%0")))
    (clobber (match_scratch:HI 0 "=r"))]
        (const_string "alu")))
    (set_attr "mode" "HI")])
 
-; See comments above addsi_3_imm for details.
+; See comments above addsi_4 for details.
 (define_insn "*addhi_4"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (match_operand:HI 1 "nonimmediate_operand" "0")
                 (match_operand:HI 2 "const_int_operand" "n")))
    (clobber (match_scratch:HI 0 "=rm"))]
 
 
 (define_insn "*addhi_5"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (plus:HI (match_operand:HI 1 "nonimmediate_operand" "%0")
                   (match_operand:HI 2 "general_operand" "rmni"))
   [(parallel [(set (match_operand:QI 0 "nonimmediate_operand" "")
                   (plus:QI (match_operand:QI 1 "nonimmediate_operand" "")
                            (match_operand:QI 2 "general_operand" "")))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   "TARGET_QIMODE_MATH"
   "ix86_expand_binary_operator (PLUS, QImode, operands); DONE;")
 
 (define_insn "*addqi_1_lea"
   [(set (match_operand:QI 0 "nonimmediate_operand" "=qm,q,r,r")
        (plus:QI (match_operand:QI 1 "nonimmediate_operand" "%0,0,0,r")
-                (match_operand:QI 2 "general_operand" "qn,qmn,rn,rn")))
-   (clobber (reg:CC 17))]
+                (match_operand:QI 2 "general_operand" "qn,qmn,rn,ln")))
+   (clobber (reg:CC FLAGS_REG))]
   "!TARGET_PARTIAL_REG_STALL
    && ix86_binary_operator_ok (PLUS, QImode, operands)"
 {
   [(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 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_PARTIAL_REG_STALL
    && ix86_binary_operator_ok (PLUS, QImode, operands)"
 {
   [(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")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "(! TARGET_PARTIAL_REG_STALL || optimize_size)
    && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)"
 {
     }
 }
   [(set (attr "type")
-     (if_then_else (match_operand:QI 2 "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" "")
+        (const_string "load")
+        (const_string "none")))
    (set_attr "mode" "QI")])
 
 (define_insn "*addqi_2"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (plus:QI (match_operand:QI 1 "nonimmediate_operand" "%0,0")
                   (match_operand:QI 2 "general_operand" "qmni,qni"))
    (set_attr "mode" "QI")])
 
 (define_insn "*addqi_3"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (neg:QI (match_operand:QI 2 "general_operand" "qmni"))
                 (match_operand:QI 1 "nonimmediate_operand" "%0")))
    (clobber (match_scratch:QI 0 "=q"))]
        (const_string "alu")))
    (set_attr "mode" "QI")])
 
-; See comments above addsi_3_imm for details.
+; See comments above addsi_4 for details.
 (define_insn "*addqi_4"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (match_operand:QI 1 "nonimmediate_operand" "0")
                 (match_operand:QI 2 "const_int_operand" "n")))
    (clobber (match_scratch:QI 0 "=qm"))]
 
 
 (define_insn "*addqi_5"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (plus:QI (match_operand:QI 1 "nonimmediate_operand" "%0")
                   (match_operand:QI 2 "general_operand" "qmni"))
            (const_int 8)
            (const_int 8))
          (match_operand:QI 2 "general_operand" "Qmn")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "!TARGET_64BIT"
 {
   switch (get_attr_type (insn))
            (const_int 8)
            (const_int 8))
          (match_operand:QI 2 "nonmemory_operand" "Qn")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT"
 {
   switch (get_attr_type (insn))
            (match_operand 2 "ext_register_operand" "Q")
            (const_int 8)
            (const_int 8))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   ""
   "add{b}\t{%h2, %h0|%h0, %h2}"
   [(set_attr "type" "alu")
   [(parallel [(set (match_operand:DI 0 "nonimmediate_operand" "")
                   (minus:DI (match_operand:DI 1 "nonimmediate_operand" "")
                             (match_operand:DI 2 "x86_64_general_operand" "")))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   ""
   "ix86_expand_binary_operator (MINUS, DImode, operands); DONE;")
 
   [(set (match_operand:DI 0 "nonimmediate_operand" "=r,o")
        (minus:DI (match_operand:DI 1 "nonimmediate_operand" "0,0")
                  (match_operand:DI 2 "general_operand" "roiF,riF")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "!TARGET_64BIT && ix86_binary_operator_ok (MINUS, DImode, operands)"
   "#")
 
   [(set (match_operand:DI 0 "nonimmediate_operand" "")
        (minus:DI (match_operand:DI 1 "nonimmediate_operand" "")
                  (match_operand:DI 2 "general_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "!TARGET_64BIT && reload_completed"
-  [(parallel [(set (reg:CC 17) (compare:CC (match_dup 1) (match_dup 2)))
+  [(parallel [(set (reg:CC FLAGS_REG) (compare:CC (match_dup 1) (match_dup 2)))
              (set (match_dup 0) (minus:SI (match_dup 1) (match_dup 2)))])
    (parallel [(set (match_dup 3)
                   (minus:SI (match_dup 4)
-                            (plus:SI (ltu:SI (reg:CC 17) (const_int 0))
+                            (plus:SI (ltu:SI (reg:CC FLAGS_REG) (const_int 0))
                                      (match_dup 5))))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   "split_di (operands+0, 1, operands+0, operands+3);
    split_di (operands+1, 1, operands+1, operands+4);
    split_di (operands+2, 1, operands+2, operands+5);")
          (minus:DI (match_operand:DI 1 "nonimmediate_operand" "0,0")
            (plus:DI (match_operand:DI 3 "ix86_carry_flag_operator" "")
               (match_operand:DI 2 "x86_64_general_operand" "re,rm"))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (MINUS, DImode, operands)"
   "sbb{q}\t{%2, %0|%0, %2}"
   [(set_attr "type" "alu")
    (set_attr "pent_pair" "pu")
-   (set_attr "ppro_uops" "few")
    (set_attr "mode" "DI")])
 
 (define_insn "*subdi_1_rex64"
   [(set (match_operand:DI 0 "nonimmediate_operand" "=rm,r")
        (minus:DI (match_operand:DI 1 "nonimmediate_operand" "0,0")
                  (match_operand:DI 2 "x86_64_general_operand" "re,rm")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (MINUS, DImode, operands)"
   "sub{q}\t{%2, %0|%0, %2}"
   [(set_attr "type" "alu")
    (set_attr "mode" "DI")])
 
 (define_insn "*subdi_2_rex64"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (minus:DI (match_operand:DI 1 "nonimmediate_operand" "0,0")
                    (match_operand:DI 2 "x86_64_general_operand" "re,rm"))
    (set_attr "mode" "DI")])
 
 (define_insn "*subdi_3_rex63"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (match_operand:DI 1 "nonimmediate_operand" "0,0")
                 (match_operand:DI 2 "x86_64_general_operand" "re,rm")))
    (set (match_operand:DI 0 "nonimmediate_operand" "=rm,r")
          (minus:QI (match_operand:QI 1 "nonimmediate_operand" "0,0")
            (plus:QI (match_operand:QI 3 "ix86_carry_flag_operator" "")
               (match_operand:QI 2 "general_operand" "qi,qm"))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (MINUS, QImode, operands)"
   "sbb{b}\t{%2, %0|%0, %2}"
   [(set_attr "type" "alu")
    (set_attr "pent_pair" "pu")
-   (set_attr "ppro_uops" "few")
    (set_attr "mode" "QI")])
 
 (define_insn "subhi3_carry"
          (minus:HI (match_operand:HI 1 "nonimmediate_operand" "0,0")
            (plus:HI (match_operand:HI 3 "ix86_carry_flag_operator" "")
               (match_operand:HI 2 "general_operand" "ri,rm"))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (MINUS, HImode, operands)"
   "sbb{w}\t{%2, %0|%0, %2}"
   [(set_attr "type" "alu")
    (set_attr "pent_pair" "pu")
-   (set_attr "ppro_uops" "few")
    (set_attr "mode" "HI")])
 
 (define_insn "subsi3_carry"
          (minus:SI (match_operand:SI 1 "nonimmediate_operand" "0,0")
            (plus:SI (match_operand:SI 3 "ix86_carry_flag_operator" "")
               (match_operand:SI 2 "general_operand" "ri,rm"))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (MINUS, SImode, operands)"
   "sbb{l}\t{%2, %0|%0, %2}"
   [(set_attr "type" "alu")
    (set_attr "pent_pair" "pu")
-   (set_attr "ppro_uops" "few")
    (set_attr "mode" "SI")])
 
 (define_insn "subsi3_carry_zext"
            (minus:SI (match_operand:SI 1 "register_operand" "0,0")
              (plus:SI (match_operand:SI 3 "ix86_carry_flag_operator" "")
                 (match_operand:SI 2 "general_operand" "ri,rm")))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (MINUS, SImode, operands)"
   "sbb{l}\t{%2, %k0|%k0, %2}"
   [(set_attr "type" "alu")
    (set_attr "pent_pair" "pu")
-   (set_attr "ppro_uops" "few")
    (set_attr "mode" "SI")])
 
 (define_expand "subsi3"
   [(parallel [(set (match_operand:SI 0 "nonimmediate_operand" "")
                   (minus:SI (match_operand:SI 1 "nonimmediate_operand" "")
                             (match_operand:SI 2 "general_operand" "")))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   ""
   "ix86_expand_binary_operator (MINUS, SImode, operands); DONE;")
 
   [(set (match_operand:SI 0 "nonimmediate_operand" "=rm,r")
        (minus:SI (match_operand:SI 1 "nonimmediate_operand" "0,0")
                  (match_operand:SI 2 "general_operand" "ri,rm")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (MINUS, SImode, operands)"
   "sub{l}\t{%2, %0|%0, %2}"
   [(set_attr "type" "alu")
        (zero_extend:DI
          (minus:SI (match_operand:SI 1 "register_operand" "0")
                    (match_operand:SI 2 "general_operand" "rim"))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (MINUS, SImode, operands)"
   "sub{l}\t{%2, %k0|%k0, %2}"
   [(set_attr "type" "alu")
    (set_attr "mode" "SI")])
 
 (define_insn "*subsi_2"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (minus:SI (match_operand:SI 1 "nonimmediate_operand" "0,0")
                    (match_operand:SI 2 "general_operand" "ri,rm"))
    (set_attr "mode" "SI")])
 
 (define_insn "*subsi_2_zext"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (minus:SI (match_operand:SI 1 "register_operand" "0")
                    (match_operand:SI 2 "general_operand" "rim"))
    (set_attr "mode" "SI")])
 
 (define_insn "*subsi_3"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (match_operand:SI 1 "nonimmediate_operand" "0,0")
                 (match_operand:SI 2 "general_operand" "ri,rm")))
    (set (match_operand:SI 0 "nonimmediate_operand" "=rm,r")
    (set_attr "mode" "SI")])
 
 (define_insn "*subsi_3_zext"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (match_operand:SI 1 "register_operand" "0")
                 (match_operand:SI 2 "general_operand" "rim")))
    (set (match_operand:DI 0 "register_operand" "=r")
   [(parallel [(set (match_operand:HI 0 "nonimmediate_operand" "")
                   (minus:HI (match_operand:HI 1 "nonimmediate_operand" "")
                             (match_operand:HI 2 "general_operand" "")))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   "TARGET_HIMODE_MATH"
   "ix86_expand_binary_operator (MINUS, HImode, operands); DONE;")
 
   [(set (match_operand:HI 0 "nonimmediate_operand" "=rm,r")
        (minus:HI (match_operand:HI 1 "nonimmediate_operand" "0,0")
                  (match_operand:HI 2 "general_operand" "ri,rm")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (MINUS, HImode, operands)"
   "sub{w}\t{%2, %0|%0, %2}"
   [(set_attr "type" "alu")
    (set_attr "mode" "HI")])
 
 (define_insn "*subhi_2"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (minus:HI (match_operand:HI 1 "nonimmediate_operand" "0,0")
                    (match_operand:HI 2 "general_operand" "ri,rm"))
    (set_attr "mode" "HI")])
 
 (define_insn "*subhi_3"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (match_operand:HI 1 "nonimmediate_operand" "0,0")
                 (match_operand:HI 2 "general_operand" "ri,rm")))
    (set (match_operand:HI 0 "nonimmediate_operand" "=rm,r")
   [(parallel [(set (match_operand:QI 0 "nonimmediate_operand" "")
                   (minus:QI (match_operand:QI 1 "nonimmediate_operand" "")
                             (match_operand:QI 2 "general_operand" "")))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   "TARGET_QIMODE_MATH"
   "ix86_expand_binary_operator (MINUS, QImode, operands); DONE;")
 
   [(set (match_operand:QI 0 "nonimmediate_operand" "=qm,q")
        (minus:QI (match_operand:QI 1 "nonimmediate_operand" "0,0")
                  (match_operand:QI 2 "general_operand" "qn,qmn")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (MINUS, QImode, operands)"
   "sub{b}\t{%2, %0|%0, %2}"
   [(set_attr "type" "alu")
   [(set (strict_low_part (match_operand:QI 0 "nonimmediate_operand" "+qm,q"))
        (minus:QI (match_dup 0)
                  (match_operand:QI 1 "general_operand" "qn,qmn")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "(! TARGET_PARTIAL_REG_STALL || optimize_size)
    && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)"
   "sub{b}\t{%1, %0|%0, %1}"
    (set_attr "mode" "QI")])
 
 (define_insn "*subqi_2"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (minus:QI (match_operand:QI 1 "nonimmediate_operand" "0,0")
                    (match_operand:QI 2 "general_operand" "qi,qm"))
    (set_attr "mode" "QI")])
 
 (define_insn "*subqi_3"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (match_operand:QI 1 "nonimmediate_operand" "0,0")
                 (match_operand:QI 2 "general_operand" "qi,qm")))
    (set (match_operand:HI 0 "nonimmediate_operand" "=qm,q")
   [(parallel [(set (match_operand:DI 0 "register_operand" "")
                   (mult:DI (match_operand:DI 1 "register_operand" "")
                            (match_operand:DI 2 "x86_64_general_operand" "")))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   "TARGET_64BIT"
   "")
 
   [(set (match_operand:DI 0 "register_operand" "=r,r,r")
        (mult:DI (match_operand:DI 1 "nonimmediate_operand" "%rm,rm,0")
                 (match_operand:DI 2 "x86_64_general_operand" "K,e,mr")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT
    && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
   "@
   [(parallel [(set (match_operand:SI 0 "register_operand" "")
                   (mult:SI (match_operand:SI 1 "register_operand" "")
                            (match_operand:SI 2 "general_operand" "")))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   ""
   "")
 
   [(set (match_operand:SI 0 "register_operand" "=r,r,r")
        (mult:SI (match_operand:SI 1 "nonimmediate_operand" "%rm,rm,0")
                 (match_operand:SI 2 "general_operand" "K,i,mr")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM"
   "@
    imul{l}\t{%2, %1, %0|%0, %1, %2}
        (zero_extend:DI
          (mult:SI (match_operand:SI 1 "nonimmediate_operand" "%rm,rm,0")
                   (match_operand:SI 2 "general_operand" "K,i,mr"))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT
    && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
   "@
   [(parallel [(set (match_operand:HI 0 "register_operand" "")
                   (mult:HI (match_operand:HI 1 "register_operand" "")
                            (match_operand:HI 2 "general_operand" "")))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   "TARGET_HIMODE_MATH"
   "")
 
   [(set (match_operand:HI 0 "register_operand" "=r,r,r")
        (mult:HI (match_operand:HI 1 "nonimmediate_operand" "%rm,rm,0")
                 (match_operand:HI 2 "general_operand" "K,i,mr")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM"
   "@
    imul{w}\t{%2, %1, %0|%0, %1, %2}
   [(parallel [(set (match_operand:QI 0 "register_operand" "")
                   (mult:QI (match_operand:QI 1 "nonimmediate_operand" "")
                            (match_operand:QI 2 "register_operand" "")))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   "TARGET_QIMODE_MATH"
   "")
 
   [(set (match_operand:QI 0 "register_operand" "=a")
        (mult:QI (match_operand:QI 1 "nonimmediate_operand" "%0")
                 (match_operand:QI 2 "nonimmediate_operand" "qm")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_QIMODE_MATH
    && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
   "mul{b}\t%2"
                              (match_operand:QI 1 "nonimmediate_operand" ""))
                            (zero_extend:HI
                              (match_operand:QI 2 "register_operand" ""))))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   "TARGET_QIMODE_MATH"
   "")
 
   [(set (match_operand:HI 0 "register_operand" "=a")
        (mult:HI (zero_extend:HI (match_operand:QI 1 "nonimmediate_operand" "%0"))
                 (zero_extend:HI (match_operand:QI 2 "nonimmediate_operand" "qm"))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_QIMODE_MATH
    && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
   "mul{b}\t%2"
   [(parallel [(set (match_operand:HI 0 "register_operand" "")
                   (mult:HI (sign_extend:HI (match_operand:QI 1 "nonimmediate_operand" ""))
                            (sign_extend:HI (match_operand:QI 2 "register_operand" ""))))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   "TARGET_QIMODE_MATH"
   "")
 
   [(set (match_operand:HI 0 "register_operand" "=a")
        (mult:HI (sign_extend:HI (match_operand:QI 1 "nonimmediate_operand" "%0"))
                 (sign_extend:HI (match_operand:QI 2 "nonimmediate_operand" "qm"))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_QIMODE_MATH
    && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
   "imul{b}\t%2"
                              (match_operand:DI 1 "nonimmediate_operand" ""))
                            (zero_extend:TI
                              (match_operand:DI 2 "register_operand" ""))))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   "TARGET_64BIT"
   "")
 
   [(set (match_operand:TI 0 "register_operand" "=A")
        (mult:TI (zero_extend:TI (match_operand:DI 1 "nonimmediate_operand" "%0"))
                 (zero_extend:TI (match_operand:DI 2 "nonimmediate_operand" "rm"))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT
    && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
   "mul{q}\t%2"
   [(set_attr "type" "imul")
-   (set_attr "ppro_uops" "few")
    (set_attr "length_immediate" "0")
    (set (attr "athlon_decode")
      (if_then_else (eq_attr "cpu" "athlon")
                              (match_operand:SI 1 "nonimmediate_operand" ""))
                            (zero_extend:DI
                              (match_operand:SI 2 "register_operand" ""))))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   "!TARGET_64BIT"
   "")
 
   [(set (match_operand:DI 0 "register_operand" "=A")
        (mult:DI (zero_extend:DI (match_operand:SI 1 "nonimmediate_operand" "%0"))
                 (zero_extend:DI (match_operand:SI 2 "nonimmediate_operand" "rm"))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "!TARGET_64BIT
    && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
   "mul{l}\t%2"
   [(set_attr "type" "imul")
-   (set_attr "ppro_uops" "few")
    (set_attr "length_immediate" "0")
    (set (attr "athlon_decode")
      (if_then_else (eq_attr "cpu" "athlon")
                              (match_operand:DI 1 "nonimmediate_operand" ""))
                            (sign_extend:TI
                              (match_operand:DI 2 "register_operand" ""))))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   "TARGET_64BIT"
   "")
 
   [(set (match_operand:TI 0 "register_operand" "=A")
        (mult:TI (sign_extend:TI (match_operand:DI 1 "nonimmediate_operand" "%0"))
                 (sign_extend:TI (match_operand:DI 2 "nonimmediate_operand" "rm"))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT
    && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
   "imul{q}\t%2"
                              (match_operand:SI 1 "nonimmediate_operand" ""))
                            (sign_extend:DI
                              (match_operand:SI 2 "register_operand" ""))))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   "!TARGET_64BIT"
   "")
 
   [(set (match_operand:DI 0 "register_operand" "=A")
        (mult:DI (sign_extend:DI (match_operand:SI 1 "nonimmediate_operand" "%0"))
                 (sign_extend:DI (match_operand:SI 2 "nonimmediate_operand" "rm"))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "!TARGET_64BIT
    && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
   "imul{l}\t%2"
                                  (match_operand:DI 2 "register_operand" "")))
                       (const_int 64))))
              (clobber (match_scratch:DI 3 ""))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   "TARGET_64BIT"
   "")
 
                       (match_operand:DI 2 "nonimmediate_operand" "rm")))
            (const_int 64))))
    (clobber (match_scratch:DI 3 "=1"))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT
    && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
   "mul{q}\t%2"
   [(set_attr "type" "imul")
-   (set_attr "ppro_uops" "few")
    (set_attr "length_immediate" "0")
    (set (attr "athlon_decode")
      (if_then_else (eq_attr "cpu" "athlon")
                                  (match_operand:SI 2 "register_operand" "")))
                       (const_int 32))))
              (clobber (match_scratch:SI 3 ""))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   ""
   "")
 
                       (match_operand:SI 2 "nonimmediate_operand" "rm")))
            (const_int 32))))
    (clobber (match_scratch:SI 3 "=1"))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM"
   "mul{l}\t%2"
   [(set_attr "type" "imul")
-   (set_attr "ppro_uops" "few")
    (set_attr "length_immediate" "0")
    (set (attr "athlon_decode")
      (if_then_else (eq_attr "cpu" "athlon")
                       (match_operand:SI 2 "nonimmediate_operand" "rm")))
            (const_int 32)))))
    (clobber (match_scratch:SI 3 "=1"))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT
    && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
   "mul{l}\t%2"
   [(set_attr "type" "imul")
-   (set_attr "ppro_uops" "few")
    (set_attr "length_immediate" "0")
    (set (attr "athlon_decode")
      (if_then_else (eq_attr "cpu" "athlon")
                                  (match_operand:DI 2 "register_operand" "")))
                       (const_int 64))))
              (clobber (match_scratch:DI 3 ""))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   "TARGET_64BIT"
   "")
 
                       (match_operand:DI 2 "nonimmediate_operand" "rm")))
            (const_int 64))))
    (clobber (match_scratch:DI 3 "=1"))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT
    && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
   "imul{q}\t%2"
   [(set_attr "type" "imul")
-   (set_attr "ppro_uops" "few")
    (set (attr "athlon_decode")
      (if_then_else (eq_attr "cpu" "athlon")
         (const_string "vector")
                                  (match_operand:SI 2 "register_operand" "")))
                       (const_int 32))))
              (clobber (match_scratch:SI 3 ""))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   ""
   "")
 
                       (match_operand:SI 2 "nonimmediate_operand" "rm")))
            (const_int 32))))
    (clobber (match_scratch:SI 3 "=1"))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM"
   "imul{l}\t%2"
   [(set_attr "type" "imul")
-   (set_attr "ppro_uops" "few")
    (set (attr "athlon_decode")
      (if_then_else (eq_attr "cpu" "athlon")
         (const_string "vector")
                       (match_operand:SI 2 "nonimmediate_operand" "rm")))
            (const_int 32)))))
    (clobber (match_scratch:SI 3 "=1"))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT
    && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
   "imul{l}\t%2"
   [(set_attr "type" "imul")
-   (set_attr "ppro_uops" "few")
    (set (attr "athlon_decode")
      (if_then_else (eq_attr "cpu" "athlon")
         (const_string "vector")
   [(set (match_operand:QI 0 "register_operand" "=a")
        (div:QI (match_operand:HI 1 "register_operand" "0")
                (match_operand:QI 2 "nonimmediate_operand" "qm")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_QIMODE_MATH"
   "idiv{b}\t%2"
   [(set_attr "type" "idiv")
-   (set_attr "mode" "QI")
-   (set_attr "ppro_uops" "few")])
+   (set_attr "mode" "QI")])
 
 (define_insn "udivqi3"
   [(set (match_operand:QI 0 "register_operand" "=a")
        (udiv:QI (match_operand:HI 1 "register_operand" "0")
                 (match_operand:QI 2 "nonimmediate_operand" "qm")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_QIMODE_MATH"
   "div{b}\t%2"
   [(set_attr "type" "idiv")
-   (set_attr "mode" "QI")
-   (set_attr "ppro_uops" "few")])
+   (set_attr "mode" "QI")])
 
 ;; The patterns that match these are at the end of this file.
 
                           (match_operand:DI 2 "nonimmediate_operand" "")))
              (set (match_operand:DI 3 "register_operand" "")
                   (mod:DI (match_dup 1) (match_dup 2)))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   "TARGET_64BIT"
   "")
 
                (match_operand:DI 3 "nonimmediate_operand" "rm,rm")))
    (set (match_operand:DI 1 "register_operand" "=&d,&d")
        (mod:DI (match_dup 2) (match_dup 3)))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && !optimize_size && !TARGET_USE_CLTD"
   "#"
   [(set_attr "type" "multi")])
                (match_operand:DI 3 "nonimmediate_operand" "rm")))
    (set (match_operand:DI 1 "register_operand" "=&d")
        (mod:DI (match_dup 2) (match_dup 3)))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && (optimize_size || TARGET_USE_CLTD)"
   "#"
   [(set_attr "type" "multi")])
    (set (match_operand:DI 3 "register_operand" "=d")
        (mod:DI (match_dup 1) (match_dup 2)))
    (use (match_operand:DI 4 "register_operand" "3"))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT"
   "idiv{q}\t%2"
   [(set_attr "type" "idiv")
-   (set_attr "mode" "DI")
-   (set_attr "ppro_uops" "few")])
+   (set_attr "mode" "DI")])
 
 (define_split
   [(set (match_operand:DI 0 "register_operand" "")
                (match_operand:DI 2 "nonimmediate_operand" "")))
    (set (match_operand:DI 3 "register_operand" "")
        (mod:DI (match_dup 1) (match_dup 2)))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && reload_completed"
   [(parallel [(set (match_dup 3)
                   (ashiftrt:DI (match_dup 4) (const_int 63)))
-             (clobber (reg:CC 17))])
+             (clobber (reg:CC FLAGS_REG))])
    (parallel [(set (match_dup 0)
                   (div:DI (reg:DI 0) (match_dup 2)))
              (set (match_dup 3)
                   (mod:DI (reg:DI 0) (match_dup 2)))
              (use (match_dup 3))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
 {
   /* Avoid use of cltd in favor of a mov+shift.  */
   if (!TARGET_USE_CLTD && !optimize_size)
                           (match_operand:SI 2 "nonimmediate_operand" "")))
              (set (match_operand:SI 3 "register_operand" "")
                   (mod:SI (match_dup 1) (match_dup 2)))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   ""
   "")
 
                (match_operand:SI 3 "nonimmediate_operand" "rm,rm")))
    (set (match_operand:SI 1 "register_operand" "=&d,&d")
        (mod:SI (match_dup 2) (match_dup 3)))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "!optimize_size && !TARGET_USE_CLTD"
   "#"
   [(set_attr "type" "multi")])
                (match_operand:SI 3 "nonimmediate_operand" "rm")))
    (set (match_operand:SI 1 "register_operand" "=&d")
        (mod:SI (match_dup 2) (match_dup 3)))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "optimize_size || TARGET_USE_CLTD"
   "#"
   [(set_attr "type" "multi")])
    (set (match_operand:SI 3 "register_operand" "=d")
        (mod:SI (match_dup 1) (match_dup 2)))
    (use (match_operand:SI 4 "register_operand" "3"))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   ""
   "idiv{l}\t%2"
   [(set_attr "type" "idiv")
-   (set_attr "mode" "SI")
-   (set_attr "ppro_uops" "few")])
+   (set_attr "mode" "SI")])
 
 (define_split
   [(set (match_operand:SI 0 "register_operand" "")
                (match_operand:SI 2 "nonimmediate_operand" "")))
    (set (match_operand:SI 3 "register_operand" "")
        (mod:SI (match_dup 1) (match_dup 2)))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "reload_completed"
   [(parallel [(set (match_dup 3)
                   (ashiftrt:SI (match_dup 4) (const_int 31)))
-             (clobber (reg:CC 17))])
+             (clobber (reg:CC FLAGS_REG))])
    (parallel [(set (match_dup 0)
                   (div:SI (reg:SI 0) (match_dup 2)))
              (set (match_dup 3)
                   (mod:SI (reg:SI 0) (match_dup 2)))
              (use (match_dup 3))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
 {
   /* Avoid use of cltd in favor of a mov+shift.  */
   if (!TARGET_USE_CLTD && !optimize_size)
                (match_operand:HI 2 "nonimmediate_operand" "rm")))
    (set (match_operand:HI 3 "register_operand" "=&d")
        (mod:HI (match_dup 1) (match_dup 2)))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_HIMODE_MATH"
   "cwtd\;idiv{w}\t%2"
   [(set_attr "type" "multi")
                 (match_operand:DI 2 "nonimmediate_operand" "rm")))
    (set (match_operand:DI 3 "register_operand" "=&d")
        (umod:DI (match_dup 1) (match_dup 2)))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT"
   "xor{q}\t%3, %3\;div{q}\t%2"
   [(set_attr "type" "multi")
    (set (match_operand:DI 3 "register_operand" "=d")
        (umod:DI (match_dup 1) (match_dup 2)))
    (use (match_dup 3))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT"
   "div{q}\t%2"
   [(set_attr "type" "idiv")
-   (set_attr "ppro_uops" "few")
    (set_attr "mode" "DI")])
 
 (define_split
                 (match_operand:DI 2 "nonimmediate_operand" "")))
    (set (match_operand:DI 3 "register_operand" "")
        (umod:DI (match_dup 1) (match_dup 2)))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && reload_completed"
   [(set (match_dup 3) (const_int 0))
    (parallel [(set (match_dup 0)
              (set (match_dup 3)
                   (umod:DI (match_dup 1) (match_dup 2)))
              (use (match_dup 3))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   "")
 
 (define_insn "udivmodsi4"
                 (match_operand:SI 2 "nonimmediate_operand" "rm")))
    (set (match_operand:SI 3 "register_operand" "=&d")
        (umod:SI (match_dup 1) (match_dup 2)))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   ""
   "xor{l}\t%3, %3\;div{l}\t%2"
   [(set_attr "type" "multi")
    (set (match_operand:SI 3 "register_operand" "=d")
        (umod:SI (match_dup 1) (match_dup 2)))
    (use (match_dup 3))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   ""
   "div{l}\t%2"
   [(set_attr "type" "idiv")
-   (set_attr "ppro_uops" "few")
    (set_attr "mode" "SI")])
 
 (define_split
                 (match_operand:SI 2 "nonimmediate_operand" "")))
    (set (match_operand:SI 3 "register_operand" "")
        (umod:SI (match_dup 1) (match_dup 2)))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "reload_completed"
   [(set (match_dup 3) (const_int 0))
    (parallel [(set (match_dup 0)
              (set (match_dup 3)
                   (umod:SI (match_dup 1) (match_dup 2)))
              (use (match_dup 3))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   "")
 
 (define_expand "udivmodhi4"
              (set (match_operand:HI 3 "register_operand" "")
                   (umod:HI (match_dup 1) (match_dup 2)))
              (use (match_dup 4))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   "TARGET_HIMODE_MATH"
   "operands[4] = gen_reg_rtx (HImode);")
 
    (set (match_operand:HI 3 "register_operand" "=d")
        (umod:HI (match_dup 1) (match_dup 2)))
    (use (match_operand:HI 4 "register_operand" "3"))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   ""
   "div{w}\t%2"
   [(set_attr "type" "idiv")
-   (set_attr "mode" "HI")
-   (set_attr "ppro_uops" "few")])
+   (set_attr "mode" "HI")])
 
-;; We can not use div/idiv for double division, because it causes
+;; We cannot use div/idiv for double division, because it causes
 ;; "division by zero" on the overflow and that's not what we expect
 ;; from truncate.  Because true (non truncating) double division is
 ;; never generated, we can't create this insn anyway.
 ;   (set (match_operand:SI 3 "register_operand" "=d")
 ;      (truncate:SI
 ;        (umod:DI (match_dup 1) (zero_extend:DI (match_dup 2)))))
-;   (clobber (reg:CC 17))]
+;   (clobber (reg:CC FLAGS_REG))]
 ;  ""
 ;  "div{l}\t{%2, %0|%0, %2}"
-;  [(set_attr "type" "idiv")
-;   (set_attr "ppro_uops" "few")])
+;  [(set_attr "type" "idiv")])
 \f
 ;;- Logical AND instructions
 
 ;; Note that this excludes ah.
 
 (define_insn "*testdi_1_rex64"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (and:DI (match_operand:DI 0 "nonimmediate_operand" "%!*a,r,!*a,r,rm")
                  (match_operand:DI 1 "x86_64_szext_general_operand" "Z,Z,e,e,re"))
    (set_attr "pent_pair" "uv,np,uv,np,uv")])
 
 (define_insn "testsi_1"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (and:SI (match_operand:SI 0 "nonimmediate_operand" "%!*a,r,rm")
                  (match_operand:SI 1 "general_operand" "in,in,rin"))
    (set_attr "pent_pair" "uv,np,uv")])
 
 (define_expand "testsi_ccno_1"
-  [(set (reg:CCNO 17)
+  [(set (reg:CCNO FLAGS_REG)
        (compare:CCNO
          (and:SI (match_operand:SI 0 "nonimmediate_operand" "")
                  (match_operand:SI 1 "nonmemory_operand" ""))
   "")
 
 (define_insn "*testhi_1"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
         (compare (and:HI (match_operand:HI 0 "nonimmediate_operand" "%!*a,r,rm")
                         (match_operand:HI 1 "general_operand" "n,n,rn"))
                 (const_int 0)))]
    (set_attr "pent_pair" "uv,np,uv")])
 
 (define_expand "testqi_ccz_1"
-  [(set (reg:CCZ 17)
+  [(set (reg:CCZ FLAGS_REG)
         (compare:CCZ (and:QI (match_operand:QI 0 "nonimmediate_operand" "")
                             (match_operand:QI 1 "nonmemory_operand" ""))
                 (const_int 0)))]
   ""
   "")
 
-(define_insn "*testqi_1"
-  [(set (reg 17)
-        (compare (and:QI (match_operand:QI 0 "nonimmediate_operand" "%!*a,q,qm,r")
-                        (match_operand:QI 1 "general_operand" "n,n,qn,n"))
-                (const_int 0)))]
-  "ix86_match_ccmode (insn, CCNOmode)
-   && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)"
+(define_insn "*testqi_1_maybe_si"
+  [(set (reg FLAGS_REG)
+        (compare
+         (and:QI
+           (match_operand:QI 0 "nonimmediate_operand" "%!*a,q,qm,r")
+           (match_operand:QI 1 "general_operand" "n,n,qn,n"))
+         (const_int 0)))]
+   "(GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)
+    && ix86_match_ccmode (insn,
+                        GET_CODE (operands[1]) == CONST_INT
+                        && INTVAL (operands[1]) >= 0 ? CCNOmode : CCZmode)"
 {
   if (which_alternative == 3)
     {
-      if (GET_CODE (operands[1]) == CONST_INT
-         && (INTVAL (operands[1]) & 0xffffff00))
+      if (GET_CODE (operands[1]) == CONST_INT && INTVAL (operands[1]) < 0)
        operands[1] = GEN_INT (INTVAL (operands[1]) & 0xff);
       return "test{l}\t{%1, %k0|%k0, %1}";
     }
    (set_attr "mode" "QI,QI,QI,SI")
    (set_attr "pent_pair" "uv,np,uv,np")])
 
+(define_insn "*testqi_1"
+  [(set (reg FLAGS_REG)
+        (compare
+         (and:QI
+           (match_operand:QI 0 "nonimmediate_operand" "%!*a,q,qm")
+           (match_operand:QI 1 "general_operand" "n,n,qn"))
+         (const_int 0)))]
+  "(GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)
+   && ix86_match_ccmode (insn, CCNOmode)"
+  "test{b}\t{%1, %0|%0, %1}"
+  [(set_attr "type" "test")
+   (set_attr "modrm" "0,1,1")
+   (set_attr "mode" "QI")
+   (set_attr "pent_pair" "uv,np,uv")])
+
 (define_expand "testqi_ext_ccno_0"
-  [(set (reg:CCNO 17)
+  [(set (reg:CCNO FLAGS_REG)
        (compare:CCNO
          (and:SI
            (zero_extract:SI
   "")
 
 (define_insn "*testqi_ext_0"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (and:SI
            (zero_extract:SI
    (set_attr "pent_pair" "np")])
 
 (define_insn "*testqi_ext_1"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (and:SI
            (zero_extract:SI
    (set_attr "mode" "QI")])
 
 (define_insn "*testqi_ext_1_rex64"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (and:SI
            (zero_extract:SI
    (set_attr "mode" "QI")])
 
 (define_insn "*testqi_ext_2"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (and:SI
            (zero_extract:SI
 
 ;; Combine likes to form bit extractions for some tests.  Humor it.
 (define_insn "*testqi_ext_3"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
         (compare (zero_extract:SI
                   (match_operand 0 "nonimmediate_operand" "rm")
                   (match_operand:SI 1 "const_int_operand" "")
   "#")
 
 (define_insn "*testqi_ext_3_rex64"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
         (compare (zero_extract:DI
                   (match_operand 0 "nonimmediate_operand" "rm")
                   (match_operand:DI 1 "const_int_operand" "")
   "#")
 
 (define_split
-  [(set (reg 17)
-        (compare (zero_extract
-                  (match_operand 0 "nonimmediate_operand" "")
-                  (match_operand 1 "const_int_operand" "")
-                  (match_operand 2 "const_int_operand" ""))
-                (const_int 0)))]
+  [(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" ""))
+          (const_int 0)]))]
   "ix86_match_ccmode (insn, CCNOmode)"
-  [(set (reg:CCNO 17) (compare:CCNO (match_dup 3) (const_int 0)))]
+  [(set (match_dup 0) (match_op_dup 1 [(match_dup 2) (const_int 0)]))]
 {
-  HOST_WIDE_INT len = INTVAL (operands[1]);
-  HOST_WIDE_INT pos = INTVAL (operands[2]);
+  rtx val = operands[2];
+  HOST_WIDE_INT len = INTVAL (operands[3]);
+  HOST_WIDE_INT pos = INTVAL (operands[4]);
   HOST_WIDE_INT mask;
   enum machine_mode mode, submode;
 
-  mode = GET_MODE (operands[0]);
-  if (GET_CODE (operands[0]) == MEM)
+  mode = GET_MODE (val);
+  if (GET_CODE (val) == MEM)
     {
       /* ??? Combine likes to put non-volatile mem extractions in QImode
         no matter the size of the test.  So find a mode that works.  */
-      if (! MEM_VOLATILE_P (operands[0]))
+      if (! MEM_VOLATILE_P (val))
        {
          mode = smallest_mode_for_size (pos + len, MODE_INT);
-         operands[0] = adjust_address (operands[0], mode, 0);
+         val = adjust_address (val, mode, 0);
        }
     }
-  else if (GET_CODE (operands[0]) == SUBREG
-          && (submode = GET_MODE (SUBREG_REG (operands[0])),
+  else if (GET_CODE (val) == SUBREG
+          && (submode = GET_MODE (SUBREG_REG (val)),
               GET_MODE_BITSIZE (mode) > GET_MODE_BITSIZE (submode))
           && pos + len <= GET_MODE_BITSIZE (submode))
     {
       /* Narrow a paradoxical subreg to prevent partial register stalls.  */
       mode = submode;
-      operands[0] = SUBREG_REG (operands[0]);
+      val = SUBREG_REG (val);
     }
   else if (mode == HImode && pos + len <= 8)
     {
       /* Small HImode tests can be converted to QImode.  */
       mode = QImode;
-      operands[0] = gen_lowpart (QImode, operands[0]);
+      val = gen_lowpart (QImode, val);
     }
 
   mask  = ((HOST_WIDE_INT)1 << (pos + len)) - 1;
   mask &= ~(((HOST_WIDE_INT)1 << pos) - 1);
 
-  operands[3] = gen_rtx_AND (mode, operands[0], gen_int_mode (mask, mode));
+  operands[2] = gen_rtx_AND (mode, val, gen_int_mode (mask, mode));
 })
 
 ;; Convert HImode/SImode test instructions with immediate to QImode ones.
 ;; Do the conversion only post-reload to avoid limiting of the register class
 ;; to QI regs.
 (define_split
-  [(set (reg 17)
-       (compare
-         (and (match_operand 0 "register_operand" "")
-              (match_operand 1 "const_int_operand" ""))
-         (const_int 0)))]
+  [(set (match_operand 0 "flags_reg_operand" "")
+       (match_operator 1 "compare_operator"
+         [(and (match_operand 2 "register_operand" "")
+               (match_operand 3 "const_int_operand" ""))
+          (const_int 0)]))]
    "reload_completed
-    && QI_REG_P (operands[0])
+    && QI_REG_P (operands[2])
+    && GET_MODE (operands[2]) != QImode
     && ((ix86_match_ccmode (insn, CCZmode)
-        && !(INTVAL (operands[1]) & ~(255 << 8)))
+        && !(INTVAL (operands[3]) & ~(255 << 8)))
        || (ix86_match_ccmode (insn, CCNOmode)
-           && !(INTVAL (operands[1]) & ~(127 << 8))))
-    && GET_MODE (operands[0]) != QImode"
-  [(set (reg:CCNO 17)
-       (compare:CCNO
-         (and:SI (zero_extract:SI (match_dup 0) (const_int 8) (const_int 8))
-                 (match_dup 1))
-         (const_int 0)))]
-  "operands[0] = gen_lowpart (SImode, operands[0]);
-   operands[1] = gen_int_mode (INTVAL (operands[1]) >> 8, SImode);")
+           && !(INTVAL (operands[3]) & ~(127 << 8))))"
+  [(set (match_dup 0)
+       (match_op_dup 1
+         [(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);")
 
 (define_split
-  [(set (reg 17)
-       (compare
-         (and (match_operand 0 "nonimmediate_operand" "")
-              (match_operand 1 "const_int_operand" ""))
-         (const_int 0)))]
+  [(set (match_operand 0 "flags_reg_operand" "")
+       (match_operator 1 "compare_operator"
+         [(and (match_operand 2 "nonimmediate_operand" "")
+               (match_operand 3 "const_int_operand" ""))
+          (const_int 0)]))]
    "reload_completed
-    && (!REG_P (operands[0]) || ANY_QI_REG_P (operands[0]))
+    && GET_MODE (operands[2]) != QImode
+    && (!REG_P (operands[2]) || ANY_QI_REG_P (operands[2]))
     && ((ix86_match_ccmode (insn, CCZmode)
-        && !(INTVAL (operands[1]) & ~255))
+        && !(INTVAL (operands[3]) & ~255))
        || (ix86_match_ccmode (insn, CCNOmode)
-           && !(INTVAL (operands[1]) & ~127)))
-    && GET_MODE (operands[0]) != QImode"
-  [(set (reg:CCNO 17)
-       (compare:CCNO
-         (and:QI (match_dup 0)
-                 (match_dup 1))
-         (const_int 0)))]
-  "operands[0] = gen_lowpart (QImode, operands[0]);
-   operands[1] = gen_lowpart (QImode, operands[1]);")
+           && !(INTVAL (operands[3]) & ~127)))"
+  [(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]);")
 
 
 ;; %%% This used to optimize known byte-wide and operations to memory,
   [(set (match_operand:DI 0 "nonimmediate_operand" "")
        (and:DI (match_operand:DI 1 "nonimmediate_operand" "")
                (match_operand:DI 2 "x86_64_szext_general_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT"
   "ix86_expand_binary_operator (AND, DImode, operands); DONE;")
 
   [(set (match_operand:DI 0 "nonimmediate_operand" "=r,rm,r,r")
        (and:DI (match_operand:DI 1 "nonimmediate_operand" "%0,0,0,qm")
                (match_operand:DI 2 "x86_64_szext_general_operand" "Z,re,rm,L")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (AND, DImode, operands)"
 {
   switch (get_attr_type (insn))
    (set_attr "mode" "SI,DI,DI,DI")])
 
 (define_insn "*anddi_2"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (and:DI (match_operand:DI 1 "nonimmediate_operand" "%0,0,0")
                         (match_operand:DI 2 "x86_64_szext_general_operand" "Z,rem,re"))
                 (const_int 0)))
   [(set (match_operand:SI 0 "nonimmediate_operand" "")
        (and:SI (match_operand:SI 1 "nonimmediate_operand" "")
                (match_operand:SI 2 "general_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   ""
   "ix86_expand_binary_operator (AND, SImode, operands); DONE;")
 
   [(set (match_operand:SI 0 "nonimmediate_operand" "=rm,r,r")
        (and:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0,qm")
                (match_operand:SI 2 "general_operand" "ri,rm,L")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (AND, SImode, operands)"
 {
   switch (get_attr_type (insn))
   [(set (match_operand 0 "register_operand" "")
        (and (match_dup 0)
             (const_int -65536)))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "optimize_size || (TARGET_FAST_PREFIX && !TARGET_PARTIAL_REG_STALL)"
   [(set (strict_low_part (match_dup 1)) (const_int 0))]
   "operands[1] = gen_lowpart (HImode, operands[0]);")
   [(set (match_operand 0 "ext_register_operand" "")
        (and (match_dup 0)
             (const_int -256)))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "(optimize_size || !TARGET_PARTIAL_REG_STALL) && reload_completed"
   [(set (strict_low_part (match_dup 1)) (const_int 0))]
   "operands[1] = gen_lowpart (QImode, operands[0]);")
   [(set (match_operand 0 "ext_register_operand" "")
        (and (match_dup 0)
             (const_int -65281)))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "(optimize_size || !TARGET_PARTIAL_REG_STALL) && reload_completed"
   [(parallel [(set (zero_extract:SI (match_dup 0)
                                    (const_int 8)
                     (zero_extract:SI (match_dup 0)
                                      (const_int 8)
                                      (const_int 8))))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   "operands[0] = gen_lowpart (SImode, operands[0]);")
 
 ;; See comment for addsi_1_zext why we do use nonimmediate_operand
        (zero_extend:DI
          (and:SI (match_operand:SI 1 "nonimmediate_operand" "%0")
                  (match_operand:SI 2 "general_operand" "rim"))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (AND, SImode, operands)"
   "and{l}\t{%2, %k0|%k0, %2}"
   [(set_attr "type" "alu")
    (set_attr "mode" "SI")])
 
 (define_insn "*andsi_2"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (and:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0")
                         (match_operand:SI 2 "general_operand" "rim,ri"))
                 (const_int 0)))
 
 ;; See comment for addsi_1_zext why we do use nonimmediate_operand
 (define_insn "*andsi_2_zext"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (and:SI (match_operand:SI 1 "nonimmediate_operand" "%0")
                         (match_operand:SI 2 "general_operand" "rim"))
                 (const_int 0)))
   [(set (match_operand:HI 0 "nonimmediate_operand" "")
        (and:HI (match_operand:HI 1 "nonimmediate_operand" "")
                (match_operand:HI 2 "general_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_HIMODE_MATH"
   "ix86_expand_binary_operator (AND, HImode, operands); DONE;")
 
   [(set (match_operand:HI 0 "nonimmediate_operand" "=rm,r,r")
        (and:HI (match_operand:HI 1 "nonimmediate_operand" "%0,0,qm")
                (match_operand:HI 2 "general_operand" "ri,rm,L")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (AND, HImode, operands)"
 {
   switch (get_attr_type (insn))
    (set_attr "mode" "HI,HI,SI")])
 
 (define_insn "*andhi_2"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (and:HI (match_operand:HI 1 "nonimmediate_operand" "%0,0")
                         (match_operand:HI 2 "general_operand" "rim,ri"))
                 (const_int 0)))
   [(set (match_operand:QI 0 "nonimmediate_operand" "")
        (and:QI (match_operand:QI 1 "nonimmediate_operand" "")
                (match_operand:QI 2 "general_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_QIMODE_MATH"
   "ix86_expand_binary_operator (AND, QImode, operands); DONE;")
 
   [(set (match_operand:QI 0 "nonimmediate_operand" "=qm,q,r")
        (and:QI (match_operand:QI 1 "nonimmediate_operand" "%0,0,0")
                (match_operand:QI 2 "general_operand" "qi,qmi,ri")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (AND, QImode, operands)"
   "@
    and{b}\t{%2, %0|%0, %2}
   [(set (strict_low_part (match_operand:QI 0 "nonimmediate_operand" "+qm,q"))
        (and:QI (match_dup 0)
                (match_operand:QI 1 "general_operand" "qi,qmi")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "(! TARGET_PARTIAL_REG_STALL || optimize_size)
    && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)"
   "and{b}\t{%1, %0|%0, %1}"
   [(set_attr "type" "alu1")
    (set_attr "mode" "QI")])
 
-(define_insn "*andqi_2"
-  [(set (reg 17)
+(define_insn "*andqi_2_maybe_si"
+  [(set (reg FLAGS_REG)
        (compare (and:QI
-                  (match_operand:QI 1 "nonimmediate_operand" "%0,0,0")
-                  (match_operand:QI 2 "general_operand" "qim,qi,i"))
+                     (match_operand:QI 1 "nonimmediate_operand" "%0,0,0")
+                     (match_operand:QI 2 "general_operand" "qim,qi,i"))
                 (const_int 0)))
    (set (match_operand:QI 0 "nonimmediate_operand" "=q,qm,*r")
        (and:QI (match_dup 1) (match_dup 2)))]
-  "ix86_match_ccmode (insn, CCNOmode)
-   && ix86_binary_operator_ok (AND, QImode, operands)"
+  "ix86_binary_operator_ok (AND, QImode, operands)
+   && ix86_match_ccmode (insn,
+                        GET_CODE (operands[2]) == CONST_INT
+                        && INTVAL (operands[2]) >= 0 ? CCNOmode : CCZmode)"
 {
   if (which_alternative == 2)
     {
-      if (GET_CODE (operands[2]) == CONST_INT
-          && (INTVAL (operands[2]) & 0xffffff00))
+      if (GET_CODE (operands[2]) == CONST_INT && INTVAL (operands[2]) < 0)
         operands[2] = GEN_INT (INTVAL (operands[2]) & 0xff);
       return "and{l}\t{%2, %k0|%k0, %2}";
     }
   [(set_attr "type" "alu")
    (set_attr "mode" "QI,QI,SI")])
 
+(define_insn "*andqi_2"
+  [(set (reg FLAGS_REG)
+       (compare (and:QI
+                  (match_operand:QI 1 "nonimmediate_operand" "%0,0")
+                  (match_operand:QI 2 "general_operand" "qim,qi"))
+                (const_int 0)))
+   (set (match_operand:QI 0 "nonimmediate_operand" "=q,qm")
+       (and:QI (match_dup 1) (match_dup 2)))]
+  "ix86_match_ccmode (insn, CCNOmode)
+   && ix86_binary_operator_ok (AND, QImode, operands)"
+  "and{b}\t{%2, %0|%0, %2}"
+  [(set_attr "type" "alu")
+   (set_attr "mode" "QI")])
+
 (define_insn "*andqi_2_slp"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (and:QI
                   (match_operand:QI 0 "nonimmediate_operand" "+q,qm")
                   (match_operand:QI 1 "nonimmediate_operand" "qmi,qi"))
            (const_int 8)
            (const_int 8))
          (match_operand 2 "const_int_operand" "n")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   ""
   "and{b}\t{%2, %h0|%h0, %2}"
   [(set_attr "type" "alu")
 ;; often in fp comparisons.
 
 (define_insn "*andqi_ext_0_cc"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (and:SI
            (zero_extract:SI
            (const_int 8))
          (zero_extend:SI
            (match_operand:QI 2 "general_operand" "Qm"))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "!TARGET_64BIT"
   "and{b}\t{%2, %h0|%h0, %2}"
   [(set_attr "type" "alu")
            (const_int 8))
          (zero_extend:SI
            (match_operand 2 "ext_register_operand" "Q"))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT"
   "and{b}\t{%2, %h0|%h0, %2}"
   [(set_attr "type" "alu")
            (match_operand 2 "ext_register_operand" "Q")
            (const_int 8)
            (const_int 8))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   ""
   "and{b}\t{%h2, %h0|%h0, %h2}"
   [(set_attr "type" "alu")
   [(set (match_operand 0 "register_operand" "")
        (and (match_operand 1 "register_operand" "")
             (match_operand 2 "const_int_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
    "reload_completed
     && QI_REG_P (operands[0])
     && (!TARGET_PARTIAL_REG_STALL || optimize_size)
                   (and:SI (zero_extract:SI (match_dup 1)
                                            (const_int 8) (const_int 8))
                           (match_dup 2)))
-             (clobber (reg:CC 17))])]
+             (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);")
   [(set (match_operand 0 "register_operand" "")
        (and (match_operand 1 "general_operand" "")
             (match_operand 2 "const_int_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
    "reload_completed
     && ANY_QI_REG_P (operands[0])
     && (!TARGET_PARTIAL_REG_STALL || optimize_size)
   [(parallel [(set (strict_low_part (match_dup 0))
                   (and:QI (match_dup 1)
                           (match_dup 2)))
-             (clobber (reg:CC 17))])]
+             (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]);")
   [(set (match_operand:DI 0 "nonimmediate_operand" "")
        (ior:DI (match_operand:DI 1 "nonimmediate_operand" "")
                (match_operand:DI 2 "x86_64_general_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT"
   "ix86_expand_binary_operator (IOR, DImode, operands); DONE;")
 
   [(set (match_operand:DI 0 "nonimmediate_operand" "=rm,r")
        (ior:DI (match_operand:DI 1 "nonimmediate_operand" "%0,0")
                (match_operand:DI 2 "x86_64_general_operand" "re,rme")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT
    && ix86_binary_operator_ok (IOR, DImode, operands)"
   "or{q}\t{%2, %0|%0, %2}"
    (set_attr "mode" "DI")])
 
 (define_insn "*iordi_2_rex64"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (ior:DI (match_operand:DI 1 "nonimmediate_operand" "%0,0")
                         (match_operand:DI 2 "x86_64_general_operand" "rem,re"))
                 (const_int 0)))
    (set_attr "mode" "DI")])
 
 (define_insn "*iordi_3_rex64"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (ior:DI (match_operand:DI 1 "nonimmediate_operand" "%0")
                         (match_operand:DI 2 "x86_64_general_operand" "rem"))
                 (const_int 0)))
   [(set (match_operand:SI 0 "nonimmediate_operand" "")
        (ior:SI (match_operand:SI 1 "nonimmediate_operand" "")
                (match_operand:SI 2 "general_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   ""
   "ix86_expand_binary_operator (IOR, SImode, operands); DONE;")
 
   [(set (match_operand:SI 0 "nonimmediate_operand" "=rm,r")
        (ior:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0")
                (match_operand:SI 2 "general_operand" "ri,rmi")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (IOR, SImode, operands)"
   "or{l}\t{%2, %0|%0, %2}"
   [(set_attr "type" "alu")
        (zero_extend:DI
          (ior:SI (match_operand:SI 1 "nonimmediate_operand" "%0")
                  (match_operand:SI 2 "general_operand" "rim"))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (IOR, SImode, operands)"
   "or{l}\t{%2, %k0|%k0, %2}"
   [(set_attr "type" "alu")
   [(set (match_operand:DI 0 "register_operand" "=rm")
        (ior:DI (zero_extend:DI (match_operand:SI 1 "register_operand" "%0"))
                (match_operand:DI 2 "x86_64_zext_immediate_operand" "Z")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT"
   "or{l}\t{%2, %k0|%k0, %2}"
   [(set_attr "type" "alu")
    (set_attr "mode" "SI")])
 
 (define_insn "*iorsi_2"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (ior:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0")
                         (match_operand:SI 2 "general_operand" "rim,ri"))
                 (const_int 0)))
 ;; See comment for addsi_1_zext why we do use nonimmediate_operand
 ;; ??? Special case for immediate operand is missing - it is tricky.
 (define_insn "*iorsi_2_zext"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (ior:SI (match_operand:SI 1 "nonimmediate_operand" "%0")
                         (match_operand:SI 2 "general_operand" "rim"))
                 (const_int 0)))
    (set_attr "mode" "SI")])
 
 (define_insn "*iorsi_2_zext_imm"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (ior:SI (match_operand:SI 1 "nonimmediate_operand" "%0")
                         (match_operand 2 "x86_64_zext_immediate_operand" "Z"))
                 (const_int 0)))
    (set_attr "mode" "SI")])
 
 (define_insn "*iorsi_3"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (ior:SI (match_operand:SI 1 "nonimmediate_operand" "%0")
                         (match_operand:SI 2 "general_operand" "rim"))
                 (const_int 0)))
   [(set (match_operand:HI 0 "nonimmediate_operand" "")
        (ior:HI (match_operand:HI 1 "nonimmediate_operand" "")
                (match_operand:HI 2 "general_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_HIMODE_MATH"
   "ix86_expand_binary_operator (IOR, HImode, operands); DONE;")
 
   [(set (match_operand:HI 0 "nonimmediate_operand" "=r,m")
        (ior:HI (match_operand:HI 1 "nonimmediate_operand" "%0,0")
                (match_operand:HI 2 "general_operand" "rmi,ri")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (IOR, HImode, operands)"
   "or{w}\t{%2, %0|%0, %2}"
   [(set_attr "type" "alu")
    (set_attr "mode" "HI")])
 
 (define_insn "*iorhi_2"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (ior:HI (match_operand:HI 1 "nonimmediate_operand" "%0,0")
                         (match_operand:HI 2 "general_operand" "rim,ri"))
                 (const_int 0)))
    (set_attr "mode" "HI")])
 
 (define_insn "*iorhi_3"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (ior:HI (match_operand:HI 1 "nonimmediate_operand" "%0")
                         (match_operand:HI 2 "general_operand" "rim"))
                 (const_int 0)))
   [(set (match_operand:QI 0 "nonimmediate_operand" "")
        (ior:QI (match_operand:QI 1 "nonimmediate_operand" "")
                (match_operand:QI 2 "general_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_QIMODE_MATH"
   "ix86_expand_binary_operator (IOR, QImode, operands); DONE;")
 
   [(set (match_operand:QI 0 "nonimmediate_operand" "=q,m,r")
        (ior:QI (match_operand:QI 1 "nonimmediate_operand" "%0,0,0")
                (match_operand:QI 2 "general_operand" "qmi,qi,ri")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (IOR, QImode, operands)"
   "@
    or{b}\t{%2, %0|%0, %2}
   [(set (strict_low_part (match_operand:QI 0 "nonimmediate_operand" "+q,m"))
        (ior:QI (match_dup 0)
                (match_operand:QI 1 "general_operand" "qmi,qi")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "(! TARGET_PARTIAL_REG_STALL || optimize_size)
    && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)"
   "or{b}\t{%1, %0|%0, %1}"
    (set_attr "mode" "QI")])
 
 (define_insn "*iorqi_2"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (ior:QI (match_operand:QI 1 "nonimmediate_operand" "%0,0")
                         (match_operand:QI 2 "general_operand" "qim,qi"))
                 (const_int 0)))
    (set_attr "mode" "QI")])
 
 (define_insn "*iorqi_2_slp"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (ior:QI (match_operand:QI 0 "nonimmediate_operand" "+q,qm")
                         (match_operand:QI 1 "general_operand" "qim,qi"))
                 (const_int 0)))
    (set_attr "mode" "QI")])
 
 (define_insn "*iorqi_3"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (ior:QI (match_operand:QI 1 "nonimmediate_operand" "%0")
                         (match_operand:QI 2 "general_operand" "qim"))
                 (const_int 0)))
            (const_int 8)
            (const_int 8))
          (match_operand 2 "const_int_operand" "n")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "(!TARGET_PARTIAL_REG_STALL || optimize_size)"
   "or{b}\t{%2, %h0|%h0, %2}"
   [(set_attr "type" "alu")
            (const_int 8))
          (zero_extend:SI
            (match_operand:QI 2 "general_operand" "Qm"))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "!TARGET_64BIT
    && (!TARGET_PARTIAL_REG_STALL || optimize_size)"
   "or{b}\t{%2, %h0|%h0, %2}"
            (const_int 8))
          (zero_extend:SI
            (match_operand 2 "ext_register_operand" "Q"))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT
    && (!TARGET_PARTIAL_REG_STALL || optimize_size)"
   "or{b}\t{%2, %h0|%h0, %2}"
          (zero_extract:SI (match_operand 2 "ext_register_operand" "Q")
                           (const_int 8)
                           (const_int 8))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "(!TARGET_PARTIAL_REG_STALL || optimize_size)"
   "ior{b}\t{%h2, %h0|%h0, %h2}"
   [(set_attr "type" "alu")
   [(set (match_operand 0 "register_operand" "")
        (ior (match_operand 1 "register_operand" "")
             (match_operand 2 "const_int_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
    "reload_completed
     && QI_REG_P (operands[0])
     && (!TARGET_PARTIAL_REG_STALL || optimize_size)
                   (ior:SI (zero_extract:SI (match_dup 1)
                                            (const_int 8) (const_int 8))
                           (match_dup 2)))
-             (clobber (reg:CC 17))])]
+             (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);")
   [(set (match_operand 0 "register_operand" "")
        (ior (match_operand 1 "general_operand" "")
             (match_operand 2 "const_int_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
    "reload_completed
     && ANY_QI_REG_P (operands[0])
     && (!TARGET_PARTIAL_REG_STALL || optimize_size)
   [(parallel [(set (strict_low_part (match_dup 0))
                   (ior:QI (match_dup 1)
                           (match_dup 2)))
-             (clobber (reg:CC 17))])]
+             (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]);")
   [(set (match_operand:DI 0 "nonimmediate_operand" "")
        (xor:DI (match_operand:DI 1 "nonimmediate_operand" "")
                (match_operand:DI 2 "x86_64_general_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT"
   "ix86_expand_binary_operator (XOR, DImode, operands); DONE;")
 
   [(set (match_operand:DI 0 "nonimmediate_operand" "=rm,r")
        (xor:DI (match_operand:DI 1 "nonimmediate_operand" "%0,0")
                (match_operand:DI 2 "x86_64_general_operand" "re,rm")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT
    && ix86_binary_operator_ok (XOR, DImode, operands)"
   "@
    (set_attr "mode" "DI,DI")])
 
 (define_insn "*xordi_2_rex64"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (xor:DI (match_operand:DI 1 "nonimmediate_operand" "%0,0")
                         (match_operand:DI 2 "x86_64_general_operand" "rem,re"))
                 (const_int 0)))
    (set_attr "mode" "DI,DI")])
 
 (define_insn "*xordi_3_rex64"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (xor:DI (match_operand:DI 1 "nonimmediate_operand" "%0")
                         (match_operand:DI 2 "x86_64_general_operand" "rem"))
                 (const_int 0)))
   [(set (match_operand:SI 0 "nonimmediate_operand" "")
        (xor:SI (match_operand:SI 1 "nonimmediate_operand" "")
                (match_operand:SI 2 "general_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   ""
   "ix86_expand_binary_operator (XOR, SImode, operands); DONE;")
 
   [(set (match_operand:SI 0 "nonimmediate_operand" "=rm,r")
        (xor:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0")
                (match_operand:SI 2 "general_operand" "ri,rm")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (XOR, SImode, operands)"
   "xor{l}\t{%2, %0|%0, %2}"
   [(set_attr "type" "alu")
        (zero_extend:DI
          (xor:SI (match_operand:SI 1 "nonimmediate_operand" "%0")
                  (match_operand:SI 2 "general_operand" "rim"))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (XOR, SImode, operands)"
   "xor{l}\t{%2, %k0|%k0, %2}"
   [(set_attr "type" "alu")
   [(set (match_operand:DI 0 "register_operand" "=r")
        (xor:DI (zero_extend:DI (match_operand:SI 1 "register_operand" "%0"))
                (match_operand:DI 2 "x86_64_zext_immediate_operand" "Z")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (XOR, SImode, operands)"
   "xor{l}\t{%2, %k0|%k0, %2}"
   [(set_attr "type" "alu")
    (set_attr "mode" "SI")])
 
 (define_insn "*xorsi_2"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (xor:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0")
                         (match_operand:SI 2 "general_operand" "rim,ri"))
                 (const_int 0)))
 ;; See comment for addsi_1_zext why we do use nonimmediate_operand
 ;; ??? Special case for immediate operand is missing - it is tricky.
 (define_insn "*xorsi_2_zext"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (xor:SI (match_operand:SI 1 "nonimmediate_operand" "%0")
                         (match_operand:SI 2 "general_operand" "rim"))
                 (const_int 0)))
    (set_attr "mode" "SI")])
 
 (define_insn "*xorsi_2_zext_imm"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (xor:SI (match_operand:SI 1 "nonimmediate_operand" "%0")
                         (match_operand 2 "x86_64_zext_immediate_operand" "Z"))
                 (const_int 0)))
    (set_attr "mode" "SI")])
 
 (define_insn "*xorsi_3"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (xor:SI (match_operand:SI 1 "nonimmediate_operand" "%0")
                         (match_operand:SI 2 "general_operand" "rim"))
                 (const_int 0)))
   [(set (match_operand:HI 0 "nonimmediate_operand" "")
        (xor:HI (match_operand:HI 1 "nonimmediate_operand" "")
                (match_operand:HI 2 "general_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_HIMODE_MATH"
   "ix86_expand_binary_operator (XOR, HImode, operands); DONE;")
 
   [(set (match_operand:HI 0 "nonimmediate_operand" "=r,m")
        (xor:HI (match_operand:HI 1 "nonimmediate_operand" "%0,0")
                (match_operand:HI 2 "general_operand" "rmi,ri")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (XOR, HImode, operands)"
   "xor{w}\t{%2, %0|%0, %2}"
   [(set_attr "type" "alu")
    (set_attr "mode" "HI")])
 
 (define_insn "*xorhi_2"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (xor:HI (match_operand:HI 1 "nonimmediate_operand" "%0,0")
                         (match_operand:HI 2 "general_operand" "rim,ri"))
                 (const_int 0)))
    (set_attr "mode" "HI")])
 
 (define_insn "*xorhi_3"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (xor:HI (match_operand:HI 1 "nonimmediate_operand" "%0")
                         (match_operand:HI 2 "general_operand" "rim"))
                 (const_int 0)))
   [(set (match_operand:QI 0 "nonimmediate_operand" "")
        (xor:QI (match_operand:QI 1 "nonimmediate_operand" "")
                (match_operand:QI 2 "general_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_QIMODE_MATH"
   "ix86_expand_binary_operator (XOR, QImode, operands); DONE;")
 
   [(set (match_operand:QI 0 "nonimmediate_operand" "=q,m,r")
        (xor:QI (match_operand:QI 1 "nonimmediate_operand" "%0,0,0")
                (match_operand:QI 2 "general_operand" "qmi,qi,ri")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (XOR, QImode, operands)"
   "@
    xor{b}\t{%2, %0|%0, %2}
   [(set (strict_low_part (match_operand:QI 0 "nonimmediate_operand" "+qm,q"))
        (xor:QI (match_dup 0)
                (match_operand:QI 1 "general_operand" "qi,qmi")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "(! TARGET_PARTIAL_REG_STALL || optimize_size)
    && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)"
   "xor{b}\t{%1, %0|%0, %1}"
            (const_int 8)
            (const_int 8))
          (match_operand 2 "const_int_operand" "n")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "(!TARGET_PARTIAL_REG_STALL || optimize_size)"
   "xor{b}\t{%2, %h0|%h0, %2}"
   [(set_attr "type" "alu")
            (const_int 8))
          (zero_extend:SI
            (match_operand:QI 2 "general_operand" "Qm"))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "!TARGET_64BIT
    && (!TARGET_PARTIAL_REG_STALL || optimize_size)"
   "xor{b}\t{%2, %h0|%h0, %2}"
            (const_int 8))
          (zero_extend:SI
            (match_operand 2 "ext_register_operand" "Q"))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT
    && (!TARGET_PARTIAL_REG_STALL || optimize_size)"
   "xor{b}\t{%2, %h0|%h0, %2}"
          (zero_extract:SI (match_operand 2 "ext_register_operand" "Q")
                           (const_int 8)
                           (const_int 8))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "(!TARGET_PARTIAL_REG_STALL || optimize_size)"
   "xor{b}\t{%h2, %h0|%h0, %h2}"
   [(set_attr "type" "alu")
    (set_attr "mode" "QI")])
 
 (define_insn "*xorqi_cc_1"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (xor:QI (match_operand:QI 1 "nonimmediate_operand" "%0,0")
                  (match_operand:QI 2 "general_operand" "qim,qi"))
    (set_attr "mode" "QI")])
 
 (define_insn "*xorqi_2_slp"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (xor:QI (match_operand:QI 0 "nonimmediate_operand" "+q,qm")
                         (match_operand:QI 1 "general_operand" "qim,qi"))
                 (const_int 0)))
    (set_attr "mode" "QI")])
 
 (define_insn "*xorqi_cc_2"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (xor:QI (match_operand:QI 1 "nonimmediate_operand" "%0")
                  (match_operand:QI 2 "general_operand" "qim"))
    (set_attr "mode" "QI")])
 
 (define_insn "*xorqi_cc_ext_1"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (xor:SI
            (zero_extract:SI
    (set_attr "mode" "QI")])
 
 (define_insn "*xorqi_cc_ext_1_rex64"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (xor:SI
            (zero_extract:SI
 
 (define_expand "xorqi_cc_ext_1"
   [(parallel [
-     (set (reg:CCNO 17)
+     (set (reg:CCNO FLAGS_REG)
          (compare:CCNO
            (xor:SI
              (zero_extract:SI
   [(set (match_operand 0 "register_operand" "")
        (xor (match_operand 1 "register_operand" "")
             (match_operand 2 "const_int_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
    "reload_completed
     && QI_REG_P (operands[0])
     && (!TARGET_PARTIAL_REG_STALL || optimize_size)
                   (xor:SI (zero_extract:SI (match_dup 1)
                                            (const_int 8) (const_int 8))
                           (match_dup 2)))
-             (clobber (reg:CC 17))])]
+             (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);")
   [(set (match_operand 0 "register_operand" "")
        (xor (match_operand 1 "general_operand" "")
             (match_operand 2 "const_int_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
    "reload_completed
     && ANY_QI_REG_P (operands[0])
     && (!TARGET_PARTIAL_REG_STALL || optimize_size)
   [(parallel [(set (strict_low_part (match_dup 0))
                   (xor:QI (match_dup 1)
                           (match_dup 2)))
-             (clobber (reg:CC 17))])]
+             (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]);")
 (define_expand "negdi2"
   [(parallel [(set (match_operand:DI 0 "nonimmediate_operand" "")
                   (neg:DI (match_operand:DI 1 "nonimmediate_operand" "")))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   ""
   "ix86_expand_unary_operator (NEG, DImode, operands); DONE;")
 
 (define_insn "*negdi2_1"
   [(set (match_operand:DI 0 "nonimmediate_operand" "=ro")
        (neg:DI (match_operand:DI 1 "general_operand" "0")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "!TARGET_64BIT
    && ix86_unary_operator_ok (NEG, DImode, operands)"
   "#")
 (define_split
   [(set (match_operand:DI 0 "nonimmediate_operand" "")
        (neg:DI (match_operand:DI 1 "general_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "!TARGET_64BIT && reload_completed"
   [(parallel
-    [(set (reg:CCZ 17)
+    [(set (reg:CCZ FLAGS_REG)
          (compare:CCZ (neg:SI (match_dup 2)) (const_int 0)))
      (set (match_dup 0) (neg:SI (match_dup 2)))])
    (parallel
     [(set (match_dup 1)
-         (plus:SI (plus:SI (ltu:SI (reg:CC 17) (const_int 0))
+         (plus:SI (plus:SI (ltu:SI (reg:CC FLAGS_REG) (const_int 0))
                            (match_dup 3))
                   (const_int 0)))
-     (clobber (reg:CC 17))])
+     (clobber (reg:CC FLAGS_REG))])
    (parallel
     [(set (match_dup 1)
          (neg:SI (match_dup 1)))
-     (clobber (reg:CC 17))])]
+     (clobber (reg:CC FLAGS_REG))])]
   "split_di (operands+1, 1, operands+2, operands+3);
    split_di (operands+0, 1, operands+0, operands+1);")
 
 (define_insn "*negdi2_1_rex64"
   [(set (match_operand:DI 0 "nonimmediate_operand" "=rm")
        (neg:DI (match_operand:DI 1 "nonimmediate_operand" "0")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_unary_operator_ok (NEG, DImode, operands)"
   "neg{q}\t%0"
   [(set_attr "type" "negnot")
 ;; flag being the only useful item.
 
 (define_insn "*negdi2_cmpz_rex64"
-  [(set (reg:CCZ 17)
+  [(set (reg:CCZ FLAGS_REG)
        (compare:CCZ (neg:DI (match_operand:DI 1 "nonimmediate_operand" "0"))
                     (const_int 0)))
    (set (match_operand:DI 0 "nonimmediate_operand" "=rm")
 (define_expand "negsi2"
   [(parallel [(set (match_operand:SI 0 "nonimmediate_operand" "")
                   (neg:SI (match_operand:SI 1 "nonimmediate_operand" "")))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   ""
   "ix86_expand_unary_operator (NEG, SImode, operands); DONE;")
 
 (define_insn "*negsi2_1"
   [(set (match_operand:SI 0 "nonimmediate_operand" "=rm")
        (neg:SI (match_operand:SI 1 "nonimmediate_operand" "0")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_unary_operator_ok (NEG, SImode, operands)"
   "neg{l}\t%0"
   [(set_attr "type" "negnot")
        (lshiftrt:DI (neg:DI (ashift:DI (match_operand:DI 1 "register_operand" "0")
                                        (const_int 32)))
                     (const_int 32)))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_unary_operator_ok (NEG, SImode, operands)"
   "neg{l}\t%k0"
   [(set_attr "type" "negnot")
 ;; flag being the only useful item.
 
 (define_insn "*negsi2_cmpz"
-  [(set (reg:CCZ 17)
+  [(set (reg:CCZ FLAGS_REG)
        (compare:CCZ (neg:SI (match_operand:SI 1 "nonimmediate_operand" "0"))
                     (const_int 0)))
    (set (match_operand:SI 0 "nonimmediate_operand" "=rm")
    (set_attr "mode" "SI")])
 
 (define_insn "*negsi2_cmpz_zext"
-  [(set (reg:CCZ 17)
+  [(set (reg:CCZ FLAGS_REG)
        (compare:CCZ (lshiftrt:DI
                       (neg:DI (ashift:DI
                                 (match_operand:DI 1 "register_operand" "0")
 (define_expand "neghi2"
   [(parallel [(set (match_operand:HI 0 "nonimmediate_operand" "")
                   (neg:HI (match_operand:HI 1 "nonimmediate_operand" "")))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   "TARGET_HIMODE_MATH"
   "ix86_expand_unary_operator (NEG, HImode, operands); DONE;")
 
 (define_insn "*neghi2_1"
   [(set (match_operand:HI 0 "nonimmediate_operand" "=rm")
        (neg:HI (match_operand:HI 1 "nonimmediate_operand" "0")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_unary_operator_ok (NEG, HImode, operands)"
   "neg{w}\t%0"
   [(set_attr "type" "negnot")
    (set_attr "mode" "HI")])
 
 (define_insn "*neghi2_cmpz"
-  [(set (reg:CCZ 17)
+  [(set (reg:CCZ FLAGS_REG)
        (compare:CCZ (neg:HI (match_operand:HI 1 "nonimmediate_operand" "0"))
                     (const_int 0)))
    (set (match_operand:HI 0 "nonimmediate_operand" "=rm")
 (define_expand "negqi2"
   [(parallel [(set (match_operand:QI 0 "nonimmediate_operand" "")
                   (neg:QI (match_operand:QI 1 "nonimmediate_operand" "")))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   "TARGET_QIMODE_MATH"
   "ix86_expand_unary_operator (NEG, QImode, operands); DONE;")
 
 (define_insn "*negqi2_1"
   [(set (match_operand:QI 0 "nonimmediate_operand" "=qm")
        (neg:QI (match_operand:QI 1 "nonimmediate_operand" "0")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_unary_operator_ok (NEG, QImode, operands)"
   "neg{b}\t%0"
   [(set_attr "type" "negnot")
    (set_attr "mode" "QI")])
 
 (define_insn "*negqi2_cmpz"
-  [(set (reg:CCZ 17)
+  [(set (reg:CCZ FLAGS_REG)
        (compare:CCZ (neg:QI (match_operand:QI 1 "nonimmediate_operand" "0"))
                     (const_int 0)))
    (set (match_operand:QI 0 "nonimmediate_operand" "=qm")
 ;; Changing of sign for FP values is doable using integer unit too.
 
 (define_expand "negsf2"
-  [(parallel [(set (match_operand:SF 0 "nonimmediate_operand" "")
-                  (neg:SF (match_operand:SF 1 "nonimmediate_operand" "")))
-             (clobber (reg:CC 17))])]
-  "TARGET_80387"
-  "if (TARGET_SSE)
-     {
-       /* In case operand is in memory,  we will not use SSE.  */
-       if (memory_operand (operands[0], VOIDmode)
-          && rtx_equal_p (operands[0], operands[1]))
-        emit_insn (gen_negsf2_memory (operands[0], operands[1]));
-       else
-       {
-         /* Using SSE is tricky, since we need bitwise negation of -0
-            in register.  */
-         rtx reg = gen_reg_rtx (SFmode);
-         rtx dest = operands[0];
-         rtx imm = gen_lowpart (SFmode, gen_int_mode (0x80000000, SImode));
-
-         operands[1] = force_reg (SFmode, operands[1]);
-         operands[0] = force_reg (SFmode, operands[0]);
-         reg = force_reg (V4SFmode,
-                          gen_rtx_CONST_VECTOR (V4SFmode,
-                            gen_rtvec (4, imm, CONST0_RTX (SFmode),
-                                       CONST0_RTX (SFmode),
-                                       CONST0_RTX (SFmode))));
-         emit_insn (gen_negsf2_ifs (operands[0], operands[1], reg));
-         if (dest != operands[0])
-           emit_move_insn (dest, operands[0]);
-       }
-       DONE;
-     }
-   ix86_expand_unary_operator (NEG, SFmode, operands); DONE;")
+  [(set (match_operand:SF 0 "nonimmediate_operand" "")
+       (neg:SF (match_operand:SF 1 "nonimmediate_operand" "")))]
+  "TARGET_80387 || TARGET_SSE_MATH"
+  "ix86_expand_fp_absneg_operator (NEG, SFmode, operands); DONE;")
 
-(define_insn "negsf2_memory"
-  [(set (match_operand:SF 0 "memory_operand" "=m")
-       (neg:SF (match_operand:SF 1 "memory_operand" "0")))
-   (clobber (reg:CC 17))]
-  "ix86_unary_operator_ok (NEG, SFmode, operands)"
+(define_expand "abssf2"
+  [(set (match_operand:SF 0 "nonimmediate_operand" "")
+       (abs:SF (match_operand:SF 1 "nonimmediate_operand" "")))]
+  "TARGET_80387 || TARGET_SSE_MATH"
+  "ix86_expand_fp_absneg_operator (ABS, SFmode, operands); DONE;")
+
+(define_insn "*absnegsf2_mixed"
+  [(set (match_operand:SF 0 "nonimmediate_operand"    "=x#fr,x#fr,f#xr,rm#xf")
+       (match_operator:SF 3 "absneg_operator"
+         [(match_operand:SF 1 "nonimmediate_operand" "0    ,x#fr,0   ,0")]))
+   (use (match_operand:V4SF 2 "nonimmediate_operand"  "xm   ,0   ,X   ,X"))
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_SSE_MATH && TARGET_MIX_SSE_I387
+   && ix86_unary_operator_ok (GET_CODE (operands[3]), SFmode, operands)"
   "#")
 
-(define_insn "negsf2_ifs"
-  [(set (match_operand:SF 0 "nonimmediate_operand" "=x#fr,x#fr,f#xr,rm#xf")
-       (neg:SF (match_operand:SF 1 "nonimmediate_operand" "0,x#fr,0,0")))
-   (use (match_operand:V4SF 2 "nonimmediate_operand" "xm,0,xm*r,xm*r"))
-   (clobber (reg:CC 17))]
-  "TARGET_SSE
-   && (reload_in_progress || reload_completed
-       || (register_operand (operands[0], VOIDmode)
-          && register_operand (operands[1], VOIDmode)))"
+(define_insn "*absnegsf2_sse"
+  [(set (match_operand:SF 0 "nonimmediate_operand"    "=x#r,x#r,rm#x")
+       (match_operator:SF 3 "absneg_operator"
+         [(match_operand:SF 1 "nonimmediate_operand" "0   ,x#r,0")]))
+   (use (match_operand:V4SF 2 "nonimmediate_operand"  "xm  ,0  ,X"))
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_SSE_MATH
+   && ix86_unary_operator_ok (GET_CODE (operands[3]), SFmode, operands)"
   "#")
 
-(define_split
-  [(set (match_operand:SF 0 "memory_operand" "")
-       (neg:SF (match_operand:SF 1 "memory_operand" "")))
-   (use (match_operand:SF 2 "" ""))
-   (clobber (reg:CC 17))]
-  ""
-  [(parallel [(set (match_dup 0)
-                  (neg:SF (match_dup 1)))
-             (clobber (reg:CC 17))])])
-
-(define_split
-  [(set (match_operand:SF 0 "register_operand" "")
-       (neg:SF (match_operand:SF 1 "register_operand" "")))
-   (use (match_operand:V4SF 2 "" ""))
-   (clobber (reg:CC 17))]
-  "reload_completed && !SSE_REG_P (operands[0])"
-  [(parallel [(set (match_dup 0)
-                  (neg:SF (match_dup 1)))
-             (clobber (reg:CC 17))])])
-
-(define_split
-  [(set (match_operand:SF 0 "register_operand" "")
-       (neg:SF (match_operand:SF 1 "register_operand" "")))
-   (use (match_operand:V4SF 2 "nonimmediate_operand" ""))
-   (clobber (reg:CC 17))]
-  "reload_completed && SSE_REG_P (operands[0])"
-  [(set (subreg:TI (match_dup 0) 0)
-       (xor:TI (match_dup 1)
-               (match_dup 2)))]
-{
-  operands[1] = simplify_gen_subreg (TImode, operands[1], SFmode, 0);
-  operands[2] = simplify_gen_subreg (TImode, operands[2], V4SFmode, 0);
-  if (operands_match_p (operands[0], operands[2]))
-    {
-      rtx tmp;
-      tmp = operands[1];
-      operands[1] = operands[2];
-      operands[2] = tmp;
-    }
-})
-
-
-;; Keep 'f' and 'r' in separate alternatives to avoid reload problems
-;; because of secondary memory needed to reload from class FLOAT_INT_REGS
-;; to itself.
-(define_insn "*negsf2_if"
+(define_insn "*absnegsf2_i387"
   [(set (match_operand:SF 0 "nonimmediate_operand" "=f#r,rm#f")
-       (neg:SF (match_operand:SF 1 "nonimmediate_operand" "0,0")))
-   (clobber (reg:CC 17))]
-  "TARGET_80387 && !TARGET_SSE
-   && ix86_unary_operator_ok (NEG, SFmode, operands)"
+       (match_operator:SF 3 "absneg_operator"
+         [(match_operand:SF 1 "nonimmediate_operand" "0,0")]))
+   (use (match_operand 2 "" ""))
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_80387 && !TARGET_SSE_MATH
+   && ix86_unary_operator_ok (GET_CODE (operands[3]), SFmode, operands)"
   "#")
 
-(define_split
-  [(set (match_operand:SF 0 "fp_register_operand" "")
-       (neg:SF (match_operand:SF 1 "register_operand" "")))
-   (clobber (reg:CC 17))]
-  "TARGET_80387 && reload_completed"
-  [(set (match_dup 0)
-       (neg:SF (match_dup 1)))]
-  "")
-
-(define_split
-  [(set (match_operand:SF 0 "register_and_not_fp_reg_operand" "")
-       (neg:SF (match_operand:SF 1 "register_operand" "")))
-   (clobber (reg:CC 17))]
-  "TARGET_80387 && reload_completed"
-  [(parallel [(set (match_dup 0) (xor:SI (match_dup 0) (match_dup 1)))
-             (clobber (reg:CC 17))])]
-  "operands[1] = gen_int_mode (0x80000000, SImode);
-   operands[0] = gen_lowpart (SImode, operands[0]);")
-
-(define_split
-  [(set (match_operand 0 "memory_operand" "")
-       (neg (match_operand 1 "memory_operand" "")))
-   (clobber (reg:CC 17))]
-  "TARGET_80387 && reload_completed && FLOAT_MODE_P (GET_MODE (operands[0]))"
-  [(parallel [(set (match_dup 0) (xor:QI (match_dup 0) (match_dup 1)))
-             (clobber (reg:CC 17))])]
-{
-  int size = GET_MODE_SIZE (GET_MODE (operands[1]));
-
-  if (GET_MODE (operands[1]) == XFmode)
-    size = 10;
-  operands[0] = adjust_address (operands[0], QImode, size - 1);
-  operands[1] = gen_int_mode (0x80, QImode);
-})
-
 (define_expand "negdf2"
-  [(parallel [(set (match_operand:DF 0 "nonimmediate_operand" "")
-                  (neg:DF (match_operand:DF 1 "nonimmediate_operand" "")))
-             (clobber (reg:CC 17))])]
-  "TARGET_80387"
-  "if (TARGET_SSE2)
-     {
-       /* In case operand is in memory,  we will not use SSE.  */
-       if (memory_operand (operands[0], VOIDmode)
-          && rtx_equal_p (operands[0], operands[1]))
-        emit_insn (gen_negdf2_memory (operands[0], operands[1]));
-       else
-       {
-         /* Using SSE is tricky, since we need bitwise negation of -0
-            in register.  */
-         rtx reg;
-#if HOST_BITS_PER_WIDE_INT >= 64
-         rtx imm = gen_int_mode (((HOST_WIDE_INT)1) << 63, DImode);
-#else
-         rtx imm = immed_double_const (0, 0x80000000, DImode);
-#endif
-         rtx dest = operands[0];
-
-         operands[1] = force_reg (DFmode, operands[1]);
-         operands[0] = force_reg (DFmode, operands[0]);
-         imm = gen_lowpart (DFmode, imm);
-         reg = force_reg (V2DFmode,
-                          gen_rtx_CONST_VECTOR (V2DFmode,
-                            gen_rtvec (2, imm, CONST0_RTX (DFmode))));
-         emit_insn (gen_negdf2_ifs (operands[0], operands[1], reg));
-         if (dest != operands[0])
-           emit_move_insn (dest, operands[0]);
-       }
-       DONE;
-     }
-   ix86_expand_unary_operator (NEG, DFmode, operands); DONE;")
+  [(set (match_operand:DF 0 "nonimmediate_operand" "")
+       (neg:DF (match_operand:DF 1 "nonimmediate_operand" "")))]
+  "TARGET_80387 || (TARGET_SSE2 && TARGET_SSE_MATH)"
+  "ix86_expand_fp_absneg_operator (NEG, DFmode, operands); DONE;")
 
-(define_insn "negdf2_memory"
-  [(set (match_operand:DF 0 "memory_operand" "=m")
-       (neg:DF (match_operand:DF 1 "memory_operand" "0")))
-   (clobber (reg:CC 17))]
-  "ix86_unary_operator_ok (NEG, DFmode, operands)"
+(define_expand "absdf2"
+  [(set (match_operand:DF 0 "nonimmediate_operand" "")
+       (abs:DF (match_operand:DF 1 "nonimmediate_operand" "")))]
+  "TARGET_80387 || (TARGET_SSE2 && TARGET_SSE_MATH)"
+  "ix86_expand_fp_absneg_operator (ABS, DFmode, operands); DONE;")
+
+(define_insn "*absnegdf2_mixed"
+  [(set (match_operand:DF 0 "nonimmediate_operand"    "=Y#fr,Y#fr,f#Yr,rm#Yf")
+       (match_operator:DF 3 "absneg_operator"
+         [(match_operand:DF 1 "nonimmediate_operand" "0    ,Y#fr,0   ,0")]))
+   (use (match_operand:V2DF 2 "nonimmediate_operand"  "Ym   ,0   ,X   ,X"))
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_SSE2 && TARGET_SSE_MATH && TARGET_MIX_SSE_I387
+   && ix86_unary_operator_ok (GET_CODE (operands[3]), DFmode, operands)"
   "#")
 
-(define_insn "negdf2_ifs"
-  [(set (match_operand:DF 0 "nonimmediate_operand" "=Y#fr,Y#fr,f#Yr,rm#Yf")
-       (neg:DF (match_operand:DF 1 "nonimmediate_operand" "0,Y#fr,0,0")))
-   (use (match_operand:V2DF 2 "nonimmediate_operand" "Ym,0,Ym*r,Ym*r"))
-   (clobber (reg:CC 17))]
-  "!TARGET_64BIT && TARGET_SSE2
-   && (reload_in_progress || reload_completed
-       || (register_operand (operands[0], VOIDmode)
-          && register_operand (operands[1], VOIDmode)))"
+(define_insn "*absnegdf2_sse"
+  [(set (match_operand:DF 0 "nonimmediate_operand"    "=Y#r,Y#r,rm#Y")
+       (match_operator:DF 3 "absneg_operator"
+         [(match_operand:DF 1 "nonimmediate_operand" "0   ,Y#r,0")]))
+   (use (match_operand:V2DF 2 "nonimmediate_operand"  "Ym  ,0  ,X"))
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_SSE2 && TARGET_SSE_MATH
+   && ix86_unary_operator_ok (GET_CODE (operands[3]), DFmode, operands)"
   "#")
 
-(define_insn "*negdf2_ifs_rex64"
-  [(set (match_operand:DF 0 "nonimmediate_operand" "=Y#f,Y#f,fm#Y")
-       (neg:DF (match_operand:DF 1 "nonimmediate_operand" "0,Y#fr,0")))
-   (use (match_operand:V2DF 2 "nonimmediate_operand" "Ym,0,Ym*r"))
-   (clobber (reg:CC 17))]
-  "TARGET_64BIT && TARGET_SSE2
-   && (reload_in_progress || reload_completed
-       || (register_operand (operands[0], VOIDmode)
-          && register_operand (operands[1], VOIDmode)))"
+(define_insn "*absnegdf2_i387"
+  [(set (match_operand:DF 0 "nonimmediate_operand" "=f#r,rm#f")
+       (match_operator:DF 3 "absneg_operator"
+         [(match_operand:DF 1 "nonimmediate_operand" "0,0")]))
+   (use (match_operand 2 "" ""))
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_80387 && !(TARGET_SSE2 && TARGET_SSE_MATH)
+   && ix86_unary_operator_ok (GET_CODE (operands[3]), DFmode, operands)"
   "#")
 
-(define_split
-  [(set (match_operand:DF 0 "memory_operand" "")
-       (neg:DF (match_operand:DF 1 "memory_operand" "")))
-   (use (match_operand:V2DF 2 "" ""))
-   (clobber (reg:CC 17))]
-  ""
-  [(parallel [(set (match_dup 0)
-                  (neg:DF (match_dup 1)))
-             (clobber (reg:CC 17))])])
+(define_expand "negxf2"
+  [(set (match_operand:XF 0 "nonimmediate_operand" "")
+       (neg:XF (match_operand:XF 1 "nonimmediate_operand" "")))]
+  "TARGET_80387"
+  "ix86_expand_fp_absneg_operator (NEG, XFmode, operands); DONE;")
 
-(define_split
-  [(set (match_operand:DF 0 "register_operand" "")
-       (neg:DF (match_operand:DF 1 "register_operand" "")))
-   (use (match_operand:V2DF 2 "" ""))
-   (clobber (reg:CC 17))]
-  "reload_completed && !SSE_REG_P (operands[0])
-   && (!TARGET_64BIT || FP_REG_P (operands[0]))"
-  [(parallel [(set (match_dup 0)
-                  (neg:DF (match_dup 1)))
-             (clobber (reg:CC 17))])])
+(define_expand "absxf2"
+  [(set (match_operand:XF 0 "nonimmediate_operand" "")
+       (neg:XF (match_operand:XF 1 "nonimmediate_operand" "")))]
+  "TARGET_80387"
+  "ix86_expand_fp_absneg_operator (ABS, XFmode, operands); DONE;")
+
+(define_insn "*absnegxf2_i387"
+  [(set (match_operand:XF 0 "nonimmediate_operand" "=f#r,rm#f")
+       (match_operator:XF 3 "absneg_operator"
+         [(match_operand:XF 1 "nonimmediate_operand" "0,0")]))
+   (use (match_operand 2 "" ""))
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_80387
+   && ix86_unary_operator_ok (GET_CODE (operands[3]), XFmode, operands)"
+  "#")
+
+;; Splitters for fp abs and neg.
 
 (define_split
-  [(set (match_operand:DF 0 "register_operand" "")
-       (neg:DF (match_operand:DF 1 "register_operand" "")))
-   (use (match_operand:V2DF 2 "" ""))
-   (clobber (reg:CC 17))]
-  "TARGET_64BIT && reload_completed && GENERAL_REG_P (operands[0])"
-  [(parallel [(set (match_dup 0)
-                  (xor:DI (match_dup 1) (match_dup 2)))
-             (clobber (reg:CC 17))])]
-   "operands[0] = gen_lowpart (DImode, operands[0]);
-    operands[1] = gen_lowpart (DImode, operands[1]);
-    operands[2] = gen_lowpart (DImode, operands[2]);")
+  [(set (match_operand 0 "fp_register_operand" "")
+       (match_operator 1 "absneg_operator" [(match_dup 0)]))
+   (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:DF 0 "register_operand" "")
-       (neg:DF (match_operand:DF 1 "register_operand" "")))
-   (use (match_operand:V2DF 2 "nonimmediate_operand" ""))
-   (clobber (reg:CC 17))]
+  [(set (match_operand 0 "register_operand" "")
+       (match_operator 3 "absneg_operator"
+         [(match_operand 1 "register_operand" "")]))
+   (use (match_operand 2 "nonimmediate_operand" ""))
+   (clobber (reg:CC FLAGS_REG))]
   "reload_completed && SSE_REG_P (operands[0])"
-  [(set (subreg:TI (match_dup 0) 0)
-       (xor:TI (match_dup 1)
-               (match_dup 2)))]
+  [(set (match_dup 0) (match_dup 3))]
 {
-  operands[0] = simplify_gen_subreg (V2DFmode, operands[0], DFmode, 0);
-  operands[1] = simplify_gen_subreg (TImode, operands[1], DFmode, 0);
-  operands[2] = simplify_gen_subreg (TImode, operands[2], V2DFmode, 0);
-  /* Avoid possible reformatting on the operands.  */
-  if (TARGET_SSE_PARTIAL_REGS && !optimize_size)
-    emit_insn (gen_sse2_unpcklpd (operands[0], operands[0], operands[0]));
+  enum machine_mode mode = GET_MODE (operands[0]);
+  enum machine_mode vmode = GET_MODE (operands[2]);
+  rtx tmp;
+  
+  operands[0] = simplify_gen_subreg (vmode, operands[0], mode, 0);
+  operands[1] = simplify_gen_subreg (vmode, operands[1], mode, 0);
   if (operands_match_p (operands[0], operands[2]))
     {
-      rtx tmp;
       tmp = operands[1];
       operands[1] = operands[2];
       operands[2] = tmp;
     }
+  if (GET_CODE (operands[3]) == ABS)
+    tmp = gen_rtx_AND (vmode, operands[1], operands[2]);
+  else
+    tmp = gen_rtx_XOR (vmode, operands[1], operands[2]);
+  operands[3] = tmp;
 })
 
-;; Keep 'f' and 'r' in separate alternatives to avoid reload problems
-;; because of secondary memory needed to reload from class FLOAT_INT_REGS
-;; to itself.
-(define_insn "*negdf2_if"
-  [(set (match_operand:DF 0 "nonimmediate_operand" "=f#r,rm#f")
-       (neg:DF (match_operand:DF 1 "nonimmediate_operand" "0,0")))
-   (clobber (reg:CC 17))]
-  "!TARGET_64BIT && TARGET_80387
-   && ix86_unary_operator_ok (NEG, DFmode, operands)"
-  "#")
-
-;; FIXME: We should to allow integer registers here.  Problem is that
-;; we need another scratch register to get constant from.
-;; Forcing constant to mem if no register available in peep2 should be
-;; safe even for PIC mode, because of RIP relative addressing.
-(define_insn "*negdf2_if_rex64"
-  [(set (match_operand:DF 0 "nonimmediate_operand" "=f,mf")
-       (neg:DF (match_operand:DF 1 "nonimmediate_operand" "0,0")))
-   (clobber (reg:CC 17))]
-  "TARGET_64BIT && TARGET_80387
-   && ix86_unary_operator_ok (NEG, DFmode, operands)"
-  "#")
-
 (define_split
-  [(set (match_operand:DF 0 "fp_register_operand" "")
-       (neg:DF (match_operand:DF 1 "register_operand" "")))
-   (clobber (reg:CC 17))]
-  "TARGET_80387 && reload_completed"
-  [(set (match_dup 0)
-       (neg:DF (match_dup 1)))]
-  "")
+  [(set (match_operand:SF 0 "register_operand" "")
+       (match_operator:SF 1 "absneg_operator" [(match_dup 0)]))
+   (use (match_operand:V4SF 2 "" ""))
+   (clobber (reg:CC FLAGS_REG))]
+  "reload_completed"
+  [(parallel [(set (match_dup 0) (match_dup 1))
+             (clobber (reg:CC FLAGS_REG))])]
+{ 
+  rtx tmp;
+  operands[0] = gen_lowpart (SImode, operands[0]);
+  if (GET_CODE (operands[1]) == ABS)
+    {
+      tmp = gen_int_mode (0x7fffffff, SImode);
+      tmp = gen_rtx_AND (SImode, operands[0], tmp);
+    }
+  else
+    {
+      tmp = gen_int_mode (0x80000000, SImode);
+      tmp = gen_rtx_XOR (SImode, operands[0], tmp);
+    }
+  operands[1] = tmp;
+})
 
 (define_split
-  [(set (match_operand:DF 0 "register_and_not_fp_reg_operand" "")
-       (neg:DF (match_operand:DF 1 "register_operand" "")))
-   (clobber (reg:CC 17))]
-  "!TARGET_64BIT && TARGET_80387 && reload_completed"
-  [(parallel [(set (match_dup 3) (xor:SI (match_dup 3) (match_dup 4)))
-             (clobber (reg:CC 17))])]
-  "operands[4] = gen_int_mode (0x80000000, SImode);
-   split_di (operands+0, 1, operands+2, operands+3);")
-
-(define_expand "negxf2"
-  [(parallel [(set (match_operand:XF 0 "nonimmediate_operand" "")
-                  (neg:XF (match_operand:XF 1 "nonimmediate_operand" "")))
-             (clobber (reg:CC 17))])]
-  "TARGET_80387"
-  "ix86_expand_unary_operator (NEG, XFmode, operands); DONE;")
+  [(set (match_operand:DF 0 "register_operand" "")
+       (match_operator:DF 1 "absneg_operator" [(match_dup 0)]))
+   (use (match_operand 2 "" ""))
+   (clobber (reg:CC FLAGS_REG))]
+  "reload_completed"
+  [(parallel [(set (match_dup 0) (match_dup 1))
+             (clobber (reg:CC FLAGS_REG))])]
+{
+  rtx tmp;
+  if (TARGET_64BIT)
+    {
+      tmp = gen_lowpart (DImode, operands[0]);
+      tmp = gen_rtx_ZERO_EXTRACT (DImode, tmp, const1_rtx, GEN_INT (63));
+      operands[0] = tmp;
 
-;; Keep 'f' and 'r' in separate alternatives to avoid reload problems
-;; because of secondary memory needed to reload from class FLOAT_INT_REGS
-;; to itself.
-(define_insn "*negxf2_if"
-  [(set (match_operand:XF 0 "nonimmediate_operand" "=f#r,rm#f")
-       (neg:XF (match_operand:XF 1 "nonimmediate_operand" "0,0")))
-   (clobber (reg:CC 17))]
-  "TARGET_80387
-   && ix86_unary_operator_ok (NEG, XFmode, operands)"
-  "#")
+      if (GET_CODE (operands[1]) == ABS)
+       tmp = const0_rtx;
+      else
+       tmp = gen_rtx_NOT (DImode, tmp);
+    }
+  else
+    {
+      operands[0] = gen_highpart (SImode, operands[0]);
+      if (GET_CODE (operands[1]) == ABS)
+       {
+         tmp = gen_int_mode (0x7fffffff, SImode);
+         tmp = gen_rtx_AND (SImode, operands[0], tmp);
+       }
+      else
+       {
+         tmp = gen_int_mode (0x80000000, SImode);
+         tmp = gen_rtx_XOR (SImode, operands[0], tmp);
+       }
+    }
+  operands[1] = tmp;
+})
 
 (define_split
-  [(set (match_operand:XF 0 "fp_register_operand" "")
-       (neg:XF (match_operand:XF 1 "register_operand" "")))
-   (clobber (reg:CC 17))]
-  "TARGET_80387 && reload_completed"
-  [(set (match_dup 0)
-       (neg:XF (match_dup 1)))]
-  "")
+  [(set (match_operand:XF 0 "register_operand" "")
+       (match_operator:XF 1 "absneg_operator" [(match_dup 0)]))
+   (use (match_operand 2 "" ""))
+   (clobber (reg:CC FLAGS_REG))]
+  "reload_completed"
+  [(parallel [(set (match_dup 0) (match_dup 1))
+             (clobber (reg:CC FLAGS_REG))])]
+{
+  rtx tmp;
+  operands[0] = gen_rtx_REG (SImode,
+                            true_regnum (operands[0])
+                            + (TARGET_64BIT ? 1 : 2));
+  if (GET_CODE (operands[1]) == ABS)
+    {
+      tmp = GEN_INT (0x7fff);
+      tmp = gen_rtx_AND (SImode, operands[0], tmp);
+    }
+  else
+    {
+      tmp = GEN_INT (0x8000);
+      tmp = gen_rtx_XOR (SImode, operands[0], tmp);
+    }
+  operands[1] = tmp;
+})
 
 (define_split
-  [(set (match_operand:XF 0 "register_and_not_fp_reg_operand" "")
-       (neg:XF (match_operand:XF 1 "register_operand" "")))
-   (clobber (reg:CC 17))]
-  "TARGET_80387 && reload_completed"
-  [(parallel [(set (match_dup 0) (xor:SI (match_dup 0) (match_dup 1)))
-             (clobber (reg:CC 17))])]
-  "operands[1] = GEN_INT (0x8000);
-   operands[0] = gen_rtx_REG (SImode,
-                             true_regnum (operands[0]) + (TARGET_64BIT ? 1 : 2));")
+  [(set (match_operand 0 "memory_operand" "")
+       (match_operator 1 "absneg_operator" [(match_dup 0)]))
+   (use (match_operand 2 "" ""))
+   (clobber (reg:CC FLAGS_REG))]
+  "reload_completed"
+  [(parallel [(set (match_dup 0) (match_dup 1))
+             (clobber (reg:CC FLAGS_REG))])]
+{
+  enum machine_mode mode = GET_MODE (operands[0]);
+  int size = mode == XFmode ? 10 : GET_MODE_SIZE (mode);
+  rtx tmp;
+
+  operands[0] = adjust_address (operands[0], QImode, size - 1);
+  if (GET_CODE (operands[1]) == ABS)
+    {
+      tmp = gen_int_mode (0x7f, QImode);
+      tmp = gen_rtx_AND (QImode, operands[0], tmp);
+    }
+  else
+    {
+      tmp = gen_int_mode (0x80, QImode);
+      tmp = gen_rtx_XOR (QImode, operands[0], tmp);
+    }
+  operands[1] = tmp;
+})
 
-;; Conditionalize these after reload. If they matches before reload, we 
+;; Conditionalize these after reload. If they match before reload, we 
 ;; lose the clobber and ability to use integer instructions.
 
 (define_insn "*negsf2_1"
   "TARGET_80387 && reload_completed"
   "fchs"
   [(set_attr "type" "fsgn")
-   (set_attr "mode" "SF")
-   (set_attr "ppro_uops" "few")])
+   (set_attr "mode" "SF")])
 
 (define_insn "*negdf2_1"
   [(set (match_operand:DF 0 "register_operand" "=f")
   "TARGET_80387 && reload_completed"
   "fchs"
   [(set_attr "type" "fsgn")
-   (set_attr "mode" "DF")
-   (set_attr "ppro_uops" "few")])
+   (set_attr "mode" "DF")])
 
-(define_insn "*negextendsfdf2"
-  [(set (match_operand:DF 0 "register_operand" "=f")
-       (neg:DF (float_extend:DF
-                 (match_operand:SF 1 "register_operand" "0"))))]
-  "TARGET_80387"
+(define_insn "*negxf2_1"
+  [(set (match_operand:XF 0 "register_operand" "=f")
+       (neg:XF (match_operand:XF 1 "register_operand" "0")))]
+  "TARGET_80387 && reload_completed"
   "fchs"
   [(set_attr "type" "fsgn")
-   (set_attr "mode" "DF")
-   (set_attr "ppro_uops" "few")])
+   (set_attr "mode" "XF")])
 
-(define_insn "*negxf2_1"
+(define_insn "*abssf2_1"
+  [(set (match_operand:SF 0 "register_operand" "=f")
+       (abs:SF (match_operand:SF 1 "register_operand" "0")))]
+  "TARGET_80387 && reload_completed"
+  "fabs"
+  [(set_attr "type" "fsgn")
+   (set_attr "mode" "SF")])
+
+(define_insn "*absdf2_1"
+  [(set (match_operand:DF 0 "register_operand" "=f")
+       (abs:DF (match_operand:DF 1 "register_operand" "0")))]
+  "TARGET_80387 && reload_completed"
+  "fabs"
+  [(set_attr "type" "fsgn")
+   (set_attr "mode" "DF")])
+
+(define_insn "*absxf2_1"
   [(set (match_operand:XF 0 "register_operand" "=f")
-       (neg:XF (match_operand:XF 1 "register_operand" "0")))]
+       (abs:XF (match_operand:XF 1 "register_operand" "0")))]
   "TARGET_80387 && reload_completed"
+  "fabs"
+  [(set_attr "type" "fsgn")
+   (set_attr "mode" "DF")])
+
+(define_insn "*negextendsfdf2"
+  [(set (match_operand:DF 0 "register_operand" "=f")
+       (neg:DF (float_extend:DF
+                 (match_operand:SF 1 "register_operand" "0"))))]
+  "TARGET_80387 && (!TARGET_SSE_MATH || TARGET_MIX_SSE_I387)"
   "fchs"
   [(set_attr "type" "fsgn")
-   (set_attr "mode" "XF")
-   (set_attr "ppro_uops" "few")])
+   (set_attr "mode" "DF")])
 
 (define_insn "*negextenddfxf2"
   [(set (match_operand:XF 0 "register_operand" "=f")
   "TARGET_80387"
   "fchs"
   [(set_attr "type" "fsgn")
-   (set_attr "mode" "XF")
-   (set_attr "ppro_uops" "few")])
+   (set_attr "mode" "XF")])
 
 (define_insn "*negextendsfxf2"
   [(set (match_operand:XF 0 "register_operand" "=f")
   "TARGET_80387"
   "fchs"
   [(set_attr "type" "fsgn")
-   (set_attr "mode" "XF")
-   (set_attr "ppro_uops" "few")])
-\f
-;; Absolute value instructions
+   (set_attr "mode" "XF")])
 
-(define_expand "abssf2"
-  [(parallel [(set (match_operand:SF 0 "nonimmediate_operand" "")
-                  (neg:SF (match_operand:SF 1 "nonimmediate_operand" "")))
-             (clobber (reg:CC 17))])]
+(define_insn "*absextendsfdf2"
+  [(set (match_operand:DF 0 "register_operand" "=f")
+       (abs:DF (float_extend:DF
+                 (match_operand:SF 1 "register_operand" "0"))))]
+  "TARGET_80387 && (!TARGET_SSE_MATH || TARGET_MIX_SSE_I387)"
+  "fabs"
+  [(set_attr "type" "fsgn")
+   (set_attr "mode" "DF")])
+
+(define_insn "*absextenddfxf2"
+  [(set (match_operand:XF 0 "register_operand" "=f")
+       (abs:XF (float_extend:XF
+         (match_operand:DF 1 "register_operand" "0"))))]
   "TARGET_80387"
-  "if (TARGET_SSE)
-     {
-       /* In case operand is in memory,  we will not use SSE.  */
-       if (memory_operand (operands[0], VOIDmode)
-          && rtx_equal_p (operands[0], operands[1]))
-        emit_insn (gen_abssf2_memory (operands[0], operands[1]));
-       else
-       {
-         /* Using SSE is tricky, since we need bitwise negation of -0
-            in register.  */
-         rtx reg = gen_reg_rtx (V4SFmode);
-         rtx dest = operands[0];
-         rtx imm;
-
-         operands[1] = force_reg (SFmode, operands[1]);
-         operands[0] = force_reg (SFmode, operands[0]);
-         imm = gen_lowpart (SFmode, gen_int_mode(~0x80000000, SImode));
-         reg = force_reg (V4SFmode,
-                          gen_rtx_CONST_VECTOR (V4SFmode,
-                          gen_rtvec (4, imm, CONST0_RTX (SFmode),
-                                     CONST0_RTX (SFmode),
-                                     CONST0_RTX (SFmode))));
-         emit_insn (gen_abssf2_ifs (operands[0], operands[1], reg));
-         if (dest != operands[0])
-           emit_move_insn (dest, operands[0]);
-       }
-       DONE;
-     }
-   ix86_expand_unary_operator (ABS, SFmode, operands); DONE;")
+  "fabs"
+  [(set_attr "type" "fsgn")
+   (set_attr "mode" "XF")])
 
-(define_insn "abssf2_memory"
-  [(set (match_operand:SF 0 "memory_operand" "=m")
-       (abs:SF (match_operand:SF 1 "memory_operand" "0")))
-   (clobber (reg:CC 17))]
-  "ix86_unary_operator_ok (ABS, SFmode, operands)"
-  "#")
+(define_insn "*absextendsfxf2"
+  [(set (match_operand:XF 0 "register_operand" "=f")
+       (abs:XF (float_extend:XF
+         (match_operand:SF 1 "register_operand" "0"))))]
+  "TARGET_80387"
+  "fabs"
+  [(set_attr "type" "fsgn")
+   (set_attr "mode" "XF")])
+\f
+;; One complement instructions
 
-(define_insn "abssf2_ifs"
-  [(set (match_operand:SF 0 "nonimmediate_operand" "=x#fr,x#fr,f#xr,rm#xf")
-       (abs:SF (match_operand:SF 1 "nonimmediate_operand" "0,x#fr,0,0")))
-   (use (match_operand:V4SF 2 "nonimmediate_operand" "xm,0,xm*r,xm*r"))
-   (clobber (reg:CC 17))]
-  "TARGET_SSE
-   && (reload_in_progress || reload_completed
-       || (register_operand (operands[0], VOIDmode)
-           && register_operand (operands[1], VOIDmode)))"
-  "#")
+(define_expand "one_cmpldi2"
+  [(set (match_operand:DI 0 "nonimmediate_operand" "")
+       (not:DI (match_operand:DI 1 "nonimmediate_operand" "")))]
+  "TARGET_64BIT"
+  "ix86_expand_unary_operator (NOT, DImode, operands); DONE;")
 
-(define_split
-  [(set (match_operand:SF 0 "memory_operand" "")
-       (abs:SF (match_operand:SF 1 "memory_operand" "")))
-   (use (match_operand:V4SF 2 "" ""))
-   (clobber (reg:CC 17))]
-  ""
-  [(parallel [(set (match_dup 0)
-                  (abs:SF (match_dup 1)))
-             (clobber (reg:CC 17))])])
+(define_insn "*one_cmpldi2_1_rex64"
+  [(set (match_operand:DI 0 "nonimmediate_operand" "=rm")
+       (not:DI (match_operand:DI 1 "nonimmediate_operand" "0")))]
+  "TARGET_64BIT && ix86_unary_operator_ok (NOT, DImode, operands)"
+  "not{q}\t%0"
+  [(set_attr "type" "negnot")
+   (set_attr "mode" "DI")])
+
+(define_insn "*one_cmpldi2_2_rex64"
+  [(set (reg FLAGS_REG)
+       (compare (not:DI (match_operand:DI 1 "nonimmediate_operand" "0"))
+                (const_int 0)))
+   (set (match_operand:DI 0 "nonimmediate_operand" "=rm")
+       (not:DI (match_dup 1)))]
+  "TARGET_64BIT && ix86_match_ccmode (insn, CCNOmode)
+   && ix86_unary_operator_ok (NOT, DImode, operands)"
+  "#"
+  [(set_attr "type" "alu1")
+   (set_attr "mode" "DI")])
 
 (define_split
-  [(set (match_operand:SF 0 "register_operand" "")
-       (abs:SF (match_operand:SF 1 "register_operand" "")))
-   (use (match_operand:V4SF 2 "" ""))
-   (clobber (reg:CC 17))]
-  "reload_completed && !SSE_REG_P (operands[0])"
+  [(set (match_operand 0 "flags_reg_operand" "")
+       (match_operator 2 "compare_operator"
+         [(not:DI (match_operand:DI 3 "nonimmediate_operand" ""))
+          (const_int 0)]))
+   (set (match_operand:DI 1 "nonimmediate_operand" "")
+       (not:DI (match_dup 3)))]
+  "TARGET_64BIT && ix86_match_ccmode (insn, CCNOmode)"
   [(parallel [(set (match_dup 0)
-                  (abs:SF (match_dup 1)))
-             (clobber (reg:CC 17))])])
+                  (match_op_dup 2
+                    [(xor:DI (match_dup 3) (const_int -1))
+                     (const_int 0)]))
+             (set (match_dup 1)
+                  (xor:DI (match_dup 3) (const_int -1)))])]
+  "")
 
-(define_split
-  [(set (match_operand:SF 0 "register_operand" "")
-       (abs:SF (match_operand:SF 1 "register_operand" "")))
-   (use (match_operand:V4SF 2 "nonimmediate_operand" ""))
-   (clobber (reg:CC 17))]
-  "reload_completed && SSE_REG_P (operands[0])"
-  [(set (subreg:TI (match_dup 0) 0)
-       (and:TI (match_dup 1)
-               (match_dup 2)))]
-{
-  operands[1] = simplify_gen_subreg (TImode, operands[1], SFmode, 0);
-  operands[2] = simplify_gen_subreg (TImode, operands[2], V4SFmode, 0);
-  if (operands_match_p (operands[0], operands[2]))
-    {
-      rtx tmp;
-      tmp = operands[1];
-      operands[1] = operands[2];
-      operands[2] = tmp;
-    }
-})
+(define_expand "one_cmplsi2"
+  [(set (match_operand:SI 0 "nonimmediate_operand" "")
+       (not:SI (match_operand:SI 1 "nonimmediate_operand" "")))]
+  ""
+  "ix86_expand_unary_operator (NOT, SImode, operands); DONE;")
 
-;; Keep 'f' and 'r' in separate alternatives to avoid reload problems
-;; because of secondary memory needed to reload from class FLOAT_INT_REGS
-;; to itself.
-(define_insn "*abssf2_if"
-  [(set (match_operand:SF 0 "nonimmediate_operand" "=f#r,rm#f")
-       (abs:SF (match_operand:SF 1 "nonimmediate_operand" "0,0")))
-   (clobber (reg:CC 17))]
-  "TARGET_80387 && ix86_unary_operator_ok (ABS, SFmode, operands) && !TARGET_SSE"
-  "#")
+(define_insn "*one_cmplsi2_1"
+  [(set (match_operand:SI 0 "nonimmediate_operand" "=rm")
+       (not:SI (match_operand:SI 1 "nonimmediate_operand" "0")))]
+  "ix86_unary_operator_ok (NOT, SImode, operands)"
+  "not{l}\t%0"
+  [(set_attr "type" "negnot")
+   (set_attr "mode" "SI")])
+
+;; ??? Currently never generated - xor is used instead.
+(define_insn "*one_cmplsi2_1_zext"
+  [(set (match_operand:DI 0 "register_operand" "=r")
+       (zero_extend:DI (not:SI (match_operand:SI 1 "register_operand" "0"))))]
+  "TARGET_64BIT && ix86_unary_operator_ok (NOT, SImode, operands)"
+  "not{l}\t%k0"
+  [(set_attr "type" "negnot")
+   (set_attr "mode" "SI")])
+
+(define_insn "*one_cmplsi2_2"
+  [(set (reg FLAGS_REG)
+       (compare (not:SI (match_operand:SI 1 "nonimmediate_operand" "0"))
+                (const_int 0)))
+   (set (match_operand:SI 0 "nonimmediate_operand" "=rm")
+       (not:SI (match_dup 1)))]
+  "ix86_match_ccmode (insn, CCNOmode)
+   && ix86_unary_operator_ok (NOT, SImode, operands)"
+  "#"
+  [(set_attr "type" "alu1")
+   (set_attr "mode" "SI")])
 
 (define_split
-  [(set (match_operand:SF 0 "fp_register_operand" "")
-       (abs:SF (match_operand:SF 1 "register_operand" "")))
-   (clobber (reg:CC 17))]
-  "TARGET_80387 && reload_completed"
-  [(set (match_dup 0)
-       (abs:SF (match_dup 1)))]
+  [(set (match_operand 0 "flags_reg_operand" "")
+       (match_operator 2 "compare_operator"
+         [(not:SI (match_operand:SI 3 "nonimmediate_operand" ""))
+          (const_int 0)]))
+   (set (match_operand:SI 1 "nonimmediate_operand" "")
+       (not:SI (match_dup 3)))]
+  "ix86_match_ccmode (insn, CCNOmode)"
+  [(parallel [(set (match_dup 0)
+                  (match_op_dup 2 [(xor:SI (match_dup 3) (const_int -1))
+                                   (const_int 0)]))
+             (set (match_dup 1)
+                  (xor:SI (match_dup 3) (const_int -1)))])]
   "")
 
-(define_split
-  [(set (match_operand:SF 0 "register_and_not_fp_reg_operand" "")
-       (abs:SF (match_operand:SF 1 "register_operand" "")))
-   (clobber (reg:CC 17))]
-  "TARGET_80387 && reload_completed"
-  [(parallel [(set (match_dup 0) (and:SI (match_dup 0) (match_dup 1)))
-             (clobber (reg:CC 17))])]
-  "operands[1] = gen_int_mode (~0x80000000, SImode);
-   operands[0] = gen_lowpart (SImode, operands[0]);")
+;; ??? Currently never generated - xor is used instead.
+(define_insn "*one_cmplsi2_2_zext"
+  [(set (reg FLAGS_REG)
+       (compare (not:SI (match_operand:SI 1 "register_operand" "0"))
+                (const_int 0)))
+   (set (match_operand:DI 0 "register_operand" "=r")
+       (zero_extend:DI (not:SI (match_dup 1))))]
+  "TARGET_64BIT && ix86_match_ccmode (insn, CCNOmode)
+   && ix86_unary_operator_ok (NOT, SImode, operands)"
+  "#"
+  [(set_attr "type" "alu1")
+   (set_attr "mode" "SI")])
 
 (define_split
-  [(set (match_operand 0 "memory_operand" "")
-       (abs (match_operand 1 "memory_operand" "")))
-   (clobber (reg:CC 17))]
-  "TARGET_80387 && reload_completed && FLOAT_MODE_P (GET_MODE (operands[0]))"
-  [(parallel [(set (match_dup 0) (and:QI (match_dup 0) (match_dup 1)))
-             (clobber (reg:CC 17))])]
-{
-  int size = GET_MODE_SIZE (GET_MODE (operands[1]));
-
-  if (GET_MODE (operands[1]) == XFmode)
-    size = 10;
-  operands[0] = adjust_address (operands[0], QImode, size - 1);
-  operands[1] = gen_int_mode (~0x80, QImode);
-})
-
-(define_expand "absdf2"
-  [(parallel [(set (match_operand:DF 0 "nonimmediate_operand" "")
-                  (neg:DF (match_operand:DF 1 "nonimmediate_operand" "")))
-             (clobber (reg:CC 17))])]
-  "TARGET_80387"
-  "if (TARGET_SSE2)
-     {
-       /* In case operand is in memory,  we will not use SSE.  */
-       if (memory_operand (operands[0], VOIDmode)
-          && rtx_equal_p (operands[0], operands[1]))
-        emit_insn (gen_absdf2_memory (operands[0], operands[1]));
-       else
-       {
-         /* Using SSE is tricky, since we need bitwise negation of -0
-            in register.  */
-         rtx reg = gen_reg_rtx (V2DFmode);
-#if HOST_BITS_PER_WIDE_INT >= 64
-         rtx imm = gen_int_mode (~(((HOST_WIDE_INT)1) << 63), DImode);
-#else
-         rtx imm = immed_double_const (~0, ~0x80000000, DImode);
-#endif
-         rtx dest = operands[0];
-
-         operands[1] = force_reg (DFmode, operands[1]);
-         operands[0] = force_reg (DFmode, operands[0]);
-
-         /* Produce LONG_DOUBLE with the proper immediate argument.  */
-         imm = gen_lowpart (DFmode, imm);
-         reg = force_reg (V2DFmode,
-                          gen_rtx_CONST_VECTOR (V2DFmode,
-                          gen_rtvec (2, imm, CONST0_RTX (DFmode))));
-         emit_insn (gen_absdf2_ifs (operands[0], operands[1], reg));
-         if (dest != operands[0])
-           emit_move_insn (dest, operands[0]);
-       }
-       DONE;
-     }
-   ix86_expand_unary_operator (ABS, DFmode, operands); DONE;")
-
-(define_insn "absdf2_memory"
-  [(set (match_operand:DF 0 "memory_operand" "=m")
-       (abs:DF (match_operand:DF 1 "memory_operand" "0")))
-   (clobber (reg:CC 17))]
-  "ix86_unary_operator_ok (ABS, DFmode, operands)"
-  "#")
-
-(define_insn "absdf2_ifs"
-  [(set (match_operand:DF 0 "nonimmediate_operand" "=Y#fr,Y#fr,mf#Yr,mr#Yf")
-       (abs:DF (match_operand:DF 1 "nonimmediate_operand" "0,Y#fr,0,0")))
-   (use (match_operand:V2DF 2 "nonimmediate_operand" "Ym,0,Ym*r,Ym*r"))
-   (clobber (reg:CC 17))]
-  "!TARGET_64BIT && TARGET_SSE2
-   && (reload_in_progress || reload_completed
-       || (register_operand (operands[0], VOIDmode)
-          && register_operand (operands[1], VOIDmode)))"
-  "#")
-
-(define_insn "*absdf2_ifs_rex64"
-  [(set (match_operand:DF 0 "nonimmediate_operand" "=Y#fr,Y#fr,mf#Yr")
-       (abs:DF (match_operand:DF 1 "nonimmediate_operand" "0,Y#fr,0")))
-   (use (match_operand:V2DF 2 "nonimmediate_operand" "Ym,0,Ym*r"))
-   (clobber (reg:CC 17))]
-  "TARGET_64BIT && TARGET_SSE2
-   && (reload_in_progress || reload_completed
-       || (register_operand (operands[0], VOIDmode)
-          && register_operand (operands[1], VOIDmode)))"
-  "#")
-
-(define_split
-  [(set (match_operand:DF 0 "memory_operand" "")
-       (abs:DF (match_operand:DF 1 "memory_operand" "")))
-   (use (match_operand:V2DF 2 "" ""))
-   (clobber (reg:CC 17))]
-  ""
-  [(parallel [(set (match_dup 0)
-                  (abs:DF (match_dup 1)))
-             (clobber (reg:CC 17))])])
-
-(define_split
-  [(set (match_operand:DF 0 "register_operand" "")
-       (abs:DF (match_operand:DF 1 "register_operand" "")))
-   (use (match_operand:V2DF 2 "" ""))
-   (clobber (reg:CC 17))]
-  "reload_completed && !SSE_REG_P (operands[0])"
-  [(parallel [(set (match_dup 0)
-                  (abs:DF (match_dup 1)))
-             (clobber (reg:CC 17))])])
-
-(define_split
-  [(set (match_operand:DF 0 "register_operand" "")
-       (abs:DF (match_operand:DF 1 "register_operand" "")))
-   (use (match_operand:V2DF 2 "nonimmediate_operand" ""))
-   (clobber (reg:CC 17))]
-  "reload_completed && SSE_REG_P (operands[0])"
-  [(set (subreg:TI (match_dup 0) 0)
-       (and:TI (match_dup 1)
-               (match_dup 2)))]
-{
-  operands[0] = simplify_gen_subreg (V2DFmode, operands[0], DFmode, 0);
-  operands[1] = simplify_gen_subreg (TImode, operands[1], DFmode, 0);
-  operands[2] = simplify_gen_subreg (TImode, operands[2], V2DFmode, 0);
-  /* Avoid possible reformatting on the operands.  */
-  if (TARGET_SSE_PARTIAL_REGS && !optimize_size)
-    emit_insn (gen_sse2_unpcklpd (operands[0], operands[0], operands[0]));
-  if (operands_match_p (operands[0], operands[2]))
-    {
-      rtx tmp;
-      tmp = operands[1];
-      operands[1] = operands[2];
-      operands[2] = tmp;
-    }
-})
-
-
-;; Keep 'f' and 'r' in separate alternatives to avoid reload problems
-;; because of secondary memory needed to reload from class FLOAT_INT_REGS
-;; to itself.
-(define_insn "*absdf2_if"
-  [(set (match_operand:DF 0 "nonimmediate_operand" "=f#r,rm#f")
-       (abs:DF (match_operand:DF 1 "nonimmediate_operand" "0,0")))
-   (clobber (reg:CC 17))]
-  "!TARGET_64BIT && TARGET_80387
-   && ix86_unary_operator_ok (ABS, DFmode, operands)"
-  "#")
-
-;; FIXME: We should to allow integer registers here.  Problem is that
-;; we need another scratch register to get constant from.
-;; Forcing constant to mem if no register available in peep2 should be
-;; safe even for PIC mode, because of RIP relative addressing.
-(define_insn "*absdf2_if_rex64"
-  [(set (match_operand:DF 0 "nonimmediate_operand" "=f,mf")
-       (abs:DF (match_operand:DF 1 "nonimmediate_operand" "0,0")))
-   (clobber (reg:CC 17))]
-  "TARGET_64BIT && TARGET_80387
-   && ix86_unary_operator_ok (ABS, DFmode, operands)"
-  "#")
-
-(define_split
-  [(set (match_operand:DF 0 "fp_register_operand" "")
-       (abs:DF (match_operand:DF 1 "register_operand" "")))
-   (clobber (reg:CC 17))]
-  "TARGET_80387 && reload_completed"
-  [(set (match_dup 0)
-       (abs:DF (match_dup 1)))]
-  "")
-
-(define_split
-  [(set (match_operand:DF 0 "register_and_not_fp_reg_operand" "")
-       (abs:DF (match_operand:DF 1 "register_operand" "")))
-   (clobber (reg:CC 17))]
-  "!TARGET_64BIT && TARGET_80387 && reload_completed"
-  [(parallel [(set (match_dup 3) (and:SI (match_dup 3) (match_dup 4)))
-             (clobber (reg:CC 17))])]
-  "operands[4] = gen_int_mode (~0x80000000, SImode);
-   split_di (operands+0, 1, operands+2, operands+3);")
-
-(define_expand "absxf2"
-  [(parallel [(set (match_operand:XF 0 "nonimmediate_operand" "")
-                  (neg:XF (match_operand:XF 1 "nonimmediate_operand" "")))
-             (clobber (reg:CC 17))])]
-  "TARGET_80387"
-  "ix86_expand_unary_operator (ABS, XFmode, operands); DONE;")
-
-;; Keep 'f' and 'r' in separate alternatives to avoid reload problems
-;; because of secondary memory needed to reload from class FLOAT_INT_REGS
-;; to itself.
-(define_insn "*absxf2_if"
-  [(set (match_operand:XF 0 "nonimmediate_operand" "=f#r,rm#f")
-       (abs:XF (match_operand:XF 1 "nonimmediate_operand" "0,0")))
-   (clobber (reg:CC 17))]
-  "TARGET_80387
-   && ix86_unary_operator_ok (ABS, XFmode, operands)"
-  "#")
-
-(define_split
-  [(set (match_operand:XF 0 "fp_register_operand" "")
-       (abs:XF (match_operand:XF 1 "register_operand" "")))
-   (clobber (reg:CC 17))]
-  "TARGET_80387 && reload_completed"
-  [(set (match_dup 0)
-       (abs:XF (match_dup 1)))]
-  "")
-
-(define_split
-  [(set (match_operand:XF 0 "register_and_not_fp_reg_operand" "")
-       (abs:XF (match_operand:XF 1 "register_operand" "")))
-   (clobber (reg:CC 17))]
-  "TARGET_80387 && reload_completed"
-  [(parallel [(set (match_dup 0) (and:SI (match_dup 0) (match_dup 1)))
-             (clobber (reg:CC 17))])]
-  "operands[1] = GEN_INT (~0x8000);
-   operands[0] = gen_rtx_REG (SImode,
-                             true_regnum (operands[0]) + (TARGET_64BIT ? 1 : 2));")
-
-(define_insn "*abssf2_1"
-  [(set (match_operand:SF 0 "register_operand" "=f")
-       (abs:SF (match_operand:SF 1 "register_operand" "0")))]
-  "TARGET_80387 && reload_completed"
-  "fabs"
-  [(set_attr "type" "fsgn")
-   (set_attr "mode" "SF")])
-
-(define_insn "*absdf2_1"
-  [(set (match_operand:DF 0 "register_operand" "=f")
-       (abs:DF (match_operand:DF 1 "register_operand" "0")))]
-  "TARGET_80387 && reload_completed"
-  "fabs"
-  [(set_attr "type" "fsgn")
-   (set_attr "mode" "DF")])
-
-(define_insn "*absextendsfdf2"
-  [(set (match_operand:DF 0 "register_operand" "=f")
-       (abs:DF (float_extend:DF
-                 (match_operand:SF 1 "register_operand" "0"))))]
-  "TARGET_80387"
-  "fabs"
-  [(set_attr "type" "fsgn")
-   (set_attr "mode" "DF")])
-
-(define_insn "*absxf2_1"
-  [(set (match_operand:XF 0 "register_operand" "=f")
-       (abs:XF (match_operand:XF 1 "register_operand" "0")))]
-  "TARGET_80387 && reload_completed"
-  "fabs"
-  [(set_attr "type" "fsgn")
-   (set_attr "mode" "DF")])
-
-(define_insn "*absextenddfxf2"
-  [(set (match_operand:XF 0 "register_operand" "=f")
-       (abs:XF (float_extend:XF
-         (match_operand:DF 1 "register_operand" "0"))))]
-  "TARGET_80387"
-  "fabs"
-  [(set_attr "type" "fsgn")
-   (set_attr "mode" "XF")])
-
-(define_insn "*absextendsfxf2"
-  [(set (match_operand:XF 0 "register_operand" "=f")
-       (abs:XF (float_extend:XF
-         (match_operand:SF 1 "register_operand" "0"))))]
-  "TARGET_80387"
-  "fabs"
-  [(set_attr "type" "fsgn")
-   (set_attr "mode" "XF")])
-\f
-;; One complement instructions
-
-(define_expand "one_cmpldi2"
-  [(set (match_operand:DI 0 "nonimmediate_operand" "")
-       (not:DI (match_operand:DI 1 "nonimmediate_operand" "")))]
-  "TARGET_64BIT"
-  "ix86_expand_unary_operator (NOT, DImode, operands); DONE;")
-
-(define_insn "*one_cmpldi2_1_rex64"
-  [(set (match_operand:DI 0 "nonimmediate_operand" "=rm")
-       (not:DI (match_operand:DI 1 "nonimmediate_operand" "0")))]
-  "TARGET_64BIT && ix86_unary_operator_ok (NOT, DImode, operands)"
-  "not{q}\t%0"
-  [(set_attr "type" "negnot")
-   (set_attr "mode" "DI")])
-
-(define_insn "*one_cmpldi2_2_rex64"
-  [(set (reg 17)
-       (compare (not:DI (match_operand:DI 1 "nonimmediate_operand" "0"))
-                (const_int 0)))
-   (set (match_operand:DI 0 "nonimmediate_operand" "=rm")
-       (not:DI (match_dup 1)))]
-  "TARGET_64BIT && ix86_match_ccmode (insn, CCNOmode)
-   && ix86_unary_operator_ok (NOT, DImode, operands)"
-  "#"
-  [(set_attr "type" "alu1")
-   (set_attr "mode" "DI")])
-
-(define_split
-  [(set (reg 17)
-       (compare (not:DI (match_operand:DI 1 "nonimmediate_operand" ""))
-                (const_int 0)))
-   (set (match_operand:DI 0 "nonimmediate_operand" "")
-       (not:DI (match_dup 1)))]
-  "TARGET_64BIT && ix86_match_ccmode (insn, CCNOmode)"
-  [(parallel [(set (reg:CCNO 17)
-                  (compare:CCNO (xor:DI (match_dup 1) (const_int -1))
-                                (const_int 0)))
-             (set (match_dup 0)
-                  (xor:DI (match_dup 1) (const_int -1)))])]
-  "")
-
-(define_expand "one_cmplsi2"
-  [(set (match_operand:SI 0 "nonimmediate_operand" "")
-       (not:SI (match_operand:SI 1 "nonimmediate_operand" "")))]
-  ""
-  "ix86_expand_unary_operator (NOT, SImode, operands); DONE;")
-
-(define_insn "*one_cmplsi2_1"
-  [(set (match_operand:SI 0 "nonimmediate_operand" "=rm")
-       (not:SI (match_operand:SI 1 "nonimmediate_operand" "0")))]
-  "ix86_unary_operator_ok (NOT, SImode, operands)"
-  "not{l}\t%0"
-  [(set_attr "type" "negnot")
-   (set_attr "mode" "SI")])
-
-;; ??? Currently never generated - xor is used instead.
-(define_insn "*one_cmplsi2_1_zext"
-  [(set (match_operand:DI 0 "register_operand" "=r")
-       (zero_extend:DI (not:SI (match_operand:SI 1 "register_operand" "0"))))]
-  "TARGET_64BIT && ix86_unary_operator_ok (NOT, SImode, operands)"
-  "not{l}\t%k0"
-  [(set_attr "type" "negnot")
-   (set_attr "mode" "SI")])
-
-(define_insn "*one_cmplsi2_2"
-  [(set (reg 17)
-       (compare (not:SI (match_operand:SI 1 "nonimmediate_operand" "0"))
-                (const_int 0)))
-   (set (match_operand:SI 0 "nonimmediate_operand" "=rm")
-       (not:SI (match_dup 1)))]
-  "ix86_match_ccmode (insn, CCNOmode)
-   && ix86_unary_operator_ok (NOT, SImode, operands)"
-  "#"
-  [(set_attr "type" "alu1")
-   (set_attr "mode" "SI")])
-
-(define_split
-  [(set (reg 17)
-       (compare (not:SI (match_operand:SI 1 "nonimmediate_operand" ""))
-                (const_int 0)))
-   (set (match_operand:SI 0 "nonimmediate_operand" "")
-       (not:SI (match_dup 1)))]
-  "ix86_match_ccmode (insn, CCNOmode)"
-  [(parallel [(set (reg:CCNO 17)
-                  (compare:CCNO (xor:SI (match_dup 1) (const_int -1))
-                                (const_int 0)))
-             (set (match_dup 0)
-                  (xor:SI (match_dup 1) (const_int -1)))])]
-  "")
-
-;; ??? Currently never generated - xor is used instead.
-(define_insn "*one_cmplsi2_2_zext"
-  [(set (reg 17)
-       (compare (not:SI (match_operand:SI 1 "register_operand" "0"))
-                (const_int 0)))
-   (set (match_operand:DI 0 "register_operand" "=r")
-       (zero_extend:DI (not:SI (match_dup 1))))]
-  "TARGET_64BIT && ix86_match_ccmode (insn, CCNOmode)
-   && ix86_unary_operator_ok (NOT, SImode, operands)"
-  "#"
-  [(set_attr "type" "alu1")
-   (set_attr "mode" "SI")])
-
-(define_split
-  [(set (reg 17)
-       (compare (not:SI (match_operand:SI 1 "register_operand" ""))
-                (const_int 0)))
-   (set (match_operand:DI 0 "register_operand" "")
-       (zero_extend:DI (not:SI (match_dup 1))))]
-  "ix86_match_ccmode (insn, CCNOmode)"
-  [(parallel [(set (reg:CCNO 17)
-                  (compare:CCNO (xor:SI (match_dup 1) (const_int -1))
-                                (const_int 0)))
-             (set (match_dup 0)
-                  (zero_extend:DI (xor:SI (match_dup 1) (const_int -1))))])]
-  "")
+  [(set (match_operand 0 "flags_reg_operand" "")
+       (match_operator 2 "compare_operator"
+         [(not:SI (match_operand:SI 3 "register_operand" ""))
+          (const_int 0)]))
+   (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)
+                  (match_op_dup 2 [(xor:SI (match_dup 3) (const_int -1))
+                                   (const_int 0)]))
+             (set (match_dup 1)
+                  (zero_extend:DI (xor:SI (match_dup 3) (const_int -1))))])]
+  "")
 
 (define_expand "one_cmplhi2"
   [(set (match_operand:HI 0 "nonimmediate_operand" "")
    (set_attr "mode" "HI")])
 
 (define_insn "*one_cmplhi2_2"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (not:HI (match_operand:HI 1 "nonimmediate_operand" "0"))
                 (const_int 0)))
    (set (match_operand:HI 0 "nonimmediate_operand" "=rm")
    (set_attr "mode" "HI")])
 
 (define_split
-  [(set (reg 17)
-       (compare (not:HI (match_operand:HI 1 "nonimmediate_operand" ""))
-                (const_int 0)))
-   (set (match_operand:HI 0 "nonimmediate_operand" "")
-       (not:HI (match_dup 1)))]
+  [(set (match_operand 0 "flags_reg_operand" "")
+       (match_operator 2 "compare_operator"
+         [(not:HI (match_operand:HI 3 "nonimmediate_operand" ""))
+          (const_int 0)]))
+   (set (match_operand:HI 1 "nonimmediate_operand" "")
+       (not:HI (match_dup 3)))]
   "ix86_match_ccmode (insn, CCNOmode)"
-  [(parallel [(set (reg:CCNO 17)
-                  (compare:CCNO (xor:HI (match_dup 1) (const_int -1))
-                                (const_int 0)))
-             (set (match_dup 0)
-                  (xor:HI (match_dup 1) (const_int -1)))])]
+  [(parallel [(set (match_dup 0)
+                  (match_op_dup 2 [(xor:HI (match_dup 3) (const_int -1))
+                                   (const_int 0)]))
+             (set (match_dup 1)
+                  (xor:HI (match_dup 3) (const_int -1)))])]
   "")
 
 ;; %%% Potential partial reg stall on alternative 1.  What to do?
    (set_attr "mode" "QI,SI")])
 
 (define_insn "*one_cmplqi2_2"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare (not:QI (match_operand:QI 1 "nonimmediate_operand" "0"))
                 (const_int 0)))
    (set (match_operand:QI 0 "nonimmediate_operand" "=qm")
    (set_attr "mode" "QI")])
 
 (define_split
-  [(set (reg 17)
-       (compare (not:QI (match_operand:QI 1 "nonimmediate_operand" ""))
-                (const_int 0)))
-   (set (match_operand:QI 0 "nonimmediate_operand" "")
-       (not:QI (match_dup 1)))]
+  [(set (match_operand 0 "flags_reg_operand" "")
+       (match_operator 2 "compare_operator"
+         [(not:QI (match_operand:QI 3 "nonimmediate_operand" ""))
+          (const_int 0)]))
+   (set (match_operand:QI 1 "nonimmediate_operand" "")
+       (not:QI (match_dup 3)))]
   "ix86_match_ccmode (insn, CCNOmode)"
-  [(parallel [(set (reg:CCNO 17)
-                  (compare:CCNO (xor:QI (match_dup 1) (const_int -1))
-                                (const_int 0)))
-             (set (match_dup 0)
-                  (xor:QI (match_dup 1) (const_int -1)))])]
+  [(parallel [(set (match_dup 0)
+                  (match_op_dup 2 [(xor:QI (match_dup 3) (const_int -1))
+                                   (const_int 0)]))
+             (set (match_dup 1)
+                  (xor:QI (match_dup 3) (const_int -1)))])]
   "")
 \f
 ;; Arithmetic shift instructions
 ;; than 31.
 
 (define_expand "ashldi3"
-  [(parallel [(set (match_operand:DI 0 "shiftdi_operand" "")
-                  (ashift:DI (match_operand:DI 1 "shiftdi_operand" "")
-                             (match_operand:QI 2 "nonmemory_operand" "")))
-             (clobber (reg:CC 17))])]
+  [(set (match_operand:DI 0 "shiftdi_operand" "")
+       (ashift:DI (match_operand:DI 1 "ashldi_input_operand" "")
+                  (match_operand:QI 2 "nonmemory_operand" "")))]
   ""
-{
-  if (!TARGET_64BIT && TARGET_CMOVE && ! immediate_operand (operands[2], QImode))
-    {
-      emit_insn (gen_ashldi3_1 (operands[0], operands[1], operands[2]));
-      DONE;
-    }
-  ix86_expand_binary_operator (ASHIFT, DImode, operands);
-  DONE;
-})
+  "ix86_expand_binary_operator (ASHIFT, DImode, operands); DONE;")
 
 (define_insn "*ashldi3_1_rex64"
   [(set (match_operand:DI 0 "nonimmediate_operand" "=rm,r")
-       (ashift:DI (match_operand:DI 1 "nonimmediate_operand" "0,r")
+       (ashift:DI (match_operand:DI 1 "nonimmediate_operand" "0,l")
                   (match_operand:QI 2 "nonmemory_operand" "cJ,M")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (ASHIFT, DImode, operands)"
 {
   switch (get_attr_type (insn))
 ;; Convert lea to the lea pattern to avoid flags dependency.
 (define_split
   [(set (match_operand:DI 0 "register_operand" "")
-       (ashift:DI (match_operand:DI 1 "register_operand" "")
+       (ashift:DI (match_operand:DI 1 "index_register_operand" "")
                   (match_operand:QI 2 "immediate_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && reload_completed
    && true_regnum (operands[0]) != true_regnum (operands[1])"
   [(set (match_dup 0)
 ;; zero don't affect the flags.  We assume that shifts by constant
 ;; zero are optimized away.
 (define_insn "*ashldi3_cmp_rex64"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (ashift:DI (match_operand:DI 1 "nonimmediate_operand" "0")
                     (match_operand:QI 2 "immediate_operand" "e"))
           (const_string "ishift")))
    (set_attr "mode" "DI")])
 
-(define_insn "ashldi3_1"
-  [(set (match_operand:DI 0 "register_operand" "=r")
-       (ashift:DI (match_operand:DI 1 "register_operand" "0")
-                  (match_operand:QI 2 "nonmemory_operand" "Jc")))
-   (clobber (match_scratch:SI 3 "=&r"))
-   (clobber (reg:CC 17))]
-  "!TARGET_64BIT && TARGET_CMOVE"
-  "#"
-  [(set_attr "type" "multi")])
-
-(define_insn "*ashldi3_2"
-  [(set (match_operand:DI 0 "register_operand" "=r")
-       (ashift:DI (match_operand:DI 1 "register_operand" "0")
-                  (match_operand:QI 2 "nonmemory_operand" "Jc")))
-   (clobber (reg:CC 17))]
+(define_insn "*ashldi3_1"
+  [(set (match_operand:DI 0 "register_operand" "=&r,r")
+       (ashift:DI (match_operand:DI 1 "reg_or_pm1_operand" "n,0")
+                  (match_operand:QI 2 "nonmemory_operand" "Jc,Jc")))
+   (clobber (reg:CC FLAGS_REG))]
   "!TARGET_64BIT"
   "#"
   [(set_attr "type" "multi")])
 
-(define_split
-  [(set (match_operand:DI 0 "register_operand" "")
-       (ashift:DI (match_operand:DI 1 "register_operand" "")
-                  (match_operand:QI 2 "nonmemory_operand" "")))
-   (clobber (match_scratch:SI 3 ""))
-   (clobber (reg:CC 17))]
-  "!TARGET_64BIT && TARGET_CMOVE && reload_completed"
+;; By default we don't ask for a scratch register, because when DImode
+;; values are manipulated, registers are already at a premium.  But if
+;; we have one handy, we won't turn it away.
+(define_peephole2
+  [(match_scratch:SI 3 "r")
+   (parallel [(set (match_operand:DI 0 "register_operand" "")
+                  (ashift:DI (match_operand:DI 1 "nonmemory_operand" "")
+                             (match_operand:QI 2 "nonmemory_operand" "")))
+             (clobber (reg:CC FLAGS_REG))])
+   (match_dup 3)]
+  "!TARGET_64BIT && TARGET_CMOVE"
   [(const_int 0)]
   "ix86_split_ashldi (operands, operands[3]); DONE;")
 
 (define_split
   [(set (match_operand:DI 0 "register_operand" "")
-       (ashift:DI (match_operand:DI 1 "register_operand" "")
+       (ashift:DI (match_operand:DI 1 "nonmemory_operand" "")
                   (match_operand:QI 2 "nonmemory_operand" "")))
-   (clobber (reg:CC 17))]
-  "!TARGET_64BIT && reload_completed"
+   (clobber (reg:CC FLAGS_REG))]
+  "!TARGET_64BIT && (flag_peephole2 ? flow2_completed : reload_completed)"
   [(const_int 0)]
   "ix86_split_ashldi (operands, NULL_RTX); DONE;")
 
                  (match_operand:QI 2 "nonmemory_operand" "I,c"))
                (lshiftrt:SI (match_operand:SI 1 "register_operand" "r,r")
                  (minus:QI (const_int 32) (match_dup 2)))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   ""
   "@
    shld{l}\t{%2, %1, %0|%0, %1, %2}
    (set_attr "prefix_0f" "1")
    (set_attr "mode" "SI")
    (set_attr "pent_pair" "np")
-   (set_attr "athlon_decode" "vector")
-   (set_attr "ppro_uops" "few")])
+   (set_attr "athlon_decode" "vector")])
 
 (define_expand "x86_shift_adj_1"
-  [(set (reg:CCZ 17)
+  [(set (reg:CCZ FLAGS_REG)
        (compare:CCZ (and:QI (match_operand:QI 2 "register_operand" "")
                             (const_int 32))
                     (const_int 0)))
    (set (match_operand:SI 0 "register_operand" "")
-        (if_then_else:SI (ne (reg:CCZ 17) (const_int 0))
+        (if_then_else:SI (ne (reg:CCZ FLAGS_REG) (const_int 0))
                         (match_operand:SI 1 "register_operand" "")
                         (match_dup 0)))
    (set (match_dup 1)
-       (if_then_else:SI (ne (reg:CCZ 17) (const_int 0))
+       (if_then_else:SI (ne (reg:CCZ FLAGS_REG) (const_int 0))
                         (match_operand:SI 3 "register_operand" "r")
                         (match_dup 1)))]
   "TARGET_CMOVE"
   JUMP_LABEL (tmp) = label;
 
   emit_move_insn (operands[0], operands[1]);
-  emit_move_insn (operands[1], const0_rtx);
+  ix86_expand_clear (operands[1]);
 
   emit_label (label);
   LABEL_NUSES (label) = 1;
   [(set (match_operand:SI 0 "nonimmediate_operand" "")
        (ashift:SI (match_operand:SI 1 "nonimmediate_operand" "")
                   (match_operand:QI 2 "nonmemory_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   ""
   "ix86_expand_binary_operator (ASHIFT, SImode, operands); DONE;")
 
 (define_insn "*ashlsi3_1"
   [(set (match_operand:SI 0 "nonimmediate_operand" "=rm,r")
-       (ashift:SI (match_operand:SI 1 "nonimmediate_operand" "0,r")
+       (ashift:SI (match_operand:SI 1 "nonimmediate_operand" "0,l")
                   (match_operand:QI 2 "nonmemory_operand" "cI,M")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (ASHIFT, SImode, operands)"
 {
   switch (get_attr_type (insn))
   [(set (match_operand 0 "register_operand" "")
        (ashift (match_operand 1 "index_register_operand" "")
                 (match_operand:QI 2 "const_int_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "reload_completed
-   && true_regnum (operands[0]) != true_regnum (operands[1])"
+   && true_regnum (operands[0]) != true_regnum (operands[1])
+   && GET_MODE_SIZE (GET_MODE (operands[0])) <= 4"
   [(const_int 0)]
 {
   rtx pat;
-  operands[0] = gen_lowpart (SImode, operands[0]);
-  operands[1] = gen_lowpart (Pmode, operands[1]);
+  enum machine_mode mode = GET_MODE (operands[0]);
+
+  if (GET_MODE_SIZE (mode) < 4)
+    operands[0] = gen_lowpart (SImode, 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]);
   if (Pmode != SImode)
     pat = gen_rtx_SUBREG (SImode, pat, 0);
   [(set (match_operand 0 "register_operand" "")
        (ashift (match_operand 1 "register_operand" "")
                 (match_operand:QI 2 "const_int_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "reload_completed
    && true_regnum (operands[0]) != true_regnum (operands[1])"
   [(const_int 0)]
 
 (define_insn "*ashlsi3_1_zext"
   [(set (match_operand:DI 0 "register_operand" "=r,r")
-       (zero_extend:DI (ashift:SI (match_operand:SI 1 "register_operand" "0,r")
+       (zero_extend:DI (ashift:SI (match_operand:SI 1 "register_operand" "0,l")
                        (match_operand:QI 2 "nonmemory_operand" "cI,M"))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (ASHIFT, SImode, operands)"
 {
   switch (get_attr_type (insn))
   [(set (match_operand:DI 0 "register_operand" "")
        (zero_extend:DI (ashift (match_operand 1 "register_operand" "")
                                (match_operand:QI 2 "const_int_operand" ""))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && reload_completed
    && true_regnum (operands[0]) != true_regnum (operands[1])"
   [(set (match_dup 0) (zero_extend:DI
 ;; zero don't affect the flags.  We assume that shifts by constant
 ;; zero are optimized away.
 (define_insn "*ashlsi3_cmp"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (ashift:SI (match_operand:SI 1 "nonimmediate_operand" "0")
-                    (match_operand:QI 2 "const_int_1_31_operand" "I"))
+                    (match_operand:QI 2 "const_1_to_31_operand" "I"))
          (const_int 0)))
    (set (match_operand:SI 0 "nonimmediate_operand" "=rm")
        (ashift:SI (match_dup 1) (match_dup 2)))]
    (set_attr "mode" "SI")])
 
 (define_insn "*ashlsi3_cmp_zext"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (ashift:SI (match_operand:SI 1 "register_operand" "0")
-                    (match_operand:QI 2 "const_int_1_31_operand" "I"))
+                    (match_operand:QI 2 "const_1_to_31_operand" "I"))
          (const_int 0)))
    (set (match_operand:DI 0 "register_operand" "=r")
        (zero_extend:DI (ashift:SI (match_dup 1) (match_dup 2))))]
   [(set (match_operand:HI 0 "nonimmediate_operand" "")
        (ashift:HI (match_operand:HI 1 "nonimmediate_operand" "")
                   (match_operand:QI 2 "nonmemory_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_HIMODE_MATH"
   "ix86_expand_binary_operator (ASHIFT, HImode, operands); DONE;")
 
 (define_insn "*ashlhi3_1_lea"
   [(set (match_operand:HI 0 "nonimmediate_operand" "=rm,r")
-       (ashift:HI (match_operand:HI 1 "nonimmediate_operand" "0,r")
+       (ashift:HI (match_operand:HI 1 "nonimmediate_operand" "0,l")
                   (match_operand:QI 2 "nonmemory_operand" "cI,M")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "!TARGET_PARTIAL_REG_STALL
    && ix86_binary_operator_ok (ASHIFT, HImode, operands)"
 {
   [(set (match_operand:HI 0 "nonimmediate_operand" "=rm")
        (ashift:HI (match_operand:HI 1 "nonimmediate_operand" "0")
                   (match_operand:QI 2 "nonmemory_operand" "cI")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_PARTIAL_REG_STALL
    && ix86_binary_operator_ok (ASHIFT, HImode, operands)"
 {
 ;; zero don't affect the flags.  We assume that shifts by constant
 ;; zero are optimized away.
 (define_insn "*ashlhi3_cmp"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (ashift:HI (match_operand:HI 1 "nonimmediate_operand" "0")
-                    (match_operand:QI 2 "const_int_1_31_operand" "I"))
+                    (match_operand:QI 2 "const_1_to_31_operand" "I"))
          (const_int 0)))
    (set (match_operand:HI 0 "nonimmediate_operand" "=rm")
        (ashift:HI (match_dup 1) (match_dup 2)))]
   [(set (match_operand:QI 0 "nonimmediate_operand" "")
        (ashift:QI (match_operand:QI 1 "nonimmediate_operand" "")
                   (match_operand:QI 2 "nonmemory_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_QIMODE_MATH"
   "ix86_expand_binary_operator (ASHIFT, QImode, operands); DONE;")
 
 
 (define_insn "*ashlqi3_1_lea"
   [(set (match_operand:QI 0 "nonimmediate_operand" "=qm,r,r")
-       (ashift:QI (match_operand:QI 1 "nonimmediate_operand" "0,0,r")
+       (ashift:QI (match_operand:QI 1 "nonimmediate_operand" "0,0,l")
                   (match_operand:QI 2 "nonmemory_operand" "cI,cI,M")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "!TARGET_PARTIAL_REG_STALL
    && ix86_binary_operator_ok (ASHIFT, QImode, operands)"
 {
   [(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 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_PARTIAL_REG_STALL
    && ix86_binary_operator_ok (ASHIFT, QImode, operands)"
 {
 ;; zero don't affect the flags.  We assume that shifts by constant
 ;; zero are optimized away.
 (define_insn "*ashlqi3_cmp"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (ashift:QI (match_operand:QI 1 "nonimmediate_operand" "0")
-                    (match_operand:QI 2 "const_int_1_31_operand" "I"))
+                    (match_operand:QI 2 "const_1_to_31_operand" "I"))
          (const_int 0)))
    (set (match_operand:QI 0 "nonimmediate_operand" "=qm")
        (ashift:QI (match_dup 1) (match_dup 2)))]
 ;; See comment above `ashldi3' about how this works.
 
 (define_expand "ashrdi3"
-  [(parallel [(set (match_operand:DI 0 "shiftdi_operand" "")
-                  (ashiftrt:DI (match_operand:DI 1 "shiftdi_operand" "")
-                               (match_operand:QI 2 "nonmemory_operand" "")))
-             (clobber (reg:CC 17))])]
+  [(set (match_operand:DI 0 "shiftdi_operand" "")
+       (ashiftrt:DI (match_operand:DI 1 "shiftdi_operand" "")
+                    (match_operand:QI 2 "nonmemory_operand" "")))]
   ""
-{
-  if (!TARGET_64BIT && TARGET_CMOVE && ! immediate_operand (operands[2], QImode))
-    {
-      emit_insn (gen_ashrdi3_1 (operands[0], operands[1], operands[2]));
-      DONE;
-    }
-  ix86_expand_binary_operator (ASHIFTRT, DImode, operands);
-  DONE;
-})
+  "ix86_expand_binary_operator (ASHIFTRT, DImode, operands); DONE;")
 
-(define_insn "ashrdi3_63_rex64"
+(define_insn "*ashrdi3_63_rex64"
   [(set (match_operand:DI 0 "nonimmediate_operand" "=*d,rm")
        (ashiftrt:DI (match_operand:DI 1 "nonimmediate_operand" "*a,0")
                     (match_operand:DI 2 "const_int_operand" "i,i")))
-   (clobber (reg:CC 17))]
-  "TARGET_64BIT && INTVAL (operands[2]) == 63 && (TARGET_USE_CLTD || optimize_size)
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_64BIT && INTVAL (operands[2]) == 63
+   && (TARGET_USE_CLTD || optimize_size)
    && ix86_binary_operator_ok (ASHIFTRT, DImode, operands)"
   "@
    {cqto|cqo}
   [(set (match_operand:DI 0 "nonimmediate_operand" "=rm")
        (ashiftrt:DI (match_operand:DI 1 "nonimmediate_operand" "0")
                     (match_operand:QI 2 "const1_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (ASHIFTRT, DImode, operands)
    && (TARGET_SHIFT1 || optimize_size)"
   "sar{q}\t%0"
   [(set (match_operand:DI 0 "nonimmediate_operand" "=rm,rm")
        (ashiftrt:DI (match_operand:DI 1 "nonimmediate_operand" "0,0")
                     (match_operand:QI 2 "nonmemory_operand" "J,c")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (ASHIFTRT, DImode, operands)"
   "@
    sar{q}\t{%2, %0|%0, %2}
 ;; zero don't affect the flags.  We assume that shifts by constant
 ;; zero are optimized away.
 (define_insn "*ashrdi3_one_bit_cmp_rex64"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (ashiftrt:DI (match_operand:DI 1 "nonimmediate_operand" "0")
                       (match_operand:QI 2 "const1_operand" ""))
 ;; zero don't affect the flags.  We assume that shifts by constant
 ;; zero are optimized away.
 (define_insn "*ashrdi3_cmp_rex64"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (ashiftrt:DI (match_operand:DI 1 "nonimmediate_operand" "0")
                       (match_operand:QI 2 "const_int_operand" "n"))
   [(set_attr "type" "ishift")
    (set_attr "mode" "DI")])
 
-
-(define_insn "ashrdi3_1"
-  [(set (match_operand:DI 0 "register_operand" "=r")
-       (ashiftrt:DI (match_operand:DI 1 "register_operand" "0")
-                    (match_operand:QI 2 "nonmemory_operand" "Jc")))
-   (clobber (match_scratch:SI 3 "=&r"))
-   (clobber (reg:CC 17))]
-  "!TARGET_64BIT && TARGET_CMOVE"
-  "#"
-  [(set_attr "type" "multi")])
-
-(define_insn "*ashrdi3_2"
+(define_insn "*ashrdi3_1"
   [(set (match_operand:DI 0 "register_operand" "=r")
        (ashiftrt:DI (match_operand:DI 1 "register_operand" "0")
                     (match_operand:QI 2 "nonmemory_operand" "Jc")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "!TARGET_64BIT"
   "#"
   [(set_attr "type" "multi")])
 
-(define_split
-  [(set (match_operand:DI 0 "register_operand" "")
-       (ashiftrt:DI (match_operand:DI 1 "register_operand" "")
-                    (match_operand:QI 2 "nonmemory_operand" "")))
-   (clobber (match_scratch:SI 3 ""))
-   (clobber (reg:CC 17))]
-  "!TARGET_64BIT && TARGET_CMOVE && reload_completed"
+;; By default we don't ask for a scratch register, because when DImode
+;; values are manipulated, registers are already at a premium.  But if
+;; we have one handy, we won't turn it away.
+(define_peephole2
+  [(match_scratch:SI 3 "r")
+   (parallel [(set (match_operand:DI 0 "register_operand" "")
+                  (ashiftrt:DI (match_operand:DI 1 "register_operand" "")
+                               (match_operand:QI 2 "nonmemory_operand" "")))
+             (clobber (reg:CC FLAGS_REG))])
+   (match_dup 3)]
+  "!TARGET_64BIT && TARGET_CMOVE"
   [(const_int 0)]
   "ix86_split_ashrdi (operands, operands[3]); DONE;")
 
   [(set (match_operand:DI 0 "register_operand" "")
        (ashiftrt:DI (match_operand:DI 1 "register_operand" "")
                     (match_operand:QI 2 "nonmemory_operand" "")))
-   (clobber (reg:CC 17))]
-  "!TARGET_64BIT && reload_completed"
+   (clobber (reg:CC FLAGS_REG))]
+  "!TARGET_64BIT && (flag_peephole2 ? flow2_completed : reload_completed)"
   [(const_int 0)]
   "ix86_split_ashrdi (operands, NULL_RTX); DONE;")
 
                  (match_operand:QI 2 "nonmemory_operand" "I,c"))
                (ashift:SI (match_operand:SI 1 "register_operand" "r,r")
                  (minus:QI (const_int 32) (match_dup 2)))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   ""
   "@
    shrd{l}\t{%2, %1, %0|%0, %1, %2}
   [(set_attr "type" "ishift")
    (set_attr "prefix_0f" "1")
    (set_attr "pent_pair" "np")
-   (set_attr "ppro_uops" "few")
    (set_attr "mode" "SI")])
 
 (define_expand "x86_shift_adj_3"
   [(set (match_operand:SI 0 "nonimmediate_operand" "=*d,rm")
        (ashiftrt:SI (match_operand:SI 1 "nonimmediate_operand" "*a,0")
                     (match_operand:SI 2 "const_int_operand" "i,i")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "INTVAL (operands[2]) == 31 && (TARGET_USE_CLTD || optimize_size)
    && ix86_binary_operator_ok (ASHIFTRT, SImode, operands)"
   "@
   [(set (match_operand:DI 0 "register_operand" "=*d,r")
        (zero_extend:DI (ashiftrt:SI (match_operand:SI 1 "register_operand" "*a,0")
                                     (match_operand:SI 2 "const_int_operand" "i,i"))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && (TARGET_USE_CLTD || optimize_size)
    && INTVAL (operands[2]) == 31
    && ix86_binary_operator_ok (ASHIFTRT, SImode, operands)"
   [(set (match_operand:SI 0 "nonimmediate_operand" "")
        (ashiftrt:SI (match_operand:SI 1 "nonimmediate_operand" "")
                     (match_operand:QI 2 "nonmemory_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   ""
   "ix86_expand_binary_operator (ASHIFTRT, SImode, operands); DONE;")
 
   [(set (match_operand:SI 0 "nonimmediate_operand" "=rm")
        (ashiftrt:SI (match_operand:SI 1 "nonimmediate_operand" "0")
                     (match_operand:QI 2 "const1_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (ASHIFTRT, SImode, operands)
    && (TARGET_SHIFT1 || optimize_size)"
   "sar{l}\t%0"
   [(set (match_operand:DI 0 "register_operand" "=r")
        (zero_extend:DI (ashiftrt:SI (match_operand:SI 1 "register_operand" "0")
                                     (match_operand:QI 2 "const1_operand" ""))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (ASHIFTRT, SImode, operands)
    && (TARGET_SHIFT1 || optimize_size)"
   "sar{l}\t%k0"
   [(set (match_operand:SI 0 "nonimmediate_operand" "=rm,rm")
        (ashiftrt:SI (match_operand:SI 1 "nonimmediate_operand" "0,0")
                     (match_operand:QI 2 "nonmemory_operand" "I,c")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (ASHIFTRT, SImode, operands)"
   "@
    sar{l}\t{%2, %0|%0, %2}
   [(set (match_operand:DI 0 "register_operand" "=r,r")
        (zero_extend:DI (ashiftrt:SI (match_operand:SI 1 "register_operand" "0,0")
                                     (match_operand:QI 2 "nonmemory_operand" "I,c"))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (ASHIFTRT, SImode, operands)"
   "@
    sar{l}\t{%2, %k0|%k0, %2}
 ;; zero don't affect the flags.  We assume that shifts by constant
 ;; zero are optimized away.
 (define_insn "*ashrsi3_one_bit_cmp"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (ashiftrt:SI (match_operand:SI 1 "nonimmediate_operand" "0")
                       (match_operand:QI 2 "const1_operand" ""))
        (const_string "*")))])
 
 (define_insn "*ashrsi3_one_bit_cmp_zext"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (ashiftrt:SI (match_operand:SI 1 "register_operand" "0")
                       (match_operand:QI 2 "const1_operand" ""))
 ;; zero don't affect the flags.  We assume that shifts by constant
 ;; zero are optimized away.
 (define_insn "*ashrsi3_cmp"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (ashiftrt:SI (match_operand:SI 1 "nonimmediate_operand" "0")
-                      (match_operand:QI 2 "const_int_1_31_operand" "I"))
+                      (match_operand:QI 2 "const_1_to_31_operand" "I"))
          (const_int 0)))
    (set (match_operand:SI 0 "nonimmediate_operand" "=rm")
        (ashiftrt:SI (match_dup 1) (match_dup 2)))]
    (set_attr "mode" "SI")])
 
 (define_insn "*ashrsi3_cmp_zext"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (ashiftrt:SI (match_operand:SI 1 "register_operand" "0")
-                      (match_operand:QI 2 "const_int_1_31_operand" "I"))
+                      (match_operand:QI 2 "const_1_to_31_operand" "I"))
          (const_int 0)))
    (set (match_operand:DI 0 "register_operand" "=r")
        (zero_extend:DI (ashiftrt:SI (match_dup 1) (match_dup 2))))]
   [(set (match_operand:HI 0 "nonimmediate_operand" "")
        (ashiftrt:HI (match_operand:HI 1 "nonimmediate_operand" "")
                     (match_operand:QI 2 "nonmemory_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_HIMODE_MATH"
   "ix86_expand_binary_operator (ASHIFTRT, HImode, operands); DONE;")
 
   [(set (match_operand:HI 0 "nonimmediate_operand" "=rm")
        (ashiftrt:HI (match_operand:HI 1 "nonimmediate_operand" "0")
                     (match_operand:QI 2 "const1_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (ASHIFTRT, HImode, operands)
    && (TARGET_SHIFT1 || optimize_size)"
   "sar{w}\t%0"
   [(set (match_operand:HI 0 "nonimmediate_operand" "=rm,rm")
        (ashiftrt:HI (match_operand:HI 1 "nonimmediate_operand" "0,0")
                     (match_operand:QI 2 "nonmemory_operand" "I,c")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (ASHIFTRT, HImode, operands)"
   "@
    sar{w}\t{%2, %0|%0, %2}
 ;; zero don't affect the flags.  We assume that shifts by constant
 ;; zero are optimized away.
 (define_insn "*ashrhi3_one_bit_cmp"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (ashiftrt:HI (match_operand:HI 1 "nonimmediate_operand" "0")
                       (match_operand:QI 2 "const1_operand" ""))
 ;; zero don't affect the flags.  We assume that shifts by constant
 ;; zero are optimized away.
 (define_insn "*ashrhi3_cmp"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (ashiftrt:HI (match_operand:HI 1 "nonimmediate_operand" "0")
-                      (match_operand:QI 2 "const_int_1_31_operand" "I"))
+                      (match_operand:QI 2 "const_1_to_31_operand" "I"))
          (const_int 0)))
    (set (match_operand:HI 0 "nonimmediate_operand" "=rm")
        (ashiftrt:HI (match_dup 1) (match_dup 2)))]
   [(set (match_operand:QI 0 "nonimmediate_operand" "")
        (ashiftrt:QI (match_operand:QI 1 "nonimmediate_operand" "")
                     (match_operand:QI 2 "nonmemory_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_QIMODE_MATH"
   "ix86_expand_binary_operator (ASHIFTRT, QImode, operands); DONE;")
 
   [(set (match_operand:QI 0 "nonimmediate_operand" "=qm")
        (ashiftrt:QI (match_operand:QI 1 "nonimmediate_operand" "0")
                     (match_operand:QI 2 "const1_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (ASHIFTRT, QImode, operands)
    && (TARGET_SHIFT1 || optimize_size)"
   "sar{b}\t%0"
   [(set (strict_low_part (match_operand:QI 0 "nonimmediate_operand" "+qm"))
        (ashiftrt:QI (match_dup 0)
                     (match_operand:QI 1 "const1_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (ASHIFTRT, QImode, operands)
    && (! TARGET_PARTIAL_REG_STALL || optimize_size)
    && (TARGET_SHIFT1 || optimize_size)"
   [(set (match_operand:QI 0 "nonimmediate_operand" "=qm,qm")
        (ashiftrt:QI (match_operand:QI 1 "nonimmediate_operand" "0,0")
                     (match_operand:QI 2 "nonmemory_operand" "I,c")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (ASHIFTRT, QImode, operands)"
   "@
    sar{b}\t{%2, %0|%0, %2}
   [(set (strict_low_part (match_operand:QI 0 "nonimmediate_operand" "+qm,qm"))
        (ashiftrt:QI (match_dup 0)
                     (match_operand:QI 1 "nonmemory_operand" "I,c")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "(! TARGET_PARTIAL_REG_STALL || optimize_size)
    && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)"
   "@
 ;; zero don't affect the flags.  We assume that shifts by constant
 ;; zero are optimized away.
 (define_insn "*ashrqi3_one_bit_cmp"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (ashiftrt:QI (match_operand:QI 1 "nonimmediate_operand" "0")
                       (match_operand:QI 2 "const1_operand" "I"))
 ;; zero don't affect the flags.  We assume that shifts by constant
 ;; zero are optimized away.
 (define_insn "*ashrqi3_cmp"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (ashiftrt:QI (match_operand:QI 1 "nonimmediate_operand" "0")
-                      (match_operand:QI 2 "const_int_1_31_operand" "I"))
+                      (match_operand:QI 2 "const_1_to_31_operand" "I"))
          (const_int 0)))
    (set (match_operand:QI 0 "nonimmediate_operand" "=qm")
        (ashiftrt:QI (match_dup 1) (match_dup 2)))]
 ;; See comment above `ashldi3' about how this works.
 
 (define_expand "lshrdi3"
-  [(parallel [(set (match_operand:DI 0 "shiftdi_operand" "")
-                  (lshiftrt:DI (match_operand:DI 1 "shiftdi_operand" "")
-                               (match_operand:QI 2 "nonmemory_operand" "")))
-             (clobber (reg:CC 17))])]
+  [(set (match_operand:DI 0 "shiftdi_operand" "")
+       (lshiftrt:DI (match_operand:DI 1 "shiftdi_operand" "")
+                    (match_operand:QI 2 "nonmemory_operand" "")))]
   ""
-{
-  if (!TARGET_64BIT && TARGET_CMOVE && ! immediate_operand (operands[2], QImode))
-    {
-      emit_insn (gen_lshrdi3_1 (operands[0], operands[1], operands[2]));
-      DONE;
-    }
-  ix86_expand_binary_operator (LSHIFTRT, DImode, operands);
-  DONE;
-})
+  "ix86_expand_binary_operator (LSHIFTRT, DImode, operands); DONE;")
 
 (define_insn "*lshrdi3_1_one_bit_rex64"
   [(set (match_operand:DI 0 "nonimmediate_operand" "=rm")
        (lshiftrt:DI (match_operand:DI 1 "nonimmediate_operand" "0")
                     (match_operand:QI 2 "const1_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (LSHIFTRT, HImode, operands)
    && (TARGET_SHIFT1 || optimize_size)"
   "shr{q}\t%0"
   [(set (match_operand:DI 0 "nonimmediate_operand" "=rm,rm")
        (lshiftrt:DI (match_operand:DI 1 "nonimmediate_operand" "0,0")
                     (match_operand:QI 2 "nonmemory_operand" "J,c")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (LSHIFTRT, HImode, operands)"
   "@
    shr{q}\t{%2, %0|%0, %2}
 ;; zero don't affect the flags.  We assume that shifts by constant
 ;; zero are optimized away.
 (define_insn "*lshrdi3_cmp_one_bit_rex64"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (lshiftrt:DI (match_operand:DI 1 "nonimmediate_operand" "0")
                       (match_operand:QI 2 "const1_operand" ""))
 ;; zero don't affect the flags.  We assume that shifts by constant
 ;; zero are optimized away.
 (define_insn "*lshrdi3_cmp_rex64"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (lshiftrt:DI (match_operand:DI 1 "nonimmediate_operand" "0")
                       (match_operand:QI 2 "const_int_operand" "e"))
   [(set_attr "type" "ishift")
    (set_attr "mode" "DI")])
 
-(define_insn "lshrdi3_1"
-  [(set (match_operand:DI 0 "register_operand" "=r")
-       (lshiftrt:DI (match_operand:DI 1 "register_operand" "0")
-                    (match_operand:QI 2 "nonmemory_operand" "Jc")))
-   (clobber (match_scratch:SI 3 "=&r"))
-   (clobber (reg:CC 17))]
-  "!TARGET_64BIT && TARGET_CMOVE"
-  "#"
-  [(set_attr "type" "multi")])
-
-(define_insn "*lshrdi3_2"
+(define_insn "*lshrdi3_1"
   [(set (match_operand:DI 0 "register_operand" "=r")
        (lshiftrt:DI (match_operand:DI 1 "register_operand" "0")
                     (match_operand:QI 2 "nonmemory_operand" "Jc")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "!TARGET_64BIT"
   "#"
   [(set_attr "type" "multi")])
 
-(define_split 
-  [(set (match_operand:DI 0 "register_operand" "")
-       (lshiftrt:DI (match_operand:DI 1 "register_operand" "")
-                    (match_operand:QI 2 "nonmemory_operand" "")))
-   (clobber (match_scratch:SI 3 ""))
-   (clobber (reg:CC 17))]
-  "!TARGET_64BIT && TARGET_CMOVE && reload_completed"
+;; By default we don't ask for a scratch register, because when DImode
+;; values are manipulated, registers are already at a premium.  But if
+;; we have one handy, we won't turn it away.
+(define_peephole2
+  [(match_scratch:SI 3 "r")
+   (parallel [(set (match_operand:DI 0 "register_operand" "")
+                  (lshiftrt:DI (match_operand:DI 1 "register_operand" "")
+                               (match_operand:QI 2 "nonmemory_operand" "")))
+             (clobber (reg:CC FLAGS_REG))])
+   (match_dup 3)]
+  "!TARGET_64BIT && TARGET_CMOVE"
   [(const_int 0)]
   "ix86_split_lshrdi (operands, operands[3]); DONE;")
 
   [(set (match_operand:DI 0 "register_operand" "")
        (lshiftrt:DI (match_operand:DI 1 "register_operand" "")
                     (match_operand:QI 2 "nonmemory_operand" "")))
-   (clobber (reg:CC 17))]
-  "!TARGET_64BIT && reload_completed"
+   (clobber (reg:CC FLAGS_REG))]
+  "!TARGET_64BIT && (flag_peephole2 ? flow2_completed : reload_completed)"
   [(const_int 0)]
   "ix86_split_lshrdi (operands, NULL_RTX); DONE;")
 
   [(set (match_operand:SI 0 "nonimmediate_operand" "")
        (lshiftrt:SI (match_operand:SI 1 "nonimmediate_operand" "")
                     (match_operand:QI 2 "nonmemory_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   ""
   "ix86_expand_binary_operator (LSHIFTRT, SImode, operands); DONE;")
 
   [(set (match_operand:SI 0 "nonimmediate_operand" "=rm")
        (lshiftrt:SI (match_operand:SI 1 "nonimmediate_operand" "0")
                     (match_operand:QI 2 "const1_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (LSHIFTRT, HImode, operands)
    && (TARGET_SHIFT1 || optimize_size)"
   "shr{l}\t%0"
   [(set (match_operand:DI 0 "register_operand" "=r")
        (lshiftrt:DI (zero_extend:DI (match_operand:SI 1 "register_operand" "0"))
                     (match_operand:QI 2 "const1_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (LSHIFTRT, HImode, operands)
    && (TARGET_SHIFT1 || optimize_size)"
   "shr{l}\t%k0"
   [(set (match_operand:SI 0 "nonimmediate_operand" "=rm,rm")
        (lshiftrt:SI (match_operand:SI 1 "nonimmediate_operand" "0,0")
                     (match_operand:QI 2 "nonmemory_operand" "I,c")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (LSHIFTRT, HImode, operands)"
   "@
    shr{l}\t{%2, %0|%0, %2}
        (zero_extend:DI
          (lshiftrt:SI (match_operand:SI 1 "nonimmediate_operand" "0,0")
                       (match_operand:QI 2 "nonmemory_operand" "I,c"))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (LSHIFTRT, HImode, operands)"
   "@
    shr{l}\t{%2, %k0|%k0, %2}
 ;; zero don't affect the flags.  We assume that shifts by constant
 ;; zero are optimized away.
 (define_insn "*lshrsi3_one_bit_cmp"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (lshiftrt:SI (match_operand:SI 1 "nonimmediate_operand" "0")
                       (match_operand:QI 2 "const1_operand" ""))
        (const_string "*")))])
 
 (define_insn "*lshrsi3_cmp_one_bit_zext"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (lshiftrt:SI (match_operand:SI 1 "register_operand" "0")
                       (match_operand:QI 2 "const1_operand" ""))
 ;; zero don't affect the flags.  We assume that shifts by constant
 ;; zero are optimized away.
 (define_insn "*lshrsi3_cmp"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (lshiftrt:SI (match_operand:SI 1 "nonimmediate_operand" "0")
-                      (match_operand:QI 2 "const_int_1_31_operand" "I"))
+                      (match_operand:QI 2 "const_1_to_31_operand" "I"))
          (const_int 0)))
    (set (match_operand:SI 0 "nonimmediate_operand" "=rm")
        (lshiftrt:SI (match_dup 1) (match_dup 2)))]
    (set_attr "mode" "SI")])
 
 (define_insn "*lshrsi3_cmp_zext"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (lshiftrt:SI (match_operand:SI 1 "register_operand" "0")
-                      (match_operand:QI 2 "const_int_1_31_operand" "I"))
+                      (match_operand:QI 2 "const_1_to_31_operand" "I"))
          (const_int 0)))
    (set (match_operand:DI 0 "register_operand" "=r")
        (lshiftrt:DI (zero_extend:DI (match_dup 1)) (match_dup 2)))]
   [(set (match_operand:HI 0 "nonimmediate_operand" "")
        (lshiftrt:HI (match_operand:HI 1 "nonimmediate_operand" "")
                     (match_operand:QI 2 "nonmemory_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_HIMODE_MATH"
   "ix86_expand_binary_operator (LSHIFTRT, HImode, operands); DONE;")
 
   [(set (match_operand:HI 0 "nonimmediate_operand" "=rm")
        (lshiftrt:HI (match_operand:HI 1 "nonimmediate_operand" "0")
                     (match_operand:QI 2 "const1_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (LSHIFTRT, HImode, operands)
    && (TARGET_SHIFT1 || optimize_size)"
   "shr{w}\t%0"
   [(set (match_operand:HI 0 "nonimmediate_operand" "=rm,rm")
        (lshiftrt:HI (match_operand:HI 1 "nonimmediate_operand" "0,0")
                     (match_operand:QI 2 "nonmemory_operand" "I,c")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (LSHIFTRT, HImode, operands)"
   "@
    shr{w}\t{%2, %0|%0, %2}
 ;; zero don't affect the flags.  We assume that shifts by constant
 ;; zero are optimized away.
 (define_insn "*lshrhi3_one_bit_cmp"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (lshiftrt:HI (match_operand:HI 1 "nonimmediate_operand" "0")
                       (match_operand:QI 2 "const1_operand" ""))
 ;; zero don't affect the flags.  We assume that shifts by constant
 ;; zero are optimized away.
 (define_insn "*lshrhi3_cmp"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (lshiftrt:HI (match_operand:HI 1 "nonimmediate_operand" "0")
-                      (match_operand:QI 2 "const_int_1_31_operand" "I"))
+                      (match_operand:QI 2 "const_1_to_31_operand" "I"))
          (const_int 0)))
    (set (match_operand:HI 0 "nonimmediate_operand" "=rm")
        (lshiftrt:HI (match_dup 1) (match_dup 2)))]
   [(set (match_operand:QI 0 "nonimmediate_operand" "")
        (lshiftrt:QI (match_operand:QI 1 "nonimmediate_operand" "")
                     (match_operand:QI 2 "nonmemory_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_QIMODE_MATH"
   "ix86_expand_binary_operator (LSHIFTRT, QImode, operands); DONE;")
 
   [(set (match_operand:QI 0 "nonimmediate_operand" "=qm")
        (lshiftrt:QI (match_operand:QI 1 "nonimmediate_operand" "0")
                     (match_operand:QI 2 "const1_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (LSHIFTRT, QImode, operands)
    && (TARGET_SHIFT1 || optimize_size)"
   "shr{b}\t%0"
   [(set (strict_low_part (match_operand:QI 0 "nonimmediate_operand" "+qm"))
        (lshiftrt:QI (match_dup 0)
                     (match_operand:QI 1 "const1_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "(! TARGET_PARTIAL_REG_STALL || optimize_size)
    && (TARGET_SHIFT1 || optimize_size)"
   "shr{b}\t%0"
   [(set (match_operand:QI 0 "nonimmediate_operand" "=qm,qm")
        (lshiftrt:QI (match_operand:QI 1 "nonimmediate_operand" "0,0")
                     (match_operand:QI 2 "nonmemory_operand" "I,c")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (LSHIFTRT, QImode, operands)"
   "@
    shr{b}\t{%2, %0|%0, %2}
   [(set (strict_low_part (match_operand:QI 0 "nonimmediate_operand" "+qm,qm"))
        (lshiftrt:QI (match_dup 0)
                     (match_operand:QI 1 "nonmemory_operand" "I,c")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "(! TARGET_PARTIAL_REG_STALL || optimize_size)
    && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)"
   "@
 ;; zero don't affect the flags.  We assume that shifts by constant
 ;; zero are optimized away.
 (define_insn "*lshrqi2_one_bit_cmp"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (lshiftrt:QI (match_operand:QI 1 "nonimmediate_operand" "0")
                       (match_operand:QI 2 "const1_operand" ""))
 ;; zero don't affect the flags.  We assume that shifts by constant
 ;; zero are optimized away.
 (define_insn "*lshrqi2_cmp"
-  [(set (reg 17)
+  [(set (reg FLAGS_REG)
        (compare
          (lshiftrt:QI (match_operand:QI 1 "nonimmediate_operand" "0")
-                      (match_operand:QI 2 "const_int_1_31_operand" "I"))
+                      (match_operand:QI 2 "const_1_to_31_operand" "I"))
          (const_int 0)))
    (set (match_operand:QI 0 "nonimmediate_operand" "=qm")
        (lshiftrt:QI (match_dup 1) (match_dup 2)))]
   [(set (match_operand:DI 0 "nonimmediate_operand" "")
        (rotate:DI (match_operand:DI 1 "nonimmediate_operand" "")
                   (match_operand:QI 2 "nonmemory_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT"
   "ix86_expand_binary_operator (ROTATE, DImode, operands); DONE;")
 
   [(set (match_operand:DI 0 "nonimmediate_operand" "=rm")
        (rotate:DI (match_operand:DI 1 "nonimmediate_operand" "0")
                   (match_operand:QI 2 "const1_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (ROTATE, DImode, operands)
    && (TARGET_SHIFT1 || optimize_size)"
   "rol{q}\t%0"
   [(set (match_operand:DI 0 "nonimmediate_operand" "=rm,rm")
        (rotate:DI (match_operand:DI 1 "nonimmediate_operand" "0,0")
                   (match_operand:QI 2 "nonmemory_operand" "e,c")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (ROTATE, DImode, operands)"
   "@
    rol{q}\t{%2, %0|%0, %2}
   [(set (match_operand:SI 0 "nonimmediate_operand" "")
        (rotate:SI (match_operand:SI 1 "nonimmediate_operand" "")
                   (match_operand:QI 2 "nonmemory_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   ""
   "ix86_expand_binary_operator (ROTATE, SImode, operands); DONE;")
 
   [(set (match_operand:SI 0 "nonimmediate_operand" "=rm")
        (rotate:SI (match_operand:SI 1 "nonimmediate_operand" "0")
                   (match_operand:QI 2 "const1_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (ROTATE, SImode, operands)
    && (TARGET_SHIFT1 || optimize_size)"
   "rol{l}\t%0"
        (zero_extend:DI
          (rotate:SI (match_operand:SI 1 "register_operand" "0")
                     (match_operand:QI 2 "const1_operand" ""))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (ROTATE, SImode, operands)
    && (TARGET_SHIFT1 || optimize_size)"
   "rol{l}\t%k0"
   [(set (match_operand:SI 0 "nonimmediate_operand" "=rm,rm")
        (rotate:SI (match_operand:SI 1 "nonimmediate_operand" "0,0")
                   (match_operand:QI 2 "nonmemory_operand" "I,c")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (ROTATE, SImode, operands)"
   "@
    rol{l}\t{%2, %0|%0, %2}
        (zero_extend:DI
          (rotate:SI (match_operand:SI 1 "register_operand" "0,0")
                     (match_operand:QI 2 "nonmemory_operand" "I,c"))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (ROTATE, SImode, operands)"
   "@
    rol{l}\t{%2, %k0|%k0, %2}
   [(set (match_operand:HI 0 "nonimmediate_operand" "")
        (rotate:HI (match_operand:HI 1 "nonimmediate_operand" "")
                   (match_operand:QI 2 "nonmemory_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_HIMODE_MATH"
   "ix86_expand_binary_operator (ROTATE, HImode, operands); DONE;")
 
   [(set (match_operand:HI 0 "nonimmediate_operand" "=rm")
        (rotate:HI (match_operand:HI 1 "nonimmediate_operand" "0")
                   (match_operand:QI 2 "const1_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (ROTATE, HImode, operands)
    && (TARGET_SHIFT1 || optimize_size)"
   "rol{w}\t%0"
   [(set (match_operand:HI 0 "nonimmediate_operand" "=rm,rm")
        (rotate:HI (match_operand:HI 1 "nonimmediate_operand" "0,0")
                   (match_operand:QI 2 "nonmemory_operand" "I,c")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (ROTATE, HImode, operands)"
   "@
    rol{w}\t{%2, %0|%0, %2}
   [(set (match_operand:QI 0 "nonimmediate_operand" "")
        (rotate:QI (match_operand:QI 1 "nonimmediate_operand" "")
                   (match_operand:QI 2 "nonmemory_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_QIMODE_MATH"
   "ix86_expand_binary_operator (ROTATE, QImode, operands); DONE;")
 
   [(set (strict_low_part (match_operand:QI 0 "nonimmediate_operand" "+qm"))
        (rotate:QI (match_dup 0)
                   (match_operand:QI 1 "const1_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "(! TARGET_PARTIAL_REG_STALL || optimize_size)
    && (TARGET_SHIFT1 || optimize_size)"
   "rol{b}\t%0"
   [(set (match_operand:QI 0 "nonimmediate_operand" "=qm")
        (rotate:QI (match_operand:QI 1 "nonimmediate_operand" "0")
                   (match_operand:QI 2 "const1_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (ROTATE, QImode, operands)
    && (TARGET_SHIFT1 || optimize_size)"
   "rol{b}\t%0"
   [(set (strict_low_part (match_operand:QI 0 "nonimmediate_operand" "+qm,qm"))
        (rotate:QI (match_dup 0)
                   (match_operand:QI 1 "nonmemory_operand" "I,c")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "(! TARGET_PARTIAL_REG_STALL || optimize_size)
    && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)"
   "@
   [(set (match_operand:QI 0 "nonimmediate_operand" "=qm,qm")
        (rotate:QI (match_operand:QI 1 "nonimmediate_operand" "0,0")
                   (match_operand:QI 2 "nonmemory_operand" "I,c")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (ROTATE, QImode, operands)"
   "@
    rol{b}\t{%2, %0|%0, %2}
   [(set (match_operand:DI 0 "nonimmediate_operand" "")
        (rotatert:DI (match_operand:DI 1 "nonimmediate_operand" "")
                     (match_operand:QI 2 "nonmemory_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT"
   "ix86_expand_binary_operator (ROTATERT, DImode, operands); DONE;")
 
   [(set (match_operand:DI 0 "nonimmediate_operand" "=rm")
        (rotatert:DI (match_operand:DI 1 "nonimmediate_operand" "0")
                     (match_operand:QI 2 "const1_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (ROTATERT, DImode, operands)
    && (TARGET_SHIFT1 || optimize_size)"
   "ror{q}\t%0"
   [(set (match_operand:DI 0 "nonimmediate_operand" "=rm,rm")
        (rotatert:DI (match_operand:DI 1 "nonimmediate_operand" "0,0")
                     (match_operand:QI 2 "nonmemory_operand" "J,c")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (ROTATERT, DImode, operands)"
   "@
    ror{q}\t{%2, %0|%0, %2}
   [(set (match_operand:SI 0 "nonimmediate_operand" "")
        (rotatert:SI (match_operand:SI 1 "nonimmediate_operand" "")
                     (match_operand:QI 2 "nonmemory_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   ""
   "ix86_expand_binary_operator (ROTATERT, SImode, operands); DONE;")
 
   [(set (match_operand:SI 0 "nonimmediate_operand" "=rm")
        (rotatert:SI (match_operand:SI 1 "nonimmediate_operand" "0")
                     (match_operand:QI 2 "const1_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (ROTATERT, SImode, operands)
    && (TARGET_SHIFT1 || optimize_size)"
   "ror{l}\t%0"
        (zero_extend:DI
          (rotatert:SI (match_operand:SI 1 "register_operand" "0")
                       (match_operand:QI 2 "const1_operand" ""))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (ROTATERT, SImode, operands)
    && (TARGET_SHIFT1 || optimize_size)"
   "ror{l}\t%k0"
   [(set (match_operand:SI 0 "nonimmediate_operand" "=rm,rm")
        (rotatert:SI (match_operand:SI 1 "nonimmediate_operand" "0,0")
                     (match_operand:QI 2 "nonmemory_operand" "I,c")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (ROTATERT, SImode, operands)"
   "@
    ror{l}\t{%2, %0|%0, %2}
        (zero_extend:DI
          (rotatert:SI (match_operand:SI 1 "register_operand" "0,0")
                       (match_operand:QI 2 "nonmemory_operand" "I,c"))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT && ix86_binary_operator_ok (ROTATERT, SImode, operands)"
   "@
    ror{l}\t{%2, %k0|%k0, %2}
   [(set (match_operand:HI 0 "nonimmediate_operand" "")
        (rotatert:HI (match_operand:HI 1 "nonimmediate_operand" "")
                     (match_operand:QI 2 "nonmemory_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_HIMODE_MATH"
   "ix86_expand_binary_operator (ROTATERT, HImode, operands); DONE;")
 
   [(set (match_operand:HI 0 "nonimmediate_operand" "=rm")
        (rotatert:HI (match_operand:HI 1 "nonimmediate_operand" "0")
                     (match_operand:QI 2 "const1_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (ROTATERT, HImode, operands)
    && (TARGET_SHIFT1 || optimize_size)"
   "ror{w}\t%0"
   [(set (match_operand:HI 0 "nonimmediate_operand" "=rm,rm")
        (rotatert:HI (match_operand:HI 1 "nonimmediate_operand" "0,0")
                     (match_operand:QI 2 "nonmemory_operand" "I,c")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (ROTATERT, HImode, operands)"
   "@
    ror{w}\t{%2, %0|%0, %2}
   [(set (match_operand:QI 0 "nonimmediate_operand" "")
        (rotatert:QI (match_operand:QI 1 "nonimmediate_operand" "")
                     (match_operand:QI 2 "nonmemory_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_QIMODE_MATH"
   "ix86_expand_binary_operator (ROTATERT, QImode, operands); DONE;")
 
   [(set (match_operand:QI 0 "nonimmediate_operand" "=qm")
        (rotatert:QI (match_operand:QI 1 "nonimmediate_operand" "0")
                     (match_operand:QI 2 "const1_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (ROTATERT, QImode, operands)
    && (TARGET_SHIFT1 || optimize_size)"
   "ror{b}\t%0"
   [(set (strict_low_part (match_operand:QI 0 "nonimmediate_operand" "+qm"))
        (rotatert:QI (match_dup 0)
                     (match_operand:QI 1 "const1_operand" "")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "(! TARGET_PARTIAL_REG_STALL || optimize_size)
    && (TARGET_SHIFT1 || optimize_size)"
   "ror{b}\t%0"
   [(set (match_operand:QI 0 "nonimmediate_operand" "=qm,qm")
        (rotatert:QI (match_operand:QI 1 "nonimmediate_operand" "0,0")
                     (match_operand:QI 2 "nonmemory_operand" "I,c")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (ROTATERT, QImode, operands)"
   "@
    ror{b}\t{%2, %0|%0, %2}
   [(set (strict_low_part (match_operand:QI 0 "nonimmediate_operand" "+qm,qm"))
        (rotatert:QI (match_dup 0)
                     (match_operand:QI 1 "nonmemory_operand" "I,c")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "(! TARGET_PARTIAL_REG_STALL || optimize_size)
    && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)"
   "@
 
   /* From mips.md: extract_bit_field doesn't verify that our source
      matches the predicate, so check it again here.  */
-  if (! register_operand (operands[1], VOIDmode))
+  if (! ext_register_operand (operands[1], VOIDmode))
     FAIL;
 })
 
 
   /* From mips.md: extract_bit_field doesn't verify that our source
      matches the predicate, so check it again here.  */
-  if (! register_operand (operands[1], VOIDmode))
+  if (! ext_register_operand (operands[1], VOIDmode))
     FAIL;
 })
 
 (define_expand "insv"
-  [(set (zero_extract:SI (match_operand 0 "ext_register_operand" "")
-                        (match_operand:SI 1 "immediate_operand" "")
-                        (match_operand:SI 2 "immediate_operand" ""))
-        (match_operand:SI 3 "register_operand" ""))]
+  [(set (zero_extract (match_operand 0 "ext_register_operand" "")
+                     (match_operand 1 "immediate_operand" "")
+                     (match_operand 2 "immediate_operand" ""))
+        (match_operand 3 "register_operand" ""))]
   ""
 {
   /* Handle extractions from %ah et al.  */
 
   /* From mips.md: insert_bit_field doesn't verify that our source
      matches the predicate, so check it again here.  */
-  if (! register_operand (operands[0], VOIDmode))
+  if (! ext_register_operand (operands[0], VOIDmode))
     FAIL;
+
+  if (TARGET_64BIT)
+    emit_insn (gen_movdi_insv_1_rex64 (operands[0], operands[3]));
+  else
+    emit_insn (gen_movsi_insv_1 (operands[0], operands[3]));
+
+  DONE;
 })
 
 ;; %%% bts, btr, btc, bt.
+;; In general these instructions are *slow* when applied to memory,
+;; since they enforce atomic operation.  When applied to registers,
+;; it depends on the cpu implementation.  They're never faster than
+;; the corresponding and/ior/xor operations, so with 32-bit there's
+;; no point.  But in 64-bit, we can't hold the relevant immediates
+;; within the instruction itself, so operating on bits in the high
+;; 32-bits of a register becomes easier.
+;;
+;; These are slow on Nocona, but fast on Athlon64.  We do require the use
+;; of btrq and btcq for corner cases of post-reload expansion of absdf and
+;; negdf respectively, so they can never be disabled entirely.
+
+(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" ""))
+       (const_int 1))
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_64BIT && (TARGET_USE_BT || reload_completed)"
+  "bts{q} %1,%0"
+  [(set_attr "type" "alu1")])
+
+(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" ""))
+       (const_int 0))
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_64BIT && (TARGET_USE_BT || reload_completed)"
+  "btr{q} %1,%0"
+  [(set_attr "type" "alu1")])
+
+(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" ""))
+       (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)"
+  "btc{q} %1,%0"
+  [(set_attr "type" "alu1")])
+
+;; Allow Nocona to avoid these instructions if a register is available.
+
+(define_peephole2
+  [(match_scratch:DI 2 "r")
+   (parallel [(set (zero_extract:DI
+                    (match_operand:DI 0 "register_operand" "")
+                    (const_int 1)
+                    (match_operand:DI 1 "const_0_to_63_operand" ""))
+                  (const_int 1))
+             (clobber (reg:CC FLAGS_REG))])]
+  "TARGET_64BIT && !TARGET_USE_BT"
+  [(const_int 0)]
+{
+  HOST_WIDE_INT i = INTVAL (operands[1]), hi, lo;
+  rtx op1;
+
+  if (HOST_BITS_PER_WIDE_INT >= 64)
+    lo = (HOST_WIDE_INT)1 << i, hi = 0;
+  else if (i < HOST_BITS_PER_WIDE_INT)
+    lo = (HOST_WIDE_INT)1 << i, hi = 0;
+  else
+    lo = 0, hi = (HOST_WIDE_INT)1 << (i - HOST_BITS_PER_WIDE_INT);
+
+  op1 = immed_double_const (lo, hi, DImode);
+  if (i >= 31)
+    {
+      emit_move_insn (operands[2], op1);
+      op1 = operands[2];
+    }
+
+  emit_insn (gen_iordi3 (operands[0], operands[0], op1));
+  DONE;
+})
+
+(define_peephole2
+  [(match_scratch:DI 2 "r")
+   (parallel [(set (zero_extract:DI
+                    (match_operand:DI 0 "register_operand" "")
+                    (const_int 1)
+                    (match_operand:DI 1 "const_0_to_63_operand" ""))
+                  (const_int 0))
+             (clobber (reg:CC FLAGS_REG))])]
+  "TARGET_64BIT && !TARGET_USE_BT"
+  [(const_int 0)]
+{
+  HOST_WIDE_INT i = INTVAL (operands[1]), hi, lo;
+  rtx op1;
+
+  if (HOST_BITS_PER_WIDE_INT >= 64)
+    lo = (HOST_WIDE_INT)1 << i, hi = 0;
+  else if (i < HOST_BITS_PER_WIDE_INT)
+    lo = (HOST_WIDE_INT)1 << i, hi = 0;
+  else
+    lo = 0, hi = (HOST_WIDE_INT)1 << (i - HOST_BITS_PER_WIDE_INT);
+
+  op1 = immed_double_const (~lo, ~hi, DImode);
+  if (i >= 32)
+    {
+      emit_move_insn (operands[2], op1);
+      op1 = operands[2];
+    }
+
+  emit_insn (gen_anddi3 (operands[0], operands[0], op1));
+  DONE;
+})
+
+(define_peephole2
+  [(match_scratch:DI 2 "r")
+   (parallel [(set (zero_extract:DI
+                    (match_operand:DI 0 "register_operand" "")
+                    (const_int 1)
+                    (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"
+  [(const_int 0)]
+{
+  HOST_WIDE_INT i = INTVAL (operands[1]), hi, lo;
+  rtx op1;
+
+  if (HOST_BITS_PER_WIDE_INT >= 64)
+    lo = (HOST_WIDE_INT)1 << i, hi = 0;
+  else if (i < HOST_BITS_PER_WIDE_INT)
+    lo = (HOST_WIDE_INT)1 << i, hi = 0;
+  else
+    lo = 0, hi = (HOST_WIDE_INT)1 << (i - HOST_BITS_PER_WIDE_INT);
+
+  op1 = immed_double_const (lo, hi, DImode);
+  if (i >= 31)
+    {
+      emit_move_insn (operands[2], op1);
+      op1 = operands[2];
+    }
+
+  emit_insn (gen_xordi3 (operands[0], operands[0], op1));
+  DONE;
+})
 \f
 ;; Store-flag instructions.
 
 
 (define_expand "seq"
   [(set (match_operand:QI 0 "register_operand" "")
-        (eq:QI (reg:CC 17) (const_int 0)))]
+        (eq:QI (reg:CC FLAGS_REG) (const_int 0)))]
   ""
   "if (ix86_expand_setcc (EQ, operands[0])) DONE; else FAIL;")
 
 (define_expand "sne"
   [(set (match_operand:QI 0 "register_operand" "")
-        (ne:QI (reg:CC 17) (const_int 0)))]
+        (ne:QI (reg:CC FLAGS_REG) (const_int 0)))]
   ""
   "if (ix86_expand_setcc (NE, operands[0])) DONE; else FAIL;")
 
 (define_expand "sgt"
   [(set (match_operand:QI 0 "register_operand" "")
-        (gt:QI (reg:CC 17) (const_int 0)))]
+        (gt:QI (reg:CC FLAGS_REG) (const_int 0)))]
   ""
   "if (ix86_expand_setcc (GT, operands[0])) DONE; else FAIL;")
 
 (define_expand "sgtu"
   [(set (match_operand:QI 0 "register_operand" "")
-        (gtu:QI (reg:CC 17) (const_int 0)))]
+        (gtu:QI (reg:CC FLAGS_REG) (const_int 0)))]
   ""
   "if (ix86_expand_setcc (GTU, operands[0])) DONE; else FAIL;")
 
 (define_expand "slt"
   [(set (match_operand:QI 0 "register_operand" "")
-        (lt:QI (reg:CC 17) (const_int 0)))]
+        (lt:QI (reg:CC FLAGS_REG) (const_int 0)))]
   ""
   "if (ix86_expand_setcc (LT, operands[0])) DONE; else FAIL;")
 
 (define_expand "sltu"
   [(set (match_operand:QI 0 "register_operand" "")
-        (ltu:QI (reg:CC 17) (const_int 0)))]
+        (ltu:QI (reg:CC FLAGS_REG) (const_int 0)))]
   ""
   "if (ix86_expand_setcc (LTU, operands[0])) DONE; else FAIL;")
 
 (define_expand "sge"
   [(set (match_operand:QI 0 "register_operand" "")
-        (ge:QI (reg:CC 17) (const_int 0)))]
+        (ge:QI (reg:CC FLAGS_REG) (const_int 0)))]
   ""
   "if (ix86_expand_setcc (GE, operands[0])) DONE; else FAIL;")
 
 (define_expand "sgeu"
   [(set (match_operand:QI 0 "register_operand" "")
-        (geu:QI (reg:CC 17) (const_int 0)))]
+        (geu:QI (reg:CC FLAGS_REG) (const_int 0)))]
   ""
   "if (ix86_expand_setcc (GEU, operands[0])) DONE; else FAIL;")
 
 (define_expand "sle"
   [(set (match_operand:QI 0 "register_operand" "")
-        (le:QI (reg:CC 17) (const_int 0)))]
+        (le:QI (reg:CC FLAGS_REG) (const_int 0)))]
   ""
   "if (ix86_expand_setcc (LE, operands[0])) DONE; else FAIL;")
 
 (define_expand "sleu"
   [(set (match_operand:QI 0 "register_operand" "")
-        (leu:QI (reg:CC 17) (const_int 0)))]
+        (leu:QI (reg:CC FLAGS_REG) (const_int 0)))]
   ""
   "if (ix86_expand_setcc (LEU, operands[0])) DONE; else FAIL;")
 
 (define_expand "sunordered"
   [(set (match_operand:QI 0 "register_operand" "")
-        (unordered:QI (reg:CC 17) (const_int 0)))]
+        (unordered:QI (reg:CC FLAGS_REG) (const_int 0)))]
   "TARGET_80387 || TARGET_SSE"
   "if (ix86_expand_setcc (UNORDERED, operands[0])) DONE; else FAIL;")
 
 (define_expand "sordered"
   [(set (match_operand:QI 0 "register_operand" "")
-        (ordered:QI (reg:CC 17) (const_int 0)))]
+        (ordered:QI (reg:CC FLAGS_REG) (const_int 0)))]
   "TARGET_80387"
   "if (ix86_expand_setcc (ORDERED, operands[0])) DONE; else FAIL;")
 
 (define_expand "suneq"
   [(set (match_operand:QI 0 "register_operand" "")
-        (uneq:QI (reg:CC 17) (const_int 0)))]
+        (uneq:QI (reg:CC FLAGS_REG) (const_int 0)))]
   "TARGET_80387 || TARGET_SSE"
   "if (ix86_expand_setcc (UNEQ, operands[0])) DONE; else FAIL;")
 
 (define_expand "sunge"
   [(set (match_operand:QI 0 "register_operand" "")
-        (unge:QI (reg:CC 17) (const_int 0)))]
+        (unge:QI (reg:CC FLAGS_REG) (const_int 0)))]
   "TARGET_80387 || TARGET_SSE"
   "if (ix86_expand_setcc (UNGE, operands[0])) DONE; else FAIL;")
 
 (define_expand "sungt"
   [(set (match_operand:QI 0 "register_operand" "")
-        (ungt:QI (reg:CC 17) (const_int 0)))]
+        (ungt:QI (reg:CC FLAGS_REG) (const_int 0)))]
   "TARGET_80387 || TARGET_SSE"
   "if (ix86_expand_setcc (UNGT, operands[0])) DONE; else FAIL;")
 
 (define_expand "sunle"
   [(set (match_operand:QI 0 "register_operand" "")
-        (unle:QI (reg:CC 17) (const_int 0)))]
+        (unle:QI (reg:CC FLAGS_REG) (const_int 0)))]
   "TARGET_80387 || TARGET_SSE"
   "if (ix86_expand_setcc (UNLE, operands[0])) DONE; else FAIL;")
 
 (define_expand "sunlt"
   [(set (match_operand:QI 0 "register_operand" "")
-        (unlt:QI (reg:CC 17) (const_int 0)))]
+        (unlt:QI (reg:CC FLAGS_REG) (const_int 0)))]
   "TARGET_80387 || TARGET_SSE"
   "if (ix86_expand_setcc (UNLT, operands[0])) DONE; else FAIL;")
 
 (define_expand "sltgt"
   [(set (match_operand:QI 0 "register_operand" "")
-        (ltgt:QI (reg:CC 17) (const_int 0)))]
+        (ltgt:QI (reg:CC FLAGS_REG) (const_int 0)))]
   "TARGET_80387 || TARGET_SSE"
   "if (ix86_expand_setcc (LTGT, operands[0])) DONE; else FAIL;")
 
 (define_insn "*setcc_1"
   [(set (match_operand:QI 0 "nonimmediate_operand" "=qm")
        (match_operator:QI 1 "ix86_comparison_operator"
-         [(reg 17) (const_int 0)]))]
+         [(reg FLAGS_REG) (const_int 0)]))]
   ""
   "set%C1\t%0"
   [(set_attr "type" "setcc")
    (set_attr "mode" "QI")])
 
-(define_insn "setcc_2"
+(define_insn "*setcc_2"
   [(set (strict_low_part (match_operand:QI 0 "nonimmediate_operand" "+qm"))
        (match_operator:QI 1 "ix86_comparison_operator"
-         [(reg 17) (const_int 0)]))]
+         [(reg FLAGS_REG) (const_int 0)]))]
   ""
   "set%C1\t%0"
   [(set_attr "type" "setcc")
 (define_split 
   [(set (match_operand:QI 0 "nonimmediate_operand" "")
        (ne:QI (match_operator 1 "ix86_comparison_operator"
-                [(reg 17) (const_int 0)])
+                [(reg FLAGS_REG) (const_int 0)])
            (const_int 0)))]
   ""
   [(set (match_dup 0) (match_dup 1))]
 (define_split 
   [(set (strict_low_part (match_operand:QI 0 "nonimmediate_operand" ""))
        (ne:QI (match_operator 1 "ix86_comparison_operator"
-                [(reg 17) (const_int 0)])
+                [(reg FLAGS_REG) (const_int 0)])
            (const_int 0)))]
   ""
   [(set (match_dup 0) (match_dup 1))]
 (define_split 
   [(set (match_operand:QI 0 "nonimmediate_operand" "")
        (eq:QI (match_operator 1 "ix86_comparison_operator"
-                [(reg 17) (const_int 0)])
+                [(reg FLAGS_REG) (const_int 0)])
            (const_int 0)))]
   ""
   [(set (match_dup 0) (match_dup 1))]
   rtx new_op1 = copy_rtx (operands[1]);
   operands[1] = new_op1;
   PUT_MODE (new_op1, QImode);
-  PUT_CODE (new_op1, REVERSE_CONDITION (GET_CODE (new_op1),
-                                       GET_MODE (XEXP (new_op1, 0))));
+  PUT_CODE (new_op1, ix86_reverse_condition (GET_CODE (new_op1),
+                                            GET_MODE (XEXP (new_op1, 0))));
 
   /* Make sure that (a) the CCmode we have for the flags is strong
      enough for the reversed compare or (b) we have a valid FP compare.  */
 (define_split 
   [(set (strict_low_part (match_operand:QI 0 "nonimmediate_operand" ""))
        (eq:QI (match_operator 1 "ix86_comparison_operator"
-                [(reg 17) (const_int 0)])
+                [(reg FLAGS_REG) (const_int 0)])
            (const_int 0)))]
   ""
   [(set (match_dup 0) (match_dup 1))]
   rtx new_op1 = copy_rtx (operands[1]);
   operands[1] = new_op1;
   PUT_MODE (new_op1, QImode);
-  PUT_CODE (new_op1, REVERSE_CONDITION (GET_CODE (new_op1),
-                                       GET_MODE (XEXP (new_op1, 0))));
+  PUT_CODE (new_op1, ix86_reverse_condition (GET_CODE (new_op1),
+                                            GET_MODE (XEXP (new_op1, 0))));
 
   /* Make sure that (a) the CCmode we have for the flags is strong
      enough for the reversed compare or (b) we have a valid FP compare.  */
 ;; We ignore the overflow flag for signed branch instructions.
 
 ;; For all bCOND expanders, also expand the compare or test insn that
-;; generates reg 17.  Generate an equality comparison if `beq' or `bne'.
+;; generates reg FLAGS_REG.  Generate an equality comparison if `beq' or `bne'.
 
 (define_expand "beq"
   [(set (pc)
 (define_insn "*jcc_1"
   [(set (pc)
        (if_then_else (match_operator 1 "ix86_comparison_operator"
-                                     [(reg 17) (const_int 0)])
+                                     [(reg FLAGS_REG) (const_int 0)])
                      (label_ref (match_operand 0 "" ""))
                      (pc)))]
   ""
 (define_insn "*jcc_2"
   [(set (pc)
        (if_then_else (match_operator 1 "ix86_comparison_operator"
-                                     [(reg 17) (const_int 0)])
+                                     [(reg FLAGS_REG) (const_int 0)])
                      (pc)
                      (label_ref (match_operand 0 "" ""))))]
   ""
 (define_split 
   [(set (pc)
        (if_then_else (ne (match_operator 0 "ix86_comparison_operator"
-                                     [(reg 17) (const_int 0)])
+                                     [(reg FLAGS_REG) (const_int 0)])
                          (const_int 0))
                      (label_ref (match_operand 1 "" ""))
                      (pc)))]
 (define_split 
   [(set (pc)
        (if_then_else (eq (match_operator 0 "ix86_comparison_operator"
-                                     [(reg 17) (const_int 0)])
+                                     [(reg FLAGS_REG) (const_int 0)])
                          (const_int 0))
                      (label_ref (match_operand 1 "" ""))
                      (pc)))]
   rtx new_op0 = copy_rtx (operands[0]);
   operands[0] = new_op0;
   PUT_MODE (new_op0, VOIDmode);
-  PUT_CODE (new_op0, REVERSE_CONDITION (GET_CODE (new_op0),
-                                       GET_MODE (XEXP (new_op0, 0))));
+  PUT_CODE (new_op0, ix86_reverse_condition (GET_CODE (new_op0),
+                                            GET_MODE (XEXP (new_op0, 0))));
 
   /* Make sure that (a) the CCmode we have for the flags is strong
      enough for the reversed compare or (b) we have a valid FP compare.  */
                         (match_operand 2 "register_operand" "f")])
          (label_ref (match_operand 3 "" ""))
          (pc)))
-   (clobber (reg:CCFP 18))
-   (clobber (reg:CCFP 17))]
+   (clobber (reg:CCFP FPSR_REG))
+   (clobber (reg:CCFP FLAGS_REG))]
   "TARGET_CMOVE && TARGET_80387
    && !SSE_FLOAT_MODE_P (GET_MODE (operands[1]))
    && FLOAT_MODE_P (GET_MODE (operands[1]))
                         (match_operand 2 "nonimmediate_operand" "f#x,xm#f")])
          (label_ref (match_operand 3 "" ""))
          (pc)))
-   (clobber (reg:CCFP 18))
-   (clobber (reg:CCFP 17))]
+   (clobber (reg:CCFP FPSR_REG))
+   (clobber (reg:CCFP FLAGS_REG))]
   "TARGET_80387
    && SSE_FLOAT_MODE_P (GET_MODE (operands[1]))
    && GET_MODE (operands[1]) == GET_MODE (operands[2])
                         (match_operand 2 "nonimmediate_operand" "xm")])
          (label_ref (match_operand 3 "" ""))
          (pc)))
-   (clobber (reg:CCFP 18))
-   (clobber (reg:CCFP 17))]
+   (clobber (reg:CCFP FPSR_REG))
+   (clobber (reg:CCFP FLAGS_REG))]
   "SSE_FLOAT_MODE_P (GET_MODE (operands[1]))
    && GET_MODE (operands[1]) == GET_MODE (operands[2])
    && ix86_fp_jump_nontrivial_p (GET_CODE (operands[0]))"
                         (match_operand 2 "register_operand" "f")])
          (pc)
          (label_ref (match_operand 3 "" ""))))
-   (clobber (reg:CCFP 18))
-   (clobber (reg:CCFP 17))]
+   (clobber (reg:CCFP FPSR_REG))
+   (clobber (reg:CCFP FLAGS_REG))]
   "TARGET_CMOVE && TARGET_80387
    && !SSE_FLOAT_MODE_P (GET_MODE (operands[1]))
    && FLOAT_MODE_P (GET_MODE (operands[1]))
                         (match_operand 2 "nonimmediate_operand" "f#x,xm#f")])
          (pc)
          (label_ref (match_operand 3 "" ""))))
-   (clobber (reg:CCFP 18))
-   (clobber (reg:CCFP 17))]
+   (clobber (reg:CCFP FPSR_REG))
+   (clobber (reg:CCFP FLAGS_REG))]
   "TARGET_80387
    && SSE_FLOAT_MODE_P (GET_MODE (operands[1]))
    && GET_MODE (operands[1]) == GET_MODE (operands[2])
                         (match_operand 2 "nonimmediate_operand" "xm")])
          (pc)
          (label_ref (match_operand 3 "" ""))))
-   (clobber (reg:CCFP 18))
-   (clobber (reg:CCFP 17))]
+   (clobber (reg:CCFP FPSR_REG))
+   (clobber (reg:CCFP FLAGS_REG))]
   "SSE_FLOAT_MODE_P (GET_MODE (operands[1]))
    && GET_MODE (operands[1]) == GET_MODE (operands[2])
    && ix86_fp_jump_nontrivial_p (GET_CODE (operands[0]))"
                         (match_operand 2 "nonimmediate_operand" "fm")])
          (label_ref (match_operand 3 "" ""))
          (pc)))
-   (clobber (reg:CCFP 18))
-   (clobber (reg:CCFP 17))
+   (clobber (reg:CCFP FPSR_REG))
+   (clobber (reg:CCFP FLAGS_REG))
    (clobber (match_scratch:HI 4 "=a"))]
   "TARGET_80387
    && (GET_MODE (operands[1]) == SFmode || GET_MODE (operands[1]) == DFmode)
                         (match_operand 2 "nonimmediate_operand" "fm")])
          (pc)
          (label_ref (match_operand 3 "" ""))))
-   (clobber (reg:CCFP 18))
-   (clobber (reg:CCFP 17))
+   (clobber (reg:CCFP FPSR_REG))
+   (clobber (reg:CCFP FLAGS_REG))
    (clobber (match_scratch:HI 4 "=a"))]
   "TARGET_80387
    && (GET_MODE (operands[1]) == SFmode || GET_MODE (operands[1]) == DFmode)
                         (match_operand 2 "register_operand" "f")])
          (label_ref (match_operand 3 "" ""))
          (pc)))
-   (clobber (reg:CCFP 18))
-   (clobber (reg:CCFP 17))
+   (clobber (reg:CCFP FPSR_REG))
+   (clobber (reg:CCFP FLAGS_REG))
    (clobber (match_scratch:HI 4 "=a"))]
   "TARGET_80387
    && FLOAT_MODE_P (GET_MODE (operands[1]))
                         (match_operand 2 "register_operand" "f")])
          (pc)
          (label_ref (match_operand 3 "" ""))))
-   (clobber (reg:CCFP 18))
-   (clobber (reg:CCFP 17))
+   (clobber (reg:CCFP FPSR_REG))
+   (clobber (reg:CCFP FLAGS_REG))
    (clobber (match_scratch:HI 4 "=a"))]
   "TARGET_80387
    && FLOAT_MODE_P (GET_MODE (operands[1]))
    && ix86_fp_jump_nontrivial_p (GET_CODE (operands[0]))"
   "#")
 
+(define_insn "*fp_jcc_7"
+  [(set (pc)
+       (if_then_else (match_operator 0 "comparison_operator"
+                       [(match_operand 1 "register_operand" "f")
+                        (match_operand 2 "const_double_operand" "C")])
+         (label_ref (match_operand 3 "" ""))
+         (pc)))
+   (clobber (reg:CCFP FPSR_REG))
+   (clobber (reg:CCFP FLAGS_REG))
+   (clobber (match_scratch:HI 4 "=a"))]
+  "TARGET_80387
+   && FLOAT_MODE_P (GET_MODE (operands[1]))
+   && operands[2] == CONST0_RTX (GET_MODE (operands[1]))
+   && !ix86_use_fcomi_compare (GET_CODE (operands[0]))
+   && SELECT_CC_MODE (GET_CODE (operands[0]),
+                     operands[1], operands[2]) == CCFPmode
+   && ix86_fp_jump_nontrivial_p (GET_CODE (operands[0]))"
+  "#")
+
+;; The order of operands in *fp_jcc_8 is forced by combine in
+;; simplify_comparison () function. Float operator is treated as RTX_OBJ
+;; with a precedence over other operators and is always put in the first
+;; place. Swap condition and operands to match ficom instruction.
+
+(define_insn "*fp_jcc_8"
+  [(set (pc)
+       (if_then_else (match_operator 0 "comparison_operator"
+                       [(match_operator 1 "float_operator"
+                          [(match_operand:SI 2 "nonimmediate_operand" "m,?r")])
+                          (match_operand 3 "register_operand" "f,f")])
+         (label_ref (match_operand 4 "" ""))
+         (pc)))
+   (clobber (reg:CCFP FPSR_REG))
+   (clobber (reg:CCFP FLAGS_REG))
+   (clobber (match_scratch:HI 5 "=a,a"))]
+  "TARGET_80387 && TARGET_USE_FIOP
+   && FLOAT_MODE_P (GET_MODE (operands[3]))
+   && GET_MODE (operands[1]) == GET_MODE (operands[3])
+   && !ix86_use_fcomi_compare (swap_condition (GET_CODE (operands[0])))
+   && ix86_fp_compare_mode (swap_condition (GET_CODE (operands[0]))) == CCFPmode
+   && ix86_fp_jump_nontrivial_p (swap_condition (GET_CODE (operands[0])))"
+  "#")
+
 (define_split
   [(set (pc)
        (if_then_else (match_operator 0 "comparison_operator"
                         (match_operand 2 "nonimmediate_operand" "")])
          (match_operand 3 "" "")
          (match_operand 4 "" "")))
-   (clobber (reg:CCFP 18))
-   (clobber (reg:CCFP 17))]
+   (clobber (reg:CCFP FPSR_REG))
+   (clobber (reg:CCFP FLAGS_REG))]
   "reload_completed"
   [(const_int 0)]
 {
   ix86_split_fp_branch (GET_CODE (operands[0]), operands[1], operands[2],
-                       operands[3], operands[4], NULL_RTX);
+                       operands[3], operands[4], NULL_RTX, NULL_RTX);
   DONE;
 })
 
   [(set (pc)
        (if_then_else (match_operator 0 "comparison_operator"
                        [(match_operand 1 "register_operand" "")
-                        (match_operand 2 "nonimmediate_operand" "")])
+                        (match_operand 2 "general_operand" "")])
          (match_operand 3 "" "")
          (match_operand 4 "" "")))
-   (clobber (reg:CCFP 18))
-   (clobber (reg:CCFP 17))
+   (clobber (reg:CCFP FPSR_REG))
+   (clobber (reg:CCFP FLAGS_REG))
    (clobber (match_scratch:HI 5 "=a"))]
   "reload_completed"
-  [(set (pc)
-       (if_then_else (match_dup 6)
-         (match_dup 3)
-         (match_dup 4)))]
+  [(const_int 0)]
 {
   ix86_split_fp_branch (GET_CODE (operands[0]), operands[1], operands[2],
-                       operands[3], operands[4], operands[5]);
+                       operands[3], operands[4], operands[5], NULL_RTX);
+  DONE;
+})
+
+(define_split
+  [(set (pc)
+       (if_then_else (match_operator 0 "comparison_operator"
+                       [(match_operator 1 "float_operator"
+                          [(match_operand:SI 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"))]
+  "reload_completed"
+  [(const_int 0)]
+{
+  operands[7] = gen_rtx_FLOAT (GET_MODE (operands[1]), operands[2]);
+  ix86_split_fp_branch (swap_condition (GET_CODE (operands[0])),
+                       operands[3], operands[7],
+                       operands[4], operands[5], operands[6], NULL_RTX);
+  DONE;
+})
+
+;; %%% Kill this when reload knows how to do it.
+(define_split
+  [(set (pc)
+       (if_then_else (match_operator 0 "comparison_operator"
+                       [(match_operator 1 "float_operator"
+                          [(match_operand:SI 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"))]
+  "reload_completed"
+  [(const_int 0)]
+{
+  operands[7] = ix86_force_to_memory (GET_MODE (operands[2]), operands[2]);
+  operands[7] = gen_rtx_FLOAT (GET_MODE (operands[1]), operands[7]);
+  ix86_split_fp_branch (swap_condition (GET_CODE (operands[0])),
+                       operands[3], operands[7],
+                       operands[4], operands[5], operands[6], operands[2]);
   DONE;
 })
 \f
                          (const_int 1))
                      (label_ref (match_operand 0 "" ""))
                      (pc)))
-   (set (match_operand:SI 2 "register_operand" "=1,1,*m*r")
+   (set (match_operand:SI 2 "nonimmediate_operand" "=1,1,*m*r")
        (plus:SI (match_dup 1)
                 (const_int -1)))
    (clobber (match_scratch:SI 3 "=X,X,r"))
-   (clobber (reg:CC 17))]
-  "!TARGET_64BIT && TARGET_USE_LOOP"
+   (clobber (reg:CC FLAGS_REG))]
+  "!TARGET_64BIT && TARGET_USE_LOOP
+   && (reload_in_progress || reload_completed
+       || register_operand (operands[2], VOIDmode))"
 {
   if (which_alternative != 0)
     return "#";
   else
     return "dec{l}\t%1\;%+jne\t%l0";
 }
-  [(set_attr "ppro_uops" "many")
-   (set (attr "length")
+  [(set (attr "length")
        (if_then_else (and (eq_attr "alternative" "0")
                           (and (ge (minus (match_dup 0) (pc))
                                    (const_int -126))
        (plus:SI (match_dup 1)
                 (const_int -1)))
    (clobber (match_scratch:SI 2 ""))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "!TARGET_64BIT && TARGET_USE_LOOP
    && reload_completed
    && REGNO (operands[1]) != 2"
-  [(parallel [(set (reg:CCZ 17)
+  [(parallel [(set (reg:CCZ FLAGS_REG)
                   (compare:CCZ (plus:SI (match_dup 1) (const_int -1))
                                 (const_int 0)))
              (set (match_dup 1) (plus:SI (match_dup 1) (const_int -1)))])
-   (set (pc) (if_then_else (ne (reg:CCZ 17) (const_int 0))
+   (set (pc) (if_then_else (ne (reg:CCZ FLAGS_REG) (const_int 0))
                           (match_dup 0)
                           (pc)))]
   "")
        (plus:SI (match_dup 1)
                 (const_int -1)))
    (clobber (match_scratch:SI 3 ""))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "!TARGET_64BIT && TARGET_USE_LOOP
    && reload_completed
    && (! REG_P (operands[2])
        || ! rtx_equal_p (operands[1], operands[2]))"
   [(set (match_dup 3) (match_dup 1))
-   (parallel [(set (reg:CCZ 17)
+   (parallel [(set (reg:CCZ FLAGS_REG)
                   (compare:CCZ (plus:SI (match_dup 3) (const_int -1))
                                (const_int 0)))
              (set (match_dup 3) (plus:SI (match_dup 3) (const_int -1)))])
    (set (match_dup 2) (match_dup 3))
-   (set (pc) (if_then_else (ne (reg:CCZ 17) (const_int 0))
+   (set (pc) (if_then_else (ne (reg:CCZ FLAGS_REG) (const_int 0))
                           (match_dup 0)
                           (pc)))]
   "")
 ;; Convert setcc + movzbl to xor + setcc if operands don't overlap.
 
 (define_peephole2
-  [(set (reg 17) (match_operand 0 "" ""))
+  [(set (reg FLAGS_REG) (match_operand 0 "" ""))
    (set (match_operand:QI 1 "register_operand" "")
        (match_operator:QI 2 "ix86_comparison_operator"
-         [(reg 17) (const_int 0)]))
+         [(reg FLAGS_REG) (const_int 0)]))
    (set (match_operand 3 "q_regs_operand" "")
        (zero_extend (match_dup 1)))]
   "(peep2_reg_dead_p (3, operands[1])
 ;; Similar, but match zero_extendhisi2_and, which adds a clobber.
 
 (define_peephole2
-  [(set (reg 17) (match_operand 0 "" ""))
+  [(set (reg FLAGS_REG) (match_operand 0 "" ""))
    (set (match_operand:QI 1 "register_operand" "")
        (match_operator:QI 2 "ix86_comparison_operator"
-         [(reg 17) (const_int 0)]))
+         [(reg FLAGS_REG) (const_int 0)]))
    (parallel [(set (match_operand 3 "q_regs_operand" "")
                   (zero_extend (match_dup 1)))
-             (clobber (reg:CC 17))])]
+             (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])"
 (define_expand "call_pop"
   [(parallel [(call (match_operand:QI 0 "" "")
                    (match_operand:SI 1 "" ""))
-             (set (reg:SI 7)
-                  (plus:SI (reg:SI 7)
+             (set (reg:SI SP_REG)
+                  (plus:SI (reg:SI SP_REG)
                            (match_operand:SI 3 "" "")))])]
   "!TARGET_64BIT"
 {
 (define_insn "*call_pop_0"
   [(call (mem:QI (match_operand:SI 0 "constant_call_address_operand" ""))
         (match_operand:SI 1 "" ""))
-   (set (reg:SI 7) (plus:SI (reg:SI 7)
+   (set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG)
                            (match_operand:SI 2 "immediate_operand" "")))]
   "!TARGET_64BIT"
 {
 (define_insn "*call_pop_1"
   [(call (mem:QI (match_operand:SI 0 "call_insn_operand" "rsm"))
         (match_operand:SI 1 "" ""))
-   (set (reg:SI 7) (plus:SI (reg:SI 7)
+   (set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG)
                            (match_operand:SI 2 "immediate_operand" "i")))]
   "!TARGET_64BIT"
 {
         (match_operand 1 "" ""))]
   "!SIBLING_CALL_P (insn) && !TARGET_64BIT"
 {
-  if (constant_call_address_operand (operands[0], QImode))
+  if (constant_call_address_operand (operands[0], Pmode))
     return "call\t%P0";
   return "call\t%A0";
 }
         (match_operand 1 "" ""))]
   "SIBLING_CALL_P (insn) && !TARGET_64BIT"
 {
-  if (constant_call_address_operand (operands[0], QImode))
+  if (constant_call_address_operand (operands[0], Pmode))
     return "jmp\t%P0";
   return "jmp\t%A0";
 }
         (match_operand 1 "" ""))]
   "!SIBLING_CALL_P (insn) && TARGET_64BIT"
 {
-  if (constant_call_address_operand (operands[0], QImode))
+  if (constant_call_address_operand (operands[0], Pmode))
     return "call\t%P0";
   return "call\t%A0";
 }
   [(parallel [(set (match_operand 0 "" "")
                   (call (match_operand:QI 1 "" "")
                         (match_operand:SI 2 "" "")))
-             (set (reg:SI 7)
-                  (plus:SI (reg:SI 7)
+             (set (reg:SI SP_REG)
+                  (plus:SI (reg:SI SP_REG)
                            (match_operand:SI 4 "" "")))])]
   "!TARGET_64BIT"
 {
   "nop"
   [(set_attr "length" "1")
    (set_attr "length_immediate" "0")
-   (set_attr "modrm" "0")
-   (set_attr "ppro_uops" "one")])
+   (set_attr "modrm" "0")])
 
 ;; Align to 16-byte boundary, max skip in op0.  Used to avoid
 ;; branch prediction penalty for the third jump in a 16-byte
 (define_insn "set_got"
   [(set (match_operand:SI 0 "register_operand" "=r")
        (unspec:SI [(const_int 0)] UNSPEC_SET_GOT))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "!TARGET_64BIT"
   { return output_set_got (operands[0]); }
   [(set_attr "type" "multi")
   emit_move_insn (tmp, ra);
 
   if (Pmode == SImode)
-    emit_insn (gen_eh_return_si (sa));
+    emit_jump_insn (gen_eh_return_si (sa));
   else
-    emit_insn (gen_eh_return_di (sa));
+    emit_jump_insn (gen_eh_return_di (sa));
   emit_barrier ();
   DONE;
 })
 
 (define_insn_and_split "eh_return_si"
-  [(unspec_volatile [(match_operand:SI 0 "register_operand" "c")]
-                   UNSPECV_EH_RETURN)]
+  [(set (pc) 
+        (unspec [(match_operand:SI 0 "register_operand" "c")]
+                UNSPEC_EH_RETURN))]
   "!TARGET_64BIT"
   "#"
   "reload_completed"
   "ix86_expand_epilogue (2); DONE;")
 
 (define_insn_and_split "eh_return_di"
-  [(unspec_volatile [(match_operand:DI 0 "register_operand" "c")]
-                   UNSPECV_EH_RETURN)]
+  [(set (pc) 
+        (unspec [(match_operand:DI 0 "register_operand" "c")]
+                UNSPEC_EH_RETURN))]
   "TARGET_64BIT"
   "#"
   "reload_completed"
   "ix86_expand_epilogue (2); DONE;")
 
 (define_insn "leave"
-  [(set (reg:SI 7) (plus:SI (reg:SI 6) (const_int 4)))
-   (set (reg:SI 6) (mem:SI (reg:SI 6)))
+  [(set (reg:SI SP_REG) (plus:SI (reg:SI BP_REG) (const_int 4)))
+   (set (reg:SI BP_REG) (mem:SI (reg:SI BP_REG)))
    (clobber (mem:BLK (scratch)))]
   "!TARGET_64BIT"
   "leave"
   [(set_attr "type" "leave")])
 
 (define_insn "leave_rex64"
-  [(set (reg:DI 7) (plus:DI (reg:DI 6) (const_int 8)))
-   (set (reg:DI 6) (mem:DI (reg:DI 6)))
+  [(set (reg:DI SP_REG) (plus:DI (reg:DI BP_REG) (const_int 8)))
+   (set (reg:DI BP_REG) (mem:DI (reg:DI BP_REG)))
    (clobber (mem:BLK (scratch)))]
   "TARGET_64BIT"
   "leave"
      [(set (match_operand:SI 0 "register_operand" "") 
           (ffs:SI (match_operand:SI 1 "nonimmediate_operand" "")))
       (clobber (match_scratch:SI 2 ""))
-      (clobber (reg:CC 17))])]
+      (clobber (reg:CC FLAGS_REG))])]
   ""
   "")
 
   [(set (match_operand:SI 0 "register_operand" "=r") 
        (ffs:SI (match_operand:SI 1 "nonimmediate_operand" "rm")))
    (clobber (match_scratch:SI 2 "=&r"))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_CMOVE"
   "#"
   "&& reload_completed"
   [(set (match_dup 2) (const_int -1))
-   (parallel [(set (reg:CCZ 17) (compare:CCZ (match_dup 1) (const_int 0)))
+   (parallel [(set (reg:CCZ FLAGS_REG) (compare:CCZ (match_dup 1) (const_int 0)))
              (set (match_dup 0) (ctz:SI (match_dup 1)))])
    (set (match_dup 0) (if_then_else:SI
-                       (eq (reg:CCZ 17) (const_int 0))
+                       (eq (reg:CCZ FLAGS_REG) (const_int 0))
                        (match_dup 2)
                        (match_dup 0)))
    (parallel [(set (match_dup 0) (plus:SI (match_dup 0) (const_int 1)))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   "")
 
 (define_insn_and_split "*ffs_no_cmove"
   [(set (match_operand:SI 0 "nonimmediate_operand" "=r") 
        (ffs:SI (match_operand:SI 1 "nonimmediate_operand" "rm")))
    (clobber (match_scratch:SI 2 "=&q"))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   ""
   "#"
   "reload_completed"
-  [(parallel [(set (reg:CCZ 17) (compare:CCZ (match_dup 1) (const_int 0)))
+  [(parallel [(set (reg:CCZ FLAGS_REG) (compare:CCZ (match_dup 1) (const_int 0)))
              (set (match_dup 0) (ctz:SI (match_dup 1)))])
    (set (strict_low_part (match_dup 3))
-       (eq:QI (reg:CCZ 17) (const_int 0)))
+       (eq:QI (reg:CCZ FLAGS_REG) (const_int 0)))
    (parallel [(set (match_dup 2) (neg:SI (match_dup 2)))
-             (clobber (reg:CC 17))])
+             (clobber (reg:CC FLAGS_REG))])
    (parallel [(set (match_dup 0) (ior:SI (match_dup 0) (match_dup 2)))
-             (clobber (reg:CC 17))])
+             (clobber (reg:CC FLAGS_REG))])
    (parallel [(set (match_dup 0) (plus:SI (match_dup 0) (const_int 1)))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
 {
   operands[3] = gen_lowpart (QImode, operands[2]);
   ix86_expand_clear (operands[2]);
 })
 
 (define_insn "*ffssi_1"
-  [(set (reg:CCZ 17)
+  [(set (reg:CCZ FLAGS_REG)
        (compare:CCZ (match_operand:SI 1 "nonimmediate_operand" "rm")
                     (const_int 0)))
    (set (match_operand:SI 0 "register_operand" "=r")
        (ctz:SI (match_dup 1)))]
   ""
   "bsf{l}\t{%1, %0|%0, %1}"
-  [(set_attr "prefix_0f" "1")
-   (set_attr "ppro_uops" "few")])
+  [(set_attr "prefix_0f" "1")])
+
+(define_expand "ffsdi2"
+  [(parallel
+     [(set (match_operand:DI 0 "register_operand" "") 
+          (ffs:DI (match_operand:DI 1 "nonimmediate_operand" "")))
+      (clobber (match_scratch:DI 2 ""))
+      (clobber (reg:CC FLAGS_REG))])]
+  "TARGET_64BIT && TARGET_CMOVE"
+  "")
+
+(define_insn_and_split "*ffs_rex64"
+  [(set (match_operand:DI 0 "register_operand" "=r") 
+       (ffs:DI (match_operand:DI 1 "nonimmediate_operand" "rm")))
+   (clobber (match_scratch:DI 2 "=&r"))
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_64BIT && TARGET_CMOVE"
+  "#"
+  "&& reload_completed"
+  [(set (match_dup 2) (const_int -1))
+   (parallel [(set (reg:CCZ FLAGS_REG)
+                  (compare:CCZ (match_dup 1) (const_int 0)))
+             (set (match_dup 0) (ctz:DI (match_dup 1)))])
+   (set (match_dup 0) (if_then_else:DI
+                       (eq (reg:CCZ FLAGS_REG) (const_int 0))
+                       (match_dup 2)
+                       (match_dup 0)))
+   (parallel [(set (match_dup 0) (plus:DI (match_dup 0) (const_int 1)))
+             (clobber (reg:CC FLAGS_REG))])]
+  "")
+
+(define_insn "*ffsdi_1"
+  [(set (reg:CCZ FLAGS_REG)
+       (compare:CCZ (match_operand:DI 1 "nonimmediate_operand" "rm")
+                    (const_int 0)))
+   (set (match_operand:DI 0 "register_operand" "=r")
+       (ctz:DI (match_dup 1)))]
+  "TARGET_64BIT"
+  "bsf{q}\t{%1, %0|%0, %1}"
+  [(set_attr "prefix_0f" "1")])
 
 (define_insn "ctzsi2"
   [(set (match_operand:SI 0 "register_operand" "=r")
        (ctz:SI (match_operand:SI 1 "nonimmediate_operand" "rm")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   ""
   "bsf{l}\t{%1, %0|%0, %1}"
-  [(set_attr "prefix_0f" "1")
-   (set_attr "ppro_uops" "few")])
+  [(set_attr "prefix_0f" "1")])
+
+(define_insn "ctzdi2"
+  [(set (match_operand:DI 0 "register_operand" "=r")
+       (ctz:DI (match_operand:DI 1 "nonimmediate_operand" "rm")))
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_64BIT"
+  "bsf{q}\t{%1, %0|%0, %1}"
+  [(set_attr "prefix_0f" "1")])
 
 (define_expand "clzsi2"
   [(parallel
      [(set (match_operand:SI 0 "register_operand" "")
           (minus:SI (const_int 31)
                     (clz:SI (match_operand:SI 1 "nonimmediate_operand" ""))))
-      (clobber (reg:CC 17))])
+      (clobber (reg:CC FLAGS_REG))])
    (parallel
      [(set (match_dup 0) (xor:SI (match_dup 0) (const_int 31)))
-      (clobber (reg:CC 17))])]
+      (clobber (reg:CC FLAGS_REG))])]
   ""
   "")
 
   [(set (match_operand:SI 0 "register_operand" "=r")
        (minus:SI (const_int 31)
                  (clz:SI (match_operand:SI 1 "nonimmediate_operand" "rm"))))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   ""
   "bsr{l}\t{%1, %0|%0, %1}"
-  [(set_attr "prefix_0f" "1")
-   (set_attr "ppro_uops" "few")])
+  [(set_attr "prefix_0f" "1")])
+
+(define_expand "clzdi2"
+  [(parallel
+     [(set (match_operand:DI 0 "register_operand" "")
+          (minus:DI (const_int 63)
+                    (clz:DI (match_operand:DI 1 "nonimmediate_operand" ""))))
+      (clobber (reg:CC FLAGS_REG))])
+   (parallel
+     [(set (match_dup 0) (xor:DI (match_dup 0) (const_int 63)))
+      (clobber (reg:CC FLAGS_REG))])]
+  "TARGET_64BIT"
+  "")
+
+(define_insn "*bsr_rex64"
+  [(set (match_operand:DI 0 "register_operand" "=r")
+       (minus:DI (const_int 63)
+                 (clz:DI (match_operand:DI 1 "nonimmediate_operand" "rm"))))
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_64BIT"
+  "bsr{q}\t{%1, %0|%0, %1}"
+  [(set_attr "prefix_0f" "1")])
 \f
 ;; Thread-local storage patterns for ELF.
 ;;
                    UNSPEC_TLS_GD))
    (clobber (match_scratch:SI 4 "=d"))
    (clobber (match_scratch:SI 5 "=c"))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "!TARGET_64BIT && TARGET_GNU_TLS"
   "lea{l}\t{%a2@TLSGD(,%1,1), %0|%0, %a2@TLSGD[%1*1]}\;call\t%P3"
   [(set_attr "type" "multi")
                    UNSPEC_TLS_GD))
    (clobber (match_scratch:SI 4 "=d"))
    (clobber (match_scratch:SI 5 "=c"))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "!TARGET_64BIT && TARGET_SUN_TLS"
   "lea{l}\t{%a2@DTLNDX(%1), %4|%4, %a2@DTLNDX[%1]}
        push{l}\t%4\;call\t%a2@TLSPLT\;pop{l}\t%4\;nop"
                    UNSPEC_TLS_GD))
              (clobber (match_scratch:SI 4 ""))
              (clobber (match_scratch:SI 5 ""))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   ""
 {
   if (flag_pic)
                   UNSPEC_TLS_LD_BASE))
    (clobber (match_scratch:SI 3 "=d"))
    (clobber (match_scratch:SI 4 "=c"))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "!TARGET_64BIT && TARGET_GNU_TLS"
   "lea{l}\t{%&@TLSLDM(%1), %0|%0, %&@TLSLDM[%1]}\;call\t%P2"
   [(set_attr "type" "multi")
                   UNSPEC_TLS_LD_BASE))
    (clobber (match_scratch:SI 3 "=d"))
    (clobber (match_scratch:SI 4 "=c"))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "!TARGET_64BIT && TARGET_SUN_TLS"
   "lea{l}\t{%&@TMDNX(%1), %3|%3, %&@TMDNX[%1]}
        push{l}\t%3\;call\t%&@TLSPLT\;pop{l}\t%3"
                              UNSPEC_TLS_LD_BASE))
              (clobber (match_scratch:SI 3 ""))
              (clobber (match_scratch:SI 4 ""))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   ""
 {
   if (flag_pic)
                            UNSPEC_DTPOFF))))
    (clobber (match_scratch:SI 4 "=d"))
    (clobber (match_scratch:SI 5 "=c"))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   ""
   "#"
   ""
                              UNSPEC_TLS_GD))
              (clobber (match_dup 4))
              (clobber (match_dup 5))
-             (clobber (reg:CC 17))])]
+             (clobber (reg:CC FLAGS_REG))])]
   "")
 
 ;; Load and add the thread base pointer from %gs:0.
   [(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 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "!TARGET_64BIT"
   "add{l}\t{%%gs:0, %0|%0, DWORD PTR %%gs:0}"
   [(set_attr "type" "alu")
   [(set (match_operand:DI 0 "register_operand" "=r")
        (plus:DI (unspec:DI [(const_int 0)] UNSPEC_TP)
                 (match_operand:DI 1 "register_operand" "0")))
-   (clobber (reg:CC 17))]
+   (clobber (reg:CC FLAGS_REG))]
   "TARGET_64BIT"
   "add{q}\t{%%fs:0, %0|%0, QWORD PTR %%fs:0}"
   [(set_attr "type" "alu")
 
 ;; Gcc is slightly more smart about handling normal two address instructions
 ;; so use special patterns for add and mull.
-(define_insn "*fop_sf_comm_nosse"
-  [(set (match_operand:SF 0 "register_operand" "=f")
-       (match_operator:SF 3 "binary_fp_operator"
-                       [(match_operand:SF 1 "nonimmediate_operand" "%0")
-                        (match_operand:SF 2 "nonimmediate_operand" "fm")]))]
-  "TARGET_80387 && !TARGET_SSE_MATH
-   && GET_RTX_CLASS (GET_CODE (operands[3])) == 'c'
-   && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
-  "* return output_387_binary_op (insn, operands);"
-  [(set (attr "type") 
-       (if_then_else (match_operand:SF 3 "mult_operator" "") 
-          (const_string "fmul")
-          (const_string "fop")))
-   (set_attr "mode" "SF")])
 
-(define_insn "*fop_sf_comm"
+(define_insn "*fop_sf_comm_mixed"
   [(set (match_operand:SF 0 "register_operand" "=f#x,x#f")
        (match_operator:SF 3 "binary_fp_operator"
                        [(match_operand:SF 1 "nonimmediate_operand" "%0,0")
                         (match_operand:SF 2 "nonimmediate_operand" "fm#x,xm#f")]))]
-  "TARGET_80387 && TARGET_SSE_MATH && TARGET_MIX_SSE_I387
-   && GET_RTX_CLASS (GET_CODE (operands[3])) == 'c'
+  "TARGET_MIX_SSE_I387
+   && COMMUTATIVE_ARITH_P (operands[3])
    && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
   "* return output_387_binary_op (insn, operands);"
   [(set (attr "type") 
        (match_operator:SF 3 "binary_fp_operator"
                        [(match_operand:SF 1 "nonimmediate_operand" "%0")
                         (match_operand:SF 2 "nonimmediate_operand" "xm")]))]
-  "TARGET_SSE_MATH && GET_RTX_CLASS (GET_CODE (operands[3])) == 'c'
+  "TARGET_SSE_MATH
+   && COMMUTATIVE_ARITH_P (operands[3])
    && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
   "* return output_387_binary_op (insn, operands);"
   [(set (attr "type") 
           (const_string "sseadd")))
    (set_attr "mode" "SF")])
 
-(define_insn "*fop_df_comm_nosse"
-  [(set (match_operand:DF 0 "register_operand" "=f")
-       (match_operator:DF 3 "binary_fp_operator"
-                       [(match_operand:DF 1 "nonimmediate_operand" "%0")
-                        (match_operand:DF 2 "nonimmediate_operand" "fm")]))]
-  "TARGET_80387 && (!TARGET_SSE2 || !TARGET_SSE_MATH)
-   && GET_RTX_CLASS (GET_CODE (operands[3])) == 'c'
+(define_insn "*fop_sf_comm_i387"
+  [(set (match_operand:SF 0 "register_operand" "=f")
+       (match_operator:SF 3 "binary_fp_operator"
+                       [(match_operand:SF 1 "nonimmediate_operand" "%0")
+                        (match_operand:SF 2 "nonimmediate_operand" "fm")]))]
+  "TARGET_80387
+   && COMMUTATIVE_ARITH_P (operands[3])
    && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
   "* return output_387_binary_op (insn, operands);"
   [(set (attr "type") 
        (if_then_else (match_operand:SF 3 "mult_operator" "") 
           (const_string "fmul")
           (const_string "fop")))
-   (set_attr "mode" "DF")])
-
-(define_insn "*fop_df_comm"
-  [(set (match_operand:DF 0 "register_operand" "=f#Y,Y#f")
-       (match_operator:DF 3 "binary_fp_operator"
-                       [(match_operand:DF 1 "nonimmediate_operand" "%0,0")
-                        (match_operand:DF 2 "nonimmediate_operand" "fm#Y,Ym#f")]))]
-  "TARGET_80387 && TARGET_SSE_MATH && TARGET_SSE2 && TARGET_MIX_SSE_I387
-   && GET_RTX_CLASS (GET_CODE (operands[3])) == 'c'
-   && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
-  "* return output_387_binary_op (insn, operands);"
-  [(set (attr "type") 
-       (if_then_else (eq_attr "alternative" "1")
-          (if_then_else (match_operand:SF 3 "mult_operator" "") 
-             (const_string "ssemul")
-             (const_string "sseadd"))
-          (if_then_else (match_operand:SF 3 "mult_operator" "") 
-             (const_string "fmul")
-             (const_string "fop"))))
-   (set_attr "mode" "DF")])
-
-(define_insn "*fop_df_comm_sse"
-  [(set (match_operand:DF 0 "register_operand" "=Y")
-       (match_operator:DF 3 "binary_fp_operator"
-                       [(match_operand:DF 1 "nonimmediate_operand" "%0")
-                        (match_operand:DF 2 "nonimmediate_operand" "Ym")]))]
-  "TARGET_SSE2 && TARGET_SSE_MATH
-   && GET_RTX_CLASS (GET_CODE (operands[3])) == 'c'
-   && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
-  "* return output_387_binary_op (insn, operands);"
-  [(set (attr "type") 
-        (if_then_else (match_operand:SF 3 "mult_operator" "") 
-          (const_string "ssemul")
-          (const_string "sseadd")))
-   (set_attr "mode" "DF")])
-
-(define_insn "*fop_xf_comm"
-  [(set (match_operand:XF 0 "register_operand" "=f")
-       (match_operator:XF 3 "binary_fp_operator"
-                       [(match_operand:XF 1 "register_operand" "%0")
-                        (match_operand:XF 2 "register_operand" "f")]))]
-  "TARGET_80387
-   && GET_RTX_CLASS (GET_CODE (operands[3])) == 'c'"
-  "* return output_387_binary_op (insn, operands);"
-  [(set (attr "type") 
-        (if_then_else (match_operand:XF 3 "mult_operator" "") 
-           (const_string "fmul")
-           (const_string "fop")))
-   (set_attr "mode" "XF")])
-
-(define_insn "*fop_sf_1_nosse"
-  [(set (match_operand:SF 0 "register_operand" "=f,f")
-       (match_operator:SF 3 "binary_fp_operator"
-                       [(match_operand:SF 1 "nonimmediate_operand" "0,fm")
-                        (match_operand:SF 2 "nonimmediate_operand" "fm,0")]))]
-  "TARGET_80387 && !TARGET_SSE_MATH
-   && GET_RTX_CLASS (GET_CODE (operands[3])) != 'c'
-   && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
-  "* return output_387_binary_op (insn, operands);"
-  [(set (attr "type") 
-        (cond [(match_operand:SF 3 "mult_operator" "") 
-                 (const_string "fmul")
-               (match_operand:SF 3 "div_operator" "") 
-                 (const_string "fdiv")
-              ]
-              (const_string "fop")))
    (set_attr "mode" "SF")])
 
-(define_insn "*fop_sf_1"
+(define_insn "*fop_sf_1_mixed"
   [(set (match_operand:SF 0 "register_operand" "=f,f,x")
        (match_operator:SF 3 "binary_fp_operator"
                        [(match_operand:SF 1 "nonimmediate_operand" "0,fm,0")
                         (match_operand:SF 2 "nonimmediate_operand" "fm,0,xm#f")]))]
-  "TARGET_80387 && TARGET_SSE_MATH && TARGET_MIX_SSE_I387
-   && GET_RTX_CLASS (GET_CODE (operands[3])) != 'c'
+  "TARGET_MIX_SSE_I387
+   && !COMMUTATIVE_ARITH_P (operands[3])
    && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
   "* return output_387_binary_op (insn, operands);"
   [(set (attr "type") 
                        [(match_operand:SF 1 "register_operand" "0")
                         (match_operand:SF 2 "nonimmediate_operand" "xm")]))]
   "TARGET_SSE_MATH
-   && GET_RTX_CLASS (GET_CODE (operands[3])) != 'c'"
+   && !COMMUTATIVE_ARITH_P (operands[3])"
   "* return output_387_binary_op (insn, operands);"
   [(set (attr "type") 
         (cond [(match_operand:SF 3 "mult_operator" "")
               (const_string "sseadd")))
    (set_attr "mode" "SF")])
 
-;; ??? Add SSE splitters for these!
-(define_insn "*fop_sf_2"
+;; This pattern is not fully shadowed by the pattern above.
+(define_insn "*fop_sf_1_i387"
   [(set (match_operand:SF 0 "register_operand" "=f,f")
        (match_operator:SF 3 "binary_fp_operator"
-         [(float:SF (match_operand:SI 1 "nonimmediate_operand" "m,?r"))
-          (match_operand:SF 2 "register_operand" "0,0")]))]
-  "TARGET_80387 && TARGET_USE_FIOP && !TARGET_SSE_MATH"
-  "* return which_alternative ? \"#\" : output_387_binary_op (insn, operands);"
-  [(set (attr "type") 
-        (cond [(match_operand:SF 3 "mult_operator" "") 
+                       [(match_operand:SF 1 "nonimmediate_operand" "0,fm")
+                        (match_operand:SF 2 "nonimmediate_operand" "fm,0")]))]
+  "TARGET_80387 && !TARGET_SSE_MATH
+   && !COMMUTATIVE_ARITH_P (operands[3])
+   && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
+  "* return output_387_binary_op (insn, operands);"
+  [(set (attr "type") 
+        (cond [(match_operand:SF 3 "mult_operator" "") 
+                 (const_string "fmul")
+               (match_operand:SF 3 "div_operator" "") 
+                 (const_string "fdiv")
+              ]
+              (const_string "fop")))
+   (set_attr "mode" "SF")])
+
+
+;; ??? Add SSE splitters for these!
+(define_insn "*fop_sf_2_i387"
+  [(set (match_operand:SF 0 "register_operand" "=f,f")
+       (match_operator:SF 3 "binary_fp_operator"
+         [(float:SF (match_operand:SI 1 "nonimmediate_operand" "m,?r"))
+          (match_operand:SF 2 "register_operand" "0,0")]))]
+  "TARGET_80387 && TARGET_USE_FIOP && !TARGET_SSE_MATH"
+  "* return which_alternative ? \"#\" : output_387_binary_op (insn, operands);"
+  [(set (attr "type") 
+        (cond [(match_operand:SF 3 "mult_operator" "") 
                  (const_string "fmul")
                (match_operand:SF 3 "div_operator" "") 
                  (const_string "fdiv")
               ]
               (const_string "fop")))
    (set_attr "fp_int_src" "true")
-   (set_attr "ppro_uops" "many")
    (set_attr "mode" "SI")])
 
-(define_insn "*fop_sf_3"
+(define_insn "*fop_sf_3_i387"
   [(set (match_operand:SF 0 "register_operand" "=f,f")
        (match_operator:SF 3 "binary_fp_operator"
          [(match_operand:SF 1 "register_operand" "0,0")
               ]
               (const_string "fop")))
    (set_attr "fp_int_src" "true")
-   (set_attr "ppro_uops" "many")
    (set_attr "mode" "SI")])
 
-(define_insn "*fop_df_1_nosse"
-  [(set (match_operand:DF 0 "register_operand" "=f,f")
+(define_insn "*fop_df_comm_mixed"
+  [(set (match_operand:DF 0 "register_operand" "=f#Y,Y#f")
        (match_operator:DF 3 "binary_fp_operator"
-                       [(match_operand:DF 1 "nonimmediate_operand" "0,fm")
-                        (match_operand:DF 2 "nonimmediate_operand" "fm,0")]))]
-  "TARGET_80387 && (!TARGET_SSE2 || !TARGET_SSE_MATH)
-   && GET_RTX_CLASS (GET_CODE (operands[3])) != 'c'
+                       [(match_operand:DF 1 "nonimmediate_operand" "%0,0")
+                        (match_operand:DF 2 "nonimmediate_operand" "fm#Y,Ym#f")]))]
+  "TARGET_SSE2 && TARGET_MIX_SSE_I387
+   && COMMUTATIVE_ARITH_P (operands[3])
    && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
   "* return output_387_binary_op (insn, operands);"
   [(set (attr "type") 
-        (cond [(match_operand:DF 3 "mult_operator" "") 
-                 (const_string "fmul")
-               (match_operand:DF 3 "div_operator" "")
-                 (const_string "fdiv")
-              ]
-              (const_string "fop")))
+       (if_then_else (eq_attr "alternative" "1")
+          (if_then_else (match_operand:SF 3 "mult_operator" "") 
+             (const_string "ssemul")
+             (const_string "sseadd"))
+          (if_then_else (match_operand:SF 3 "mult_operator" "") 
+             (const_string "fmul")
+             (const_string "fop"))))
+   (set_attr "mode" "DF")])
+
+(define_insn "*fop_df_comm_sse"
+  [(set (match_operand:DF 0 "register_operand" "=Y")
+       (match_operator:DF 3 "binary_fp_operator"
+                       [(match_operand:DF 1 "nonimmediate_operand" "%0")
+                        (match_operand:DF 2 "nonimmediate_operand" "Ym")]))]
+  "TARGET_SSE2 && TARGET_SSE_MATH
+   && COMMUTATIVE_ARITH_P (operands[3])
+   && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
+  "* return output_387_binary_op (insn, operands);"
+  [(set (attr "type") 
+        (if_then_else (match_operand:SF 3 "mult_operator" "") 
+          (const_string "ssemul")
+          (const_string "sseadd")))
    (set_attr "mode" "DF")])
 
+(define_insn "*fop_df_comm_i387"
+  [(set (match_operand:DF 0 "register_operand" "=f")
+       (match_operator:DF 3 "binary_fp_operator"
+                       [(match_operand:DF 1 "nonimmediate_operand" "%0")
+                        (match_operand:DF 2 "nonimmediate_operand" "fm")]))]
+  "TARGET_80387
+   && COMMUTATIVE_ARITH_P (operands[3])
+   && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
+  "* return output_387_binary_op (insn, operands);"
+  [(set (attr "type") 
+       (if_then_else (match_operand:SF 3 "mult_operator" "") 
+          (const_string "fmul")
+          (const_string "fop")))
+   (set_attr "mode" "DF")])
 
-(define_insn "*fop_df_1"
+(define_insn "*fop_df_1_mixed"
   [(set (match_operand:DF 0 "register_operand" "=f#Y,f#Y,Y#f")
        (match_operator:DF 3 "binary_fp_operator"
                        [(match_operand:DF 1 "nonimmediate_operand" "0,fm,0")
                         (match_operand:DF 2 "nonimmediate_operand" "fm,0,Ym#f")]))]
-  "TARGET_80387 && TARGET_SSE2 && TARGET_SSE_MATH && TARGET_MIX_SSE_I387
-   && GET_RTX_CLASS (GET_CODE (operands[3])) != 'c'
+  "TARGET_SSE2 && TARGET_SSE_MATH && TARGET_MIX_SSE_I387
+   && !COMMUTATIVE_ARITH_P (operands[3])
    && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
   "* return output_387_binary_op (insn, operands);"
   [(set (attr "type") 
                        [(match_operand:DF 1 "register_operand" "0")
                         (match_operand:DF 2 "nonimmediate_operand" "Ym")]))]
   "TARGET_SSE2 && TARGET_SSE_MATH
-   && GET_RTX_CLASS (GET_CODE (operands[3])) != 'c'"
+   && !COMMUTATIVE_ARITH_P (operands[3])"
   "* return output_387_binary_op (insn, operands);"
   [(set_attr "mode" "DF")
    (set (attr "type") 
               ]
               (const_string "sseadd")))])
 
+;; This pattern is not fully shadowed by the pattern above.
+(define_insn "*fop_df_1_i387"
+  [(set (match_operand:DF 0 "register_operand" "=f,f")
+       (match_operator:DF 3 "binary_fp_operator"
+                       [(match_operand:DF 1 "nonimmediate_operand" "0,fm")
+                        (match_operand:DF 2 "nonimmediate_operand" "fm,0")]))]
+  "TARGET_80387 && !(TARGET_SSE2 && TARGET_SSE_MATH)
+   && !COMMUTATIVE_ARITH_P (operands[3])
+   && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
+  "* return output_387_binary_op (insn, operands);"
+  [(set (attr "type") 
+        (cond [(match_operand:DF 3 "mult_operator" "") 
+                 (const_string "fmul")
+               (match_operand:DF 3 "div_operator" "")
+                 (const_string "fdiv")
+              ]
+              (const_string "fop")))
+   (set_attr "mode" "DF")])
+
 ;; ??? Add SSE splitters for these!
-(define_insn "*fop_df_2"
+(define_insn "*fop_df_2_i387"
   [(set (match_operand:DF 0 "register_operand" "=f,f")
        (match_operator:DF 3 "binary_fp_operator"
           [(float:DF (match_operand:SI 1 "nonimmediate_operand" "m,?r"))
               ]
               (const_string "fop")))
    (set_attr "fp_int_src" "true")
-   (set_attr "ppro_uops" "many")
    (set_attr "mode" "SI")])
 
-(define_insn "*fop_df_3"
+(define_insn "*fop_df_3_i387"
   [(set (match_operand:DF 0 "register_operand" "=f,f")
        (match_operator:DF 3 "binary_fp_operator"
           [(match_operand:DF 1 "register_operand" "0,0")
               ]
               (const_string "fop")))
    (set_attr "fp_int_src" "true")
-   (set_attr "ppro_uops" "many")
    (set_attr "mode" "SI")])
 
-(define_insn "*fop_df_4"
+(define_insn "*fop_df_4_i387"
   [(set (match_operand:DF 0 "register_operand" "=f,f")
        (match_operator:DF 3 "binary_fp_operator"
           [(float_extend:DF (match_operand:SF 1 "nonimmediate_operand" "fm,0"))
            (match_operand:DF 2 "register_operand" "0,f")]))]
-  "TARGET_80387 && (!TARGET_SSE2 || !TARGET_SSE_MATH)
+  "TARGET_80387 && !(TARGET_SSE2 && TARGET_SSE_MATH)
    && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
   "* return output_387_binary_op (insn, operands);"
   [(set (attr "type") 
               (const_string "fop")))
    (set_attr "mode" "SF")])
 
-(define_insn "*fop_df_5"
+(define_insn "*fop_df_5_i387"
   [(set (match_operand:DF 0 "register_operand" "=f,f")
        (match_operator:DF 3 "binary_fp_operator"
          [(match_operand:DF 1 "register_operand" "0,f")
               (const_string "fop")))
    (set_attr "mode" "SF")])
 
-(define_insn "*fop_df_6"
+(define_insn "*fop_df_6_i387"
   [(set (match_operand:DF 0 "register_operand" "=f,f")
        (match_operator:DF 3 "binary_fp_operator"
          [(float_extend:DF
               (const_string "fop")))
    (set_attr "mode" "SF")])
 
-(define_insn "*fop_xf_1"
+(define_insn "*fop_xf_comm_i387"
+  [(set (match_operand:XF 0 "register_operand" "=f")
+       (match_operator:XF 3 "binary_fp_operator"
+                       [(match_operand:XF 1 "register_operand" "%0")
+                        (match_operand:XF 2 "register_operand" "f")]))]
+  "TARGET_80387
+   && COMMUTATIVE_ARITH_P (operands[3])"
+  "* return output_387_binary_op (insn, operands);"
+  [(set (attr "type") 
+        (if_then_else (match_operand:XF 3 "mult_operator" "") 
+           (const_string "fmul")
+           (const_string "fop")))
+   (set_attr "mode" "XF")])
+
+(define_insn "*fop_xf_1_i387"
   [(set (match_operand:XF 0 "register_operand" "=f,f")
        (match_operator:XF 3 "binary_fp_operator"
                        [(match_operand:XF 1 "register_operand" "0,f")
                         (match_operand:XF 2 "register_operand" "f,0")]))]
   "TARGET_80387
-   && GET_RTX_CLASS (GET_CODE (operands[3])) != 'c'"
+   && !COMMUTATIVE_ARITH_P (operands[3])"
   "* return output_387_binary_op (insn, operands);"
   [(set (attr "type") 
         (cond [(match_operand:XF 3 "mult_operator" "") 
               (const_string "fop")))
    (set_attr "mode" "XF")])
 
-(define_insn "*fop_xf_2"
+(define_insn "*fop_xf_2_i387"
   [(set (match_operand:XF 0 "register_operand" "=f,f")
        (match_operator:XF 3 "binary_fp_operator"
           [(float:XF (match_operand:SI 1 "nonimmediate_operand" "m,?r"))
               ]
               (const_string "fop")))
    (set_attr "fp_int_src" "true")
-   (set_attr "mode" "SI")
-   (set_attr "ppro_uops" "many")])
+   (set_attr "mode" "SI")])
 
-(define_insn "*fop_xf_3"
+(define_insn "*fop_xf_3_i387"
   [(set (match_operand:XF 0 "register_operand" "=f,f")
        (match_operator:XF 3 "binary_fp_operator"
          [(match_operand:XF 1 "register_operand" "0,0")
               ]
               (const_string "fop")))
    (set_attr "fp_int_src" "true")
-   (set_attr "mode" "SI")
-   (set_attr "ppro_uops" "many")])
+   (set_attr "mode" "SI")])
 
-(define_insn "*fop_xf_4"
+(define_insn "*fop_xf_4_i387"
   [(set (match_operand:XF 0 "register_operand" "=f,f")
        (match_operator:XF 3 "binary_fp_operator"
           [(float_extend:XF (match_operand 1 "nonimmediate_operand" "fm,0"))
               (const_string "fop")))
    (set_attr "mode" "SF")])
 
-(define_insn "*fop_xf_5"
+(define_insn "*fop_xf_5_i387"
   [(set (match_operand:XF 0 "register_operand" "=f,f")
        (match_operator:XF 3 "binary_fp_operator"
          [(match_operand:XF 1 "register_operand" "0,f")
               (const_string "fop")))
    (set_attr "mode" "SF")])
 
-(define_insn "*fop_xf_6"
+(define_insn "*fop_xf_6_i387"
   [(set (match_operand:XF 0 "register_operand" "=f,f")
        (match_operator:XF 3 "binary_fp_operator"
          [(float_extend:XF
 (define_expand "sqrtsf2"
   [(set (match_operand:SF 0 "register_operand" "")
        (sqrt:SF (match_operand:SF 1 "nonimmediate_operand" "")))]
-  "(! TARGET_NO_FANCY_MATH_387 && TARGET_80387) || TARGET_SSE_MATH"
+  "TARGET_USE_FANCY_MATH_387 || TARGET_SSE_MATH"
 {
   if (!TARGET_SSE_MATH)
     operands[1] = force_reg (SFmode, operands[1]);
 })
 
-(define_insn "sqrtsf2_1"
+(define_insn "*sqrtsf2_mixed"
   [(set (match_operand:SF 0 "register_operand" "=f#x,x#f")
        (sqrt:SF (match_operand:SF 1 "nonimmediate_operand" "0#x,xm#f")))]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387
-   && (TARGET_SSE_MATH && TARGET_MIX_SSE_I387)"
+  "TARGET_USE_FANCY_MATH_387 && TARGET_MIX_SSE_I387"
   "@
    fsqrt
    sqrtss\t{%1, %0|%0, %1}"
    (set_attr "mode" "SF,SF")
    (set_attr "athlon_decode" "direct,*")])
 
-(define_insn "sqrtsf2_1_sse_only"
+(define_insn "*sqrtsf2_sse"
   [(set (match_operand:SF 0 "register_operand" "=x")
        (sqrt:SF (match_operand:SF 1 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE_MATH && (!TARGET_80387 || !TARGET_MIX_SSE_I387)"
+  "TARGET_SSE_MATH"
   "sqrtss\t{%1, %0|%0, %1}"
   [(set_attr "type" "sse")
    (set_attr "mode" "SF")
    (set_attr "athlon_decode" "*")])
 
-(define_insn "sqrtsf2_i387"
+(define_insn "*sqrtsf2_i387"
   [(set (match_operand:SF 0 "register_operand" "=f")
        (sqrt:SF (match_operand:SF 1 "register_operand" "0")))]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387
-   && !TARGET_SSE_MATH"
+  "TARGET_USE_FANCY_MATH_387"
   "fsqrt"
   [(set_attr "type" "fpspc")
    (set_attr "mode" "SF")
 (define_expand "sqrtdf2"
   [(set (match_operand:DF 0 "register_operand" "")
        (sqrt:DF (match_operand:DF 1 "nonimmediate_operand" "")))]
-  "(! TARGET_NO_FANCY_MATH_387 && TARGET_80387)
-   || (TARGET_SSE2 && TARGET_SSE_MATH)"
+  "TARGET_USE_FANCY_MATH_387 || (TARGET_SSE2 && TARGET_SSE_MATH)"
 {
-  if (!TARGET_SSE2 || !TARGET_SSE_MATH)
+  if (!(TARGET_SSE2 && TARGET_SSE_MATH))
     operands[1] = force_reg (DFmode, operands[1]);
 })
 
-(define_insn "sqrtdf2_1"
+(define_insn "*sqrtdf2_mixed"
   [(set (match_operand:DF 0 "register_operand" "=f#Y,Y#f")
        (sqrt:DF (match_operand:DF 1 "nonimmediate_operand" "0#Y,Ym#f")))]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387
-   && (TARGET_SSE2 && TARGET_SSE_MATH && TARGET_MIX_SSE_I387)"
+  "TARGET_USE_FANCY_MATH_387 && TARGET_SSE2 && TARGET_MIX_SSE_I387"
   "@
    fsqrt
    sqrtsd\t{%1, %0|%0, %1}"
    (set_attr "mode" "DF,DF")
    (set_attr "athlon_decode" "direct,*")])
 
-(define_insn "sqrtdf2_1_sse_only"
+(define_insn "*sqrtdf2_sse"
   [(set (match_operand:DF 0 "register_operand" "=Y")
        (sqrt:DF (match_operand:DF 1 "nonimmediate_operand" "Ym")))]
-  "TARGET_SSE2 && TARGET_SSE_MATH && (!TARGET_80387 || !TARGET_MIX_SSE_I387)"
+  "TARGET_SSE2 && TARGET_SSE_MATH"
   "sqrtsd\t{%1, %0|%0, %1}"
   [(set_attr "type" "sse")
    (set_attr "mode" "DF")
    (set_attr "athlon_decode" "*")])
 
-(define_insn "sqrtdf2_i387"
+(define_insn "*sqrtdf2_i387"
   [(set (match_operand:DF 0 "register_operand" "=f")
        (sqrt:DF (match_operand:DF 1 "register_operand" "0")))]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387
-   && (!TARGET_SSE2 || !TARGET_SSE_MATH)"
+  "TARGET_USE_FANCY_MATH_387"
   "fsqrt"
   [(set_attr "type" "fpspc")
    (set_attr "mode" "DF")
    (set_attr "athlon_decode" "direct")])
 
-(define_insn "*sqrtextendsfdf2"
+(define_insn "*sqrtextendsfdf2_i387"
   [(set (match_operand:DF 0 "register_operand" "=f")
        (sqrt:DF (float_extend:DF
                  (match_operand:SF 1 "register_operand" "0"))))]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387
-   && !(TARGET_SSE2 && TARGET_SSE_MATH)"
+  "TARGET_USE_FANCY_MATH_387
+   && (!(TARGET_SSE2 && TARGET_SSE_MATH) || TARGET_MIX_SSE_I387)"
   "fsqrt"
   [(set_attr "type" "fpspc")
    (set_attr "mode" "DF")
 (define_insn "sqrtxf2"
   [(set (match_operand:XF 0 "register_operand" "=f")
        (sqrt:XF (match_operand:XF 1 "register_operand" "0")))]
-  "TARGET_80387 && !TARGET_NO_FANCY_MATH_387 
+  "TARGET_USE_FANCY_MATH_387 
    && (TARGET_IEEE_FP || flag_unsafe_math_optimizations) "
   "fsqrt"
   [(set_attr "type" "fpspc")
    (set_attr "mode" "XF")
    (set_attr "athlon_decode" "direct")])
 
-(define_insn "*sqrtextenddfxf2"
+(define_insn "*sqrtextendsfxf2_i387"
   [(set (match_operand:XF 0 "register_operand" "=f")
        (sqrt:XF (float_extend:XF
-                 (match_operand:DF 1 "register_operand" "0"))))]
-  "TARGET_80387 && !TARGET_NO_FANCY_MATH_387"
+                 (match_operand:SF 1 "register_operand" "0"))))]
+  "TARGET_USE_FANCY_MATH_387"
   "fsqrt"
   [(set_attr "type" "fpspc")
    (set_attr "mode" "XF")
    (set_attr "athlon_decode" "direct")])
 
-(define_insn "*sqrtextendsfxf2"
+(define_insn "*sqrtextenddfxf2_i387"
   [(set (match_operand:XF 0 "register_operand" "=f")
        (sqrt:XF (float_extend:XF
-                 (match_operand:SF 1 "register_operand" "0"))))]
-  "TARGET_80387 && !TARGET_NO_FANCY_MATH_387"
+                 (match_operand:DF 1 "register_operand" "0"))))]
+  "TARGET_USE_FANCY_MATH_387"
   "fsqrt"
   [(set_attr "type" "fpspc")
    (set_attr "mode" "XF")
    (set_attr "athlon_decode" "direct")])
 
-(define_insn "sindf2"
+(define_insn "fpremxf4"
+  [(set (match_operand:XF 0 "register_operand" "=f")
+       (unspec:XF [(match_operand:XF 2 "register_operand" "0")
+                   (match_operand:XF 3 "register_operand" "1")]
+                  UNSPEC_FPREM_F))
+   (set (match_operand:XF 1 "register_operand" "=u")
+       (unspec:XF [(match_dup 2) (match_dup 3)]
+                  UNSPEC_FPREM_U))
+   (set (reg:CCFP FPSR_REG)
+       (unspec:CCFP [(const_int 0)] UNSPEC_NOP))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+  "fprem"
+  [(set_attr "type" "fpspc")
+   (set_attr "mode" "XF")])
+
+(define_expand "fmodsf3"
+  [(use (match_operand:SF 0 "register_operand" ""))
+   (use (match_operand:SF 1 "register_operand" ""))
+   (use (match_operand:SF 2 "register_operand" ""))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  rtx label = gen_label_rtx ();
+
+  rtx op1 = gen_reg_rtx (XFmode);
+  rtx op2 = gen_reg_rtx (XFmode);
+
+  emit_insn(gen_extendsfxf2 (op1, operands[1]));
+  emit_insn(gen_extendsfxf2 (op2, operands[2]));
+
+  emit_label (label);
+
+  emit_insn (gen_fpremxf4 (op1, op2, op1, op2));
+  ix86_emit_fp_unordered_jump (label);
+
+  emit_insn (gen_truncxfsf2_i387_noop (operands[0], op1));
+  DONE;
+})
+
+(define_expand "fmoddf3"
+  [(use (match_operand:DF 0 "register_operand" ""))
+   (use (match_operand:DF 1 "register_operand" ""))
+   (use (match_operand:DF 2 "register_operand" ""))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  rtx label = gen_label_rtx ();
+
+  rtx op1 = gen_reg_rtx (XFmode);
+  rtx op2 = gen_reg_rtx (XFmode);
+
+  emit_insn (gen_extenddfxf2 (op1, operands[1]));
+  emit_insn (gen_extenddfxf2 (op2, operands[2]));
+
+  emit_label (label);
+
+  emit_insn (gen_fpremxf4 (op1, op2, op1, op2));
+  ix86_emit_fp_unordered_jump (label);
+
+  emit_insn (gen_truncxfdf2_i387_noop (operands[0], op1));
+  DONE;
+})
+
+(define_expand "fmodxf3"
+  [(use (match_operand:XF 0 "register_operand" ""))
+   (use (match_operand:XF 1 "register_operand" ""))
+   (use (match_operand:XF 2 "register_operand" ""))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  rtx label = gen_label_rtx ();
+
+  emit_label (label);
+
+  emit_insn (gen_fpremxf4 (operands[1], operands[2],
+                          operands[1], operands[2]));
+  ix86_emit_fp_unordered_jump (label);
+
+  emit_move_insn (operands[0], operands[1]);
+  DONE;
+})
+
+(define_insn "fprem1xf4"
+  [(set (match_operand:XF 0 "register_operand" "=f")
+       (unspec:XF [(match_operand:XF 2 "register_operand" "0")
+                   (match_operand:XF 3 "register_operand" "1")]
+                  UNSPEC_FPREM1_F))
+   (set (match_operand:XF 1 "register_operand" "=u")
+       (unspec:XF [(match_dup 2) (match_dup 3)]
+                  UNSPEC_FPREM1_U))
+   (set (reg:CCFP FPSR_REG)
+       (unspec:CCFP [(const_int 0)] UNSPEC_NOP))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+  "fprem1"
+  [(set_attr "type" "fpspc")
+   (set_attr "mode" "XF")])
+
+(define_expand "dremsf3"
+  [(use (match_operand:SF 0 "register_operand" ""))
+   (use (match_operand:SF 1 "register_operand" ""))
+   (use (match_operand:SF 2 "register_operand" ""))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  rtx label = gen_label_rtx ();
+
+  rtx op1 = gen_reg_rtx (XFmode);
+  rtx op2 = gen_reg_rtx (XFmode);
+
+  emit_insn(gen_extendsfxf2 (op1, operands[1]));
+  emit_insn(gen_extendsfxf2 (op2, operands[2]));
+
+  emit_label (label);
+
+  emit_insn (gen_fprem1xf4 (op1, op2, op1, op2));
+  ix86_emit_fp_unordered_jump (label);
+
+  emit_insn (gen_truncxfsf2_i387_noop (operands[0], op1));
+  DONE;
+})
+
+(define_expand "dremdf3"
+  [(use (match_operand:DF 0 "register_operand" ""))
+   (use (match_operand:DF 1 "register_operand" ""))
+   (use (match_operand:DF 2 "register_operand" ""))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  rtx label = gen_label_rtx ();
+
+  rtx op1 = gen_reg_rtx (XFmode);
+  rtx op2 = gen_reg_rtx (XFmode);
+
+  emit_insn (gen_extenddfxf2 (op1, operands[1]));
+  emit_insn (gen_extenddfxf2 (op2, operands[2]));
+
+  emit_label (label);
+
+  emit_insn (gen_fprem1xf4 (op1, op2, op1, op2));
+  ix86_emit_fp_unordered_jump (label);
+
+  emit_insn (gen_truncxfdf2_i387_noop (operands[0], op1));
+  DONE;
+})
+
+(define_expand "dremxf3"
+  [(use (match_operand:XF 0 "register_operand" ""))
+   (use (match_operand:XF 1 "register_operand" ""))
+   (use (match_operand:XF 2 "register_operand" ""))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  rtx label = gen_label_rtx ();
+
+  emit_label (label);
+
+  emit_insn (gen_fprem1xf4 (operands[1], operands[2],
+                           operands[1], operands[2]));
+  ix86_emit_fp_unordered_jump (label);
+
+  emit_move_insn (operands[0], operands[1]);
+  DONE;
+})
+
+(define_insn "*sindf2"
   [(set (match_operand:DF 0 "register_operand" "=f")
        (unspec:DF [(match_operand:DF 1 "register_operand" "0")] UNSPEC_SIN))]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387 
+  "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
   "fsin"
   [(set_attr "type" "fpspc")
    (set_attr "mode" "DF")])
 
-(define_insn "sinsf2"
+(define_insn "*sinsf2"
   [(set (match_operand:SF 0 "register_operand" "=f")
        (unspec:SF [(match_operand:SF 1 "register_operand" "0")] UNSPEC_SIN))]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387 
+  "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
   "fsin"
   [(set_attr "type" "fpspc")
        (unspec:DF [(float_extend:DF
                     (match_operand:SF 1 "register_operand" "0"))]
                   UNSPEC_SIN))]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387 
+  "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
   "fsin"
   [(set_attr "type" "fpspc")
    (set_attr "mode" "DF")])
 
-(define_insn "sinxf2"
+(define_insn "*sinxf2"
   [(set (match_operand:XF 0 "register_operand" "=f")
        (unspec:XF [(match_operand:XF 1 "register_operand" "0")] UNSPEC_SIN))]
-  "TARGET_80387 && !TARGET_NO_FANCY_MATH_387
+  "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
   "fsin"
   [(set_attr "type" "fpspc")
    (set_attr "mode" "XF")])
 
-(define_insn "cosdf2"
+(define_insn "*cosdf2"
   [(set (match_operand:DF 0 "register_operand" "=f")
        (unspec:DF [(match_operand:DF 1 "register_operand" "0")] UNSPEC_COS))]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387 
+  "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
   "fcos"
   [(set_attr "type" "fpspc")
    (set_attr "mode" "DF")])
 
-(define_insn "cossf2"
+(define_insn "*cossf2"
   [(set (match_operand:SF 0 "register_operand" "=f")
        (unspec:SF [(match_operand:SF 1 "register_operand" "0")] UNSPEC_COS))]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387 
+  "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
   "fcos"
   [(set_attr "type" "fpspc")
        (unspec:DF [(float_extend:DF
                     (match_operand:SF 1 "register_operand" "0"))]
                   UNSPEC_COS))]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387 
+  "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
   "fcos"
   [(set_attr "type" "fpspc")
    (set_attr "mode" "DF")])
 
-(define_insn "cosxf2"
+(define_insn "*cosxf2"
   [(set (match_operand:XF 0 "register_operand" "=f")
        (unspec:XF [(match_operand:XF 1 "register_operand" "0")] UNSPEC_COS))]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387
+  "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
   "fcos"
   [(set_attr "type" "fpspc")
    (set_attr "mode" "XF")])
 
-(define_insn "atan2df3_1"
+;; With sincos pattern defined, sin and cos builtin function will be
+;; expanded to sincos pattern with one of its outputs left unused. 
+;; Cse pass  will detected, if two sincos patterns can be combined,
+;; otherwise sincos pattern will be split back to sin or cos pattern,
+;; depending on the unused output.
+
+(define_insn "sincosdf3"
   [(set (match_operand:DF 0 "register_operand" "=f")
-       (unspec:DF [(match_operand:DF 2 "register_operand" "0")
-                   (match_operand:DF 1 "register_operand" "u")]
-                  UNSPEC_FPATAN))
-   (clobber (match_scratch:DF 3 "=1"))]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387
+       (unspec:DF [(match_operand:DF 2 "register_operand" "0")]
+                  UNSPEC_SINCOS_COS))
+   (set (match_operand:DF 1 "register_operand" "=u")
+        (unspec:DF [(match_dup 2)] UNSPEC_SINCOS_SIN))]
+  "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
-  "fpatan"
+  "fsincos"
   [(set_attr "type" "fpspc")
    (set_attr "mode" "DF")])
 
-(define_expand "atan2df3"
-  [(use (match_operand:DF 0 "register_operand" "=f"))
-   (use (match_operand:DF 2 "register_operand" "0"))
-   (use (match_operand:DF 1 "register_operand" "u"))]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387
-   && flag_unsafe_math_optimizations"
-{
-  rtx copy = gen_reg_rtx (DFmode);
-  emit_move_insn (copy, operands[1]);
-  emit_insn (gen_atan2df3_1 (operands[0], copy, operands[2]));
-  DONE;
-})
+(define_split
+  [(set (match_operand:DF 0 "register_operand" "")
+       (unspec:DF [(match_operand:DF 2 "register_operand" "")]
+                  UNSPEC_SINCOS_COS))
+   (set (match_operand:DF 1 "register_operand" "")
+       (unspec:DF [(match_dup 2)] UNSPEC_SINCOS_SIN))]
+  "find_regno_note (insn, REG_UNUSED, REGNO (operands[0]))
+   && !reload_completed && !reload_in_progress"
+  [(set (match_dup 1) (unspec:DF [(match_dup 2)] UNSPEC_SIN))]
+  "")
 
-(define_insn "atan2sf3_1"
+(define_split
+  [(set (match_operand:DF 0 "register_operand" "")
+       (unspec:DF [(match_operand:DF 2 "register_operand" "")]
+                  UNSPEC_SINCOS_COS))
+   (set (match_operand:DF 1 "register_operand" "")
+       (unspec:DF [(match_dup 2)] UNSPEC_SINCOS_SIN))]
+  "find_regno_note (insn, REG_UNUSED, REGNO (operands[1]))
+   && !reload_completed && !reload_in_progress"
+  [(set (match_dup 0) (unspec:DF [(match_dup 2)] UNSPEC_COS))]
+  "")
+
+(define_insn "sincossf3"
   [(set (match_operand:SF 0 "register_operand" "=f")
-        (unspec:SF [(match_operand:SF 2 "register_operand" "0")
-                   (match_operand:SF 1 "register_operand" "u")]
-                  UNSPEC_FPATAN))
-   (clobber (match_scratch:SF 3 "=1"))]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387
+       (unspec:SF [(match_operand:SF 2 "register_operand" "0")]
+                  UNSPEC_SINCOS_COS))
+   (set (match_operand:SF 1 "register_operand" "=u")
+        (unspec:SF [(match_dup 2)] UNSPEC_SINCOS_SIN))]
+  "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
-  "fpatan"
+  "fsincos"
   [(set_attr "type" "fpspc")
    (set_attr "mode" "SF")])
 
-(define_expand "atan2sf3"
-  [(use (match_operand:SF 0 "register_operand" "=f"))
-   (use (match_operand:SF 2 "register_operand" "0"))
-   (use (match_operand:SF 1 "register_operand" "u"))]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387
-   && flag_unsafe_math_optimizations"
-{
-  rtx copy = gen_reg_rtx (SFmode);
-  emit_move_insn (copy, operands[1]);
-  emit_insn (gen_atan2sf3_1 (operands[0], copy, operands[2]));
-  DONE;
-})
+(define_split
+  [(set (match_operand:SF 0 "register_operand" "")
+       (unspec:SF [(match_operand:SF 2 "register_operand" "")]
+                  UNSPEC_SINCOS_COS))
+   (set (match_operand:SF 1 "register_operand" "")
+       (unspec:SF [(match_dup 2)] UNSPEC_SINCOS_SIN))]
+  "find_regno_note (insn, REG_UNUSED, REGNO (operands[0]))
+   && !reload_completed && !reload_in_progress"
+  [(set (match_dup 1) (unspec:SF [(match_dup 2)] UNSPEC_SIN))]
+  "")
 
-(define_insn "atan2xf3_1"
-  [(set (match_operand:XF 0 "register_operand" "=f")
-        (unspec:XF [(match_operand:XF 2 "register_operand" "0")
-                   (match_operand:XF 1 "register_operand" "u")]
-                  UNSPEC_FPATAN))
-   (clobber (match_scratch:XF 3 "=1"))]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387
+(define_split
+  [(set (match_operand:SF 0 "register_operand" "")
+       (unspec:SF [(match_operand:SF 2 "register_operand" "")]
+                  UNSPEC_SINCOS_COS))
+   (set (match_operand:SF 1 "register_operand" "")
+       (unspec:SF [(match_dup 2)] UNSPEC_SINCOS_SIN))]
+  "find_regno_note (insn, REG_UNUSED, REGNO (operands[1]))
+   && !reload_completed && !reload_in_progress"
+  [(set (match_dup 0) (unspec:SF [(match_dup 2)] UNSPEC_COS))]
+  "")
+
+(define_insn "*sincosextendsfdf3"
+  [(set (match_operand:DF 0 "register_operand" "=f")
+       (unspec:DF [(float_extend:DF
+                    (match_operand:SF 2 "register_operand" "0"))]
+                  UNSPEC_SINCOS_COS))
+   (set (match_operand:DF 1 "register_operand" "=u")
+        (unspec:DF [(float_extend:DF
+                    (match_dup 2))] UNSPEC_SINCOS_SIN))]
+  "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
-  "fpatan"
+  "fsincos"
   [(set_attr "type" "fpspc")
-   (set_attr "mode" "XF")])
+   (set_attr "mode" "DF")])
 
-(define_expand "atan2xf3"
-  [(use (match_operand:XF 0 "register_operand" "=f"))
-   (use (match_operand:XF 2 "register_operand" "0"))
-   (use (match_operand:XF 1 "register_operand" "u"))]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387
-   && flag_unsafe_math_optimizations"
-{
-  rtx copy = gen_reg_rtx (XFmode);
-  emit_move_insn (copy, operands[1]);
-  emit_insn (gen_atan2xf3_1 (operands[0], copy, operands[2]));
-  DONE;
-})
+(define_split
+  [(set (match_operand:DF 0 "register_operand" "")
+       (unspec:DF [(float_extend:DF
+                    (match_operand:SF 2 "register_operand" ""))]
+                  UNSPEC_SINCOS_COS))
+   (set (match_operand:DF 1 "register_operand" "")
+        (unspec:DF [(float_extend:DF
+                    (match_dup 2))] UNSPEC_SINCOS_SIN))]
+  "find_regno_note (insn, REG_UNUSED, REGNO (operands[0]))
+   && !reload_completed && !reload_in_progress"
+  [(set (match_dup 1) (unspec:DF [(float_extend:DF
+                                  (match_dup 2))] UNSPEC_SIN))]
+  "")
 
-(define_insn "*fyl2x_sfxf3"
-  [(set (match_operand:SF 0 "register_operand" "=f")
-         (unspec:SF [(match_operand:SF 2 "register_operand" "0")
-                    (match_operand:XF 1 "register_operand" "u")]
-                   UNSPEC_FYL2X))
-   (clobber (match_scratch:SF 3 "=1"))]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387
+(define_split
+  [(set (match_operand:DF 0 "register_operand" "")
+       (unspec:DF [(float_extend:DF
+                    (match_operand:SF 2 "register_operand" ""))]
+                  UNSPEC_SINCOS_COS))
+   (set (match_operand:DF 1 "register_operand" "")
+        (unspec:DF [(float_extend:DF
+                    (match_dup 2))] UNSPEC_SINCOS_SIN))]
+  "find_regno_note (insn, REG_UNUSED, REGNO (operands[1]))
+   && !reload_completed && !reload_in_progress"
+  [(set (match_dup 0) (unspec:DF [(float_extend:DF
+                                  (match_dup 2))] UNSPEC_COS))]
+  "")
+
+(define_insn "sincosxf3"
+  [(set (match_operand:XF 0 "register_operand" "=f")
+       (unspec:XF [(match_operand:XF 2 "register_operand" "0")]
+                  UNSPEC_SINCOS_COS))
+   (set (match_operand:XF 1 "register_operand" "=u")
+        (unspec:XF [(match_dup 2)] UNSPEC_SINCOS_SIN))]
+  "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
-  "fyl2x"
+  "fsincos"
   [(set_attr "type" "fpspc")
-   (set_attr "mode" "SF")])
+   (set_attr "mode" "XF")])
+
+(define_split
+  [(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" "")
+       (unspec:XF [(match_dup 2)] UNSPEC_SINCOS_SIN))]
+  "find_regno_note (insn, REG_UNUSED, REGNO (operands[0]))
+   && !reload_completed && !reload_in_progress"
+  [(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" "")]
+                  UNSPEC_SINCOS_COS))
+   (set (match_operand:XF 1 "register_operand" "")
+       (unspec:XF [(match_dup 2)] UNSPEC_SINCOS_SIN))]
+  "find_regno_note (insn, REG_UNUSED, REGNO (operands[1]))
+   && !reload_completed && !reload_in_progress"
+  [(set (match_dup 0) (unspec:XF [(match_dup 2)] UNSPEC_COS))]
+  "")
 
-(define_insn "*fyl2x_dfxf3"
+(define_insn "*tandf3_1"
   [(set (match_operand:DF 0 "register_operand" "=f")
-         (unspec:DF [(match_operand:DF 2 "register_operand" "0")
-                    (match_operand:XF 1 "register_operand" "u")]
-                   UNSPEC_FYL2X))
-   (clobber (match_scratch:DF 3 "=1"))]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387
+       (unspec:DF [(match_operand:DF 2 "register_operand" "0")]
+                  UNSPEC_TAN_ONE))
+   (set (match_operand:DF 1 "register_operand" "=u")
+        (unspec:DF [(match_dup 2)] UNSPEC_TAN_TAN))]
+  "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
-  "fyl2x"
+  "fptan"
   [(set_attr "type" "fpspc")
    (set_attr "mode" "DF")])
 
-(define_insn "*fyl2x_xf3"
-  [(set (match_operand:XF 0 "register_operand" "=f")
-        (unspec:XF [(match_operand:XF 2 "register_operand" "0")
-                   (match_operand:XF 1 "register_operand" "u")]
-                  UNSPEC_FYL2X))
-   (clobber (match_scratch:XF 3 "=1"))]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387
+;; optimize sequence: fptan
+;;                   fstp    %st(0)
+;;                   fld1
+;; into fptan insn.
+
+(define_peephole2
+  [(parallel[(set (match_operand:DF 0 "register_operand" "")
+                 (unspec:DF [(match_operand:DF 2 "register_operand" "")]
+                            UNSPEC_TAN_ONE))
+            (set (match_operand:DF 1 "register_operand" "")
+                 (unspec:DF [(match_dup 2)] UNSPEC_TAN_TAN))])
+   (set (match_dup 0)
+        (match_operand:DF 3 "immediate_operand" ""))]
+  "standard_80387_constant_p (operands[3]) == 2"
+  [(parallel[(set (match_dup 0) (unspec:DF [(match_dup 2)] UNSPEC_TAN_ONE))
+            (set (match_dup 1) (unspec:DF [(match_dup 2)] UNSPEC_TAN_TAN))])]
+  "")
+
+(define_expand "tandf2"
+  [(parallel [(set (match_dup 2)
+                  (unspec:DF [(match_operand:DF 1 "register_operand" "")]
+                             UNSPEC_TAN_ONE))
+             (set (match_operand:DF 0 "register_operand" "")
+                  (unspec:DF [(match_dup 1)] UNSPEC_TAN_TAN))])]
+  "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
-  "fyl2x"
+{
+  operands[2] = gen_reg_rtx (DFmode);
+})
+
+(define_insn "*tansf3_1"
+  [(set (match_operand:SF 0 "register_operand" "=f")
+       (unspec:SF [(match_operand:SF 2 "register_operand" "0")]
+                  UNSPEC_TAN_ONE))
+   (set (match_operand:SF 1 "register_operand" "=u")
+        (unspec:SF [(match_dup 2)] UNSPEC_TAN_TAN))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+  "fptan"
   [(set_attr "type" "fpspc")
-   (set_attr "mode" "XF")])
+   (set_attr "mode" "SF")])
 
-(define_expand "logsf2"
-  [(parallel [(set (match_operand:SF 0 "register_operand" "")
-                  (unspec:SF [(match_operand:SF 1 "register_operand" "")
-                              (match_dup 2)] UNSPEC_FYL2X))
-             (clobber (match_scratch:SF 3 ""))])]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387
+;; optimize sequence: fptan
+;;                   fstp    %st(0)
+;;                   fld1
+;; into fptan insn.
+
+(define_peephole2
+  [(parallel[(set (match_operand:SF 0 "register_operand" "")
+                 (unspec:SF [(match_operand:SF 2 "register_operand" "")]
+                            UNSPEC_TAN_ONE))
+            (set (match_operand:SF 1 "register_operand" "")
+                 (unspec:SF [(match_dup 2)] UNSPEC_TAN_TAN))])
+   (set (match_dup 0)
+        (match_operand:SF 3 "immediate_operand" ""))]
+  "standard_80387_constant_p (operands[3]) == 2"
+  [(parallel[(set (match_dup 0) (unspec:SF [(match_dup 2)] UNSPEC_TAN_ONE))
+            (set (match_dup 1) (unspec:SF [(match_dup 2)] UNSPEC_TAN_TAN))])]
+  "")
+
+(define_expand "tansf2"
+  [(parallel [(set (match_dup 2)
+                  (unspec:SF [(match_operand:SF 1 "register_operand" "")]
+                             UNSPEC_TAN_ONE))
+             (set (match_operand:SF 0 "register_operand" "")
+                  (unspec:SF [(match_dup 1)] UNSPEC_TAN_TAN))])]
+  "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
 {
-  rtx temp;
-
-  operands[2] = gen_reg_rtx (XFmode);
-  temp = standard_80387_constant_rtx (4); /* fldln2 */
-  emit_move_insn (operands[2], temp);
+  operands[2] = gen_reg_rtx (SFmode);
 })
 
-(define_expand "logdf2"
-  [(parallel [(set (match_operand:DF 0 "register_operand" "")
-                  (unspec:DF [(match_operand:DF 1 "register_operand" "")
-                              (match_dup 2)] UNSPEC_FYL2X))
-             (clobber (match_scratch:DF 3 ""))])]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387
+(define_insn "*tanxf3_1"
+  [(set (match_operand:XF 0 "register_operand" "=f")
+       (unspec:XF [(match_operand:XF 2 "register_operand" "0")]
+                  UNSPEC_TAN_ONE))
+   (set (match_operand:XF 1 "register_operand" "=u")
+        (unspec:XF [(match_dup 2)] UNSPEC_TAN_TAN))]
+  "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
-{
-  rtx temp;
+  "fptan"
+  [(set_attr "type" "fpspc")
+   (set_attr "mode" "XF")])
 
-  operands[2] = gen_reg_rtx (XFmode);
-  temp = standard_80387_constant_rtx (4); /* fldln2 */
-  emit_move_insn (operands[2], temp);
-})
+;; optimize sequence: fptan
+;;                   fstp    %st(0)
+;;                   fld1
+;; into fptan insn.
 
-(define_expand "logxf2"
-  [(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 ""))])]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387
+(define_peephole2
+  [(parallel[(set (match_operand:XF 0 "register_operand" "")
+                 (unspec:XF [(match_operand:XF 2 "register_operand" "")]
+                            UNSPEC_TAN_ONE))
+            (set (match_operand:XF 1 "register_operand" "")
+                 (unspec:XF [(match_dup 2)] UNSPEC_TAN_TAN))])
+   (set (match_dup 0)
+        (match_operand:XF 3 "immediate_operand" ""))]
+  "standard_80387_constant_p (operands[3]) == 2"
+  [(parallel[(set (match_dup 0) (unspec:XF [(match_dup 2)] UNSPEC_TAN_ONE))
+            (set (match_dup 1) (unspec:XF [(match_dup 2)] UNSPEC_TAN_TAN))])]
+  "")
+
+(define_expand "tanxf2"
+  [(parallel [(set (match_dup 2)
+                  (unspec:XF [(match_operand:XF 1 "register_operand" "")]
+                             UNSPEC_TAN_ONE))
+             (set (match_operand:XF 0 "register_operand" "")
+                  (unspec:XF [(match_dup 1)] UNSPEC_TAN_TAN))])]
+  "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
 {
-  rtx temp;
-
   operands[2] = gen_reg_rtx (XFmode);
-  temp = standard_80387_constant_rtx (4); /* fldln2 */
-  emit_move_insn (operands[2], temp);
 })
 
-(define_expand "log10sf2"
-  [(parallel [(set (match_operand:SF 0 "register_operand" "")
-                  (unspec:SF [(match_operand:SF 1 "register_operand" "")
-                              (match_dup 2)] UNSPEC_FYL2X))
-             (clobber (match_scratch:SF 3 ""))])]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387
+(define_insn "atan2df3_1"
+  [(set (match_operand:DF 0 "register_operand" "=f")
+       (unspec:DF [(match_operand:DF 2 "register_operand" "0")
+                   (match_operand:DF 1 "register_operand" "u")]
+                  UNSPEC_FPATAN))
+   (clobber (match_scratch:DF 3 "=1"))]
+  "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
-{
-  rtx temp;
+  "fpatan"
+  [(set_attr "type" "fpspc")
+   (set_attr "mode" "DF")])
 
-  operands[2] = gen_reg_rtx (XFmode);
-  temp = standard_80387_constant_rtx (3); /* fldlg2 */
-  emit_move_insn (operands[2], temp);
+(define_expand "atan2df3"
+  [(use (match_operand:DF 0 "register_operand" "=f"))
+   (use (match_operand:DF 2 "register_operand" "0"))
+   (use (match_operand:DF 1 "register_operand" "u"))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  rtx copy = gen_reg_rtx (DFmode);
+  emit_move_insn (copy, operands[1]);
+  emit_insn (gen_atan2df3_1 (operands[0], copy, operands[2]));
+  DONE;
 })
 
-(define_expand "log10df2"
+(define_expand "atandf2"
   [(parallel [(set (match_operand:DF 0 "register_operand" "")
-                  (unspec:DF [(match_operand:DF 1 "register_operand" "")
-                              (match_dup 2)] UNSPEC_FYL2X))
+                  (unspec:DF [(match_dup 2)
+                              (match_operand:DF 1 "register_operand" "")]
+                   UNSPEC_FPATAN))
              (clobber (match_scratch:DF 3 ""))])]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387
+  "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
 {
-  rtx temp;
-
-  operands[2] = gen_reg_rtx (XFmode);
-  temp = standard_80387_constant_rtx (3); /* fldlg2 */
-  emit_move_insn (operands[2], temp);
+  operands[2] = gen_reg_rtx (DFmode);
+  emit_move_insn (operands[2], CONST1_RTX (DFmode));  /* fld1 */
 })
 
-(define_expand "log10xf2"
-  [(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 ""))])]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387
+(define_insn "atan2sf3_1"
+  [(set (match_operand:SF 0 "register_operand" "=f")
+        (unspec:SF [(match_operand:SF 2 "register_operand" "0")
+                   (match_operand:SF 1 "register_operand" "u")]
+                  UNSPEC_FPATAN))
+   (clobber (match_scratch:SF 3 "=1"))]
+  "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
-{
-  rtx temp;
+  "fpatan"
+  [(set_attr "type" "fpspc")
+   (set_attr "mode" "SF")])
 
-  operands[2] = gen_reg_rtx (XFmode);
-  temp = standard_80387_constant_rtx (3); /* fldlg2 */
-  emit_move_insn (operands[2], temp);
+(define_expand "atan2sf3"
+  [(use (match_operand:SF 0 "register_operand" "=f"))
+   (use (match_operand:SF 2 "register_operand" "0"))
+   (use (match_operand:SF 1 "register_operand" "u"))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  rtx copy = gen_reg_rtx (SFmode);
+  emit_move_insn (copy, operands[1]);
+  emit_insn (gen_atan2sf3_1 (operands[0], copy, operands[2]));
+  DONE;
 })
 
-(define_expand "log2sf2"
+(define_expand "atansf2"
   [(parallel [(set (match_operand:SF 0 "register_operand" "")
-                  (unspec:SF [(match_operand:SF 1 "register_operand" "")
-                              (match_dup 2)] UNSPEC_FYL2X))
+                  (unspec:SF [(match_dup 2)
+                              (match_operand:SF 1 "register_operand" "")]
+                   UNSPEC_FPATAN))
              (clobber (match_scratch:SF 3 ""))])]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387
+  "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
 {
-  operands[2] = gen_reg_rtx (XFmode);
-  emit_move_insn (operands[2], CONST1_RTX (XFmode));  /* fld1 */
-
+  operands[2] = gen_reg_rtx (SFmode);
+  emit_move_insn (operands[2], CONST1_RTX (SFmode));  /* fld1 */
 })
 
-(define_expand "log2df2"
-  [(parallel [(set (match_operand:DF 0 "register_operand" "")
-                  (unspec:DF [(match_operand:DF 1 "register_operand" "")
-                              (match_dup 2)] UNSPEC_FYL2X))
-             (clobber (match_scratch:DF 3 ""))])]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387
+(define_insn "atan2xf3_1"
+  [(set (match_operand:XF 0 "register_operand" "=f")
+        (unspec:XF [(match_operand:XF 2 "register_operand" "0")
+                   (match_operand:XF 1 "register_operand" "u")]
+                  UNSPEC_FPATAN))
+   (clobber (match_scratch:XF 3 "=1"))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+  "fpatan"
+  [(set_attr "type" "fpspc")
+   (set_attr "mode" "XF")])
+
+(define_expand "atan2xf3"
+  [(use (match_operand:XF 0 "register_operand" "=f"))
+   (use (match_operand:XF 2 "register_operand" "0"))
+   (use (match_operand:XF 1 "register_operand" "u"))]
+  "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
 {
-  operands[2] = gen_reg_rtx (XFmode);
-  emit_move_insn (operands[2], CONST1_RTX (XFmode));  /* fld1 */
+  rtx copy = gen_reg_rtx (XFmode);
+  emit_move_insn (copy, operands[1]);
+  emit_insn (gen_atan2xf3_1 (operands[0], copy, operands[2]));
+  DONE;
 })
 
-(define_expand "log2xf2"
+(define_expand "atanxf2"
   [(parallel [(set (match_operand:XF 0 "register_operand" "")
-                  (unspec:XF [(match_operand:XF 1 "register_operand" "")
-                              (match_dup 2)] UNSPEC_FYL2X))
+                  (unspec:XF [(match_dup 2)
+                              (match_operand:XF 1 "register_operand" "")]
+                   UNSPEC_FPATAN))
              (clobber (match_scratch:XF 3 ""))])]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387
+  "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
 {
   operands[2] = gen_reg_rtx (XFmode);
   emit_move_insn (operands[2], CONST1_RTX (XFmode));  /* fld1 */
 })
 
-(define_insn "*fscale_sfxf3"
-  [(set (match_operand:SF 0 "register_operand" "=f")
-        (unspec:SF [(match_operand:XF 2 "register_operand" "0")
-                    (match_operand:XF 1 "register_operand" "u")]
-                   UNSPEC_FSCALE))
-   (clobber (match_scratch:SF 3 "=1"))]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387
-   && flag_unsafe_math_optimizations"
-  "fscale\;fstp\t%y1"
-  [(set_attr "type" "fpspc")
-   (set_attr "mode" "SF")])
-
-(define_insn "*fscale_dfxf3"
-  [(set (match_operand:DF 0 "register_operand" "=f")
-        (unspec:DF [(match_operand:XF 2 "register_operand" "0")
-                    (match_operand:XF 1 "register_operand" "u")]
-                   UNSPEC_FSCALE))
-   (clobber (match_scratch:DF 3 "=1"))]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387
-   && flag_unsafe_math_optimizations"
-  "fscale\;fstp\t%y1"
-  [(set_attr "type" "fpspc")
-   (set_attr "mode" "DF")])
-
-(define_insn "*fscale_xf3"
-  [(set (match_operand:XF 0 "register_operand" "=f")
-       (unspec:XF [(match_operand:XF 2 "register_operand" "0")
-                   (match_operand:XF 1 "register_operand" "u")]
-                  UNSPEC_FSCALE))
-   (clobber (match_scratch:XF 3 "=1"))]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387
+(define_expand "asindf2"
+  [(set (match_dup 2)
+       (float_extend:XF (match_operand:DF 1 "register_operand" "")))
+   (set (match_dup 3) (mult:XF (match_dup 2) (match_dup 2)))
+   (set (match_dup 5) (minus:XF (match_dup 4) (match_dup 3)))
+   (set (match_dup 6) (sqrt:XF (match_dup 5)))
+   (parallel [(set (match_dup 7)
+                  (unspec:XF [(match_dup 6) (match_dup 2)]
+                             UNSPEC_FPATAN))
+             (clobber (match_scratch:XF 8 ""))])
+   (set (match_operand:DF 0 "register_operand" "")
+       (float_truncate:DF (match_dup 7)))]
+  "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
-  "fscale\;fstp\t%y1"
-  [(set_attr "type" "fpspc")
-   (set_attr "mode" "XF")])
+{
+  int i;
 
-(define_insn "*frndintxf2"
-  [(set (match_operand:XF 0 "register_operand" "=f")
-       (unspec:XF [(match_operand:XF 1 "register_operand" "0")]
-        UNSPEC_FRNDINT))]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387
-   && flag_unsafe_math_optimizations"
-  "frndint"
-  [(set_attr "type" "fpspc")
-   (set_attr "mode" "XF")])
+  for (i=2; i<8; i++)
+    operands[i] = gen_reg_rtx (XFmode);
 
-(define_insn "*f2xm1xf2"
-  [(set (match_operand:XF 0 "register_operand" "=f")
-       (unspec:XF [(match_operand:XF 1 "register_operand" "0")]
-        UNSPEC_F2XM1))]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387
-   && flag_unsafe_math_optimizations"
-  "f2xm1"
-  [(set_attr "type" "fpspc")
-   (set_attr "mode" "XF")])
+  emit_move_insn (operands[4], CONST1_RTX (XFmode));  /* fld1 */
+})
 
-(define_expand "expsf2"
+(define_expand "asinsf2"
   [(set (match_dup 2)
        (float_extend:XF (match_operand:SF 1 "register_operand" "")))
-   (set (match_dup 4) (mult:XF (match_dup 2) (match_dup 3)))
-   (set (match_dup 5) (unspec:XF [(match_dup 4)] UNSPEC_FRNDINT))
-   (set (match_dup 6) (minus:XF (match_dup 4) (match_dup 5)))
-   (set (match_dup 7) (unspec:XF [(match_dup 6)] UNSPEC_F2XM1))
-   (set (match_dup 9) (plus:XF (match_dup 7) (match_dup 8)))
-   (parallel [(set (match_operand:SF 0 "register_operand" "")
-                  (unspec:SF [(match_dup 9) (match_dup 5)] UNSPEC_FSCALE))
-             (clobber (match_scratch:SF 5 ""))])]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387
+   (set (match_dup 3) (mult:XF (match_dup 2) (match_dup 2)))
+   (set (match_dup 5) (minus:XF (match_dup 4) (match_dup 3)))
+   (set (match_dup 6) (sqrt:XF (match_dup 5)))
+   (parallel [(set (match_dup 7)
+                  (unspec:XF [(match_dup 6) (match_dup 2)]
+                             UNSPEC_FPATAN))
+             (clobber (match_scratch:XF 8 ""))])
+   (set (match_operand:SF 0 "register_operand" "")
+       (float_truncate:SF (match_dup 7)))]
+  "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
 {
-  rtx temp;
   int i;
 
-  for (i=2; i<10; i++)
+  for (i=2; i<8; i++)
     operands[i] = gen_reg_rtx (XFmode);
-  temp = standard_80387_constant_rtx (5); /* fldl2e */
-  emit_move_insn (operands[3], temp);
-  emit_move_insn (operands[8], CONST1_RTX (XFmode));  /* fld1 */
+
+  emit_move_insn (operands[4], CONST1_RTX (XFmode));  /* fld1 */
 })
 
-(define_expand "expdf2"
+(define_expand "asinxf2"
+  [(set (match_dup 2)
+       (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" "")
+                  (unspec:XF [(match_dup 5) (match_dup 1)]
+                             UNSPEC_FPATAN))
+             (clobber (match_scratch:XF 6 ""))])]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  int i;
+
+  for (i=2; i<6; i++)
+    operands[i] = gen_reg_rtx (XFmode);
+
+  emit_move_insn (operands[3], CONST1_RTX (XFmode));  /* fld1 */
+})
+
+(define_expand "acosdf2"
   [(set (match_dup 2)
        (float_extend:XF (match_operand:DF 1 "register_operand" "")))
-   (set (match_dup 4) (mult:XF (match_dup 2) (match_dup 3)))
-   (set (match_dup 5) (unspec:XF [(match_dup 4)] UNSPEC_FRNDINT))
-   (set (match_dup 6) (minus:XF (match_dup 4) (match_dup 5)))
-   (set (match_dup 7) (unspec:XF [(match_dup 6)] UNSPEC_F2XM1))
-   (set (match_dup 9) (plus:XF (match_dup 7) (match_dup 8)))
-   (parallel [(set (match_operand:DF 0 "register_operand" "")
-                  (unspec:DF [(match_dup 9) (match_dup 5)] UNSPEC_FSCALE))
-             (clobber (match_scratch:DF 5 ""))])]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387
+   (set (match_dup 3) (mult:XF (match_dup 2) (match_dup 2)))
+   (set (match_dup 5) (minus:XF (match_dup 4) (match_dup 3)))
+   (set (match_dup 6) (sqrt:XF (match_dup 5)))
+   (parallel [(set (match_dup 7)
+                  (unspec:XF [(match_dup 2) (match_dup 6)]
+                             UNSPEC_FPATAN))
+             (clobber (match_scratch:XF 8 ""))])
+   (set (match_operand:DF 0 "register_operand" "")
+       (float_truncate:DF (match_dup 7)))]
+  "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
 {
-  rtx temp;
   int i;
 
-  for (i=2; i<10; i++)
+  for (i=2; i<8; i++)
     operands[i] = gen_reg_rtx (XFmode);
-  temp = standard_80387_constant_rtx (5); /* fldl2e */
-  emit_move_insn (operands[3], temp);
-  emit_move_insn (operands[8], CONST1_RTX (XFmode));  /* fld1 */
+
+  emit_move_insn (operands[4], CONST1_RTX (XFmode));  /* fld1 */
 })
 
-(define_expand "expxf2"
-  [(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)))
-   (set (match_dup 6) (unspec:XF [(match_dup 5)] UNSPEC_F2XM1))
-   (set (match_dup 8) (plus:XF (match_dup 6) (match_dup 7)))
+(define_expand "acossf2"
+  [(set (match_dup 2)
+       (float_extend:XF (match_operand:SF 1 "register_operand" "")))
+   (set (match_dup 3) (mult:XF (match_dup 2) (match_dup 2)))
+   (set (match_dup 5) (minus:XF (match_dup 4) (match_dup 3)))
+   (set (match_dup 6) (sqrt:XF (match_dup 5)))
+   (parallel [(set (match_dup 7)
+                  (unspec:XF [(match_dup 2) (match_dup 6)]
+                             UNSPEC_FPATAN))
+             (clobber (match_scratch:XF 8 ""))])
+   (set (match_operand:SF 0 "register_operand" "")
+       (float_truncate:SF (match_dup 7)))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  int i;
+
+  for (i=2; i<8; i++)
+    operands[i] = gen_reg_rtx (XFmode);
+
+  emit_move_insn (operands[4], CONST1_RTX (XFmode));  /* fld1 */
+})
+
+(define_expand "acosxf2"
+  [(set (match_dup 2)
+       (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" "")
-                  (unspec:XF [(match_dup 8) (match_dup 4)] UNSPEC_FSCALE))
-             (clobber (match_scratch:XF 5 ""))])]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387
+                  (unspec:XF [(match_dup 1) (match_dup 5)]
+                             UNSPEC_FPATAN))
+             (clobber (match_scratch:XF 6 ""))])]
+  "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
 {
-  rtx temp;
   int i;
 
-  for (i=2; i<9; i++)
+  for (i=2; i<6; i++)
     operands[i] = gen_reg_rtx (XFmode);
-  temp = standard_80387_constant_rtx (5); /* fldl2e */
-  emit_move_insn (operands[2], temp);
-  emit_move_insn (operands[7], CONST1_RTX (XFmode));  /* fld1 */
+
+  emit_move_insn (operands[3], CONST1_RTX (XFmode));  /* fld1 */
 })
 
-(define_expand "atansf2"
-  [(parallel [(set (match_operand:SF 0 "register_operand" "")
-                  (unspec:SF [(match_dup 2)
-                              (match_operand:SF 1 "register_operand" "")]
-                   UNSPEC_FPATAN))
-             (clobber (match_scratch:SF 3 ""))])]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387
+(define_insn "fyl2x_xf3"
+  [(set (match_operand:XF 0 "register_operand" "=f")
+        (unspec:XF [(match_operand:XF 2 "register_operand" "0")
+                   (match_operand:XF 1 "register_operand" "u")]
+                  UNSPEC_FYL2X))
+   (clobber (match_scratch:XF 3 "=1"))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+  "fyl2x"
+  [(set_attr "type" "fpspc")
+   (set_attr "mode" "XF")])
+
+(define_expand "logsf2"
+  [(set (match_dup 2)
+       (float_extend:XF (match_operand:SF 1 "register_operand" "")))
+   (parallel [(set (match_dup 4)
+                  (unspec:XF [(match_dup 2)
+                              (match_dup 3)] UNSPEC_FYL2X))
+             (clobber (match_scratch:XF 5 ""))])
+   (set (match_operand:SF 0 "register_operand" "")
+       (float_truncate:SF (match_dup 4)))]
+  "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
 {
-  operands[2] = gen_reg_rtx (SFmode);
-  emit_move_insn (operands[2], CONST1_RTX (SFmode));  /* fld1 */
+  rtx temp;
+
+  operands[2] = gen_reg_rtx (XFmode);
+  operands[3] = gen_reg_rtx (XFmode);
+  operands[4] = gen_reg_rtx (XFmode);
+
+  temp = standard_80387_constant_rtx (4); /* fldln2 */
+  emit_move_insn (operands[3], temp);
 })
 
-(define_expand "atandf2"
-  [(parallel [(set (match_operand:DF 0 "register_operand" "")
-                  (unspec:DF [(match_dup 2)
-                              (match_operand:DF 1 "register_operand" "")]
-                   UNSPEC_FPATAN))
-             (clobber (match_scratch:DF 3 ""))])]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387
+(define_expand "logdf2"
+  [(set (match_dup 2)
+       (float_extend:XF (match_operand:DF 1 "register_operand" "")))
+   (parallel [(set (match_dup 4)
+                  (unspec:XF [(match_dup 2)
+                              (match_dup 3)] UNSPEC_FYL2X))
+             (clobber (match_scratch:XF 5 ""))])
+   (set (match_operand:DF 0 "register_operand" "")
+       (float_truncate:DF (match_dup 4)))]
+  "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
 {
-  operands[2] = gen_reg_rtx (DFmode);
-  emit_move_insn (operands[2], CONST1_RTX (DFmode));  /* fld1 */
+  rtx temp;
+
+  operands[2] = gen_reg_rtx (XFmode);
+  operands[3] = gen_reg_rtx (XFmode);
+  operands[4] = gen_reg_rtx (XFmode);
+
+  temp = standard_80387_constant_rtx (4); /* fldln2 */
+  emit_move_insn (operands[3], temp);
 })
 
-(define_expand "atanxf2"
+(define_expand "logxf2"
   [(parallel [(set (match_operand:XF 0 "register_operand" "")
-                  (unspec:XF [(match_dup 2)
-                              (match_operand:XF 1 "register_operand" "")]
-                   UNSPEC_FPATAN))
+                  (unspec:XF [(match_operand:XF 1 "register_operand" "")
+                              (match_dup 2)] UNSPEC_FYL2X))
              (clobber (match_scratch:XF 3 ""))])]
-  "! TARGET_NO_FANCY_MATH_387 && TARGET_80387
+  "TARGET_USE_FANCY_MATH_387
    && flag_unsafe_math_optimizations"
 {
+  rtx temp;
+
   operands[2] = gen_reg_rtx (XFmode);
-  emit_move_insn (operands[2], CONST1_RTX (XFmode));  /* fld1 */
+  temp = standard_80387_constant_rtx (4); /* fldln2 */
+  emit_move_insn (operands[2], temp);
 })
-\f
-;; Block operation instructions
-
-(define_insn "cld"
- [(set (reg:SI 19) (const_int 0))]
- ""
- "cld"
-  [(set_attr "type" "cld")])
 
-(define_expand "movstrsi"
-  [(use (match_operand:BLK 0 "memory_operand" ""))
-   (use (match_operand:BLK 1 "memory_operand" ""))
-   (use (match_operand:SI 2 "nonmemory_operand" ""))
-   (use (match_operand:SI 3 "const_int_operand" ""))]
-  "! optimize_size"
+(define_expand "log10sf2"
+  [(set (match_dup 2)
+       (float_extend:XF (match_operand:SF 1 "register_operand" "")))
+   (parallel [(set (match_dup 4)
+                  (unspec:XF [(match_dup 2)
+                              (match_dup 3)] UNSPEC_FYL2X))
+             (clobber (match_scratch:XF 5 ""))])
+   (set (match_operand:SF 0 "register_operand" "")
+       (float_truncate:SF (match_dup 4)))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
 {
- if (ix86_expand_movstr (operands[0], operands[1], operands[2], operands[3]))
-   DONE;
- else
-   FAIL;
+  rtx temp;
+
+  operands[2] = gen_reg_rtx (XFmode);
+  operands[3] = gen_reg_rtx (XFmode);
+  operands[4] = gen_reg_rtx (XFmode);
+
+  temp = standard_80387_constant_rtx (3); /* fldlg2 */
+  emit_move_insn (operands[3], temp);
 })
 
-(define_expand "movstrdi"
-  [(use (match_operand:BLK 0 "memory_operand" ""))
-   (use (match_operand:BLK 1 "memory_operand" ""))
-   (use (match_operand:DI 2 "nonmemory_operand" ""))
-   (use (match_operand:DI 3 "const_int_operand" ""))]
-  "TARGET_64BIT"
+(define_expand "log10df2"
+  [(set (match_dup 2)
+       (float_extend:XF (match_operand:DF 1 "register_operand" "")))
+   (parallel [(set (match_dup 4)
+                  (unspec:XF [(match_dup 2)
+                              (match_dup 3)] UNSPEC_FYL2X))
+             (clobber (match_scratch:XF 5 ""))])
+   (set (match_operand:DF 0 "register_operand" "")
+       (float_truncate:DF (match_dup 4)))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
 {
- if (ix86_expand_movstr (operands[0], operands[1], operands[2], operands[3]))
-   DONE;
- else
-   FAIL;
+  rtx temp;
+
+  operands[2] = gen_reg_rtx (XFmode);
+  operands[3] = gen_reg_rtx (XFmode);
+  operands[4] = gen_reg_rtx (XFmode);
+
+  temp = standard_80387_constant_rtx (3); /* fldlg2 */
+  emit_move_insn (operands[3], temp);
 })
 
-;; Most CPUs don't like single string operations
-;; Handle this case here to simplify previous expander.
+(define_expand "log10xf2"
+  [(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 ""))])]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  rtx temp;
 
-(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))
-             (clobber (reg:CC 17))])
-   (parallel [(set (match_operand 2 "register_operand" "") (match_dup 6))
-             (clobber (reg:CC 17))])]
-  ""
+  operands[2] = gen_reg_rtx (XFmode);
+  temp = standard_80387_constant_rtx (3); /* fldlg2 */
+  emit_move_insn (operands[2], temp);
+})
+
+(define_expand "log2sf2"
+  [(set (match_dup 2)
+       (float_extend:XF (match_operand:SF 1 "register_operand" "")))
+   (parallel [(set (match_dup 4)
+                  (unspec:XF [(match_dup 2)
+                              (match_dup 3)] UNSPEC_FYL2X))
+             (clobber (match_scratch:XF 5 ""))])
+   (set (match_operand:SF 0 "register_operand" "")
+       (float_truncate:SF (match_dup 4)))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
 {
-  rtx adjust = GEN_INT (GET_MODE_SIZE (GET_MODE (operands[1])));
+  operands[2] = gen_reg_rtx (XFmode);
+  operands[3] = gen_reg_rtx (XFmode);
+  operands[4] = gen_reg_rtx (XFmode);
 
-  /* If .md ever supports :P for Pmode, these can be directly
-     in the pattern above.  */
-  operands[5] = gen_rtx_PLUS (Pmode, operands[0], adjust);
-  operands[6] = gen_rtx_PLUS (Pmode, operands[2], adjust);
+  emit_move_insn (operands[3], CONST1_RTX (XFmode));  /* fld1 */
+})
 
-  if (TARGET_SINGLE_STRINGOP || optimize_size)
-    {
-      emit_insn (gen_strmov_singleop (operands[0], operands[1],
-                                     operands[2], operands[3],
-                                     operands[5], operands[6]));
-      DONE;
-    }
+(define_expand "log2df2"
+  [(set (match_dup 2)
+       (float_extend:XF (match_operand:DF 1 "register_operand" "")))
+   (parallel [(set (match_dup 4)
+                  (unspec:XF [(match_dup 2)
+                              (match_dup 3)] UNSPEC_FYL2X))
+             (clobber (match_scratch:XF 5 ""))])
+   (set (match_operand:DF 0 "register_operand" "")
+       (float_truncate:DF (match_dup 4)))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  operands[2] = gen_reg_rtx (XFmode);
+  operands[3] = gen_reg_rtx (XFmode);
+  operands[4] = gen_reg_rtx (XFmode);
 
-  operands[4] = gen_reg_rtx (GET_MODE (operands[1]));
+  emit_move_insn (operands[3], CONST1_RTX (XFmode));  /* fld1 */
 })
 
-(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 "" ""))
-             (use (reg:SI 19))])]
-  "TARGET_SINGLE_STRINGOP || optimize_size"
-  "")
+(define_expand "log2xf2"
+  [(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 ""))])]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  operands[2] = gen_reg_rtx (XFmode);
+  emit_move_insn (operands[2], CONST1_RTX (XFmode));  /* fld1 */
+})
 
-(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)))
-   (use (reg:SI 19))]
-  "TARGET_64BIT && (TARGET_SINGLE_STRINGOP || optimize_size)"
-  "movsq"
-  [(set_attr "type" "str")
-   (set_attr "mode" "DI")
-   (set_attr "memory" "both")])
+(define_insn "fyl2xp1_xf3"
+  [(set (match_operand:XF 0 "register_operand" "=f")
+        (unspec:XF [(match_operand:XF 2 "register_operand" "0")
+                   (match_operand:XF 1 "register_operand" "u")]
+                  UNSPEC_FYL2XP1))
+   (clobber (match_scratch:XF 3 "=1"))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+  "fyl2xp1"
+  [(set_attr "type" "fpspc")
+   (set_attr "mode" "XF")])
 
-(define_insn "*strmovsi_1"
-  [(set (mem:SI (match_operand:SI 2 "register_operand" "0"))
-       (mem:SI (match_operand:SI 3 "register_operand" "1")))
-   (set (match_operand:SI 0 "register_operand" "=D")
-       (plus:SI (match_dup 2)
-                (const_int 4)))
-   (set (match_operand:SI 1 "register_operand" "=S")
-       (plus:SI (match_dup 3)
-                (const_int 4)))
-   (use (reg:SI 19))]
-  "!TARGET_64BIT && (TARGET_SINGLE_STRINGOP || optimize_size)"
-  "{movsl|movsd}"
-  [(set_attr "type" "str")
-   (set_attr "mode" "SI")
-   (set_attr "memory" "both")])
+(define_expand "log1psf2"
+  [(use (match_operand:SF 0 "register_operand" ""))
+   (use (match_operand:SF 1 "register_operand" ""))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  rtx op0 = gen_reg_rtx (XFmode);
+  rtx op1 = gen_reg_rtx (XFmode);
 
-(define_insn "*strmovsi_rex_1"
-  [(set (mem:SI (match_operand:DI 2 "register_operand" "0"))
-       (mem:SI (match_operand:DI 3 "register_operand" "1")))
-   (set (match_operand:DI 0 "register_operand" "=D")
-       (plus:DI (match_dup 2)
-                (const_int 4)))
-   (set (match_operand:DI 1 "register_operand" "=S")
-       (plus:DI (match_dup 3)
-                (const_int 4)))
-   (use (reg:SI 19))]
-  "TARGET_64BIT && (TARGET_SINGLE_STRINGOP || optimize_size)"
-  "{movsl|movsd}"
-  [(set_attr "type" "str")
-   (set_attr "mode" "SI")
-   (set_attr "memory" "both")])
-
-(define_insn "*strmovhi_1"
-  [(set (mem:HI (match_operand:SI 2 "register_operand" "0"))
-       (mem:HI (match_operand:SI 3 "register_operand" "1")))
-   (set (match_operand:SI 0 "register_operand" "=D")
-       (plus:SI (match_dup 2)
-                (const_int 2)))
-   (set (match_operand:SI 1 "register_operand" "=S")
-       (plus:SI (match_dup 3)
-                (const_int 2)))
-   (use (reg:SI 19))]
-  "!TARGET_64BIT && (TARGET_SINGLE_STRINGOP || optimize_size)"
-  "movsw"
-  [(set_attr "type" "str")
-   (set_attr "memory" "both")
-   (set_attr "mode" "HI")])
-
-(define_insn "*strmovhi_rex_1"
-  [(set (mem:HI (match_operand:DI 2 "register_operand" "0"))
-       (mem:HI (match_operand:DI 3 "register_operand" "1")))
-   (set (match_operand:DI 0 "register_operand" "=D")
-       (plus:DI (match_dup 2)
-                (const_int 2)))
-   (set (match_operand:DI 1 "register_operand" "=S")
-       (plus:DI (match_dup 3)
-                (const_int 2)))
-   (use (reg:SI 19))]
-  "TARGET_64BIT && (TARGET_SINGLE_STRINGOP || optimize_size)"
-  "movsw"
-  [(set_attr "type" "str")
-   (set_attr "memory" "both")
-   (set_attr "mode" "HI")])
-
-(define_insn "*strmovqi_1"
-  [(set (mem:QI (match_operand:SI 2 "register_operand" "0"))
-       (mem:QI (match_operand:SI 3 "register_operand" "1")))
-   (set (match_operand:SI 0 "register_operand" "=D")
-       (plus:SI (match_dup 2)
-                (const_int 1)))
-   (set (match_operand:SI 1 "register_operand" "=S")
-       (plus:SI (match_dup 3)
-                (const_int 1)))
-   (use (reg:SI 19))]
-  "!TARGET_64BIT && (TARGET_SINGLE_STRINGOP || optimize_size)"
-  "movsb"
-  [(set_attr "type" "str")
-   (set_attr "memory" "both")
-   (set_attr "mode" "QI")])
-
-(define_insn "*strmovqi_rex_1"
-  [(set (mem:QI (match_operand:DI 2 "register_operand" "0"))
-       (mem:QI (match_operand:DI 3 "register_operand" "1")))
-   (set (match_operand:DI 0 "register_operand" "=D")
-       (plus:DI (match_dup 2)
-                (const_int 1)))
-   (set (match_operand:DI 1 "register_operand" "=S")
-       (plus:DI (match_dup 3)
-                (const_int 1)))
-   (use (reg:SI 19))]
-  "TARGET_64BIT && (TARGET_SINGLE_STRINGOP || optimize_size)"
-  "movsb"
-  [(set_attr "type" "str")
-   (set_attr "memory" "both")
-   (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" ""))
-             (use (match_dup 4))
-             (use (reg:SI 19))])]
-  ""
-  "")
-
-(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 (mem:BLK (match_dup 3))
-       (mem:BLK (match_dup 4)))
-   (use (match_dup 5))
-   (use (reg:SI 19))]
-  "TARGET_64BIT"
-  "{rep\;movsq|rep movsq}"
-  [(set_attr "type" "str")
-   (set_attr "prefix_rep" "1")
-   (set_attr "memory" "both")
-   (set_attr "mode" "DI")])
+  emit_insn (gen_extendsfxf2 (op1, operands[1]));
+  ix86_emit_i387_log1p (op0, op1);
+  emit_insn (gen_truncxfsf2_i387_noop (operands[0], op0));
+  DONE;
+})
 
-(define_insn "*rep_movsi"
-  [(set (match_operand:SI 2 "register_operand" "=c") (const_int 0))
-   (set (match_operand:SI 0 "register_operand" "=D") 
-        (plus:SI (ashift:SI (match_operand:SI 5 "register_operand" "2")
-                           (const_int 2))
-                (match_operand:SI 3 "register_operand" "0")))
-   (set (match_operand:SI 1 "register_operand" "=S") 
-        (plus:SI (ashift:SI (match_dup 5) (const_int 2))
-                (match_operand:SI 4 "register_operand" "1")))
-   (set (mem:BLK (match_dup 3))
-       (mem:BLK (match_dup 4)))
-   (use (match_dup 5))
-   (use (reg:SI 19))]
-  "!TARGET_64BIT"
-  "{rep\;movsl|rep movsd}"
-  [(set_attr "type" "str")
-   (set_attr "prefix_rep" "1")
-   (set_attr "memory" "both")
-   (set_attr "mode" "SI")])
+(define_expand "log1pdf2"
+  [(use (match_operand:DF 0 "register_operand" ""))
+   (use (match_operand:DF 1 "register_operand" ""))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  rtx op0 = gen_reg_rtx (XFmode);
+  rtx op1 = gen_reg_rtx (XFmode);
 
-(define_insn "*rep_movsi_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 2))
-                (match_operand:DI 3 "register_operand" "0")))
-   (set (match_operand:DI 1 "register_operand" "=S") 
-        (plus:DI (ashift:DI (match_dup 5) (const_int 2))
-                (match_operand:DI 4 "register_operand" "1")))
-   (set (mem:BLK (match_dup 3))
-       (mem:BLK (match_dup 4)))
-   (use (match_dup 5))
-   (use (reg:SI 19))]
-  "TARGET_64BIT"
-  "{rep\;movsl|rep movsd}"
-  [(set_attr "type" "str")
-   (set_attr "prefix_rep" "1")
-   (set_attr "memory" "both")
-   (set_attr "mode" "SI")])
+  emit_insn (gen_extenddfxf2 (op1, operands[1]));
+  ix86_emit_i387_log1p (op0, op1);
+  emit_insn (gen_truncxfdf2_i387_noop (operands[0], op0));
+  DONE;
+})
 
-(define_insn "*rep_movqi"
-  [(set (match_operand:SI 2 "register_operand" "=c") (const_int 0))
-   (set (match_operand:SI 0 "register_operand" "=D") 
-        (plus:SI (match_operand:SI 3 "register_operand" "0")
-                (match_operand:SI 5 "register_operand" "2")))
-   (set (match_operand:SI 1 "register_operand" "=S") 
-        (plus:SI (match_operand:SI 4 "register_operand" "1") (match_dup 5)))
-   (set (mem:BLK (match_dup 3))
-       (mem:BLK (match_dup 4)))
-   (use (match_dup 5))
-   (use (reg:SI 19))]
-  "!TARGET_64BIT"
-  "{rep\;movsb|rep movsb}"
-  [(set_attr "type" "str")
-   (set_attr "prefix_rep" "1")
-   (set_attr "memory" "both")
-   (set_attr "mode" "SI")])
+(define_expand "log1pxf2"
+  [(use (match_operand:XF 0 "register_operand" ""))
+   (use (match_operand:XF 1 "register_operand" ""))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  ix86_emit_i387_log1p (operands[0], operands[1]);
+  DONE;
+})
 
-(define_insn "*rep_movqi_rex64"
-  [(set (match_operand:DI 2 "register_operand" "=c") (const_int 0))
-   (set (match_operand:DI 0 "register_operand" "=D") 
-        (plus:DI (match_operand:DI 3 "register_operand" "0")
-                (match_operand:DI 5 "register_operand" "2")))
-   (set (match_operand:DI 1 "register_operand" "=S") 
-        (plus:DI (match_operand:DI 4 "register_operand" "1") (match_dup 5)))
-   (set (mem:BLK (match_dup 3))
-       (mem:BLK (match_dup 4)))
-   (use (match_dup 5))
-   (use (reg:SI 19))]
-  "TARGET_64BIT"
-  "{rep\;movsb|rep movsb}"
-  [(set_attr "type" "str")
-   (set_attr "prefix_rep" "1")
-   (set_attr "memory" "both")
-   (set_attr "mode" "SI")])
+(define_insn "*fxtractxf3"
+  [(set (match_operand:XF 0 "register_operand" "=f")
+       (unspec:XF [(match_operand:XF 2 "register_operand" "0")]
+                  UNSPEC_XTRACT_FRACT))
+   (set (match_operand:XF 1 "register_operand" "=u")
+        (unspec:XF [(match_dup 2)] UNSPEC_XTRACT_EXP))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+  "fxtract"
+  [(set_attr "type" "fpspc")
+   (set_attr "mode" "XF")])
 
-(define_expand "clrstrsi"
-   [(use (match_operand:BLK 0 "memory_operand" ""))
-    (use (match_operand:SI 1 "nonmemory_operand" ""))
-    (use (match_operand 2 "const_int_operand" ""))]
-  ""
+(define_expand "logbsf2"
+  [(set (match_dup 2)
+       (float_extend:XF (match_operand:SF 1 "register_operand" "")))
+   (parallel [(set (match_dup 3)
+                  (unspec:XF [(match_dup 2)] UNSPEC_XTRACT_FRACT))
+             (set (match_dup 4)
+                  (unspec:XF [(match_dup 2)] UNSPEC_XTRACT_EXP))])
+   (set (match_operand:SF 0 "register_operand" "")
+       (float_truncate:SF (match_dup 4)))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
 {
- if (ix86_expand_clrstr (operands[0], operands[1], operands[2]))
-   DONE;
- else
-   FAIL;
+  operands[2] = gen_reg_rtx (XFmode);
+  operands[3] = gen_reg_rtx (XFmode);
+  operands[4] = gen_reg_rtx (XFmode);
 })
 
-(define_expand "clrstrdi"
-   [(use (match_operand:BLK 0 "memory_operand" ""))
-    (use (match_operand:DI 1 "nonmemory_operand" ""))
-    (use (match_operand 2 "const_int_operand" ""))]
-  "TARGET_64BIT"
+(define_expand "logbdf2"
+  [(set (match_dup 2)
+       (float_extend:XF (match_operand:DF 1 "register_operand" "")))
+   (parallel [(set (match_dup 3)
+                  (unspec:XF [(match_dup 2)] UNSPEC_XTRACT_FRACT))
+             (set (match_dup 4)
+                  (unspec:XF [(match_dup 2)] UNSPEC_XTRACT_EXP))])
+   (set (match_operand:DF 0 "register_operand" "")
+       (float_truncate:DF (match_dup 4)))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
 {
- if (ix86_expand_clrstr (operands[0], operands[1], operands[2]))
-   DONE;
- else
-   FAIL;
+  operands[2] = gen_reg_rtx (XFmode);
+  operands[3] = gen_reg_rtx (XFmode);
+  operands[4] = gen_reg_rtx (XFmode);
 })
 
-;; Most CPUs don't like single string operations
-;; 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" "")
-                  (match_dup 3))
-             (clobber (reg:CC 17))])]
-  ""
+(define_expand "logbxf2"
+  [(parallel [(set (match_dup 2)
+                  (unspec:XF [(match_operand:XF 1 "register_operand" "")]
+                             UNSPEC_XTRACT_FRACT))
+             (set (match_operand:XF 0 "register_operand" "")
+                  (unspec:XF [(match_dup 1)] UNSPEC_XTRACT_EXP))])]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
 {
-  if (GET_MODE (operands[1]) != GET_MODE (operands[2]))
-    operands[1] = adjust_address_nv (operands[1], GET_MODE (operands[2]), 0);
+  operands[2] = gen_reg_rtx (XFmode);
+})
 
-  /* If .md ever supports :P for Pmode, this can be directly
-     in the pattern above.  */
-  operands[3] = gen_rtx_PLUS (Pmode, operands[0],
-                             GEN_INT (GET_MODE_SIZE (GET_MODE
-                                                     (operands[2]))));
-  if (TARGET_SINGLE_STRINGOP || optimize_size)
-    {
-      emit_insn (gen_strset_singleop (operands[0], operands[1], operands[2],
-                                     operands[3]));
-      DONE;
-    }
+(define_expand "ilogbsi2"
+  [(parallel [(set (match_dup 2)
+                  (unspec:XF [(match_operand:XF 1 "register_operand" "")]
+                             UNSPEC_XTRACT_FRACT))
+             (set (match_operand:XF 3 "register_operand" "")
+                  (unspec:XF [(match_dup 1)] UNSPEC_XTRACT_EXP))])
+   (parallel [(set (match_operand:SI 0 "register_operand" "")
+                  (fix:SI (match_dup 3)))
+             (clobber (reg:CC FLAGS_REG))])]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  operands[2] = gen_reg_rtx (XFmode);
+  operands[3] = gen_reg_rtx (XFmode);
 })
 
-(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 "" ""))
-             (use (reg:SI 19))])]
-  "TARGET_SINGLE_STRINGOP || optimize_size"
-  "")
+(define_insn "*f2xm1xf2"
+  [(set (match_operand:XF 0 "register_operand" "=f")
+       (unspec:XF [(match_operand:XF 1 "register_operand" "0")]
+        UNSPEC_F2XM1))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+  "f2xm1"
+  [(set_attr "type" "fpspc")
+   (set_attr "mode" "XF")])
 
-(define_insn "*strsetdi_rex_1"
-  [(set (mem:SI (match_operand:DI 1 "register_operand" "0"))
-       (match_operand:SI 2 "register_operand" "a"))
-   (set (match_operand:DI 0 "register_operand" "=D")
-       (plus:DI (match_dup 1)
-                (const_int 8)))
-   (use (reg:SI 19))]
-  "TARGET_64BIT && (TARGET_SINGLE_STRINGOP || optimize_size)"
-  "stosq"
-  [(set_attr "type" "str")
-   (set_attr "memory" "store")
-   (set_attr "mode" "DI")])
+(define_insn "*fscalexf4"
+  [(set (match_operand:XF 0 "register_operand" "=f")
+       (unspec:XF [(match_operand:XF 2 "register_operand" "0")
+                   (match_operand:XF 3 "register_operand" "1")]
+                  UNSPEC_FSCALE_FRACT))
+   (set (match_operand:XF 1 "register_operand" "=u")
+       (unspec:XF [(match_dup 2) (match_dup 3)]
+                  UNSPEC_FSCALE_EXP))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+  "fscale"
+  [(set_attr "type" "fpspc")
+   (set_attr "mode" "XF")])
 
-(define_insn "*strsetsi_1"
-  [(set (mem:SI (match_operand:SI 1 "register_operand" "0"))
-       (match_operand:SI 2 "register_operand" "a"))
-   (set (match_operand:SI 0 "register_operand" "=D")
-       (plus:SI (match_dup 1)
-                (const_int 4)))
-   (use (reg:SI 19))]
-  "!TARGET_64BIT && (TARGET_SINGLE_STRINGOP || optimize_size)"
-  "{stosl|stosd}"
-  [(set_attr "type" "str")
-   (set_attr "memory" "store")
-   (set_attr "mode" "SI")])
+(define_expand "expsf2"
+  [(set (match_dup 2)
+       (float_extend:XF (match_operand:SF 1 "register_operand" "")))
+   (set (match_dup 4) (mult:XF (match_dup 2) (match_dup 3)))
+   (set (match_dup 5) (unspec:XF [(match_dup 4)] UNSPEC_FRNDINT))
+   (set (match_dup 6) (minus:XF (match_dup 4) (match_dup 5)))
+   (set (match_dup 7) (unspec:XF [(match_dup 6)] UNSPEC_F2XM1))
+   (set (match_dup 9) (plus:XF (match_dup 7) (match_dup 8)))
+   (parallel [(set (match_dup 10)
+                  (unspec:XF [(match_dup 9) (match_dup 5)]
+                             UNSPEC_FSCALE_FRACT))
+             (set (match_dup 11)
+                  (unspec:XF [(match_dup 9) (match_dup 5)]
+                             UNSPEC_FSCALE_EXP))])
+   (set (match_operand:SF 0 "register_operand" "")
+       (float_truncate:SF (match_dup 10)))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  rtx temp;
+  int i;
 
-(define_insn "*strsetsi_rex_1"
-  [(set (mem:SI (match_operand:DI 1 "register_operand" "0"))
-       (match_operand:SI 2 "register_operand" "a"))
-   (set (match_operand:DI 0 "register_operand" "=D")
-       (plus:DI (match_dup 1)
-                (const_int 4)))
-   (use (reg:SI 19))]
-  "TARGET_64BIT && (TARGET_SINGLE_STRINGOP || optimize_size)"
-  "{stosl|stosd}"
-  [(set_attr "type" "str")
-   (set_attr "memory" "store")
-   (set_attr "mode" "SI")])
+  for (i=2; i<12; i++)
+    operands[i] = gen_reg_rtx (XFmode);
+  temp = standard_80387_constant_rtx (5); /* fldl2e */
+  emit_move_insn (operands[3], temp);
+  emit_move_insn (operands[8], CONST1_RTX (XFmode));  /* fld1 */
+})
 
-(define_insn "*strsethi_1"
-  [(set (mem:HI (match_operand:SI 1 "register_operand" "0"))
-       (match_operand:HI 2 "register_operand" "a"))
-   (set (match_operand:SI 0 "register_operand" "=D")
-       (plus:SI (match_dup 1)
-                (const_int 2)))
-   (use (reg:SI 19))]
-  "!TARGET_64BIT && (TARGET_SINGLE_STRINGOP || optimize_size)"
-  "stosw"
-  [(set_attr "type" "str")
-   (set_attr "memory" "store")
-   (set_attr "mode" "HI")])
+(define_expand "expdf2"
+  [(set (match_dup 2)
+       (float_extend:XF (match_operand:DF 1 "register_operand" "")))
+   (set (match_dup 4) (mult:XF (match_dup 2) (match_dup 3)))
+   (set (match_dup 5) (unspec:XF [(match_dup 4)] UNSPEC_FRNDINT))
+   (set (match_dup 6) (minus:XF (match_dup 4) (match_dup 5)))
+   (set (match_dup 7) (unspec:XF [(match_dup 6)] UNSPEC_F2XM1))
+   (set (match_dup 9) (plus:XF (match_dup 7) (match_dup 8)))
+   (parallel [(set (match_dup 10)
+                  (unspec:XF [(match_dup 9) (match_dup 5)]
+                             UNSPEC_FSCALE_FRACT))
+             (set (match_dup 11)
+                  (unspec:XF [(match_dup 9) (match_dup 5)]
+                             UNSPEC_FSCALE_EXP))])
+   (set (match_operand:DF 0 "register_operand" "")
+       (float_truncate:DF (match_dup 10)))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  rtx temp;
+  int i;
 
-(define_insn "*strsethi_rex_1"
-  [(set (mem:HI (match_operand:DI 1 "register_operand" "0"))
-       (match_operand:HI 2 "register_operand" "a"))
-   (set (match_operand:DI 0 "register_operand" "=D")
-       (plus:DI (match_dup 1)
-                (const_int 2)))
-   (use (reg:SI 19))]
-  "TARGET_64BIT && (TARGET_SINGLE_STRINGOP || optimize_size)"
-  "stosw"
-  [(set_attr "type" "str")
-   (set_attr "memory" "store")
-   (set_attr "mode" "HI")])
+  for (i=2; i<12; i++)
+    operands[i] = gen_reg_rtx (XFmode);
+  temp = standard_80387_constant_rtx (5); /* fldl2e */
+  emit_move_insn (operands[3], temp);
+  emit_move_insn (operands[8], CONST1_RTX (XFmode));  /* fld1 */
+})
 
-(define_insn "*strsetqi_1"
-  [(set (mem:QI (match_operand:SI 1 "register_operand" "0"))
-       (match_operand:QI 2 "register_operand" "a"))
-   (set (match_operand:SI 0 "register_operand" "=D")
-       (plus:SI (match_dup 1)
-                (const_int 1)))
-   (use (reg:SI 19))]
-  "!TARGET_64BIT && (TARGET_SINGLE_STRINGOP || optimize_size)"
-  "stosb"
-  [(set_attr "type" "str")
-   (set_attr "memory" "store")
-   (set_attr "mode" "QI")])
+(define_expand "expxf2"
+  [(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)))
+   (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" "")
+                  (unspec:XF [(match_dup 8) (match_dup 4)]
+                             UNSPEC_FSCALE_FRACT))
+             (set (match_dup 9)
+                  (unspec:XF [(match_dup 8) (match_dup 4)]
+                             UNSPEC_FSCALE_EXP))])]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  rtx temp;
+  int i;
 
-(define_insn "*strsetqi_rex_1"
-  [(set (mem:QI (match_operand:DI 1 "register_operand" "0"))
-       (match_operand:QI 2 "register_operand" "a"))
-   (set (match_operand:DI 0 "register_operand" "=D")
-       (plus:DI (match_dup 1)
-                (const_int 1)))
-   (use (reg:SI 19))]
-  "TARGET_64BIT && (TARGET_SINGLE_STRINGOP || optimize_size)"
-  "stosb"
-  [(set_attr "type" "str")
-   (set_attr "memory" "store")
-   (set_attr "mode" "QI")])
+  for (i=2; i<10; i++)
+    operands[i] = gen_reg_rtx (XFmode);
+  temp = standard_80387_constant_rtx (5); /* fldl2e */
+  emit_move_insn (operands[2], temp);
+  emit_move_insn (operands[7], CONST1_RTX (XFmode));  /* fld1 */
+})
 
-(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" ""))
-             (use (match_dup 1))
-             (use (reg:SI 19))])]
-  ""
-  "")
+(define_expand "exp10sf2"
+  [(set (match_dup 2)
+       (float_extend:XF (match_operand:SF 1 "register_operand" "")))
+   (set (match_dup 4) (mult:XF (match_dup 2) (match_dup 3)))
+   (set (match_dup 5) (unspec:XF [(match_dup 4)] UNSPEC_FRNDINT))
+   (set (match_dup 6) (minus:XF (match_dup 4) (match_dup 5)))
+   (set (match_dup 7) (unspec:XF [(match_dup 6)] UNSPEC_F2XM1))
+   (set (match_dup 9) (plus:XF (match_dup 7) (match_dup 8)))
+   (parallel [(set (match_dup 10)
+                  (unspec:XF [(match_dup 9) (match_dup 5)]
+                             UNSPEC_FSCALE_FRACT))
+             (set (match_dup 11)
+                  (unspec:XF [(match_dup 9) (match_dup 5)]
+                             UNSPEC_FSCALE_EXP))])
+   (set (match_operand:SF 0 "register_operand" "")
+       (float_truncate:SF (match_dup 10)))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  rtx temp;
+  int i;
 
-(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 (mem:BLK (match_dup 3))
-       (const_int 0))
-   (use (match_operand:DI 2 "register_operand" "a"))
-   (use (match_dup 4))
-   (use (reg:SI 19))]
-  "TARGET_64BIT"
-  "{rep\;stosq|rep stosq}"
-  [(set_attr "type" "str")
-   (set_attr "prefix_rep" "1")
-   (set_attr "memory" "store")
-   (set_attr "mode" "DI")])
+  for (i=2; i<12; i++)
+    operands[i] = gen_reg_rtx (XFmode);
+  temp = standard_80387_constant_rtx (6); /* fldl2t */
+  emit_move_insn (operands[3], temp);
+  emit_move_insn (operands[8], CONST1_RTX (XFmode));  /* fld1 */
+})
 
-(define_insn "*rep_stossi"
-  [(set (match_operand:SI 1 "register_operand" "=c") (const_int 0))
-   (set (match_operand:SI 0 "register_operand" "=D") 
-        (plus:SI (ashift:SI (match_operand:SI 4 "register_operand" "1")
-                           (const_int 2))
-                (match_operand:SI 3 "register_operand" "0")))
-   (set (mem:BLK (match_dup 3))
-       (const_int 0))
-   (use (match_operand:SI 2 "register_operand" "a"))
-   (use (match_dup 4))
-   (use (reg:SI 19))]
-  "!TARGET_64BIT"
-  "{rep\;stosl|rep stosd}"
-  [(set_attr "type" "str")
-   (set_attr "prefix_rep" "1")
-   (set_attr "memory" "store")
-   (set_attr "mode" "SI")])
+(define_expand "exp10df2"
+  [(set (match_dup 2)
+       (float_extend:XF (match_operand:DF 1 "register_operand" "")))
+   (set (match_dup 4) (mult:XF (match_dup 2) (match_dup 3)))
+   (set (match_dup 5) (unspec:XF [(match_dup 4)] UNSPEC_FRNDINT))
+   (set (match_dup 6) (minus:XF (match_dup 4) (match_dup 5)))
+   (set (match_dup 7) (unspec:XF [(match_dup 6)] UNSPEC_F2XM1))
+   (set (match_dup 9) (plus:XF (match_dup 7) (match_dup 8)))
+   (parallel [(set (match_dup 10)
+                  (unspec:XF [(match_dup 9) (match_dup 5)]
+                             UNSPEC_FSCALE_FRACT))
+             (set (match_dup 11)
+                  (unspec:XF [(match_dup 9) (match_dup 5)]
+                             UNSPEC_FSCALE_EXP))])
+   (set (match_operand:DF 0 "register_operand" "")
+       (float_truncate:DF (match_dup 10)))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  rtx temp;
+  int i;
 
-(define_insn "*rep_stossi_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 2))
-                (match_operand:DI 3 "register_operand" "0")))
-   (set (mem:BLK (match_dup 3))
-       (const_int 0))
-   (use (match_operand:SI 2 "register_operand" "a"))
-   (use (match_dup 4))
-   (use (reg:SI 19))]
-  "TARGET_64BIT"
-  "{rep\;stosl|rep stosd}"
-  [(set_attr "type" "str")
-   (set_attr "prefix_rep" "1")
-   (set_attr "memory" "store")
-   (set_attr "mode" "SI")])
+  for (i=2; i<12; i++)
+    operands[i] = gen_reg_rtx (XFmode);
+  temp = standard_80387_constant_rtx (6); /* fldl2t */
+  emit_move_insn (operands[3], temp);
+  emit_move_insn (operands[8], CONST1_RTX (XFmode));  /* fld1 */
+})
 
-(define_insn "*rep_stosqi"
-  [(set (match_operand:SI 1 "register_operand" "=c") (const_int 0))
-   (set (match_operand:SI 0 "register_operand" "=D") 
-        (plus:SI (match_operand:SI 3 "register_operand" "0")
-                (match_operand:SI 4 "register_operand" "1")))
-   (set (mem:BLK (match_dup 3))
-       (const_int 0))
-   (use (match_operand:QI 2 "register_operand" "a"))
-   (use (match_dup 4))
-   (use (reg:SI 19))]
-  "!TARGET_64BIT"
-  "{rep\;stosb|rep stosb}"
-  [(set_attr "type" "str")
-   (set_attr "prefix_rep" "1")
-   (set_attr "memory" "store")
-   (set_attr "mode" "QI")])
+(define_expand "exp10xf2"
+  [(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)))
+   (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" "")
+                  (unspec:XF [(match_dup 8) (match_dup 4)]
+                             UNSPEC_FSCALE_FRACT))
+             (set (match_dup 9)
+                  (unspec:XF [(match_dup 8) (match_dup 4)]
+                             UNSPEC_FSCALE_EXP))])]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  rtx temp;
+  int i;
 
-(define_insn "*rep_stosqi_rex64"
-  [(set (match_operand:DI 1 "register_operand" "=c") (const_int 0))
-   (set (match_operand:DI 0 "register_operand" "=D") 
-        (plus:DI (match_operand:DI 3 "register_operand" "0")
-                (match_operand:DI 4 "register_operand" "1")))
-   (set (mem:BLK (match_dup 3))
-       (const_int 0))
-   (use (match_operand:QI 2 "register_operand" "a"))
-   (use (match_dup 4))
-   (use (reg:SI 19))]
-  "TARGET_64BIT"
-  "{rep\;stosb|rep stosb}"
-  [(set_attr "type" "str")
-   (set_attr "prefix_rep" "1")
-   (set_attr "memory" "store")
-   (set_attr "mode" "QI")])
+  for (i=2; i<10; i++)
+    operands[i] = gen_reg_rtx (XFmode);
+  temp = standard_80387_constant_rtx (6); /* fldl2t */
+  emit_move_insn (operands[2], temp);
+  emit_move_insn (operands[7], CONST1_RTX (XFmode));  /* fld1 */
+})
 
-(define_expand "cmpstrsi"
-  [(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" ""))]
-  "! optimize_size || TARGET_INLINE_ALL_STRINGOPS"
+(define_expand "exp2sf2"
+  [(set (match_dup 2)
+       (float_extend:XF (match_operand:SF 1 "register_operand" "")))
+   (set (match_dup 3) (unspec:XF [(match_dup 2)] UNSPEC_FRNDINT))
+   (set (match_dup 4) (minus:XF (match_dup 2) (match_dup 3)))
+   (set (match_dup 5) (unspec:XF [(match_dup 4)] UNSPEC_F2XM1))
+   (set (match_dup 7) (plus:XF (match_dup 5) (match_dup 6)))
+   (parallel [(set (match_dup 8)
+                  (unspec:XF [(match_dup 7) (match_dup 3)]
+                             UNSPEC_FSCALE_FRACT))
+             (set (match_dup 9)
+                  (unspec:XF [(match_dup 7) (match_dup 3)]
+                             UNSPEC_FSCALE_EXP))])
+   (set (match_operand:SF 0 "register_operand" "")
+       (float_truncate:SF (match_dup 8)))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
 {
-  rtx addr1, addr2, out, outlow, count, countreg, align;
+  int i;
 
-  /* Can't use this if the user has appropriated esi or edi.  */
-  if (global_regs[4] || global_regs[5])
-    FAIL;
+  for (i=2; i<10; i++)
+    operands[i] = gen_reg_rtx (XFmode);
+  emit_move_insn (operands[6], CONST1_RTX (XFmode));  /* fld1 */
+})
 
-  out = operands[0];
-  if (GET_CODE (out) != REG)
-    out = gen_reg_rtx (SImode);
+(define_expand "exp2df2"
+  [(set (match_dup 2)
+       (float_extend:XF (match_operand:DF 1 "register_operand" "")))
+   (set (match_dup 3) (unspec:XF [(match_dup 2)] UNSPEC_FRNDINT))
+   (set (match_dup 4) (minus:XF (match_dup 2) (match_dup 3)))
+   (set (match_dup 5) (unspec:XF [(match_dup 4)] UNSPEC_F2XM1))
+   (set (match_dup 7) (plus:XF (match_dup 5) (match_dup 6)))
+   (parallel [(set (match_dup 8)
+                  (unspec:XF [(match_dup 7) (match_dup 3)]
+                             UNSPEC_FSCALE_FRACT))
+             (set (match_dup 9)
+                  (unspec:XF [(match_dup 7) (match_dup 3)]
+                             UNSPEC_FSCALE_EXP))])
+   (set (match_operand:DF 0 "register_operand" "")
+       (float_truncate:DF (match_dup 8)))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  int i;
 
-  addr1 = copy_to_mode_reg (Pmode, XEXP (operands[1], 0));
-  addr2 = copy_to_mode_reg (Pmode, 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))
-    operands[2] = replace_equiv_address_nv (operands[2], addr2);
+  for (i=2; i<10; i++)
+    operands[i] = gen_reg_rtx (XFmode);
+  emit_move_insn (operands[6], CONST1_RTX (XFmode));  /* fld1 */
+})
 
-  count = operands[3];
-  countreg = ix86_zero_extend_to_Pmode (count);
+(define_expand "exp2xf2"
+  [(set (match_dup 2) (match_operand:XF 1 "register_operand" ""))
+   (set (match_dup 3) (unspec:XF [(match_dup 2)] UNSPEC_FRNDINT))
+   (set (match_dup 4) (minus:XF (match_dup 2) (match_dup 3)))
+   (set (match_dup 5) (unspec:XF [(match_dup 4)] UNSPEC_F2XM1))
+   (set (match_dup 7) (plus:XF (match_dup 5) (match_dup 6)))
+   (parallel [(set (match_operand:XF 0 "register_operand" "")
+                  (unspec:XF [(match_dup 7) (match_dup 3)]
+                             UNSPEC_FSCALE_FRACT))
+             (set (match_dup 8)
+                  (unspec:XF [(match_dup 7) (match_dup 3)]
+                             UNSPEC_FSCALE_EXP))])]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  int i;
 
-  /* %%% Iff we are testing strict equality, we can use known alignment
-     to good advantage.  This may be possible with combine, particularly
-     once cc0 is dead.  */
-  align = operands[4];
+  for (i=2; i<9; i++)
+    operands[i] = gen_reg_rtx (XFmode);
+  emit_move_insn (operands[6], CONST1_RTX (XFmode));  /* fld1 */
+})
 
-  emit_insn (gen_cld ());
-  if (GET_CODE (count) == CONST_INT)
-    {
-      if (INTVAL (count) == 0)
-       {
-         emit_move_insn (operands[0], const0_rtx);
-         DONE;
-       }
-      emit_insn (gen_cmpstrqi_nz_1 (addr1, addr2, countreg, align,
-                                   operands[1], operands[2]));
-    }
-  else
-    {
-      if (TARGET_64BIT)
-       emit_insn (gen_cmpdi_1_rex64 (countreg, countreg));
-      else
-       emit_insn (gen_cmpsi_1 (countreg, countreg));
-      emit_insn (gen_cmpstrqi_1 (addr1, addr2, countreg, align,
-                                operands[1], operands[2]));
-    }
+(define_expand "expm1df2"
+  [(set (match_dup 2)
+       (float_extend:XF (match_operand:DF 1 "register_operand" "")))
+   (set (match_dup 4) (mult:XF (match_dup 2) (match_dup 3)))
+   (set (match_dup 5) (unspec:XF [(match_dup 4)] UNSPEC_FRNDINT))
+   (set (match_dup 6) (minus:XF (match_dup 4) (match_dup 5)))
+   (set (match_dup 7) (unspec:XF [(match_dup 6)] UNSPEC_F2XM1))
+   (parallel [(set (match_dup 8)
+                  (unspec:XF [(match_dup 7) (match_dup 5)]
+                             UNSPEC_FSCALE_FRACT))
+                  (set (match_dup 9)
+                  (unspec:XF [(match_dup 7) (match_dup 5)]
+                             UNSPEC_FSCALE_EXP))])
+   (parallel [(set (match_dup 11)
+                  (unspec:XF [(match_dup 10) (match_dup 9)]
+                             UNSPEC_FSCALE_FRACT))
+             (set (match_dup 12)
+                  (unspec:XF [(match_dup 10) (match_dup 9)]
+                             UNSPEC_FSCALE_EXP))])
+   (set (match_dup 13) (minus:XF (match_dup 11) (match_dup 10)))
+   (set (match_dup 14) (plus:XF (match_dup 13) (match_dup 8)))
+   (set (match_operand:DF 0 "register_operand" "")
+       (float_truncate:DF (match_dup 14)))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  rtx temp;
+  int i;
 
-  outlow = gen_lowpart (QImode, out);
-  emit_insn (gen_cmpintqi (outlow));
-  emit_move_insn (out, gen_rtx_SIGN_EXTEND (SImode, outlow));
+  for (i=2; i<15; i++)
+    operands[i] = gen_reg_rtx (XFmode);
+  temp = standard_80387_constant_rtx (5); /* fldl2e */
+  emit_move_insn (operands[3], temp);
+  emit_move_insn (operands[10], CONST1_RTX (XFmode));  /* fld1 */
+})
 
-  if (operands[0] != out)
-    emit_move_insn (operands[0], out);
+(define_expand "expm1sf2"
+  [(set (match_dup 2)
+       (float_extend:XF (match_operand:SF 1 "register_operand" "")))
+   (set (match_dup 4) (mult:XF (match_dup 2) (match_dup 3)))
+   (set (match_dup 5) (unspec:XF [(match_dup 4)] UNSPEC_FRNDINT))
+   (set (match_dup 6) (minus:XF (match_dup 4) (match_dup 5)))
+   (set (match_dup 7) (unspec:XF [(match_dup 6)] UNSPEC_F2XM1))
+   (parallel [(set (match_dup 8)
+                  (unspec:XF [(match_dup 7) (match_dup 5)]
+                             UNSPEC_FSCALE_FRACT))
+                  (set (match_dup 9)
+                  (unspec:XF [(match_dup 7) (match_dup 5)]
+                             UNSPEC_FSCALE_EXP))])
+   (parallel [(set (match_dup 11)
+                  (unspec:XF [(match_dup 10) (match_dup 9)]
+                             UNSPEC_FSCALE_FRACT))
+             (set (match_dup 12)
+                  (unspec:XF [(match_dup 10) (match_dup 9)]
+                             UNSPEC_FSCALE_EXP))])
+   (set (match_dup 13) (minus:XF (match_dup 11) (match_dup 10)))
+   (set (match_dup 14) (plus:XF (match_dup 13) (match_dup 8)))
+   (set (match_operand:SF 0 "register_operand" "")
+       (float_truncate:SF (match_dup 14)))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  rtx temp;
+  int i;
 
-  DONE;
+  for (i=2; i<15; i++)
+    operands[i] = gen_reg_rtx (XFmode);
+  temp = standard_80387_constant_rtx (5); /* fldl2e */
+  emit_move_insn (operands[3], temp);
+  emit_move_insn (operands[10], CONST1_RTX (XFmode));  /* fld1 */
 })
 
-;; Produce a tri-state integer (-1, 0, 1) from condition codes.
-
-(define_expand "cmpintqi"
-  [(set (match_dup 1)
-       (gtu:QI (reg:CC 17) (const_int 0)))
-   (set (match_dup 2)
-       (ltu:QI (reg:CC 17) (const_int 0)))
-   (parallel [(set (match_operand:QI 0 "register_operand" "")
-                  (minus:QI (match_dup 1)
-                            (match_dup 2)))
-             (clobber (reg:CC 17))])]
-  ""
-  "operands[1] = gen_reg_rtx (QImode);
-   operands[2] = gen_reg_rtx (QImode);")
+(define_expand "expm1xf2"
+  [(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)))
+   (set (match_dup 6) (unspec:XF [(match_dup 5)] UNSPEC_F2XM1))
+   (parallel [(set (match_dup 7)
+                  (unspec:XF [(match_dup 6) (match_dup 4)]
+                             UNSPEC_FSCALE_FRACT))
+                  (set (match_dup 8)
+                  (unspec:XF [(match_dup 6) (match_dup 4)]
+                             UNSPEC_FSCALE_EXP))])
+   (parallel [(set (match_dup 10)
+                  (unspec:XF [(match_dup 9) (match_dup 8)]
+                             UNSPEC_FSCALE_FRACT))
+             (set (match_dup 11)
+                  (unspec:XF [(match_dup 9) (match_dup 8)]
+                             UNSPEC_FSCALE_EXP))])
+   (set (match_dup 12) (minus:XF (match_dup 10) (match_dup 9)))
+   (set (match_operand:XF 0 "register_operand" "")
+       (plus:XF (match_dup 12) (match_dup 7)))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  rtx temp;
+  int i;
 
-;; memcmp recognizers.  The `cmpsb' opcode does nothing if the count is
-;; zero.  Emit extra code to make sure that a zero-length compare is EQ.
+  for (i=2; i<13; i++)
+    operands[i] = gen_reg_rtx (XFmode);
+  temp = standard_80387_constant_rtx (5); /* fldl2e */
+  emit_move_insn (operands[2], temp);
+  emit_move_insn (operands[9], CONST1_RTX (XFmode));  /* fld1 */
+})
+\f
 
-(define_expand "cmpstrqi_nz_1"
-  [(parallel [(set (reg:CC 17)
-                  (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" ""))
-             (use (reg:SI 19))
-             (clobber (match_operand 0 "register_operand" ""))
-             (clobber (match_operand 1 "register_operand" ""))
-             (clobber (match_dup 2))])]
-  ""
-  "")
+(define_insn "frndintxf2"
+  [(set (match_operand:XF 0 "register_operand" "=f")
+       (unspec:XF [(match_operand:XF 1 "register_operand" "0")]
+        UNSPEC_FRNDINT))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+  "frndint"
+  [(set_attr "type" "fpspc")
+   (set_attr "mode" "XF")])
 
-(define_insn "*cmpstrqi_nz_1"
-  [(set (reg:CC 17)
-       (compare:CC (mem:BLK (match_operand:SI 4 "register_operand" "0"))
-                   (mem:BLK (match_operand:SI 5 "register_operand" "1"))))
-   (use (match_operand:SI 6 "register_operand" "2"))
-   (use (match_operand:SI 3 "immediate_operand" "i"))
-   (use (reg:SI 19))
-   (clobber (match_operand:SI 0 "register_operand" "=S"))
-   (clobber (match_operand:SI 1 "register_operand" "=D"))
-   (clobber (match_operand:SI 2 "register_operand" "=c"))]
-  "!TARGET_64BIT"
-  "repz{\;| }cmpsb"
-  [(set_attr "type" "str")
-   (set_attr "mode" "QI")
-   (set_attr "prefix_rep" "1")])
+(define_expand "rintdf2"
+  [(use (match_operand:DF 0 "register_operand" ""))
+   (use (match_operand:DF 1 "register_operand" ""))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  rtx op0 = gen_reg_rtx (XFmode);
+  rtx op1 = gen_reg_rtx (XFmode);
 
-(define_insn "*cmpstrqi_nz_rex_1"
-  [(set (reg:CC 17)
-       (compare:CC (mem:BLK (match_operand:DI 4 "register_operand" "0"))
-                   (mem:BLK (match_operand:DI 5 "register_operand" "1"))))
-   (use (match_operand:DI 6 "register_operand" "2"))
-   (use (match_operand:SI 3 "immediate_operand" "i"))
-   (use (reg:SI 19))
-   (clobber (match_operand:DI 0 "register_operand" "=S"))
-   (clobber (match_operand:DI 1 "register_operand" "=D"))
-   (clobber (match_operand:DI 2 "register_operand" "=c"))]
-  "TARGET_64BIT"
-  "repz{\;| }cmpsb"
-  [(set_attr "type" "str")
-   (set_attr "mode" "QI")
-   (set_attr "prefix_rep" "1")])
+  emit_insn (gen_extenddfxf2 (op1, operands[1]));
+  emit_insn (gen_frndintxf2 (op0, op1));
 
-;; The same, but the count is not known to not be zero.
+  emit_insn (gen_truncxfdf2_i387_noop (operands[0], op0));
+  DONE;
+})
 
-(define_expand "cmpstrqi_1"
-  [(parallel [(set (reg:CC 17)
-               (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" ""))
-                 (const_int 0)))
-             (use (match_operand:SI 3 "immediate_operand" ""))
-             (use (reg:CC 17))
-             (use (reg:SI 19))
-             (clobber (match_operand 0 "register_operand" ""))
-             (clobber (match_operand 1 "register_operand" ""))
-             (clobber (match_dup 2))])]
-  ""
-  "")
+(define_expand "rintsf2"
+  [(use (match_operand:SF 0 "register_operand" ""))
+   (use (match_operand:SF 1 "register_operand" ""))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  rtx op0 = gen_reg_rtx (XFmode);
+  rtx op1 = gen_reg_rtx (XFmode);
 
-(define_insn "*cmpstrqi_1"
-  [(set (reg:CC 17)
-       (if_then_else:CC (ne (match_operand:SI 6 "register_operand" "2")
-                            (const_int 0))
-         (compare:CC (mem:BLK (match_operand:SI 4 "register_operand" "0"))
-                     (mem:BLK (match_operand:SI 5 "register_operand" "1")))
-         (const_int 0)))
-   (use (match_operand:SI 3 "immediate_operand" "i"))
-   (use (reg:CC 17))
-   (use (reg:SI 19))
-   (clobber (match_operand:SI 0 "register_operand" "=S"))
-   (clobber (match_operand:SI 1 "register_operand" "=D"))
-   (clobber (match_operand:SI 2 "register_operand" "=c"))]
-  "!TARGET_64BIT"
-  "repz{\;| }cmpsb"
-  [(set_attr "type" "str")
-   (set_attr "mode" "QI")
-   (set_attr "prefix_rep" "1")])
+  emit_insn (gen_extendsfxf2 (op1, operands[1]));
+  emit_insn (gen_frndintxf2 (op0, op1));
 
-(define_insn "*cmpstrqi_rex_1"
-  [(set (reg:CC 17)
-       (if_then_else:CC (ne (match_operand:DI 6 "register_operand" "2")
-                            (const_int 0))
-         (compare:CC (mem:BLK (match_operand:DI 4 "register_operand" "0"))
-                     (mem:BLK (match_operand:DI 5 "register_operand" "1")))
-         (const_int 0)))
-   (use (match_operand:SI 3 "immediate_operand" "i"))
-   (use (reg:CC 17))
-   (use (reg:SI 19))
-   (clobber (match_operand:DI 0 "register_operand" "=S"))
-   (clobber (match_operand:DI 1 "register_operand" "=D"))
-   (clobber (match_operand:DI 2 "register_operand" "=c"))]
-  "TARGET_64BIT"
-  "repz{\;| }cmpsb"
-  [(set_attr "type" "str")
-   (set_attr "mode" "QI")
-   (set_attr "prefix_rep" "1")])
+  emit_insn (gen_truncxfsf2_i387_noop (operands[0], op0));
+  DONE;
+})
 
-(define_expand "strlensi"
-  [(set (match_operand:SI 0 "register_operand" "")
-       (unspec:SI [(match_operand:BLK 1 "general_operand" "")
-                   (match_operand:QI 2 "immediate_operand" "")
-                   (match_operand 3 "immediate_operand" "")] UNSPEC_SCAS))]
-  ""
+(define_expand "rintxf2"
+  [(use (match_operand:XF 0 "register_operand" ""))
+   (use (match_operand:XF 1 "register_operand" ""))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
 {
- if (ix86_expand_strlen (operands[0], operands[1], operands[2], operands[3]))
-   DONE;
- else
-   FAIL;
+  emit_insn (gen_frndintxf2 (operands[0], operands[1]));
+  DONE;
 })
 
-(define_expand "strlendi"
-  [(set (match_operand:DI 0 "register_operand" "")
-       (unspec:DI [(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]))
-   DONE;
- else
-   FAIL;
-})
+(define_insn "frndintxf2_floor"
+  [(set (match_operand:XF 0 "register_operand" "=f")
+       (unspec:XF [(match_operand:XF 1 "register_operand" "0")]
+        UNSPEC_FRNDINT_FLOOR))
+   (use (match_operand:HI 2 "memory_operand" "m"))
+   (use (match_operand:HI 3 "memory_operand" "m"))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+  "fldcw\t%3\n\tfrndint\n\tfldcw\t%2"
+  [(set_attr "type" "frndint")
+   (set_attr "i387_cw" "floor")
+   (set_attr "mode" "XF")])
 
-(define_expand "strlenqi_1"
-  [(parallel [(set (match_operand 0 "register_operand" "") (match_operand 2 "" ""))
-             (use (reg:SI 19))
-             (clobber (match_operand 1 "register_operand" ""))
-             (clobber (reg:CC 17))])]
-  ""
-  "")
+(define_expand "floordf2"
+  [(use (match_operand:DF 0 "register_operand" ""))
+   (use (match_operand:DF 1 "register_operand" ""))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  rtx op0 = gen_reg_rtx (XFmode);
+  rtx op1 = gen_reg_rtx (XFmode);
+  rtx op2 = assign_386_stack_local (HImode, 1);
+  rtx op3 = assign_386_stack_local (HImode, 2);
+       
+  ix86_optimize_mode_switching = 1;
 
-(define_insn "*strlenqi_1"
-  [(set (match_operand:SI 0 "register_operand" "=&c")
-       (unspec:SI [(mem:BLK (match_operand:SI 5 "register_operand" "1"))
-                   (match_operand:QI 2 "register_operand" "a")
-                   (match_operand:SI 3 "immediate_operand" "i")
-                   (match_operand:SI 4 "register_operand" "0")] UNSPEC_SCAS))
-   (use (reg:SI 19))
-   (clobber (match_operand:SI 1 "register_operand" "=D"))
-   (clobber (reg:CC 17))]
-  "!TARGET_64BIT"
-  "repnz{\;| }scasb"
-  [(set_attr "type" "str")
-   (set_attr "mode" "QI")
-   (set_attr "prefix_rep" "1")])
+  emit_insn (gen_extenddfxf2 (op1, operands[1]));
+  emit_insn (gen_frndintxf2_floor (op0, op1, op2, op3));
 
-(define_insn "*strlenqi_rex_1"
-  [(set (match_operand:DI 0 "register_operand" "=&c")
-       (unspec:DI [(mem:BLK (match_operand:DI 5 "register_operand" "1"))
-                   (match_operand:QI 2 "register_operand" "a")
-                   (match_operand:DI 3 "immediate_operand" "i")
-                   (match_operand:DI 4 "register_operand" "0")] UNSPEC_SCAS))
-   (use (reg:SI 19))
-   (clobber (match_operand:DI 1 "register_operand" "=D"))
-   (clobber (reg:CC 17))]
-  "TARGET_64BIT"
-  "repnz{\;| }scasb"
-  [(set_attr "type" "str")
-   (set_attr "mode" "QI")
-   (set_attr "prefix_rep" "1")])
+  emit_insn (gen_truncxfdf2_i387_noop (operands[0], op0));
+  DONE;
+})
 
-;; Peephole optimizations to clean up after cmpstr*.  This should be
-;; handled in combine, but it is not currently up to the task.
-;; When used for their truth value, the cmpstr* expanders generate
-;; code like this:
-;;
-;;   repz cmpsb
-;;   seta      %al
-;;   setb      %dl
-;;   cmpb      %al, %dl
-;;   jcc       label
-;;
-;; The intermediate three instructions are unnecessary.
+(define_expand "floorsf2"
+  [(use (match_operand:SF 0 "register_operand" ""))
+   (use (match_operand:SF 1 "register_operand" ""))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  rtx op0 = gen_reg_rtx (XFmode);
+  rtx op1 = gen_reg_rtx (XFmode);
+  rtx op2 = assign_386_stack_local (HImode, 1);
+  rtx op3 = assign_386_stack_local (HImode, 2);
+       
+  ix86_optimize_mode_switching = 1;
 
-;; This one handles cmpstr*_nz_1...
-(define_peephole2
-  [(parallel[
-     (set (reg:CC 17)
-         (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" ""))
-     (use (reg:SI 19))
-     (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 17) (const_int 0)))
-   (set (match_operand:QI 8 "register_operand" "")
-       (ltu:QI (reg:CC 17) (const_int 0)))
-   (set (reg 17)
-       (compare (match_dup 7) (match_dup 8)))
-  ]
-  "peep2_reg_dead_p (4, operands[7]) && peep2_reg_dead_p (4, operands[8])"
-  [(parallel[
-     (set (reg:CC 17)
-         (compare:CC (mem:BLK (match_dup 4))
-                     (mem:BLK (match_dup 5))))
-     (use (match_dup 6))
-     (use (match_dup 3))
-     (use (reg:SI 19))
-     (clobber (match_dup 0))
-     (clobber (match_dup 1))
-     (clobber (match_dup 2))])]
-  "")
+  emit_insn (gen_extendsfxf2 (op1, operands[1]));
+  emit_insn (gen_frndintxf2_floor (op0, op1, op2, op3));
 
-;; ...and this one handles cmpstr*_1.
-(define_peephole2
-  [(parallel[
-     (set (reg:CC 17)
-         (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" "")))
-           (const_int 0)))
-     (use (match_operand:SI 3 "immediate_operand" ""))
-     (use (reg:CC 17))
-     (use (reg:SI 19))
-     (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 17) (const_int 0)))
-   (set (match_operand:QI 8 "register_operand" "")
-       (ltu:QI (reg:CC 17) (const_int 0)))
-   (set (reg 17)
-       (compare (match_dup 7) (match_dup 8)))
-  ]
-  "peep2_reg_dead_p (4, operands[7]) && peep2_reg_dead_p (4, operands[8])"
-  [(parallel[
-     (set (reg:CC 17)
-         (if_then_else:CC (ne (match_dup 6)
-                              (const_int 0))
-           (compare:CC (mem:BLK (match_dup 4))
-                       (mem:BLK (match_dup 5)))
-           (const_int 0)))
-     (use (match_dup 3))
-     (use (reg:CC 17))
-     (use (reg:SI 19))
-     (clobber (match_dup 0))
-     (clobber (match_dup 1))
-     (clobber (match_dup 2))])]
-  "")
+  emit_insn (gen_truncxfsf2_i387_noop (operands[0], op0));
+  DONE;
+})
 
+(define_expand "floorxf2"
+  [(use (match_operand:XF 0 "register_operand" ""))
+   (use (match_operand:XF 1 "register_operand" ""))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  rtx op2 = assign_386_stack_local (HImode, 1);
+  rtx op3 = assign_386_stack_local (HImode, 2);
+       
+  ix86_optimize_mode_switching = 1;
 
-\f
-;; Conditional move instructions.
+  emit_insn (gen_frndintxf2_floor (operands[0], operands[1], op2, op3));
+  DONE;
+})
 
-(define_expand "movdicc"
-  [(set (match_operand:DI 0 "register_operand" "")
-       (if_then_else:DI (match_operand 1 "comparison_operator" "")
-                        (match_operand:DI 2 "general_operand" "")
-                        (match_operand:DI 3 "general_operand" "")))]
-  "TARGET_64BIT"
-  "if (!ix86_expand_int_movcc (operands)) FAIL; DONE;")
+(define_insn "frndintxf2_ceil"
+  [(set (match_operand:XF 0 "register_operand" "=f")
+       (unspec:XF [(match_operand:XF 1 "register_operand" "0")]
+        UNSPEC_FRNDINT_CEIL))
+   (use (match_operand:HI 2 "memory_operand" "m"))
+   (use (match_operand:HI 3 "memory_operand" "m"))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+  "fldcw\t%3\n\tfrndint\n\tfldcw\t%2"
+  [(set_attr "type" "frndint")
+   (set_attr "i387_cw" "ceil")
+   (set_attr "mode" "XF")])
 
-(define_insn "x86_movdicc_0_m1_rex64"
-  [(set (match_operand:DI 0 "register_operand" "=r")
-       (if_then_else:DI (match_operand 1 "ix86_carry_flag_operator" "")
-         (const_int -1)
-         (const_int 0)))
-   (clobber (reg:CC 17))]
-  "TARGET_64BIT"
-  "sbb{q}\t%0, %0"
-  ; Since we don't have the proper number of operands for an alu insn,
-  ; fill in all the blanks.
-  [(set_attr "type" "alu")
-   (set_attr "pent_pair" "pu")
-   (set_attr "memory" "none")
-   (set_attr "imm_disp" "false")
-   (set_attr "mode" "DI")
-   (set_attr "length_immediate" "0")])
+(define_expand "ceildf2"
+  [(use (match_operand:DF 0 "register_operand" ""))
+   (use (match_operand:DF 1 "register_operand" ""))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  rtx op0 = gen_reg_rtx (XFmode);
+  rtx op1 = gen_reg_rtx (XFmode);
+  rtx op2 = assign_386_stack_local (HImode, 1);
+  rtx op3 = assign_386_stack_local (HImode, 2);
+       
+  ix86_optimize_mode_switching = 1;
 
-(define_insn "movdicc_c_rex64"
-  [(set (match_operand:DI 0 "register_operand" "=r,r")
-       (if_then_else:DI (match_operator 1 "ix86_comparison_operator" 
-                               [(reg 17) (const_int 0)])
-                     (match_operand:DI 2 "nonimmediate_operand" "rm,0")
-                     (match_operand:DI 3 "nonimmediate_operand" "0,rm")))]
-  "TARGET_64BIT && TARGET_CMOVE
-   && (GET_CODE (operands[2]) != MEM || GET_CODE (operands[3]) != MEM)"
-  "@
-   cmov%O2%C1\t{%2, %0|%0, %2}
-   cmov%O2%c1\t{%3, %0|%0, %3}"
-  [(set_attr "type" "icmov")
-   (set_attr "mode" "DI")])
+  emit_insn (gen_extenddfxf2 (op1, operands[1]));
+  emit_insn (gen_frndintxf2_ceil (op0, op1, op2, op3));
 
-(define_expand "movsicc"
-  [(set (match_operand:SI 0 "register_operand" "")
-       (if_then_else:SI (match_operand 1 "comparison_operator" "")
-                        (match_operand:SI 2 "general_operand" "")
-                        (match_operand:SI 3 "general_operand" "")))]
-  ""
-  "if (!ix86_expand_int_movcc (operands)) FAIL; DONE;")
+  emit_insn (gen_truncxfdf2_i387_noop (operands[0], op0));
+  DONE;
+})
 
-;; Data flow gets confused by our desire for `sbbl reg,reg', and clearing
-;; the register first winds up with `sbbl $0,reg', which is also weird.
-;; So just document what we're doing explicitly.
+(define_expand "ceilsf2"
+  [(use (match_operand:SF 0 "register_operand" ""))
+   (use (match_operand:SF 1 "register_operand" ""))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  rtx op0 = gen_reg_rtx (XFmode);
+  rtx op1 = gen_reg_rtx (XFmode);
+  rtx op2 = assign_386_stack_local (HImode, 1);
+  rtx op3 = assign_386_stack_local (HImode, 2);
+       
+  ix86_optimize_mode_switching = 1;
 
-(define_insn "x86_movsicc_0_m1"
-  [(set (match_operand:SI 0 "register_operand" "=r")
-       (if_then_else:SI (match_operand 1 "ix86_carry_flag_operator" "")
-         (const_int -1)
-         (const_int 0)))
-   (clobber (reg:CC 17))]
-  ""
-  "sbb{l}\t%0, %0"
-  ; Since we don't have the proper number of operands for an alu insn,
-  ; fill in all the blanks.
-  [(set_attr "type" "alu")
-   (set_attr "pent_pair" "pu")
-   (set_attr "memory" "none")
-   (set_attr "imm_disp" "false")
-   (set_attr "mode" "SI")
-   (set_attr "length_immediate" "0")])
+  emit_insn (gen_extendsfxf2 (op1, operands[1]));
+  emit_insn (gen_frndintxf2_ceil (op0, op1, op2, op3));
 
-(define_insn "*movsicc_noc"
-  [(set (match_operand:SI 0 "register_operand" "=r,r")
-       (if_then_else:SI (match_operator 1 "ix86_comparison_operator" 
-                               [(reg 17) (const_int 0)])
-                     (match_operand:SI 2 "nonimmediate_operand" "rm,0")
-                     (match_operand:SI 3 "nonimmediate_operand" "0,rm")))]
-  "TARGET_CMOVE
-   && (GET_CODE (operands[2]) != MEM || GET_CODE (operands[3]) != MEM)"
-  "@
-   cmov%O2%C1\t{%2, %0|%0, %2}
-   cmov%O2%c1\t{%3, %0|%0, %3}"
-  [(set_attr "type" "icmov")
-   (set_attr "mode" "SI")])
+  emit_insn (gen_truncxfsf2_i387_noop (operands[0], op0));
+  DONE;
+})
 
-(define_expand "movhicc"
-  [(set (match_operand:HI 0 "register_operand" "")
-       (if_then_else:HI (match_operand 1 "comparison_operator" "")
-                        (match_operand:HI 2 "general_operand" "")
-                        (match_operand:HI 3 "general_operand" "")))]
-  "TARGET_HIMODE_MATH"
-  "if (!ix86_expand_int_movcc (operands)) FAIL; DONE;")
+(define_expand "ceilxf2"
+  [(use (match_operand:XF 0 "register_operand" ""))
+   (use (match_operand:XF 1 "register_operand" ""))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  rtx op2 = assign_386_stack_local (HImode, 1);
+  rtx op3 = assign_386_stack_local (HImode, 2);
+       
+  ix86_optimize_mode_switching = 1;
 
-(define_insn "*movhicc_noc"
-  [(set (match_operand:HI 0 "register_operand" "=r,r")
-       (if_then_else:HI (match_operator 1 "ix86_comparison_operator" 
-                               [(reg 17) (const_int 0)])
-                     (match_operand:HI 2 "nonimmediate_operand" "rm,0")
-                     (match_operand:HI 3 "nonimmediate_operand" "0,rm")))]
-  "TARGET_CMOVE
-   && (GET_CODE (operands[2]) != MEM || GET_CODE (operands[3]) != MEM)"
-  "@
-   cmov%O2%C1\t{%2, %0|%0, %2}
-   cmov%O2%c1\t{%3, %0|%0, %3}"
-  [(set_attr "type" "icmov")
-   (set_attr "mode" "HI")])
+  emit_insn (gen_frndintxf2_ceil (operands[0], operands[1], op2, op3));
+  DONE;
+})
 
-(define_expand "movqicc"
-  [(set (match_operand:QI 0 "register_operand" "")
-       (if_then_else:QI (match_operand 1 "comparison_operator" "")
-                        (match_operand:QI 2 "general_operand" "")
-                        (match_operand:QI 3 "general_operand" "")))]
-  "TARGET_QIMODE_MATH"
-  "if (!ix86_expand_int_movcc (operands)) FAIL; DONE;")
+(define_insn "frndintxf2_trunc"
+  [(set (match_operand:XF 0 "register_operand" "=f")
+       (unspec:XF [(match_operand:XF 1 "register_operand" "0")]
+        UNSPEC_FRNDINT_TRUNC))
+   (use (match_operand:HI 2 "memory_operand" "m"))
+   (use (match_operand:HI 3 "memory_operand" "m"))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+  "fldcw\t%3\n\tfrndint\n\tfldcw\t%2"
+  [(set_attr "type" "frndint")
+   (set_attr "i387_cw" "trunc")
+   (set_attr "mode" "XF")])
 
-(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" "") (const_int 0)])
-                     (match_operand:QI 2 "register_operand" "r,0")
-                     (match_operand:QI 3 "register_operand" "0,r")))]
-  "TARGET_CMOVE && !TARGET_PARTIAL_REG_STALL"
-  "#"
-  "&& reload_completed"
-  [(set (match_dup 0)
-       (if_then_else:SI (match_op_dup 1 [(match_dup 4) (const_int 0)])
-                     (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]);"
-  [(set_attr "type" "icmov")
-   (set_attr "mode" "SI")])
+(define_expand "btruncdf2"
+  [(use (match_operand:DF 0 "register_operand" ""))
+   (use (match_operand:DF 1 "register_operand" ""))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  rtx op0 = gen_reg_rtx (XFmode);
+  rtx op1 = gen_reg_rtx (XFmode);
+  rtx op2 = assign_386_stack_local (HImode, 1);
+  rtx op3 = assign_386_stack_local (HImode, 2);
+       
+  ix86_optimize_mode_switching = 1;
 
-(define_expand "movsfcc"
-  [(set (match_operand:SF 0 "register_operand" "")
-       (if_then_else:SF (match_operand 1 "comparison_operator" "")
-                        (match_operand:SF 2 "register_operand" "")
-                        (match_operand:SF 3 "register_operand" "")))]
-  "TARGET_CMOVE"
-  "if (! ix86_expand_fp_movcc (operands)) FAIL; DONE;")
+  emit_insn (gen_extenddfxf2 (op1, operands[1]));
+  emit_insn (gen_frndintxf2_trunc (op0, op1, op2, op3));
 
-(define_insn "*movsfcc_1"
-  [(set (match_operand:SF 0 "register_operand" "=f#r,f#r,r#f,r#f")
-       (if_then_else:SF (match_operator 1 "fcmov_comparison_operator" 
-                               [(reg 17) (const_int 0)])
-                     (match_operand:SF 2 "nonimmediate_operand" "f#r,0,rm#f,0")
-                     (match_operand:SF 3 "nonimmediate_operand" "0,f#r,0,rm#f")))]
-  "TARGET_CMOVE
-   && (GET_CODE (operands[2]) != MEM || GET_CODE (operands[3]) != MEM)"
-  "@
-   fcmov%F1\t{%2, %0|%0, %2}
-   fcmov%f1\t{%3, %0|%0, %3}
-   cmov%O2%C1\t{%2, %0|%0, %2}
-   cmov%O2%c1\t{%3, %0|%0, %3}"
-  [(set_attr "type" "fcmov,fcmov,icmov,icmov")
-   (set_attr "mode" "SF,SF,SI,SI")])
+  emit_insn (gen_truncxfdf2_i387_noop (operands[0], op0));
+  DONE;
+})
 
-(define_expand "movdfcc"
-  [(set (match_operand:DF 0 "register_operand" "")
-       (if_then_else:DF (match_operand 1 "comparison_operator" "")
-                        (match_operand:DF 2 "register_operand" "")
-                        (match_operand:DF 3 "register_operand" "")))]
-  "TARGET_CMOVE"
-  "if (! ix86_expand_fp_movcc (operands)) FAIL; DONE;")
+(define_expand "btruncsf2"
+  [(use (match_operand:SF 0 "register_operand" ""))
+   (use (match_operand:SF 1 "register_operand" ""))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  rtx op0 = gen_reg_rtx (XFmode);
+  rtx op1 = gen_reg_rtx (XFmode);
+  rtx op2 = assign_386_stack_local (HImode, 1);
+  rtx op3 = assign_386_stack_local (HImode, 2);
+       
+  ix86_optimize_mode_switching = 1;
 
-(define_insn "*movdfcc_1"
-  [(set (match_operand:DF 0 "register_operand" "=f#r,f#r,&r#f,&r#f")
-       (if_then_else:DF (match_operator 1 "fcmov_comparison_operator" 
-                               [(reg 17) (const_int 0)])
-                     (match_operand:DF 2 "nonimmediate_operand" "f#r,0,rm#f,0")
-                     (match_operand:DF 3 "nonimmediate_operand" "0,f#r,0,rm#f")))]
-  "!TARGET_64BIT && TARGET_CMOVE
-   && (GET_CODE (operands[2]) != MEM || GET_CODE (operands[3]) != MEM)"
-  "@
-   fcmov%F1\t{%2, %0|%0, %2}
-   fcmov%f1\t{%3, %0|%0, %3}
-   #
-   #"
-  [(set_attr "type" "fcmov,fcmov,multi,multi")
-   (set_attr "mode" "DF")])
+  emit_insn (gen_extendsfxf2 (op1, operands[1]));
+  emit_insn (gen_frndintxf2_trunc (op0, op1, op2, op3));
 
-(define_insn "*movdfcc_1_rex64"
-  [(set (match_operand:DF 0 "register_operand" "=f#r,f#r,r#f,r#f")
-       (if_then_else:DF (match_operator 1 "fcmov_comparison_operator" 
-                               [(reg 17) (const_int 0)])
-                     (match_operand:DF 2 "nonimmediate_operand" "f#r,0#r,rm#f,0#f")
-                     (match_operand:DF 3 "nonimmediate_operand" "0#r,f#r,0#f,rm#f")))]
-  "TARGET_64BIT && TARGET_CMOVE
-   && (GET_CODE (operands[2]) != MEM || GET_CODE (operands[3]) != MEM)"
-  "@
-   fcmov%F1\t{%2, %0|%0, %2}
-   fcmov%f1\t{%3, %0|%0, %3}
-   cmov%O2%C1\t{%2, %0|%0, %2}
-   cmov%O2%c1\t{%3, %0|%0, %3}"
-  [(set_attr "type" "fcmov,fcmov,icmov,icmov")
-   (set_attr "mode" "DF")])
+  emit_insn (gen_truncxfsf2_i387_noop (operands[0], op0));
+  DONE;
+})
 
-(define_split
-  [(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" "") (const_int 0)])
-                     (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)])
-                     (match_dup 5)
-                     (match_dup 7)))
-   (set (match_dup 3)
-       (if_then_else:SI (match_op_dup 1 [(match_dup 4) (const_int 0)])
-                     (match_dup 6)
-                     (match_dup 8)))]
-  "split_di (operands+2, 1, operands+5, operands+6);
-   split_di (operands+3, 1, operands+7, operands+8);
-   split_di (operands, 1, operands+2, operands+3);")
+(define_expand "btruncxf2"
+  [(use (match_operand:XF 0 "register_operand" ""))
+   (use (match_operand:XF 1 "register_operand" ""))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  rtx op2 = assign_386_stack_local (HImode, 1);
+  rtx op3 = assign_386_stack_local (HImode, 2);
+       
+  ix86_optimize_mode_switching = 1;
 
-(define_expand "movxfcc"
-  [(set (match_operand:XF 0 "register_operand" "")
-       (if_then_else:XF (match_operand 1 "comparison_operator" "")
-                        (match_operand:XF 2 "register_operand" "")
-                        (match_operand:XF 3 "register_operand" "")))]
-  "TARGET_CMOVE"
-  "if (! ix86_expand_fp_movcc (operands)) FAIL; DONE;")
+  emit_insn (gen_frndintxf2_trunc (operands[0], operands[1], op2, op3));
+  DONE;
+})
 
-(define_insn "*movxfcc_1"
-  [(set (match_operand:XF 0 "register_operand" "=f,f")
-       (if_then_else:XF (match_operator 1 "fcmov_comparison_operator" 
-                               [(reg 17) (const_int 0)])
-                     (match_operand:XF 2 "register_operand" "f,0")
-                     (match_operand:XF 3 "register_operand" "0,f")))]
-  "TARGET_CMOVE"
-  "@
-   fcmov%F1\t{%2, %0|%0, %2}
-   fcmov%f1\t{%3, %0|%0, %3}"
-  [(set_attr "type" "fcmov")
+(define_insn "frndintxf2_mask_pm"
+  [(set (match_operand:XF 0 "register_operand" "=f")
+       (unspec:XF [(match_operand:XF 1 "register_operand" "0")]
+        UNSPEC_FRNDINT_MASK_PM))
+   (use (match_operand:HI 2 "memory_operand" "m"))
+   (use (match_operand:HI 3 "memory_operand" "m"))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+  "fldcw\t%3\n\tfrndint\n\tfclex\n\tfldcw\t%2"
+  [(set_attr "type" "frndint")
+   (set_attr "i387_cw" "mask_pm")
    (set_attr "mode" "XF")])
 
-(define_expand "minsf3"
-  [(parallel [
-     (set (match_operand:SF 0 "register_operand" "")
-         (if_then_else:SF (lt (match_operand:SF 1 "register_operand" "")
-                              (match_operand:SF 2 "nonimmediate_operand" ""))
-                          (match_dup 1)
-                          (match_dup 2)))
-     (clobber (reg:CC 17))])]
-  "TARGET_SSE"
-  "")
-
-(define_insn "*minsf"
-  [(set (match_operand:SF 0 "register_operand" "=x#f,f#x,f#x")
-       (if_then_else:SF (lt (match_operand:SF 1 "register_operand" "0,0,f#x")
-                            (match_operand:SF 2 "nonimmediate_operand" "xm#f,f#x,0"))
-                        (match_dup 1)
-                        (match_dup 2)))
-   (clobber (reg:CC 17))]
-  "TARGET_SSE && TARGET_IEEE_FP"
-  "#")
+(define_expand "nearbyintdf2"
+  [(use (match_operand:DF 0 "register_operand" ""))
+   (use (match_operand:DF 1 "register_operand" ""))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  rtx op0 = gen_reg_rtx (XFmode);
+  rtx op1 = gen_reg_rtx (XFmode);
+  rtx op2 = assign_386_stack_local (HImode, 1);
+  rtx op3 = assign_386_stack_local (HImode, 2);
+       
+  ix86_optimize_mode_switching = 1;
 
-(define_insn "*minsf_nonieee"
-  [(set (match_operand:SF 0 "register_operand" "=x#f,f#x")
-       (if_then_else:SF (lt (match_operand:SF 1 "nonimmediate_operand" "%0,0")
-                            (match_operand:SF 2 "nonimmediate_operand" "xm#f,f#x"))
-                        (match_dup 1)
-                        (match_dup 2)))
-   (clobber (reg:CC 17))]
-  "TARGET_SSE && !TARGET_IEEE_FP
-   && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
-  "#")
+  emit_insn (gen_extenddfxf2 (op1, operands[1]));
+  emit_insn (gen_frndintxf2_mask_pm (op0, op1, op2, op3));
 
-(define_split
-  [(set (match_operand:SF 0 "register_operand" "")
-       (if_then_else:SF (lt (match_operand:SF 1 "register_operand" "")
-                            (match_operand:SF 2 "nonimmediate_operand" ""))
-                        (match_operand:SF 3 "register_operand" "")
-                        (match_operand:SF 4 "nonimmediate_operand" "")))
-   (clobber (reg:CC 17))]
-  "SSE_REG_P (operands[0]) && reload_completed
-   && ((operands_match_p (operands[1], operands[3])
-       && operands_match_p (operands[2], operands[4]))
-       || (operands_match_p (operands[1], operands[4])
-          && operands_match_p (operands[2], operands[3])))"
-  [(set (match_dup 0)
-       (if_then_else:SF (lt (match_dup 1)
-                            (match_dup 2))
-                        (match_dup 1)
-                        (match_dup 2)))])
+  emit_insn (gen_truncxfdf2_i387_noop (operands[0], op0));
+  DONE;
+})
 
-;; Conditional addition patterns
-(define_expand "addqicc"
-  [(match_operand:QI 0 "register_operand" "")
-   (match_operand 1 "comparison_operator" "")
-   (match_operand:QI 2 "register_operand" "")
-   (match_operand:QI 3 "const_int_operand" "")]
-  ""
-  "if (!ix86_expand_int_addcc (operands)) FAIL; DONE;")
+(define_expand "nearbyintsf2"
+  [(use (match_operand:SF 0 "register_operand" ""))
+   (use (match_operand:SF 1 "register_operand" ""))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  rtx op0 = gen_reg_rtx (XFmode);
+  rtx op1 = gen_reg_rtx (XFmode);
+  rtx op2 = assign_386_stack_local (HImode, 1);
+  rtx op3 = assign_386_stack_local (HImode, 2);
+       
+  ix86_optimize_mode_switching = 1;
 
-(define_expand "addhicc"
-  [(match_operand:HI 0 "register_operand" "")
-   (match_operand 1 "comparison_operator" "")
-   (match_operand:HI 2 "register_operand" "")
-   (match_operand:HI 3 "const_int_operand" "")]
-  ""
-  "if (!ix86_expand_int_addcc (operands)) FAIL; DONE;")
+  emit_insn (gen_extendsfxf2 (op1, operands[1]));
+  emit_insn (gen_frndintxf2_mask_pm (op0, op1, op2, op3));
 
-(define_expand "addsicc"
-  [(match_operand:SI 0 "register_operand" "")
-   (match_operand 1 "comparison_operator" "")
-   (match_operand:SI 2 "register_operand" "")
-   (match_operand:SI 3 "const_int_operand" "")]
-  ""
-  "if (!ix86_expand_int_addcc (operands)) FAIL; DONE;")
+  emit_insn (gen_truncxfsf2_i387_noop (operands[0], op0));
+  DONE;
+})
 
-(define_expand "adddicc"
-  [(match_operand:DI 0 "register_operand" "")
-   (match_operand 1 "comparison_operator" "")
-   (match_operand:DI 2 "register_operand" "")
-   (match_operand:DI 3 "const_int_operand" "")]
-  "TARGET_64BIT"
-  "if (!ix86_expand_int_addcc (operands)) FAIL; DONE;")
+(define_expand "nearbyintxf2"
+  [(use (match_operand:XF 0 "register_operand" ""))
+   (use (match_operand:XF 1 "register_operand" ""))]
+  "TARGET_USE_FANCY_MATH_387
+   && flag_unsafe_math_optimizations"
+{
+  rtx op2 = assign_386_stack_local (HImode, 1);
+  rtx op3 = assign_386_stack_local (HImode, 2);
+       
+  ix86_optimize_mode_switching = 1;
 
-;; We can't represent the LT test directly.  Do this by swapping the operands.
+  emit_insn (gen_frndintxf2_mask_pm (operands[0], operands[1],
+                                    op2, op3));
+  DONE;
+})
 
-(define_split
-  [(set (match_operand:SF 0 "fp_register_operand" "")
-       (if_then_else:SF (lt (match_operand:SF 1 "register_operand" "")
-                            (match_operand:SF 2 "register_operand" ""))
-                        (match_operand:SF 3 "register_operand" "")
-                        (match_operand:SF 4 "register_operand" "")))
-   (clobber (reg:CC 17))]
-  "reload_completed
-   && ((operands_match_p (operands[1], operands[3])
-       && operands_match_p (operands[2], operands[4]))
-       || (operands_match_p (operands[1], operands[4])
-          && operands_match_p (operands[2], operands[3])))"
-  [(set (reg:CCFP 17)
-       (compare:CCFP (match_dup 2)
-                     (match_dup 1)))
-   (set (match_dup 0)
-       (if_then_else:SF (ge (reg:CCFP 17) (const_int 0))
-                        (match_dup 1)
-                        (match_dup 2)))])
+\f
+;; Block operation instructions
 
-(define_insn "*minsf_sse"
-  [(set (match_operand:SF 0 "register_operand" "=x")
-       (if_then_else:SF (lt (match_operand:SF 1 "register_operand" "0")
-                            (match_operand:SF 2 "nonimmediate_operand" "xm"))
-                        (match_dup 1)
-                        (match_dup 2)))]
-  "TARGET_SSE && reload_completed"
-  "minss\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sse")
-   (set_attr "mode" "SF")])
+(define_insn "cld"
+ [(set (reg:SI DIRFLAG_REG) (const_int 0))]
+ ""
+ "cld"
+  [(set_attr "type" "cld")])
 
-(define_expand "mindf3"
-  [(parallel [
-     (set (match_operand:DF 0 "register_operand" "")
-         (if_then_else:DF (lt (match_operand:DF 1 "register_operand" "")
-                              (match_operand:DF 2 "nonimmediate_operand" ""))
-                          (match_dup 1)
-                          (match_dup 2)))
-     (clobber (reg:CC 17))])]
-  "TARGET_SSE2 && TARGET_SSE_MATH"
-  "#")
-
-(define_insn "*mindf"
-  [(set (match_operand:DF 0 "register_operand" "=Y#f,f#Y,f#Y")
-       (if_then_else:DF (lt (match_operand:DF 1 "register_operand" "0,0,f#Y")
-                            (match_operand:DF 2 "nonimmediate_operand" "Ym#f,f#Y,0"))
-                        (match_dup 1)
-                        (match_dup 2)))
-   (clobber (reg:CC 17))]
-  "TARGET_SSE2 && TARGET_IEEE_FP && TARGET_SSE_MATH"
-  "#")
+(define_expand "movmemsi"
+  [(use (match_operand:BLK 0 "memory_operand" ""))
+   (use (match_operand:BLK 1 "memory_operand" ""))
+   (use (match_operand:SI 2 "nonmemory_operand" ""))
+   (use (match_operand:SI 3 "const_int_operand" ""))]
+  "! optimize_size"
+{
+ if (ix86_expand_movmem (operands[0], operands[1], operands[2], operands[3]))
+   DONE;
+ else
+   FAIL;
+})
 
-(define_insn "*mindf_nonieee"
-  [(set (match_operand:DF 0 "register_operand" "=Y#f,f#Y")
-       (if_then_else:DF (lt (match_operand:DF 1 "nonimmediate_operand" "%0,0")
-                            (match_operand:DF 2 "nonimmediate_operand" "Ym#f,f#Y"))
-                        (match_dup 1)
-                        (match_dup 2)))
-   (clobber (reg:CC 17))]
-  "TARGET_SSE2 && TARGET_SSE_MATH && !TARGET_IEEE_FP
-   && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
-  "#")
+(define_expand "movmemdi"
+  [(use (match_operand:BLK 0 "memory_operand" ""))
+   (use (match_operand:BLK 1 "memory_operand" ""))
+   (use (match_operand:DI 2 "nonmemory_operand" ""))
+   (use (match_operand:DI 3 "const_int_operand" ""))]
+  "TARGET_64BIT"
+{
+ if (ix86_expand_movmem (operands[0], operands[1], operands[2], operands[3]))
+   DONE;
+ else
+   FAIL;
+})
 
-(define_split
-  [(set (match_operand:DF 0 "register_operand" "")
-       (if_then_else:DF (lt (match_operand:DF 1 "register_operand" "")
-                            (match_operand:DF 2 "nonimmediate_operand" ""))
-                        (match_operand:DF 3 "register_operand" "")
-                        (match_operand:DF 4 "nonimmediate_operand" "")))
-   (clobber (reg:CC 17))]
-  "SSE_REG_P (operands[0]) && reload_completed
-   && ((operands_match_p (operands[1], operands[3])
-       && operands_match_p (operands[2], operands[4]))
-       || (operands_match_p (operands[1], operands[4])
-          && operands_match_p (operands[2], operands[3])))"
-  [(set (match_dup 0)
-       (if_then_else:DF (lt (match_dup 1)
-                            (match_dup 2))
-                        (match_dup 1)
-                        (match_dup 2)))])
+;; Most CPUs don't like single string operations
+;; Handle this case here to simplify previous expander.
 
-;; We can't represent the LT test directly.  Do this by swapping the operands.
-(define_split
-  [(set (match_operand:DF 0 "fp_register_operand" "")
-       (if_then_else:DF (lt (match_operand:DF 1 "register_operand" "")
-                            (match_operand:DF 2 "register_operand" ""))
-                        (match_operand:DF 3 "register_operand" "")
-                        (match_operand:DF 4 "register_operand" "")))
-   (clobber (reg:CC 17))]
-  "reload_completed
-   && ((operands_match_p (operands[1], operands[3])
-       && operands_match_p (operands[2], operands[4]))
-       || (operands_match_p (operands[1], operands[4])
-          && operands_match_p (operands[2], operands[3])))"
-  [(set (reg:CCFP 17)
-       (compare:CCFP (match_dup 2)
-                     (match_dup 1)))
-   (set (match_dup 0)
-       (if_then_else:DF (ge (reg:CCFP 17) (const_int 0))
-                        (match_dup 1)
-                        (match_dup 2)))])
+(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))
+             (clobber (reg:CC FLAGS_REG))])
+   (parallel [(set (match_operand 2 "register_operand" "") (match_dup 6))
+             (clobber (reg:CC FLAGS_REG))])]
+  ""
+{
+  rtx adjust = GEN_INT (GET_MODE_SIZE (GET_MODE (operands[1])));
 
-(define_insn "*mindf_sse"
-  [(set (match_operand:DF 0 "register_operand" "=Y")
-       (if_then_else:DF (lt (match_operand:DF 1 "register_operand" "0")
-                            (match_operand:DF 2 "nonimmediate_operand" "Ym"))
-                        (match_dup 1)
-                        (match_dup 2)))]
-  "TARGET_SSE2 && TARGET_SSE_MATH && reload_completed"
-  "minsd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sse")
-   (set_attr "mode" "DF")])
+  /* If .md ever supports :P for Pmode, these can be directly
+     in the pattern above.  */
+  operands[5] = gen_rtx_PLUS (Pmode, operands[0], adjust);
+  operands[6] = gen_rtx_PLUS (Pmode, operands[2], adjust);
 
-(define_expand "maxsf3"
-  [(parallel [
-     (set (match_operand:SF 0 "register_operand" "")
-         (if_then_else:SF (gt (match_operand:SF 1 "register_operand" "")
-                              (match_operand:SF 2 "nonimmediate_operand" ""))
-                          (match_dup 1)
-                          (match_dup 2)))
-     (clobber (reg:CC 17))])]
-  "TARGET_SSE"
-  "#")
+  if (TARGET_SINGLE_STRINGOP || optimize_size)
+    {
+      emit_insn (gen_strmov_singleop (operands[0], operands[1],
+                                     operands[2], operands[3],
+                                     operands[5], operands[6]));
+      DONE;
+    }
 
-(define_insn "*maxsf"
-  [(set (match_operand:SF 0 "register_operand" "=x#f,f#x,f#x")
-       (if_then_else:SF (gt (match_operand:SF 1 "register_operand" "0,0,f#x")
-                            (match_operand:SF 2 "nonimmediate_operand" "xm#f,f#x,0"))
-                        (match_dup 1)
-                        (match_dup 2)))
-   (clobber (reg:CC 17))]
-  "TARGET_SSE && TARGET_IEEE_FP"
-  "#")
+  operands[4] = gen_reg_rtx (GET_MODE (operands[1]));
+})
 
-(define_insn "*maxsf_nonieee"
-  [(set (match_operand:SF 0 "register_operand" "=x#f,f#x")
-       (if_then_else:SF (gt (match_operand:SF 1 "nonimmediate_operand" "%0,0")
-                            (match_operand:SF 2 "nonimmediate_operand" "xm#f,f#x"))
-                        (match_dup 1)
-                        (match_dup 2)))
-   (clobber (reg:CC 17))]
-  "TARGET_SSE && !TARGET_IEEE_FP
-   && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
-  "#")
+(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 "" ""))
+             (use (reg:SI DIRFLAG_REG))])]
+  "TARGET_SINGLE_STRINGOP || optimize_size"
+  "")
 
-(define_split
-  [(set (match_operand:SF 0 "register_operand" "")
-       (if_then_else:SF (gt (match_operand:SF 1 "register_operand" "")
-                            (match_operand:SF 2 "nonimmediate_operand" ""))
-                        (match_operand:SF 3 "register_operand" "")
-                        (match_operand:SF 4 "nonimmediate_operand" "")))
-   (clobber (reg:CC 17))]
-  "SSE_REG_P (operands[0]) && reload_completed
-   && ((operands_match_p (operands[1], operands[3])
-       && operands_match_p (operands[2], operands[4]))
-       || (operands_match_p (operands[1], operands[4])
-          && operands_match_p (operands[2], operands[3])))"
-  [(set (match_dup 0)
-       (if_then_else:SF (gt (match_dup 1)
-                            (match_dup 2))
-                        (match_dup 1)
-                        (match_dup 2)))])
+(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)))
+   (use (reg:SI DIRFLAG_REG))]
+  "TARGET_64BIT && (TARGET_SINGLE_STRINGOP || optimize_size)"
+  "movsq"
+  [(set_attr "type" "str")
+   (set_attr "mode" "DI")
+   (set_attr "memory" "both")])
 
-(define_split
-  [(set (match_operand:SF 0 "fp_register_operand" "")
-       (if_then_else:SF (gt (match_operand:SF 1 "register_operand" "")
-                            (match_operand:SF 2 "register_operand" ""))
-                        (match_operand:SF 3 "register_operand" "")
-                        (match_operand:SF 4 "register_operand" "")))
-   (clobber (reg:CC 17))]
-  "reload_completed
-   && ((operands_match_p (operands[1], operands[3])
-       && operands_match_p (operands[2], operands[4]))
-       || (operands_match_p (operands[1], operands[4])
-          && operands_match_p (operands[2], operands[3])))"
-  [(set (reg:CCFP 17)
-       (compare:CCFP (match_dup 1)
-                     (match_dup 2)))
-   (set (match_dup 0)
-       (if_then_else:SF (gt (reg:CCFP 17) (const_int 0))
-                        (match_dup 1)
-                        (match_dup 2)))])
+(define_insn "*strmovsi_1"
+  [(set (mem:SI (match_operand:SI 2 "register_operand" "0"))
+       (mem:SI (match_operand:SI 3 "register_operand" "1")))
+   (set (match_operand:SI 0 "register_operand" "=D")
+       (plus:SI (match_dup 2)
+                (const_int 4)))
+   (set (match_operand:SI 1 "register_operand" "=S")
+       (plus:SI (match_dup 3)
+                (const_int 4)))
+   (use (reg:SI DIRFLAG_REG))]
+  "!TARGET_64BIT && (TARGET_SINGLE_STRINGOP || optimize_size)"
+  "{movsl|movsd}"
+  [(set_attr "type" "str")
+   (set_attr "mode" "SI")
+   (set_attr "memory" "both")])
 
-(define_insn "*maxsf_sse"
-  [(set (match_operand:SF 0 "register_operand" "=x")
-       (if_then_else:SF (gt (match_operand:SF 1 "register_operand" "0")
-                            (match_operand:SF 2 "nonimmediate_operand" "xm"))
-                        (match_dup 1)
-                        (match_dup 2)))]
-  "TARGET_SSE && reload_completed"
-  "maxss\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sse")
-   (set_attr "mode" "SF")])
+(define_insn "*strmovsi_rex_1"
+  [(set (mem:SI (match_operand:DI 2 "register_operand" "0"))
+       (mem:SI (match_operand:DI 3 "register_operand" "1")))
+   (set (match_operand:DI 0 "register_operand" "=D")
+       (plus:DI (match_dup 2)
+                (const_int 4)))
+   (set (match_operand:DI 1 "register_operand" "=S")
+       (plus:DI (match_dup 3)
+                (const_int 4)))
+   (use (reg:SI DIRFLAG_REG))]
+  "TARGET_64BIT && (TARGET_SINGLE_STRINGOP || optimize_size)"
+  "{movsl|movsd}"
+  [(set_attr "type" "str")
+   (set_attr "mode" "SI")
+   (set_attr "memory" "both")])
 
-(define_expand "maxdf3"
-  [(parallel [
-     (set (match_operand:DF 0 "register_operand" "")
-         (if_then_else:DF (gt (match_operand:DF 1 "register_operand" "")
-                              (match_operand:DF 2 "nonimmediate_operand" ""))
-                          (match_dup 1)
-                          (match_dup 2)))
-     (clobber (reg:CC 17))])]
-  "TARGET_SSE2 && TARGET_SSE_MATH"
-  "#")
+(define_insn "*strmovhi_1"
+  [(set (mem:HI (match_operand:SI 2 "register_operand" "0"))
+       (mem:HI (match_operand:SI 3 "register_operand" "1")))
+   (set (match_operand:SI 0 "register_operand" "=D")
+       (plus:SI (match_dup 2)
+                (const_int 2)))
+   (set (match_operand:SI 1 "register_operand" "=S")
+       (plus:SI (match_dup 3)
+                (const_int 2)))
+   (use (reg:SI DIRFLAG_REG))]
+  "!TARGET_64BIT && (TARGET_SINGLE_STRINGOP || optimize_size)"
+  "movsw"
+  [(set_attr "type" "str")
+   (set_attr "memory" "both")
+   (set_attr "mode" "HI")])
 
-(define_insn "*maxdf"
-  [(set (match_operand:DF 0 "register_operand" "=Y#f,f#Y,f#Y")
-       (if_then_else:DF (gt (match_operand:DF 1 "register_operand" "0,0,f#Y")
-                            (match_operand:DF 2 "nonimmediate_operand" "Ym#f,f#Y,0"))
-                        (match_dup 1)
-                        (match_dup 2)))
-   (clobber (reg:CC 17))]
-  "TARGET_SSE2 && TARGET_SSE_MATH && TARGET_IEEE_FP"
-  "#")
+(define_insn "*strmovhi_rex_1"
+  [(set (mem:HI (match_operand:DI 2 "register_operand" "0"))
+       (mem:HI (match_operand:DI 3 "register_operand" "1")))
+   (set (match_operand:DI 0 "register_operand" "=D")
+       (plus:DI (match_dup 2)
+                (const_int 2)))
+   (set (match_operand:DI 1 "register_operand" "=S")
+       (plus:DI (match_dup 3)
+                (const_int 2)))
+   (use (reg:SI DIRFLAG_REG))]
+  "TARGET_64BIT && (TARGET_SINGLE_STRINGOP || optimize_size)"
+  "movsw"
+  [(set_attr "type" "str")
+   (set_attr "memory" "both")
+   (set_attr "mode" "HI")])
 
-(define_insn "*maxdf_nonieee"
-  [(set (match_operand:DF 0 "register_operand" "=Y#f,f#Y")
-       (if_then_else:DF (gt (match_operand:DF 1 "nonimmediate_operand" "%0,0")
-                            (match_operand:DF 2 "nonimmediate_operand" "Ym#f,f#Y"))
-                        (match_dup 1)
-                        (match_dup 2)))
-   (clobber (reg:CC 17))]
-  "TARGET_SSE2 && TARGET_SSE_MATH && !TARGET_IEEE_FP
-   && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
-  "#")
+(define_insn "*strmovqi_1"
+  [(set (mem:QI (match_operand:SI 2 "register_operand" "0"))
+       (mem:QI (match_operand:SI 3 "register_operand" "1")))
+   (set (match_operand:SI 0 "register_operand" "=D")
+       (plus:SI (match_dup 2)
+                (const_int 1)))
+   (set (match_operand:SI 1 "register_operand" "=S")
+       (plus:SI (match_dup 3)
+                (const_int 1)))
+   (use (reg:SI DIRFLAG_REG))]
+  "!TARGET_64BIT && (TARGET_SINGLE_STRINGOP || optimize_size)"
+  "movsb"
+  [(set_attr "type" "str")
+   (set_attr "memory" "both")
+   (set_attr "mode" "QI")])
 
-(define_split
-  [(set (match_operand:DF 0 "register_operand" "")
-       (if_then_else:DF (gt (match_operand:DF 1 "register_operand" "")
-                            (match_operand:DF 2 "nonimmediate_operand" ""))
-                        (match_operand:DF 3 "register_operand" "")
-                        (match_operand:DF 4 "nonimmediate_operand" "")))
-   (clobber (reg:CC 17))]
-  "SSE_REG_P (operands[0]) && reload_completed
-   && ((operands_match_p (operands[1], operands[3])
-       && operands_match_p (operands[2], operands[4]))
-       || (operands_match_p (operands[1], operands[4])
-          && operands_match_p (operands[2], operands[3])))"
-  [(set (match_dup 0)
-       (if_then_else:DF (gt (match_dup 1)
-                            (match_dup 2))
-                        (match_dup 1)
-                        (match_dup 2)))])
+(define_insn "*strmovqi_rex_1"
+  [(set (mem:QI (match_operand:DI 2 "register_operand" "0"))
+       (mem:QI (match_operand:DI 3 "register_operand" "1")))
+   (set (match_operand:DI 0 "register_operand" "=D")
+       (plus:DI (match_dup 2)
+                (const_int 1)))
+   (set (match_operand:DI 1 "register_operand" "=S")
+       (plus:DI (match_dup 3)
+                (const_int 1)))
+   (use (reg:SI DIRFLAG_REG))]
+  "TARGET_64BIT && (TARGET_SINGLE_STRINGOP || optimize_size)"
+  "movsb"
+  [(set_attr "type" "str")
+   (set_attr "memory" "both")
+   (set_attr "mode" "QI")])
 
-(define_split
-  [(set (match_operand:DF 0 "fp_register_operand" "")
-       (if_then_else:DF (gt (match_operand:DF 1 "register_operand" "")
-                            (match_operand:DF 2 "register_operand" ""))
-                        (match_operand:DF 3 "register_operand" "")
-                        (match_operand:DF 4 "register_operand" "")))
-   (clobber (reg:CC 17))]
-  "reload_completed
-   && ((operands_match_p (operands[1], operands[3])
-       && operands_match_p (operands[2], operands[4]))
-       || (operands_match_p (operands[1], operands[4])
-          && operands_match_p (operands[2], operands[3])))"
-  [(set (reg:CCFP 17)
-       (compare:CCFP (match_dup 1)
-                     (match_dup 2)))
-   (set (match_dup 0)
-       (if_then_else:DF (gt (reg:CCFP 17) (const_int 0))
-                        (match_dup 1)
-                        (match_dup 2)))])
+(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" ""))
+             (use (match_dup 4))
+             (use (reg:SI DIRFLAG_REG))])]
+  ""
+  "")
 
-(define_insn "*maxdf_sse"
-  [(set (match_operand:DF 0 "register_operand" "=Y")
-       (if_then_else:DF (gt (match_operand:DF 1 "register_operand" "0")
-                            (match_operand:DF 2 "nonimmediate_operand" "Ym"))
-                        (match_dup 1)
-                        (match_dup 2)))]
-  "TARGET_SSE2 && TARGET_SSE_MATH && reload_completed"
-  "maxsd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sse")
-   (set_attr "mode" "DF")])
-\f
-;; Misc patterns (?)
+(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 (mem:BLK (match_dup 3))
+       (mem:BLK (match_dup 4)))
+   (use (match_dup 5))
+   (use (reg:SI DIRFLAG_REG))]
+  "TARGET_64BIT"
+  "{rep\;movsq|rep movsq}"
+  [(set_attr "type" "str")
+   (set_attr "prefix_rep" "1")
+   (set_attr "memory" "both")
+   (set_attr "mode" "DI")])
 
-;; This pattern exists to put a dependency on all ebp-based memory accesses.
-;; Otherwise there will be nothing to keep
-;; 
-;; [(set (reg ebp) (reg esp))]
-;; [(set (reg esp) (plus (reg esp) (const_int -160000)))
-;;  (clobber (eflags)]
-;; [(set (mem (plus (reg ebp) (const_int -160000))) (const_int 0))]
-;;
-;; in proper program order.
-(define_insn "pro_epilogue_adjust_stack_1"
-  [(set (match_operand:SI 0 "register_operand" "=r,r")
-       (plus:SI (match_operand:SI 1 "register_operand" "0,r")
-                (match_operand:SI 2 "immediate_operand" "i,i")))
-   (clobber (reg:CC 17))
-   (clobber (mem:BLK (scratch)))]
+(define_insn "*rep_movsi"
+  [(set (match_operand:SI 2 "register_operand" "=c") (const_int 0))
+   (set (match_operand:SI 0 "register_operand" "=D") 
+        (plus:SI (ashift:SI (match_operand:SI 5 "register_operand" "2")
+                           (const_int 2))
+                (match_operand:SI 3 "register_operand" "0")))
+   (set (match_operand:SI 1 "register_operand" "=S") 
+        (plus:SI (ashift:SI (match_dup 5) (const_int 2))
+                (match_operand:SI 4 "register_operand" "1")))
+   (set (mem:BLK (match_dup 3))
+       (mem:BLK (match_dup 4)))
+   (use (match_dup 5))
+   (use (reg:SI DIRFLAG_REG))]
   "!TARGET_64BIT"
-{
-  switch (get_attr_type (insn))
-    {
-    case TYPE_IMOV:
-      return "mov{l}\t{%1, %0|%0, %1}";
-
-    case TYPE_ALU:
-      if (GET_CODE (operands[2]) == CONST_INT
-          && (INTVAL (operands[2]) == 128
-             || (INTVAL (operands[2]) < 0
-                 && INTVAL (operands[2]) != -128)))
-       {
-         operands[2] = GEN_INT (-INTVAL (operands[2]));
-         return "sub{l}\t{%2, %0|%0, %2}";
-       }
-      return "add{l}\t{%2, %0|%0, %2}";
-
-    case TYPE_LEA:
-      operands[2] = SET_SRC (XVECEXP (PATTERN (insn), 0, 0));
-      return "lea{l}\t{%a2, %0|%0, %a2}";
-
-    default:
-      abort ();
-    }
-}
-  [(set (attr "type")
-       (cond [(eq_attr "alternative" "0")
-                (const_string "alu")
-              (match_operand:SI 2 "const0_operand" "")
-                (const_string "imov")
-             ]
-             (const_string "lea")))
+  "{rep\;movsl|rep movsd}"
+  [(set_attr "type" "str")
+   (set_attr "prefix_rep" "1")
+   (set_attr "memory" "both")
    (set_attr "mode" "SI")])
 
-(define_insn "pro_epilogue_adjust_stack_rex64"
-  [(set (match_operand:DI 0 "register_operand" "=r,r")
-       (plus:DI (match_operand:DI 1 "register_operand" "0,r")
-                (match_operand:DI 2 "x86_64_immediate_operand" "e,e")))
-   (clobber (reg:CC 17))
-   (clobber (mem:BLK (scratch)))]
+(define_insn "*rep_movsi_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 2))
+                (match_operand:DI 3 "register_operand" "0")))
+   (set (match_operand:DI 1 "register_operand" "=S") 
+        (plus:DI (ashift:DI (match_dup 5) (const_int 2))
+                (match_operand:DI 4 "register_operand" "1")))
+   (set (mem:BLK (match_dup 3))
+       (mem:BLK (match_dup 4)))
+   (use (match_dup 5))
+   (use (reg:SI DIRFLAG_REG))]
   "TARGET_64BIT"
-{
-  switch (get_attr_type (insn))
-    {
-    case TYPE_IMOV:
-      return "mov{q}\t{%1, %0|%0, %1}";
-
-    case TYPE_ALU:
-      if (GET_CODE (operands[2]) == CONST_INT
-         /* Avoid overflows.  */
-         && ((INTVAL (operands[2]) & ((((unsigned int) 1) << 31) - 1)))
-          && (INTVAL (operands[2]) == 128
-             || (INTVAL (operands[2]) < 0
-                 && INTVAL (operands[2]) != -128)))
-       {
-         operands[2] = GEN_INT (-INTVAL (operands[2]));
-         return "sub{q}\t{%2, %0|%0, %2}";
-       }
-      return "add{q}\t{%2, %0|%0, %2}";
-
-    case TYPE_LEA:
-      operands[2] = SET_SRC (XVECEXP (PATTERN (insn), 0, 0));
-      return "lea{q}\t{%a2, %0|%0, %a2}";
-
-    default:
-      abort ();
-    }
-}
-  [(set (attr "type")
-       (cond [(eq_attr "alternative" "0")
-                (const_string "alu")
-              (match_operand:DI 2 "const0_operand" "")
-                (const_string "imov")
-             ]
-             (const_string "lea")))
-   (set_attr "mode" "DI")])
+  "{rep\;movsl|rep movsd}"
+  [(set_attr "type" "str")
+   (set_attr "prefix_rep" "1")
+   (set_attr "memory" "both")
+   (set_attr "mode" "SI")])
 
-(define_insn "pro_epilogue_adjust_stack_rex64_2"
-  [(set (match_operand:DI 0 "register_operand" "=r,r")
-       (plus:DI (match_operand:DI 1 "register_operand" "0,r")
-                (match_operand:DI 3 "immediate_operand" "i,i")))
-   (use (match_operand:DI 2 "register_operand" "r,r"))
-   (clobber (reg:CC 17))
-   (clobber (mem:BLK (scratch)))]
-  "TARGET_64BIT"
-{
-  switch (get_attr_type (insn))
-    {
-    case TYPE_ALU:
-      return "add{q}\t{%2, %0|%0, %2}";
-
-    case TYPE_LEA:
-      operands[2] = gen_rtx_PLUS (DImode, operands[1], operands[2]);
-      return "lea{q}\t{%a2, %0|%0, %a2}";
-
-    default:
-      abort ();
-    }
-}
-  [(set_attr "type" "alu,lea")
-   (set_attr "mode" "DI")])
-
-;; Placeholder for the conditional moves.  This one is split either to SSE
-;; based moves emulation or to usual cmove sequence.  Little bit unfortunate
-;; fact is that compares supported by the cmp??ss instructions are exactly
-;; swapped of those supported by cmove sequence.
-;; The EQ/NE comparisons also needs bit care, since they are not directly
-;; supported by i387 comparisons and we do need to emit two conditional moves
-;; in tandem.
-
-(define_insn "sse_movsfcc"
-  [(set (match_operand:SF 0 "register_operand" "=&x#rf,x#rf,?f#xr,?f#xr,?f#xr,?f#xr,?r#xf,?r#xf,?r#xf,?r#xf")
-       (if_then_else:SF (match_operator 1 "sse_comparison_operator"
-                       [(match_operand:SF 4 "nonimmediate_operand" "0#fx,x#fx,f#x,f#x,xm#f,xm#f,f#x,f#x,xm#f,xm#f")
-                        (match_operand:SF 5 "nonimmediate_operand" "xm#f,xm#f,f#x,f#x,x#f,x#f,f#x,f#x,x#f,x#f")])
-                     (match_operand:SF 2 "nonimmediate_operand" "x#fr,0#fr,f#fx,0#fx,f#fx,0#fx,rm#rx,0#rx,rm#rx,0#rx")
-                     (match_operand:SF 3 "nonimmediate_operand" "x#fr,x#fr,0#fx,f#fx,0#fx,f#fx,0#fx,rm#rx,0#rx,rm#rx")))
-   (clobber (match_scratch:SF 6 "=2,&4,X,X,X,X,X,X,X,X"))
-   (clobber (reg:CC 17))]
-  "TARGET_SSE
-   && (GET_CODE (operands[2]) != MEM || GET_CODE (operands[3]) != MEM)
-   /* Avoid combine from being smart and converting min/max
-      instruction patterns into conditional moves.  */
-   && ((GET_CODE (operands[1]) != LT && GET_CODE (operands[1]) != GT
-       && GET_CODE (operands[1]) != UNLE && GET_CODE (operands[1]) != UNGE)
-       || !rtx_equal_p (operands[4], operands[2])
-       || !rtx_equal_p (operands[5], operands[3]))
-   && (!TARGET_IEEE_FP
-       || (GET_CODE (operands[1]) != EQ && GET_CODE (operands[1]) != NE))"
-  "#")
-
-(define_insn "sse_movsfcc_eq"
-  [(set (match_operand:SF 0 "register_operand" "=&x#rf,x#rf,?f#xr,?f#xr,?r#xf,?r#xf")
-       (if_then_else:SF (eq (match_operand:SF 3 "nonimmediate_operand" "%0#fx,x#fx,f#x,xm#f,f#x,xm#f")
-                            (match_operand:SF 4 "nonimmediate_operand" "xm#f,xm#f,f#x,x#f,f#x,x#f"))
-                     (match_operand:SF 1 "nonimmediate_operand" "x#fr,0#fr,0#fx,0#fx,0#rx,0#rx")
-                     (match_operand:SF 2 "nonimmediate_operand" "x#fr,x#fr,f#fx,f#fx,rm#rx,rm#rx")))
-   (clobber (match_scratch:SF 5 "=1,&3,X,X,X,X"))
-   (clobber (reg:CC 17))]
-  "TARGET_SSE
-   && (GET_CODE (operands[2]) != MEM || GET_CODE (operands[3]) != MEM)"
-  "#")
-
-(define_insn "sse_movdfcc"
-  [(set (match_operand:DF 0 "register_operand" "=&Y#rf,Y#rf,?f#Yr,?f#Yr,?f#Yr,?f#Yr,?r#Yf,?r#Yf,?r#Yf,?r#Yf")
-       (if_then_else:DF (match_operator 1 "sse_comparison_operator"
-                       [(match_operand:DF 4 "nonimmediate_operand" "0#fY,Y#fY,f#Y,f#Y,Ym#f,Ym#f,f#Y,f#Y,Ym#f,Ym#f")
-                        (match_operand:DF 5 "nonimmediate_operand" "Ym#f,Ym#f,f#Y,f#Y,Y#f,Y#f,f#Y,f#Y,Y#f,Y#f")])
-                     (match_operand:DF 2 "nonimmediate_operand" "Y#fr,0#fr,f#fY,0#fY,f#fY,0#fY,rm#rY,0#rY,rm#rY,0#rY")
-                     (match_operand:DF 3 "nonimmediate_operand" "Y#fr,Y#fr,0#fY,f#fY,0#fY,f#fY,0#fY,rm#rY,0#rY,rm#rY")))
-   (clobber (match_scratch:DF 6 "=2,&4,X,X,X,X,X,X,X,X"))
-   (clobber (reg:CC 17))]
-  "TARGET_SSE2
-   && (GET_CODE (operands[2]) != MEM || GET_CODE (operands[3]) != MEM)
-   /* Avoid combine from being smart and converting min/max
-      instruction patterns into conditional moves.  */
-   && ((GET_CODE (operands[1]) != LT && GET_CODE (operands[1]) != GT
-       && GET_CODE (operands[1]) != UNLE && GET_CODE (operands[1]) != UNGE)
-       || !rtx_equal_p (operands[4], operands[2])
-       || !rtx_equal_p (operands[5], operands[3]))
-   && (!TARGET_IEEE_FP
-       || (GET_CODE (operands[1]) != EQ && GET_CODE (operands[1]) != NE))"
-  "#")
-
-(define_insn "sse_movdfcc_eq"
-  [(set (match_operand:DF 0 "register_operand" "=&Y#rf,Y#rf,?f#Yr,?f#Yr,?r#Yf,?r#Yf")
-       (if_then_else:DF (eq (match_operand:DF 3 "nonimmediate_operand" "%0#fY,Y#fY,f#Y,Ym#f,f#Y,Ym#f")
-                            (match_operand:DF 4 "nonimmediate_operand" "Ym#f,Ym#f,f#Y,Y#f,f#Y,Y#f"))
-                     (match_operand:DF 1 "nonimmediate_operand" "Y#fr,0#fr,0#fY,0#fY,0#rY,0#rY")
-                     (match_operand:DF 2 "nonimmediate_operand" "Y#fr,Y#fr,f#fY,f#fY,rm#rY,rm#rY")))
-   (clobber (match_scratch:DF 5 "=1,&3,X,X,X,X"))
-   (clobber (reg:CC 17))]
-  "TARGET_SSE
-   && (GET_CODE (operands[2]) != MEM || GET_CODE (operands[3]) != MEM)"
-  "#")
-
-;; For non-sse moves just expand the usual cmove sequence.
-(define_split
-  [(set (match_operand 0 "register_operand" "")
-       (if_then_else (match_operator 1 "comparison_operator"
-                       [(match_operand 4 "nonimmediate_operand" "")
-                        (match_operand 5 "register_operand" "")])
-                     (match_operand 2 "nonimmediate_operand" "")
-                     (match_operand 3 "nonimmediate_operand" "")))
-   (clobber (match_operand 6 "" ""))
-   (clobber (reg:CC 17))]
-  "!SSE_REG_P (operands[0]) && reload_completed
-   && VALID_SSE_REG_MODE (GET_MODE (operands[0]))"
-  [(const_int 0)]
-{
-   ix86_compare_op0 = operands[5];
-   ix86_compare_op1 = operands[4];
-   operands[1] = gen_rtx_fmt_ee (swap_condition (GET_CODE (operands[1])),
-                                VOIDmode, operands[5], operands[4]);
-   ix86_expand_fp_movcc (operands);
-   DONE;
-})
-
-;; Split SSE based conditional move into sequence:
-;; cmpCC op0, op4   -  set op0 to 0 or ffffffff depending on the comparison
-;; and   op2, op0   -  zero op2 if comparison was false
-;; nand  op0, op3   -  load op3 to op0 if comparison was false
-;; or   op2, op0   -  get the nonzero one into the result.
-(define_split
-  [(set (match_operand 0 "register_operand" "")
-       (if_then_else (match_operator 1 "sse_comparison_operator"
-                       [(match_operand 4 "register_operand" "")
-                        (match_operand 5 "nonimmediate_operand" "")])
-                     (match_operand 2 "register_operand" "")
-                     (match_operand 3 "register_operand" "")))
-   (clobber (match_operand 6 "" ""))
-   (clobber (reg:CC 17))]
-  "SSE_REG_P (operands[0]) && reload_completed"
-  [(set (match_dup 4) (match_op_dup 1 [(match_dup 4) (match_dup 5)]))
-   (set (subreg:TI (match_dup 2) 0) (and:TI (subreg:TI (match_dup 2) 0)
-                                           (subreg:TI (match_dup 4) 0)))
-   (set (subreg:TI (match_dup 4) 0) (and:TI (not:TI (subreg:TI (match_dup 4) 0))
-                                           (subreg:TI (match_dup 3) 0)))
-   (set (subreg:TI (match_dup 0) 0) (ior:TI (subreg:TI (match_dup 6) 0)
-                                           (subreg:TI (match_dup 7) 0)))]
-{
-  if (GET_MODE (operands[2]) == DFmode
-      && TARGET_SSE_PARTIAL_REGS && !optimize_size)
-    {
-      rtx op = simplify_gen_subreg (V2DFmode, operands[2], DFmode, 0);
-      emit_insn (gen_sse2_unpcklpd (op, op, op));
-      op = simplify_gen_subreg (V2DFmode, operands[3], DFmode, 0);
-      emit_insn (gen_sse2_unpcklpd (op, op, op));
-    }
-
-  /* If op2 == op3, op3 would be clobbered before it is used.  */
-  if (operands_match_p (operands[2], operands[3]))
-    {
-      emit_move_insn (operands[0], operands[2]);
-      DONE;
-    }
-
-  PUT_MODE (operands[1], GET_MODE (operands[0]));
-  if (operands_match_p (operands[0], operands[4]))
-    operands[6] = operands[4], operands[7] = operands[2];
-  else
-    operands[6] = operands[2], operands[7] = operands[4];
-})
-
-;; Special case of conditional move we can handle effectively.
-;; Do not brother with the integer/floating point case, since these are
-;; bot considerably slower, unlike in the generic case.
-(define_insn "*sse_movsfcc_const0_1"
-  [(set (match_operand:SF 0 "register_operand" "=&x")
-       (if_then_else:SF (match_operator 1 "sse_comparison_operator"
-                       [(match_operand:SF 4 "register_operand" "0")
-                        (match_operand:SF 5 "nonimmediate_operand" "xm")])
-                     (match_operand:SF 2 "register_operand" "x")
-                     (match_operand:SF 3 "const0_operand" "X")))]
-  "TARGET_SSE"
-  "#")
-
-(define_insn "*sse_movsfcc_const0_2"
-  [(set (match_operand:SF 0 "register_operand" "=&x")
-       (if_then_else:SF (match_operator 1 "sse_comparison_operator"
-                       [(match_operand:SF 4 "register_operand" "0")
-                        (match_operand:SF 5 "nonimmediate_operand" "xm")])
-                     (match_operand:SF 2 "const0_operand" "X")
-                     (match_operand:SF 3 "register_operand" "x")))]
-  "TARGET_SSE"
-  "#")
-
-(define_insn "*sse_movsfcc_const0_3"
-  [(set (match_operand:SF 0 "register_operand" "=&x")
-       (if_then_else:SF (match_operator 1 "fcmov_comparison_operator"
-                       [(match_operand:SF 4 "nonimmediate_operand" "xm")
-                        (match_operand:SF 5 "register_operand" "0")])
-                     (match_operand:SF 2 "register_operand" "x")
-                     (match_operand:SF 3 "const0_operand" "X")))]
-  "TARGET_SSE"
-  "#")
-
-(define_insn "*sse_movsfcc_const0_4"
-  [(set (match_operand:SF 0 "register_operand" "=&x")
-       (if_then_else:SF (match_operator 1 "fcmov_comparison_operator"
-                       [(match_operand:SF 4 "nonimmediate_operand" "xm")
-                        (match_operand:SF 5 "register_operand" "0")])
-                     (match_operand:SF 2 "const0_operand" "X")
-                     (match_operand:SF 3 "register_operand" "x")))]
-  "TARGET_SSE"
-  "#")
-
-(define_insn "*sse_movdfcc_const0_1"
-  [(set (match_operand:DF 0 "register_operand" "=&Y")
-       (if_then_else:DF (match_operator 1 "sse_comparison_operator"
-                       [(match_operand:DF 4 "register_operand" "0")
-                        (match_operand:DF 5 "nonimmediate_operand" "Ym")])
-                     (match_operand:DF 2 "register_operand" "Y")
-                     (match_operand:DF 3 "const0_operand" "X")))]
-  "TARGET_SSE2"
-  "#")
-
-(define_insn "*sse_movdfcc_const0_2"
-  [(set (match_operand:DF 0 "register_operand" "=&Y")
-       (if_then_else:DF (match_operator 1 "sse_comparison_operator"
-                       [(match_operand:DF 4 "register_operand" "0")
-                        (match_operand:DF 5 "nonimmediate_operand" "Ym")])
-                     (match_operand:DF 2 "const0_operand" "X")
-                     (match_operand:DF 3 "register_operand" "Y")))]
-  "TARGET_SSE2"
-  "#")
-
-(define_insn "*sse_movdfcc_const0_3"
-  [(set (match_operand:DF 0 "register_operand" "=&Y")
-       (if_then_else:DF (match_operator 1 "fcmov_comparison_operator"
-                       [(match_operand:DF 4 "nonimmediate_operand" "Ym")
-                        (match_operand:DF 5 "register_operand" "0")])
-                     (match_operand:DF 2 "register_operand" "Y")
-                     (match_operand:DF 3 "const0_operand" "X")))]
-  "TARGET_SSE2"
-  "#")
-
-(define_insn "*sse_movdfcc_const0_4"
-  [(set (match_operand:DF 0 "register_operand" "=&Y")
-       (if_then_else:DF (match_operator 1 "fcmov_comparison_operator"
-                       [(match_operand:DF 4 "nonimmediate_operand" "Ym")
-                        (match_operand:DF 5 "register_operand" "0")])
-                     (match_operand:DF 2 "const0_operand" "X")
-                     (match_operand:DF 3 "register_operand" "Y")))]
-  "TARGET_SSE2"
-  "#")
-
-(define_split
-  [(set (match_operand 0 "register_operand" "")
-       (if_then_else (match_operator 1 "comparison_operator"
-                       [(match_operand 4 "nonimmediate_operand" "")
-                        (match_operand 5 "nonimmediate_operand" "")])
-                     (match_operand 2 "nonmemory_operand" "")
-                     (match_operand 3 "nonmemory_operand" "")))]
-  "SSE_REG_P (operands[0]) && reload_completed
-   && (const0_operand (operands[2], GET_MODE (operands[0]))
-       || const0_operand (operands[3], GET_MODE (operands[0])))"
-  [(set (match_dup 0) (match_op_dup 1 [(match_dup 0) (match_dup 5)]))
-   (set (subreg:TI (match_dup 0) 0) (and:TI (match_dup 6)
-                                           (match_dup 7)))]
-{
-  if (TARGET_SSE_PARTIAL_REGS && !optimize_size
-      && GET_MODE (operands[2]) == DFmode)
-    {
-      if (REG_P (operands[2]))
-       {
-         rtx op = simplify_gen_subreg (V2DFmode, operands[2], DFmode, 0);
-         emit_insn (gen_sse2_unpcklpd (op, op, op));
-       }
-      if (REG_P (operands[3]))
-       {
-         rtx op = simplify_gen_subreg (V2DFmode, operands[3], DFmode, 0);
-         emit_insn (gen_sse2_unpcklpd (op, op, op));
-       }
-    }
-  PUT_MODE (operands[1], GET_MODE (operands[0]));
-  if (!sse_comparison_operator (operands[1], VOIDmode)
-      || !rtx_equal_p (operands[0], operands[4]))
-    {
-      rtx tmp = operands[5];
-      operands[5] = operands[4];
-      operands[4] = tmp;
-      PUT_CODE (operands[1], swap_condition (GET_CODE (operands[1])));
-    }
-  if (!rtx_equal_p (operands[0], operands[4]))
-    abort ();
-  if (const0_operand (operands[2], GET_MODE (operands[0])))
-    {
-      operands[7] = operands[3];
-      operands[6] = gen_rtx_NOT (TImode, gen_rtx_SUBREG (TImode, operands[0],
-                                                        0));
-    }
-  else
-    {
-      operands[7] = operands[2];
-      operands[6] = gen_rtx_SUBREG (TImode, operands[0], 0);
-    }
-  operands[7] = simplify_gen_subreg (TImode, operands[7],
-                                    GET_MODE (operands[7]), 0);
-})
-
-(define_expand "allocate_stack_worker"
-  [(match_operand:SI 0 "register_operand" "")]
-  "TARGET_STACK_PROBE"
-{
-  if (reload_completed)
-    {
-      if (TARGET_64BIT)
-       emit_insn (gen_allocate_stack_worker_rex64_postreload (operands[0]));
-      else
-       emit_insn (gen_allocate_stack_worker_postreload (operands[0]));
-    }
-  else
-    {
-      if (TARGET_64BIT)
-       emit_insn (gen_allocate_stack_worker_rex64 (operands[0]));
-      else
-       emit_insn (gen_allocate_stack_worker_1 (operands[0]));
-    }
-  DONE;
-})
-
-(define_insn "allocate_stack_worker_1"
-  [(unspec:SI [(match_operand:SI 0 "register_operand" "a")] UNSPEC_STACK_PROBE)
-   (set (reg:SI 7) (minus:SI (reg:SI 7) (match_dup 0)))
-   (clobber (match_scratch:SI 1 "=0"))
-   (clobber (reg:CC 17))]
-  "!TARGET_64BIT && TARGET_STACK_PROBE"
-  "call\t__alloca"
-  [(set_attr "type" "multi")
-   (set_attr "length" "5")])
-
-(define_expand "allocate_stack_worker_postreload"
-  [(parallel [(unspec:SI [(match_operand:SI 0 "register_operand" "a")]
-                          UNSPEC_STACK_PROBE)
-             (set (reg:SI 7) (minus:SI (reg:SI 7) (match_dup 0)))
-             (clobber (match_dup 0))
-             (clobber (reg:CC 17))])]
-  ""
-  "")
-
-(define_insn "allocate_stack_worker_rex64"
-  [(unspec:DI [(match_operand:DI 0 "register_operand" "a")] UNSPEC_STACK_PROBE)
-   (set (reg:DI 7) (minus:DI (reg:DI 7) (match_dup 0)))
-   (clobber (match_scratch:DI 1 "=0"))
-   (clobber (reg:CC 17))]
-  "TARGET_64BIT && TARGET_STACK_PROBE"
-  "call\t__alloca"
-  [(set_attr "type" "multi")
-   (set_attr "length" "5")])
-
-(define_expand "allocate_stack_worker_rex64_postreload"
-  [(parallel [(unspec:DI [(match_operand:DI 0 "register_operand" "a")]
-                          UNSPEC_STACK_PROBE)
-             (set (reg:DI 7) (minus:DI (reg:DI 7) (match_dup 0)))
-             (clobber (match_dup 0))
-             (clobber (reg:CC 17))])]
-  ""
-  "")
-
-(define_expand "allocate_stack"
-  [(parallel [(set (match_operand:SI 0 "register_operand" "=r")
-                  (minus:SI (reg:SI 7)
-                            (match_operand:SI 1 "general_operand" "")))
-             (clobber (reg:CC 17))])
-   (parallel [(set (reg:SI 7)
-                  (minus:SI (reg:SI 7) (match_dup 1)))
-             (clobber (reg:CC 17))])]
-  "TARGET_STACK_PROBE"
-{
-#ifdef CHECK_STACK_LIMIT
-  if (GET_CODE (operands[1]) == CONST_INT
-      && INTVAL (operands[1]) < CHECK_STACK_LIMIT)
-    emit_insn (gen_subsi3 (stack_pointer_rtx, stack_pointer_rtx,
-                          operands[1]));
-  else 
-#endif
-    emit_insn (gen_allocate_stack_worker (copy_to_mode_reg (SImode,
-                                                           operands[1])));
-
-  emit_move_insn (operands[0], virtual_stack_dynamic_rtx);
-  DONE;
-})
-
-(define_expand "builtin_setjmp_receiver"
-  [(label_ref (match_operand 0 "" ""))]
-  "!TARGET_64BIT && flag_pic"
-{
-  emit_insn (gen_set_got (pic_offset_table_rtx));
-  DONE;
-})
-\f
-;; Avoid redundant prefixes by splitting HImode arithmetic to SImode.
-
-(define_split
-  [(set (match_operand 0 "register_operand" "")
-       (match_operator 3 "promotable_binary_operator"
-          [(match_operand 1 "register_operand" "")
-           (match_operand 2 "aligned_operand" "")]))
-   (clobber (reg:CC 17))]
-  "! TARGET_PARTIAL_REG_STALL && reload_completed
-   && ((GET_MODE (operands[0]) == HImode 
-       && ((!optimize_size && !TARGET_FAST_PREFIX)
-           || GET_CODE (operands[2]) != CONST_INT
-           || CONST_OK_FOR_LETTER_P (INTVAL (operands[2]), 'K')))
-       || (GET_MODE (operands[0]) == QImode 
-          && (TARGET_PROMOTE_QImode || optimize_size)))"
-  [(parallel [(set (match_dup 0)
-                  (match_op_dup 3 [(match_dup 1) (match_dup 2)]))
-             (clobber (reg:CC 17))])]
-  "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 (reg 17)
-       (compare (and (match_operand 1 "aligned_operand" "")
-                     (match_operand 2 "const_int_operand" ""))
-                (const_int 0)))
-   (set (match_operand 0 "register_operand" "")
-       (and (match_dup 1) (match_dup 2)))]
-  "! TARGET_PARTIAL_REG_STALL && reload_completed
-   /* Ensure that the operand will remain sign-extended immediate.  */
-   && ix86_match_ccmode (insn, INTVAL (operands[2]) >= 0 ? CCNOmode : CCZmode)
-   && ! optimize_size
-   && ((GET_MODE (operands[0]) == HImode && ! TARGET_FAST_PREFIX)
-       || (GET_MODE (operands[0]) == QImode && TARGET_PROMOTE_QImode))"
-  [(parallel [(set (reg:CCNO 17)
-                  (compare:CCNO (and:SI (match_dup 1) (match_dup 2))
-                                (const_int 0)))
-             (set (match_dup 0)
-                  (and:SI (match_dup 1) (match_dup 2)))])]
-  "operands[2]
-     = gen_int_mode (INTVAL (operands[2])
-                    & GET_MODE_MASK (GET_MODE (operands[0])),
-                    SImode);
-   operands[0] = gen_lowpart (SImode, operands[0]);
-   operands[1] = gen_lowpart (SImode, operands[1]);")
-
-; Don't promote the QImode tests, as i386 doesn't have encoding of
-; the TEST instruction with 32-bit sign-extended immediate and thus
-; the instruction size would at least double, which is not what we
-; want even with ! optimize_size.
-(define_split
-  [(set (reg 17)
-       (compare (and (match_operand:HI 0 "aligned_operand" "")
-                     (match_operand:HI 1 "const_int_operand" ""))
-                (const_int 0)))]
-  "! TARGET_PARTIAL_REG_STALL && reload_completed
-   /* Ensure that the operand will remain sign-extended immediate.  */
-   && ix86_match_ccmode (insn, INTVAL (operands[1]) >= 0 ? CCNOmode : CCZmode)
-   && ! TARGET_FAST_PREFIX
-   && ! optimize_size"
-  [(set (reg:CCNO 17)
-       (compare:CCNO (and:SI (match_dup 0) (match_dup 1))
-                     (const_int 0)))]
-  "operands[1]
-     = gen_int_mode (INTVAL (operands[1])
-                    & GET_MODE_MASK (GET_MODE (operands[0])),
-                    SImode);
-   operands[0] = gen_lowpart (SImode, operands[0]);")
-
-(define_split
-  [(set (match_operand 0 "register_operand" "")
-       (neg (match_operand 1 "register_operand" "")))
-   (clobber (reg:CC 17))]
-  "! TARGET_PARTIAL_REG_STALL && reload_completed
-   && (GET_MODE (operands[0]) == HImode
-       || (GET_MODE (operands[0]) == QImode 
-          && (TARGET_PROMOTE_QImode || optimize_size)))"
-  [(parallel [(set (match_dup 0)
-                  (neg:SI (match_dup 1)))
-             (clobber (reg:CC 17))])]
-  "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" "")))]
-  "! TARGET_PARTIAL_REG_STALL && reload_completed
-   && (GET_MODE (operands[0]) == HImode
-       || (GET_MODE (operands[0]) == QImode 
-          && (TARGET_PROMOTE_QImode || optimize_size)))"
-  [(set (match_dup 0)
-       (not:SI (match_dup 1)))]
-  "operands[0] = gen_lowpart (SImode, operands[0]);
-   operands[1] = gen_lowpart (SImode, operands[1]);")
-
-(define_split 
-  [(set (match_operand 0 "register_operand" "")
-       (if_then_else (match_operator 1 "comparison_operator" 
-                               [(reg 17) (const_int 0)])
-                     (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 
-          && (TARGET_PROMOTE_QImode || optimize_size)))"
-  [(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]);")
-                       
-\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:SI 0 "push_operand" "")
-       (match_operand:SI 1 "memory_operand" ""))
-   (match_scratch:SI 2 "r")]
-  "! optimize_size && ! TARGET_PUSH_MEMORY"
-  [(set (match_dup 2) (match_dup 1))
-   (set (match_dup 0) (match_dup 2))]
-  "")
-
-(define_peephole2
-  [(set (match_operand:DI 0 "push_operand" "")
-       (match_operand:DI 1 "memory_operand" ""))
-   (match_scratch:DI 2 "r")]
-  "! optimize_size && ! TARGET_PUSH_MEMORY"
-  [(set (match_dup 2) (match_dup 1))
-   (set (match_dup 0) (match_dup 2))]
-  "")
-
-;; We need to handle SFmode only, because DFmode and XFmode is split to
-;; SImode pushes.
-(define_peephole2
-  [(set (match_operand:SF 0 "push_operand" "")
-       (match_operand:SF 1 "memory_operand" ""))
-   (match_scratch:SF 2 "r")]
-  "! optimize_size && ! TARGET_PUSH_MEMORY"
-  [(set (match_dup 2) (match_dup 1))
-   (set (match_dup 0) (match_dup 2))]
-  "")
-
-(define_peephole2
-  [(set (match_operand:HI 0 "push_operand" "")
-       (match_operand:HI 1 "memory_operand" ""))
-   (match_scratch:HI 2 "r")]
-  "! optimize_size && ! TARGET_PUSH_MEMORY"
-  [(set (match_dup 2) (match_dup 1))
-   (set (match_dup 0) (match_dup 2))]
-  "")
-
-(define_peephole2
-  [(set (match_operand:QI 0 "push_operand" "")
-       (match_operand:QI 1 "memory_operand" ""))
-   (match_scratch:QI 2 "q")]
-  "! optimize_size && ! TARGET_PUSH_MEMORY"
-  [(set (match_dup 2) (match_dup 1))
-   (set (match_dup 0) (match_dup 2))]
-  "")
-
-;; Don't move an immediate directly to memory when the instruction
-;; gets too big.
-(define_peephole2
-  [(match_scratch:SI 1 "r")
-   (set (match_operand:SI 0 "memory_operand" "")
-        (const_int 0))]
-  "! optimize_size
-   && ! TARGET_USE_MOV0
-   && TARGET_SPLIT_LONG_MOVES
-   && get_attr_length (insn) >= ix86_cost->large_insn
-   && peep2_regno_dead_p (0, FLAGS_REG)"
-  [(parallel [(set (match_dup 1) (const_int 0))
-             (clobber (reg:CC 17))])
-   (set (match_dup 0) (match_dup 1))]
-  "")
-
-(define_peephole2
-  [(match_scratch:HI 1 "r")
-   (set (match_operand:HI 0 "memory_operand" "")
-        (const_int 0))]
-  "! optimize_size
-   && ! TARGET_USE_MOV0
-   && TARGET_SPLIT_LONG_MOVES
-   && get_attr_length (insn) >= ix86_cost->large_insn
-   && peep2_regno_dead_p (0, FLAGS_REG)"
-  [(parallel [(set (match_dup 2) (const_int 0))
-             (clobber (reg:CC 17))])
-   (set (match_dup 0) (match_dup 1))]
-  "operands[2] = gen_lowpart (SImode, operands[1]);")
-
-(define_peephole2
-  [(match_scratch:QI 1 "q")
-   (set (match_operand:QI 0 "memory_operand" "")
-        (const_int 0))]
-  "! optimize_size
-   && ! TARGET_USE_MOV0
-   && TARGET_SPLIT_LONG_MOVES
-   && get_attr_length (insn) >= ix86_cost->large_insn
-   && peep2_regno_dead_p (0, FLAGS_REG)"
-  [(parallel [(set (match_dup 2) (const_int 0))
-             (clobber (reg:CC 17))])
-   (set (match_dup 0) (match_dup 1))]
-  "operands[2] = gen_lowpart (SImode, operands[1]);")
-
-(define_peephole2
-  [(match_scratch:SI 2 "r")
-   (set (match_operand:SI 0 "memory_operand" "")
-        (match_operand:SI 1 "immediate_operand" ""))]
-  "! optimize_size
-   && get_attr_length (insn) >= ix86_cost->large_insn
-   && TARGET_SPLIT_LONG_MOVES"
-  [(set (match_dup 2) (match_dup 1))
-   (set (match_dup 0) (match_dup 2))]
-  "")
-
-(define_peephole2
-  [(match_scratch:HI 2 "r")
-   (set (match_operand:HI 0 "memory_operand" "")
-        (match_operand:HI 1 "immediate_operand" ""))]
-  "! optimize_size && get_attr_length (insn) >= ix86_cost->large_insn
-  && TARGET_SPLIT_LONG_MOVES"
-  [(set (match_dup 2) (match_dup 1))
-   (set (match_dup 0) (match_dup 2))]
-  "")
-
-(define_peephole2
-  [(match_scratch:QI 2 "q")
-   (set (match_operand:QI 0 "memory_operand" "")
-        (match_operand:QI 1 "immediate_operand" ""))]
-  "! optimize_size && get_attr_length (insn) >= ix86_cost->large_insn
-  && TARGET_SPLIT_LONG_MOVES"
-  [(set (match_dup 2) (match_dup 1))
-   (set (match_dup 0) (match_dup 2))]
-  "")
-
-;; Don't compare memory with zero, load and use a test instead.
-(define_peephole2
-  [(set (reg 17)
-       (compare (match_operand:SI 0 "memory_operand" "")
-                (const_int 0)))
-   (match_scratch:SI 3 "r")]
-  "ix86_match_ccmode (insn, CCNOmode) && ! optimize_size"
-  [(set (match_dup 3) (match_dup 0))
-   (set (reg:CCNO 17) (compare:CCNO (match_dup 3) (const_int 0)))]
-  "")
-
-;; NOT is not pairable on Pentium, while XOR is, but one byte longer. 
-;; Don't split NOTs with a displacement operand, because resulting XOR
-;; will not be pairable anyway.
-;;
-;; On AMD K6, NOT is vector decoded with memory operand that can not be
-;; represented using a modRM byte.  The XOR replacement is long decoded,
-;; so this split helps here as well.
-;;
-;; Note: Can't do this as a regular split because we can't get proper
-;; lifetime information then.
-
-(define_peephole2
-  [(set (match_operand:SI 0 "nonimmediate_operand" "")
-       (not:SI (match_operand:SI 1 "nonimmediate_operand" "")))]
-  "!optimize_size
-   && peep2_regno_dead_p (0, FLAGS_REG)
-   && ((TARGET_PENTIUM 
-        && (GET_CODE (operands[0]) != MEM
-            || !memory_displacement_operand (operands[0], SImode)))
-       || (TARGET_K6 && long_memory_operand (operands[0], SImode)))"
-  [(parallel [(set (match_dup 0)
-                  (xor:SI (match_dup 1) (const_int -1)))
-             (clobber (reg:CC 17))])]
-  "")
-
-(define_peephole2
-  [(set (match_operand:HI 0 "nonimmediate_operand" "")
-       (not:HI (match_operand:HI 1 "nonimmediate_operand" "")))]
-  "!optimize_size
-   && peep2_regno_dead_p (0, FLAGS_REG)
-   && ((TARGET_PENTIUM 
-        && (GET_CODE (operands[0]) != MEM
-            || !memory_displacement_operand (operands[0], HImode)))
-       || (TARGET_K6 && long_memory_operand (operands[0], HImode)))"
-  [(parallel [(set (match_dup 0)
-                  (xor:HI (match_dup 1) (const_int -1)))
-             (clobber (reg:CC 17))])]
-  "")
-
-(define_peephole2
-  [(set (match_operand:QI 0 "nonimmediate_operand" "")
-       (not:QI (match_operand:QI 1 "nonimmediate_operand" "")))]
-  "!optimize_size
-   && peep2_regno_dead_p (0, FLAGS_REG)
-   && ((TARGET_PENTIUM 
-        && (GET_CODE (operands[0]) != MEM
-            || !memory_displacement_operand (operands[0], QImode)))
-       || (TARGET_K6 && long_memory_operand (operands[0], QImode)))"
-  [(parallel [(set (match_dup 0)
-                  (xor:QI (match_dup 1) (const_int -1)))
-             (clobber (reg:CC 17))])]
-  "")
-
-;; Non pairable "test imm, reg" instructions can be translated to
-;; "and imm, reg" if reg dies.  The "and" form is also shorter (one
-;; byte opcode instead of two, have a short form for byte operands),
-;; so do it for other CPUs as well.  Given that the value was dead,
-;; this should not create any new dependencies.  Pass on the sub-word
-;; versions if we're concerned about partial register stalls.
-
-(define_peephole2
-  [(set (reg 17)
-       (compare (and:SI (match_operand:SI 0 "register_operand" "")
-                        (match_operand:SI 1 "immediate_operand" ""))
-                (const_int 0)))]
-  "ix86_match_ccmode (insn, CCNOmode)
-   && (true_regnum (operands[0]) != 0
-       || (GET_CODE (operands[1]) == CONST_INT
-          && CONST_OK_FOR_LETTER_P (INTVAL (operands[1]), 'K')))
-   && find_regno_note (insn, REG_DEAD, true_regnum (operands[0]))"
-  [(parallel
-     [(set (reg:CCNO 17)
-          (compare:CCNO (and:SI (match_dup 0)
-                                (match_dup 1))
-                        (const_int 0)))
-      (set (match_dup 0)
-          (and:SI (match_dup 0) (match_dup 1)))])]
-  "")
-
-;; We don't need to handle HImode case, because it will be promoted to SImode
-;; on ! TARGET_PARTIAL_REG_STALL
-
-(define_peephole2
-  [(set (reg 17)
-       (compare (and:QI (match_operand:QI 0 "register_operand" "")
-                        (match_operand:QI 1 "immediate_operand" ""))
-                (const_int 0)))]
-  "! TARGET_PARTIAL_REG_STALL
-   && ix86_match_ccmode (insn, CCNOmode)
-   && true_regnum (operands[0]) != 0
-   && find_regno_note (insn, REG_DEAD, true_regnum (operands[0]))"
-  [(parallel
-     [(set (reg:CCNO 17)
-          (compare:CCNO (and:QI (match_dup 0)
-                                (match_dup 1))
-                        (const_int 0)))
-      (set (match_dup 0)
-          (and:QI (match_dup 0) (match_dup 1)))])]
-  "")
-
-(define_peephole2
-  [(set (reg 17)
-       (compare
-         (and:SI
-           (zero_extract:SI
-             (match_operand 0 "ext_register_operand" "")
-             (const_int 8)
-             (const_int 8))
-           (match_operand 1 "const_int_operand" ""))
-         (const_int 0)))]
-  "! TARGET_PARTIAL_REG_STALL
-   && ix86_match_ccmode (insn, CCNOmode)
-   && true_regnum (operands[0]) != 0
-   && find_regno_note (insn, REG_DEAD, true_regnum (operands[0]))"
-  [(parallel [(set (reg:CCNO 17)
-                  (compare:CCNO
-                      (and:SI
-                        (zero_extract:SI
-                        (match_dup 0)
-                        (const_int 8)
-                        (const_int 8))
-                       (match_dup 1))
-                  (const_int 0)))
-             (set (zero_extract:SI (match_dup 0)
-                                   (const_int 8)
-                                   (const_int 8))
-                  (and:SI 
-                    (zero_extract:SI
-                      (match_dup 0)
-                      (const_int 8)
-                      (const_int 8))
-                    (match_dup 1)))])]
-  "")
-
-;; Don't do logical operations with memory inputs.
-(define_peephole2
-  [(match_scratch:SI 2 "r")
-   (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" "")]))
-              (clobber (reg:CC 17))])]
-  "! optimize_size && ! TARGET_READ_MODIFY"
-  [(set (match_dup 2) (match_dup 1))
-   (parallel [(set (match_dup 0)
-                   (match_op_dup 3 [(match_dup 0) (match_dup 2)]))
-              (clobber (reg:CC 17))])]
-  "")
-
-(define_peephole2
-  [(match_scratch:SI 2 "r")
-   (parallel [(set (match_operand:SI 0 "register_operand" "")
-                   (match_operator:SI 3 "arith_or_logical_operator"
-                     [(match_operand:SI 1 "memory_operand" "")
-                      (match_dup 0)]))
-              (clobber (reg:CC 17))])]
-  "! optimize_size && ! TARGET_READ_MODIFY"
-  [(set (match_dup 2) (match_dup 1))
-   (parallel [(set (match_dup 0)
-                   (match_op_dup 3 [(match_dup 2) (match_dup 0)]))
-              (clobber (reg:CC 17))])]
-  "")
-
-; Don't do logical operations with memory outputs
-;
-; These two don't make sense for PPro/PII -- we're expanding a 4-uop
-; instruction into two 1-uop insns plus a 2-uop insn.  That last has
-; the same decoder scheduling characteristics as the original.
-
-(define_peephole2
-  [(match_scratch:SI 2 "r")
-   (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" "")]))
-              (clobber (reg:CC 17))])]
-  "! optimize_size && ! TARGET_READ_MODIFY_WRITE"
-  [(set (match_dup 2) (match_dup 0))
-   (parallel [(set (match_dup 2)
-                   (match_op_dup 3 [(match_dup 2) (match_dup 1)]))
-              (clobber (reg:CC 17))])
-   (set (match_dup 0) (match_dup 2))]
-  "")
-
-(define_peephole2
-  [(match_scratch:SI 2 "r")
-   (parallel [(set (match_operand:SI 0 "memory_operand" "")
-                   (match_operator:SI 3 "arith_or_logical_operator"
-                     [(match_operand:SI 1 "nonmemory_operand" "")
-                      (match_dup 0)]))
-              (clobber (reg:CC 17))])]
-  "! optimize_size && ! TARGET_READ_MODIFY_WRITE"
-  [(set (match_dup 2) (match_dup 0))
-   (parallel [(set (match_dup 2)
-                   (match_op_dup 3 [(match_dup 1) (match_dup 2)]))
-              (clobber (reg:CC 17))])
-   (set (match_dup 0) (match_dup 2))]
-  "")
-
-;; Attempt to always use XOR for zeroing registers.
-(define_peephole2
-  [(set (match_operand 0 "register_operand" "")
-       (const_int 0))]
-  "(GET_MODE (operands[0]) == QImode
-    || GET_MODE (operands[0]) == HImode
-    || GET_MODE (operands[0]) == SImode
-    || (GET_MODE (operands[0]) == DImode && TARGET_64BIT))
-   && (! TARGET_USE_MOV0 || optimize_size)
-   && peep2_regno_dead_p (0, FLAGS_REG)"
-  [(parallel [(set (match_dup 0) (const_int 0))
-             (clobber (reg:CC 17))])]
-  "operands[0] = gen_lowpart (GET_MODE (operands[0]) == DImode ? DImode : SImode,
-                             operands[0]);")
-
-(define_peephole2
-  [(set (strict_low_part (match_operand 0 "register_operand" ""))
-       (const_int 0))]
-  "(GET_MODE (operands[0]) == QImode
-    || GET_MODE (operands[0]) == HImode)
-   && (! TARGET_USE_MOV0 || optimize_size)
-   && peep2_regno_dead_p (0, FLAGS_REG)"
-  [(parallel [(set (strict_low_part (match_dup 0)) (const_int 0))
-             (clobber (reg:CC 17))])])
-
-;; For HI and SI modes, or $-1,reg is smaller than mov $-1,reg.
-(define_peephole2
-  [(set (match_operand 0 "register_operand" "")
-       (const_int -1))]
-  "(GET_MODE (operands[0]) == HImode
-    || GET_MODE (operands[0]) == SImode 
-    || (GET_MODE (operands[0]) == DImode && TARGET_64BIT))
-   && (optimize_size || TARGET_PENTIUM)
-   && peep2_regno_dead_p (0, FLAGS_REG)"
-  [(parallel [(set (match_dup 0) (const_int -1))
-             (clobber (reg:CC 17))])]
-  "operands[0] = gen_lowpart (GET_MODE (operands[0]) == DImode ? DImode : SImode,
-                             operands[0]);")
-
-;; Attempt to convert simple leas to adds. These can be created by
-;; move expanders.
-(define_peephole2
-  [(set (match_operand:SI 0 "register_operand" "")
-       (plus:SI (match_dup 0)
-                (match_operand:SI 1 "nonmemory_operand" "")))]
-  "peep2_regno_dead_p (0, FLAGS_REG)"
-  [(parallel [(set (match_dup 0) (plus:SI (match_dup 0) (match_dup 1)))
-             (clobber (reg:CC 17))])]
-  "")
-
-(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))]
-  "peep2_regno_dead_p (0, FLAGS_REG) && REGNO (operands[0]) == REGNO (operands[1])"
-  [(parallel [(set (match_dup 0) (plus:SI (match_dup 0) (match_dup 2)))
-             (clobber (reg:CC 17))])]
-  "operands[2] = gen_lowpart (SImode, operands[2]);")
-
-(define_peephole2
-  [(set (match_operand:DI 0 "register_operand" "")
-       (plus:DI (match_dup 0)
-                (match_operand:DI 1 "x86_64_general_operand" "")))]
-  "peep2_regno_dead_p (0, FLAGS_REG)"
-  [(parallel [(set (match_dup 0) (plus:DI (match_dup 0) (match_dup 1)))
-             (clobber (reg:CC 17))])]
-  "")
-
-(define_peephole2
-  [(set (match_operand:SI 0 "register_operand" "")
-       (mult:SI (match_dup 0)
-                (match_operand:SI 1 "const_int_operand" "")))]
-  "exact_log2 (INTVAL (operands[1])) >= 0
-   && peep2_regno_dead_p (0, FLAGS_REG)"
-  [(parallel [(set (match_dup 0) (ashift:SI (match_dup 0) (match_dup 2)))
-             (clobber (reg:CC 17))])]
-  "operands[2] = GEN_INT (exact_log2 (INTVAL (operands[1])));")
-
-(define_peephole2
-  [(set (match_operand:DI 0 "register_operand" "")
-       (mult:DI (match_dup 0)
-                (match_operand:DI 1 "const_int_operand" "")))]
-  "exact_log2 (INTVAL (operands[1])) >= 0
-   && peep2_regno_dead_p (0, FLAGS_REG)"
-  [(parallel [(set (match_dup 0) (ashift:DI (match_dup 0) (match_dup 2)))
-             (clobber (reg:CC 17))])]
-  "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))]
-  "exact_log2 (INTVAL (operands[2])) >= 0
-   && REGNO (operands[0]) == REGNO (operands[1])
-   && peep2_regno_dead_p (0, FLAGS_REG)"
-  [(parallel [(set (match_dup 0) (ashift:SI (match_dup 0) (match_dup 2)))
-             (clobber (reg:CC 17))])]
-  "operands[2] = GEN_INT (exact_log2 (INTVAL (operands[2])));")
-
-;; The ESP adjustments can be done by the push and pop instructions.  Resulting
-;; code is shorter, since push is only 1 byte, while add imm, %esp 3 bytes.  On
-;; many CPUs it is also faster, since special hardware to avoid esp
-;; dependencies is present.
-
-;; While some of these conversions may be done using splitters, we use peepholes
-;; in order to allow combine_stack_adjustments pass to see nonobfuscated RTL.
-
-;; Convert prologue esp subtractions to push.
-;; We need register to push.  In order to keep verify_flow_info happy we have
-;; two choices
-;; - use scratch and clobber it in order to avoid dependencies
-;; - use already live register
-;; We can't use the second way right now, since there is no reliable way how to
-;; verify that given register is live.  First choice will also most likely in
-;; fewer dependencies.  On the place of esp adjustments it is very likely that
-;; call clobbered registers are dead.  We may want to use base pointer as an
-;; alternative when no register is available later.
-
-(define_peephole2
-  [(match_scratch:SI 0 "r")
-   (parallel [(set (reg:SI 7) (plus:SI (reg:SI 7) (const_int -4)))
-             (clobber (reg:CC 17))
-             (clobber (mem:BLK (scratch)))])]
-  "optimize_size || !TARGET_SUB_ESP_4"
-  [(clobber (match_dup 0))
-   (parallel [(set (mem:SI (pre_dec:SI (reg:SI 7))) (match_dup 0))
-             (clobber (mem:BLK (scratch)))])])
-
-(define_peephole2
-  [(match_scratch:SI 0 "r")
-   (parallel [(set (reg:SI 7) (plus:SI (reg:SI 7) (const_int -8)))
-             (clobber (reg:CC 17))
-             (clobber (mem:BLK (scratch)))])]
-  "optimize_size || !TARGET_SUB_ESP_8"
-  [(clobber (match_dup 0))
-   (set (mem:SI (pre_dec:SI (reg:SI 7))) (match_dup 0))
-   (parallel [(set (mem:SI (pre_dec:SI (reg:SI 7))) (match_dup 0))
-             (clobber (mem:BLK (scratch)))])])
-
-;; Convert esp subtractions to push.
-(define_peephole2
-  [(match_scratch:SI 0 "r")
-   (parallel [(set (reg:SI 7) (plus:SI (reg:SI 7) (const_int -4)))
-             (clobber (reg:CC 17))])]
-  "optimize_size || !TARGET_SUB_ESP_4"
-  [(clobber (match_dup 0))
-   (set (mem:SI (pre_dec:SI (reg:SI 7))) (match_dup 0))])
-
-(define_peephole2
-  [(match_scratch:SI 0 "r")
-   (parallel [(set (reg:SI 7) (plus:SI (reg:SI 7) (const_int -8)))
-             (clobber (reg:CC 17))])]
-  "optimize_size || !TARGET_SUB_ESP_8"
-  [(clobber (match_dup 0))
-   (set (mem:SI (pre_dec:SI (reg:SI 7))) (match_dup 0))
-   (set (mem:SI (pre_dec:SI (reg:SI 7))) (match_dup 0))])
-
-;; Convert epilogue deallocator to pop.
-(define_peephole2
-  [(match_scratch:SI 0 "r")
-   (parallel [(set (reg:SI 7) (plus:SI (reg:SI 7) (const_int 4)))
-             (clobber (reg:CC 17))
-             (clobber (mem:BLK (scratch)))])]
-  "optimize_size || !TARGET_ADD_ESP_4"
-  [(parallel [(set (match_dup 0) (mem:SI (reg:SI 7)))
-             (set (reg:SI 7) (plus:SI (reg:SI 7) (const_int 4)))
-             (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:SI 0 "r")
-   (match_scratch:SI 1 "r")
-   (parallel [(set (reg:SI 7) (plus:SI (reg:SI 7) (const_int 8)))
-             (clobber (reg:CC 17))
-             (clobber (mem:BLK (scratch)))])]
-  "optimize_size || !TARGET_ADD_ESP_8"
-  [(parallel [(set (match_dup 0) (mem:SI (reg:SI 7)))
-             (set (reg:SI 7) (plus:SI (reg:SI 7) (const_int 4)))
-             (clobber (mem:BLK (scratch)))])
-   (parallel [(set (match_dup 1) (mem:SI (reg:SI 7)))
-             (set (reg:SI 7) (plus:SI (reg:SI 7) (const_int 4)))])]
-  "")
-
-(define_peephole2
-  [(match_scratch:SI 0 "r")
-   (parallel [(set (reg:SI 7) (plus:SI (reg:SI 7) (const_int 8)))
-             (clobber (reg:CC 17))
-             (clobber (mem:BLK (scratch)))])]
-  "optimize_size"
-  [(parallel [(set (match_dup 0) (mem:SI (reg:SI 7)))
-             (set (reg:SI 7) (plus:SI (reg:SI 7) (const_int 4)))
-             (clobber (mem:BLK (scratch)))])
-   (parallel [(set (match_dup 0) (mem:SI (reg:SI 7)))
-             (set (reg:SI 7) (plus:SI (reg:SI 7) (const_int 4)))])]
-  "")
-
-;; Convert esp additions to pop.
-(define_peephole2
-  [(match_scratch:SI 0 "r")
-   (parallel [(set (reg:SI 7) (plus:SI (reg:SI 7) (const_int 4)))
-             (clobber (reg:CC 17))])]
-  ""
-  [(parallel [(set (match_dup 0) (mem:SI (reg:SI 7)))
-             (set (reg:SI 7) (plus:SI (reg:SI 7) (const_int 4)))])]
-  "")
-
-;; Two pops case is tricky, since pop causes dependency on destination register.
-;; We use two registers if available.
-(define_peephole2
-  [(match_scratch:SI 0 "r")
-   (match_scratch:SI 1 "r")
-   (parallel [(set (reg:SI 7) (plus:SI (reg:SI 7) (const_int 8)))
-             (clobber (reg:CC 17))])]
-  ""
-  [(parallel [(set (match_dup 0) (mem:SI (reg:SI 7)))
-             (set (reg:SI 7) (plus:SI (reg:SI 7) (const_int 4)))])
-   (parallel [(set (match_dup 1) (mem:SI (reg:SI 7)))
-             (set (reg:SI 7) (plus:SI (reg:SI 7) (const_int 4)))])]
-  "")
-
-(define_peephole2
-  [(match_scratch:SI 0 "r")
-   (parallel [(set (reg:SI 7) (plus:SI (reg:SI 7) (const_int 8)))
-             (clobber (reg:CC 17))])]
-  "optimize_size"
-  [(parallel [(set (match_dup 0) (mem:SI (reg:SI 7)))
-             (set (reg:SI 7) (plus:SI (reg:SI 7) (const_int 4)))])
-   (parallel [(set (match_dup 0) (mem:SI (reg:SI 7)))
-             (set (reg:SI 7) (plus:SI (reg:SI 7) (const_int 4)))])]
-  "")
-\f
-;; Convert compares with 1 to shorter inc/dec operations when CF is not
-;; required and register dies.
-(define_peephole2
-  [(set (reg 17)
-       (compare (match_operand:SI 0 "register_operand" "")
-                (match_operand:SI 1 "incdec_operand" "")))]
-  "ix86_match_ccmode (insn, CCGCmode)
-   && find_regno_note (insn, REG_DEAD, true_regnum (operands[0]))"
-  [(parallel [(set (reg:CCGC 17)
-                  (compare:CCGC (match_dup 0)
-                                (match_dup 1)))
-             (clobber (match_dup 0))])]
-  "")
-
-(define_peephole2
-  [(set (reg 17)
-       (compare (match_operand:HI 0 "register_operand" "")
-                (match_operand:HI 1 "incdec_operand" "")))]
-  "ix86_match_ccmode (insn, CCGCmode)
-   && find_regno_note (insn, REG_DEAD, true_regnum (operands[0]))"
-  [(parallel [(set (reg:CCGC 17)
-                  (compare:CCGC (match_dup 0)
-                                (match_dup 1)))
-             (clobber (match_dup 0))])]
-  "")
-
-(define_peephole2
-  [(set (reg 17)
-       (compare (match_operand:QI 0 "register_operand" "")
-                (match_operand:QI 1 "incdec_operand" "")))]
-  "ix86_match_ccmode (insn, CCGCmode)
-   && find_regno_note (insn, REG_DEAD, true_regnum (operands[0]))"
-  [(parallel [(set (reg:CCGC 17)
-                  (compare:CCGC (match_dup 0)
-                                (match_dup 1)))
-             (clobber (match_dup 0))])]
-  "")
-
-;; Convert compares with 128 to shorter add -128
-(define_peephole2
-  [(set (reg 17)
-       (compare (match_operand:SI 0 "register_operand" "")
-                (const_int 128)))]
-  "ix86_match_ccmode (insn, CCGCmode)
-   && find_regno_note (insn, REG_DEAD, true_regnum (operands[0]))"
-  [(parallel [(set (reg:CCGC 17)
-                  (compare:CCGC (match_dup 0)
-                                (const_int 128)))
-             (clobber (match_dup 0))])]
-  "")
-
-(define_peephole2
-  [(set (reg 17)
-       (compare (match_operand:HI 0 "register_operand" "")
-                (const_int 128)))]
-  "ix86_match_ccmode (insn, CCGCmode)
-   && find_regno_note (insn, REG_DEAD, true_regnum (operands[0]))"
-  [(parallel [(set (reg:CCGC 17)
-                  (compare:CCGC (match_dup 0)
-                                (const_int 128)))
-             (clobber (match_dup 0))])]
-  "")
-\f
-(define_peephole2
-  [(match_scratch:DI 0 "r")
-   (parallel [(set (reg:DI 7) (plus:DI (reg:DI 7) (const_int -8)))
-             (clobber (reg:CC 17))
-             (clobber (mem:BLK (scratch)))])]
-  "optimize_size || !TARGET_SUB_ESP_4"
-  [(clobber (match_dup 0))
-   (parallel [(set (mem:DI (pre_dec:DI (reg:DI 7))) (match_dup 0))
-             (clobber (mem:BLK (scratch)))])])
-
-(define_peephole2
-  [(match_scratch:DI 0 "r")
-   (parallel [(set (reg:DI 7) (plus:DI (reg:DI 7) (const_int -16)))
-             (clobber (reg:CC 17))
-             (clobber (mem:BLK (scratch)))])]
-  "optimize_size || !TARGET_SUB_ESP_8"
-  [(clobber (match_dup 0))
-   (set (mem:DI (pre_dec:DI (reg:DI 7))) (match_dup 0))
-   (parallel [(set (mem:DI (pre_dec:DI (reg:DI 7))) (match_dup 0))
-             (clobber (mem:BLK (scratch)))])])
-
-;; Convert esp subtractions to push.
-(define_peephole2
-  [(match_scratch:DI 0 "r")
-   (parallel [(set (reg:DI 7) (plus:DI (reg:DI 7) (const_int -8)))
-             (clobber (reg:CC 17))])]
-  "optimize_size || !TARGET_SUB_ESP_4"
-  [(clobber (match_dup 0))
-   (set (mem:DI (pre_dec:DI (reg:DI 7))) (match_dup 0))])
-
-(define_peephole2
-  [(match_scratch:DI 0 "r")
-   (parallel [(set (reg:DI 7) (plus:DI (reg:DI 7) (const_int -16)))
-             (clobber (reg:CC 17))])]
-  "optimize_size || !TARGET_SUB_ESP_8"
-  [(clobber (match_dup 0))
-   (set (mem:DI (pre_dec:DI (reg:DI 7))) (match_dup 0))
-   (set (mem:DI (pre_dec:DI (reg:DI 7))) (match_dup 0))])
-
-;; Convert epilogue deallocator to pop.
-(define_peephole2
-  [(match_scratch:DI 0 "r")
-   (parallel [(set (reg:DI 7) (plus:DI (reg:DI 7) (const_int 8)))
-             (clobber (reg:CC 17))
-             (clobber (mem:BLK (scratch)))])]
-  "optimize_size || !TARGET_ADD_ESP_4"
-  [(parallel [(set (match_dup 0) (mem:DI (reg:DI 7)))
-             (set (reg:DI 7) (plus:DI (reg:DI 7) (const_int 8)))
-             (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:DI 0 "r")
-   (match_scratch:DI 1 "r")
-   (parallel [(set (reg:DI 7) (plus:DI (reg:DI 7) (const_int 16)))
-             (clobber (reg:CC 17))
-             (clobber (mem:BLK (scratch)))])]
-  "optimize_size || !TARGET_ADD_ESP_8"
-  [(parallel [(set (match_dup 0) (mem:DI (reg:DI 7)))
-             (set (reg:DI 7) (plus:DI (reg:DI 7) (const_int 8)))
-             (clobber (mem:BLK (scratch)))])
-   (parallel [(set (match_dup 1) (mem:DI (reg:DI 7)))
-             (set (reg:DI 7) (plus:DI (reg:DI 7) (const_int 8)))])]
-  "")
-
-(define_peephole2
-  [(match_scratch:DI 0 "r")
-   (parallel [(set (reg:DI 7) (plus:DI (reg:DI 7) (const_int 16)))
-             (clobber (reg:CC 17))
-             (clobber (mem:BLK (scratch)))])]
-  "optimize_size"
-  [(parallel [(set (match_dup 0) (mem:DI (reg:DI 7)))
-             (set (reg:DI 7) (plus:DI (reg:DI 7) (const_int 8)))
-             (clobber (mem:BLK (scratch)))])
-   (parallel [(set (match_dup 0) (mem:DI (reg:DI 7)))
-             (set (reg:DI 7) (plus:DI (reg:DI 7) (const_int 8)))])]
-  "")
-
-;; Convert esp additions to pop.
-(define_peephole2
-  [(match_scratch:DI 0 "r")
-   (parallel [(set (reg:DI 7) (plus:DI (reg:DI 7) (const_int 8)))
-             (clobber (reg:CC 17))])]
-  ""
-  [(parallel [(set (match_dup 0) (mem:DI (reg:DI 7)))
-             (set (reg:DI 7) (plus:DI (reg:DI 7) (const_int 8)))])]
-  "")
-
-;; Two pops case is tricky, since pop causes dependency on destination register.
-;; We use two registers if available.
-(define_peephole2
-  [(match_scratch:DI 0 "r")
-   (match_scratch:DI 1 "r")
-   (parallel [(set (reg:DI 7) (plus:DI (reg:DI 7) (const_int 16)))
-             (clobber (reg:CC 17))])]
-  ""
-  [(parallel [(set (match_dup 0) (mem:DI (reg:DI 7)))
-             (set (reg:DI 7) (plus:DI (reg:DI 7) (const_int 8)))])
-   (parallel [(set (match_dup 1) (mem:DI (reg:DI 7)))
-             (set (reg:DI 7) (plus:DI (reg:DI 7) (const_int 8)))])]
-  "")
-
-(define_peephole2
-  [(match_scratch:DI 0 "r")
-   (parallel [(set (reg:DI 7) (plus:DI (reg:DI 7) (const_int 16)))
-             (clobber (reg:CC 17))])]
-  "optimize_size"
-  [(parallel [(set (match_dup 0) (mem:DI (reg:DI 7)))
-             (set (reg:DI 7) (plus:DI (reg:DI 7) (const_int 8)))])
-   (parallel [(set (match_dup 0) (mem:DI (reg:DI 7)))
-             (set (reg:DI 7) (plus:DI (reg:DI 7) (const_int 8)))])]
-  "")
-\f
-;; Imul $32bit_imm, mem, reg is vector decoded, while
-;; imul $32bit_imm, reg, reg is direct decoded.
-(define_peephole2
-  [(match_scratch:DI 3 "r")
-   (parallel [(set (match_operand:DI 0 "register_operand" "")
-                  (mult:DI (match_operand:DI 1 "memory_operand" "")
-                           (match_operand:DI 2 "immediate_operand" "")))
-             (clobber (reg:CC 17))])]
-  "TARGET_K8 && !optimize_size
-   && (GET_CODE (operands[2]) != CONST_INT
-       || !CONST_OK_FOR_LETTER_P (INTVAL (operands[2]), 'K'))"
-  [(set (match_dup 3) (match_dup 1))
-   (parallel [(set (match_dup 0) (mult:DI (match_dup 3) (match_dup 2)))
-             (clobber (reg:CC 17))])]
-"")
-
-(define_peephole2
-  [(match_scratch:SI 3 "r")
-   (parallel [(set (match_operand:SI 0 "register_operand" "")
-                  (mult:SI (match_operand:SI 1 "memory_operand" "")
-                           (match_operand:SI 2 "immediate_operand" "")))
-             (clobber (reg:CC 17))])]
-  "TARGET_K8 && !optimize_size
-   && (GET_CODE (operands[2]) != CONST_INT
-       || !CONST_OK_FOR_LETTER_P (INTVAL (operands[2]), 'K'))"
-  [(set (match_dup 3) (match_dup 1))
-   (parallel [(set (match_dup 0) (mult:SI (match_dup 3) (match_dup 2)))
-             (clobber (reg:CC 17))])]
-"")
-
-(define_peephole2
-  [(match_scratch:SI 3 "r")
-   (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" ""))))
-             (clobber (reg:CC 17))])]
-  "TARGET_K8 && !optimize_size
-   && (GET_CODE (operands[2]) != CONST_INT
-       || !CONST_OK_FOR_LETTER_P (INTVAL (operands[2]), 'K'))"
-  [(set (match_dup 3) (match_dup 1))
-   (parallel [(set (match_dup 0) (zero_extend:DI (mult:SI (match_dup 3) (match_dup 2))))
-             (clobber (reg:CC 17))])]
-"")
-
-;; imul $8/16bit_imm, regmem, reg is vector decoded.
-;; Convert it into imul reg, reg
-;; 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:DI 0 "register_operand" "")
-                  (mult:DI (match_operand:DI 1 "nonimmediate_operand" "")
-                           (match_operand:DI 2 "const_int_operand" "")))
-             (clobber (reg:CC 17))])
-   (match_scratch:DI 3 "r")]
-  "TARGET_K8 && !optimize_size
-   && CONST_OK_FOR_LETTER_P (INTVAL (operands[2]), 'K')"
-  [(set (match_dup 3) (match_dup 2))
-   (parallel [(set (match_dup 0) (mult:DI (match_dup 0) (match_dup 3)))
-             (clobber (reg:CC 17))])]
-{
-  if (!rtx_equal_p (operands[0], operands[1]))
-    emit_move_insn (operands[0], operands[1]);
-})
-
-(define_peephole2
-  [(parallel [(set (match_operand:SI 0 "register_operand" "")
-                  (mult:SI (match_operand:SI 1 "nonimmediate_operand" "")
-                           (match_operand:SI 2 "const_int_operand" "")))
-             (clobber (reg:CC 17))])
-   (match_scratch:SI 3 "r")]
-  "TARGET_K8 && !optimize_size
-   && CONST_OK_FOR_LETTER_P (INTVAL (operands[2]), 'K')"
-  [(set (match_dup 3) (match_dup 2))
-   (parallel [(set (match_dup 0) (mult:SI (match_dup 0) (match_dup 3)))
-             (clobber (reg:CC 17))])]
-{
-  if (!rtx_equal_p (operands[0], operands[1]))
-    emit_move_insn (operands[0], operands[1]);
-})
-
-(define_peephole2
-  [(parallel [(set (match_operand:HI 0 "register_operand" "")
-                  (mult:HI (match_operand:HI 1 "nonimmediate_operand" "")
-                           (match_operand:HI 2 "immediate_operand" "")))
-             (clobber (reg:CC 17))])
-   (match_scratch:HI 3 "r")]
-  "TARGET_K8 && !optimize_size"
-  [(set (match_dup 3) (match_dup 2))
-   (parallel [(set (match_dup 0) (mult:HI (match_dup 0) (match_dup 3)))
-             (clobber (reg:CC 17))])]
-{
-  if (!rtx_equal_p (operands[0], operands[1]))
-    emit_move_insn (operands[0], operands[1]);
-})
-\f
-;; Call-value patterns last so that the wildcard operand does not
-;; disrupt insn-recog's switch tables.
-
-(define_insn "*call_value_pop_0"
-  [(set (match_operand 0 "" "")
-       (call (mem:QI (match_operand:SI 1 "constant_call_address_operand" ""))
-             (match_operand:SI 2 "" "")))
-   (set (reg:SI 7) (plus:SI (reg:SI 7)
-                           (match_operand:SI 3 "immediate_operand" "")))]
-  "!TARGET_64BIT"
-{
-  if (SIBLING_CALL_P (insn))
-    return "jmp\t%P1";
-  else
-    return "call\t%P1";
-}
-  [(set_attr "type" "callv")])
-
-(define_insn "*call_value_pop_1"
-  [(set (match_operand 0 "" "")
-       (call (mem:QI (match_operand:SI 1 "call_insn_operand" "rsm"))
-             (match_operand:SI 2 "" "")))
-   (set (reg:SI 7) (plus:SI (reg:SI 7)
-                           (match_operand:SI 3 "immediate_operand" "i")))]
-  "!TARGET_64BIT"
-{
-  if (constant_call_address_operand (operands[1], QImode))
-    {
-      if (SIBLING_CALL_P (insn))
-       return "jmp\t%P1";
-      else
-       return "call\t%P1";
-    }
-  if (SIBLING_CALL_P (insn))
-    return "jmp\t%A1";
-  else
-    return "call\t%A1";
-}
-  [(set_attr "type" "callv")])
-
-(define_insn "*call_value_0"
-  [(set (match_operand 0 "" "")
-       (call (mem:QI (match_operand:SI 1 "constant_call_address_operand" ""))
-             (match_operand:SI 2 "" "")))]
-  "!TARGET_64BIT"
-{
-  if (SIBLING_CALL_P (insn))
-    return "jmp\t%P1";
-  else
-    return "call\t%P1";
-}
-  [(set_attr "type" "callv")])
-
-(define_insn "*call_value_0_rex64"
-  [(set (match_operand 0 "" "")
-       (call (mem:QI (match_operand:DI 1 "constant_call_address_operand" ""))
-             (match_operand:DI 2 "const_int_operand" "")))]
-  "TARGET_64BIT"
-{
-  if (SIBLING_CALL_P (insn))
-    return "jmp\t%P1";
-  else
-    return "call\t%P1";
-}
-  [(set_attr "type" "callv")])
-
-(define_insn "*call_value_1"
-  [(set (match_operand 0 "" "")
-       (call (mem:QI (match_operand:SI 1 "call_insn_operand" "rsm"))
-             (match_operand:SI 2 "" "")))]
-  "!SIBLING_CALL_P (insn) && !TARGET_64BIT"
-{
-  if (constant_call_address_operand (operands[1], QImode))
-    return "call\t%P1";
-  return "call\t%*%1";
-}
-  [(set_attr "type" "callv")])
-
-(define_insn "*sibcall_value_1"
-  [(set (match_operand 0 "" "")
-       (call (mem:QI (match_operand:SI 1 "sibcall_insn_operand" "s,c,d,a"))
-             (match_operand:SI 2 "" "")))]
-  "SIBLING_CALL_P (insn) && !TARGET_64BIT"
-{
-  if (constant_call_address_operand (operands[1], QImode))
-    return "jmp\t%P1";
-  return "jmp\t%*%1";
-}
-  [(set_attr "type" "callv")])
-
-(define_insn "*call_value_1_rex64"
-  [(set (match_operand 0 "" "")
-       (call (mem:QI (match_operand:DI 1 "call_insn_operand" "rsm"))
-             (match_operand:DI 2 "" "")))]
-  "!SIBLING_CALL_P (insn) && TARGET_64BIT"
-{
-  if (constant_call_address_operand (operands[1], QImode))
-    return "call\t%P1";
-  return "call\t%A1";
-}
-  [(set_attr "type" "callv")])
-
-(define_insn "*sibcall_value_1_rex64"
-  [(set (match_operand 0 "" "")
-       (call (mem:QI (match_operand:DI 1 "constant_call_address_operand" ""))
-             (match_operand:DI 2 "" "")))]
-  "SIBLING_CALL_P (insn) && TARGET_64BIT"
-  "jmp\t%P1"
-  [(set_attr "type" "callv")])
-
-(define_insn "*sibcall_value_1_rex64_v"
-  [(set (match_operand 0 "" "")
-       (call (mem:QI (reg:DI 40))
-             (match_operand:DI 1 "" "")))]
-  "SIBLING_CALL_P (insn) && TARGET_64BIT"
-  "jmp\t*%%r11"
-  [(set_attr "type" "callv")])
-\f
-(define_insn "trap"
-  [(trap_if (const_int 1) (const_int 5))]
-  ""
-  "int\t$5")
-
-;;; ix86 doesn't have conditional trap instructions, but we fake them
-;;; for the sake of bounds checking.  By emitting bounds checks as
-;;; conditional traps rather than as conditional jumps around
-;;; unconditional traps we avoid introducing spurious basic-block
-;;; boundaries and facilitate elimination of redundant checks.  In
-;;; honor of the too-inflexible-for-BPs `bound' instruction, we use
-;;; interrupt 5.
-;;; 
-;;; FIXME: Static branch prediction rules for ix86 are such that
-;;; forward conditional branches predict as untaken.  As implemented
-;;; below, pseudo conditional traps violate that rule.  We should use
-;;; .pushsection/.popsection to place all of the `int 5's in a special
-;;; section loaded at the end of the text segment and branch forward
-;;; there on bounds-failure, and then jump back immediately (in case
-;;; the system chooses to ignore bounds violations, or to report
-;;; violations and continue execution).
-
-(define_expand "conditional_trap"
-  [(trap_if (match_operator 0 "comparison_operator"
-            [(match_dup 2) (const_int 0)])
-           (match_operand 1 "const_int_operand" ""))]
-  ""
-{
-  emit_insn (gen_rtx_TRAP_IF (VOIDmode,
-                             ix86_expand_compare (GET_CODE (operands[0]),
-                                                  NULL, NULL),
-                             operands[1]));
-  DONE;
-})
-
-(define_insn "*conditional_trap_1"
-  [(trap_if (match_operator 0 "comparison_operator"
-            [(reg 17) (const_int 0)])
-           (match_operand 1 "const_int_operand" ""))]
-  ""
-{
-  operands[2] = gen_label_rtx ();
-  output_asm_insn ("j%c0\t%l2\; int\t%1", operands);
-  (*targetm.asm_out.internal_label) (asm_out_file, "L",
-                            CODE_LABEL_NUMBER (operands[2]));
-  RET;
-})
-
-       ;; Pentium III SIMD instructions.
-
-;; Moves for SSE/MMX regs.
-
-(define_insn "movv4sf_internal"
-  [(set (match_operand:V4SF 0 "nonimmediate_operand" "=x,x,m")
-       (match_operand:V4SF 1 "vector_move_operand" "C,xm,x"))]
-  "TARGET_SSE"
-  "@
-    xorps\t%0, %0
-    movaps\t{%1, %0|%0, %1}
-    movaps\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssemov")
-   (set_attr "mode" "V4SF")])
-
-(define_split
-  [(set (match_operand:V4SF 0 "register_operand" "")
-       (match_operand:V4SF 1 "zero_extended_scalar_load_operand" ""))]
-  "TARGET_SSE"
-  [(set (match_dup 0)
-       (vec_merge:V4SF
-        (vec_duplicate:V4SF (match_dup 1))
-        (match_dup 2)
-        (const_int 1)))]
-{
-  operands[1] = simplify_gen_subreg (SFmode, operands[1], V4SFmode, 0);
-  operands[2] = CONST0_RTX (V4SFmode);
-})
-
-(define_insn "movv4si_internal"
-  [(set (match_operand:V4SI 0 "nonimmediate_operand" "=x,x,m")
-       (match_operand:V4SI 1 "vector_move_operand" "C,xm,x"))]
-  "TARGET_SSE"
-{
-  switch (which_alternative)
-    {
-    case 0:
-      if (get_attr_mode (insn) == MODE_V4SF)
-       return "xorps\t%0, %0";
-      else
-       return "pxor\t%0, %0";
-    case 1:
-    case 2:
-      if (get_attr_mode (insn) == MODE_V4SF)
-       return "movaps\t{%1, %0|%0, %1}";
-      else
-       return "movdqa\t{%1, %0|%0, %1}";
-    default:
-      abort ();
-    }
-}
-  [(set_attr "type" "ssemov")
-   (set (attr "mode")
-        (cond [(eq_attr "alternative" "0,1")
-                (if_then_else
-                  (ne (symbol_ref "optimize_size")
-                      (const_int 0))
-                  (const_string "V4SF")
-                  (const_string "TI"))
-              (eq_attr "alternative" "2")
-                (if_then_else
-                  (ior (ne (symbol_ref "TARGET_SSE_TYPELESS_STORES")
-                           (const_int 0))
-                       (ne (symbol_ref "optimize_size")
-                           (const_int 0)))
-                  (const_string "V4SF")
-                  (const_string "TI"))]
-              (const_string "TI")))])
-
-(define_insn "movv2di_internal"
-  [(set (match_operand:V2DI 0 "nonimmediate_operand" "=x,x,m")
-       (match_operand:V2DI 1 "vector_move_operand" "C,xm,x"))]
-  "TARGET_SSE2"
-{
-  switch (which_alternative)
-    {
-    case 0:
-      if (get_attr_mode (insn) == MODE_V4SF)
-       return "xorps\t%0, %0";
-      else
-       return "pxor\t%0, %0";
-    case 1:
-    case 2:
-      if (get_attr_mode (insn) == MODE_V4SF)
-       return "movaps\t{%1, %0|%0, %1}";
-      else
-       return "movdqa\t{%1, %0|%0, %1}";
-    default:
-      abort ();
-    }
-}
-  [(set_attr "type" "ssemov")
-   (set (attr "mode")
-        (cond [(eq_attr "alternative" "0,1")
-                (if_then_else
-                  (ne (symbol_ref "optimize_size")
-                      (const_int 0))
-                  (const_string "V4SF")
-                  (const_string "TI"))
-              (eq_attr "alternative" "2")
-                (if_then_else
-                  (ior (ne (symbol_ref "TARGET_SSE_TYPELESS_STORES")
-                           (const_int 0))
-                       (ne (symbol_ref "optimize_size")
-                           (const_int 0)))
-                  (const_string "V4SF")
-                  (const_string "TI"))]
-              (const_string "TI")))])
-
-(define_split
-  [(set (match_operand:V2DF 0 "register_operand" "")
-       (match_operand:V2DF 1 "zero_extended_scalar_load_operand" ""))]
-  "TARGET_SSE2"
-  [(set (match_dup 0)
-       (vec_merge:V2DF
-        (vec_duplicate:V2DF (match_dup 1))
-        (match_dup 2)
-        (const_int 1)))]
-{
-  operands[1] = simplify_gen_subreg (DFmode, operands[1], V2DFmode, 0);
-  operands[2] = CONST0_RTX (V2DFmode);
-})
-
-(define_insn "movv8qi_internal"
-  [(set (match_operand:V8QI 0 "nonimmediate_operand" "=y,y,m")
-       (match_operand:V8QI 1 "vector_move_operand" "C,ym,y"))]
-  "TARGET_MMX
-   && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)"
-  "@
-    pxor\t%0, %0
-    movq\t{%1, %0|%0, %1}
-    movq\t{%1, %0|%0, %1}"
-  [(set_attr "type" "mmxmov")
-   (set_attr "mode" "DI")])
-
-(define_insn "movv4hi_internal"
-  [(set (match_operand:V4HI 0 "nonimmediate_operand" "=y,y,m")
-       (match_operand:V4HI 1 "vector_move_operand" "C,ym,y"))]
-  "TARGET_MMX
-   && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)"
-  "@
-    pxor\t%0, %0
-    movq\t{%1, %0|%0, %1}
-    movq\t{%1, %0|%0, %1}"
-  [(set_attr "type" "mmxmov")
-   (set_attr "mode" "DI")])
-
-(define_insn "movv2si_internal"
-  [(set (match_operand:V2SI 0 "nonimmediate_operand" "=y,y,m")
-       (match_operand:V2SI 1 "vector_move_operand" "C,ym,y"))]
-  "TARGET_MMX
-   && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)"
-  "@
-    pxor\t%0, %0
-    movq\t{%1, %0|%0, %1}
-    movq\t{%1, %0|%0, %1}"
-  [(set_attr "type" "mmxcvt")
-   (set_attr "mode" "DI")])
-
-(define_insn "movv2sf_internal"
-  [(set (match_operand:V2SF 0 "nonimmediate_operand" "=y,y,m")
-        (match_operand:V2SF 1 "vector_move_operand" "C,ym,y"))]
-  "TARGET_3DNOW
-   && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)"
-  "@
-    pxor\t%0, %0
-    movq\t{%1, %0|%0, %1}
-    movq\t{%1, %0|%0, %1}"
-  [(set_attr "type" "mmxcvt")
-   (set_attr "mode" "DI")])
-
-(define_expand "movti"
-  [(set (match_operand:TI 0 "nonimmediate_operand" "")
-       (match_operand:TI 1 "nonimmediate_operand" ""))]
-  "TARGET_SSE || TARGET_64BIT"
-{
-  if (TARGET_64BIT)
-    ix86_expand_move (TImode, operands);
-  else
-    ix86_expand_vector_move (TImode, operands);
-  DONE;
-})
-
-(define_expand "movtf"
-  [(set (match_operand:TF 0 "nonimmediate_operand" "")
-       (match_operand:TF 1 "nonimmediate_operand" ""))]
-  "TARGET_64BIT"
-{
-  if (TARGET_64BIT)
-    ix86_expand_move (TFmode, operands);
-  else
-    ix86_expand_vector_move (TFmode, operands);
-  DONE;
-})
-
-(define_insn "movv2df_internal"
-  [(set (match_operand:V2DF 0 "nonimmediate_operand" "=x,x,m")
-       (match_operand:V2DF 1 "vector_move_operand" "C,xm,x"))]
-  "TARGET_SSE2
-   && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)"
-{
-  switch (which_alternative)
-    {
-    case 0:
-      if (get_attr_mode (insn) == MODE_V4SF)
-       return "xorps\t%0, %0";
-      else
-       return "xorpd\t%0, %0";
-    case 1:
-    case 2:
-      if (get_attr_mode (insn) == MODE_V4SF)
-       return "movaps\t{%1, %0|%0, %1}";
-      else
-       return "movapd\t{%1, %0|%0, %1}";
-    default:
-      abort ();
-    }
-}
-  [(set_attr "type" "ssemov")
-   (set (attr "mode")
-        (cond [(eq_attr "alternative" "0,1")
-                (if_then_else
-                  (ne (symbol_ref "optimize_size")
-                      (const_int 0))
-                  (const_string "V4SF")
-                  (const_string "V2DF"))
-              (eq_attr "alternative" "2")
-                (if_then_else
-                  (ior (ne (symbol_ref "TARGET_SSE_TYPELESS_STORES")
-                           (const_int 0))
-                       (ne (symbol_ref "optimize_size")
-                           (const_int 0)))
-                  (const_string "V4SF")
-                  (const_string "V2DF"))]
-              (const_string "V2DF")))])
-
-(define_insn "movv8hi_internal"
-  [(set (match_operand:V8HI 0 "nonimmediate_operand" "=x,x,m")
-       (match_operand:V8HI 1 "vector_move_operand" "C,xm,x"))]
-  "TARGET_SSE2
-   && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)"
-{
-  switch (which_alternative)
-    {
-    case 0:
-      if (get_attr_mode (insn) == MODE_V4SF)
-       return "xorps\t%0, %0";
-      else
-       return "pxor\t%0, %0";
-    case 1:
-    case 2:
-      if (get_attr_mode (insn) == MODE_V4SF)
-       return "movaps\t{%1, %0|%0, %1}";
-      else
-       return "movdqa\t{%1, %0|%0, %1}";
-    default:
-      abort ();
-    }
-}
-  [(set_attr "type" "ssemov")
-   (set (attr "mode")
-        (cond [(eq_attr "alternative" "0,1")
-                (if_then_else
-                  (ne (symbol_ref "optimize_size")
-                      (const_int 0))
-                  (const_string "V4SF")
-                  (const_string "TI"))
-              (eq_attr "alternative" "2")
-                (if_then_else
-                  (ior (ne (symbol_ref "TARGET_SSE_TYPELESS_STORES")
-                           (const_int 0))
-                       (ne (symbol_ref "optimize_size")
-                           (const_int 0)))
-                  (const_string "V4SF")
-                  (const_string "TI"))]
-              (const_string "TI")))])
-
-(define_insn "movv16qi_internal"
-  [(set (match_operand:V16QI 0 "nonimmediate_operand" "=x,x,m")
-       (match_operand:V16QI 1 "nonimmediate_operand" "C,xm,x"))]
-  "TARGET_SSE2
-   && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)"
-{
-  switch (which_alternative)
-    {
-    case 0:
-      if (get_attr_mode (insn) == MODE_V4SF)
-       return "xorps\t%0, %0";
-      else
-       return "pxor\t%0, %0";
-    case 1:
-    case 2:
-      if (get_attr_mode (insn) == MODE_V4SF)
-       return "movaps\t{%1, %0|%0, %1}";
-      else
-       return "movdqa\t{%1, %0|%0, %1}";
-    default:
-      abort ();
-    }
-}
-  [(set_attr "type" "ssemov")
-   (set (attr "mode")
-        (cond [(eq_attr "alternative" "0,1")
-                (if_then_else
-                  (ne (symbol_ref "optimize_size")
-                      (const_int 0))
-                  (const_string "V4SF")
-                  (const_string "TI"))
-              (eq_attr "alternative" "2")
-                (if_then_else
-                  (ior (ne (symbol_ref "TARGET_SSE_TYPELESS_STORES")
-                           (const_int 0))
-                       (ne (symbol_ref "optimize_size")
-                           (const_int 0)))
-                  (const_string "V4SF")
-                  (const_string "TI"))]
-              (const_string "TI")))])
-
-(define_expand "movv2df"
-  [(set (match_operand:V2DF 0 "nonimmediate_operand" "")
-       (match_operand:V2DF 1 "nonimmediate_operand" ""))]
-  "TARGET_SSE2"
-{
-  ix86_expand_vector_move (V2DFmode, operands);
-  DONE;
-})
-
-(define_expand "movv8hi"
-  [(set (match_operand:V8HI 0 "nonimmediate_operand" "")
-       (match_operand:V8HI 1 "nonimmediate_operand" ""))]
-  "TARGET_SSE2"
-{
-  ix86_expand_vector_move (V8HImode, operands);
-  DONE;
-})
-
-(define_expand "movv16qi"
-  [(set (match_operand:V16QI 0 "nonimmediate_operand" "")
-       (match_operand:V16QI 1 "nonimmediate_operand" ""))]
-  "TARGET_SSE2"
-{
-  ix86_expand_vector_move (V16QImode, operands);
-  DONE;
-})
-
-(define_expand "movv4sf"
-  [(set (match_operand:V4SF 0 "nonimmediate_operand" "")
-       (match_operand:V4SF 1 "nonimmediate_operand" ""))]
-  "TARGET_SSE"
-{
-  ix86_expand_vector_move (V4SFmode, operands);
-  DONE;
-})
-
-(define_expand "movv4si"
-  [(set (match_operand:V4SI 0 "nonimmediate_operand" "")
-       (match_operand:V4SI 1 "nonimmediate_operand" ""))]
-  "TARGET_SSE"
-{
-  ix86_expand_vector_move (V4SImode, operands);
-  DONE;
-})
-
-(define_expand "movv2di"
-  [(set (match_operand:V2DI 0 "nonimmediate_operand" "")
-       (match_operand:V2DI 1 "nonimmediate_operand" ""))]
-  "TARGET_SSE"
-{
-  ix86_expand_vector_move (V2DImode, operands);
-  DONE;
-})
-
-(define_expand "movv2si"
-  [(set (match_operand:V2SI 0 "nonimmediate_operand" "")
-       (match_operand:V2SI 1 "nonimmediate_operand" ""))]
-  "TARGET_MMX"
-{
-  ix86_expand_vector_move (V2SImode, operands);
-  DONE;
-})
-
-(define_expand "movv4hi"
-  [(set (match_operand:V4HI 0 "nonimmediate_operand" "")
-       (match_operand:V4HI 1 "nonimmediate_operand" ""))]
-  "TARGET_MMX"
-{
-  ix86_expand_vector_move (V4HImode, operands);
-  DONE;
-})
-
-(define_expand "movv8qi"
-  [(set (match_operand:V8QI 0 "nonimmediate_operand" "")
-       (match_operand:V8QI 1 "nonimmediate_operand" ""))]
-  "TARGET_MMX"
-{
-  ix86_expand_vector_move (V8QImode, operands);
-  DONE;
-})
-
-(define_expand "movv2sf"
-  [(set (match_operand:V2SF 0 "nonimmediate_operand" "")
-       (match_operand:V2SF 1 "nonimmediate_operand" ""))]
-   "TARGET_3DNOW"
-{
-  ix86_expand_vector_move (V2SFmode, operands);
-  DONE;
-})
-
-(define_insn "*pushti"
-  [(set (match_operand:TI 0 "push_operand" "=<")
-       (match_operand:TI 1 "register_operand" "x"))]
-  "TARGET_SSE"
-  "#")
-
-(define_insn "*pushv2df"
-  [(set (match_operand:V2DF 0 "push_operand" "=<")
-       (match_operand:V2DF 1 "register_operand" "x"))]
-  "TARGET_SSE"
-  "#")
-
-(define_insn "*pushv2di"
-  [(set (match_operand:V2DI 0 "push_operand" "=<")
-       (match_operand:V2DI 1 "register_operand" "x"))]
-  "TARGET_SSE2"
-  "#")
-
-(define_insn "*pushv8hi"
-  [(set (match_operand:V8HI 0 "push_operand" "=<")
-       (match_operand:V8HI 1 "register_operand" "x"))]
-  "TARGET_SSE2"
-  "#")
-
-(define_insn "*pushv16qi"
-  [(set (match_operand:V16QI 0 "push_operand" "=<")
-       (match_operand:V16QI 1 "register_operand" "x"))]
-  "TARGET_SSE2"
-  "#")
-
-(define_insn "*pushv4sf"
-  [(set (match_operand:V4SF 0 "push_operand" "=<")
-       (match_operand:V4SF 1 "register_operand" "x"))]
-  "TARGET_SSE"
-  "#")
-
-(define_insn "*pushv4si"
-  [(set (match_operand:V4SI 0 "push_operand" "=<")
-       (match_operand:V4SI 1 "register_operand" "x"))]
-  "TARGET_SSE2"
-  "#")
-
-(define_insn "*pushv2si"
-  [(set (match_operand:V2SI 0 "push_operand" "=<")
-       (match_operand:V2SI 1 "register_operand" "y"))]
-  "TARGET_MMX"
-  "#")
-
-(define_insn "*pushv4hi"
-  [(set (match_operand:V4HI 0 "push_operand" "=<")
-       (match_operand:V4HI 1 "register_operand" "y"))]
-  "TARGET_MMX"
-  "#")
-
-(define_insn "*pushv8qi"
-  [(set (match_operand:V8QI 0 "push_operand" "=<")
-       (match_operand:V8QI 1 "register_operand" "y"))]
-  "TARGET_MMX"
-  "#")
-
-(define_insn "*pushv2sf"
-  [(set (match_operand:V2SF 0 "push_operand" "=<")
-       (match_operand:V2SF 1 "register_operand" "y"))]
-  "TARGET_3DNOW"
-  "#")
-
-(define_split
-  [(set (match_operand 0 "push_operand" "")
-       (match_operand 1 "register_operand" ""))]
-  "!TARGET_64BIT && reload_completed
-   && (SSE_REG_P (operands[1]) || MMX_REG_P (operands[1]))"
-  [(set (reg:SI 7) (plus:SI (reg:SI 7) (match_dup 3)))
-   (set (match_dup 2) (match_dup 1))]
-  "operands[2] = change_address (operands[0], GET_MODE (operands[0]),
-                                stack_pointer_rtx);
-   operands[3] = GEN_INT (-GET_MODE_SIZE (GET_MODE (operands[0])));")
-
-(define_split
-  [(set (match_operand 0 "push_operand" "")
-       (match_operand 1 "register_operand" ""))]
-  "TARGET_64BIT && reload_completed
-   && (SSE_REG_P (operands[1]) || MMX_REG_P (operands[1]))"
-  [(set (reg:DI 7) (plus:DI (reg:DI 7) (match_dup 3)))
-   (set (match_dup 2) (match_dup 1))]
-  "operands[2] = change_address (operands[0], GET_MODE (operands[0]),
-                                stack_pointer_rtx);
-   operands[3] = GEN_INT (-GET_MODE_SIZE (GET_MODE (operands[0])));")
-
-
-(define_insn "movti_internal"
-  [(set (match_operand:TI 0 "nonimmediate_operand" "=x,x,m")
-       (match_operand:TI 1 "vector_move_operand" "C,xm,x"))]
-  "TARGET_SSE && !TARGET_64BIT
-   && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)"
-{
-  switch (which_alternative)
-    {
-    case 0:
-      if (get_attr_mode (insn) == MODE_V4SF)
-       return "xorps\t%0, %0";
-      else
-       return "pxor\t%0, %0";
-    case 1:
-    case 2:
-      if (get_attr_mode (insn) == MODE_V4SF)
-       return "movaps\t{%1, %0|%0, %1}";
-      else
-       return "movdqa\t{%1, %0|%0, %1}";
-    default:
-      abort ();
-    }
-}
-  [(set_attr "type" "ssemov,ssemov,ssemov")
-   (set (attr "mode")
-        (cond [(eq_attr "alternative" "0,1")
-                (if_then_else
-                  (ne (symbol_ref "optimize_size")
-                      (const_int 0))
-                  (const_string "V4SF")
-                  (const_string "TI"))
-              (eq_attr "alternative" "2")
-                (if_then_else
-                  (ne (symbol_ref "optimize_size")
-                      (const_int 0))
-                  (const_string "V4SF")
-                  (const_string "TI"))]
-              (const_string "TI")))])
-
-(define_insn "*movti_rex64"
-  [(set (match_operand:TI 0 "nonimmediate_operand" "=r,o,x,x,xm")
-       (match_operand:TI 1 "general_operand" "riFo,riF,C,xm,x"))]
-  "TARGET_64BIT
-   && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)"
-{
-  switch (which_alternative)
-    {
-    case 0:
-    case 1:
-      return "#";
-    case 2:
-      if (get_attr_mode (insn) == MODE_V4SF)
-       return "xorps\t%0, %0";
-      else
-       return "pxor\t%0, %0";
-    case 3:
-    case 4:
-      if (get_attr_mode (insn) == MODE_V4SF)
-       return "movaps\t{%1, %0|%0, %1}";
-      else
-       return "movdqa\t{%1, %0|%0, %1}";
-    default:
-      abort ();
-    }
-}
-  [(set_attr "type" "*,*,ssemov,ssemov,ssemov")
-   (set (attr "mode")
-        (cond [(eq_attr "alternative" "2,3")
-                (if_then_else
-                  (ne (symbol_ref "optimize_size")
-                      (const_int 0))
-                  (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_size")
-                           (const_int 0)))
-                  (const_string "V4SF")
-                  (const_string "TI"))]
-              (const_string "DI")))])
-
-(define_insn "*movtf_rex64"
-  [(set (match_operand:TF 0 "nonimmediate_operand" "=r,o,x,x,xm")
-       (match_operand:TF 1 "general_operand" "riFo,riF,C,xm,x"))]
-  "TARGET_64BIT
-   && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)"
-{
-  switch (which_alternative)
-    {
-    case 0:
-    case 1:
-      return "#";
-    case 2:
-      if (get_attr_mode (insn) == MODE_V4SF)
-       return "xorps\t%0, %0";
-      else
-       return "pxor\t%0, %0";
-    case 3:
-    case 4:
-      if (get_attr_mode (insn) == MODE_V4SF)
-       return "movaps\t{%1, %0|%0, %1}";
-      else
-       return "movdqa\t{%1, %0|%0, %1}";
-    default:
-      abort ();
-    }
-}
-  [(set_attr "type" "*,*,ssemov,ssemov,ssemov")
-   (set (attr "mode")
-        (cond [(eq_attr "alternative" "2,3")
-                (if_then_else
-                  (ne (symbol_ref "optimize_size")
-                      (const_int 0))
-                  (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_size")
-                           (const_int 0)))
-                  (const_string "V4SF")
-                  (const_string "TI"))]
-              (const_string "DI")))])
+(define_insn "*rep_movqi"
+  [(set (match_operand:SI 2 "register_operand" "=c") (const_int 0))
+   (set (match_operand:SI 0 "register_operand" "=D") 
+        (plus:SI (match_operand:SI 3 "register_operand" "0")
+                (match_operand:SI 5 "register_operand" "2")))
+   (set (match_operand:SI 1 "register_operand" "=S") 
+        (plus:SI (match_operand:SI 4 "register_operand" "1") (match_dup 5)))
+   (set (mem:BLK (match_dup 3))
+       (mem:BLK (match_dup 4)))
+   (use (match_dup 5))
+   (use (reg:SI DIRFLAG_REG))]
+  "!TARGET_64BIT"
+  "{rep\;movsb|rep movsb}"
+  [(set_attr "type" "str")
+   (set_attr "prefix_rep" "1")
+   (set_attr "memory" "both")
+   (set_attr "mode" "SI")])
 
-(define_split
-  [(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)]
-  "ix86_split_long_move (operands); DONE;")
+(define_insn "*rep_movqi_rex64"
+  [(set (match_operand:DI 2 "register_operand" "=c") (const_int 0))
+   (set (match_operand:DI 0 "register_operand" "=D") 
+        (plus:DI (match_operand:DI 3 "register_operand" "0")
+                (match_operand:DI 5 "register_operand" "2")))
+   (set (match_operand:DI 1 "register_operand" "=S") 
+        (plus:DI (match_operand:DI 4 "register_operand" "1") (match_dup 5)))
+   (set (mem:BLK (match_dup 3))
+       (mem:BLK (match_dup 4)))
+   (use (match_dup 5))
+   (use (reg:SI DIRFLAG_REG))]
+  "TARGET_64BIT"
+  "{rep\;movsb|rep movsb}"
+  [(set_attr "type" "str")
+   (set_attr "prefix_rep" "1")
+   (set_attr "memory" "both")
+   (set_attr "mode" "SI")])
 
-(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;")
+(define_expand "clrmemsi"
+   [(use (match_operand:BLK 0 "memory_operand" ""))
+    (use (match_operand:SI 1 "nonmemory_operand" ""))
+    (use (match_operand 2 "const_int_operand" ""))]
+  ""
+{
+ if (ix86_expand_clrmem (operands[0], operands[1], operands[2]))
+   DONE;
+ else
+   FAIL;
+})
 
-;; These two patterns are useful for specifying exactly whether to use
-;; movaps or movups
-(define_expand "sse_movaps"
-  [(set (match_operand:V4SF 0 "nonimmediate_operand" "")
-       (unspec:V4SF [(match_operand:V4SF 1 "nonimmediate_operand" "")]
-                    UNSPEC_MOVA))]
-  "TARGET_SSE"
+(define_expand "clrmemdi"
+   [(use (match_operand:BLK 0 "memory_operand" ""))
+    (use (match_operand:DI 1 "nonmemory_operand" ""))
+    (use (match_operand 2 "const_int_operand" ""))]
+  "TARGET_64BIT"
 {
-  if (GET_CODE (operands[0]) == MEM && GET_CODE (operands[1]) == MEM)
-    {
-      rtx tmp = gen_reg_rtx (V4SFmode);
-      emit_insn (gen_sse_movaps (tmp, operands[1]));
-      emit_move_insn (operands[0], tmp);
-      DONE;
-    }
+ if (ix86_expand_clrmem (operands[0], operands[1], operands[2]))
+   DONE;
+ else
+   FAIL;
 })
 
-(define_insn "*sse_movaps_1"
-  [(set (match_operand:V4SF 0 "nonimmediate_operand" "=x,m")
-       (unspec:V4SF [(match_operand:V4SF 1 "nonimmediate_operand" "xm,x")]
-                    UNSPEC_MOVA))]
-  "TARGET_SSE
-   && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)"
-  "movaps\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssemov,ssemov")
-   (set_attr "mode" "V4SF")])
-
-(define_expand "sse_movups"
-  [(set (match_operand:V4SF 0 "nonimmediate_operand" "")
-       (unspec:V4SF [(match_operand:V4SF 1 "nonimmediate_operand" "")]
-                    UNSPEC_MOVU))]
-  "TARGET_SSE"
+;; Most CPUs don't like single string operations
+;; 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" "")
+                  (match_dup 3))
+             (clobber (reg:CC FLAGS_REG))])]
+  ""
 {
-  if (GET_CODE (operands[0]) == MEM && GET_CODE (operands[1]) == MEM)
+  if (GET_MODE (operands[1]) != GET_MODE (operands[2]))
+    operands[1] = adjust_address_nv (operands[1], GET_MODE (operands[2]), 0);
+
+  /* If .md ever supports :P for Pmode, this can be directly
+     in the pattern above.  */
+  operands[3] = gen_rtx_PLUS (Pmode, operands[0],
+                             GEN_INT (GET_MODE_SIZE (GET_MODE
+                                                     (operands[2]))));
+  if (TARGET_SINGLE_STRINGOP || optimize_size)
     {
-      rtx tmp = gen_reg_rtx (V4SFmode);
-      emit_insn (gen_sse_movups (tmp, operands[1]));
-      emit_move_insn (operands[0], tmp);
+      emit_insn (gen_strset_singleop (operands[0], operands[1], operands[2],
+                                     operands[3]));
       DONE;
     }
 })
 
-(define_insn "*sse_movups_1"
-  [(set (match_operand:V4SF 0 "nonimmediate_operand" "=x,m")
-       (unspec:V4SF [(match_operand:V4SF 1 "nonimmediate_operand" "xm,x")]
-                    UNSPEC_MOVU))]
-  "TARGET_SSE
-   && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)"
-  "movups\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssecvt,ssecvt")
-   (set_attr "mode" "V4SF")])
-
-;; SSE Strange Moves.
-
-(define_insn "sse_movmskps"
-  [(set (match_operand:SI 0 "register_operand" "=r")
-       (unspec:SI [(match_operand:V4SF 1 "register_operand" "x")]
-                  UNSPEC_MOVMSK))]
-  "TARGET_SSE"
-  "movmskps\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "V4SF")])
-
-(define_insn "mmx_pmovmskb"
-  [(set (match_operand:SI 0 "register_operand" "=r")
-       (unspec:SI [(match_operand:V8QI 1 "register_operand" "y")]
-                  UNSPEC_MOVMSK))]
-  "TARGET_SSE || TARGET_3DNOW_A"
-  "pmovmskb\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "V4SF")])
-
-
-(define_insn "mmx_maskmovq"
-  [(set (mem:V8QI (match_operand:SI 0 "register_operand" "D"))
-       (unspec:V8QI [(match_operand:V8QI 1 "register_operand" "y")
-                     (match_operand:V8QI 2 "register_operand" "y")]
-                    UNSPEC_MASKMOV))]
-  "(TARGET_SSE || TARGET_3DNOW_A) && !TARGET_64BIT"
-  ;; @@@ check ordering of operands in intel/nonintel syntax
-  "maskmovq\t{%2, %1|%1, %2}"
-  [(set_attr "type" "mmxcvt")
-   (set_attr "mode" "DI")])
-
-(define_insn "mmx_maskmovq_rex"
-  [(set (mem:V8QI (match_operand:DI 0 "register_operand" "D"))
-       (unspec:V8QI [(match_operand:V8QI 1 "register_operand" "y")
-                     (match_operand:V8QI 2 "register_operand" "y")]
-                    UNSPEC_MASKMOV))]
-  "(TARGET_SSE || TARGET_3DNOW_A) && TARGET_64BIT"
-  ;; @@@ check ordering of operands in intel/nonintel syntax
-  "maskmovq\t{%2, %1|%1, %2}"
-  [(set_attr "type" "mmxcvt")
-   (set_attr "mode" "DI")])
-
-(define_insn "sse_movntv4sf"
-  [(set (match_operand:V4SF 0 "memory_operand" "=m")
-       (unspec:V4SF [(match_operand:V4SF 1 "register_operand" "x")]
-                    UNSPEC_MOVNT))]
-  "TARGET_SSE"
-  "movntps\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssemov")
-   (set_attr "mode" "V4SF")])
+(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 "" ""))
+             (use (reg:SI DIRFLAG_REG))])]
+  "TARGET_SINGLE_STRINGOP || optimize_size"
+  "")
 
-(define_insn "sse_movntdi"
-  [(set (match_operand:DI 0 "memory_operand" "=m")
-       (unspec:DI [(match_operand:DI 1 "register_operand" "y")]
-                  UNSPEC_MOVNT))]
-  "TARGET_SSE || TARGET_3DNOW_A"
-  "movntq\t{%1, %0|%0, %1}"
-  [(set_attr "type" "mmxmov")
+(define_insn "*strsetdi_rex_1"
+  [(set (mem:DI (match_operand:DI 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)))
+   (use (reg:SI DIRFLAG_REG))]
+  "TARGET_64BIT && (TARGET_SINGLE_STRINGOP || optimize_size)"
+  "stosq"
+  [(set_attr "type" "str")
+   (set_attr "memory" "store")
    (set_attr "mode" "DI")])
 
-(define_insn "sse_movhlps"
-  [(set (match_operand:V4SF 0 "register_operand" "=x")
-       (vec_merge:V4SF
-        (match_operand:V4SF 1 "register_operand" "0")
-        (vec_select:V4SF (match_operand:V4SF 2 "register_operand" "x")
-                         (parallel [(const_int 2)
-                                    (const_int 3)
-                                    (const_int 0)
-                                    (const_int 1)]))
-        (const_int 3)))]
-  "TARGET_SSE"
-  "movhlps\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "V4SF")])
-
-(define_insn "sse_movlhps"
-  [(set (match_operand:V4SF 0 "register_operand" "=x")
-       (vec_merge:V4SF
-        (match_operand:V4SF 1 "register_operand" "0")
-        (vec_select:V4SF (match_operand:V4SF 2 "register_operand" "x")
-                         (parallel [(const_int 2)
-                                    (const_int 3)
-                                    (const_int 0)
-                                    (const_int 1)]))
-        (const_int 12)))]
-  "TARGET_SSE"
-  "movlhps\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "V4SF")])
-
-(define_insn "sse_movhps"
-  [(set (match_operand:V4SF 0 "nonimmediate_operand" "=x,m")
-       (vec_merge:V4SF
-        (match_operand:V4SF 1 "nonimmediate_operand" "0,0")
-        (match_operand:V4SF 2 "nonimmediate_operand" "m,x")
-        (const_int 12)))]
-  "TARGET_SSE
-   && (GET_CODE (operands[1]) == MEM || GET_CODE (operands[2]) == MEM)"
-  "movhps\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "V4SF")])
-
-(define_insn "sse_movlps"
-  [(set (match_operand:V4SF 0 "nonimmediate_operand" "=x,m")
-       (vec_merge:V4SF
-        (match_operand:V4SF 1 "nonimmediate_operand" "0,0")
-        (match_operand:V4SF 2 "nonimmediate_operand" "m,x")
-        (const_int 3)))]
-  "TARGET_SSE
-   && (GET_CODE (operands[1]) == MEM || GET_CODE (operands[2]) == MEM)"
-  "movlps\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "V4SF")])
-
-(define_expand "sse_loadss"
-  [(match_operand:V4SF 0 "register_operand" "")
-   (match_operand:SF 1 "memory_operand" "")]
-  "TARGET_SSE"
-{
-  emit_insn (gen_sse_loadss_1 (operands[0], operands[1],
-                              CONST0_RTX (V4SFmode)));
-  DONE;
-})
-
-(define_insn "sse_loadss_1"
-  [(set (match_operand:V4SF 0 "register_operand" "=x")
-       (vec_merge:V4SF
-        (vec_duplicate:V4SF (match_operand:SF 1 "memory_operand" "m"))
-        (match_operand:V4SF 2 "const0_operand" "X")
-        (const_int 1)))]
-  "TARGET_SSE"
-  "movss\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssemov")
-   (set_attr "mode" "SF")])
-
-(define_insn "sse_movss"
-  [(set (match_operand:V4SF 0 "register_operand" "=x")
-       (vec_merge:V4SF
-        (match_operand:V4SF 1 "register_operand" "0")
-        (match_operand:V4SF 2 "register_operand" "x")
-        (const_int 1)))]
-  "TARGET_SSE"
-  "movss\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssemov")
-   (set_attr "mode" "SF")])
-
-(define_insn "sse_storess"
-  [(set (match_operand:SF 0 "memory_operand" "=m")
-       (vec_select:SF
-        (match_operand:V4SF 1 "register_operand" "x")
-        (parallel [(const_int 0)])))]
-  "TARGET_SSE"
-  "movss\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssemov")
-   (set_attr "mode" "SF")])
-
-(define_insn "sse_shufps"
-  [(set (match_operand:V4SF 0 "register_operand" "=x")
-        (unspec:V4SF [(match_operand:V4SF 1 "register_operand" "0")
-                     (match_operand:V4SF 2 "nonimmediate_operand" "xm")
-                     (match_operand:SI 3 "immediate_operand" "i")]
-                    UNSPEC_SHUFFLE))]
-  "TARGET_SSE"
-  ;; @@@ check operand order for intel/nonintel syntax
-  "shufps\t{%3, %2, %0|%0, %2, %3}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "V4SF")])
-
-
-;; SSE arithmetic
-
-(define_insn "addv4sf3"
-  [(set (match_operand:V4SF 0 "register_operand" "=x")
-        (plus:V4SF (match_operand:V4SF 1 "register_operand" "0")
-                  (match_operand:V4SF 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE"
-  "addps\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseadd")
-   (set_attr "mode" "V4SF")])
-
-(define_insn "vmaddv4sf3"
-  [(set (match_operand:V4SF 0 "register_operand" "=x")
-       (vec_merge:V4SF
-        (plus:V4SF (match_operand:V4SF 1 "register_operand" "0")
-                   (match_operand:V4SF 2 "nonimmediate_operand" "xm"))
-        (match_dup 1)
-        (const_int 1)))]
-  "TARGET_SSE"
-  "addss\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseadd")
-   (set_attr "mode" "SF")])
-
-(define_insn "subv4sf3"
-  [(set (match_operand:V4SF 0 "register_operand" "=x")
-        (minus:V4SF (match_operand:V4SF 1 "register_operand" "0")
-                   (match_operand:V4SF 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE"
-  "subps\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseadd")
-   (set_attr "mode" "V4SF")])
-
-(define_insn "vmsubv4sf3"
-  [(set (match_operand:V4SF 0 "register_operand" "=x")
-       (vec_merge:V4SF
-        (minus:V4SF (match_operand:V4SF 1 "register_operand" "0")
-                    (match_operand:V4SF 2 "nonimmediate_operand" "xm"))
-        (match_dup 1)
-        (const_int 1)))]
-  "TARGET_SSE"
-  "subss\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseadd")
-   (set_attr "mode" "SF")])
-
-(define_insn "mulv4sf3"
-  [(set (match_operand:V4SF 0 "register_operand" "=x")
-        (mult:V4SF (match_operand:V4SF 1 "register_operand" "0")
-                  (match_operand:V4SF 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE"
-  "mulps\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssemul")
-   (set_attr "mode" "V4SF")])
-
-(define_insn "vmmulv4sf3"
-  [(set (match_operand:V4SF 0 "register_operand" "=x")
-       (vec_merge:V4SF
-        (mult:V4SF (match_operand:V4SF 1 "register_operand" "0")
-                   (match_operand:V4SF 2 "nonimmediate_operand" "xm"))
-        (match_dup 1)
-        (const_int 1)))]
-  "TARGET_SSE"
-  "mulss\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssemul")
-   (set_attr "mode" "SF")])
+(define_insn "*strsetsi_1"
+  [(set (mem:SI (match_operand:SI 1 "register_operand" "0"))
+       (match_operand:SI 2 "register_operand" "a"))
+   (set (match_operand:SI 0 "register_operand" "=D")
+       (plus:SI (match_dup 1)
+                (const_int 4)))
+   (use (reg:SI DIRFLAG_REG))]
+  "!TARGET_64BIT && (TARGET_SINGLE_STRINGOP || optimize_size)"
+  "{stosl|stosd}"
+  [(set_attr "type" "str")
+   (set_attr "memory" "store")
+   (set_attr "mode" "SI")])
 
-(define_insn "divv4sf3"
-  [(set (match_operand:V4SF 0 "register_operand" "=x")
-        (div:V4SF (match_operand:V4SF 1 "register_operand" "0")
-                 (match_operand:V4SF 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE"
-  "divps\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssediv")
-   (set_attr "mode" "V4SF")])
-
-(define_insn "vmdivv4sf3"
-  [(set (match_operand:V4SF 0 "register_operand" "=x")
-       (vec_merge:V4SF
-        (div:V4SF (match_operand:V4SF 1 "register_operand" "0")
-                  (match_operand:V4SF 2 "nonimmediate_operand" "xm"))
-        (match_dup 1)
-        (const_int 1)))]
-  "TARGET_SSE"
-  "divss\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssediv")
-   (set_attr "mode" "SF")])
+(define_insn "*strsetsi_rex_1"
+  [(set (mem:SI (match_operand:DI 1 "register_operand" "0"))
+       (match_operand:SI 2 "register_operand" "a"))
+   (set (match_operand:DI 0 "register_operand" "=D")
+       (plus:DI (match_dup 1)
+                (const_int 4)))
+   (use (reg:SI DIRFLAG_REG))]
+  "TARGET_64BIT && (TARGET_SINGLE_STRINGOP || optimize_size)"
+  "{stosl|stosd}"
+  [(set_attr "type" "str")
+   (set_attr "memory" "store")
+   (set_attr "mode" "SI")])
 
+(define_insn "*strsethi_1"
+  [(set (mem:HI (match_operand:SI 1 "register_operand" "0"))
+       (match_operand:HI 2 "register_operand" "a"))
+   (set (match_operand:SI 0 "register_operand" "=D")
+       (plus:SI (match_dup 1)
+                (const_int 2)))
+   (use (reg:SI DIRFLAG_REG))]
+  "!TARGET_64BIT && (TARGET_SINGLE_STRINGOP || optimize_size)"
+  "stosw"
+  [(set_attr "type" "str")
+   (set_attr "memory" "store")
+   (set_attr "mode" "HI")])
 
-;; SSE square root/reciprocal
+(define_insn "*strsethi_rex_1"
+  [(set (mem:HI (match_operand:DI 1 "register_operand" "0"))
+       (match_operand:HI 2 "register_operand" "a"))
+   (set (match_operand:DI 0 "register_operand" "=D")
+       (plus:DI (match_dup 1)
+                (const_int 2)))
+   (use (reg:SI DIRFLAG_REG))]
+  "TARGET_64BIT && (TARGET_SINGLE_STRINGOP || optimize_size)"
+  "stosw"
+  [(set_attr "type" "str")
+   (set_attr "memory" "store")
+   (set_attr "mode" "HI")])
 
-(define_insn "rcpv4sf2"
-  [(set (match_operand:V4SF 0 "register_operand" "=x")
-        (unspec:V4SF
-        [(match_operand:V4SF 1 "nonimmediate_operand" "xm")] UNSPEC_RCP))]
-  "TARGET_SSE"
-  "rcpps\t{%1, %0|%0, %1}"
-  [(set_attr "type" "sse")
-   (set_attr "mode" "V4SF")])
-
-(define_insn "vmrcpv4sf2"
-  [(set (match_operand:V4SF 0 "register_operand" "=x")
-       (vec_merge:V4SF
-        (unspec:V4SF [(match_operand:V4SF 1 "nonimmediate_operand" "xm")]
-                     UNSPEC_RCP)
-        (match_operand:V4SF 2 "register_operand" "0")
-        (const_int 1)))]
-  "TARGET_SSE"
-  "rcpss\t{%1, %0|%0, %1}"
-  [(set_attr "type" "sse")
-   (set_attr "mode" "SF")])
+(define_insn "*strsetqi_1"
+  [(set (mem:QI (match_operand:SI 1 "register_operand" "0"))
+       (match_operand:QI 2 "register_operand" "a"))
+   (set (match_operand:SI 0 "register_operand" "=D")
+       (plus:SI (match_dup 1)
+                (const_int 1)))
+   (use (reg:SI DIRFLAG_REG))]
+  "!TARGET_64BIT && (TARGET_SINGLE_STRINGOP || optimize_size)"
+  "stosb"
+  [(set_attr "type" "str")
+   (set_attr "memory" "store")
+   (set_attr "mode" "QI")])
 
-(define_insn "rsqrtv4sf2"
-  [(set (match_operand:V4SF 0 "register_operand" "=x")
-        (unspec:V4SF
-        [(match_operand:V4SF 1 "nonimmediate_operand" "xm")] UNSPEC_RSQRT))]
-  "TARGET_SSE"
-  "rsqrtps\t{%1, %0|%0, %1}"
-  [(set_attr "type" "sse")
-   (set_attr "mode" "V4SF")])
-
-(define_insn "vmrsqrtv4sf2"
-  [(set (match_operand:V4SF 0 "register_operand" "=x")
-       (vec_merge:V4SF
-        (unspec:V4SF [(match_operand:V4SF 1 "nonimmediate_operand" "xm")]
-                     UNSPEC_RSQRT)
-        (match_operand:V4SF 2 "register_operand" "0")
-        (const_int 1)))]
-  "TARGET_SSE"
-  "rsqrtss\t{%1, %0|%0, %1}"
-  [(set_attr "type" "sse")
-   (set_attr "mode" "SF")])
+(define_insn "*strsetqi_rex_1"
+  [(set (mem:QI (match_operand:DI 1 "register_operand" "0"))
+       (match_operand:QI 2 "register_operand" "a"))
+   (set (match_operand:DI 0 "register_operand" "=D")
+       (plus:DI (match_dup 1)
+                (const_int 1)))
+   (use (reg:SI DIRFLAG_REG))]
+  "TARGET_64BIT && (TARGET_SINGLE_STRINGOP || optimize_size)"
+  "stosb"
+  [(set_attr "type" "str")
+   (set_attr "memory" "store")
+   (set_attr "mode" "QI")])
 
-(define_insn "sqrtv4sf2"
-  [(set (match_operand:V4SF 0 "register_operand" "=x")
-        (sqrt:V4SF (match_operand:V4SF 1 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE"
-  "sqrtps\t{%1, %0|%0, %1}"
-  [(set_attr "type" "sse")
-   (set_attr "mode" "V4SF")])
-
-(define_insn "vmsqrtv4sf2"
-  [(set (match_operand:V4SF 0 "register_operand" "=x")
-       (vec_merge:V4SF
-        (sqrt:V4SF (match_operand:V4SF 1 "nonimmediate_operand" "xm"))
-        (match_operand:V4SF 2 "register_operand" "0")
-        (const_int 1)))]
-  "TARGET_SSE"
-  "sqrtss\t{%1, %0|%0, %1}"
-  [(set_attr "type" "sse")
-   (set_attr "mode" "SF")])
+(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" ""))
+             (use (match_dup 1))
+             (use (reg:SI DIRFLAG_REG))])]
+  ""
+  "")
 
-;; SSE logical operations.
+(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 (mem:BLK (match_dup 3))
+       (const_int 0))
+   (use (match_operand:DI 2 "register_operand" "a"))
+   (use (match_dup 4))
+   (use (reg:SI DIRFLAG_REG))]
+  "TARGET_64BIT"
+  "{rep\;stosq|rep stosq}"
+  [(set_attr "type" "str")
+   (set_attr "prefix_rep" "1")
+   (set_attr "memory" "store")
+   (set_attr "mode" "DI")])
 
-;; SSE defines logical operations on floating point values.  This brings
-;; interesting challenge to RTL representation where logicals are only valid
-;; on integral types.  We deal with this by representing the floating point
-;; logical as logical on arguments casted to TImode as this is what hardware
-;; really does.  Unfortunately hardware requires the type information to be
-;; present and thus we must avoid subregs from being simplified and eliminated
-;; in later compilation phases.
-;;
-;; We have following variants from each instruction:
-;; sse_andsf3 - the operation taking V4SF vector operands
-;;              and doing TImode cast on them
-;; *sse_andsf3_memory - the operation taking one memory operand casted to
-;;                      TImode, since backend insist on eliminating casts
-;;                      on memory operands
-;; sse_andti3_sf_1 - the operation taking SF scalar operands.
-;;                   We can not accept memory operand here as instruction reads
-;;                  whole scalar.  This is generated only post reload by GCC
-;;                  scalar float operations that expands to logicals (fabs)
-;; sse_andti3_sf_2 - the operation taking SF scalar input and TImode
-;;                  memory operand.  Eventually combine can be able
-;;                  to synthesize these using splitter.
-;; sse2_anddf3, *sse2_anddf3_memory
-;;              
-;; 
-;; These are not called andti3 etc. because we really really don't want
-;; the compiler to widen DImode ands to TImode ands and then try to move
-;; into DImode subregs of SSE registers, and them together, and move out
-;; of DImode subregs again!
-;; SSE1 single precision floating point logical operation
-(define_expand "sse_andv4sf3"
-  [(set (subreg:TI (match_operand:V4SF 0 "register_operand" "") 0)
-        (and:TI (subreg:TI (match_operand:V4SF 1 "register_operand" "") 0)
-               (subreg:TI (match_operand:V4SF 2 "nonimmediate_operand" "") 0)))]
-  "TARGET_SSE"
-  "")
+(define_insn "*rep_stossi"
+  [(set (match_operand:SI 1 "register_operand" "=c") (const_int 0))
+   (set (match_operand:SI 0 "register_operand" "=D") 
+        (plus:SI (ashift:SI (match_operand:SI 4 "register_operand" "1")
+                           (const_int 2))
+                (match_operand:SI 3 "register_operand" "0")))
+   (set (mem:BLK (match_dup 3))
+       (const_int 0))
+   (use (match_operand:SI 2 "register_operand" "a"))
+   (use (match_dup 4))
+   (use (reg:SI DIRFLAG_REG))]
+  "!TARGET_64BIT"
+  "{rep\;stosl|rep stosd}"
+  [(set_attr "type" "str")
+   (set_attr "prefix_rep" "1")
+   (set_attr "memory" "store")
+   (set_attr "mode" "SI")])
 
-(define_insn "*sse_andv4sf3"
-  [(set (subreg:TI (match_operand:V4SF 0 "register_operand" "=x") 0)
-        (and:TI (match_operand:TI 1 "nonimmediate_operand" "%0")
-               (match_operand:TI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE
-   && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
-  "andps\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sselog")
-   (set_attr "mode" "V4SF")])
-
-(define_insn "*sse_andsf3"
-  [(set (subreg:TI (match_operand:SF 0 "register_operand" "=x") 0)
-        (and:TI (match_operand:TI 1 "nonimmediate_operand" "%0")
-               (match_operand:TI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE
-   && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
-  "andps\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sselog")
-   (set_attr "mode" "V4SF")])
-
-(define_expand "sse_nandv4sf3"
-  [(set (subreg:TI (match_operand:V4SF 0 "register_operand" "") 0)
-        (and:TI (not:TI (subreg:TI (match_operand:V4SF 1 "register_operand" "") 0))
-               (subreg:TI (match_operand:V4SF 2 "nonimmediate_operand" "") 0)))]
-  "TARGET_SSE"
-  "")
+(define_insn "*rep_stossi_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 2))
+                (match_operand:DI 3 "register_operand" "0")))
+   (set (mem:BLK (match_dup 3))
+       (const_int 0))
+   (use (match_operand:SI 2 "register_operand" "a"))
+   (use (match_dup 4))
+   (use (reg:SI DIRFLAG_REG))]
+  "TARGET_64BIT"
+  "{rep\;stosl|rep stosd}"
+  [(set_attr "type" "str")
+   (set_attr "prefix_rep" "1")
+   (set_attr "memory" "store")
+   (set_attr "mode" "SI")])
 
-(define_insn "*sse_nandv4sf3"
-  [(set (subreg:TI (match_operand:V4SF 0 "register_operand" "=x") 0)
-        (and:TI (not:TI (match_operand:TI 1 "register_operand" "0"))
-               (match_operand:TI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE"
-  "andnps\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sselog")
-   (set_attr "mode" "V4SF")])
-
-(define_insn "*sse_nandsf3"
-  [(set (subreg:TI (match_operand:SF 0 "register_operand" "=x") 0)
-        (and:TI (not:TI (match_operand:TI 1 "register_operand" "0"))
-               (match_operand:TI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE"
-  "andnps\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sselog")
-   (set_attr "mode" "V4SF")])
-
-(define_expand "sse_iorv4sf3"
-  [(set (subreg:TI (match_operand:V4SF 0 "register_operand" "") 0)
-        (ior:TI (subreg:TI (match_operand:V4SF 1 "register_operand" "") 0)
-               (subreg:TI (match_operand:V4SF 2 "nonimmediate_operand" "") 0)))]
-  "TARGET_SSE"
-  "")
+(define_insn "*rep_stosqi"
+  [(set (match_operand:SI 1 "register_operand" "=c") (const_int 0))
+   (set (match_operand:SI 0 "register_operand" "=D") 
+        (plus:SI (match_operand:SI 3 "register_operand" "0")
+                (match_operand:SI 4 "register_operand" "1")))
+   (set (mem:BLK (match_dup 3))
+       (const_int 0))
+   (use (match_operand:QI 2 "register_operand" "a"))
+   (use (match_dup 4))
+   (use (reg:SI DIRFLAG_REG))]
+  "!TARGET_64BIT"
+  "{rep\;stosb|rep stosb}"
+  [(set_attr "type" "str")
+   (set_attr "prefix_rep" "1")
+   (set_attr "memory" "store")
+   (set_attr "mode" "QI")])
 
-(define_insn "*sse_iorv4sf3"
-  [(set (subreg:TI (match_operand:V4SF 0 "register_operand" "=x") 0)
-        (ior:TI (match_operand:TI 1 "nonimmediate_operand" "%0")
-               (match_operand:TI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE
-   && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
-  "orps\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sselog")
-   (set_attr "mode" "V4SF")])
-
-(define_insn "*sse_iorsf3"
-  [(set (subreg:TI (match_operand:SF 0 "register_operand" "=x") 0)
-        (ior:TI (match_operand:TI 1 "nonimmediate_operand" "%0")
-               (match_operand:TI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE
-   && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
-  "orps\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sselog")
-   (set_attr "mode" "V4SF")])
-
-(define_expand "sse_xorv4sf3"
-  [(set (subreg:TI (match_operand:V4SF 0 "register_operand" "") 0)
-        (xor:TI (subreg:TI (match_operand:V4SF 1 "register_operand" "") 0)
-               (subreg:TI (match_operand:V4SF 2 "nonimmediate_operand" "") 0)))]
-  "TARGET_SSE
-   && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
-  "")
+(define_insn "*rep_stosqi_rex64"
+  [(set (match_operand:DI 1 "register_operand" "=c") (const_int 0))
+   (set (match_operand:DI 0 "register_operand" "=D") 
+        (plus:DI (match_operand:DI 3 "register_operand" "0")
+                (match_operand:DI 4 "register_operand" "1")))
+   (set (mem:BLK (match_dup 3))
+       (const_int 0))
+   (use (match_operand:QI 2 "register_operand" "a"))
+   (use (match_dup 4))
+   (use (reg:SI DIRFLAG_REG))]
+  "TARGET_64BIT"
+  "{rep\;stosb|rep stosb}"
+  [(set_attr "type" "str")
+   (set_attr "prefix_rep" "1")
+   (set_attr "memory" "store")
+   (set_attr "mode" "QI")])
 
-(define_insn "*sse_xorv4sf3"
-  [(set (subreg:TI (match_operand:V4SF 0 "register_operand" "=x") 0)
-        (xor:TI (match_operand:TI 1 "nonimmediate_operand" "%0")
-               (match_operand:TI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE
-   && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
-  "xorps\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sselog")
-   (set_attr "mode" "V4SF")])
-
-(define_insn "*sse_xorsf3"
-  [(set (subreg:TI (match_operand:SF 0 "register_operand" "=x") 0)
-        (xor:TI (match_operand:TI 1 "nonimmediate_operand" "%0")
-               (match_operand:TI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE
-   && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
-  "xorps\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sselog")
-   (set_attr "mode" "V4SF")])
+(define_expand "cmpstrsi"
+  [(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" ""))]
+  "! optimize_size || TARGET_INLINE_ALL_STRINGOPS"
+{
+  rtx addr1, addr2, out, outlow, count, countreg, align;
 
-;; SSE2 double precision floating point logical operation
+  /* Can't use this if the user has appropriated esi or edi.  */
+  if (global_regs[4] || global_regs[5])
+    FAIL;
 
-(define_expand "sse2_andv2df3"
-  [(set (subreg:TI (match_operand:V2DF 0 "register_operand" "") 0)
-        (and:TI (subreg:TI (match_operand:V2DF 1 "register_operand" "") 0)
-               (subreg:TI (match_operand:V2DF 2 "nonimmediate_operand" "") 0)))]
-  "TARGET_SSE2"
-  "")
+  out = operands[0];
+  if (GET_CODE (out) != REG)
+    out = gen_reg_rtx (SImode);
 
-(define_insn "*sse2_andv2df3"
-  [(set (subreg:TI (match_operand:V2DF 0 "register_operand" "=x") 0)
-        (and:TI (match_operand:TI 1 "nonimmediate_operand" "%0")
-               (match_operand:TI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2
-   && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
-  "andpd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sselog")
-   (set_attr "mode" "V2DF")])
-
-(define_insn "*sse2_andv2df3"
-  [(set (subreg:TI (match_operand:DF 0 "register_operand" "=x") 0)
-        (and:TI (match_operand:TI 1 "nonimmediate_operand" "%0")
-               (match_operand:TI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2
-   && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
-  "andpd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sselog")
-   (set_attr "mode" "V2DF")])
-
-(define_expand "sse2_nandv2df3"
-  [(set (subreg:TI (match_operand:V2DF 0 "register_operand" "") 0)
-        (and:TI (not:TI (subreg:TI (match_operand:V2DF 1 "register_operand" "") 0))
-               (subreg:TI (match_operand:V2DF 2 "nonimmediate_operand" "") 0)))]
-  "TARGET_SSE2"
-  "")
+  addr1 = copy_to_mode_reg (Pmode, XEXP (operands[1], 0));
+  addr2 = copy_to_mode_reg (Pmode, 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))
+    operands[2] = replace_equiv_address_nv (operands[2], addr2);
 
-(define_insn "*sse2_nandv2df3"
-  [(set (subreg:TI (match_operand:V2DF 0 "register_operand" "=x") 0)
-        (and:TI (not:TI (match_operand:TI 1 "register_operand" "0"))
-               (match_operand:TI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2"
-  "andnpd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sselog")
-   (set_attr "mode" "V2DF")])
-
-(define_insn "*sse_nandti3_df"
-  [(set (subreg:TI (match_operand:DF 0 "register_operand" "=Y") 0)
-        (and:TI (not:TI (match_operand:TI 1 "register_operand" "0"))
-               (match_operand:TI 2 "nonimmediate_operand" "Ym")))]
-  "TARGET_SSE2"
-  "andnpd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sselog")
-   (set_attr "mode" "V2DF")])
-
-(define_expand "sse2_iorv2df3"
-  [(set (subreg:TI (match_operand:V2DF 0 "register_operand" "") 0)
-        (ior:TI (subreg:TI (match_operand:V2DF 1 "register_operand" "") 0)
-               (subreg:TI (match_operand:V2DF 2 "nonimmediate_operand" "") 0)))]
-  "TARGET_SSE2"
-  "")
+  count = operands[3];
+  countreg = ix86_zero_extend_to_Pmode (count);
 
-(define_insn "*sse2_iorv2df3"
-  [(set (subreg:TI (match_operand:V2DF 0 "register_operand" "=x") 0)
-        (ior:TI (match_operand:TI 1 "nonimmediate_operand" "%0")
-               (match_operand:TI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2
-   && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
-  "orpd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sselog")
-   (set_attr "mode" "V2DF")])
-
-(define_insn "*sse2_iordf3"
-  [(set (subreg:TI (match_operand:DF 0 "register_operand" "=x") 0)
-        (ior:TI (match_operand:TI 1 "nonimmediate_operand" "%0")
-               (match_operand:TI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2
-   && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
-  "orpd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sselog")
-   (set_attr "mode" "V2DF")])
-
-(define_expand "sse2_xorv2df3"
-  [(set (subreg:TI (match_operand:V2DF 0 "register_operand" "") 0)
-        (xor:TI (subreg:TI (match_operand:V2DF 1 "nonimmediate_operand" "") 0)
-               (subreg:TI (match_operand:V2DF 2 "nonimmediate_operand" "") 0)))]
-  "TARGET_SSE2"
-  "")
+  /* %%% Iff we are testing strict equality, we can use known alignment
+     to good advantage.  This may be possible with combine, particularly
+     once cc0 is dead.  */
+  align = operands[4];
 
-(define_insn "*sse2_xorv2df3"
-  [(set (subreg:TI (match_operand:V2DF 0 "register_operand" "=x") 0)
-        (xor:TI (match_operand:TI 1 "nonimmediate_operand" "%0")
-               (match_operand:TI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2
-   && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
-  "xorpd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sselog")
-   (set_attr "mode" "V2DF")])
-
-(define_insn "*sse2_xordf3"
-  [(set (subreg:TI (match_operand:DF 0 "register_operand" "=x") 0)
-        (xor:TI (match_operand:TI 1 "nonimmediate_operand" "%0")
-               (match_operand:TI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2
-   && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
-  "xorpd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sselog")
-   (set_attr "mode" "V2DF")])
-
-;; SSE2 integral logicals.  These patterns must always come after floating
-;; point ones since we don't want compiler to use integer opcodes on floating
-;; point SSE values to avoid matching of subregs in the match_operand.
-(define_insn "*sse2_andti3"
-  [(set (match_operand:TI 0 "register_operand" "=x")
-        (and:TI (match_operand:TI 1 "nonimmediate_operand" "%0")
-               (match_operand:TI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2
-   && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
-  "pand\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sselog")
-   (set_attr "mode" "TI")])
-
-(define_insn "sse2_andv2di3"
-  [(set (match_operand:V2DI 0 "register_operand" "=x")
-        (and:V2DI (match_operand:V2DI 1 "nonimmediate_operand" "%0")
-                 (match_operand:V2DI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2
-   && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
-  "pand\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sselog")
-   (set_attr "mode" "TI")])
-
-(define_insn "*sse2_nandti3"
-  [(set (match_operand:TI 0 "register_operand" "=x")
-        (and:TI (not:TI (match_operand:TI 1 "register_operand" "0"))
-               (match_operand:TI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2"
-  "pandn\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sselog")
-   (set_attr "mode" "TI")])
-
-(define_insn "sse2_nandv2di3"
-  [(set (match_operand:V2DI 0 "register_operand" "=x")
-        (and:V2DI (not:V2DI (match_operand:V2DI 1 "register_operand" "0"))
-                 (match_operand:V2DI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2
-   && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
-  "pandn\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sselog")
-   (set_attr "mode" "TI")])
-
-(define_insn "*sse2_iorti3"
-  [(set (match_operand:TI 0 "register_operand" "=x")
-        (ior:TI (match_operand:TI 1 "nonimmediate_operand" "%0")
-               (match_operand:TI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2
-   && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
-  "por\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sselog")
-   (set_attr "mode" "TI")])
-
-(define_insn "sse2_iorv2di3"
-  [(set (match_operand:V2DI 0 "register_operand" "=x")
-        (ior:V2DI (match_operand:V2DI 1 "nonimmediate_operand" "%0")
-                 (match_operand:V2DI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2
-   && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
-  "por\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sselog")
-   (set_attr "mode" "TI")])
-
-(define_insn "*sse2_xorti3"
-  [(set (match_operand:TI 0 "register_operand" "=x")
-        (xor:TI (match_operand:TI 1 "nonimmediate_operand" "%0")
-               (match_operand:TI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2
-   && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
-  "pxor\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sselog")
-   (set_attr "mode" "TI")])
-
-(define_insn "sse2_xorv2di3"
-  [(set (match_operand:V2DI 0 "register_operand" "=x")
-        (xor:V2DI (match_operand:V2DI 1 "nonimmediate_operand" "%0")
-                 (match_operand:V2DI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2
-   && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
-  "pxor\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sselog")
-   (set_attr "mode" "TI")])
-
-;; Use xor, but don't show input operands so they aren't live before
-;; this insn.
-(define_insn "sse_clrv4sf"
-  [(set (match_operand:V4SF 0 "register_operand" "=x")
-       (match_operand:V4SF 1 "const0_operand" "X"))]
-  "TARGET_SSE"
-{
-  if (get_attr_mode (insn) == MODE_TI)
-    return "pxor\t{%0, %0|%0, %0}";
+  emit_insn (gen_cld ());
+  if (GET_CODE (count) == CONST_INT)
+    {
+      if (INTVAL (count) == 0)
+       {
+         emit_move_insn (operands[0], const0_rtx);
+         DONE;
+       }
+      emit_insn (gen_cmpstrqi_nz_1 (addr1, addr2, countreg, align,
+                                   operands[1], operands[2]));
+    }
   else
-    return "xorps\t{%0, %0|%0, %0}";
-}
-  [(set_attr "type" "sselog")
-   (set_attr "memory" "none")
-   (set (attr "mode")
-       (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_size")
-                   (const_int 0)))
-        (const_string "TI")
-        (const_string "V4SF")))])
-
-;; Use xor, but don't show input operands so they aren't live before
-;; this insn.
-(define_insn "sse_clrv2df"
-  [(set (match_operand:V2DF 0 "register_operand" "=x")
-        (unspec:V2DF [(const_int 0)] UNSPEC_NOP))]
-  "TARGET_SSE2"
-  "xorpd\t{%0, %0|%0, %0}"
-  [(set_attr "type" "sselog")
-   (set_attr "memory" "none")
-   (set_attr "mode" "V4SF")])
+    {
+      if (TARGET_64BIT)
+       emit_insn (gen_cmpdi_1_rex64 (countreg, countreg));
+      else
+       emit_insn (gen_cmpsi_1 (countreg, countreg));
+      emit_insn (gen_cmpstrqi_1 (addr1, addr2, countreg, align,
+                                operands[1], operands[2]));
+    }
 
-;; SSE mask-generating compares
+  outlow = gen_lowpart (QImode, out);
+  emit_insn (gen_cmpintqi (outlow));
+  emit_move_insn (out, gen_rtx_SIGN_EXTEND (SImode, outlow));
 
-(define_insn "maskcmpv4sf3"
-  [(set (match_operand:V4SI 0 "register_operand" "=x")
-        (match_operator:V4SI 3 "sse_comparison_operator"
-               [(match_operand:V4SF 1 "register_operand" "0")
-                (match_operand:V4SF 2 "register_operand" "x")]))]
-  "TARGET_SSE"
-  "cmp%D3ps\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssecmp")
-   (set_attr "mode" "V4SF")])
-
-(define_insn "maskncmpv4sf3"
-  [(set (match_operand:V4SI 0 "register_operand" "=x")
-        (not:V4SI
-        (match_operator:V4SI 3 "sse_comparison_operator"
-               [(match_operand:V4SF 1 "register_operand" "0")
-                (match_operand:V4SF 2 "register_operand" "x")])))]
-  "TARGET_SSE"
-{
-  if (GET_CODE (operands[3]) == UNORDERED)
-    return "cmpordps\t{%2, %0|%0, %2}";
-  else
-    return "cmpn%D3ps\t{%2, %0|%0, %2}";
-}
-  [(set_attr "type" "ssecmp")
-   (set_attr "mode" "V4SF")])
-
-(define_insn "vmmaskcmpv4sf3"
-  [(set (match_operand:V4SI 0 "register_operand" "=x")
-       (vec_merge:V4SI
-        (match_operator:V4SI 3 "sse_comparison_operator"
-               [(match_operand:V4SF 1 "register_operand" "0")
-                (match_operand:V4SF 2 "register_operand" "x")])
-        (subreg:V4SI (match_dup 1) 0)
-        (const_int 1)))]
-  "TARGET_SSE"
-  "cmp%D3ss\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssecmp")
-   (set_attr "mode" "SF")])
+  if (operands[0] != out)
+    emit_move_insn (operands[0], out);
 
-(define_insn "vmmaskncmpv4sf3"
-  [(set (match_operand:V4SI 0 "register_operand" "=x")
-       (vec_merge:V4SI
-        (not:V4SI
-         (match_operator:V4SI 3 "sse_comparison_operator"
-               [(match_operand:V4SF 1 "register_operand" "0")
-                (match_operand:V4SF 2 "register_operand" "x")]))
-        (subreg:V4SI (match_dup 1) 0)
-        (const_int 1)))]
-  "TARGET_SSE"
-{
-  if (GET_CODE (operands[3]) == UNORDERED)
-    return "cmpordss\t{%2, %0|%0, %2}";
-  else
-    return "cmpn%D3ss\t{%2, %0|%0, %2}";
-}
-  [(set_attr "type" "ssecmp")
-   (set_attr "mode" "SF")])
+  DONE;
+})
 
-(define_insn "sse_comi"
-  [(set (reg:CCFP 17)
-        (compare:CCFP (vec_select:SF
-                      (match_operand:V4SF 0 "register_operand" "x")
-                      (parallel [(const_int 0)]))
-                     (vec_select:SF
-                      (match_operand:V4SF 1 "register_operand" "x")
-                      (parallel [(const_int 0)]))))]
-  "TARGET_SSE"
-  "comiss\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssecomi")
-   (set_attr "mode" "SF")])
+;; Produce a tri-state integer (-1, 0, 1) from condition codes.
 
-(define_insn "sse_ucomi"
-  [(set (reg:CCFPU 17)
-       (compare:CCFPU (vec_select:SF
-                       (match_operand:V4SF 0 "register_operand" "x")
-                       (parallel [(const_int 0)]))
-                      (vec_select:SF
-                       (match_operand:V4SF 1 "register_operand" "x")
-                       (parallel [(const_int 0)]))))]
-  "TARGET_SSE"
-  "ucomiss\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssecomi")
-   (set_attr "mode" "SF")])
+(define_expand "cmpintqi"
+  [(set (match_dup 1)
+       (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" "")
+                  (minus:QI (match_dup 1)
+                            (match_dup 2)))
+             (clobber (reg:CC FLAGS_REG))])]
+  ""
+  "operands[1] = gen_reg_rtx (QImode);
+   operands[2] = gen_reg_rtx (QImode);")
 
+;; memcmp recognizers.  The `cmpsb' opcode does nothing if the count is
+;; zero.  Emit extra code to make sure that a zero-length compare is EQ.
 
-;; SSE unpack
-
-(define_insn "sse_unpckhps"
-  [(set (match_operand:V4SF 0 "register_operand" "=x")
-       (vec_merge:V4SF
-        (vec_select:V4SF (match_operand:V4SF 1 "register_operand" "0")
-                         (parallel [(const_int 2)
-                                    (const_int 0)
-                                    (const_int 3)
-                                    (const_int 1)]))
-        (vec_select:V4SF (match_operand:V4SF 2 "register_operand" "x")
-                         (parallel [(const_int 0)
-                                    (const_int 2)
-                                    (const_int 1)
-                                    (const_int 3)]))
-        (const_int 5)))]
-  "TARGET_SSE"
-  "unpckhps\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "V4SF")])
-
-(define_insn "sse_unpcklps"
-  [(set (match_operand:V4SF 0 "register_operand" "=x")
-       (vec_merge:V4SF
-        (vec_select:V4SF (match_operand:V4SF 1 "register_operand" "0")
-                         (parallel [(const_int 0)
-                                    (const_int 2)
-                                    (const_int 1)
-                                    (const_int 3)]))
-        (vec_select:V4SF (match_operand:V4SF 2 "register_operand" "x")
-                         (parallel [(const_int 2)
-                                    (const_int 0)
-                                    (const_int 3)
-                                    (const_int 1)]))
-        (const_int 5)))]
-  "TARGET_SSE"
-  "unpcklps\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "V4SF")])
+(define_expand "cmpstrqi_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" ""))
+             (use (reg:SI DIRFLAG_REG))
+             (clobber (match_operand 0 "register_operand" ""))
+             (clobber (match_operand 1 "register_operand" ""))
+             (clobber (match_dup 2))])]
+  ""
+  "")
 
+(define_insn "*cmpstrqi_nz_1"
+  [(set (reg:CC FLAGS_REG)
+       (compare:CC (mem:BLK (match_operand:SI 4 "register_operand" "0"))
+                   (mem:BLK (match_operand:SI 5 "register_operand" "1"))))
+   (use (match_operand:SI 6 "register_operand" "2"))
+   (use (match_operand:SI 3 "immediate_operand" "i"))
+   (use (reg:SI DIRFLAG_REG))
+   (clobber (match_operand:SI 0 "register_operand" "=S"))
+   (clobber (match_operand:SI 1 "register_operand" "=D"))
+   (clobber (match_operand:SI 2 "register_operand" "=c"))]
+  "!TARGET_64BIT"
+  "repz{\;| }cmpsb"
+  [(set_attr "type" "str")
+   (set_attr "mode" "QI")
+   (set_attr "prefix_rep" "1")])
 
-;; SSE min/max
+(define_insn "*cmpstrqi_nz_rex_1"
+  [(set (reg:CC FLAGS_REG)
+       (compare:CC (mem:BLK (match_operand:DI 4 "register_operand" "0"))
+                   (mem:BLK (match_operand:DI 5 "register_operand" "1"))))
+   (use (match_operand:DI 6 "register_operand" "2"))
+   (use (match_operand:SI 3 "immediate_operand" "i"))
+   (use (reg:SI DIRFLAG_REG))
+   (clobber (match_operand:DI 0 "register_operand" "=S"))
+   (clobber (match_operand:DI 1 "register_operand" "=D"))
+   (clobber (match_operand:DI 2 "register_operand" "=c"))]
+  "TARGET_64BIT"
+  "repz{\;| }cmpsb"
+  [(set_attr "type" "str")
+   (set_attr "mode" "QI")
+   (set_attr "prefix_rep" "1")])
 
-(define_insn "smaxv4sf3"
-  [(set (match_operand:V4SF 0 "register_operand" "=x")
-        (smax:V4SF (match_operand:V4SF 1 "register_operand" "0")
-                  (match_operand:V4SF 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE"
-  "maxps\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sse")
-   (set_attr "mode" "V4SF")])
-
-(define_insn "vmsmaxv4sf3"
-  [(set (match_operand:V4SF 0 "register_operand" "=x")
-       (vec_merge:V4SF
-        (smax:V4SF (match_operand:V4SF 1 "register_operand" "0")
-                   (match_operand:V4SF 2 "nonimmediate_operand" "xm"))
-        (match_dup 1)
-        (const_int 1)))]
-  "TARGET_SSE"
-  "maxss\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sse")
-   (set_attr "mode" "SF")])
+;; The same, but the count is not known to not be zero.
 
-(define_insn "sminv4sf3"
-  [(set (match_operand:V4SF 0 "register_operand" "=x")
-        (smin:V4SF (match_operand:V4SF 1 "register_operand" "0")
-                  (match_operand:V4SF 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE"
-  "minps\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sse")
-   (set_attr "mode" "V4SF")])
-
-(define_insn "vmsminv4sf3"
-  [(set (match_operand:V4SF 0 "register_operand" "=x")
-       (vec_merge:V4SF
-        (smin:V4SF (match_operand:V4SF 1 "register_operand" "0")
-                   (match_operand:V4SF 2 "nonimmediate_operand" "xm"))
-        (match_dup 1)
-        (const_int 1)))]
-  "TARGET_SSE"
-  "minss\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sse")
-   (set_attr "mode" "SF")])
+(define_expand "cmpstrqi_1"
+  [(parallel [(set (reg:CC FLAGS_REG)
+               (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" ""))
+                 (const_int 0)))
+             (use (match_operand:SI 3 "immediate_operand" ""))
+             (use (reg:CC FLAGS_REG))
+             (use (reg:SI DIRFLAG_REG))
+             (clobber (match_operand 0 "register_operand" ""))
+             (clobber (match_operand 1 "register_operand" ""))
+             (clobber (match_dup 2))])]
+  ""
+  "")
 
-;; SSE <-> integer/MMX conversions
+(define_insn "*cmpstrqi_1"
+  [(set (reg:CC FLAGS_REG)
+       (if_then_else:CC (ne (match_operand:SI 6 "register_operand" "2")
+                            (const_int 0))
+         (compare:CC (mem:BLK (match_operand:SI 4 "register_operand" "0"))
+                     (mem:BLK (match_operand:SI 5 "register_operand" "1")))
+         (const_int 0)))
+   (use (match_operand:SI 3 "immediate_operand" "i"))
+   (use (reg:CC FLAGS_REG))
+   (use (reg:SI DIRFLAG_REG))
+   (clobber (match_operand:SI 0 "register_operand" "=S"))
+   (clobber (match_operand:SI 1 "register_operand" "=D"))
+   (clobber (match_operand:SI 2 "register_operand" "=c"))]
+  "!TARGET_64BIT"
+  "repz{\;| }cmpsb"
+  [(set_attr "type" "str")
+   (set_attr "mode" "QI")
+   (set_attr "prefix_rep" "1")])
 
-(define_insn "cvtpi2ps"
-  [(set (match_operand:V4SF 0 "register_operand" "=x")
-       (vec_merge:V4SF
-        (match_operand:V4SF 1 "register_operand" "0")
-        (vec_duplicate:V4SF
-         (float:V2SF (match_operand:V2SI 2 "nonimmediate_operand" "ym")))
-        (const_int 12)))]
-  "TARGET_SSE"
-  "cvtpi2ps\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "V4SF")])
+(define_insn "*cmpstrqi_rex_1"
+  [(set (reg:CC FLAGS_REG)
+       (if_then_else:CC (ne (match_operand:DI 6 "register_operand" "2")
+                            (const_int 0))
+         (compare:CC (mem:BLK (match_operand:DI 4 "register_operand" "0"))
+                     (mem:BLK (match_operand:DI 5 "register_operand" "1")))
+         (const_int 0)))
+   (use (match_operand:SI 3 "immediate_operand" "i"))
+   (use (reg:CC FLAGS_REG))
+   (use (reg:SI DIRFLAG_REG))
+   (clobber (match_operand:DI 0 "register_operand" "=S"))
+   (clobber (match_operand:DI 1 "register_operand" "=D"))
+   (clobber (match_operand:DI 2 "register_operand" "=c"))]
+  "TARGET_64BIT"
+  "repz{\;| }cmpsb"
+  [(set_attr "type" "str")
+   (set_attr "mode" "QI")
+   (set_attr "prefix_rep" "1")])
 
-(define_insn "cvtps2pi"
-  [(set (match_operand:V2SI 0 "register_operand" "=y")
-       (vec_select:V2SI
-        (fix:V4SI (match_operand:V4SF 1 "nonimmediate_operand" "xm"))
-        (parallel [(const_int 0) (const_int 1)])))]
-  "TARGET_SSE"
-  "cvtps2pi\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "V4SF")])
-
-(define_insn "cvttps2pi"
-  [(set (match_operand:V2SI 0 "register_operand" "=y")
-       (vec_select:V2SI
-        (unspec:V4SI [(match_operand:V4SF 1 "nonimmediate_operand" "xm")]
-                     UNSPEC_FIX)
-        (parallel [(const_int 0) (const_int 1)])))]
-  "TARGET_SSE"
-  "cvttps2pi\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "SF")])
+(define_expand "strlensi"
+  [(set (match_operand:SI 0 "register_operand" "")
+       (unspec:SI [(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]))
+   DONE;
+ else
+   FAIL;
+})
 
-(define_insn "cvtsi2ss"
-  [(set (match_operand:V4SF 0 "register_operand" "=x,x")
-       (vec_merge:V4SF
-        (match_operand:V4SF 1 "register_operand" "0,0")
-        (vec_duplicate:V4SF
-         (float:SF (match_operand:SI 2 "nonimmediate_operand" "r,rm")))
-        (const_int 14)))]
-  "TARGET_SSE"
-  "cvtsi2ss\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseicvt")
-   (set_attr "athlon_decode" "vector,double")
-   (set_attr "mode" "SF")])
+(define_expand "strlendi"
+  [(set (match_operand:DI 0 "register_operand" "")
+       (unspec:DI [(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]))
+   DONE;
+ else
+   FAIL;
+})
 
-(define_insn "cvtsi2ssq"
-  [(set (match_operand:V4SF 0 "register_operand" "=x,x")
-       (vec_merge:V4SF
-        (match_operand:V4SF 1 "register_operand" "0,0")
-        (vec_duplicate:V4SF
-         (float:SF (match_operand:DI 2 "nonimmediate_operand" "r,rm")))
-        (const_int 14)))]
-  "TARGET_SSE && TARGET_64BIT"
-  "cvtsi2ssq\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseicvt")
-   (set_attr "athlon_decode" "vector,double")
-   (set_attr "mode" "SF")])
+(define_expand "strlenqi_1"
+  [(parallel [(set (match_operand 0 "register_operand" "") (match_operand 2 "" ""))
+             (use (reg:SI DIRFLAG_REG))
+             (clobber (match_operand 1 "register_operand" ""))
+             (clobber (reg:CC FLAGS_REG))])]
+  ""
+  "")
 
-(define_insn "cvtss2si"
-  [(set (match_operand:SI 0 "register_operand" "=r,r")
-       (vec_select:SI
-        (fix:V4SI (match_operand:V4SF 1 "nonimmediate_operand" "x,m"))
-        (parallel [(const_int 0)])))]
-  "TARGET_SSE"
-  "cvtss2si\t{%1, %0|%0, %1}"
-  [(set_attr "type" "sseicvt")
-   (set_attr "athlon_decode" "double,vector")
-   (set_attr "mode" "SI")])
+(define_insn "*strlenqi_1"
+  [(set (match_operand:SI 0 "register_operand" "=&c")
+       (unspec:SI [(mem:BLK (match_operand:SI 5 "register_operand" "1"))
+                   (match_operand:QI 2 "register_operand" "a")
+                   (match_operand:SI 3 "immediate_operand" "i")
+                   (match_operand:SI 4 "register_operand" "0")] UNSPEC_SCAS))
+   (use (reg:SI DIRFLAG_REG))
+   (clobber (match_operand:SI 1 "register_operand" "=D"))
+   (clobber (reg:CC FLAGS_REG))]
+  "!TARGET_64BIT"
+  "repnz{\;| }scasb"
+  [(set_attr "type" "str")
+   (set_attr "mode" "QI")
+   (set_attr "prefix_rep" "1")])
 
-(define_insn "cvtss2siq"
-  [(set (match_operand:DI 0 "register_operand" "=r,r")
-       (vec_select:DI
-        (fix:V4DI (match_operand:V4SF 1 "nonimmediate_operand" "x,m"))
-        (parallel [(const_int 0)])))]
-  "TARGET_SSE"
-  "cvtss2siq\t{%1, %0|%0, %1}"
-  [(set_attr "type" "sseicvt")
-   (set_attr "athlon_decode" "double,vector")
-   (set_attr "mode" "DI")])
+(define_insn "*strlenqi_rex_1"
+  [(set (match_operand:DI 0 "register_operand" "=&c")
+       (unspec:DI [(mem:BLK (match_operand:DI 5 "register_operand" "1"))
+                   (match_operand:QI 2 "register_operand" "a")
+                   (match_operand:DI 3 "immediate_operand" "i")
+                   (match_operand:DI 4 "register_operand" "0")] UNSPEC_SCAS))
+   (use (reg:SI DIRFLAG_REG))
+   (clobber (match_operand:DI 1 "register_operand" "=D"))
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_64BIT"
+  "repnz{\;| }scasb"
+  [(set_attr "type" "str")
+   (set_attr "mode" "QI")
+   (set_attr "prefix_rep" "1")])
 
-(define_insn "cvttss2si"
-  [(set (match_operand:SI 0 "register_operand" "=r,r")
-       (vec_select:SI
-        (unspec:V4SI [(match_operand:V4SF 1 "nonimmediate_operand" "x,xm")]
-                     UNSPEC_FIX)
-        (parallel [(const_int 0)])))]
-  "TARGET_SSE"
-  "cvttss2si\t{%1, %0|%0, %1}"
-  [(set_attr "type" "sseicvt")
-   (set_attr "mode" "SF")
-   (set_attr "athlon_decode" "double,vector")])
+;; Peephole optimizations to clean up after cmpstr*.  This should be
+;; handled in combine, but it is not currently up to the task.
+;; When used for their truth value, the cmpstr* expanders generate
+;; code like this:
+;;
+;;   repz cmpsb
+;;   seta      %al
+;;   setb      %dl
+;;   cmpb      %al, %dl
+;;   jcc       label
+;;
+;; The intermediate three instructions are unnecessary.
 
-(define_insn "cvttss2siq"
-  [(set (match_operand:DI 0 "register_operand" "=r,r")
-       (vec_select:DI
-        (unspec:V4DI [(match_operand:V4SF 1 "nonimmediate_operand" "x,xm")]
-                     UNSPEC_FIX)
-        (parallel [(const_int 0)])))]
-  "TARGET_SSE && TARGET_64BIT"
-  "cvttss2siq\t{%1, %0|%0, %1}"
-  [(set_attr "type" "sseicvt")
-   (set_attr "mode" "SF")
-   (set_attr "athlon_decode" "double,vector")])
+;; This one handles cmpstr*_nz_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" ""))
+     (use (reg:SI DIRFLAG_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" "")
+       (gtu:QI (reg:CC FLAGS_REG) (const_int 0)))
+   (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)))
+  ]
+  "peep2_reg_dead_p (4, operands[7]) && peep2_reg_dead_p (4, operands[8])"
+  [(parallel[
+     (set (reg:CC FLAGS_REG)
+         (compare:CC (mem:BLK (match_dup 4))
+                     (mem:BLK (match_dup 5))))
+     (use (match_dup 6))
+     (use (match_dup 3))
+     (use (reg:SI DIRFLAG_REG))
+     (clobber (match_dup 0))
+     (clobber (match_dup 1))
+     (clobber (match_dup 2))])]
+  "")
 
+;; ...and this one handles cmpstr*_1.
+(define_peephole2
+  [(parallel[
+     (set (reg:CC FLAGS_REG)
+         (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" "")))
+           (const_int 0)))
+     (use (match_operand:SI 3 "immediate_operand" ""))
+     (use (reg:CC FLAGS_REG))
+     (use (reg:SI DIRFLAG_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" "")
+       (gtu:QI (reg:CC FLAGS_REG) (const_int 0)))
+   (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)))
+  ]
+  "peep2_reg_dead_p (4, operands[7]) && peep2_reg_dead_p (4, operands[8])"
+  [(parallel[
+     (set (reg:CC FLAGS_REG)
+         (if_then_else:CC (ne (match_dup 6)
+                              (const_int 0))
+           (compare:CC (mem:BLK (match_dup 4))
+                       (mem:BLK (match_dup 5)))
+           (const_int 0)))
+     (use (match_dup 3))
+     (use (reg:CC FLAGS_REG))
+     (use (reg:SI DIRFLAG_REG))
+     (clobber (match_dup 0))
+     (clobber (match_dup 1))
+     (clobber (match_dup 2))])]
+  "")
 
-;; MMX insns
 
-;; MMX arithmetic
+\f
+;; Conditional move instructions.
 
-(define_insn "addv8qi3"
-  [(set (match_operand:V8QI 0 "register_operand" "=y")
-        (plus:V8QI (match_operand:V8QI 1 "register_operand" "%0")
-                  (match_operand:V8QI 2 "nonimmediate_operand" "ym")))]
-  "TARGET_MMX"
-  "paddb\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxadd")
-   (set_attr "mode" "DI")])
+(define_expand "movdicc"
+  [(set (match_operand:DI 0 "register_operand" "")
+       (if_then_else:DI (match_operand 1 "comparison_operator" "")
+                        (match_operand:DI 2 "general_operand" "")
+                        (match_operand:DI 3 "general_operand" "")))]
+  "TARGET_64BIT"
+  "if (!ix86_expand_int_movcc (operands)) FAIL; DONE;")
 
-(define_insn "addv4hi3"
-  [(set (match_operand:V4HI 0 "register_operand" "=y")
-        (plus:V4HI (match_operand:V4HI 1 "register_operand" "%0")
-                  (match_operand:V4HI 2 "nonimmediate_operand" "ym")))]
-  "TARGET_MMX"
-  "paddw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxadd")
-   (set_attr "mode" "DI")])
+(define_insn "x86_movdicc_0_m1_rex64"
+  [(set (match_operand:DI 0 "register_operand" "=r")
+       (if_then_else:DI (match_operand 1 "ix86_carry_flag_operator" "")
+         (const_int -1)
+         (const_int 0)))
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_64BIT"
+  "sbb{q}\t%0, %0"
+  ; Since we don't have the proper number of operands for an alu insn,
+  ; fill in all the blanks.
+  [(set_attr "type" "alu")
+   (set_attr "pent_pair" "pu")
+   (set_attr "memory" "none")
+   (set_attr "imm_disp" "false")
+   (set_attr "mode" "DI")
+   (set_attr "length_immediate" "0")])
 
-(define_insn "addv2si3"
-  [(set (match_operand:V2SI 0 "register_operand" "=y")
-        (plus:V2SI (match_operand:V2SI 1 "register_operand" "%0")
-                  (match_operand:V2SI 2 "nonimmediate_operand" "ym")))]
-  "TARGET_MMX"
-  "paddd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxadd")
+(define_insn "movdicc_c_rex64"
+  [(set (match_operand:DI 0 "register_operand" "=r,r")
+       (if_then_else:DI (match_operator 1 "ix86_comparison_operator" 
+                               [(reg FLAGS_REG) (const_int 0)])
+                     (match_operand:DI 2 "nonimmediate_operand" "rm,0")
+                     (match_operand:DI 3 "nonimmediate_operand" "0,rm")))]
+  "TARGET_64BIT && TARGET_CMOVE
+   && (GET_CODE (operands[2]) != MEM || GET_CODE (operands[3]) != MEM)"
+  "@
+   cmov%O2%C1\t{%2, %0|%0, %2}
+   cmov%O2%c1\t{%3, %0|%0, %3}"
+  [(set_attr "type" "icmov")
    (set_attr "mode" "DI")])
 
-(define_insn "mmx_adddi3"
-  [(set (match_operand:DI 0 "register_operand" "=y")
-        (unspec:DI
-        [(plus:DI (match_operand:DI 1 "register_operand" "%0")
-                  (match_operand:DI 2 "nonimmediate_operand" "ym"))]
-        UNSPEC_NOP))]
-  "TARGET_MMX"
-  "paddq\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxadd")
-   (set_attr "mode" "DI")])
+(define_expand "movsicc"
+  [(set (match_operand:SI 0 "register_operand" "")
+       (if_then_else:SI (match_operand 1 "comparison_operator" "")
+                        (match_operand:SI 2 "general_operand" "")
+                        (match_operand:SI 3 "general_operand" "")))]
+  ""
+  "if (!ix86_expand_int_movcc (operands)) FAIL; DONE;")
 
-(define_insn "ssaddv8qi3"
-  [(set (match_operand:V8QI 0 "register_operand" "=y")
-        (ss_plus:V8QI (match_operand:V8QI 1 "register_operand" "%0")
-                     (match_operand:V8QI 2 "nonimmediate_operand" "ym")))]
-  "TARGET_MMX"
-  "paddsb\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxadd")
-   (set_attr "mode" "DI")])
+;; Data flow gets confused by our desire for `sbbl reg,reg', and clearing
+;; the register first winds up with `sbbl $0,reg', which is also weird.
+;; So just document what we're doing explicitly.
 
-(define_insn "ssaddv4hi3"
-  [(set (match_operand:V4HI 0 "register_operand" "=y")
-        (ss_plus:V4HI (match_operand:V4HI 1 "register_operand" "%0")
-                     (match_operand:V4HI 2 "nonimmediate_operand" "ym")))]
-  "TARGET_MMX"
-  "paddsw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxadd")
-   (set_attr "mode" "DI")])
+(define_insn "x86_movsicc_0_m1"
+  [(set (match_operand:SI 0 "register_operand" "=r")
+       (if_then_else:SI (match_operand 1 "ix86_carry_flag_operator" "")
+         (const_int -1)
+         (const_int 0)))
+   (clobber (reg:CC FLAGS_REG))]
+  ""
+  "sbb{l}\t%0, %0"
+  ; Since we don't have the proper number of operands for an alu insn,
+  ; fill in all the blanks.
+  [(set_attr "type" "alu")
+   (set_attr "pent_pair" "pu")
+   (set_attr "memory" "none")
+   (set_attr "imm_disp" "false")
+   (set_attr "mode" "SI")
+   (set_attr "length_immediate" "0")])
 
-(define_insn "usaddv8qi3"
-  [(set (match_operand:V8QI 0 "register_operand" "=y")
-        (us_plus:V8QI (match_operand:V8QI 1 "register_operand" "%0")
-                     (match_operand:V8QI 2 "nonimmediate_operand" "ym")))]
-  "TARGET_MMX"
-  "paddusb\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxadd")
-   (set_attr "mode" "DI")])
+(define_insn "*movsicc_noc"
+  [(set (match_operand:SI 0 "register_operand" "=r,r")
+       (if_then_else:SI (match_operator 1 "ix86_comparison_operator" 
+                               [(reg FLAGS_REG) (const_int 0)])
+                     (match_operand:SI 2 "nonimmediate_operand" "rm,0")
+                     (match_operand:SI 3 "nonimmediate_operand" "0,rm")))]
+  "TARGET_CMOVE
+   && (GET_CODE (operands[2]) != MEM || GET_CODE (operands[3]) != MEM)"
+  "@
+   cmov%O2%C1\t{%2, %0|%0, %2}
+   cmov%O2%c1\t{%3, %0|%0, %3}"
+  [(set_attr "type" "icmov")
+   (set_attr "mode" "SI")])
 
-(define_insn "usaddv4hi3"
-  [(set (match_operand:V4HI 0 "register_operand" "=y")
-        (us_plus:V4HI (match_operand:V4HI 1 "register_operand" "%0")
-                     (match_operand:V4HI 2 "nonimmediate_operand" "ym")))]
-  "TARGET_MMX"
-  "paddusw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxadd")
-   (set_attr "mode" "DI")])
+(define_expand "movhicc"
+  [(set (match_operand:HI 0 "register_operand" "")
+       (if_then_else:HI (match_operand 1 "comparison_operator" "")
+                        (match_operand:HI 2 "general_operand" "")
+                        (match_operand:HI 3 "general_operand" "")))]
+  "TARGET_HIMODE_MATH"
+  "if (!ix86_expand_int_movcc (operands)) FAIL; DONE;")
 
-(define_insn "subv8qi3"
-  [(set (match_operand:V8QI 0 "register_operand" "=y")
-        (minus:V8QI (match_operand:V8QI 1 "register_operand" "0")
-                   (match_operand:V8QI 2 "nonimmediate_operand" "ym")))]
-  "TARGET_MMX"
-  "psubb\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxadd")
-   (set_attr "mode" "DI")])
+(define_insn "*movhicc_noc"
+  [(set (match_operand:HI 0 "register_operand" "=r,r")
+       (if_then_else:HI (match_operator 1 "ix86_comparison_operator" 
+                               [(reg FLAGS_REG) (const_int 0)])
+                     (match_operand:HI 2 "nonimmediate_operand" "rm,0")
+                     (match_operand:HI 3 "nonimmediate_operand" "0,rm")))]
+  "TARGET_CMOVE
+   && (GET_CODE (operands[2]) != MEM || GET_CODE (operands[3]) != MEM)"
+  "@
+   cmov%O2%C1\t{%2, %0|%0, %2}
+   cmov%O2%c1\t{%3, %0|%0, %3}"
+  [(set_attr "type" "icmov")
+   (set_attr "mode" "HI")])
 
-(define_insn "subv4hi3"
-  [(set (match_operand:V4HI 0 "register_operand" "=y")
-        (minus:V4HI (match_operand:V4HI 1 "register_operand" "0")
-                   (match_operand:V4HI 2 "nonimmediate_operand" "ym")))]
-  "TARGET_MMX"
-  "psubw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxadd")
-   (set_attr "mode" "DI")])
+(define_expand "movqicc"
+  [(set (match_operand:QI 0 "register_operand" "")
+       (if_then_else:QI (match_operand 1 "comparison_operator" "")
+                        (match_operand:QI 2 "general_operand" "")
+                        (match_operand:QI 3 "general_operand" "")))]
+  "TARGET_QIMODE_MATH"
+  "if (!ix86_expand_int_movcc (operands)) FAIL; DONE;")
 
-(define_insn "subv2si3"
-  [(set (match_operand:V2SI 0 "register_operand" "=y")
-        (minus:V2SI (match_operand:V2SI 1 "register_operand" "0")
-                   (match_operand:V2SI 2 "nonimmediate_operand" "ym")))]
-  "TARGET_MMX"
-  "psubd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxadd")
-   (set_attr "mode" "DI")])
+(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" "") (const_int 0)])
+                     (match_operand:QI 2 "register_operand" "r,0")
+                     (match_operand:QI 3 "register_operand" "0,r")))]
+  "TARGET_CMOVE && !TARGET_PARTIAL_REG_STALL"
+  "#"
+  "&& reload_completed"
+  [(set (match_dup 0)
+       (if_then_else:SI (match_op_dup 1 [(match_dup 4) (const_int 0)])
+                     (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]);"
+  [(set_attr "type" "icmov")
+   (set_attr "mode" "SI")])
 
-(define_insn "mmx_subdi3"
-  [(set (match_operand:DI 0 "register_operand" "=y")
-        (unspec:DI
-        [(minus:DI (match_operand:DI 1 "register_operand" "0")
-                   (match_operand:DI 2 "nonimmediate_operand" "ym"))]
-        UNSPEC_NOP))]
-  "TARGET_MMX"
-  "psubq\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxadd")
-   (set_attr "mode" "DI")])
+(define_expand "movsfcc"
+  [(set (match_operand:SF 0 "register_operand" "")
+       (if_then_else:SF (match_operand 1 "comparison_operator" "")
+                        (match_operand:SF 2 "register_operand" "")
+                        (match_operand:SF 3 "register_operand" "")))]
+  "TARGET_CMOVE"
+  "if (! ix86_expand_fp_movcc (operands)) FAIL; DONE;")
 
-(define_insn "sssubv8qi3"
-  [(set (match_operand:V8QI 0 "register_operand" "=y")
-        (ss_minus:V8QI (match_operand:V8QI 1 "register_operand" "0")
-                      (match_operand:V8QI 2 "nonimmediate_operand" "ym")))]
-  "TARGET_MMX"
-  "psubsb\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxadd")
-   (set_attr "mode" "DI")])
+(define_insn "*movsfcc_1"
+  [(set (match_operand:SF 0 "register_operand" "=f#r,f#r,r#f,r#f")
+       (if_then_else:SF (match_operator 1 "fcmov_comparison_operator" 
+                               [(reg FLAGS_REG) (const_int 0)])
+                     (match_operand:SF 2 "nonimmediate_operand" "f#r,0,rm#f,0")
+                     (match_operand:SF 3 "nonimmediate_operand" "0,f#r,0,rm#f")))]
+  "TARGET_CMOVE
+   && (GET_CODE (operands[2]) != MEM || GET_CODE (operands[3]) != MEM)"
+  "@
+   fcmov%F1\t{%2, %0|%0, %2}
+   fcmov%f1\t{%3, %0|%0, %3}
+   cmov%O2%C1\t{%2, %0|%0, %2}
+   cmov%O2%c1\t{%3, %0|%0, %3}"
+  [(set_attr "type" "fcmov,fcmov,icmov,icmov")
+   (set_attr "mode" "SF,SF,SI,SI")])
 
-(define_insn "sssubv4hi3"
-  [(set (match_operand:V4HI 0 "register_operand" "=y")
-        (ss_minus:V4HI (match_operand:V4HI 1 "register_operand" "0")
-                      (match_operand:V4HI 2 "nonimmediate_operand" "ym")))]
-  "TARGET_MMX"
-  "psubsw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxadd")
-   (set_attr "mode" "DI")])
+(define_expand "movdfcc"
+  [(set (match_operand:DF 0 "register_operand" "")
+       (if_then_else:DF (match_operand 1 "comparison_operator" "")
+                        (match_operand:DF 2 "register_operand" "")
+                        (match_operand:DF 3 "register_operand" "")))]
+  "TARGET_CMOVE"
+  "if (! ix86_expand_fp_movcc (operands)) FAIL; DONE;")
 
-(define_insn "ussubv8qi3"
-  [(set (match_operand:V8QI 0 "register_operand" "=y")
-        (us_minus:V8QI (match_operand:V8QI 1 "register_operand" "0")
-                      (match_operand:V8QI 2 "nonimmediate_operand" "ym")))]
-  "TARGET_MMX"
-  "psubusb\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxadd")
-   (set_attr "mode" "DI")])
+(define_insn "*movdfcc_1"
+  [(set (match_operand:DF 0 "register_operand" "=f#r,f#r,&r#f,&r#f")
+       (if_then_else:DF (match_operator 1 "fcmov_comparison_operator" 
+                               [(reg FLAGS_REG) (const_int 0)])
+                     (match_operand:DF 2 "nonimmediate_operand" "f#r,0,rm#f,0")
+                     (match_operand:DF 3 "nonimmediate_operand" "0,f#r,0,rm#f")))]
+  "!TARGET_64BIT && TARGET_CMOVE
+   && (GET_CODE (operands[2]) != MEM || GET_CODE (operands[3]) != MEM)"
+  "@
+   fcmov%F1\t{%2, %0|%0, %2}
+   fcmov%f1\t{%3, %0|%0, %3}
+   #
+   #"
+  [(set_attr "type" "fcmov,fcmov,multi,multi")
+   (set_attr "mode" "DF")])
 
-(define_insn "ussubv4hi3"
-  [(set (match_operand:V4HI 0 "register_operand" "=y")
-        (us_minus:V4HI (match_operand:V4HI 1 "register_operand" "0")
-                      (match_operand:V4HI 2 "nonimmediate_operand" "ym")))]
-  "TARGET_MMX"
-  "psubusw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxadd")
-   (set_attr "mode" "DI")])
+(define_insn "*movdfcc_1_rex64"
+  [(set (match_operand:DF 0 "register_operand" "=f#r,f#r,r#f,r#f")
+       (if_then_else:DF (match_operator 1 "fcmov_comparison_operator" 
+                               [(reg FLAGS_REG) (const_int 0)])
+                     (match_operand:DF 2 "nonimmediate_operand" "f#r,0#r,rm#f,0#f")
+                     (match_operand:DF 3 "nonimmediate_operand" "0#r,f#r,0#f,rm#f")))]
+  "TARGET_64BIT && TARGET_CMOVE
+   && (GET_CODE (operands[2]) != MEM || GET_CODE (operands[3]) != MEM)"
+  "@
+   fcmov%F1\t{%2, %0|%0, %2}
+   fcmov%f1\t{%3, %0|%0, %3}
+   cmov%O2%C1\t{%2, %0|%0, %2}
+   cmov%O2%c1\t{%3, %0|%0, %3}"
+  [(set_attr "type" "fcmov,fcmov,icmov,icmov")
+   (set_attr "mode" "DF")])
 
-(define_insn "mulv4hi3"
-  [(set (match_operand:V4HI 0 "register_operand" "=y")
-        (mult:V4HI (match_operand:V4HI 1 "register_operand" "0")
-                  (match_operand:V4HI 2 "nonimmediate_operand" "ym")))]
-  "TARGET_MMX"
-  "pmullw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxmul")
-   (set_attr "mode" "DI")])
+(define_split
+  [(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" "") (const_int 0)])
+                     (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)])
+                     (match_dup 5)
+                     (match_dup 7)))
+   (set (match_dup 3)
+       (if_then_else:SI (match_op_dup 1 [(match_dup 4) (const_int 0)])
+                     (match_dup 6)
+                     (match_dup 8)))]
+  "split_di (operands+2, 1, operands+5, operands+6);
+   split_di (operands+3, 1, operands+7, operands+8);
+   split_di (operands, 1, operands+2, operands+3);")
 
-(define_insn "smulv4hi3_highpart"
-  [(set (match_operand:V4HI 0 "register_operand" "=y")
-       (truncate:V4HI
-        (lshiftrt:V4SI
-         (mult:V4SI (sign_extend:V4SI
-                     (match_operand:V4HI 1 "register_operand" "0"))
-                    (sign_extend:V4SI
-                     (match_operand:V4HI 2 "nonimmediate_operand" "ym")))
-         (const_int 16))))]
-  "TARGET_MMX"
-  "pmulhw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxmul")
-   (set_attr "mode" "DI")])
+(define_expand "movxfcc"
+  [(set (match_operand:XF 0 "register_operand" "")
+       (if_then_else:XF (match_operand 1 "comparison_operator" "")
+                        (match_operand:XF 2 "register_operand" "")
+                        (match_operand:XF 3 "register_operand" "")))]
+  "TARGET_CMOVE"
+  "if (! ix86_expand_fp_movcc (operands)) FAIL; DONE;")
 
-(define_insn "umulv4hi3_highpart"
-  [(set (match_operand:V4HI 0 "register_operand" "=y")
-       (truncate:V4HI
-        (lshiftrt:V4SI
-         (mult:V4SI (zero_extend:V4SI
-                     (match_operand:V4HI 1 "register_operand" "0"))
-                    (zero_extend:V4SI
-                     (match_operand:V4HI 2 "nonimmediate_operand" "ym")))
-         (const_int 16))))]
-  "TARGET_SSE || TARGET_3DNOW_A"
-  "pmulhuw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxmul")
-   (set_attr "mode" "DI")])
+(define_insn "*movxfcc_1"
+  [(set (match_operand:XF 0 "register_operand" "=f,f")
+       (if_then_else:XF (match_operator 1 "fcmov_comparison_operator" 
+                               [(reg FLAGS_REG) (const_int 0)])
+                     (match_operand:XF 2 "register_operand" "f,0")
+                     (match_operand:XF 3 "register_operand" "0,f")))]
+  "TARGET_CMOVE"
+  "@
+   fcmov%F1\t{%2, %0|%0, %2}
+   fcmov%f1\t{%3, %0|%0, %3}"
+  [(set_attr "type" "fcmov")
+   (set_attr "mode" "XF")])
 
-(define_insn "mmx_pmaddwd"
-  [(set (match_operand:V2SI 0 "register_operand" "=y")
-        (plus:V2SI
-        (mult:V2SI
-         (sign_extend:V2SI
-          (vec_select:V2HI (match_operand:V4HI 1 "register_operand" "0")
-                           (parallel [(const_int 0) (const_int 2)])))
-         (sign_extend:V2SI
-          (vec_select:V2HI (match_operand:V4HI 2 "nonimmediate_operand" "ym")
-                           (parallel [(const_int 0) (const_int 2)]))))
-        (mult:V2SI
-         (sign_extend:V2SI (vec_select:V2HI (match_dup 1)
-                                            (parallel [(const_int 1)
-                                                       (const_int 3)])))
-         (sign_extend:V2SI (vec_select:V2HI (match_dup 2)
-                                            (parallel [(const_int 1)
-                                                       (const_int 3)]))))))]
-  "TARGET_MMX"
-  "pmaddwd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxmul")
-   (set_attr "mode" "DI")])
+(define_expand "minsf3"
+  [(parallel [
+     (set (match_operand:SF 0 "register_operand" "")
+         (if_then_else:SF (lt (match_operand:SF 1 "register_operand" "")
+                              (match_operand:SF 2 "nonimmediate_operand" ""))
+                          (match_dup 1)
+                          (match_dup 2)))
+     (clobber (reg:CC FLAGS_REG))])]
+  "TARGET_SSE"
+  "")
 
+(define_insn "*minsf"
+  [(set (match_operand:SF 0 "register_operand" "=x#f,f#x,f#x")
+       (if_then_else:SF (lt (match_operand:SF 1 "register_operand" "0,0,f#x")
+                            (match_operand:SF 2 "nonimmediate_operand" "xm#f,f#x,0"))
+                        (match_dup 1)
+                        (match_dup 2)))
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_SSE && TARGET_IEEE_FP"
+  "#")
 
-;; MMX logical operations
-;; Note we don't want to declare these as regular iordi3 insns to prevent
-;; normal code that also wants to use the FPU from getting broken.
-;; The UNSPECs are there to prevent the combiner from getting overly clever.
-(define_insn "mmx_iordi3"
-  [(set (match_operand:DI 0 "register_operand" "=y")
-        (unspec:DI
-        [(ior:DI (match_operand:DI 1 "register_operand" "%0")
-                 (match_operand:DI 2 "nonimmediate_operand" "ym"))]
-        UNSPEC_NOP))]
-  "TARGET_MMX"
-  "por\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxadd")
-   (set_attr "mode" "DI")])
+(define_insn "*minsf_nonieee"
+  [(set (match_operand:SF 0 "register_operand" "=x#f,f#x")
+       (if_then_else:SF (lt (match_operand:SF 1 "nonimmediate_operand" "%0,0")
+                            (match_operand:SF 2 "nonimmediate_operand" "xm#f,f#x"))
+                        (match_dup 1)
+                        (match_dup 2)))
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_SSE && !TARGET_IEEE_FP
+   && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
+  "#")
 
-(define_insn "mmx_xordi3"
-  [(set (match_operand:DI 0 "register_operand" "=y")
-        (unspec:DI
-        [(xor:DI (match_operand:DI 1 "register_operand" "%0")
-                 (match_operand:DI 2 "nonimmediate_operand" "ym"))]
-        UNSPEC_NOP))]
-  "TARGET_MMX"
-  "pxor\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxadd")
-   (set_attr "mode" "DI")
-   (set_attr "memory" "none")])
+(define_split
+  [(set (match_operand:SF 0 "register_operand" "")
+       (if_then_else:SF (lt (match_operand:SF 1 "register_operand" "")
+                            (match_operand:SF 2 "nonimmediate_operand" ""))
+                        (match_operand:SF 3 "register_operand" "")
+                        (match_operand:SF 4 "nonimmediate_operand" "")))
+   (clobber (reg:CC FLAGS_REG))]
+  "SSE_REG_P (operands[0]) && reload_completed
+   && ((operands_match_p (operands[1], operands[3])
+       && operands_match_p (operands[2], operands[4]))
+       || (operands_match_p (operands[1], operands[4])
+          && operands_match_p (operands[2], operands[3])))"
+  [(set (match_dup 0)
+       (if_then_else:SF (lt (match_dup 1)
+                            (match_dup 2))
+                        (match_dup 1)
+                        (match_dup 2)))])
 
-;; Same as pxor, but don't show input operands so that we don't think
-;; they are live.
-(define_insn "mmx_clrdi"
-  [(set (match_operand:DI 0 "register_operand" "=y")
-        (unspec:DI [(const_int 0)] UNSPEC_NOP))]
-  "TARGET_MMX"
-  "pxor\t{%0, %0|%0, %0}"
-  [(set_attr "type" "mmxadd")
-   (set_attr "mode" "DI")
-   (set_attr "memory" "none")])
+;; Conditional addition patterns
+(define_expand "addqicc"
+  [(match_operand:QI 0 "register_operand" "")
+   (match_operand 1 "comparison_operator" "")
+   (match_operand:QI 2 "register_operand" "")
+   (match_operand:QI 3 "const_int_operand" "")]
+  ""
+  "if (!ix86_expand_int_addcc (operands)) FAIL; DONE;")
 
-(define_insn "mmx_anddi3"
-  [(set (match_operand:DI 0 "register_operand" "=y")
-        (unspec:DI
-        [(and:DI (match_operand:DI 1 "register_operand" "%0")
-                 (match_operand:DI 2 "nonimmediate_operand" "ym"))]
-        UNSPEC_NOP))]
-  "TARGET_MMX"
-  "pand\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxadd")
-   (set_attr "mode" "DI")])
+(define_expand "addhicc"
+  [(match_operand:HI 0 "register_operand" "")
+   (match_operand 1 "comparison_operator" "")
+   (match_operand:HI 2 "register_operand" "")
+   (match_operand:HI 3 "const_int_operand" "")]
+  ""
+  "if (!ix86_expand_int_addcc (operands)) FAIL; DONE;")
 
-(define_insn "mmx_nanddi3"
-  [(set (match_operand:DI 0 "register_operand" "=y")
-        (unspec:DI
-        [(and:DI (not:DI (match_operand:DI 1 "register_operand" "0"))
-                         (match_operand:DI 2 "nonimmediate_operand" "ym"))]
-        UNSPEC_NOP))]
-  "TARGET_MMX"
-  "pandn\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxadd")
-   (set_attr "mode" "DI")])
+(define_expand "addsicc"
+  [(match_operand:SI 0 "register_operand" "")
+   (match_operand 1 "comparison_operator" "")
+   (match_operand:SI 2 "register_operand" "")
+   (match_operand:SI 3 "const_int_operand" "")]
+  ""
+  "if (!ix86_expand_int_addcc (operands)) FAIL; DONE;")
 
+(define_expand "adddicc"
+  [(match_operand:DI 0 "register_operand" "")
+   (match_operand 1 "comparison_operator" "")
+   (match_operand:DI 2 "register_operand" "")
+   (match_operand:DI 3 "const_int_operand" "")]
+  "TARGET_64BIT"
+  "if (!ix86_expand_int_addcc (operands)) FAIL; DONE;")
 
-;; MMX unsigned averages/sum of absolute differences
-
-(define_insn "mmx_uavgv8qi3"
-  [(set (match_operand:V8QI 0 "register_operand" "=y")
-        (ashiftrt:V8QI
-        (plus:V8QI (plus:V8QI
-                    (match_operand:V8QI 1 "register_operand" "0")
-                    (match_operand:V8QI 2 "nonimmediate_operand" "ym"))
-                   (const_vector:V8QI [(const_int 1)
-                                       (const_int 1)
-                                       (const_int 1)
-                                       (const_int 1)
-                                       (const_int 1)
-                                       (const_int 1)
-                                       (const_int 1)
-                                       (const_int 1)]))
-        (const_int 1)))]
-  "TARGET_SSE || TARGET_3DNOW_A"
-  "pavgb\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxshft")
-   (set_attr "mode" "DI")])
+;; We can't represent the LT test directly.  Do this by swapping the operands.
 
-(define_insn "mmx_uavgv4hi3"
-  [(set (match_operand:V4HI 0 "register_operand" "=y")
-        (ashiftrt:V4HI
-        (plus:V4HI (plus:V4HI
-                    (match_operand:V4HI 1 "register_operand" "0")
-                    (match_operand:V4HI 2 "nonimmediate_operand" "ym"))
-                   (const_vector:V4HI [(const_int 1)
-                                       (const_int 1)
-                                       (const_int 1)
-                                       (const_int 1)]))
-        (const_int 1)))]
-  "TARGET_SSE || TARGET_3DNOW_A"
-  "pavgw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxshft")
-   (set_attr "mode" "DI")])
+(define_split
+  [(set (match_operand:SF 0 "fp_register_operand" "")
+       (if_then_else:SF (lt (match_operand:SF 1 "register_operand" "")
+                            (match_operand:SF 2 "register_operand" ""))
+                        (match_operand:SF 3 "register_operand" "")
+                        (match_operand:SF 4 "register_operand" "")))
+   (clobber (reg:CC FLAGS_REG))]
+  "reload_completed
+   && ((operands_match_p (operands[1], operands[3])
+       && operands_match_p (operands[2], operands[4]))
+       || (operands_match_p (operands[1], operands[4])
+          && operands_match_p (operands[2], operands[3])))"
+  [(set (reg:CCFP FLAGS_REG)
+       (compare:CCFP (match_dup 2)
+                     (match_dup 1)))
+   (set (match_dup 0)
+       (if_then_else:SF (ge (reg:CCFP FLAGS_REG) (const_int 0))
+                        (match_dup 1)
+                        (match_dup 2)))])
 
-(define_insn "mmx_psadbw"
-  [(set (match_operand:DI 0 "register_operand" "=y")
-        (unspec:DI [(match_operand:V8QI 1 "register_operand" "0")
-                   (match_operand:V8QI 2 "nonimmediate_operand" "ym")]
-                  UNSPEC_PSADBW))]
-  "TARGET_SSE || TARGET_3DNOW_A"
-  "psadbw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxshft")
-   (set_attr "mode" "DI")])
+(define_insn "*minsf_sse"
+  [(set (match_operand:SF 0 "register_operand" "=x")
+       (if_then_else:SF (lt (match_operand:SF 1 "register_operand" "0")
+                            (match_operand:SF 2 "nonimmediate_operand" "xm"))
+                        (match_dup 1)
+                        (match_dup 2)))]
+  "TARGET_SSE && reload_completed"
+  "minss\t{%2, %0|%0, %2}"
+  [(set_attr "type" "sse")
+   (set_attr "mode" "SF")])
 
+(define_expand "mindf3"
+  [(parallel [
+     (set (match_operand:DF 0 "register_operand" "")
+         (if_then_else:DF (lt (match_operand:DF 1 "register_operand" "")
+                              (match_operand:DF 2 "nonimmediate_operand" ""))
+                          (match_dup 1)
+                          (match_dup 2)))
+     (clobber (reg:CC FLAGS_REG))])]
+  "TARGET_SSE2 && TARGET_SSE_MATH"
+  "#")
 
-;; MMX insert/extract/shuffle
+(define_insn "*mindf"
+  [(set (match_operand:DF 0 "register_operand" "=Y#f,f#Y,f#Y")
+       (if_then_else:DF (lt (match_operand:DF 1 "register_operand" "0,0,f#Y")
+                            (match_operand:DF 2 "nonimmediate_operand" "Ym#f,f#Y,0"))
+                        (match_dup 1)
+                        (match_dup 2)))
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_SSE2 && TARGET_IEEE_FP && TARGET_SSE_MATH"
+  "#")
 
-(define_insn "mmx_pinsrw"
-  [(set (match_operand:V4HI 0 "register_operand" "=y")
-        (vec_merge:V4HI (match_operand:V4HI 1 "register_operand" "0")
-                       (vec_duplicate:V4HI
-                        (truncate:HI (match_operand:SI 2 "nonimmediate_operand" "rm")))
-                       (match_operand:SI 3 "const_0_to_15_operand" "N")))]
-  "TARGET_SSE || TARGET_3DNOW_A"
-  "pinsrw\t{%3, %2, %0|%0, %2, %3}"
-  [(set_attr "type" "mmxcvt")
-   (set_attr "mode" "DI")])
+(define_insn "*mindf_nonieee"
+  [(set (match_operand:DF 0 "register_operand" "=Y#f,f#Y")
+       (if_then_else:DF (lt (match_operand:DF 1 "nonimmediate_operand" "%0,0")
+                            (match_operand:DF 2 "nonimmediate_operand" "Ym#f,f#Y"))
+                        (match_dup 1)
+                        (match_dup 2)))
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_SSE2 && TARGET_SSE_MATH && !TARGET_IEEE_FP
+   && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
+  "#")
 
-(define_insn "mmx_pextrw"
-  [(set (match_operand:SI 0 "register_operand" "=r")
-        (zero_extend:SI (vec_select:HI (match_operand:V4HI 1 "register_operand" "y")
-                                      (parallel
-                                       [(match_operand:SI 2 "const_0_to_3_operand" "N")]))))]
-  "TARGET_SSE || TARGET_3DNOW_A"
-  "pextrw\t{%2, %1, %0|%0, %1, %2}"
-  [(set_attr "type" "mmxcvt")
-   (set_attr "mode" "DI")])
+(define_split
+  [(set (match_operand:DF 0 "register_operand" "")
+       (if_then_else:DF (lt (match_operand:DF 1 "register_operand" "")
+                            (match_operand:DF 2 "nonimmediate_operand" ""))
+                        (match_operand:DF 3 "register_operand" "")
+                        (match_operand:DF 4 "nonimmediate_operand" "")))
+   (clobber (reg:CC FLAGS_REG))]
+  "SSE_REG_P (operands[0]) && reload_completed
+   && ((operands_match_p (operands[1], operands[3])
+       && operands_match_p (operands[2], operands[4]))
+       || (operands_match_p (operands[1], operands[4])
+          && operands_match_p (operands[2], operands[3])))"
+  [(set (match_dup 0)
+       (if_then_else:DF (lt (match_dup 1)
+                            (match_dup 2))
+                        (match_dup 1)
+                        (match_dup 2)))])
 
-(define_insn "mmx_pshufw"
-  [(set (match_operand:V4HI 0 "register_operand" "=y")
-        (unspec:V4HI [(match_operand:V4HI 1 "register_operand" "0")
-                     (match_operand:SI 2 "immediate_operand" "i")]
-                    UNSPEC_SHUFFLE))]
-  "TARGET_SSE || TARGET_3DNOW_A"
-  "pshufw\t{%2, %1, %0|%0, %1, %2}"
-  [(set_attr "type" "mmxcvt")
-   (set_attr "mode" "DI")])
+;; We can't represent the LT test directly.  Do this by swapping the operands.
+(define_split
+  [(set (match_operand:DF 0 "fp_register_operand" "")
+       (if_then_else:DF (lt (match_operand:DF 1 "register_operand" "")
+                            (match_operand:DF 2 "register_operand" ""))
+                        (match_operand:DF 3 "register_operand" "")
+                        (match_operand:DF 4 "register_operand" "")))
+   (clobber (reg:CC FLAGS_REG))]
+  "reload_completed
+   && ((operands_match_p (operands[1], operands[3])
+       && operands_match_p (operands[2], operands[4]))
+       || (operands_match_p (operands[1], operands[4])
+          && operands_match_p (operands[2], operands[3])))"
+  [(set (reg:CCFP FLAGS_REG)
+       (compare:CCFP (match_dup 2)
+                     (match_dup 1)))
+   (set (match_dup 0)
+       (if_then_else:DF (ge (reg:CCFP FLAGS_REG) (const_int 0))
+                        (match_dup 1)
+                        (match_dup 2)))])
 
+(define_insn "*mindf_sse"
+  [(set (match_operand:DF 0 "register_operand" "=Y")
+       (if_then_else:DF (lt (match_operand:DF 1 "register_operand" "0")
+                            (match_operand:DF 2 "nonimmediate_operand" "Ym"))
+                        (match_dup 1)
+                        (match_dup 2)))]
+  "TARGET_SSE2 && TARGET_SSE_MATH && reload_completed"
+  "minsd\t{%2, %0|%0, %2}"
+  [(set_attr "type" "sse")
+   (set_attr "mode" "DF")])
 
-;; MMX mask-generating comparisons
+(define_expand "maxsf3"
+  [(parallel [
+     (set (match_operand:SF 0 "register_operand" "")
+         (if_then_else:SF (gt (match_operand:SF 1 "register_operand" "")
+                              (match_operand:SF 2 "nonimmediate_operand" ""))
+                          (match_dup 1)
+                          (match_dup 2)))
+     (clobber (reg:CC FLAGS_REG))])]
+  "TARGET_SSE"
+  "#")
 
-(define_insn "eqv8qi3"
-  [(set (match_operand:V8QI 0 "register_operand" "=y")
-        (eq:V8QI (match_operand:V8QI 1 "register_operand" "0")
-                (match_operand:V8QI 2 "nonimmediate_operand" "ym")))]
-  "TARGET_MMX"
-  "pcmpeqb\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxcmp")
-   (set_attr "mode" "DI")])
+(define_insn "*maxsf"
+  [(set (match_operand:SF 0 "register_operand" "=x#f,f#x,f#x")
+       (if_then_else:SF (gt (match_operand:SF 1 "register_operand" "0,0,f#x")
+                            (match_operand:SF 2 "nonimmediate_operand" "xm#f,f#x,0"))
+                        (match_dup 1)
+                        (match_dup 2)))
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_SSE && TARGET_IEEE_FP"
+  "#")
 
-(define_insn "eqv4hi3"
-  [(set (match_operand:V4HI 0 "register_operand" "=y")
-        (eq:V4HI (match_operand:V4HI 1 "register_operand" "0")
-                (match_operand:V4HI 2 "nonimmediate_operand" "ym")))]
-  "TARGET_MMX"
-  "pcmpeqw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxcmp")
-   (set_attr "mode" "DI")])
+(define_insn "*maxsf_nonieee"
+  [(set (match_operand:SF 0 "register_operand" "=x#f,f#x")
+       (if_then_else:SF (gt (match_operand:SF 1 "nonimmediate_operand" "%0,0")
+                            (match_operand:SF 2 "nonimmediate_operand" "xm#f,f#x"))
+                        (match_dup 1)
+                        (match_dup 2)))
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_SSE && !TARGET_IEEE_FP
+   && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
+  "#")
 
-(define_insn "eqv2si3"
-  [(set (match_operand:V2SI 0 "register_operand" "=y")
-        (eq:V2SI (match_operand:V2SI 1 "register_operand" "0")
-                (match_operand:V2SI 2 "nonimmediate_operand" "ym")))]
-  "TARGET_MMX"
-  "pcmpeqd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxcmp")
-   (set_attr "mode" "DI")])
+(define_split
+  [(set (match_operand:SF 0 "register_operand" "")
+       (if_then_else:SF (gt (match_operand:SF 1 "register_operand" "")
+                            (match_operand:SF 2 "nonimmediate_operand" ""))
+                        (match_operand:SF 3 "register_operand" "")
+                        (match_operand:SF 4 "nonimmediate_operand" "")))
+   (clobber (reg:CC FLAGS_REG))]
+  "SSE_REG_P (operands[0]) && reload_completed
+   && ((operands_match_p (operands[1], operands[3])
+       && operands_match_p (operands[2], operands[4]))
+       || (operands_match_p (operands[1], operands[4])
+          && operands_match_p (operands[2], operands[3])))"
+  [(set (match_dup 0)
+       (if_then_else:SF (gt (match_dup 1)
+                            (match_dup 2))
+                        (match_dup 1)
+                        (match_dup 2)))])
 
-(define_insn "gtv8qi3"
-  [(set (match_operand:V8QI 0 "register_operand" "=y")
-        (gt:V8QI (match_operand:V8QI 1 "register_operand" "0")
-                (match_operand:V8QI 2 "nonimmediate_operand" "ym")))]
-  "TARGET_MMX"
-  "pcmpgtb\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxcmp")
-   (set_attr "mode" "DI")])
+(define_split
+  [(set (match_operand:SF 0 "fp_register_operand" "")
+       (if_then_else:SF (gt (match_operand:SF 1 "register_operand" "")
+                            (match_operand:SF 2 "register_operand" ""))
+                        (match_operand:SF 3 "register_operand" "")
+                        (match_operand:SF 4 "register_operand" "")))
+   (clobber (reg:CC FLAGS_REG))]
+  "reload_completed
+   && ((operands_match_p (operands[1], operands[3])
+       && operands_match_p (operands[2], operands[4]))
+       || (operands_match_p (operands[1], operands[4])
+          && operands_match_p (operands[2], operands[3])))"
+  [(set (reg:CCFP FLAGS_REG)
+       (compare:CCFP (match_dup 1)
+                     (match_dup 2)))
+   (set (match_dup 0)
+       (if_then_else:SF (gt (reg:CCFP FLAGS_REG) (const_int 0))
+                        (match_dup 1)
+                        (match_dup 2)))])
 
-(define_insn "gtv4hi3"
-  [(set (match_operand:V4HI 0 "register_operand" "=y")
-        (gt:V4HI (match_operand:V4HI 1 "register_operand" "0")
-                (match_operand:V4HI 2 "nonimmediate_operand" "ym")))]
-  "TARGET_MMX"
-  "pcmpgtw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxcmp")
-   (set_attr "mode" "DI")])
+(define_insn "*maxsf_sse"
+  [(set (match_operand:SF 0 "register_operand" "=x")
+       (if_then_else:SF (gt (match_operand:SF 1 "register_operand" "0")
+                            (match_operand:SF 2 "nonimmediate_operand" "xm"))
+                        (match_dup 1)
+                        (match_dup 2)))]
+  "TARGET_SSE && reload_completed"
+  "maxss\t{%2, %0|%0, %2}"
+  [(set_attr "type" "sse")
+   (set_attr "mode" "SF")])
 
-(define_insn "gtv2si3"
-  [(set (match_operand:V2SI 0 "register_operand" "=y")
-        (gt:V2SI (match_operand:V2SI 1 "register_operand" "0")
-                (match_operand:V2SI 2 "nonimmediate_operand" "ym")))]
-  "TARGET_MMX"
-  "pcmpgtd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxcmp")
-   (set_attr "mode" "DI")])
+(define_expand "maxdf3"
+  [(parallel [
+     (set (match_operand:DF 0 "register_operand" "")
+         (if_then_else:DF (gt (match_operand:DF 1 "register_operand" "")
+                              (match_operand:DF 2 "nonimmediate_operand" ""))
+                          (match_dup 1)
+                          (match_dup 2)))
+     (clobber (reg:CC FLAGS_REG))])]
+  "TARGET_SSE2 && TARGET_SSE_MATH"
+  "#")
 
+(define_insn "*maxdf"
+  [(set (match_operand:DF 0 "register_operand" "=Y#f,f#Y,f#Y")
+       (if_then_else:DF (gt (match_operand:DF 1 "register_operand" "0,0,f#Y")
+                            (match_operand:DF 2 "nonimmediate_operand" "Ym#f,f#Y,0"))
+                        (match_dup 1)
+                        (match_dup 2)))
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_SSE2 && TARGET_SSE_MATH && TARGET_IEEE_FP"
+  "#")
 
-;; MMX max/min insns
+(define_insn "*maxdf_nonieee"
+  [(set (match_operand:DF 0 "register_operand" "=Y#f,f#Y")
+       (if_then_else:DF (gt (match_operand:DF 1 "nonimmediate_operand" "%0,0")
+                            (match_operand:DF 2 "nonimmediate_operand" "Ym#f,f#Y"))
+                        (match_dup 1)
+                        (match_dup 2)))
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_SSE2 && TARGET_SSE_MATH && !TARGET_IEEE_FP
+   && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
+  "#")
 
-(define_insn "umaxv8qi3"
-  [(set (match_operand:V8QI 0 "register_operand" "=y")
-        (umax:V8QI (match_operand:V8QI 1 "register_operand" "0")
-                  (match_operand:V8QI 2 "nonimmediate_operand" "ym")))]
-  "TARGET_SSE || TARGET_3DNOW_A"
-  "pmaxub\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxadd")
-   (set_attr "mode" "DI")])
+(define_split
+  [(set (match_operand:DF 0 "register_operand" "")
+       (if_then_else:DF (gt (match_operand:DF 1 "register_operand" "")
+                            (match_operand:DF 2 "nonimmediate_operand" ""))
+                        (match_operand:DF 3 "register_operand" "")
+                        (match_operand:DF 4 "nonimmediate_operand" "")))
+   (clobber (reg:CC FLAGS_REG))]
+  "SSE_REG_P (operands[0]) && reload_completed
+   && ((operands_match_p (operands[1], operands[3])
+       && operands_match_p (operands[2], operands[4]))
+       || (operands_match_p (operands[1], operands[4])
+          && operands_match_p (operands[2], operands[3])))"
+  [(set (match_dup 0)
+       (if_then_else:DF (gt (match_dup 1)
+                            (match_dup 2))
+                        (match_dup 1)
+                        (match_dup 2)))])
 
-(define_insn "smaxv4hi3"
-  [(set (match_operand:V4HI 0 "register_operand" "=y")
-        (smax:V4HI (match_operand:V4HI 1 "register_operand" "0")
-                  (match_operand:V4HI 2 "nonimmediate_operand" "ym")))]
-  "TARGET_SSE || TARGET_3DNOW_A"
-  "pmaxsw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxadd")
-   (set_attr "mode" "DI")])
+(define_split
+  [(set (match_operand:DF 0 "fp_register_operand" "")
+       (if_then_else:DF (gt (match_operand:DF 1 "register_operand" "")
+                            (match_operand:DF 2 "register_operand" ""))
+                        (match_operand:DF 3 "register_operand" "")
+                        (match_operand:DF 4 "register_operand" "")))
+   (clobber (reg:CC FLAGS_REG))]
+  "reload_completed
+   && ((operands_match_p (operands[1], operands[3])
+       && operands_match_p (operands[2], operands[4]))
+       || (operands_match_p (operands[1], operands[4])
+          && operands_match_p (operands[2], operands[3])))"
+  [(set (reg:CCFP FLAGS_REG)
+       (compare:CCFP (match_dup 1)
+                     (match_dup 2)))
+   (set (match_dup 0)
+       (if_then_else:DF (gt (reg:CCFP FLAGS_REG) (const_int 0))
+                        (match_dup 1)
+                        (match_dup 2)))])
 
-(define_insn "uminv8qi3"
-  [(set (match_operand:V8QI 0 "register_operand" "=y")
-        (umin:V8QI (match_operand:V8QI 1 "register_operand" "0")
-                  (match_operand:V8QI 2 "nonimmediate_operand" "ym")))]
-  "TARGET_SSE || TARGET_3DNOW_A"
-  "pminub\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxadd")
-   (set_attr "mode" "DI")])
+(define_insn "*maxdf_sse"
+  [(set (match_operand:DF 0 "register_operand" "=Y")
+       (if_then_else:DF (gt (match_operand:DF 1 "register_operand" "0")
+                            (match_operand:DF 2 "nonimmediate_operand" "Ym"))
+                        (match_dup 1)
+                        (match_dup 2)))]
+  "TARGET_SSE2 && TARGET_SSE_MATH && reload_completed"
+  "maxsd\t{%2, %0|%0, %2}"
+  [(set_attr "type" "sse")
+   (set_attr "mode" "DF")])
+\f
+;; Misc patterns (?)
 
-(define_insn "sminv4hi3"
-  [(set (match_operand:V4HI 0 "register_operand" "=y")
-        (smin:V4HI (match_operand:V4HI 1 "register_operand" "0")
-                  (match_operand:V4HI 2 "nonimmediate_operand" "ym")))]
-  "TARGET_SSE || TARGET_3DNOW_A"
-  "pminsw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxadd")
-   (set_attr "mode" "DI")])
+;; This pattern exists to put a dependency on all ebp-based memory accesses.
+;; Otherwise there will be nothing to keep
+;; 
+;; [(set (reg ebp) (reg esp))]
+;; [(set (reg esp) (plus (reg esp) (const_int -160000)))
+;;  (clobber (eflags)]
+;; [(set (mem (plus (reg ebp) (const_int -160000))) (const_int 0))]
+;;
+;; in proper program order.
+(define_insn "pro_epilogue_adjust_stack_1"
+  [(set (match_operand:SI 0 "register_operand" "=r,r")
+       (plus:SI (match_operand:SI 1 "register_operand" "0,r")
+                (match_operand:SI 2 "immediate_operand" "i,i")))
+   (clobber (reg:CC FLAGS_REG))
+   (clobber (mem:BLK (scratch)))]
+  "!TARGET_64BIT"
+{
+  switch (get_attr_type (insn))
+    {
+    case TYPE_IMOV:
+      return "mov{l}\t{%1, %0|%0, %1}";
 
+    case TYPE_ALU:
+      if (GET_CODE (operands[2]) == CONST_INT
+          && (INTVAL (operands[2]) == 128
+             || (INTVAL (operands[2]) < 0
+                 && INTVAL (operands[2]) != -128)))
+       {
+         operands[2] = GEN_INT (-INTVAL (operands[2]));
+         return "sub{l}\t{%2, %0|%0, %2}";
+       }
+      return "add{l}\t{%2, %0|%0, %2}";
 
-;; MMX shifts
+    case TYPE_LEA:
+      operands[2] = SET_SRC (XVECEXP (PATTERN (insn), 0, 0));
+      return "lea{l}\t{%a2, %0|%0, %a2}";
 
-(define_insn "ashrv4hi3"
-  [(set (match_operand:V4HI 0 "register_operand" "=y")
-        (ashiftrt:V4HI (match_operand:V4HI 1 "register_operand" "0")
-                      (match_operand:DI 2 "nonmemory_operand" "yi")))]
-  "TARGET_MMX"
-  "psraw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxshft")
-   (set_attr "mode" "DI")])
+    default:
+      abort ();
+    }
+}
+  [(set (attr "type")
+       (cond [(eq_attr "alternative" "0")
+                (const_string "alu")
+              (match_operand:SI 2 "const0_operand" "")
+                (const_string "imov")
+             ]
+             (const_string "lea")))
+   (set_attr "mode" "SI")])
 
-(define_insn "ashrv2si3"
-  [(set (match_operand:V2SI 0 "register_operand" "=y")
-        (ashiftrt:V2SI (match_operand:V2SI 1 "register_operand" "0")
-                      (match_operand:DI 2 "nonmemory_operand" "yi")))]
-  "TARGET_MMX"
-  "psrad\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxshft")
-   (set_attr "mode" "DI")])
+(define_insn "pro_epilogue_adjust_stack_rex64"
+  [(set (match_operand:DI 0 "register_operand" "=r,r")
+       (plus:DI (match_operand:DI 1 "register_operand" "0,r")
+                (match_operand:DI 2 "x86_64_immediate_operand" "e,e")))
+   (clobber (reg:CC FLAGS_REG))
+   (clobber (mem:BLK (scratch)))]
+  "TARGET_64BIT"
+{
+  switch (get_attr_type (insn))
+    {
+    case TYPE_IMOV:
+      return "mov{q}\t{%1, %0|%0, %1}";
 
-(define_insn "lshrv4hi3"
-  [(set (match_operand:V4HI 0 "register_operand" "=y")
-        (lshiftrt:V4HI (match_operand:V4HI 1 "register_operand" "0")
-                      (match_operand:DI 2 "nonmemory_operand" "yi")))]
-  "TARGET_MMX"
-  "psrlw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxshft")
-   (set_attr "mode" "DI")])
+    case TYPE_ALU:
+      if (GET_CODE (operands[2]) == CONST_INT
+         /* Avoid overflows.  */
+         && ((INTVAL (operands[2]) & ((((unsigned int) 1) << 31) - 1)))
+          && (INTVAL (operands[2]) == 128
+             || (INTVAL (operands[2]) < 0
+                 && INTVAL (operands[2]) != -128)))
+       {
+         operands[2] = GEN_INT (-INTVAL (operands[2]));
+         return "sub{q}\t{%2, %0|%0, %2}";
+       }
+      return "add{q}\t{%2, %0|%0, %2}";
 
-(define_insn "lshrv2si3"
-  [(set (match_operand:V2SI 0 "register_operand" "=y")
-        (lshiftrt:V2SI (match_operand:V2SI 1 "register_operand" "0")
-                      (match_operand:DI 2 "nonmemory_operand" "yi")))]
-  "TARGET_MMX"
-  "psrld\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxshft")
-   (set_attr "mode" "DI")])
+    case TYPE_LEA:
+      operands[2] = SET_SRC (XVECEXP (PATTERN (insn), 0, 0));
+      return "lea{q}\t{%a2, %0|%0, %a2}";
 
-;; See logical MMX insns.
-(define_insn "mmx_lshrdi3"
-  [(set (match_operand:DI 0 "register_operand" "=y")
-        (unspec:DI
-         [(lshiftrt:DI (match_operand:DI 1 "register_operand" "0")
-                      (match_operand:DI 2 "nonmemory_operand" "yi"))]
-         UNSPEC_NOP))]
-  "TARGET_MMX"
-  "psrlq\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxshft")
+    default:
+      abort ();
+    }
+}
+  [(set (attr "type")
+       (cond [(eq_attr "alternative" "0")
+                (const_string "alu")
+              (match_operand:DI 2 "const0_operand" "")
+                (const_string "imov")
+             ]
+             (const_string "lea")))
    (set_attr "mode" "DI")])
 
-(define_insn "ashlv4hi3"
-  [(set (match_operand:V4HI 0 "register_operand" "=y")
-        (ashift:V4HI (match_operand:V4HI 1 "register_operand" "0")
-                      (match_operand:DI 2 "nonmemory_operand" "yi")))]
-  "TARGET_MMX"
-  "psllw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxshft")
-   (set_attr "mode" "DI")])
+(define_insn "pro_epilogue_adjust_stack_rex64_2"
+  [(set (match_operand:DI 0 "register_operand" "=r,r")
+       (plus:DI (match_operand:DI 1 "register_operand" "0,r")
+                (match_operand:DI 3 "immediate_operand" "i,i")))
+   (use (match_operand:DI 2 "register_operand" "r,r"))
+   (clobber (reg:CC FLAGS_REG))
+   (clobber (mem:BLK (scratch)))]
+  "TARGET_64BIT"
+{
+  switch (get_attr_type (insn))
+    {
+    case TYPE_ALU:
+      return "add{q}\t{%2, %0|%0, %2}";
 
-(define_insn "ashlv2si3"
-  [(set (match_operand:V2SI 0 "register_operand" "=y")
-        (ashift:V2SI (match_operand:V2SI 1 "register_operand" "0")
-                      (match_operand:DI 2 "nonmemory_operand" "yi")))]
-  "TARGET_MMX"
-  "pslld\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxshft")
-   (set_attr "mode" "DI")])
+    case TYPE_LEA:
+      operands[2] = gen_rtx_PLUS (DImode, operands[1], operands[2]);
+      return "lea{q}\t{%a2, %0|%0, %a2}";
 
-;; See logical MMX insns.
-(define_insn "mmx_ashldi3"
-  [(set (match_operand:DI 0 "register_operand" "=y")
-        (unspec:DI
-        [(ashift:DI (match_operand:DI 1 "register_operand" "0")
-                    (match_operand:DI 2 "nonmemory_operand" "yi"))]
-        UNSPEC_NOP))]
-  "TARGET_MMX"
-  "psllq\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxshft")
+    default:
+      abort ();
+    }
+}
+  [(set_attr "type" "alu,lea")
    (set_attr "mode" "DI")])
 
+;; Placeholder for the conditional moves.  This one is split either to SSE
+;; based moves emulation or to usual cmove sequence.  Little bit unfortunate
+;; fact is that compares supported by the cmp??ss instructions are exactly
+;; swapped of those supported by cmove sequence.
+;; The EQ/NE comparisons also needs bit care, since they are not directly
+;; supported by i387 comparisons and we do need to emit two conditional moves
+;; in tandem.
 
-;; MMX pack/unpack insns.
+(define_insn "sse_movsfcc"
+  [(set (match_operand:SF 0 "register_operand" "=&x#rf,x#rf,?f#xr,?f#xr,?f#xr,?f#xr,?r#xf,?r#xf,?r#xf,?r#xf")
+       (if_then_else:SF (match_operator 1 "sse_comparison_operator"
+                       [(match_operand:SF 4 "nonimmediate_operand" "0#fx,x#fx,f#x,f#x,xm#f,xm#f,f#x,f#x,xm#f,xm#f")
+                        (match_operand:SF 5 "nonimmediate_operand" "xm#f,xm#f,f#x,f#x,x#f,x#f,f#x,f#x,x#f,x#f")])
+                     (match_operand:SF 2 "nonimmediate_operand" "x#fr,0#fr,f#fx,0#fx,f#fx,0#fx,rm#rx,0#rx,rm#rx,0#rx")
+                     (match_operand:SF 3 "nonimmediate_operand" "x#fr,x#fr,0#fx,f#fx,0#fx,f#fx,0#fx,rm#rx,0#rx,rm#rx")))
+   (clobber (match_scratch:SF 6 "=2,&4,X,X,X,X,X,X,X,X"))
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_SSE
+   && (GET_CODE (operands[2]) != MEM || GET_CODE (operands[3]) != MEM)
+   /* Avoid combine from being smart and converting min/max
+      instruction patterns into conditional moves.  */
+   && ((GET_CODE (operands[1]) != LT && GET_CODE (operands[1]) != GT
+       && GET_CODE (operands[1]) != UNLE && GET_CODE (operands[1]) != UNGE)
+       || !rtx_equal_p (operands[4], operands[2])
+       || !rtx_equal_p (operands[5], operands[3]))
+   && (!TARGET_IEEE_FP
+       || (GET_CODE (operands[1]) != EQ && GET_CODE (operands[1]) != NE))"
+  "#")
 
-(define_insn "mmx_packsswb"
-  [(set (match_operand:V8QI 0 "register_operand" "=y")
-       (vec_concat:V8QI
-        (ss_truncate:V4QI (match_operand:V4HI 1 "register_operand" "0"))
-        (ss_truncate:V4QI (match_operand:V4HI 2 "register_operand" "y"))))]
-  "TARGET_MMX"
-  "packsswb\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxshft")
-   (set_attr "mode" "DI")])
+(define_insn "sse_movsfcc_eq"
+  [(set (match_operand:SF 0 "register_operand" "=&x#rf,x#rf,?f#xr,?f#xr,?r#xf,?r#xf")
+       (if_then_else:SF (eq (match_operand:SF 3 "nonimmediate_operand" "%0#fx,x#fx,f#x,xm#f,f#x,xm#f")
+                            (match_operand:SF 4 "nonimmediate_operand" "xm#f,xm#f,f#x,x#f,f#x,x#f"))
+                     (match_operand:SF 1 "nonimmediate_operand" "x#fr,0#fr,0#fx,0#fx,0#rx,0#rx")
+                     (match_operand:SF 2 "nonimmediate_operand" "x#fr,x#fr,f#fx,f#fx,rm#rx,rm#rx")))
+   (clobber (match_scratch:SF 5 "=1,&3,X,X,X,X"))
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_SSE
+   && (GET_CODE (operands[2]) != MEM || GET_CODE (operands[3]) != MEM)"
+  "#")
 
-(define_insn "mmx_packssdw"
-  [(set (match_operand:V4HI 0 "register_operand" "=y")
-       (vec_concat:V4HI
-        (ss_truncate:V2HI (match_operand:V2SI 1 "register_operand" "0"))
-        (ss_truncate:V2HI (match_operand:V2SI 2 "register_operand" "y"))))]
-  "TARGET_MMX"
-  "packssdw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxshft")
-   (set_attr "mode" "DI")])
+(define_insn "sse_movdfcc"
+  [(set (match_operand:DF 0 "register_operand" "=&Y#rf,Y#rf,?f#Yr,?f#Yr,?f#Yr,?f#Yr,?r#Yf,?r#Yf,?r#Yf,?r#Yf")
+       (if_then_else:DF (match_operator 1 "sse_comparison_operator"
+                       [(match_operand:DF 4 "nonimmediate_operand" "0#fY,Y#fY,f#Y,f#Y,Ym#f,Ym#f,f#Y,f#Y,Ym#f,Ym#f")
+                        (match_operand:DF 5 "nonimmediate_operand" "Ym#f,Ym#f,f#Y,f#Y,Y#f,Y#f,f#Y,f#Y,Y#f,Y#f")])
+                     (match_operand:DF 2 "nonimmediate_operand" "Y#fr,0#fr,f#fY,0#fY,f#fY,0#fY,rm#rY,0#rY,rm#rY,0#rY")
+                     (match_operand:DF 3 "nonimmediate_operand" "Y#fr,Y#fr,0#fY,f#fY,0#fY,f#fY,0#fY,rm#rY,0#rY,rm#rY")))
+   (clobber (match_scratch:DF 6 "=2,&4,X,X,X,X,X,X,X,X"))
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_SSE2
+   && (GET_CODE (operands[2]) != MEM || GET_CODE (operands[3]) != MEM)
+   /* Avoid combine from being smart and converting min/max
+      instruction patterns into conditional moves.  */
+   && ((GET_CODE (operands[1]) != LT && GET_CODE (operands[1]) != GT
+       && GET_CODE (operands[1]) != UNLE && GET_CODE (operands[1]) != UNGE)
+       || !rtx_equal_p (operands[4], operands[2])
+       || !rtx_equal_p (operands[5], operands[3]))
+   && (!TARGET_IEEE_FP
+       || (GET_CODE (operands[1]) != EQ && GET_CODE (operands[1]) != NE))"
+  "#")
 
-(define_insn "mmx_packuswb"
-  [(set (match_operand:V8QI 0 "register_operand" "=y")
-       (vec_concat:V8QI
-        (us_truncate:V4QI (match_operand:V4HI 1 "register_operand" "0"))
-        (us_truncate:V4QI (match_operand:V4HI 2 "register_operand" "y"))))]
-  "TARGET_MMX"
-  "packuswb\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxshft")
-   (set_attr "mode" "DI")])
+(define_insn "sse_movdfcc_eq"
+  [(set (match_operand:DF 0 "register_operand" "=&Y#rf,Y#rf,?f#Yr,?f#Yr,?r#Yf,?r#Yf")
+       (if_then_else:DF (eq (match_operand:DF 3 "nonimmediate_operand" "%0#fY,Y#fY,f#Y,Ym#f,f#Y,Ym#f")
+                            (match_operand:DF 4 "nonimmediate_operand" "Ym#f,Ym#f,f#Y,Y#f,f#Y,Y#f"))
+                     (match_operand:DF 1 "nonimmediate_operand" "Y#fr,0#fr,0#fY,0#fY,0#rY,0#rY")
+                     (match_operand:DF 2 "nonimmediate_operand" "Y#fr,Y#fr,f#fY,f#fY,rm#rY,rm#rY")))
+   (clobber (match_scratch:DF 5 "=1,&3,X,X,X,X"))
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_SSE
+   && (GET_CODE (operands[2]) != MEM || GET_CODE (operands[3]) != MEM)"
+  "#")
 
-(define_insn "mmx_punpckhbw"
-  [(set (match_operand:V8QI 0 "register_operand" "=y")
-       (vec_merge:V8QI
-        (vec_select:V8QI (match_operand:V8QI 1 "register_operand" "0")
-                         (parallel [(const_int 4)
-                                    (const_int 0)
-                                    (const_int 5)
-                                    (const_int 1)
-                                    (const_int 6)
-                                    (const_int 2)
-                                    (const_int 7)
-                                    (const_int 3)]))
-        (vec_select:V8QI (match_operand:V8QI 2 "register_operand" "y")
-                         (parallel [(const_int 0)
-                                    (const_int 4)
-                                    (const_int 1)
-                                    (const_int 5)
-                                    (const_int 2)
-                                    (const_int 6)
-                                    (const_int 3)
-                                    (const_int 7)]))
-        (const_int 85)))]
-  "TARGET_MMX"
-  "punpckhbw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxcvt")
-   (set_attr "mode" "DI")])
+;; For non-sse moves just expand the usual cmove sequence.
+(define_split
+  [(set (match_operand 0 "register_operand" "")
+       (if_then_else (match_operator 1 "comparison_operator"
+                       [(match_operand 4 "nonimmediate_operand" "")
+                        (match_operand 5 "register_operand" "")])
+                     (match_operand 2 "nonimmediate_operand" "")
+                     (match_operand 3 "nonimmediate_operand" "")))
+   (clobber (match_operand 6 "" ""))
+   (clobber (reg:CC FLAGS_REG))]
+  "!SSE_REG_P (operands[0]) && reload_completed
+   && (GET_MODE (operands[0]) == SFmode
+       || (TARGET_SSE2 && GET_MODE (operands[0]) == DFmode))"
+  [(const_int 0)]
+{
+   ix86_compare_op0 = operands[5];
+   ix86_compare_op1 = operands[4];
+   operands[1] = gen_rtx_fmt_ee (swap_condition (GET_CODE (operands[1])),
+                                VOIDmode, operands[5], operands[4]);
+   ix86_expand_fp_movcc (operands);
+   DONE;
+})
 
-(define_insn "mmx_punpckhwd"
-  [(set (match_operand:V4HI 0 "register_operand" "=y")
-       (vec_merge:V4HI
-        (vec_select:V4HI (match_operand:V4HI 1 "register_operand" "0")
-                         (parallel [(const_int 0)
-                                    (const_int 2)
-                                    (const_int 1)
-                                    (const_int 3)]))
-        (vec_select:V4HI (match_operand:V4HI 2 "register_operand" "y")
-                         (parallel [(const_int 2)
-                                    (const_int 0)
-                                    (const_int 3)
-                                    (const_int 1)]))
-        (const_int 5)))]
-  "TARGET_MMX"
-  "punpckhwd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxcvt")
-   (set_attr "mode" "DI")])
+;; Split SSE based conditional move into sequence:
+;; cmpCC op0, op4   -  set op0 to 0 or ffffffff depending on the comparison
+;; and   op2, op0   -  zero op2 if comparison was false
+;; nand  op0, op3   -  load op3 to op0 if comparison was false
+;; or   op2, op0   -  get the nonzero one into the result.
+(define_split
+  [(set (match_operand:SF 0 "register_operand" "")
+       (if_then_else:SF (match_operator:SF 1 "sse_comparison_operator"
+                          [(match_operand:SF 4 "register_operand" "")
+                           (match_operand:SF 5 "nonimmediate_operand" "")])
+                        (match_operand:SF 2 "register_operand" "")
+                        (match_operand:SF 3 "register_operand" "")))
+   (clobber (match_operand 6 "" ""))
+   (clobber (reg:CC FLAGS_REG))]
+  "SSE_REG_P (operands[0]) && reload_completed"
+  [(set (match_dup 4) (match_op_dup 1 [(match_dup 4) (match_dup 5)]))
+   (set (match_dup 2) (and:V4SF (match_dup 2)
+                               (match_dup 8)))
+   (set (match_dup 8) (and:V4SF (not:V4SF (match_dup 8))
+                                         (match_dup 3)))
+   (set (match_dup 0) (ior:V4SF (match_dup 6)
+                               (match_dup 7)))]
+{
+  /* If op2 == op3, op3 would be clobbered before it is used.  */
+  if (operands_match_p (operands[2], operands[3]))
+    {
+      emit_move_insn (operands[0], operands[2]);
+      DONE;
+    }
 
-(define_insn "mmx_punpckhdq"
-  [(set (match_operand:V2SI 0 "register_operand" "=y")
-       (vec_merge:V2SI
-        (match_operand:V2SI 1 "register_operand" "0")
-        (vec_select:V2SI (match_operand:V2SI 2 "register_operand" "y")
-                         (parallel [(const_int 1)
-                                    (const_int 0)]))
-        (const_int 1)))]
-  "TARGET_MMX"
-  "punpckhdq\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxcvt")
-   (set_attr "mode" "DI")])
+  PUT_MODE (operands[1], GET_MODE (operands[0]));
+  if (operands_match_p (operands[0], operands[4]))
+    operands[6] = operands[4], operands[7] = operands[2];
+  else
+    operands[6] = operands[2], operands[7] = operands[4];
+  operands[0] = simplify_gen_subreg (V4SFmode, operands[0], SFmode, 0);
+  operands[2] = simplify_gen_subreg (V4SFmode, operands[2], SFmode, 0);
+  operands[3] = simplify_gen_subreg (V4SFmode, operands[3], SFmode, 0);
+  operands[8] = simplify_gen_subreg (V4SFmode, operands[4], SFmode, 0);
+  operands[6] = simplify_gen_subreg (V4SFmode, operands[6], SFmode, 0);
+  operands[7] = simplify_gen_subreg (V4SFmode, operands[7], SFmode, 0);
+})
 
-(define_insn "mmx_punpcklbw"
-  [(set (match_operand:V8QI 0 "register_operand" "=y")
-       (vec_merge:V8QI
-        (vec_select:V8QI (match_operand:V8QI 1 "register_operand" "0")
-                         (parallel [(const_int 0)
-                                    (const_int 4)
-                                    (const_int 1)
-                                    (const_int 5)
-                                    (const_int 2)
-                                    (const_int 6)
-                                    (const_int 3)
-                                    (const_int 7)]))
-        (vec_select:V8QI (match_operand:V8QI 2 "register_operand" "y")
-                         (parallel [(const_int 4)
-                                    (const_int 0)
-                                    (const_int 5)
-                                    (const_int 1)
-                                    (const_int 6)
-                                    (const_int 2)
-                                    (const_int 7)
-                                    (const_int 3)]))
-        (const_int 85)))]
-  "TARGET_MMX"
-  "punpcklbw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxcvt")
-   (set_attr "mode" "DI")])
+(define_split
+  [(set (match_operand:DF 0 "register_operand" "")
+       (if_then_else:DF (match_operator:DF 1 "sse_comparison_operator"
+                          [(match_operand:DF 4 "register_operand" "")
+                           (match_operand:DF 5 "nonimmediate_operand" "")])
+                        (match_operand:DF 2 "register_operand" "")
+                        (match_operand:DF 3 "register_operand" "")))
+   (clobber (match_operand 6 "" ""))
+   (clobber (reg:CC FLAGS_REG))]
+  "SSE_REG_P (operands[0]) && reload_completed"
+  [(set (match_dup 4) (match_op_dup 1 [(match_dup 4) (match_dup 5)]))
+   (set (match_dup 2) (and:V2DF (match_dup 2)
+                               (match_dup 8)))
+   (set (match_dup 8) (and:V2DF (not:V2DF (match_dup 8))
+                                         (match_dup 3)))
+   (set (match_dup 0) (ior:V2DF (match_dup 6)
+                               (match_dup 7)))]
+{
+  if (TARGET_SSE_SPLIT_REGS && !optimize_size)
+    {
+      rtx op = simplify_gen_subreg (V2DFmode, operands[2], DFmode, 0);
+      emit_insn (gen_sse2_unpcklpd (op, op, op));
+      op = simplify_gen_subreg (V2DFmode, operands[3], DFmode, 0);
+      emit_insn (gen_sse2_unpcklpd (op, op, op));
+    }
 
-(define_insn "mmx_punpcklwd"
-  [(set (match_operand:V4HI 0 "register_operand" "=y")
-       (vec_merge:V4HI
-        (vec_select:V4HI (match_operand:V4HI 1 "register_operand" "0")
-                         (parallel [(const_int 2)
-                                    (const_int 0)
-                                    (const_int 3)
-                                    (const_int 1)]))
-        (vec_select:V4HI (match_operand:V4HI 2 "register_operand" "y")
-                         (parallel [(const_int 0)
-                                    (const_int 2)
-                                    (const_int 1)
-                                    (const_int 3)]))
-        (const_int 5)))]
-  "TARGET_MMX"
-  "punpcklwd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxcvt")
-   (set_attr "mode" "DI")])
+  /* If op2 == op3, op3 would be clobbered before it is used.  */
+  if (operands_match_p (operands[2], operands[3]))
+    {
+      emit_move_insn (operands[0], operands[2]);
+      DONE;
+    }
 
-(define_insn "mmx_punpckldq"
-  [(set (match_operand:V2SI 0 "register_operand" "=y")
-       (vec_merge:V2SI
-        (vec_select:V2SI (match_operand:V2SI 1 "register_operand" "0")
-                          (parallel [(const_int 1)
-                                     (const_int 0)]))
-        (match_operand:V2SI 2 "register_operand" "y")
-        (const_int 1)))]
-  "TARGET_MMX"
-  "punpckldq\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxcvt")
-   (set_attr "mode" "DI")])
+  PUT_MODE (operands[1], GET_MODE (operands[0]));
+  if (operands_match_p (operands[0], operands[4]))
+    operands[6] = operands[4], operands[7] = operands[2];
+  else
+    operands[6] = operands[2], operands[7] = operands[4];
+  operands[0] = simplify_gen_subreg (V2DFmode, operands[0], DFmode, 0);
+  operands[2] = simplify_gen_subreg (V2DFmode, operands[2], DFmode, 0);
+  operands[3] = simplify_gen_subreg (V2DFmode, operands[3], DFmode, 0);
+  operands[8] = simplify_gen_subreg (V2DFmode, operands[4], DFmode, 0);
+  operands[6] = simplify_gen_subreg (V2DFmode, operands[6], DFmode, 0);
+  operands[7] = simplify_gen_subreg (V2DFmode, operands[7], DFmode, 0);
+})
 
+;; Special case of conditional move we can handle effectively.
+;; Do not brother with the integer/floating point case, since these are
+;; bot considerably slower, unlike in the generic case.
+(define_insn "*sse_movsfcc_const0_1"
+  [(set (match_operand:SF 0 "register_operand" "=&x")
+       (if_then_else:SF (match_operator 1 "sse_comparison_operator"
+                       [(match_operand:SF 4 "register_operand" "0")
+                        (match_operand:SF 5 "nonimmediate_operand" "xm")])
+                     (match_operand:SF 2 "register_operand" "x")
+                     (match_operand:SF 3 "const0_operand" "X")))]
+  "TARGET_SSE"
+  "#")
 
-;; Miscellaneous stuff
-
-(define_insn "emms"
-  [(unspec_volatile [(const_int 0)] UNSPECV_EMMS)
-   (clobber (reg:XF 8))
-   (clobber (reg:XF 9))
-   (clobber (reg:XF 10))
-   (clobber (reg:XF 11))
-   (clobber (reg:XF 12))
-   (clobber (reg:XF 13))
-   (clobber (reg:XF 14))
-   (clobber (reg:XF 15))
-   (clobber (reg:DI 29))
-   (clobber (reg:DI 30))
-   (clobber (reg:DI 31))
-   (clobber (reg:DI 32))
-   (clobber (reg:DI 33))
-   (clobber (reg:DI 34))
-   (clobber (reg:DI 35))
-   (clobber (reg:DI 36))]
-  "TARGET_MMX"
-  "emms"
-  [(set_attr "type" "mmx")
-   (set_attr "memory" "unknown")])
+(define_insn "*sse_movsfcc_const0_2"
+  [(set (match_operand:SF 0 "register_operand" "=&x")
+       (if_then_else:SF (match_operator 1 "sse_comparison_operator"
+                       [(match_operand:SF 4 "register_operand" "0")
+                        (match_operand:SF 5 "nonimmediate_operand" "xm")])
+                     (match_operand:SF 2 "const0_operand" "X")
+                     (match_operand:SF 3 "register_operand" "x")))]
+  "TARGET_SSE"
+  "#")
 
-(define_insn "ldmxcsr"
-  [(unspec_volatile [(match_operand:SI 0 "memory_operand" "m")]
-                   UNSPECV_LDMXCSR)]
+(define_insn "*sse_movsfcc_const0_3"
+  [(set (match_operand:SF 0 "register_operand" "=&x")
+       (if_then_else:SF (match_operator 1 "fcmov_comparison_operator"
+                       [(match_operand:SF 4 "nonimmediate_operand" "xm")
+                        (match_operand:SF 5 "register_operand" "0")])
+                     (match_operand:SF 2 "register_operand" "x")
+                     (match_operand:SF 3 "const0_operand" "X")))]
   "TARGET_SSE"
-  "ldmxcsr\t%0"
-  [(set_attr "type" "sse")
-   (set_attr "memory" "load")])
+  "#")
 
-(define_insn "stmxcsr"
-  [(set (match_operand:SI 0 "memory_operand" "=m")
-       (unspec_volatile:SI [(const_int 0)] UNSPECV_STMXCSR))]
+(define_insn "*sse_movsfcc_const0_4"
+  [(set (match_operand:SF 0 "register_operand" "=&x")
+       (if_then_else:SF (match_operator 1 "fcmov_comparison_operator"
+                       [(match_operand:SF 4 "nonimmediate_operand" "xm")
+                        (match_operand:SF 5 "register_operand" "0")])
+                     (match_operand:SF 2 "const0_operand" "X")
+                     (match_operand:SF 3 "register_operand" "x")))]
   "TARGET_SSE"
-  "stmxcsr\t%0"
-  [(set_attr "type" "sse")
-   (set_attr "memory" "store")])
+  "#")
 
-(define_expand "sfence"
-  [(set (match_dup 0)
-       (unspec:BLK [(match_dup 0)] UNSPEC_SFENCE))]
-  "TARGET_SSE || TARGET_3DNOW_A"
-{
-  operands[0] = gen_rtx_MEM (BLKmode, gen_rtx_SCRATCH (Pmode));
-  MEM_VOLATILE_P (operands[0]) = 1;
-})
+(define_insn "*sse_movdfcc_const0_1"
+  [(set (match_operand:DF 0 "register_operand" "=&Y")
+       (if_then_else:DF (match_operator 1 "sse_comparison_operator"
+                       [(match_operand:DF 4 "register_operand" "0")
+                        (match_operand:DF 5 "nonimmediate_operand" "Ym")])
+                     (match_operand:DF 2 "register_operand" "Y")
+                     (match_operand:DF 3 "const0_operand" "X")))]
+  "TARGET_SSE2"
+  "#")
 
-(define_insn "*sfence_insn"
-  [(set (match_operand:BLK 0 "" "")
-       (unspec:BLK [(match_dup 0)] UNSPEC_SFENCE))]
-  "TARGET_SSE || TARGET_3DNOW_A"
-  "sfence"
-  [(set_attr "type" "sse")
-   (set_attr "memory" "unknown")])
+(define_insn "*sse_movdfcc_const0_2"
+  [(set (match_operand:DF 0 "register_operand" "=&Y")
+       (if_then_else:DF (match_operator 1 "sse_comparison_operator"
+                       [(match_operand:DF 4 "register_operand" "0")
+                        (match_operand:DF 5 "nonimmediate_operand" "Ym")])
+                     (match_operand:DF 2 "const0_operand" "X")
+                     (match_operand:DF 3 "register_operand" "Y")))]
+  "TARGET_SSE2"
+  "#")
 
-(define_expand "sse_prologue_save"
-  [(parallel [(set (match_operand:BLK 0 "" "")
-                  (unspec:BLK [(reg:DI 21)
-                               (reg:DI 22)
-                               (reg:DI 23)
-                               (reg:DI 24)
-                               (reg:DI 25)
-                               (reg:DI 26)
-                               (reg:DI 27)
-                               (reg:DI 28)] UNSPEC_SSE_PROLOGUE_SAVE))
-             (use (match_operand:DI 1 "register_operand" ""))
-             (use (match_operand:DI 2 "immediate_operand" ""))
-             (use (label_ref:DI (match_operand 3 "" "")))])]
-  "TARGET_64BIT"
-  "")
+(define_insn "*sse_movdfcc_const0_3"
+  [(set (match_operand:DF 0 "register_operand" "=&Y")
+       (if_then_else:DF (match_operator 1 "fcmov_comparison_operator"
+                       [(match_operand:DF 4 "nonimmediate_operand" "Ym")
+                        (match_operand:DF 5 "register_operand" "0")])
+                     (match_operand:DF 2 "register_operand" "Y")
+                     (match_operand:DF 3 "const0_operand" "X")))]
+  "TARGET_SSE2"
+  "#")
 
-(define_insn "*sse_prologue_save_insn"
-  [(set (mem:BLK (plus:DI (match_operand:DI 0 "register_operand" "R")
-                         (match_operand:DI 4 "const_int_operand" "n")))
-       (unspec:BLK [(reg:DI 21)
-                    (reg:DI 22)
-                    (reg:DI 23)
-                    (reg:DI 24)
-                    (reg:DI 25)
-                    (reg:DI 26)
-                    (reg:DI 27)
-                    (reg:DI 28)] UNSPEC_SSE_PROLOGUE_SAVE))
-   (use (match_operand:DI 1 "register_operand" "r"))
-   (use (match_operand:DI 2 "const_int_operand" "i"))
-   (use (label_ref:DI (match_operand 3 "" "X")))]
-  "TARGET_64BIT
-   && INTVAL (operands[4]) + SSE_REGPARM_MAX * 16 - 16 < 128
-   && INTVAL (operands[4]) + INTVAL (operands[2]) * 16 >= -128"
-  "*
+(define_insn "*sse_movdfcc_const0_4"
+  [(set (match_operand:DF 0 "register_operand" "=&Y")
+       (if_then_else:DF (match_operator 1 "fcmov_comparison_operator"
+                       [(match_operand:DF 4 "nonimmediate_operand" "Ym")
+                        (match_operand:DF 5 "register_operand" "0")])
+                     (match_operand:DF 2 "const0_operand" "X")
+                     (match_operand:DF 3 "register_operand" "Y")))]
+  "TARGET_SSE2"
+  "#")
+
+(define_split
+  [(set (match_operand:SF 0 "register_operand" "")
+       (if_then_else:SF (match_operator 1 "comparison_operator"
+                          [(match_operand:SF 4 "nonimmediate_operand" "")
+                           (match_operand:SF 5 "nonimmediate_operand" "")])
+                        (match_operand:SF 2 "nonmemory_operand" "")
+                        (match_operand:SF 3 "nonmemory_operand" "")))]
+  "SSE_REG_P (operands[0]) && reload_completed
+   && (const0_operand (operands[2], GET_MODE (operands[0]))
+       || const0_operand (operands[3], GET_MODE (operands[0])))"
+  [(set (match_dup 0) (match_op_dup 1 [(match_dup 0) (match_dup 5)]))
+   (set (match_dup 8) (and:V4SF (match_dup 6) (match_dup 7)))]
 {
-  int i;
-  operands[0] = gen_rtx_MEM (Pmode,
-                            gen_rtx_PLUS (Pmode, operands[0], operands[4]));
-  output_asm_insn (\"jmp\\t%A1\", operands);
-  for (i = SSE_REGPARM_MAX - 1; i >= INTVAL (operands[2]); i--)
+  PUT_MODE (operands[1], GET_MODE (operands[0]));
+  if (!sse_comparison_operator (operands[1], VOIDmode)
+      || !rtx_equal_p (operands[0], operands[4]))
     {
-      operands[4] = adjust_address (operands[0], DImode, i*16);
-      operands[5] = gen_rtx_REG (TImode, SSE_REGNO (i));
-      PUT_MODE (operands[4], TImode);
-      if (GET_CODE (XEXP (operands[0], 0)) != PLUS)
-        output_asm_insn (\"rex\", operands);
-      output_asm_insn (\"movaps\\t{%5, %4|%4, %5}\", operands);
+      rtx tmp = operands[5];
+      operands[5] = operands[4];
+      operands[4] = tmp;
+      PUT_CODE (operands[1], swap_condition (GET_CODE (operands[1])));
     }
-  (*targetm.asm_out.internal_label) (asm_out_file, \"L\",
-                            CODE_LABEL_NUMBER (operands[3]));
-  RET;
-}
-  "
-  [(set_attr "type" "other")
-   (set_attr "length_immediate" "0")
-   (set_attr "length_address" "0")
-   (set_attr "length" "135")
-   (set_attr "memory" "store")
-   (set_attr "modrm" "0")
-   (set_attr "mode" "DI")])
-
-;; 3Dnow! instructions
-
-(define_insn "addv2sf3"
-  [(set (match_operand:V2SF 0 "register_operand" "=y")
-       (plus:V2SF (match_operand:V2SF 1 "register_operand" "0")
-                  (match_operand:V2SF 2 "nonimmediate_operand" "ym")))]
-  "TARGET_3DNOW"
-  "pfadd\\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxadd")
-   (set_attr "mode" "V2SF")])
-
-(define_insn "subv2sf3"
-  [(set (match_operand:V2SF 0 "register_operand" "=y")
-        (minus:V2SF (match_operand:V2SF 1 "register_operand" "0")
-                   (match_operand:V2SF 2 "nonimmediate_operand" "ym")))]
-  "TARGET_3DNOW"
-  "pfsub\\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxadd")
-   (set_attr "mode" "V2SF")])
-
-(define_insn "subrv2sf3"
-  [(set (match_operand:V2SF 0 "register_operand" "=y")
-        (minus:V2SF (match_operand:V2SF 2 "nonimmediate_operand" "ym")
-                    (match_operand:V2SF 1 "register_operand" "0")))]
-  "TARGET_3DNOW"
-  "pfsubr\\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxadd")
-   (set_attr "mode" "V2SF")])
-
-(define_insn "gtv2sf3"
-  [(set (match_operand:V2SI 0 "register_operand" "=y")
-       (gt:V2SI (match_operand:V2SF 1 "register_operand" "0")
-                (match_operand:V2SF 2 "nonimmediate_operand" "ym")))]
- "TARGET_3DNOW"
-  "pfcmpgt\\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxcmp")
-   (set_attr "mode" "V2SF")])
-
-(define_insn "gev2sf3"
-  [(set (match_operand:V2SI 0 "register_operand" "=y")
-       (ge:V2SI (match_operand:V2SF 1 "register_operand" "0")
-                (match_operand:V2SF 2 "nonimmediate_operand" "ym")))]
-  "TARGET_3DNOW"
-  "pfcmpge\\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxcmp")
-   (set_attr "mode" "V2SF")])
-
-(define_insn "eqv2sf3"
-  [(set (match_operand:V2SI 0 "register_operand" "=y")
-       (eq:V2SI (match_operand:V2SF 1 "register_operand" "0")
-                (match_operand:V2SF 2 "nonimmediate_operand" "ym")))]
-  "TARGET_3DNOW"
-  "pfcmpeq\\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxcmp")
-   (set_attr "mode" "V2SF")])
-
-(define_insn "pfmaxv2sf3"
-  [(set (match_operand:V2SF 0 "register_operand" "=y")
-        (smax:V2SF (match_operand:V2SF 1 "register_operand" "0")
-                   (match_operand:V2SF 2 "nonimmediate_operand" "ym")))]
-  "TARGET_3DNOW"
-  "pfmax\\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxadd")
-   (set_attr "mode" "V2SF")])
-
-(define_insn "pfminv2sf3"
-  [(set (match_operand:V2SF 0 "register_operand" "=y")
-        (smin:V2SF (match_operand:V2SF 1 "register_operand" "0")
-                   (match_operand:V2SF 2 "nonimmediate_operand" "ym")))]
-  "TARGET_3DNOW"
-  "pfmin\\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxadd")
-   (set_attr "mode" "V2SF")])
-
-(define_insn "mulv2sf3"
-  [(set (match_operand:V2SF 0 "register_operand" "=y")
-       (mult:V2SF (match_operand:V2SF 1 "register_operand" "0")
-                  (match_operand:V2SF 2 "nonimmediate_operand" "ym")))]
-  "TARGET_3DNOW"
-  "pfmul\\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxmul")
-   (set_attr "mode" "V2SF")])
-
-(define_insn "femms"
-  [(unspec_volatile [(const_int 0)] UNSPECV_FEMMS)
-   (clobber (reg:XF 8))
-   (clobber (reg:XF 9))
-   (clobber (reg:XF 10))
-   (clobber (reg:XF 11))
-   (clobber (reg:XF 12))
-   (clobber (reg:XF 13))
-   (clobber (reg:XF 14))
-   (clobber (reg:XF 15))
-   (clobber (reg:DI 29))
-   (clobber (reg:DI 30))
-   (clobber (reg:DI 31))
-   (clobber (reg:DI 32))
-   (clobber (reg:DI 33))
-   (clobber (reg:DI 34))
-   (clobber (reg:DI 35))
-   (clobber (reg:DI 36))]
-  "TARGET_3DNOW"
-  "femms"
-  [(set_attr "type" "mmx")
-   (set_attr "memory" "none")]) 
-
-(define_insn "pf2id"
-  [(set (match_operand:V2SI 0 "register_operand" "=y")
-       (fix:V2SI (match_operand:V2SF 1 "nonimmediate_operand" "ym")))]
-  "TARGET_3DNOW"
-  "pf2id\\t{%1, %0|%0, %1}"
-  [(set_attr "type" "mmxcvt")
-   (set_attr "mode" "V2SF")])
-
-(define_insn "pf2iw"
-  [(set (match_operand:V2SI 0 "register_operand" "=y")
-       (sign_extend:V2SI
-          (ss_truncate:V2HI
-             (fix:V2SI (match_operand:V2SF 1 "nonimmediate_operand" "ym")))))]
-  "TARGET_3DNOW_A"
-  "pf2iw\\t{%1, %0|%0, %1}"
-  [(set_attr "type" "mmxcvt")
-   (set_attr "mode" "V2SF")])
-
-(define_insn "pfacc"
-  [(set (match_operand:V2SF 0 "register_operand" "=y")
-       (vec_concat:V2SF
-          (plus:SF
-             (vec_select:SF (match_operand:V2SF 1 "register_operand" "0")
-                            (parallel [(const_int  0)]))
-             (vec_select:SF (match_dup 1)
-                            (parallel [(const_int 1)])))
-           (plus:SF
-              (vec_select:SF (match_operand:V2SF 2 "nonimmediate_operand" "y")
-                            (parallel [(const_int  0)]))
-              (vec_select:SF (match_dup 2)
-                            (parallel [(const_int 1)])))))]
-  "TARGET_3DNOW"
-  "pfacc\\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxadd")
-   (set_attr "mode" "V2SF")])
-
-(define_insn "pfnacc"
-  [(set (match_operand:V2SF 0 "register_operand" "=y")
-       (vec_concat:V2SF
-           (minus:SF
-              (vec_select:SF (match_operand:V2SF 1 "register_operand" "0")
-                            (parallel [(const_int 0)]))
-              (vec_select:SF (match_dup 1)
-                            (parallel [(const_int 1)])))
-           (minus:SF
-              (vec_select:SF (match_operand:V2SF 2 "nonimmediate_operand" "y")
-                            (parallel [(const_int  0)]))
-              (vec_select:SF (match_dup 2)
-                            (parallel [(const_int 1)])))))]
-  "TARGET_3DNOW_A"
-  "pfnacc\\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxadd")
-   (set_attr "mode" "V2SF")])
-
-(define_insn "pfpnacc"
-  [(set (match_operand:V2SF 0 "register_operand" "=y")
-        (vec_concat:V2SF
-           (minus:SF
-              (vec_select:SF (match_operand:V2SF 1 "register_operand" "0")
-                            (parallel [(const_int 0)]))
-              (vec_select:SF (match_dup 1)
-                            (parallel [(const_int 1)])))
-           (plus:SF
-              (vec_select:SF (match_operand:V2SF 2 "nonimmediate_operand" "y")
-                            (parallel [(const_int 0)]))
-              (vec_select:SF (match_dup 2)
-                            (parallel [(const_int 1)])))))]
-  "TARGET_3DNOW_A"
-  "pfpnacc\\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxadd")
-   (set_attr "mode" "V2SF")])
-
-(define_insn "pi2fw"
-  [(set (match_operand:V2SF 0 "register_operand" "=y")
-       (float:V2SF
-          (vec_concat:V2SI
-             (sign_extend:SI
-                (truncate:HI
-                   (vec_select:SI (match_operand:V2SI 1 "nonimmediate_operand" "ym")
-                                  (parallel [(const_int 0)]))))
-              (sign_extend:SI
-                (truncate:HI
-                    (vec_select:SI (match_dup 1)
-                                  (parallel [(const_int  1)])))))))]
-  "TARGET_3DNOW_A"
-  "pi2fw\\t{%1, %0|%0, %1}"
-  [(set_attr "type" "mmxcvt")
-   (set_attr "mode" "V2SF")])
-
-(define_insn "floatv2si2"
-  [(set (match_operand:V2SF 0 "register_operand" "=y")
-       (float:V2SF (match_operand:V2SI 1 "nonimmediate_operand" "ym")))]
-  "TARGET_3DNOW"
-  "pi2fd\\t{%1, %0|%0, %1}"
-  [(set_attr "type" "mmxcvt")
-   (set_attr "mode" "V2SF")])
-
-;; This insn is identical to pavgb in operation, but the opcode is
-;; different.  To avoid accidentally matching pavgb, use an unspec.
-
-(define_insn "pavgusb"
- [(set (match_operand:V8QI 0 "register_operand" "=y")
-       (unspec:V8QI
-          [(match_operand:V8QI 1 "register_operand" "0")
-           (match_operand:V8QI 2 "nonimmediate_operand" "ym")]
-         UNSPEC_PAVGUSB))]
-  "TARGET_3DNOW"
-  "pavgusb\\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxshft")
-   (set_attr "mode" "TI")])
-
-;; 3DNow reciprocal and sqrt
-(define_insn "pfrcpv2sf2"
-  [(set (match_operand:V2SF 0 "register_operand" "=y")
-        (unspec:V2SF [(match_operand:V2SF 1 "nonimmediate_operand" "ym")]
-       UNSPEC_PFRCP))]
-  "TARGET_3DNOW"
-  "pfrcp\\t{%1, %0|%0, %1}"
-  [(set_attr "type" "mmx")
-   (set_attr "mode" "TI")])
-
-(define_insn "pfrcpit1v2sf3"
-  [(set (match_operand:V2SF 0 "register_operand" "=y")
-       (unspec:V2SF [(match_operand:V2SF 1 "register_operand" "0")
-                     (match_operand:V2SF 2 "nonimmediate_operand" "ym")]
-                    UNSPEC_PFRCPIT1))]
-  "TARGET_3DNOW"
-  "pfrcpit1\\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmx")
-   (set_attr "mode" "TI")])
-
-(define_insn "pfrcpit2v2sf3"
-  [(set (match_operand:V2SF 0 "register_operand" "=y")
-       (unspec:V2SF [(match_operand:V2SF 1 "register_operand" "0")
-                     (match_operand:V2SF 2 "nonimmediate_operand" "ym")]
-                    UNSPEC_PFRCPIT2))]
-  "TARGET_3DNOW"
-  "pfrcpit2\\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmx")
-   (set_attr "mode" "TI")])
-
-(define_insn "pfrsqrtv2sf2"
-  [(set (match_operand:V2SF 0 "register_operand" "=y")
-       (unspec:V2SF [(match_operand:V2SF 1 "nonimmediate_operand" "ym")]
-                    UNSPEC_PFRSQRT))]
-  "TARGET_3DNOW"
-  "pfrsqrt\\t{%1, %0|%0, %1}"
-  [(set_attr "type" "mmx")
-   (set_attr "mode" "TI")])
-               
-(define_insn "pfrsqit1v2sf3"
-  [(set (match_operand:V2SF 0 "register_operand" "=y")
-       (unspec:V2SF [(match_operand:V2SF 1 "register_operand" "0")
-                     (match_operand:V2SF 2 "nonimmediate_operand" "ym")]
-                    UNSPEC_PFRSQIT1))]
-  "TARGET_3DNOW"
-  "pfrsqit1\\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmx")
-   (set_attr "mode" "TI")])
-
-(define_insn "pmulhrwv4hi3"
-  [(set (match_operand:V4HI 0 "register_operand" "=y")
-       (truncate:V4HI
-          (lshiftrt:V4SI
-             (plus:V4SI
-                (mult:V4SI
-                   (sign_extend:V4SI
-                      (match_operand:V4HI 1 "register_operand" "0"))
-                   (sign_extend:V4SI
-                      (match_operand:V4HI 2 "nonimmediate_operand" "ym")))
-                (const_vector:V4SI [(const_int 32768)
-                                    (const_int 32768)
-                                    (const_int 32768)
-                                    (const_int 32768)]))
-             (const_int 16))))]
-  "TARGET_3DNOW"
-  "pmulhrw\\t{%2, %0|%0, %2}"
-  [(set_attr "type" "mmxmul")
-   (set_attr "mode" "TI")])
-
-(define_insn "pswapdv2si2"
-  [(set (match_operand:V2SI 0 "register_operand" "=y")
-       (vec_select:V2SI (match_operand:V2SI 1 "nonimmediate_operand" "ym")
-                        (parallel [(const_int 1) (const_int 0)])))]
-  "TARGET_3DNOW_A"
-  "pswapd\\t{%1, %0|%0, %1}"
-  [(set_attr "type" "mmxcvt")
-   (set_attr "mode" "TI")])
-
-(define_insn "pswapdv2sf2"
-  [(set (match_operand:V2SF 0 "register_operand" "=y")
-       (vec_select:V2SF (match_operand:V2SF 1 "nonimmediate_operand" "ym")
-                        (parallel [(const_int 1) (const_int 0)])))]
-  "TARGET_3DNOW_A"
-  "pswapd\\t{%1, %0|%0, %1}"
-  [(set_attr "type" "mmxcvt")
-   (set_attr "mode" "TI")])
+  if (!rtx_equal_p (operands[0], operands[4]))
+    abort ();
+  operands[8] = simplify_gen_subreg (V4SFmode, operands[0], SFmode, 0);
+  if (const0_operand (operands[2], GET_MODE (operands[2])))
+    {
+      operands[7] = operands[3];
+      operands[6] = gen_rtx_NOT (V4SFmode, operands[8]);
+    }
+  else
+    {
+      operands[7] = operands[2];
+      operands[6] = operands[8];
+    }
+  operands[7] = simplify_gen_subreg (V4SFmode, operands[7], SFmode, 0);
+})
 
-(define_expand "prefetch"
-  [(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"
+(define_split
+  [(set (match_operand:DF 0 "register_operand" "")
+       (if_then_else:DF (match_operator 1 "comparison_operator"
+                          [(match_operand:DF 4 "nonimmediate_operand" "")
+                           (match_operand:DF 5 "nonimmediate_operand" "")])
+                        (match_operand:DF 2 "nonmemory_operand" "")
+                        (match_operand:DF 3 "nonmemory_operand" "")))]
+  "SSE_REG_P (operands[0]) && reload_completed
+   && (const0_operand (operands[2], GET_MODE (operands[0]))
+       || const0_operand (operands[3], GET_MODE (operands[0])))"
+  [(set (match_dup 0) (match_op_dup 1 [(match_dup 0) (match_dup 5)]))
+   (set (match_dup 8) (and:V2DF (match_dup 6) (match_dup 7)))]
 {
-  int rw = INTVAL (operands[1]);
-  int locality = INTVAL (operands[2]);
-
-  if (rw != 0 && rw != 1)
-    abort ();
-  if (locality < 0 || locality > 3)
-    abort ();
-  if (GET_MODE (operands[0]) != Pmode && GET_MODE (operands[0]) != VOIDmode)
+  if (TARGET_SSE_SPLIT_REGS && !optimize_size)
+    {
+      if (REG_P (operands[2]))
+       {
+         rtx op = simplify_gen_subreg (V2DFmode, operands[2], DFmode, 0);
+         emit_insn (gen_sse2_unpcklpd (op, op, op));
+       }
+      if (REG_P (operands[3]))
+       {
+         rtx op = simplify_gen_subreg (V2DFmode, operands[3], DFmode, 0);
+         emit_insn (gen_sse2_unpcklpd (op, op, op));
+       }
+    }
+  PUT_MODE (operands[1], GET_MODE (operands[0]));
+  if (!sse_comparison_operator (operands[1], VOIDmode)
+      || !rtx_equal_p (operands[0], operands[4]))
+    {
+      rtx tmp = operands[5];
+      operands[5] = operands[4];
+      operands[4] = tmp;
+      PUT_CODE (operands[1], swap_condition (GET_CODE (operands[1])));
+    }
+  if (!rtx_equal_p (operands[0], operands[4]))
     abort ();
-
-  /* Use 3dNOW prefetch in case we are asking for write prefetch not
-     suported by SSE counterpart or the SSE prefetch is not available
-     (K6 machines).  Otherwise use SSE prefetch as it allows specifying
-     of locality.  */
-  if (TARGET_3DNOW && (!TARGET_PREFETCH_SSE || rw))
-    operands[2] = GEN_INT (3);
+  operands[8] = simplify_gen_subreg (V2DFmode, operands[0], DFmode, 0);
+  if (const0_operand (operands[2], GET_MODE (operands[2])))
+    {
+      operands[7] = operands[3];
+      operands[6] = gen_rtx_NOT (V2DFmode, operands[8]);
+    }
   else
-    operands[1] = const0_rtx;
+    {
+      operands[7] = operands[2];
+      operands[6] = operands[8];
+    }
+  operands[7] = simplify_gen_subreg (V2DFmode, operands[7], DFmode, 0);
 })
 
-(define_insn "*prefetch_sse"
-  [(prefetch (match_operand:SI 0 "address_operand" "p")
-            (const_int 0)
-            (match_operand:SI 1 "const_int_operand" ""))]
-  "TARGET_PREFETCH_SSE && !TARGET_64BIT"
+(define_expand "allocate_stack_worker"
+  [(match_operand:SI 0 "register_operand" "")]
+  "TARGET_STACK_PROBE"
 {
-  static const char * const patterns[4] = {
-   "prefetchnta\t%a0", "prefetcht2\t%a0", "prefetcht1\t%a0", "prefetcht0\t%a0"
-  };
+  if (reload_completed)
+    {
+      if (TARGET_64BIT)
+       emit_insn (gen_allocate_stack_worker_rex64_postreload (operands[0]));
+      else
+       emit_insn (gen_allocate_stack_worker_postreload (operands[0]));
+    }
+  else
+    {
+      if (TARGET_64BIT)
+       emit_insn (gen_allocate_stack_worker_rex64 (operands[0]));
+      else
+       emit_insn (gen_allocate_stack_worker_1 (operands[0]));
+    }
+  DONE;
+})
+
+(define_insn "allocate_stack_worker_1"
+  [(unspec_volatile:SI [(match_operand:SI 0 "register_operand" "a")]
+    UNSPECV_STACK_PROBE)
+   (set (reg:SI SP_REG) (minus:SI (reg:SI SP_REG) (match_dup 0)))
+   (clobber (match_scratch:SI 1 "=0"))
+   (clobber (reg:CC FLAGS_REG))]
+  "!TARGET_64BIT && TARGET_STACK_PROBE"
+  "call\t__alloca"
+  [(set_attr "type" "multi")
+   (set_attr "length" "5")])
+
+(define_expand "allocate_stack_worker_postreload"
+  [(parallel [(unspec_volatile:SI [(match_operand:SI 0 "register_operand" "a")]
+                                   UNSPECV_STACK_PROBE)
+             (set (reg:SI SP_REG) (minus:SI (reg:SI SP_REG) (match_dup 0)))
+             (clobber (match_dup 0))
+             (clobber (reg:CC FLAGS_REG))])]
+  ""
+  "")
 
-  int locality = INTVAL (operands[1]);
-  if (locality < 0 || locality > 3)
-    abort ();
+(define_insn "allocate_stack_worker_rex64"
+  [(unspec_volatile:DI [(match_operand:DI 0 "register_operand" "a")]
+    UNSPECV_STACK_PROBE)
+   (set (reg:DI SP_REG) (minus:DI (reg:DI SP_REG) (match_dup 0)))
+   (clobber (match_scratch:DI 1 "=0"))
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_64BIT && TARGET_STACK_PROBE"
+  "call\t__alloca"
+  [(set_attr "type" "multi")
+   (set_attr "length" "5")])
 
-  return patterns[locality];  
-}
-  [(set_attr "type" "sse")
-   (set_attr "memory" "none")])
+(define_expand "allocate_stack_worker_rex64_postreload"
+  [(parallel [(unspec_volatile:DI [(match_operand:DI 0 "register_operand" "a")]
+                                   UNSPECV_STACK_PROBE)
+             (set (reg:DI SP_REG) (minus:DI (reg:DI SP_REG) (match_dup 0)))
+             (clobber (match_dup 0))
+             (clobber (reg:CC FLAGS_REG))])]
+  ""
+  "")
 
-(define_insn "*prefetch_sse_rex"
-  [(prefetch (match_operand:DI 0 "address_operand" "p")
-            (const_int 0)
-            (match_operand:SI 1 "const_int_operand" ""))]
-  "TARGET_PREFETCH_SSE && TARGET_64BIT"
+(define_expand "allocate_stack"
+  [(parallel [(set (match_operand:SI 0 "register_operand" "=r")
+                  (minus:SI (reg:SI SP_REG)
+                            (match_operand:SI 1 "general_operand" "")))
+             (clobber (reg:CC FLAGS_REG))])
+   (parallel [(set (reg:SI SP_REG)
+                  (minus:SI (reg:SI SP_REG) (match_dup 1)))
+             (clobber (reg:CC FLAGS_REG))])]
+  "TARGET_STACK_PROBE"
 {
-  static const char * const patterns[4] = {
-   "prefetchnta\t%a0", "prefetcht2\t%a0", "prefetcht1\t%a0", "prefetcht0\t%a0"
-  };
-
-  int locality = INTVAL (operands[1]);
-  if (locality < 0 || locality > 3)
-    abort ();
+#ifdef CHECK_STACK_LIMIT
+  if (GET_CODE (operands[1]) == CONST_INT
+      && INTVAL (operands[1]) < CHECK_STACK_LIMIT)
+    emit_insn (gen_subsi3 (stack_pointer_rtx, stack_pointer_rtx,
+                          operands[1]));
+  else 
+#endif
+    emit_insn (gen_allocate_stack_worker (copy_to_mode_reg (SImode,
+                                                           operands[1])));
 
-  return patterns[locality];  
-}
-  [(set_attr "type" "sse")
-   (set_attr "memory" "none")])
+  emit_move_insn (operands[0], virtual_stack_dynamic_rtx);
+  DONE;
+})
 
-(define_insn "*prefetch_3dnow"
-  [(prefetch (match_operand:SI 0 "address_operand" "p")
-            (match_operand:SI 1 "const_int_operand" "n")
-            (const_int 3))]
-  "TARGET_3DNOW && !TARGET_64BIT"
+(define_expand "builtin_setjmp_receiver"
+  [(label_ref (match_operand 0 "" ""))]
+  "!TARGET_64BIT && flag_pic"
 {
-  if (INTVAL (operands[1]) == 0)
-    return "prefetch\t%a0";
-  else
-    return "prefetchw\t%a0";
-}
-  [(set_attr "type" "mmx")
-   (set_attr "memory" "none")])
+  emit_insn (gen_set_got (pic_offset_table_rtx));
+  DONE;
+})
+\f
+;; Avoid redundant prefixes by splitting HImode arithmetic to SImode.
 
-(define_insn "*prefetch_3dnow_rex"
-  [(prefetch (match_operand:DI 0 "address_operand" "p")
-            (match_operand:SI 1 "const_int_operand" "n")
-            (const_int 3))]
-  "TARGET_3DNOW && TARGET_64BIT"
+(define_split
+  [(set (match_operand 0 "register_operand" "")
+       (match_operator 3 "promotable_binary_operator"
+          [(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 
+       && ((!optimize_size && !TARGET_FAST_PREFIX)
+           || GET_CODE (operands[2]) != CONST_INT
+           || CONST_OK_FOR_LETTER_P (INTVAL (operands[2]), 'K')))
+       || (GET_MODE (operands[0]) == QImode 
+          && (TARGET_PROMOTE_QImode || optimize_size)))"
+  [(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);")
+
+; 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" "")
+       (match_operator 2 "compare_operator"
+         [(and (match_operand 3 "aligned_operand" "")
+               (match_operand 4 "const_int_operand" ""))
+          (const_int 0)]))
+   (set (match_operand 1 "register_operand" "")
+       (and (match_dup 3) (match_dup 4)))]
+  "! TARGET_PARTIAL_REG_STALL && reload_completed
+   /* Ensure that the operand will remain sign-extended immediate.  */
+   && ix86_match_ccmode (insn, INTVAL (operands[4]) >= 0 ? CCNOmode : CCZmode)
+   && ! optimize_size
+   && ((GET_MODE (operands[1]) == HImode && ! TARGET_FAST_PREFIX)
+       || (GET_MODE (operands[1]) == QImode && TARGET_PROMOTE_QImode))"
+  [(parallel [(set (match_dup 0)
+                  (match_op_dup 2 [(and:SI (match_dup 3) (match_dup 4))
+                                   (const_int 0)]))
+             (set (match_dup 1)
+                  (and:SI (match_dup 3) (match_dup 4)))])]
+{
+  operands[4]
+    = gen_int_mode (INTVAL (operands[4])
+                   & GET_MODE_MASK (GET_MODE (operands[1])), SImode);
+  operands[1] = gen_lowpart (SImode, operands[1]);
+  operands[3] = gen_lowpart (SImode, operands[3]);
+})
+
+; Don't promote the QImode tests, as i386 doesn't have encoding of
+; the TEST instruction with 32-bit sign-extended immediate and thus
+; 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" "")
+       (match_operator 1 "compare_operator"
+         [(and (match_operand:HI 2 "aligned_operand" "")
+               (match_operand:HI 3 "const_int_operand" ""))
+          (const_int 0)]))]
+  "! TARGET_PARTIAL_REG_STALL && reload_completed
+   /* Ensure that the operand will remain sign-extended immediate.  */
+   && ix86_match_ccmode (insn, INTVAL (operands[3]) >= 0 ? CCNOmode : CCZmode)
+   && ! TARGET_FAST_PREFIX
+   && ! optimize_size"
+  [(set (match_dup 0)
+       (match_op_dup 1 [(and:SI (match_dup 2) (match_dup 3))
+                        (const_int 0)]))]
 {
-  if (INTVAL (operands[1]) == 0)
-    return "prefetch\t%a0";
-  else
-    return "prefetchw\t%a0";
-}
-  [(set_attr "type" "mmx")
-   (set_attr "memory" "none")])
+  operands[3]
+    = gen_int_mode (INTVAL (operands[3])
+                   & GET_MODE_MASK (GET_MODE (operands[2])), SImode);
+  operands[2] = gen_lowpart (SImode, operands[2]);
+})
 
-;; SSE2 support
+(define_split
+  [(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
+       || (GET_MODE (operands[0]) == QImode 
+          && (TARGET_PROMOTE_QImode || optimize_size)))"
+  [(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]);")
 
-(define_insn "addv2df3"
-  [(set (match_operand:V2DF 0 "register_operand" "=x")
-        (plus:V2DF (match_operand:V2DF 1 "register_operand" "0")
-                  (match_operand:V2DF 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2"
-  "addpd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseadd")
-   (set_attr "mode" "V2DF")])
-
-(define_insn "vmaddv2df3"
-  [(set (match_operand:V2DF 0 "register_operand" "=x")
-       (vec_merge:V2DF (plus:V2DF (match_operand:V2DF 1 "register_operand" "0")
-                                  (match_operand:V2DF 2 "nonimmediate_operand" "xm"))
-                        (match_dup 1)
-                       (const_int 1)))]
-  "TARGET_SSE2"
-  "addsd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseadd")
-   (set_attr "mode" "DF")])
+(define_split
+  [(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 
+          && (TARGET_PROMOTE_QImode || optimize_size)))"
+  [(set (match_dup 0)
+       (not:SI (match_dup 1)))]
+  "operands[0] = gen_lowpart (SImode, operands[0]);
+   operands[1] = gen_lowpart (SImode, operands[1]);")
 
-(define_insn "subv2df3"
-  [(set (match_operand:V2DF 0 "register_operand" "=x")
-        (minus:V2DF (match_operand:V2DF 1 "register_operand" "0")
-                  (match_operand:V2DF 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2"
-  "subpd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseadd")
-   (set_attr "mode" "V2DF")])
-
-(define_insn "vmsubv2df3"
-  [(set (match_operand:V2DF 0 "register_operand" "=x")
-       (vec_merge:V2DF (minus:V2DF (match_operand:V2DF 1 "register_operand" "0")
-                                  (match_operand:V2DF 2 "nonimmediate_operand" "xm"))
-                        (match_dup 1)
-                       (const_int 1)))]
-  "TARGET_SSE2"
-  "subsd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseadd")
-   (set_attr "mode" "DF")])
+(define_split 
+  [(set (match_operand 0 "register_operand" "")
+       (if_then_else (match_operator 1 "comparison_operator" 
+                               [(reg FLAGS_REG) (const_int 0)])
+                     (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 
+          && (TARGET_PROMOTE_QImode || optimize_size)))"
+  [(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]);")
+                       
+\f
+;; RTL Peephole optimizations, run before sched2.  These primarily look to
+;; transform a complex memory operation into two memory to register operations.
 
-(define_insn "mulv2df3"
-  [(set (match_operand:V2DF 0 "register_operand" "=x")
-        (mult:V2DF (match_operand:V2DF 1 "register_operand" "0")
-                  (match_operand:V2DF 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2"
-  "mulpd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssemul")
-   (set_attr "mode" "V2DF")])
-
-(define_insn "vmmulv2df3"
-  [(set (match_operand:V2DF 0 "register_operand" "=x")
-       (vec_merge:V2DF (mult:V2DF (match_operand:V2DF 1 "register_operand" "0")
-                                  (match_operand:V2DF 2 "nonimmediate_operand" "xm"))
-                        (match_dup 1)
-                       (const_int 1)))]
-  "TARGET_SSE2"
-  "mulsd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssemul")
-   (set_attr "mode" "DF")])
+;; Don't push memory operands
+(define_peephole2
+  [(set (match_operand:SI 0 "push_operand" "")
+       (match_operand:SI 1 "memory_operand" ""))
+   (match_scratch:SI 2 "r")]
+  "! optimize_size && ! TARGET_PUSH_MEMORY"
+  [(set (match_dup 2) (match_dup 1))
+   (set (match_dup 0) (match_dup 2))]
+  "")
 
-(define_insn "divv2df3"
-  [(set (match_operand:V2DF 0 "register_operand" "=x")
-        (div:V2DF (match_operand:V2DF 1 "register_operand" "0")
-                 (match_operand:V2DF 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2"
-  "divpd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssediv")
-   (set_attr "mode" "V2DF")])
-
-(define_insn "vmdivv2df3"
-  [(set (match_operand:V2DF 0 "register_operand" "=x")
-       (vec_merge:V2DF (div:V2DF (match_operand:V2DF 1 "register_operand" "0")
-                                 (match_operand:V2DF 2 "nonimmediate_operand" "xm"))
-                        (match_dup 1)
-                       (const_int 1)))]
-  "TARGET_SSE2"
-  "divsd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssediv")
-   (set_attr "mode" "DF")])
+(define_peephole2
+  [(set (match_operand:DI 0 "push_operand" "")
+       (match_operand:DI 1 "memory_operand" ""))
+   (match_scratch:DI 2 "r")]
+  "! optimize_size && ! TARGET_PUSH_MEMORY"
+  [(set (match_dup 2) (match_dup 1))
+   (set (match_dup 0) (match_dup 2))]
+  "")
 
-;; SSE min/max
+;; We need to handle SFmode only, because DFmode and XFmode is split to
+;; SImode pushes.
+(define_peephole2
+  [(set (match_operand:SF 0 "push_operand" "")
+       (match_operand:SF 1 "memory_operand" ""))
+   (match_scratch:SF 2 "r")]
+  "! optimize_size && ! TARGET_PUSH_MEMORY"
+  [(set (match_dup 2) (match_dup 1))
+   (set (match_dup 0) (match_dup 2))]
+  "")
 
-(define_insn "smaxv2df3"
-  [(set (match_operand:V2DF 0 "register_operand" "=x")
-        (smax:V2DF (match_operand:V2DF 1 "register_operand" "0")
-                  (match_operand:V2DF 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2"
-  "maxpd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseadd")
-   (set_attr "mode" "V2DF")])
-
-(define_insn "vmsmaxv2df3"
-  [(set (match_operand:V2DF 0 "register_operand" "=x")
-       (vec_merge:V2DF (smax:V2DF (match_operand:V2DF 1 "register_operand" "0")
-                                  (match_operand:V2DF 2 "nonimmediate_operand" "xm"))
-                        (match_dup 1)
-                       (const_int 1)))]
-  "TARGET_SSE2"
-  "maxsd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseadd")
-   (set_attr "mode" "DF")])
+(define_peephole2
+  [(set (match_operand:HI 0 "push_operand" "")
+       (match_operand:HI 1 "memory_operand" ""))
+   (match_scratch:HI 2 "r")]
+  "! optimize_size && ! TARGET_PUSH_MEMORY"
+  [(set (match_dup 2) (match_dup 1))
+   (set (match_dup 0) (match_dup 2))]
+  "")
 
-(define_insn "sminv2df3"
-  [(set (match_operand:V2DF 0 "register_operand" "=x")
-        (smin:V2DF (match_operand:V2DF 1 "register_operand" "0")
-                  (match_operand:V2DF 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2"
-  "minpd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseadd")
-   (set_attr "mode" "V2DF")])
-
-(define_insn "vmsminv2df3"
-  [(set (match_operand:V2DF 0 "register_operand" "=x")
-       (vec_merge:V2DF (smin:V2DF (match_operand:V2DF 1 "register_operand" "0")
-                                  (match_operand:V2DF 2 "nonimmediate_operand" "xm"))
-                        (match_dup 1)
-                       (const_int 1)))]
-  "TARGET_SSE2"
-  "minsd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseadd")
-   (set_attr "mode" "DF")])
-;; SSE2 square root.  There doesn't appear to be an extension for the
-;; reciprocal/rsqrt instructions if the Intel manual is to be believed.
+(define_peephole2
+  [(set (match_operand:QI 0 "push_operand" "")
+       (match_operand:QI 1 "memory_operand" ""))
+   (match_scratch:QI 2 "q")]
+  "! optimize_size && ! TARGET_PUSH_MEMORY"
+  [(set (match_dup 2) (match_dup 1))
+   (set (match_dup 0) (match_dup 2))]
+  "")
 
-(define_insn "sqrtv2df2"
-  [(set (match_operand:V2DF 0 "register_operand" "=x")
-        (sqrt:V2DF (match_operand:V2DF 1 "register_operand" "xm")))]
-  "TARGET_SSE2"
-  "sqrtpd\t{%1, %0|%0, %1}"
-  [(set_attr "type" "sse")
-   (set_attr "mode" "V2DF")])
+;; Don't move an immediate directly to memory when the instruction
+;; gets too big.
+(define_peephole2
+  [(match_scratch:SI 1 "r")
+   (set (match_operand:SI 0 "memory_operand" "")
+        (const_int 0))]
+  "! optimize_size
+   && ! TARGET_USE_MOV0
+   && TARGET_SPLIT_LONG_MOVES
+   && get_attr_length (insn) >= ix86_cost->large_insn
+   && peep2_regno_dead_p (0, FLAGS_REG)"
+  [(parallel [(set (match_dup 1) (const_int 0))
+             (clobber (reg:CC FLAGS_REG))])
+   (set (match_dup 0) (match_dup 1))]
+  "")
 
-(define_insn "vmsqrtv2df2"
-  [(set (match_operand:V2DF 0 "register_operand" "=x")
-       (vec_merge:V2DF (sqrt:V2DF (match_operand:V2DF 1 "register_operand" "xm"))
-                        (match_operand:V2DF 2 "register_operand" "0")
-                       (const_int 1)))]
-  "TARGET_SSE2"
-  "sqrtsd\t{%1, %0|%0, %1}"
-  [(set_attr "type" "sse")
-   (set_attr "mode" "SF")])
+(define_peephole2
+  [(match_scratch:HI 1 "r")
+   (set (match_operand:HI 0 "memory_operand" "")
+        (const_int 0))]
+  "! optimize_size
+   && ! TARGET_USE_MOV0
+   && TARGET_SPLIT_LONG_MOVES
+   && get_attr_length (insn) >= ix86_cost->large_insn
+   && peep2_regno_dead_p (0, FLAGS_REG)"
+  [(parallel [(set (match_dup 2) (const_int 0))
+             (clobber (reg:CC FLAGS_REG))])
+   (set (match_dup 0) (match_dup 1))]
+  "operands[2] = gen_lowpart (SImode, operands[1]);")
 
-;; SSE mask-generating compares
+(define_peephole2
+  [(match_scratch:QI 1 "q")
+   (set (match_operand:QI 0 "memory_operand" "")
+        (const_int 0))]
+  "! optimize_size
+   && ! TARGET_USE_MOV0
+   && TARGET_SPLIT_LONG_MOVES
+   && get_attr_length (insn) >= ix86_cost->large_insn
+   && peep2_regno_dead_p (0, FLAGS_REG)"
+  [(parallel [(set (match_dup 2) (const_int 0))
+             (clobber (reg:CC FLAGS_REG))])
+   (set (match_dup 0) (match_dup 1))]
+  "operands[2] = gen_lowpart (SImode, operands[1]);")
 
-(define_insn "maskcmpv2df3"
-  [(set (match_operand:V2DI 0 "register_operand" "=x")
-        (match_operator:V2DI 3 "sse_comparison_operator"
-                            [(match_operand:V2DF 1 "register_operand" "0")
-                             (match_operand:V2DF 2 "nonimmediate_operand" "x")]))]
-  "TARGET_SSE2"
-  "cmp%D3pd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssecmp")
-   (set_attr "mode" "V2DF")])
-
-(define_insn "maskncmpv2df3"
-  [(set (match_operand:V2DI 0 "register_operand" "=x")
-        (not:V2DI
-        (match_operator:V2DI 3 "sse_comparison_operator"
-                             [(match_operand:V2DF 1 "register_operand" "0")
-                              (match_operand:V2DF 2 "nonimmediate_operand" "x")])))]
-  "TARGET_SSE2"
-{
-  if (GET_CODE (operands[3]) == UNORDERED)
-    return "cmpordps\t{%2, %0|%0, %2}";
-  else
-    return "cmpn%D3pd\t{%2, %0|%0, %2}";
-}
-  [(set_attr "type" "ssecmp")
-   (set_attr "mode" "V2DF")])
-
-(define_insn "vmmaskcmpv2df3"
-  [(set (match_operand:V2DI 0 "register_operand" "=x")
-       (vec_merge:V2DI
-        (match_operator:V2DI 3 "sse_comparison_operator"
-                             [(match_operand:V2DF 1 "register_operand" "0")
-                              (match_operand:V2DF 2 "nonimmediate_operand" "x")])
-        (subreg:V2DI (match_dup 1) 0)
-        (const_int 1)))]
-  "TARGET_SSE2"
-  "cmp%D3sd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssecmp")
-   (set_attr "mode" "DF")])
+(define_peephole2
+  [(match_scratch:SI 2 "r")
+   (set (match_operand:SI 0 "memory_operand" "")
+        (match_operand:SI 1 "immediate_operand" ""))]
+  "! optimize_size
+   && get_attr_length (insn) >= ix86_cost->large_insn
+   && TARGET_SPLIT_LONG_MOVES"
+  [(set (match_dup 2) (match_dup 1))
+   (set (match_dup 0) (match_dup 2))]
+  "")
 
-(define_insn "vmmaskncmpv2df3"
-  [(set (match_operand:V2DI 0 "register_operand" "=x")
-       (vec_merge:V2DI
-        (not:V2DI
-         (match_operator:V2DI 3 "sse_comparison_operator"
-                              [(match_operand:V2DF 1 "register_operand" "0")
-                               (match_operand:V2DF 2 "nonimmediate_operand" "x")]))
-        (subreg:V2DI (match_dup 1) 0)
-        (const_int 1)))]
-  "TARGET_SSE2"
-{
-  if (GET_CODE (operands[3]) == UNORDERED)
-    return "cmpordsd\t{%2, %0|%0, %2}";
-  else
-    return "cmpn%D3sd\t{%2, %0|%0, %2}";
-}
-  [(set_attr "type" "ssecmp")
-   (set_attr "mode" "DF")])
+(define_peephole2
+  [(match_scratch:HI 2 "r")
+   (set (match_operand:HI 0 "memory_operand" "")
+        (match_operand:HI 1 "immediate_operand" ""))]
+  "! optimize_size && get_attr_length (insn) >= ix86_cost->large_insn
+  && TARGET_SPLIT_LONG_MOVES"
+  [(set (match_dup 2) (match_dup 1))
+   (set (match_dup 0) (match_dup 2))]
+  "")
 
-(define_insn "sse2_comi"
-  [(set (reg:CCFP 17)
-        (compare:CCFP (vec_select:DF
-                      (match_operand:V2DF 0 "register_operand" "x")
-                      (parallel [(const_int 0)]))
-                     (vec_select:DF
-                      (match_operand:V2DF 1 "register_operand" "x")
-                      (parallel [(const_int 0)]))))]
-  "TARGET_SSE2"
-  "comisd\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssecomi")
-   (set_attr "mode" "DF")])
+(define_peephole2
+  [(match_scratch:QI 2 "q")
+   (set (match_operand:QI 0 "memory_operand" "")
+        (match_operand:QI 1 "immediate_operand" ""))]
+  "! optimize_size && get_attr_length (insn) >= ix86_cost->large_insn
+  && TARGET_SPLIT_LONG_MOVES"
+  [(set (match_dup 2) (match_dup 1))
+   (set (match_dup 0) (match_dup 2))]
+  "")
 
-(define_insn "sse2_ucomi"
-  [(set (reg:CCFPU 17)
-       (compare:CCFPU (vec_select:DF
-                        (match_operand:V2DF 0 "register_operand" "x")
-                        (parallel [(const_int 0)]))
-                       (vec_select:DF
-                        (match_operand:V2DF 1 "register_operand" "x")
-                        (parallel [(const_int 0)]))))]
-  "TARGET_SSE2"
-  "ucomisd\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssecomi")
-   (set_attr "mode" "DF")])
+;; Don't compare memory with zero, load and use a test instead.
+(define_peephole2
+  [(set (match_operand 0 "flags_reg_operand" "")
+       (match_operator 1 "compare_operator"
+         [(match_operand:SI 2 "memory_operand" "")
+          (const_int 0)]))
+   (match_scratch:SI 3 "r")]
+  "ix86_match_ccmode (insn, CCNOmode) && ! optimize_size"
+  [(set (match_dup 3) (match_dup 2))
+   (set (match_dup 0) (match_op_dup 1 [(match_dup 3) (const_int 0)]))]
+  "")
 
-;; SSE Strange Moves.
+;; NOT is not pairable on Pentium, while XOR is, but one byte longer. 
+;; Don't split NOTs with a displacement operand, because resulting XOR
+;; will not be pairable anyway.
+;;
+;; On AMD K6, NOT is vector decoded with memory operand that cannot be
+;; represented using a modRM byte.  The XOR replacement is long decoded,
+;; so this split helps here as well.
+;;
+;; Note: Can't do this as a regular split because we can't get proper
+;; lifetime information then.
 
-(define_insn "sse2_movmskpd"
-  [(set (match_operand:SI 0 "register_operand" "=r")
-       (unspec:SI [(match_operand:V2DF 1 "register_operand" "x")]
-                  UNSPEC_MOVMSK))]
-  "TARGET_SSE2"
-  "movmskpd\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "V2DF")])
+(define_peephole2
+  [(set (match_operand:SI 0 "nonimmediate_operand" "")
+       (not:SI (match_operand:SI 1 "nonimmediate_operand" "")))]
+  "!optimize_size
+   && peep2_regno_dead_p (0, FLAGS_REG)
+   && ((TARGET_PENTIUM 
+        && (GET_CODE (operands[0]) != MEM
+            || !memory_displacement_operand (operands[0], SImode)))
+       || (TARGET_K6 && long_memory_operand (operands[0], SImode)))"
+  [(parallel [(set (match_dup 0)
+                  (xor:SI (match_dup 1) (const_int -1)))
+             (clobber (reg:CC FLAGS_REG))])]
+  "")
 
-(define_insn "sse2_pmovmskb"
-  [(set (match_operand:SI 0 "register_operand" "=r")
-       (unspec:SI [(match_operand:V16QI 1 "register_operand" "x")]
-                  UNSPEC_MOVMSK))]
-  "TARGET_SSE2"
-  "pmovmskb\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "V2DF")])
+(define_peephole2
+  [(set (match_operand:HI 0 "nonimmediate_operand" "")
+       (not:HI (match_operand:HI 1 "nonimmediate_operand" "")))]
+  "!optimize_size
+   && peep2_regno_dead_p (0, FLAGS_REG)
+   && ((TARGET_PENTIUM 
+        && (GET_CODE (operands[0]) != MEM
+            || !memory_displacement_operand (operands[0], HImode)))
+       || (TARGET_K6 && long_memory_operand (operands[0], HImode)))"
+  [(parallel [(set (match_dup 0)
+                  (xor:HI (match_dup 1) (const_int -1)))
+             (clobber (reg:CC FLAGS_REG))])]
+  "")
 
-(define_insn "sse2_maskmovdqu"
-  [(set (mem:V16QI (match_operand:SI 0 "register_operand" "D"))
-       (unspec:V16QI [(match_operand:V16QI 1 "register_operand" "x")
-                      (match_operand:V16QI 2 "register_operand" "x")]
-                     UNSPEC_MASKMOV))]
-  "TARGET_SSE2"
-  ;; @@@ check ordering of operands in intel/nonintel syntax
-  "maskmovdqu\t{%2, %1|%1, %2}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "TI")])
+(define_peephole2
+  [(set (match_operand:QI 0 "nonimmediate_operand" "")
+       (not:QI (match_operand:QI 1 "nonimmediate_operand" "")))]
+  "!optimize_size
+   && peep2_regno_dead_p (0, FLAGS_REG)
+   && ((TARGET_PENTIUM 
+        && (GET_CODE (operands[0]) != MEM
+            || !memory_displacement_operand (operands[0], QImode)))
+       || (TARGET_K6 && long_memory_operand (operands[0], QImode)))"
+  [(parallel [(set (match_dup 0)
+                  (xor:QI (match_dup 1) (const_int -1)))
+             (clobber (reg:CC FLAGS_REG))])]
+  "")
 
-(define_insn "sse2_maskmovdqu_rex64"
-  [(set (mem:V16QI (match_operand:DI 0 "register_operand" "D"))
-       (unspec:V16QI [(match_operand:V16QI 1 "register_operand" "x")
-                      (match_operand:V16QI 2 "register_operand" "x")]
-                     UNSPEC_MASKMOV))]
-  "TARGET_SSE2"
-  ;; @@@ check ordering of operands in intel/nonintel syntax
-  "maskmovdqu\t{%2, %1|%1, %2}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "TI")])
+;; Non pairable "test imm, reg" instructions can be translated to
+;; "and imm, reg" if reg dies.  The "and" form is also shorter (one
+;; byte opcode instead of two, have a short form for byte operands),
+;; so do it for other CPUs as well.  Given that the value was dead,
+;; this should not create any new dependencies.  Pass on the sub-word
+;; versions if we're concerned about partial register stalls.
 
-(define_insn "sse2_movntv2df"
-  [(set (match_operand:V2DF 0 "memory_operand" "=m")
-       (unspec:V2DF [(match_operand:V2DF 1 "register_operand" "x")]
-                    UNSPEC_MOVNT))]
-  "TARGET_SSE2"
-  "movntpd\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "V2DF")])
+(define_peephole2
+  [(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" ""))
+          (const_int 0)]))]
+  "ix86_match_ccmode (insn, CCNOmode)
+   && (true_regnum (operands[2]) != 0
+       || (GET_CODE (operands[3]) == CONST_INT
+          && CONST_OK_FOR_LETTER_P (INTVAL (operands[3]), 'K')))
+   && peep2_reg_dead_p (1, operands[2])"
+  [(parallel
+     [(set (match_dup 0)
+          (match_op_dup 1 [(and:SI (match_dup 2) (match_dup 3))
+                           (const_int 0)]))
+      (set (match_dup 2)
+          (and:SI (match_dup 2) (match_dup 3)))])]
+  "")
 
-(define_insn "sse2_movntv2di"
-  [(set (match_operand:V2DI 0 "memory_operand" "=m")
-       (unspec:V2DI [(match_operand:V2DI 1 "register_operand" "x")]
-                    UNSPEC_MOVNT))]
-  "TARGET_SSE2"
-  "movntdq\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "TI")])
+;; We don't need to handle HImode case, because it will be promoted to SImode
+;; on ! TARGET_PARTIAL_REG_STALL
 
-(define_insn "sse2_movntsi"
-  [(set (match_operand:SI 0 "memory_operand" "=m")
-       (unspec:SI [(match_operand:SI 1 "register_operand" "r")]
-                  UNSPEC_MOVNT))]
-  "TARGET_SSE2"
-  "movnti\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "V2DF")])
+(define_peephole2
+  [(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" ""))
+          (const_int 0)]))]
+  "! TARGET_PARTIAL_REG_STALL
+   && ix86_match_ccmode (insn, CCNOmode)
+   && true_regnum (operands[2]) != 0
+   && peep2_reg_dead_p (1, operands[2])"
+  [(parallel
+     [(set (match_dup 0)
+          (match_op_dup 1 [(and:QI (match_dup 2) (match_dup 3))
+                           (const_int 0)]))
+      (set (match_dup 2)
+          (and:QI (match_dup 2) (match_dup 3)))])]
+  "")
 
-;; SSE <-> integer/MMX conversions
+(define_peephole2
+  [(set (match_operand 0 "flags_reg_operand" "")
+       (match_operator 1 "compare_operator"
+         [(and:SI
+            (zero_extract:SI
+              (match_operand 2 "ext_register_operand" "")
+              (const_int 8)
+              (const_int 8))
+            (match_operand 3 "const_int_operand" ""))
+          (const_int 0)]))]
+  "! TARGET_PARTIAL_REG_STALL
+   && ix86_match_ccmode (insn, CCNOmode)
+   && true_regnum (operands[2]) != 0
+   && peep2_reg_dead_p (1, operands[2])"
+  [(parallel [(set (match_dup 0)
+                  (match_op_dup 1
+                    [(and:SI
+                       (zero_extract:SI
+                         (match_dup 2)
+                         (const_int 8)
+                         (const_int 8))
+                       (match_dup 3))
+                     (const_int 0)]))
+             (set (zero_extract:SI (match_dup 2)
+                                   (const_int 8)
+                                   (const_int 8))
+                  (and:SI 
+                    (zero_extract:SI
+                      (match_dup 2)
+                      (const_int 8)
+                      (const_int 8))
+                    (match_dup 3)))])]
+  "")
 
-;; Conversions between SI and SF
+;; Don't do logical operations with memory inputs.
+(define_peephole2
+  [(match_scratch:SI 2 "r")
+   (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" "")]))
+              (clobber (reg:CC FLAGS_REG))])]
+  "! optimize_size && ! TARGET_READ_MODIFY"
+  [(set (match_dup 2) (match_dup 1))
+   (parallel [(set (match_dup 0)
+                   (match_op_dup 3 [(match_dup 0) (match_dup 2)]))
+              (clobber (reg:CC FLAGS_REG))])]
+  "")
 
-(define_insn "cvtdq2ps"
-  [(set (match_operand:V4SF 0 "register_operand" "=x")
-       (float:V4SF (match_operand:V4SI 1 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2"
-  "cvtdq2ps\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "V2DF")])
+(define_peephole2
+  [(match_scratch:SI 2 "r")
+   (parallel [(set (match_operand:SI 0 "register_operand" "")
+                   (match_operator:SI 3 "arith_or_logical_operator"
+                     [(match_operand:SI 1 "memory_operand" "")
+                      (match_dup 0)]))
+              (clobber (reg:CC FLAGS_REG))])]
+  "! optimize_size && ! TARGET_READ_MODIFY"
+  [(set (match_dup 2) (match_dup 1))
+   (parallel [(set (match_dup 0)
+                   (match_op_dup 3 [(match_dup 2) (match_dup 0)]))
+              (clobber (reg:CC FLAGS_REG))])]
+  "")
 
-(define_insn "cvtps2dq"
-  [(set (match_operand:V4SI 0 "register_operand" "=x")
-       (fix:V4SI (match_operand:V4SF 1 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2"
-  "cvtps2dq\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "TI")])
+; Don't do logical operations with memory outputs
+;
+; These two don't make sense for PPro/PII -- we're expanding a 4-uop
+; instruction into two 1-uop insns plus a 2-uop insn.  That last has
+; the same decoder scheduling characteristics as the original.
 
-(define_insn "cvttps2dq"
-  [(set (match_operand:V4SI 0 "register_operand" "=x")
-       (unspec:V4SI [(match_operand:V4SF 1 "nonimmediate_operand" "xm")]
-                    UNSPEC_FIX))]
-  "TARGET_SSE2"
-  "cvttps2dq\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "TI")])
+(define_peephole2
+  [(match_scratch:SI 2 "r")
+   (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" "")]))
+              (clobber (reg:CC FLAGS_REG))])]
+  "! optimize_size && ! TARGET_READ_MODIFY_WRITE"
+  [(set (match_dup 2) (match_dup 0))
+   (parallel [(set (match_dup 2)
+                   (match_op_dup 3 [(match_dup 2) (match_dup 1)]))
+              (clobber (reg:CC FLAGS_REG))])
+   (set (match_dup 0) (match_dup 2))]
+  "")
 
-;; Conversions between SI and DF
+(define_peephole2
+  [(match_scratch:SI 2 "r")
+   (parallel [(set (match_operand:SI 0 "memory_operand" "")
+                   (match_operator:SI 3 "arith_or_logical_operator"
+                     [(match_operand:SI 1 "nonmemory_operand" "")
+                      (match_dup 0)]))
+              (clobber (reg:CC FLAGS_REG))])]
+  "! optimize_size && ! TARGET_READ_MODIFY_WRITE"
+  [(set (match_dup 2) (match_dup 0))
+   (parallel [(set (match_dup 2)
+                   (match_op_dup 3 [(match_dup 1) (match_dup 2)]))
+              (clobber (reg:CC FLAGS_REG))])
+   (set (match_dup 0) (match_dup 2))]
+  "")
 
-(define_insn "cvtdq2pd"
-  [(set (match_operand:V2DF 0 "register_operand" "=x")
-       (float:V2DF (vec_select:V2SI
-                    (match_operand:V4SI 1 "nonimmediate_operand" "xm")
-                    (parallel
-                     [(const_int 0)
-                      (const_int 1)]))))]
-  "TARGET_SSE2"
-  "cvtdq2pd\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "V2DF")])
+;; Attempt to always use XOR for zeroing registers.
+(define_peephole2
+  [(set (match_operand 0 "register_operand" "")
+       (const_int 0))]
+  "(GET_MODE (operands[0]) == QImode
+    || GET_MODE (operands[0]) == HImode
+    || GET_MODE (operands[0]) == SImode
+    || (GET_MODE (operands[0]) == DImode && TARGET_64BIT))
+   && (! TARGET_USE_MOV0 || optimize_size)
+   && peep2_regno_dead_p (0, FLAGS_REG)"
+  [(parallel [(set (match_dup 0) (const_int 0))
+             (clobber (reg:CC FLAGS_REG))])]
+  "operands[0] = gen_lowpart (GET_MODE (operands[0]) == DImode ? DImode : SImode,
+                             operands[0]);")
 
-(define_insn "cvtpd2dq"
-  [(set (match_operand:V4SI 0 "register_operand" "=x")
-       (vec_concat:V4SI
-        (fix:V2SI (match_operand:V2DF 1 "nonimmediate_operand" "xm"))
-        (const_vector:V2SI [(const_int 0) (const_int 0)])))]
-  "TARGET_SSE2"
-  "cvtpd2dq\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "TI")])
-
-(define_insn "cvttpd2dq"
-  [(set (match_operand:V4SI 0 "register_operand" "=x")
-       (vec_concat:V4SI
-        (unspec:V2SI [(match_operand:V2DF 1 "nonimmediate_operand" "xm")]
-                     UNSPEC_FIX)
-        (const_vector:V2SI [(const_int 0) (const_int 0)])))]
-  "TARGET_SSE2"
-  "cvttpd2dq\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "TI")])
+(define_peephole2
+  [(set (strict_low_part (match_operand 0 "register_operand" ""))
+       (const_int 0))]
+  "(GET_MODE (operands[0]) == QImode
+    || GET_MODE (operands[0]) == HImode)
+   && (! TARGET_USE_MOV0 || optimize_size)
+   && peep2_regno_dead_p (0, FLAGS_REG)"
+  [(parallel [(set (strict_low_part (match_dup 0)) (const_int 0))
+             (clobber (reg:CC FLAGS_REG))])])
+
+;; For HI and SI modes, or $-1,reg is smaller than mov $-1,reg.
+(define_peephole2
+  [(set (match_operand 0 "register_operand" "")
+       (const_int -1))]
+  "(GET_MODE (operands[0]) == HImode
+    || GET_MODE (operands[0]) == SImode 
+    || (GET_MODE (operands[0]) == DImode && TARGET_64BIT))
+   && (optimize_size || TARGET_PENTIUM)
+   && peep2_regno_dead_p (0, FLAGS_REG)"
+  [(parallel [(set (match_dup 0) (const_int -1))
+             (clobber (reg:CC FLAGS_REG))])]
+  "operands[0] = gen_lowpart (GET_MODE (operands[0]) == DImode ? DImode : SImode,
+                             operands[0]);")
 
-(define_insn "cvtpd2pi"
-  [(set (match_operand:V2SI 0 "register_operand" "=y")
-       (fix:V2SI (match_operand:V2DF 1 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2"
-  "cvtpd2pi\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "TI")])
+;; Attempt to convert simple leas to adds. These can be created by
+;; move expanders.
+(define_peephole2
+  [(set (match_operand:SI 0 "register_operand" "")
+       (plus:SI (match_dup 0)
+                (match_operand:SI 1 "nonmemory_operand" "")))]
+  "peep2_regno_dead_p (0, FLAGS_REG)"
+  [(parallel [(set (match_dup 0) (plus:SI (match_dup 0) (match_dup 1)))
+             (clobber (reg:CC FLAGS_REG))])]
+  "")
 
-(define_insn "cvttpd2pi"
-  [(set (match_operand:V2SI 0 "register_operand" "=y")
-       (unspec:V2SI [(match_operand:V2DF 1 "nonimmediate_operand" "xm")]
-                    UNSPEC_FIX))]
-  "TARGET_SSE2"
-  "cvttpd2pi\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "TI")])
+(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))]
+  "peep2_regno_dead_p (0, FLAGS_REG) && REGNO (operands[0]) == REGNO (operands[1])"
+  [(parallel [(set (match_dup 0) (plus:SI (match_dup 0) (match_dup 2)))
+             (clobber (reg:CC FLAGS_REG))])]
+  "operands[2] = gen_lowpart (SImode, operands[2]);")
 
-(define_insn "cvtpi2pd"
-  [(set (match_operand:V2DF 0 "register_operand" "=x")
-       (float:V2DF (match_operand:V2SI 1 "nonimmediate_operand" "ym")))]
-  "TARGET_SSE2"
-  "cvtpi2pd\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "TI")])
+(define_peephole2
+  [(set (match_operand:DI 0 "register_operand" "")
+       (plus:DI (match_dup 0)
+                (match_operand:DI 1 "x86_64_general_operand" "")))]
+  "peep2_regno_dead_p (0, FLAGS_REG)"
+  [(parallel [(set (match_dup 0) (plus:DI (match_dup 0) (match_dup 1)))
+             (clobber (reg:CC FLAGS_REG))])]
+  "")
 
-;; Conversions between SI and DF
+(define_peephole2
+  [(set (match_operand:SI 0 "register_operand" "")
+       (mult:SI (match_dup 0)
+                (match_operand:SI 1 "const_int_operand" "")))]
+  "exact_log2 (INTVAL (operands[1])) >= 0
+   && peep2_regno_dead_p (0, FLAGS_REG)"
+  [(parallel [(set (match_dup 0) (ashift:SI (match_dup 0) (match_dup 2)))
+             (clobber (reg:CC FLAGS_REG))])]
+  "operands[2] = GEN_INT (exact_log2 (INTVAL (operands[1])));")
 
-(define_insn "cvtsd2si"
-  [(set (match_operand:SI 0 "register_operand" "=r,r")
-       (fix:SI (vec_select:DF (match_operand:V2DF 1 "register_operand" "x,m")
-                              (parallel [(const_int 0)]))))]
-  "TARGET_SSE2"
-  "cvtsd2si\t{%1, %0|%0, %1}"
-  [(set_attr "type" "sseicvt")
-   (set_attr "athlon_decode" "double,vector")
-   (set_attr "mode" "SI")])
+(define_peephole2
+  [(set (match_operand:DI 0 "register_operand" "")
+       (mult:DI (match_dup 0)
+                (match_operand:DI 1 "const_int_operand" "")))]
+  "exact_log2 (INTVAL (operands[1])) >= 0
+   && peep2_regno_dead_p (0, FLAGS_REG)"
+  [(parallel [(set (match_dup 0) (ashift:DI (match_dup 0) (match_dup 2)))
+             (clobber (reg:CC FLAGS_REG))])]
+  "operands[2] = GEN_INT (exact_log2 (INTVAL (operands[1])));")
 
-(define_insn "cvtsd2siq"
-  [(set (match_operand:DI 0 "register_operand" "=r,r")
-       (fix:DI (vec_select:DF (match_operand:V2DF 1 "register_operand" "x,m")
-                              (parallel [(const_int 0)]))))]
-  "TARGET_SSE2 && TARGET_64BIT"
-  "cvtsd2siq\t{%1, %0|%0, %1}"
-  [(set_attr "type" "sseicvt")
-   (set_attr "athlon_decode" "double,vector")
-   (set_attr "mode" "DI")])
+(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))]
+  "exact_log2 (INTVAL (operands[2])) >= 0
+   && REGNO (operands[0]) == REGNO (operands[1])
+   && peep2_regno_dead_p (0, FLAGS_REG)"
+  [(parallel [(set (match_dup 0) (ashift:SI (match_dup 0) (match_dup 2)))
+             (clobber (reg:CC FLAGS_REG))])]
+  "operands[2] = GEN_INT (exact_log2 (INTVAL (operands[2])));")
 
-(define_insn "cvttsd2si"
-  [(set (match_operand:SI 0 "register_operand" "=r,r")
-       (unspec:SI [(vec_select:DF (match_operand:V2DF 1 "register_operand" "x,xm")
-                                  (parallel [(const_int 0)]))] UNSPEC_FIX))]
-  "TARGET_SSE2"
-  "cvttsd2si\t{%1, %0|%0, %1}"
-  [(set_attr "type" "sseicvt")
-   (set_attr "mode" "SI")
-   (set_attr "athlon_decode" "double,vector")])
+;; The ESP adjustments can be done by the push and pop instructions.  Resulting
+;; code is shorter, since push is only 1 byte, while add imm, %esp 3 bytes.  On
+;; many CPUs it is also faster, since special hardware to avoid esp
+;; dependencies is present.
 
-(define_insn "cvttsd2siq"
-  [(set (match_operand:DI 0 "register_operand" "=r,r")
-       (unspec:DI [(vec_select:DF (match_operand:V2DF 1 "register_operand" "x,xm")
-                                  (parallel [(const_int 0)]))] UNSPEC_FIX))]
-  "TARGET_SSE2 && TARGET_64BIT"
-  "cvttsd2siq\t{%1, %0|%0, %1}"
-  [(set_attr "type" "sseicvt")
-   (set_attr "mode" "DI")
-   (set_attr "athlon_decode" "double,vector")])
+;; While some of these conversions may be done using splitters, we use peepholes
+;; in order to allow combine_stack_adjustments pass to see nonobfuscated RTL.
 
-(define_insn "cvtsi2sd"
-  [(set (match_operand:V2DF 0 "register_operand" "=x,x")
-       (vec_merge:V2DF (match_operand:V2DF 1 "register_operand" "0,0")
-                       (vec_duplicate:V2DF
-                         (float:DF
-                           (match_operand:SI 2 "nonimmediate_operand" "r,rm")))
-                       (const_int 2)))]
-  "TARGET_SSE2"
-  "cvtsi2sd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseicvt")
-   (set_attr "mode" "DF")
-   (set_attr "athlon_decode" "double,direct")])
-
-(define_insn "cvtsi2sdq"
-  [(set (match_operand:V2DF 0 "register_operand" "=x,x")
-       (vec_merge:V2DF (match_operand:V2DF 1 "register_operand" "0,0")
-                       (vec_duplicate:V2DF
-                         (float:DF
-                           (match_operand:DI 2 "nonimmediate_operand" "r,rm")))
-                       (const_int 2)))]
-  "TARGET_SSE2 && TARGET_64BIT"
-  "cvtsi2sdq\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseicvt")
-   (set_attr "mode" "DF")
-   (set_attr "athlon_decode" "double,direct")])
+;; Convert prologue esp subtractions to push.
+;; We need register to push.  In order to keep verify_flow_info happy we have
+;; two choices
+;; - use scratch and clobber it in order to avoid dependencies
+;; - use already live register
+;; We can't use the second way right now, since there is no reliable way how to
+;; verify that given register is live.  First choice will also most likely in
+;; fewer dependencies.  On the place of esp adjustments it is very likely that
+;; call clobbered registers are dead.  We may want to use base pointer as an
+;; alternative when no register is available later.
+
+(define_peephole2
+  [(match_scratch:SI 0 "r")
+   (parallel [(set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG) (const_int -4)))
+             (clobber (reg:CC FLAGS_REG))
+             (clobber (mem:BLK (scratch)))])]
+  "optimize_size || !TARGET_SUB_ESP_4"
+  [(clobber (match_dup 0))
+   (parallel [(set (mem:SI (pre_dec:SI (reg:SI SP_REG))) (match_dup 0))
+             (clobber (mem:BLK (scratch)))])])
 
-;; Conversions between SF and DF
+(define_peephole2
+  [(match_scratch:SI 0 "r")
+   (parallel [(set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG) (const_int -8)))
+             (clobber (reg:CC FLAGS_REG))
+             (clobber (mem:BLK (scratch)))])]
+  "optimize_size || !TARGET_SUB_ESP_8"
+  [(clobber (match_dup 0))
+   (set (mem:SI (pre_dec:SI (reg:SI SP_REG))) (match_dup 0))
+   (parallel [(set (mem:SI (pre_dec:SI (reg:SI SP_REG))) (match_dup 0))
+             (clobber (mem:BLK (scratch)))])])
 
-(define_insn "cvtsd2ss"
-  [(set (match_operand:V4SF 0 "register_operand" "=x,x")
-       (vec_merge:V4SF (match_operand:V4SF 1 "register_operand" "0,0")
-                       (vec_duplicate:V4SF
-                         (float_truncate:V2SF
-                           (match_operand:V2DF 2 "nonimmediate_operand" "x,xm")))
-                       (const_int 14)))]
-  "TARGET_SSE2"
-  "cvtsd2ss\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "athlon_decode" "vector,double")
-   (set_attr "mode" "SF")])
+;; Convert esp subtractions to push.
+(define_peephole2
+  [(match_scratch:SI 0 "r")
+   (parallel [(set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG) (const_int -4)))
+             (clobber (reg:CC FLAGS_REG))])]
+  "optimize_size || !TARGET_SUB_ESP_4"
+  [(clobber (match_dup 0))
+   (set (mem:SI (pre_dec:SI (reg:SI SP_REG))) (match_dup 0))])
 
-(define_insn "cvtss2sd"
-  [(set (match_operand:V2DF 0 "register_operand" "=x")
-       (vec_merge:V2DF (match_operand:V2DF 1 "register_operand" "0")
-                       (float_extend:V2DF
-                         (vec_select:V2SF
-                           (match_operand:V4SF 2 "nonimmediate_operand" "xm")
-                           (parallel [(const_int 0)
-                                      (const_int 1)])))
-                       (const_int 2)))]
-  "TARGET_SSE2"
-  "cvtss2sd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "DF")])
+(define_peephole2
+  [(match_scratch:SI 0 "r")
+   (parallel [(set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG) (const_int -8)))
+             (clobber (reg:CC FLAGS_REG))])]
+  "optimize_size || !TARGET_SUB_ESP_8"
+  [(clobber (match_dup 0))
+   (set (mem:SI (pre_dec:SI (reg:SI SP_REG))) (match_dup 0))
+   (set (mem:SI (pre_dec:SI (reg:SI SP_REG))) (match_dup 0))])
 
-(define_insn "cvtpd2ps"
-  [(set (match_operand:V4SF 0 "register_operand" "=x")
-       (subreg:V4SF
-         (vec_concat:V4SI
-           (subreg:V2SI (float_truncate:V2SF
-                          (match_operand:V2DF 1 "nonimmediate_operand" "xm")) 0)
-           (const_vector:V2SI [(const_int 0) (const_int 0)])) 0))]
-  "TARGET_SSE2"
-  "cvtpd2ps\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "V4SF")])
-
-(define_insn "cvtps2pd"
-  [(set (match_operand:V2DF 0 "register_operand" "=x")
-       (float_extend:V2DF
-         (vec_select:V2SF (match_operand:V4SF 1 "nonimmediate_operand" "xm")
-                          (parallel [(const_int 0)
-                                     (const_int 1)]))))]
-  "TARGET_SSE2"
-  "cvtps2pd\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "V2DF")])
+;; Convert epilogue deallocator to pop.
+(define_peephole2
+  [(match_scratch:SI 0 "r")
+   (parallel [(set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG) (const_int 4)))
+             (clobber (reg:CC FLAGS_REG))
+             (clobber (mem:BLK (scratch)))])]
+  "optimize_size || !TARGET_ADD_ESP_4"
+  [(parallel [(set (match_dup 0) (mem:SI (reg:SI SP_REG)))
+             (set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG) (const_int 4)))
+             (clobber (mem:BLK (scratch)))])]
+  "")
 
-;; SSE2 variants of MMX insns
+;; Two pops case is tricky, since pop causes dependency on destination register.
+;; We use two registers if available.
+(define_peephole2
+  [(match_scratch:SI 0 "r")
+   (match_scratch:SI 1 "r")
+   (parallel [(set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG) (const_int 8)))
+             (clobber (reg:CC FLAGS_REG))
+             (clobber (mem:BLK (scratch)))])]
+  "optimize_size || !TARGET_ADD_ESP_8"
+  [(parallel [(set (match_dup 0) (mem:SI (reg:SI SP_REG)))
+             (set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG) (const_int 4)))
+             (clobber (mem:BLK (scratch)))])
+   (parallel [(set (match_dup 1) (mem:SI (reg:SI SP_REG)))
+             (set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG) (const_int 4)))])]
+  "")
 
-;; MMX arithmetic
+(define_peephole2
+  [(match_scratch:SI 0 "r")
+   (parallel [(set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG) (const_int 8)))
+             (clobber (reg:CC FLAGS_REG))
+             (clobber (mem:BLK (scratch)))])]
+  "optimize_size"
+  [(parallel [(set (match_dup 0) (mem:SI (reg:SI SP_REG)))
+             (set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG) (const_int 4)))
+             (clobber (mem:BLK (scratch)))])
+   (parallel [(set (match_dup 0) (mem:SI (reg:SI SP_REG)))
+             (set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG) (const_int 4)))])]
+  "")
 
-(define_insn "addv16qi3"
-  [(set (match_operand:V16QI 0 "register_operand" "=x")
-        (plus:V16QI (match_operand:V16QI 1 "register_operand" "%0")
-                   (match_operand:V16QI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2"
-  "paddb\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseiadd")
-   (set_attr "mode" "TI")])
-
-(define_insn "addv8hi3"
-  [(set (match_operand:V8HI 0 "register_operand" "=x")
-        (plus:V8HI (match_operand:V8HI 1 "register_operand" "%0")
-                  (match_operand:V8HI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2"
-  "paddw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseiadd")
-   (set_attr "mode" "TI")])
-
-(define_insn "addv4si3"
-  [(set (match_operand:V4SI 0 "register_operand" "=x")
-        (plus:V4SI (match_operand:V4SI 1 "register_operand" "%0")
-                  (match_operand:V4SI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2"
-  "paddd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseiadd")
-   (set_attr "mode" "TI")])
-
-(define_insn "addv2di3"
-  [(set (match_operand:V2DI 0 "register_operand" "=x")
-        (plus:V2DI (match_operand:V2DI 1 "register_operand" "%0")
-                  (match_operand:V2DI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2"
-  "paddq\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseiadd")
-   (set_attr "mode" "TI")])
-
-(define_insn "ssaddv16qi3"
-  [(set (match_operand:V16QI 0 "register_operand" "=x")
-        (ss_plus:V16QI (match_operand:V16QI 1 "register_operand" "%0")
-                      (match_operand:V16QI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2"
-  "paddsb\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseiadd")
-   (set_attr "mode" "TI")])
-
-(define_insn "ssaddv8hi3"
-  [(set (match_operand:V8HI 0 "register_operand" "=x")
-        (ss_plus:V8HI (match_operand:V8HI 1 "register_operand" "%0")
-                     (match_operand:V8HI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2"
-  "paddsw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseiadd")
-   (set_attr "mode" "TI")])
-
-(define_insn "usaddv16qi3"
-  [(set (match_operand:V16QI 0 "register_operand" "=x")
-        (us_plus:V16QI (match_operand:V16QI 1 "register_operand" "%0")
-                      (match_operand:V16QI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2"
-  "paddusb\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseiadd")
-   (set_attr "mode" "TI")])
-
-(define_insn "usaddv8hi3"
-  [(set (match_operand:V8HI 0 "register_operand" "=x")
-        (us_plus:V8HI (match_operand:V8HI 1 "register_operand" "%0")
-                     (match_operand:V8HI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2"
-  "paddusw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseiadd")
-   (set_attr "mode" "TI")])
-
-(define_insn "subv16qi3"
-  [(set (match_operand:V16QI 0 "register_operand" "=x")
-        (minus:V16QI (match_operand:V16QI 1 "register_operand" "0")
-                    (match_operand:V16QI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2"
-  "psubb\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseiadd")
-   (set_attr "mode" "TI")])
-
-(define_insn "subv8hi3"
-  [(set (match_operand:V8HI 0 "register_operand" "=x")
-        (minus:V8HI (match_operand:V8HI 1 "register_operand" "0")
-                   (match_operand:V8HI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2"
-  "psubw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseiadd")
-   (set_attr "mode" "TI")])
-
-(define_insn "subv4si3"
-  [(set (match_operand:V4SI 0 "register_operand" "=x")
-        (minus:V4SI (match_operand:V4SI 1 "register_operand" "0")
-                   (match_operand:V4SI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2"
-  "psubd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseiadd")
-   (set_attr "mode" "TI")])
-
-(define_insn "subv2di3"
-  [(set (match_operand:V2DI 0 "register_operand" "=x")
-        (minus:V2DI (match_operand:V2DI 1 "register_operand" "0")
-                   (match_operand:V2DI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2"
-  "psubq\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseiadd")
-   (set_attr "mode" "TI")])
-
-(define_insn "sssubv16qi3"
-  [(set (match_operand:V16QI 0 "register_operand" "=x")
-        (ss_minus:V16QI (match_operand:V16QI 1 "register_operand" "0")
-                       (match_operand:V16QI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2"
-  "psubsb\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseiadd")
-   (set_attr "mode" "TI")])
-
-(define_insn "sssubv8hi3"
-  [(set (match_operand:V8HI 0 "register_operand" "=x")
-        (ss_minus:V8HI (match_operand:V8HI 1 "register_operand" "0")
-                      (match_operand:V8HI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2"
-  "psubsw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseiadd")
-   (set_attr "mode" "TI")])
-
-(define_insn "ussubv16qi3"
-  [(set (match_operand:V16QI 0 "register_operand" "=x")
-        (us_minus:V16QI (match_operand:V16QI 1 "register_operand" "0")
-                       (match_operand:V16QI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2"
-  "psubusb\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseiadd")
-   (set_attr "mode" "TI")])
-
-(define_insn "ussubv8hi3"
-  [(set (match_operand:V8HI 0 "register_operand" "=x")
-        (us_minus:V8HI (match_operand:V8HI 1 "register_operand" "0")
-                      (match_operand:V8HI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2"
-  "psubusw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseiadd")
-   (set_attr "mode" "TI")])
-
-(define_insn "mulv8hi3"
-  [(set (match_operand:V8HI 0 "register_operand" "=x")
-        (mult:V8HI (match_operand:V8HI 1 "register_operand" "0")
-                  (match_operand:V8HI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2"
-  "pmullw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseimul")
-   (set_attr "mode" "TI")])
-
-(define_insn "smulv8hi3_highpart"
-  [(set (match_operand:V8HI 0 "register_operand" "=x")
-       (truncate:V8HI
-        (lshiftrt:V8SI
-         (mult:V8SI (sign_extend:V8SI (match_operand:V8HI 1 "register_operand" "0"))
-                    (sign_extend:V8SI (match_operand:V8HI 2 "nonimmediate_operand" "xm")))
-         (const_int 16))))]
-  "TARGET_SSE2"
-  "pmulhw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseimul")
-   (set_attr "mode" "TI")])
-
-(define_insn "umulv8hi3_highpart"
-  [(set (match_operand:V8HI 0 "register_operand" "=x")
-       (truncate:V8HI
-        (lshiftrt:V8SI
-         (mult:V8SI (zero_extend:V8SI (match_operand:V8HI 1 "register_operand" "0"))
-                    (zero_extend:V8SI (match_operand:V8HI 2 "nonimmediate_operand" "xm")))
-         (const_int 16))))]
-  "TARGET_SSE2"
-  "pmulhuw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseimul")
-   (set_attr "mode" "TI")])
-
-(define_insn "sse2_umulsidi3"
-  [(set (match_operand:DI 0 "register_operand" "=y")
-        (mult:DI (zero_extend:DI (vec_select:SI
-                                 (match_operand:V2SI 1 "register_operand" "0")
-                                 (parallel [(const_int 0)])))
-                (zero_extend:DI (vec_select:SI
-                                 (match_operand:V2SI 2 "nonimmediate_operand" "ym")
-                                 (parallel [(const_int 0)])))))]
-  "TARGET_SSE2"
-  "pmuludq\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseimul")
-   (set_attr "mode" "TI")])
-
-(define_insn "sse2_umulv2siv2di3"
-  [(set (match_operand:V2DI 0 "register_operand" "=x")
-        (mult:V2DI (zero_extend:V2DI
-                    (vec_select:V2SI
-                      (match_operand:V4SI 1 "register_operand" "0")
-                      (parallel [(const_int 0) (const_int 2)])))
-                  (zero_extend:V2DI
-                    (vec_select:V2SI
-                      (match_operand:V4SI 2 "nonimmediate_operand" "xm")
-                      (parallel [(const_int 0) (const_int 2)])))))]
-  "TARGET_SSE2"
-  "pmuludq\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseimul")
-   (set_attr "mode" "TI")])
-
-(define_insn "sse2_pmaddwd"
-  [(set (match_operand:V4SI 0 "register_operand" "=x")
-        (plus:V4SI
-        (mult:V4SI
-         (sign_extend:V4SI (vec_select:V4HI (match_operand:V8HI 1 "register_operand" "0")
-                                            (parallel [(const_int 0)
-                                                       (const_int 2)
-                                                       (const_int 4)
-                                                       (const_int 6)])))
-         (sign_extend:V4SI (vec_select:V4HI (match_operand:V8HI 2 "nonimmediate_operand" "xm")
-                                            (parallel [(const_int 0)
-                                                       (const_int 2)
-                                                       (const_int 4)
-                                                       (const_int 6)]))))
-        (mult:V4SI
-         (sign_extend:V4SI (vec_select:V4HI (match_dup 1)
-                                            (parallel [(const_int 1)
-                                                       (const_int 3)
-                                                       (const_int 5)
-                                                       (const_int 7)])))
-         (sign_extend:V4SI (vec_select:V4HI (match_dup 2)
-                                            (parallel [(const_int 1)
-                                                       (const_int 3)
-                                                       (const_int 5)
-                                                       (const_int 7)]))))))]
-  "TARGET_SSE2"
-  "pmaddwd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseiadd")
-   (set_attr "mode" "TI")])
-
-;; Same as pxor, but don't show input operands so that we don't think
-;; they are live.
-(define_insn "sse2_clrti"
-  [(set (match_operand:TI 0 "register_operand" "=x") (const_int 0))]
-  "TARGET_SSE2"
-{
-  if (get_attr_mode (insn) == MODE_TI)
-    return "pxor\t%0, %0";
-  else
-    return "xorps\t%0, %0";
-}
-  [(set_attr "type" "ssemov")
-   (set_attr "memory" "none")
-   (set (attr "mode")
-             (if_then_else
-               (ne (symbol_ref "optimize_size")
-                   (const_int 0))
-               (const_string "V4SF")
-               (const_string "TI")))])
-
-;; MMX unsigned averages/sum of absolute differences
-
-(define_insn "sse2_uavgv16qi3"
-  [(set (match_operand:V16QI 0 "register_operand" "=x")
-        (ashiftrt:V16QI
-        (plus:V16QI (plus:V16QI
-                    (match_operand:V16QI 1 "register_operand" "0")
-                    (match_operand:V16QI 2 "nonimmediate_operand" "xm"))
-                    (const_vector:V16QI [(const_int 1) (const_int 1)
-                                         (const_int 1) (const_int 1)
-                                         (const_int 1) (const_int 1)
-                                         (const_int 1) (const_int 1)
-                                         (const_int 1) (const_int 1)
-                                         (const_int 1) (const_int 1)
-                                         (const_int 1) (const_int 1)
-                                         (const_int 1) (const_int 1)]))
-        (const_int 1)))]
-  "TARGET_SSE2"
-  "pavgb\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseiadd")
-   (set_attr "mode" "TI")])
-
-(define_insn "sse2_uavgv8hi3"
-  [(set (match_operand:V8HI 0 "register_operand" "=x")
-        (ashiftrt:V8HI
-        (plus:V8HI (plus:V8HI
-                    (match_operand:V8HI 1 "register_operand" "0")
-                    (match_operand:V8HI 2 "nonimmediate_operand" "xm"))
-                   (const_vector:V8HI [(const_int 1) (const_int 1)
-                                       (const_int 1) (const_int 1)
-                                       (const_int 1) (const_int 1)
-                                       (const_int 1) (const_int 1)]))
-        (const_int 1)))]
-  "TARGET_SSE2"
-  "pavgw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseiadd")
-   (set_attr "mode" "TI")])
-
-;; @@@ this isn't the right representation.
-(define_insn "sse2_psadbw"
-  [(set (match_operand:V2DI 0 "register_operand" "=x")
-        (unspec:V2DI [(match_operand:V16QI 1 "register_operand" "0")
-                     (match_operand:V16QI 2 "nonimmediate_operand" "xm")]
-                    UNSPEC_PSADBW))]
-  "TARGET_SSE2"
-  "psadbw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseiadd")
-   (set_attr "mode" "TI")])
+;; Convert esp additions to pop.
+(define_peephole2
+  [(match_scratch:SI 0 "r")
+   (parallel [(set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG) (const_int 4)))
+             (clobber (reg:CC FLAGS_REG))])]
+  ""
+  [(parallel [(set (match_dup 0) (mem:SI (reg:SI SP_REG)))
+             (set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG) (const_int 4)))])]
+  "")
 
+;; Two pops case is tricky, since pop causes dependency on destination register.
+;; We use two registers if available.
+(define_peephole2
+  [(match_scratch:SI 0 "r")
+   (match_scratch:SI 1 "r")
+   (parallel [(set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG) (const_int 8)))
+             (clobber (reg:CC FLAGS_REG))])]
+  ""
+  [(parallel [(set (match_dup 0) (mem:SI (reg:SI SP_REG)))
+             (set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG) (const_int 4)))])
+   (parallel [(set (match_dup 1) (mem:SI (reg:SI SP_REG)))
+             (set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG) (const_int 4)))])]
+  "")
 
-;; MMX insert/extract/shuffle
+(define_peephole2
+  [(match_scratch:SI 0 "r")
+   (parallel [(set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG) (const_int 8)))
+             (clobber (reg:CC FLAGS_REG))])]
+  "optimize_size"
+  [(parallel [(set (match_dup 0) (mem:SI (reg:SI SP_REG)))
+             (set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG) (const_int 4)))])
+   (parallel [(set (match_dup 0) (mem:SI (reg:SI SP_REG)))
+             (set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG) (const_int 4)))])]
+  "")
+\f
+;; Convert compares with 1 to shorter inc/dec operations when CF is not
+;; required and register dies.  Similarly for 128 to plus -128.
+(define_peephole2
+  [(set (match_operand 0 "flags_reg_operand" "")
+       (match_operator 1 "compare_operator"
+         [(match_operand 2 "register_operand" "")
+          (match_operand 3 "const_int_operand" "")]))]
+  "(INTVAL (operands[3]) == -1
+    || INTVAL (operands[3]) == 1
+    || INTVAL (operands[3]) == 128)
+   && ix86_match_ccmode (insn, CCGCmode)
+   && peep2_reg_dead_p (1, operands[2])"
+  [(parallel [(set (match_dup 0)
+                  (match_op_dup 1 [(match_dup 2) (match_dup 3)]))
+             (clobber (match_dup 2))])]
+  "")
+\f
+(define_peephole2
+  [(match_scratch:DI 0 "r")
+   (parallel [(set (reg:DI SP_REG) (plus:DI (reg:DI SP_REG) (const_int -8)))
+             (clobber (reg:CC FLAGS_REG))
+             (clobber (mem:BLK (scratch)))])]
+  "optimize_size || !TARGET_SUB_ESP_4"
+  [(clobber (match_dup 0))
+   (parallel [(set (mem:DI (pre_dec:DI (reg:DI SP_REG))) (match_dup 0))
+             (clobber (mem:BLK (scratch)))])])
 
-(define_insn "sse2_pinsrw"
-  [(set (match_operand:V8HI 0 "register_operand" "=x")
-        (vec_merge:V8HI (match_operand:V8HI 1 "register_operand" "0")
-                       (vec_duplicate:V8HI
-                        (truncate:HI
-                          (match_operand:SI 2 "nonimmediate_operand" "rm")))
-                       (match_operand:SI 3 "const_0_to_255_operand" "N")))]
-  "TARGET_SSE2"
-  "pinsrw\t{%3, %2, %0|%0, %2, %3}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "TI")])
+(define_peephole2
+  [(match_scratch:DI 0 "r")
+   (parallel [(set (reg:DI SP_REG) (plus:DI (reg:DI SP_REG) (const_int -16)))
+             (clobber (reg:CC FLAGS_REG))
+             (clobber (mem:BLK (scratch)))])]
+  "optimize_size || !TARGET_SUB_ESP_8"
+  [(clobber (match_dup 0))
+   (set (mem:DI (pre_dec:DI (reg:DI SP_REG))) (match_dup 0))
+   (parallel [(set (mem:DI (pre_dec:DI (reg:DI SP_REG))) (match_dup 0))
+             (clobber (mem:BLK (scratch)))])])
 
-(define_insn "sse2_pextrw"
-  [(set (match_operand:SI 0 "register_operand" "=r")
-        (zero_extend:SI
-         (vec_select:HI (match_operand:V8HI 1 "register_operand" "x")
-                        (parallel
-                         [(match_operand:SI 2 "const_0_to_7_operand" "N")]))))]
-  "TARGET_SSE2"
-  "pextrw\t{%2, %1, %0|%0, %1, %2}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "TI")])
+;; Convert esp subtractions to push.
+(define_peephole2
+  [(match_scratch:DI 0 "r")
+   (parallel [(set (reg:DI SP_REG) (plus:DI (reg:DI SP_REG) (const_int -8)))
+             (clobber (reg:CC FLAGS_REG))])]
+  "optimize_size || !TARGET_SUB_ESP_4"
+  [(clobber (match_dup 0))
+   (set (mem:DI (pre_dec:DI (reg:DI SP_REG))) (match_dup 0))])
 
-(define_insn "sse2_pshufd"
-  [(set (match_operand:V4SI 0 "register_operand" "=x")
-        (unspec:V4SI [(match_operand:V4SI 1 "register_operand" "0")
-                     (match_operand:SI 2 "immediate_operand" "i")]
-                    UNSPEC_SHUFFLE))]
-  "TARGET_SSE2"
-  "pshufd\t{%2, %1, %0|%0, %1, %2}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "TI")])
+(define_peephole2
+  [(match_scratch:DI 0 "r")
+   (parallel [(set (reg:DI SP_REG) (plus:DI (reg:DI SP_REG) (const_int -16)))
+             (clobber (reg:CC FLAGS_REG))])]
+  "optimize_size || !TARGET_SUB_ESP_8"
+  [(clobber (match_dup 0))
+   (set (mem:DI (pre_dec:DI (reg:DI SP_REG))) (match_dup 0))
+   (set (mem:DI (pre_dec:DI (reg:DI SP_REG))) (match_dup 0))])
 
-(define_insn "sse2_pshuflw"
-  [(set (match_operand:V8HI 0 "register_operand" "=x")
-        (unspec:V8HI [(match_operand:V8HI 1 "register_operand" "0")
-                     (match_operand:SI 2 "immediate_operand" "i")]
-                    UNSPEC_PSHUFLW))]
-  "TARGET_SSE2"
-  "pshuflw\t{%2, %1, %0|%0, %1, %2}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "TI")])
+;; Convert epilogue deallocator to pop.
+(define_peephole2
+  [(match_scratch:DI 0 "r")
+   (parallel [(set (reg:DI SP_REG) (plus:DI (reg:DI SP_REG) (const_int 8)))
+             (clobber (reg:CC FLAGS_REG))
+             (clobber (mem:BLK (scratch)))])]
+  "optimize_size || !TARGET_ADD_ESP_4"
+  [(parallel [(set (match_dup 0) (mem:DI (reg:DI SP_REG)))
+             (set (reg:DI SP_REG) (plus:DI (reg:DI SP_REG) (const_int 8)))
+             (clobber (mem:BLK (scratch)))])]
+  "")
 
-(define_insn "sse2_pshufhw"
-  [(set (match_operand:V8HI 0 "register_operand" "=x")
-        (unspec:V8HI [(match_operand:V8HI 1 "register_operand" "0")
-                     (match_operand:SI 2 "immediate_operand" "i")]
-                    UNSPEC_PSHUFHW))]
-  "TARGET_SSE2"
-  "pshufhw\t{%2, %1, %0|%0, %1, %2}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "TI")])
+;; Two pops case is tricky, since pop causes dependency on destination register.
+;; We use two registers if available.
+(define_peephole2
+  [(match_scratch:DI 0 "r")
+   (match_scratch:DI 1 "r")
+   (parallel [(set (reg:DI SP_REG) (plus:DI (reg:DI SP_REG) (const_int 16)))
+             (clobber (reg:CC FLAGS_REG))
+             (clobber (mem:BLK (scratch)))])]
+  "optimize_size || !TARGET_ADD_ESP_8"
+  [(parallel [(set (match_dup 0) (mem:DI (reg:DI SP_REG)))
+             (set (reg:DI SP_REG) (plus:DI (reg:DI SP_REG) (const_int 8)))
+             (clobber (mem:BLK (scratch)))])
+   (parallel [(set (match_dup 1) (mem:DI (reg:DI SP_REG)))
+             (set (reg:DI SP_REG) (plus:DI (reg:DI SP_REG) (const_int 8)))])]
+  "")
 
-;; MMX mask-generating comparisons
+(define_peephole2
+  [(match_scratch:DI 0 "r")
+   (parallel [(set (reg:DI SP_REG) (plus:DI (reg:DI SP_REG) (const_int 16)))
+             (clobber (reg:CC FLAGS_REG))
+             (clobber (mem:BLK (scratch)))])]
+  "optimize_size"
+  [(parallel [(set (match_dup 0) (mem:DI (reg:DI SP_REG)))
+             (set (reg:DI SP_REG) (plus:DI (reg:DI SP_REG) (const_int 8)))
+             (clobber (mem:BLK (scratch)))])
+   (parallel [(set (match_dup 0) (mem:DI (reg:DI SP_REG)))
+             (set (reg:DI SP_REG) (plus:DI (reg:DI SP_REG) (const_int 8)))])]
+  "")
 
-(define_insn "eqv16qi3"
-  [(set (match_operand:V16QI 0 "register_operand" "=x")
-        (eq:V16QI (match_operand:V16QI 1 "register_operand" "0")
-                (match_operand:V16QI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2"
-  "pcmpeqb\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssecmp")
-   (set_attr "mode" "TI")])
+;; Convert esp additions to pop.
+(define_peephole2
+  [(match_scratch:DI 0 "r")
+   (parallel [(set (reg:DI SP_REG) (plus:DI (reg:DI SP_REG) (const_int 8)))
+             (clobber (reg:CC FLAGS_REG))])]
+  ""
+  [(parallel [(set (match_dup 0) (mem:DI (reg:DI SP_REG)))
+             (set (reg:DI SP_REG) (plus:DI (reg:DI SP_REG) (const_int 8)))])]
+  "")
 
-(define_insn "eqv8hi3"
-  [(set (match_operand:V8HI 0 "register_operand" "=x")
-        (eq:V8HI (match_operand:V8HI 1 "register_operand" "0")
-                (match_operand:V8HI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2"
-  "pcmpeqw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssecmp")
-   (set_attr "mode" "TI")])
+;; Two pops case is tricky, since pop causes dependency on destination register.
+;; We use two registers if available.
+(define_peephole2
+  [(match_scratch:DI 0 "r")
+   (match_scratch:DI 1 "r")
+   (parallel [(set (reg:DI SP_REG) (plus:DI (reg:DI SP_REG) (const_int 16)))
+             (clobber (reg:CC FLAGS_REG))])]
+  ""
+  [(parallel [(set (match_dup 0) (mem:DI (reg:DI SP_REG)))
+             (set (reg:DI SP_REG) (plus:DI (reg:DI SP_REG) (const_int 8)))])
+   (parallel [(set (match_dup 1) (mem:DI (reg:DI SP_REG)))
+             (set (reg:DI SP_REG) (plus:DI (reg:DI SP_REG) (const_int 8)))])]
+  "")
 
-(define_insn "eqv4si3"
-  [(set (match_operand:V4SI 0 "register_operand" "=x")
-        (eq:V4SI (match_operand:V4SI 1 "register_operand" "0")
-                (match_operand:V4SI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2"
-  "pcmpeqd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssecmp")
-   (set_attr "mode" "TI")])
+(define_peephole2
+  [(match_scratch:DI 0 "r")
+   (parallel [(set (reg:DI SP_REG) (plus:DI (reg:DI SP_REG) (const_int 16)))
+             (clobber (reg:CC FLAGS_REG))])]
+  "optimize_size"
+  [(parallel [(set (match_dup 0) (mem:DI (reg:DI SP_REG)))
+             (set (reg:DI SP_REG) (plus:DI (reg:DI SP_REG) (const_int 8)))])
+   (parallel [(set (match_dup 0) (mem:DI (reg:DI SP_REG)))
+             (set (reg:DI SP_REG) (plus:DI (reg:DI SP_REG) (const_int 8)))])]
+  "")
+\f
+;; Convert imul by three, five and nine into lea
+(define_peephole2
+  [(parallel
+    [(set (match_operand:SI 0 "register_operand" "")
+         (mult:SI (match_operand:SI 1 "register_operand" "")
+                  (match_operand:SI 2 "const_int_operand" "")))
+     (clobber (reg:CC FLAGS_REG))])]
+  "INTVAL (operands[2]) == 3
+   || INTVAL (operands[2]) == 5
+   || INTVAL (operands[2]) == 9"
+  [(set (match_dup 0)
+        (plus:SI (mult:SI (match_dup 1) (match_dup 2))
+                 (match_dup 1)))]
+  { operands[2] = GEN_INT (INTVAL (operands[2]) - 1); })
 
-(define_insn "gtv16qi3"
-  [(set (match_operand:V16QI 0 "register_operand" "=x")
-        (gt:V16QI (match_operand:V16QI 1 "register_operand" "0")
-                (match_operand:V16QI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2"
-  "pcmpgtb\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssecmp")
-   (set_attr "mode" "TI")])
+(define_peephole2
+  [(parallel
+    [(set (match_operand:SI 0 "register_operand" "")
+          (mult:SI (match_operand:SI 1 "nonimmediate_operand" "")
+                   (match_operand:SI 2 "const_int_operand" "")))
+     (clobber (reg:CC FLAGS_REG))])]
+  "!optimize_size 
+   && (INTVAL (operands[2]) == 3
+       || INTVAL (operands[2]) == 5
+       || INTVAL (operands[2]) == 9)"
+  [(set (match_dup 0) (match_dup 1))
+   (set (match_dup 0)
+        (plus:SI (mult:SI (match_dup 0) (match_dup 2))
+                 (match_dup 0)))]
+  { operands[2] = GEN_INT (INTVAL (operands[2]) - 1); })
 
-(define_insn "gtv8hi3"
-  [(set (match_operand:V8HI 0 "register_operand" "=x")
-        (gt:V8HI (match_operand:V8HI 1 "register_operand" "0")
-                (match_operand:V8HI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2"
-  "pcmpgtw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssecmp")
-   (set_attr "mode" "TI")])
+(define_peephole2
+  [(parallel
+    [(set (match_operand:DI 0 "register_operand" "")
+         (mult:DI (match_operand:DI 1 "register_operand" "")
+                  (match_operand:DI 2 "const_int_operand" "")))
+     (clobber (reg:CC FLAGS_REG))])]
+  "TARGET_64BIT
+   && (INTVAL (operands[2]) == 3
+       || INTVAL (operands[2]) == 5
+       || INTVAL (operands[2]) == 9)"
+  [(set (match_dup 0)
+        (plus:DI (mult:DI (match_dup 1) (match_dup 2))
+                 (match_dup 1)))]
+  { operands[2] = GEN_INT (INTVAL (operands[2]) - 1); })
 
-(define_insn "gtv4si3"
-  [(set (match_operand:V4SI 0 "register_operand" "=x")
-        (gt:V4SI (match_operand:V4SI 1 "register_operand" "0")
-                (match_operand:V4SI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2"
-  "pcmpgtd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssecmp")
-   (set_attr "mode" "TI")])
+(define_peephole2
+  [(parallel
+    [(set (match_operand:DI 0 "register_operand" "")
+          (mult:DI (match_operand:DI 1 "nonimmediate_operand" "")
+                   (match_operand:DI 2 "const_int_operand" "")))
+     (clobber (reg:CC FLAGS_REG))])]
+  "TARGET_64BIT
+   && !optimize_size 
+   && (INTVAL (operands[2]) == 3
+       || INTVAL (operands[2]) == 5
+       || INTVAL (operands[2]) == 9)"
+  [(set (match_dup 0) (match_dup 1))
+   (set (match_dup 0)
+        (plus:DI (mult:DI (match_dup 0) (match_dup 2))
+                 (match_dup 0)))]
+  { operands[2] = GEN_INT (INTVAL (operands[2]) - 1); })
 
+;; Imul $32bit_imm, mem, reg is vector decoded, while
+;; imul $32bit_imm, reg, reg is direct decoded.
+(define_peephole2
+  [(match_scratch:DI 3 "r")
+   (parallel [(set (match_operand:DI 0 "register_operand" "")
+                  (mult:DI (match_operand:DI 1 "memory_operand" "")
+                           (match_operand:DI 2 "immediate_operand" "")))
+             (clobber (reg:CC FLAGS_REG))])]
+  "TARGET_K8 && !optimize_size
+   && (GET_CODE (operands[2]) != CONST_INT
+       || !CONST_OK_FOR_LETTER_P (INTVAL (operands[2]), 'K'))"
+  [(set (match_dup 3) (match_dup 1))
+   (parallel [(set (match_dup 0) (mult:DI (match_dup 3) (match_dup 2)))
+             (clobber (reg:CC FLAGS_REG))])]
+"")
 
-;; MMX max/min insns
+(define_peephole2
+  [(match_scratch:SI 3 "r")
+   (parallel [(set (match_operand:SI 0 "register_operand" "")
+                  (mult:SI (match_operand:SI 1 "memory_operand" "")
+                           (match_operand:SI 2 "immediate_operand" "")))
+             (clobber (reg:CC FLAGS_REG))])]
+  "TARGET_K8 && !optimize_size
+   && (GET_CODE (operands[2]) != CONST_INT
+       || !CONST_OK_FOR_LETTER_P (INTVAL (operands[2]), 'K'))"
+  [(set (match_dup 3) (match_dup 1))
+   (parallel [(set (match_dup 0) (mult:SI (match_dup 3) (match_dup 2)))
+             (clobber (reg:CC FLAGS_REG))])]
+"")
 
-(define_insn "umaxv16qi3"
-  [(set (match_operand:V16QI 0 "register_operand" "=x")
-        (umax:V16QI (match_operand:V16QI 1 "register_operand" "0")
-                  (match_operand:V16QI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2"
-  "pmaxub\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseiadd")
-   (set_attr "mode" "TI")])
-
-(define_insn "smaxv8hi3"
-  [(set (match_operand:V8HI 0 "register_operand" "=x")
-        (smax:V8HI (match_operand:V8HI 1 "register_operand" "0")
-                  (match_operand:V8HI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2"
-  "pmaxsw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseiadd")
-   (set_attr "mode" "TI")])
-
-(define_insn "uminv16qi3"
-  [(set (match_operand:V16QI 0 "register_operand" "=x")
-        (umin:V16QI (match_operand:V16QI 1 "register_operand" "0")
-                  (match_operand:V16QI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2"
-  "pminub\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseiadd")
-   (set_attr "mode" "TI")])
-
-(define_insn "sminv8hi3"
-  [(set (match_operand:V8HI 0 "register_operand" "=x")
-        (smin:V8HI (match_operand:V8HI 1 "register_operand" "0")
-                  (match_operand:V8HI 2 "nonimmediate_operand" "xm")))]
-  "TARGET_SSE2"
-  "pminsw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseiadd")
-   (set_attr "mode" "TI")])
+(define_peephole2
+  [(match_scratch:SI 3 "r")
+   (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" ""))))
+             (clobber (reg:CC FLAGS_REG))])]
+  "TARGET_K8 && !optimize_size
+   && (GET_CODE (operands[2]) != CONST_INT
+       || !CONST_OK_FOR_LETTER_P (INTVAL (operands[2]), 'K'))"
+  [(set (match_dup 3) (match_dup 1))
+   (parallel [(set (match_dup 0) (zero_extend:DI (mult:SI (match_dup 3) (match_dup 2))))
+             (clobber (reg:CC FLAGS_REG))])]
+"")
 
+;; imul $8/16bit_imm, regmem, reg is vector decoded.
+;; Convert it into imul reg, reg
+;; 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:DI 0 "register_operand" "")
+                  (mult:DI (match_operand:DI 1 "nonimmediate_operand" "")
+                           (match_operand:DI 2 "const_int_operand" "")))
+             (clobber (reg:CC FLAGS_REG))])
+   (match_scratch:DI 3 "r")]
+  "TARGET_K8 && !optimize_size
+   && CONST_OK_FOR_LETTER_P (INTVAL (operands[2]), 'K')"
+  [(set (match_dup 3) (match_dup 2))
+   (parallel [(set (match_dup 0) (mult:DI (match_dup 0) (match_dup 3)))
+             (clobber (reg:CC FLAGS_REG))])]
+{
+  if (!rtx_equal_p (operands[0], operands[1]))
+    emit_move_insn (operands[0], operands[1]);
+})
 
-;; MMX shifts
+(define_peephole2
+  [(parallel [(set (match_operand:SI 0 "register_operand" "")
+                  (mult:SI (match_operand:SI 1 "nonimmediate_operand" "")
+                           (match_operand:SI 2 "const_int_operand" "")))
+             (clobber (reg:CC FLAGS_REG))])
+   (match_scratch:SI 3 "r")]
+  "TARGET_K8 && !optimize_size
+   && CONST_OK_FOR_LETTER_P (INTVAL (operands[2]), 'K')"
+  [(set (match_dup 3) (match_dup 2))
+   (parallel [(set (match_dup 0) (mult:SI (match_dup 0) (match_dup 3)))
+             (clobber (reg:CC FLAGS_REG))])]
+{
+  if (!rtx_equal_p (operands[0], operands[1]))
+    emit_move_insn (operands[0], operands[1]);
+})
 
-(define_insn "ashrv8hi3"
-  [(set (match_operand:V8HI 0 "register_operand" "=x")
-        (ashiftrt:V8HI (match_operand:V8HI 1 "register_operand" "0")
-                      (match_operand:SI 2 "nonmemory_operand" "xi")))]
-  "TARGET_SSE2"
-  "psraw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseishft")
-   (set_attr "mode" "TI")])
-
-(define_insn "ashrv4si3"
-  [(set (match_operand:V4SI 0 "register_operand" "=x")
-        (ashiftrt:V4SI (match_operand:V4SI 1 "register_operand" "0")
-                      (match_operand:SI 2 "nonmemory_operand" "xi")))]
-  "TARGET_SSE2"
-  "psrad\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseishft")
-   (set_attr "mode" "TI")])
-
-(define_insn "lshrv8hi3"
-  [(set (match_operand:V8HI 0 "register_operand" "=x")
-        (lshiftrt:V8HI (match_operand:V8HI 1 "register_operand" "0")
-                      (match_operand:SI 2 "nonmemory_operand" "xi")))]
-  "TARGET_SSE2"
-  "psrlw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseishft")
-   (set_attr "mode" "TI")])
-
-(define_insn "lshrv4si3"
-  [(set (match_operand:V4SI 0 "register_operand" "=x")
-        (lshiftrt:V4SI (match_operand:V4SI 1 "register_operand" "0")
-                      (match_operand:SI 2 "nonmemory_operand" "xi")))]
-  "TARGET_SSE2"
-  "psrld\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseishft")
-   (set_attr "mode" "TI")])
-
-(define_insn "lshrv2di3"
-  [(set (match_operand:V2DI 0 "register_operand" "=x")
-        (lshiftrt:V2DI (match_operand:V2DI 1 "register_operand" "0")
-                      (match_operand:SI 2 "nonmemory_operand" "xi")))]
-  "TARGET_SSE2"
-  "psrlq\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseishft")
-   (set_attr "mode" "TI")])
-
-(define_insn "ashlv8hi3"
-  [(set (match_operand:V8HI 0 "register_operand" "=x")
-        (ashift:V8HI (match_operand:V8HI 1 "register_operand" "0")
-                    (match_operand:SI 2 "nonmemory_operand" "xi")))]
-  "TARGET_SSE2"
-  "psllw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseishft")
-   (set_attr "mode" "TI")])
-
-(define_insn "ashlv4si3"
-  [(set (match_operand:V4SI 0 "register_operand" "=x")
-        (ashift:V4SI (match_operand:V4SI 1 "register_operand" "0")
-                    (match_operand:SI 2 "nonmemory_operand" "xi")))]
-  "TARGET_SSE2"
-  "pslld\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseishft")
-   (set_attr "mode" "TI")])
-
-(define_insn "ashlv2di3"
-  [(set (match_operand:V2DI 0 "register_operand" "=x")
-        (ashift:V2DI (match_operand:V2DI 1 "register_operand" "0")
-                    (match_operand:SI 2 "nonmemory_operand" "xi")))]
-  "TARGET_SSE2"
-  "psllq\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseishft")
-   (set_attr "mode" "TI")])
-
-(define_insn "ashrv8hi3_ti"
-  [(set (match_operand:V8HI 0 "register_operand" "=x")
-        (ashiftrt:V8HI (match_operand:V8HI 1 "register_operand" "0")
-                      (subreg:SI (match_operand:V2DI 2 "nonmemory_operand" "xi") 0)))]
-  "TARGET_SSE2"
-  "psraw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseishft")
-   (set_attr "mode" "TI")])
-
-(define_insn "ashrv4si3_ti"
-  [(set (match_operand:V4SI 0 "register_operand" "=x")
-        (ashiftrt:V4SI (match_operand:V4SI 1 "register_operand" "0")
-                      (subreg:SI (match_operand:V2DI 2 "nonmemory_operand" "xi") 0)))]
-  "TARGET_SSE2"
-  "psrad\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseishft")
-   (set_attr "mode" "TI")])
-
-(define_insn "lshrv8hi3_ti"
-  [(set (match_operand:V8HI 0 "register_operand" "=x")
-        (lshiftrt:V8HI (match_operand:V8HI 1 "register_operand" "0")
-                      (subreg:SI (match_operand:V2DI 2 "nonmemory_operand" "xi") 0)))]
-  "TARGET_SSE2"
-  "psrlw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseishft")
-   (set_attr "mode" "TI")])
-
-(define_insn "lshrv4si3_ti"
-  [(set (match_operand:V4SI 0 "register_operand" "=x")
-        (lshiftrt:V4SI (match_operand:V4SI 1 "register_operand" "0")
-                      (subreg:SI (match_operand:V2DI 2 "nonmemory_operand" "xi") 0)))]
-  "TARGET_SSE2"
-  "psrld\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseishft")
-   (set_attr "mode" "TI")])
-
-(define_insn "lshrv2di3_ti"
-  [(set (match_operand:V2DI 0 "register_operand" "=x")
-        (lshiftrt:V2DI (match_operand:V2DI 1 "register_operand" "0")
-                      (subreg:SI (match_operand:V2DI 2 "nonmemory_operand" "xi") 0)))]
-  "TARGET_SSE2"
-  "psrlq\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseishft")
-   (set_attr "mode" "TI")])
-
-(define_insn "ashlv8hi3_ti"
-  [(set (match_operand:V8HI 0 "register_operand" "=x")
-        (ashift:V8HI (match_operand:V8HI 1 "register_operand" "0")
-                    (subreg:SI (match_operand:V2DI 2 "nonmemory_operand" "xi") 0)))]
-  "TARGET_SSE2"
-  "psllw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseishft")
-   (set_attr "mode" "TI")])
-
-(define_insn "ashlv4si3_ti"
-  [(set (match_operand:V4SI 0 "register_operand" "=x")
-        (ashift:V4SI (match_operand:V4SI 1 "register_operand" "0")
-                    (subreg:SI (match_operand:V2DI 2 "nonmemory_operand" "xi") 0)))]
-  "TARGET_SSE2"
-  "pslld\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseishft")
-   (set_attr "mode" "TI")])
-
-(define_insn "ashlv2di3_ti"
-  [(set (match_operand:V2DI 0 "register_operand" "=x")
-        (ashift:V2DI (match_operand:V2DI 1 "register_operand" "0")
-                    (subreg:SI (match_operand:V2DI 2 "nonmemory_operand" "xi") 0)))]
-  "TARGET_SSE2"
-  "psllq\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseishft")
-   (set_attr "mode" "TI")])
-
-;; See logical MMX insns for the reason for the unspec.  Strictly speaking
-;; we wouldn't need here it since we never generate TImode arithmetic.
-
-;; There has to be some kind of prize for the weirdest new instruction...
-(define_insn "sse2_ashlti3"
-  [(set (match_operand:TI 0 "register_operand" "=x")
-        (unspec:TI
-        [(ashift:TI (match_operand:TI 1 "register_operand" "0")
-                    (mult:SI (match_operand:SI 2 "immediate_operand" "i")
-                              (const_int 8)))] UNSPEC_NOP))]
-  "TARGET_SSE2"
-  "pslldq\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseishft")
-   (set_attr "mode" "TI")])
-
-(define_insn "sse2_lshrti3"
-  [(set (match_operand:TI 0 "register_operand" "=x")
-        (unspec:TI
-        [(lshiftrt:TI (match_operand:TI 1 "register_operand" "0")
-                      (mult:SI (match_operand:SI 2 "immediate_operand" "i")
-                               (const_int 8)))] UNSPEC_NOP))]
-  "TARGET_SSE2"
-  "psrldq\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseishft")
-   (set_attr "mode" "TI")])
-
-;; SSE unpack
-
-(define_insn "sse2_unpckhpd"
-  [(set (match_operand:V2DF 0 "register_operand" "=x")
-       (vec_concat:V2DF
-        (vec_select:DF (match_operand:V2DF 1 "register_operand" "0")
-                       (parallel [(const_int 1)]))
-        (vec_select:DF (match_operand:V2DF 2 "register_operand" "x")
-                       (parallel [(const_int 1)]))))]
-  "TARGET_SSE2"
-  "unpckhpd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "V2DF")])
-
-(define_insn "sse2_unpcklpd"
-  [(set (match_operand:V2DF 0 "register_operand" "=x")
-       (vec_concat:V2DF
-        (vec_select:DF (match_operand:V2DF 1 "register_operand" "0")
-                       (parallel [(const_int 0)]))
-        (vec_select:DF (match_operand:V2DF 2 "register_operand" "x")
-                       (parallel [(const_int 0)]))))]
-  "TARGET_SSE2"
-  "unpcklpd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "V2DF")])
+(define_peephole2
+  [(parallel [(set (match_operand:HI 0 "register_operand" "")
+                  (mult:HI (match_operand:HI 1 "nonimmediate_operand" "")
+                           (match_operand:HI 2 "immediate_operand" "")))
+             (clobber (reg:CC FLAGS_REG))])
+   (match_scratch:HI 3 "r")]
+  "TARGET_K8 && !optimize_size"
+  [(set (match_dup 3) (match_dup 2))
+   (parallel [(set (match_dup 0) (mult:HI (match_dup 0) (match_dup 3)))
+             (clobber (reg:CC FLAGS_REG))])]
+{
+  if (!rtx_equal_p (operands[0], operands[1]))
+    emit_move_insn (operands[0], operands[1]);
+})
+\f
+;; Call-value patterns last so that the wildcard operand does not
+;; disrupt insn-recog's switch tables.
 
-;; MMX pack/unpack insns.
+(define_insn "*call_value_pop_0"
+  [(set (match_operand 0 "" "")
+       (call (mem:QI (match_operand:SI 1 "constant_call_address_operand" ""))
+             (match_operand:SI 2 "" "")))
+   (set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG)
+                           (match_operand:SI 3 "immediate_operand" "")))]
+  "!TARGET_64BIT"
+{
+  if (SIBLING_CALL_P (insn))
+    return "jmp\t%P1";
+  else
+    return "call\t%P1";
+}
+  [(set_attr "type" "callv")])
 
-(define_insn "sse2_packsswb"
-  [(set (match_operand:V16QI 0 "register_operand" "=x")
-       (vec_concat:V16QI
-        (ss_truncate:V8QI (match_operand:V8HI 1 "register_operand" "0"))
-        (ss_truncate:V8QI (match_operand:V8HI 2 "register_operand" "x"))))]
-  "TARGET_SSE2"
-  "packsswb\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "TI")])
+(define_insn "*call_value_pop_1"
+  [(set (match_operand 0 "" "")
+       (call (mem:QI (match_operand:SI 1 "call_insn_operand" "rsm"))
+             (match_operand:SI 2 "" "")))
+   (set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG)
+                           (match_operand:SI 3 "immediate_operand" "i")))]
+  "!TARGET_64BIT"
+{
+  if (constant_call_address_operand (operands[1], Pmode))
+    {
+      if (SIBLING_CALL_P (insn))
+       return "jmp\t%P1";
+      else
+       return "call\t%P1";
+    }
+  if (SIBLING_CALL_P (insn))
+    return "jmp\t%A1";
+  else
+    return "call\t%A1";
+}
+  [(set_attr "type" "callv")])
 
-(define_insn "sse2_packssdw"
-  [(set (match_operand:V8HI 0 "register_operand" "=x")
-       (vec_concat:V8HI
-        (ss_truncate:V4HI (match_operand:V4SI 1 "register_operand" "0"))
-        (ss_truncate:V4HI (match_operand:V4SI 2 "register_operand" "x"))))]
-  "TARGET_SSE2"
-  "packssdw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "TI")])
+(define_insn "*call_value_0"
+  [(set (match_operand 0 "" "")
+       (call (mem:QI (match_operand:SI 1 "constant_call_address_operand" ""))
+             (match_operand:SI 2 "" "")))]
+  "!TARGET_64BIT"
+{
+  if (SIBLING_CALL_P (insn))
+    return "jmp\t%P1";
+  else
+    return "call\t%P1";
+}
+  [(set_attr "type" "callv")])
 
-(define_insn "sse2_packuswb"
-  [(set (match_operand:V16QI 0 "register_operand" "=x")
-       (vec_concat:V16QI
-        (us_truncate:V8QI (match_operand:V8HI 1 "register_operand" "0"))
-        (us_truncate:V8QI (match_operand:V8HI 2 "register_operand" "x"))))]
-  "TARGET_SSE2"
-  "packuswb\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "TI")])
-
-(define_insn "sse2_punpckhbw"
-  [(set (match_operand:V16QI 0 "register_operand" "=x")
-       (vec_merge:V16QI
-        (vec_select:V16QI (match_operand:V16QI 1 "register_operand" "0")
-                          (parallel [(const_int 8) (const_int 0)
-                                     (const_int 9) (const_int 1)
-                                     (const_int 10) (const_int 2)
-                                     (const_int 11) (const_int 3)
-                                     (const_int 12) (const_int 4)
-                                     (const_int 13) (const_int 5)
-                                     (const_int 14) (const_int 6)
-                                     (const_int 15) (const_int 7)]))
-        (vec_select:V16QI (match_operand:V16QI 2 "register_operand" "x")
-                          (parallel [(const_int 0) (const_int 8)
-                                     (const_int 1) (const_int 9)
-                                     (const_int 2) (const_int 10)
-                                     (const_int 3) (const_int 11)
-                                     (const_int 4) (const_int 12)
-                                     (const_int 5) (const_int 13)
-                                     (const_int 6) (const_int 14)
-                                     (const_int 7) (const_int 15)]))
-        (const_int 21845)))]
-  "TARGET_SSE2"
-  "punpckhbw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "TI")])
-
-(define_insn "sse2_punpckhwd"
-  [(set (match_operand:V8HI 0 "register_operand" "=x")
-       (vec_merge:V8HI
-        (vec_select:V8HI (match_operand:V8HI 1 "register_operand" "0")
-                         (parallel [(const_int 4) (const_int 0)
-                                    (const_int 5) (const_int 1)
-                                    (const_int 6) (const_int 2)
-                                    (const_int 7) (const_int 3)]))
-        (vec_select:V8HI (match_operand:V8HI 2 "register_operand" "x")
-                         (parallel [(const_int 0) (const_int 4)
-                                    (const_int 1) (const_int 5)
-                                    (const_int 2) (const_int 6)
-                                    (const_int 3) (const_int 7)]))
-        (const_int 85)))]
-  "TARGET_SSE2"
-  "punpckhwd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "TI")])
-
-(define_insn "sse2_punpckhdq"
-  [(set (match_operand:V4SI 0 "register_operand" "=x")
-       (vec_merge:V4SI
-        (vec_select:V4SI (match_operand:V4SI 1 "register_operand" "0")
-                         (parallel [(const_int 2) (const_int 0)
-                                    (const_int 3) (const_int 1)]))
-        (vec_select:V4SI (match_operand:V4SI 2 "register_operand" "x")
-                         (parallel [(const_int 0) (const_int 2)
-                                    (const_int 1) (const_int 3)]))
-        (const_int 5)))]
-  "TARGET_SSE2"
-  "punpckhdq\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "TI")])
-
-(define_insn "sse2_punpcklbw"
-  [(set (match_operand:V16QI 0 "register_operand" "=x")
-       (vec_merge:V16QI
-        (vec_select:V16QI (match_operand:V16QI 1 "register_operand" "0")
-                          (parallel [(const_int 0) (const_int 8)
-                                     (const_int 1) (const_int 9)
-                                     (const_int 2) (const_int 10)
-                                     (const_int 3) (const_int 11)
-                                     (const_int 4) (const_int 12)
-                                     (const_int 5) (const_int 13)
-                                     (const_int 6) (const_int 14)
-                                     (const_int 7) (const_int 15)]))
-        (vec_select:V16QI (match_operand:V16QI 2 "register_operand" "x")
-                          (parallel [(const_int 8) (const_int 0)
-                                     (const_int 9) (const_int 1)
-                                     (const_int 10) (const_int 2)
-                                     (const_int 11) (const_int 3)
-                                     (const_int 12) (const_int 4)
-                                     (const_int 13) (const_int 5)
-                                     (const_int 14) (const_int 6)
-                                     (const_int 15) (const_int 7)]))
-        (const_int 21845)))]
-  "TARGET_SSE2"
-  "punpcklbw\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "TI")])
-
-(define_insn "sse2_punpcklwd"
-  [(set (match_operand:V8HI 0 "register_operand" "=x")
-       (vec_merge:V8HI
-        (vec_select:V8HI (match_operand:V8HI 1 "register_operand" "0")
-                         (parallel [(const_int 0) (const_int 4)
-                                    (const_int 1) (const_int 5)
-                                    (const_int 2) (const_int 6)
-                                    (const_int 3) (const_int 7)]))
-        (vec_select:V8HI (match_operand:V8HI 2 "register_operand" "x")
-                         (parallel [(const_int 4) (const_int 0)
-                                    (const_int 5) (const_int 1)
-                                    (const_int 6) (const_int 2)
-                                    (const_int 7) (const_int 3)]))
-        (const_int 85)))]
-  "TARGET_SSE2"
-  "punpcklwd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "TI")])
-
-(define_insn "sse2_punpckldq"
-  [(set (match_operand:V4SI 0 "register_operand" "=x")
-       (vec_merge:V4SI
-        (vec_select:V4SI (match_operand:V4SI 1 "register_operand" "0")
-                         (parallel [(const_int 0) (const_int 2)
-                                    (const_int 1) (const_int 3)]))
-        (vec_select:V4SI (match_operand:V4SI 2 "register_operand" "x")
-                         (parallel [(const_int 2) (const_int 0)
-                                    (const_int 3) (const_int 1)]))
-        (const_int 5)))]
-  "TARGET_SSE2"
-  "punpckldq\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "TI")])
-
-(define_insn "sse2_punpcklqdq"
-  [(set (match_operand:V2DI 0 "register_operand" "=x")
-       (vec_merge:V2DI
-        (vec_select:V2DI (match_operand:V2DI 2 "register_operand" "x")
-                         (parallel [(const_int 1)
-                                    (const_int 0)]))
-        (match_operand:V2DI 1 "register_operand" "0")
-        (const_int 1)))]
-  "TARGET_SSE2"
-  "punpcklqdq\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "TI")])
-
-(define_insn "sse2_punpckhqdq"
-  [(set (match_operand:V2DI 0 "register_operand" "=x")
-       (vec_merge:V2DI
-        (match_operand:V2DI 1 "register_operand" "0")
-        (vec_select:V2DI (match_operand:V2DI 2 "register_operand" "x")
-                         (parallel [(const_int 1)
-                                    (const_int 0)]))
-        (const_int 1)))]
-  "TARGET_SSE2"
-  "punpckhqdq\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "TI")])
+(define_insn "*call_value_0_rex64"
+  [(set (match_operand 0 "" "")
+       (call (mem:QI (match_operand:DI 1 "constant_call_address_operand" ""))
+             (match_operand:DI 2 "const_int_operand" "")))]
+  "TARGET_64BIT"
+{
+  if (SIBLING_CALL_P (insn))
+    return "jmp\t%P1";
+  else
+    return "call\t%P1";
+}
+  [(set_attr "type" "callv")])
 
-;; SSE2 moves
+(define_insn "*call_value_1"
+  [(set (match_operand 0 "" "")
+       (call (mem:QI (match_operand:SI 1 "call_insn_operand" "rsm"))
+             (match_operand:SI 2 "" "")))]
+  "!SIBLING_CALL_P (insn) && !TARGET_64BIT"
+{
+  if (constant_call_address_operand (operands[1], Pmode))
+    return "call\t%P1";
+  return "call\t%A1";
+}
+  [(set_attr "type" "callv")])
 
-(define_insn "sse2_movapd"
-  [(set (match_operand:V2DF 0 "nonimmediate_operand" "=x,m")
-       (unspec:V2DF [(match_operand:V2DF 1 "nonimmediate_operand" "xm,x")]
-                    UNSPEC_MOVA))]
-  "TARGET_SSE2
-   && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)"
-  "movapd\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssemov")
-   (set_attr "mode" "V2DF")])
-
-(define_insn "sse2_movupd"
-  [(set (match_operand:V2DF 0 "nonimmediate_operand" "=x,m")
-       (unspec:V2DF [(match_operand:V2DF 1 "nonimmediate_operand" "xm,x")]
-                    UNSPEC_MOVU))]
-  "TARGET_SSE2
-   && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)"
-  "movupd\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "V2DF")])
+(define_insn "*sibcall_value_1"
+  [(set (match_operand 0 "" "")
+       (call (mem:QI (match_operand:SI 1 "sibcall_insn_operand" "s,c,d,a"))
+             (match_operand:SI 2 "" "")))]
+  "SIBLING_CALL_P (insn) && !TARGET_64BIT"
+{
+  if (constant_call_address_operand (operands[1], Pmode))
+    return "jmp\t%P1";
+  return "jmp\t%A1";
+}
+  [(set_attr "type" "callv")])
 
-(define_insn "sse2_movdqa"
-  [(set (match_operand:V16QI 0 "nonimmediate_operand" "=x,m")
-       (unspec:V16QI [(match_operand:V16QI 1 "nonimmediate_operand" "xm,x")]
-                      UNSPEC_MOVA))]
-  "TARGET_SSE2
-   && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)"
-  "movdqa\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssemov")
-   (set_attr "mode" "TI")])
-
-(define_insn "sse2_movdqu"
-  [(set (match_operand:V16QI 0 "nonimmediate_operand" "=x,m")
-       (unspec:V16QI [(match_operand:V16QI 1 "nonimmediate_operand" "xm,x")]
-                      UNSPEC_MOVU))]
-  "TARGET_SSE2
-   && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)"
-  "movdqu\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "TI")])
+(define_insn "*call_value_1_rex64"
+  [(set (match_operand 0 "" "")
+       (call (mem:QI (match_operand:DI 1 "call_insn_operand" "rsm"))
+             (match_operand:DI 2 "" "")))]
+  "!SIBLING_CALL_P (insn) && TARGET_64BIT"
+{
+  if (constant_call_address_operand (operands[1], Pmode))
+    return "call\t%P1";
+  return "call\t%A1";
+}
+  [(set_attr "type" "callv")])
 
-(define_insn "sse2_movdq2q"
-  [(set (match_operand:DI 0 "nonimmediate_operand" "=m,y")
-       (vec_select:DI (match_operand:V2DI 1 "register_operand" "x,x")
-                      (parallel [(const_int 0)])))]
-  "TARGET_SSE2 && !TARGET_64BIT"
-  "@
-   movq\t{%1, %0|%0, %1}
-   movdq2q\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "TI")])
+(define_insn "*sibcall_value_1_rex64"
+  [(set (match_operand 0 "" "")
+       (call (mem:QI (match_operand:DI 1 "constant_call_address_operand" ""))
+             (match_operand:DI 2 "" "")))]
+  "SIBLING_CALL_P (insn) && TARGET_64BIT"
+  "jmp\t%P1"
+  [(set_attr "type" "callv")])
 
-(define_insn "sse2_movdq2q_rex64"
-  [(set (match_operand:DI 0 "nonimmediate_operand" "=m,y,r")
-       (vec_select:DI (match_operand:V2DI 1 "register_operand" "x,x,x")
-                      (parallel [(const_int 0)])))]
-  "TARGET_SSE2 && TARGET_64BIT"
-  "@
-   movq\t{%1, %0|%0, %1}
-   movdq2q\t{%1, %0|%0, %1}
-   movd\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "TI")])
+(define_insn "*sibcall_value_1_rex64_v"
+  [(set (match_operand 0 "" "")
+       (call (mem:QI (reg:DI 40))
+             (match_operand:DI 1 "" "")))]
+  "SIBLING_CALL_P (insn) && TARGET_64BIT"
+  "jmp\t*%%r11"
+  [(set_attr "type" "callv")])
+\f
+(define_insn "trap"
+  [(trap_if (const_int 1) (const_int 5))]
+  ""
+  "int\t$5")
 
-(define_insn "sse2_movq2dq"
-  [(set (match_operand:V2DI 0 "register_operand" "=x,?x")
-       (vec_concat:V2DI (match_operand:DI 1 "nonimmediate_operand" "m,y")
-                        (const_int 0)))]
-  "TARGET_SSE2 && !TARGET_64BIT"
-  "@
-   movq\t{%1, %0|%0, %1}
-   movq2dq\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssecvt,ssemov")
-   (set_attr "mode" "TI")])
-
-(define_insn "sse2_movq2dq_rex64"
-  [(set (match_operand:V2DI 0 "register_operand" "=x,?x,?x")
-       (vec_concat:V2DI (match_operand:DI 1 "nonimmediate_operand" "m,y,r")
-                        (const_int 0)))]
-  "TARGET_SSE2 && TARGET_64BIT"
-  "@
-   movq\t{%1, %0|%0, %1}
-   movq2dq\t{%1, %0|%0, %1}
-   movd\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssecvt,ssemov,ssecvt")
-   (set_attr "mode" "TI")])
-
-(define_insn "sse2_movq"
-  [(set (match_operand:V2DI 0 "register_operand" "=x")
-       (vec_concat:V2DI (vec_select:DI
-                         (match_operand:V2DI 1 "nonimmediate_operand" "xm")
-                         (parallel [(const_int 0)]))
-                        (const_int 0)))]
-  "TARGET_SSE2"
-  "movq\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssemov")
-   (set_attr "mode" "TI")])
-
-(define_insn "sse2_loadd"
-  [(set (match_operand:V4SI 0 "register_operand" "=x")
-       (vec_merge:V4SI
-        (vec_duplicate:V4SI (match_operand:SI 1 "nonimmediate_operand" "mr"))
-        (const_vector:V4SI [(const_int 0)
-                            (const_int 0)
-                            (const_int 0)
-                            (const_int 0)])
-        (const_int 1)))]
-  "TARGET_SSE2"
-  "movd\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssemov")
-   (set_attr "mode" "TI")])
-
-(define_insn "sse2_stored"
-  [(set (match_operand:SI 0 "nonimmediate_operand" "=mr")
-       (vec_select:SI
-        (match_operand:V4SI 1 "register_operand" "x")
-        (parallel [(const_int 0)])))]
-  "TARGET_SSE2"
-  "movd\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssemov")
-   (set_attr "mode" "TI")])
-
-(define_insn "sse2_movhpd"
-  [(set (match_operand:V2DF 0 "nonimmediate_operand" "=x,m")
-       (vec_merge:V2DF
-        (match_operand:V2DF 1 "nonimmediate_operand" "0,0")
-        (match_operand:V2DF 2 "nonimmediate_operand" "m,x")
-        (const_int 2)))]
-  "TARGET_SSE2 && (GET_CODE (operands[1]) == MEM || GET_CODE (operands[2]) == MEM)"
-  "movhpd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "V2DF")])
+;;; ix86 doesn't have conditional trap instructions, but we fake them
+;;; for the sake of bounds checking.  By emitting bounds checks as
+;;; conditional traps rather than as conditional jumps around
+;;; unconditional traps we avoid introducing spurious basic-block
+;;; boundaries and facilitate elimination of redundant checks.  In
+;;; honor of the too-inflexible-for-BPs `bound' instruction, we use
+;;; interrupt 5.
+;;; 
+;;; FIXME: Static branch prediction rules for ix86 are such that
+;;; forward conditional branches predict as untaken.  As implemented
+;;; below, pseudo conditional traps violate that rule.  We should use
+;;; .pushsection/.popsection to place all of the `int 5's in a special
+;;; section loaded at the end of the text segment and branch forward
+;;; there on bounds-failure, and then jump back immediately (in case
+;;; the system chooses to ignore bounds violations, or to report
+;;; violations and continue execution).
 
-(define_expand "sse2_loadsd"
-  [(match_operand:V2DF 0 "register_operand" "")
-   (match_operand:DF 1 "memory_operand" "")]
-  "TARGET_SSE2"
+(define_expand "conditional_trap"
+  [(trap_if (match_operator 0 "comparison_operator"
+            [(match_dup 2) (const_int 0)])
+           (match_operand 1 "const_int_operand" ""))]
+  ""
 {
-  emit_insn (gen_sse2_loadsd_1 (operands[0], operands[1],
-                               CONST0_RTX (V2DFmode)));
+  emit_insn (gen_rtx_TRAP_IF (VOIDmode,
+                             ix86_expand_compare (GET_CODE (operands[0]),
+                                                  NULL, NULL),
+                             operands[1]));
   DONE;
 })
 
-(define_insn "sse2_loadsd_1"
-  [(set (match_operand:V2DF 0 "register_operand" "=x")
-       (vec_merge:V2DF
-        (vec_duplicate:V2DF (match_operand:DF 1 "memory_operand" "m"))
-        (match_operand:V2DF 2 "const0_operand" "X")
-        (const_int 1)))]
-  "TARGET_SSE2"
-  "movsd\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "DF")])
+(define_insn "*conditional_trap_1"
+  [(trap_if (match_operator 0 "comparison_operator"
+            [(reg FLAGS_REG) (const_int 0)])
+           (match_operand 1 "const_int_operand" ""))]
+  ""
+{
+  operands[2] = gen_label_rtx ();
+  output_asm_insn ("j%c0\t%l2\; int\t%1", operands);
+  (*targetm.asm_out.internal_label) (asm_out_file, "L",
+                            CODE_LABEL_NUMBER (operands[2]));
+  RET;
+})
 
-(define_insn "sse2_movsd"
-  [(set (match_operand:V2DF 0 "nonimmediate_operand" "=x,x,m")
-       (vec_merge:V2DF
-        (match_operand:V2DF 1 "nonimmediate_operand" "0,0,0")
-        (match_operand:V2DF 2 "nonimmediate_operand" "x,m,x")
-        (const_int 1)))]
-  "TARGET_SSE2 && ix86_binary_operator_ok (UNKNOWN, V2DFmode, operands)"
-  "@movsd\t{%2, %0|%0, %2}
-    movlpd\t{%2, %0|%0, %2}
-    movlpd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "DF,V2DF,V2DF")])
+(define_expand "sse_prologue_save"
+  [(parallel [(set (match_operand:BLK 0 "" "")
+                  (unspec:BLK [(reg:DI 21)
+                               (reg:DI 22)
+                               (reg:DI 23)
+                               (reg:DI 24)
+                               (reg:DI 25)
+                               (reg:DI 26)
+                               (reg:DI 27)
+                               (reg:DI 28)] UNSPEC_SSE_PROLOGUE_SAVE))
+             (use (match_operand:DI 1 "register_operand" ""))
+             (use (match_operand:DI 2 "immediate_operand" ""))
+             (use (label_ref:DI (match_operand 3 "" "")))])]
+  "TARGET_64BIT"
+  "")
 
-(define_insn "sse2_storesd"
-  [(set (match_operand:DF 0 "memory_operand" "=m")
-       (vec_select:DF
-        (match_operand:V2DF 1 "register_operand" "x")
-        (parallel [(const_int 0)])))]
-  "TARGET_SSE2"
-  "movsd\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "DF")])
+(define_insn "*sse_prologue_save_insn"
+  [(set (mem:BLK (plus:DI (match_operand:DI 0 "register_operand" "R")
+                         (match_operand:DI 4 "const_int_operand" "n")))
+       (unspec:BLK [(reg:DI 21)
+                    (reg:DI 22)
+                    (reg:DI 23)
+                    (reg:DI 24)
+                    (reg:DI 25)
+                    (reg:DI 26)
+                    (reg:DI 27)
+                    (reg:DI 28)] UNSPEC_SSE_PROLOGUE_SAVE))
+   (use (match_operand:DI 1 "register_operand" "r"))
+   (use (match_operand:DI 2 "const_int_operand" "i"))
+   (use (label_ref:DI (match_operand 3 "" "X")))]
+  "TARGET_64BIT
+   && INTVAL (operands[4]) + SSE_REGPARM_MAX * 16 - 16 < 128
+   && INTVAL (operands[4]) + INTVAL (operands[2]) * 16 >= -128"
+  "*
+{
+  int i;
+  operands[0] = gen_rtx_MEM (Pmode,
+                            gen_rtx_PLUS (Pmode, operands[0], operands[4]));
+  output_asm_insn (\"jmp\\t%A1\", operands);
+  for (i = SSE_REGPARM_MAX - 1; i >= INTVAL (operands[2]); i--)
+    {
+      operands[4] = adjust_address (operands[0], DImode, i*16);
+      operands[5] = gen_rtx_REG (TImode, SSE_REGNO (i));
+      PUT_MODE (operands[4], TImode);
+      if (GET_CODE (XEXP (operands[0], 0)) != PLUS)
+        output_asm_insn (\"rex\", operands);
+      output_asm_insn (\"movaps\\t{%5, %4|%4, %5}\", operands);
+    }
+  (*targetm.asm_out.internal_label) (asm_out_file, \"L\",
+                            CODE_LABEL_NUMBER (operands[3]));
+  RET;
+}
+  "
+  [(set_attr "type" "other")
+   (set_attr "length_immediate" "0")
+   (set_attr "length_address" "0")
+   (set_attr "length" "135")
+   (set_attr "memory" "store")
+   (set_attr "modrm" "0")
+   (set_attr "mode" "DI")])
 
-(define_insn "sse2_shufpd"
-  [(set (match_operand:V2DF 0 "register_operand" "=x")
-        (unspec:V2DF [(match_operand:V2DF 1 "register_operand" "0")
-                     (match_operand:V2DF 2 "nonimmediate_operand" "xm")
-                     (match_operand:SI 3 "immediate_operand" "i")]
-                    UNSPEC_SHUFFLE))]
-  "TARGET_SSE2"
-  ;; @@@ check operand order for intel/nonintel syntax
-  "shufpd\t{%3, %2, %0|%0, %2, %3}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "V2DF")])
+(define_expand "prefetch"
+  [(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]);
+  int locality = INTVAL (operands[2]);
 
-(define_insn "sse2_clflush"
-  [(unspec_volatile [(match_operand 0 "address_operand" "p")]
-                   UNSPECV_CLFLUSH)]
-  "TARGET_SSE2"
-  "clflush %0"
-  [(set_attr "type" "sse")
-   (set_attr "memory" "unknown")])
+  if (rw != 0 && rw != 1)
+    abort ();
+  if (locality < 0 || locality > 3)
+    abort ();
+  if (GET_MODE (operands[0]) != Pmode && GET_MODE (operands[0]) != VOIDmode)
+    abort ();
 
-(define_expand "sse2_mfence"
-  [(set (match_dup 0)
-       (unspec:BLK [(match_dup 0)] UNSPEC_MFENCE))]
-  "TARGET_SSE2"
-{
-  operands[0] = gen_rtx_MEM (BLKmode, gen_rtx_SCRATCH (Pmode));
-  MEM_VOLATILE_P (operands[0]) = 1;
+  /* Use 3dNOW prefetch in case we are asking for write prefetch not
+     suported by SSE counterpart or the SSE prefetch is not available
+     (K6 machines).  Otherwise use SSE prefetch as it allows specifying
+     of locality.  */
+  if (TARGET_3DNOW && (!TARGET_PREFETCH_SSE || rw))
+    operands[2] = GEN_INT (3);
+  else
+    operands[1] = const0_rtx;
 })
 
-(define_insn "*mfence_insn"
-  [(set (match_operand:BLK 0 "" "")
-       (unspec:BLK [(match_dup 0)] UNSPEC_MFENCE))]
-  "TARGET_SSE2"
-  "mfence"
+(define_insn "*prefetch_sse"
+  [(prefetch (match_operand:SI 0 "address_operand" "p")
+            (const_int 0)
+            (match_operand:SI 1 "const_int_operand" ""))]
+  "TARGET_PREFETCH_SSE && !TARGET_64BIT"
+{
+  static const char * const patterns[4] = {
+   "prefetchnta\t%a0", "prefetcht2\t%a0", "prefetcht1\t%a0", "prefetcht0\t%a0"
+  };
+
+  int locality = INTVAL (operands[1]);
+  if (locality < 0 || locality > 3)
+    abort ();
+
+  return patterns[locality];  
+}
   [(set_attr "type" "sse")
-   (set_attr "memory" "unknown")])
+   (set_attr "memory" "none")])
 
-(define_expand "sse2_lfence"
-  [(set (match_dup 0)
-       (unspec:BLK [(match_dup 0)] UNSPEC_LFENCE))]
-  "TARGET_SSE2"
+(define_insn "*prefetch_sse_rex"
+  [(prefetch (match_operand:DI 0 "address_operand" "p")
+            (const_int 0)
+            (match_operand:SI 1 "const_int_operand" ""))]
+  "TARGET_PREFETCH_SSE && TARGET_64BIT"
 {
-  operands[0] = gen_rtx_MEM (BLKmode, gen_rtx_SCRATCH (Pmode));
-  MEM_VOLATILE_P (operands[0]) = 1;
-})
+  static const char * const patterns[4] = {
+   "prefetchnta\t%a0", "prefetcht2\t%a0", "prefetcht1\t%a0", "prefetcht0\t%a0"
+  };
 
-(define_insn "*lfence_insn"
-  [(set (match_operand:BLK 0 "" "")
-       (unspec:BLK [(match_dup 0)] UNSPEC_LFENCE))]
-  "TARGET_SSE2"
-  "lfence"
-  [(set_attr "type" "sse")
-   (set_attr "memory" "unknown")])
-
-;; PNI
-
-(define_insn "mwait"
-  [(unspec_volatile [(match_operand:SI 0 "register_operand" "a")
-                    (match_operand:SI 1 "register_operand" "c")]
-                   UNSPECV_MWAIT)]
-  "TARGET_PNI"
-  "mwait\t%0, %1"
-  [(set_attr "length" "3")])
-
-(define_insn "monitor"
-  [(unspec_volatile [(match_operand:SI 0 "register_operand" "a")
-                    (match_operand:SI 1 "register_operand" "c")
-                    (match_operand:SI 2 "register_operand" "d")]
-                   UNSPECV_MONITOR)]
-  "TARGET_PNI"
-  "monitor\t%0, %1, %2"
-  [(set_attr "length" "3")])
-
-;; PNI arithmetic
-
-(define_insn "addsubv4sf3"
-  [(set (match_operand:V4SF 0 "register_operand" "=x")
-        (unspec:V4SF [(match_operand:V4SF 1 "register_operand" "0")
-                     (match_operand:V4SF 2 "nonimmediate_operand" "xm")]
-                    UNSPEC_ADDSUB))]
-  "TARGET_PNI"
-  "addsubps\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseadd")
-   (set_attr "mode" "V4SF")])
-
-(define_insn "addsubv2df3"
-  [(set (match_operand:V2DF 0 "register_operand" "=x")
-        (unspec:V2DF [(match_operand:V2DF 1 "register_operand" "0")
-                     (match_operand:V2DF 2 "nonimmediate_operand" "xm")]
-                    UNSPEC_ADDSUB))]
-  "TARGET_PNI"
-  "addsubpd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseadd")
-   (set_attr "mode" "V2DF")])
-
-(define_insn "haddv4sf3"
-  [(set (match_operand:V4SF 0 "register_operand" "=x")
-        (unspec:V4SF [(match_operand:V4SF 1 "register_operand" "0")
-                     (match_operand:V4SF 2 "nonimmediate_operand" "xm")]
-                    UNSPEC_HADD))]
-  "TARGET_PNI"
-  "haddps\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseadd")
-   (set_attr "mode" "V4SF")])
-
-(define_insn "haddv2df3"
-  [(set (match_operand:V2DF 0 "register_operand" "=x")
-        (unspec:V2DF [(match_operand:V2DF 1 "register_operand" "0")
-                     (match_operand:V2DF 2 "nonimmediate_operand" "xm")]
-                    UNSPEC_HADD))]
-  "TARGET_PNI"
-  "haddpd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseadd")
-   (set_attr "mode" "V2DF")])
-
-(define_insn "hsubv4sf3"
-  [(set (match_operand:V4SF 0 "register_operand" "=x")
-        (unspec:V4SF [(match_operand:V4SF 1 "register_operand" "0")
-                     (match_operand:V4SF 2 "nonimmediate_operand" "xm")]
-                    UNSPEC_HSUB))]
-  "TARGET_PNI"
-  "hsubps\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseadd")
-   (set_attr "mode" "V4SF")])
-
-(define_insn "hsubv2df3"
-  [(set (match_operand:V2DF 0 "register_operand" "=x")
-        (unspec:V2DF [(match_operand:V2DF 1 "register_operand" "0")
-                     (match_operand:V2DF 2 "nonimmediate_operand" "xm")]
-                    UNSPEC_HSUB))]
-  "TARGET_PNI"
-  "hsubpd\t{%2, %0|%0, %2}"
-  [(set_attr "type" "sseadd")
-   (set_attr "mode" "V2DF")])
-
-(define_insn "movshdup"
-  [(set (match_operand:V4SF 0 "register_operand" "=x")
-        (unspec:V4SF
-        [(match_operand:V4SF 1 "nonimmediate_operand" "xm")] UNSPEC_MOVSHDUP))]
-  "TARGET_PNI"
-  "movshdup\t{%1, %0|%0, %1}"
-  [(set_attr "type" "sse")
-   (set_attr "mode" "V4SF")])
-
-(define_insn "movsldup"
-  [(set (match_operand:V4SF 0 "register_operand" "=x")
-        (unspec:V4SF
-        [(match_operand:V4SF 1 "nonimmediate_operand" "xm")] UNSPEC_MOVSLDUP))]
-  "TARGET_PNI"
-  "movsldup\t{%1, %0|%0, %1}"
+  int locality = INTVAL (operands[1]);
+  if (locality < 0 || locality > 3)
+    abort ();
+
+  return patterns[locality];  
+}
   [(set_attr "type" "sse")
-   (set_attr "mode" "V4SF")])
-
-(define_insn "lddqu"
-  [(set (match_operand:V16QI 0 "register_operand" "=x")
-       (unspec:V16QI [(match_operand:V16QI 1 "memory_operand" "m")]
-                      UNSPEC_LDQQU))]
-  "TARGET_PNI"
-  "lddqu\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "TI")])
+   (set_attr "memory" "none")])
 
-(define_insn "loadddup"
-  [(set (match_operand:V2DF 0 "register_operand" "=x")
-       (vec_duplicate:V2DF (match_operand:DF 1 "memory_operand" "m")))]
-  "TARGET_PNI"
-  "movddup\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "DF")])
+(define_insn "*prefetch_3dnow"
+  [(prefetch (match_operand:SI 0 "address_operand" "p")
+            (match_operand:SI 1 "const_int_operand" "n")
+            (const_int 3))]
+  "TARGET_3DNOW && !TARGET_64BIT"
+{
+  if (INTVAL (operands[1]) == 0)
+    return "prefetch\t%a0";
+  else
+    return "prefetchw\t%a0";
+}
+  [(set_attr "type" "mmx")
+   (set_attr "memory" "none")])
 
-(define_insn "movddup"
-  [(set (match_operand:V2DF 0 "register_operand" "=x")
-       (vec_duplicate:V2DF
-        (vec_select:DF (match_operand:V2DF 1 "register_operand" "x")
-                       (parallel [(const_int 0)]))))]
-  "TARGET_PNI"
-  "movddup\t{%1, %0|%0, %1}"
-  [(set_attr "type" "ssecvt")
-   (set_attr "mode" "DF")])
+(define_insn "*prefetch_3dnow_rex"
+  [(prefetch (match_operand:DI 0 "address_operand" "p")
+            (match_operand:SI 1 "const_int_operand" "n")
+            (const_int 3))]
+  "TARGET_3DNOW && TARGET_64BIT"
+{
+  if (INTVAL (operands[1]) == 0)
+    return "prefetch\t%a0";
+  else
+    return "prefetchw\t%a0";
+}
+  [(set_attr "type" "mmx")
+   (set_attr "memory" "none")])
+
+(include "sse.md")
+(include "mmx.md")