* @version $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "lowering.h"
#include "irprog_t.h"
#include "ircons.h"
#include "irgmod.h"
#include "irgwalk.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;
/* 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);
}
*/
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));
- 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)
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;
}
* Walker environment for fix_args_and_collect_calls().
*/
typedef struct _wlk_env_t {
- int arg_shift; /**< The Argument index shift for parameters. */
- int first_hidden; /**< The index of the first hidden argument. */
- struct obstack obst; /**< An obstack to allocate the data on. */
- cl_entry *cl_list; /**< The call list. */
- pmap *dummy_map; /**< A map for finding the dummy arguments. */
- unsigned dnr; /**< The dummy index number. */
- const lower_params_t *params; /**< lowering parameters */
- int changed; /**< set if the current graph was changed */
+ int arg_shift; /**< The Argument index shift for parameters. */
+ int first_hidden; /**< The index of the first hidden argument. */
+ struct obstack obst; /**< An obstack to allocate the data on. */
+ cl_entry *cl_list; /**< The call list. */
+ 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;
/**
* @param call A Call node.
* @param env The environment.
*/
-static cl_entry *get_Call_entry(ir_node *call, wlk_env *env) {
+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;
}
/**
- * Post walker: shift all parameter indeces
+ * Finds the base address of an address by skipping Sel's and address
+ * calculation.
+ *
+ * @param adr the address
+ * @param pEnt points to the base entity if any
+ */
+static ir_node *find_base_adr(ir_node *ptr, ir_entity **pEnt)
+{
+ ir_entity *ent = NULL;
+ assert(mode_is_reference(get_irn_mode(ptr)));
+
+ for (;;) {
+ if (is_Sel(ptr)) {
+ ent = get_Sel_entity(ptr);
+ ptr = get_Sel_ptr(ptr);
+ }
+ else if (is_Add(ptr)) {
+ ir_node *left = get_Add_left(ptr);
+ if (mode_is_reference(get_irn_mode(left)))
+ ptr = left;
+ else
+ ptr = get_Add_right(ptr);
+ ent = NULL;
+ } else if (is_Sub(ptr)) {
+ ptr = get_Sub_left(ptr);
+ ent = NULL;
+ } else {
+ *pEnt = ent;
+ return ptr;
+ }
+ }
+}
+
+/**
+ * Check if a given pointer represents non-local memory.
+ */
+static void check_ptr(ir_node *ptr, wlk_env *env)
+{
+ ir_storage_class_class_t sc;
+ ir_entity *ent;
+
+ /* still alias free */
+ ptr = find_base_adr(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;
+ }
+}
+
+/**
+ * Post walker: shift all parameter indexes
* and collect Calls with compound returns in the call list.
+ * If a non-alias free memory access is found, reset the alias free
+ * flag.
*/
-static void fix_args_and_collect_calls(ir_node *n, void *ctx) {
+static void fix_args_and_collect_calls(ir_node *n, void *ctx)
+{
wlk_env *env = ctx;
- int i;
+ int i;
ir_type *ctp;
- ir_op *op = get_irn_op(n);
+ ir_node *ptr;
- if (env->arg_shift > 0 && op == op_Proj) {
- ir_node *pred = get_Proj_pred(n);
+ switch (get_irn_opcode(n)) {
+ case iro_Sel:
+ if (env->lowered_mtp != NULL && env->value_params != NULL) {
+ ir_entity *ent = get_Sel_entity(n);
- /* Fix the argument numbers */
- if (pred == get_irg_args(current_ir_graph)) {
- long pnr = get_Proj_proj(n);
- set_Proj_proj(n, pnr + env->arg_shift);
- env->changed = 1;
+ 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);
+ }
}
- } else if (op == op_Call) {
+ break;
+ case iro_Load:
+ case iro_Store:
+ if (env->only_local_mem) {
+ ptr = get_irn_n(n, 1);
+ check_ptr(ptr, env);
+ }
+ break;
+ case iro_Proj:
+ if (env->arg_shift > 0) {
+ ir_node *pred = get_Proj_pred(n);
+
+ /* Fix the argument numbers */
+ if (pred == get_irg_args(current_ir_graph)) {
+ long pnr = get_Proj_proj(n);
+ set_Proj_proj(n, pnr + env->arg_shift);
+ env->changed = 1;
+ }
+ }
+ break;
+ case iro_Call:
+ if (! is_self_recursive_Call(n)) {
+ /* any non self recursive call might access global memory */
+ env->only_local_mem = 0;
+ }
+
ctp = get_Call_type(n);
if (env->params->flags & LF_COMPOUND_RETURN) {
/* check for compound returns */
}
}
}
- } else if (op == op_CopyB && env->params->flags & LF_COMPOUND_RETURN) {
- /* check for compound returns */
- ir_node *src = get_CopyB_src(n);
- /* older scheme using value_res_ent */
- if (is_Sel(src)) {
- ir_node *proj = get_Sel_ptr(src);
- if (is_Proj(proj) && get_Proj_proj(proj) == pn_Call_P_value_res_base) {
- ir_node *call = get_Proj_pred(proj);
- if (is_Call(call)) {
- /* found a CopyB from compound Call result */
- cl_entry *e = get_Call_entry(call, env);
- set_irn_link(n, e->copyb);
- e->copyb = n;
- }
- }
- } else
- /* new scheme: compound results are determined by the call type only */
- if (is_Proj(src)) {
- ir_node *proj = get_Proj_pred(src);
- if (is_Proj(proj) && get_Proj_proj(proj) == pn_Call_T_result) {
+ break;
+ case iro_CopyB:
+ if (env->only_local_mem) {
+ check_ptr(get_CopyB_src(n), env);
+ if (env->only_local_mem)
+ check_ptr(get_CopyB_dst(n), env);
+ }
+ if (env->params->flags & LF_COMPOUND_RETURN) {
+ /* check for compound returns */
+ ir_node *src = get_CopyB_src(n);
+ /* older scheme using value_res_ent */
+ if (is_Sel(src)) {
+ ir_node *proj = get_Sel_ptr(src);
+ if (is_Proj(proj) && get_Proj_proj(proj) == pn_Call_P_value_res_base) {
ir_node *call = get_Proj_pred(proj);
if (is_Call(call)) {
- ctp = get_Call_type(call);
- if (is_compound_type(get_method_res_type(ctp, get_Proj_proj(src)))) {
- /* found a CopyB from compound Call result */
- cl_entry *e = get_Call_entry(call, env);
- set_irn_link(n, e->copyb);
- e->copyb = n;
+ /* found a CopyB from compound Call result */
+ cl_entry *e = get_Call_entry(call, env);
+ set_irn_link(n, e->copyb);
+ e->copyb = n;
+ }
+ }
+ } else {
+ /* new scheme: compound results are determined by the call type only */
+ if (is_Proj(src)) {
+ ir_node *proj = get_Proj_pred(src);
+ if (is_Proj(proj) && get_Proj_proj(proj) == pn_Call_T_result) {
+ ir_node *call = get_Proj_pred(proj);
+ if (is_Call(call)) {
+ ctp = get_Call_type(call);
+ if (is_compound_type(get_method_res_type(ctp, get_Proj_proj(src)))) {
+ /* found a CopyB from compound Call result */
+ cl_entry *e = get_Call_entry(call, env);
+ set_irn_link(n, e->copyb);
+ e->copyb = n;
+ }
}
}
}
}
+ }
+ break;
+ default:
+ /* do nothing */
+ break;
}
}
* return values) to be 1 (C, C++) in almost all cases, so ignore the
* linear search complexity here.
*/
-static void do_copy_return_opt(ir_node *n, void *ctx) {
+static void do_copy_return_opt(ir_node *n, void *ctx)
+{
cr_pair *arr = ctx;
int i;
}
}
return new_r_simpleSel(
- irg,
block,
get_irg_no_mem(irg),
get_irg_frame(irg),
if (get_struct_member(owner, idx) == ent)
break;
assert(idx < get_struct_n_members(owner));
- }
- else
-
+ } else {
/* new scheme: compound returns are determined by the call type and are Proj's */
idx = get_Proj_proj(src);
+ }
ins[idx] = get_CopyB_dst(p);
mem = get_CopyB_mem(p);
/* 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;
}
* @param irg the graph
* @param env the environment
*/
-static void fix_call_list(ir_graph *irg, wlk_env *env) {
+static void fix_call_list(ir_graph *irg, wlk_env *env)
+{
const lower_params_t *lp = env->params;
cl_entry *p;
ir_node *call, **new_in;
*/
static void transform_irg(const lower_params_t *lp, ir_graph *irg)
{
- ir_entity *ent = get_irg_entity(irg);
- ir_type *mtp, *lowered_mtp, *tp, *ft;
- int i, j, k, n_ress = 0, n_ret_com = 0, n_cr_opt;
- ir_node **new_in, *ret, *endbl, *bl, *mem, *copy;
- cr_pair *cr_opt;
- wlk_env env;
+ ir_graph * rem = current_ir_graph;
+ ir_entity *ent = get_irg_entity(irg);
+ ir_type *mtp, *lowered_mtp, *tp, *ft;
+ int i, j, k, n_ress = 0, n_ret_com = 0, n_cr_opt;
+ ir_node **new_in, *ret, *endbl, *bl, *mem, *copy;
+ cr_pair *cr_opt;
+ wlk_env env;
add_hidden hidden_params;
+ current_ir_graph = irg;
+
assert(ent && "Cannot transform graph without an entity");
assert(get_irg_phase_state(irg) == phase_high && "call lowering must be done in phase high");
/* hidden arguments are added first */
env.arg_shift = n_ret_com;
env.first_hidden = 0;
- }
- else {
+ } else {
/* hidden arguments are added last */
env.arg_shift = 0;
env.first_hidden = get_method_n_params(mtp);
} 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.changed = 0;
+ 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;
/* scan the code, fix argument numbers and collect calls. */
irg_walk_graph(irg, firm_clear_link, fix_args_and_collect_calls, &env);
if (n_ret_com) {
/*
- * Now fix the Return node of the current graph.
- */
+ * Now fix the Return node of the current graph.
+ */
env.changed = 1;
/* STEP 1: find the return. This is simple, we have normalized the graph. */
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(arg, mode_P_data, env.first_hidden + k);
++k;
if (is_Unknown(pred)) {
/* The Return(Unknown) is the Firm construct for a missing return.
Do nothing. */
} else {
- if (is_compound_address(ft, pred)) {
+ /**
+ * Sorrily detecting that copy-return is possible isn't that simple.
+ * We must check, that the hidden address is alias free during the whole
+ * function.
+ * A simple heuristic: all Loads/Stores inside
+ * the function access only local frame.
+ */
+ if (env.only_local_mem && is_compound_address(ft, pred)) {
/* we can do the copy-return optimization here */
cr_opt[n_cr_opt].ent = get_Sel_entity(pred);
cr_opt[n_cr_opt].arg = arg;
++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(copy, mode_M, pn_CopyB_M);
}
}
if (lp->flags & LF_RETURN_HIDDEN) {
irg_walk_graph(irg, NULL, do_copy_return_opt, cr_opt);
for (i = ARR_LEN(cr_opt) - 1; i >= 0; --i) {
- remove_class_member(ft, cr_opt[i].ent);
+ free_entity(cr_opt[i].ent);
}
}
} /* if (n_ret_com) */
set_irg_outs_inconsistent(irg);
set_irg_loopinfo_state(irg, loopinfo_inconsistent);
}
+ current_ir_graph = rem;
}
/**
* @param lp lowering parameters
* @param tp The type.
*/
-static int must_be_lowered(const lower_params_t *lp, ir_type *tp) {
+static int must_be_lowered(const lower_params_t *lp, ir_type *tp)
+{
int i, n_ress;
ir_type *res_tp;
* type-walker: lower all method types of entities
* and points-to types.
*/
-static void lower_method_types(type_or_ent *tore, void *env)
+static void lower_method_types(type_or_ent tore, void *env)
{
const lower_params_t *lp = env;
ir_type *tp;
/* fix method entities */
- if (is_entity(tore)) {
- ir_entity *ent = (ir_entity *)tore;
+ if (is_entity(tore.ent)) {
+ ir_entity *ent = tore.ent;
tp = get_entity_type(ent);
if (must_be_lowered(lp, tp)) {
set_entity_type(ent, tp);
}
} else {
- tp = (ir_type *)tore;
+ tp = tore.typ;
/* fix pointer to methods */
if (is_Pointer_type(tp)) {
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