X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Ftailrec.c;h=6c6012a7b66aee26a238c62f5c0ab68b80efc25d;hb=c1c777ab401f028f3bfef31836da00c3f3fc5e0c;hp=0117e0af478fd30ac8c7c98091358e818b320821;hpb=ddfcdcb1227bd6fb6720f8485dc62995f7bfd98f;p=libfirm

diff --git a/ir/opt/tailrec.c b/ir/opt/tailrec.c
index 0117e0af4..6c6012a7b 100644
--- a/ir/opt/tailrec.c
+++ b/ir/opt/tailrec.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -45,14 +45,14 @@
 #include "irouts.h"
 #include "irhooks.h"
 #include "ircons_t.h"
-#include "irtools.h"
+#include "irpass.h"
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg);
 
 /**
  * the environment for collecting data
  */
-typedef struct _collect_t {
+typedef struct collect_t {
 	ir_node *proj_X;      /**< initial exec proj */
 	ir_node *block;       /**< old first block */
 	int     blk_idx;      /**< cfgpred index of the initial exec in block */
@@ -63,8 +63,9 @@ typedef struct _collect_t {
 /**
  * walker for collecting data, fills a collect_t environment
  */
-static void collect_data(ir_node *node, void *env) {
-	collect_t *data = env;
+static void collect_data(ir_node *node, void *env)
+{
+	collect_t *data = (collect_t*)env;
 	ir_node *pred;
 	ir_op *op;
 
@@ -96,7 +97,7 @@ static void collect_data(ir_node *node, void *env) {
 		/*
 		 * the first block has the initial exec as cfg predecessor
 		 */
-		if (node != get_irg_start_block(current_ir_graph)) {
+		if (node != get_irg_start_block(get_irn_irg(node))) {
 			for (i = 0; i < n_pred; ++i) {
 				if (get_Block_cfgpred(node, i) == data->proj_X) {
 					data->block   = node;
@@ -135,7 +136,8 @@ typedef struct tr_env {
  * @param rets          linked list of all rets
  * @param n_tail_calls  number of tail-recursion calls
  */
-static void do_opt_tail_rec(ir_graph *irg, tr_env *env) {
+static void do_opt_tail_rec(ir_graph *irg, tr_env *env)
+{
 	ir_node *end_block = get_irg_end_block(irg);
 	ir_node *block, *jmp, *call, *calls;
 	ir_node **in;
@@ -147,9 +149,6 @@ static void do_opt_tail_rec(ir_graph *irg, tr_env *env) {
 	int rem            = get_optimize();
 	ir_entity *ent     = get_irg_entity(irg);
 	ir_type *method_tp = get_entity_type(ent);
-	ir_graph *old      = current_ir_graph;
-
-	current_ir_graph = irg;
 
 	assert(env->n_tail_calls > 0);
 
@@ -178,7 +177,7 @@ static void do_opt_tail_rec(ir_graph *irg, tr_env *env) {
 	irg_walk_graph(irg, NULL, collect_data, &data);
 
 	/* check number of arguments */
-	call = get_irn_link(end_block);
+	call     = (ir_node*)get_irn_link(end_block);
 	n_params = get_Call_n_params(call);
 
 	assert(data.proj_X && "Could not find initial exec from Start");
@@ -195,7 +194,7 @@ static void do_opt_tail_rec(ir_graph *irg, tr_env *env) {
 	for (i = 1, p = env->rets; p; p = n) {
 		ir_node *block = get_nodes_block(p);
 
-		n = get_irn_link(p);
+		n = (ir_node*)get_irn_link(p);
 		in[i++] = new_r_Jmp(block);
 
 		// exchange(p, new_r_Bad(irg));
@@ -217,11 +216,11 @@ static void do_opt_tail_rec(ir_graph *irg, tr_env *env) {
 
 	/* build the memory phi */
 	i = 0;
-	in[i] = new_r_Proj(get_irg_start_block(irg), get_irg_start(irg), mode_M, pn_Start_M);
+	in[i] = new_r_Proj(get_irg_start(irg), mode_M, pn_Start_M);
 	set_irg_initial_mem(irg, in[i]);
 	++i;
 
-	for (calls = call; calls; calls = get_irn_link(calls)) {
+	for (calls = call; calls != NULL; calls = (ir_node*)get_irn_link(calls)) {
 		in[i] = get_Call_mem(calls);
 		++i;
 	}
@@ -238,7 +237,8 @@ static void do_opt_tail_rec(ir_graph *irg, tr_env *env) {
 		NEW_ARR_A(ir_node **, call_params, env->n_tail_calls);
 
 		/* collect all parameters */
-		for (i = 0, calls = call; calls; calls = get_irn_link(calls)) {
+		for (i = 0, calls = call; calls != NULL;
+		     calls = (ir_node*)get_irn_link(calls)) {
 			call_params[i] = get_Call_param_arr(calls);
 			++i;
 		}
@@ -249,7 +249,7 @@ static void do_opt_tail_rec(ir_graph *irg, tr_env *env) {
 		for (i = 0; i < n_params; ++i) {
 			ir_mode *mode = get_type_mode(get_method_param_type(method_tp, i));
 
-			in[0] = new_r_Proj(args_bl, args, mode, i);
+			in[0] = new_r_Proj(args, mode, i);
 			for (j = 0; j < env->n_tail_calls; ++j)
 				in[j + 1] = call_params[j][i];
 
@@ -266,7 +266,7 @@ static void do_opt_tail_rec(ir_graph *irg, tr_env *env) {
 		long proj = get_Proj_proj(p);
 
 		assert(0 <= proj && proj < n_params);
-		n = get_irn_link(p);
+		n = (ir_node*)get_irn_link(p);
 		exchange(p, phis[proj + 1]);
 	}
 
@@ -274,7 +274,7 @@ static void do_opt_tail_rec(ir_graph *irg, tr_env *env) {
 	set_irg_doms_inconsistent(irg);
 	set_irg_outs_inconsistent(irg);
 	set_irg_extblk_inconsistent(irg);
-	set_irg_loopinfo_state(current_ir_graph, loopinfo_cf_inconsistent);
+	set_irg_loopinfo_state(irg, loopinfo_cf_inconsistent);
 	set_trouts_inconsistent();
 	set_irg_callee_info_state(irg, irg_callee_info_inconsistent);
 
@@ -305,9 +305,9 @@ static void do_opt_tail_rec(ir_graph *irg, tr_env *env) {
 
 			modes[i] = mode;
 			if (env->variants[i] == TR_ADD) {
-				set_value(i, new_Const(get_mode_null(mode)));
+				set_value(i, new_r_Const(irg, get_mode_null(mode)));
 			} else if (env->variants[i] == TR_MUL) {
-				set_value(i, new_Const(get_mode_one(mode)));
+				set_value(i, new_r_Const(irg, get_mode_one(mode)));
 			}
 		}
 		mature_immBlock(start_block);
@@ -320,7 +320,7 @@ static void do_opt_tail_rec(ir_graph *irg, tr_env *env) {
 			ir_node *call, *mem, *jmp, *tuple;
 
 			set_cur_block(block);
-			n = get_irn_link(p);
+			n = (ir_node*)get_irn_link(p);
 
 			call = skip_Proj(get_Return_mem(p));
 			assert(is_Call(call));
@@ -329,7 +329,7 @@ static void do_opt_tail_rec(ir_graph *irg, tr_env *env) {
 
 			/* create a new jump, free of CSE */
 			set_optimize(0);
-			jmp = new_Jmp();
+			jmp = new_r_Jmp(block);
 			set_optimize(rem);
 
 			for (i = 0; i < env->n_ress; ++i) {
@@ -340,14 +340,13 @@ static void do_opt_tail_rec(ir_graph *irg, tr_env *env) {
 				}
 			}
 			/* create a new tuple for the return values */
-			tuple = new_Tuple(env->n_ress, in);
+			tuple = new_r_Tuple(block, env->n_ress, in);
 
 			turn_into_tuple(call, pn_Call_max);
 			set_Tuple_pred(call, pn_Call_M,                mem);
 			set_Tuple_pred(call, pn_Call_X_regular,        jmp);
 			set_Tuple_pred(call, pn_Call_X_except,         bad);
 			set_Tuple_pred(call, pn_Call_T_result,         tuple);
-			set_Tuple_pred(call, pn_Call_M_except,         mem);
 			set_Tuple_pred(call, pn_Call_P_value_res_base, bad);
 
 			for (i = 0; i < env->n_ress; ++i) {
@@ -364,12 +363,14 @@ static void do_opt_tail_rec(ir_graph *irg, tr_env *env) {
 		end_block = get_irg_end_block(irg);
 		for (i = get_Block_n_cfgpreds(end_block) - 1; i >= 0; --i) {
 			ir_node *ret = get_Block_cfgpred(end_block, i);
+			ir_node *block;
 
 			/* search all Returns of a block */
 			if (! is_Return(ret))
 				continue;
 
-			set_cur_block(get_nodes_block(ret));
+			block = get_nodes_block(ret);
+			set_cur_block(block);
 			for (j = 0; j < env->n_ress; ++j) {
 				ir_node *pred = get_Return_res(ret, j);
 				ir_node *n;
@@ -380,13 +381,13 @@ static void do_opt_tail_rec(ir_graph *irg, tr_env *env) {
 
 				case TR_ADD:
 					n = get_value(j, modes[j]);
-					n = new_Add(n, pred, modes[j]);
+					n = new_r_Add(block, n, pred, modes[j]);
 					set_Return_res(ret, j, n);
 					break;
 
 				case TR_MUL:
 					n = get_value(j, modes[j]);
-					n = new_Mul(n, pred, modes[j]);
+					n = new_r_Mul(block, n, pred, modes[j]);
 					set_Return_res(ret, j, n);
 					break;
 
@@ -401,11 +402,10 @@ static void do_opt_tail_rec(ir_graph *irg, tr_env *env) {
 
 		/* no: we can kill all returns */
 		for (p = env->rets; p; p = n) {
-			n = get_irn_link(p);
+			n = (ir_node*)get_irn_link(p);
 			exchange(p, bad);
 		}
 	}
-	current_ir_graph = old;
 }
 
 /**
@@ -417,7 +417,8 @@ static void do_opt_tail_rec(ir_graph *irg, tr_env *env) {
  *
  * @return non-zero if it's ok to do tail recursion
  */
-static int check_lifetime_of_locals(ir_graph *irg) {
+static int check_lifetime_of_locals(ir_graph *irg)
+{
 	ir_node *irg_frame;
 	int i;
 	ir_type *frame_tp = get_irg_frame_type(irg);
@@ -442,7 +443,8 @@ static int check_lifetime_of_locals(ir_graph *irg) {
 /**
  * Examine irn and detect the recursion variant.
  */
-static tail_rec_variants find_variant(ir_node *irn, ir_node *call) {
+static tail_rec_variants find_variant(ir_node *irn, ir_node *call)
+{
 	ir_node           *a, *b;
 	tail_rec_variants va, vb, res;
 
@@ -454,7 +456,7 @@ static tail_rec_variants find_variant(ir_node *irn, ir_node *call) {
 	case iro_Add:
 		/* try additive */
 		a = get_Add_left(irn);
-		if (get_irn_MacroBlock(a) != get_irn_MacroBlock(call)) {
+		if (get_nodes_block(a) != get_nodes_block(call)) {
 			/* we are outside, ignore */
 			va = TR_UNKNOWN;
 		} else {
@@ -463,7 +465,7 @@ static tail_rec_variants find_variant(ir_node *irn, ir_node *call) {
 				return TR_BAD;
 		}
 		b = get_Add_right(irn);
-		if (get_irn_MacroBlock(b) != get_irn_MacroBlock(call)) {
+		if (get_nodes_block(b) != get_nodes_block(call)) {
 			/* we are outside, ignore */
 			vb = TR_UNKNOWN;
 		} else {
@@ -490,7 +492,7 @@ static tail_rec_variants find_variant(ir_node *irn, ir_node *call) {
 	case iro_Sub:
 		/* try additive, but return value must be left */
 		a = get_Sub_left(irn);
-		if (get_irn_MacroBlock(a) != get_irn_MacroBlock(call)) {
+		if (get_nodes_block(a) != get_nodes_block(call)) {
 			/* we are outside, ignore */
 			va = TR_UNKNOWN;
 		} else {
@@ -499,7 +501,7 @@ static tail_rec_variants find_variant(ir_node *irn, ir_node *call) {
 				return TR_BAD;
 		}
 		b = get_Sub_right(irn);
-		if (get_irn_MacroBlock(b) != get_irn_MacroBlock(call)) {
+		if (get_nodes_block(b) != get_nodes_block(call)) {
 			/* we are outside, ignore */
 			vb = TR_UNKNOWN;
 		} else {
@@ -516,7 +518,7 @@ static tail_rec_variants find_variant(ir_node *irn, ir_node *call) {
 	case iro_Mul:
 		/* try multiplicative */
 		a = get_Mul_left(irn);
-		if (get_irn_MacroBlock(a) != get_irn_MacroBlock(call)) {
+		if (get_nodes_block(a) != get_nodes_block(call)) {
 			/* we are outside, ignore */
 			va = TR_UNKNOWN;
 		} else {
@@ -525,7 +527,7 @@ static tail_rec_variants find_variant(ir_node *irn, ir_node *call) {
 				return TR_BAD;
 		}
 		b = get_Mul_right(irn);
-		if (get_irn_MacroBlock(b) != get_irn_MacroBlock(call)) {
+		if (get_nodes_block(b) != get_nodes_block(call)) {
 			/* we are outside, ignore */
 			vb = TR_UNKNOWN;
 		} else {
@@ -569,7 +571,8 @@ static tail_rec_variants find_variant(ir_node *irn, ir_node *call) {
 /*
  * convert simple tail-calls into loops
  */
-int opt_tail_rec_irg(ir_graph *irg) {
+int opt_tail_rec_irg(ir_graph *irg)
+{
 	tr_env            env;
 	ir_node           *end_block;
 	int               i, n_ress, n_tail_calls = 0;
@@ -577,12 +580,13 @@ int opt_tail_rec_irg(ir_graph *irg) {
 	ir_type           *mtd_type, *call_type;
 	ir_entity         *ent;
 
+	FIRM_DBG_REGISTER(dbg, "firm.opt.tailrec");
+
 	assure_irg_outs(irg);
 
 	if (! check_lifetime_of_locals(irg))
 		return 0;
 
-
 	ent      = get_irg_entity(irg);
 	mtd_type = get_entity_type(ent);
     n_ress   = get_method_n_ress(mtd_type);
@@ -711,17 +715,15 @@ ir_graph_pass_t *opt_tail_rec_irg_pass(const char *name)
 /*
  * optimize tail recursion away
  */
-void opt_tail_recursion(void) {
-	int i;
-	int n_opt_applications = 0;
-	ir_graph *irg;
+void opt_tail_recursion(void)
+{
+	size_t i, n;
+	size_t n_opt_applications = 0;
 
 	FIRM_DBG_REGISTER(dbg, "firm.opt.tailrec");
 
-	for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
-		irg = get_irp_irg(i);
-
-		current_ir_graph = irg;
+	for (i = 0, n = get_irp_n_irgs(); i < n; ++i) {
+		ir_graph *irg = get_irp_irg(i);
 
 		ir_reserve_resources(irg, IR_RESOURCE_IRN_LINK);
 		if (opt_tail_rec_irg(irg))
@@ -730,7 +732,7 @@ void opt_tail_recursion(void) {
 		ir_free_resources(irg, IR_RESOURCE_IRN_LINK);
 	}
 
-	DB((dbg, LEVEL_1, "Performed tail recursion for %d of %d graphs\n",
+	DB((dbg, LEVEL_1, "Performed tail recursion for %zu of %zu graphs\n",
 	    n_opt_applications, get_irp_n_irgs()));
 }