X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Flower%2Flower_dw.c;h=6f63196ff9c1d7debe19e76b60e8d4df565e9128;hb=f2edb6301aa7affb0673e76436d9b4dbaef6b9e1;hp=c3b8a65b78c72cc90a63a1522cbaeeaa9c682f97;hpb=c235ec9d0dc7d5c0706d2ef29bc3615134aa27e3;p=libfirm

diff --git a/ir/lower/lower_dw.c b/ir/lower/lower_dw.c
index c3b8a65b7..6f63196ff 100644
--- a/ir/lower/lower_dw.c
+++ b/ir/lower/lower_dw.c
@@ -37,6 +37,7 @@
 
 #include <assert.h>
 
+#include "error.h"
 #include "lowering.h"
 #include "irnode_t.h"
 #include "irgraph_t.h"
@@ -57,7 +58,7 @@
 #include "pmap.h"
 #include "pdeq.h"
 #include "irdump.h"
-#include "xmalloc.h"
+#include "array_t.h"
 
 /** A map from mode to a primitive type. */
 static pmap *prim_types;
@@ -998,24 +999,25 @@ static void lower_Shrs(ir_node *node, ir_mode *mode, lower_env_t *env) {
 
 		if (tarval_is_long(tv) &&
 		    get_tarval_long(tv) >= (long)get_mode_size_bits(mode)) {
-			ir_node *block = get_nodes_block(node);
-			ir_node *left = get_Shrs_left(node);
-			long shf_cnt = get_tarval_long(tv) - get_mode_size_bits(mode);
+			ir_node *block   = get_nodes_block(node);
+			ir_node *left    = get_Shrs_left(node);
+			long     shf_cnt = get_tarval_long(tv) - get_mode_size_bits(mode);
+			int      idx     = get_irn_idx(left);
+			ir_node *low;
 			ir_node *c;
-			int idx = get_irn_idx(left);
 
 			left = env->entries[idx]->high_word;
 			idx = get_irn_idx(node);
 
 			if (shf_cnt > 0) {
-				ir_node *tmp;
-				c = new_r_Const_long(irg, block, mode_Iu, shf_cnt);
-				tmp = new_r_Shrs(irg, block, left, c, mode);
-				/* low word is expected to have mode_Iu */
-				env->entries[idx]->low_word = new_r_Conv(irg, block, tmp, mode_Iu);
+				c   = new_r_Const_long(irg, block, mode_Iu, shf_cnt);
+				low = new_r_Shrs(irg, block, left, c, mode);
 			} else {
-				env->entries[idx]->low_word = left;
+				low = left;
 			}  /* if */
+			/* low word is expected to have mode_Iu */
+			env->entries[idx]->low_word = new_r_Conv(irg, block, low, mode_Iu);
+
 			c = new_r_Const_long(irg, block, mode_Iu, get_mode_size_bits(mode) - 1);
 			env->entries[idx]->high_word = new_r_Shrs(irg, block, left, c, mode);
 
@@ -1092,6 +1094,8 @@ static void lower_Rotl(ir_node *node, ir_mode *mode, lower_env_t *env) {
 	ir_node *left = get_Rotl_left(node);
 	ir_node *h, *l;
 	int idx = get_irn_idx(left);
+	(void) right;
+	(void) mode;
 
 	assert(get_mode_arithmetic(mode) == irma_twos_complement &&
 	       is_Const(right) && tarval_is_long(get_Const_tarval(right)) &&
@@ -2161,64 +2165,87 @@ static void lower_Phi(ir_node *phi, ir_mode *mode, lower_env_t *env) {
 }  /* lower_Phi */
 
 /**
- * Translate a Psi.
+ * Translate a Mux.
  */
-static void lower_Psi(ir_node *psi, ir_mode *mode, lower_env_t *env) {
+static void lower_Mux(ir_node *mux, ir_mode *mode, lower_env_t *env) {
 	ir_graph *irg = current_ir_graph;
 	ir_node  *block, *val;
-	ir_node  **valsl, **valsh, **conds;
+	ir_node  *true_l, *true_h, *false_l, *false_h, *sel;
 	dbg_info *dbg;
-	int      idx, i, n_conds = get_Psi_n_conds(psi);
+	int      idx;
 
-	/* first create a new in array */
-	NEW_ARR_A(ir_node *, valsl, n_conds + 1);
-	NEW_ARR_A(ir_node *, valsh, n_conds + 1);
+	val = get_Mux_true(mux);
+	idx = get_irn_idx(val);
+	if (env->entries[idx]->low_word) {
+		/* Values already build */
+		true_l = env->entries[idx]->low_word;
+		true_h = env->entries[idx]->high_word;
+	} else {
+		/* still not ready */
+		pdeq_putr(env->waitq, mux);
+		return;
+	}  /* if */
 
-	for (i = 0; i < n_conds; ++i) {
-		val = get_Psi_val(psi, i);
-		idx = get_irn_idx(val);
-		if (env->entries[idx]->low_word) {
-			/* Values already build */
-			valsl[i] = env->entries[idx]->low_word;
-			valsh[i] = env->entries[idx]->high_word;
-		} else {
-			/* still not ready */
-			pdeq_putr(env->waitq, psi);
-			return;
-		}  /* if */
-	}  /* for */
-	val = get_Psi_default(psi);
+	val = get_Mux_false(mux);
 	idx = get_irn_idx(val);
 	if (env->entries[idx]->low_word) {
 		/* Values already build */
-		valsl[i] = env->entries[idx]->low_word;
-		valsh[i] = env->entries[idx]->high_word;
+		false_l = env->entries[idx]->low_word;
+		false_h = env->entries[idx]->high_word;
 	} else {
 		/* still not ready */
-		pdeq_putr(env->waitq, psi);
+		pdeq_putr(env->waitq, mux);
 		return;
 	}  /* if */
 
 
-	NEW_ARR_A(ir_node *, conds, n_conds);
-	for (i = 0; i < n_conds; ++i) {
-		conds[i] = get_Psi_cond(psi, i);
-	}  /* for */
+	sel = get_Mux_sel(mux);
 
-	dbg   = get_irn_dbg_info(psi);
-	block = get_nodes_block(psi);
+	dbg   = get_irn_dbg_info(mux);
+	block = get_nodes_block(mux);
 
-	idx = get_irn_idx(psi);
+	idx = get_irn_idx(mux);
 	assert(idx < env->n_entries);
-	env->entries[idx]->low_word  = new_rd_Psi(dbg, irg, block, n_conds, conds, valsl, mode);
-	env->entries[idx]->high_word = new_rd_Psi(dbg, irg, block, n_conds, conds, valsh, mode);
-}  /* lower_Psi */
+	env->entries[idx]->low_word  = new_rd_Mux(dbg, irg, block, sel, false_l, true_l, mode);
+	env->entries[idx]->high_word = new_rd_Mux(dbg, irg, block, sel, false_h, true_h, mode);
+}  /* lower_Mux */
+
+static void lower_ASM(ir_node *asmn, ir_mode *mode, lower_env_t *env)
+{
+	ir_mode *his = env->params->high_signed;
+	ir_mode *hiu = env->params->high_unsigned;
+	int      i;
+	ir_node *n;
+
+	(void)mode;
+
+	for (i = get_irn_arity(asmn) - 1; i >= 0; --i) {
+		ir_mode *op_mode = get_irn_mode(get_irn_n(asmn, i));
+		if (op_mode == his || op_mode == hiu) {
+			panic("lowering ASM unimplemented");
+		}
+	}
+
+	for (n = asmn;;) {
+		ir_mode *proj_mode;
+
+		n = get_irn_link(n);
+		if (n == NULL)
+			break;
+
+		proj_mode = get_irn_mode(n);
+		if (proj_mode == his || proj_mode == hiu) {
+			panic("lowering ASM unimplemented");
+		}
+	}
+}
 
 /**
  * check for opcodes that must always be lowered.
  */
 static int always_lower(ir_opcode code) {
 	switch (code) {
+	case iro_ASM:
 	case iro_Proj:
 	case iro_Start:
 	case iro_Call:
@@ -2307,7 +2334,7 @@ static void lower_ops(ir_node *node, void *env)
 	int          idx = get_irn_idx(node);
 	ir_mode      *mode = get_irn_mode(node);
 
-	if (mode == mode_b || is_Psi(node) || is_Conv(node)) {
+	if (mode == mode_b || is_Mux(node) || is_Conv(node)) {
 		int i;
 
 		for (i = get_irn_arity(node) - 1; i >= 0; --i) {
@@ -2488,6 +2515,7 @@ void lower_dw_ops(const lwrdw_param_t *param)
 #define LOWER_UN(op)      LOWER2(op, lower_Unop)
 
 	/* the table of all operations that must be lowered follows */
+	LOWER(ASM);
 	LOWER(Load);
 	LOWER(Store);
 	LOWER(Const);
@@ -2500,7 +2528,7 @@ void lower_dw_ops(const lwrdw_param_t *param)
 	LOWER(Call);
 	LOWER(Unknown);
 	LOWER(Phi);
-	LOWER(Psi);
+	LOWER(Mux);
 	LOWER(Start);
 
 	LOWER_BIN(Add);