2010-04-19 Eric B. Weddington <eric.weddington@atmel.com>

[pf3gnuchains/gcc-fork.git] / gcc / ira-emit.c

diff --git a/gcc/ira-emit.c b/gcc/ira-emit.c
index 2db8fa9..9d66bfe 100644 (file)
--- a/gcc/ira-emit.c
+++ b/gcc/ira-emit.c
@@ -109,7 +109,7 @@ static void
 free_move_list (move_t head)
 {
   move_t next;
-  
+
   for (; head != NULL; head = next)
     {
       next = head->next;
@@ -390,9 +390,9 @@ generate_edge_moves (edge e)
     return;
   src_map = src_loop_node->regno_allocno_map;
   dest_map = dest_loop_node->regno_allocno_map;
-  EXECUTE_IF_SET_IN_REG_SET (df_get_live_in (e->dest),
+  EXECUTE_IF_SET_IN_REG_SET (DF_LR_IN (e->dest),
                             FIRST_PSEUDO_REGISTER, regno, bi)
-    if (bitmap_bit_p (df_get_live_out (e->src), regno))
+    if (bitmap_bit_p (DF_LR_OUT (e->src), regno))
       {
        src_allocno = src_map[regno];
        dest_allocno = dest_map[regno];
@@ -450,7 +450,7 @@ change_loop (ira_loop_tree_node_t node)
 
   if (node != ira_loop_tree_root)
     {
-      
+
       if (node->bb != NULL)
        {
          FOR_BB_INSNS (node->bb, insn)
@@ -461,12 +461,12 @@ change_loop (ira_loop_tree_node_t node)
              }
          return;
        }
-      
+
       if (internal_flag_ira_verbose > 3 && ira_dump_file != NULL)
        fprintf (ira_dump_file,
                 "      Changing RTL for loop %d (header bb%d)\n",
                 node->loop->num, node->loop->header->index);
-      
+
       parent = ira_curr_loop_tree_node->parent;
       map = parent->regno_allocno_map;
       EXECUTE_IF_SET_IN_REG_SET (ira_curr_loop_tree_node->border_allocnos,
@@ -812,7 +812,8 @@ emit_move_list (move_t list, int freq)
        }
       else
        {
-         cost = ira_register_move_cost[mode][cover_class][cover_class] * freq;
+         cost = (ira_get_register_move_cost (mode, cover_class, cover_class)
+                 * freq);
          ira_shuffle_cost += cost;
        }
       ira_overall_cost += cost;
@@ -1028,16 +1029,15 @@ add_ranges_and_copies (void)
         destination block) to use for searching allocnos by their
         regnos because of subsequent IR flattening.  */
       node = IRA_BB_NODE (bb)->parent;
-      bitmap_copy (live_through, df_get_live_in (bb));
+      bitmap_copy (live_through, DF_LR_IN (bb));
       add_range_and_copies_from_move_list
        (at_bb_start[bb->index], node, live_through, REG_FREQ_FROM_BB (bb));
-      bitmap_copy (live_through, df_get_live_out (bb));
+      bitmap_copy (live_through, DF_LR_OUT (bb));
       add_range_and_copies_from_move_list
        (at_bb_end[bb->index], node, live_through, REG_FREQ_FROM_BB (bb));
       FOR_EACH_EDGE (e, ei, bb->succs)
        {
-         bitmap_and (live_through, df_get_live_in (e->dest),
-                     df_get_live_out (bb));
+         bitmap_and (live_through, DF_LR_IN (e->dest), DF_LR_OUT (bb));
          add_range_and_copies_from_move_list
            ((move_t) e->aux, node, live_through,
             REG_FREQ_FROM_EDGE_FREQ (EDGE_FREQUENCY (e)));