Simplify x87_dump_stack().

[libfirm] / ir / be / belower.c

diff --git a/ir/be/belower.c b/ir/be/belower.c
index 6556382..29ee427 100644 (file)
--- a/ir/be/belower.c
+++ b/ir/be/belower.c
@@ -23,7 +23,6 @@
  *              register constraints.
  * @author      Christian Wuerdig
  * @date        14.12.2005
- * @version     $Id$
  */
 #include "config.h"
 
@@ -302,8 +301,6 @@ static void lower_perm_node(ir_node *irn, lower_env_t *env)
         * NOTE: This works with auto-magic. If we insert the new copy/exchange
         * nodes after this node, everything should be ok. */
        ir_node                     *      sched_point = sched_prev(irn);
-       const ir_edge_t             *      edge;
-       const ir_edge_t             *      next;
        int                                n;
        int                                i;
 
@@ -314,7 +311,7 @@ static void lower_perm_node(ir_node *irn, lower_env_t *env)
 
        /* build the list of register pairs (in, out) */
        n = 0;
-       foreach_out_edge_safe(irn, edge, next) {
+       foreach_out_edge_safe(irn, edge) {
                ir_node               *const out     = get_edge_src_irn(edge);
                long                   const pn      = get_Proj_proj(out);
                ir_node               *const in      = get_irn_n(irn, pn);
@@ -556,7 +553,7 @@ static void gen_assure_different_pattern(ir_node *irn, ir_node *other_different,
        sched_add_after(skip_Proj(irn), keep);
 
        /* insert the other different and its copies into the map */
-       entry = (op_copy_assoc_t*)ir_nodehashmap_get(op_set, other_different);
+       entry = ir_nodehashmap_get(op_copy_assoc_t, op_set, other_different);
        if (! entry) {
                entry      = OALLOC(&env->obst, op_copy_assoc_t);
                entry->cls = cls;
@@ -622,15 +619,12 @@ static void assure_different_constraints(ir_node *irn, ir_node *skipped_irn, con
  */
 static void assure_constraints_walker(ir_node *block, void *walk_env)
 {
-       ir_node *irn;
        constraint_env_t *env = (constraint_env_t*)walk_env;
 
        sched_foreach_reverse(block, irn) {
                ir_mode *mode = get_irn_mode(irn);
 
                if (mode == mode_T) {
-                       const ir_edge_t *edge;
-
                        foreach_out_edge(irn, edge) {
                                ir_node *proj = get_edge_src_irn(edge);
 
@@ -657,9 +651,7 @@ static void melt_copykeeps(constraint_env_t *cenv)
        foreach_ir_nodehashmap(&cenv->op_set, map_entry, map_iter) {
                op_copy_assoc_t *entry = (op_copy_assoc_t*)map_entry.data;
                int     idx, num_ck;
-               ir_node *cp;
                struct obstack obst;
-               ir_nodeset_iterator_t iter;
                ir_node **ck_arr, **melt_arr;
 
                obstack_init(&obst);
@@ -789,8 +781,6 @@ void assure_constraints(ir_graph *irg)
                op_copy_assoc_t          *entry = (op_copy_assoc_t*)map_entry.data;
                size_t                    n     = ir_nodeset_size(&entry->copies);
                ir_node                 **nodes = ALLOCAN(ir_node*, n);
-               ir_node                  *cp;
-               ir_nodeset_iterator_t     iter;
                be_ssa_construction_env_t senv;
 
                /* put the node in an array */
@@ -833,10 +823,9 @@ void assure_constraints(ir_graph *irg)
 
        ir_nodehashmap_destroy(&cenv.op_set);
        obstack_free(&cenv.obst, NULL);
-       be_liveness_invalidate(be_get_irg_liveness(irg));
+       be_invalidate_live_sets(irg);
 }
 
-
 /**
  * Push nodes that do not need to be permed through the Perm.
  * This is commonly a reload cascade at block ends.
@@ -854,7 +843,6 @@ static int push_through_perm(ir_node *perm)
 {
        ir_graph *irg     = get_irn_irg(perm);
        ir_node *bl       = get_nodes_block(perm);
-       ir_node *node;
        int  arity        = get_irn_arity(perm);
        int *map;
        int *proj_map;
@@ -862,12 +850,10 @@ static int push_through_perm(ir_node *perm)
        int n_moved;
        int new_size;
        ir_node *frontier = bl;
-       ir_node *irn;
        int i, n;
 
        /* get some Proj and find out the register class of that Proj. */
-       const ir_edge_t             *edge     = get_irn_out_edge_first_kind(perm, EDGE_KIND_NORMAL);
-       ir_node                     *one_proj = get_edge_src_irn(edge);
+       ir_node                     *one_proj = get_edge_src_irn(get_irn_out_edge_first_kind(perm, EDGE_KIND_NORMAL));
        const arch_register_class_t *cls      = arch_get_irn_reg_class(one_proj);
        assert(is_Proj(one_proj));
 
@@ -896,9 +882,12 @@ found_front:
 
        DB((dbg_permmove, LEVEL_2, "\tfrontier: %+F\n", frontier));
 
-       node = sched_prev(perm);
        n_moved = 0;
-       while (!sched_is_begin(node)) {
+       for (;;) {
+               ir_node *const node = sched_prev(perm);
+               if (node == frontier)
+                       break;
+
                const arch_register_req_t *req;
                int                        input = -1;
                ir_node                   *proj  = NULL;
@@ -917,8 +906,6 @@ found_front:
                /* it wasn't an input to the perm, we can't do anything more */
                if (input < 0)
                        break;
-               if (!sched_comes_after(frontier, node))
-                       break;
                if (arch_irn_is(node, modify_flags))
                        break;
                req = arch_get_irn_register_req(node);
@@ -947,8 +934,6 @@ found_front:
 
                bitset_set(moved, input);
                n_moved++;
-
-               node = sched_prev(node);
        }
 
        /* well, we could not push anything through the perm */
@@ -1015,7 +1000,7 @@ void lower_nodes_after_ra(ir_graph *irg, int do_copy)
        env.do_copy = do_copy;
 
        /* we will need interference */
-       be_liveness_assure_chk(be_get_irg_liveness(irg));
+       be_assure_live_chk(irg);
 
        irg_walk_graph(irg, NULL, lower_nodes_after_ra_walker, &env);
 }