X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firpass.c;h=3626d215514e9f66fb9b1d88423c323018af311b;hb=af82344c3d1ede9a28e652302a8c2bac7bb1c743;hp=201ac4172f5f848d594fc05e76ffa35ac0546707;hpb=060aa4c91666063f9bb70aaa76f5c819d256a15f;p=libfirm

diff --git a/ir/ir/irpass.c b/ir/ir/irpass.c
index 201ac4172..3626d2155 100644
--- a/ir/ir/irpass.c
+++ b/ir/ir/irpass.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2009 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2010 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -31,9 +31,13 @@
 #include "irgraph_t.h"
 #include "irprog_t.h"
 #include "irdump.h"
-#include "irvrfy.h"
+#include "irverify.h"
 #include "xmalloc.h"
 
+typedef void (*void_pass_func_irg)(ir_graph *irg);
+typedef int (*int_pass_func_irg)(ir_graph *irg);
+typedef void (*void_pass_func)(void);
+
 /*Add a graph pass to a graph pass manager. */
 void ir_graph_pass_mgr_add(ir_graph_pass_manager_t *mgr, ir_graph_pass_t *pass)
 {
@@ -58,7 +62,7 @@ void ir_prog_pass_mgr_add(ir_prog_pass_manager_t *mgr, ir_prog_pass_t *pass)
  */
 static int run_wrapper(ir_prog *prog, void *ctx)
 {
-	ir_graph_pass_manager_t *mgr = ctx;
+	ir_graph_pass_manager_t *mgr = (ir_graph_pass_manager_t*)ctx;
 
 	(void)prog;
 	return ir_graph_pass_mgr_run(mgr);
@@ -85,7 +89,7 @@ void ir_prog_no_dump(ir_prog *prog, void *ctx, unsigned idx)
  */
 static void term_wrapper(void *context)
 {
-	ir_graph_pass_manager_t *mgr = context;
+	ir_graph_pass_manager_t *mgr = (ir_graph_pass_manager_t*)context;
 	term_graph_pass_mgr(mgr);
 }
 
@@ -97,6 +101,7 @@ static ir_prog_pass_t *create_wrapper_pass(ir_graph_pass_manager_t *graph_mgr)
 	/* create a wrapper pass */
 	ir_prog_pass_t *pass = XMALLOCZ(ir_prog_pass_t);
 
+	pass->kind          = k_ir_prog_pass;
 	pass->run_on_irprog = run_wrapper;
 	pass->context       = graph_mgr;
 	pass->name          = graph_mgr->name;
@@ -123,7 +128,7 @@ void ir_prog_pass_mgr_add_graph_pass(
 	if (! list_empty(&mgr->passes)) {
 		wrapper = list_entry(mgr->passes.prev, ir_prog_pass_t, list);
 		if (wrapper->is_wrapper) {
-			graph_mgr = wrapper->context;
+			graph_mgr = (ir_graph_pass_manager_t*)wrapper->context;
 
 			ir_graph_pass_mgr_add(graph_mgr, pass);
 			++mgr->n_passes;
@@ -166,7 +171,8 @@ static void create_suffix(char *suffix, size_t n, const char *pass_name)
 int ir_graph_pass_mgr_run(ir_graph_pass_manager_t *mgr)
 {
 	ir_graph_pass_t *pass;
-	int             i, res = 0;
+	size_t           i;
+	int              res = 0;
 	ir_graph        *rem = current_ir_graph;
 
 	/* on all graphs: beware: number of irgs might be changed */
@@ -208,9 +214,11 @@ int ir_graph_pass_mgr_run(ir_graph_pass_manager_t *mgr)
  */
 static int irp_verify_irgs(void)
 {
-	int i, res = 1;
+	int    res = 1;
+	size_t i;
+	size_t n_irgs = get_irp_n_irgs();
 
-	for (i = get_irp_n_irgs() - 1; i >= 0; --i)
+	for (i = 0; i < n_irgs; ++i)
 		res &= irg_verify(get_irp_irg(i), 0);
 	return res;
 }
@@ -246,7 +254,7 @@ int ir_prog_pass_mgr_run(ir_prog_pass_manager_t *mgr)
 			}
 		}
 		if (pass->is_wrapper) {
-			ir_graph_pass_manager_t *graph_mgr = pass->context;
+			ir_graph_pass_manager_t *graph_mgr = (ir_graph_pass_manager_t*)pass->context;
 			idx += graph_mgr->n_passes;
 		} else
 			++idx;
@@ -345,7 +353,7 @@ void ir_prog_pass_mgr_set_run_idx(
  */
 static int void_graph_wrapper(ir_graph *irg, void *context)
 {
-	void (*function)(ir_graph *irg) = context;
+	void_pass_func_irg function = (void_pass_func_irg)context;
 	function(irg);
 	return 0;
 }  /* void_graph_wrapper */
@@ -358,7 +366,7 @@ ir_graph_pass_t *def_graph_pass(
 
 	pass->kind       = k_ir_graph_pass;
 	pass->run_on_irg = void_graph_wrapper;
-	pass->context    = function;
+	pass->context    = (void*)function;
 	pass->name       = name;
 
 	INIT_LIST_HEAD(&pass->list);
@@ -367,11 +375,11 @@ ir_graph_pass_t *def_graph_pass(
 }  /* def_graph_pass */
 
 /**
- * Wrapper for running void function(ir_graph *irg) as an ir_graph pass.
+ * Wrapper for running int function(ir_graph *irg) as an ir_graph pass.
  */
 static int int_graph_wrapper(ir_graph *irg, void *context)
 {
-	int (*function)(ir_graph *irg) = context;
+	int_pass_func_irg function = (int_pass_func_irg)context;
 	return function(irg);
 }  /* int_graph_wrapper */
 
@@ -383,7 +391,7 @@ ir_graph_pass_t *def_graph_pass_ret(
 
 	pass->kind       = k_ir_graph_pass;
 	pass->run_on_irg = int_graph_wrapper;
-	pass->context    = function;
+	pass->context    = (void*)function;
 	pass->name       = name;
 
 	INIT_LIST_HEAD(&pass->list);
@@ -420,7 +428,7 @@ void ir_graph_pass_set_parallel(ir_graph_pass_t *pass, int flag)
  */
 static int void_prog_wrapper(ir_prog *irp, void *context)
 {
-	void (*function)(void) = context;
+	void_pass_func function = (void_pass_func)context;
 
 	(void)irp;
 	function();
@@ -436,7 +444,7 @@ ir_prog_pass_t *def_prog_pass(
 
 	pass->kind          = k_ir_prog_pass;
 	pass->run_on_irprog = void_prog_wrapper;
-	pass->context       = function;
+	pass->context       = (void*)function;
 	pass->name          = name;
 
 	INIT_LIST_HEAD(&pass->list);
@@ -465,18 +473,18 @@ ir_prog_pass_t *def_prog_pass_constructor(
 	return pass;
 }  /* def_prog_pass_constructor */
 
-struct pass_t {
+typedef struct pass_t {
 	ir_prog_pass_t pass;
 	void           *context;
 	void (*function)(void *context);
-};
+} pass_t;
 
 /**
  * Wrapper for the call_function pass.
  */
 static int call_function_wrapper(ir_prog *irp, void *context)
 {
-	struct pass_t *pass = context;
+	pass_t *pass = (pass_t*)context;
 
 	(void)irp;
 	pass->function(pass->context);