X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Flower%2Flower_calls.c;h=7f15ee5ffe786adc133941e3d5cc9f3b2f82f7b3;hb=80e7f8c6416845453f540584d38ffb79e7bfc3e9;hp=073e7f22647412eb26dde16b07dda294bc54ab56;hpb=bfc5faedb904ceb85508a06d1b5c86eb86d37079;p=libfirm

diff --git a/ir/lower/lower_calls.c b/ir/lower/lower_calls.c
index 073e7f226..7f15ee5ff 100644
--- a/ir/lower/lower_calls.c
+++ b/ir/lower/lower_calls.c
@@ -56,10 +56,11 @@ static ir_type *def_find_pointer_type(ir_type *e_type, ir_mode *mode, int alignm
 	/* Mode and alignment are always identical in all calls to def_find_pointer_type(), so
 	   we simply can use a map from the element type to the pointer type. */
 	e = pmap_find(type_map, e_type);
-	if (e)
+	if (e && get_type_mode(e->value) == mode)
 		res = e->value;
 	else {
-		res = new_type_pointer(id_mangle_u(get_type_ident(e_type), new_id_from_chars("Ptr", 3)), e_type, mode);
+		res = new_type_pointer(e_type);
+		set_type_mode(res, mode);
 		set_type_alignment_bytes(res, alignment);
 		pmap_insert(type_map, e_type, res);
 	}
@@ -83,7 +84,6 @@ static ir_type *create_modified_mtd_type(const lower_params_t *lp, ir_type *mtp)
 	int     *param_map;
 	ir_mode *modes[MAX_REGISTER_RET_VAL];
 	int n_ress, n_params, nn_ress, nn_params, i, first_variadic;
-	ident *id;
 	add_hidden hidden_params;
 	int        changed = 0;
 	ir_variadicity var;
@@ -175,8 +175,7 @@ static ir_type *create_modified_mtd_type(const lower_params_t *lp, ir_type *mtp)
 	}
 
 	/* create the new type */
-	id      = id_mangle_u(new_id_from_chars("L", 1), get_type_ident(mtp));
-	lowered = new_d_type_method(id, nn_params, nn_ress, get_type_dbg_info(mtp));
+	lowered = new_d_type_method(nn_params, nn_ress, get_type_dbg_info(mtp));
 
 	/* fill it */
 	for (i = 0; i < nn_params; ++i)
@@ -261,7 +260,7 @@ typedef struct _wlk_env_t {
 static cl_entry *get_Call_entry(ir_node *call, wlk_env *env) {
 	cl_entry *res = get_irn_link(call);
 	if (res == NULL) {
-		cl_entry *res = obstack_alloc(&env->obst, sizeof(*res));
+		cl_entry *res = OALLOC(&env->obst, cl_entry);
 		res->next  = env->cl_list;
 		res->call  = call;
 		res->copyb = NULL;
@@ -313,7 +312,7 @@ static void check_ptr(ir_node *ptr, wlk_env *env) {
 
 	/* still alias free */
 	ptr = find_base_adr(ptr, &ent);
-	sc  = classify_pointer(current_ir_graph, ptr, ent);
+	sc  = GET_BASE_SC(classify_pointer(current_ir_graph, ptr, ent));
 	if (sc != ir_sc_localvar && sc != ir_sc_malloced) {
 		/* non-local memory access */
 		env->only_local_mem = 0;
@@ -518,7 +517,6 @@ static ir_node *get_dummy_sel(ir_graph *irg, ir_node *block, ir_type *tp, wlk_en
 		}
 	}
 	return new_r_simpleSel(
-		irg,
 		block,
 		get_irg_no_mem(irg),
 		get_irg_frame(irg),
@@ -567,9 +565,8 @@ static void add_hidden_param(ir_graph *irg, int n_com, ir_node **ins, cl_entry *
 
 		/* get rid of the CopyB */
 		turn_into_tuple(p, pn_CopyB_max);
-		set_Tuple_pred(p, pn_CopyB_M_regular, mem);
-		set_Tuple_pred(p, pn_CopyB_M_except,  get_irg_bad(irg));
-		set_Tuple_pred(p, pn_CopyB_X_regular, new_r_Jmp(irg, blk));
+		set_Tuple_pred(p, pn_CopyB_M,         mem);
+		set_Tuple_pred(p, pn_CopyB_X_regular, new_r_Jmp(blk));
 		set_Tuple_pred(p, pn_CopyB_X_except,  get_irg_bad(irg));
 		++n_args;
 	}
@@ -769,7 +766,7 @@ static void transform_irg(const lower_params_t *lp, ir_graph *irg)
 
 			if (is_compound_type(tp)) {
 				ir_node *arg = get_irg_args(irg);
-				arg = new_r_Proj(irg, get_nodes_block(arg), arg, mode_P_data, env.first_hidden + k);
+				arg = new_r_Proj(get_nodes_block(arg), arg, mode_P_data, env.first_hidden + k);
 				++k;
 
 				if (is_Unknown(pred)) {
@@ -790,13 +787,13 @@ static void transform_irg(const lower_params_t *lp, ir_graph *irg)
 						++n_cr_opt;
 					} else { /* copy-return optimization is impossible, do the copy. */
 						copy = new_r_CopyB(
-							irg, bl,
+							bl,
 							mem,
 							arg,
 							pred,
 							tp
 							);
-						mem = new_r_Proj(irg, bl, copy, mode_M, pn_CopyB_M_regular);
+						mem = new_r_Proj(bl, copy, mode_M, pn_CopyB_M);
 					}
 				}
 				if (lp->flags & LF_RETURN_HIDDEN) {