X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firarch.c;h=41e154c6bbe1af86d7048acb061c1675cae3e86b;hb=31ef53136fdb86d4a98919c2148c95cadea4ea81;hp=73a482101719ca02f45cd4bf65ebe7b1a11197ef;hpb=3f23264b1442b40b6b3e69c0184e0123f4b7c51f;p=libfirm

diff --git a/ir/ir/irarch.c b/ir/ir/irarch.c
index 73a482101..41e154c6b 100644
--- a/ir/ir/irarch.c
+++ b/ir/ir/irarch.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.
  *
@@ -52,6 +52,7 @@
 #include "ircons.h"
 #include "irarch.h"
 #include "irflag.h"
+#include "error.h"
 
 #undef DEB
 
@@ -70,23 +71,6 @@ static const ir_settings_arch_dep_t *params = NULL;
 /** The bit mask, which optimizations to apply. */
 static arch_dep_opts_t opts;
 
-/**
- * construct a Mulh: Mulh(a,b) = (a * b) >> w, w is the with in bits of a, b
- */
-static ir_node *
-new_rd_Mulh (dbg_info *db, ir_graph *irg, ir_node *block,
-       ir_node *op1, ir_node *op2, ir_mode *mode) {
-	ir_node *in[2];
-	ir_node *res;
-
-	in[0] = op1;
-	in[1] = op2;
-	res = new_ir_node(db, irg, block, op_Mulh, mode, 2, in);
-	res = optimize_node(res);
-	IRN_VRFY_IRG(res, irg);
-	return res;
-}
-
 void arch_dep_init(arch_dep_params_factory_t factory) {
 	opts = arch_dep_none;
 
@@ -96,9 +80,6 @@ void arch_dep_init(arch_dep_params_factory_t factory) {
 
 void arch_dep_set_opts(arch_dep_opts_t the_opts) {
 	opts = the_opts;
-
-	if (opts & arch_dep_mul_to_shift)
-		set_opt_arch_dep_running(1);
 }
 
 /** check, whether a mode allows a Mulh instruction. */
@@ -249,8 +230,8 @@ static unsigned char *value_to_condensed(mul_env *env, tarval *tv, int *pr) {
  * Calculate the gain when using the generalized complementary technique
  */
 static int calculate_gain(unsigned char *R, int r) {
-	int max_gain = -1;
-	int idx, i;
+	int max_gain = 0;
+	int idx = -1, i;
 	int gain;
 
 	/* the gain for r == 1 */
@@ -264,9 +245,7 @@ static int calculate_gain(unsigned char *R, int r) {
 			idx = i;
 		}
 	}
-	if (max_gain > 0)
-		return idx;
-	return -1;
+	return idx;
 }
 
 /**
@@ -346,11 +325,16 @@ static instruction *decompose_simple_cases(mul_env *env, unsigned char *R, int r
 		assert(r == 2);
 
 		ins = env->root;
+		if (R[1] <= env->max_S) {
+			ins = emit_LEA(env, ins, ins, R[1]);
+			if (R[0] != 0) {
+				ins = emit_SHIFT(env, ins, R[0]);
+			}
+			return ins;
+		}
 		if (R[0] != 0) {
 			ins = emit_SHIFT(env, ins, R[0]);
 		}
-		if (R[1] <= env->max_S)
-			return emit_LEA(env, ins, ins, R[1]);
 
 		ins2 = emit_SHIFT(env, env->root, R[0] + R[1]);
 		return emit_LEA(env, ins, ins2, 0);
@@ -484,7 +468,7 @@ static ir_node *build_graph(mul_env *env, instruction *inst) {
 	case ZERO:
 		return inst->irn = new_r_Const(current_ir_graph, env->blk, env->mode, get_mode_null(env->mode));
 	default:
-		assert(0);
+		panic("Unsupported instruction kind");
 		return NULL;
 	}
 }
@@ -524,16 +508,14 @@ static int evaluate_insn(mul_env *env, instruction *inst) {
 	case ZERO:
 		inst->costs = costs = env->evaluate(inst->kind, NULL);
 		return costs;
-	default:
-		assert(0);
-		return 0;
 	}
+	panic("Unsupported instruction kind");
 }
 
 /**
  * Evaluate the replacement instructions and build a new graph
  * if faster than the Mul.
- * returns the root of the new graph then or irn otherwise.
+ * Returns the root of the new graph then or irn otherwise.
  *
  * @param irn      the Mul operation
  * @param operand  the multiplication operand
@@ -562,7 +544,7 @@ static ir_node *do_decomposition(ir_node *irn, ir_node *operand, tarval *tv) {
 	inst = decompose_mul(&env, R, r, tv);
 
 	/* the paper suggests 70% here */
-	mul_costs = (env.evaluate(MUL, tv) * 7) / 10;
+	mul_costs = (env.evaluate(MUL, tv) * 7 + 5) / 10;
 	if (evaluate_insn(&env, inst) <= mul_costs && !env.fail) {
 		env.op       = operand;
 		env.blk      = get_nodes_block(irn);
@@ -587,30 +569,34 @@ ir_node *arch_dep_replace_mul_with_shifts(ir_node *irn) {
 	if (params == NULL || (opts & arch_dep_mul_to_shift) == 0)
 		return irn;
 
-	if (is_Mul(irn) && mode_is_int(mode)) {
-		ir_node *left    = get_binop_left(irn);
-		ir_node *right   = get_binop_right(irn);
-		tarval *tv       = NULL;
-		ir_node *operand = NULL;
-
-		/* Look, if one operand is a constant. */
-		if (is_Const(left)) {
-			tv = get_Const_tarval(left);
-			operand = right;
-		} else if (is_Const(right)) {
-			tv = get_Const_tarval(right);
-			operand = left;
-		}
+	set_arch_dep_running(1);
+	{
+		if (is_Mul(irn) && mode_is_int(mode)) {
+			ir_node *left    = get_binop_left(irn);
+			ir_node *right   = get_binop_right(irn);
+			tarval *tv       = NULL;
+			ir_node *operand = NULL;
+
+			/* Look, if one operand is a constant. */
+			if (is_Const(left)) {
+				tv = get_Const_tarval(left);
+				operand = right;
+			} else if (is_Const(right)) {
+				tv = get_Const_tarval(right);
+				operand = left;
+			}
 
-		if (tv != NULL) {
-			res = do_decomposition(irn, operand, tv);
+			if (tv != NULL) {
+				res = do_decomposition(irn, operand, tv);
 
-			if (res != irn) {
-				hook_arch_dep_replace_mul_with_shifts(irn);
-				exchange(irn, res);
+				if (res != irn) {
+					hook_arch_dep_replace_mul_with_shifts(irn);
+					exchange(irn, res);
+				}
 			}
 		}
 	}
+	//set_arch_dep_running(0);
 
 	return res;
 }
@@ -647,7 +633,7 @@ static int tv_ld2(tarval *tv, int bits) {
 #define SHL(a, b) tarval_shl(a, b)
 #define SHR(a, b) tarval_shr(a, b)
 #define ADD(a, b) tarval_add(a, b)
-#define SUB(a, b) tarval_sub(a, b)
+#define SUB(a, b) tarval_sub(a, b, NULL)
 #define MUL(a, b) tarval_mul(a, b)
 #define DIV(a, b) tarval_div(a, b)
 #define MOD(a, b) tarval_mod(a, b)
@@ -864,7 +850,7 @@ static ir_node *replace_div_by_mulh(ir_node *div, tarval *tv) {
 
 		/* generate the Mulh instruction */
 		c = new_r_Const(current_ir_graph, block, mode, mag.M);
-		q    = new_rd_Mulh(dbg, current_ir_graph, block, n, c, mode);
+		q = new_rd_Mulh(dbg, current_ir_graph, block, n, c, mode);
 
 		if (mag.need_add) {
 			if (mag.s > 0) {
@@ -899,7 +885,7 @@ ir_node *arch_dep_replace_div_by_const(ir_node *irn) {
 	if (params == NULL || (opts & arch_dep_div_by_const) == 0)
 		return irn;
 
-	if (get_irn_opcode(irn) == iro_Div) {
+	if (is_Div(irn)) {
 		ir_node *c = get_Div_right(irn);
 		ir_node *block, *left;
 		ir_mode *mode;
@@ -908,13 +894,13 @@ ir_node *arch_dep_replace_div_by_const(ir_node *irn) {
 		int n, bits;
 		int k, n_flag;
 
-		if (get_irn_op(c) != op_Const)
+		if (! is_Const(c))
 			return irn;
 
 		tv = get_Const_tarval(c);
 
 		/* check for division by zero */
-		if (classify_tarval(tv) == TV_CLASSIFY_NULL)
+		if (tarval_is_null(tv))
 			return irn;
 
 		left  = get_Div_left(irn);
@@ -943,15 +929,20 @@ ir_node *arch_dep_replace_div_by_const(ir_node *irn) {
 				ir_node *k_node;
 				ir_node *curr = left;
 
-				if (k != 1) {
-					k_node = new_r_Const_long(current_ir_graph, block, mode_Iu, k - 1);
-					curr   = new_rd_Shrs(dbg, current_ir_graph, block, left, k_node, mode);
-				}
+				/* create the correction code for signed values only if there might be a remainder */
+				if (! is_Div_remainderless(irn)) {
+					if (k != 1) {
+						k_node = new_r_Const_long(current_ir_graph, block, mode_Iu, k - 1);
+						curr   = new_rd_Shrs(dbg, current_ir_graph, block, left, k_node, mode);
+					}
 
-				k_node = new_r_Const_long(current_ir_graph, block, mode_Iu, bits - k);
-				curr   = new_rd_Shr(dbg, current_ir_graph, block, curr, k_node, mode);
+					k_node = new_r_Const_long(current_ir_graph, block, mode_Iu, bits - k);
+					curr   = new_rd_Shr(dbg, current_ir_graph, block, curr, k_node, mode);
 
-				curr   = new_rd_Add(dbg, current_ir_graph, block, left, curr, mode);
+					curr   = new_rd_Add(dbg, current_ir_graph, block, left, curr, mode);
+				} else {
+					k_node = left;
+				}
 
 				k_node = new_r_Const_long(current_ir_graph, block, mode_Iu, k);
 				res    = new_rd_Shrs(dbg, current_ir_graph, block, curr, k_node, mode);
@@ -990,7 +981,7 @@ ir_node *arch_dep_replace_mod_by_const(ir_node *irn) {
 	if (params == NULL || (opts & arch_dep_mod_by_const) == 0)
 		return irn;
 
-	if (get_irn_opcode(irn) == iro_Mod) {
+	if (is_Mod(irn)) {
 		ir_node *c = get_Mod_right(irn);
 		ir_node *block, *left;
 		ir_mode *mode;
@@ -999,13 +990,13 @@ ir_node *arch_dep_replace_mod_by_const(ir_node *irn) {
 		int n, bits;
 		int k;
 
-		if (get_irn_op(c) != op_Const)
+		if (! is_Const(c))
 			return irn;
 
 		tv = get_Const_tarval(c);
 
 		/* check for division by zero */
-		if (classify_tarval(tv) == TV_CLASSIFY_NULL)
+		if (tarval_is_null(tv))
 			return irn;
 
 		left  = get_Mod_left(irn);
@@ -1084,7 +1075,7 @@ void arch_dep_replace_divmod_by_const(ir_node **div, ir_node **mod, ir_node *irn
 		((opts & (arch_dep_div_by_const|arch_dep_mod_by_const)) != (arch_dep_div_by_const|arch_dep_mod_by_const)))
 		return;
 
-	if (get_irn_opcode(irn) == iro_DivMod) {
+	if (is_DivMod(irn)) {
 		ir_node *c = get_DivMod_right(irn);
 		ir_node *block, *left;
 		ir_mode *mode;
@@ -1093,13 +1084,13 @@ void arch_dep_replace_divmod_by_const(ir_node **div, ir_node **mod, ir_node *irn
 		int n, bits;
 		int k, n_flag;
 
-		if (get_irn_op(c) != op_Const)
+		if (! is_Const(c))
 			return;
 
 		tv = get_Const_tarval(c);
 
 		/* check for division by zero */
-		if (classify_tarval(tv) == TV_CLASSIFY_NULL)
+		if (tarval_is_null(tv))
 			return;
 
 		left  = get_DivMod_left(irn);