X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbelower.c;h=3eb1d7a83e19e3b8dbea67196f68d514897916c0;hb=b9d22b30c82c58d3b60a14576e0bdba7a54cc9c4;hp=ea016785dd8bb14a5a8f6182815b6ed2fa7e61a5;hpb=1ce363f80e6a204d4011f85813362d9bd1d0e7e4;p=libfirm

diff --git a/ir/be/belower.c b/ir/be/belower.c
index ea016785d..3eb1d7a83 100644
--- a/ir/be/belower.c
+++ b/ir/be/belower.c
@@ -49,14 +49,14 @@
 
 #undef KEEP_ALIVE_COPYKEEP_HACK
 
-/* associates op with it's copy and CopyKeep */
+/** Associates an op with it's copy and CopyKeep. */
 typedef struct {
-	ir_node *op;         /* an irn which must be different */
-	ir_nodeset_t copies; /* all non-spillable copies of this irn */
+	ir_node *op;         /**< an irn which must be different */
+	ir_nodeset_t copies; /**< all non-spillable copies of this irn */
 	const arch_register_class_t *cls;
 } op_copy_assoc_t;
 
-/* environment for constraints */
+/** Environment for constraints. */
 typedef struct {
 	be_irg_t       *birg;
 	pset           *op_set;
@@ -64,7 +64,7 @@ typedef struct {
 	DEBUG_ONLY(firm_dbg_module_t *dbg;)
 } constraint_env_t;
 
-/* lowering walker environment */
+/** Lowering walker environment. */
 typedef struct _lower_env_t {
 	be_irg_t         *birg;
 	const arch_env_t *arch_env;
@@ -72,7 +72,7 @@ typedef struct _lower_env_t {
 	DEBUG_ONLY(firm_dbg_module_t *dbg_module;)
 } lower_env_t;
 
-/* holds a perm register pair */
+/** Holds a Perm register pair. */
 typedef struct _reg_pair_t {
 	const arch_register_t *in_reg;    /**< a perm IN register */
 	ir_node               *in_node;   /**< the in node to which the register belongs */
@@ -90,15 +90,14 @@ typedef enum _perm_type_t {
 	PERM_COPY
 } perm_type_t;
 
-/* structure to represent cycles or chains in a perm */
+/** Structure to represent cycles or chains in a Perm. */
 typedef struct _perm_cycle_t {
 	const arch_register_t **elems;       /**< the registers in the cycle */
 	int                     n_elems;     /**< number of elements in the cycle */
 	perm_type_t             type;        /**< type (CHAIN or CYCLE) */
 } perm_cycle_t;
 
-//
-/* Compare the two operands */
+/** Compare the two operands. */
 static int cmp_op_copy_assoc(const void *a, const void *b) {
 	const op_copy_assoc_t *op1 = a;
 	const op_copy_assoc_t *op2 = b;
@@ -106,7 +105,7 @@ static int cmp_op_copy_assoc(const void *a, const void *b) {
 	return op1->op != op2->op;
 }
 
-/* Compare the in registers of two register pairs */
+/** Compare the in registers of two register pairs. */
 static int compare_reg_pair(const void *a, const void *b) {
 	const reg_pair_t *pair_a = a;
 	const reg_pair_t *pair_b = b;
@@ -117,7 +116,7 @@ static int compare_reg_pair(const void *a, const void *b) {
 		return -1;
 }
 
-/* returns the number register pairs marked as checked */
+/** returns the number register pairs marked as checked. */
 static int get_n_checked_pairs(reg_pair_t *pairs, int n) {
 	int i, n_checked = 0;
 
@@ -505,23 +504,19 @@ static void lower_perm_node(ir_node *irn, void *walk_env) {
 	/* remove the perm from schedule */
 	if (! keep_perm) {
 		sched_remove(irn);
-		be_kill_node(irn);
+		kill_node(irn);
 	}
 }
 
 
 
-static int get_n_out_edges(const ir_node *irn) {
-	const ir_edge_t *edge;
-	int cnt = 0;
-
-	foreach_out_edge(irn, edge) {
-		cnt++;
-	}
-
-	return cnt;
+static int has_irn_users(const ir_node *irn) {
+	return get_irn_out_edge_first_kind(irn, EDGE_KIND_NORMAL) != 0;
 }
 
+/**
+ * Skip all Proj nodes.
+ */
 static INLINE ir_node *belower_skip_proj(ir_node *irn) {
 	while(is_Proj(irn))
 		irn = get_Proj_pred(irn);
@@ -565,7 +560,7 @@ static void gen_assure_different_pattern(ir_node *irn, ir_node *other_different,
 	/* in block far far away                             */
 	/* The copy is optimized later if not needed         */
 
-	/* check if already exists such a copy in the schedule immediatly before */
+	/* check if already exists such a copy in the schedule immediately before */
 	cpy = find_copy(env, belower_skip_proj(irn), other_different);
 	if (! cpy) {
 		cpy = be_new_Copy(cls, irg, block, other_different);
@@ -581,13 +576,13 @@ static void gen_assure_different_pattern(ir_node *irn, ir_node *other_different,
 
 	/* Add the Keep resp. CopyKeep and reroute the users */
 	/* of the other_different irn in case of CopyKeep.   */
-	if (get_n_out_edges(other_different) == 0) {
-		keep = be_new_Keep(cls, irg, block, 2, in);
-	}
-	else {
+	if (has_irn_users(other_different)) {
 		keep = be_new_CopyKeep_single(cls, irg, block, cpy, irn, get_irn_mode(other_different));
 		be_node_set_reg_class(keep, 1, cls);
 	}
+	else {
+		keep = be_new_Keep(cls, irg, block, 2, in);
+	}
 
 	DBG((mod, LEVEL_1, "created %+F(%+F, %+F)\n\n", keep, irn, cpy));
 
@@ -633,6 +628,22 @@ static void assure_different_constraints(ir_node *irn, constraint_env_t *env) {
 		const unsigned other = req->other_different;
 		int i;
 
+		if (arch_register_req_is(req, should_be_same)) {
+			const unsigned same = req->other_same;
+
+			if (is_po2(other) && is_po2(same)) {
+				int idx_other = ntz(other);
+				int idx_same  = ntz(same);
+
+				/*
+				 * We can safely ignore a should_be_same x should_be_different y
+				 * IFF both inputs are equal!
+				 */
+				if (get_irn_n(irn, idx_other) == get_irn_n(irn, idx_same)) {
+					return;
+				}
+			}
+		}
 		for (i = 0; 1U << i <= other; ++i) {
 			if (other & (1U << i)) {
 				ir_node *different_from = get_irn_n(belower_skip_proj(irn), i);
@@ -642,8 +653,6 @@ static void assure_different_constraints(ir_node *irn, constraint_env_t *env) {
 	}
 }
 
-
-
 /**
  * Calls the functions to assure register constraints.
  *
@@ -656,8 +665,6 @@ static void assure_constraints_walker(ir_node *irn, void *walk_env) {
 
 	if (sched_is_scheduled(irn) && mode_is_datab(get_irn_mode(irn)))
 		assure_different_constraints(irn, walk_env);
-
-	return;
 }
 
 /**
@@ -745,7 +752,7 @@ static void melt_copykeeps(constraint_env_t *cenv) {
 					/* now, we can kill the melted keep, except the */
 					/* ref one, we still need some information      */
 					if (melt_arr[j] != ref)
-						be_kill_node(melt_arr[j]);
+						kill_node(melt_arr[j]);
 				}
 
 #ifdef KEEP_ALIVE_COPYKEEP_HACK
@@ -772,7 +779,7 @@ static void melt_copykeeps(constraint_env_t *cenv) {
 				DBG((cenv->dbg, LEVEL_1, "created %+F, scheduled before %+F\n", new_ck, sched_pt));
 
 				/* finally: kill the reference copykeep */
-				be_kill_node(ref);
+				kill_node(ref);
 			}
 		}
 
@@ -844,12 +851,12 @@ void assure_constraints(be_irg_t *birg) {
 				int     n = get_irn_arity(cp);
 
 				keep = be_new_Keep(arch_get_irn_reg_class(arch_env, cp, -1),
-					irg, get_nodes_block(cp), n, (ir_node **)&get_irn_in(cp)[1]);
+					irg, get_nodes_block(cp), n, get_irn_in(cp) + 1);
 				sched_add_before(cp, keep);
 
 				/* Set all ins (including the block) of the CopyKeep BAD to keep the verifier happy. */
 				sched_remove(cp);
-				be_kill_node(cp);
+				kill_node(cp);
 			}
 		}
 
@@ -979,7 +986,7 @@ found_front:
 
 		/* and kill it */
 		set_Proj_pred(proj, new_Bad());
-		be_kill_node(proj);
+		kill_node(proj);
 
 		bitset_set(moved, input);
 		n_moved++;