* c-common.h (enum rid): Remove RID_BOUNDED, RID_UNBOUNDED.

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

diff --git a/gcc/ra-colorize.c b/gcc/ra-colorize.c
index b867255..7b9016a 100644 (file)
--- a/gcc/ra-colorize.c
+++ b/gcc/ra-colorize.c
@@ -534,13 +534,14 @@ merge_moves (u, v)
      struct web *u, *v;
 {
   regset seen;
-  struct move_list *ml;
+  struct move_list *ml, *ml_next;
 
   seen = BITMAP_XMALLOC ();
   for (ml = u->moves; ml; ml = ml->next)
     bitmap_set_bit (seen, INSN_UID (ml->move->insn));
-  for (ml = v->moves; ml; ml = ml->next)
+  for (ml = v->moves; ml; ml = ml_next)
     {
+      ml_next = ml->next;
       if (! bitmap_bit_p (seen, INSN_UID (ml->move->insn)))
         {
          ml->next = u->moves;
@@ -1294,6 +1295,8 @@ colorize_one_web (web, hard)
   HARD_REG_SET fat_colors;
   HARD_REG_SET bias;
 
+  CLEAR_HARD_REG_SET (fat_colors);
+  
   if (web->regno >= max_normal_pseudo)
     hard = 0;
 
@@ -1367,10 +1370,9 @@ colorize_one_web (web, hard)
       else
        COPY_HARD_REG_SET (colors,
                           usable_regs[reg_preferred_class (web->regno)]);
-#ifdef CLASS_CANNOT_CHANGE_MODE
+#ifdef CANNOT_CHANGE_MODE_CLASS
       if (web->mode_changed)
-        AND_COMPL_HARD_REG_SET (colors, reg_class_contents[
-                                 (int) CLASS_CANNOT_CHANGE_MODE]);
+        AND_COMPL_HARD_REG_SET (colors, invalid_mode_change_regs);
 #endif
       COPY_HARD_REG_SET (call_clobbered, colors);
       AND_HARD_REG_SET (call_clobbered, call_used_reg_set);
@@ -1401,10 +1403,9 @@ colorize_one_web (web, hard)
          else
            IOR_HARD_REG_SET (colors, usable_regs
                              [reg_alternate_class (web->regno)]);
-#ifdef CLASS_CANNOT_CHANGE_MODE
+#ifdef CANNOT_CHANGE_MODE_CLASS
          if (web->mode_changed)
-           AND_COMPL_HARD_REG_SET (colors, reg_class_contents[
-                                     (int) CLASS_CANNOT_CHANGE_MODE]);
+           AND_COMPL_HARD_REG_SET (colors, invalid_mode_change_regs);
 #endif
          COPY_HARD_REG_SET (call_clobbered, colors);
          AND_HARD_REG_SET (call_clobbered, call_used_reg_set);
@@ -1509,7 +1510,7 @@ colorize_one_web (web, hard)
              struct web *aw = alias (w);
              /* If we are a spill-temp, we also look at webs coalesced
                 to precolored ones.  Otherwise we only look at webs which
-                themself were colored, or coalesced to one.  */
+                themselves were colored, or coalesced to one.  */
              if (aw->type == PRECOLORED && w != aw && web->spill_temp
                  && flag_ra_optimistic_coalescing)
                {
@@ -2721,7 +2722,7 @@ ra_colorize_free_all ()
     put_web (DLIST_WEB (d), INITIAL);
   while ((d = pop_list (&WEBS(INITIAL))) != NULL)
     {
-      struct web *web =DLIST_WEB (d);
+      struct web *web = DLIST_WEB (d);
       struct web *wnext;
       web->orig_conflict_list = NULL;
       web->conflict_list = NULL;