iq2000.md (cbranchsi4): Remove mode from comparison and label.

	* config/iq2000/iq2000.md (cbranchsi4): Remove mode from
	comparison and label.
	(branch_zero): Likewise.
	(branch_zero_inverted): Likewise.
	(branch_equality): Likewise.
	(branch_equality_inverted): Likewise.
	(extend-and-compare): Disable until reload issues can be
	resolved.
	* config/iq2000/iq2000.c (gen_conditional_branch): Use VOIDmode
	for comparison.
	(iq2000_function_arg_advance): Remove CONST_CAST2.

From-SVN: r190476

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bdabc9abd9b3c31c81f449018b5a8a3def281fa9..eea212fb8048de8035ae51f8186927d7517a7d8b 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -61,6 +61,18 @@
 
 2012-08-17  Nick Clifton  <nickc@redhat.com>
 
+       * config/iq2000/iq2000.md (cbranchsi4): Remove mode from
+       comparison and label.
+       (branch_zero): Likewise.
+       (branch_zero_inverted): Likewise.
+       (branch_equality): Likewise.
+       (branch_equality_inverted): Likewise.
+       (extend-and-compare): Disable until reload issues can be
+       resolved.
+       * config/iq2000/iq2000.c (gen_conditional_branch): Use VOIDmode
+       for comparison.
+       (iq2000_function_arg_advance): Remove CONST_CAST2.
+
        * config/mep/t-mep (mep-pragma.o): Use $(COMPILER) to compile
        mep-pragma.c.
 

diff --git a/gcc/config/iq2000/iq2000.c b/gcc/config/iq2000/iq2000.c
index e75eb2f806ab8a7ac30b3332280592005499192a..ab55a154f06a197139b773a3d60d435412531b26 100644 (file)
--- a/gcc/config/iq2000/iq2000.c
+++ b/gcc/config/iq2000/iq2000.c
@@ -1076,7 +1076,7 @@ gen_conditional_branch (rtx operands[], enum machine_mode mode)
   emit_jump_insn (gen_rtx_SET (VOIDmode, pc_rtx,
                               gen_rtx_IF_THEN_ELSE (VOIDmode,
                                                     gen_rtx_fmt_ee (test_code,
-                                                                    mode,
+                                                                    VOIDmode,
                                                                     cmp0, cmp1),
                                                     label1, label2)));
 }
@@ -1140,7 +1140,7 @@ iq2000_function_arg_advance (cumulative_args_t cum_v, enum machine_mode mode,
               "function_adv({gp reg found = %d, arg # = %2d, words = %2d}, %4s, ",
               cum->gp_reg_found, cum->arg_number, cum->arg_words,
               GET_MODE_NAME (mode));
-      fprintf (stderr, "%p", CONST_CAST2 (void *, const_tree,  type));
+      fprintf (stderr, "%p", type);
       fprintf (stderr, ", %d )\n\n", named);
     }
 

diff --git a/gcc/config/iq2000/iq2000.md b/gcc/config/iq2000/iq2000.md
index 51fbe22fbe2f5ef6f3c0c93ec6aa774797af24e6..59a97d42b0a5291eec67632c02d8702b3892aff2 100644 (file)
--- a/gcc/config/iq2000/iq2000.md
+++ b/gcc/config/iq2000/iq2000.md
@@ -1001,10 +1001,10 @@
 (define_expand "cbranchsi4"
   [(set (pc)
         (if_then_else
-         (match_operator:SI 0 "ordered_comparison_operator"
-                            [(match_operand:SI 1 "register_operand")
-                             (match_operand:SI 2 "reg_or_const_operand")])
-        (label_ref (match_operand:SI 3 ""))
+         (match_operator 0 "ordered_comparison_operator"
+                        [(match_operand:SI 1 "register_operand")
+                         (match_operand:SI 2 "reg_or_const_operand")])
+        (label_ref (match_operand 3 ""))
         (pc)))]
   ""
   "
@@ -1019,9 +1019,9 @@
 (define_insn "branch_zero"
   [(set (pc)
        (if_then_else
-         (match_operator:SI 0 "cmp_op"
-                           [(match_operand:SI 2 "register_operand" "d")
-                            (const_int 0)])
+         (match_operator 0 "cmp_op"
+                        [(match_operand:SI 2 "register_operand" "d")
+                         (const_int 0)])
         (label_ref (match_operand 1 "" ""))
         (pc)))]
   ""
@@ -1040,9 +1040,9 @@
 (define_insn "branch_zero_inverted"
   [(set (pc)
        (if_then_else
-         (match_operator:SI 0 "cmp_op"
-                           [(match_operand:SI 2 "register_operand" "d")
-                            (const_int 0)])
+         (match_operator 0 "cmp_op"
+                        [(match_operand:SI 2 "register_operand" "d")
+                         (const_int 0)])
         (pc)
         (label_ref (match_operand 1 "" ""))))]
   ""
@@ -1063,9 +1063,9 @@
 (define_insn "branch_equality"
   [(set (pc)
        (if_then_else
-         (match_operator:SI 0 "equality_op"
-                           [(match_operand:SI 2 "register_operand" "d")
-                            (match_operand:SI 3 "register_operand" "d")])
+         (match_operator 0 "equality_op"
+                        [(match_operand:SI 2 "register_operand" "d")
+                         (match_operand:SI 3 "register_operand" "d")])
          (label_ref (match_operand 1 "" ""))
          (pc)))]
   ""
@@ -1084,9 +1084,9 @@
 (define_insn "branch_equality_inverted"
   [(set (pc)
        (if_then_else
-         (match_operator:SI 0 "equality_op"
-                           [(match_operand:SI 2 "register_operand" "d")
-                            (match_operand:SI 3 "register_operand" "d")])
+         (match_operator 0 "equality_op"
+                        [(match_operand:SI 2 "register_operand" "d")
+                         (match_operand:SI 3 "register_operand" "d")])
          (pc)
          (label_ref (match_operand 1 "" ""))))]
   ""
@@ -1145,7 +1145,7 @@
             (const_int 0))
         (match_operand 2 "pc_or_label_operand" "")
         (match_operand 3 "pc_or_label_operand" "")))]
-  ""
+  "0"
   "bb%A2\\t%0(31-%1),%P2%P3"
   [(set_attr "length" "4")
    (set_attr "type" "branch")])
@@ -1159,7 +1159,7 @@
             (const_int 0))
         (match_operand 2 "pc_or_label_operand" "")
         (match_operand 3 "pc_or_label_operand" "")))]
-  ""
+  "0"
   "bb%A3\\t%0(31-%1),%P2%P3"
   [(set_attr "length" "4")
    (set_attr "type" "branch")])