X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeschednormal.c;h=df84887a5c54f2f667c1bba7452718934f186777;hb=dd4cd761ab637d4488c7e29f49843b1b02366acf;hp=75071c596b33ab3fce4e0ffc4305480e79605f7b;hpb=362872980b97a68e388ae3bfc429dd5390ca3b93;p=libfirm

diff --git a/ir/be/beschednormal.c b/ir/be/beschednormal.c
index 75071c596..df84887a5 100644
--- a/ir/be/beschednormal.c
+++ b/ir/be/beschednormal.c
@@ -36,10 +36,11 @@
 #include "irtools.h"
 #include "irgwalk.h"
 #include "benode_t.h"
-
+#include "array_t.h"
 
 // XXX there is no one time init for schedulers
 //#define NORMAL_DBG
+#include "irprintf.h"
 
 
 static int must_be_scheduled(const ir_node* const irn)
@@ -94,8 +95,10 @@ static int cost_cmp(const void* a, const void* b)
 	const irn_cost_pair* const a1 = a;
 	const irn_cost_pair* const b1 = b;
 	int ret = b1->cost - a1->cost;
+	if (ret == 0)
+		ret = (int)get_irn_idx(a1->irn) - (int)get_irn_idx(b1->irn);
 #if defined NORMAL_DBG
-	ir_fprintf(stderr, "%+F %s %+F\n", a1->irn, ret < 0 ? "<" : ret > 0 ? ">" : "=", b1->irn);
+	ir_fprintf(stderr, "cost %+F %s %+F\n", a1->irn, ret < 0 ? "<" : ret > 0 ? ">" : "=", b1->irn);
 #endif
 	return ret;
 }
@@ -126,6 +129,7 @@ static int normal_tree_cost(ir_node* irn)
 	flag_and_cost* fc    = get_irn_link(irn);
 	ir_node*       block = get_nodes_block(irn);
 	int            arity = get_irn_arity(irn);
+	ir_node*       last;
 	int            n_res;
 	int            cost;
 	int            n_op_res = 0;
@@ -179,10 +183,14 @@ static int normal_tree_cost(ir_node* irn)
 	}
 
 	cost = 0;
+	last = 0;
 	for (i = 0; i < arity; ++i) {
-		if (get_irn_mode(fc->costs[i].irn) == mode_M) continue;
-		if (arch_irn_is(cur_arch_env, fc->costs[i].irn, ignore)) continue;
+		ir_node* op = fc->costs[i].irn;
+		if (op == last)                            continue;
+		if (get_irn_mode(op) == mode_M)            continue;
+		if (arch_irn_is(cur_arch_env, op, ignore)) continue;
 		cost = MAX(fc->costs[i].cost + n_op_res, cost);
+		last = op;
 		++n_op_res;
 	}
 	n_res = count_result(irn);
@@ -280,7 +288,7 @@ static int root_cmp(const void* a, const void* b)
 		}
 	}
 #if defined NORMAL_DBG
-	ir_fprintf(stderr, "%+F %s %+F\n", a1->irn, ret < 0 ? "<" : ret > 0 ? ">" : "=", b1->irn);
+	ir_fprintf(stderr, "root %+F %s %+F\n", a1->irn, ret < 0 ? "<" : ret > 0 ? ">" : "=", b1->irn);
 #endif
 	return ret;
 }