X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fra-rewrite.c;h=2f4ce6cfcf1e9c431625e5d3f0b3a0f69ef0b5a4;hb=1e5fcbe2009a34584768d8b8833756bc8de97dc3;hp=23c26ba9c3f09a8f4364958a7b6109247fa55e8b;hpb=0cc4271a0f43fa0d3e4b3b728a3c103d39e305cd;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/gcc/ra-rewrite.c b/gcc/ra-rewrite.c
index 23c26ba9c3f..2f4ce6cfcf1 100644
--- a/gcc/ra-rewrite.c
+++ b/gcc/ra-rewrite.c
@@ -996,7 +996,8 @@ reloads_to_loads (struct rewrite_info *ri, struct ref **refs,
       struct web *web = ref2web[DF_REF_ID (refs[n])];
       struct web *supweb = find_web_for_subweb (web);
       int is_death;
-      int j;
+      unsigned j;
+      
       /* Only emit reloads when entering their interference
 	 region.  A use of a spilled web never opens an
 	 interference region, independent of it's color.  */
@@ -1034,8 +1035,7 @@ reloads_to_loads (struct rewrite_info *ri, struct ref **refs,
 		}
 	    }
 	  if (num_reloads != old_num_r)
-	    bitmap_operation (ri->need_reload, ri->need_reload, ri->scratch,
-			      BITMAP_AND_COMPL);
+	    bitmap_and_compl_into (ri->need_reload, ri->scratch);
 	}
     }
   ri->num_reloads = num_reloads;
@@ -1063,7 +1063,7 @@ rewrite_program2 (bitmap new_deaths)
     {
       basic_block last_bb = NULL;
       rtx last_block_insn;
-      int i, j;
+      unsigned i, j;
       bitmap_iterator bi;
 
       if (!INSN_P (insn))
@@ -1163,8 +1163,7 @@ rewrite_program2 (bitmap new_deaths)
 		      ri.num_reloads--;
 		    }
 		}
-	      bitmap_operation (ri.need_reload, ri.need_reload, ri.scratch,
-				BITMAP_AND_COMPL);
+	      bitmap_and_compl_into (ri.need_reload, ri.scratch);
 	      last_bb = BLOCK_FOR_INSN (insn);
 	      last_block_insn = insn;
 	      if (!INSN_P (last_block_insn))
@@ -1350,13 +1349,17 @@ rewrite_program2 (bitmap new_deaths)
 	  int in_ir = 0;
 	  edge e;
 	  int num = 0;
+	  edge_iterator ei;
 	  bitmap_iterator bi;
 
 	  HARD_REG_SET cum_colors, colors;
 	  CLEAR_HARD_REG_SET (cum_colors);
-	  for (e = bb->pred; e && num < 5; e = e->pred_next, num++)
+	  FOR_EACH_EDGE (e, ei, bb->preds)
 	    {
-	      int j;
+	      unsigned j;
+
+	      if (num >= 5)
+		break;
 	      CLEAR_HARD_REG_SET (colors);
 	      EXECUTE_IF_SET_IN_BITMAP (live_at_end[e->src->index], 0, j, bi)
 		{
@@ -1366,6 +1369,7 @@ rewrite_program2 (bitmap new_deaths)
 		    update_spill_colors (&colors, web, 1);
 		}
 	      IOR_HARD_REG_SET (cum_colors, colors);
+	      num++;
 	    }
 	  if (num == 5)
 	    in_ir = 1;
@@ -1392,9 +1396,8 @@ rewrite_program2 (bitmap new_deaths)
 		  bitmap_set_bit (ri.scratch, j);
 		  ri.num_reloads--;
 		}
-	  }
-	  bitmap_operation (ri.need_reload, ri.need_reload, ri.scratch,
-			    BITMAP_AND_COMPL);
+	    }
+	  bitmap_and_compl_into (ri.need_reload, ri.scratch);
 	}
 
       ri.need_load = 1;
@@ -1536,8 +1539,7 @@ detect_web_parts_to_rebuild (void)
      indeed not become member of it again).  */
   live_at_end -= 2;
   for (i = 0; i < (unsigned int) last_basic_block + 2; i++)
-    bitmap_operation (live_at_end[i], live_at_end[i], uses_as_bitmap,
-		      BITMAP_AND_COMPL);
+    bitmap_and_compl_into (live_at_end[i], uses_as_bitmap);
   live_at_end += 2;
 
   if (dump_file && (debug_new_regalloc & DUMP_REBUILD) != 0)
@@ -1628,7 +1630,7 @@ reset_changed_flag (void)
 void
 actual_spill (void)
 {
-  int i;
+  unsigned i;
   bitmap_iterator bi;
   bitmap new_deaths = BITMAP_XMALLOC ();