X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firphase.c;h=44e1841ff935a2891fa61ea2382ecdaf06c2448d;hb=e1c33a238578342a072e1c95ff12eefe6d0acd37;hp=ac6f0f509307211f5ca5c9eb21225e79b556d890;hpb=7575655c00063c4bb9d9bc54efb7ec965a408c2c;p=libfirm

diff --git a/ir/ir/irphase.c b/ir/ir/irphase.c
index ac6f0f509..44e1841ff 100644
--- a/ir/ir/irphase.c
+++ b/ir/ir/irphase.c
@@ -18,20 +18,16 @@
 #include "irnode_t.h"
 #include "irphase_t.h"
 
-phase_t *phase_new(const char *name, ir_graph *irg, size_t data_size, unsigned growth_factor, phase_irn_data_init_t *data_init)
+phase_t *phase_init(phase_t *ph, const char *name, ir_graph *irg, unsigned growth_factor, phase_irn_data_init_t *data_init)
 {
-	phase_t *ph;
-
 	assert(growth_factor >= 1.0 && "growth factor must greater or equal to 1.0");
-
-	ph = xmalloc(sizeof(ph[0]));
+	assert(data_init && "You must provide a data constructor");
 
 	obstack_init(&ph->obst);
 
 	ph->name          = name;
 	ph->growth_factor = growth_factor;
 	ph->data_init     = data_init;
-	ph->data_size     = data_size;
 	ph->irg           = irg;
 	ph->n_data_ptr    = 0;
 	ph->data_ptr      = NULL;
@@ -42,7 +38,8 @@ phase_t *phase_new(const char *name, ir_graph *irg, size_t data_size, unsigned g
 void phase_free(phase_t *phase)
 {
 	obstack_free(&phase->obst, NULL);
-	xfree(phase->data_ptr);
+	if(phase->data_ptr)
+		xfree(phase->data_ptr);
 }
 
 phase_stat_t *phase_stat(const phase_t *phase, phase_stat_t *stat)
@@ -55,9 +52,21 @@ phase_stat_t *phase_stat(const phase_t *phase, phase_stat_t *stat)
 	for(i = 0, n = phase->n_data_ptr; i < n; ++i) {
 		if(phase->data_ptr[i] != NULL) {
 			stat->node_slots_used++;
-			stat->node_data_bytes += phase->data_size;
 		}
 	}
-	stat->overall_bytes = stat->node_map_bytes + obstack_memory_used(&phase->obst);
+	stat->overall_bytes = stat->node_map_bytes + obstack_memory_used(&((phase_t *)phase)->obst);
 	return stat;
 }
+
+void phase_reinit_irn_data(phase_t *phase)
+{
+	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, NULL, phase->data_ptr[i]);
+	}
+}