#include "obst.h"
#include "set.h"
#include "pset.h"
+#include "irprintf_t.h"
#include "irgraph.h"
#include "irnode.h"
#include "irmode.h"
#include "irgwalk.h"
#include "iredges_t.h"
#include "ircons_t.h"
+#include "irprintf.h"
#include "beutil.h"
#include "bearch.h"
static INLINE unsigned get_distance(belady_env_t *bel, const ir_node *from, unsigned from_step, const ir_node *def, int skip_from_uses)
{
arch_irn_flags_t fl = arch_irn_get_flags(bel->arch, def);
- if((fl & (arch_irn_flags_ignore | arch_irn_flags_dont_spill)) != 0)
+ unsigned dist = be_get_next_use(bel->uses, from, from_step, def, skip_from_uses);
+
+ if(!USES_IS_INIFINITE(dist) && (fl & (arch_irn_flags_ignore | arch_irn_flags_dont_spill)) != 0)
return 0;
- else
- return be_get_next_use(bel->uses, from, from_step, def, skip_from_uses);
+
+ return dist;
}
/**
ir_node *irn;
for (irn = pset_first(bel->copies); irn; irn = pset_next(bel->copies)) {
- ir_node *src, *spill;
+ ir_node *src, *user;
assert(be_is_Copy(irn));
assert(get_irn_n_edges(irn) == 1 && "This is not a copy introduced in 'compute_block_start_info()'. Who created it?");
- spill = get_irn_edge(get_irn_irg(irn), irn, 0)->src;
- assert(be_is_Spill(spill) && "This is not a copy introduced in 'compute_block_start_info()'. Who created it?");
+ user = get_irn_edge(get_irn_irg(irn), irn, 0)->src;
- src = get_irn_n(irn, 0);
- set_irn_n(spill, 0, src);
+ src = get_irn_n(irn, be_pos_Copy_orig);
+ set_irn_n(user, 0, src);
}
}
ir_node *spill;
DBG((dbg, DBG_SPILL, "Removing %+F before %+F in %+F\n", irn, sched_next(irn), get_nodes_block(irn)));
- spill = get_irn_n(irn, 0);
+ if (be_is_Reload(irn))
+ spill = get_irn_n(irn, be_pos_Reload_mem);
/* remove reload */
set_irn_n(irn, 0, new_Bad());
sched_remove(irn);
- /* if spill not used anymore, remove it too
- * test of regclass is necessary since spill may be a phi-M */
- if (get_irn_n_edges(spill) == 0 && bel->cls == arch_get_irn_reg_class(bel->arch, spill, -1)) {
- set_irn_n(spill, 0, new_Bad());
- sched_remove(spill);
+ if (be_is_Reload(irn)) {
+ /* if spill not used anymore, remove it too
+ * test of regclass is necessary since spill may be a phi-M */
+ if (get_irn_n_edges(spill) == 0 && bel->cls == arch_get_irn_reg_class(bel->arch, spill, -1)) {
+ set_irn_n(spill, 0, new_Bad());
+ sched_remove(spill);
+ }
}
}
}