- moved the imul mem,imm32 splitting into peephole optimizations

[libfirm] / ir / be / bestate.c

diff --git a/ir/be/bestate.c b/ir/be/bestate.c
index 97639e2..8e819fd 100644 (file)
--- a/ir/be/bestate.c
+++ b/ir/be/bestate.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -186,7 +186,7 @@ void spill_phi(minibelady_env_t *env, ir_node *phi)
 
        /* create a new phi-M with bad preds */
        for(i = 0; i < arity; ++i) {
-               in[i] = new_r_Bad(irg);
+               in[i] = new_r_Unknown(irg, mode_M);
        }
 
        DBG((dbg, LEVEL_2, "\tcreate Phi-M for %+F\n", phi));
@@ -315,6 +315,9 @@ block_info_t *compute_block_start_state(minibelady_env_t *env, ir_node *block)
        be_lv_foreach(env->lv, block, be_lv_state_in, i) {
                node = be_lv_get_irn(env->lv, block, i);
 
+               if(!mode_is_data(get_irn_mode(node)))
+                       continue;
+
                if (arch_get_irn_register(env->arch_env, node) != env->reg)
                        continue;
 
@@ -400,9 +403,13 @@ void belady(minibelady_env_t *env, ir_node *block)
                /* check which state is desired for the node */
                arity = get_irn_arity(node);
                for(i = 0; i < arity; ++i) {
+                       const arch_register_t *reg;
                        ir_node *in = get_irn_n(node, i);
-                       const arch_register_t *reg =
-                               arch_get_irn_register(env->arch_env, in);
+
+                       if(!mode_is_data(get_irn_mode(in)))
+                               continue;
+
+                       reg = arch_get_irn_register(env->arch_env, in);
                        if(reg == env->reg) {
                                assert(need_val == NULL);
                                need_val = in;
@@ -423,20 +430,26 @@ void belady(minibelady_env_t *env, ir_node *block)
                        const ir_edge_t *edge;
 
                        foreach_out_edge(node, edge) {
+                               const arch_register_t *reg;
                                ir_node *proj = get_edge_src_irn(edge);
-                               const arch_register_t *reg =
-                                       arch_get_irn_register(env->arch_env, proj);
+
+                               if(!mode_is_data(get_irn_mode(proj)))
+                                       continue;
+
+                               reg = arch_get_irn_register(env->arch_env, proj);
                                if(reg == env->reg) {
                                        current_state = proj;
                                        DBG((dbg, LEVEL_3, "\t... current_state <- %+F\n", current_state));
                                }
                        }
                } else {
-                       const arch_register_t *reg =
-                               arch_get_irn_register(env->arch_env, node);
-                       if(reg == env->reg) {
-                               current_state = node;
-                               DBG((dbg, LEVEL_3, "\t... current_state <- %+F\n", current_state));
+                       if(mode_is_data(get_irn_mode(node))) {
+                               const arch_register_t *reg =
+                                       arch_get_irn_register(env->arch_env, node);
+                               if(reg == env->reg) {
+                                       current_state = node;
+                                       DBG((dbg, LEVEL_3, "\t... current_state <- %+F\n", current_state));
+                               }
                        }
                }
        }
@@ -547,7 +560,7 @@ void be_assure_state(be_irg_t *birg, const arch_register_t *reg, void *func_env,
        ir_nodemap_init(&env.spill_infos);
 
        assure_doms(irg);
-       set_using_visited(irg);
+       set_using_irn_visited(irg);
        set_using_irn_link(irg);
        inc_irg_visited(irg);
 
@@ -557,7 +570,7 @@ void be_assure_state(be_irg_t *birg, const arch_register_t *reg, void *func_env,
        /* fix block end_states that don't match the next blocks start_state */
        irg_block_walk_graph(irg, fix_block_borders, NULL, &env);
 
-       clear_using_visited(irg);
+       clear_using_irn_visited(irg);
        clear_using_irn_link(irg);
 
        /* reconstruct ssa-form */