X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fstat%2Ffirmstat.c;h=7b2d1f1835e930478dec2076b722123b849eb990;hb=00b3e0b5a91a8d92b26b1905b1af7da81e2367bf;hp=853a8b5dedb282e960cd86080db338d929dd4d13;hpb=0fbcef83aa6060534172bb13e71cdadb04428806;p=libfirm

diff --git a/ir/stat/firmstat.c b/ir/stat/firmstat.c
index 853a8b5de..7b2d1f183 100644
--- a/ir/stat/firmstat.c
+++ b/ir/stat/firmstat.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2010 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -21,30 +21,25 @@
  * @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"
+#include "ircons.h"
 
 /*
  * need this to be static:
@@ -68,12 +63,6 @@ static ir_op _op_DivC;
 /** The Div by Const node. */
 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;
 
@@ -86,13 +75,13 @@ static ir_op _op_SelSelSel;
 /* ---------------------------------------------------------------------------------- */
 
 /** Marks the begin of a statistic (hook) function. */
-#define STAT_ENTER		++status->recursive
+#define STAT_ENTER    ++status->recursive
 
 /** Marks the end of a statistic (hook) functions. */
-#define STAT_LEAVE		--status->recursive
+#define STAT_LEAVE    --status->recursive
 
 /** Allows to enter a statistic function only when we are not already in a hook. */
-#define STAT_ENTER_SINGLE	do { if (status->recursive > 0) return; ++status->recursive; } while (0)
+#define STAT_ENTER_SINGLE    do { if (status->recursive > 0) return; ++status->recursive; } while (0)
 
 /**
  * global status
@@ -103,9 +92,10 @@ static stat_info_t *status = (stat_info_t *)&status_disable;
 /**
  * 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;
+static int opcode_cmp(const void *elt, const void *key)
+{
+	const node_entry_t *e1 = (const node_entry_t*)elt;
+	const node_entry_t *e2 = (const node_entry_t*)key;
 
 	return e1->op->code - e2->op->code;
 }  /* opcode_cmp */
@@ -113,9 +103,10 @@ static int opcode_cmp(const void *elt, const void *key) {
 /**
  * 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;
+static int graph_cmp(const void *elt, const void *key)
+{
+	const graph_entry_t *e1 = (const graph_entry_t*)elt;
+	const graph_entry_t *e2 = (const graph_entry_t*)key;
 
 	return e1->irg != e2->irg;
 }  /* graph_cmp */
@@ -123,19 +114,21 @@ static int graph_cmp(const void *elt, const void *key) {
 /**
  * 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;
+static int opt_cmp(const void *elt, const void *key)
+{
+	const opt_entry_t *e1 = (const opt_entry_t*)elt;
+	const opt_entry_t *e2 = (const opt_entry_t*)key;
 
 	return e1->op->code != e2->op->code;
 }  /* opt_cmp */
 
 /**
- * Compare two elements of the block/extbb hash.
+ * Compare two elements of the block hash.
  */
-static int block_cmp(const void *elt, const void *key) {
-	const block_entry_t *e1 = elt;
-	const block_entry_t *e2 = key;
+static int block_cmp(const void *elt, const void *key)
+{
+	const block_entry_t *e1 = (const block_entry_t*)elt;
+	const block_entry_t *e2 = (const block_entry_t*)key;
 
 	/* it's enough to compare the block number */
 	return e1->block_nr != e2->block_nr;
@@ -144,9 +137,10 @@ static int block_cmp(const void *elt, const void *key) {
 /**
  * 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;
+static int be_block_cmp(const void *elt, const void *key)
+{
+	const be_block_entry_t *e1 = (const be_block_entry_t*)elt;
+	const be_block_entry_t *e2 = (const be_block_entry_t*)key;
 
 	return e1->block_nr != e2->block_nr;
 }  /* be_block_cmp */
@@ -154,9 +148,10 @@ static int be_block_cmp(const void *elt, const void *key) {
 /**
  * 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;
+static int reg_pressure_cmp(const void *elt, const void *key)
+{
+	const reg_pressure_entry_t *e1 = (const reg_pressure_entry_t*)elt;
+	const reg_pressure_entry_t *e2 = (const reg_pressure_entry_t*)key;
 
 	return e1->class_name != e2->class_name;
 }  /* reg_pressure_cmp */
@@ -164,9 +159,10 @@ static int reg_pressure_cmp(const void *elt, const void *key) {
 /**
  * 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;
+static int perm_stat_cmp(const void *elt, const void *key)
+{
+	const perm_stat_entry_t *e1 = (const perm_stat_entry_t*)elt;
+	const perm_stat_entry_t *e2 = (const perm_stat_entry_t*)key;
 
 	return e1->perm != e2->perm;
 }  /* perm_stat_cmp */
@@ -174,9 +170,10 @@ static int perm_stat_cmp(const void *elt, const void *key) {
 /**
  * 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;
+static int perm_class_cmp(const void *elt, const void *key)
+{
+	const perm_class_entry_t *e1 = (const perm_class_entry_t*)elt;
+	const perm_class_entry_t *e2 = (const perm_class_entry_t*)key;
 
 	return e1->class_name != e2->class_name;
 }  /* perm_class_cmp */
@@ -184,9 +181,10 @@ static int perm_class_cmp(const void *elt, const void *key) {
 /**
  * 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;
+static int opcode_cmp_2(const void *elt, const void *key)
+{
+	const ir_op *e1 = (const ir_op*)elt;
+	const ir_op *e2 = (const ir_op*)key;
 
 	return e1->code != e2->code;
 }  /* opcode_cmp_2 */
@@ -194,9 +192,10 @@ static int opcode_cmp_2(const void *elt, const void *key) {
 /**
  * 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;
+static int address_mark_cmp(const void *elt, const void *key, size_t size)
+{
+	const address_mark_entry_t *e1 = (const address_mark_entry_t*)elt;
+	const address_mark_entry_t *e2 = (const address_mark_entry_t*)key;
 	(void) size;
 
 	/* compare only the nodes, the rest is used as data container */
@@ -206,37 +205,40 @@ static int address_mark_cmp(const void *elt, const void *key, size_t size) {
 /**
  * Clear all counter in a node_entry_t.
  */
-static void opcode_clear_entry(node_entry_t *elem) {
+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->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) {
+static node_entry_t *opcode_get_entry(const ir_op *op, hmap_node_entry_t *hmap)
+{
 	node_entry_t key;
 	node_entry_t *elem;
 
 	key.op = op;
 
-	elem = pset_find(hmap, &key, op->code);
+	elem = (node_entry_t*)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);
 
 	elem->op = op;
 
-	return pset_insert(hmap, elem, op->code);
+	return (node_entry_t*)pset_insert(hmap, elem, op->code);
 }  /* opcode_get_entry */
 
 /**
@@ -245,11 +247,12 @@ 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(ir_opcode code, hmap_ir_op *hmap) {
+static ir_op *opcode_find_entry(ir_opcode code, hmap_ir_op *hmap)
+{
 	ir_op key;
 
 	key.code = code;
-	return pset_find(hmap, &key, code);
+	return (ir_op*)pset_find(hmap, &key, code);
 }  /* opcode_find_entry */
 
 /**
@@ -258,7 +261,8 @@ static ir_op *opcode_find_entry(ir_opcode code, hmap_ir_op *hmap) {
  * @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) {
+static void graph_clear_entry(graph_entry_t *elem, int all)
+{
 	int i;
 
 	/* clear accumulated / non-accumulated counter */
@@ -271,11 +275,6 @@ static void graph_clear_entry(graph_entry_t *elem, int all) {
 		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 */
@@ -283,7 +282,7 @@ static void graph_clear_entry(graph_entry_t *elem, int all) {
 /**
  * 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)
@@ -294,7 +293,7 @@ static graph_entry_t *graph_get_entry(ir_graph *irg, hmap_graph_entry_t *hmap)
 
 	key.irg = irg;
 
-	elem = pset_find(hmap, &key, HASH_PTR(irg));
+	elem = (graph_entry_t*)pset_find(hmap, &key, hash_ptr(irg));
 
 	if (elem) {
 		/* create hash map backend block information */
@@ -305,8 +304,7 @@ static graph_entry_t *graph_get_entry(ir_graph *irg, hmap_graph_entry_t *hmap)
 	}  /* if */
 
 	/* allocate a new one */
-	elem = obstack_alloc(&status->cnts, sizeof(*elem));
-	memset(elem, 0, sizeof(*elem));
+	elem = OALLOCZ(&status->cnts, graph_entry_t);
 	obstack_init(&elem->recalc_cnts);
 
 	/* clear counter */
@@ -319,18 +317,18 @@ static graph_entry_t *graph_get_entry(ir_graph *irg, hmap_graph_entry_t *hmap)
 
 	/* 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)
+	for (i = 0; i != ARRAY_SIZE(elem->opt_hash); ++i)
 		elem->opt_hash[i] = new_pset(opt_cmp, 4);
 
-	return pset_insert(hmap, elem, HASH_PTR(irg));
+	return (graph_entry_t*)pset_insert(hmap, elem, hash_ptr(irg));
 }  /* graph_get_entry */
 
 /**
  * Clear all counter in an opt_entry_t.
  */
-static void opt_clear_entry(opt_entry_t *elem) {
+static void opt_clear_entry(opt_entry_t *elem)
+{
 	cnt_clr(&elem->count);
 }  /* opt_clear_entry */
 
@@ -347,25 +345,25 @@ static opt_entry_t *opt_get_entry(const ir_op *op, hmap_opt_entry_t *hmap)
 
 	key.op = op;
 
-	elem = pset_find(hmap, &key, op->code);
+	elem = (opt_entry_t*)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);
 
 	elem->op = op;
 
-	return pset_insert(hmap, elem, op->code);
+	return (opt_entry_t*)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) {
+static void block_clear_entry(block_entry_t *elem)
+{
 	int i;
 
 	for (i = 0; i < _bcnt_last; ++i)
@@ -385,19 +383,18 @@ static block_entry_t *block_get_entry(struct obstack *obst, long block_nr, hmap_
 
 	key.block_nr = block_nr;
 
-	elem = pset_find(hmap, &key, block_nr);
+	elem = (block_entry_t*)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);
 
 	elem->block_nr = block_nr;
 
-	return pset_insert(hmap, elem, block_nr);
+	return (block_entry_t*)pset_insert(hmap, elem, block_nr);
 }  /* block_get_entry */
 
 /**
@@ -432,25 +429,25 @@ static be_block_entry_t *be_block_get_entry(struct obstack *obst, long block_nr,
 
 	key.block_nr = block_nr;
 
-	elem = pset_find(hmap, &key, block_nr);
+	elem = (be_block_entry_t*)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);
 
 	elem->block_nr = block_nr;
 
-	return pset_insert(hmap, elem, block_nr);
+	return (be_block_entry_t*)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);
 
@@ -471,25 +468,25 @@ static perm_class_entry_t *perm_class_get_entry(struct obstack *obst, const char
 
 	key.class_name = class_name;
 
-	elem = pset_find(hmap, &key, HASH_PTR(class_name));
+	elem = (perm_class_entry_t*)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);
 
 	elem->class_name = class_name;
 
-	return pset_insert(hmap, elem, HASH_PTR(class_name));
+	return (perm_class_entry_t*)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);
 
@@ -513,25 +510,25 @@ static perm_stat_entry_t *perm_stat_get_entry(struct obstack *obst, ir_node *per
 
 	key.perm = perm;
 
-	elem = pset_find(hmap, &key, HASH_PTR(perm));
+	elem = (perm_stat_entry_t*)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);
 
 	elem->perm = perm;
 
-	return pset_insert(hmap, elem, HASH_PTR(perm));
+	return (perm_stat_entry_t*)pset_insert(hmap, elem, hash_ptr(perm));
 }  /* perm_stat_get_entry */
 
 /**
  * Clear optimizations counter,
  */
-static void clear_optimization_counter(void)  {
+static void clear_optimization_counter(void)
+{
 	int i;
 	for (i = 0; i < FS_OPT_MAX; ++i)
 		cnt_clr(&status->num_opts[i]);
@@ -546,7 +543,7 @@ static void clear_optimization_counter(void)  {
 static ir_op *stat_get_irn_op(ir_node *node)
 {
 	ir_op *op = get_irn_op(node);
-	ir_opcode opc = op->code;
+	unsigned opc = op->code;
 
 	switch (opc) {
 	case iro_Phi:
@@ -582,18 +579,6 @@ static ir_op *stat_get_irn_op(ir_node *node)
 			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 */
@@ -605,7 +590,7 @@ static ir_op *stat_get_irn_op(ir_node *node)
 		}  /* if */
 		break;
 	default:
-		;
+		break;
 	}  /* switch */
 
 	return op;
@@ -637,7 +622,7 @@ static void undate_block_info(ir_node *node, graph_entry_t *graph)
 			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->cnt[bcnt_in_edges]);  /* an edge coming from another block */
 			cnt_inc(&b_entry_other->cnt[bcnt_out_edges]);
 		}  /* for */
 		return;
@@ -667,84 +652,22 @@ static void undate_block_info(ir_node *node, graph_entry_t *graph)
 		other_block = get_nodes_block(pred);
 
 		if (other_block == block)
-			cnt_inc(&b_entry->cnt[bcnt_edges]);	/* a in block edge */
+			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[bcnt_in_edges]);	/* an edge coming from another block */
+			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.
- */
-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;
-
-	/* 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);
-
-			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[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);
-
-	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[bcnt_nodes]);
-
-	/* don't count keep-alive edges */
-	if (is_End(node))
-		return;
-
-	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);
-
-		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[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, updates
  * param distribution.
  */
-static void analyse_params_of_Call(graph_entry_t *graph, ir_node *call) {
+static void analyse_params_of_Call(graph_entry_t *graph, ir_node *call)
+{
 	int i, num_const_args = 0, num_local_adr = 0;
 	int n = get_Call_n_params(call);
 
@@ -831,7 +754,7 @@ static void stat_update_call(ir_node *call, graph_entry_t *graph)
 		for (; curr != block && get_Block_dom_depth(curr) > depth;) {
 			curr = get_Block_idom(curr);
 
-			if (! curr || is_no_Block(curr))
+			if (! curr || !is_Block(curr))
 				break;
 		}  /* for */
 
@@ -897,7 +820,8 @@ static void stat_update_call_2(ir_node *call, graph_entry_t *graph)
  *
  * @return the base address.
  */
-static ir_node *find_base_adr(ir_node *sel) {
+static ir_node *find_base_adr(ir_node *sel)
+{
 	ir_node *ptr = get_Sel_ptr(sel);
 
 	while (is_Sel(ptr)) {
@@ -910,8 +834,9 @@ static ir_node *find_base_adr(ir_node *sel) {
 /**
  * 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);
+static void stat_update_address(ir_node *node, graph_entry_t *graph)
+{
+	unsigned opc = get_irn_opcode(node);
 	ir_node *base;
 	ir_graph *irg;
 
@@ -923,10 +848,7 @@ static void stat_update_address(ir_node *node, graph_entry_t *graph) {
 	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)) {
+		if (base == get_irg_frame(irg)) {
 			/* a local Variable. */
 			cnt_inc(&graph->cnt[gcnt_local_adr]);
 		} else {
@@ -948,14 +870,14 @@ static void stat_update_address(ir_node *node, graph_entry_t *graph) {
 				}  /* if */
 				/* other parameter */
 				cnt_inc(&graph->cnt[gcnt_param_adr]);
-end_parameter:	;
+end_parameter: ;
 			} else {
 				/* unknown Pointer access */
 				cnt_inc(&graph->cnt[gcnt_other_adr]);
 			}  /* if */
 		}  /* if */
 	default:
-		;
+		break;
 	}  /* switch */
 }  /* stat_update_address */
 
@@ -964,7 +886,7 @@ end_parameter:	;
  */
 static void update_node_stat(ir_node *node, void *env)
 {
-	graph_entry_t *graph = env;
+	graph_entry_t *graph = (graph_entry_t*)env;
 	node_entry_t *entry;
 
 	ir_op *op = stat_get_irn_op(node);
@@ -978,12 +900,6 @@ static void update_node_stat(ir_node *node, void *env)
 	/* 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) {
@@ -1010,7 +926,7 @@ static void update_node_stat(ir_node *node, void *env)
 			}
 		}
 	default:
-		;
+		break;
 	}  /* switch */
 
 	/* we want to count the constant IN nodes, not the CSE'ed constant's itself */
@@ -1031,8 +947,9 @@ static void update_node_stat(ir_node *node, void *env)
 /**
  * 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;
+static void update_node_stat_2(ir_node *node, void *env)
+{
+	graph_entry_t *graph = (graph_entry_t*)env;
 
 	/* check for properties that depends on calls like recursion/leaf/indirect call */
 	if (is_Call(node))
@@ -1042,8 +959,10 @@ static void update_node_stat_2(ir_node *node, void *env) {
 /**
  * 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));
+static unsigned get_adr_mark(graph_entry_t *graph, ir_node *node)
+{
+	address_mark_entry_t const val = { node, 0 };
+	address_mark_entry_t *value = set_find(address_mark_entry_t, graph->address_mark, &val, sizeof(val), hash_ptr(node));
 
 	return value ? value->mark : 0;
 }  /* get_adr_mark */
@@ -1051,10 +970,10 @@ static unsigned get_adr_mark(graph_entry_t *graph, ir_node *node) {
 /**
  * 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));
-
-	value->mark = val;
+static void set_adr_mark(graph_entry_t *graph, ir_node *node, unsigned val)
+{
+	address_mark_entry_t const value = { node, val };
+	set_insert(address_mark_entry_t, graph->address_mark, &value, sizeof(value), hash_ptr(node));
 }  /* set_adr_mark */
 
 #undef DUMP_ADR_MODE
@@ -1089,14 +1008,13 @@ static int stat_adr_mark_hook(FILE *F, ir_node *node, ir_node *local)
 /**
  * Return the "operational" mode of a Firm node.
  */
-static ir_mode *get_irn_op_mode(ir_node *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:
@@ -1115,8 +1033,9 @@ static ir_mode *get_irn_op_mode(ir_node *node) {
  * 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;
+static void mark_address_calc(ir_node *node, void *env)
+{
+	graph_entry_t *graph = (graph_entry_t*)env;
 	ir_mode *mode = get_irn_op_mode(node);
 	int i, n;
 	unsigned mark_preds = MARK_REF_NON_ADR;
@@ -1160,8 +1079,9 @@ static void mark_address_calc(ir_node *node, void *env) {
  * calling it in the post of an outs walk. This should work even in cycles,
  * while the normal pre-walk will not.
  */
-static void count_adr_ops(ir_node *node, void *env) {
-	graph_entry_t *graph = env;
+static void count_adr_ops(ir_node *node, void *env)
+{
+	graph_entry_t *graph = (graph_entry_t*)env;
 	unsigned mark        = get_adr_mark(graph, node);
 
 	if (mark & MARK_ADDRESS_CALC)
@@ -1181,11 +1101,10 @@ static void count_adr_ops(ir_node *node, void *env) {
  */
 static void update_graph_stat(graph_entry_t *global, graph_entry_t *graph)
 {
-	node_entry_t *entry;
 	int i;
 
 	/* clear first the alive counter in the graph */
-	foreach_pset(graph->opcode_hash, entry) {
+	foreach_pset(graph->opcode_hash, node_entry_t*, entry) {
 		cnt_clr(&entry->cnt_alive);
 	}  /* foreach_pset */
 
@@ -1202,14 +1121,6 @@ static void update_graph_stat(graph_entry_t *global, graph_entry_t *graph)
 	/* 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);
-
-			/* create new extbb counter */
-			graph->extbb_hash = new_pset(block_cmp, 5);
-		}  /* if */
 	}  /* if */
 
 	/* count the nodes in the graph */
@@ -1229,7 +1140,7 @@ static void update_graph_stat(graph_entry_t *global, graph_entry_t *graph)
 		graph->is_chain_call = 0;
 
 	/* assume we walk every graph only ONCE, we could sum here the global count */
-	foreach_pset(graph->opcode_hash, entry) {
+	foreach_pset(graph->opcode_hash, node_entry_t*, entry) {
 		node_entry_t *g_entry = opcode_get_entry(entry->op, global->opcode_hash);
 
 		/* update the node counter */
@@ -1307,10 +1218,10 @@ static void update_graph_stat_2(graph_entry_t *global, graph_entry_t *graph)
 /**
  * Register a dumper.
  */
-static void stat_register_dumper(const dumper_t *dumper) {
+static void stat_register_dumper(const dumper_t *dumper)
+{
 	dumper_t *p = XMALLOC(dumper_t);
-
-	memcpy(p, dumper, sizeof(*p));
+	*p = *dumper;
 
 	p->next        = status->dumper;
 	p->status      = status;
@@ -1322,7 +1233,8 @@ static void stat_register_dumper(const dumper_t *dumper) {
 /**
  * Dumps the statistics of an IR graph.
  */
-static void stat_dump_graph(graph_entry_t *entry) {
+static void stat_dump_graph(graph_entry_t *entry)
+{
 	dumper_t *dumper;
 
 	for (dumper = status->dumper; dumper; dumper = dumper->next) {
@@ -1334,14 +1246,13 @@ static void stat_dump_graph(graph_entry_t *entry) {
 /**
  * Calls all registered dumper functions.
  */
-static void stat_dump_registered(graph_entry_t *entry) {
+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)
+			foreach_pset(dumper->func_map, dump_graph_FUNC*, func)
 				func(dumper, entry);
 		}  /* if */
 	}  /* for */
@@ -1350,7 +1261,8 @@ static void stat_dump_registered(graph_entry_t *entry) {
 /**
  * Dumps a constant table.
  */
-static void stat_dump_consts(const constant_info_t *tbl) {
+static void stat_dump_consts(const constant_info_t *tbl)
+{
 	dumper_t *dumper;
 
 	for (dumper = status->dumper; dumper; dumper = dumper->next) {
@@ -1362,7 +1274,8 @@ static void stat_dump_consts(const constant_info_t *tbl) {
 /**
  * Dumps the parameter distribution
  */
-static void stat_dump_param_tbl(const distrib_tbl_t *tbl, graph_entry_t *global) {
+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) {
@@ -1374,7 +1287,8 @@ static void stat_dump_param_tbl(const distrib_tbl_t *tbl, graph_entry_t *global)
 /**
  * Dumps the optimization counter
  */
-static void stat_dump_opt_cnt(const counter_t *tbl, unsigned len) {
+static void stat_dump_opt_cnt(const counter_t *tbl, unsigned len)
+{
 	dumper_t *dumper;
 
 	for (dumper = status->dumper; dumper; dumper = dumper->next) {
@@ -1386,7 +1300,8 @@ static void stat_dump_opt_cnt(const counter_t *tbl, unsigned len) {
 /**
  * Initialize the dumper.
  */
-static void stat_dump_init(const char *name) {
+static void stat_dump_init(const char *name)
+{
 	dumper_t *dumper;
 
 	for (dumper = status->dumper; dumper; dumper = dumper->next) {
@@ -1398,7 +1313,8 @@ static void stat_dump_init(const char *name) {
 /**
  * Finish the dumper.
  */
-static void stat_dump_finish(void) {
+static void stat_dump_finish(void)
+{
 	dumper_t *dumper;
 
 	for (dumper = status->dumper; dumper; dumper = dumper->next) {
@@ -1410,13 +1326,14 @@ static void stat_dump_finish(void) {
 /**
  * Register an additional function for all dumper.
  */
-void stat_register_dumper_func(dump_graph_FUNC func) {
+void stat_register_dumper_func(dump_graph_FUNC *const func)
+{
 	dumper_t *dumper;
 
 	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);
+		pset_insert_ptr(dumper->func_map, (void*)func);
 	}  /* for */
 }  /* stat_register_dumper_func */
 
@@ -1425,8 +1342,9 @@ void stat_register_dumper_func(dump_graph_FUNC func) {
 /*
  * Helper: get an ir_op from an opcode.
  */
-ir_op *stat_get_op_from_opcode(ir_opcode code) {
-	return opcode_find_entry(code, status->ir_op_hash);
+ir_op *stat_get_op_from_opcode(unsigned code)
+{
+	return opcode_find_entry((ir_opcode)code, status->ir_op_hash);
 }  /* stat_get_op_from_opcode */
 
 /**
@@ -1435,7 +1353,8 @@ ir_op *stat_get_op_from_opcode(ir_opcode code) {
  * @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) {
+static void stat_new_ir_op(void *ctx, ir_op *op)
+{
 	(void) ctx;
 	if (! status->stat_options)
 		return;
@@ -1458,7 +1377,8 @@ static void stat_new_ir_op(void *ctx, ir_op *op) {
  * @param ctx  the hook context
  * @param op   the IR opcode that is freed
  */
-static void stat_free_ir_op(void *ctx, ir_op *op) {
+static void stat_free_ir_op(void *ctx, ir_op *op)
+{
 	(void) ctx;
 	(void) op;
 	if (! status->stat_options)
@@ -1477,7 +1397,8 @@ static void stat_free_ir_op(void *ctx, ir_op *op) {
  * @param irg   the IR graph on which the node is created
  * @param node  the new IR node that was created
  */
-static void stat_new_node(void *ctx, ir_graph *irg, ir_node *node) {
+static void stat_new_node(void *ctx, ir_graph *irg, ir_node *node)
+{
 	(void) ctx;
 	(void) irg;
 	if (! status->stat_options)
@@ -1512,7 +1433,8 @@ static void stat_new_node(void *ctx, ir_graph *irg, ir_node *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) {
+static void stat_turn_into_id(void *ctx, ir_node *node)
+{
 	(void) ctx;
 	if (! status->stat_options)
 		return;
@@ -1536,6 +1458,37 @@ static void stat_turn_into_id(void *ctx, ir_node *node) {
 	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 */
+
 /**
  * Hook: A new graph was created
  *
@@ -1543,7 +1496,8 @@ static void stat_turn_into_id(void *ctx, ir_node *node) {
  * @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, ir_entity *ent) {
+static void stat_new_graph(void *ctx, ir_graph *irg, ir_entity *ent)
+{
 	(void) ctx;
 	if (! status->stat_options)
 		return;
@@ -1575,7 +1529,8 @@ static void stat_new_graph(void *ctx, ir_graph *irg, ir_entity *ent) {
  * in our hash maps, only a flag is set which prevents this
  * information from being changed, it's "frozen" from now.
  */
-static void stat_free_graph(void *ctx, ir_graph *irg) {
+static void stat_free_graph(void *ctx, ir_graph *irg)
+{
 	(void) ctx;
 	if (! status->stat_options)
 		return;
@@ -1668,7 +1623,8 @@ static void stat_irg_block_walk(void *ctx, ir_graph *irg, ir_node *node, generic
  * @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, hook_opt_kind kind) {
+static void removed_due_opt(ir_node *n, hmap_opt_entry_t *hmap, hook_opt_kind kind)
+{
 	opt_entry_t *entry;
 	ir_op *op = stat_get_irn_op(n);
 
@@ -1723,7 +1679,7 @@ static void stat_merge_nodes(
 						xopt = HOOK_OPT_CONFIRM_C;
 				}  /* if */
 
-				removed_due_opt(old_node_array[i], graph->opt_hash[xopt], xopt);
+				removed_due_opt(old_node_array[i], graph->opt_hash[xopt], (hook_opt_kind)xopt);
 			}  /* if */
 		}  /* for */
 	}
@@ -1736,7 +1692,8 @@ static void stat_merge_nodes(
  * @param ctx   the hook context
  * @param flag  if non-zero, reassociation is started else stopped
  */
-static void stat_reassociate(void *ctx, int flag) {
+static void stat_reassociate(void *ctx, int flag)
+{
 	(void) ctx;
 	if (! status->stat_options)
 		return;
@@ -1754,7 +1711,8 @@ static void stat_reassociate(void *ctx, int flag) {
  * @param ctx  the hook context
  * @param node the IR node that will be lowered
  */
-static void stat_lower(void *ctx, ir_node *node) {
+static void stat_lower(void *ctx, ir_node *node)
+{
 	(void) ctx;
 	if (! status->stat_options)
 		return;
@@ -1799,7 +1757,8 @@ static void stat_inline(void *ctx, ir_node *call, ir_graph *called_irg)
  *
  * @param ctx  the hook context
  */
-static void stat_tail_rec(void *ctx, ir_graph *irg, int n_calls) {
+static void stat_tail_rec(void *ctx, ir_graph *irg, int n_calls)
+{
 	(void) ctx;
 	if (! status->stat_options)
 		return;
@@ -1818,7 +1777,8 @@ static void stat_tail_rec(void *ctx, ir_graph *irg, int n_calls) {
  *
  * @param ctx  the hook context
  */
-static void stat_strength_red(void *ctx, ir_graph *irg, ir_node *strong) {
+static void stat_strength_red(void *ctx, ir_graph *irg, ir_node *strong)
+{
 	(void) ctx;
 	if (! status->stat_options)
 		return;
@@ -1838,7 +1798,8 @@ static void stat_strength_red(void *ctx, ir_graph *irg, ir_node *strong) {
  *
  * @param ctx  the hook context
  */
-static void stat_dead_node_elim(void *ctx, ir_graph *irg, int start) {
+static void stat_dead_node_elim(void *ctx, ir_graph *irg, int start)
+{
 	(void) ctx;
 	(void) irg;
 	if (! status->stat_options)
@@ -1893,7 +1854,8 @@ static void stat_func_call(void *context, ir_graph *irg, ir_node *call)
  *
  * @param ctx  the hook context
  */
-static void stat_arch_dep_replace_mul_with_shifts(void *ctx, ir_node *mul) {
+static void stat_arch_dep_replace_mul_with_shifts(void *ctx, ir_node *mul)
+{
 	(void) ctx;
 	if (! status->stat_options)
 		return;
@@ -1912,7 +1874,8 @@ static void stat_arch_dep_replace_mul_with_shifts(void *ctx, ir_node *mul) {
  * @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) {
+static void stat_arch_dep_replace_division_by_const(void *ctx, ir_node *node)
+{
 	(void) ctx;
 	if (! status->stat_options)
 		return;
@@ -1945,13 +1908,12 @@ 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;
 
-		pset_insert(block_ent->reg_pressure, rp_ent, HASH_PTR(class_name));
+		pset_insert(block_ent->reg_pressure, rp_ent, hash_ptr(class_name));
 	}
 	STAT_LEAVE;
 }  /* stat_be_block_regpressure */
@@ -2060,14 +2022,13 @@ void stat_dump_snapshot(const char *name, const char *phase)
 {
 	char fname[2048];
 	const char *p;
-	int l;
+	size_t l;
 
 	if (! status->stat_options)
 		return;
 
 	STAT_ENTER;
 	{
-		graph_entry_t *entry;
 		graph_entry_t *global = graph_get_entry(NULL, status->irg_hash);
 
 		/*
@@ -2104,15 +2065,15 @@ void stat_dump_snapshot(const char *name, const char *phase)
 			fname[0] = '\0';
 			p = name;
 		}  /* if */
-		strncat(fname, "firmstat-", sizeof(fname));
-		strncat(fname, phase, sizeof(fname));
-		strncat(fname, "-", sizeof(fname));
-		strncat(fname, p, sizeof(fname));
+		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)) {
+		foreach_pset(status->irg_hash, graph_entry_t*, entry) {
 			if (entry->irg == NULL) {
 				/* special entry for the global count */
 				continue;
@@ -2125,13 +2086,13 @@ void stat_dump_snapshot(const char *name, const char *phase)
 
 		/* some calculations are dependent, we pushed them on the wait_q */
 		while (! pdeq_empty(status->wait_q)) {
-			entry = pdeq_getr(status->wait_q);
+			graph_entry_t *const entry = (graph_entry_t*)pdeq_getr(status->wait_q);
 
 			update_graph_stat_2(global, entry);
 		}  /* while */
 
 		/* dump per graph */
-		for (entry = pset_first(status->irg_hash); entry; entry = pset_next(status->irg_hash)) {
+		foreach_pset(status->irg_hash, graph_entry_t*, entry) {
 			if (entry->irg == NULL) {
 				/* special entry for the global count */
 				continue;
@@ -2159,27 +2120,79 @@ void stat_dump_snapshot(const char *name, const char *phase)
 		stat_dump_param_tbl(status->dist_param_cnt, global);
 
 		/* dump the optimization counter and clear them */
-		stat_dump_opt_cnt(status->num_opts, ARR_SIZE(status->num_opts));
+		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 counter 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, 1);
-		}
+		/* clear the global counters here */
+		foreach_pset(global->opcode_hash, node_entry_t*, entry) {
+			opcode_clear_entry(entry);
+		}  /* for */
+		/* clear all global counter */
+		graph_clear_entry(global, /*all=*/1);
 	}
 	STAT_LEAVE;
 }  /* stat_dump_snapshot */
 
+typedef struct pass_t {
+	ir_prog_pass_t pass;
+	const char     *fname;
+	const char     *phase;
+} pass_t;
+
+/**
+ * Wrapper to run stat_dump_snapshot() as a ir_prog wrapper.
+ */
+static int stat_dump_snapshot_wrapper(ir_prog *irp, void *context)
+{
+	pass_t *pass = (pass_t*)context;
+
+	(void)irp;
+	stat_dump_snapshot(pass->fname, pass->phase);
+	return 0;
+}  /* stat_dump_snapshot_wrapper */
+
+/**
+ * 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)
+{
+	pass_t *pass = XMALLOCZ(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];
 
@@ -2204,6 +2217,7 @@ void firm_init_stat(unsigned enable_options)
 	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);
@@ -2252,20 +2266,12 @@ void firm_init_stat(unsigned enable_options)
 		_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;
@@ -2273,8 +2279,6 @@ void firm_init_stat(unsigned enable_options)
 		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 */
@@ -2317,7 +2321,8 @@ void firm_init_stat(unsigned enable_options)
 /**
  * Frees all dumper structures.
  */
-static void stat_term_dumper(void) {
+static void stat_term_dumper(void)
+{
 	dumper_t *dumper, *next_dumper;
 
 	for (dumper = status->dumper; dumper; /* iteration done in loop body */ ) {
@@ -2332,7 +2337,8 @@ static void stat_term_dumper(void) {
 
 
 /* Terminates the statistics module, frees all memory. */
-void stat_term(void) {
+void stat_term(void)
+{
 	if (status != (stat_info_t *)&status_disable) {
 		obstack_free(&status->be_data, NULL);
 		obstack_free(&status->cnts, NULL);
@@ -2345,19 +2351,7 @@ void stat_term(void) {
 }  /* stat_term */
 
 /* returns 1 if statistics were initialized, 0 otherwise */
-int stat_is_active(void) {
+int stat_is_active(void)
+{
 	return status != (stat_info_t *)&status_disable;
 }  /* stat_is_active */
-
-#else
-
-/* initialize the statistics module. */
-void firm_init_stat(unsigned enable_options) {}
-
-/* Dumps a statistics snapshot */
-void stat_dump_snapshot(const char *name, const char *phase) {}
-
-/* terminates the statistics module, frees all memory */
-void stat_term(void);
-
-#endif /* FIRM_STATISTICS */