X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbelive.c;h=eaadfb42e1b069c229ac0b56ac7d8992693926ba;hb=10e58f9669ea6c77e82bd3bc12c4ac5bbaa6bb15;hp=1f0a21534d08c051ecd17f4de5c45a5ea3dc1064;hpb=1a26f4853c07d1ecd68a097409dd602edfe29eff;p=libfirm

diff --git a/ir/be/belive.c b/ir/be/belive.c
index 1f0a21534..eaadfb42e 100644
--- a/ir/be/belive.c
+++ b/ir/be/belive.c
@@ -29,7 +29,6 @@
 /* statev is expensive here, only enable when needed */
 #define DISABLE_STATEV
 
-#include "impl.h"
 #include "iredges_t.h"
 #include "irgwalk.h"
 #include "irprintf_t.h"
@@ -77,16 +76,6 @@ static inline int is_liveness_node(const ir_node *irn)
 	}
 }
 
-int (be_lv_next_irn)(const struct _be_lv_t *lv, const ir_node *bl, unsigned flags, int i)
-{
-	return _be_lv_next_irn(lv, bl, flags, i);
-}
-
-const ir_node * (be_lv_get_irn)(const struct _be_lv_t *lv, const ir_node *bl, int i)
-{
-	return _be_lv_get_irn(lv, bl, i);
-}
-
 int (be_is_live_in)(const be_lv_t *lv, const ir_node *block, const ir_node *irn)
 {
 	return _be_is_live_xxx(lv, block, irn, be_lv_state_in);
@@ -104,9 +93,9 @@ int (be_is_live_end)(const be_lv_t *lv, const ir_node *block, const ir_node *irn
 
 
 #ifdef LV_USE_BINARY_SEARCH
-static inline unsigned _be_liveness_bsearch(struct _be_lv_info_t *arr, unsigned idx)
+static inline unsigned _be_liveness_bsearch(be_lv_info_t *arr, unsigned idx)
 {
-	struct _be_lv_info_t *payload = arr + 1;
+	be_lv_info_t *payload = arr + 1;
 
 	unsigned n   = arr[0].u.head.n_members;
 	unsigned res = 0;
@@ -152,7 +141,7 @@ static inline unsigned _be_liveness_bsearch(struct _be_lv_info_t *arr, unsigned
 /**
  * This function searches linearly for the node in the array.
  */
-static inline unsigned _be_liveness_bsearch(struct _be_lv_info_t *arr, unsigned idx)
+static inline unsigned _be_liveness_bsearch(be_lv_info_t *arr, unsigned idx)
 {
 	unsigned n  = arr[0].u.head.n_members;
 	unsigned i;
@@ -166,13 +155,13 @@ static inline unsigned _be_liveness_bsearch(struct _be_lv_info_t *arr, unsigned
 }
 #endif
 
-struct _be_lv_info_node_t *be_lv_get(const struct _be_lv_t *li, const ir_node *bl, const ir_node *irn)
+be_lv_info_node_t *be_lv_get(const be_lv_t *li, const ir_node *bl, const ir_node *irn)
 {
-	struct _be_lv_info_t *irn_live;
-	struct _be_lv_info_node_t *res = NULL;
+	be_lv_info_t *irn_live;
+	be_lv_info_node_t *res = NULL;
 
 	stat_ev_tim_push();
-	irn_live = phase_get_irn_data(&li->ph, bl);
+	irn_live = (be_lv_info_t*)phase_get_irn_data(&li->ph, bl);
 	if (irn_live) {
 		unsigned idx = get_irn_idx(irn);
 
@@ -180,7 +169,7 @@ struct _be_lv_info_node_t *be_lv_get(const struct _be_lv_t *li, const ir_node *b
 		int pos = _be_liveness_bsearch(irn_live, idx);
 
 		/* Get the record in question. 1 must be added, since the first record contains information about the array and must be skipped. */
-		struct _be_lv_info_node_t *rec = &irn_live[pos + 1].u.node;
+		be_lv_info_node_t *rec = &irn_live[pos + 1].u.node;
 
 		/* Check, if the irn is in deed in the array. */
 		if (rec->idx == idx)
@@ -191,9 +180,9 @@ struct _be_lv_info_node_t *be_lv_get(const struct _be_lv_t *li, const ir_node *b
 	return res;
 }
 
-static struct _be_lv_info_node_t *be_lv_get_or_set(struct _be_lv_t *li, ir_node *bl, ir_node *irn)
+static be_lv_info_node_t *be_lv_get_or_set(be_lv_t *li, ir_node *bl, ir_node *irn)
 {
-	struct _be_lv_info_t *irn_live = phase_get_or_set_irn_data(&li->ph, bl);
+	be_lv_info_t *irn_live = (be_lv_info_t*)phase_get_or_set_irn_data(&li->ph, bl);
 
 	unsigned idx = get_irn_idx(irn);
 
@@ -201,11 +190,11 @@ static struct _be_lv_info_node_t *be_lv_get_or_set(struct _be_lv_t *li, ir_node
 	unsigned pos = _be_liveness_bsearch(irn_live, idx);
 
 	/* Get the record in question. 1 must be added, since the first record contains information about the array and must be skipped. */
-	struct _be_lv_info_node_t *res = &irn_live[pos + 1].u.node;
+	be_lv_info_node_t *res = &irn_live[pos + 1].u.node;
 
 	/* Check, if the irn is in deed in the array. */
 	if (res->idx != idx) {
-		struct _be_lv_info_t *payload;
+		be_lv_info_t *payload;
 		unsigned n_members = irn_live[0].u.head.n_members;
 		unsigned n_size    = irn_live[0].u.head.n_size;
 		unsigned i;
@@ -216,7 +205,7 @@ static struct _be_lv_info_node_t *be_lv_get_or_set(struct _be_lv_t *li, ir_node
 			unsigned old_size_bytes  = (n_size + 1) * sizeof(irn_live[0]);
 			unsigned new_size        = (2 * n_size) + 1;
 			size_t   new_size_bytes  = new_size * sizeof(irn_live[0]);
-			struct _be_lv_info_t *nw = phase_alloc(&li->ph, new_size_bytes);
+			be_lv_info_t *nw = (be_lv_info_t*)phase_alloc(&li->ph, new_size_bytes);
 			memcpy(nw, irn_live, old_size_bytes);
 			memset(((char*) nw) + old_size_bytes, 0,
 			       new_size_bytes - old_size_bytes);
@@ -242,7 +231,7 @@ static struct _be_lv_info_node_t *be_lv_get_or_set(struct _be_lv_t *li, ir_node
 		unsigned i;
 		unsigned n = irn_live[0].u.head.n_members;
 		unsigned last = 0;
-		struct _be_lv_info_t *payload = &irn_live[1];
+		be_lv_info_t *payload = &irn_live[1];
 
 		for (i = 0; i < n; ++i) {
 			assert(payload[i].u.node.idx >= last);
@@ -258,17 +247,17 @@ static struct _be_lv_info_node_t *be_lv_get_or_set(struct _be_lv_t *li, ir_node
  * Removes a node from the list of live variables of a block.
  * @return 1 if the node was live at that block, 0 if not.
  */
-static int be_lv_remove(struct _be_lv_t *li, const ir_node *bl,
+static int be_lv_remove(be_lv_t *li, const ir_node *bl,
                         const ir_node *irn)
 {
-	struct _be_lv_info_t *irn_live = phase_get_irn_data(&li->ph, bl);
+	be_lv_info_t *irn_live = (be_lv_info_t*)phase_get_irn_data(&li->ph, bl);
 
 	if (irn_live) {
 		unsigned n   = irn_live[0].u.head.n_members;
 		unsigned idx = get_irn_idx(irn);
 		unsigned pos = _be_liveness_bsearch(irn_live, idx);
-		struct _be_lv_info_t *payload  = irn_live + 1;
-		struct _be_lv_info_node_t *res = &payload[pos].u.node;
+		be_lv_info_t *payload  = irn_live + 1;
+		be_lv_info_node_t *res = &payload[pos].u.node;
 
 		/* The node is in deed in the block's array. Let's remove it. */
 		if (res->idx == idx) {
@@ -294,7 +283,7 @@ static void register_node(be_lv_t *lv, const ir_node *irn)
 	unsigned idx = get_irn_idx(irn);
 	if (idx >= bitset_size(lv->nodes)) {
 		bitset_t *nw = bitset_malloc(2 * idx);
-		bitset_copy(nw, lv->nodes);
+		bitset_copy_into(nw, lv->nodes);
 		bitset_free(lv->nodes);
 		lv->nodes = nw;
 	}
@@ -307,7 +296,7 @@ static void register_node(be_lv_t *lv, const ir_node *irn)
  */
 static inline void mark_live_in(be_lv_t *lv, ir_node *block, ir_node *irn)
 {
-	struct _be_lv_info_node_t *n = be_lv_get_or_set(lv, block, irn);
+	be_lv_info_node_t *n = be_lv_get_or_set(lv, block, irn);
 	DBG((dbg, LEVEL_2, "marking %+F live in at %+F\n", irn, block));
 	n->flags |= be_lv_state_in;
 	register_node(lv, irn);
@@ -318,7 +307,7 @@ static inline void mark_live_in(be_lv_t *lv, ir_node *block, ir_node *irn)
  */
 static inline void mark_live_out(be_lv_t *lv, ir_node *block, ir_node *irn)
 {
-	struct _be_lv_info_node_t *n = be_lv_get_or_set(lv, block, irn);
+	be_lv_info_node_t *n = be_lv_get_or_set(lv, block, irn);
 	DBG((dbg, LEVEL_2, "marking %+F live out at %+F\n", irn, block));
 	n->flags |= be_lv_state_out | be_lv_state_end;
 	register_node(lv, irn);
@@ -329,7 +318,7 @@ static inline void mark_live_out(be_lv_t *lv, ir_node *block, ir_node *irn)
  */
 static inline void mark_live_end(be_lv_t *lv, ir_node *block, ir_node *irn)
 {
-	struct _be_lv_info_node_t *n = be_lv_get_or_set(lv, block, irn);
+	be_lv_info_node_t *n = be_lv_get_or_set(lv, block, irn);
 	DBG((dbg, LEVEL_2, "marking %+F live end at %+F\n", irn, block));
 	n->flags |= be_lv_state_end;
 	register_node(lv, irn);
@@ -337,7 +326,7 @@ static inline void mark_live_end(be_lv_t *lv, ir_node *block, ir_node *irn)
 
 static struct {
 	be_lv_t  *lv;         /**< The liveness object. */
-	ir_node  *def;	      /**< The node (value). */
+	ir_node  *def;        /**< The node (value). */
 	ir_node  *def_block;  /**< The block of def. */
 	bitset_t *visited;    /**< A set were all visited blocks are recorded. */
 } re;
@@ -379,7 +368,7 @@ static void live_end_at_block(ir_node *block, int is_true_out)
 	}
 }
 
-typedef struct _lv_walker_t {
+typedef struct lv_walker_t {
 	be_lv_t *lv;
 	void *data;
 } lv_walker_t;
@@ -453,7 +442,7 @@ static void liveness_for_node(ir_node *irn)
 
 static void lv_remove_irn_walker(ir_node *bl, void *data)
 {
-	lv_remove_walker_t *w = data;
+	lv_remove_walker_t *w = (lv_remove_walker_t*)data;
 	be_lv_remove(w->lv, bl, w->irn);
 }
 
@@ -476,8 +465,8 @@ static const char *lv_flags_to_str(unsigned flags)
 static void lv_dump_block(void *context, FILE *f, const ir_node *bl)
 {
 	if (is_Block(bl)) {
-		be_lv_t *lv = context;
-		struct _be_lv_info_t *info = phase_get_irn_data(&lv->ph, bl);
+		be_lv_t *lv = (be_lv_t*)context;
+		be_lv_info_t *info = (be_lv_info_t*)phase_get_irn_data(&lv->ph, bl);
 
 		fprintf(f, "liveness:\n");
 		if (info) {
@@ -485,18 +474,17 @@ static void lv_dump_block(void *context, FILE *f, const ir_node *bl)
 			unsigned i;
 
 			for (i = 0; i < n; ++i) {
-				struct _be_lv_info_node_t *n = &info[i+1].u.node;
+				be_lv_info_node_t *n = &info[i+1].u.node;
 				ir_fprintf(f, "%s %+F\n", lv_flags_to_str(n->flags), get_idx_irn(lv->irg, n->idx));
 			}
 		}
 	}
 }
 
-static void *lv_phase_data_init(ir_phase *phase, const ir_node *irn, void *old)
+static void *lv_phase_data_init(ir_phase *phase, const ir_node *irn)
 {
-	struct _be_lv_info_t *info = phase_alloc(phase, LV_STD_SIZE * sizeof(info[0]));
+	be_lv_info_t *info = (be_lv_info_t*)phase_alloc(phase, LV_STD_SIZE * sizeof(info[0]));
 	(void) irn;
-	(void) old;
 
 	memset(info, 0, LV_STD_SIZE * sizeof(info[0]));
 	info[0].u.head.n_size = LV_STD_SIZE - 1;
@@ -509,7 +497,7 @@ static void *lv_phase_data_init(ir_phase *phase, const ir_node *irn, void *old)
  */
 static void collect_liveness_nodes(ir_node *irn, void *data)
 {
-	ir_node **nodes = data;
+	ir_node **nodes = (ir_node**)data;
 	if (is_liveness_node(irn))
 		nodes[get_irn_idx(irn)] = irn;
 }
@@ -551,7 +539,7 @@ void be_liveness_assure_sets(be_lv_t *lv)
 		be_timer_push(T_LIVE);
 
 		lv->nodes = bitset_malloc(2 * get_irg_last_idx(lv->irg));
-		phase_init(&lv->ph, "liveness", lv->irg, PHASE_DEFAULT_GROWTH, lv_phase_data_init, NULL);
+		phase_init(&lv->ph, lv->irg, lv_phase_data_init);
 		compute_liveness(lv);
 		/* be_live_chk_compare(lv, lv->lvc); */
 
@@ -574,7 +562,7 @@ void be_liveness_invalidate(be_lv_t *lv)
 {
 	if (lv && lv->nodes) {
 		unregister_hook(hook_node_info, &lv->hook_info);
-		phase_free(&lv->ph);
+		phase_deinit(&lv->ph);
 		bitset_free(lv->nodes);
 		lv->nodes = NULL;
 	}
@@ -608,8 +596,8 @@ void be_liveness_recompute(be_lv_t *lv)
 	} else
 		bitset_clear_all(lv->nodes);
 
-	phase_free(&lv->ph);
-	phase_init(&lv->ph, "liveness", lv->irg, PHASE_DEFAULT_GROWTH, lv_phase_data_init, NULL);
+	phase_deinit(&lv->ph);
+	phase_init(&lv->ph, lv->irg, lv_phase_data_init);
 	compute_liveness(lv);
 
 	be_timer_pop(T_LIVE);
@@ -664,12 +652,12 @@ void be_liveness_update(be_lv_t *lv, ir_node *irn)
 
 static void lv_check_walker(ir_node *bl, void *data)
 {
-	lv_walker_t *w = data;
+	lv_walker_t *w = (lv_walker_t*)data;
 	be_lv_t *lv    = w->lv;
-	be_lv_t *fresh = w->data;
+	be_lv_t *fresh = (be_lv_t*)w->data;
 
-	struct _be_lv_info_t *curr = phase_get_irn_data(&lv->ph, bl);
-	struct _be_lv_info_t *fr   = phase_get_irn_data(&fresh->ph, bl);
+	be_lv_info_t *curr = (be_lv_info_t*)phase_get_irn_data(&lv->ph, bl);
+	be_lv_info_t *fr   = (be_lv_info_t*)phase_get_irn_data(&fresh->ph, bl);
 
 	if (!fr && curr && curr[0].u.head.n_members > 0) {
 		unsigned i;
@@ -691,13 +679,13 @@ static void lv_check_walker(ir_node *bl, void *data)
 
 			ir_fprintf(stderr, "current:\n");
 			for (i = 0; i < n_curr; ++i) {
-				struct _be_lv_info_node_t *n = &curr[1 + i].u.node;
+				be_lv_info_node_t *n = &curr[1 + i].u.node;
 				ir_fprintf(stderr, "%+F %u %+F %s\n", bl, i, get_idx_irn(lv->irg, n->idx), lv_flags_to_str(n->flags));
 			}
 
 			ir_fprintf(stderr, "correct:\n");
 			for (i = 0; i < n_fresh; ++i) {
-				struct _be_lv_info_node_t *n = &fr[1 + i].u.node;
+				be_lv_info_node_t *n = &fr[1 + i].u.node;
 				ir_fprintf(stderr, "%+F %u %+F %s\n", bl, i, get_idx_irn(lv->irg, n->idx), lv_flags_to_str(n->flags));
 			}
 		}
@@ -718,9 +706,9 @@ void be_liveness_check(be_lv_t *lv)
 
 static void lv_dump_block_walker(ir_node *irn, void *data)
 {
-	lv_walker_t *w = data;
+	lv_walker_t *w = (lv_walker_t*)data;
 	if (is_Block(irn))
-		lv_dump_block(w->lv, w->data, irn);
+		lv_dump_block(w->lv, (FILE*)w->data, irn);
 }
 
 
@@ -747,12 +735,11 @@ void be_liveness_dumpto(const be_lv_t *lv, const char *cls_name)
 }
 
 /**
- * Walker: checks the every predecessors of a node dominate
- * the note.
+ * Walker: checks that every predecessors of a node dominates the node.
  */
 static void dom_check(ir_node *irn, void *data)
 {
-	int *problem_found = data;
+	int *problem_found = (int*)data;
 
 	if (!is_Block(irn) && irn != get_irg_end(get_irn_irg(irn))) {
 		int i, n;
@@ -861,7 +848,7 @@ void be_liveness_nodes_live_at(const be_lv_t *lv,
 
 static void collect_node(ir_node *irn, void *data)
 {
-	struct obstack *obst = data;
+	struct obstack *obst = (struct obstack*)data;
 	obstack_ptr_grow(obst, irn);
 }
 
@@ -878,11 +865,11 @@ void be_live_chk_compare(be_lv_t *lv, lv_chk_t *lvc)
 
 	irg_block_walk_graph(irg, collect_node, NULL, &obst);
 	obstack_ptr_grow(&obst, NULL);
-	blocks = obstack_finish(&obst);
+	blocks = (ir_node**)obstack_finish(&obst);
 
 	irg_walk_graph(irg, collect_node, NULL, &obst);
 	obstack_ptr_grow(&obst, NULL);
-	nodes = obstack_finish(&obst);
+	nodes = (ir_node**)obstack_finish(&obst);
 
 	stat_ev_ctx_push("be_lv_chk_compare");
 	for (j = 0; nodes[j]; ++j) {
@@ -915,9 +902,8 @@ void be_live_chk_compare(be_lv_t *lv, lv_chk_t *lvc)
 	obstack_free(&obst, NULL);
 }
 
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_live)
 void be_init_live(void)
 {
 	FIRM_DBG_REGISTER(dbg, "firm.be.liveness");
 }
-
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_live);