X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Flower%2Flower_intrinsics.c;h=f64c03953c0d3deb5a98b2a170620084e2f299d0;hb=f2edb6301aa7affb0673e76436d9b4dbaef6b9e1;hp=d7e746e86ce86647c229235605164c39c1e3e667;hpb=5db950e57dd3291516c077d5338c159fa110641f;p=libfirm

diff --git a/ir/lower/lower_intrinsics.c b/ir/lower/lower_intrinsics.c
index d7e746e86..f64c03953 100644
--- a/ir/lower/lower_intrinsics.c
+++ b/ir/lower/lower_intrinsics.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.
  *
@@ -38,11 +38,12 @@
 #include "irgmod.h"
 #include "irgopt.h"
 #include "trouts.h"
+#include "irvrfy.h"
 #include "pmap.h"
-#include "xmalloc.h"
+#include "array_t.h"
 #include "iropt_dbg.h"
 
-/** Walker environment */
+/** Walker environment. */
 typedef struct _walker_env {
 	pmap     *c_map;              /**< The intrinsic call map. */
 	unsigned nr_of_intrinsics;    /**< statistics */
@@ -63,11 +64,10 @@ static void call_mapper(ir_node *node, void *env) {
 		ir_entity *ent;
 
 		symconst = get_Call_ptr(node);
-		if (get_irn_op(symconst) != op_SymConst ||
-			get_SymConst_kind(symconst) != symconst_addr_ent)
+		if (! is_Global(symconst))
 			return;
 
-		ent = get_SymConst_entity(symconst);
+		ent = get_Global_entity(symconst);
 		p   = pmap_find(wenv->c_map, ent);
 
 		if (p) {
@@ -127,21 +127,24 @@ unsigned lower_intrinsics(i_record *list, int length, int part_block_used) {
 		wenv.nr_of_intrinsics = 0;
 		irg_walk_graph(irg, NULL, call_mapper, &wenv);
 
-		if (wenv.nr_of_intrinsics) {
-			/* changes detected */
+		if (wenv.nr_of_intrinsics > 0) {
+			/* Changes detected: we might have added/removed nodes. */
 			set_irg_outs_inconsistent(irg);
 			set_irg_callee_info_state(irg, irg_callee_info_inconsistent);
 
-			/* exception control flow might have changed */
+			/* Exception control flow might have changed / new block might have added. */
 			set_irg_doms_inconsistent(irg);
 			set_irg_extblk_inconsistent(irg);
 			set_irg_loopinfo_inconsistent(irg);
 
-			/* calls might be removed/added */
+			/* Calls might be removed/added. */
 			set_trouts_inconsistent();
 
-			/* optimize it, tuple might be created */
-			local_optimize_graph(irg);
+			/* verify here */
+			irg_verify(irg, VRFY_NORMAL);
+
+			/* Optimize it, tuple might be created. */
+			optimize_graph_df(irg);
 
 			nr_of_intrinsics += wenv.nr_of_intrinsics;
 		}
@@ -161,8 +164,9 @@ unsigned lower_intrinsics(i_record *list, int length, int part_block_used) {
  * @param exc_jmp  new exception control flow, if reg_jmp == NULL, a Bad will be used
  */
 static void replace_call(ir_node *irn, ir_node *call, ir_node *mem, ir_node *reg_jmp, ir_node *exc_jmp) {
+	ir_node *block = get_nodes_block(call);
+
 	if (reg_jmp == NULL) {
-		ir_node *block = get_nodes_block(call);
 
 		/* Beware: do we need here a protection against CSE? Better we do it. */
 		int old_cse = get_opt_cse();
@@ -171,7 +175,7 @@ static void replace_call(ir_node *irn, ir_node *call, ir_node *mem, ir_node *reg
 		set_opt_cse(old_cse);
 		exc_jmp = new_Bad();
 	}
-	irn = new_Tuple(1, &irn);
+	irn = new_r_Tuple(current_ir_graph, block, 1, &irn);
 
 	turn_into_tuple(call, pn_Call_max);
 	set_Tuple_pred(call, pn_Call_M_regular, mem);
@@ -206,11 +210,15 @@ int i_mapper_alloca(ir_node *call, void *ctx) {
 	dbg_info *dbg  = get_irn_dbg_info(call);
 	(void) ctx;
 
+	if (mode_is_signed(get_irn_mode(op))) {
+		op = new_rd_Conv(dbg, current_ir_graph, block, op, mode_Iu);
+	}
+
 	irn    = new_rd_Alloc(dbg, current_ir_graph, block, mem, op, firm_unknown_type, stack_alloc);
-	mem    = new_Proj(irn, mode_M, pn_Alloc_M);
-	no_exc = new_Proj(irn, mode_X, pn_Alloc_X_regular);
-	exc    = new_Proj(irn, mode_X, pn_Alloc_X_except);
-	irn    = new_Proj(irn, get_modeP_data(), pn_Alloc_res);
+	mem    = new_rd_Proj(dbg, current_ir_graph, block, irn, mode_M, pn_Alloc_M);
+	no_exc = new_rd_Proj(dbg, current_ir_graph, block, irn, mode_X, pn_Alloc_X_regular);
+	exc    = new_rd_Proj(dbg, current_ir_graph, block, irn, mode_X, pn_Alloc_X_except);
+	irn    = new_rd_Proj(dbg, current_ir_graph, block, irn, get_modeP_data(), pn_Alloc_res);
 
 	DBG_OPT_ALGSIM0(call, irn, FS_OPT_RTS_ALLOCA);
 	replace_call(irn, call, mem, no_exc, exc);
@@ -329,24 +337,6 @@ int i_mapper_exp(ir_node *call, void *ctx) {
 	return 0;
 }  /* i_mapper_exp */
 
-/* A mapper for the floating point log. */
-int i_mapper_log(ir_node *call, void *ctx) {
-	ir_node *val  = get_Call_param(call, 0);
-	(void) ctx;
-
-	if (is_Const(val) && is_Const_one(val)) {
-		/* log(1.0) = 0.0 */
-		ir_node *block = get_nodes_block(call);
-		ir_mode *mode  = get_irn_mode(val);
-		ir_node *irn   = new_r_Const(current_ir_graph, block, mode, get_mode_null(mode));
-		ir_node *mem   = get_Call_mem(call);
-		DBG_OPT_ALGSIM0(call, val, FS_OPT_RTS_LOG);
-		replace_call(val, call, mem, NULL, NULL);
-		return 1;
-	}
-	return 0;
-}  /* i_mapper_log */
-
 /**
  * A mapper for mapping f(0.0) to 0.0.
  */
@@ -430,6 +420,12 @@ static int i_mapper_symmetric_zero_to_one(ir_node *call, void *ctx, int reason)
 	return 0;
 }  /* i_mapper_symmetric_zero_to_one */
 
+/* A mapper for the floating point log. */
+int i_mapper_log(ir_node *call, void *ctx) {
+	/* log(1.0) = 0.0 */
+	return i_mapper_one_to_zero(call, ctx, FS_OPT_RTS_LOG);
+}  /* i_mapper_log */
+
 /* A mapper for the floating point sin. */
 int i_mapper_sin(ir_node *call, void *ctx) {
 	/* sin(0.0) = 0.0 */
@@ -484,28 +480,297 @@ int i_mapper_tanh(ir_node *call, void *ctx) {
 	return i_mapper_zero_to_zero(call, ctx, FS_OPT_RTS_TANH);
 }  /* i_mapper_tanh */
 
+/**
+ * Return the const entity that is accessed through the pointer ptr or
+ * NULL if there is no entity (or the entity is not constant).
+ *
+ * @param ptr  the pointer
+ */
+static ir_entity *get_const_entity(ir_node *ptr) {
+	/* FIXME: this cannot handle constant strings inside struct initializers yet */
+	if (is_Global(ptr)) {
+		ir_entity *ent = get_Global_entity(ptr);
+
+		if (get_entity_variability(ent) == variability_constant) {
+			/* a constant entity */
+			return ent;
+		}
+	}
+	return NULL;
+}  /* get_const_entity */
+
+/**
+ * Calculate the value of strlen if possible.
+ *
+ * @param ent     the entity
+ * @param res_tp  the result type
+ *
+ * @return a Const node containing the strlen() result or NULL
+ *         if the evaluation fails
+ */
+static ir_node *eval_strlen(ir_entity *ent, ir_type *res_tp) {
+	ir_type *tp = get_entity_type(ent);
+	ir_mode *mode;
+	int     i, n, len = -1;
+
+	if (! is_Array_type(tp))
+		return NULL;
+	tp = get_array_element_type(tp);
+	if (! is_Primitive_type(tp))
+		return NULL;
+	mode = get_type_mode(tp);
+
+	/* FIXME: This is too restrict, as the type char might be more the 8bits */
+	if (!mode_is_int(mode) || get_mode_size_bits(mode) != get_mode_size_bits(mode_Bs))
+		return NULL;
+
+	n = get_compound_ent_n_values(ent);
+	for (i = 0; i < n; ++i) {
+		ir_node *irn = get_compound_ent_value(ent, i);
+
+		if (! is_Const(irn))
+			return NULL;
+
+		if (is_Const_null(irn)) {
+			/* found the length */
+			len = i;
+			break;
+		}
+	}
+	if (len >= 0) {
+		tarval *tv = new_tarval_from_long(len, get_type_mode(res_tp));
+		return new_Const_type(tv, res_tp);
+	}
+	return NULL;
+}  /* eval_strlen */
+
+/* A mapper for strlen */
+int i_mapper_strlen(ir_node *call, void *ctx) {
+	ir_node *s     = get_Call_param(call, 0);
+	ir_entity *ent = get_const_entity(s);
+
+	(void) ctx;
+
+	/* FIXME: this cannot handle constant strings inside struct initializers yet */
+	if (ent != NULL) {
+		/* a constant entity */
+		ir_type *tp = get_Call_type(call);
+		ir_node *irn;
+
+		tp  = get_method_res_type(tp, 0);
+		irn = eval_strlen(ent, tp);
+
+		if (irn) {
+			ir_node *mem = get_Call_mem(call);
+			DBG_OPT_ALGSIM0(call, irn, FS_OPT_RTS_STRLEN);
+			replace_call(irn, call, mem, NULL, NULL);
+			return 1;
+		}
+	}
+	return 0;
+}  /* i_mapper_strlen */
+
+/**
+ * Calculate the value of strlen if possible.
+ *
+ * @param left    the left entity
+ * @param right   the right entity
+ * @param res_tp  the result type
+ *
+ * @return a Const node containing the strcmp() result or NULL
+ *         if the evaluation fails
+ */
+static ir_node *eval_strcmp(ir_entity *left, ir_entity *right, ir_type *res_tp) {
+	ir_type *tp;
+	ir_mode *mode;
+	int     i, n, n_r, res;
+
+	tp = get_entity_type(left);
+	if (! is_Array_type(tp))
+		return NULL;
+	tp = get_array_element_type(tp);
+	if (! is_Primitive_type(tp))
+		return NULL;
+	mode = get_type_mode(tp);
+
+	/* FIXME: This is too restrict, as the type char might be more the 8bits */
+	if (!mode_is_int(mode) || get_mode_size_bits(mode) != get_mode_size_bits(mode_Bs))
+		return NULL;
+
+	tp = get_entity_type(right);
+	if (! is_Array_type(tp))
+		return NULL;
+	tp = get_array_element_type(tp);
+	if (! is_Primitive_type(tp))
+		return NULL;
+	mode = get_type_mode(tp);
+
+	/* FIXME: This is too restrict, as the type char might be more the 8bits */
+	if (!mode_is_int(mode) || get_mode_size_bits(mode) != get_mode_size_bits(mode_Bs))
+		return NULL;
+
+	n   = get_compound_ent_n_values(left);
+	n_r = get_compound_ent_n_values(right);
+	if (n_r < n)
+		n = n_r;
+	for (i = 0; i < n; ++i) {
+		ir_node *irn;
+		long v_l, v_r;
+		tarval *tv;
+
+		irn = get_compound_ent_value(left, i);
+		if (! is_Const(irn))
+			return NULL;
+		tv = get_Const_tarval(irn);
+		v_l = get_tarval_long(tv);
+
+		irn = get_compound_ent_value(right, i);
+		if (! is_Const(irn))
+			return NULL;
+		tv = get_Const_tarval(irn);
+		v_r = get_tarval_long(tv);
+
+		if (v_l < v_r) {
+			res = -1;
+			break;
+		}
+		if (v_l > v_r) {
+			res = +1;
+			break;
+		}
+
+		if (v_l == 0) {
+			res = 0;
+			break;
+		}
+	}
+	if (i < n) {
+		/* we found an end */
+		tarval *tv = new_tarval_from_long(res, get_type_mode(res_tp));
+		return new_Const_type(tv, res_tp);
+	}
+	return NULL;
+}  /* eval_strcmp */
+
+/**
+ * Checks if an entity represents the empty string.
+ *
+ * @param ent     the entity
+ *
+ * @return non-zero if ent represents the empty string
+ */
+static int is_empty_string(ir_entity *ent) {
+	ir_type *tp = get_entity_type(ent);
+	ir_mode *mode;
+	int     n;
+	ir_node *irn;
+
+	if (! is_Array_type(tp))
+		return 0;
+	tp = get_array_element_type(tp);
+	if (! is_Primitive_type(tp))
+		return 0;
+	mode = get_type_mode(tp);
+
+	/* FIXME: This is too restrict, as the type char might be more the 8bits */
+	if (!mode_is_int(mode) || get_mode_size_bits(mode) != get_mode_size_bits(mode_Bs))
+		return 0;
+
+	n = get_compound_ent_n_values(ent);
+	if (n < 1)
+		return 0;
+	irn = get_compound_ent_value(ent, 0);
+
+	return is_Const(irn) && is_Const_null(irn);
+}  /* is_empty_string */
+
 /* A mapper for strcmp */
 int i_mapper_strcmp(ir_node *call, void *ctx) {
-	ir_node *left  = get_Call_param(call, 0);
-	ir_node *right = get_Call_param(call, 1);
-	ir_node *irn;
+	ir_node   *left    = get_Call_param(call, 0);
+	ir_node   *right   = get_Call_param(call, 1);
+	ir_node   *irn     = NULL;
+	ir_node   *exc     = NULL;
+	ir_node   *reg     = NULL;
+	ir_type   *call_tp = get_Call_type(call);
+	ir_type   *res_tp  = get_method_res_type(call_tp, 0);
+	ir_entity *ent_l, *ent_r;
+	ir_type   *char_tp;
+	ir_node   *v;
+
 	(void) ctx;
 
+	/* do some type checks first */
+	if (! is_Primitive_type(res_tp))
+		return 0;
+	char_tp = get_method_param_type(call_tp, 0);
+	if (char_tp != get_method_param_type(call_tp, 1))
+		return 0;
+	if (! is_Pointer_type(char_tp))
+		return 0;
+	char_tp = get_pointer_points_to_type(char_tp);
+
 	if (left == right) {
 		/* a strcmp(s, s) ==> 0 */
-		ir_node   *mem     = get_Call_mem(call);
-		ir_node   *adr     = get_Call_ptr(call);
-		ir_entity *ent     = get_SymConst_entity(adr);
-		ir_type   *call_tp = get_entity_type(ent);
-		ir_type   *res_tp  = get_method_res_type(call_tp, 0);
-		ir_mode   *mode    = get_type_mode(res_tp);
-		ir_node   *block   = get_nodes_block(call);
+		ir_node *mem   = get_Call_mem(call);
+		ir_mode *mode  = get_type_mode(res_tp);
+		ir_node *block = get_nodes_block(call);
 
 		irn = new_r_Const(current_ir_graph, block, mode, get_mode_null(mode));
 		DBG_OPT_ALGSIM0(call, irn, FS_OPT_RTS_STRCMP);
 		replace_call(irn, call, mem, NULL, NULL);
 		return 1;
 	}
+	ent_l = get_const_entity(left);
+	ent_r = get_const_entity(right);
+
+	if (ent_l != NULL && ent_r != NULL) {
+		/* both entities are const, try to evaluate */
+		irn = eval_strcmp(ent_l, ent_r, res_tp);
+	} else if (ent_l != NULL) {
+		if (is_empty_string(ent_l)) {
+			/* s strcmp("", s) ==> -(*s)*/
+			v = right;
+			goto replace_by_call;
+		}
+	} else if (ent_r != NULL) {
+		if (is_empty_string(ent_r)) {
+			/* s strcmp(s, "") ==> (*s) */
+			ir_node  *mem, *block;
+			dbg_info *dbg;
+			ir_mode  *mode;
+
+			v = left;
+replace_by_call:
+			mem   = get_Call_mem(call);
+			block = get_nodes_block(call);
+			dbg   = get_irn_dbg_info(call);
+			mode  = get_type_mode(char_tp);
+
+			/* replace the strcmp by (*x) */
+			irn = new_rd_Load(dbg, current_ir_graph, block, mem, v, mode);
+			mem = new_r_Proj(current_ir_graph, block, irn, mode_M, pn_Load_M);
+			exc = new_r_Proj(current_ir_graph, block, irn, mode_X, pn_Load_X_except);
+			reg = new_r_Proj(current_ir_graph, block, irn, mode_X, pn_Load_X_regular);
+			irn = new_r_Proj(current_ir_graph, block, irn, mode, pn_Load_res);
+
+			/* conv to the result mode */
+			mode = get_type_mode(res_tp);
+			irn  = new_rd_Conv(dbg, current_ir_graph, block, irn, mode);
+
+			if (v == right) {
+				/* negate in the ("", s) case */
+				irn = new_rd_Minus(dbg, current_ir_graph, block, irn, mode);
+			}
+		}
+	}
+
+	if (irn != NULL) {
+		ir_node *mem = get_Call_mem(call);
+		DBG_OPT_ALGSIM0(call, irn, FS_OPT_RTS_STRCMP);
+		replace_call(irn, call, mem, reg, exc);
+		return 1;
+	}
+
 	return 0;
 }  /* i_mapper_strcmp */
 
@@ -665,7 +930,7 @@ int i_mapper_RuntimeCall(ir_node *node, runtime_rt *rt) {
 
 	/* step 1: create the call */
 	sym.entity_p = rt->ent;
-	addr = new_r_SymConst(irg, bl, sym, symconst_addr_ent);
+	addr = new_r_SymConst(irg, bl, mode_P_code, sym, symconst_addr_ent);
 	call = new_rd_Call(get_irn_dbg_info(node), irg, bl, mem, addr, n_param, in, mtp);
 	set_irn_pinned(call, get_irn_pinned(node));
 
@@ -684,7 +949,7 @@ int i_mapper_RuntimeCall(ir_node *node, runtime_rt *rt) {
 			set_Tuple_pred(node, i, new_r_Bad(irg));
 		if (rt->mem_proj_nr >= 0)
 			set_Tuple_pred(node, rt->mem_proj_nr, new_r_Proj(irg, bl, call, mode_M, pn_Call_M_regular));
-		if (get_irn_op(mem) != op_NoMem) {
+		if (!is_NoMem(mem)) {
 			/* Exceptions can only be handled with real memory */
 			if (rt->regular_proj_nr >= 0)
 				set_Tuple_pred(node, rt->regular_proj_nr, new_r_Proj(irg, bl, call, mode_X, pn_Call_X_regular));