/*
- * 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.
*
/**
* 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 */
*/
static void collect_data(ir_node *node, void *env)
{
- collect_t *data = env;
+ collect_t *data = (collect_t*)env;
ir_node *pred;
ir_op *op;
/*
* 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;
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);
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");
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));
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;
}
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;
}
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]);
}
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);
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);
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));
/* 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) {
}
}
/* 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);
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;
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;
/* 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;
}
/**
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 {
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 {
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 {
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 {
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 {
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 {
*/
void opt_tail_recursion(void)
{
- int i;
- int n_opt_applications = 0;
- ir_graph *irg;
+ 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))
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()));
}
projects / libfirm / blobdiff