X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeirgmod.c;h=bf6506c110ac6e0a4329d9b31b3bc5ffa3fa46b4;hb=3dff5ea08f916551668dc18b449327a8a593bc9f;hp=022561a180e23a60a43ae8e0fd1bdf3f42faacb2;hpb=668ea673fa4b3d4d5d3bd47bce720f844c6aee75;p=libfirm

diff --git a/ir/be/beirgmod.c b/ir/be/beirgmod.c
index 022561a18..bf6506c11 100644
--- a/ir/be/beirgmod.c
+++ b/ir/be/beirgmod.c
@@ -51,7 +51,7 @@
 #include "irgraph_t.h"
 #include "irgopt.h"
 #include "irgmod.h"
-#include "irprintf_t.h"
+#include "irprintf.h"
 #include "irgwalk.h"
 
 #include "be_t.h"
@@ -87,21 +87,19 @@ static int cmp_node_nr(const void *a, const void *b)
 
 */
 
-ir_node *insert_Perm_after(ir_graph *irg, const arch_register_class_t *cls,
+ir_node *insert_Perm_before(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_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));
+	DBG((dbg, LEVEL_1, "Insert Perm before: %+F\n", pos));
 
 	ir_nodeset_init(&live);
-	be_liveness_nodes_live_at(lv, cls, pos, &live);
+	be_liveness_nodes_live_before(lv, cls, pos, &live);
 
 	n = ir_nodeset_size(&live);
 	if (n == 0) {
@@ -122,18 +120,17 @@ ir_node *insert_Perm_after(ir_graph *irg, const arch_register_class_t *cls,
 	/* make the input order deterministic */
 	qsort(nodes, n, sizeof(nodes[0]), cmp_node_nr);
 
+	ir_node *const bl = get_nodes_block(pos);
 	perm = be_new_Perm(cls, bl, n, nodes);
-	sched_add_after(pos, perm);
+	sched_add_before(pos, perm);
 	free(nodes);
 
 	for (i = 0; i < n; ++i) {
 		ir_node *perm_op = get_irn_n(perm, i);
-		const arch_register_t *reg = arch_get_irn_register(perm_op);
 		be_ssa_construction_env_t senv;
 
 		ir_mode *mode = get_irn_mode(perm_op);
 		ir_node *proj = new_r_Proj(perm, mode, i);
-		arch_set_irn_register(proj, reg);
 
 		be_ssa_construction_init(&senv, irg);
 		be_ssa_construction_add_copy(&senv, perm_op);
@@ -156,16 +153,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;
@@ -190,7 +184,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);
@@ -213,8 +207,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;
@@ -320,9 +314,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;