- use get_r/set_r instead of get_/set_* functions, so we
can operate without current_ir_graph set
- set current_ir_graph, but only for debugging now
- fixed wrong usage of indexes for local SSA variables
- placed resorce checking at the right plaace
- removed #if 0'ed debug code and replace it by DB()
- fixed doxygen comments
{
collect_t *data = (collect_t*)env;
ir_node *pred;
{
collect_t *data = (collect_t*)env;
ir_node *pred;
switch (get_irn_opcode(node)) {
case iro_Proj:
pred = get_Proj_pred(node);
switch (get_irn_opcode(node)) {
case iro_Proj:
pred = get_Proj_pred(node);
- op = get_irn_op(pred);
- if (op == op_Proj) {
+ opcode = get_irn_opcode(pred);
+ if (opcode == iro_Proj) {
ir_node *start = get_Proj_pred(pred);
if (is_Start(start)) {
ir_node *start = get_Proj_pred(pred);
if (is_Start(start)) {
data->proj_data = node;
}
}
data->proj_data = node;
}
}
- } else if (op == op_Start) {
+ } else if (opcode == iro_Start) {
if (get_Proj_proj(node) == pn_Start_X_initial_exec) {
/* found ProjX(Start) */
data->proj_X = node;
if (get_Proj_proj(node) == pn_Start_X_initial_exec) {
/* found ProjX(Start) */
data->proj_X = node;
/**
* do the graph reconstruction for tail-recursion elimination
*
/**
* do the graph reconstruction for tail-recursion elimination
*
- * @param irg the graph that will reconstructed
- * @param rets linked list of all rets
- * @param n_tail_calls number of tail-recursion calls
+ * @param irg the graph that will reconstructed
+ * @param env tail recursion environment
*/
static void do_opt_tail_rec(ir_graph *irg, tr_env *env)
{
*/
static void do_opt_tail_rec(ir_graph *irg, tr_env *env)
{
/* allocate in's for phi and block construction */
NEW_ARR_A(ir_node *, in, env->n_tail_calls + 1);
/* allocate in's for phi and block construction */
NEW_ARR_A(ir_node *, in, env->n_tail_calls + 1);
+ /* build a new header block for the loop we create */
+ i = 0;
+ in[i++] = data.proj_X;
/* turn Return's into Jmp's */
/* turn Return's into Jmp's */
- for (i = 1, p = env->rets; p; p = n) {
+ for (p = env->rets; p; p = n) {
ir_node *block = get_nodes_block(p);
n = (ir_node*)get_irn_link(p);
ir_node *block = get_nodes_block(p);
n = (ir_node*)get_irn_link(p);
* the block to the keep-alive list */
add_End_keepalive(get_irg_end(irg), block);
}
* the block to the keep-alive list */
add_End_keepalive(get_irg_end(irg), block);
}
+ assert(i == env->n_tail_calls + 1);
- /* create a new block at start */
- block = new_r_Block(irg, env->n_tail_calls + 1, in);
+ /* now create it */
+ block = new_r_Block(irg, i, in);
jmp = new_r_Jmp(block);
/* the old first block is now the second one */
jmp = new_r_Jmp(block);
/* the old first block is now the second one */
/* check if we need new values */
n_locs = 0;
for (i = 0; i < env->n_ress; ++i) {
/* check if we need new values */
n_locs = 0;
for (i = 0; i < env->n_ress; ++i) {
- if (env->variants[i] != TR_DIRECT)
+ if (env->variants[i] != TR_DIRECT) {
ir_node **in;
ir_mode **modes;
ir_node **in;
ir_mode **modes;
- NEW_ARR_A(ir_node *, in, n_locs);
- NEW_ARR_A(ir_mode *, modes, n_locs);
- ssa_cons_start(irg, n_locs);
+ NEW_ARR_A(ir_node *, in, env->n_ress);
+ NEW_ARR_A(ir_mode *, modes, env->n_ress);
+ ssa_cons_start(irg, env->n_ress);
start_block = get_irg_start_block(irg);
start_block = get_irg_start_block(irg);
- set_cur_block(start_block);
+ set_r_cur_block(irg, start_block);
+ /* set the neutral elements for the iteration start */
for (i = 0; i < env->n_ress; ++i) {
ir_type *tp = get_method_res_type(method_tp, i);
ir_mode *mode = get_type_mode(tp);
modes[i] = mode;
if (env->variants[i] == TR_ADD) {
for (i = 0; i < env->n_ress; ++i) {
ir_type *tp = get_method_res_type(method_tp, i);
ir_mode *mode = get_type_mode(tp);
modes[i] = mode;
if (env->variants[i] == TR_ADD) {
- set_value(i, new_r_Const(irg, get_mode_null(mode)));
+ set_r_value(irg, i, new_r_Const(irg, get_mode_null(mode)));
} else if (env->variants[i] == TR_MUL) {
} else if (env->variants[i] == TR_MUL) {
- set_value(i, new_r_Const(irg, get_mode_one(mode)));
+ set_r_value(irg, i, new_r_Const(irg, get_mode_one(mode)));
}
}
mature_immBlock(start_block);
}
}
mature_immBlock(start_block);
ir_node *block = get_nodes_block(p);
ir_node *call, *mem, *jmp, *tuple;
ir_node *block = get_nodes_block(p);
ir_node *call, *mem, *jmp, *tuple;
+ set_r_cur_block(irg, block);
n = (ir_node*)get_irn_link(p);
call = skip_Proj(get_Return_mem(p));
n = (ir_node*)get_irn_link(p);
call = skip_Proj(get_Return_mem(p));
for (i = 0; i < env->n_ress; ++i) {
if (env->variants[i] != TR_DIRECT) {
for (i = 0; i < env->n_ress; ++i) {
if (env->variants[i] != TR_DIRECT) {
- in[i] = get_value(i, modes[i]);
+ in[i] = get_r_value(irg, i, modes[i]);
for (i = 0; i < env->n_ress; ++i) {
ir_node *res = get_Return_res(p, i);
if (env->variants[i] != TR_DIRECT) {
for (i = 0; i < env->n_ress; ++i) {
ir_node *res = get_Return_res(p, i);
if (env->variants[i] != TR_DIRECT) {
+ set_r_value(irg, i, res);
continue;
block = get_nodes_block(ret);
continue;
block = get_nodes_block(ret);
+ set_r_cur_block(irg, block);
for (j = 0; j < env->n_ress; ++j) {
ir_node *pred = get_Return_res(ret, j);
ir_node *n;
for (j = 0; j < env->n_ress; ++j) {
ir_node *pred = get_Return_res(ret, j);
ir_node *n;
- n = get_value(j, modes[j]);
+ n = get_r_value(irg, j, modes[j]);
n = new_r_Add(block, n, pred, modes[j]);
set_Return_res(ret, j, n);
break;
case TR_MUL:
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 = get_r_value(irg, j, modes[j]);
n = new_r_Mul(block, n, pred, modes[j]);
set_Return_res(ret, j, n);
break;
n = new_r_Mul(block, n, pred, modes[j]);
set_Return_res(ret, j, n);
break;
ir_node *rets = NULL;
ir_type *mtd_type, *call_type;
ir_entity *ent;
ir_node *rets = NULL;
ir_type *mtd_type, *call_type;
ir_entity *ent;
FIRM_DBG_REGISTER(dbg, "firm.opt.tailrec");
FIRM_DBG_REGISTER(dbg, "firm.opt.tailrec");
if (! check_lifetime_of_locals(irg))
return 0;
if (! check_lifetime_of_locals(irg))
return 0;
+ rem = current_ir_graph;
+ current_ir_graph = irg;
+
ent = get_irg_entity(irg);
mtd_type = get_entity_type(ent);
ent = get_irg_entity(irg);
mtd_type = get_entity_type(ent);
- n_ress = get_method_n_ress(mtd_type);
+ n_ress = get_method_n_ress(mtd_type);
env.variants = NULL;
env.n_ress = n_ress;
env.variants = NULL;
env.n_ress = n_ress;
*/
normalize_n_returns(irg);
*/
normalize_n_returns(irg);
+ ir_reserve_resources(irg, IR_RESOURCE_IRN_LINK);
+
end_block = get_irg_end_block(irg);
set_irn_link(end_block, NULL);
end_block = get_irg_end_block(irg);
set_irn_link(end_block, NULL);
* This can happen in C when no prototype is given
* or K&R style is used.
*/
* This can happen in C when no prototype is given
* or K&R style is used.
*/
-#if 0
- printf("Warning: Tail recursion fails because of different method and call types:\n");
- dump_type(mtd_type);
- dump_type(call_type);
-#endif
+ DB((dbg, LEVEL_3, " tail recursion fails because of call type mismatch: %+F != %+F\n", mtd_type, call_type));
env.variants[j] = var;
if (env.variants[j] != var) {
/* not compatible */
env.variants[j] = var;
if (env.variants[j] != var) {
/* not compatible */
+ DB((dbg, LEVEL_3, " tail recursion fails for %d return value of %+F\n", j, ret));
}
/* now, end_block->link contains the list of all tail calls */
}
/* now, end_block->link contains the list of all tail calls */
- if (n_tail_calls <= 0)
- return 0;
-
- DB((dbg, LEVEL_2, " Performing tail recursion for graph %s and %d Calls\n",
- get_entity_ld_name(get_irg_entity(irg)), n_tail_calls));
-
- hook_tail_rec(irg, n_tail_calls);
+ if (n_tail_calls > 0) {
+ DB((dbg, LEVEL_2, " Performing tail recursion for graph %s and %d Calls\n",
+ get_entity_ld_name(get_irg_entity(irg)), n_tail_calls));
- env.n_tail_calls = n_tail_calls;
- env.rets = rets;
- do_opt_tail_rec(irg, &env);
+ hook_tail_rec(irg, n_tail_calls);
+ env.n_tail_calls = n_tail_calls;
+ env.rets = rets;
+ do_opt_tail_rec(irg, &env);
+ }
+ ir_free_resources(irg, IR_RESOURCE_IRN_LINK);
+ current_ir_graph = rem;
FIRM_DBG_REGISTER(dbg, "firm.opt.tailrec");
FIRM_DBG_REGISTER(dbg, "firm.opt.tailrec");
+ DB((dbg, LEVEL_1, "Performing tail recursion ...\n"));
for (i = 0, n = get_irp_n_irgs(); i < n; ++i) {
ir_graph *irg = get_irp_irg(i);
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))
++n_opt_applications;
if (opt_tail_rec_irg(irg))
++n_opt_applications;
-
- ir_free_resources(irg, IR_RESOURCE_IRN_LINK);
- DB((dbg, LEVEL_1, "Performed tail recursion for %zu of %zu graphs\n",
+ DB((dbg, LEVEL_1, "Done for %zu of %zu graphs.\n",
n_opt_applications, get_irp_n_irgs()));
}
n_opt_applications, get_irp_n_irgs()));
}