set_irg_callee_info_state(irg, irg_callee_info_inconsistent);
/* Exception control flow might have changed / new block might have added. */
- set_irg_doms_inconsistent(irg);
- set_irg_extblk_inconsistent(irg);
- set_irg_loopinfo_inconsistent(irg);
-
- /* Calls might be removed/added. */
- set_trouts_inconsistent();
+ clear_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_DOMINANCE
+ | IR_GRAPH_STATE_VALID_EXTENDED_BLOCKS);
/* verify here */
irg_verify(irg, VERIFY_NORMAL);
const char *name,
i_record *list, size_t length, int part_block_used)
{
- pass_t *pass = (pass_t*)xmalloc(sizeof(*pass) + (length-1) * sizeof(pass->list[0]));
-
+ pass_t *const pass = XMALLOCF(pass_t, list, length);
memcpy(pass->list, list, sizeof(list[0]) * length);
pass->length = length;
pass->part_block_used = part_block_used;
* @param reg_jmp new regular control flow, if NULL, a Jmp will be used
* @param exc_jmp new exception control flow, if reg_jmp == NULL, a Bad will be used
*/
-static void replace_call(ir_node *irn, ir_node *call, ir_node *mem, ir_node *reg_jmp, ir_node *exc_jmp)
+static void replace_call(ir_node *irn, ir_node *call, ir_node *mem,
+ ir_node *reg_jmp, ir_node *exc_jmp)
{
ir_node *block = get_nodes_block(call);
ir_graph *irg = get_irn_irg(block);
+ ir_node *rest = new_r_Tuple(block, 1, &irn);
- if (reg_jmp == NULL) {
-
- /* Beware: do we need here a protection against CSE? Better we do it. */
- int old_cse = get_opt_cse();
- set_opt_cse(0);
- reg_jmp = new_r_Jmp(block);
- set_opt_cse(old_cse);
- exc_jmp = new_r_Bad(irg, mode_X);
+ if (ir_throws_exception(call)) {
+ turn_into_tuple(call, pn_Call_max+1);
+ if (reg_jmp == NULL) {
+ reg_jmp = new_r_Jmp(block);
+ }
+ if (exc_jmp == NULL) {
+ exc_jmp = new_r_Bad(irg, mode_X);
+ }
+ set_Tuple_pred(call, pn_Call_X_regular, reg_jmp);
+ set_Tuple_pred(call, pn_Call_X_except, exc_jmp);
+ } else {
+ assert(reg_jmp == NULL);
+ assert(exc_jmp == NULL);
+ turn_into_tuple(call, pn_Call_T_result+1);
+ assert(pn_Call_M <= pn_Call_T_result);
+ assert(pn_Call_X_regular > pn_Call_T_result);
+ assert(pn_Call_X_except > pn_Call_T_result);
}
- irn = new_r_Tuple(block, 1, &irn);
-
- turn_into_tuple(call, pn_Call_max);
set_Tuple_pred(call, pn_Call_M, mem);
- set_Tuple_pred(call, pn_Call_X_regular, reg_jmp);
- set_Tuple_pred(call, pn_Call_X_except, exc_jmp);
- set_Tuple_pred(call, pn_Call_T_result, irn);
-} /* replace_call */
+ set_Tuple_pred(call, pn_Call_T_result, rest);
+}
/* A mapper for the integer abs. */
int i_mapper_abs(ir_node *call, void *ctx)
irn = new_rd_Alloc(dbg, block, mem, op, firm_unknown_type, stack_alloc);
mem = new_rd_Proj(dbg, irn, mode_M, pn_Alloc_M);
- no_exc = new_rd_Proj(dbg, irn, mode_X, pn_Alloc_X_regular);
- exc = new_rd_Proj(dbg, irn, mode_X, pn_Alloc_X_except);
irn = new_rd_Proj(dbg, irn, get_modeP_data(), pn_Alloc_res);
+ if (ir_throws_exception(call)) {
+ no_exc = new_rd_Proj(dbg, irn, mode_X, pn_Alloc_X_regular);
+ exc = new_rd_Proj(dbg, irn, mode_X, pn_Alloc_X_except);
+ ir_set_throws_exception(irn, true);
+ } else {
+ no_exc = NULL;
+ exc = NULL;
+ }
DBG_OPT_ALGSIM0(call, irn, FS_OPT_RTS_ALLOCA);
replace_call(irn, call, mem, no_exc, exc);
/* A mapper for the floating point pow. */
int i_mapper_pow(ir_node *call, void *ctx)
{
+ ir_node *left = get_Call_param(call, 0);
+ ir_node *right = get_Call_param(call, 1);
+ ir_node *block = get_nodes_block(call);
+ ir_graph *irg = get_irn_irg(block);
+ ir_node *reg_jmp = NULL;
+ ir_node *exc_jmp = NULL;
+ ir_node *irn;
dbg_info *dbg;
ir_node *mem;
- ir_node *left = get_Call_param(call, 0);
- ir_node *right = get_Call_param(call, 1);
- ir_node *block = get_nodes_block(call);
- ir_graph *irg = get_irn_irg(block);
- ir_node *irn, *reg_jmp = NULL, *exc_jmp = NULL;
(void) ctx;
if (is_Const(left) && is_Const_one(left)) {
div = new_rd_Div(dbg, block, mem, irn, left, mode, op_pin_state_pinned);
mem = new_r_Proj(div, mode_M, pn_Div_M);
irn = new_r_Proj(div, mode, pn_Div_res);
- reg_jmp = new_r_Proj(div, mode_X, pn_Div_X_regular);
- exc_jmp = new_r_Proj(div, mode_X, pn_Div_X_except);
+ if (ir_throws_exception(call)) {
+ reg_jmp = new_r_Proj(div, mode_X, pn_Div_X_regular);
+ exc_jmp = new_r_Proj(div, mode_X, pn_Div_X_except);
+ ir_set_throws_exception(div, true);
+ }
}
DBG_OPT_ALGSIM0(call, irn, FS_OPT_RTS_POW);
replace_call(irn, call, mem, reg_jmp, exc_jmp);
/* replace the strcmp by (*x) */
irn = new_rd_Load(dbg, block, mem, v, mode, cons_none);
mem = new_r_Proj(irn, mode_M, pn_Load_M);
- exc = new_r_Proj(irn, mode_X, pn_Load_X_except);
- reg = new_r_Proj(irn, mode_X, pn_Load_X_regular);
irn = new_r_Proj(irn, mode, pn_Load_res);
+ if (ir_throws_exception(call)) {
+ exc = new_r_Proj(irn, mode_X, pn_Load_X_except);
+ reg = new_r_Proj(irn, mode_X, pn_Load_X_regular);
+ ir_set_throws_exception(irn, true);
+ } else {
+ exc = NULL;
+ reg = NULL;
+ }
/* conv to the result mode */
mode = get_type_mode(res_tp);
ir_type *mtp;
ir_node *mem, *bl, *call, *addr, *res_proj;
ir_node **in;
+ bool throws_exception;
+ ir_op *op;
ir_graph *irg;
symconst_symbol sym;
ir_mode *mode = get_irn_mode(node);
return 0;
}
- n_res = get_method_n_ress(mtp);
+ n_res = get_method_n_ress(mtp);
+ throws_exception = ir_throws_exception(node);
/* step 0: calculate the number of needed Proj's */
n_proj = 0;
n_proj = LMAX(n_proj, rt->mem_proj_nr + 1);
- n_proj = LMAX(n_proj, rt->regular_proj_nr + 1);
- n_proj = LMAX(n_proj, rt->exc_proj_nr + 1);
- n_proj = LMAX(n_proj, rt->exc_mem_proj_nr + 1);
n_proj = LMAX(n_proj, rt->res_proj_nr + 1);
+ if (throws_exception) {
+ n_proj = LMAX(n_proj, rt->regular_proj_nr + 1);
+ n_proj = LMAX(n_proj, rt->exc_proj_nr + 1);
+ }
if (n_proj > 0) {
if (rt->mode != mode_T) /* must be mode_T */
/* ok, when we are here, the number of predecessors match as well as the parameter modes */
bl = get_nodes_block(node);
+ op = get_irn_op(node);
in = NULL;
if (n_param > 0) {
if (rt->mem_proj_nr >= 0)
set_Tuple_pred(node, rt->mem_proj_nr, new_r_Proj(call, mode_M, pn_Call_M));
- if (!is_NoMem(mem)) {
- /* Exceptions can only be handled with real memory */
- if (rt->regular_proj_nr >= 0)
- set_Tuple_pred(node, rt->regular_proj_nr, new_r_Proj(call, mode_X, pn_Call_X_regular));
- if (rt->exc_proj_nr >= 0)
- set_Tuple_pred(node, rt->exc_proj_nr, new_r_Proj(call, mode_X, pn_Call_X_except));
- if (rt->exc_mem_proj_nr >= 0)
- set_Tuple_pred(node, rt->mem_proj_nr, new_r_Proj(call, mode_M, pn_Call_M));
+ if (throws_exception) {
+ set_Tuple_pred(node, op->pn_x_regular, new_r_Proj(call, mode_X, pn_Call_X_regular));
+ set_Tuple_pred(node, op->pn_x_except, new_r_Proj(call, mode_X, pn_Call_X_except));
}
if (rt->res_proj_nr >= 0) {
projects / libfirm / blobdiff