2009-06-17 H.J. Lu <hongjiu.lu@intel.com>

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

diff --git a/gcc/ira-color.c b/gcc/ira-color.c
index d61d39e..743ec3c 100644 (file)
--- a/gcc/ira-color.c
+++ b/gcc/ira-color.c
@@ -285,8 +285,8 @@ update_copy_costs (ira_allocno_t allocno, bool decr_p)
            continue;
 
          cost = (cp->second == allocno
-                 ? ira_register_move_cost[mode][rclass][cover_class]
-                 : ira_register_move_cost[mode][cover_class][rclass]);
+                 ? ira_get_register_move_cost (mode, rclass, cover_class)
+                 : ira_get_register_move_cost (mode, cover_class, rclass));
          if (decr_p)
            cost = -cost;
 
@@ -1022,8 +1022,8 @@ ira_loop_edge_freq (ira_loop_tree_node_t loop_node, int regno, bool exit_p)
       FOR_EACH_EDGE (e, ei, loop_node->loop->header->preds)
        if (e->src != loop_node->loop->latch
            && (regno < 0
-               || (bitmap_bit_p (df_get_live_out (e->src), regno)
-                   && bitmap_bit_p (df_get_live_in (e->dest), regno))))
+               || (bitmap_bit_p (DF_LR_OUT (e->src), regno)
+                   && bitmap_bit_p (DF_LR_IN (e->dest), regno))))
          freq += EDGE_FREQUENCY (e);
     }
   else
@@ -1031,8 +1031,8 @@ ira_loop_edge_freq (ira_loop_tree_node_t loop_node, int regno, bool exit_p)
       edges = get_loop_exit_edges (loop_node->loop);
       for (i = 0; VEC_iterate (edge, edges, i, e); i++)
        if (regno < 0
-           || (bitmap_bit_p (df_get_live_out (e->src), regno)
-               && bitmap_bit_p (df_get_live_in (e->dest), regno)))
+           || (bitmap_bit_p (DF_LR_OUT (e->src), regno)
+               && bitmap_bit_p (DF_LR_IN (e->dest), regno)))
          freq += EDGE_FREQUENCY (e);
       VEC_free (edge, heap, edges);
     }
@@ -1071,7 +1071,7 @@ calculate_allocno_spill_cost (ira_allocno_t a)
              * ira_loop_edge_freq (loop_node, regno, true)
              + ira_memory_move_cost[mode][rclass][0]
              * ira_loop_edge_freq (loop_node, regno, false))
-            - (ira_register_move_cost[mode][rclass][rclass]
+            - (ira_get_register_move_cost (mode, rclass, rclass)
                * (ira_loop_edge_freq (loop_node, regno, false)
                   + ira_loop_edge_freq (loop_node, regno, true))));
   return cost;
@@ -2039,7 +2039,7 @@ color_pass (ira_loop_tree_node_t loop_tree_node)
          else
            {
              cover_class = ALLOCNO_COVER_CLASS (subloop_allocno);
-             cost = (ira_register_move_cost[mode][rclass][rclass] 
+             cost = (ira_get_register_move_cost (mode, rclass, rclass)
                      * (exit_freq + enter_freq));
              ira_allocate_and_set_or_copy_costs
                (&ALLOCNO_UPDATED_HARD_REG_COSTS (subloop_allocno), cover_class,
@@ -2164,7 +2164,7 @@ move_spill_restore (void)
                    += (ira_memory_move_cost[mode][rclass][0] * exit_freq
                        + ira_memory_move_cost[mode][rclass][1] * enter_freq);
                  if (hard_regno2 != hard_regno)
-                   cost -= (ira_register_move_cost[mode][rclass][rclass]
+                   cost -= (ira_get_register_move_cost (mode, rclass, rclass)
                             * (exit_freq + enter_freq));
                }
            }
@@ -2183,7 +2183,7 @@ move_spill_restore (void)
                    += (ira_memory_move_cost[mode][rclass][1] * exit_freq
                        + ira_memory_move_cost[mode][rclass][0] * enter_freq);
                  if (hard_regno2 != hard_regno)
-                   cost -= (ira_register_move_cost[mode][rclass][rclass]
+                   cost -= (ira_get_register_move_cost (mode, rclass, rclass)
                             * (exit_freq + enter_freq));
                }
            }
@@ -2249,8 +2249,8 @@ update_curr_costs (ira_allocno_t a)
       if (i < 0)
        continue;
       cost = (cp->first == a
-             ? ira_register_move_cost[mode][rclass][cover_class]
-             : ira_register_move_cost[mode][cover_class][rclass]);
+             ? ira_get_register_move_cost (mode, rclass, cover_class)
+             : ira_get_register_move_cost (mode, cover_class, rclass));
       ira_allocate_and_set_or_copy_costs
        (&ALLOCNO_UPDATED_HARD_REG_COSTS (a),
         cover_class, ALLOCNO_COVER_CLASS_COST (a),