Fixed some typos.

[libfirm] / ir / stat / firmstat.c

diff --git a/ir/stat/firmstat.c b/ir/stat/firmstat.c
index 9e22abc..563106a 100644 (file)
--- a/ir/stat/firmstat.c
+++ b/ir/stat/firmstat.c
@@ -601,13 +601,12 @@ static ir_op *stat_get_irn_op(ir_node *node)
  */
 static void undate_block_info(ir_node *node, graph_entry_t *graph)
 {
-       ir_op *op = get_irn_op(node);
        ir_node *block;
        block_entry_t *b_entry;
        int i, arity;
 
        /* check for block */
-       if (op == op_Block) {
+       if (is_Block(node)) {
                arity = get_irn_arity(node);
                b_entry = block_get_entry(&graph->recalc_cnts, get_irn_node_nr(node), graph->block_hash);
                /* mark start end block to allow to filter them out */
@@ -631,7 +630,7 @@ static void undate_block_info(ir_node *node, graph_entry_t *graph)
        block   = get_nodes_block(node);
        b_entry = block_get_entry(&graph->recalc_cnts, get_irn_node_nr(block), graph->block_hash);
 
-       if (op == op_Phi && mode_is_datab(get_irn_mode(node))) {
+       if (is_Phi(node) && mode_is_datab(get_irn_mode(node))) {
                /* count data Phi per block */
                cnt_inc(&b_entry->cnt[bcnt_phi_data]);
        }  /* if */
@@ -973,7 +972,7 @@ static unsigned get_adr_mark(graph_entry_t *graph, ir_node *node)
 static void set_adr_mark(graph_entry_t *graph, ir_node *node, unsigned val)
 {
        address_mark_entry_t const value = { node, val };
-       set_insert(address_mark_entry_t, graph->address_mark, &value, sizeof(value), hash_ptr(node));
+       (void)set_insert(address_mark_entry_t, graph->address_mark, &value, sizeof(value), hash_ptr(node));
 }  /* set_adr_mark */
 
 #undef DUMP_ADR_MODE
@@ -1101,11 +1100,10 @@ static void count_adr_ops(ir_node *node, void *env)
  */
 static void update_graph_stat(graph_entry_t *global, graph_entry_t *graph)
 {
-       node_entry_t *entry;
        int i;
 
        /* clear first the alive counter in the graph */
-       foreach_pset(graph->opcode_hash, node_entry_t*, entry) {
+       foreach_pset(graph->opcode_hash, node_entry_t, entry) {
                cnt_clr(&entry->cnt_alive);
        }  /* foreach_pset */
 
@@ -1141,7 +1139,7 @@ static void update_graph_stat(graph_entry_t *global, graph_entry_t *graph)
                graph->is_chain_call = 0;
 
        /* assume we walk every graph only ONCE, we could sum here the global count */
-       foreach_pset(graph->opcode_hash, node_entry_t*, entry) {
+       foreach_pset(graph->opcode_hash, node_entry_t, entry) {
                node_entry_t *g_entry = opcode_get_entry(entry->op, global->opcode_hash);
 
                /* update the node counter */
@@ -1253,8 +1251,6 @@ static void stat_dump_registered(graph_entry_t *entry)
 
        for (dumper = status->dumper; dumper; dumper = dumper->next) {
                if (dumper->func_map) {
-                       dump_graph_FUNC func;
-
                        foreach_pset(dumper->func_map, dump_graph_FUNC, func)
                                func(dumper, entry);
                }  /* if */
@@ -1329,7 +1325,7 @@ static void stat_dump_finish(void)
 /**
  * Register an additional function for all dumper.
  */
-void stat_register_dumper_func(dump_graph_FUNC func)
+void stat_register_dumper_func(dump_graph_FUNC *const func)
 {
        dumper_t *dumper;
 
@@ -1676,9 +1672,8 @@ static void stat_merge_nodes(
 
                                /* sometimes we did not detect, that it is replaced by a Const */
                                if (opt == HOOK_OPT_CONFIRM && new_num_entries == 1) {
-                                       ir_op *op = get_irn_op(new_node_array[0]);
-
-                                       if (op == op_Const || op == op_SymConst)
+                                       ir_node *const irn = new_node_array[0];
+                                       if (is_Const(irn) || is_SymConst(irn))
                                                xopt = HOOK_OPT_CONFIRM_C;
                                }  /* if */
 
@@ -2032,7 +2027,6 @@ void stat_dump_snapshot(const char *name, const char *phase)
 
        STAT_ENTER;
        {
-               graph_entry_t *entry;
                graph_entry_t *global = graph_get_entry(NULL, status->irg_hash);
 
                /*
@@ -2077,7 +2071,7 @@ void stat_dump_snapshot(const char *name, const char *phase)
                stat_dump_init(fname);
 
                /* calculate the graph statistics */
-               foreach_pset(status->irg_hash, graph_entry_t*, entry) {
+               foreach_pset(status->irg_hash, graph_entry_t, entry) {
                        if (entry->irg == NULL) {
                                /* special entry for the global count */
                                continue;
@@ -2090,13 +2084,13 @@ void stat_dump_snapshot(const char *name, const char *phase)
 
                /* some calculations are dependent, we pushed them on the wait_q */
                while (! pdeq_empty(status->wait_q)) {
-                       entry = (graph_entry_t*)pdeq_getr(status->wait_q);
+                       graph_entry_t *const entry = (graph_entry_t*)pdeq_getr(status->wait_q);
 
                        update_graph_stat_2(global, entry);
                }  /* while */
 
                /* dump per graph */
-               foreach_pset(status->irg_hash, graph_entry_t*, entry) {
+               foreach_pset(status->irg_hash, graph_entry_t, entry) {
                        if (entry->irg == NULL) {
                                /* special entry for the global count */
                                continue;
@@ -2132,15 +2126,11 @@ void stat_dump_snapshot(const char *name, const char *phase)
                stat_finish_pattern_history(fname);
 
                /* clear the global counters here */
-               {
-                       node_entry_t *entry;
-
-                       foreach_pset(global->opcode_hash, node_entry_t*, entry) {
-                               opcode_clear_entry(entry);
-                       }  /* for */
-                       /* clear all global counter */
-                       graph_clear_entry(global, /*all=*/1);
-               }
+               foreach_pset(global->opcode_hash, node_entry_t, entry) {
+                       opcode_clear_entry(entry);
+               }  /* for */
+               /* clear all global counter */
+               graph_clear_entry(global, /*all=*/1);
        }
        STAT_LEAVE;
 }  /* stat_dump_snapshot */