X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fldst2.c;h=d73a8f76aa82e8f7620cdde3a4075d3ac6a08c0f;hb=0f8ce2cb3442f33f0e5b07106151513f2100d562;hp=deed71c6e807c7ce4f027ff9799cc8fb73d3fc4d;hpb=9bf7cffd000f23a53c12242b5ecdc797bcdf1840;p=libfirm

diff --git a/ir/opt/ldst2.c b/ir/opt/ldst2.c
index deed71c6e..d73a8f76a 100644
--- a/ir/opt/ldst2.c
+++ b/ir/opt/ldst2.c
@@ -23,13 +23,11 @@
  * @author  Christoph Mallon
  * @version $Id: $
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "iroptimize.h"
 
-#include "array.h"
+#include "array_t.h"
 #include "debug.h"
 #include "ircons.h"
 #include "irgraph.h"
@@ -43,6 +41,7 @@
 #include "irdump.h"
 #include "irflag_t.h"
 #include "irprintf.h"
+#include "irpass.h"
 
 #if +0
 #define OPTIMISE_LOAD_AFTER_LOAD
@@ -165,6 +164,14 @@ static ir_alias_relation AliasTest(ir_graph* irg, ir_node* addr, ir_mode* mode,
 }
 
 
+static int in_cmp(void const* va, void const* vb)
+{
+	ir_node const* const a = *(ir_node const*const*)va;
+	ir_node const* const b = *(ir_node const*const*)vb;
+	return get_irn_idx(a) - get_irn_idx(b);
+}
+
+
 static ir_node* GenerateSync(ir_graph* irg, ir_node* block, ir_nodeset_t* after_set)
 {
 	size_t set_size = ir_nodeset_size(after_set);
@@ -183,6 +190,7 @@ static ir_node* GenerateSync(ir_graph* irg, ir_node* block, ir_nodeset_t* after_
 		for (i = 0; i < set_size; i++) {
 			in[i] = ir_nodeset_iterator_next(&iter);
 		}
+		qsort(in, set_size, sizeof(*in), in_cmp);
 		return new_r_Sync(irg, block, set_size, in);
 	}
 }
@@ -361,7 +369,7 @@ static int WalkMem(ir_graph* irg, ir_node* node, ir_node* last_block)
 	if (block != last_block) {
 		DB((dbg, LEVEL_3, "===> Changing block from %+F to %+F\n", last_block, block));
 		block_change = 1;
-		if (Block_not_block_visited(block)) {
+		if (!Block_block_visited(block)) {
 			mark_Block_block_visited(block);
 		} else {
 			DB((dbg, LEVEL_2, "===> Hit already visited block at %+F\n", node));
@@ -401,7 +409,7 @@ static int WalkMem(ir_graph* irg, ir_node* node, ir_node* last_block)
 				ir_node* unknown;
 
 				DB((dbg, LEVEL_3, "===> The predecessor was not finished yet\n"));
-				assert(!Block_not_block_visited(pred_block));
+				assert(Block_block_visited(pred_block));
 
 				unknown = new_r_Unknown(irg, mode_M);
 				for (i = 0; i < count_addrs; i++) {
@@ -516,7 +524,7 @@ static void Detotalise(ir_graph* irg)
 	size_t npreds = get_Block_n_cfgpreds(end_block);
 	size_t i;
 
-	unfinished_phis = xmalloc(sizeof(*unfinished_phis) * count_addrs);
+	unfinished_phis = XMALLOCN(ir_node, count_addrs);
 	for (i = 0; i < count_addrs; i++) {
 		unfinished_phis[i] = NULL;
 	}
@@ -534,6 +542,7 @@ static void Detotalise(ir_graph* irg)
 #endif
 
 
+#if 0
 static void AddSyncPreds(ir_nodeset_t* preds, ir_node* sync)
 {
 	size_t n = get_Sync_n_preds(sync);
@@ -549,7 +558,6 @@ static void AddSyncPreds(ir_nodeset_t* preds, ir_node* sync)
 	}
 }
 
-#if 0
 static void NormaliseSync(ir_node* node, void* env)
 {
 	ir_nodeset_t preds;
@@ -779,7 +787,7 @@ static void walker(ir_node *proj, void *env)
 	}
 
 	n = ir_nodeset_size(&pi.user_mem);
-	if (n != 0) { /* nothing happend otherwise */
+	if (n != 0) { /* nothing happened otherwise */
 		ir_graph               *irg  = current_ir_graph;
 		ir_node                *sync;
 		ir_node               **in;
@@ -798,11 +806,11 @@ static void walker(ir_node *proj, void *env)
 			in[i++] = p;
 		}
 		assert(i == n);
-		sync = new_r_Sync(irg, block, n, in);
+		sync = new_r_Sync(block, n, in);
 		exchange(proj, sync);
 
 		assert(pn_Load_M == pn_Store_M);
-		proj = new_r_Proj(irg, block, mem_op, mode_M, pn_Load_M);
+		proj = new_r_Proj(block, mem_op, mode_M, pn_Load_M);
 		set_Sync_pred(sync, 0, proj);
 
 		n = ir_nodeset_size(&pi.this_mem);
@@ -819,7 +827,7 @@ static void walker(ir_node *proj, void *env)
 				in[i++] = p;
 			}
 			assert(i == n);
-			sync = new_r_Sync(irg, block, n, in);
+			sync = new_r_Sync(block, n, in);
 		}
 		set_memop_mem(mem_op, sync);
 	}
@@ -829,12 +837,17 @@ static void walker(ir_node *proj, void *env)
 }
 
 
-void opt_ldst2(ir_graph *irg)
+void opt_sync(ir_graph *irg)
 {
-	assure_irg_address_taken_computed(irg);
-	assure_irp_globals_address_taken_computed();
+	//assure_irg_entity_usage_computed(irg);
+	//assure_irp_globals_entity_usage_computed();
 
 	irg_walk_graph(irg, NULL, walker, NULL);
-  //optimize_graph_df(irg);
+	//optimize_graph_df(irg);
 	//irg_walk_graph(irg, NormaliseSync, NULL, NULL);
 }
+
+ir_graph_pass_t *opt_sync_pass(const char *name)
+{
+	return def_graph_pass(name ? name : "opt_sync", opt_sync);
+}