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

diff --git a/ir/lower/lower_intrinsics.c b/ir/lower/lower_intrinsics.c
index e5ac97a0a..1073887b9 100644
--- a/ir/lower/lower_intrinsics.c
+++ b/ir/lower/lower_intrinsics.c
@@ -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,10 +65,10 @@ static void call_mapper(ir_node *node, void *env) {
 		ir_entity *ent;
 
 		symconst = get_Call_ptr(node);
-		if (! is_SymConst_addr_ent(symconst))
+		if (! is_Global(symconst))
 			return;
 
-		ent = get_SymConst_entity(symconst);
+		ent = get_Global_entity(symconst);
 		p   = pmap_find(wenv->c_map, ent);
 
 		if (p) {
@@ -126,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;
 		}
@@ -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);
@@ -480,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_addr_ent(ptr)) {
-		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 */
@@ -683,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;
@@ -943,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));