X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Flower%2Flower_calls.c;h=59bb85f38e99da7da0e6235a2cebe2efd4cb2734;hb=8b5aac95f0921dc70b53f2526f7a7413df3f6f85;hp=57fe11b243ee04e7cf6a6fe0f2c688ae3fa76aaa;hpb=43332529cf18bf9f2a0ecb384dc5dd0093eb3c8a;p=libfirm

diff --git a/ir/lower/lower_calls.c b/ir/lower/lower_calls.c
index 57fe11b24..59bb85f38 100644
--- a/ir/lower/lower_calls.c
+++ b/ir/lower/lower_calls.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -48,17 +48,13 @@ static pmap *type_map;
  * Default implementation for finding a pointer type for a given element type.
  * Simple create a new one.
  */
-static ir_type *def_find_pointer_type(ir_type *e_type, ir_mode *mode, int alignment)
+static ir_type *def_find_pointer_type(ir_type *e_type, ir_mode *mode,
+                                      int alignment)
 {
-	ir_type *res;
-	pmap_entry *e;
-
 	/* 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 && get_type_mode(e->value) == mode)
-		res = e->value;
-	else {
+	ir_type *res = (ir_type*)pmap_get(type_map, e_type);
+	if (res == NULL || get_type_mode(res) != mode) {
 		res = new_type_pointer(e_type);
 		set_type_mode(res, mode);
 		set_type_alignment_bytes(res, alignment);
@@ -235,7 +231,7 @@ struct cl_entry {
 /**
  * Walker environment for fix_args_and_collect_calls().
  */
-typedef struct _wlk_env_t {
+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. */
@@ -259,7 +255,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);
+	cl_entry *res = (cl_entry*)get_irn_link(call);
 	if (res == NULL) {
 		cl_entry *res = OALLOC(&env->obst, cl_entry);
 		res->next  = env->cl_list;
@@ -315,7 +311,7 @@ static void check_ptr(ir_node *ptr, wlk_env *env)
 
 	/* still alias free */
 	ptr = find_base_adr(ptr, &ent);
-	sc  = GET_BASE_SC(classify_pointer(current_ir_graph, ptr, ent));
+	sc  = get_base_sc(classify_pointer(ptr, ent));
 	if (sc != ir_sc_localvar && sc != ir_sc_malloced) {
 		/* non-local memory access */
 		env->only_local_mem = 0;
@@ -330,7 +326,7 @@ static void check_ptr(ir_node *ptr, wlk_env *env)
  */
 static void fix_args_and_collect_calls(ir_node *n, void *ctx)
 {
-	wlk_env *env = ctx;
+	wlk_env *env = (wlk_env*)ctx;
 	int      i;
 	ir_type *ctp;
 	ir_node *ptr;
@@ -472,13 +468,12 @@ typedef struct cr_pair {
  */
 static void do_copy_return_opt(ir_node *n, void *ctx)
 {
-	cr_pair *arr = ctx;
-	int i;
-
 	if (is_Sel(n)) {
 		ir_entity *ent = get_Sel_entity(n);
+		cr_pair   *arr = (cr_pair*)ctx;
+		size_t    i, l;
 
-		for (i = ARR_LEN(arr) - 1; i >= 0; --i) {
+		for (i = 0, l = ARR_LEN(arr); i < l; ++i) {
 			if (ent == arr[i].ent) {
 				exchange(n, arr[i].arg);
 				break;
@@ -507,7 +502,7 @@ static ir_node *get_dummy_sel(ir_graph *irg, ir_node *block, ir_type *tp, wlk_en
 	/* use a map the check if we already create such an entity */
 	e = pmap_find(env->dummy_map, tp);
 	if (e)
-		ent = e->value;
+		ent = (ir_entity*)e->value;
 	else {
 		ir_type *ft = get_irg_frame_type(irg);
 		char buf[16];
@@ -542,11 +537,12 @@ static void add_hidden_param(ir_graph *irg, int n_com, ir_node **ins, cl_entry *
 	ir_node *p, *n, *src, *mem, *blk;
 	ir_entity *ent;
 	ir_type *owner;
-	int idx, n_args;
+	int n_args;
 
 	n_args = 0;
 	for (p = entry->copyb; p; p = n) {
-		n   = get_irn_link(p);
+		size_t idx;
+		n   = (ir_node*)get_irn_link(p);
 		src = get_CopyB_src(p);
 
 		/* old scheme using value_res_ent */
@@ -579,7 +575,8 @@ static void add_hidden_param(ir_graph *irg, int n_com, ir_node **ins, cl_entry *
 	/* 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);
@@ -661,10 +658,11 @@ static void fix_call_list(ir_graph *irg, wlk_env *env)
  */
 static void transform_irg(const lower_params_t *lp, ir_graph *irg)
 {
-	ir_graph   * rem = current_ir_graph;
+	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;
+	int        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;
 	wlk_env    env;
@@ -816,9 +814,11 @@ static void transform_irg(const lower_params_t *lp, ir_graph *irg)
 		set_irn_in(ret, j, new_in);
 
 		if (n_cr_opt > 0) {
+			size_t i, n;
+
 			irg_walk_graph(irg, NULL, do_copy_return_opt, cr_opt);
 
-			for (i = ARR_LEN(cr_opt) - 1; i >= 0; --i) {
+			for (i = 0, n = ARR_LEN(cr_opt); i < n; ++i) {
 				free_entity(cr_opt[i].ent);
 			}
 		}
@@ -868,7 +868,7 @@ static int must_be_lowered(const lower_params_t *lp, ir_type *tp)
  */
 static void lower_method_types(type_or_ent tore, void *env)
 {
-	const lower_params_t *lp = env;
+	const lower_params_t *lp = (const lower_params_t*)env;
 	ir_type *tp;
 
 	/* fix method entities */
@@ -911,7 +911,7 @@ static void lower_method_types(type_or_ent tore, void *env)
  */
 void lower_calls_with_compounds(const lower_params_t *params)
 {
-	int i;
+	size_t i, n;
 	ir_graph *irg;
 	lower_params_t param = *params;
 
@@ -922,7 +922,7 @@ void lower_calls_with_compounds(const lower_params_t *params)
 		type_map = NULL;
 
 	/* first step: Transform all graphs */
-	for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
+	for (i = 0, n = get_irp_n_irgs(); i < n; ++i) {
 		irg = get_irp_irg(i);
 
 		transform_irg(&param, irg);