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

diff --git a/ir/ir/irphase.c b/ir/ir/irphase.c
index ac6f0f509..6d4e7fa8b 100644
--- a/ir/ir/irphase.c
+++ b/ir/ir/irphase.c
@@ -10,7 +10,7 @@
  * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
  */
 
-#ifdef _HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
@@ -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)
+ir_phase *phase_init(ir_phase *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(growth_factor >= 256 && "growth factor must greater or equal to 256/256");
+	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;
@@ -39,13 +35,14 @@ phase_t *phase_new(const char *name, ir_graph *irg, size_t data_size, unsigned g
 	return ph;
 }
 
-void phase_free(phase_t *phase)
+void phase_free(ir_phase *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)
+phase_stat_t *phase_stat(const ir_phase *phase, phase_stat_t *stat)
 {
 	int i, n;
 	memset(stat, 0, sizeof(stat[0]));
@@ -55,9 +52,57 @@ 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(&((ir_phase *)phase)->obst);
 	return stat;
 }
+
+void phase_reinit_irn_data(ir_phase *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, 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;
+
+	if (! phase->data_init)
+		return;
+
+	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 *phase_get_first_node(ir_phase *phase) {
+	int i;
+
+	for (i = 0; i < phase->n_data_ptr;  ++i)
+		if (phase->data_ptr[i])
+			return get_idx_irn(phase->irg, i);
+
+	return NULL;
+}
+
+ir_node *phase_get_next_node(ir_phase *phase, ir_node *start) {
+	int i;
+
+	for (i = get_irn_idx(start) + 1; i < phase->n_data_ptr; ++i)
+		if (phase->data_ptr[i])
+			return get_idx_irn(phase->irg, i);
+
+	return NULL;
+}