remove irsimpletype stuff (unused/broken)

[libfirm] / ir / be / bepeephole.c

diff --git a/ir/be/bepeephole.c b/ir/be/bepeephole.c
index c14faf8..26a9c4a 100644 (file)
--- a/ir/be/bepeephole.c
+++ b/ir/be/bepeephole.c
@@ -193,9 +193,9 @@ static void process_block(ir_node *block, void *data)
        (void) data;
 
        /* construct initial register assignment */
-       n_classes = arch_env_get_n_reg_class(arch_env);
+       n_classes = arch_env->n_register_classes;
        for (i = 0; i < n_classes; ++i) {
-               const arch_register_class_t *cls    = arch_env_get_reg_class(arch_env, i);
+               const arch_register_class_t *cls    = &arch_env->register_classes[i];
                unsigned                     n_regs = arch_register_class_n_regs(cls);
                memset(register_values[i], 0, sizeof(ir_node*) * n_regs);
        }
@@ -235,13 +235,14 @@ static void process_block(ir_node *block, void *data)
 
 static void kill_node_and_preds(ir_node *node)
 {
+       ir_graph *irg = get_irn_irg(node);
        int arity, i;
 
        arity = get_irn_arity(node);
        for (i = 0; i < arity; ++i) {
                ir_node *pred = get_irn_n(node, i);
 
-               set_irn_n(node, i, new_Bad());
+               set_irn_n(node, i, new_r_Bad(irg));
                if (get_irn_n_edges(pred) != 0)
                        continue;
 
@@ -307,7 +308,8 @@ static void skip_barrier(ir_node *block, ir_graph *irg)
                                assert(n < n_in);
                                in[n++] = get_irn_n(irn, i);
                        }
-                       keep = be_new_Keep(get_nodes_block(irn), n_in, in);
+                       keep = be_new_Barrier(get_nodes_block(irn), n_in, in);
+                       keep_alive(keep);
                        sched_add_before(irn, keep);
                }
 
@@ -319,10 +321,10 @@ static void skip_barrier(ir_node *block, ir_graph *irg)
 /**
  * Kill the Barrier nodes for better peephole optimization.
  */
-static void    kill_barriers(ir_graph *irg)
+static void kill_barriers(ir_graph *irg)
 {
        ir_node *end_blk = get_irg_end_block(irg);
-       ir_node *start_blk;
+       ir_node *start_blk = get_irg_start_block(irg);
        int i;
 
        /* skip the barrier on all return blocks */
@@ -330,6 +332,9 @@ static void kill_barriers(ir_graph *irg)
                ir_node *be_ret = get_Block_cfgpred(end_blk, i);
                ir_node *ret_blk = get_nodes_block(be_ret);
 
+               if (ret_blk == start_blk)
+                       continue;
+
                skip_barrier(ret_blk, irg);
        }
 
@@ -405,11 +410,10 @@ ir_node *be_peephole_IncSP_IncSP(ir_node *node)
        return pred;
 }
 
-void be_peephole_opt(be_irg_t *birg)
+void be_peephole_opt(ir_graph *irg)
 {
-       ir_graph   *irg = be_get_birg_irg(birg);
-       unsigned n_classes;
-       unsigned i;
+       unsigned  n_classes;
+       unsigned  i;
 
        /* barrier nodes are used for register allocations. They hinders
         * peephole optimizations, so remove them here. */
@@ -417,16 +421,16 @@ void be_peephole_opt(be_irg_t *birg)
 
        /* we sometimes find BadE nodes in float apps like optest_float.c or
         * kahansum.c for example... */
-       be_liveness_invalidate(birg->lv);
-       be_liveness_assure_sets(be_assure_liveness(birg));
+       be_liveness_invalidate(be_get_irg_liveness(irg));
+       be_liveness_assure_sets(be_assure_liveness(irg));
 
-       arch_env = be_get_birg_arch_env(birg);
-       lv       = be_get_birg_liveness(birg);
+       arch_env = be_get_irg_arch_env(irg);
+       lv       = be_get_irg_liveness(irg);
 
-       n_classes = arch_env_get_n_reg_class(arch_env);
+       n_classes = arch_env->n_register_classes;
        register_values = XMALLOCN(ir_node**, n_classes);
        for (i = 0; i < n_classes; ++i) {
-               const arch_register_class_t *cls    = arch_env_get_reg_class(arch_env, i);
+               const arch_register_class_t *cls    = &arch_env->register_classes[i];
                unsigned                     n_regs = arch_register_class_n_regs(cls);
                register_values[i] = XMALLOCN(ir_node*, n_regs);
        }