return set_insert(sc, &templ, sizeof(templ), HASH_COMBINE(HASH_PTR(to_spill), HASH_PTR(ctx_irn)));
}
+/**
+ * Schedules a node after an instruction. (That is the place after all projs and phis
+ * that are scheduled after the instruction)
+ */
+static void sched_add_after_insn(ir_node *sched_after, ir_node *node) {
+ ir_node *next = sched_next(sched_after);
+ while(!sched_is_end(next)) {
+ if(!is_Proj(next) && !is_Phi(next))
+ break;
+ next = sched_next(next);
+ }
+
+ if(sched_is_end(next)) {
+ next = sched_last(get_nodes_block(sched_after));
+ sched_add_after(next, node);
+ } else {
+ sched_add_before(next, node);
+ }
+}
+
/**
* Creates a spill.
*
}
ctx->spill = be_spill(env->arch_env, irn, ctx_irn);
+ sched_add_after_insn(irn, ctx->spill);
return ctx->spill;
}
ARR_SETLEN(ir_node*, env->copies, 0);
}
+static INLINE ir_node *skip_projs(ir_node *node) {
+ while(is_Proj(node)) {
+ node = sched_next(node);
+ assert(!sched_is_end(node));
+ }
+
+ return node;
+}
+
/**
- * Searchs the schedule of a block backwards until we reach the first
- * use or def of a value or a phi.
+ * Searchs the schedule backwards until we reach the first use or def of a
+ * value or a phi.
* Returns the node before this node (so that you can do sched_add_before)
*/
static ir_node *find_last_use_def(spill_env_t *env, ir_node *block, ir_node *value) {
return last;
}
if(value == node) {
- return last;
+ return skip_projs(last);
}
for(i = 0, arity = get_irn_arity(node); i < arity; ++i) {
ir_node *arg = get_irn_n(node, i);
if(arg == value) {
- return last;
+ return skip_projs(node);
}
}
last = node;
}
void be_spill_phi(spill_env_t *env, ir_node *node) {
+ int i, arity;
+
assert(is_Phi(node));
pset_insert_ptr(env->mem_phis, node);
+
+ /* We have to place copy nodes in the predecessor blocks to temporarily
+ * produce new values that get separate spill slots
+ */
+ for(i = 0, arity = get_irn_arity(node); i < arity; ++i) {
+ ir_node *pred_block, *arg, *copy, *insert_point;
+
+ /* Don't do anything for looping edges (there's no need
+ * and placing copies here breaks stuff as it suddenly
+ * generates new living values through the whole loop)
+ */
+ arg = get_irn_n(node, i);
+ if(arg == node)
+ continue;
+
+ pred_block = get_Block_cfgpred_block(get_nodes_block(node), i);
+ copy = be_new_Copy(env->cls, get_irn_irg(arg), pred_block, arg);
+
+ ARR_APP1(ir_node*, env->copies, copy);
+ insert_point = find_last_use_def(env, pred_block, arg);
+ sched_add_before(insert_point, copy);
+
+ set_irn_n(node, i, copy);
+ }
}
void be_insert_spills_reloads(spill_env_t *env) {
DBG((env->dbg, LEVEL_1, "Reloads for mem-phis:\n"));
foreach_pset(env->mem_phis, node) {
const ir_edge_t *e;
- int i, arity;
assert(is_Phi(node));
- /* We have to place copy nodes in the predecessor blocks to temporarily
- * produce new values that get separate spill slots
- */
- for(i = 0, arity = get_irn_arity(node); i < arity; ++i) {
- ir_node *pred_block, *arg, *copy, *insert_point;
-
- /* Don't do anything for looping edges (there's no need
- * and placing copies here breaks stuff as it suddenly
- * generates new living values through the whole loop)
- */
- arg = get_irn_n(node, i);
- if(arg == node)
- continue;
-
- pred_block = get_Block_cfgpred_block(get_nodes_block(node), i);
- copy = be_new_Copy(env->cls, get_irn_irg(arg), pred_block, arg);
-
- ARR_APP1(ir_node*, env->copies, copy);
- insert_point = find_last_use_def(env, pred_block, arg);
- sched_add_before(insert_point, copy);
-
- set_irn_n(node, i, copy);
- }
-
/* Add reloads for mem_phis */
/* BETTER: These reloads (1) should only be inserted, if they are really needed */
DBG((env->dbg, LEVEL_1, " Mem-phi %+F\n", node));
return;
}
- // We have to reload the value in pred-block
+ /* We have to reload the value in pred-block */
predblock = get_Block_cfgpred_block(block, pos);
last = sched_last(predblock);
- // there should be exactly 1 jump at the end of the block
+
+ /* we might have projs and keepanys behind the jump... */
+ while(is_Proj(last) || be_is_Keep(last)) {
+ last = sched_prev(last);
+ assert(!sched_is_end(last));
+ }
assert(is_cfop(last));
// add the reload before the (cond-)jump
if (! e) {
char buf[64];
snprintf(buf, sizeof(buf), "spill_slot_type_%s", get_mode_name(ss->largest_mode));
+ buf[sizeof(buf) - 1] = '\0';
res = new_type_primitive(new_id_from_str(buf), ss->largest_mode);
set_type_alignment_bytes(res, ss->align);
pmap_insert(types, ss->largest_mode, res);
*/
static void assign_entities(ss_env_t *ssenv, int n_slots, spill_slot_t *ss[]) {
int i, offset, frame_align;
- ir_type *frame = get_irg_frame_type(ssenv->cenv->irg);
+ ir_type *frame;
+
+ /* do not align the frame if no spill slots are needed */
+ if (n_slots <= 0)
+ return;
+
+ frame = get_irg_frame_type(ssenv->cenv->irg);
/* aligning by increasing frame size */
- offset = get_type_size_bits(frame) / 8;
+ offset = get_type_size_bytes(frame);
offset = round_up2(offset, ALIGN_SPILL_AREA);
- set_type_size_bytes(frame, -1);
/* create entities and assign offsets according to size and alignment*/
for (i = 0; i < n_slots; ++i) {
/* build entity */
snprintf(buf, sizeof(buf), "spill_slot_%d", i);
+ buf[sizeof(buf) - 1] = '\0';
name = new_id_from_str(buf);
spill_ent = new_entity(frame, name, get_spill_type(ssenv->types, ss[i]));
projects / libfirm / blobdiff