Correct the date for my last ChangeLog entry.

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

diff --git a/gcc/bt-load.c b/gcc/bt-load.c
index f49cec8..c3bc3fa 100644 (file)
--- a/gcc/bt-load.c
+++ b/gcc/bt-load.c
@@ -22,13 +22,9 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"

-#include "bitmap.h"
-#include "sbitmap.h"

 #include "rtl.h"
 #include "hard-reg-set.h"
 #include "rtl.h"
 #include "hard-reg-set.h"

-#include "basic-block.h"

 #include "regs.h"
 #include "regs.h"

-#include "obstack.h"

 #include "fibheap.h"
 #include "output.h"
 #include "target.h"
 #include "fibheap.h"
 #include "output.h"
 #include "target.h"


@@ -102,6 +98,10 @@ typedef struct btr_def_s
      as appropriate.  */
   char other_btr_uses_before_def;
   char other_btr_uses_after_use;
      as appropriate.  */
   char other_btr_uses_before_def;
   char other_btr_uses_after_use;

+  /* We set own_end when we have moved a definition into a dominator.
+     Thus, when a later combination removes this definition again, we know
+     to clear out trs_live_at_end again.  */
+  char own_end;

   bitmap live_range;
 } *btr_def;
 
   bitmap live_range;
 } *btr_def;
 


@@ -127,9 +127,9 @@ static void link_btr_uses (btr_def *, btr_user *, sbitmap *, sbitmap *, int);
 static void build_btr_def_use_webs (fibheap_t);
 static int block_at_edge_of_live_range_p (int, btr_def);
 static void clear_btr_from_live_range (btr_def def);
 static void build_btr_def_use_webs (fibheap_t);
 static int block_at_edge_of_live_range_p (int, btr_def);
 static void clear_btr_from_live_range (btr_def def);

-static void add_btr_to_live_range (btr_def);
+static void add_btr_to_live_range (btr_def, int);

 static void augment_live_range (bitmap, HARD_REG_SET *, basic_block,
 static void augment_live_range (bitmap, HARD_REG_SET *, basic_block,

-                               basic_block);
+                               basic_block, int);

 static int choose_btr (HARD_REG_SET);
 static void combine_btr_defs (btr_def, HARD_REG_SET *);
 static void btr_def_live_range (btr_def, HARD_REG_SET *);
 static int choose_btr (HARD_REG_SET);
 static void combine_btr_defs (btr_def, HARD_REG_SET *);
 static void btr_def_live_range (btr_def, HARD_REG_SET *);


@@ -195,10 +195,10 @@ find_btr_reference (rtx *px, void *preg)
   if (px == preg)
     return -1;
   x = *px;
   if (px == preg)
     return -1;
   x = *px;

-  if (GET_CODE (x) != REG)
+  if (!REG_P (x))

     return 0;
   regno = REGNO (x);
     return 0;
   regno = REGNO (x);

-  for (i = HARD_REGNO_NREGS (regno, GET_MODE (x)) - 1; i >= 0; i--)
+  for (i = hard_regno_nregs[regno][GET_MODE (x)] - 1; i >= 0; i--)

     if (TEST_HARD_REG_BIT (all_btrs, regno+i))
       {
        btr_reference_found = px;
     if (TEST_HARD_REG_BIT (all_btrs, regno+i))
       {
        btr_reference_found = px;


@@ -225,7 +225,7 @@ insn_sets_btr_p (rtx insn, int check_const, int *regno)
 {
   rtx set;
 
 {
   rtx set;
 

-  if (GET_CODE (insn) == INSN
+  if (NONJUMP_INSN_P (insn)

       && (set = single_set (insn)))
     {
       rtx dest = SET_DEST (set);
       && (set = single_set (insn)))
     {
       rtx dest = SET_DEST (set);


@@ -234,11 +234,11 @@ insn_sets_btr_p (rtx insn, int check_const, int *regno)
       if (GET_CODE (dest) == SUBREG)
        dest = XEXP (dest, 0);
 
       if (GET_CODE (dest) == SUBREG)
        dest = XEXP (dest, 0);
 

-      if (GET_CODE (dest) == REG
+      if (REG_P (dest)

          && TEST_HARD_REG_BIT (all_btrs, REGNO (dest)))
        {
          && TEST_HARD_REG_BIT (all_btrs, REGNO (dest)))
        {

-         if (btr_referenced_p (src, NULL))
-           abort();
+         gcc_assert (!btr_referenced_p (src, NULL));
+         

          if (!check_const || CONSTANT_P (src))
            {
              if (regno)
          if (!check_const || CONSTANT_P (src))
            {
              if (regno)


@@ -319,8 +319,8 @@ add_btr_def (fibheap_t all_btr_defs, basic_block bb, int insn_luid, rtx insn,
 
   fibheap_insert (all_btr_defs, -this->cost, this);
 
 
   fibheap_insert (all_btr_defs, -this->cost, this);
 

-  if (rtl_dump_file)
-    fprintf (rtl_dump_file,
+  if (dump_file)
+    fprintf (dump_file,

       "Found target reg definition: sets %u { bb %d, insn %d }%s priority %d\n",
       dest_reg, bb->index, INSN_UID (insn), (this->group ? "" : ":not const"),
       this->cost);
       "Found target reg definition: sets %u { bb %d, insn %d }%s priority %d\n",
       dest_reg, bb->index, INSN_UID (insn), (this->group ? "" : ":not const"),
       this->cost);


@@ -363,13 +363,13 @@ new_btr_user (basic_block bb, int insn_luid, rtx insn)
   user->n_reaching_defs = 0;
   user->first_reaching_def = -1;
 
   user->n_reaching_defs = 0;
   user->first_reaching_def = -1;
 

-  if (rtl_dump_file)
+  if (dump_file)

     {
     {

-      fprintf (rtl_dump_file, "Uses target reg: { bb %d, insn %d }",
+      fprintf (dump_file, "Uses target reg: { bb %d, insn %d }",

               bb->index, INSN_UID (insn));
 
       if (user->use)
               bb->index, INSN_UID (insn));
 
       if (user->use)

-       fprintf (rtl_dump_file, ": unambiguous use of reg %d\n",
+       fprintf (dump_file, ": unambiguous use of reg %d\n",

                 REGNO (user->use));
     }
 
                 REGNO (user->use));
     }
 


@@ -383,16 +383,16 @@ dump_hard_reg_set (HARD_REG_SET s)
   int reg;
   for (reg = 0; reg < FIRST_PSEUDO_REGISTER; reg++)
     if (TEST_HARD_REG_BIT (s, reg))
   int reg;
   for (reg = 0; reg < FIRST_PSEUDO_REGISTER; reg++)
     if (TEST_HARD_REG_BIT (s, reg))

-      fprintf (rtl_dump_file, " %d", reg);
+      fprintf (dump_file, " %d", reg);

 }
 
 /* Write the set of target regs live in block BB to the dump file.  */
 static void
 dump_btrs_live (int bb)
 {
 }
 
 /* Write the set of target regs live in block BB to the dump file.  */
 static void
 dump_btrs_live (int bb)
 {

-  fprintf (rtl_dump_file, "BB%d live:", bb);
+  fprintf (dump_file, "BB%d live:", bb);

   dump_hard_reg_set (btrs_live[bb]);
   dump_hard_reg_set (btrs_live[bb]);

-  fprintf (rtl_dump_file, "\n");
+  fprintf (dump_file, "\n");

 }
 
 /* REGNO is the number of a branch target register that is being used or
 }
 
 /* REGNO is the number of a branch target register that is being used or


@@ -427,10 +427,10 @@ note_btr_set (rtx dest, rtx set ATTRIBUTE_UNUSED, void *data)
   defs_uses_info *info = data;
   int regno, end_regno;
 
   defs_uses_info *info = data;
   int regno, end_regno;
 

-  if (GET_CODE (dest) != REG)
+  if (!REG_P (dest))

     return;
   regno = REGNO (dest);
     return;
   regno = REGNO (dest);

-  end_regno = regno + HARD_REGNO_NREGS (regno, GET_MODE (dest));
+  end_regno = regno + hard_regno_nregs[regno][GET_MODE (dest)];

   for (; regno < end_regno; regno++)
     if (TEST_HARD_REG_BIT (all_btrs, regno))
       {
   for (; regno < end_regno; regno++)
     if (TEST_HARD_REG_BIT (all_btrs, regno))
       {


@@ -533,7 +533,7 @@ compute_defs_uses_and_gen (fibheap_t all_btr_defs, btr_def *def_array,
                      user->next = info.users_this_bb;
                      info.users_this_bb = user;
                    }
                      user->next = info.users_this_bb;
                      info.users_this_bb = user;
                    }

-                 if (GET_CODE (insn) == CALL_INSN)
+                 if (CALL_P (insn))

                    {
                      HARD_REG_SET *clobbered = &call_used_reg_set;
                      HARD_REG_SET call_saved;
                    {
                      HARD_REG_SET *clobbered = &call_used_reg_set;
                      HARD_REG_SET call_saved;


@@ -580,7 +580,7 @@ compute_defs_uses_and_gen (fibheap_t all_btr_defs, btr_def *def_array,
          IOR_HARD_REG_SET (btrs_live_at_end[i], tmp);
          can_throw = 1;
        }
          IOR_HARD_REG_SET (btrs_live_at_end[i], tmp);
          can_throw = 1;
        }

-      if (can_throw || GET_CODE (insn) == JUMP_INSN)
+      if (can_throw || JUMP_P (insn))

        {
          int regno;
 
        {
          int regno;
 


@@ -589,7 +589,7 @@ compute_defs_uses_and_gen (fibheap_t all_btr_defs, btr_def *def_array,
              SET_HARD_REG_BIT (btrs_live_at_end[i], regno);
        }
 
              SET_HARD_REG_BIT (btrs_live_at_end[i], regno);
        }
 

-      if (rtl_dump_file)
+      if (dump_file)

        dump_btrs_live(i);
     }
 }
        dump_btrs_live(i);
     }
 }


@@ -710,8 +710,8 @@ link_btr_uses (btr_def *def_array, btr_user *use_array, sbitmap *bb_out,
 
                      /* We now know that def reaches user.  */
 
 
                      /* We now know that def reaches user.  */
 

-                     if (rtl_dump_file)
-                       fprintf (rtl_dump_file,
+                     if (dump_file)
+                       fprintf (dump_file,

                          "Def in insn %d reaches use in insn %d\n",
                          uid, insn_uid);
 
                          "Def in insn %d reaches use in insn %d\n",
                          uid, insn_uid);
 


@@ -725,8 +725,8 @@ link_btr_uses (btr_def *def_array, btr_user *use_array, sbitmap *bb_out,
                          def->has_ambiguous_use = 1;
                          def_array[user->first_reaching_def]
                            ->has_ambiguous_use = 1;
                          def->has_ambiguous_use = 1;
                          def_array[user->first_reaching_def]
                            ->has_ambiguous_use = 1;

-                         if (rtl_dump_file)
-                           fprintf (rtl_dump_file,
+                         if (dump_file)
+                           fprintf (dump_file,

                                     "(use %d has multiple reaching defs)\n",
                                     insn_uid);
                        }
                                     "(use %d has multiple reaching defs)\n",
                                     insn_uid);
                        }


@@ -740,7 +740,7 @@ link_btr_uses (btr_def *def_array, btr_user *use_array, sbitmap *bb_out,
                  sbitmap_free (reaching_defs_of_reg);
                }
 
                  sbitmap_free (reaching_defs_of_reg);
                }
 

-             if (GET_CODE (insn) == CALL_INSN)
+             if (CALL_P (insn))

                {
                  int regno;
 
                {
                  int regno;
 


@@ -821,39 +821,49 @@ block_at_edge_of_live_range_p (int bb, btr_def def)
 static void
 clear_btr_from_live_range (btr_def def)
 {
 static void
 clear_btr_from_live_range (btr_def def)
 {

-  int bb;
-
-  EXECUTE_IF_SET_IN_BITMAP
-    (def->live_range, 0, bb,
-     {
-       if ((!def->other_btr_uses_before_def
-            && !def->other_btr_uses_after_use)
-          || !block_at_edge_of_live_range_p (bb, def))
-        {
-          CLEAR_HARD_REG_BIT (btrs_live[bb], def->btr);
-          CLEAR_HARD_REG_BIT (btrs_live_at_end[bb], def->btr);
-          if (rtl_dump_file)
-            dump_btrs_live (bb);
-        }
-     });
+  unsigned bb;
+  bitmap_iterator bi;
+
+  EXECUTE_IF_SET_IN_BITMAP (def->live_range, 0, bb, bi)
+    {
+      if ((!def->other_btr_uses_before_def
+          && !def->other_btr_uses_after_use)
+         || !block_at_edge_of_live_range_p (bb, def))
+       {
+         CLEAR_HARD_REG_BIT (btrs_live[bb], def->btr);
+         CLEAR_HARD_REG_BIT (btrs_live_at_end[bb], def->btr);
+         if (dump_file)
+           dump_btrs_live (bb);
+       }
+    }
+ if (def->own_end)
+   CLEAR_HARD_REG_BIT (btrs_live_at_end[def->bb->index], def->btr);

 }
 
 
 /* We are adding the def/use web DEF.  Add the target register used
    in this web to the live set of all of the basic blocks that contain
 }
 
 
 /* We are adding the def/use web DEF.  Add the target register used
    in this web to the live set of all of the basic blocks that contain

-   the live range of the web.  */
+   the live range of the web.
+   If OWN_END is set, also show that the register is live from our
+   definitions at the end of the basic block where it is defined.  */

 static void
 static void

-add_btr_to_live_range (btr_def def)
+add_btr_to_live_range (btr_def def, int own_end)

 {
 {

-  int bb;
-  EXECUTE_IF_SET_IN_BITMAP
-    (def->live_range, 0, bb,
-     {
-       SET_HARD_REG_BIT (btrs_live[bb], def->btr);
-       SET_HARD_REG_BIT (btrs_live_at_end[bb], def->btr);
-       if (rtl_dump_file)
-        dump_btrs_live (bb);
-     });
+  unsigned bb;
+  bitmap_iterator bi;
+
+  EXECUTE_IF_SET_IN_BITMAP (def->live_range, 0, bb, bi)
+    {
+      SET_HARD_REG_BIT (btrs_live[bb], def->btr);
+      SET_HARD_REG_BIT (btrs_live_at_end[bb], def->btr);
+      if (dump_file)
+       dump_btrs_live (bb);
+    }
+  if (own_end)
+    {
+      SET_HARD_REG_BIT (btrs_live_at_end[def->bb->index], def->btr);
+      def->own_end = 1;
+    }

 }
 
 /* Update a live range to contain the basic block NEW_BLOCK, and all
 }
 
 /* Update a live range to contain the basic block NEW_BLOCK, and all


@@ -862,46 +872,58 @@ add_btr_to_live_range (btr_def def)
    all other blocks in the existing live range.
    Also add to the set BTRS_LIVE_IN_RANGE all target registers that
    are live in the blocks that we add to the live range.
    all other blocks in the existing live range.
    Also add to the set BTRS_LIVE_IN_RANGE all target registers that
    are live in the blocks that we add to the live range.

+   If FULL_RANGE is set, include the full live range of NEW_BB;
+   otherwise, if NEW_BB dominates HEAD_BB, only add registers that
+   are life at the end of NEW_BB for NEW_BB itself.

    It is a precondition that either NEW_BLOCK dominates HEAD,or
    HEAD dom NEW_BLOCK.  This is used to speed up the
    implementation of this function.  */
 static void
 augment_live_range (bitmap live_range, HARD_REG_SET *btrs_live_in_range,
    It is a precondition that either NEW_BLOCK dominates HEAD,or
    HEAD dom NEW_BLOCK.  This is used to speed up the
    implementation of this function.  */
 static void
 augment_live_range (bitmap live_range, HARD_REG_SET *btrs_live_in_range,

-                   basic_block head_bb, basic_block new_bb)
+                   basic_block head_bb, basic_block new_bb, int full_range)

 {
   basic_block *worklist, *tos;
 
   tos = worklist = xmalloc (sizeof (basic_block) * (n_basic_blocks + 1));
 
   if (dominated_by_p (CDI_DOMINATORS, new_bb, head_bb))
 {
   basic_block *worklist, *tos;
 
   tos = worklist = xmalloc (sizeof (basic_block) * (n_basic_blocks + 1));
 
   if (dominated_by_p (CDI_DOMINATORS, new_bb, head_bb))

-    *tos++ = new_bb;
-  else if (dominated_by_p (CDI_DOMINATORS, head_bb, new_bb))
+    {
+      if (new_bb == head_bb)
+       {
+         if (full_range)
+           IOR_HARD_REG_SET (*btrs_live_in_range, btrs_live[new_bb->index]);
+         return;
+       }
+      *tos++ = new_bb;
+    }
+  else

     {
       edge e;
     {
       edge e;

+      edge_iterator ei;

       int new_block = new_bb->index;
 
       int new_block = new_bb->index;
 

+      gcc_assert (dominated_by_p (CDI_DOMINATORS, head_bb, new_bb));
+  
+      IOR_HARD_REG_SET (*btrs_live_in_range, btrs_live[head_bb->index]);

       bitmap_set_bit (live_range, new_block);
       bitmap_set_bit (live_range, new_block);

-      if (flag_btr_bb_exclusive)
+      /* A previous btr migration could have caused a register to be
+        live just at the end of new_block which we need in full, so
+        use trs_live_at_end even if full_range is set.  */
+      IOR_HARD_REG_SET (*btrs_live_in_range, btrs_live_at_end[new_block]);
+      if (full_range)

        IOR_HARD_REG_SET (*btrs_live_in_range, btrs_live[new_block]);
        IOR_HARD_REG_SET (*btrs_live_in_range, btrs_live[new_block]);

-      else
-       {
-         IOR_HARD_REG_SET (*btrs_live_in_range, btrs_live_at_end[new_block]);
-         IOR_HARD_REG_SET (*btrs_live_in_range, btrs_live[head_bb->index]);
-       }
-      if (rtl_dump_file)
+      if (dump_file)

        {
        {

-         fprintf (rtl_dump_file,
+         fprintf (dump_file,

                   "Adding end of block %d and rest of %d to live range\n",
                   new_block, head_bb->index);
                   "Adding end of block %d and rest of %d to live range\n",
                   new_block, head_bb->index);

-         fprintf (rtl_dump_file,"Now live btrs are ");
+         fprintf (dump_file,"Now live btrs are ");

          dump_hard_reg_set (*btrs_live_in_range);
          dump_hard_reg_set (*btrs_live_in_range);

-         fprintf (rtl_dump_file, "\n");
+         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;
     }
        *tos++ = e->src;
     }

-  else
-    abort();

 
   while (tos != worklist)
     {
 
   while (tos != worklist)
     {


@@ -909,20 +931,25 @@ augment_live_range (bitmap live_range, HARD_REG_SET *btrs_live_in_range,
       if (!bitmap_bit_p (live_range, bb->index))
        {
          edge e;
       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,
            btrs_live[bb->index]);
 
          bitmap_set_bit (live_range, bb->index);
          IOR_HARD_REG_SET (*btrs_live_in_range,
            btrs_live[bb->index]);

-         if (rtl_dump_file)
+         /* A previous btr migration could have caused a register to be
+            live just at the end of a block which we need in full.  */
+         IOR_HARD_REG_SET (*btrs_live_in_range,
+           btrs_live_at_end[bb->index]);
+         if (dump_file)

            {
            {

-             fprintf (rtl_dump_file,
+             fprintf (dump_file,

                "Adding block %d to live range\n", bb->index);
                "Adding block %d to live range\n", bb->index);

-             fprintf (rtl_dump_file,"Now live btrs are ");
+             fprintf (dump_file,"Now live btrs are ");

              dump_hard_reg_set (*btrs_live_in_range);
              dump_hard_reg_set (*btrs_live_in_range);

-             fprintf (rtl_dump_file, "\n");
+             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))
            {
              basic_block pred = e->src;
              if (!bitmap_bit_p (live_range, pred->index))


@@ -972,15 +999,16 @@ 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);
       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,
 
       for (user = def->uses; user != NULL; user = user->next)
        augment_live_range (def->live_range, btrs_live_in_range,

-                           def->bb, user->bb);
+                           def->bb, user->bb,
+                           (flag_btr_bb_exclusive
+                            || user->insn != BB_END (def->bb)
+                            || GET_CODE (user->insn) != JUMP_INSN));

     }
   else
     {
     }
   else
     {


@@ -988,24 +1016,17 @@ 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.
       */
         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);
 
       CLEAR_HARD_REG_SET (*btrs_live_in_range);

-      if (flag_btr_bb_exclusive)
-       EXECUTE_IF_SET_IN_BITMAP
-         (def->live_range, 0, bb,
-          {
-            IOR_HARD_REG_SET (*btrs_live_in_range, btrs_live[bb]);
-          });
-      else
-       EXECUTE_IF_SET_IN_BITMAP
-         (def->live_range, 0, bb,
-          {
-            IOR_HARD_REG_SET (*btrs_live_in_range,
-                              (def_bb == bb
-                               ? btrs_live_at_end : btrs_live) [bb]);
-          });
+      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]);
+       }

     }
   if (!def->other_btr_uses_before_def &&
       !def->other_btr_uses_after_use)
     }
   if (!def->other_btr_uses_before_def &&
       !def->other_btr_uses_after_use)


@@ -1048,14 +1069,17 @@ combine_btr_defs (btr_def def, HARD_REG_SET *btrs_live_in_range)
 
          for (user = other_def->uses; user != NULL; user = user->next)
            augment_live_range (combined_live_range, &combined_btrs_live,
 
          for (user = other_def->uses; user != NULL; user = user->next)
            augment_live_range (combined_live_range, &combined_btrs_live,

-                               def->bb, user->bb);
+                               def->bb, user->bb,
+                               (flag_btr_bb_exclusive
+                                || user->insn != BB_END (def->bb)
+                                || GET_CODE (user->insn) != JUMP_INSN));

 
          btr = choose_btr (combined_btrs_live);
          if (btr != -1)
            {
              /* We can combine them.  */
 
          btr = choose_btr (combined_btrs_live);
          if (btr != -1)
            {
              /* We can combine them.  */

-             if (rtl_dump_file)
-               fprintf (rtl_dump_file,
+             if (dump_file)
+               fprintf (dump_file,

                         "Combining def in insn %d with def in insn %d\n",
                         INSN_UID (other_def->insn), INSN_UID (def->insn));
 
                         "Combining def in insn %d with def in insn %d\n",
                         INSN_UID (other_def->insn), INSN_UID (def->insn));
 


@@ -1082,7 +1106,7 @@ combine_btr_defs (btr_def def, HARD_REG_SET *btrs_live_in_range)
              clear_btr_from_live_range (other_def);
              other_def->uses = NULL;
              bitmap_copy (def->live_range, combined_live_range);
              clear_btr_from_live_range (other_def);
              other_def->uses = NULL;
              bitmap_copy (def->live_range, combined_live_range);

-             if (other_def->other_btr_uses_after_use)
+             if (other_def->btr == btr && other_def->other_btr_uses_after_use)

                def->other_btr_uses_after_use = 1;
              COPY_HARD_REG_SET (*btrs_live_in_range, combined_btrs_live);
 
                def->other_btr_uses_after_use = 1;
              COPY_HARD_REG_SET (*btrs_live_in_range, combined_btrs_live);
 


@@ -1120,8 +1144,8 @@ move_btr_def (basic_block new_def_bb, int btr, btr_def def, bitmap live_range,
   btr_user user;
   rtx set;
 
   btr_user user;
   rtx set;
 

-  if (rtl_dump_file)
-    fprintf(rtl_dump_file, "migrating to basic block %d, using reg %d\n",
+  if (dump_file)
+    fprintf(dump_file, "migrating to basic block %d, using reg %d\n",

            new_def_bb->index, btr);
 
   clear_btr_from_live_range (def);
            new_def_bb->index, btr);
 
   clear_btr_from_live_range (def);


@@ -1129,13 +1153,13 @@ move_btr_def (basic_block new_def_bb, int btr, btr_def def, bitmap live_range,
   def->bb = new_def_bb;
   def->luid = 0;
   def->cost = basic_block_freq (new_def_bb);
   def->bb = new_def_bb;
   def->luid = 0;
   def->cost = basic_block_freq (new_def_bb);

-  def->other_btr_uses_before_def
-    = TEST_HARD_REG_BIT (btrs_live[b->index], btr) ? 1 : 0;

   bitmap_copy (def->live_range, live_range);
   combine_btr_defs (def, btrs_live_in_range);
   btr = def->btr;
   bitmap_copy (def->live_range, live_range);
   combine_btr_defs (def, btrs_live_in_range);
   btr = def->btr;

-  add_btr_to_live_range (def);
-  if (GET_CODE (insp) == CODE_LABEL)
+  def->other_btr_uses_before_def
+    = TEST_HARD_REG_BIT (btrs_live[b->index], btr) ? 1 : 0;
+  add_btr_to_live_range (def, 1);
+  if (LABEL_P (insp))

     insp = NEXT_INSN (insp);
   /* N.B.: insp is expected to be NOTE_INSN_BASIC_BLOCK now.  Some
      optimizations can result in insp being both first and last insn of
     insp = NEXT_INSN (insp);
   /* N.B.: insp is expected to be NOTE_INSN_BASIC_BLOCK now.  Some
      optimizations can result in insp being both first and last insn of


@@ -1146,9 +1170,9 @@ move_btr_def (basic_block new_def_bb, int btr, btr_def def, bitmap live_range,
     {
       insp = BB_END (b);
       for (insp = BB_END (b); ! INSN_P (insp); insp = PREV_INSN (insp))
     {
       insp = BB_END (b);
       for (insp = BB_END (b); ! INSN_P (insp); insp = PREV_INSN (insp))

-       if (insp == BB_HEAD (b))
-         abort ();
-      if (GET_CODE (insp) == JUMP_INSN || can_throw_internal (insp))
+       gcc_assert (insp != BB_HEAD (b));
+      
+      if (JUMP_P (insp) || can_throw_internal (insp))

        insp = PREV_INSN (insp);
     }
 
        insp = PREV_INSN (insp);
     }
 


@@ -1164,8 +1188,8 @@ move_btr_def (basic_block new_def_bb, int btr, btr_def def, bitmap live_range,
 
   regs_ever_live[btr] = 1;
 
 
   regs_ever_live[btr] = 1;
 

-  if (rtl_dump_file)
-    fprintf (rtl_dump_file, "New pt is insn %d, inserted after insn %d\n",
+  if (dump_file)
+    fprintf (dump_file, "New pt is insn %d, inserted after insn %d\n",

             INSN_UID (def->insn), INSN_UID (insp));
 
   /* Delete the old target register initialization.  */
             INSN_UID (def->insn), INSN_UID (insp));
 
   /* Delete the old target register initialization.  */


@@ -1237,18 +1261,18 @@ migrate_btr_def (btr_def def, int min_cost)
   int give_up = 0;
   int def_moved = 0;
   btr_user user;
   int give_up = 0;
   int def_moved = 0;
   btr_user user;

-  int def_latency = 1;
+  int def_latency;

 
 

-  if (rtl_dump_file)
-    fprintf (rtl_dump_file,
+  if (dump_file)
+    fprintf (dump_file,

             "Attempting to migrate pt from insn %d (cost = %d, min_cost = %d) ... ",
             INSN_UID (def->insn), def->cost, min_cost);
 
   if (!def->group || def->has_ambiguous_use)
     /* These defs are not migratable.  */
     {
             "Attempting to migrate pt from insn %d (cost = %d, min_cost = %d) ... ",
             INSN_UID (def->insn), def->cost, min_cost);
 
   if (!def->group || def->has_ambiguous_use)
     /* These defs are not migratable.  */
     {

-      if (rtl_dump_file)
-       fprintf (rtl_dump_file, "it's not migratable\n");
+      if (dump_file)
+       fprintf (dump_file, "it's not migratable\n");

       return 0;
     }
 
       return 0;
     }
 


@@ -1257,8 +1281,8 @@ migrate_btr_def (btr_def def, int min_cost)
        no need to consider it further.
     */
     {
        no need to consider it further.
     */
     {

-      if (rtl_dump_file)
-       fprintf (rtl_dump_file, "it's already combined with another pt\n");
+      if (dump_file)
+       fprintf (dump_file, "it's already combined with another pt\n");

       return 0;
     }
 
       return 0;
     }
 


@@ -1267,14 +1291,11 @@ migrate_btr_def (btr_def def, int min_cost)
   bitmap_copy (live_range, def->live_range);
 
 #ifdef INSN_SCHEDULING
   bitmap_copy (live_range, def->live_range);
 
 #ifdef INSN_SCHEDULING

-  if ((*targetm.sched.use_dfa_pipeline_interface) ())
-    def_latency = insn_default_latency (def->insn);
-  else
-    def_latency = result_ready_cost (def->insn);
+  def_latency = insn_default_latency (def->insn) * issue_rate;
+#else
+  def_latency = issue_rate;

 #endif
 
 #endif
 

-  def_latency *= issue_rate;
-

   for (user = def->uses; user != NULL; user = user->next)
     {
       if (user->bb == def->bb
   for (user = def->uses; user != NULL; user = user->next)
     {
       if (user->bb == def->bb


@@ -1298,19 +1319,20 @@ migrate_btr_def (btr_def def, int min_cost)
         basic block TRY.  */
       int try_freq = basic_block_freq (try);
 
         basic block TRY.  */
       int try_freq = basic_block_freq (try);
 

-      if (rtl_dump_file)
-       fprintf (rtl_dump_file, "trying block %d ...", try->index);
+      if (dump_file)
+       fprintf (dump_file, "trying block %d ...", try->index);

 
       if (try_freq < def_basic_block_freq
          || (try_freq == def_basic_block_freq && btr_used_near_def))
        {
          int btr;
 
       if (try_freq < def_basic_block_freq
          || (try_freq == def_basic_block_freq && btr_used_near_def))
        {
          int btr;

-         augment_live_range (live_range, &btrs_live_in_range, def->bb, try);
-         if (rtl_dump_file)
+         augment_live_range (live_range, &btrs_live_in_range, def->bb, try,
+                             flag_btr_bb_exclusive);
+         if (dump_file)

            {
            {

-             fprintf (rtl_dump_file, "Now btrs live in range are: ");
+             fprintf (dump_file, "Now btrs live in range are: ");

              dump_hard_reg_set (btrs_live_in_range);
              dump_hard_reg_set (btrs_live_in_range);

-             fprintf (rtl_dump_file, "\n");
+             fprintf (dump_file, "\n");

            }
          btr = choose_btr (btrs_live_in_range);
          if (btr != -1)
            }
          btr = choose_btr (btrs_live_in_range);
          if (btr != -1)


@@ -1326,8 +1348,8 @@ migrate_btr_def (btr_def def, int min_cost)
              /* There are no free target registers available to move
                 this far forward, so give up */
              give_up = 1;
              /* There are no free target registers available to move
                 this far forward, so give up */
              give_up = 1;

-             if (rtl_dump_file)
-               fprintf (rtl_dump_file,
+             if (dump_file)
+               fprintf (dump_file,

                         "giving up because there are no free target registers\n");
            }
 
                         "giving up because there are no free target registers\n");
            }
 


@@ -1336,8 +1358,8 @@ migrate_btr_def (btr_def def, int min_cost)
   if (!def_moved)
     {
       give_up = 1;
   if (!def_moved)
     {
       give_up = 1;

-      if (rtl_dump_file)
-       fprintf (rtl_dump_file, "failed to move\n");
+      if (dump_file)
+       fprintf (dump_file, "failed to move\n");

     }
   BITMAP_XFREE (live_range);
   return !give_up;
     }
   BITMAP_XFREE (live_range);
   return !give_up;


@@ -1352,14 +1374,14 @@ migrate_btr_defs (enum reg_class btr_class, int allow_callee_save)
   int reg;
 
   gcc_obstack_init (&migrate_btrl_obstack);
   int reg;
 
   gcc_obstack_init (&migrate_btrl_obstack);

-  if (rtl_dump_file)
+  if (dump_file)

     {
       int i;
 
       for (i = 0; i < n_basic_blocks; i++)
        {
          basic_block bb = BASIC_BLOCK (i);
     {
       int i;
 
       for (i = 0; i < n_basic_blocks; i++)
        {
          basic_block bb = BASIC_BLOCK (i);

-         fprintf(rtl_dump_file,
+         fprintf(dump_file,

            "Basic block %d: count = " HOST_WIDEST_INT_PRINT_DEC
            " loop-depth = %d idom = %d\n",
            i, (HOST_WIDEST_INT) bb->count, bb->loop_depth,
            "Basic block %d: count = " HOST_WIDEST_INT_PRINT_DEC
            " loop-depth = %d idom = %d\n",
            i, (HOST_WIDEST_INT) bb->count, bb->loop_depth,


@@ -1385,24 +1407,20 @@ migrate_btr_defs (enum reg_class btr_class, int allow_callee_save)
 
   while (!fibheap_empty (all_btr_defs))
     {
 
   while (!fibheap_empty (all_btr_defs))
     {

-      btr_def def =
-       (btr_def) fibheap_extract_min (all_btr_defs);
+      btr_def def = fibheap_extract_min (all_btr_defs);

       int min_cost = -fibheap_min_key (all_btr_defs);
       if (migrate_btr_def (def, min_cost))
        {
          fibheap_insert (all_btr_defs, -def->cost, (void *) def);
       int min_cost = -fibheap_min_key (all_btr_defs);
       if (migrate_btr_def (def, min_cost))
        {
          fibheap_insert (all_btr_defs, -def->cost, (void *) def);

-         if (rtl_dump_file)
+         if (dump_file)

            {
            {

-             fprintf (rtl_dump_file,
+             fprintf (dump_file,

                "Putting insn %d back on queue with priority %d\n",
                INSN_UID (def->insn), def->cost);
            }
        }
       else
                "Putting insn %d back on queue with priority %d\n",
                INSN_UID (def->insn), def->cost);
            }
        }
       else

-       {
-         if (def->live_range)
-           BITMAP_XFREE (def->live_range);
-       }
+       BITMAP_XFREE (def->live_range);

     }
 
   free (btrs_live);
     }
 
   free (btrs_live);


@@ -1412,14 +1430,14 @@ migrate_btr_defs (enum reg_class btr_class, int allow_callee_save)
 }
 
 void
 }
 
 void

-branch_target_load_optimize (rtx insns, bool after_prologue_epilogue_gen)
+branch_target_load_optimize (bool after_prologue_epilogue_gen)

 {
 {

-  enum reg_class class = (*targetm.branch_target_register_class) ();
+  enum reg_class class = targetm.branch_target_register_class ();

   if (class != NO_REGS)
     {
       /* Initialize issue_rate.  */
       if (targetm.sched.issue_rate)
   if (class != NO_REGS)
     {
       /* Initialize issue_rate.  */
       if (targetm.sched.issue_rate)

-       issue_rate = (*targetm.sched.issue_rate) ();
+       issue_rate = targetm.sched.issue_rate ();

       else
        issue_rate = 1;
 
       else
        issue_rate = 1;
 


@@ -1430,12 +1448,12 @@ branch_target_load_optimize (rtx insns, bool after_prologue_epilogue_gen)
       cleanup_cfg (optimize ? CLEANUP_EXPENSIVE : 0);
 #endif
 
       cleanup_cfg (optimize ? CLEANUP_EXPENSIVE : 0);
 #endif
 

-      life_analysis (insns, NULL, 0);
+      life_analysis (NULL, 0);

 
       /* Dominator info is also needed for migrate_btr_def.  */
       calculate_dominance_info (CDI_DOMINATORS);
       migrate_btr_defs (class,
 
       /* Dominator info is also needed for migrate_btr_def.  */
       calculate_dominance_info (CDI_DOMINATORS);
       migrate_btr_defs (class,

-                      ((*targetm.branch_target_register_callee_saved)
+                      (targetm.branch_target_register_callee_saved

                        (after_prologue_epilogue_gen)));
 
       free_dominance_info (CDI_DOMINATORS);
                        (after_prologue_epilogue_gen)));
 
       free_dominance_info (CDI_DOMINATORS);