* gcj.texi (Input and output files): Mention non-class entries.

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

diff --git a/gcc/ra-colorize.c b/gcc/ra-colorize.c
index f101eaa..074f735 100644 (file)
--- a/gcc/ra-colorize.c
+++ b/gcc/ra-colorize.c
@@ -20,6 +20,8 @@
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
+#include "tm.h"
 #include "rtl.h"
 #include "tm_p.h"
 #include "function.h"
@@ -336,7 +338,7 @@ build_worklists (df)
      backed by a new pseudo, but conceptually can stand for a stackslot,
      i.e. it doesn't really matter if they get a color or not), on
      the SELECT stack first, those with lowest cost first.  This way
-     they will be colored last, so do not contrain the coloring of the
+     they will be colored last, so do not constrain the coloring of the
      normal webs.  But still those with the highest count are colored
      before, i.e. get a color more probable.  The use of stackregs is
      a pure optimization, and all would work, if we used real stackslots
@@ -1160,7 +1162,7 @@ hardregset_to_string (s)
 {
   static char string[/*FIRST_PSEUDO_REGISTER + 30*/1024];
 #if FIRST_PSEUDO_REGISTER <= HOST_BITS_PER_WIDE_INT
-  sprintf (string, "%x", s);
+  sprintf (string, HOST_WIDE_INT_PRINT_HEX, s);
 #else
   char *c = string;
   int i,j;
@@ -1285,7 +1287,6 @@ colorize_one_web (web, hard)
   int c = -1;
   int bestc = -1;
   int neighbor_needs= 0;
-  struct web *fat_neighbor = NULL;
   struct web *fats_parent = NULL;
   int num_fat = 0;
   int long_blocks = 0;
@@ -1293,6 +1294,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;
 
@@ -1318,7 +1321,6 @@ colorize_one_web (web, hard)
                && w->add_hardregs >= neighbor_needs)
              {
                neighbor_needs = w->add_hardregs;
-               fat_neighbor = w;
                fats_parent = ptarget;
                num_fat++;
              }
@@ -1347,7 +1349,7 @@ colorize_one_web (web, hard)
       HARD_REG_SET call_clobbered;
 
       /* Here we choose a hard-reg for the current web.  For non spill
-         temporaries we first search in the hardregs for it's prefered
+         temporaries we first search in the hardregs for it's preferred
         class, then, if we found nothing appropriate, in those of the
         alternate class.  For spill temporaries we only search in
         usable_regs of this web (which is probably larger than that of
@@ -1509,7 +1511,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)
                {
@@ -1558,7 +1560,7 @@ colorize_one_web (web, hard)
                    set_cand (6, aw);
                  /* For boehm-gc/misc.c.  If we are a difficult spilltemp,
                     also coalesced neighbors are a chance, _even_ if they
-                    too are spilltemps.  At least their coalscing can be
+                    too are spilltemps.  At least their coalescing can be
                     broken up, which may be reset usable_regs, and makes
                     it easier colorable.  */
                  if (web->spill_temp != 2 && aw->is_coalesced
@@ -1669,9 +1671,7 @@ assign_colors ()
 
   while (WEBS(SELECT))
     {
-      struct web *web;
       d = pop_list (&WEBS(SELECT));
-      web = DLIST_WEB (d);
       colorize_one_web (DLIST_WEB (d), 1);
     }
 
@@ -2027,7 +2027,7 @@ check_colors ()
        if (!TEST_HARD_REG_BIT (web->usable_regs, aweb->color + c))
          abort ();
       /* Search the original (pre-coalesce) conflict list.  In the current
-        one some inprecise conflicts may be noted (due to combine() or
+        one some imprecise conflicts may be noted (due to combine() or
         insert_coalesced_conflicts() relocating partial conflicts) making
         it look like some wide webs are in conflict and having the same
         color.  */