X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal_draw.c;h=8c43799e8f6d6ec201706d7a4806cc93508b9cc7;hb=ba873a5483697d4ff93e3980d7b6a1b5cbc491b5;hp=10a734f839f2475d344fbf6acbe579a280138eef;hpb=03ffa62ef4f525aa0c45dbe766a17bc94b161695;p=libfirm

diff --git a/ir/be/bechordal_draw.c b/ir/be/bechordal_draw.c
index 10a734f83..8c43799e8 100644
--- a/ir/be/bechordal_draw.c
+++ b/ir/be/bechordal_draw.c
@@ -9,14 +9,18 @@
  * Copyright (C) 2005 Universitaet Karlsruhe
  * Released under the GPL
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #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"
@@ -174,11 +178,13 @@ struct block_dims {
   rect_t subtree_box;
 };
 
+#undef min
 static INLINE int min(int a, int b)
 {
   return a < b ? a : b;
 }
 
+#undef max
 static INLINE int max(int a, int b)
 {
   return a > b ? a : b;
@@ -199,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);
@@ -271,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;
@@ -300,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);
@@ -320,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;
@@ -349,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;
 
@@ -366,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)