*
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
+#include "config.h"
#endif
#include "obst.h"
#include "iredges_t.h"
#include "ircons_t.h"
#include "irprintf.h"
+#include "xmalloc.h"
#include "beutil.h"
#include "bearch.h"
assert(is_Phi(node));
loc.time = USES_INFINITY;
DBG((dbg, DBG_START, " %+F not taken (dead)\n", node));
+ if(is_Phi(node)) {
+ be_spill_phi(env->senv, node);
+ }
return loc;
}
ARR_APP1(loc_t, delayed, loc);
else
ARR_APP1(loc_t, starters, loc);
- } else {
- be_spill_phi(env->senv, irn);
}
}
for (i = 0; i < ARR_LEN(delayed) && i < free_slots; ++i) {
DBG((dbg, DBG_START, " delayed %+F taken\n", delayed[i].irn));
ARR_APP1(loc_t, starters, delayed[i]);
+ delayed[i].irn = NULL;
+ }
+
+ /* spill all delayed phis which didn't make it into start workset */
+ for (i = ARR_LEN(delayed) - 1; i >= 0; --i) {
+ ir_node *irn = delayed[i].irn;
+ if (irn && is_Phi(irn)) {
+ DBG((dbg, DBG_START, " spilling delayed phi %+F\n", irn));
+ be_spill_phi(env->senv, irn);
+ }
}
DEL_ARR_F(delayed);
void be_spill_belady_spill_env(be_irg_t *birg, const arch_register_class_t *cls, spill_env_t *spill_env) {
belady_env_t env;
ir_graph *irg = be_get_birg_irg(birg);
+ int n_regs;
+
+ /* some special classes contain only ignore regs, nothing to do then */
+ n_regs = cls->n_regs - be_put_ignore_regs(birg, cls, NULL);
+ if(n_regs == 0)
+ return;
be_invalidate_liveness(birg);
be_assure_liveness(birg);
env.arch = birg->main_env->arch_env;
env.cls = cls;
env.lv = be_get_birg_liveness(birg);
- env.n_regs = env.cls->n_regs - be_put_ignore_regs(birg, cls, NULL);
+ env.n_regs = n_regs;
env.ws = new_workset(&env, &env.ob);
env.uses = be_begin_uses(irg, env.lv);
env.loop_ana = be_new_loop_pressure(birg);