X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firphase.c;h=98c01db7797640d1f8dab94983b72a0c69235c1b;hb=4f92e524762e0febc361676111b3b5b79addd03a;hp=7edb541bc6db904c907ca34d84b0f527a4995ba4;hpb=7c36344d22a7c306a4e216f135c974bdb9f6b943;p=libfirm

diff --git a/ir/ir/irphase.c b/ir/ir/irphase.c
index 7edb541bc..98c01db77 100644
--- a/ir/ir/irphase.c
+++ b/ir/ir/irphase.c
@@ -34,11 +34,10 @@
 #include "irgraph_t.h"
 #include "irphase_t.h"
 
-void *phase_irn_init_default(ir_phase *ph, const ir_node *irn, void *old)
+void *phase_irn_init_default(ir_phase *ph, const ir_node *irn)
 {
 	(void) ph;
 	(void) irn;
-	(void) old;
 	return NULL;
 }
 
@@ -55,7 +54,7 @@ void phase_init(ir_phase *phase, ir_graph *irg, phase_irn_init *data_init)
 
 ir_phase *new_phase(ir_graph *irg, phase_irn_init *data_init)
 {
-	ir_phase *phase = xmalloc(sizeof(*phase));
+	ir_phase *phase = XMALLOC(ir_phase);
 	phase_init(phase, irg, data_init);
 	return phase;
 }
@@ -75,7 +74,7 @@ void phase_free(ir_phase *phase)
 
 phase_stat_t *phase_stat(const ir_phase *phase, phase_stat_t *stat)
 {
-	int i, n;
+	size_t i, n;
 	memset(stat, 0, sizeof(stat[0]));
 
 	stat->node_map_bytes = phase->n_data_ptr * sizeof(phase->data_ptr[0]);
@@ -89,31 +88,19 @@ phase_stat_t *phase_stat(const ir_phase *phase, phase_stat_t *stat)
 	return stat;
 }
 
-void phase_reinit_irn_data(ir_phase *phase)
+void phase_reinit_irn_data(ir_phase *phase, phase_irn_reinit *data_reinit)
 {
-	int i, n;
-
-	if (! phase->data_init)
-		return;
-
-	for (i = 0, n = phase->n_data_ptr; i < n; ++i) {
-		if (phase->data_ptr[i])
-			phase->data_init(phase, get_idx_irn(phase->irg, i), phase->data_ptr[i]);
-	}
-}
-
-void phase_reinit_block_irn_data(ir_phase *phase, ir_node *block)
-{
-	int i, n;
+	size_t i, n;
+	ir_graph *irg;
 
 	if (! phase->data_init)
 		return;
 
+	irg = phase->irg;
 	for (i = 0, n = phase->n_data_ptr; i < n; ++i) {
 		if (phase->data_ptr[i]) {
-			ir_node *irn = get_idx_irn(phase->irg, i);
-			if (! is_Block(irn) && get_nodes_block(irn) == block)
-				phase->data_init(phase, irn, phase->data_ptr[i]);
+			ir_node *node = get_idx_irn(irg, i);
+			phase->data_ptr[i] = data_reinit(phase, node, phase->data_ptr[i]);
 		}
 	}
 }