2004-11-16 Eric Christopher <echristo@redhat.com>

[pf3gnuchains/gcc-fork.git] / gcc / ra-colorize.c

diff --git a/gcc/ra-colorize.c b/gcc/ra-colorize.c
index 829a2b7..6d7980c 100644 (file)
--- a/gcc/ra-colorize.c
+++ b/gcc/ra-colorize.c
@@ -210,7 +210,6 @@ void
 reset_lists (void)
 {
   struct dlist *d;
-  unsigned int i;
 
   gcc_assert (!WEBS(SIMPLIFY));
   gcc_assert (!WEBS(SIMPLIFY_SPILL));
@@ -248,14 +247,18 @@ reset_lists (void)
     }
 
 #ifdef ENABLE_CHECKING
-  /* Sanity check, that we only have free, initial or precolored webs. */
-  for (i = 0; i < num_webs; i++)
-    {
-      struct web *web = ID2WEB (i);
-      
-      gcc_assert (web->type == INITIAL || web->type == FREE
-                 || web->type == PRECOLORED);
-    }
+  /* Sanity check, that we only have free, initial or precolored webs.  */
+  {
+    unsigned int i;
+
+    for (i = 0; i < num_webs; i++)
+      {
+       struct web *web = ID2WEB (i);
+
+       gcc_assert (web->type == INITIAL || web->type == FREE
+                   || web->type == PRECOLORED);
+      }
+  }
 #endif
   free_dlist (&mv_worklist);
   free_dlist (&mv_coalesced);
@@ -1260,7 +1263,7 @@ colorize_one_web (struct web *web, int hard)
   HARD_REG_SET bias;
 
   CLEAR_HARD_REG_SET (fat_colors);
-  
+
   if (web->regno >= max_normal_pseudo)
     hard = 0;
 
@@ -1973,11 +1976,11 @@ check_colors (void)
       struct web *web = id2web[i];
       struct web *aweb = alias (web);
       struct conflict_link *wl;
-      int nregs, c;
+      int nregs;
 
       if (web->regno >= max_normal_pseudo)
        continue;
-      
+
       switch (aweb->type)
        {
        case SPILLED:
@@ -1996,9 +1999,12 @@ check_colors (void)
        }
 
 #ifdef ENABLE_CHECKING
-      /* The color must be valid for the original usable_regs.  */
-      for (c = 0; c < nregs; c++)
-       gcc_assert (TEST_HARD_REG_BIT (web->usable_regs, aweb->color + c));
+       /* The color must be valid for the original usable_regs.  */
+      {
+       int c;
+       for (c = 0; c < nregs; c++)
+         gcc_assert (TEST_HARD_REG_BIT (web->usable_regs, aweb->color + c));
+      }
 #endif
       /* Search the original (pre-coalesce) conflict list.  In the current
         one some imprecise conflicts may be noted (due to combine() or
@@ -2487,7 +2493,7 @@ ok_class (struct web *target, struct web *source)
      branch on count transformation (i.e. DoLoop) since the target, which
      prefers the CTR, was being coalesced with a source which preferred
      GENERAL_REGS. If only one web has a preferred class with 1 free reg
-     then set it as the preferred color of the other web.   */
+     then set it as the preferred color of the other web.  */
   enum reg_class t_class, s_class;
   t_class = reg_preferred_class (target->regno);
   s_class = reg_preferred_class (source->regno);