rework liveness dumper

[libfirm] / ir / ana / heights.c

diff --git a/ir/ana/heights.c b/ir/ana/heights.c
index c50ec9f..e860a03 100644 (file)
--- a/ir/ana/heights.c
+++ b/ir/ana/heights.c
@@ -53,13 +53,13 @@ typedef struct {
 static irn_height_t *maybe_get_height_data(const ir_heights_t *heights,
                                            const ir_node *node)
 {
-       irn_height_t *height = (irn_height_t*)ir_nodemap_get(&heights->data, node);
+       irn_height_t *height = ir_nodemap_get(irn_height_t, &heights->data, node);
        return height;
 }
 
 static irn_height_t *get_height_data(ir_heights_t *heights, const ir_node *node)
 {
-       irn_height_t *height = (irn_height_t*)ir_nodemap_get(&heights->data, node);
+       irn_height_t *height = ir_nodemap_get(irn_height_t, &heights->data, node);
        if (height == NULL) {
                height = OALLOCZ(&heights->obst, irn_height_t);
                ir_nodemap_insert(&heights->data, node, height);
@@ -121,10 +121,6 @@ static bool search(ir_heights_t *h, const ir_node *curr, const ir_node *tgt)
        return false;
 }
 
-/**
- * Check, if one node can be reached from another one, according to data
- * dependence.
- */
 int heights_reachable_in_block(ir_heights_t *h, const ir_node *n,
                                const ir_node *m)
 {
@@ -153,8 +149,6 @@ static unsigned compute_height(ir_heights_t *h, ir_node *irn, const ir_node *bl)
 {
        irn_height_t *ih = get_height_data(h, irn);
 
-       const ir_edge_t *edge;
-
        /* bail out if we already visited that node. */
        if (ih->visited >= h->visited)
                return ih->height;
@@ -190,8 +184,7 @@ static unsigned compute_height(ir_heights_t *h, ir_node *irn, const ir_node *bl)
 
 static unsigned compute_heights_in_block(ir_node *bl, ir_heights_t *h)
 {
-       int             max_height = -1;
-       const ir_edge_t *edge;
+       int max_height = -1;
 
        h->visited++;
 
@@ -228,11 +221,10 @@ unsigned get_irn_height(const ir_heights_t *heights, const ir_node *irn)
 unsigned heights_recompute_block(ir_heights_t *h, ir_node *block)
 {
        ir_graph *irg = get_irn_irg(block);
-       const ir_edge_t *edge;
 
-       edges_assure(irg);
+       assure_edges(irg);
 
-       /* reset phase data for all nodes in the block */
+       /* reset data for all nodes in the block */
        foreach_out_edge(block, edge) {
                ir_node      *irn = get_edge_src_irn(edge);
                irn_height_t *ih  = get_height_data(h, irn);
@@ -250,7 +242,7 @@ ir_heights_t *heights_new(ir_graph *irg)
        obstack_init(&res->obst);
        res->dump_handle = dump_add_node_info_callback(height_dump_cb, res);
 
-       edges_assure(irg);
+       assure_edges(irg);
        irg_block_walk_graph(irg, compute_heights_in_block_walker, NULL, res);
 
        return res;