X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firphase_t.h;h=0eca0039c655a3915856fffe67e708cd218aa944;hb=e1c33a238578342a072e1c95ff12eefe6d0acd37;hp=6841a86c9959ab2d9de4a1d1a4ff1b0376252abb;hpb=7575655c00063c4bb9d9bc54efb7ec965a408c2c;p=libfirm

diff --git a/ir/ir/irphase_t.h b/ir/ir/irphase_t.h
index 6841a86c9..0eca0039c 100644
--- a/ir/ir/irphase_t.h
+++ b/ir/ir/irphase_t.h
@@ -15,7 +15,9 @@
 
 #include "obstack.h"
 #include "irgraph_t.h"
+#include "irtools.h"
 #include "irphase.h"
+#include "irtools.h"
 
 typedef struct {
 	unsigned node_slots;
@@ -30,7 +32,7 @@ typedef struct {
  */
 phase_stat_t *phase_stat(const phase_t *phase, phase_stat_t *stat);
 
-typedef void (phase_irn_data_init_t)(const phase_t *phase, const ir_node *irn, void *data);
+typedef void *(phase_irn_data_init_t)(phase_t *phase, ir_node *irn, void *old);
 
 /**
  * The default grow factor.
@@ -42,29 +44,27 @@ typedef void (phase_irn_data_init_t)(const phase_t *phase, const ir_node *irn, v
  * A phase object.
  */
 struct _phase_t {
-	struct obstack obst;        /**< The obstack where the irn phase data will be stored on. */
-	const char *name;           /**< The name of the phase. */
-	ir_graph   *irg;            /**< The irg this phase will we applied to. */
-	unsigned    growth_factor;  /**< factor to leave room for add. nodes. 256 means 1.0. */
-	void       *priv;           /**< Some pointer private to the user of the phase. */
-	size_t      data_size;      /**< The amount of bytes which shall be allocated for each irn. */
-	size_t      n_data_ptr;     /**< The length of the data_ptr array. */
-	void      **data_ptr;       /**< Map node indexes to irn data on the obstack. */
-	phase_irn_data_init_t *data_init; /**< A callback that is called to initialize newly created node data. */
+	struct obstack         obst;           /**< The obstack where the irn phase data will be stored on. */
+	const char            *name;           /**< The name of the phase. */
+	ir_graph              *irg;            /**< The irg this phase will we applied to. */
+	unsigned               growth_factor;  /**< factor to leave room for add. nodes. 256 means 1.0. */
+	void                  *priv;           /**< Some pointer private to the user of the phase. */
+	size_t                 n_data_ptr;     /**< The length of the data_ptr array. */
+	void                 **data_ptr;       /**< Map node indexes to irn data on the obstack. */
+	phase_irn_data_init_t *data_init;      /**< A callback that is called to initialize newly created node data. */
 };
 
 /**
- * Make a new phase.
+ * Initialize a phase object.
  * @param name          The name of the phase.
  * @param irg           The graph the phase will run on.
- * @param data_size     The amount of extra storage in bytes that should be allocated for each node.
  * @param growth_factor A factor denoting how many node slots will be additionally allocated,
  *                      if the node => data is full. 256 means 1.0.
  * @param irn_data_init A callback that is called to initialize newly created node data.
  * @param priv          Some private pointer which is kept in the phase and can be retrieved with phase_get_private().
  * @return              A new phase object.
  */
-phase_t *phase_new(const char *name, ir_graph *irg, size_t data_size, unsigned growth_factor, phase_irn_data_init_t *irn_data_init, void *priv);
+phase_t *phase_init(phase_t *ph, const char *name, ir_graph *irg, unsigned growth_factor, phase_irn_data_init_t *data_init);
 
 /**
  * Free the phase and all node data associated with it.
@@ -72,6 +72,13 @@ phase_t *phase_new(const char *name, ir_graph *irg, size_t data_size, unsigned g
  */
 void phase_free(phase_t *phase);
 
+/**
+ * Re-initialize the irn data for all nodes in the node => data map using the given callback.
+ * @param phase The phase.
+ * @note This function will pass NULL to the init function passed to phase_new().
+ */
+void phase_reinit_irn_data(phase_t *phase);
+
 /**
  * Get the name of the phase.
  */
@@ -90,7 +97,12 @@ void phase_free(phase_t *phase);
 /**
  * Allocate memory in the phase's memory pool.
  */
-#define phase_alloc(ph, size)              obstack_alloc(&(ph)->obst, (size))
+#define phase_alloc(ph, size)              obstack_alloc(phase_obst(ph), (size))
+
+/**
+ * Get the obstack of the phase.
+ */
+#define phase_obst(ph)                     (&(ph)->obst)
 
 /**
  * Get the phase data for an irn.
@@ -121,7 +133,7 @@ static INLINE void _private_phase_enlarge(phase_t *phase, unsigned max_idx)
 	max_idx = MAX(max_idx, last_irg_idx);
 	new_cap = (size_t) (max_idx * phase->growth_factor / 256);
 
-	phase->data_ptr = (void **) realloc(phase->data_ptr, new_cap * sizeof(phase->data_ptr[0]));
+	phase->data_ptr = (void **)xrealloc(phase->data_ptr, new_cap * sizeof(phase->data_ptr[0]));
 
 	/* initialize the newly allocated memory. */
 	memset(phase->data_ptr + old_cap, 0, (new_cap - old_cap) * sizeof(phase->data_ptr[0]));
@@ -139,7 +151,7 @@ static INLINE void *_phase_get_irn_data(phase_t *ph, const ir_node *irn)
 	return idx < ph->n_data_ptr ? ph->data_ptr[idx] : NULL;
 }
 
-static INLINE void *_phase_get_or_set_irn_data(phase_t *ph, const ir_node *irn)
+static INLINE void *_phase_get_or_set_irn_data(phase_t *ph, ir_node *irn)
 {
 	unsigned idx = get_irn_idx(irn);
 	void *res;
@@ -152,11 +164,10 @@ static INLINE void *_phase_get_or_set_irn_data(phase_t *ph, const ir_node *irn)
 	/* If there has no irn data allocated yet, do that now. */
 	if(!res) {
 		phase_irn_data_init_t *data_init = ph->data_init;
-		res = ph->data_ptr[idx] = phase_alloc(ph, ph->data_size);
 
-		/* Call the irn data callback, if there is one. */
-		if(data_init)
-			data_init(ph, irn, res);
+		/* call the node data structure allocator/constructor. */
+		res = ph->data_ptr[idx] = data_init(ph, irn, NULL);
+
 	}
 	return res;
 }