X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Flower%2Flower_intrinsics.c;h=1073887b96b9f5bfe143b72c03bc0ee42f42be98;hb=edb11cbddcf9e4fef1bde33d576003af8a6a3323;hp=fff83681f9fe662305f913f734c2febbcfc00039;hpb=eb88cfd7d028eb2866d573bd854d36b19053c071;p=libfirm

diff --git a/ir/lower/lower_intrinsics.c b/ir/lower/lower_intrinsics.c
index fff83681f..1073887b9 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,13 @@
 #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 +65,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 +128,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 +165,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 +176,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 +211,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 +338,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 +421,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 */
@@ -492,8 +489,8 @@ int i_mapper_tanh(ir_node *call, void *ctx) {
  */
 static ir_entity *get_const_entity(ir_node *ptr) {
 	/* FIXME: this cannot handle constant strings inside struct initializers yet */
-	if (is_SymConst(ptr) && get_SymConst_kind(ptr) == symconst_addr_ent) {
-		ir_entity *ent = get_SymConst_entity(ptr);
+	if (is_Global(ptr)) {
+		ir_entity *ent = get_Global_entity(ptr);
 
 		if (get_entity_variability(ent) == variability_constant) {
 			/* a constant entity */
@@ -553,6 +550,8 @@ 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 */
@@ -693,9 +692,7 @@ int i_mapper_strcmp(ir_node *call, void *ctx) {
 	ir_node   *irn     = NULL;
 	ir_node   *exc     = NULL;
 	ir_node   *reg     = NULL;
-	ir_node   *adr     = get_Call_ptr(call);
-	ir_entity *ent     = get_SymConst_entity(adr);
-	ir_type   *call_tp = get_entity_type(ent);
+	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;
@@ -934,7 +931,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));
 
@@ -953,7 +950,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));