#include "iredges_t.h"
#include "irgwalk.h"
-#ifdef _WIN32
-#include <malloc.h>
-#else
-#include <alloca.h>
+#ifdef HAVE_MALLOC_H
+ #include <malloc.h>
+#endif
+#ifdef HAVE_ALLOCA_H
+ #include <alloca.h>
#endif
#undef is_Perm
int pidx = get_pairidx_for_regidx(pairs, n, cycle->elems[i]->index, 0);
/* create intermediate proj */
- res2 = new_r_Proj(get_irn_irg(irn), block, cpyxchg, get_irn_mode(res1), 0);
+ res1 = new_r_Proj(get_irn_irg(irn), block, cpyxchg, get_irn_mode(res1), 0);
/* set as in for next Perm */
- pairs[pidx].in_node = res2;
+ pairs[pidx].in_node = res1;
}
else {
- sched_remove(res2);
+ sched_remove(res1);
}
- sched_remove(res1);
+ sched_remove(res2);
set_Proj_pred(res2, cpyxchg);
set_Proj_proj(res2, 0);
arch_set_irn_register(arch_env, res2, cycle->elems[i + 1]);
arch_set_irn_register(arch_env, res1, cycle->elems[i]);
+
+ /* insert the copy/exchange node in schedule after the magic schedule node (see above) */
+ sched_add_after(sched_point, cpyxchg);
+
+ DBG((mod, LEVEL_1, "replacing %+F with %+F, placed new node after %+F\n", irn, cpyxchg, sched_point));
+
+ /* set the new scheduling point */
+ sched_point = res1;
}
else {
DBG((mod, LEVEL_1, "%+F creating copy node (%+F, %s) -> (%+F, %s)\n",
/* exchange copy node and proj */
exchange(res2, cpyxchg);
- }
- /* insert the copy/exchange node in schedule after the magic schedule node (see above) */
- sched_add_after(sched_point, cpyxchg);
- /* set the new scheduling point */
- sched_point = cpyxchg;
+ /* insert the copy/exchange node in schedule after the magic schedule node (see above) */
+ sched_add_after(sched_point, cpyxchg);
- DBG((mod, LEVEL_1, "replacing %+F with %+F, placed new node after %+F\n", irn, cpyxchg, sched_point));
+ /* set the new scheduling point */
+ sched_point = cpyxchg;
+ }
}
free((void *) cycle->elems);
}
static void fix_in(ir_node *irn, ir_node *old, ir_node *nw) {
- int i, n = get_irn_arity(irn);
+ int i, n;
irn = belower_skip_proj(irn);
+ n = get_irn_arity(irn);
for (i = 0; i < n; i++) {
if (get_irn_n(irn, i) == old) {
firm_dbg_module_t *mod = firm_dbg_register("firm.be.lower");
const arch_register_class_t *cls = arch_get_irn_reg_class(arch_env, other_different, -1);
- if (arch_irn_is_ignore(arch_env, other_different)) {
- DBG((mod, LEVEL_1, "ignore constraint for %+F because other_irn is ignore\n", irn));
+ if (arch_irn_is(arch_env, other_different, ignore) || ! mode_is_datab(get_irn_mode(other_different))) {
+ DBG((mod, LEVEL_1, "ignore constraint for %+F because other_irn is ignore or not a datab node\n", irn));
return;
}
in[0] = irn;
in[1] = cpy;
+ /* Let the irn use the copy instead of the old other_different */
+ fix_in(irn, other_different, cpy);
+
/* Add the Keep resp. CopyKeep and reroute the users */
/* of the other_different irn in case of CopyKeep. */
- if (get_n_out_edges(other_different) == 1) {
+ if (get_n_out_edges(other_different) == 0) {
keep = be_new_Keep(cls, birg->irg, block, 2, in);
}
else {
- keep = be_new_CopyKeep(cls, birg->irg, block, cpy, 2, in, get_irn_mode(other_different));
+ keep = be_new_CopyKeep_single(cls, birg->irg, block, cpy, irn, get_irn_mode(other_different));
+ be_node_set_reg_class(keep, 1, cls);
edges_reroute(other_different, keep, birg->irg);
}
/* after rerouting: let the copy point to the other_different irn */
set_irn_n(cpy, 0, other_different);
- /* Let the irn use the copy instead of the old other_different */
- fix_in(irn, other_different, cpy);
-
DBG((mod, LEVEL_1, "created %+F for %+F to assure should_be_different\n", keep, irn));
}