identifiers starting with _ are reserved; remove this bad practice
[libfirm] / ir / stat / firmstat.c
index d03ab24..3aa6fe4 100644 (file)
@@ -1,38 +1,47 @@
 /*
- * Project:     libFIRM
- * File name:   ir/ir/firmstat.c
- * Purpose:     Statistics for Firm.
- * Author:      Michael Beck
- * Created:
- * CVS-ID:      $Id$
- * Copyright:   (c) 2004 Universität Karlsruhe
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
- */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ *
+ * This file is part of libFirm.
+ *
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
+ *
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
+ *
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
+ */
+
+/**
+ * @file
+ * @brief   Statistics for Firm.
+ * @author  Michael Beck
+ * @version $Id$
+ */
+#include "config.h"
 
 #ifdef FIRM_STATISTICS
 
 #include <stdio.h>
-
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
+#include <stdlib.h>
+#include <string.h>
 
 #include "irouts.h"
 #include "irdump.h"
 #include "hashptr.h"
 #include "firmstat_t.h"
+#include "irpass_t.h"
 #include "pattern.h"
 #include "dags.h"
 #include "stat_dmp.h"
 #include "xmalloc.h"
 #include "irhooks.h"
+#include "util.h"
 
 /*
  * need this to be static:
@@ -59,6 +68,9 @@ static ir_op _op_ModC;
 /** The Div by Const node. */
 static ir_op _op_DivModC;
 
+/** The Quot by Const node. */
+static ir_op _op_QuotC;
+
 /** The memory Proj node. */
 static ir_op _op_ProjM;
 
@@ -82,157 +94,160 @@ static ir_op _op_SelSelSel;
 /**
  * global status
  */
-static const int status_disable = 0;
+static const unsigned status_disable = 0;
 static stat_info_t *status = (stat_info_t *)&status_disable;
 
 /**
- * compare two elements of the opcode hash
+ * Compare two elements of the opcode hash.
  */
 static int opcode_cmp(const void *elt, const void *key)
 {
-  const node_entry_t *e1 = elt;
-  const node_entry_t *e2 = key;
+       const node_entry_t *e1 = elt;
+       const node_entry_t *e2 = key;
 
-  return e1->op->code - e2->op->code;
-}
+       return e1->op->code - e2->op->code;
+}  /* opcode_cmp */
 
 /**
- * compare two elements of the graph hash
+ * Compare two elements of the graph hash.
  */
 static int graph_cmp(const void *elt, const void *key)
 {
-  const graph_entry_t *e1 = elt;
-  const graph_entry_t *e2 = key;
+       const graph_entry_t *e1 = elt;
+       const graph_entry_t *e2 = key;
 
-  return e1->irg != e2->irg;
-}
+       return e1->irg != e2->irg;
+}  /* graph_cmp */
 
 /**
- * compare two elements of the optimization hash
+ * Compare two elements of the optimization hash.
  */
 static int opt_cmp(const void *elt, const void *key)
 {
-  const opt_entry_t *e1 = elt;
-  const opt_entry_t *e2 = key;
+       const opt_entry_t *e1 = elt;
+       const opt_entry_t *e2 = key;
 
-  return e1->op->code != e2->op->code;
-}
+       return e1->op->code != e2->op->code;
+}  /* opt_cmp */
 
 /**
- * compare two elements of the block/extbb hash
+ * Compare two elements of the block/extbb hash.
  */
 static int block_cmp(const void *elt, const void *key)
 {
-  const block_entry_t *e1 = elt;
-  const block_entry_t *e2 = key;
+       const block_entry_t *e1 = elt;
+       const block_entry_t *e2 = key;
 
-  return e1->block_nr != e2->block_nr;
-}
+       /* it's enough to compare the block number */
+       return e1->block_nr != e2->block_nr;
+}  /* block_cmp */
 
 /**
- * compare two elements of the be_block hash
+ * Compare two elements of the be_block hash.
  */
 static int be_block_cmp(const void *elt, const void *key)
 {
-  const be_block_entry_t *e1 = elt;
-  const be_block_entry_t *e2 = key;
+       const be_block_entry_t *e1 = elt;
+       const be_block_entry_t *e2 = key;
 
-  return e1->block_nr != e2->block_nr;
-}
+       return e1->block_nr != e2->block_nr;
+}  /* be_block_cmp */
 
 /**
- * compare two elements of reg pressure hash
+ * Compare two elements of reg pressure hash.
  */
 static int reg_pressure_cmp(const void *elt, const void *key)
 {
-  const reg_pressure_entry_t *e1 = elt;
-  const reg_pressure_entry_t *e2 = key;
+       const reg_pressure_entry_t *e1 = elt;
+       const reg_pressure_entry_t *e2 = key;
 
-  return e1->class_name != e2->class_name;
-}
+       return e1->class_name != e2->class_name;
+}  /* reg_pressure_cmp */
 
 /**
- * compare two elements of the perm_stat hash
+ * Compare two elements of the perm_stat hash.
  */
 static int perm_stat_cmp(const void *elt, const void *key)
 {
-  const perm_stat_entry_t *e1 = elt;
-  const perm_stat_entry_t *e2 = key;
+       const perm_stat_entry_t *e1 = elt;
+       const perm_stat_entry_t *e2 = key;
 
-  return e1->perm != e2->perm;
-}
+       return e1->perm != e2->perm;
+}  /* perm_stat_cmp */
 
 /**
- * compare two elements of the perm_class hash
+ * Compare two elements of the perm_class hash.
  */
 static int perm_class_cmp(const void *elt, const void *key)
 {
-  const perm_class_entry_t *e1 = elt;
-  const perm_class_entry_t *e2 = key;
+       const perm_class_entry_t *e1 = elt;
+       const perm_class_entry_t *e2 = key;
 
-  return e1->class_name != e2->class_name;
-}
+       return e1->class_name != e2->class_name;
+}  /* perm_class_cmp */
 
 /**
- * compare two elements of the ir_op hash
+ * Compare two elements of the ir_op hash.
  */
 static int opcode_cmp_2(const void *elt, const void *key)
 {
-  const ir_op *e1 = elt;
-  const ir_op *e2 = key;
+       const ir_op *e1 = elt;
+       const ir_op *e2 = key;
 
-  return e1->code != e2->code;
-}
+       return e1->code != e2->code;
+}  /* opcode_cmp_2 */
 
 /**
- * compare two elements of the address_mark set
+ * Compare two elements of the address_mark set.
  */
 static int address_mark_cmp(const void *elt, const void *key, size_t size)
 {
-  const address_mark_entry_t *e1 = elt;
-  const address_mark_entry_t *e2 = key;
+       const address_mark_entry_t *e1 = elt;
+       const address_mark_entry_t *e2 = key;
+       (void) size;
 
-  /* compare only the nodes, the rest is used as data container */
-  return e1->node != e2->node;
-}
+       /* compare only the nodes, the rest is used as data container */
+       return e1->node != e2->node;
+}  /* address_mark_cmp */
 
 /**
- * clears all counter in a node_entry_t
+ * Clear all counter in a node_entry_t.
  */
 static void opcode_clear_entry(node_entry_t *elem)
 {
-  cnt_clr(&elem->cnt_alive);
-  cnt_clr(&elem->new_node);
-  cnt_clr(&elem->into_Id);
-}
+       cnt_clr(&elem->cnt_alive);
+       cnt_clr(&elem->new_node);
+       cnt_clr(&elem->into_Id);
+       cnt_clr(&elem->normalized);
+}  /* opcode_clear_entry */
 
 /**
- * Returns the associates node_entry_t for an ir_op
+ * Returns the associates node_entry_t for an ir_op (and allocates
+ * one if not yet available).
  *
  * @param op    the IR operation
  * @param hmap  a hash map containing ir_op* -> node_entry_t*
  */
 static node_entry_t *opcode_get_entry(const ir_op *op, hmap_node_entry_t *hmap)
 {
-  node_entry_t key;
-  node_entry_t *elem;
+       node_entry_t key;
+       node_entry_t *elem;
 
-  key.op = op;
+       key.op = op;
 
-  elem = pset_find(hmap, &key, op->code);
-  if (elem)
-    return elem;
+       elem = pset_find(hmap, &key, op->code);
+       if (elem)
+               return elem;
 
-  elem = obstack_alloc(&status->cnts, sizeof(*elem));
-  memset(elem, 0, sizeof(*elem));
+       elem = OALLOCZ(&status->cnts, node_entry_t);
 
-  /* clear counter */
-  opcode_clear_entry(elem);
+       /* clear counter */
+       opcode_clear_entry(elem);
 
-  elem->op = op;
+       elem->op = op;
 
-  return pset_insert(hmap, elem, op->code);
-}
+       return pset_insert(hmap, elem, op->code);
+}  /* opcode_get_entry */
 
 /**
  * Returns the associates ir_op for an opcode
@@ -240,100 +255,96 @@ static node_entry_t *opcode_get_entry(const ir_op *op, hmap_node_entry_t *hmap)
  * @param code  the IR opcode
  * @param hmap  the hash map containing opcode -> ir_op*
  */
-static ir_op *opcode_find_entry(opcode code, hmap_ir_op *hmap)
+static ir_op *opcode_find_entry(ir_opcode code, hmap_ir_op *hmap)
 {
-  ir_op key;
+       ir_op key;
 
-  key.code = code;
-  return pset_find(hmap, &key, code);
-}
+       key.code = code;
+       return pset_find(hmap, &key, code);
+}  /* opcode_find_entry */
 
 /**
- * clears all counter in a graph_entry_t
+ * Clears all counter in a graph_entry_t.
+ *
+ * @param elem  the graph entry
+ * @param all   if non-zero, clears all counters, else leave accumulated ones
  */
 static void graph_clear_entry(graph_entry_t *elem, int all)
 {
-  if (all) {
-    cnt_clr(&elem->cnt_walked);
-    cnt_clr(&elem->cnt_walked_blocks);
-    cnt_clr(&elem->cnt_was_inlined);
-    cnt_clr(&elem->cnt_got_inlined);
-    cnt_clr(&elem->cnt_strength_red);
-    cnt_clr(&elem->cnt_real_func_call);
-  }
-  cnt_clr(&elem->cnt_edges);
-  cnt_clr(&elem->cnt_all_calls);
-  cnt_clr(&elem->cnt_call_with_cnst_arg);
-  cnt_clr(&elem->cnt_indirect_calls);
-
-  if (elem->block_hash) {
-    del_pset(elem->block_hash);
-    elem->block_hash = NULL;
-  }
-
-  if (elem->extbb_hash) {
-    del_pset(elem->extbb_hash);
-    elem->extbb_hash = NULL;
-  }
-
-  obstack_free(&elem->recalc_cnts, NULL);
-  obstack_init(&elem->recalc_cnts);
-}
+       int i;
+
+       /* clear accumulated / non-accumulated counter */
+       for (i = all ? 0 : _gcnt_non_acc; i < _gcnt_last; ++i) {
+               cnt_clr(&elem->cnt[i]);
+       }  /* for */
+
+       if (elem->block_hash) {
+               del_pset(elem->block_hash);
+               elem->block_hash = NULL;
+       }  /* if */
+
+       if (elem->extbb_hash) {
+               del_pset(elem->extbb_hash);
+               elem->extbb_hash = NULL;
+       }  /* if */
+
+       obstack_free(&elem->recalc_cnts, NULL);
+       obstack_init(&elem->recalc_cnts);
+}  /* graph_clear_entry */
 
 /**
  * Returns the associated graph_entry_t for an IR graph.
  *
- * @param irg   the IR graph
+ * @param irg   the IR graph, NULL for the global counter
  * @param hmap  the hash map containing ir_graph* -> graph_entry_t*
  */
 static graph_entry_t *graph_get_entry(ir_graph *irg, hmap_graph_entry_t *hmap)
 {
-  graph_entry_t key;
-  graph_entry_t *elem;
-  int i;
+       graph_entry_t key;
+       graph_entry_t *elem;
+       size_t i;
 
-  key.irg = irg;
+       key.irg = irg;
 
-  elem = pset_find(hmap, &key, HASH_PTR(irg));
+       elem = pset_find(hmap, &key, HASH_PTR(irg));
 
-  if (elem) {
-    /* create hash map backend block information */
-    if (! elem->be_block_hash)
-      elem->be_block_hash = new_pset(be_block_cmp, 5);
+       if (elem) {
+               /* create hash map backend block information */
+               if (! elem->be_block_hash)
+                       elem->be_block_hash = new_pset(be_block_cmp, 5);
 
-    return elem;
-  }
+               return elem;
+       }  /* if */
 
-  /* allocate a new one */
-  elem = obstack_alloc(&status->cnts, sizeof(*elem));
-  memset(elem, 0, sizeof(*elem));
-  obstack_init(&elem->recalc_cnts);
+       /* allocate a new one */
+       elem = OALLOCZ(&status->cnts, graph_entry_t);
+       obstack_init(&elem->recalc_cnts);
 
-  /* clear counter */
-  graph_clear_entry(elem, 1);
+       /* clear counter */
+       graph_clear_entry(elem, 1);
 
-  /* new hash table for opcodes here  */
-  elem->opcode_hash  = new_pset(opcode_cmp, 5);
-  elem->address_mark = new_set(address_mark_cmp, 5);
-  elem->irg          = irg;
+       /* new hash table for opcodes here  */
+       elem->opcode_hash   = new_pset(opcode_cmp, 5);
+       elem->address_mark  = new_set(address_mark_cmp, 5);
+       elem->irg           = irg;
 
-  /* these hash tables are created on demand */
-  elem->block_hash = NULL;
-  elem->extbb_hash = NULL;
+       /* these hash tables are created on demand */
+       elem->block_hash = NULL;
+       elem->extbb_hash = NULL;
 
-  for (i = 0; i < sizeof(elem->opt_hash)/sizeof(elem->opt_hash[0]); ++i)
-    elem->opt_hash[i] = new_pset(opt_cmp, 4);
+       for (i = 0; i < sizeof(elem->opt_hash)/sizeof(elem->opt_hash[0]); ++i)
+               elem->opt_hash[i] = new_pset(opt_cmp, 4);
 
-  return pset_insert(hmap, elem, HASH_PTR(irg));
-}
+       return pset_insert(hmap, elem, HASH_PTR(irg));
+}  /* graph_get_entry */
 
 /**
- * clears all counter in an opt_entry_t
+ * Clear all counter in an opt_entry_t.
  */
 static void opt_clear_entry(opt_entry_t *elem)
 {
-  cnt_clr(&elem->count);
-}
+       cnt_clr(&elem->count);
+}  /* opt_clear_entry */
 
 /**
  * Returns the associated opt_entry_t for an IR operation.
@@ -343,37 +354,35 @@ static void opt_clear_entry(opt_entry_t *elem)
  */
 static opt_entry_t *opt_get_entry(const ir_op *op, hmap_opt_entry_t *hmap)
 {
-  opt_entry_t key;
-  opt_entry_t *elem;
+       opt_entry_t key;
+       opt_entry_t *elem;
 
-  key.op = op;
+       key.op = op;
 
-  elem = pset_find(hmap, &key, op->code);
-  if (elem)
-    return elem;
+       elem = pset_find(hmap, &key, op->code);
+       if (elem)
+               return elem;
 
-  elem = obstack_alloc(&status->cnts, sizeof(*elem));
-  memset(elem, 0, sizeof(*elem));
+       elem = OALLOCZ(&status->cnts, opt_entry_t);
 
-  /* clear new counter */
-  opt_clear_entry(elem);
+       /* clear new counter */
+       opt_clear_entry(elem);
 
-  elem->op = op;
+       elem->op = op;
 
-  return pset_insert(hmap, elem, op->code);
-}
+       return pset_insert(hmap, elem, op->code);
+}  /* opt_get_entry */
 
 /**
  * clears all counter in a block_entry_t
  */
 static void block_clear_entry(block_entry_t *elem)
 {
-  cnt_clr(&elem->cnt_nodes);
-  cnt_clr(&elem->cnt_edges);
-  cnt_clr(&elem->cnt_in_edges);
-  cnt_clr(&elem->cnt_out_edges);
-  cnt_clr(&elem->cnt_phi_data);
-}
+       int i;
+
+       for (i = 0; i < _bcnt_last; ++i)
+               cnt_clr(&elem->cnt[i]);
+}  /* block_clear_entry */
 
 /**
  * Returns the associated block_entry_t for an block.
@@ -383,28 +392,27 @@ static void block_clear_entry(block_entry_t *elem)
  */
 static block_entry_t *block_get_entry(struct obstack *obst, long block_nr, hmap_block_entry_t *hmap)
 {
-  block_entry_t key;
-  block_entry_t *elem;
+       block_entry_t key;
+       block_entry_t *elem;
 
-  key.block_nr = block_nr;
+       key.block_nr = block_nr;
 
-  elem = pset_find(hmap, &key, block_nr);
-  if (elem)
-    return elem;
+       elem = pset_find(hmap, &key, block_nr);
+       if (elem)
+               return elem;
 
-  elem = obstack_alloc(obst, sizeof(*elem));
-  memset(elem, 0, sizeof(*elem));
+       elem = OALLOCZ(obst, block_entry_t);
 
-  /* clear new counter */
-  block_clear_entry(elem);
+       /* clear new counter */
+       block_clear_entry(elem);
 
-  elem->block_nr = block_nr;
+       elem->block_nr = block_nr;
 
-  return pset_insert(hmap, elem, block_nr);
-}
+       return pset_insert(hmap, elem, block_nr);
+}  /* block_get_entry */
 
 /**
- * clears all sets in be_block_entry_t
+ * Clear all sets in be_block_entry_t.
  */
 static void be_block_clear_entry(be_block_entry_t *elem)
 {
@@ -420,7 +428,7 @@ static void be_block_clear_entry(be_block_entry_t *elem)
        elem->reg_pressure    = new_pset(reg_pressure_cmp, 5);
        elem->sched_ready     = stat_new_int_distrib_tbl();
        elem->perm_class_stat = new_pset(perm_class_cmp, 5);
-}
+}  /* be_block_clear_entry */
 
 /**
  * Returns the associated be_block_entry_t for an block.
@@ -430,35 +438,35 @@ static void be_block_clear_entry(be_block_entry_t *elem)
  */
 static be_block_entry_t *be_block_get_entry(struct obstack *obst, long block_nr, hmap_be_block_entry_t *hmap)
 {
-  be_block_entry_t key;
-  be_block_entry_t *elem;
+       be_block_entry_t key;
+       be_block_entry_t *elem;
 
-  key.block_nr = block_nr;
+       key.block_nr = block_nr;
 
-  elem = pset_find(hmap, &key, block_nr);
-  if (elem)
-    return elem;
+       elem = pset_find(hmap, &key, block_nr);
+       if (elem)
+               return elem;
 
-  elem = obstack_alloc(obst, sizeof(*elem));
-  memset(elem, 0, sizeof(*elem));
+       elem = OALLOCZ(obst, be_block_entry_t);
 
-  /* clear new counter */
-  be_block_clear_entry(elem);
+       /* clear new counter */
+       be_block_clear_entry(elem);
 
-  elem->block_nr = block_nr;
+       elem->block_nr = block_nr;
 
-  return pset_insert(hmap, elem, block_nr);
-}
+       return pset_insert(hmap, elem, block_nr);
+}  /* be_block_get_entry */
 
 /**
  * clears all sets in perm_class_entry_t
  */
-static void perm_class_clear_entry(perm_class_entry_t *elem) {
+static void perm_class_clear_entry(perm_class_entry_t *elem)
+{
        if (elem->perm_stat)
                del_pset(elem->perm_stat);
 
        elem->perm_stat = new_pset(perm_stat_cmp, 5);
-}
+}  /* perm_class_clear_entry */
 
 /**
  * Returns the associated perm_class entry for a register class.
@@ -469,30 +477,30 @@ static void perm_class_clear_entry(perm_class_entry_t *elem) {
 static perm_class_entry_t *perm_class_get_entry(struct obstack *obst, const char *class_name,
                                                 hmap_perm_class_entry_t *hmap)
 {
-  perm_class_entry_t key;
-  perm_class_entry_t *elem;
+       perm_class_entry_t key;
+       perm_class_entry_t *elem;
 
-  key.class_name = class_name;
+       key.class_name = class_name;
 
-  elem = pset_find(hmap, &key, HASH_PTR(class_name));
-  if (elem)
-    return elem;
+       elem = pset_find(hmap, &key, HASH_PTR(class_name));
+       if (elem)
+               return elem;
 
-  elem = obstack_alloc(obst, sizeof(*elem));
-  memset(elem, 0, sizeof(*elem));
+       elem = OALLOCZ(obst, perm_class_entry_t);
 
-  /* clear new counter */
-  perm_class_clear_entry(elem);
+       /* clear new counter */
+       perm_class_clear_entry(elem);
 
-  elem->class_name = class_name;
+       elem->class_name = class_name;
 
-  return pset_insert(hmap, elem, HASH_PTR(class_name));
-}
+       return pset_insert(hmap, elem, HASH_PTR(class_name));
+}  /* perm_class_get_entry */
 
 /**
  * clears all sets in perm_stat_entry_t
  */
-static void perm_stat_clear_entry(perm_stat_entry_t *elem) {
+static void perm_stat_clear_entry(perm_stat_entry_t *elem)
+{
        if (elem->chains)
                stat_delete_distrib_tbl(elem->chains);
 
@@ -501,7 +509,7 @@ static void perm_stat_clear_entry(perm_stat_entry_t *elem) {
 
        elem->chains = stat_new_int_distrib_tbl();
        elem->cycles = stat_new_int_distrib_tbl();
-}
+}  /* perm_stat_clear_entry */
 
 /**
  * Returns the associated perm_stat entry for a perm.
@@ -511,24 +519,33 @@ static void perm_stat_clear_entry(perm_stat_entry_t *elem) {
  */
 static perm_stat_entry_t *perm_stat_get_entry(struct obstack *obst, ir_node *perm, hmap_perm_stat_entry_t *hmap)
 {
-  perm_stat_entry_t key;
-  perm_stat_entry_t *elem;
+       perm_stat_entry_t key;
+       perm_stat_entry_t *elem;
 
-  key.perm = perm;
+       key.perm = perm;
 
-  elem = pset_find(hmap, &key, HASH_PTR(perm));
-  if (elem)
-    return elem;
+       elem = pset_find(hmap, &key, HASH_PTR(perm));
+       if (elem)
+               return elem;
 
-  elem = obstack_alloc(obst, sizeof(*elem));
-  memset(elem, 0, sizeof(*elem));
+       elem = OALLOCZ(obst, perm_stat_entry_t);
 
-  /* clear new counter */
-  perm_stat_clear_entry(elem);
+       /* clear new counter */
+       perm_stat_clear_entry(elem);
 
-  elem->perm = perm;
+       elem->perm = perm;
 
-  return pset_insert(hmap, elem, HASH_PTR(perm));
+       return pset_insert(hmap, elem, HASH_PTR(perm));
+}  /* perm_stat_get_entry */
+
+/**
+ * Clear optimizations counter,
+ */
+static void clear_optimization_counter(void)
+{
+       int i;
+       for (i = 0; i < FS_OPT_MAX; ++i)
+               cnt_clr(&status->num_opts[i]);
 }
 
 /**
@@ -539,379 +556,527 @@ static perm_stat_entry_t *perm_stat_get_entry(struct obstack *obst, ir_node *per
  */
 static ir_op *stat_get_irn_op(ir_node *node)
 {
-  ir_op *op = get_irn_op(node);
-
-  if (op == op_Phi && get_irn_arity(node) == 0) {
-    /* special case, a Phi0 node, count on extra counter */
-    op = status->op_Phi0 ? status->op_Phi0 : op;
-  }
-  else if (op == op_Phi && get_irn_mode(node) == mode_M) {
-    /* special case, a Memory Phi node, count on extra counter */
-    op = status->op_PhiM ? status->op_PhiM : op;
-  }
-  else if (op == op_Proj && get_irn_mode(node) == mode_M) {
-    /* special case, a Memory Proj node, count on extra counter */
-    op = status->op_ProjM ? status->op_ProjM : op;
-  }
-  else if (op == op_Mul &&
-           (get_irn_op(get_Mul_left(node)) == op_Const || get_irn_op(get_Mul_right(node)) == op_Const)) {
-    /* special case, a Multiply by a const, count on extra counter */
-    op = status->op_MulC ? status->op_MulC : op;
-  }
-  else if (op == op_Div && get_irn_op(get_Div_right(node)) == op_Const) {
-    /* special case, a division by a const, count on extra counter */
-    op = status->op_DivC ? status->op_DivC : op;
-  }
-  else if (op == op_Mod && get_irn_op(get_Mod_right(node)) == op_Const) {
-    /* special case, a module by a const, count on extra counter */
-    op = status->op_ModC ? status->op_ModC : op;
-  }
-  else if (op == op_DivMod && get_irn_op(get_DivMod_right(node)) == op_Const) {
-    /* special case, a division/modulo by a const, count on extra counter */
-    op = status->op_DivModC ? status->op_DivModC : op;
-  }
-  else if (op == op_Sel && get_irn_op(get_Sel_ptr(node)) == op_Sel) {
-    /* special case, a Sel of a Sel, count on extra counter */
-    op = status->op_SelSel ? status->op_SelSel : op;
-
-    if (get_irn_op(get_Sel_ptr(get_Sel_ptr(node))) == op_Sel) {
-      /* special case, a Sel of a Sel of a Sel, count on extra counter */
-      op = status->op_SelSelSel ? status->op_SelSelSel : op;
-    }
-  }
-
-  return op;
-}
+       ir_op *op = get_irn_op(node);
+       ir_opcode opc = op->code;
+
+       switch (opc) {
+       case iro_Phi:
+               if (get_irn_arity(node) == 0) {
+                       /* special case, a Phi0 node, count on extra counter */
+                       op = status->op_Phi0 ? status->op_Phi0 : op;
+               } else if (get_irn_mode(node) == mode_M) {
+                       /* special case, a Memory Phi node, count on extra counter */
+                       op = status->op_PhiM ? status->op_PhiM : op;
+               }  /* if */
+               break;
+       case iro_Proj:
+               if (get_irn_mode(node) == mode_M) {
+                       /* special case, a Memory Proj node, count on extra counter */
+                       op = status->op_ProjM ? status->op_ProjM : op;
+               }  /* if */
+               break;
+       case iro_Mul:
+               if (is_Const(get_Mul_left(node)) || is_Const(get_Mul_right(node))) {
+                       /* special case, a Multiply by a const, count on extra counter */
+                       op = status->op_MulC ? status->op_MulC : op;
+               }  /* if */
+               break;
+       case iro_Div:
+               if (is_Const(get_Div_right(node))) {
+                       /* special case, a division by a const, count on extra counter */
+                       op = status->op_DivC ? status->op_DivC : op;
+               }  /* if */
+               break;
+       case iro_Mod:
+               if (is_Const(get_Mod_right(node))) {
+                       /* special case, a module by a const, count on extra counter */
+                       op = status->op_ModC ? status->op_ModC : op;
+               }  /* if */
+               break;
+       case iro_DivMod:
+               if (is_Const(get_DivMod_right(node))) {
+                       /* special case, a division/modulo by a const, count on extra counter */
+                       op = status->op_DivModC ? status->op_DivModC : op;
+               }  /* if */
+               break;
+       case iro_Quot:
+               if (is_Const(get_Quot_right(node))) {
+                       /* special case, a floating point division by a const, count on extra counter */
+                       op = status->op_QuotC ? status->op_QuotC : op;
+               }  /* if */
+               break;
+       case iro_Sel:
+               if (is_Sel(get_Sel_ptr(node))) {
+                       /* special case, a Sel of a Sel, count on extra counter */
+                       op = status->op_SelSel ? status->op_SelSel : op;
+                       if (is_Sel(get_Sel_ptr(get_Sel_ptr(node)))) {
+                               /* special case, a Sel of a Sel of a Sel, count on extra counter */
+                               op = status->op_SelSelSel ? status->op_SelSelSel : op;
+                       }  /* if */
+               }  /* if */
+               break;
+       default:
+               ;
+       }  /* switch */
+
+       return op;
+}  /* stat_get_irn_op */
 
 /**
  * update the block counter
  */
 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) {
-    arity = get_irn_arity(node);
-    b_entry = block_get_entry(&graph->recalc_cnts, get_irn_node_nr(node), graph->block_hash);
-
-    /* count all incoming edges */
-    for (i = 0; i < arity; ++i) {
-      ir_node *pred = get_irn_n(node, i);
-      ir_node *other_block = get_nodes_block(pred);
-      block_entry_t *b_entry_other = block_get_entry(&graph->recalc_cnts, get_irn_node_nr(other_block), graph->block_hash);
-
-      cnt_inc(&b_entry->cnt_in_edges); /* an edge coming from another block */
-      cnt_inc(&b_entry_other->cnt_out_edges);
-    }
-    return;
-  }
+       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) {
+               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 */
+               if (node == get_irg_start_block(graph->irg))
+                       b_entry->is_start = 1;
+               else if (node == get_irg_end_block(graph->irg))
+                       b_entry->is_end = 1;
+
+               /* count all incoming edges */
+               for (i = 0; i < arity; ++i) {
+                       ir_node *pred = get_irn_n(node, i);
+                       ir_node *other_block = get_nodes_block(pred);
+                       block_entry_t *b_entry_other = block_get_entry(&graph->recalc_cnts, get_irn_node_nr(other_block), graph->block_hash);
+
+                       cnt_inc(&b_entry->cnt[bcnt_in_edges]);  /* an edge coming from another block */
+                       cnt_inc(&b_entry_other->cnt[bcnt_out_edges]);
+               }  /* for */
+               return;
+       }  /* if */
 
-  block   = get_nodes_block(node);
-  b_entry = block_get_entry(&graph->recalc_cnts, get_irn_node_nr(block), graph->block_hash);
+       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))) {
-    /* count data Phi per block */
-    cnt_inc(&b_entry->cnt_phi_data);
-  }
+       if (op == op_Phi && mode_is_datab(get_irn_mode(node))) {
+               /* count data Phi per block */
+               cnt_inc(&b_entry->cnt[bcnt_phi_data]);
+       }  /* if */
 
-  /* we have a new node in our block */
-  cnt_inc(&b_entry->cnt_nodes);
+       /* we have a new node in our block */
+       cnt_inc(&b_entry->cnt[bcnt_nodes]);
 
-  /* don't count keep-alive edges */
-  if (get_irn_op(node) == op_End)
-    return;
+       /* don't count keep-alive edges */
+       if (is_End(node))
+               return;
 
-  arity = get_irn_arity(node);
+       arity = get_irn_arity(node);
 
-  for (i = 0; i < arity; ++i) {
-    ir_node *pred = get_irn_n(node, i);
-    ir_node *other_block;
+       for (i = 0; i < arity; ++i) {
+               ir_node *pred = get_irn_n(node, i);
+               ir_node *other_block;
 
-    other_block = get_nodes_block(pred);
+               other_block = get_nodes_block(pred);
 
-    if (other_block == block)
-      cnt_inc(&b_entry->cnt_edges);    /* a in block edge */
-    else {
-      block_entry_t *b_entry_other = block_get_entry(&graph->recalc_cnts, get_irn_node_nr(other_block), graph->block_hash);
+               if (other_block == block)
+                       cnt_inc(&b_entry->cnt[bcnt_edges]);     /* a in block edge */
+               else {
+                       block_entry_t *b_entry_other = block_get_entry(&graph->recalc_cnts, get_irn_node_nr(other_block), graph->block_hash);
 
-      cnt_inc(&b_entry->cnt_in_edges); /* an edge coming from another block */
-      cnt_inc(&b_entry_other->cnt_out_edges);
-    }
-  }
-}
+                       cnt_inc(&b_entry->cnt[bcnt_in_edges]);  /* an edge coming from another block */
+                       cnt_inc(&b_entry_other->cnt[bcnt_out_edges]);
+               }  /* if */
+       }  /* for */
+}  /* undate_block_info */
 
 /**
- * update the extended block counter
+ * Update the extended block counter.
  */
-static void undate_extbb_info(ir_node *node, graph_entry_t *graph)
+static void update_extbb_info(ir_node *node, graph_entry_t *graph)
 {
-  ir_op *op = get_irn_op(node);
-  ir_extblk *extbb;
-  extbb_entry_t *eb_entry;
-  int i, arity;
+       ir_op *op = get_irn_op(node);
+       ir_extblk *extbb;
+       extbb_entry_t *eb_entry;
+       int i, arity;
 
-  /* check for block */
-  if (op == op_Block) {
-    extbb = get_nodes_extbb(node);
-    arity = get_irn_arity(node);
-    eb_entry = block_get_entry(&graph->recalc_cnts, get_extbb_node_nr(extbb), graph->extbb_hash);
+       /* check for block */
+       if (op == op_Block) {
+               extbb = get_nodes_extbb(node);
+               arity = get_irn_arity(node);
+               eb_entry = block_get_entry(&graph->recalc_cnts, get_extbb_node_nr(extbb), graph->extbb_hash);
 
-    /* count all incoming edges */
-    for (i = 0; i < arity; ++i) {
-      ir_node *pred = get_irn_n(node, i);
-      ir_extblk *other_extbb = get_nodes_extbb(pred);
+               /* count all incoming edges */
+               for (i = 0; i < arity; ++i) {
+                       ir_node *pred = get_irn_n(node, i);
+                       ir_extblk *other_extbb = get_nodes_extbb(pred);
 
-      if (extbb != other_extbb) {
-        extbb_entry_t *eb_entry_other = block_get_entry(&graph->recalc_cnts, get_extbb_node_nr(other_extbb), graph->extbb_hash);
+                       if (extbb != other_extbb) {
+                               extbb_entry_t *eb_entry_other = block_get_entry(&graph->recalc_cnts, get_extbb_node_nr(other_extbb), graph->extbb_hash);
 
-        cnt_inc(&eb_entry->cnt_in_edges);      /* an edge coming from another extbb */
-        cnt_inc(&eb_entry_other->cnt_out_edges);
-      }
-    }
-    return;
-  }
+                               cnt_inc(&eb_entry->cnt[bcnt_in_edges]); /* an edge coming from another extbb */
+                               cnt_inc(&eb_entry_other->cnt[bcnt_out_edges]);
+                       }  /* if */
+               }  /* for */
+               return;
+       }  /* if */
 
-  extbb    = get_nodes_extbb(node);
-  eb_entry = block_get_entry(&graph->recalc_cnts, get_extbb_node_nr(extbb), graph->extbb_hash);
+       extbb    = get_nodes_extbb(node);
+       eb_entry = block_get_entry(&graph->recalc_cnts, get_extbb_node_nr(extbb), graph->extbb_hash);
 
-  if (op == op_Phi && mode_is_datab(get_irn_mode(node))) {
-    /* count data Phi per extbb */
-    cnt_inc(&eb_entry->cnt_phi_data);
-  }
+       if (op == op_Phi && mode_is_datab(get_irn_mode(node))) {
+               /* count data Phi per extbb */
+               cnt_inc(&eb_entry->cnt[bcnt_phi_data]);
+       }  /* if */
 
-  /* we have a new node in our block */
-  cnt_inc(&eb_entry->cnt_nodes);
+       /* we have a new node in our block */
+       cnt_inc(&eb_entry->cnt[bcnt_nodes]);
 
-  /* don't count keep-alive edges */
-  if (get_irn_op(node) == op_End)
-    return;
+       /* don't count keep-alive edges */
+       if (is_End(node))
+               return;
 
-  arity = get_irn_arity(node);
+       arity = get_irn_arity(node);
 
-  for (i = 0; i < arity; ++i) {
-    ir_node *pred = get_irn_n(node, i);
-    ir_extblk *other_extbb = get_nodes_extbb(pred);
+       for (i = 0; i < arity; ++i) {
+               ir_node *pred = get_irn_n(node, i);
+               ir_extblk *other_extbb = get_nodes_extbb(pred);
 
-    if (other_extbb == extbb)
-      cnt_inc(&eb_entry->cnt_edges);   /* a in extbb edge */
-    else {
-      extbb_entry_t *eb_entry_other = block_get_entry(&graph->recalc_cnts, get_extbb_node_nr(other_extbb), graph->extbb_hash);
+               if (other_extbb == extbb)
+                       cnt_inc(&eb_entry->cnt[bcnt_edges]);    /* a in extbb edge */
+               else {
+                       extbb_entry_t *eb_entry_other = block_get_entry(&graph->recalc_cnts, get_extbb_node_nr(other_extbb), graph->extbb_hash);
 
-      cnt_inc(&eb_entry->cnt_in_edges);        /* an edge coming from another extbb */
-      cnt_inc(&eb_entry_other->cnt_out_edges);
-    }
-  }
-}
+                       cnt_inc(&eb_entry->cnt[bcnt_in_edges]); /* an edge coming from another extbb */
+                       cnt_inc(&eb_entry_other->cnt[bcnt_out_edges]);
+               }  /* if */
+       }  /* for */
+}  /* update_extbb_info */
 
-/** calculates how many arguments of the call are const */
-static int cnt_const_args(ir_node *call)
+/**
+ * Calculates how many arguments of the call are const, updates
+ * param distribution.
+ */
+static void analyse_params_of_Call(graph_entry_t *graph, ir_node *call)
 {
-  int  i, res = 0;
-  int  n = get_Call_n_params(call);
+       int i, num_const_args = 0, num_local_adr = 0;
+       int n = get_Call_n_params(call);
 
-  for (i = 0; i < n; ++i) {
-    ir_node *param = get_Call_param(call, i);
-    ir_op   *op = get_irn_op(param);
+       for (i = 0; i < n; ++i) {
+               ir_node *param = get_Call_param(call, i);
 
-    if (op == op_Const || op == op_SymConst)
-      ++res;
-  }
-  return res;
-}
+               if (is_irn_constlike(param))
+                       ++num_const_args;
+               else if (is_Sel(param)) {
+                       ir_node *base = param;
+
+                       do {
+                               base = get_Sel_ptr(base);
+                       } while (is_Sel(base));
+
+                       if (base == get_irg_frame(current_ir_graph))
+                               ++num_local_adr;
+               }
+
+       }  /* for */
+
+       if (num_const_args > 0)
+               cnt_inc(&graph->cnt[gcnt_call_with_cnst_arg]);
+       if (num_const_args == n)
+               cnt_inc(&graph->cnt[gcnt_call_with_all_cnst_arg]);
+       if (num_local_adr > 0)
+               cnt_inc(&graph->cnt[gcnt_call_with_local_adr]);
+
+       stat_inc_int_distrib_tbl(status->dist_param_cnt, n);
+}  /* analyse_params_of_Call */
 
 /**
- * update info on calls
+ * Update info on calls.
  *
  * @param call   The call
  * @param graph  The graph entry containing the call
  */
 static void stat_update_call(ir_node *call, graph_entry_t *graph)
 {
-  ir_node  *block = get_nodes_block(call);
-  ir_node  *ptr = get_Call_ptr(call);
-  entity   *ent = NULL;
-  ir_graph *callee = NULL;
-  int      num_const_args;
-
-  /*
-   * If the block is bad, the whole subgraph will collapse later
-   * so do not count this call.
-   * This happens in dead code.
-   */
-  if (is_Bad(block))
-    return;
-
-  cnt_inc(&graph->cnt_all_calls);
-
-  /* found a call, this function is not a leaf */
-  graph->is_leaf = 0;
-
-  if (get_irn_op(ptr) == op_SymConst) {
-    if (get_SymConst_kind(ptr) == symconst_addr_ent) {
-      /* ok, we seems to know the entity */
-      ent = get_SymConst_entity(ptr);
-      callee = get_entity_irg(ent);
-
-      /* it is recursive, if it calls at least once */
-      if (callee == graph->irg)
-        graph->is_recursive = 1;
-    }
-  }
-  else {
-    /* indirect call, be could not predict */
-    cnt_inc(&graph->cnt_indirect_calls);
-
-    /* NOT a leaf call */
-    graph->is_leaf_call = LCS_NON_LEAF_CALL;
-  }
-
-  /* check, if it's a chain-call: Then, the call-block
-   * must dominate the end block. */
-  {
-    ir_node *curr = get_irg_end_block(graph->irg);
-    int depth = get_Block_dom_depth(block);
-
-    for (; curr != block && get_Block_dom_depth(curr) > depth;) {
-      curr = get_Block_idom(curr);
-
-      if (! curr || is_no_Block(curr))
-        break;
-    }
-
-    if (curr != block)
-      graph->is_chain_call = 0;
-  }
-
-  /* check, if the callee is a leaf */
-  if (callee) {
-    graph_entry_t *called = graph_get_entry(callee, status->irg_hash);
-
-    if (called->is_analyzed) {
-      if (! called->is_leaf)
-        graph->is_leaf_call = LCS_NON_LEAF_CALL;
-    }
-  }
-
-  /* check, if arguments of the call are const */
-  num_const_args = cnt_const_args(call);
-
-  if (num_const_args > 0)
-    cnt_inc(&graph->cnt_call_with_cnst_arg);
-}
+       ir_node   *block = get_nodes_block(call);
+       ir_node   *ptr = get_Call_ptr(call);
+       ir_entity *ent = NULL;
+       ir_graph  *callee = NULL;
+
+       /*
+        * If the block is bad, the whole subgraph will collapse later
+        * so do not count this call.
+        * This happens in dead code.
+        */
+       if (is_Bad(block))
+               return;
 
-/**
- * update info on calls for graphs on the wait queue
- */
-static void stat_update_call_2(ir_node *call, graph_entry_t *graph)
-{
-  ir_node  *block = get_nodes_block(call);
-  ir_node  *ptr = get_Call_ptr(call);
-  entity   *ent = NULL;
-  ir_graph *callee = NULL;
-
-  /*
-   * If the block is bad, the whole subgraph will collapse later
-   * so do not count this call.
-   * This happens in dead code.
-   */
-  if (is_Bad(block))
-    return;
-
-  if (get_irn_op(ptr) == op_SymConst) {
-    if (get_SymConst_kind(ptr) == symconst_addr_ent) {
-      /* ok, we seems to know the entity */
-      ent = get_SymConst_entity(ptr);
-      callee = get_entity_irg(ent);
-    }
-  }
-
-  /* check, if the callee is a leaf */
-  if (callee) {
-    graph_entry_t *called = graph_get_entry(callee, status->irg_hash);
-
-    assert(called->is_analyzed);
-
-    if (! called->is_leaf)
-      graph->is_leaf_call = LCS_NON_LEAF_CALL;
-  }
-  else
-    graph->is_leaf_call = LCS_NON_LEAF_CALL;
-}
+       cnt_inc(&graph->cnt[gcnt_all_calls]);
+
+       /* found a call, this function is not a leaf */
+       graph->is_leaf = 0;
+
+       if (is_SymConst(ptr)) {
+               if (get_SymConst_kind(ptr) == symconst_addr_ent) {
+                       /* ok, we seems to know the entity */
+                       ent = get_SymConst_entity(ptr);
+                       callee = get_entity_irg(ent);
+
+                       /* it is recursive, if it calls at least once */
+                       if (callee == graph->irg)
+                               graph->is_recursive = 1;
+                       if (callee == NULL)
+                               cnt_inc(&graph->cnt[gcnt_external_calls]);
+               }  /* if */
+       } else {
+               /* indirect call, be could not predict */
+               cnt_inc(&graph->cnt[gcnt_indirect_calls]);
+
+               /* NOT a leaf call */
+               graph->is_leaf_call = LCS_NON_LEAF_CALL;
+       }  /* if */
+
+       /* check, if it's a chain-call: Then, the call-block
+        * must dominate the end block. */
+       {
+               ir_node *curr = get_irg_end_block(graph->irg);
+               int depth = get_Block_dom_depth(block);
 
-/**
- * walker for reachable nodes count
- */
-static void update_node_stat(ir_node *node, void *env)
-{
-  graph_entry_t *graph = env;
-  node_entry_t *entry;
+               for (; curr != block && get_Block_dom_depth(curr) > depth;) {
+                       curr = get_Block_idom(curr);
 
-  ir_op *op = stat_get_irn_op(node);
-  int arity = get_irn_arity(node);
+                       if (! curr || !is_Block(curr))
+                               break;
+               }  /* for */
 
-  entry = opcode_get_entry(op, graph->opcode_hash);
+               if (curr != block)
+                       graph->is_chain_call = 0;
+       }
 
-  cnt_inc(&entry->cnt_alive);
-  cnt_add_i(&graph->cnt_edges, arity);
+       /* check, if the callee is a leaf */
+       if (callee) {
+               graph_entry_t *called = graph_get_entry(callee, status->irg_hash);
 
-  /* count block edges */
-  undate_block_info(node, graph);
+               if (called->is_analyzed) {
+                       if (! called->is_leaf)
+                               graph->is_leaf_call = LCS_NON_LEAF_CALL;
+               }  /* if */
+       }  /* if */
 
-  /* count extended block edges */
-  if (status->stat_options & FIRMSTAT_COUNT_EXTBB) {
-    undate_extbb_info(node, graph);
-  }
+       analyse_params_of_Call(graph, call);
+}  /* stat_update_call */
 
-  /* handle statistics for special node types */
+/**
+ * Update info on calls for graphs on the wait queue.
+ */
+static void stat_update_call_2(ir_node *call, graph_entry_t *graph)
+{
+       ir_node   *block = get_nodes_block(call);
+       ir_node   *ptr = get_Call_ptr(call);
+       ir_entity *ent = NULL;
+       ir_graph  *callee = NULL;
+
+       /*
+        * If the block is bad, the whole subgraph will collapse later
+        * so do not count this call.
+        * This happens in dead code.
+        */
+       if (is_Bad(block))
+               return;
 
-  if (op == op_Const) {
-    if (status->stat_options & FIRMSTAT_COUNT_CONSTS) {
-      /* check properties of constants */
-      stat_update_const(status, node, graph);
-    }
-  }
-  else if (op == op_Call) {
-    /* check for properties that depends on calls like recursion/leaf/indirect call */
-    stat_update_call(node, graph);
-  }
-}
+       if (is_SymConst(ptr)) {
+               if (get_SymConst_kind(ptr) == symconst_addr_ent) {
+                       /* ok, we seems to know the entity */
+                       ent = get_SymConst_entity(ptr);
+                       callee = get_entity_irg(ent);
+               }  /* if */
+       }  /* if */
+
+       /* check, if the callee is a leaf */
+       if (callee) {
+               graph_entry_t *called = graph_get_entry(callee, status->irg_hash);
+
+               assert(called->is_analyzed);
+
+               if (! called->is_leaf)
+                       graph->is_leaf_call = LCS_NON_LEAF_CALL;
+       } else
+               graph->is_leaf_call = LCS_NON_LEAF_CALL;
+}  /* stat_update_call_2 */
 
 /**
- * walker for reachable nodes count for graphs on the wait_q
+ * Find the base address and entity of an Sel node.
+ *
+ * @param sel  the node
+ *
+ * @return the base address.
+ */
+static ir_node *find_base_adr(ir_node *sel)
+{
+       ir_node *ptr = get_Sel_ptr(sel);
+
+       while (is_Sel(ptr)) {
+               sel = ptr;
+               ptr = get_Sel_ptr(sel);
+       }
+       return ptr;
+}  /* find_base_adr */
+
+/**
+ * Update info on Load/Store address statistics.
+ */
+static void stat_update_address(ir_node *node, graph_entry_t *graph)
+{
+       ir_opcode opc = get_irn_opcode(node);
+       ir_node *base;
+       ir_graph *irg;
+
+       switch (opc) {
+       case iro_SymConst:
+               /* a global address */
+               cnt_inc(&graph->cnt[gcnt_global_adr]);
+               break;
+       case iro_Sel:
+               base = find_base_adr(node);
+               irg = current_ir_graph;
+               if (base == get_irg_tls(irg)) {
+                       /* a TLS variable, like a global. */
+                       cnt_inc(&graph->cnt[gcnt_global_adr]);
+               } else if (base == get_irg_frame(irg)) {
+                       /* a local Variable. */
+                       cnt_inc(&graph->cnt[gcnt_local_adr]);
+               } else {
+                       /* Pointer access */
+                       if (is_Proj(base) && skip_Proj(get_Proj_pred(base)) == get_irg_start(irg)) {
+                               /* pointer access through parameter, check for THIS */
+                               ir_entity *ent = get_irg_entity(irg);
+
+                               if (ent != NULL) {
+                                       ir_type *ent_tp = get_entity_type(ent);
+
+                                       if (get_method_calling_convention(ent_tp) & cc_this_call) {
+                                               if (get_Proj_proj(base) == 0) {
+                                                       /* THIS pointer */
+                                                       cnt_inc(&graph->cnt[gcnt_this_adr]);
+                                                       goto end_parameter;
+                                               }  /* if */
+                                       }  /* if */
+                               }  /* if */
+                               /* other parameter */
+                               cnt_inc(&graph->cnt[gcnt_param_adr]);
+end_parameter: ;
+                       } else {
+                               /* unknown Pointer access */
+                               cnt_inc(&graph->cnt[gcnt_other_adr]);
+                       }  /* if */
+               }  /* if */
+       default:
+               ;
+       }  /* switch */
+}  /* stat_update_address */
+
+/**
+ * Walker for reachable nodes count.
+ */
+static void update_node_stat(ir_node *node, void *env)
+{
+       graph_entry_t *graph = env;
+       node_entry_t *entry;
+
+       ir_op *op = stat_get_irn_op(node);
+       int i, arity = get_irn_arity(node);
+
+       entry = opcode_get_entry(op, graph->opcode_hash);
+
+       cnt_inc(&entry->cnt_alive);
+       cnt_add_i(&graph->cnt[gcnt_edges], arity);
+
+       /* count block edges */
+       undate_block_info(node, graph);
+
+       /* count extended block edges */
+       if (status->stat_options & FIRMSTAT_COUNT_EXTBB) {
+               if (graph->irg != get_const_code_irg())
+                       update_extbb_info(node, graph);
+       }  /* if */
+
+       /* handle statistics for special node types */
+
+       switch (op->code) {
+       case iro_Call:
+               /* check for properties that depends on calls like recursion/leaf/indirect call */
+               stat_update_call(node, graph);
+               break;
+       case iro_Load:
+               /* check address properties */
+               stat_update_address(get_Load_ptr(node), graph);
+               break;
+       case iro_Store:
+               /* check address properties */
+               stat_update_address(get_Store_ptr(node), graph);
+               break;
+       case iro_Phi:
+               /* check for non-strict Phi nodes */
+               for (i = arity - 1; i >= 0; --i) {
+                       ir_node *pred = get_Phi_pred(node, i);
+                       if (is_Unknown(pred)) {
+                               /* found an Unknown predecessor, graph is not strict */
+                               graph->is_strict = 0;
+                               break;
+                       }
+               }
+       default:
+               ;
+       }  /* switch */
+
+       /* we want to count the constant IN nodes, not the CSE'ed constant's itself */
+       if (status->stat_options & FIRMSTAT_COUNT_CONSTS) {
+               int i;
+
+               for (i = get_irn_arity(node) - 1; i >= 0; --i) {
+                       ir_node *pred = get_irn_n(node, i);
+
+                       if (is_Const(pred)) {
+                               /* check properties of constants */
+                               stat_update_const(status, pred, graph);
+                       }  /* if */
+               }  /* for */
+       }  /* if */
+}  /* update_node_stat */
+
+/**
+ * Walker for reachable nodes count for graphs on the wait_q.
  */
 static void update_node_stat_2(ir_node *node, void *env)
 {
-  graph_entry_t *graph = env;
+       graph_entry_t *graph = env;
 
-  /* check for properties that depends on calls like recursion/leaf/indirect call */
-  if (is_Call(node))
-    stat_update_call_2(node, graph);
-}
+       /* check for properties that depends on calls like recursion/leaf/indirect call */
+       if (is_Call(node))
+               stat_update_call_2(node, graph);
+}  /* update_node_stat_2 */
 
 /**
- * get the current address mark
+ * Get the current address mark.
  */
 static unsigned get_adr_mark(graph_entry_t *graph, ir_node *node)
 {
-  address_mark_entry_t *value = set_find(graph->address_mark, &node, sizeof(*value), HASH_PTR(node));
+       address_mark_entry_t *value = set_find(graph->address_mark, &node, sizeof(*value), HASH_PTR(node));
 
-  return value ? value->mark : 0;
-}
+       return value ? value->mark : 0;
+}  /* get_adr_mark */
 
 /**
- * set the current address mark
+ * Set the current address mark.
  */
 static void set_adr_mark(graph_entry_t *graph, ir_node *node, unsigned val)
 {
-  address_mark_entry_t *value = set_insert(graph->address_mark, &node, sizeof(*value), HASH_PTR(node));
+       address_mark_entry_t *value = set_insert(graph->address_mark, &node, sizeof(*value), HASH_PTR(node));
 
-  value->mark = val;
-}
+       value->mark = val;
+}  /* set_adr_mark */
 
+#undef DUMP_ADR_MODE
+
+#ifdef DUMP_ADR_MODE
 /**
  * a vcg attribute hook: Color a node with a different color if
  * it's identified as a part of an address expression or at least referenced
@@ -919,66 +1084,113 @@ static void set_adr_mark(graph_entry_t *graph, ir_node *node, unsigned val)
  */
 static int stat_adr_mark_hook(FILE *F, ir_node *node, ir_node *local)
 {
-  ir_node *n           = local ? local : node;
-  ir_graph *irg        = get_irn_irg(n);
-  graph_entry_t *graph = graph_get_entry(irg, status->irg_hash);
-  unsigned mark        = get_adr_mark(graph, n);
-
-  if (mark & MARK_ADDRESS_CALC)
-    fprintf(F, "color: purple");
-  else if ((mark & (MARK_REF_ADR | MARK_REF_NON_ADR)) == MARK_REF_ADR)
-    fprintf(F, "color: pink");
-  else if ((mark & (MARK_REF_ADR | MARK_REF_NON_ADR)) == (MARK_REF_ADR|MARK_REF_NON_ADR))
-    fprintf(F, "color: lightblue");
-  else
-    return 0;
-
-  /* I know the color! */
-  return 1;
-}
+       ir_node *n           = local ? local : node;
+       ir_graph *irg        = get_irn_irg(n);
+       graph_entry_t *graph = graph_get_entry(irg, status->irg_hash);
+       unsigned mark        = get_adr_mark(graph, n);
+
+       if (mark & MARK_ADDRESS_CALC)
+               fprintf(F, "color: purple");
+       else if ((mark & (MARK_REF_ADR | MARK_REF_NON_ADR)) == MARK_REF_ADR)
+               fprintf(F, "color: pink");
+       else if ((mark & (MARK_REF_ADR | MARK_REF_NON_ADR)) == (MARK_REF_ADR|MARK_REF_NON_ADR))
+               fprintf(F, "color: lightblue");
+       else
+               return 0;
+
+       /* I know the color! */
+       return 1;
+}  /* stat_adr_mark_hook */
+#endif /* DUMP_ADR_MODE */
+
+/**
+ * Return the "operational" mode of a Firm node.
+ */
+static ir_mode *get_irn_op_mode(ir_node *node)
+{
+       switch (get_irn_opcode(node)) {
+       case iro_Load:
+               return get_Load_mode(node);
+       case iro_Store:
+               return get_irn_mode(get_Store_value(node));
+       case iro_DivMod:
+               return get_irn_mode(get_DivMod_left(node));
+       case iro_Div:
+               return get_irn_mode(get_Div_left(node));
+       case iro_Mod:
+               return get_irn_mode(get_Mod_left(node));
+       case iro_Cmp:
+               /* Cmp is no address calculation, or is it? */
+       default:
+               return get_irn_mode(node);
+       }  /* switch */
+}  /* get_irn_op_mode */
+
+/**
+ * Post-walker that marks every node that is an address calculation.
+ *
+ * Users of a node must be visited first. We ensure this by
+ * calling it in the post of an outs walk. This should work even in cycles,
+ * while the normal pre-walk will not.
+ */
+static void mark_address_calc(ir_node *node, void *env)
+{
+       graph_entry_t *graph = env;
+       ir_mode *mode = get_irn_op_mode(node);
+       int i, n;
+       unsigned mark_preds = MARK_REF_NON_ADR;
+
+       if (! mode_is_data(mode))
+               return;
+
+       if (mode_is_reference(mode)) {
+               /* a reference is calculated here, we are sure */
+               set_adr_mark(graph, node, MARK_ADDRESS_CALC);
+
+               mark_preds = MARK_REF_ADR;
+       } else {
+               unsigned mark = get_adr_mark(graph, node);
+
+               if ((mark & (MARK_REF_ADR | MARK_REF_NON_ADR)) == MARK_REF_ADR) {
+                       /*
+                        * this node has no reference mode, but is only
+                        * referenced by address calculations
+                        */
+                       mark_preds = MARK_REF_ADR;
+               }  /* if */
+       }  /* if */
+
+       /* mark all predecessors */
+       for (i = 0, n = get_irn_arity(node); i < n; ++i) {
+               ir_node *pred = get_irn_n(node, i);
+
+               mode = get_irn_op_mode(pred);
+               if (! mode_is_data(mode))
+                       continue;
+
+               set_adr_mark(graph, pred, get_adr_mark(graph, pred) | mark_preds);
+       }  /* for */
+}  /* mark_address_calc */
 
 /**
- * walker that marks every node that is an address calculation
+ * Post-walker that marks every node that is an address calculation.
  *
- * predecessor nodes must be visited first. We ensure this by
- * calling in in the post of an outs walk. This should work even in cycles,
- * while the pre in a normal walk will not.
+ * Users of a node must be visited first. We ensure this by
+ * calling it in the post of an outs walk. This should work even in cycles,
+ * while the normal pre-walk will not.
  */
-static void mark_address_calc(ir_node *node, void *env)
+static void count_adr_ops(ir_node *node, void *env)
 {
-  graph_entry_t *graph = env;
-  ir_mode *mode = get_irn_mode(node);
-  int i, n;
-  unsigned mark_preds = MARK_REF_NON_ADR;
-
-  if (! mode_is_numP(mode))
-    return;
-
-  if (mode_is_reference(mode)) {
-    /* a reference is calculated here, we are sure */
-    set_adr_mark(graph, node, MARK_ADDRESS_CALC);
-
-    mark_preds = MARK_REF_ADR;
-  }
-  else {
-    unsigned mark = get_adr_mark(graph, node);
-
-    if ((mark & (MARK_REF_ADR | MARK_REF_NON_ADR)) == MARK_REF_ADR) {
-      /*
-       * this node has not an reference mode, but is only
-       * referenced by address calculations
-       */
-      mark_preds = MARK_REF_ADR;
-    }
-  }
-
-  /* mark all predecessors */
-  for (i = 0, n = get_irn_arity(node); i < n; ++i) {
-    ir_node *pred = get_irn_n(node, i);
-
-    set_adr_mark(graph, pred, get_adr_mark(graph, pred) | mark_preds);
-  }
-}
+       graph_entry_t *graph = env;
+       unsigned mark        = get_adr_mark(graph, node);
+
+       if (mark & MARK_ADDRESS_CALC)
+               cnt_inc(&graph->cnt[gcnt_pure_adr_ops]);
+       else if ((mark & (MARK_REF_ADR | MARK_REF_NON_ADR)) == MARK_REF_ADR)
+               cnt_inc(&graph->cnt[gcnt_pure_adr_ops]);
+       else if ((mark & (MARK_REF_ADR | MARK_REF_NON_ADR)) == (MARK_REF_ADR|MARK_REF_NON_ADR))
+               cnt_inc(&graph->cnt[gcnt_all_adr_ops]);
+}  /* count_adr_ops */
 
 /**
  * Called for every graph when the graph is either deleted or stat_dump_snapshot()
@@ -989,245 +1201,309 @@ static void mark_address_calc(ir_node *node, void *env)
  */
 static void update_graph_stat(graph_entry_t *global, graph_entry_t *graph)
 {
-  node_entry_t *entry;
+       node_entry_t *entry;
+       int i;
 
-  /* clear first the alive counter in the graph */
-  for (entry = pset_first(graph->opcode_hash); entry; entry = pset_next(graph->opcode_hash)) {
-    cnt_clr(&entry->cnt_alive);
-  }
+       /* clear first the alive counter in the graph */
+       foreach_pset(graph->opcode_hash, entry) {
+               cnt_clr(&entry->cnt_alive);
+       }  /* foreach_pset */
 
-  /* set pessimistic values */
-  graph->is_leaf       = 1;
-  graph->is_leaf_call  = LCS_UNKNOWN;
-  graph->is_recursive  = 0;
-  graph->is_chain_call = 1;
+       /* set pessimistic values */
+       graph->is_leaf       = 1;
+       graph->is_leaf_call  = LCS_UNKNOWN;
+       graph->is_recursive  = 0;
+       graph->is_chain_call = 1;
+       graph->is_strict     = 1;
 
-  /* create new block counter */
-  graph->block_hash = new_pset(block_cmp, 5);
+       /* create new block counter */
+       graph->block_hash = new_pset(block_cmp, 5);
 
-  /* we need dominator info */
-  if (graph->irg != get_const_code_irg())
-    if (get_irg_dom_state(graph->irg) != dom_consistent)
-      compute_doms(graph->irg);
+       /* we need dominator info */
+       if (graph->irg != get_const_code_irg()) {
+               assure_doms(graph->irg);
 
-  if (status->stat_options & FIRMSTAT_COUNT_EXTBB) {
-    /* we need extended basic blocks */
-    compute_extbb(graph->irg);
+               if (status->stat_options & FIRMSTAT_COUNT_EXTBB) {
+                       /* we need extended basic blocks */
+                       compute_extbb(graph->irg);
 
-    /* create new extbb counter */
-    graph->extbb_hash = new_pset(block_cmp, 5);
-  }
+                       /* create new extbb counter */
+                       graph->extbb_hash = new_pset(block_cmp, 5);
+               }  /* if */
+       }  /* if */
 
-  /* count the nodes in the graph */
-  irg_walk_graph(graph->irg, update_node_stat, NULL, graph);
+       /* count the nodes in the graph */
+       irg_walk_graph(graph->irg, update_node_stat, NULL, graph);
 
 #if 0
-  /* Uncomment this code if chain-call means call exact one */
-  entry = opcode_get_entry(op_Call, graph->opcode_hash);
+       /* Uncomment this code if chain-call means call exact one. */
+       entry = opcode_get_entry(op_Call, graph->opcode_hash);
 
-  /* check if we have more than 1 call */
-  if (cnt_gt(entry->cnt_alive, 1))
-    graph->is_chain_call = 0;
+       /* check if we have more than 1 call */
+       if (cnt_gt(entry->cnt_alive, 1))
+               graph->is_chain_call = 0;
 #endif
 
-  /* recursive functions are never chain calls, leafs don't have calls */
-  if (graph->is_recursive || graph->is_leaf)
-    graph->is_chain_call = 0;
+       /* recursive functions are never chain calls, leafs don't have calls */
+       if (graph->is_recursive || graph->is_leaf)
+               graph->is_chain_call = 0;
 
-  /* assume we walk every graph only ONCE, we could sum here the global count */
-  for (entry = pset_first(graph->opcode_hash); entry; entry = pset_next(graph->opcode_hash)) {
-    node_entry_t *g_entry = opcode_get_entry(entry->op, global->opcode_hash);
+       /* assume we walk every graph only ONCE, we could sum here the global count */
+       foreach_pset(graph->opcode_hash, entry) {
+               node_entry_t *g_entry = opcode_get_entry(entry->op, global->opcode_hash);
 
-    /* update the node counter */
-    cnt_add(&g_entry->cnt_alive, &entry->cnt_alive);
-  }
+               /* update the node counter */
+               cnt_add(&g_entry->cnt_alive, &entry->cnt_alive);
+       }  /* foreach_pset */
 
-  /* update the edge counter */
-  cnt_add(&global->cnt_edges, &graph->cnt_edges);
+       /* count the number of address calculation */
+       if (graph->irg != get_const_code_irg()) {
+               ir_graph *rem = current_ir_graph;
 
-  /* count the number of address calculation */
-  if (graph->irg != get_const_code_irg()) {
-    ir_graph *rem = current_ir_graph;
+               assure_irg_outs(graph->irg);
 
-    if (get_irg_outs_state(graph->irg) != outs_consistent)
-      compute_irg_outs(graph->irg);
+               /* Must be done an the outs graph */
+               current_ir_graph = graph->irg;
+               irg_out_walk(get_irg_start(graph->irg), NULL, mark_address_calc, graph);
+               current_ir_graph = rem;
 
-    /* Must be done an the outs graph */
-    current_ir_graph = graph->irg;
-    irg_out_walk(get_irg_start(graph->irg), NULL, mark_address_calc, graph);
-    current_ir_graph = rem;
+#ifdef DUMP_ADR_MODE
+               /* register the vcg hook and dump the graph for test */
+               set_dump_node_vcgattr_hook(stat_adr_mark_hook);
+               dump_ir_block_graph(graph->irg, "-adr");
+               set_dump_node_vcgattr_hook(NULL);
+#endif /* DUMP_ADR_MODE */
 
-#if 0
-    set_dump_node_vcgattr_hook(stat_adr_mark_hook);
-    dump_ir_block_graph(graph->irg, "-adr");
-    set_dump_node_vcgattr_hook(NULL);
-#endif
-  }
+               irg_walk_graph(graph->irg, NULL, count_adr_ops, graph);
+       }  /* if */
 
-  /* count the DAG's */
-  if (status->stat_options & FIRMSTAT_COUNT_DAG)
-    count_dags_in_graph(global, graph);
+       /* count the DAG's */
+       if (status->stat_options & FIRMSTAT_COUNT_DAG)
+               count_dags_in_graph(global, graph);
 
-  /* calculate the patterns of this graph */
-  stat_calc_pattern_history(graph->irg);
+       /* calculate the patterns of this graph */
+       stat_calc_pattern_history(graph->irg);
 
-  /* leaf function did not call others */
-  if (graph->is_leaf)
-    graph->is_leaf_call = LCS_NON_LEAF_CALL;
-  else if (graph->is_leaf_call == LCS_UNKNOWN) {
-    /* we still don't know if this graph calls leaf-functions, so enqueue */
-    pdeq_putl(status->wait_q, graph);
-  }
+       /* leaf function did not call others */
+       if (graph->is_leaf)
+               graph->is_leaf_call = LCS_NON_LEAF_CALL;
+       else if (graph->is_leaf_call == LCS_UNKNOWN) {
+               /* we still don't know if this graph calls leaf-functions, so enqueue */
+               pdeq_putl(status->wait_q, graph);
+       }  /* if */
 
-  /* we have analyzed this graph */
-  graph->is_analyzed = 1;
-}
+       /* we have analyzed this graph */
+       graph->is_analyzed = 1;
+
+       /* accumulate all counter's */
+       for (i = 0; i < _gcnt_last; ++i)
+               cnt_add(&global->cnt[i], &graph->cnt[i]);
+}  /* update_graph_stat */
 
 /**
  * Called for every graph that was on the wait_q in stat_dump_snapshot()
- *  must finish all statistic info calculations.
+ * must finish all statistic info calculations.
  *
  * @param global    The global entry
  * @param graph     The current entry
  */
 static void update_graph_stat_2(graph_entry_t *global, graph_entry_t *graph)
 {
-  if (graph->is_deleted) {
-    /* deleted, ignore */
-    return;
-  }
+       (void) global;
+       if (graph->is_deleted) {
+               /* deleted, ignore */
+               return;
+       }
 
-  if (graph->irg) {
-    /* count the nodes in the graph */
-    irg_walk_graph(graph->irg, update_node_stat_2, NULL, graph);
+       if (graph->irg) {
+               /* count the nodes in the graph */
+               irg_walk_graph(graph->irg, update_node_stat_2, NULL, graph);
 
-    if (graph->is_leaf_call == LCS_UNKNOWN)
-      graph->is_leaf_call = LCS_LEAF_CALL;
-  }
-}
+               if (graph->is_leaf_call == LCS_UNKNOWN)
+                       graph->is_leaf_call = LCS_LEAF_CALL;
+       }  /* if */
+}  /* update_graph_stat_2 */
 
 /**
- * register a dumper
+ * Register a dumper.
  */
 static void stat_register_dumper(const dumper_t *dumper)
 {
-  dumper_t *p = xmalloc(sizeof(*p));
+       dumper_t *p = XMALLOC(dumper_t);
 
-  if (p) {
-    *p = *dumper;
+       memcpy(p, dumper, sizeof(*p));
 
-    p->next        = status->dumper;
-    p->status      = status;
-    status->dumper = p;
-  }
+       p->next        = status->dumper;
+       p->status      = status;
+       status->dumper = p;
 
-  /* FIXME: memory leak */
-}
+       /* FIXME: memory leak */
+}  /* stat_register_dumper */
 
 /**
- * dumps an IR graph.
+ * Dumps the statistics of an IR graph.
  */
 static void stat_dump_graph(graph_entry_t *entry)
 {
-  dumper_t *dumper;
+       dumper_t *dumper;
 
-  for (dumper = status->dumper; dumper; dumper = dumper->next) {
-    if (dumper->dump_graph)
-      dumper->dump_graph(dumper, entry);
-  }
-}
+       for (dumper = status->dumper; dumper; dumper = dumper->next) {
+               if (dumper->dump_graph)
+                       dumper->dump_graph(dumper, entry);
+       }  /* for */
+}  /* stat_dump_graph */
+
+/**
+ * Calls all registered dumper functions.
+ */
+static void stat_dump_registered(graph_entry_t *entry)
+{
+       dumper_t *dumper;
+
+       for (dumper = status->dumper; dumper; dumper = dumper->next) {
+               if (dumper->func_map) {
+                       dump_graph_FUNC func;
+
+                       foreach_pset(dumper->func_map, func)
+                               func(dumper, entry);
+               }  /* if */
+       }  /* for */
+}  /* stat_dump_registered */
 
 /**
- * dumps a constant table
+ * Dumps a constant table.
  */
 static void stat_dump_consts(const constant_info_t *tbl)
 {
-  dumper_t *dumper;
+       dumper_t *dumper;
 
-  for (dumper = status->dumper; dumper; dumper = dumper->next) {
-    if (dumper->dump_const_tbl)
-      dumper->dump_const_tbl(dumper, tbl);
-  }
-}
+       for (dumper = status->dumper; dumper; dumper = dumper->next) {
+               if (dumper->dump_const_tbl)
+                       dumper->dump_const_tbl(dumper, tbl);
+       }  /* for */
+}  /* stat_dump_consts */
+
+/**
+ * Dumps the parameter distribution
+ */
+static void stat_dump_param_tbl(const distrib_tbl_t *tbl, graph_entry_t *global)
+{
+       dumper_t *dumper;
+
+       for (dumper = status->dumper; dumper; dumper = dumper->next) {
+               if (dumper->dump_param_tbl)
+                       dumper->dump_param_tbl(dumper, tbl, global);
+       }  /* for */
+}  /* stat_dump_param_tbl */
 
 /**
- * initialize the dumper
+ * Dumps the optimization counter
+ */
+static void stat_dump_opt_cnt(const counter_t *tbl, unsigned len)
+{
+       dumper_t *dumper;
+
+       for (dumper = status->dumper; dumper; dumper = dumper->next) {
+               if (dumper->dump_opt_cnt)
+                       dumper->dump_opt_cnt(dumper, tbl, len);
+       }  /* for */
+}  /* stat_dump_opt_cnt */
+
+/**
+ * Initialize the dumper.
  */
 static void stat_dump_init(const char *name)
 {
-  dumper_t *dumper;
+       dumper_t *dumper;
 
-  for (dumper = status->dumper; dumper; dumper = dumper->next) {
-    if (dumper->init)
-      dumper->init(dumper, name);
-  }
-}
+       for (dumper = status->dumper; dumper; dumper = dumper->next) {
+               if (dumper->init)
+                       dumper->init(dumper, name);
+       }  /* for */
+}  /* stat_dump_init */
 
 /**
- * finish the dumper
+ * Finish the dumper.
  */
 static void stat_dump_finish(void)
 {
-  dumper_t *dumper;
+       dumper_t *dumper;
 
-  for (dumper = status->dumper; dumper; dumper = dumper->next) {
-    if (dumper->finish)
-      dumper->finish(dumper);
-  }
-}
+       for (dumper = status->dumper; dumper; dumper = dumper->next) {
+               if (dumper->finish)
+                       dumper->finish(dumper);
+       }  /* for */
+}  /* stat_dump_finish */
+
+/**
+ * Register an additional function for all dumper.
+ */
+void stat_register_dumper_func(dump_graph_FUNC func)
+{
+       dumper_t *dumper;
+
+       for (dumper = status->dumper; dumper; dumper = dumper->next) {
+               if (! dumper->func_map)
+                       dumper->func_map = pset_new_ptr(3);
+               pset_insert_ptr(dumper->func_map, func);
+       }  /* for */
+}  /* stat_register_dumper_func */
 
 /* ---------------------------------------------------------------------- */
 
 /*
- * helper: get an ir_op from an opcode
+ * Helper: get an ir_op from an opcode.
  */
-ir_op *stat_get_op_from_opcode(opcode code)
+ir_op *stat_get_op_from_opcode(ir_opcode code)
 {
-  return opcode_find_entry(code, status->ir_op_hash);
-}
+       return opcode_find_entry(code, status->ir_op_hash);
+}  /* stat_get_op_from_opcode */
 
 /**
- * A new IR op is registered.
+ * Hook: A new IR op is registered.
  *
  * @param ctx  the hook context
  * @param op   the new IR opcode that was created.
  */
 static void stat_new_ir_op(void *ctx, ir_op *op)
 {
-  if (! status->stat_options)
-    return;
+       (void) ctx;
+       if (! status->stat_options)
+               return;
 
-  STAT_ENTER;
-  {
-    graph_entry_t *graph = graph_get_entry(NULL, status->irg_hash);
+       STAT_ENTER;
+       {
+               graph_entry_t *graph = graph_get_entry(NULL, status->irg_hash);
 
-    /* execute for side effect :-) */
-    opcode_get_entry(op, graph->opcode_hash);
+               /* execute for side effect :-) */
+               (void)opcode_get_entry(op, graph->opcode_hash);
 
-    pset_insert(status->ir_op_hash, op, op->code);
-  }
-  STAT_LEAVE;
-}
+               pset_insert(status->ir_op_hash, op, op->code);
+       }
+       STAT_LEAVE;
+}  /* stat_new_ir_op */
 
 /**
- * An IR op is freed.
+ * Hook: An IR op is freed.
  *
  * @param ctx  the hook context
  * @param op   the IR opcode that is freed
  */
 static void stat_free_ir_op(void *ctx, ir_op *op)
 {
-  if (! status->stat_options)
-    return;
+       (void) ctx;
+       (void) op;
+       if (! status->stat_options)
+               return;
 
-  STAT_ENTER;
-  {
-  }
-  STAT_LEAVE;
-}
+       STAT_ENTER;
+       {
+       }
+       STAT_LEAVE;
+}  /* stat_free_ir_op */
 
 /**
- * A new node is created.
+ * Hook: A new node is created.
  *
  * @param ctx   the hook context
  * @param irg   the IR graph on which the node is created
@@ -1235,92 +1511,128 @@ static void stat_free_ir_op(void *ctx, ir_op *op)
  */
 static void stat_new_node(void *ctx, ir_graph *irg, ir_node *node)
 {
-  if (! status->stat_options)
-    return;
-
-  /* do NOT count during dead node elimination */
-  if (status->in_dead_node_elim > 0)
-    return;
-
-  STAT_ENTER;
-  {
-    node_entry_t *entry;
-    graph_entry_t *graph;
-    ir_op *op = stat_get_irn_op(node);
-
-    /* increase global value */
-    graph = graph_get_entry(NULL, status->irg_hash);
-    entry = opcode_get_entry(op, graph->opcode_hash);
-    cnt_inc(&entry->new_node);
-
-    /* increase local value */
-    graph = graph_get_entry(current_ir_graph, status->irg_hash);
-    entry = opcode_get_entry(op, graph->opcode_hash);
-    cnt_inc(&entry->new_node);
-  }
-  STAT_LEAVE;
-}
+       (void) ctx;
+       (void) irg;
+       if (! status->stat_options)
+               return;
+
+       /* do NOT count during dead node elimination */
+       if (status->in_dead_node_elim)
+               return;
+
+       STAT_ENTER;
+       {
+               node_entry_t *entry;
+               graph_entry_t *graph;
+               ir_op *op = stat_get_irn_op(node);
+
+               /* increase global value */
+               graph = graph_get_entry(NULL, status->irg_hash);
+               entry = opcode_get_entry(op, graph->opcode_hash);
+               cnt_inc(&entry->new_node);
+
+               /* increase local value */
+               graph = graph_get_entry(current_ir_graph, status->irg_hash);
+               entry = opcode_get_entry(op, graph->opcode_hash);
+               cnt_inc(&entry->new_node);
+       }
+       STAT_LEAVE;
+}  /* stat_new_node */
 
 /**
- * A node is changed into a Id node
+ * Hook: A node is changed into a Id node
  *
  * @param ctx   the hook context
  * @param node  the IR node that will be turned into an ID
  */
 static void stat_turn_into_id(void *ctx, ir_node *node)
 {
-  if (! status->stat_options)
-    return;
-
-  STAT_ENTER;
-  {
-    node_entry_t *entry;
-    graph_entry_t *graph;
-    ir_op *op = stat_get_irn_op(node);
-
-    /* increase global value */
-    graph = graph_get_entry(NULL, status->irg_hash);
-    entry = opcode_get_entry(op, graph->opcode_hash);
-    cnt_inc(&entry->into_Id);
-
-    /* increase local value */
-    graph = graph_get_entry(current_ir_graph, status->irg_hash);
-    entry = opcode_get_entry(op, graph->opcode_hash);
-    cnt_inc(&entry->into_Id);
-  }
-  STAT_LEAVE;
-}
+       (void) ctx;
+       if (! status->stat_options)
+               return;
+
+       STAT_ENTER;
+       {
+               node_entry_t *entry;
+               graph_entry_t *graph;
+               ir_op *op = stat_get_irn_op(node);
+
+               /* increase global value */
+               graph = graph_get_entry(NULL, status->irg_hash);
+               entry = opcode_get_entry(op, graph->opcode_hash);
+               cnt_inc(&entry->into_Id);
+
+               /* increase local value */
+               graph = graph_get_entry(current_ir_graph, status->irg_hash);
+               entry = opcode_get_entry(op, graph->opcode_hash);
+               cnt_inc(&entry->into_Id);
+       }
+       STAT_LEAVE;
+}  /* stat_turn_into_id */
+
+/**
+ * Hook: A node is normalized
+ *
+ * @param ctx   the hook context
+ * @param node  the IR node that was normalized
+ */
+static void stat_normalize(void *ctx, ir_node *node)
+{
+       (void) ctx;
+       if (! status->stat_options)
+               return;
+
+       STAT_ENTER;
+       {
+               node_entry_t *entry;
+               graph_entry_t *graph;
+               ir_op *op = stat_get_irn_op(node);
+
+               /* increase global value */
+               graph = graph_get_entry(NULL, status->irg_hash);
+               entry = opcode_get_entry(op, graph->opcode_hash);
+               cnt_inc(&entry->normalized);
+
+               /* increase local value */
+               graph = graph_get_entry(current_ir_graph, status->irg_hash);
+               entry = opcode_get_entry(op, graph->opcode_hash);
+               cnt_inc(&entry->normalized);
+       }
+       STAT_LEAVE;
+}  /* stat_normalize */
 
 /**
- * A new graph was created
+ * Hook: A new graph was created
  *
  * @param ctx  the hook context
  * @param irg  the new IR graph that was created
  * @param ent  the entity of this graph
  */
-static void stat_new_graph(void *ctx, ir_graph *irg, entity *ent)
-{
-  if (! status->stat_options)
-    return;
-
-  STAT_ENTER;
-  {
-    /* execute for side effect :-) */
-    graph_entry_t * graph = graph_get_entry(irg, status->irg_hash);
-
-    graph->ent           = ent;
-    graph->is_deleted    = 0;
-    graph->is_leaf       = 0;
-    graph->is_leaf_call  = 0;
-    graph->is_recursive  = 0;
-    graph->is_chain_call = 0;
-    graph->is_analyzed   = 0;
-  }
-  STAT_LEAVE;
-}
+static void stat_new_graph(void *ctx, ir_graph *irg, ir_entity *ent)
+{
+       (void) ctx;
+       if (! status->stat_options)
+               return;
+
+       STAT_ENTER;
+       {
+               /* execute for side effect :-) */
+               graph_entry_t * graph = graph_get_entry(irg, status->irg_hash);
+
+               graph->ent           = ent;
+               graph->is_deleted    = 0;
+               graph->is_leaf       = 0;
+               graph->is_leaf_call  = 0;
+               graph->is_recursive  = 0;
+               graph->is_chain_call = 0;
+               graph->is_strict     = 1;
+               graph->is_analyzed   = 0;
+       }
+       STAT_LEAVE;
+}  /* stat_new_graph */
 
 /**
- * A graph will be deleted
+ * Hook: A graph will be deleted
  *
  * @param ctx  the hook context
  * @param irg  the IR graph that will be deleted
@@ -1331,26 +1643,27 @@ static void stat_new_graph(void *ctx, ir_graph *irg, entity *ent)
  */
 static void stat_free_graph(void *ctx, ir_graph *irg)
 {
-  if (! status->stat_options)
-    return;
+       (void) ctx;
+       if (! status->stat_options)
+               return;
 
-  STAT_ENTER;
-  {
-    graph_entry_t *graph  = graph_get_entry(irg, status->irg_hash);
-    graph_entry_t *global = graph_get_entry(NULL, status->irg_hash);
+       STAT_ENTER;
+       {
+               graph_entry_t *graph  = graph_get_entry(irg, status->irg_hash);
+               graph_entry_t *global = graph_get_entry(NULL, status->irg_hash);
 
-    graph->is_deleted = 1;
+               graph->is_deleted = 1;
 
-    if (status->stat_options & FIRMSTAT_COUNT_DELETED) {
-      /* count the nodes of the graph yet, it will be destroyed later */
-      update_graph_stat(global, graph);
-    }
-  }
-  STAT_LEAVE;
-}
+               if (status->stat_options & FIRMSTAT_COUNT_DELETED) {
+                       /* count the nodes of the graph yet, it will be destroyed later */
+                       update_graph_stat(global, graph);
+               }  /* if */
+       }
+       STAT_LEAVE;
+}  /* stat_free_graph */
 
 /**
- * A walk over a graph is initiated. Do not count walks from statistic code.
+ * Hook: A walk over a graph is initiated. Do not count walks from statistic code.
  *
  * @param ctx  the hook context
  * @param irg  the IR graph that will be walked
@@ -1359,20 +1672,23 @@ static void stat_free_graph(void *ctx, ir_graph *irg)
  */
 static void stat_irg_walk(void *ctx, ir_graph *irg, generic_func *pre, generic_func *post)
 {
-  if (! status->stat_options)
-    return;
+       (void) ctx;
+       (void) pre;
+       (void) post;
+       if (! status->stat_options)
+               return;
 
-  STAT_ENTER_SINGLE;
-  {
-    graph_entry_t *graph = graph_get_entry(irg, status->irg_hash);
+       STAT_ENTER_SINGLE;
+       {
+               graph_entry_t *graph = graph_get_entry(irg, status->irg_hash);
 
-    cnt_inc(&graph->cnt_walked);
-  }
-  STAT_LEAVE;
-}
+               cnt_inc(&graph->cnt[gcnt_acc_walked]);
+       }
+       STAT_LEAVE;
+}  /* stat_irg_walk */
 
 /**
- * A walk over a graph in block-wise order is initiated. Do not count walks from statistic code.
+ * Hook: A walk over a graph in block-wise order is initiated. Do not count walks from statistic code.
  *
  * @param ctx  the hook context
  * @param irg  the IR graph that will be walked
@@ -1381,12 +1697,12 @@ static void stat_irg_walk(void *ctx, ir_graph *irg, generic_func *pre, generic_f
  */
 static void stat_irg_walk_blkwise(void *ctx, ir_graph *irg, generic_func *pre, generic_func *post)
 {
-  /* for now, do NOT differentiate between blockwise and normal */
-  stat_irg_walk(ctx, irg, pre, post);
-}
+       /* for now, do NOT differentiate between blockwise and normal */
+       stat_irg_walk(ctx, irg, pre, post);
+}  /* stat_irg_walk_blkwise */
 
 /**
- * A walk over the graph's blocks is initiated. Do not count walks from statistic code.
+ * Hook: A walk over the graph's blocks is initiated. Do not count walks from statistic code.
  *
  * @param ctx  the hook context
  * @param irg  the IR graph that will be walked
@@ -1396,35 +1712,45 @@ static void stat_irg_walk_blkwise(void *ctx, ir_graph *irg, generic_func *pre, g
  */
 static void stat_irg_block_walk(void *ctx, ir_graph *irg, ir_node *node, generic_func *pre, generic_func *post)
 {
-  if (! status->stat_options)
-    return;
+       (void) ctx;
+       (void) node;
+       (void) pre;
+       (void) post;
+       if (! status->stat_options)
+               return;
 
-  STAT_ENTER_SINGLE;
-  {
-    graph_entry_t *graph = graph_get_entry(irg, status->irg_hash);
+       STAT_ENTER_SINGLE;
+       {
+               graph_entry_t *graph = graph_get_entry(irg, status->irg_hash);
 
-    cnt_inc(&graph->cnt_walked_blocks);
-  }
-  STAT_LEAVE;
-}
+               cnt_inc(&graph->cnt[gcnt_acc_walked_blocks]);
+       }
+       STAT_LEAVE;
+}  /* stat_irg_block_walk */
 
 /**
- * called for every node that is removed due to an optimization.
+ * Called for every node that is removed due to an optimization.
  *
  * @param n     the IR node that will be removed
  * @param hmap  the hash map containing ir_op* -> opt_entry_t*
+ * @param kind  the optimization kind
  */
-static void removed_due_opt(ir_node *n, hmap_opt_entry_t *hmap)
+static void removed_due_opt(ir_node *n, hmap_opt_entry_t *hmap, hook_opt_kind kind)
 {
-  ir_op *op          = stat_get_irn_op(n);
-  opt_entry_t *entry = opt_get_entry(op, hmap);
+       opt_entry_t *entry;
+       ir_op *op = stat_get_irn_op(n);
 
-  /* increase global value */
-  cnt_inc(&entry->count);
-}
+       /* ignore CSE for Constants */
+       if (kind == HOOK_OPT_CSE && (is_Const(n) || is_SymConst(n)))
+               return;
+
+       /* increase global value */
+       entry = opt_get_entry(op, hmap);
+       cnt_inc(&entry->count);
+}  /* removed_due_opt */
 
 /**
- * Some nodes were optimized into some others due to an optimization.
+ * Hook: Some nodes were optimized into some others due to an optimization.
  *
  * @param ctx  the hook context
  */
@@ -1434,81 +1760,86 @@ static void stat_merge_nodes(
     ir_node **old_node_array, int old_num_entries,
     hook_opt_kind opt)
 {
-  if (! status->stat_options)
-    return;
-
-  STAT_ENTER;
-  {
-    int i, j;
-    graph_entry_t *graph = graph_get_entry(current_ir_graph, status->irg_hash);
-
-    if (status->reassoc_run)
-      opt = HOOK_OPT_REASSOC;
-
-    for (i = 0; i < old_num_entries; ++i) {
-      for (j = 0; j < new_num_entries; ++j)
-        if (old_node_array[i] == new_node_array[j])
-          break;
-
-      /* nodes might be in new and old, these are NOT removed */
-      if (j >= new_num_entries) {
-        int xopt = opt;
-
-        /* 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)
-            xopt = HOOK_OPT_CONFIRM_C;
-        }
+       (void) ctx;
+       if (! status->stat_options)
+               return;
 
-        removed_due_opt(old_node_array[i], graph->opt_hash[xopt]);
-      }
-    }
-  }
-  STAT_LEAVE;
-}
+       STAT_ENTER;
+       {
+               int i, j;
+               graph_entry_t *graph = graph_get_entry(current_ir_graph, status->irg_hash);
+
+               cnt_inc(&status->num_opts[opt]);
+               if (status->reassoc_run)
+                       opt = HOOK_OPT_REASSOC;
+
+               for (i = 0; i < old_num_entries; ++i) {
+                       /* nodes might be in new and old, so if we found a node
+                          in both sets, this one  is NOT removed */
+                       for (j = 0; j < new_num_entries; ++j) {
+                               if (old_node_array[i] == new_node_array[j])
+                                       break;
+                       }  /* for */
+                       if (j >= new_num_entries) {
+                               int xopt = opt;
+
+                               /* 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)
+                                               xopt = HOOK_OPT_CONFIRM_C;
+                               }  /* if */
+
+                               removed_due_opt(old_node_array[i], graph->opt_hash[xopt], xopt);
+                       }  /* if */
+               }  /* for */
+       }
+       STAT_LEAVE;
+}  /* stat_merge_nodes */
 
 /**
- * Reassociation is started/stopped.
+ * Hook: Reassociation is started/stopped.
  *
  * @param ctx   the hook context
  * @param flag  if non-zero, reassociation is started else stopped
  */
 static void stat_reassociate(void *ctx, int flag)
 {
-  if (! status->stat_options)
-    return;
+       (void) ctx;
+       if (! status->stat_options)
+               return;
 
-  STAT_ENTER;
-  {
-    status->reassoc_run = flag;
-  }
-  STAT_LEAVE;
-}
+       STAT_ENTER;
+       {
+               status->reassoc_run = flag;
+       }
+       STAT_LEAVE;
+}  /* stat_reassociate */
 
 /**
- * A node was lowered into other nodes
+ * Hook: A node was lowered into other nodes
  *
  * @param ctx  the hook context
  * @param node the IR node that will be lowered
  */
 static void stat_lower(void *ctx, ir_node *node)
 {
-  if (! status->stat_options)
-    return;
+       (void) ctx;
+       if (! status->stat_options)
+               return;
 
-  STAT_ENTER;
-  {
-    graph_entry_t *graph = graph_get_entry(current_ir_graph, status->irg_hash);
+       STAT_ENTER;
+       {
+               graph_entry_t *graph = graph_get_entry(current_ir_graph, status->irg_hash);
 
-    removed_due_opt(node, graph->opt_hash[HOOK_LOWERED]);
-  }
-  STAT_LEAVE;
-}
+               removed_due_opt(node, graph->opt_hash[HOOK_LOWERED], HOOK_LOWERED);
+       }
+       STAT_LEAVE;
+}  /* stat_lower */
 
 /**
- * A graph was inlined.
+ * Hook: A graph was inlined.
  *
  * @param ctx  the hook context
  * @param call the IR call that will re changed into the body of
@@ -1517,150 +1848,160 @@ static void stat_lower(void *ctx, ir_node *node)
  */
 static void stat_inline(void *ctx, ir_node *call, ir_graph *called_irg)
 {
-  if (! status->stat_options)
-    return;
+       (void) ctx;
+       if (! status->stat_options)
+               return;
 
-  STAT_ENTER;
-  {
-    ir_graph *irg = get_irn_irg(call);
-    graph_entry_t *i_graph = graph_get_entry(called_irg, status->irg_hash);
-    graph_entry_t *graph   = graph_get_entry(irg, status->irg_hash);
+       STAT_ENTER;
+       {
+               ir_graph *irg = get_irn_irg(call);
+               graph_entry_t *i_graph = graph_get_entry(called_irg, status->irg_hash);
+               graph_entry_t *graph   = graph_get_entry(irg, status->irg_hash);
 
-    cnt_inc(&graph->cnt_got_inlined);
-    cnt_inc(&i_graph->cnt_was_inlined);
-  }
-  STAT_LEAVE;
-}
+               cnt_inc(&graph->cnt[gcnt_acc_got_inlined]);
+               cnt_inc(&i_graph->cnt[gcnt_acc_was_inlined]);
+       }
+       STAT_LEAVE;
+}  /* stat_inline */
 
 /**
- * A graph with tail-recursions was optimized.
+ * Hook: A graph with tail-recursions was optimized.
  *
  * @param ctx  the hook context
  */
 static void stat_tail_rec(void *ctx, ir_graph *irg, int n_calls)
 {
-  if (! status->stat_options)
-    return;
+       (void) ctx;
+       if (! status->stat_options)
+               return;
 
-  STAT_ENTER;
-  {
-    graph_entry_t *graph = graph_get_entry(irg, status->irg_hash);
+       STAT_ENTER;
+       {
+               graph_entry_t *graph = graph_get_entry(irg, status->irg_hash);
 
-    graph->num_tail_recursion += n_calls;
-  }
-  STAT_LEAVE;
-}
+               graph->num_tail_recursion += n_calls;
+       }
+       STAT_LEAVE;
+}  /* stat_tail_rec */
 
 /**
  * Strength reduction was performed on an iteration variable.
  *
  * @param ctx  the hook context
  */
-static void stat_strength_red(void *ctx, ir_graph *irg, ir_node *strong, ir_node *cmp)
+static void stat_strength_red(void *ctx, ir_graph *irg, ir_node *strong)
 {
-  if (! status->stat_options)
-    return;
+       (void) ctx;
+       if (! status->stat_options)
+               return;
 
-  STAT_ENTER;
-  {
-    graph_entry_t *graph = graph_get_entry(irg, status->irg_hash);
-    cnt_inc(&graph->cnt_strength_red);
+       STAT_ENTER;
+       {
+               graph_entry_t *graph = graph_get_entry(irg, status->irg_hash);
+               cnt_inc(&graph->cnt[gcnt_acc_strength_red]);
 
-    removed_due_opt(strong, graph->opt_hash[HOOK_OPT_STRENGTH_RED]);
-  }
-  STAT_LEAVE;
-}
+               removed_due_opt(strong, graph->opt_hash[HOOK_OPT_STRENGTH_RED], HOOK_OPT_STRENGTH_RED);
+       }
+       STAT_LEAVE;
+}  /* stat_strength_red */
 
 /**
- * Start/Stop the dead node elimination.
+ * Hook: Start/Stop the dead node elimination.
  *
  * @param ctx  the hook context
  */
 static void stat_dead_node_elim(void *ctx, ir_graph *irg, int start)
 {
-  if (! status->stat_options)
-    return;
+       (void) ctx;
+       (void) irg;
+       if (! status->stat_options)
+               return;
 
-  if (start)
-    ++status->in_dead_node_elim;
-  else
-    --status->in_dead_node_elim;
-}
+       status->in_dead_node_elim = (start != 0);
+}  /* stat_dead_node_elim */
 
 /**
- * if-conversion was tried
+ * Hook: if-conversion was tried.
  */
 static void stat_if_conversion(void *context, ir_graph *irg, ir_node *phi,
                                int pos, ir_node *mux, if_result_t reason)
 {
-  if (! status->stat_options)
-    return;
+       (void) context;
+       (void) phi;
+       (void) pos;
+       (void) mux;
+       if (! status->stat_options)
+               return;
 
-  STAT_ENTER;
-  {
-    graph_entry_t *graph = graph_get_entry(irg, status->irg_hash);
+       STAT_ENTER;
+       {
+               graph_entry_t *graph = graph_get_entry(irg, status->irg_hash);
 
-    cnt_inc(&graph->cnt_if_conv[reason]);
-  }
-  STAT_LEAVE;
-}
+               cnt_inc(&graph->cnt[gcnt_if_conv + reason]);
+       }
+       STAT_LEAVE;
+}  /* stat_if_conversion */
 
 /**
- * real function call was optimized
+ * Hook: real function call was optimized.
  */
 static void stat_func_call(void *context, ir_graph *irg, ir_node *call)
 {
-  if (! status->stat_options)
-    return;
+       (void) context;
+       (void) call;
+       if (! status->stat_options)
+               return;
 
-  STAT_ENTER;
-  {
-    graph_entry_t *graph = graph_get_entry(irg, status->irg_hash);
+       STAT_ENTER;
+       {
+               graph_entry_t *graph = graph_get_entry(irg, status->irg_hash);
 
-    cnt_inc(&graph->cnt_real_func_call);
-  }
-  STAT_LEAVE;
-}
+               cnt_inc(&graph->cnt[gcnt_acc_real_func_call]);
+       }
+       STAT_LEAVE;
+}  /* stat_func_call */
 
 /**
- * A multiply was replaced by a series of Shifts/Adds/Subs
+ * Hook: A multiply was replaced by a series of Shifts/Adds/Subs.
  *
  * @param ctx  the hook context
  */
 static void stat_arch_dep_replace_mul_with_shifts(void *ctx, ir_node *mul)
 {
-  if (! status->stat_options)
-    return;
+       (void) ctx;
+       if (! status->stat_options)
+               return;
 
-  STAT_ENTER;
-  {
-    graph_entry_t *graph = graph_get_entry(current_ir_graph, status->irg_hash);
-    removed_due_opt(mul, graph->opt_hash[HOOK_OPT_ARCH_DEP]);
-  }
-  STAT_LEAVE;
-}
+       STAT_ENTER;
+       {
+               graph_entry_t *graph = graph_get_entry(current_ir_graph, status->irg_hash);
+               removed_due_opt(mul, graph->opt_hash[HOOK_OPT_ARCH_DEP], HOOK_OPT_ARCH_DEP);
+       }
+       STAT_LEAVE;
+}  /* stat_arch_dep_replace_mul_with_shifts */
 
 /**
- * A division by const was replaced
+ * Hook: A division by const was replaced.
  *
  * @param ctx   the hook context
  * @param node  the division node that will be optimized
  */
 static void stat_arch_dep_replace_division_by_const(void *ctx, ir_node *node)
 {
-  if (! status->stat_options)
-    return;
+       (void) ctx;
+       if (! status->stat_options)
+               return;
 
-  STAT_ENTER;
-  {
-    graph_entry_t *graph = graph_get_entry(current_ir_graph, status->irg_hash);
-    removed_due_opt(node, graph->opt_hash[HOOK_OPT_ARCH_DEP]);
-  }
-  STAT_LEAVE;
-}
+       STAT_ENTER;
+       {
+               graph_entry_t *graph = graph_get_entry(current_ir_graph, status->irg_hash);
+               removed_due_opt(node, graph->opt_hash[HOOK_OPT_ARCH_DEP], HOOK_OPT_ARCH_DEP);
+       }
+       STAT_LEAVE;
+}  /* stat_arch_dep_replace_division_by_const */
 
 /*
- * Update the register pressure of a block
+ * Update the register pressure of a block.
  *
  * @param irg        the irg containing the block
  * @param block      the block for which the reg pressure should be set
@@ -1679,8 +2020,7 @@ void stat_be_block_regpressure(ir_graph *irg, ir_node *block, int pressure, cons
                reg_pressure_entry_t *rp_ent;
 
                block_ent = be_block_get_entry(&status->be_data, get_irn_node_nr(block), graph->be_block_hash);
-               rp_ent    = obstack_alloc(&status->be_data, sizeof(*rp_ent));
-               memset(rp_ent, 0, sizeof(*rp_ent));
+               rp_ent    = OALLOCZ(&status->be_data, reg_pressure_entry_t);
 
                rp_ent->class_name = class_name;
                rp_ent->pressure   = pressure;
@@ -1688,7 +2028,7 @@ void stat_be_block_regpressure(ir_graph *irg, ir_node *block, int pressure, cons
                pset_insert(block_ent->reg_pressure, rp_ent, HASH_PTR(class_name));
        }
        STAT_LEAVE;
-}
+}  /* stat_be_block_regpressure */
 
 /**
  * Update the distribution of ready nodes of a block
@@ -1699,62 +2039,61 @@ void stat_be_block_regpressure(ir_graph *irg, ir_node *block, int pressure, cons
  */
 void stat_be_block_sched_ready(ir_graph *irg, ir_node *block, int num_ready)
 {
-  if (! status->stat_options)
-    return;
+       if (! status->stat_options)
+               return;
 
-  STAT_ENTER;
-  {
-    graph_entry_t    *graph = graph_get_entry(irg, status->irg_hash);
-    be_block_entry_t *block_ent;
+       STAT_ENTER;
+       {
+               graph_entry_t    *graph = graph_get_entry(irg, status->irg_hash);
+               be_block_entry_t *block_ent;
 
-    block_ent = be_block_get_entry(&status->be_data, get_irn_node_nr(block), graph->be_block_hash);
+               block_ent = be_block_get_entry(&status->be_data, get_irn_node_nr(block), graph->be_block_hash);
 
-    /* increase the counter of corresponding number of ready nodes */
-       stat_inc_int_distrib_tbl(block_ent->sched_ready, num_ready);
-  }
-  STAT_LEAVE;
-}
+               /* increase the counter of corresponding number of ready nodes */
+               stat_inc_int_distrib_tbl(block_ent->sched_ready, num_ready);
+       }
+       STAT_LEAVE;
+}  /* stat_be_block_sched_ready */
 
 /**
- * Update the permutation statistic of a block
+ * Update the permutation statistic of a block.
  *
- * @param ctx        the hook context
  * @param class_name the name of the register class
+ * @param n_regs     number of registers in the register class
  * @param perm       the perm node
  * @param block      the block containing the perm
  * @param size       the size of the perm
  * @param real_size  number of pairs with different registers
  */
-void stat_be_block_stat_perm(void *ctx, const char *class_name, int n_regs, ir_node *perm, ir_node *block,
+void stat_be_block_stat_perm(const char *class_name, int n_regs, ir_node *perm, ir_node *block,
                              int size, int real_size)
 {
-  if (! status->stat_options)
-    return;
+       if (! status->stat_options)
+               return;
 
-  STAT_ENTER;
-  {
-    graph_entry_t      *graph = graph_get_entry(get_irn_irg(block), status->irg_hash);
-    be_block_entry_t   *block_ent;
-    perm_class_entry_t *pc_ent;
-    perm_stat_entry_t  *ps_ent;
+       STAT_ENTER;
+       {
+               graph_entry_t      *graph = graph_get_entry(get_irn_irg(block), status->irg_hash);
+               be_block_entry_t   *block_ent;
+               perm_class_entry_t *pc_ent;
+               perm_stat_entry_t  *ps_ent;
 
-    block_ent = be_block_get_entry(&status->be_data, get_irn_node_nr(block), graph->be_block_hash);
-    pc_ent    = perm_class_get_entry(&status->be_data, class_name, block_ent->perm_class_stat);
-    ps_ent    = perm_stat_get_entry(&status->be_data, perm, pc_ent->perm_stat);
+               block_ent = be_block_get_entry(&status->be_data, get_irn_node_nr(block), graph->be_block_hash);
+               pc_ent    = perm_class_get_entry(&status->be_data, class_name, block_ent->perm_class_stat);
+               ps_ent    = perm_stat_get_entry(&status->be_data, perm, pc_ent->perm_stat);
 
-       pc_ent->n_regs = n_regs;
+               pc_ent->n_regs = n_regs;
 
-    /* update information */
-    ps_ent->size      = size;
-    ps_ent->real_size = real_size;
-  }
-  STAT_LEAVE;
-}
+               /* update information */
+               ps_ent->size      = size;
+               ps_ent->real_size = real_size;
+       }
+       STAT_LEAVE;
+}  /* stat_be_block_stat_perm */
 
 /**
- * Update the permutation statistic of a single perm
+ * Update the permutation statistic of a single perm.
  *
- * @param ctx        the hook context
  * @param class_name the name of the register class
  * @param perm       the perm node
  * @param block      the block containing the perm
@@ -1762,157 +2101,215 @@ void stat_be_block_stat_perm(void *ctx, const char *class_name, int n_regs, ir_n
  * @param size       length of the cycle/chain
  * @param n_ops      the number of ops representing this cycle/chain after lowering
  */
-void stat_be_block_stat_permcycle(void *ctx, const char *class_name, ir_node *perm, ir_node *block,
+void stat_be_block_stat_permcycle(const char *class_name, ir_node *perm, ir_node *block,
                                   int is_chain, int size, int n_ops)
 {
-  if (! status->stat_options)
-    return;
-
-  STAT_ENTER;
-  {
-    graph_entry_t      *graph = graph_get_entry(get_irn_irg(block), status->irg_hash);
-    be_block_entry_t   *block_ent;
-    perm_class_entry_t *pc_ent;
-    perm_stat_entry_t  *ps_ent;
-
-    block_ent = be_block_get_entry(&status->be_data, get_irn_node_nr(block), graph->be_block_hash);
-    pc_ent    = perm_class_get_entry(&status->be_data, class_name, block_ent->perm_class_stat);
-    ps_ent    = perm_stat_get_entry(&status->be_data, perm, pc_ent->perm_stat);
-
-    if (is_chain) {
-      ps_ent->n_copies += n_ops;
-      stat_inc_int_distrib_tbl(ps_ent->chains, size);
-    }
-    else {
-      ps_ent->n_exchg += n_ops;
-      stat_inc_int_distrib_tbl(ps_ent->cycles, size);
-    }
-  }
-  STAT_LEAVE;
-}
+       if (! status->stat_options)
+               return;
 
-/* Dumps a statistics snapshot */
+       STAT_ENTER;
+       {
+               graph_entry_t      *graph = graph_get_entry(get_irn_irg(block), status->irg_hash);
+               be_block_entry_t   *block_ent;
+               perm_class_entry_t *pc_ent;
+               perm_stat_entry_t  *ps_ent;
+
+               block_ent = be_block_get_entry(&status->be_data, get_irn_node_nr(block), graph->be_block_hash);
+               pc_ent    = perm_class_get_entry(&status->be_data, class_name, block_ent->perm_class_stat);
+               ps_ent    = perm_stat_get_entry(&status->be_data, perm, pc_ent->perm_stat);
+
+               if (is_chain) {
+                       ps_ent->n_copies += n_ops;
+                       stat_inc_int_distrib_tbl(ps_ent->chains, size);
+               } else {
+                       ps_ent->n_exchg += n_ops;
+                       stat_inc_int_distrib_tbl(ps_ent->cycles, size);
+               }  /* if */
+       }
+       STAT_LEAVE;
+}  /* stat_be_block_stat_permcycle */
+
+/* Dumps a statistics snapshot. */
 void stat_dump_snapshot(const char *name, const char *phase)
 {
-  char fname[2048];
-  const char *p;
-  int l;
+       char fname[2048];
+       const char *p;
+       int l;
 
-  if (! status->stat_options)
-    return;
+       if (! status->stat_options)
+               return;
 
-  STAT_ENTER;
-  {
-    graph_entry_t *entry;
-    graph_entry_t *global = graph_get_entry(NULL, status->irg_hash);
+       STAT_ENTER;
+       {
+               graph_entry_t *entry;
+               graph_entry_t *global = graph_get_entry(NULL, status->irg_hash);
+
+               /*
+                * The constant counter is only global, so we clear it here.
+                * Note that it does NOT contain the constants in DELETED
+                * graphs due to this.
+                */
+               if (status->stat_options & FIRMSTAT_COUNT_CONSTS)
+                       stat_const_clear(status);
+
+               /* build the name */
+               p = strrchr(name, '/');
+#ifdef _WIN32
+               {
+                       const char *q;
+
+                       q = strrchr(name, '\\');
+
+                       /* NULL might be not the smallest pointer */
+                       if (q && (!p || q > p))
+                               p = q;
+               }
+#endif /* _WIN32 */
+               if (p) {
+                       ++p;
+                       l = p - name;
+
+                       if (l > (int) (sizeof(fname) - 1))
+                               l = sizeof(fname) - 1;
+
+                       memcpy(fname, name, l);
+                       fname[l] = '\0';
+               } else {
+                       fname[0] = '\0';
+                       p = name;
+               }  /* if */
+               strncat(fname, "firmstat-", sizeof(fname)-1);
+               strncat(fname, phase, sizeof(fname)-1);
+               strncat(fname, "-", sizeof(fname)-1);
+               strncat(fname, p, sizeof(fname)-1);
+
+               stat_dump_init(fname);
+
+               /* calculate the graph statistics */
+               for (entry = pset_first(status->irg_hash); entry; entry = pset_next(status->irg_hash)) {
+                       if (entry->irg == NULL) {
+                               /* special entry for the global count */
+                               continue;
+                       }  /* if */
+                       if (! entry->is_deleted) {
+                               /* the graph is still alive, count the nodes on it */
+                               update_graph_stat(global, entry);
+                       }  /* if */
+               }  /* for */
+
+               /* some calculations are dependent, we pushed them on the wait_q */
+               while (! pdeq_empty(status->wait_q)) {
+                       entry = pdeq_getr(status->wait_q);
+
+                       update_graph_stat_2(global, entry);
+               }  /* while */
+
+               /* dump per graph */
+               for (entry = pset_first(status->irg_hash); entry; entry = pset_next(status->irg_hash)) {
+                       if (entry->irg == NULL) {
+                               /* special entry for the global count */
+                               continue;
+                       }  /* if */
+
+                       if (! entry->is_deleted || status->stat_options & FIRMSTAT_COUNT_DELETED) {
+                               stat_dump_graph(entry);
+                               stat_dump_registered(entry);
+                       }  /* if */
+
+                       if (! entry->is_deleted) {
+                               /* clear the counter that are not accumulated */
+                               graph_clear_entry(entry, 0);
+                       }  /* if */
+               }  /* for */
+
+               /* dump global */
+               stat_dump_graph(global);
+
+               /* dump the const info */
+               if (status->stat_options & FIRMSTAT_COUNT_CONSTS)
+                       stat_dump_consts(&status->const_info);
+
+               /* dump the parameter distribution */
+               stat_dump_param_tbl(status->dist_param_cnt, global);
+
+               /* dump the optimization counter and clear them */
+               stat_dump_opt_cnt(status->num_opts, ARRAY_SIZE(status->num_opts));
+               clear_optimization_counter();
+
+               stat_dump_finish();
+
+               stat_finish_pattern_history(fname);
+
+               /* clear the global counters here */
+               {
+                       node_entry_t *entry;
+
+                       for (entry = pset_first(global->opcode_hash); entry; entry = pset_next(global->opcode_hash)) {
+                               opcode_clear_entry(entry);
+                       }  /* for */
+                       /* clear all global counter */
+                       graph_clear_entry(global, /*all=*/1);
+               }
+       }
+       STAT_LEAVE;
+}  /* stat_dump_snapshot */
 
-    /*
-     * The constant counter is only global, so we clear it here.
-     * Note that it does NOT contain the constants in DELETED
-     * graphs due to this.
-     */
-    if (status->stat_options & FIRMSTAT_COUNT_CONSTS)
-      stat_const_clear(status);
+struct pass_t {
+       ir_prog_pass_t pass;
+       const char     *fname;
+       const char     *phase;
+};
 
-    /* build the name */
-    p = strrchr(name, '/');
-#ifdef _WIN32
-    {
-      const char *q;
+/**
+ * Wrapper to run stat_dump_snapshot() as a ir_prog wrapper.
+ */
+static int stat_dump_snapshot_wrapper(ir_prog *irp, void *context)
+{
+       struct pass_t *pass = context;
 
-      q = strrchr(name, '\\');
+       (void)irp;
+       stat_dump_snapshot(pass->fname, pass->phase);
+       return 0;
+}  /* stat_dump_snapshot_wrapper */
 
-      /* NULL might be not the smallest pointer */
-      if (q && (!p || q > p))
-        p = q;
-    }
-#endif
-    if (p) {
-      ++p;
-      l = p - name;
-
-      if (l > sizeof(fname) - 1)
-        l = sizeof(fname) - 1;
-
-      memcpy(fname, name, l);
-      fname[l] = '\0';
-    }
-    else {
-      fname[0] = '\0';
-      p = name;
-    }
-    strncat(fname, "firmstat-", sizeof(fname));
-    strncat(fname, phase, sizeof(fname));
-    strncat(fname, "-", sizeof(fname));
-    strncat(fname, p, sizeof(fname));
-
-    stat_dump_init(fname);
-
-    /* calculate the graph statistics */
-    for (entry = pset_first(status->irg_hash); entry; entry = pset_next(status->irg_hash)) {
-
-      if (entry->irg == NULL) {
-        /* special entry for the global count */
-        continue;
-      }
-
-      if (! entry->is_deleted) {
-        /* the graph is still alive, count the nodes on it */
-        update_graph_stat(global, entry);
-      }
-    }
-
-    /* some calculations are dependent, we pushed them on the wait_q */
-    while (! pdeq_empty(status->wait_q)) {
-      entry = pdeq_getr(status->wait_q);
-
-      update_graph_stat_2(global, entry);
-    }
-
-
-    /* dump per graph */
-    for (entry = pset_first(status->irg_hash); entry; entry = pset_next(status->irg_hash)) {
-
-      if (entry->irg == NULL) {
-        /* special entry for the global count */
-        continue;
-      }
-
-      if (! entry->is_deleted || status->stat_options & FIRMSTAT_COUNT_DELETED) {
-        stat_dump_graph(entry);
-      }
-
-      if (! entry->is_deleted) {
-        /* clear the counter that are not accumulated */
-        graph_clear_entry(entry, 0);
-      }
-    }
-
-    /* dump global */
-    stat_dump_graph(global);
-
-    /* dump the const info */
-    if (status->stat_options & FIRMSTAT_COUNT_CONSTS)
-      stat_dump_consts(&status->const_info);
-
-    stat_dump_finish();
-
-    stat_finish_pattern_history();
-
-    /* clear the global counter here */
-    {
-      node_entry_t *entry;
-
-      for (entry = pset_first(global->opcode_hash); entry; entry = pset_next(global->opcode_hash)) {
-        opcode_clear_entry(entry);
-      }
-      /* clear all global counter */
-      graph_clear_entry(global, 1);
-    }
-  }
-  STAT_LEAVE;
+/**
+ * Ensure that no verifier is run from the wrapper.
+ */
+static int no_verify(ir_prog *prog, void *ctx)
+{
+       (void)prog;
+       (void)ctx;
+       return 0;
 }
 
+/**
+ * Ensure that no dumper is run from the wrapper.
+ */
+static void no_dump(ir_prog *prog, void *ctx, unsigned idx)
+{
+       (void)prog;
+       (void)ctx;
+       (void)idx;
+}
+
+/* create an ir_pog pass */
+ir_prog_pass_t *stat_dump_snapshot_pass(
+       const char *name, const char *fname, const char *phase)
+{
+       struct pass_t *pass = XMALLOCZ(struct pass_t);
+
+       def_prog_pass_constructor(
+               &pass->pass, name ? name : "stat_snapshot", stat_dump_snapshot_wrapper);
+       pass->fname = fname;
+       pass->phase = phase;
+
+       /* no dump/verify */
+       pass->pass.dump_irprog   = no_dump;
+       pass->pass.verify_irprog = no_verify;
+
+       return &pass->pass;
+}  /* stat_dump_snapshot_pass */
+
 /** the hook entries for the Firm statistics module */
 static hook_entry_t stat_hooks[hook_last];
 
@@ -1921,135 +2318,170 @@ void firm_init_stat(unsigned enable_options)
 {
 #define X(a)  a, sizeof(a)-1
 #define HOOK(h, fkt) \
-  stat_hooks[h].hook._##h = fkt; register_hook(h, &stat_hooks[h])
-  unsigned num = 0;
-
-  if (! (enable_options & FIRMSTAT_ENABLED))
-    return;
-
-  status = xmalloc(sizeof(*status));
-  memset(status, 0, sizeof(*status));
-
-  /* enable statistics */
-  status->stat_options = enable_options & FIRMSTAT_ENABLED ? enable_options : 0;
-
-  /* register all hooks */
-  HOOK(hook_new_ir_op,                          stat_new_ir_op);
-  HOOK(hook_free_ir_op,                         stat_free_ir_op);
-  HOOK(hook_new_node,                           stat_new_node);
-  HOOK(hook_turn_into_id,                       stat_turn_into_id);
-  HOOK(hook_new_graph,                          stat_new_graph);
-  HOOK(hook_free_graph,                         stat_free_graph);
-  HOOK(hook_irg_walk,                           stat_irg_walk);
-  HOOK(hook_irg_walk_blkwise,                   stat_irg_walk_blkwise);
-  HOOK(hook_irg_block_walk,                     stat_irg_block_walk);
-  HOOK(hook_merge_nodes,                        stat_merge_nodes);
-  HOOK(hook_reassociate,                        stat_reassociate);
-  HOOK(hook_lower,                              stat_lower);
-  HOOK(hook_inline,                             stat_inline);
-  HOOK(hook_tail_rec,                           stat_tail_rec);
-  HOOK(hook_strength_red,                       stat_strength_red);
-  HOOK(hook_dead_node_elim,                     stat_dead_node_elim);
-  HOOK(hook_if_conversion,                      stat_if_conversion);
-  HOOK(hook_func_call,                          stat_func_call);
-  HOOK(hook_arch_dep_replace_mul_with_shifts,   stat_arch_dep_replace_mul_with_shifts);
-  HOOK(hook_arch_dep_replace_division_by_const, stat_arch_dep_replace_division_by_const);
-  HOOK(hook_be_block_stat_perm,                 stat_be_block_stat_perm);
-  HOOK(hook_be_block_stat_permcycle,            stat_be_block_stat_permcycle);
-
-  obstack_init(&status->cnts);
-  obstack_init(&status->be_data);
-
-  /* create the hash-tables */
-  status->irg_hash   = new_pset(graph_cmp, 8);
-  status->ir_op_hash = new_pset(opcode_cmp_2, 1);
-
-  /* create the wait queue */
-  status->wait_q     = new_pdeq();
-
-  if (enable_options & FIRMSTAT_COUNT_STRONG_OP) {
-    /* build the pseudo-ops */
-
-    _op_Phi0.code    = --num;
-    _op_Phi0.name    = new_id_from_chars(X("Phi0"));
-
-    _op_PhiM.code    = --num;
-    _op_PhiM.name    = new_id_from_chars(X("PhiM"));
-
-    _op_ProjM.code   = --num;
-    _op_ProjM.name   = new_id_from_chars(X("ProjM"));
-
-    _op_MulC.code    = --num;
-    _op_MulC.name    = new_id_from_chars(X("MulC"));
-
-    _op_DivC.code    = --num;
-    _op_DivC.name    = new_id_from_chars(X("DivC"));
-
-    _op_ModC.code    = --num;
-    _op_ModC.name    = new_id_from_chars(X("ModC"));
-
-    _op_DivModC.code = --num;
-    _op_DivModC.name = new_id_from_chars(X("DivModC"));
-
-    status->op_Phi0    = &_op_Phi0;
-    status->op_PhiM    = &_op_PhiM;
-    status->op_ProjM   = &_op_ProjM;
-    status->op_MulC    = &_op_MulC;
-    status->op_DivC    = &_op_DivC;
-    status->op_ModC    = &_op_ModC;
-    status->op_DivModC = &_op_DivModC;
-  }
-  else {
-    status->op_Phi0    = NULL;
-    status->op_PhiM    = NULL;
-    status->op_ProjM   = NULL;
-    status->op_MulC    = NULL;
-    status->op_DivC    = NULL;
-    status->op_ModC    = NULL;
-    status->op_DivModC = NULL;
-  }
-
-  if (enable_options & FIRMSTAT_COUNT_SELS) {
-    _op_SelSel.code    = --num;
-    _op_SelSel.name    = new_id_from_chars(X("Sel(Sel)"));
-
-    _op_SelSelSel.code = --num;
-    _op_SelSelSel.name = new_id_from_chars(X("Sel(Sel(Sel))"));
-
-    status->op_SelSel    = &_op_SelSel;
-    status->op_SelSelSel = &_op_SelSelSel;
-  }
-  else {
-    status->op_SelSel    = NULL;
-    status->op_SelSelSel = NULL;
-  }
-
-  /* register the dumper */
-  stat_register_dumper(&simple_dumper);
-
-  if (enable_options & FIRMSTAT_CSV_OUTPUT)
-    stat_register_dumper(&csv_dumper);
-
-  /* initialize the pattern hash */
-  stat_init_pattern_history(enable_options & FIRMSTAT_PATTERN_ENABLED);
-
-  /* initialize the Const options */
-  if (enable_options & FIRMSTAT_COUNT_CONSTS)
-    stat_init_const_cnt(status);
+       stat_hooks[h].hook._##h = fkt; register_hook(h, &stat_hooks[h])
+       unsigned num = 0;
+
+       if (! (enable_options & FIRMSTAT_ENABLED))
+               return;
+
+       status = XMALLOCZ(stat_info_t);
+
+       /* enable statistics */
+       status->stat_options = enable_options & FIRMSTAT_ENABLED ? enable_options : 0;
+
+       /* register all hooks */
+       HOOK(hook_new_ir_op,                          stat_new_ir_op);
+       HOOK(hook_free_ir_op,                         stat_free_ir_op);
+       HOOK(hook_new_node,                           stat_new_node);
+       HOOK(hook_turn_into_id,                       stat_turn_into_id);
+       HOOK(hook_normalize,                          stat_normalize);
+       HOOK(hook_new_graph,                          stat_new_graph);
+       HOOK(hook_free_graph,                         stat_free_graph);
+       HOOK(hook_irg_walk,                           stat_irg_walk);
+       HOOK(hook_irg_walk_blkwise,                   stat_irg_walk_blkwise);
+       HOOK(hook_irg_block_walk,                     stat_irg_block_walk);
+       HOOK(hook_merge_nodes,                        stat_merge_nodes);
+       HOOK(hook_reassociate,                        stat_reassociate);
+       HOOK(hook_lower,                              stat_lower);
+       HOOK(hook_inline,                             stat_inline);
+       HOOK(hook_tail_rec,                           stat_tail_rec);
+       HOOK(hook_strength_red,                       stat_strength_red);
+       HOOK(hook_dead_node_elim,                     stat_dead_node_elim);
+       HOOK(hook_if_conversion,                      stat_if_conversion);
+       HOOK(hook_func_call,                          stat_func_call);
+       HOOK(hook_arch_dep_replace_mul_with_shifts,   stat_arch_dep_replace_mul_with_shifts);
+       HOOK(hook_arch_dep_replace_division_by_const, stat_arch_dep_replace_division_by_const);
+
+       obstack_init(&status->cnts);
+       obstack_init(&status->be_data);
+
+       /* create the hash-tables */
+       status->irg_hash   = new_pset(graph_cmp, 8);
+       status->ir_op_hash = new_pset(opcode_cmp_2, 1);
+
+       /* create the wait queue */
+       status->wait_q     = new_pdeq();
+
+       if (enable_options & FIRMSTAT_COUNT_STRONG_OP) {
+               /* build the pseudo-ops */
+
+               _op_Phi0.code    = --num;
+               _op_Phi0.name    = new_id_from_chars(X("Phi0"));
+
+               _op_PhiM.code    = --num;
+               _op_PhiM.name    = new_id_from_chars(X("PhiM"));
+
+               _op_ProjM.code   = --num;
+               _op_ProjM.name   = new_id_from_chars(X("ProjM"));
+
+               _op_MulC.code    = --num;
+               _op_MulC.name    = new_id_from_chars(X("MulC"));
+
+               _op_DivC.code    = --num;
+               _op_DivC.name    = new_id_from_chars(X("DivC"));
+
+               _op_ModC.code    = --num;
+               _op_ModC.name    = new_id_from_chars(X("ModC"));
+
+               _op_DivModC.code = --num;
+               _op_DivModC.name = new_id_from_chars(X("DivModC"));
+
+               _op_QuotC.code   = --num;
+               _op_QuotC.name   = new_id_from_chars(X("QuotC"));
+
+               status->op_Phi0    = &_op_Phi0;
+               status->op_PhiM    = &_op_PhiM;
+               status->op_ProjM   = &_op_ProjM;
+               status->op_MulC    = &_op_MulC;
+               status->op_DivC    = &_op_DivC;
+               status->op_ModC    = &_op_ModC;
+               status->op_DivModC = &_op_DivModC;
+               status->op_QuotC   = &_op_QuotC;
+       } else {
+               status->op_Phi0    = NULL;
+               status->op_PhiM    = NULL;
+               status->op_ProjM   = NULL;
+               status->op_MulC    = NULL;
+               status->op_DivC    = NULL;
+               status->op_ModC    = NULL;
+               status->op_DivModC = NULL;
+               status->op_QuotC   = NULL;
+       }  /* if */
+
+       /* for Florian: count the Sel depth */
+       if (enable_options & FIRMSTAT_COUNT_SELS) {
+               _op_SelSel.code    = --num;
+               _op_SelSel.name    = new_id_from_chars(X("Sel(Sel)"));
+
+               _op_SelSelSel.code = --num;
+               _op_SelSelSel.name = new_id_from_chars(X("Sel(Sel(Sel))"));
+
+               status->op_SelSel    = &_op_SelSel;
+               status->op_SelSelSel = &_op_SelSelSel;
+       } else {
+               status->op_SelSel    = NULL;
+               status->op_SelSelSel = NULL;
+       }  /* if */
+
+       /* register the dumper */
+       stat_register_dumper(&simple_dumper);
+
+       if (enable_options & FIRMSTAT_CSV_OUTPUT)
+               stat_register_dumper(&csv_dumper);
+
+       /* initialize the pattern hash */
+       stat_init_pattern_history(enable_options & FIRMSTAT_PATTERN_ENABLED);
+
+       /* initialize the Const options */
+       if (enable_options & FIRMSTAT_COUNT_CONSTS)
+               stat_init_const_cnt(status);
+
+       /* distribution table for parameter counts */
+       status->dist_param_cnt = stat_new_int_distrib_tbl();
+
+       clear_optimization_counter();
 
 #undef HOOK
 #undef X
-}
+}  /* firm_init_stat */
 
-/* terminates the statistics module, frees all memory */
-void stat_term(void) {
-  if (status != (stat_info_t *)&status_disable) {
-    obstack_free(&status->be_data, NULL);
-       obstack_free(&status->cnts, NULL);
-    xfree(status);
-    status = (stat_info_t *)&status_disable;
-  }
-}
+/**
+ * Frees all dumper structures.
+ */
+static void stat_term_dumper(void)
+{
+       dumper_t *dumper, *next_dumper;
+
+       for (dumper = status->dumper; dumper; /* iteration done in loop body */ ) {
+               if (dumper->func_map)
+                       del_pset(dumper->func_map);
+
+               next_dumper = dumper->next;
+               free(dumper);
+               dumper = next_dumper;
+       }  /* for */
+}  /* stat_term_dumper */
+
+
+/* Terminates the statistics module, frees all memory. */
+void stat_term(void)
+{
+       if (status != (stat_info_t *)&status_disable) {
+               obstack_free(&status->be_data, NULL);
+               obstack_free(&status->cnts, NULL);
+
+               stat_term_dumper();
+
+               xfree(status);
+               status = (stat_info_t *)&status_disable;
+       }
+}  /* stat_term */
+
+/* returns 1 if statistics were initialized, 0 otherwise */
+int stat_is_active(void)
+{
+       return status != (stat_info_t *)&status_disable;
+}  /* stat_is_active */
 
 #else