* @version $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "lowering.h"
#include "irprog_t.h"
#include "irmemory.h"
#include "irtools.h"
#include "iroptimize.h"
-#include "array.h"
+#include "array_t.h"
#include "pmap.h"
-#include "xmalloc.h"
+#include "error.h"
/** A type map for def_find_pointer_type. */
static pmap *type_map;
if (e)
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(id_mangle_u(get_type_ident(e_type), new_id_from_chars("Ptr", 3)), e_type, mode);
set_type_alignment_bytes(res, alignment);
pmap_insert(type_map, e_type, res);
}
*/
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. */
}
lowered = get_associated_type(mtp);
- if (lowered)
+ if (lowered != NULL)
return lowered;
n_ress = get_method_n_ress(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;
if (n_regs > 0) {
/* this compound will be returned solely in registers */
- assert(0);
+ panic("Returning compounds in registers not yet implemented");
}
else {
/* 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));
+ 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));
/* fill it */
set_method_first_variadic_param_index(lowered, first_variadic);
/* associate the lowered type with the original one for easier access */
- if(changed) {
+ if (changed) {
set_method_calling_convention(lowered, get_method_calling_convention(mtp) | cc_compound_ret);
}
+
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;
}
pmap *dummy_map; /**< A map for finding the dummy arguments. */
unsigned dnr; /**< The dummy index number. */
const lower_params_t *params; /**< Lowering parameters. */
+ ir_type *lowered_mtp; /**< The lowered method type of the current irg if any. */
+ ir_type *value_params; /**< The value params type if any. */
unsigned only_local_mem:1; /**< Set if only local memory access was found. */
unsigned changed:1; /**< Set if the current graph was changed. */
} wlk_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;
ir_node *ptr;
switch (get_irn_opcode(n)) {
+ case iro_Sel:
+ if (env->lowered_mtp != NULL && env->value_params != NULL) {
+ ir_entity *ent = get_Sel_entity(n);
+
+ if (get_entity_owner(ent) == env->value_params) {
+ int pos = get_struct_member_index(env->value_params, ent) + env->arg_shift;
+ ir_entity *new_ent;
+
+ new_ent = get_method_value_param_ent(env->lowered_mtp, pos);
+ set_entity_ident(new_ent, get_entity_ident(ent));
+ set_Sel_entity(n, new_ent);
+ }
+ }
+ break;
case iro_Load:
case iro_Store:
if (env->only_local_mem) {
} else {
/* we must only search for calls */
env.arg_shift = 0;
+ lowered_mtp = NULL;
}
obstack_init(&env.obst);
env.cl_list = NULL;
env.dummy_map = pmap_create_ex(8);
env.dnr = 0;
env.params = lp;
+ env.lowered_mtp = lowered_mtp;
+ env.value_params = get_method_value_param_type(mtp);
env.only_local_mem = 1;
env.changed = 0;
for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
irg = get_irp_irg(i);
- if (irg == get_const_code_irg())
- continue;
-
transform_irg(¶m, irg);
}
projects / libfirm / blobdiff