{
ir_type *lowered, *ptr_tp, *value_type;
ir_type **params, **results, *res_tp;
- int *param_map;
+ size_t *param_map;
ir_mode *modes[MAX_REGISTER_RET_VAL];
- int n_ress, n_params, nn_ress, nn_params, i, first_variadic;
+ size_t n_ress, n_params, nn_ress, nn_params, i;
add_hidden hidden_params;
int changed = 0;
ir_variadicity var;
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);
+ NEW_ARR_A(size_t, param_map, n_params + n_ress);
hidden_params = lp->hidden_params;
if (hidden_params == ADD_HIDDEN_SMART &&
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;
- param_map[nn_params] = -1 - i;
+ param_map[nn_params] = n_params + i;
++nn_params;
changed++;
if (lp->flags & LF_RETURN_HIDDEN)
}
}
- /* move the index of the first variadic parameter */
- first_variadic += nn_params;
-
for (i = 0; i < n_params; ++i, ++nn_params) {
params[nn_params] = get_method_param_type(mtp, i);
param_map[nn_params] = i;
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;
+ param_map[nn_params] = n_params + i;
++nn_params;
} else {
results[nn_ress++] = res_tp;
var = get_method_variadicity(mtp);
set_method_variadicity(lowered, var);
- if (var == variadicity_variadic)
- set_method_first_variadic_param_index(lowered, first_variadic);
/* associate the lowered type with the original one for easier access */
if (changed) {
/* 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];
+ size_t pos = param_map[i];
ident *id;
set_entity_link(ent, INT_TO_PTR(pos));
- if (pos < 0) {
+ if (pos >= n_params) {
/* formally return value, ignore for now */
continue;
}
* 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. */
+ size_t arg_shift; /**< The Argument index shift for parameters. */
+ size_t 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. */
static void fix_args_and_collect_calls(ir_node *n, void *ctx)
{
wlk_env *env = (wlk_env*)ctx;
- int i;
ir_type *ctp;
ir_node *ptr;
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;
+ size_t 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);
ctp = get_Call_type(n);
if (env->params->flags & LF_COMPOUND_RETURN) {
/* check for compound returns */
- for (i = get_method_n_ress(ctp) -1; i >= 0; --i) {
+ size_t i, n_res;
+ for (i = 0, n_res = get_method_n_ress(ctp); i < n_res; ++i) {
if (is_compound_type(get_method_res_type(ctp, i))) {
/*
* This is a call with a compound return. As the result
* Post walker: fixes all entities addresses for the copy-return
* optimization.
*
- * Note: We expect the length of the cr_pair array (ie number of compound
+ * Note: We expect the length of the cr_pair array (i.e. number of compound
* return values) to be 1 (C, C++) in almost all cases, so ignore the
* linear search complexity here.
*/
* @param entry the call list
* @param env the environment
*/
-static void add_hidden_param(ir_graph *irg, int n_com, ir_node **ins, cl_entry *entry, wlk_env *env)
+static void add_hidden_param(ir_graph *irg, size_t n_com, ir_node **ins, cl_entry *entry, wlk_env *env)
{
ir_node *p, *n, *src, *mem, *blk;
ir_entity *ent;
ir_type *owner;
- int idx, n_args;
+ size_t n_args;
n_args = 0;
for (p = entry->copyb; p; p = n) {
+ size_t idx;
n = (ir_node*)get_irn_link(p);
src = get_CopyB_src(p);
/* now create dummy entities for function with ignored return value */
if (n_args < n_com) {
ir_type *ctp = get_Call_type(entry->call);
- int i, j;
+ size_t i;
+ size_t j;
if (is_lowered_type(ctp))
ctp = get_associated_type(ctp);
ir_node *call, **new_in;
ir_type *ctp, *lowered_mtp;
add_hidden hidden_params;
- int i, n_params, n_com, pos;
+ size_t i, n_res, n_params, n_com, pos;
new_in = NEW_ARR_F(ir_node *, 0);
for (p = env->cl_list; p; p = p->next) {
n_params = get_Call_n_params(call);
n_com = 0;
- for (i = get_method_n_ress(ctp) - 1; i >= 0; --i) {
+ for (i = 0, n_res = get_method_n_ress(ctp); i < n_res; ++i) {
if (is_compound_type(get_method_res_type(ctp, i)))
++n_com;
}
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;
+ size_t i, j, k, n_ress = 0, n_ret_com = 0;
size_t n_cr_opt;
ir_node **new_in, *ret, *endbl, *bl, *mem, *copy;
cr_pair *cr_opt;
}
if (n_ret_com) {
+ int idx;
+
/*
* Now fix the Return node of the current graph.
*/
/* STEP 1: find the return. This is simple, we have normalized the graph. */
endbl = get_irg_end_block(irg);
ret = NULL;
- for (i = get_Block_n_cfgpreds(endbl) - 1; i >= 0; --i) {
- ir_node *pred = get_Block_cfgpred(endbl, i);
+ for (idx = get_Block_n_cfgpreds(endbl) - 1; idx >= 0; --idx) {
+ ir_node *pred = get_Block_cfgpred(endbl, idx);
if (is_Return(pred)) {
ret = pred;
*/
static int must_be_lowered(const lower_params_t *lp, ir_type *tp)
{
- int i, n_ress;
+ size_t i, n_ress;
ir_type *res_tp;
if (is_Method_type(tp)) {
if (type_map)
pmap_destroy(type_map);
}
+
projects / libfirm / blobdiff