OSDN Git Service

* config/i386/i386.md (*fop_<mode>_comm_mixed): Macroize from
authoruros <uros@138bc75d-0d04-0410-961f-82ee72b054a4>
Sat, 31 May 2008 09:48:21 +0000 (09:48 +0000)
committeruros <uros@138bc75d-0d04-0410-961f-82ee72b054a4>
Sat, 31 May 2008 09:48:21 +0000 (09:48 +0000)
*fop_sf_comm_mixed and *fop_df_comm_mixed insn patterns using MODEF
mode iterator.
(*fop_<mode>_comm_sse): Macroize from *fop_sf_comm_sse and
*fop_df_comm_sse insn patterns using MODEF mode iterator.
(*fop_<mode>_comm_i387): Macroize from *fop_sf_comm_i387 and
*fop_df_comm_i387 insn patterns using MODEF mode iterator.
(*fop_<mode>_1_mixed): Macroize from *fop_sf_1_mixed and
*fop_df_1_mixed insn patterns using MODEF mode iterator.
(*fop_<mode>_1_sse): Macroize from *fop_sf_1_sse and
*fop_df_1_sse insn patterns using MODEF mode iterator.
(*fop_<mode>_1_i387): Macroize from *fop_sf_1_i387 and
*fop_df_1_i387 insn patterns using MODEF mode iterator.
(*fop_<MODEF:mode>_2_i387): Macroize from *fop_sf_2<mode>_i387 and
*fop_df_2<mode>_i387 insn patterns using MODEF mode iterator.
(*fop_<MODEF:mode>_3_i387): Macroize from *fop_sf_3<mode>_i387 and
*fop_df_3<mode>_i387 insn patterns using MODEF mode iterator.
(*fop_xf_2_i387): Rename from *fop_xf_2<mode>_i387.
(*fop_xf_3_i387): Rename from *fop_xf_3<mode>_i387.
(*fop_xf_4_i387): Use <MODE> for mode attribute.
(*fop_xf_5_i387): Ditto.
(*fop_xf_6_i387): Ditto.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@136235 138bc75d-0d04-0410-961f-82ee72b054a4

gcc/ChangeLog
gcc/config/i386/i386.md

index 82739e0..6177e80 100644 (file)
@@ -1,3 +1,28 @@
+2008-05-31  Uros Bizjak  <ubizjak@gmail.com>
+
+       * config/i386/i386.md (*fop_<mode>_comm_mixed): Macroize from
+       *fop_sf_comm_mixed and *fop_df_comm_mixed insn patterns using MODEF
+       mode iterator.
+       (*fop_<mode>_comm_sse): Macroize from *fop_sf_comm_sse and
+       *fop_df_comm_sse insn patterns using MODEF mode iterator.
+       (*fop_<mode>_comm_i387): Macroize from *fop_sf_comm_i387 and
+       *fop_df_comm_i387 insn patterns using MODEF mode iterator.
+       (*fop_<mode>_1_mixed): Macroize from *fop_sf_1_mixed and
+       *fop_df_1_mixed insn patterns using MODEF mode iterator.
+       (*fop_<mode>_1_sse): Macroize from *fop_sf_1_sse and
+       *fop_df_1_sse insn patterns using MODEF mode iterator.
+       (*fop_<mode>_1_i387): Macroize from *fop_sf_1_i387 and
+       *fop_df_1_i387 insn patterns using MODEF mode iterator.
+       (*fop_<MODEF:mode>_2_i387): Macroize from *fop_sf_2<mode>_i387 and
+       *fop_df_2<mode>_i387 insn patterns using MODEF mode iterator.
+       (*fop_<MODEF:mode>_3_i387): Macroize from *fop_sf_3<mode>_i387 and
+       *fop_df_3<mode>_i387 insn patterns using MODEF mode iterator.
+       (*fop_xf_2_i387): Rename from *fop_xf_2<mode>_i387.
+       (*fop_xf_3_i387): Rename from *fop_xf_3<mode>_i387.
+       (*fop_xf_4_i387): Use <MODE> for mode attribute.
+       (*fop_xf_5_i387): Ditto.
+       (*fop_xf_6_i387): Ditto.
+
 2008-05-30  Richard Guenther  <rguenther@suse.de>
 
        * builtins.c (build_string_literal): Avoid generating
 2008-05-30  Richard Guenther  <rguenther@suse.de>
 
        * builtins.c (build_string_literal): Avoid generating
@@ -32,8 +57,7 @@
        * incpath.c: Use HOST_LACKS_INODE_NUMBERS conditional
        rather than OS names to choose INO_T_EQ definition.
        (DIRS_EQ) [!INO_T_EQ]: Don't worry about case in comparison.
        * incpath.c: Use HOST_LACKS_INODE_NUMBERS conditional
        rather than OS names to choose INO_T_EQ definition.
        (DIRS_EQ) [!INO_T_EQ]: Don't worry about case in comparison.
-       (add_path) [!INO_T_EQ]: Use lrealpath to fill canonical_name
-       field.
+       (add_path) [!INO_T_EQ]: Use lrealpath to fill canonical_name field.
 
 2008-05-29  Daniel Franke  <franke.daniel@gmail.com>
 
 
 2008-05-29  Daniel Franke  <franke.daniel@gmail.com>
 
@@ -43,8 +67,7 @@
        * config.gcc: Defined new variable, fortran_target_objs.
        (*-*-darwin*): Set fortran_target_objs.
        * Makefile.in: Defined new variable FORTRAN_TARGET_OBJS.
        * config.gcc: Defined new variable, fortran_target_objs.
        (*-*-darwin*): Set fortran_target_objs.
        * Makefile.in: Defined new variable FORTRAN_TARGET_OBJS.
-       * configure.ac: Substitute fortran_target_objs, set
-       FORTRAN_TARGET_OBJS.
+       * configure.ac: Substitute fortran_target_objs, set FORTRAN_TARGET_OBJS.
        * configure: Regenerated.
 
 2008-05-29  H.J. Lu  <hongjiu.lu@intel.com>
        * configure: Regenerated.
 
 2008-05-29  H.J. Lu  <hongjiu.lu@intel.com>
 
        * value-prof.c (tree_ic_transform): Print counts.
        * tree-profile.c (tree_gen_ic_func_profiler):
 
        * value-prof.c (tree_ic_transform): Print counts.
        * tree-profile.c (tree_gen_ic_func_profiler):
-       Clear __gcov_indreict_call_callee variable
-       to avoid misattribution of the profile.
+       Clear __gcov_indreict_call_callee variable to avoid misattribution
+       of the profile.
 
 2008-05-28  Rafael Espindola  <espindola@google.com>
 
 
 2008-05-28  Rafael Espindola  <espindola@google.com>
 
        (s390_expand_insv): Use rotate and insert selected bits
        instruction for insv when building for z10.
        (print_operand_address): Handle symbol ref addresses.
        (s390_expand_insv): Use rotate and insert selected bits
        instruction for insv when building for z10.
        (print_operand_address): Handle symbol ref addresses.
-       (print_operand): Output modifier 'c' added for signed byte
-       values.
+       (print_operand): Output modifier 'c' added for signed byte values.
        (s390_encode_section_info): Mark symbol refs with
        SYMBOL_FLAG_NOT_NATURALLY_ALIGNED if appropriate.
 
        (s390_encode_section_info): Mark symbol refs with
        SYMBOL_FLAG_NOT_NATURALLY_ALIGNED if appropriate.
 
 2008-05-28  Andreas Krebbel  <krebbel1@de.ibm.com>
 
        * config/s390/s390.c (z10_cost): New cost function for z10.
 2008-05-28  Andreas Krebbel  <krebbel1@de.ibm.com>
 
        * config/s390/s390.c (z10_cost): New cost function for z10.
-       (s390_handle_arch_option, override_options): Support
-       -march=z10 switch.
+       (s390_handle_arch_option, override_options): Support -march=z10 switch.
        (s390_issue_rate): Adjust issue rate for z10.
        * config/s390/s390.h (processor_type): Add PROCESSOR_2097_Z10.
        (processor_flags): Add PF_Z10.
        (s390_issue_rate): Adjust issue rate for z10.
        * config/s390/s390.h (processor_type): Add PROCESSOR_2097_Z10.
        (processor_flags): Add PF_Z10.
 2008-05-27  Richard Guenther  <rguenther@suse.de>
 
        PR tree-optimization/36245
 2008-05-27  Richard Guenther  <rguenther@suse.de>
 
        PR tree-optimization/36245
-       * tree-ssa-address.c (add_to_parts): Deal with non-pointer
-       bases.
+       * tree-ssa-address.c (add_to_parts): Deal with non-pointer bases.
 
 2008-05-27  Andreas Krebbel  <krebbel1@de.ibm.com>
 
 
 2008-05-27  Andreas Krebbel  <krebbel1@de.ibm.com>
 
        alternatives according to the "enabled" attribute
        * recog.h (struct recog_data): New field alternative_enabled_p.
        (skip_alternative): New inline function.
        alternatives according to the "enabled" attribute
        * recog.h (struct recog_data): New field alternative_enabled_p.
        (skip_alternative): New inline function.
-       * regclass.c: (record_operand_costs): Check the "enabled"
-       attribute.
+       * regclass.c: (record_operand_costs): Check the "enabled" attribute.
        (record_reg_classes): Skip alternative according to the
        "enabled" attribute.
 
        (record_reg_classes): Skip alternative according to the
        "enabled" attribute.
 
        * recog.c (asm_operand_ok, preprocess_constraints,
        constrain_operands): Likewise.
        * regclass.c (record_reg_classes): Likewise.
        * recog.c (asm_operand_ok, preprocess_constraints,
        constrain_operands): Likewise.
        * regclass.c (record_reg_classes): Likewise.
-       * reload.c (find_reloads, alternative_allows_const_pool_ref):
-       Likewise.
+       * reload.c (find_reloads, alternative_allows_const_pool_ref): Likewise.
        * reload1.c (maybe_fix_stack_asms): Likewise.
        * reload1.c (maybe_fix_stack_asms): Likewise.
-       * stmt.c (parse_output_constraint, parse_input_constraint):
-       Likewise.
+       * stmt.c (parse_output_constraint, parse_input_constraint): Likewise.
        * recog.h: Adjust comment.
        * genpreds.c (generic_constraint_letters): Remove 'm' constraint.
        * recog.h: Adjust comment.
        * genpreds.c (generic_constraint_letters): Remove 'm' constraint.
-       * genoutput.c (note_constraint): Don't emit error for 'm'
-       constraint.
+       * genoutput.c (note_constraint): Don't emit error for 'm' constraint.
        * doc/md.texi: Add a note to description of 'm' constraint.
        * doc/tm.texi: Document the new TARGET_MEM_CONSTRAINT macro.
 
        * doc/md.texi: Add a note to description of 'm' constraint.
        * doc/tm.texi: Document the new TARGET_MEM_CONSTRAINT macro.
 
        (cgraph_decide_inlining_incrementally): Likewise.
 
 2008-05-26  Tristan Gingold  <gingold@adacore.com>
        (cgraph_decide_inlining_incrementally): Likewise.
 
 2008-05-26  Tristan Gingold  <gingold@adacore.com>
-            Anatoly Sokolov  <aesok@post.ru>
+           Anatoly Sokolov  <aesok@post.ru>
 
        * config/avr/avr.md ("call_prologue_saves"): Use hi8(gs())/lo8(gs())
        instead of pm_lo8/pm_hi8 to makes this call working on avr6.
 
        * config/avr/avr.md ("call_prologue_saves"): Use hi8(gs())/lo8(gs())
        instead of pm_lo8/pm_hi8 to makes this call working on avr6.
 2008-05-26  Richard Guenther  <rguenther@suse.de>
 
        * tree-ssa-sccvn.c (expr_has_constants): Declare.
 2008-05-26  Richard Guenther  <rguenther@suse.de>
 
        * tree-ssa-sccvn.c (expr_has_constants): Declare.
-       (visit_reference_op_load): Initialize VN_INFO->has_constants
-       properly.
+       (visit_reference_op_load): Initialize VN_INFO->has_constants properly.
 
 2008-05-26  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR middle-end/36253
 
 2008-05-26  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR middle-end/36253
-       * caller-save.c (insert_restore): Verify alignment of spill
-       space.
+       * caller-save.c (insert_restore): Verify alignment of spill space.
        (insert_save): Likewise.
        (insert_save): Likewise.
-
        * cfgexpand.c (LOCAL_ALIGNMENT): Removed.
        * cfgexpand.c (LOCAL_ALIGNMENT): Removed.
-
        * defaults.h (LOCAL_ALIGNMENT): New. Provide default.
        (STACK_SLOT_ALIGNMENT): Likewise.
        * defaults.h (LOCAL_ALIGNMENT): New. Provide default.
        (STACK_SLOT_ALIGNMENT): Likewise.
-
        * function.c (LOCAL_ALIGNMENT): Removed.
        (get_stack_local_alignment): New.
        (assign_stack_local): Use it.  Set alignment on stack slot.
        (assign_stack_temp_for_type): Use get_stack_local_alignment.
        * function.c (LOCAL_ALIGNMENT): Removed.
        (get_stack_local_alignment): New.
        (assign_stack_local): Use it.  Set alignment on stack slot.
        (assign_stack_temp_for_type): Use get_stack_local_alignment.
-
        * config/i386/i386.h (LOCAL_ALIGNMENT): Updated.
        (STACK_SLOT_ALIGNMENT): New.
        * config/i386/i386.h (LOCAL_ALIGNMENT): Updated.
        (STACK_SLOT_ALIGNMENT): New.
-
        * config/i386/i386.c (ix86_local_alignment): Handle caller-save
        stack slot in XFmode.
 
        * config/i386/i386.c (ix86_local_alignment): Handle caller-save
        stack slot in XFmode.
 
 
 2008-05-25  Eric Botcazou  <ebotcazou@adacore.com>
 
 
 2008-05-25  Eric Botcazou  <ebotcazou@adacore.com>
 
-        * tree-nested.c (convert_tramp_reference) <ADDR_EXPR>: Do not
+       * tree-nested.c (convert_tramp_reference) <ADDR_EXPR>: Do not
        build a trampoline if we don't want one.
        * varasm.c (initializer_constant_valid_p) <ADDR_EXPR>: Do not
        return zero for nested functions if we don't want a trampoline.
        build a trampoline if we don't want one.
        * varasm.c (initializer_constant_valid_p) <ADDR_EXPR>: Do not
        return zero for nested functions if we don't want a trampoline.
 
 2008-05-24  Richard Guenther  <rguenther@suse.de>
 
 
 2008-05-24  Richard Guenther  <rguenther@suse.de>
 
-       * tree-dfa.c (refs_may_alias_p): Re-instantiate case that
-       a scalar variable can be only accessed through a pointer
-       or a union.
+       * tree-dfa.c (refs_may_alias_p): Re-instantiate case that a scalar
+       variable can be only accessed through a pointer or a union.
 
 2008-05-24  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 
 2008-05-24  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
        * target.h (gcc_target): Add allocate_stack_slots_for_args.
        * function.c (use_register_for_decl): Use
        targetm.calls.allocate_stack_slots_for_args.
        * target.h (gcc_target): Add allocate_stack_slots_for_args.
        * function.c (use_register_for_decl): Use
        targetm.calls.allocate_stack_slots_for_args.
-       * target-def.h (TARGET_CALLS): Add 
-       TARGET_ALLOCATE_STACK_SLOTS_FOR_ARGS.
-       * config/arm/arm.c (arm_allocate_stack_slots_for_args): 
-       New function.
+       * target-def.h (TARGET_CALLS): Add TARGET_ALLOCATE_STACK_SLOTS_FOR_ARGS.
+       * config/arm/arm.c (arm_allocate_stack_slots_for_args): New function.
        (TARGET_ALLOCATE_STACK_SLOTS_FOR_ARGS): Define.
 
 2008-05-23  Eric Botcazou  <ebotcazou@adacore.com>
        (TARGET_ALLOCATE_STACK_SLOTS_FOR_ARGS): Define.
 
 2008-05-23  Eric Botcazou  <ebotcazou@adacore.com>
 
 2008-05-23  Richard Guenther  <rguenther@suse.de>
 
 
 2008-05-23  Richard Guenther  <rguenther@suse.de>
 
-       * tree-ssa-operands.c (mark_difference_for_renaming): Use
-       bitmap_xor.
+       * tree-ssa-operands.c (mark_difference_for_renaming): Use bitmap_xor.
 
 2008-05-23  Uros Bizjak  <ubizjak@gmail.com>
            Jakub Jelinek  <jakub@redhat.com>
 
 2008-05-23  Uros Bizjak  <ubizjak@gmail.com>
            Jakub Jelinek  <jakub@redhat.com>
 
        * doc/install.texi (Options specification): Document --enable-cld.
        * doc/invoke.texi (Machine Dependent Options)
 
        * doc/install.texi (Options specification): Document --enable-cld.
        * doc/invoke.texi (Machine Dependent Options)
-        [i386 and x86-64 Options]: Add -mcld option.
-        (Intel 386 and AMD x86-64 Options): Document -mcld option.
+       [i386 and x86-64 Options]: Add -mcld option.
+       (Intel 386 and AMD x86-64 Options): Document -mcld option.
 
 2008-05-23  Kai Tietz  <kai.tietz@onevison.com>
        * config/i386/i386.c (return_in_memory_32): Add ATTRIBUTE_UNUSED.
 
 2008-05-23  Kai Tietz  <kai.tietz@onevison.com>
        * config/i386/i386.c (return_in_memory_32): Add ATTRIBUTE_UNUSED.
        parameter.
        * config/mips/mips.h (MIPS_COMPARE_AND_SWAP_12): Add OPS parameter.
        (MIPS_COMPARE_AND_SWAP_12_0): Delete macro.
        parameter.
        * config/mips/mips.h (MIPS_COMPARE_AND_SWAP_12): Add OPS parameter.
        (MIPS_COMPARE_AND_SWAP_12_0): Delete macro.
-       (MIPS_COMPARE_AND_SWAP_12_ZERO_OP,
-       MIPS_COMPARE_AND_SWAP_12_NONZERO_OP,
+       (MIPS_COMPARE_AND_SWAP_12_ZERO_OP, MIPS_COMPARE_AND_SWAP_12_NONZERO_OP,
        MIPS_SYNC_OP_12, MIPS_SYNC_OP_12_NOT_NOP,
        MIPS_SYNC_OP_12_NOT_NOT, MIPS_SYNC_OLD_OP_12,
        MIPS_SYNC_OLD_OP_12_NOT_NOP, MIPS_SYNC_OLD_OP_12_NOT_NOP_REG,
        MIPS_SYNC_OLD_OP_12_NOT_NOT, MIPS_SYNC_OLD_OP_12_NOT_NOT_REG,
        MIPS_SYNC_NEW_OP_12, MIPS_SYNC_NEW_OP_12_NOT_NOP,
        MIPS_SYNC_NEW_OP_12_NOT_NOT, MIPS_SYNC_EXCHANGE_12,
        MIPS_SYNC_OP_12, MIPS_SYNC_OP_12_NOT_NOP,
        MIPS_SYNC_OP_12_NOT_NOT, MIPS_SYNC_OLD_OP_12,
        MIPS_SYNC_OLD_OP_12_NOT_NOP, MIPS_SYNC_OLD_OP_12_NOT_NOP_REG,
        MIPS_SYNC_OLD_OP_12_NOT_NOT, MIPS_SYNC_OLD_OP_12_NOT_NOT_REG,
        MIPS_SYNC_NEW_OP_12, MIPS_SYNC_NEW_OP_12_NOT_NOP,
        MIPS_SYNC_NEW_OP_12_NOT_NOT, MIPS_SYNC_EXCHANGE_12,
-       MIPS_SYNC_EXCHANGE_12_ZERO_OP,
-       MIPS_SYNC_EXCHANGE_12_NONZERO_OP): New macros.
+       MIPS_SYNC_EXCHANGE_12_ZERO_OP, MIPS_SYNC_EXCHANGE_12_NONZERO_OP):
+       New macros.
 
 2008-05-20  H.J. Lu  <hongjiu.lu@intel.com>
 
 
 2008-05-20  H.J. Lu  <hongjiu.lu@intel.com>
 
 
        * config/i386/i386.c (ix86_expand_vector_init_concat): New.
        (ix86_expand_vector_init_interleave): Likewise.
 
        * config/i386/i386.c (ix86_expand_vector_init_concat): New.
        (ix86_expand_vector_init_interleave): Likewise.
-       (ix86_expand_vector_init_general): Use them.  Assert word_mode
-       == SImode when n_words == 4.
+       (ix86_expand_vector_init_general): Use them.  Assert
+       word_mode == SImode when n_words == 4.
 
 2008-05-19  Uros Bizjak  <ubizjak@gmail.com>
 
 
 2008-05-19  Uros Bizjak  <ubizjak@gmail.com>
 
index 885077d..c245a49 100644 (file)
 ;; Gcc is slightly more smart about handling normal two address instructions
 ;; so use special patterns for add and mull.
 
 ;; Gcc is slightly more smart about handling normal two address instructions
 ;; so use special patterns for add and mull.
 
-(define_insn "*fop_sf_comm_mixed"
-  [(set (match_operand:SF 0 "register_operand" "=f,x")
-       (match_operator:SF 3 "binary_fp_operator"
-                       [(match_operand:SF 1 "nonimmediate_operand" "%0,0")
-                        (match_operand:SF 2 "nonimmediate_operand" "fm,xm")]))]
-  "TARGET_MIX_SSE_I387
+(define_insn "*fop_<mode>_comm_mixed"
+  [(set (match_operand:MODEF 0 "register_operand" "=f,x")
+       (match_operator:MODEF 3 "binary_fp_operator"
+         [(match_operand:MODEF 1 "nonimmediate_operand" "%0,0")
+          (match_operand:MODEF 2 "nonimmediate_operand" "fm,xm")]))]
+  "SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_MIX_SSE_I387
    && COMMUTATIVE_ARITH_P (operands[3])
    && !(MEM_P (operands[1]) && MEM_P (operands[2]))"
   "* return output_387_binary_op (insn, operands);"
   [(set (attr "type")
        (if_then_else (eq_attr "alternative" "1")
    && COMMUTATIVE_ARITH_P (operands[3])
    && !(MEM_P (operands[1]) && MEM_P (operands[2]))"
   "* 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" "")
+          (if_then_else (match_operand:MODEF 3 "mult_operator" "")
              (const_string "ssemul")
              (const_string "sseadd"))
              (const_string "ssemul")
              (const_string "sseadd"))
-          (if_then_else (match_operand:SF 3 "mult_operator" "")
+          (if_then_else (match_operand:MODEF 3 "mult_operator" "")
              (const_string "fmul")
              (const_string "fop"))))
              (const_string "fmul")
              (const_string "fop"))))
-   (set_attr "mode" "SF")])
+   (set_attr "mode" "<MODE>")])
 
 
-(define_insn "*fop_sf_comm_sse"
-  [(set (match_operand:SF 0 "register_operand" "=x")
-       (match_operator:SF 3 "binary_fp_operator"
-                       [(match_operand:SF 1 "nonimmediate_operand" "%0")
-                        (match_operand:SF 2 "nonimmediate_operand" "xm")]))]
-  "TARGET_SSE_MATH
+(define_insn "*fop_<mode>_comm_sse"
+  [(set (match_operand:MODEF 0 "register_operand" "=x")
+       (match_operator:MODEF 3 "binary_fp_operator"
+         [(match_operand:MODEF 1 "nonimmediate_operand" "%0")
+          (match_operand:MODEF 2 "nonimmediate_operand" "xm")]))]
+  "SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH
    && COMMUTATIVE_ARITH_P (operands[3])
    && !(MEM_P (operands[1]) && MEM_P (operands[2]))"
   "* return output_387_binary_op (insn, operands);"
   [(set (attr "type")
    && COMMUTATIVE_ARITH_P (operands[3])
    && !(MEM_P (operands[1]) && MEM_P (operands[2]))"
   "* return output_387_binary_op (insn, operands);"
   [(set (attr "type")
-        (if_then_else (match_operand:SF 3 "mult_operator" "")
+        (if_then_else (match_operand:MODEF 3 "mult_operator" "")
           (const_string "ssemul")
           (const_string "sseadd")))
           (const_string "ssemul")
           (const_string "sseadd")))
-   (set_attr "mode" "SF")])
+   (set_attr "mode" "<MODE>")])
 
 
-(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")]))]
+(define_insn "*fop_<mode>_comm_i387"
+  [(set (match_operand:MODEF 0 "register_operand" "=f")
+       (match_operator:MODEF 3 "binary_fp_operator"
+         [(match_operand:MODEF 1 "nonimmediate_operand" "%0")
+          (match_operand:MODEF 2 "nonimmediate_operand" "fm")]))]
   "TARGET_80387
    && COMMUTATIVE_ARITH_P (operands[3])
    && !(MEM_P (operands[1]) && MEM_P (operands[2]))"
   "* return output_387_binary_op (insn, operands);"
   [(set (attr "type")
   "TARGET_80387
    && COMMUTATIVE_ARITH_P (operands[3])
    && !(MEM_P (operands[1]) && MEM_P (operands[2]))"
   "* return output_387_binary_op (insn, operands);"
   [(set (attr "type")
-       (if_then_else (match_operand:SF 3 "mult_operator" "")
+       (if_then_else (match_operand:MODEF 3 "mult_operator" "")
           (const_string "fmul")
           (const_string "fop")))
           (const_string "fmul")
           (const_string "fop")))
-   (set_attr "mode" "SF")])
+   (set_attr "mode" "<MODE>")])
 
 
-(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")]))]
-  "TARGET_MIX_SSE_I387
+(define_insn "*fop_<mode>_1_mixed"
+  [(set (match_operand:MODEF 0 "register_operand" "=f,f,x")
+       (match_operator:MODEF 3 "binary_fp_operator"
+         [(match_operand:MODEF 1 "nonimmediate_operand" "0,fm,0")
+          (match_operand:MODEF 2 "nonimmediate_operand" "fm,0,xm")]))]
+  "SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_MIX_SSE_I387
    && !COMMUTATIVE_ARITH_P (operands[3])
    && !(MEM_P (operands[1]) && MEM_P (operands[2]))"
   "* return output_387_binary_op (insn, operands);"
   [(set (attr "type")
         (cond [(and (eq_attr "alternative" "2")
    && !COMMUTATIVE_ARITH_P (operands[3])
    && !(MEM_P (operands[1]) && MEM_P (operands[2]))"
   "* return output_387_binary_op (insn, operands);"
   [(set (attr "type")
         (cond [(and (eq_attr "alternative" "2")
-                   (match_operand:SF 3 "mult_operator" ""))
+                   (match_operand:MODEF 3 "mult_operator" ""))
                  (const_string "ssemul")
               (and (eq_attr "alternative" "2")
                  (const_string "ssemul")
               (and (eq_attr "alternative" "2")
-                   (match_operand:SF 3 "div_operator" ""))
+                   (match_operand:MODEF 3 "div_operator" ""))
                  (const_string "ssediv")
               (eq_attr "alternative" "2")
                  (const_string "sseadd")
                  (const_string "ssediv")
               (eq_attr "alternative" "2")
                  (const_string "sseadd")
-              (match_operand:SF 3 "mult_operator" "")
+              (match_operand:MODEF 3 "mult_operator" "")
                  (const_string "fmul")
                  (const_string "fmul")
-               (match_operand:SF 3 "div_operator" "")
+               (match_operand:MODEF 3 "div_operator" "")
                  (const_string "fdiv")
               ]
               (const_string "fop")))
                  (const_string "fdiv")
               ]
               (const_string "fop")))
-   (set_attr "mode" "SF")])
+   (set_attr "mode" "<MODE>")])
 
 (define_insn "*rcpsf2_sse"
   [(set (match_operand:SF 0 "register_operand" "=x")
 
 (define_insn "*rcpsf2_sse"
   [(set (match_operand:SF 0 "register_operand" "=x")
   [(set_attr "type" "sse")
    (set_attr "mode" "SF")])
 
   [(set_attr "type" "sse")
    (set_attr "mode" "SF")])
 
-(define_insn "*fop_sf_1_sse"
-  [(set (match_operand:SF 0 "register_operand" "=x")
-       (match_operator:SF 3 "binary_fp_operator"
-                       [(match_operand:SF 1 "register_operand" "0")
-                        (match_operand:SF 2 "nonimmediate_operand" "xm")]))]
-  "TARGET_SSE_MATH
+(define_insn "*fop_<mode>_1_sse"
+  [(set (match_operand:MODEF 0 "register_operand" "=x")
+       (match_operator:MODEF 3 "binary_fp_operator"
+         [(match_operand:MODEF 1 "register_operand" "0")
+          (match_operand:MODEF 2 "nonimmediate_operand" "xm")]))]
+  "SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH
    && !COMMUTATIVE_ARITH_P (operands[3])"
   "* return output_387_binary_op (insn, operands);"
   [(set (attr "type")
    && !COMMUTATIVE_ARITH_P (operands[3])"
   "* return output_387_binary_op (insn, operands);"
   [(set (attr "type")
-        (cond [(match_operand:SF 3 "mult_operator" "")
+        (cond [(match_operand:MODEF 3 "mult_operator" "")
                  (const_string "ssemul")
                  (const_string "ssemul")
-              (match_operand:SF 3 "div_operator" "")
+              (match_operand:MODEF 3 "div_operator" "")
                  (const_string "ssediv")
               ]
               (const_string "sseadd")))
                  (const_string "ssediv")
               ]
               (const_string "sseadd")))
-   (set_attr "mode" "SF")])
+   (set_attr "mode" "<MODE>")])
 
 ;; This pattern is not fully shadowed by the pattern above.
 
 ;; 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"
-                       [(match_operand:SF 1 "nonimmediate_operand" "0,fm")
-                        (match_operand:SF 2 "nonimmediate_operand" "fm,0")]))]
+(define_insn "*fop_<mode>_1_i387"
+  [(set (match_operand:MODEF 0 "register_operand" "=f,f")
+       (match_operator:MODEF 3 "binary_fp_operator"
+         [(match_operand:MODEF 1 "nonimmediate_operand" "0,fm")
+          (match_operand:MODEF 2 "nonimmediate_operand" "fm,0")]))]
   "TARGET_80387 && !TARGET_SSE_MATH
    && !COMMUTATIVE_ARITH_P (operands[3])
    && !(MEM_P (operands[1]) && MEM_P (operands[2]))"
   "* return output_387_binary_op (insn, operands);"
   [(set (attr "type")
   "TARGET_80387 && !TARGET_SSE_MATH
    && !COMMUTATIVE_ARITH_P (operands[3])
    && !(MEM_P (operands[1]) && MEM_P (operands[2]))"
   "* return output_387_binary_op (insn, operands);"
   [(set (attr "type")
-        (cond [(match_operand:SF 3 "mult_operator" "")
+        (cond [(match_operand:MODEF 3 "mult_operator" "")
                  (const_string "fmul")
                  (const_string "fmul")
-               (match_operand:SF 3 "div_operator" "")
+               (match_operand:MODEF 3 "div_operator" "")
                  (const_string "fdiv")
               ]
               (const_string "fop")))
                  (const_string "fdiv")
               ]
               (const_string "fop")))
-   (set_attr "mode" "SF")])
-
-;; ??? Add SSE splitters for these!
-(define_insn "*fop_sf_2<mode>_i387"
-  [(set (match_operand:SF 0 "register_operand" "=f,f")
-       (match_operator:SF 3 "binary_fp_operator"
-         [(float:SF (match_operand:X87MODEI12 1 "nonimmediate_operand" "m,?r"))
-          (match_operand:SF 2 "register_operand" "0,0")]))]
-  "TARGET_80387 && TARGET_USE_<MODE>MODE_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 "mode" "<MODE>")])
 
    (set_attr "mode" "<MODE>")])
 
-(define_insn "*fop_sf_3<mode>_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")
-          (float:SF (match_operand:X87MODEI12 2 "nonimmediate_operand" "m,?r"))]))]
-  "TARGET_80387 && TARGET_USE_<MODE>MODE_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 "mode" "<MODE>")])
-
-(define_insn "*fop_df_comm_mixed"
-  [(set (match_operand:DF 0 "register_operand" "=f,x")
-       (match_operator:DF 3 "binary_fp_operator"
-         [(match_operand:DF 1 "nonimmediate_operand" "%0,0")
-          (match_operand:DF 2 "nonimmediate_operand" "fm,xm")]))]
-  "TARGET_SSE2 && TARGET_MIX_SSE_I387
-   && COMMUTATIVE_ARITH_P (operands[3])
-   && !(MEM_P (operands[1]) && MEM_P (operands[2]))"
-  "* return output_387_binary_op (insn, operands);"
-  [(set (attr "type")
-       (if_then_else (eq_attr "alternative" "1")
-          (if_then_else (match_operand:DF 3 "mult_operator" "")
-             (const_string "ssemul")
-             (const_string "sseadd"))
-          (if_then_else (match_operand:DF 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" "=x")
-       (match_operator:DF 3 "binary_fp_operator"
-         [(match_operand:DF 1 "nonimmediate_operand" "%0")
-          (match_operand:DF 2 "nonimmediate_operand" "xm")]))]
-  "TARGET_SSE2 && TARGET_SSE_MATH
-   && COMMUTATIVE_ARITH_P (operands[3])
-   && !(MEM_P (operands[1]) && MEM_P (operands[2]))"
-  "* return output_387_binary_op (insn, operands);"
-  [(set (attr "type")
-        (if_then_else (match_operand:DF 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])
-   && !(MEM_P (operands[1]) && MEM_P (operands[2]))"
-  "* return output_387_binary_op (insn, operands);"
-  [(set (attr "type")
-       (if_then_else (match_operand:DF 3 "mult_operator" "")
-          (const_string "fmul")
-          (const_string "fop")))
-   (set_attr "mode" "DF")])
-
-(define_insn "*fop_df_1_mixed"
-  [(set (match_operand:DF 0 "register_operand" "=f,f,x")
-       (match_operator:DF 3 "binary_fp_operator"
-         [(match_operand:DF 1 "nonimmediate_operand" "0,fm,0")
-          (match_operand:DF 2 "nonimmediate_operand" "fm,0,xm")]))]
-  "TARGET_SSE2 && TARGET_SSE_MATH && TARGET_MIX_SSE_I387
-   && !COMMUTATIVE_ARITH_P (operands[3])
-   && !(MEM_P (operands[1]) && MEM_P (operands[2]))"
-  "* return output_387_binary_op (insn, operands);"
-  [(set (attr "type")
-        (cond [(and (eq_attr "alternative" "2")
-                   (match_operand:DF 3 "mult_operator" ""))
-                 (const_string "ssemul")
-              (and (eq_attr "alternative" "2")
-                   (match_operand:DF 3 "div_operator" ""))
-                 (const_string "ssediv")
-              (eq_attr "alternative" "2")
-                 (const_string "sseadd")
-              (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")])
-
-(define_insn "*fop_df_1_sse"
-  [(set (match_operand:DF 0 "register_operand" "=x")
-       (match_operator:DF 3 "binary_fp_operator"
-         [(match_operand:DF 1 "register_operand" "0")
-          (match_operand:DF 2 "nonimmediate_operand" "xm")]))]
-  "TARGET_SSE2 && TARGET_SSE_MATH
-   && !COMMUTATIVE_ARITH_P (operands[3])"
-  "* return output_387_binary_op (insn, operands);"
-  [(set_attr "mode" "DF")
-   (set (attr "type")
-        (cond [(match_operand:DF 3 "mult_operator" "")
-                 (const_string "ssemul")
-              (match_operand:DF 3 "div_operator" "")
-                 (const_string "ssediv")
-              ]
-              (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])
-   && !(MEM_P (operands[1]) && MEM_P (operands[2]))"
-  "* return output_387_binary_op (insn, operands);"
-  [(set (attr "type")
-        (cond [(match_operand:DF 3 "mult_operator" "")
-                 (const_string "fmul")
-               (match_operand:DF 3 "div_operator" "")
-                 (const_string "fdiv")
-              ]
-              (const_string "fop")))
-   (set_attr "mode" "DF")])
-
 ;; ??? Add SSE splitters for these!
 ;; ??? Add SSE splitters for these!
-(define_insn "*fop_df_2<mode>_i387"
-  [(set (match_operand:DF 0 "register_operand" "=f,f")
-       (match_operator:DF 3 "binary_fp_operator"
-          [(float:DF (match_operand:X87MODEI12 1 "nonimmediate_operand" "m,?r"))
-           (match_operand:DF 2 "register_operand" "0,0")]))]
-  "TARGET_80387 && TARGET_USE_<MODE>MODE_FIOP
-   && !(TARGET_SSE2 && TARGET_SSE_MATH)"
+(define_insn "*fop_<MODEF:mode>_2_i387"
+  [(set (match_operand:MODEF 0 "register_operand" "=f,f")
+       (match_operator:MODEF 3 "binary_fp_operator"
+         [(float:MODEF
+            (match_operand:X87MODEI12 1 "nonimmediate_operand" "m,?r"))
+          (match_operand:MODEF 2 "register_operand" "0,0")]))]
+  "TARGET_80387 && !TARGET_SSE_MATH
+   && TARGET_USE_<X87MODEI12:MODE>MODE_FIOP"
   "* return which_alternative ? \"#\" : output_387_binary_op (insn, operands);"
   [(set (attr "type")
   "* return which_alternative ? \"#\" : output_387_binary_op (insn, operands);"
   [(set (attr "type")
-        (cond [(match_operand:DF 3 "mult_operator" "")
+        (cond [(match_operand:MODEF 3 "mult_operator" "")
                  (const_string "fmul")
                  (const_string "fmul")
-               (match_operand:DF 3 "div_operator" "")
+               (match_operand:MODEF 3 "div_operator" "")
                  (const_string "fdiv")
               ]
               (const_string "fop")))
    (set_attr "fp_int_src" "true")
                  (const_string "fdiv")
               ]
               (const_string "fop")))
    (set_attr "fp_int_src" "true")
-   (set_attr "mode" "<MODE>")])
-
-(define_insn "*fop_df_3<mode>_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")
-           (float:DF (match_operand:X87MODEI12 2 "nonimmediate_operand" "m,?r"))]))]
-  "TARGET_80387 && TARGET_USE_<MODE>MODE_FIOP
-   && !(TARGET_SSE2 && TARGET_SSE_MATH)"
+   (set_attr "mode" "<X87MODEI12:MODE>")])
+
+(define_insn "*fop_<MODEF:mode>_3_i387"
+  [(set (match_operand:MODEF 0 "register_operand" "=f,f")
+       (match_operator:MODEF 3 "binary_fp_operator"
+         [(match_operand:MODEF 1 "register_operand" "0,0")
+          (float:MODEF
+            (match_operand:X87MODEI12 2 "nonimmediate_operand" "m,?r"))]))]
+  "TARGET_80387 && !TARGET_SSE_MATH
+   && TARGET_USE_<X87MODEI12:MODE>MODE_FIOP"
   "* return which_alternative ? \"#\" : output_387_binary_op (insn, operands);"
   [(set (attr "type")
   "* return which_alternative ? \"#\" : output_387_binary_op (insn, operands);"
   [(set (attr "type")
-        (cond [(match_operand:DF 3 "mult_operator" "")
+        (cond [(match_operand:MODEF 3 "mult_operator" "")
                  (const_string "fmul")
                  (const_string "fmul")
-               (match_operand:DF 3 "div_operator" "")
+               (match_operand:MODEF 3 "div_operator" "")
                  (const_string "fdiv")
               ]
               (const_string "fop")))
                  (const_string "fdiv")
               ]
               (const_string "fop")))
               (const_string "fop")))
    (set_attr "mode" "XF")])
 
               (const_string "fop")))
    (set_attr "mode" "XF")])
 
-(define_insn "*fop_xf_2<mode>_i387"
+(define_insn "*fop_xf_2_i387"
   [(set (match_operand:XF 0 "register_operand" "=f,f")
        (match_operator:XF 3 "binary_fp_operator"
   [(set (match_operand:XF 0 "register_operand" "=f,f")
        (match_operator:XF 3 "binary_fp_operator"
-          [(float:XF (match_operand:X87MODEI12 1 "nonimmediate_operand" "m,?r"))
-           (match_operand:XF 2 "register_operand" "0,0")]))]
+         [(float:XF
+            (match_operand:X87MODEI12 1 "nonimmediate_operand" "m,?r"))
+          (match_operand:XF 2 "register_operand" "0,0")]))]
   "TARGET_80387 && TARGET_USE_<MODE>MODE_FIOP"
   "* return which_alternative ? \"#\" : output_387_binary_op (insn, operands);"
   [(set (attr "type")
   "TARGET_80387 && TARGET_USE_<MODE>MODE_FIOP"
   "* return which_alternative ? \"#\" : output_387_binary_op (insn, operands);"
   [(set (attr "type")
    (set_attr "fp_int_src" "true")
    (set_attr "mode" "<MODE>")])
 
    (set_attr "fp_int_src" "true")
    (set_attr "mode" "<MODE>")])
 
-(define_insn "*fop_xf_3<mode>_i387"
+(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")
   [(set (match_operand:XF 0 "register_operand" "=f,f")
        (match_operator:XF 3 "binary_fp_operator"
          [(match_operand:XF 1 "register_operand" "0,0")
-          (float:XF (match_operand:X87MODEI12 2 "nonimmediate_operand" "m,?r"))]))]
+          (float:XF
+            (match_operand:X87MODEI12 2 "nonimmediate_operand" "m,?r"))]))]
   "TARGET_80387 && TARGET_USE_<MODE>MODE_FIOP"
   "* return which_alternative ? \"#\" : output_387_binary_op (insn, operands);"
   [(set (attr "type")
   "TARGET_80387 && TARGET_USE_<MODE>MODE_FIOP"
   "* return which_alternative ? \"#\" : output_387_binary_op (insn, operands);"
   [(set (attr "type")
                  (const_string "fdiv")
               ]
               (const_string "fop")))
                  (const_string "fdiv")
               ]
               (const_string "fop")))
-   (set_attr "mode" "SF")])
+   (set_attr "mode" "<MODE>")])
 
 (define_insn "*fop_xf_5_i387"
   [(set (match_operand:XF 0 "register_operand" "=f,f")
 
 (define_insn "*fop_xf_5_i387"
   [(set (match_operand:XF 0 "register_operand" "=f,f")
                  (const_string "fdiv")
               ]
               (const_string "fop")))
                  (const_string "fdiv")
               ]
               (const_string "fop")))
-   (set_attr "mode" "SF")])
+   (set_attr "mode" "<MODE>")])
 
 (define_insn "*fop_xf_6_i387"
   [(set (match_operand:XF 0 "register_operand" "=f,f")
 
 (define_insn "*fop_xf_6_i387"
   [(set (match_operand:XF 0 "register_operand" "=f,f")
                  (const_string "fdiv")
               ]
               (const_string "fop")))
                  (const_string "fdiv")
               ]
               (const_string "fop")))
-   (set_attr "mode" "SF")])
+   (set_attr "mode" "<MODE>")])
 
 (define_split
   [(set (match_operand 0 "register_operand" "")
 
 (define_split
   [(set (match_operand 0 "register_operand" "")