X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbespillslots.c;h=bba1a81898f655f3b01a3f7919b75f34a752c4dc;hb=69c991e03a0eb1b284e6d0c41623d340a8e26d16;hp=018ea1b3f4935d6eeedf368f0fd9f706e8175085;hpb=71712d24f429b174d735ae063bcfcf529acc8489;p=libfirm diff --git a/ir/be/bespillslots.c b/ir/be/bespillslots.c index 018ea1b3f..bba1a8189 100644 --- a/ir/be/bespillslots.c +++ b/ir/be/bespillslots.c @@ -24,9 +24,7 @@ * @date 26.07.2006 * @version $Id$ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include @@ -43,7 +41,6 @@ #include "besched.h" #include "bespillslots.h" #include "bechordal_t.h" -#include "bejavacoal.h" #include "bestatevent.h" #include "bespilloptions.h" #include "bemodule.h" @@ -109,7 +106,7 @@ static spill_t *get_spill(be_fec_env_t *env, ir_node *node) } -static INLINE ir_node *get_memory_edge(const ir_node *node) +static inline ir_node *get_memory_edge(const ir_node *node) { int i, arity; @@ -127,7 +124,7 @@ static spill_t *collect_spill(be_fec_env_t *env, ir_node *node, const ir_mode *mode, int align) { spill_t spill, *res; - int hash = hash_irn(node); + int hash = hash_irn(node); /* insert into set of spills if not already there */ spill.spill = node; @@ -138,6 +135,7 @@ static spill_t *collect_spill(be_fec_env_t *env, ir_node *node, spill.mode = mode; spill.alignment = align; res = set_insert(env->spills, &spill, sizeof(spill), hash); + DB((dbg, DBG_COALESCING, "Slot %d: %+F\n", spill.spillslot, node)); } else { assert(res->mode == mode); assert(res->alignment == align); @@ -167,6 +165,7 @@ static spill_t *collect_memphi(be_fec_env_t *env, ir_node *node, spill.spillslot = set_count(env->spills); spill.mode = mode; spill.alignment = align; + DB((dbg, DBG_COALESCING, "Slot %d: %+F\n", spill.spillslot, node)); res = set_insert(env->spills, &spill, sizeof(spill), hash); /* collect attached spills and mem-phis */ @@ -354,11 +353,11 @@ static void do_greedy_coalescing(be_fec_env_t *env) if(spillcount == 0) return; - DBG((dbg, DBG_COALESCING, "Coalescing %d spillslots\n", spillcount)); + DB((dbg, DBG_COALESCING, "Coalescing %d spillslots\n", spillcount)); - interferences = alloca(spillcount * sizeof(interferences[0])); - spillslot_unionfind = alloca(spillcount * sizeof(spillslot_unionfind[0])); - spilllist = alloca(spillcount * sizeof(spilllist[0])); + interferences = ALLOCAN(bitset_t*, spillcount); + spillslot_unionfind = ALLOCAN(int, spillcount); + spilllist = ALLOCAN(spill_t*, spillcount); uf_init(spillslot_unionfind, 0, spillcount); @@ -390,7 +389,7 @@ static void do_greedy_coalescing(be_fec_env_t *env) continue; if (my_values_interfere(env->birg, spill1, spill2)) { - DBG((dbg, DBG_INTERFERENCES, + DB((dbg, DBG_INTERFERENCES, "Slot %d and %d interfere\n", i, i2)); bitset_set(interferences[i], i2); @@ -418,7 +417,7 @@ static void do_greedy_coalescing(be_fec_env_t *env) continue; } - DBG((dbg, DBG_COALESCING, + DB((dbg, DBG_COALESCING, "Merging %d and %d because of affinity edge\n", s1, s2)); merge_interferences(env, interferences, spillslot_unionfind, s1, s2); @@ -444,7 +443,7 @@ static void do_greedy_coalescing(be_fec_env_t *env) continue; } - DBG((dbg, DBG_COALESCING, + DB((dbg, DBG_COALESCING, "Merging %d and %d because it is possible\n", s1, s2)); if(merge_interferences(env, interferences, spillslot_unionfind, s1, s2) != 0) { @@ -519,7 +518,10 @@ static ir_entity* create_stack_entity(be_fec_env_t *env, spill_slot_t *slot) { ir_graph *irg = be_get_birg_irg(env->birg); ir_type *frame = get_irg_frame_type(irg); - ir_entity *res = frame_alloc_area(frame, slot->size, slot->align, 0); + /* TODO: backend should be able to specify wether we want spill slots + * at begin or end of frame */ + int at_start = 1; + ir_entity *res = frame_alloc_area(frame, slot->size, slot->align, at_start); /* adjust size of the entity type... */ ir_type *enttype = get_entity_type(res); @@ -550,8 +552,7 @@ static void enlarge_spillslot(spill_slot_t *slot, int otheralign, int othersize) } -static void assign_spill_entity(const arch_env_t *arch_env, ir_node *node, - ir_entity *entity) +static void assign_spill_entity(ir_node *node, ir_entity *entity) { if(is_NoMem(node)) return; @@ -563,13 +564,15 @@ static void assign_spill_entity(const arch_env_t *arch_env, ir_node *node, ir_node *in = get_irn_n(node, i); assert(!is_Phi(in)); - assign_spill_entity(arch_env, in, entity); + assign_spill_entity(in, entity); } return; } - assert(arch_get_frame_entity(arch_env, node) == NULL); - arch_set_frame_entity(arch_env, node, entity); + /* beware: we might have Stores with Memory Proj's, ia32 fisttp for instance */ + node = skip_Proj(node); + assert(arch_get_frame_entity(node) == NULL); + arch_set_frame_entity(node, entity); } /** @@ -578,16 +581,10 @@ static void assign_spill_entity(const arch_env_t *arch_env, ir_node *node, */ static void assign_spillslots(be_fec_env_t *env) { - const arch_env_t *arch_env = env->arch_env; - int i; - int spillcount; - spill_t *spill; - spill_slot_t* spillslots; - - spillcount = set_count(env->spills); - spillslots = alloca(spillcount * sizeof(spillslots[0])); - - memset(spillslots, 0, spillcount * sizeof(spillslots[0])); + int spillcount = set_count(env->spills); + spill_slot_t *spillslots = ALLOCANZ(spill_slot_t, spillcount); + spill_t *spill; + int i; /* construct spillslots */ for(spill = set_first(env->spills); spill != NULL; @@ -657,7 +654,7 @@ static void assign_spillslots(be_fec_env_t *env) } } } else { - assign_spill_entity(arch_env, node, slot->entity); + assign_spill_entity(node, slot->entity); } } @@ -669,7 +666,7 @@ static void assign_spillslots(be_fec_env_t *env) assert(slot->entity != NULL); - arch_set_frame_entity(arch_env, reload, slot->entity); + arch_set_frame_entity(reload, slot->entity); } } @@ -703,11 +700,11 @@ static void create_memperms(be_fec_env_t *env) memperm_t *memperm; for(memperm = set_first(env->memperms); memperm != NULL; memperm = set_next(env->memperms)) { - int i; - memperm_entry_t *entry; - ir_node *blockend; - ir_node** nodes = alloca(memperm->entrycount * sizeof(nodes[0])); - ir_node* mempermnode; + ir_node **nodes = ALLOCAN(ir_node*, memperm->entrycount); + memperm_entry_t *entry; + ir_node *blockend; + ir_node *mempermnode; + int i; assert(memperm->entrycount > 0); @@ -761,8 +758,8 @@ static int count_spillslots(const be_fec_env_t *env) be_fec_env_t *be_new_frame_entity_coalescer(be_irg_t *birg) { - const arch_env_t *arch_env = &birg->main_env->arch_env; - be_fec_env_t *env = xmalloc(sizeof(env[0])); + const arch_env_t *arch_env = birg->main_env->arch_env; + be_fec_env_t *env = XMALLOC(be_fec_env_t); be_liveness_assure_chk(be_assure_liveness(birg)); @@ -810,7 +807,6 @@ void be_assign_entities(be_fec_env_t *env) static void collect_spills_walker(ir_node *node, void *data) { be_fec_env_t *env = data; - const arch_env_t *arch_env = env->arch_env; const ir_mode *mode; const arch_register_class_t *cls; int align; @@ -819,12 +815,12 @@ static void collect_spills_walker(ir_node *node, void *data) if (is_Proj(node)) return; - if (!arch_irn_class_is(arch_env, node, reload)) + if (!arch_irn_class_is(node, reload)) return; mode = get_irn_mode(node); - cls = arch_get_irn_reg_class(arch_env, node, -1); - align = arch_isa_get_reg_class_alignment(arch_env_get_isa(arch_env), cls); + cls = arch_get_irn_reg_class_out(node); + align = arch_env_get_reg_class_alignment(env->arch_env, cls); be_node_needs_frame_entity(env, node, mode, align); }