use the correct mode for DIV

[libfirm] / ir / be / bespillbelady.c

diff --git a/ir/be/bespillbelady.c b/ir/be/bespillbelady.c
index d2da6f0..2f92532 100644 (file)
--- a/ir/be/bespillbelady.c
+++ b/ir/be/bespillbelady.c
@@ -502,9 +502,9 @@ static void belady(ir_node *block, void *data) {
  * about the set of live-ins. Thus we must adapt the
  * live-outs to the live-ins at each block-border.
  */
-static void fix_block_borders(ir_node *blk, void *env) {
+static void fix_block_borders(ir_node *blk, void *data) {
+       belady_env_t *env = data;
        workset_t *wsb;
-       belady_env_t *bel = env;
        int i, max, iter, iter2;
 
        DBG((dbg, DBG_FIX, "\n"));
@@ -522,9 +522,14 @@ static void fix_block_borders(ir_node *blk, void *env) {
                workset_foreach(wsb, irnb, iter) {
                        /* if irnb is a phi of the current block we reload
                         * the corresponding argument, else irnb itself */
-                       if(is_Phi(irnb) && blk == get_nodes_block(irnb))
+                       if(is_Phi(irnb) && blk == get_nodes_block(irnb)) {
                                irnb = get_irn_n(irnb, i);
 
+                               // we might have unknowns as argument for the phi
+                               if(!arch_irn_consider_in_reg_alloc(env->arch, env->cls, irnb))
+                                       continue;
+                       }
+
                        /* Unknowns are available everywhere */
                        if(get_irn_opcode(irnb) == iro_Unknown)
                                continue;
@@ -537,7 +542,7 @@ static void fix_block_borders(ir_node *blk, void *env) {
 
                        /* irnb is not in memory at the end of pred, so we have to reload it */
                        DBG((dbg, DBG_FIX, "    reload %+F\n", irnb));
-                       be_add_reload_on_edge(bel->senv, irnb, blk, i);
+                       be_add_reload_on_edge(env->senv, irnb, blk, i);
 
 next_value:
                        /*epsilon statement :)*/;
@@ -570,11 +575,15 @@ void be_spill_belady_spill_env(const be_chordal_env_t *chordal_env, spill_env_t
 
        DBG((dbg, LEVEL_1, "running on register class: %s\n", env.cls->name));
 
-       /* do the work */
        be_clear_links(chordal_env->irg);
+       /* Decide which phi nodes will be spilled and place copies for them into the graph */
        irg_block_walk_graph(chordal_env->irg, place_copy_walker, NULL, &env);
+       be_place_copies(env.senv);
+       /* Fix high register pressure with belady algorithm */
        irg_block_walk_graph(chordal_env->irg, NULL, belady, &env);
+       /* belady was block-local, fix the global flow by adding reloads on the edges */
        irg_block_walk_graph(chordal_env->irg, fix_block_borders, NULL, &env);
+       /* Insert spill/reload nodes into the graph and fix usages */
        be_insert_spills_reloads(env.senv);
 
        be_remove_dead_nodes_from_schedule(chordal_env->irg);