X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Flower%2Flower_calls.c;h=7f15ee5ffe786adc133941e3d5cc9f3b2f82f7b3;hb=aa5c48c22eb13b5c64a340fe8dca931d4bedd1e7;hp=7712f40cb921a7475f4835fb74a63adbb5c7f1b2;hpb=69c991e03a0eb1b284e6d0c41623d340a8e26d16;p=libfirm

diff --git a/ir/lower/lower_calls.c b/ir/lower/lower_calls.c
index 7712f40cb..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(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);
 	}
@@ -78,14 +79,14 @@ static ir_type *def_find_pointer_type(ir_type *e_type, ir_mode *mode, int alignm
  */
 static ir_type *create_modified_mtd_type(const lower_params_t *lp, ir_type *mtp)
 {
-	ir_type *lowered, *ptr_tp;
+	ir_type *lowered, *ptr_tp, *value_type;
 	ir_type **params, **results, *res_tp;
+	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;
-	variadicity var;
+	ir_variadicity var;
 
 	if (is_lowered_type(mtp)) {
 		/* the type is already lowered. Not handled yet. */
@@ -93,7 +94,7 @@ static ir_type *create_modified_mtd_type(const lower_params_t *lp, ir_type *mtp)
 	}
 
 	lowered = get_associated_type(mtp);
-	if (lowered)
+	if (lowered != NULL)
 		return lowered;
 
 	n_ress   = get_method_n_ress(mtp);
@@ -102,6 +103,8 @@ static ir_type *create_modified_mtd_type(const lower_params_t *lp, ir_type *mtp)
 	n_params = get_method_n_params(mtp);
 	NEW_ARR_A(ir_type *, params, n_params + n_ress);
 
+	NEW_ARR_A(int, param_map, n_params + n_ress);
+
 	first_variadic = get_method_first_variadic_param_index(mtp);
 
 	hidden_params = lp->hidden_params;
@@ -128,43 +131,51 @@ static ir_type *create_modified_mtd_type(const lower_params_t *lp, ir_type *mtp)
 					/* this compound will be allocated on callers stack and its
 					   address will be transmitted as a hidden parameter. */
 					ptr_tp = lp->find_pointer_type(res_tp, get_modeP_data(), lp->def_ptr_alignment);
-					params[nn_params++] = ptr_tp;
+					params[nn_params]    = ptr_tp;
+					param_map[nn_params] = -1 - i;
+					++nn_params;
 					changed++;
 					if (lp->flags & LF_RETURN_HIDDEN)
 						results[nn_ress++] = ptr_tp;
 				}
-			}
-			else
+			} else {
+				/* scalar result */
 				results[nn_ress++] = res_tp;
+			}
 		}
 
 		/* move the index of the first variadic parameter */
 		first_variadic += nn_params;
 
-		for (i = 0; i < n_params; ++i)
-			params[nn_params++] = get_method_param_type(mtp, i);
-	}
-	else {
+		for (i = 0; i < n_params; ++i, ++nn_params) {
+			params[nn_params]    = get_method_param_type(mtp, i);
+			param_map[nn_params] = i;
+		}
+	} else {
 		/* add hidden parameters last */
 		assert(get_method_variadicity(mtp) == variadicity_non_variadic &&
 			"Cannot add hidden parameters at end of variadic function");
 
-		for (nn_params = 0; nn_params < n_params; ++nn_params)
-			params[nn_params] = get_method_param_type(mtp, nn_params);
+		for (nn_params = 0; nn_params < n_params; ++nn_params) {
+			params[nn_params]    = get_method_param_type(mtp, nn_params);
+			param_map[nn_params] = nn_params;
+		}
 
 		for (nn_ress = i = 0; i < n_ress; ++i) {
 			res_tp = get_method_res_type(mtp, i);
 
-			if (is_compound_type(res_tp))
-				params[nn_params++] = lp->find_pointer_type(res_tp, get_modeP_data(), lp->def_ptr_alignment);
-			else
+			if (is_compound_type(res_tp)) {
+				params[nn_params] = lp->find_pointer_type(res_tp, get_modeP_data(), lp->def_ptr_alignment);
+				param_map[nn_params] = -1 - i;
+				++nn_params;
+			} else {
 				results[nn_ress++] = res_tp;
+			}
 		}
 	}
 
 	/* create the new type */
-	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)
@@ -184,6 +195,30 @@ static ir_type *create_modified_mtd_type(const lower_params_t *lp, ir_type *mtp)
 
 	set_lowered_type(mtp, lowered);
 
+	value_type = get_method_value_param_type(mtp);
+	if (value_type != NULL) {
+		/* set new param positions */
+		for (i = 0; i < nn_params; ++i) {
+			ir_entity *ent = get_method_value_param_ent(lowered, i);
+			int       pos  = param_map[i];
+			ident     *id;
+
+			set_entity_link(ent, INT_TO_PTR(pos));
+			if (pos < 0) {
+				/* formally return value, ignore for now */
+				continue;
+			}
+
+			id = get_method_param_ident(mtp, pos);
+			if (id != NULL) {
+				set_method_param_ident(lowered, i, id);
+				set_entity_ident(ent, id);
+			}
+		}
+
+		set_lowered_type(value_type, get_method_value_param_type(lowered));
+	}
+
 	return lowered;
 }
 
@@ -225,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;
@@ -277,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;
@@ -307,7 +342,7 @@ static void fix_args_and_collect_calls(ir_node *n, void *ctx) {
 
 				new_ent = get_method_value_param_ent(env->lowered_mtp, pos);
 				set_entity_ident(new_ent, get_entity_ident(ent));
-				set_Sel_entity(n, ent);
+				set_Sel_entity(n, new_ent);
 			}
 		}
 		break;
@@ -482,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),
@@ -531,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;
 	}
@@ -733,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)) {
@@ -754,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) {