X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_intrinsics.c;h=192a20241435b795f791f30178e84870b61eb47a;hb=248af0e1d8280f21f356bb148ecdf11f2e7a6093;hp=d2ff00a6e022d6fe4c130cad3b68754654481f12;hpb=3f57d89fcb7055fc726a41aa63214aab97854cdf;p=libfirm

diff --git a/ir/be/ia32/ia32_intrinsics.c b/ir/be/ia32/ia32_intrinsics.c
index d2ff00a6e..192a20241 100644
--- a/ir/be/ia32/ia32_intrinsics.c
+++ b/ir/be/ia32/ia32_intrinsics.c
@@ -39,6 +39,7 @@
 #include "ia32_new_nodes.h"
 #include "bearch_ia32_t.h"
 #include "gen_ia32_regalloc_if.h"
+#include "begnuas.h"
 
 /** The array of all intrinsics that must be mapped. */
 static i_record *intrinsics;
@@ -69,9 +70,8 @@ void ia32_handle_intrinsics(void)
  * @param proj   the pn_Call_T_result Proj
  * @param l_res  the lower 32 bit result
  * @param h_res  the upper 32 bit result or NULL
- * @param irg    the graph to replace on
  */
-static void reroute_result(ir_node *proj, ir_node *l_res, ir_node *h_res, ir_graph *irg)
+static void reroute_result(ir_node *proj, ir_node *l_res, ir_node *h_res)
 {
 	const ir_edge_t *edge, *next;
 
@@ -80,9 +80,9 @@ static void reroute_result(ir_node *proj, ir_node *l_res, ir_node *h_res, ir_gra
 		long    pn    = get_Proj_proj(proj);
 
 		if (pn == 0) {
-			edges_reroute(proj, l_res, irg);
+			edges_reroute(proj, l_res);
 		} else if (pn == 1 && h_res != NULL) {
-			edges_reroute(proj, h_res, irg);
+			edges_reroute(proj, h_res);
 		} else {
 			panic("Unsupported Result-Proj from Call found");
 		}
@@ -101,7 +101,6 @@ static void reroute_result(ir_node *proj, ir_node *l_res, ir_node *h_res, ir_gra
 static void resolve_call(ir_node *call, ir_node *l_res, ir_node *h_res, ir_graph *irg, ir_node *block)
 {
 	ir_node *jmp, *res, *in[2];
-	ir_node *bad   = get_irg_bad(irg);
 	ir_node *nomem = get_irg_no_mem(irg);
 	int     old_cse;
 
@@ -111,7 +110,7 @@ static void resolve_call(ir_node *call, ir_node *l_res, ir_node *h_res, ir_graph
 
 		foreach_out_edge_safe(call, edge, next) {
 			ir_node *proj = get_edge_src_irn(edge);
-			pn_Call pn    = get_Proj_proj(proj);
+			pn_Call pn    = (pn_Call)get_Proj_proj(proj);
 
 			switch (pn) {
 			case pn_Call_X_regular:
@@ -125,20 +124,19 @@ static void resolve_call(ir_node *call, ir_node *l_res, ir_node *h_res, ir_graph
 				set_opt_cse(0);
 				jmp = new_r_Jmp(block);
 				set_opt_cse(old_cse);
-				edges_reroute(proj, jmp, irg);
+				edges_reroute(proj, jmp);
 				break;
 
 			case pn_Call_X_except:
-			case pn_Call_P_value_res_base:
 				/* should not happen here */
-				edges_reroute(proj, bad, irg);
+				edges_reroute(proj, new_r_Bad(irg, mode_X));
 				break;
 			case pn_Call_M:
 				/* should not happen here */
-				edges_reroute(proj, nomem, irg);
+				edges_reroute(proj, nomem);
 				break;
 			case pn_Call_T_result:
-				reroute_result(proj, l_res, h_res, irg);
+				reroute_result(proj, l_res, h_res);
 				break;
 			default:
 				panic("Wrong Proj from Call");
@@ -169,11 +167,10 @@ static void resolve_call(ir_node *call, ir_node *l_res, ir_node *h_res, ir_graph
 		jmp = new_r_Jmp(block);
 		set_opt_cse(old_cse);
 
-		set_Tuple_pred(call, pn_Call_M,                nomem);
-		set_Tuple_pred(call, pn_Call_X_regular,        jmp);
-		set_Tuple_pred(call, pn_Call_X_except,         bad);
-		set_Tuple_pred(call, pn_Call_T_result,         res);
-		set_Tuple_pred(call, pn_Call_P_value_res_base, bad);
+		set_Tuple_pred(call, pn_Call_M,         nomem);
+		set_Tuple_pred(call, pn_Call_X_regular, jmp);
+		set_Tuple_pred(call, pn_Call_X_except,  new_r_Bad(irg, mode_X));
+		set_Tuple_pred(call, pn_Call_T_result,  res);
 	}
 }
 
@@ -266,9 +263,10 @@ static int map_Shl(ir_node *call, void *ctx)
 
 	if (is_Const(cnt)) {
 		/* the shift count is a const, create better code */
-		tarval *tv = get_Const_tarval(cnt);
+		ir_tarval *tv = get_Const_tarval(cnt);
 
-		if (tarval_cmp(tv, new_tarval_from_long(32, l_mode)) & (pn_Cmp_Gt|pn_Cmp_Eq)) {
+		if (tarval_cmp(tv, new_tarval_from_long(32, l_mode))
+				& (ir_relation_greater_equal)) {
 			/* simplest case: shift only the lower bits. Note that there is no
 			   need to reduce the constant here, this is done by the hardware.  */
 			ir_node *conv = new_rd_Conv(dbg, block, a_l, h_mode);
@@ -299,8 +297,7 @@ static int map_Shl(ir_node *call, void *ctx)
 	c_mode = get_irn_mode(cnt);
 	irn    = new_r_Const_long(irg, c_mode, 32);
 	irn    = new_rd_And(dbg, upper, cnt, irn, c_mode);
-	irn    = new_rd_Cmp(dbg, upper, irn, new_r_Const(irg, get_mode_null(c_mode)));
-	irn    = new_r_Proj(irn, mode_b, pn_Cmp_Eq);
+	irn    = new_rd_Cmp(dbg, upper, irn, new_r_Const(irg, get_mode_null(c_mode)), ir_relation_equal);
 	cond   = new_rd_Cond(dbg, upper, irn);
 
 	in[0]  = new_r_Proj(cond, mode_X, pn_Cond_true);
@@ -327,8 +324,10 @@ static int map_Shl(ir_node *call, void *ctx)
 
 	/* move it down */
 	set_nodes_block(call, block);
-	for (irn = get_irn_link(call); irn != NULL; irn = get_irn_link(irn))
+	for (irn = (ir_node*)get_irn_link(call); irn != NULL;
+	     irn = (ir_node*)get_irn_link(irn)) {
 		set_nodes_block(irn, block);
+	}
 
 	resolve_call(call, l_res, h_res, irg, block);
 	return 1;
@@ -355,9 +354,9 @@ static int map_Shr(ir_node *call, void *ctx)
 
 	if (is_Const(cnt)) {
 		/* the shift count is a const, create better code */
-		tarval *tv = get_Const_tarval(cnt);
+		ir_tarval *tv = get_Const_tarval(cnt);
 
-		if (tarval_cmp(tv, new_tarval_from_long(32, l_mode)) & (pn_Cmp_Gt|pn_Cmp_Eq)) {
+		if (tarval_cmp(tv, new_tarval_from_long(32, l_mode)) & (ir_relation_greater_equal)) {
 			/* simplest case: shift only the higher bits. Note that there is no
 			   need to reduce the constant here, this is done by the hardware.  */
 			ir_node *conv = new_rd_Conv(dbg, block, a_h, l_mode);
@@ -386,8 +385,7 @@ static int map_Shr(ir_node *call, void *ctx)
 	c_mode = get_irn_mode(cnt);
 	irn    = new_r_Const_long(irg, c_mode, 32);
 	irn    = new_rd_And(dbg, upper, cnt, irn, c_mode);
-	irn    = new_rd_Cmp(dbg, upper, irn, new_r_Const(irg, get_mode_null(c_mode)));
-	irn    = new_r_Proj(irn, mode_b, pn_Cmp_Eq);
+	irn    = new_rd_Cmp(dbg, upper, irn, new_r_Const(irg, get_mode_null(c_mode)), ir_relation_equal);
 	cond   = new_rd_Cond(dbg, upper, irn);
 
 	in[0]  = new_r_Proj(cond, mode_X, pn_Cond_true);
@@ -414,8 +412,10 @@ static int map_Shr(ir_node *call, void *ctx)
 
 	/* move it down */
 	set_nodes_block(call, block);
-	for (irn = get_irn_link(call); irn != NULL; irn = get_irn_link(irn))
+	for (irn = (ir_node*)get_irn_link(call); irn != NULL;
+	     irn = (ir_node*)get_irn_link(irn)) {
 		set_nodes_block(irn, block);
+	}
 
 	resolve_call(call, l_res, h_res, irg, block);
 	return 1;
@@ -442,9 +442,9 @@ static int map_Shrs(ir_node *call, void *ctx)
 
 	if (is_Const(cnt)) {
 		/* the shift count is a const, create better code */
-		tarval *tv = get_Const_tarval(cnt);
+		ir_tarval *tv = get_Const_tarval(cnt);
 
-		if (tarval_cmp(tv, new_tarval_from_long(32, l_mode)) & (pn_Cmp_Gt|pn_Cmp_Eq)) {
+		if (tarval_cmp(tv, new_tarval_from_long(32, l_mode)) & (ir_relation_greater_equal)) {
 			/* simplest case: shift only the higher bits. Note that there is no
 			   need to reduce the constant here, this is done by the hardware.  */
 			ir_node *conv    = new_rd_Conv(dbg, block, a_h, l_mode);
@@ -475,8 +475,7 @@ static int map_Shrs(ir_node *call, void *ctx)
 	c_mode = get_irn_mode(cnt);
 	irn    = new_r_Const_long(irg, c_mode, 32);
 	irn    = new_rd_And(dbg, upper, cnt, irn, c_mode);
-	irn    = new_rd_Cmp(dbg, upper, irn, new_r_Const(irg, get_mode_null(c_mode)));
-	irn    = new_r_Proj(irn, mode_b, pn_Cmp_Eq);
+	irn    = new_rd_Cmp(dbg, upper, irn, new_r_Const(irg, get_mode_null(c_mode)), ir_relation_equal);
 	cond   = new_rd_Cond(dbg, upper, irn);
 
 	in[0]  = new_r_Proj(cond, mode_X, pn_Cond_true);
@@ -503,8 +502,10 @@ static int map_Shrs(ir_node *call, void *ctx)
 
 	/* move it down */
 	set_nodes_block(call, block);
-	for (irn = get_irn_link(call); irn != NULL; irn = get_irn_link(irn))
+	for (irn = (ir_node*)get_irn_link(call); irn != NULL;
+	     irn = (ir_node*)get_irn_link(irn)) {
 		set_nodes_block(irn, block);
+	}
 
 	resolve_call(call, l_res, h_res, irg, block);
 	return 1;
@@ -516,9 +517,9 @@ static int map_Shrs(ir_node *call, void *ctx)
 static int is_sign_extend(ir_node *low, ir_node *high)
 {
 	if (is_Shrs(high)) {
-		ir_node *high_l;
-		ir_node *high_r;
-		tarval  *shift_count;
+		ir_node   *high_l;
+		ir_node   *high_r;
+		ir_tarval *shift_count;
 
 		high_r = get_Shrs_right(high);
 		if (!is_Const(high_r)) return 0;
@@ -532,8 +533,8 @@ static int is_sign_extend(ir_node *low, ir_node *high)
 		if (is_Conv(low)    && get_Conv_op(low)    == high_l) return 1;
 		if (is_Conv(high_l) && get_Conv_op(high_l) == low)    return 1;
 	} else if (is_Const(low) && is_Const(high)) {
-		tarval *tl = get_Const_tarval(low);
-		tarval *th = get_Const_tarval(high);
+		ir_tarval *tl = get_Const_tarval(low);
+		ir_tarval *th = get_Const_tarval(high);
 
 		if (tarval_is_long(th) && tarval_is_long(tl)) {
 			long l = get_tarval_long(tl);
@@ -658,7 +659,7 @@ static int map_Abs(ir_node *call, void *ctx)
 	*/
 
 	/* TODO: give a hint to the backend somehow to not create a cltd here... */
-	sign   = new_rd_Shrs(dbg, block, a_h, new_Const_long(l_mode, 31), h_mode);
+	sign   = new_rd_Shrs(dbg, block, a_h, new_r_Const_long(irg, l_mode, 31), h_mode);
 	sign_l = new_rd_Conv(dbg, block, sign, l_mode);
 	sub_l  = new_rd_Eor(dbg, block, a_l, sign_l, l_mode);
 	sub_h  = new_rd_Eor(dbg, block, a_h, sign,   h_mode);
@@ -676,12 +677,33 @@ static int map_Abs(ir_node *call, void *ctx)
 
 #define ID(x) new_id_from_chars(x, sizeof(x)-1)
 
+static ir_entity *create_compiler_lib_entity(const char *name, ir_type *type)
+{
+	ir_type   *glob   = get_glob_type();
+	ident     *id     = new_id_from_str(name);
+	ir_entity *entity;
+
+	/* Hack: we need to know the type of runtime library we use. Strictly
+	   speaking it's not the same as the object-file-format. But in practice
+	   the following should be enough */
+	if (be_gas_object_file_format == OBJECT_FILE_FORMAT_MACH_O
+			|| be_gas_object_file_format == OBJECT_FILE_FORMAT_COFF) {
+		id = id_mangle3("___", id, "");
+	} else {
+		id = id_mangle3("__", id, "");
+	}
+	entity = new_entity(glob, id, type);
+	set_entity_visibility(entity, ir_visibility_local);
+	set_entity_ld_ident(entity, id);
+	return entity;
+}
+
 /**
  * Maps a Div. Change into a library call.
  */
 static int map_Div(ir_node *call, void *ctx)
 {
-	ia32_intrinsic_env_t *env = ctx;
+	ia32_intrinsic_env_t *env = (ia32_intrinsic_env_t*)ctx;
 	ir_type   *method    = get_Call_type(call);
 	ir_mode   *h_mode    = get_type_mode(get_method_res_type(method, 1));
 	ir_node   *ptr;
@@ -693,19 +715,14 @@ static int map_Div(ir_node *call, void *ctx)
 		/* 64bit signed Division */
 		ent = env->divdi3;
 		if (ent == NULL) {
-			/* create library entity */
-			ent = env->divdi3 = new_entity(get_glob_type(), ID("__divdi3"), method);
-			set_entity_visibility(ent, ir_visibility_external);
-			set_entity_ld_ident(ent, ID("__divdi3"));
+			ent = env->divdi3 = create_compiler_lib_entity("divdi3", method);
 		}
 	} else {
 		/* 64bit unsigned Division */
 		ent = env->udivdi3;
 		if (ent == NULL) {
 			/* create library entity */
-			ent = env->udivdi3 = new_entity(get_glob_type(), ID("__udivdi3"), method);
-			set_entity_visibility(ent, ir_visibility_external);
-			set_entity_ld_ident(ent, ID("__udivdi3"));
+			ent = env->udivdi3 = create_compiler_lib_entity("udivdi3", method);
 		}
 	}
 
@@ -722,7 +739,7 @@ static int map_Div(ir_node *call, void *ctx)
  */
 static int map_Mod(ir_node *call, void *ctx)
 {
-	ia32_intrinsic_env_t *env = ctx;
+	ia32_intrinsic_env_t *env = (ia32_intrinsic_env_t*)ctx;
 	ir_type   *method    = get_Call_type(call);
 	ir_mode   *h_mode    = get_type_mode(get_method_res_type(method, 1));
 	ir_node   *ptr;
@@ -735,18 +752,14 @@ static int map_Mod(ir_node *call, void *ctx)
 		ent = env->moddi3;
 		if (ent == NULL) {
 			/* create library entity */
-			ent = env->moddi3 = new_entity(get_glob_type(), ID("__moddi3"), method);
-			set_entity_visibility(ent, ir_visibility_external);
-			set_entity_ld_ident(ent, ID("__moddi3"));
+			ent = env->moddi3 = create_compiler_lib_entity("moddi3", method);
 		}
 	} else {
 		/* 64bit signed Modulo */
 		ent = env->umoddi3;
 		if (ent == NULL) {
 			/* create library entity */
-			ent = env->umoddi3 = new_entity(get_glob_type(), ID("__umoddi3"), method);
-			set_entity_visibility(ent, ir_visibility_external);
-			set_entity_ld_ident(ent, ID("__umoddi3"));
+			ent = env->umoddi3 = create_compiler_lib_entity("umoddi3", method);
 		}
 	}
 
@@ -792,20 +805,19 @@ static int map_Conv(ir_node *call, void *ctx)
 							   pn_ia32_l_FloattoLL_res_high);
 		} else {
 			/* convert from float to signed 64bit */
-			ir_mode *flt_mode = get_irn_mode(a_f);
-			tarval  *flt_tv   = new_tarval_from_str("9223372036854775808", 19, flt_mode);
-			ir_node *flt_corr = new_Const(flt_tv);
-			ir_node *lower_blk = block;
-			ir_node *upper_blk;
-			ir_node *cmp, *proj, *cond, *blk, *int_phi, *flt_phi;
-			ir_node *in[2];
+			ir_mode   *flt_mode = get_irn_mode(a_f);
+			ir_tarval *flt_tv   = new_tarval_from_str("9223372036854775808", 19, flt_mode);
+			ir_node   *flt_corr = new_r_Const(irg, flt_tv);
+			ir_node   *lower_blk = block;
+			ir_node   *upper_blk;
+			ir_node   *cmp, *proj, *cond, *blk, *int_phi, *flt_phi;
+			ir_node   *in[2];
 
 			part_block(call);
 			upper_blk = get_nodes_block(call);
 
-			cmp   = new_rd_Cmp(dbg, upper_blk, a_f, flt_corr);
-			proj  = new_r_Proj(cmp, mode_b, pn_Cmp_Lt);
-			cond  = new_rd_Cond(dbg, upper_blk, proj);
+			cmp   = new_rd_Cmp(dbg, upper_blk, a_f, flt_corr, ir_relation_less);
+			cond  = new_rd_Cond(dbg, upper_blk, cmp);
 			in[0] = new_r_Proj(cond, mode_X, pn_Cond_true);
 			in[1] = new_r_Proj(cond, mode_X, pn_Cond_false);
 			blk   = new_r_Block(irg, 1, &in[1]);
@@ -814,8 +826,8 @@ static int map_Conv(ir_node *call, void *ctx)
 			set_irn_in(lower_blk, 2, in);
 
 			/* create to Phis */
-			in[0] = new_Const(get_mode_null(h_res_mode));
-			in[1] = new_Const_long(h_res_mode, 0x80000000);
+			in[0] = new_r_Const(irg, get_mode_null(h_res_mode));
+			in[1] = new_r_Const_long(irg, h_res_mode, 0x80000000);
 
 			int_phi = new_r_Phi(lower_blk, 2, in, h_res_mode);
 
@@ -841,8 +853,10 @@ static int map_Conv(ir_node *call, void *ctx)
 			/* move the call and its Proj's to the lower block */
 			set_nodes_block(call, lower_blk);
 
-			for (proj = get_irn_link(call); proj != NULL; proj = get_irn_link(proj))
+			for (proj = (ir_node*)get_irn_link(call); proj != NULL;
+			     proj = (ir_node*)get_irn_link(proj)) {
 				set_nodes_block(proj, lower_blk);
+			}
 			block = lower_blk;
 		}
 		/* lower the call */