X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fstat%2Ffirmstat.c;h=c437e28b6b3b1d1c37d06f901838f5adb7863122;hb=78b94dd9a1d6aee17e0dfb4218a49ef17531d680;hp=220b641b30052f4c59d76746aa80c67199df4101;hpb=32ea6ea0320f551448bb66e534e3351977464d42;p=libfirm

diff --git a/ir/stat/firmstat.c b/ir/stat/firmstat.c
index 220b641b3..c437e28b6 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,12 +21,9 @@
  * @file
  * @brief   Statistics for Firm.
  * @author  Michael Beck
- * @version $Id$
  */
 #include "config.h"
 
-#ifdef FIRM_STATISTICS
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -41,6 +38,8 @@
 #include "stat_dmp.h"
 #include "xmalloc.h"
 #include "irhooks.h"
+#include "util.h"
+#include "ircons.h"
 
 /*
  * need this to be static:
@@ -64,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;
 
@@ -82,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
@@ -101,8 +94,8 @@ static stat_info_t *status = (stat_info_t *)&status_disable;
  */
 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 = (const node_entry_t*)elt;
+	const node_entry_t *e2 = (const node_entry_t*)key;
 
 	return e1->op->code - e2->op->code;
 }  /* opcode_cmp */
@@ -112,8 +105,8 @@ static int opcode_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;
+	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 +116,19 @@ static int graph_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;
+	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;
+	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;
@@ -146,8 +139,8 @@ static int 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;
+	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 */
@@ -157,8 +150,8 @@ static int be_block_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;
+	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 */
@@ -168,8 +161,8 @@ static int reg_pressure_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;
+	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 */
@@ -179,8 +172,8 @@ static int perm_stat_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;
+	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 */
@@ -190,8 +183,8 @@ static int perm_class_cmp(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;
+	const ir_op *e1 = (const ir_op*)elt;
+	const ir_op *e2 = (const ir_op*)key;
 
 	return e1->code != e2->code;
 }  /* opcode_cmp_2 */
@@ -201,8 +194,8 @@ static int opcode_cmp_2(const void *elt, const void *key)
  */
 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 = (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 */
@@ -234,7 +227,7 @@ static node_entry_t *opcode_get_entry(const ir_op *op, hmap_node_entry_t *hmap)
 
 	key.op = op;
 
-	elem = pset_find(hmap, &key, op->code);
+	elem = (node_entry_t*)pset_find(hmap, &key, op->code);
 	if (elem)
 		return elem;
 
@@ -245,7 +238,7 @@ static node_entry_t *opcode_get_entry(const ir_op *op, hmap_node_entry_t *hmap)
 
 	elem->op = op;
 
-	return pset_insert(hmap, elem, op->code);
+	return (node_entry_t*)pset_insert(hmap, elem, op->code);
 }  /* opcode_get_entry */
 
 /**
@@ -259,7 +252,7 @@ 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 */
 
 /**
@@ -282,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 */
@@ -305,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 */
@@ -329,12 +317,11 @@ 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 */
 
 /**
@@ -358,7 +345,7 @@ 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;
 
@@ -369,7 +356,7 @@ static opt_entry_t *opt_get_entry(const ir_op *op, hmap_opt_entry_t *hmap)
 
 	elem->op = op;
 
-	return pset_insert(hmap, elem, op->code);
+	return (opt_entry_t*)pset_insert(hmap, elem, op->code);
 }  /* opt_get_entry */
 
 /**
@@ -396,7 +383,7 @@ 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;
 
@@ -407,7 +394,7 @@ static block_entry_t *block_get_entry(struct obstack *obst, long block_nr, hmap_
 
 	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 */
 
 /**
@@ -442,7 +429,7 @@ 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;
 
@@ -453,7 +440,7 @@ static be_block_entry_t *be_block_get_entry(struct obstack *obst, long block_nr,
 
 	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 */
 
 /**
@@ -481,7 +468,7 @@ 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;
 
@@ -492,7 +479,7 @@ static perm_class_entry_t *perm_class_get_entry(struct obstack *obst, const char
 
 	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 */
 
 /**
@@ -523,7 +510,7 @@ 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;
 
@@ -534,7 +521,7 @@ static perm_stat_entry_t *perm_stat_get_entry(struct obstack *obst, ir_node *per
 
 	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 */
 
 /**
@@ -556,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:
@@ -592,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 */
@@ -615,7 +590,7 @@ static ir_op *stat_get_irn_op(ir_node *node)
 		}  /* if */
 		break;
 	default:
-		;
+		break;
 	}  /* switch */
 
 	return op;
@@ -647,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;
@@ -677,79 +652,16 @@ 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.
@@ -842,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 */
 
@@ -924,7 +836,7 @@ static ir_node *find_base_adr(ir_node *sel)
  */
 static void stat_update_address(ir_node *node, graph_entry_t *graph)
 {
-	ir_opcode opc = get_irn_opcode(node);
+	unsigned opc = get_irn_opcode(node);
 	ir_node *base;
 	ir_graph *irg;
 
@@ -936,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 {
@@ -961,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 */
 
@@ -977,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);
@@ -991,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) {
@@ -1023,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 */
@@ -1046,7 +949,7 @@ static void update_node_stat(ir_node *node, void *env)
  */
 static void update_node_stat_2(ir_node *node, void *env)
 {
-	graph_entry_t *graph = 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))
@@ -1058,7 +961,7 @@ static void update_node_stat_2(ir_node *node, void *env)
  */
 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 = (address_mark_entry_t*)set_find(graph->address_mark, &node, sizeof(*value), hash_ptr(node));
 
 	return value ? value->mark : 0;
 }  /* get_adr_mark */
@@ -1068,7 +971,7 @@ static unsigned get_adr_mark(graph_entry_t *graph, ir_node *node)
  */
 static void set_adr_mark(graph_entry_t *graph, ir_node *node, unsigned val)
 {
-	address_mark_entry_t *value = set_insert(graph->address_mark, &node, sizeof(*value), HASH_PTR(node));
+	address_mark_entry_t *value = (address_mark_entry_t*)set_insert(graph->address_mark, &node, sizeof(*value), hash_ptr(node));
 
 	value->mark = val;
 }  /* set_adr_mark */
@@ -1112,8 +1015,6 @@ static ir_mode *get_irn_op_mode(ir_node *node)
 		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:
@@ -1134,7 +1035,7 @@ static ir_mode *get_irn_op_mode(ir_node *node)
  */
 static void mark_address_calc(ir_node *node, void *env)
 {
-	graph_entry_t *graph = 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;
@@ -1180,7 +1081,7 @@ 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;
+	graph_entry_t *graph = (graph_entry_t*)env;
 	unsigned mark        = get_adr_mark(graph, node);
 
 	if (mark & MARK_ADDRESS_CALC)
@@ -1204,7 +1105,7 @@ static void update_graph_stat(graph_entry_t *global, graph_entry_t *graph)
 	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 */
 
@@ -1221,14 +1122,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 */
@@ -1248,7 +1141,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 */
@@ -1329,8 +1222,7 @@ static void update_graph_stat_2(graph_entry_t *global, graph_entry_t *graph)
 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;
@@ -1363,7 +1255,7 @@ static void stat_dump_registered(graph_entry_t *entry)
 		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 */
@@ -1444,7 +1336,7 @@ void stat_register_dumper_func(dump_graph_FUNC func)
 	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 */
 
@@ -1453,7 +1345,7 @@ 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(unsigned code)
 {
 	return opcode_find_entry(code, status->ir_op_hash);
 }  /* stat_get_op_from_opcode */
@@ -1790,7 +1682,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 */
 	}
@@ -2024,7 +1916,7 @@ void stat_be_block_regpressure(ir_graph *irg, ir_node *block, int pressure, cons
 		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 */
@@ -2133,7 +2025,7 @@ 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;
@@ -2185,7 +2077,8 @@ void stat_dump_snapshot(const char *name, const char *phase)
 		stat_dump_init(fname);
 
 		/* calculate the graph statistics */
-		for (entry = pset_first(status->irg_hash); entry; entry = pset_next(status->irg_hash)) {
+		for (entry = (graph_entry_t*)pset_first(status->irg_hash);
+		      entry != NULL; entry = (graph_entry_t*)pset_next(status->irg_hash)) {
 			if (entry->irg == NULL) {
 				/* special entry for the global count */
 				continue;
@@ -2198,13 +2091,14 @@ 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);
+			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)) {
+		for (entry = (graph_entry_t*)pset_first(status->irg_hash);
+		     entry != NULL; entry = (graph_entry_t*)pset_next(status->irg_hash)) {
 			if (entry->irg == NULL) {
 				/* special entry for the global count */
 				continue;
@@ -2232,7 +2126,7 @@ 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();
@@ -2243,7 +2137,8 @@ void stat_dump_snapshot(const char *name, const char *phase)
 		{
 			node_entry_t *entry;
 
-			for (entry = pset_first(global->opcode_hash); entry; entry = pset_next(global->opcode_hash)) {
+			for (entry = (node_entry_t*)pset_first(global->opcode_hash);
+			     entry != NULL; entry = (node_entry_t*)pset_next(global->opcode_hash)) {
 				opcode_clear_entry(entry);
 			}  /* for */
 			/* clear all global counter */
@@ -2253,18 +2148,18 @@ void stat_dump_snapshot(const char *name, const char *phase)
 	STAT_LEAVE;
 }  /* stat_dump_snapshot */
 
-struct pass_t {
+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)
 {
-	struct pass_t *pass = context;
+	pass_t *pass = (pass_t*)context;
 
 	(void)irp;
 	stat_dump_snapshot(pass->fname, pass->phase);
@@ -2293,8 +2188,9 @@ static void no_dump(ir_prog *prog, void *ctx, unsigned 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);
+	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);
@@ -2381,20 +2277,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;
@@ -2402,8 +2290,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 */
@@ -2480,16 +2366,3 @@ 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 */