simplify and cleanup execfreq API

[libfirm] / ir / be / beuses.c

diff --git a/ir/be/beuses.c b/ir/be/beuses.c
index 497c136..69cf44f 100644 (file)
--- a/ir/be/beuses.c
+++ b/ir/be/beuses.c
@@ -22,7 +22,6 @@
  * @brief       Methods to compute when a value will be used again.
  * @author      Sebastian Hack, Matthias Braun
  * @date        27.06.2005
- * @version     $Id$
  */
 #include "config.h"
 
@@ -40,6 +39,7 @@
 #include "irgraph_t.h"
 #include "iredges_t.h"
 #include "irdom_t.h"
+#include "util.h"
 
 #include "be_t.h"
 #include "beutil.h"
@@ -98,13 +98,13 @@ static const be_use_t *get_or_set_use_block(be_uses_t *env,
                                             const ir_node *block,
                                             const ir_node *def)
 {
-       unsigned hash = HASH_COMBINE(hash_irn(block), hash_irn(def));
+       unsigned hash = hash_combine(hash_irn(block), hash_irn(def));
        be_use_t temp;
        be_use_t* result;
 
        temp.block = block;
        temp.node = def;
-       result = (be_use_t*)set_find(env->uses, &temp, sizeof(temp), hash);
+       result = set_find(be_use_t, env->uses, &temp, sizeof(temp), hash);
 
        if (result == NULL) {
                // insert templ first as we might end in a loop in the get_next_use
@@ -112,7 +112,7 @@ static const be_use_t *get_or_set_use_block(be_uses_t *env,
                temp.next_use = USES_INFINITY;
                temp.outermost_loop = UNKNOWN_OUTERMOST_LOOP;
                temp.visited = 0;
-               result = (be_use_t*)set_insert(env->uses, &temp, sizeof(temp), hash);
+               result = set_insert(be_use_t, env->uses, &temp, sizeof(temp), hash);
        }
 
        if (result->outermost_loop == UNKNOWN_OUTERMOST_LOOP && result->visited < env->visited_counter) {
@@ -143,7 +143,6 @@ static const be_use_t *get_or_set_use_block(be_uses_t *env,
  */
 static int be_is_phi_argument(const ir_node *block, const ir_node *def)
 {
-       ir_node *node;
        ir_node *succ_block = NULL;
        int arity, i;
 
@@ -223,23 +222,22 @@ static be_next_use_t get_next_use(be_uses_t *env, ir_node *from,
 {
        unsigned  step;
        ir_node  *block = get_nodes_block(from);
-       ir_node  *next_use;
+       ir_node  *next_use_node;
        ir_node  *node;
        unsigned  timestep;
        unsigned  next_use_step;
-       const ir_edge_t *edge;
 
        assert(skip_from_uses == 0 || skip_from_uses == 1);
        if (skip_from_uses) {
                from = sched_next(from);
        }
 
-       next_use      = NULL;
+       next_use_node = NULL;
        next_use_step = INT_MAX;
        timestep      = get_step(from);
        foreach_out_edge(def, edge) {
-               ir_node  *node = get_edge_src_irn(edge);
-               unsigned  node_step;
+               unsigned node_step;
+               node = get_edge_src_irn(edge);
 
                if (is_Anchor(node))
                        continue;
@@ -252,16 +250,16 @@ static be_next_use_t get_next_use(be_uses_t *env, ir_node *from,
                if (node_step < timestep)
                        continue;
                if (node_step < next_use_step) {
-                       next_use      = node;
+                       next_use_node = node;
                        next_use_step = node_step;
                }
        }
 
-       if (next_use != NULL) {
+       if (next_use_node != NULL) {
                be_next_use_t result;
                result.time           = next_use_step - timestep + skip_from_uses;
                result.outermost_loop = get_loop_depth(get_irn_loop(block));
-               result.before         = next_use;
+               result.before         = next_use_node;
                return result;
        }
 
@@ -369,7 +367,6 @@ be_next_use_t be_get_next_use(be_uses_t *env, ir_node *from,
  */
 static void set_sched_step_walker(ir_node *block, void *data)
 {
-       ir_node  *node;
        unsigned step = 0;
        (void) data;
 
@@ -385,7 +382,7 @@ be_uses_t *be_begin_uses(ir_graph *irg, const be_lv_t *lv)
 {
        be_uses_t *env = XMALLOC(be_uses_t);
 
-       edges_assure(irg);
+       assure_edges(irg);
 
        //set_using_irn_link(irg);