2005-12-12 J"orn Rennecke <joern.rennecke@st.com>

	* cfgcleanup.c (condjump_equiv_p, try_crossjump_to_edge):
	Fix whitespace in vincinity of to-be-installed changes.
	* struct-equiv.c (merge_memattrs, death_notes_match_p): Fix whitespace.
	(insns_match_p): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@108410 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8f32189..063cc3f 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2005-12-12  J"orn Rennecke <joern.rennecke@st.com>
+
+       * cfgcleanup.c (condjump_equiv_p, try_crossjump_to_edge):
+       Fix whitespace in vincinity of to-be-installed changes.
+       * struct-equiv.c (merge_memattrs, death_notes_match_p): Fix whitespace.
+       (insns_match_p): Likewise.
+
 2005-12-12  Nathan Sidwell  <nathan@codesourcery.com>
 
        * config.gcc (ms1): Replace with ...

diff --git a/gcc/cfgcleanup.c b/gcc/cfgcleanup.c
index c8824ff..80d68de 100644 (file)
--- a/gcc/cfgcleanup.c
+++ b/gcc/cfgcleanup.c
@@ -956,28 +956,28 @@ condjump_equiv_p (basic_block bb1, basic_block bb2)
       int prob2;
 
       if (b1->dest == b2->dest)
-        prob2 = b2->probability;
+       prob2 = b2->probability;
       else
-        /* Do not use f2 probability as f2 may be forwarded.  */
-        prob2 = REG_BR_PROB_BASE - b2->probability;
+       /* Do not use f2 probability as f2 may be forwarded.  */
+       prob2 = REG_BR_PROB_BASE - b2->probability;
 
       /* Fail if the difference in probabilities is greater than 50%.
-         This rules out two well-predicted branches with opposite
-         outcomes.  */
+        This rules out two well-predicted branches with opposite
+        outcomes.  */
       if (abs (b1->probability - prob2) > REG_BR_PROB_BASE / 2)
-        {
-          if (dump_file)
-            fprintf (dump_file,
-                     "Outcomes of branch in bb %i and %i differ too much (%i %i)\n",
-                     bb1->index, bb2->index, b1->probability, prob2);
-
-          return false;
-        }
+       {
+         if (dump_file)
+           fprintf (dump_file,
+                    "Outcomes of branch in bb %i and %i differ too much (%i %i)\n",
+                    bb1->index, bb2->index, b1->probability, prob2);
+
+         return false;
+       }
     }
 
   if (dump_file && match)
     fprintf (dump_file, "Conditionals in bb %i and %i match.\n",
-             bb1->index, bb2->index);
+            bb1->index, bb2->index);
 
   return match;
 }
@@ -1173,12 +1173,12 @@ try_crossjump_to_edge (int mode, edge e1, edge e2)
   newpos1 = newpos2 = NULL_RTX;
 
   /* If we have partitioned hot/cold basic blocks, it is a bad idea
-     to try this optimization. 
+     to try this optimization.
 
      Basic block partitioning may result in some jumps that appear to
-     be optimizable (or blocks that appear to be mergeable), but which really 
-     must be left untouched (they are required to make it safely across 
-     partition boundaries).  See the comments at the top of 
+     be optimizable (or blocks that appear to be mergeable), but which really
+     must be left untouched (they are required to make it safely across
+     partition boundaries).  See the comments at the top of
      bb-reorder.c:partition_hot_cold_basic_blocks for complete details.  */
 
   if (flag_reorder_blocks_and_partition && no_new_pseudos)

diff --git a/gcc/struct-equiv.c b/gcc/struct-equiv.c
index 0ba1b9d..9169958 100644 (file)
--- a/gcc/struct-equiv.c
+++ b/gcc/struct-equiv.c
@@ -69,7 +69,7 @@ merge_memattrs (rtx x, rtx y)
        MEM_ATTRS (y) = 0;
       else if (! MEM_ATTRS (y))
        MEM_ATTRS (x) = 0;
-      else 
+      else
        {
          rtx mem_size;
 
@@ -78,7 +78,7 @@ merge_memattrs (rtx x, rtx y)
              set_mem_alias_set (x, 0);
              set_mem_alias_set (y, 0);
            }
-         
+
          if (! mem_expr_equal_p (MEM_EXPR (x), MEM_EXPR (y)))
            {
              set_mem_expr (x, 0);
@@ -91,7 +91,7 @@ merge_memattrs (rtx x, rtx y)
              set_mem_offset (x, 0);
              set_mem_offset (y, 0);
            }
-        
+
          if (!MEM_SIZE (x))
            mem_size = NULL_RTX;
          else if (!MEM_SIZE (y))
@@ -106,7 +106,7 @@ merge_memattrs (rtx x, rtx y)
          set_mem_align (y, MEM_ALIGN (x));
        }
     }
-  
+
   fmt = GET_RTX_FORMAT (code);
   for (i = GET_RTX_LENGTH (code) - 1; i >= 0; i--)
     {
@@ -143,8 +143,8 @@ death_notes_match_p (rtx i1 ATTRIBUTE_UNUSED, rtx i2 ATTRIBUTE_UNUSED,
   if ((mode & CLEANUP_POST_REGSTACK) && stack_regs_mentioned (i1))
     {
       /* If register stack conversion has already been done, then
-         death notes must also be compared before it is certain that
-         the two instruction streams match.  */
+        death notes must also be compared before it is certain that
+        the two instruction streams match.  */
 
       rtx note;
       HARD_REG_SET i1_regset, i2_regset;
@@ -200,7 +200,7 @@ insns_match_p (int mode, rtx i1, rtx i2)
 
   if (CALL_P (i1)
       && (!rtx_equal_p (CALL_INSN_FUNCTION_USAGE (i1),
-                       CALL_INSN_FUNCTION_USAGE (i2))
+                       CALL_INSN_FUNCTION_USAGE (i2))
          || SIBLING_CALL_P (i1) != SIBLING_CALL_P (i2)))
     return false;