genrecog.c (pred): Update comparison_operator for the unordered operators.

        * genrecog.c (pred): Update comparison_operator for the unordered
        operators.

        * config/i386/i386.c (no_comparison_operator): Disallow unordered
        operators.
        (fcmov_comparison_operator): Allow UNORDERED/ORDERED.
        (uno_comparison_operator): New.
        (put_condition_code): Handle UNORDERED/ORDERED.
        (unsigned_comparison): Likewise.
        (ix86_fp_compare_mode): Broken out of ix86_expand_fp_compare.
        (ix86_use_fcomi_compare, ix86_prepare_fp_compare_args): Likewise.
        (ix86_expand_fp_compare): Use them.  Take scratch as argument,
        update all callers.  Handle all 8 unordered operators.
        (ix86_expand_setcc): Lose the unordered argument, update all callers.
        (ix86_expand_branch): Likewise.  Don't fully expand fp branches.
        * config/i386/i386.h (PREDICATE_CODES): Update.
        * config/i386/i386-protos.h (ix86_expand_fp_compare): Declare.
        (ix86_expand_branch, ix86_expand_setcc): Update.
        * config/i386/i386.md (sunordered, sordered): New.
        (suneq, sunge, sungt, sunle, sunlt, sltgt): New.
        (bunordered, bordered): New.
        (buneq, bunge, bungt, bunle, bunlt, bltgt): New.
        (*fp_jcc_1, *fp_jcc_2, *fp_jcc_3, *fp_jcc_4): New.
        (*fp_jcc_5, *fp_jcc_6, and splitters): New.

From-SVN: r33046

gcc/ChangeLog

+2000-04-09  Richard Henderson  <rth@cygnus.com>
+
+	* genrecog.c (pred): Update comparison_operator for the unordered
+	operators.
+
+	* config/i386/i386.c (no_comparison_operator): Disallow unordered
+	operators.
+	(fcmov_comparison_operator): Allow UNORDERED/ORDERED.
+	(uno_comparison_operator): New.
+	(put_condition_code): Handle UNORDERED/ORDERED.
+	(unsigned_comparison): Likewise.
+	(ix86_fp_compare_mode): Broken out of ix86_expand_fp_compare.
+	(ix86_use_fcomi_compare, ix86_prepare_fp_compare_args): Likewise.
+	(ix86_expand_fp_compare): Use them.  Take scratch as argument,
+	update all callers.  Handle all 8 unordered operators.
+	(ix86_expand_setcc): Lose the unordered argument, update all callers.
+	(ix86_expand_branch): Likewise.  Don't fully expand fp branches.
+	* config/i386/i386.h (PREDICATE_CODES): Update.
+	* config/i386/i386-protos.h (ix86_expand_fp_compare): Declare.
+	(ix86_expand_branch, ix86_expand_setcc): Update.
+	* config/i386/i386.md (sunordered, sordered): New.
+	(suneq, sunge, sungt, sunle, sunlt, sltgt): New.
+	(bunordered, bordered): New.
+	(buneq, bunge, bungt, bunle, bunlt, bltgt): New.
+	(*fp_jcc_1, *fp_jcc_2, *fp_jcc_3, *fp_jcc_4): New.
+	(*fp_jcc_5, *fp_jcc_6, and splitters): New.
+
 2000-04-09  Philip Blundell  <philb@gnu.org>
 
-        * config/arm/arm.h (ARM_NAME_ENCODING_LENGTHS): Strip `*' too.
+	* config/arm/arm.h (ARM_NAME_ENCODING_LENGTHS): Strip `*' too.
 	
 Sun Apr  9 15:16:14 EDT 2000  John Wehle  (john@feith.com)
 

gcc/config/i386/i386-protos.h

@@ -97,8 +97,9 @@ extern void ix86_expand_unary_operator PARAMS ((enum rtx_code, enum machine_mode
 extern int ix86_unary_operator_ok PARAMS ((enum rtx_code, enum machine_mode,
 					 rtx[]));
 extern int ix86_match_ccmode PARAMS ((rtx, enum machine_mode));
-extern void ix86_expand_branch PARAMS ((enum rtx_code, int, rtx));
-extern int ix86_expand_setcc PARAMS ((enum rtx_code, int, rtx));
+extern rtx ix86_expand_fp_compare PARAMS ((enum rtx_code, rtx, rtx, rtx));
+extern void ix86_expand_branch PARAMS ((enum rtx_code, rtx));
+extern int ix86_expand_setcc PARAMS ((enum rtx_code, rtx));
 extern int ix86_expand_int_movcc PARAMS ((rtx[]));
 extern int ix86_expand_fp_movcc PARAMS ((rtx[]));
 extern int ix86_split_long_move PARAMS ((rtx[]));

gcc/config/i386/i386.h

@@ -2508,6 +2508,8 @@ do { long l;						\
   {"non_q_regs_operand", {SUBREG, REG}},				\
   {"no_comparison_operator", {EQ, NE, LT, GE, LTU, GTU, LEU, GEU}},	\
   {"fcmov_comparison_operator", {EQ, NE, LTU, GTU, LEU, GEU}},		\
+  {"uno_comparison_operator", {EQ, NE, LE, LT, GE, GT, LEU, LTU, GEU,	\
+			       GTU, UNORDERED, ORDERED}},		\
   {"cmp_fp_expander_operand", {CONST_DOUBLE, SUBREG, REG, MEM}},	\
   {"ext_register_operand", {SUBREG, REG}},				\
   {"binary_fp_operator", {PLUS, MINUS, MULT, DIV}},			\

gcc/genrecog.c

@@ -211,7 +211,9 @@ static struct pred_table
   {"pop_operand", {MEM}},
   {"memory_operand", {SUBREG, MEM}},
   {"indirect_operand", {SUBREG, MEM}},
-  {"comparison_operator", {EQ, NE, LE, LT, GE, GT, LEU, LTU, GEU, GTU}},
+  {"comparison_operator", {EQ, NE, LE, LT, GE, GT, LEU, LTU, GEU, GTU,
+			   UNORDERED, ORDERED, UNEQ, UNGE, UNGT, UNLE,
+			   UNLT, LTGT}},
   {"mode_independent_operand", {CONST_INT, CONST_DOUBLE, CONST, SYMBOL_REF,
 				LABEL_REF, SUBREG, REG, MEM}}
 };