X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fcfopt.c;h=d01d1a76a3f1e1a14afd0f1cd2f5bf1c8f0b0e8f;hb=b7b24e372a1338ecd5eb26bdd285a8cbe7b1fec9;hp=97dc5032d6832e89e8794ae620d0a9dd32149de4;hpb=7fb8d0d5cb80fa51fef49bcd1c05117801a59c77;p=libfirm diff --git a/ir/opt/cfopt.c b/ir/opt/cfopt.c index 97dc5032d..d01d1a76a 100644 --- a/ir/opt/cfopt.c +++ b/ir/opt/cfopt.c @@ -104,9 +104,10 @@ static int remove_senseless_conds(ir_node *bl) ir_node *cond_j = skip_Proj(pred_j); if (cond_j == cond_i) { - ir_node *jmp = new_r_Jmp(get_nodes_block(cond_i)); + ir_graph *irg = get_irn_irg(bl); + ir_node *jmp = new_r_Jmp(get_nodes_block(cond_i)); set_irn_n(bl, i, jmp); - set_irn_n(bl, j, new_Bad()); + set_irn_n(bl, j, new_r_Bad(irg)); DBG_OPT_IFSIM2(cond_i, jmp); changed = 1; @@ -136,7 +137,7 @@ static void merge_blocks(ir_node *node, void *ctx) { int i; ir_node *new_block; - merge_env *env = ctx; + merge_env *env = (merge_env*)ctx; /* clear the link field for ALL nodes first */ set_irn_link(node, NULL); @@ -178,10 +179,11 @@ static void merge_blocks(ir_node *node, void *ctx) } /* normally, we would create a Bad block here, but this must be - * prevented, so just set it's cf to Bad. + * prevented, so just set its cf to Bad. */ if (is_Block_dead(new_block)) { - exchange(node, new_Bad()); + ir_graph *irg = get_irn_irg(node); + exchange(node, new_r_Bad(irg)); env->changed = 1; } } @@ -201,7 +203,7 @@ static void merge_blocks(ir_node *node, void *ctx) static void remove_unreachable_blocks_and_conds(ir_node *block, void *env) { int i; - int *changed = env; + int *changed = (int*)env; /* Check block predecessors and turn control flow into bad. Beware of Tuple, kill them. */ @@ -213,8 +215,9 @@ static void remove_unreachable_blocks_and_conds(ir_node *block, void *env) ir_node *pred_bl = get_nodes_block(skip_Proj(skipped)); if (is_Block_dead(pred_bl) || (get_Block_dom_depth(pred_bl) < 0)) { + ir_graph *irg = get_irn_irg(block); set_Block_dead(pred_bl); - exchange(pred_X, new_Bad()); + exchange(pred_X, new_r_Bad(irg)); *changed = 1; } else if (skipped != pred_X) { set_Block_cfgpred(block, i, skipped); @@ -241,8 +244,8 @@ static void remove_unreachable_blocks_and_conds(ir_node *block, void *env) */ static void collect_nodes(ir_node *n, void *ctx) { - ir_opcode code = get_irn_opcode(n); - merge_env *env = ctx; + unsigned code = get_irn_opcode(n); + merge_env *env = (merge_env*)ctx; if (code == iro_Block) { /* mark the block as non-removable if it is labeled */ @@ -413,7 +416,7 @@ static void optimize_blocks(ir_node *b, void *ctx) int i, j, k, n, max_preds, n_preds, p_preds = -1; ir_node *pred, *phi, *next; ir_node **in; - merge_env *env = ctx; + merge_env *env = (merge_env*)ctx; /* Count the number of predecessor if this block is merged with pred blocks that are empty. */ @@ -424,9 +427,9 @@ static void optimize_blocks(ir_node *b, void *ctx) in = XMALLOCN(ir_node*, max_preds); /*- Fix the Phi nodes of the current block -*/ - for (phi = get_irn_link(b); phi != NULL; phi = next) { + for (phi = (ir_node*)get_irn_link(b); phi != NULL; phi = (ir_node*)next) { assert(is_Phi(phi)); - next = get_irn_link(phi); + next = (ir_node*)get_irn_link(phi); /* Find the new predecessors for the Phi */ p_preds = 0; @@ -480,15 +483,16 @@ static void optimize_blocks(ir_node *b, void *ctx) ir_node *next_phi; /* we found a predecessor block at position k that will be removed */ - for (phi = get_irn_link(predb); phi; phi = next_phi) { + for (phi = (ir_node*)get_irn_link(predb); phi; phi = next_phi) { int q_preds = 0; - next_phi = get_irn_link(phi); + next_phi = (ir_node*)get_irn_link(phi); assert(is_Phi(phi)); if (get_Block_idom(b) != predb) { /* predb is not the dominator. There can't be uses of pred's Phi nodes, kill them .*/ - exchange(phi, new_Bad()); + ir_graph *irg = get_irn_irg(b); + exchange(phi, new_r_Bad(irg)); } else { /* predb is the direct dominator of b. There might be uses of the Phi nodes from predb in further block, so move this phi from the predecessor into the block b */ @@ -572,7 +576,7 @@ static void optimize_blocks(ir_node *b, void *ctx) in[n_preds++] = pred_X; } /* Remove block as it might be kept alive. */ - exchange(pred, b/*new_Bad()*/); + exchange(pred, b/*new_r_Bad(irg)*/); } else { /* case 3: */ in[n_preds++] = get_Block_cfgpred(b, i); @@ -593,8 +597,8 @@ static void optimize_blocks(ir_node *b, void *ctx) */ static void remove_simple_blocks(ir_node *block, void *ctx) { - ir_node *new_blk = equivalent_node(block); - merge_env *env = ctx; + merge_env *env = (merge_env*)ctx; + ir_node *new_blk = equivalent_node(block); if (new_blk != block) { exchange(block, new_blk); @@ -618,8 +622,8 @@ static int handle_switch_cond(ir_node *cond) { ir_node *sel = get_Cond_selector(cond); - ir_node *proj1 = get_irn_link(cond); - ir_node *proj2 = get_irn_link(proj1); + ir_node *proj1 = (ir_node*)get_irn_link(cond); + ir_node *proj2 = (ir_node*)get_irn_link(proj1); ir_node *jmp, *blk; blk = get_nodes_block(cond); @@ -634,19 +638,20 @@ static int handle_switch_cond(ir_node *cond) } else if (get_irn_link(proj2) == NULL) { /* We have two Proj's here. Check if the Cond has a constant argument */ - tarval *tv = value_of(sel); + ir_tarval *tv = value_of(sel); if (tv != tarval_bad) { /* we have a constant switch */ - long num = get_tarval_long(tv); - long def_num = get_Cond_default_proj(cond); + long num = get_tarval_long(tv); + long def_num = get_Cond_default_proj(cond); + ir_graph *irg = get_irn_irg(cond); if (def_num == get_Proj_proj(proj1)) { /* first one is the defProj */ if (num == get_Proj_proj(proj2)) { jmp = new_r_Jmp(blk); exchange(proj2, jmp); - exchange(proj1, new_Bad()); + exchange(proj1, new_r_Bad(irg)); return 1; } } else if (def_num == get_Proj_proj(proj2)) { @@ -654,7 +659,7 @@ static int handle_switch_cond(ir_node *cond) if (num == get_Proj_proj(proj1)) { jmp = new_r_Jmp(blk); exchange(proj1, jmp); - exchange(proj2, new_Bad()); + exchange(proj2, new_r_Bad(irg)); return 1; } } else { @@ -662,12 +667,12 @@ static int handle_switch_cond(ir_node *cond) if (num == get_Proj_proj(proj1)) { jmp = new_r_Jmp(blk); exchange(proj1, jmp); - exchange(proj2, new_Bad()); + exchange(proj2, new_r_Bad(irg)); return 1; } else if (num == get_Proj_proj(proj2)) { jmp = new_r_Jmp(blk); exchange(proj2, jmp); - exchange(proj1, new_Bad()); + exchange(proj1, new_r_Bad(irg)); return 1; } } @@ -697,7 +702,6 @@ void optimize_cf(ir_graph *irg) int i, j, n, changed; ir_node **in = NULL; ir_node *cond, *end = get_irg_end(irg); - ir_graph *rem = current_ir_graph; plist_element_t *el; merge_env env; @@ -707,8 +711,6 @@ void optimize_cf(ir_graph *irg) assert(get_irg_pinned(irg) != op_pin_state_floats && "Control flow optimization need a pinned graph"); - current_ir_graph = irg; - /* FIXME: control flow opt destroys block edges. So edges are deactivated here. Fix the edges! */ edges_deactivate(irg); @@ -731,7 +733,7 @@ restart: if (is_Block(ka)) { /* do NOT keep dead blocks */ if (is_Block_dead(ka) || get_Block_dom_depth(ka) < 0) { - set_End_keepalive(end, i, new_Bad()); + set_End_keepalive(end, i, new_r_Bad(irg)); changed = 1; } } else { @@ -739,7 +741,7 @@ restart: if (is_Bad(block) || is_Block_dead(block) || get_Block_dom_depth(block) < 0) { /* do NOT keep nodes in dead blocks */ - set_End_keepalive(end, i, new_Bad()); + set_End_keepalive(end, i, new_r_Bad(irg)); changed = 1; } } @@ -765,7 +767,7 @@ restart: /* handle all collected switch-Conds */ foreach_plist(env.list, el) { - cond = plist_element_get_value(el); + cond = (ir_node*)plist_element_get_value(el); env.changed |= handle_switch_cond(cond); } plist_free(env.list); @@ -793,7 +795,7 @@ restart: if (is_Block(ka)) { /* do NOT keep dead blocks */ if (is_Block_dead(ka) || get_Block_dom_depth(ka) < 0) { - set_End_keepalive(end, i, new_Bad()); + set_End_keepalive(end, i, new_r_Bad(irg)); changed = 1; } } else { @@ -801,7 +803,7 @@ restart: if (is_Bad(block) || is_Block_dead(block) || get_Block_dom_depth(block) < 0) { /* do NOT keep nodes in dead blocks */ - set_End_keepalive(end, i, new_Bad()); + set_End_keepalive(end, i, new_r_Bad(irg)); changed = 1; } } @@ -871,8 +873,6 @@ restart: fprintf(stderr, "VERIFY_BAD in optimize_cf()\n"); } } - - current_ir_graph = rem; } /* Creates an ir_graph pass for optimize_cf. */