* builtins.c, c-common.c, c-decl.c, c-format.c, c-format.h,

[pf3gnuchains/gcc-fork.git] / gcc / bt-load.c

diff --git a/gcc/bt-load.c b/gcc/bt-load.c
index ef4cf92..abfe8cd 100644 (file)
--- a/gcc/bt-load.c
+++ b/gcc/bt-load.c
@@ -821,7 +821,7 @@ block_at_edge_of_live_range_p (int bb, btr_def def)
 static void
 clear_btr_from_live_range (btr_def def)
 {
-  int bb;
+  unsigned bb;
   bitmap_iterator bi;
 
   EXECUTE_IF_SET_IN_BITMAP (def->live_range, 0, bb, bi)
@@ -845,7 +845,7 @@ clear_btr_from_live_range (btr_def def)
 static void
 add_btr_to_live_range (btr_def def)
 {
-  int bb;
+  unsigned bb;
   bitmap_iterator bi;
 
   EXECUTE_IF_SET_IN_BITMAP (def->live_range, 0, bb, bi)
@@ -879,6 +879,7 @@ augment_live_range (bitmap live_range, HARD_REG_SET *btrs_live_in_range,
   else
     {
       edge e;
+      edge_iterator ei;
       int new_block = new_bb->index;
 
       gcc_assert (dominated_by_p (CDI_DOMINATORS, head_bb, new_bb));
@@ -900,7 +901,7 @@ augment_live_range (bitmap live_range, HARD_REG_SET *btrs_live_in_range,
          dump_hard_reg_set (*btrs_live_in_range);
          fprintf (dump_file, "\n");
        }
-      for (e = head_bb->pred; e; e = e->pred_next)
+      FOR_EACH_EDGE (e, ei, head_bb->preds)
        *tos++ = e->src;
     }
 
@@ -910,6 +911,7 @@ augment_live_range (bitmap live_range, HARD_REG_SET *btrs_live_in_range,
       if (!bitmap_bit_p (live_range, bb->index))
        {
          edge e;
+         edge_iterator ei;
 
          bitmap_set_bit (live_range, bb->index);
          IOR_HARD_REG_SET (*btrs_live_in_range,
@@ -923,7 +925,7 @@ augment_live_range (bitmap live_range, HARD_REG_SET *btrs_live_in_range,
              fprintf (dump_file, "\n");
            }
 
-         for (e = bb->pred; e != NULL; e = e->pred_next)
+         FOR_EACH_EDGE (e, ei, bb->preds)
            {
              basic_block pred = e->src;
              if (!bitmap_bit_p (live_range, pred->index))
@@ -973,11 +975,9 @@ btr_def_live_range (btr_def def, HARD_REG_SET *btrs_live_in_range)
       def->live_range = BITMAP_XMALLOC ();
 
       bitmap_set_bit (def->live_range, def->bb->index);
-      if (flag_btr_bb_exclusive)
-       COPY_HARD_REG_SET (*btrs_live_in_range, btrs_live[def->bb->index]);
-      else
-       COPY_HARD_REG_SET (*btrs_live_in_range,
-                          btrs_live_at_end[def->bb->index]);
+      COPY_HARD_REG_SET (*btrs_live_in_range,
+                        (flag_btr_bb_exclusive
+                         ? btrs_live : btrs_live_at_end)[def->bb->index]);
 
       for (user = def->uses; user != NULL; user = user->next)
        augment_live_range (def->live_range, btrs_live_in_range,
@@ -989,26 +989,16 @@ btr_def_live_range (btr_def def, HARD_REG_SET *btrs_live_in_range)
         the set of target registers live over it, because migration
         of other PT instructions may have affected it.
       */
-      int bb;
-      int def_bb = def->bb->index;
+      unsigned bb;
+      unsigned def_bb = flag_btr_bb_exclusive ? -1 : def->bb->index;
       bitmap_iterator bi;
 
       CLEAR_HARD_REG_SET (*btrs_live_in_range);
-      if (flag_btr_bb_exclusive)
+      EXECUTE_IF_SET_IN_BITMAP (def->live_range, 0, bb, bi)
        {
-         EXECUTE_IF_SET_IN_BITMAP (def->live_range, 0, bb, bi)
-           {
-             IOR_HARD_REG_SET (*btrs_live_in_range, btrs_live[bb]);
-           }
-       }
-      else
-       {
-         EXECUTE_IF_SET_IN_BITMAP (def->live_range, 0, bb, bi)
-           {
-             IOR_HARD_REG_SET (*btrs_live_in_range,
-                               (def_bb == bb
-                                ? btrs_live_at_end : btrs_live) [bb]);
-           }
+         IOR_HARD_REG_SET (*btrs_live_in_range,
+                           (def_bb == bb
+                            ? btrs_live_at_end : btrs_live) [bb]);
        }
     }
   if (!def->other_btr_uses_before_def &&