X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeflags.c;h=1816b5023c68ddebd971fa7ab8c02b704d6dce71;hb=ce6161a7e42a48f7422b7babcc64d8ace18e2687;hp=4c752e8d859aaae7b1cd01d20b3733f4418c4572;hpb=18814151f8c0ea17b2a7bf84c82ee3c2e66d6a6b;p=libfirm diff --git a/ir/be/beflags.c b/ir/be/beflags.c index 4c752e8d8..1816b5023 100644 --- a/ir/be/beflags.c +++ b/ir/be/beflags.c @@ -37,6 +37,8 @@ */ #include "config.h" +#include + #include "irgwalk.h" #include "irnode_t.h" #include "irtools.h" @@ -52,9 +54,10 @@ #include "benode.h" #include "belive.h" -static const arch_register_class_t *flag_class = NULL; -static const arch_register_t *flags_reg = NULL; -static func_rematerialize remat = NULL; +static const arch_register_class_t *flag_class; +static const arch_register_t *flags_reg; +static func_rematerialize remat; +static check_modifies_flags check_modify; static int changed; static ir_node *default_remat(ir_node *node, ir_node *after) @@ -72,11 +75,16 @@ static ir_node *default_remat(ir_node *node, ir_node *after) return copy; } +static bool default_check_modifies(const ir_node *node) +{ + return arch_irn_is(node, modify_flags); +} + /** * 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) +static bool can_move(ir_node *node, ir_node *after) { const ir_edge_t *edge; assert(get_nodes_block(node) == get_nodes_block(after)); @@ -104,11 +112,11 @@ static int can_move(ir_node *node, ir_node *after) continue; assert(!is_Sync(out3)); if (sched_get_time_step(out3) <= sched_get_time_step(after)) { - return 0; + return false; } } } else if (sched_get_time_step(out2) <= sched_get_time_step(after)) { - return 0; + return false; } } } else { @@ -116,16 +124,16 @@ static int can_move(ir_node *node, ir_node *after) if (is_Phi(out)) continue; if (sched_get_time_step(out) <= sched_get_time_step(after)) { - return 0; + return false; } } } - return 1; + return true; } static void rematerialize_or_move(ir_node *flags_needed, ir_node *node, - ir_node *flag_consumers, int pn, be_lv_t *lv) + ir_node *flag_consumers, int pn) { ir_node *n; ir_node *copy; @@ -163,14 +171,16 @@ static void rematerialize_or_move(ir_node *flags_needed, ir_node *node, break; } } - n = get_irn_link(n); + n = (ir_node*)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; + ir_graph *irg = get_irn_irg(node); + be_lv_t *lv = be_get_irg_liveness(irg); + int i; if (lv != NULL) { for (i = get_irn_arity(copy) - 1; i >= 0; --i) { @@ -180,26 +190,6 @@ static void rematerialize_or_move(ir_node *flags_needed, ir_node *node, } } -static int is_modify_flags(ir_node *node) -{ - int i, arity; - - if (arch_irn_is(node, modify_flags)) - return 1; - if (!be_is_Keep(node)) - return 0; - - arity = get_irn_arity(node); - for (i = 0; i < arity; ++i) { - ir_node *in = get_irn_n(node, i); - in = skip_Proj(in); - if (arch_irn_is(in, modify_flags)) - return 1; - } - - return 0; -} - /** * walks up the schedule and makes sure there are no flag-destroying nodes * between a flag-consumer -> flag-producer chain. Fixes problematic situations @@ -213,10 +203,12 @@ 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; ir_node *new_flags_needed = NULL; + ir_node *test; if (is_Phi(node)) break; @@ -228,9 +220,13 @@ static void fix_flags_walker(ir_node *block, void *env) } /* test whether node destroys the flags */ - if (flags_needed != NULL && is_modify_flags(node)) { + test = node; + if (be_is_Keep(test)) + test = sched_prev(test); + + if (flags_needed != NULL && check_modify(test)) { /* rematerialize */ - rematerialize_or_move(flags_needed, node, flag_consumers, pn, env); + rematerialize_or_move(flags_needed, node, flag_consumers, pn); flags_needed = NULL; flag_consumers = NULL; } @@ -254,7 +250,7 @@ static void fix_flags_walker(ir_node *block, void *env) if (skip_Proj(new_flags_needed) != flags_needed) { if (flags_needed != NULL) { /* rematerialize node */ - rematerialize_or_move(flags_needed, node, flag_consumers, pn, env); + rematerialize_or_move(flags_needed, node, flag_consumers, pn); flags_needed = NULL; flag_consumers = NULL; } @@ -277,7 +273,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, env); + rematerialize_or_move(flags_needed, node, flag_consumers, pn); flags_needed = NULL; flag_consumers = NULL; } @@ -286,20 +282,22 @@ static void fix_flags_walker(ir_node *block, void *env) assert(flag_consumers == NULL); } -void be_sched_fix_flags(be_irg_t *birg, const arch_register_class_t *flag_cls, - func_rematerialize remat_func) +void be_sched_fix_flags(ir_graph *irg, const arch_register_class_t *flag_cls, + func_rematerialize remat_func, + check_modifies_flags check_modifies_flags_func) { - ir_graph *irg = be_get_birg_irg(birg); - - flag_class = flag_cls; - flags_reg = & flag_class->regs[0]; - remat = remat_func; - changed = 0; + flag_class = flag_cls; + flags_reg = & flag_class->regs[0]; + remat = remat_func; + check_modify = check_modifies_flags_func; + changed = 0; if (remat == NULL) remat = &default_remat; + if (check_modify == NULL) + check_modify = &default_check_modifies; ir_reserve_resources(irg, IR_RESOURCE_IRN_LINK); - irg_block_walk_graph(irg, fix_flags_walker, NULL, birg->lv); + irg_block_walk_graph(irg, fix_flags_walker, NULL, NULL); ir_free_resources(irg, IR_RESOURCE_IRN_LINK); if (changed) {