X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fstat%2Ffirmstat.c;h=8ae906b9a8f84be932073bc53695f642ff178a8d;hb=04321ea9f9ac1185bd7092813c34683aa15cd05f;hp=b4de73bf6d0750fb0576dd5f8078010a49568465;hpb=863d31d7a5c8210432fef88b30fc3e8353131538;p=libfirm

diff --git a/ir/stat/firmstat.c b/ir/stat/firmstat.c
index b4de73bf6..8ae906b9a 100644
--- a/ir/stat/firmstat.c
+++ b/ir/stat/firmstat.c
@@ -1,33 +1,41 @@
 /*
- * 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"
@@ -59,6 +67,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,13 +93,14 @@ 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.
  */
-static int opcode_cmp(const void *elt, const void *key) {
+static int opcode_cmp(const void *elt, const void *key)
+{
 	const node_entry_t *e1 = elt;
 	const node_entry_t *e2 = key;
 
@@ -98,7 +110,8 @@ 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) {
+static int graph_cmp(const void *elt, const void *key)
+{
 	const graph_entry_t *e1 = elt;
 	const graph_entry_t *e2 = key;
 
@@ -108,7 +121,8 @@ 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) {
+static int opt_cmp(const void *elt, const void *key)
+{
 	const opt_entry_t *e1 = elt;
 	const opt_entry_t *e2 = key;
 
@@ -118,17 +132,20 @@ static int opt_cmp(const void *elt, const void *key) {
 /**
  * Compare two elements of the block/extbb hash.
  */
-static int block_cmp(const void *elt, const void *key) {
+static int block_cmp(const void *elt, const void *key)
+{
 	const block_entry_t *e1 = elt;
 	const block_entry_t *e2 = key;
 
+	/* 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.
  */
-static int be_block_cmp(const void *elt, const void *key) {
+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;
 
@@ -138,7 +155,8 @@ 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) {
+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;
 
@@ -148,7 +166,8 @@ 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) {
+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;
 
@@ -158,7 +177,8 @@ 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) {
+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;
 
@@ -168,7 +188,8 @@ 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) {
+static int opcode_cmp_2(const void *elt, const void *key)
+{
 	const ir_op *e1 = elt;
 	const ir_op *e2 = key;
 
@@ -178,9 +199,11 @@ 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) {
+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;
+	(void) size;
 
 	/* compare only the nodes, the rest is used as data container */
 	return e1->node != e2->node;
@@ -189,19 +212,23 @@ 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;
 
@@ -211,8 +238,7 @@ static node_entry_t *opcode_get_entry(const ir_op *op, hmap_node_entry_t *hmap)
 	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);
@@ -228,7 +254,8 @@ 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;
@@ -241,10 +268,11 @@ 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-acumulated counter */
+	/* clear accumulated / non-accumulated counter */
 	for (i = all ? 0 : _gcnt_non_acc; i < _gcnt_last; ++i) {
 		cnt_clr(&elem->cnt[i]);
 	}  /* for */
@@ -266,14 +294,14 @@ 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)
 {
 	graph_entry_t key;
 	graph_entry_t *elem;
-	int i;
+	size_t i;
 
 	key.irg = irg;
 
@@ -288,8 +316,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 */
@@ -313,7 +340,8 @@ static graph_entry_t *graph_get_entry(ir_graph *irg, hmap_graph_entry_t *hmap)
 /**
  * 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 */
 
@@ -334,8 +362,7 @@ static opt_entry_t *opt_get_entry(const ir_op *op, hmap_opt_entry_t *hmap)
 	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);
@@ -348,7 +375,8 @@ static opt_entry_t *opt_get_entry(const ir_op *op, hmap_opt_entry_t *hmap)
 /**
  * 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)
@@ -372,8 +400,7 @@ static block_entry_t *block_get_entry(struct obstack *obst, long block_nr, hmap_
 	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);
@@ -419,8 +446,7 @@ static be_block_entry_t *be_block_get_entry(struct obstack *obst, long 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);
@@ -433,7 +459,8 @@ static be_block_entry_t *be_block_get_entry(struct obstack *obst, long block_nr,
 /**
  * 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);
 
@@ -458,8 +485,7 @@ static perm_class_entry_t *perm_class_get_entry(struct obstack *obst, const char
 	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);
@@ -472,7 +498,8 @@ static perm_class_entry_t *perm_class_get_entry(struct obstack *obst, const char
 /**
  * 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);
 
@@ -500,8 +527,7 @@ static perm_stat_entry_t *perm_stat_get_entry(struct obstack *obst, ir_node *per
 	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);
@@ -511,6 +537,16 @@ static perm_stat_entry_t *perm_stat_get_entry(struct obstack *obst, ir_node *per
 	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]);
+}
+
 /**
  * Returns the ir_op for an IR-node,
  * handles special cases and return pseudo op codes.
@@ -539,34 +575,40 @@ static ir_op *stat_get_irn_op(ir_node *node)
 		}  /* if */
 		break;
 	case iro_Mul:
-		if (get_irn_op(get_Mul_left(node)) == op_Const || get_irn_op(get_Mul_right(node)) == op_Const) {
+		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 (get_irn_op(get_Div_right(node)) == op_Const) {
+		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 (get_irn_op(get_Mod_right(node)) == op_Const) {
+		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 (get_irn_op(get_DivMod_right(node)) == op_Const) {
+		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 (get_irn_op(get_Sel_ptr(node)) == op_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 (get_irn_op(get_Sel_ptr(get_Sel_ptr(node))) == op_Sel) {
+			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 */
@@ -593,6 +635,11 @@ static void undate_block_info(ir_node *node, graph_entry_t *graph)
 	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) {
@@ -618,7 +665,7 @@ static void undate_block_info(ir_node *node, graph_entry_t *graph)
 	cnt_inc(&b_entry->cnt[bcnt_nodes]);
 
 	/* don't count keep-alive edges */
-	if (get_irn_op(node) == op_End)
+	if (is_End(node))
 		return;
 
 	arity = get_irn_arity(node);
@@ -683,7 +730,7 @@ static void update_extbb_info(ir_node *node, graph_entry_t *graph)
 	cnt_inc(&eb_entry->cnt[bcnt_nodes]);
 
 	/* don't count keep-alive edges */
-	if (get_irn_op(node) == op_End)
+	if (is_End(node))
 		return;
 
 	arity = get_irn_arity(node);
@@ -707,7 +754,8 @@ static void update_extbb_info(ir_node *node, graph_entry_t *graph)
  * 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);
 
@@ -765,7 +813,7 @@ static void stat_update_call(ir_node *call, graph_entry_t *graph)
 	/* found a call, this function is not a leaf */
 	graph->is_leaf = 0;
 
-	if (get_irn_op(ptr) == op_SymConst) {
+	if (is_SymConst(ptr)) {
 		if (get_SymConst_kind(ptr) == symconst_addr_ent) {
 			/* ok, we seems to know the entity */
 			ent = get_SymConst_entity(ptr);
@@ -774,6 +822,8 @@ static void stat_update_call(ir_node *call, graph_entry_t *graph)
 			/* 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 */
@@ -784,7 +834,7 @@ static void stat_update_call(ir_node *call, graph_entry_t *graph)
 	}  /* if */
 
 	/* check, if it's a chain-call: Then, the call-block
-	* must dominate the end block. */
+	 * must dominate the end block. */
 	{
 		ir_node *curr = get_irg_end_block(graph->irg);
 		int depth = get_Block_dom_depth(block);
@@ -831,7 +881,7 @@ static void stat_update_call_2(ir_node *call, graph_entry_t *graph)
 	if (is_Bad(block))
 		return;
 
-	if (get_irn_op(ptr) == op_SymConst) {
+	if (is_SymConst(ptr)) {
 		if (get_SymConst_kind(ptr) == symconst_addr_ent) {
 			/* ok, we seems to know the entity */
 			ent = get_SymConst_entity(ptr);
@@ -858,7 +908,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)) {
@@ -871,7 +922,8 @@ 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) {
+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;
@@ -929,7 +981,7 @@ static void update_node_stat(ir_node *node, void *env)
 	node_entry_t *entry;
 
 	ir_op *op = stat_get_irn_op(node);
-	int arity = get_irn_arity(node);
+	int i, arity = get_irn_arity(node);
 
 	entry = opcode_get_entry(op, graph->opcode_hash);
 
@@ -948,12 +1000,6 @@ static void update_node_stat(ir_node *node, void *env)
 	/* handle statistics for special node types */
 
 	switch (op->code) {
-	case iro_Const:
-		if (status->stat_options & FIRMSTAT_COUNT_CONSTS) {
-			/* check properties of constants */
-			stat_update_const(status, node, graph);
-		}  /* if */
-		break;
 	case iro_Call:
 		/* check for properties that depends on calls like recursion/leaf/indirect call */
 		stat_update_call(node, graph);
@@ -966,15 +1012,40 @@ static void update_node_stat(ir_node *node, void *env)
 		/* 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) {
+static void update_node_stat_2(ir_node *node, void *env)
+{
 	graph_entry_t *graph = env;
 
 	/* check for properties that depends on calls like recursion/leaf/indirect call */
@@ -985,7 +1056,8 @@ 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) {
+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));
 
 	return value ? value->mark : 0;
@@ -994,7 +1066,8 @@ 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) {
+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;
@@ -1032,7 +1105,8 @@ 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);
@@ -1058,13 +1132,14 @@ 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) {
+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_numP(mode))
+	if (! mode_is_data(mode))
 		return;
 
 	if (mode_is_reference(mode)) {
@@ -1089,7 +1164,7 @@ static void mark_address_calc(ir_node *node, void *env) {
 		ir_node *pred = get_irn_n(node, i);
 
 		mode = get_irn_op_mode(pred);
-		if (! mode_is_numP(mode))
+		if (! mode_is_data(mode))
 			continue;
 
 		set_adr_mark(graph, pred, get_adr_mark(graph, pred) | mark_preds);
@@ -1103,7 +1178,8 @@ 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) {
+static void count_adr_ops(ir_node *node, void *env)
+{
 	graph_entry_t *graph = env;
 	unsigned mark        = get_adr_mark(graph, node);
 
@@ -1137,6 +1213,7 @@ static void update_graph_stat(graph_entry_t *global, graph_entry_t *graph)
 	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);
@@ -1231,6 +1308,7 @@ static void update_graph_stat(graph_entry_t *global, graph_entry_t *graph)
  */
 static void update_graph_stat_2(graph_entry_t *global, graph_entry_t *graph)
 {
+	(void) global;
 	if (graph->is_deleted) {
 		/* deleted, ignore */
 		return;
@@ -1248,16 +1326,15 @@ 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) {
-	dumper_t *p = xmalloc(sizeof(*p));
+static void stat_register_dumper(const dumper_t *dumper)
+{
+	dumper_t *p = XMALLOC(dumper_t);
 
-	if (p) {
-		memcpy(p, dumper, sizeof(*p));
+	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 */
 }  /* stat_register_dumper */
@@ -1265,7 +1342,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) {
@@ -1277,7 +1355,8 @@ 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) {
@@ -1293,7 +1372,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) {
@@ -1305,19 +1385,34 @@ 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) {
-		if (dumper->dump_const_tbl)
+		if (dumper->dump_param_tbl)
 			dumper->dump_param_tbl(dumper, tbl, global);
 	}  /* for */
-}
+}  /* stat_dump_param_tbl */
+
+/**
+ * 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) {
+static void stat_dump_init(const char *name)
+{
 	dumper_t *dumper;
 
 	for (dumper = status->dumper; dumper; dumper = dumper->next) {
@@ -1329,7 +1424,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) {
@@ -1341,7 +1437,8 @@ 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 func)
+{
 	dumper_t *dumper;
 
 	for (dumper = status->dumper; dumper; dumper = dumper->next) {
@@ -1356,7 +1453,8 @@ 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) {
+ir_op *stat_get_op_from_opcode(ir_opcode code)
+{
 	return opcode_find_entry(code, status->ir_op_hash);
 }  /* stat_get_op_from_opcode */
 
@@ -1366,7 +1464,9 @@ 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;
 
@@ -1388,7 +1488,10 @@ 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)
 		return;
 
@@ -1405,7 +1508,10 @@ 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)
 		return;
 
@@ -1438,7 +1544,9 @@ 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;
 
@@ -1461,6 +1569,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
  *
@@ -1468,7 +1607,9 @@ 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;
 
@@ -1483,6 +1624,7 @@ static void stat_new_graph(void *ctx, ir_graph *irg, ir_entity *ent) {
 		graph->is_leaf_call  = 0;
 		graph->is_recursive  = 0;
 		graph->is_chain_call = 0;
+		graph->is_strict     = 1;
 		graph->is_analyzed   = 0;
 	}
 	STAT_LEAVE;
@@ -1498,7 +1640,9 @@ 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;
 
@@ -1527,6 +1671,9 @@ 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)
 {
+	(void) ctx;
+	(void) pre;
+	(void) post;
 	if (! status->stat_options)
 		return;
 
@@ -1564,6 +1711,10 @@ 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)
 {
+	(void) ctx;
+	(void) node;
+	(void) pre;
+	(void) post;
 	if (! status->stat_options)
 		return;
 
@@ -1581,12 +1732,19 @@ static void stat_irg_block_walk(void *ctx, ir_graph *irg, ir_node *node, generic
  *
  * @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) {
-	ir_op *op          = stat_get_irn_op(n);
-	opt_entry_t *entry = opt_get_entry(op, hmap);
+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);
+
+	/* 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 */
 
@@ -1601,6 +1759,7 @@ static void stat_merge_nodes(
     ir_node **old_node_array, int old_num_entries,
     hook_opt_kind opt)
 {
+	(void) ctx;
 	if (! status->stat_options)
 		return;
 
@@ -1609,6 +1768,7 @@ static void stat_merge_nodes(
 		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;
 
@@ -1630,7 +1790,7 @@ static void stat_merge_nodes(
 						xopt = HOOK_OPT_CONFIRM_C;
 				}  /* if */
 
-				removed_due_opt(old_node_array[i], graph->opt_hash[xopt]);
+				removed_due_opt(old_node_array[i], graph->opt_hash[xopt], xopt);
 			}  /* if */
 		}  /* for */
 	}
@@ -1643,7 +1803,9 @@ 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;
 
@@ -1660,7 +1822,9 @@ 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;
 
@@ -1668,7 +1832,7 @@ static void stat_lower(void *ctx, ir_node *node) {
 	{
 		graph_entry_t *graph = graph_get_entry(current_ir_graph, status->irg_hash);
 
-		removed_due_opt(node, graph->opt_hash[HOOK_LOWERED]);
+		removed_due_opt(node, graph->opt_hash[HOOK_LOWERED], HOOK_LOWERED);
 	}
 	STAT_LEAVE;
 }  /* stat_lower */
@@ -1683,6 +1847,7 @@ static void stat_lower(void *ctx, ir_node *node) {
  */
 static void stat_inline(void *ctx, ir_node *call, ir_graph *called_irg)
 {
+	(void) ctx;
 	if (! status->stat_options)
 		return;
 
@@ -1703,7 +1868,9 @@ 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;
 
@@ -1721,7 +1888,9 @@ 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;
 
@@ -1730,7 +1899,7 @@ static void stat_strength_red(void *ctx, ir_graph *irg, ir_node *strong) {
 		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]);
+		removed_due_opt(strong, graph->opt_hash[HOOK_OPT_STRENGTH_RED], HOOK_OPT_STRENGTH_RED);
 	}
 	STAT_LEAVE;
 }  /* stat_strength_red */
@@ -1740,7 +1909,10 @@ 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)
 		return;
 
@@ -1753,6 +1925,10 @@ static void stat_dead_node_elim(void *ctx, ir_graph *irg, int start) {
 static void stat_if_conversion(void *context, ir_graph *irg, ir_node *phi,
                                int pos, ir_node *mux, if_result_t reason)
 {
+	(void) context;
+	(void) phi;
+	(void) pos;
+	(void) mux;
 	if (! status->stat_options)
 		return;
 
@@ -1770,6 +1946,8 @@ static void stat_if_conversion(void *context, ir_graph *irg, ir_node *phi,
  */
 static void stat_func_call(void *context, ir_graph *irg, ir_node *call)
 {
+	(void) context;
+	(void) call;
 	if (! status->stat_options)
 		return;
 
@@ -1787,14 +1965,16 @@ 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;
 
 	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]);
+		removed_due_opt(mul, graph->opt_hash[HOOK_OPT_ARCH_DEP], HOOK_OPT_ARCH_DEP);
 	}
 	STAT_LEAVE;
 }  /* stat_arch_dep_replace_mul_with_shifts */
@@ -1805,14 +1985,16 @@ 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;
 
 	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]);
+		removed_due_opt(node, graph->opt_hash[HOOK_OPT_ARCH_DEP], HOOK_OPT_ARCH_DEP);
 	}
 	STAT_LEAVE;
 }  /* stat_arch_dep_replace_division_by_const */
@@ -1837,8 +2019,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;
@@ -1987,7 +2168,7 @@ void stat_dump_snapshot(const char *name, const char *phase)
 			++p;
 			l = p - name;
 
-			if (l > sizeof(fname) - 1)
+			if (l > (int) (sizeof(fname) - 1))
 				l = sizeof(fname) - 1;
 
 			memcpy(fname, name, l);
@@ -1996,10 +2177,10 @@ 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);
 
@@ -2050,11 +2231,15 @@ void stat_dump_snapshot(const char *name, const char *phase)
 		/* 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, ARR_SIZE(status->num_opts));
+		clear_optimization_counter();
+
 		stat_dump_finish();
 
 		stat_finish_pattern_history(fname);
 
-		/* clear the global counter here */
+		/* clear the global counters here */
 		{
 			node_entry_t *entry;
 
@@ -2062,12 +2247,68 @@ void stat_dump_snapshot(const char *name, const char *phase)
 				opcode_clear_entry(entry);
 			}  /* for */
 			/* clear all global counter */
-			graph_clear_entry(global, 1);
+			graph_clear_entry(global, /*all=*/1);
 		}
 	}
 	STAT_LEAVE;
 }  /* stat_dump_snapshot */
 
+struct pass_t {
+	ir_prog_pass_t pass;
+	const char     *fname;
+	const char     *phase;
+};
+
+/**
+ * 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;
+
+	(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)
+{
+	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];
 
@@ -2082,8 +2323,7 @@ void firm_init_stat(unsigned enable_options)
 	if (! (enable_options & FIRMSTAT_ENABLED))
 		return;
 
-	status = xmalloc(sizeof(*status));
-	memset(status, 0, sizeof(*status));
+	status = XMALLOCZ(stat_info_t);
 
 	/* enable statistics */
 	status->stat_options = enable_options & FIRMSTAT_ENABLED ? enable_options : 0;
@@ -2093,6 +2333,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);
@@ -2144,6 +2385,9 @@ void firm_init_stat(unsigned enable_options)
 		_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;
@@ -2151,6 +2395,7 @@ void firm_init_stat(unsigned enable_options)
 		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;
@@ -2159,6 +2404,7 @@ void firm_init_stat(unsigned enable_options)
 		status->op_DivC    = NULL;
 		status->op_ModC    = NULL;
 		status->op_DivModC = NULL;
+		status->op_QuotC   = NULL;
 	}  /* if */
 
 	/* for Florian: count the Sel depth */
@@ -2192,6 +2438,8 @@ void firm_init_stat(unsigned enable_options)
 	/* distribution table for parameter counts */
 	status->dist_param_cnt = stat_new_int_distrib_tbl();
 
+	clear_optimization_counter();
+
 #undef HOOK
 #undef X
 }  /* firm_init_stat */
@@ -2199,7 +2447,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 */ ) {
@@ -2214,7 +2463,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);
@@ -2227,7 +2477,8 @@ 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 */