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

gcc/ChangeLog

+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,6 +30,8 @@
 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,
 	NOTE_EH_HANDLER, NOTE_BASIC_BLOCK, NOTE_VAR_LOCATION, NOTE_KIND):
@@ -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.

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" "")))]
   ""