X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbestate.c;h=52efa3a61aa9af4e50ed3a03cd29ad161545b486;hb=662fc44c951bdb45a9b7d9563e9ffbb87101b9e4;hp=7c228c2550623f2ba45b10b865ba77b5529077f0;hpb=55437d814f031e648187e51ba6e952907f9a480c;p=libfirm diff --git a/ir/be/bestate.c b/ir/be/bestate.c index 7c228c255..52efa3a61 100644 --- a/ir/be/bestate.c +++ b/ir/be/bestate.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1995-2007 University of Karlsruhe. All right reserved. + * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. * * This file is part of libFirm. * @@ -39,6 +39,9 @@ #include "iredges_t.h" #include "ircons_t.h" #include "irgmod.h" +#include "irnodeset.h" +#include "irnodemap.h" +#include "adt/cpset.h" #include "bearch_t.h" #include "beuses.h" @@ -66,6 +69,7 @@ typedef struct minibelady_env_t { create_reload_func create_reload; create_spill_func create_spill; spill_info_t *spills; + ir_nodemap_t spill_infos; be_uses_t *uses; /**< env for the next-use magic */ } minibelady_env_t; @@ -81,6 +85,7 @@ block_info_t *new_block_info(struct obstack *obst, ir_node *block) block_info_t *res = obstack_alloc(obst, sizeof(*res)); memset(res, 0, sizeof(res[0])); + assert(is_Block(block)); set_irn_link(block, res); mark_irn_visited(block); @@ -102,8 +107,8 @@ spill_info_t *create_spill_info(minibelady_env_t *env, ir_node *state) spill_info->value = state; spill_info->reloads = NEW_ARR_F(ir_node*, 0); - set_irn_link(state, spill_info); - mark_irn_visited(state); + ir_nodemap_insert(&env->spill_infos, state, spill_info); + //ir_fprintf(stderr, "Insert %+F -> %p\n", state, spill_info); spill_info->next = env->spills; env->spills = spill_info; @@ -111,6 +116,15 @@ spill_info_t *create_spill_info(minibelady_env_t *env, ir_node *state) return spill_info; } +static INLINE +spill_info_t *get_spill_info(minibelady_env_t *env, const ir_node *node) +{ + spill_info_t *spill_info + = (spill_info_t*) ir_nodemap_get(&env->spill_infos, node); + //ir_fprintf(stderr, "Get %+F -> %p\n", node, spill_info); + return spill_info; +} + static spill_info_t *create_spill(minibelady_env_t *env, ir_node *state, int force) { @@ -118,12 +132,11 @@ spill_info_t *create_spill(minibelady_env_t *env, ir_node *state, int force) ir_node *next; ir_node *after; - if(irn_visited(state)) { - spill_info = (spill_info_t*) get_irn_link(state); - if(spill_info->spill != NULL || !force) - return spill_info; - } else { + spill_info = get_spill_info(env, state); + if(spill_info == NULL) { spill_info = create_spill_info(env, state); + } else if(spill_info->spill != NULL) { + return spill_info; } if(sched_is_scheduled(state)) { @@ -164,8 +177,8 @@ void spill_phi(minibelady_env_t *env, ir_node *phi) spill_info_t *spill_info; /* does a spill exist for the phis value? */ - if(irn_visited(phi)) { - spill_info = (spill_info_t*) get_irn_link(phi); + spill_info = get_spill_info(env, phi); + if(spill_info != NULL) { spill_to_kill = spill_info->spill; } else { spill_info = create_spill_info(env, phi); @@ -173,7 +186,7 @@ void spill_phi(minibelady_env_t *env, ir_node *phi) /* create a new phi-M with bad preds */ for(i = 0; i < arity; ++i) { - in[i] = new_r_Bad(irg); + in[i] = new_r_Unknown(irg, mode_M); } DBG((dbg, LEVEL_2, "\tcreate Phi-M for %+F\n", phi)); @@ -302,6 +315,9 @@ block_info_t *compute_block_start_state(minibelady_env_t *env, ir_node *block) be_lv_foreach(env->lv, block, be_lv_state_in, i) { node = be_lv_get_irn(env->lv, block, i); + if(!mode_is_data(get_irn_mode(node))) + continue; + if (arch_get_irn_register(env->arch_env, node) != env->reg) continue; @@ -387,9 +403,13 @@ void belady(minibelady_env_t *env, ir_node *block) /* check which state is desired for the node */ arity = get_irn_arity(node); for(i = 0; i < arity; ++i) { + const arch_register_t *reg; ir_node *in = get_irn_n(node, i); - const arch_register_t *reg = - arch_get_irn_register(env->arch_env, in); + + if(!mode_is_data(get_irn_mode(in))) + continue; + + reg = arch_get_irn_register(env->arch_env, in); if(reg == env->reg) { assert(need_val == NULL); need_val = in; @@ -410,20 +430,26 @@ void belady(minibelady_env_t *env, ir_node *block) const ir_edge_t *edge; foreach_out_edge(node, edge) { + const arch_register_t *reg; ir_node *proj = get_edge_src_irn(edge); - const arch_register_t *reg = - arch_get_irn_register(env->arch_env, proj); + + if(!mode_is_data(get_irn_mode(proj))) + continue; + + reg = arch_get_irn_register(env->arch_env, proj); if(reg == env->reg) { current_state = proj; DBG((dbg, LEVEL_3, "\t... current_state <- %+F\n", current_state)); } } } else { - const arch_register_t *reg = - arch_get_irn_register(env->arch_env, node); - if(reg == env->reg) { - current_state = node; - DBG((dbg, LEVEL_3, "\t... current_state <- %+F\n", current_state)); + if(mode_is_data(get_irn_mode(node))) { + const arch_register_t *reg = + arch_get_irn_register(env->arch_env, node); + if(reg == env->reg) { + current_state = node; + DBG((dbg, LEVEL_3, "\t... current_state <- %+F\n", current_state)); + } } } } @@ -531,10 +557,10 @@ void be_assure_state(be_irg_t *birg, const arch_register_t *reg, void *func_env, env.lv = be_get_birg_liveness(birg); env.uses = be_begin_uses(irg, env.lv); env.spills = NULL; + ir_nodemap_init(&env.spill_infos); assure_doms(irg); - set_using_visited(irg); - set_using_irn_link(irg); + ir_reserve_resources(irg, IR_RESOURCE_IRN_VISITED | IR_RESOURCE_IRN_LINK); inc_irg_visited(irg); /* process blocks */ @@ -543,8 +569,7 @@ void be_assure_state(be_irg_t *birg, const arch_register_t *reg, void *func_env, /* fix block end_states that don't match the next blocks start_state */ irg_block_walk_graph(irg, fix_block_borders, NULL, &env); - clear_using_visited(irg); - clear_using_irn_link(irg); + ir_free_resources(irg, IR_RESOURCE_IRN_VISITED | IR_RESOURCE_IRN_LINK); /* reconstruct ssa-form */ info = env.spills; @@ -588,6 +613,7 @@ void be_assure_state(be_irg_t *birg, const arch_register_t *reg, void *func_env, /* some nodes might be dead now. */ be_remove_dead_nodes_from_schedule(birg); + ir_nodemap_destroy(&env.spill_infos); be_end_uses(env.uses); obstack_free(&env.obst, NULL); }