X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Flower%2Flower_mode_b.c;h=a186ce3eecfd551010ac93c830a42430e9fc39b7;hb=9eda258c95c8344102aca65bf53bb3bbe2087e91;hp=9ac300208b7f131e3ad4aa267a1282809aff6ef6;hpb=778fcfbe15f153b39a768bfc12bbe5068eed636d;p=libfirm

diff --git a/ir/lower/lower_mode_b.c b/ir/lower/lower_mode_b.c
index 9ac300208..a186ce3ee 100644
--- a/ir/lower/lower_mode_b.c
+++ b/ir/lower/lower_mode_b.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -19,12 +19,14 @@
 
 /**
  * @file
+ * @brief       lowers operations with mode_b. The result is a graph which
+ *              might still contains some convs from/to mode_b, but no
+ *              operations are performed on them anymore, they are just there
+ *              so modes match. A backend can safely skip all mode_b convs.
  * @author      Matthias Braun, Christoph Mallon
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdlib.h>
 
@@ -74,7 +76,7 @@ static ir_node *create_not(dbg_info *dbgi, ir_node *node)
 	ir_node  *block  = get_nodes_block(node);
 	ir_mode  *mode   = config.lowered_mode;
 	tarval   *tv_one = get_tarval_one(mode);
-	ir_node  *one    = new_d_Const(dbgi, mode, tv_one);
+	ir_node  *one    = new_d_Const(dbgi, tv_one);
 
 	return new_rd_Eor(dbgi,	irg, block, node, one, mode);
 }
@@ -106,15 +108,14 @@ static ir_node *create_set(ir_node *node)
 	dbg_info *dbgi    = get_irn_dbg_info(node);
 	ir_mode  *mode    = config.lowered_set_mode;
 	tarval   *tv_one  = get_tarval_one(mode);
-	ir_node  *one     = new_d_Const(dbgi, mode, tv_one);
+	ir_node  *one     = new_d_Const(dbgi, tv_one);
 	ir_node  *block   = get_nodes_block(node);
 	tarval   *tv_zero = get_tarval_null(mode);
-	ir_node  *zero    = new_d_Const(dbgi, mode, tv_zero);
+	ir_node  *zero    = new_d_Const(dbgi, tv_zero);
 
-	ir_node *vals[2]  = { one, zero };
-	ir_node *set      = new_rd_Psi(dbgi, irg, block, 1, &node, vals, mode);
+	ir_node *set      = new_rd_Mux(dbgi, irg, block, node, zero, one, mode);
 
-	if(mode != config.lowered_mode) {
+	if (mode != config.lowered_mode) {
 		set = new_r_Conv(irg, block, set, config.lowered_mode);
 	}
 
@@ -148,7 +149,6 @@ static ir_node *lower_node(ir_node *node)
 {
 	ir_graph *irg   = current_ir_graph;
 	dbg_info *dbgi  = get_irn_dbg_info(node);
-	ir_op    *op    = get_irn_op(node);
 	ir_node  *block = get_nodes_block(node);
 	ir_mode *mode   = config.lowered_mode;
 	ir_node  *res;
@@ -160,13 +160,14 @@ static ir_node *lower_node(ir_node *node)
 		return res;
 
 	/* TODO: be robust against phi-loops... */
-	if(op == op_Phi) {
+	switch (get_irn_opcode(node)) {
+	case iro_Phi: {
 		int       i, arity;
 		ir_node **in;
 		ir_node  *unknown, *new_phi;
 
-		arity = get_irn_arity(node);
-		in    = alloca(arity * sizeof(in[0]));
+		arity   = get_irn_arity(node);
+		in      = ALLOCAN(ir_node*, arity);
 		unknown = new_Unknown(config.lowered_mode);
 		for(i = 0; i < arity; ++i) {
 			in[i] = unknown;
@@ -185,7 +186,9 @@ static ir_node *lower_node(ir_node *node)
 		return new_phi;
 	}
 
-	if(op == op_And || op == op_Or || op == op_Eor) {
+	case iro_And:
+	case iro_Or:
+	case iro_Eor: {
 		int i, arity;
 		ir_node *copy = exact_copy(node);
 
@@ -202,7 +205,7 @@ static ir_node *lower_node(ir_node *node)
 		pdeq_putr(lowered_nodes, node);
 		return copy;
 	}
-	if(op == op_Not) {
+	case iro_Not: {
 		ir_node *op     = get_Not_op(node);
 		ir_node *low_op = lower_node(op);
 
@@ -211,34 +214,28 @@ static ir_node *lower_node(ir_node *node)
 		pdeq_putr(lowered_nodes, node);
 		return res;
 	}
-	if(op == op_Psi) {
-		ir_node *cond        = get_Psi_cond(node, 0);
+	case iro_Mux: {
+		ir_node *cond        = get_Mux_sel(node);
 		ir_node *low_cond    = lower_node(cond);
-		ir_node *v_true      = get_Psi_val(node, 0);
+		ir_node *v_true      = get_Mux_true(node);
 		ir_node *low_v_true  = lower_node(v_true);
-		ir_node *v_false     = get_Psi_default(node);
+		ir_node *v_false     = get_Mux_false(node);
 		ir_node *low_v_false = lower_node(v_false);
 
-		ir_node *and0     = new_rd_And(dbgi, irg, block, low_cond, low_v_true,
-		                               mode);
-
+		ir_node *and0     = new_rd_And(dbgi, irg, block, low_cond, low_v_true, mode);
 		ir_node *not_cond = create_not(dbgi, low_cond);
-
-		ir_node *and1     = new_rd_And(dbgi, irg, block, not_cond, low_v_false,
-		                               mode);
-
-		ir_node *or       = new_rd_Or(dbgi, irg, block, and0, and1,
-		                              mode);
+		ir_node *and1     = new_rd_And(dbgi, irg, block, not_cond, low_v_false, mode);
+		ir_node *or       = new_rd_Or(dbgi, irg, block, and0, and1, mode);
 
 		set_irn_link(node, or);
 		pdeq_putr(lowered_nodes, node);
 		return or;
 	}
-	if(op == op_Conv) {
+	case iro_Conv: {
 		ir_node *pred     = get_Conv_op(node);
 		ir_mode *mode     = get_irn_mode(pred);
 		tarval  *tv_zeroc = get_tarval_null(mode);
-		ir_node *zero_cmp = new_d_Const(dbgi, mode, tv_zeroc);
+		ir_node *zero_cmp = new_d_Const(dbgi, tv_zeroc);
 		ir_node *set;
 
 		ir_node *cmp      = new_rd_Cmp(dbgi, irg, block, pred, zero_cmp);
@@ -250,7 +247,7 @@ static ir_node *lower_node(ir_node *node)
 		pdeq_putr(lowered_nodes, node);
 		return set;
 	}
-	if(op == op_Proj) {
+	case iro_Proj: {
 		ir_node *pred = get_Proj_pred(node);
 
 		if(is_Cmp(pred)) {
@@ -291,7 +288,7 @@ static ir_node *lower_node(ir_node *node)
 				if(a != NULL) {
 					int      bits      = get_mode_size_bits(mode);
 					tarval  *tv        = new_tarval_from_long(bits-1, mode_Iu);
-					ir_node *shift_cnt = new_d_Const(dbgi, mode_Iu, tv);
+					ir_node *shift_cnt = new_d_Const(dbgi, tv);
 
 					if(cmp_mode != mode) {
 						a = new_rd_Conv(dbgi, irg, block, a, mode);
@@ -330,14 +327,14 @@ static ir_node *lower_node(ir_node *node)
 
 		panic("unexpected projb: %+F (pred: %+F)", node, pred);
 	}
-	if(op == op_Const) {
+	case iro_Const: {
 		tarval *tv = get_Const_tarval(node);
 		if(tv == get_tarval_b_true()) {
 			tarval  *tv_one  = get_tarval_one(mode);
-			res              = new_d_Const(dbgi, mode, tv_one);
+			res              = new_d_Const(dbgi, tv_one);
 		} else if(tv == get_tarval_b_false()) {
 			tarval  *tv_zero = get_tarval_null(mode);
-			res              = new_d_Const(dbgi, mode, tv_zero);
+			res              = new_d_Const(dbgi, tv_zero);
 		} else {
 			panic("invalid boolean const %+F", node);
 		}
@@ -345,8 +342,11 @@ static ir_node *lower_node(ir_node *node)
 		pdeq_putr(lowered_nodes, node);
 		return res;
 	}
-
-	panic("didn't expect %+F to have mode_b", node);
+	case iro_Unknown:
+		return new_Unknown(config.lowered_mode);
+	default:
+		panic("didn't expect %+F to have mode_b", node);
+	}
 }
 
 static void lower_mode_b_walker(ir_node *node, void *env)
@@ -363,8 +363,8 @@ static void lower_mode_b_walker(ir_node *node, void *env)
 			continue;
 
 		if(! config.lower_direct_cmp) {
-			if(is_Cond(node)
-					|| (is_Psi(node) && get_irn_mode(node) != mode_b)) {
+			if (is_Cond(node) ||
+			    (is_Mux(node) && get_irn_mode(node) != mode_b)) {
 				if(is_Proj(in)) {
 					ir_node *pred = get_Proj_pred(in);
 					if(is_Cmp(pred))
@@ -403,7 +403,8 @@ void ir_lower_mode_b(ir_graph *irg, const lower_mode_b_config_t *nconfig)
 {
 	config        = *nconfig;
 	lowered_nodes = new_pdeq();
-	set_using_irn_link(irg);
+
+	ir_reserve_resources(irg, IR_RESOURCE_IRN_LINK);
 
 	irg_walk_graph(irg, clear_links, NULL, NULL);
 	irg_walk_graph(irg, lower_mode_b_walker, NULL, NULL);
@@ -414,5 +415,5 @@ void ir_lower_mode_b(ir_graph *irg, const lower_mode_b_config_t *nconfig)
 	}
 	del_pdeq(lowered_nodes);
 
-	clear_using_irn_link(irg);
+	ir_free_resources(irg, IR_RESOURCE_IRN_LINK);
 }