Merge branch 'opt_manage'

[libfirm] / ir / be / bestat.c

diff --git a/ir/be/bestat.c b/ir/be/bestat.c
index 2f9453a..762658d 100644 (file)
--- a/ir/be/bestat.c
+++ b/ir/be/bestat.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -52,7 +52,7 @@ struct pressure_walker_env_t {
        be_lv_t  *lv;
        double    insn_count;
        double    regpressure;
-       int       max_pressure;
+       size_t    max_pressure;
        const arch_register_class_t *cls;
 };
 
@@ -63,7 +63,7 @@ static void check_reg_pressure_class(pressure_walker_env_t *env,
        ir_graph     *irg  = env->irg;
        ir_node      *irn;
        ir_nodeset_t  live_nodes;
-       int           max_live;
+       size_t        max_live;
 
        ir_nodeset_init(&live_nodes);
        be_liveness_end_of_block(env->lv, cls, block, &live_nodes);
@@ -71,7 +71,7 @@ static void check_reg_pressure_class(pressure_walker_env_t *env,
        env->regpressure += max_live;
 
        sched_foreach_reverse(block, irn) {
-               int cnt;
+               size_t cnt;
 
                if (is_Phi(irn))
                        break;
@@ -86,15 +86,13 @@ static void check_reg_pressure_class(pressure_walker_env_t *env,
        if (max_live > env->max_pressure)
                env->max_pressure = max_live;
 
-#ifdef FIRM_STATISTICS
        stat_be_block_regpressure(irg, block, max_live, cls->name);
-#endif
        ir_nodeset_destroy(&live_nodes);
 }
 
 static void stat_reg_pressure_block(ir_node *block, void *data)
 {
-       pressure_walker_env_t *env = data;
+       pressure_walker_env_t *env = (pressure_walker_env_t*)data;
 
        check_reg_pressure_class(env, block, env->cls);
 }
@@ -123,14 +121,14 @@ void be_do_stat_reg_pressure(ir_graph *irg, const arch_register_class_t *cls)
 
 
 
-typedef struct _estimate_irg_costs_env_t {
+typedef struct estimate_irg_costs_env_t {
        ir_exec_freq     *execfreqs;
        double           costs;
 } estimate_irg_costs_env_t;
 
 static void estimate_block_costs(ir_node *block, void *data)
 {
-       estimate_irg_costs_env_t *env = data;
+       estimate_irg_costs_env_t *env = (estimate_irg_costs_env_t*)data;
        ir_node *node;
        double  costs = 0.0;
 
@@ -157,7 +155,7 @@ double be_estimate_irg_costs(ir_graph *irg, ir_exec_freq *execfreqs)
 
 static void node_stat_walker(ir_node *irn, void *data)
 {
-       be_node_stats_t *const stats = data;
+       be_node_stats_t *const stats = (be_node_stats_t*)data;
 
        /* if the node is a normal phi */
        if (is_Phi(irn)) {
@@ -217,10 +215,10 @@ static const char *get_stat_name(enum be_stat_tag_t tag)
 
 void be_emit_node_stats(be_node_stats_t *stats, const char *prefix)
 {
-       static char buf[256];
-       int         i;
+       static char   buf[256];
+       be_stat_tag_t i;
 
-       for (i = 0; i < BE_STAT_COUNT; ++i) {
+       for (i = BE_STAT_FIRST; i < BE_STAT_COUNT; ++i) {
                snprintf(buf, sizeof(buf), "%s%s", prefix, get_stat_name(i));
                stat_ev_dbl(buf, (*stats)[i]);
        }
@@ -230,7 +228,7 @@ void be_emit_node_stats(be_node_stats_t *stats, const char *prefix)
 
 static void insn_count_walker(ir_node *irn, void *data)
 {
-       unsigned long *cnt = data;
+       unsigned long *cnt = (unsigned long*)data;
 
        switch (get_irn_opcode(irn)) {
        case iro_Proj:
@@ -252,7 +250,7 @@ unsigned long be_count_insns(ir_graph *irg)
 
 static void block_count_walker(ir_node *node, void *data)
 {
-       unsigned long *cnt = data;
+       unsigned long *cnt = (unsigned long*)data;
        if (node == get_irg_end_block(current_ir_graph))
                return;
        (*cnt)++;