Added Imm nodes to bearch_firm

diff --git a/ir/be/bearch_firm.c b/ir/be/bearch_firm.c
index 21747f3..3779dd6 100644 (file)
--- a/ir/be/bearch_firm.c
+++ b/ir/be/bearch_firm.c
@@ -99,10 +99,18 @@ static void firm_init(void)
        }
 
        if(!op_imm) {
-               op_imm = new_ir_op(get_next_ir_opcode(), "Imm",
+               rflct_sig_t *sig;
+               int imm_opc = get_next_ir_opcode();
+
+               op_imm = new_ir_op(imm_opc, "Imm",
                                op_pin_state_pinned, 0, oparity_zero, 0, sizeof(imm_attr_t));
-       }
 
+               sig = rflct_signature_allocate(1, 1);
+               rflct_signature_set_arg(sig, 0, 0, "Imm", RFLCT_MC(Data), 0, 0);
+               rflct_signature_set_arg(sig, 1, 0, "Block", RFLCT_MC(BB), 0, 0);
+               rflct_new_opcode(imm_opc, "Imm", false);
+               rflct_opcode_add_signature(imm_opc, sig);
+       }
 }
 
 static int firm_get_n_reg_class(void)
@@ -332,15 +340,28 @@ static void prepare_walker(ir_node *irn, void *data)
                }
        }
 
-       else if(opc == iro_Const || opc == iro_SymConst) {
-               ir_node *bl   = get_nodes_block(irn);
-               ir_graph *irg = get_irn_irg(bl);
+}
 
-               ir_node *imm = new_Imm(irg, bl, irn);
-               exchange(irn, imm);
-               set_irn_link(imm, imm);
-       }
+static void localize_const_walker(ir_node *irn, void *data)
+{
+       if(!is_Block(irn)) {
+               int i, n;
+               ir_node *bl = get_nodes_block(irn);
+
+               for(i = 0, n = get_irn_arity(irn); i < n; ++i) {
+                       ir_node *op    = get_irn_n(irn, i);
+                       opcode opc     = get_irn_opcode(op);
+
+                       if(opc == iro_Const || opc == iro_SymConst) {
+                               ir_graph *irg   = get_irn_irg(bl);
+                               ir_node *imm_bl = is_Phi(irn) ? get_Block_cfgpred_block(bl, i) : bl;
 
+                               ir_node *imm = new_Imm(irg, imm_bl, op);
+                               set_irn_n(irn, i, imm);
+                       }
+
+               }
+       }
 }
 
 static void clear_link(ir_node *irn, void *data)
@@ -350,7 +371,7 @@ static void clear_link(ir_node *irn, void *data)
 
 static void firm_prepare_graph(ir_graph *irg)
 {
-       irg_walk_graph(irg, clear_link, NULL, NULL);
+       irg_walk_graph(irg, clear_link, localize_const_walker, NULL);
        irg_walk_graph(irg, NULL, prepare_walker, NULL);
 }
 

diff --git a/ir/be/bespillilp.c b/ir/be/bespillilp.c
index 535c22c..4970343 100644 (file)
--- a/ir/be/bespillilp.c
+++ b/ir/be/bespillilp.c
@@ -567,18 +567,20 @@ static void writeback_results(spill_ilp_t *si)
                /* Go through all live ranges of the node. */
     list_for_each_entry(live_range_t, lr, &uh->head, list) {
       int spilled = is_spilled(si, lr);
+                       int rematd  = !is_zero(lpp_get_var_sol(si->lpp, lr->is_remat_var));
 
-      if(spilled && !is_end_of_block_use(lr)) {
+                       if(spilled && !is_end_of_block_use(lr)) {
                                ir_node *bl      = get_nodes_block(lr->user);
                                ir_node *spill   = spill_live_range(si, lr, rem_phis);
                                ir_node *reload  = new_Reload(fact, si->cls,
                                                si->session_env->irg, bl, mode, spill);
 
                                obstack_ptr_grow(si->obst, reload);
-        n_reloads++;
+                               n_reloads++;
 
                                sched_add_before(lr->user, reload);
                        }
+
     }
 
                if(n_reloads > 0) {
@@ -618,7 +620,7 @@ void be_spill_ilp(const be_main_session_env_t *session_env,
   si.live_ranges    = new_set(cmp_live_range, 16384);
   si.spill_ctx      = new_set(cmp_spill_ctx, 4096);
        si.enable_remat   = 1;
-       si.enable_store   = 1;
+       si.enable_store   = 0;
 
        firm_dbg_set_mask(si.dbg, DBG_LEVEL);
   irg_block_walk_graph(session_env->irg, process_block, NULL, &si);