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;
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);
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 */
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]));
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);
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);
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) {
{
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);
return;
}
+ /* beware: we might have Stores with Memory Proj's, ia32 fisttp for instance */
+ node = skip_Proj(node);
assert(arch_get_frame_entity(arch_env, node) == NULL);
arch_set_frame_entity(arch_env, node, entity);
}
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]));
+ be_fec_env_t *env = XMALLOC(be_fec_env_t);
be_liveness_assure_chk(be_assure_liveness(birg));
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);
+ align = arch_env_get_reg_class_alignment(arch_env, cls);
be_node_needs_frame_entity(env, node, mode, align);
}