allow character mode constants

[libfirm] / ir / be / bestat.c

diff --git a/ir/be/bestat.c b/ir/be/bestat.c
index 9cdbad6..4e57152 100644 (file)
--- a/ir/be/bestat.c
+++ b/ir/be/bestat.c
@@ -101,7 +101,8 @@ struct a_pressure_walker {
 static void stat_reg_pressure_block(ir_node *block, void *data) {
        struct a_pressure_walker *env = data;
        be_irg_t         *birg = env->birg;
-       const arch_env_t *aenv = birg->main_env->arch_env;
+       ir_graph         *irg  = be_get_birg_irg(birg);
+       const arch_env_t *aenv = be_get_birg_arch_env(birg);
        int i, n = arch_isa_get_n_reg_class(aenv->isa);
 
        for (i = 0; i < n; i++) {
@@ -124,18 +125,20 @@ static void stat_reg_pressure_block(ir_node *block, void *data) {
                        max_live   = cnt < max_live ? max_live : cnt;
                }
 
-               stat_be_block_regpressure(birg->irg, block, max_live, cls->name);
+               stat_be_block_regpressure(irg, block, max_live, cls->name);
        }
 }
 
 void be_do_stat_reg_pressure(be_irg_t *birg) {
+       ir_graph *irg = be_get_birg_irg(birg);
+
        if (stat_is_active()) {
                struct a_pressure_walker w;
 
                w.birg = birg;
-               w.lv   = be_liveness(birg->irg);
+               w.lv   = be_liveness(irg);
                /* Collect register pressure information for each block */
-               irg_block_walk_graph(birg->irg, stat_reg_pressure_block, NULL, &w);
+               irg_block_walk_graph(irg, stat_reg_pressure_block, NULL, &w);
                be_liveness_free(w.lv);
        }
 }
@@ -143,9 +146,9 @@ void be_do_stat_reg_pressure(be_irg_t *birg) {
 /**
  * Notify statistic module about amount of ready nodes.
  */
-void be_do_stat_sched_ready(ir_node *block, nodeset *ready_set) {
+void be_do_stat_sched_ready(ir_node *block, const ir_nodeset_t *ready_set) {
        if (stat_is_active()) {
-               stat_be_block_sched_ready(get_irn_irg(block), block, MIN(nodeset_count(ready_set), 5));
+               stat_be_block_sched_ready(get_irn_irg(block), block, MIN(ir_nodeset_size(ready_set), 5));
        }
 }
 
@@ -302,19 +305,19 @@ void be_stat_init_irg(const arch_env_t *arch_env, ir_graph *irg) {
                }
        }
 }
-#endif
+#endif /* FIRM_STATISTICS */
 
 typedef struct _estimate_irg_costs_env_t {
        const arch_env_t *arch_env;
-       ir_exec_freq *execfreqs;
-       double costs;
+       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;
        ir_node *node;
-       double costs = 0;
+       double  costs = 0.0;
 
        sched_foreach(block, node) {
                costs += arch_get_op_estimated_cost(env->arch_env, node);
@@ -326,9 +329,10 @@ static void estimate_block_costs(ir_node *block, void *data)
 double be_estimate_irg_costs(ir_graph *irg, const arch_env_t *arch_env, ir_exec_freq *execfreqs)
 {
        estimate_irg_costs_env_t env;
-       env.arch_env = arch_env;
+
+       env.arch_env  = arch_env;
        env.execfreqs = execfreqs;
-       env.costs = 0;
+       env.costs     = 0.0;
 
        irg_block_walk_graph(irg, estimate_block_costs, NULL, &env);
 
@@ -336,8 +340,9 @@ double be_estimate_irg_costs(ir_graph *irg, const arch_env_t *arch_env, ir_exec_
 }
 
 #ifdef FIRM_STATISTICS
+
 const char *be_stat_tags[STAT_TAG_LAST];
-FILE *be_stat_file = NULL;
+FILE       *be_stat_file = NULL;
 
 void be_init_stat_file(const char *stat_file_name, const char *sourcefilename)
 {
@@ -346,11 +351,11 @@ void be_init_stat_file(const char *stat_file_name, const char *sourcefilename)
        assert(be_stat_file == NULL);
 
        /* if we want to do some statistics, push the environment. */
-       if(strlen(stat_file_name) == 0)
+       if (strlen(stat_file_name) == 0)
                return;
 
        be_stat_file = fopen(stat_file_name, "at");
-       if(be_stat_file == NULL) {
+       if (be_stat_file == NULL) {
                fprintf(stderr, "Warning couldn't open statfile '%s'\n", stat_file_name);
                return;
        }
@@ -369,14 +374,13 @@ void be_init_stat_file(const char *stat_file_name, const char *sourcefilename)
 void be_close_stat_file()
 {
        be_stat_ev_pop();
-       if(be_stat_file != NULL) {
+       if (be_stat_file != NULL) {
                fclose(be_stat_file);
                be_stat_file = NULL;
        }
 }
 
-
-#else
+#else /* FIRM_STATISTICS */
 
 void (be_stat_init_irg)(const arch_env_t *arch_env, ir_graph *irg) {}
 void (be_do_stat_nodes)(ir_graph *irg, const char *phase) {}