X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeflags.c;h=af2525c57c52882e29f32415c2eeb72573d49115;hb=2799d7aec7b0f52d8f10ad5c7a88e31d4dbc8b1b;hp=1adde1a7246f0b534ba163e2d6a76bbd5fa7c30f;hpb=1ce363f80e6a204d4011f85813362d9bd1d0e7e4;p=libfirm diff --git a/ir/be/beflags.c b/ir/be/beflags.c index 1adde1a72..af2525c57 100644 --- a/ir/be/beflags.c +++ b/ir/be/beflags.c @@ -35,9 +35,7 @@ * spilled. So in some situations (for example 2 adc-nodes that use the flags of * a single add node on x86) operations have to be repeated to work correctly. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "irgwalk.h" #include "irnode_t.h" @@ -53,7 +51,6 @@ #include "besched_t.h" #include "benode_t.h" -static const arch_env_t *arch_env = NULL; static const arch_register_class_t *flag_class = NULL; static const arch_register_t *flags_reg = NULL; static func_rematerialize remat = NULL; @@ -75,7 +72,7 @@ static ir_node *default_remat(ir_node *node, ir_node *after) } /** - * tests wether we can legally move node node after node after + * tests whether we can legally move node node after node after * (only works for nodes in same block) */ static int can_move(ir_node *node, ir_node *after) @@ -127,7 +124,7 @@ static int can_move(ir_node *node, ir_node *after) } static void rematerialize_or_move(ir_node *flags_needed, ir_node *node, - ir_node *flag_consumers, int pn) + ir_node *flag_consumers, int pn, be_lv_t *lv) { ir_node *n; ir_node *copy; @@ -139,6 +136,7 @@ static void rematerialize_or_move(ir_node *flags_needed, ir_node *node, /* move it */ sched_remove(flags_needed); sched_add_after(node, flags_needed); + /* No need to update liveness, because the node stays in the same block */ return; } @@ -168,12 +166,23 @@ static void rematerialize_or_move(ir_node *flags_needed, ir_node *node, } n = get_irn_link(n); } while(n != NULL); + + /* No need to introduce the copy, because it only lives in this block, but + * we have to update the liveness of all operands */ + if (is_Block(node) || + get_nodes_block(node) != get_nodes_block(flags_needed)) { + int i; + + for (i = get_irn_arity(copy) - 1; i >= 0; --i) { + be_liveness_update(lv, get_irn_n(copy, i)); + } + } } static int is_modify_flags(ir_node *node) { int i, arity; - if(arch_irn_is(arch_env, node, modify_flags)) + if (arch_irn_is(node, modify_flags)) return 1; if(!be_is_Keep(node)) return 0; @@ -182,7 +191,7 @@ static int is_modify_flags(ir_node *node) { for(i = 0; i < arity; ++i) { ir_node *in = get_irn_n(node, i); in = skip_Proj(in); - if(arch_irn_is(arch_env, in, modify_flags)) + if (arch_irn_is(in, modify_flags)) return 1; } @@ -202,7 +211,6 @@ static void fix_flags_walker(ir_node *block, void *env) ir_node *flags_needed = NULL; ir_node *flag_consumers = NULL; int pn = -1; - (void) env; sched_foreach_reverse(block, node) { int i, arity; @@ -220,7 +228,7 @@ static void fix_flags_walker(ir_node *block, void *env) /* test whether node destroys the flags */ if(flags_needed != NULL && is_modify_flags(node)) { /* rematerialize */ - rematerialize_or_move(flags_needed, node, flag_consumers, pn); + rematerialize_or_move(flags_needed, node, flag_consumers, pn, env); flags_needed = NULL; flag_consumers = NULL; } @@ -228,8 +236,7 @@ static void fix_flags_walker(ir_node *block, void *env) /* test whether the current node needs flags */ arity = get_irn_arity(node); for(i = 0; i < arity; ++i) { - const arch_register_class_t *cls - = arch_get_irn_reg_class(arch_env, node, i); + const arch_register_class_t *cls = arch_get_irn_reg_class(node, i); if(cls == flag_class) { assert(new_flags_needed == NULL); new_flags_needed = get_irn_n(node, i); @@ -240,25 +247,25 @@ static void fix_flags_walker(ir_node *block, void *env) continue; /* spiller can't (correctly) remat flag consumers at the moment */ - assert(!arch_irn_is(arch_env, node, rematerializable)); + assert(!arch_irn_is(node, rematerializable)); if(skip_Proj(new_flags_needed) != flags_needed) { if(flags_needed != NULL) { /* rematerialize node */ - rematerialize_or_move(flags_needed, node, flag_consumers, pn); + rematerialize_or_move(flags_needed, node, flag_consumers, pn, env); flags_needed = NULL; flag_consumers = NULL; } flags_needed = new_flags_needed; - arch_set_irn_register(arch_env, flags_needed, flags_reg); + arch_set_irn_register(flags_needed, flags_reg); if(is_Proj(flags_needed)) { pn = get_Proj_proj(flags_needed); flags_needed = get_Proj_pred(flags_needed); } flag_consumers = node; set_irn_link(flag_consumers, NULL); - assert(arch_irn_is(arch_env, flags_needed, rematerializable)); + assert(arch_irn_is(flags_needed, rematerializable)); } else { /* link all consumers in a list */ set_irn_link(node, flag_consumers); @@ -268,7 +275,7 @@ static void fix_flags_walker(ir_node *block, void *env) if(flags_needed != NULL) { assert(get_nodes_block(flags_needed) != block); - rematerialize_or_move(flags_needed, node, flag_consumers, pn); + rematerialize_or_move(flags_needed, node, flag_consumers, pn, env); flags_needed = NULL; flag_consumers = NULL; } @@ -282,7 +289,6 @@ void be_sched_fix_flags(be_irg_t *birg, const arch_register_class_t *flag_cls, { ir_graph *irg = be_get_birg_irg(birg); - arch_env = be_get_birg_arch_env(birg); flag_class = flag_cls; flags_reg = & flag_class->regs[0]; remat = remat_func; @@ -290,9 +296,9 @@ void be_sched_fix_flags(be_irg_t *birg, const arch_register_class_t *flag_cls, if(remat == NULL) remat = &default_remat; - set_using_irn_link(irg); - irg_block_walk_graph(irg, fix_flags_walker, NULL, NULL); - clear_using_irn_link(irg); + ir_reserve_resources(irg, IR_RESOURCE_IRN_LINK); + irg_block_walk_graph(irg, fix_flags_walker, NULL, birg->lv); + ir_free_resources(irg, IR_RESOURCE_IRN_LINK); if(changed) { be_remove_dead_nodes_from_schedule(birg);