i386.md (int_cond): Remove code iterator.

	* config/i386/i386.md (int_cond): Remove code iterator.
	(fp_cond): Ditto.
	(cbranch<mode>4): Use ordered_comparison_operator predicate
	for operator0.
	(cstore<mode>4): Ditto for operator1.
	(mov<SWIM:mode>cc): Ditto.

From-SVN: r162710

2 files changed, 22 insertions, 18 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 416d049..f8d5da5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2010-07-29  Uros Bizjak  <ubizjak@gmail.com>
+
+	* config/i386/i386.md (int_cond): Remove code iterator.
+	(fp_cond): Ditto.
+	(cbranch<mode>4): Use ordered_comparison_operator predicate
+	for operator0.
+	(cstore<mode>4): Ditto for operator1.
+	(mov<SWIM:mode>cc): Ditto.
+
 2010-07-30  Richard Guenther  <rguenther@suse.de>
 
 	PR middle-end/45141
@@ -21,11 +30,13 @@
 2010-07-29  Jakub Jelinek  <jakub@redhat.com>
 
 	Revert:
+	2010-07-27  Bernd Schmidt  <bernds@codesourcery.com>
+
 	* rtl.def (NOTE): Swap operands 4 and 5.
-        * rtl.h (NOTE_DATA, NOTE_DELETED_LABEL_NAME, NOTE_BLOCK,
+	* rtl.h (NOTE_DATA, NOTE_DELETED_LABEL_NAME, NOTE_BLOCK,
 	NOTE_EH_HANDLER, NOTE_BASIC_BLOCK, NOTE_VAR_LOCATION, NOTE_KIND):
 	Adjust accordingly.
-        * gengtype.c (adjust_field_rtx_def): Swap operands 4 and 5 of NOTEs.
+	* gengtype.c (adjust_field_rtx_def): Swap operands 4 and 5 of NOTEs.
 
 2010-07-29  Jakub Jelinek  <jakub@redhat.com>
 
@@ -156,7 +167,7 @@
 2010-07-29  Ira Rosen  <irar@il.ibm.com>
 
 	* tree-vect-loop.c (vect_create_epilog_for_reduction): Switch
-	to outer loop when creating reduction epilogue for double reduction, 
+	to outer loop when creating reduction epilogue for double reduction,
 	and switch back to the inner loop when updating the phi nodes.
 	Update uses of outer loop exit phi nodes in double reduction (instead
 	of uses of reduction).
@@ -281,7 +292,7 @@
 
 2010-07-28  Iain Sandoe  <iains@gcc.gnu.org>
 
-	* config/rs6000/rs6000.c (rs6000_override_options): 
+	* config/rs6000/rs6000.c (rs6000_override_options):
 	Use TARGET_MACHO inline, move darwin_one_byte_bool from here...
 	... to darwin_rs6000_override_options.
 	(rs6000_return_in_memory): Update preceding comment for darwin
@@ -545,8 +556,9 @@
 2010-07-27  Jie Zhang  <jie@codesourcery.com>
 
 	PR target/44290
-	Revert
+	Revert:
 	2010-07-23  Jie Zhang  <jie@codesourcery.com>
+
 	* tree-sra.c (ipa_sra_preliminary_function_checks): Return
 	false if ! tree_versionable_function_p.
 
@@ -569,8 +581,7 @@
 	* hooks.c (hook_bool_constcharptr_size_t_false): Remove.
 	* hooks.h (hook_bool_constcharptr_size_t_false): Remove.
 	* langhooks-def.h (LANG_HOOKS_MISSING_ARGUMENT): Remove.
-	(LANG_HOOKS_INITIALIZER): Remove missing_argument hook
-	initializer.
+	(LANG_HOOKS_INITIALIZER): Remove missing_argument hook initializer.
 	* langhooks.h (struct lang_hooks): Remove missing_argument.
 	* optc-gen.awk: Handle MissingArgError and output new structure
 	field initializers.
@@ -604,7 +615,7 @@
 	PR tree-optimization/44152
 	* tree-vect-slp.c (vect_build_slp_tree): Collect nodes with
 	complex numbers for further check.
-	(vect_supported_load_permutation_p): Check nodes with 
+	(vect_supported_load_permutation_p): Check nodes with
 	complex numbers.
 
 2010-07-27  Joseph Myers  <joseph@codesourcery.com>
diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index 6616da2..265295a 100644
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -684,13 +684,6 @@
   [(set_attr "length" "128")
    (set_attr "type" "multi")])
 
-;; All integer comparison codes.
-(define_code_iterator int_cond [ne eq ge gt le lt geu gtu leu ltu])
-
-;; All floating-point comparison codes.
-(define_code_iterator fp_cond [unordered ordered
-			       uneq unge ungt unle unlt ltgt])
-
 (define_code_iterator plusminus [plus minus])
 
 (define_code_iterator sat_plusminus [ss_plus us_plus ss_minus us_minus])
@@ -941,7 +934,7 @@
 	(compare:CC (match_operand:SDWIM 1 "nonimmediate_operand" "")
 		    (match_operand:SDWIM 2 "<general_operand>" "")))
    (set (pc) (if_then_else
-	       (match_operator 0 "comparison_operator"
+	       (match_operator 0 "ordered_comparison_operator"
 		[(reg:CC FLAGS_REG) (const_int 0)])
 	       (label_ref (match_operand 3 "" ""))
 	       (pc)))]
@@ -960,7 +953,7 @@
 	(compare:CC (match_operand:SWIM 2 "nonimmediate_operand" "")
 		    (match_operand:SWIM 3 "<general_operand>" "")))
    (set (match_operand:QI 0 "register_operand" "")
-	(match_operator 1 "comparison_operator"
+	(match_operator 1 "ordered_comparison_operator"
 	  [(reg:CC FLAGS_REG) (const_int 0)]))]
   ""
 {
@@ -16028,7 +16021,7 @@
 
 (define_expand "mov<mode>cc"
   [(set (match_operand:SWIM 0 "register_operand" "")
-	(if_then_else:SWIM (match_operand 1 "comparison_operator" "")
+	(if_then_else:SWIM (match_operand 1 "ordered_comparison_operator" "")
 			   (match_operand:SWIM 2 "general_operand" "")
 			   (match_operand:SWIM 3 "general_operand" "")))]
   ""