localopt stuff for const-code irg

[libfirm] / ir / be / beirgmod.c

diff --git a/ir/be/beirgmod.c b/ir/be/beirgmod.c
index 3270e2c..e7c7530 100644 (file)
--- a/ir/be/beirgmod.c
+++ b/ir/be/beirgmod.c
@@ -69,6 +69,15 @@
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
+static int cmp_node_nr(const void *a, const void *b)
+{
+       ir_node **p1 = (ir_node**)a;
+       ir_node **p2 = (ir_node**)b;
+       long      n1 = get_irn_node_nr(*p1);
+       long      n2 = get_irn_node_nr(*p2);
+       return (n1>n2) - (n1<n2);
+}
+
 /*
   ___                     _     ____
  |_ _|_ __  ___  ___ _ __| |_  |  _ \ ___ _ __ _ __ ___
@@ -81,12 +90,11 @@ DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 ir_node *insert_Perm_after(ir_graph *irg, const arch_register_class_t *cls,
                                                   ir_node *pos)
 {
-       be_lv_t *lv     = be_get_irg_liveness(irg);
-       ir_node *bl     = is_Block(pos) ? pos : get_nodes_block(pos);
-       ir_nodeset_t          live;
-       ir_nodeset_iterator_t iter;
+       be_lv_t     *lv = be_get_irg_liveness(irg);
+       ir_node     *bl = is_Block(pos) ? pos : get_nodes_block(pos);
+       ir_nodeset_t live;
 
-       ir_node *irn, *perm, **nodes;
+       ir_node *perm, **nodes;
        size_t i, n;
 
        DBG((dbg, LEVEL_1, "Insert Perm after: %+F\n", pos));
@@ -110,6 +118,8 @@ ir_node *insert_Perm_after(ir_graph *irg, const arch_register_class_t *cls,
                i++;
        }
        ir_nodeset_destroy(&live);
+       /* make the input order deterministic */
+       qsort(nodes, n, sizeof(nodes[0]), cmp_node_nr);
 
        perm = be_new_Perm(cls, bl, n, nodes);
        sched_add_after(pos, perm);
@@ -145,16 +155,13 @@ static int blocks_removed;
  */
 static void remove_empty_block(ir_node *block)
 {
-       const ir_edge_t *edge;
-       const ir_edge_t *next;
-       int              i;
-       int              arity;
-       ir_node         *node;
-       ir_node         *pred;
-       ir_node         *succ_block;
-       ir_node         *jump = NULL;
-       ir_graph        *irg = get_irn_irg(block);
-       ir_entity       *entity;
+       int        i;
+       int        arity;
+       ir_node   *pred;
+       ir_node   *succ_block;
+       ir_node   *jump = NULL;
+       ir_graph  *irg = get_irn_irg(block);
+       ir_entity *entity;
 
        if (irn_visited_else_mark(block))
                return;
@@ -179,7 +186,7 @@ static void remove_empty_block(ir_node *block)
        entity     = get_Block_entity(block);
        pred       = get_Block_cfgpred(block, 0);
        succ_block = NULL;
-       foreach_out_edge_safe(jump, edge, next) {
+       foreach_out_edge_safe(jump, edge) {
                int pos = get_edge_src_pos(edge);
 
                assert(succ_block == NULL);
@@ -202,8 +209,8 @@ static void remove_empty_block(ir_node *block)
 
        /* there can be some non-scheduled Pin nodes left in the block, move them
         * to the succ block (Pin) or pred block (Sync) */
-       foreach_out_edge_safe(block, edge, next) {
-               node = get_edge_src_irn(edge);
+       foreach_out_edge_safe(block, edge) {
+               ir_node *const node = get_edge_src_irn(edge);
 
                if (node == jump)
                        continue;
@@ -309,9 +316,7 @@ static void remove_dead_nodes_walker(ir_node *block, void *data)
 
                /* kill projs */
                if (get_irn_mode(node) == mode_T) {
-                       const ir_edge_t *edge;
-                       const ir_edge_t *next_edge;
-                       foreach_out_edge_safe(node, edge, next_edge) {
+                       foreach_out_edge_safe(node, edge) {
                                ir_node *proj = get_edge_src_irn(edge);
                                if (!is_Proj(proj))
                                        continue;