As suggested here:

http://gcc.gnu.org/ml/gcc-patches/2012-10/msg00283.html

The following are committed as obvious / trivial:
	* config/rs6000/predicates.md (zero_fp_constant): Fix comment.
	* config/rs6000/rs6000.md (return_pred): Fix null return.
	* config/rs6000/rs6000.c (rs6000_emit_set_const): Fix indentation.
	(print_operand): Make FALLTHRU obvious.
	(output_cbranch): Correct comment.

From-SVN: r192373

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1509897e762ec6c0d60e6ebd75e1607734d96c6f..9ddad1bd4a3d65d13a9a24385883f5de9f1e0b29 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2012-10-11  James Lemke  <jwlemke@codesourcery.com>
+
+       * config/rs6000/predicates.md (zero_fp_constant): Fix comment.
+       * config/rs6000/rs6000.md (return_pred): Fix null return.
+       * config/rs6000/rs6000.c (rs6000_emit_set_const): Fix indentation.
+       (print_operand): Make FALLTHRU obvious.
+       (output_cbranch): Correct comment.
+
 2012-10-11  Uros Bizjak  <ubizjak@gmail.com>
 
        * config/alpha/alpha.md (DWI): New mode attribute.

diff --git a/gcc/config/rs6000/predicates.md b/gcc/config/rs6000/predicates.md
index 12b75275a32b745d1bd3f814cd18228fd8d7e7e0..99130ba6eef40c58aa72231b129322146715ac55 100644 (file)
--- a/gcc/config/rs6000/predicates.md
+++ b/gcc/config/rs6000/predicates.md
@@ -490,7 +490,6 @@
        (match_test "op == CONST0_RTX (mode)")))
 
 ;; Return 1 if operand is 0.0.
-;; or non-special register register field no cr0
 (define_predicate "zero_fp_constant"
   (and (match_code "const_double")
        (match_test "SCALAR_FLOAT_MODE_P (mode)

diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index ced06508e87a96fc87e4a2e68aebcbee75d90d15..b6f3a9c9407b2c4659fdb0de3731cc0a54e1d596 100644 (file)
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -6751,7 +6751,7 @@ rs6000_emit_set_const (rtx dest, enum machine_mode mode,
 
   switch (mode)
     {
-      case  QImode:
+    case  QImode:
     case HImode:
       if (dest == NULL)
        dest = gen_reg_rtx (mode);
@@ -14990,11 +14990,10 @@ print_operand (FILE *file, rtx x, int code)
       return;
 
     case 'Q':
-      if (TARGET_MFCRF)
-       fputc (',', file);
-        /* FALLTHRU */
-      else
+      if (! TARGET_MFCRF)
        return;
+      fputc (',', file);
+      /* FALLTHRU */
 
     case 'R':
       /* X is a CR register.  Print the mask for `mtcrf'.  */
@@ -15939,7 +15938,7 @@ rs6000_emit_cbranch (enum machine_mode mode, rtx operands[])
 }
 
 /* Return the string to output a conditional branch to LABEL, which is
-   the operand number of the label, or -1 if the branch is really a
+   the operand template of the label, or NULL if the branch is really a
    conditional return.
 
    OP is the conditional expression.  XEXP (OP, 0) is assumed to be a

diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md
index 4265cb67b0f3b82b1e38b19c4f492142bac0e4d6..96f4f6a83211d00c31db99148118f85299d9f1c9 100644 (file)
--- a/gcc/config/rs6000/rs6000.md
+++ b/gcc/config/rs6000/rs6000.md
@@ -266,7 +266,7 @@
 ; Conditional returns.
 (define_code_iterator any_return [return simple_return])
 (define_code_attr return_pred [(return "direct_return ()")
-                              (simple_return "")])
+                              (simple_return "1")])
 (define_code_attr return_str [(return "") (simple_return "simple_")])
 
 ; Various instructions that come in SI and DI forms.