refactored nodes interface, completed set/get attr methods

[libfirm] / ir / be / bechordal_draw.c

diff --git a/ir/be/bechordal_draw.c b/ir/be/bechordal_draw.c
index 3ded8be..8c43799 100644 (file)
--- a/ir/be/bechordal_draw.c
+++ b/ir/be/bechordal_draw.c
@@ -16,10 +16,11 @@
 #include <limits.h>
 
 #include "pmap.h"
+#include "pset.h"
 
 #include "irgwalk.h"
 #include "irprintf.h"
-#include "irouts.h"
+#include "iredges_t.h"
 
 #include "belive_t.h"
 #include "bechordal_t.h"
@@ -204,7 +205,7 @@ static void block_dims_walker(ir_node *block, void *data)
 
        list_for_each_entry_reverse(border_t, b, head, list) {
     ir_node *irn = b->irn;
-    const arch_register_t *reg = arch_get_irn_register(env->arch_env, irn, 0);
+    const arch_register_t *reg = arch_get_irn_register(env->arch_env, irn);
     int col = arch_register_get_index(reg);
 
     dims->max_step = max(dims->max_step, b->step);
@@ -276,10 +277,11 @@ static void set_y(const draw_chordal_env_t *env, ir_node *bl, int up)
 static color_t *reg_to_color(const draw_chordal_env_t *env,
     ir_node *rel_bl, ir_node *irn, color_t *color)
 {
-  int i, n, phi_arg = 0;
+  int phi_arg = 0;
+  const ir_edge_t *edge;
 
-  for(i = 0, n = get_irn_n_outs(irn); i < n && !phi_arg; ++i)
-    phi_arg |= is_Phi(get_irn_out(irn, i));
+  foreach_out_edge(irn, edge)
+    phi_arg |= is_Phi(edge->src);
 
 #if 1
   color->r = is_Phi(irn) ? 0.5 : 0.0;
@@ -305,7 +307,7 @@ static void draw_block(ir_node *bl, void *data)
   static const color_t black = { 0, 0, 0 };
 
   const draw_chordal_env_t *env = data;
-  pset *live_in = get_live_in(bl);
+  pset *live_in = put_live_in(bl, pset_new_ptr_default());
   ir_node *irn;
   border_t *b;
        struct list_head *head = get_block_border_head(env->chordal_env, bl);
@@ -325,9 +327,8 @@ static void draw_block(ir_node *bl, void *data)
 
        list_for_each_entry(border_t, b, head, list) {
     if(b->is_def) {
-      const arch_register_t *reg = arch_get_irn_register(env->arch_env, b->irn, 0);
+      const arch_register_t *reg = arch_get_irn_register(env->arch_env, b->irn);
       int col = arch_register_get_index(reg);
-      int live_in = is_live_in(bl, b->irn);
       int live_out = is_live_out(bl, b->irn);
       int x = (col + 1) * opts->h_inter_gap;
       int ystart = (b->step) * opts->v_inter_gap;
@@ -354,7 +355,7 @@ static void draw_block(ir_node *bl, void *data)
 
     for(irn = pset_first(live_in); irn; irn = pset_next(live_in)) {
       if(arch_irn_has_reg_class(env->arch_env, irn, 0, env->cls)) {
-        const arch_register_t *reg = arch_get_irn_register(env->arch_env, irn, 0);
+        const arch_register_t *reg = arch_get_irn_register(env->arch_env, irn);
         int col = arch_register_get_index(reg);
         int x = (col + 1) * opts->h_inter_gap;
 
@@ -371,19 +372,7 @@ static void draw_block(ir_node *bl, void *data)
     }
   }
 
-#if 0
-  if(dom) {
-  struct block_dims *dom_dims = pmap_get(env->block_dims, dom);
-    rect_t line;
-
-    line.x = dims->box.x;
-    line.y = dims->box.y;
-    line.w = dom_dims->box.x;
-    line.h = dom_dims->box.y;
-
-    env->plotter->vtab->line(env->plotter, &line);
-  }
-#endif
+  del_pset(live_in);
 }
 
 static void draw(draw_chordal_env_t *env, const rect_t *start_box)