X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeschedmris.c;h=9b19a5d2c086d326db574e18514c77c739dfd443;hb=afbbc0b1ccd684c4c24bfd43d0f994123245f39f;hp=2d4488929b655a96d107f84d19ca02299fe8d2a6;hpb=294764ce7bb590e7714ef1378d7eda9608dbef6e;p=libfirm

diff --git a/ir/be/beschedmris.c b/ir/be/beschedmris.c
index 2d4488929..9b19a5d2c 100644
--- a/ir/be/beschedmris.c
+++ b/ir/be/beschedmris.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -79,7 +79,7 @@ typedef struct _mris_irn_t {
 #define get_mris_irn(env, irn)   ((mris_irn_t *) phase_get_or_set_irn_data(&env->ph, irn))
 #define foreach_lineage(env, pos, tmp) list_for_each_entry_safe(mris_irn_t, pos, tmp, &(env)->lineage_head, lineage_list)
 
-static void *mris_irn_data_init(ir_phase *ph, ir_node *irn, void *data)
+static void *mris_irn_data_init(ir_phase *ph, const ir_node *irn, void *data)
 {
 	mris_irn_t *mi = data ? data : phase_alloc(ph, sizeof(mi[0]));
 	(void) irn;
@@ -89,7 +89,7 @@ static void *mris_irn_data_init(ir_phase *ph, ir_node *irn, void *data)
 }
 
 #if 0
-static int compute_height(mris_env_t *env, ir_node *irn, unsigned long visited)
+static int compute_height(mris_env_t *env, ir_node *irn, ir_visited_t visited)
 {
 	mris_irn_t *mi = get_mris_irn(env, irn);
 
@@ -123,7 +123,7 @@ static int compute_height(mris_env_t *env, ir_node *irn, unsigned long visited)
 static void compute_heights(mris_env_t *env)
 {
 	const ir_edge_t *edge;
-	unsigned long visited;
+	ir_visited_t visited;
 
 	visited = get_irg_visited(env->irg) + 1;
 	set_irg_visited(env->irg, visited);
@@ -209,7 +209,7 @@ static ir_node *put_lowest_in_front(mris_env_t *env, ir_node **in)
 }
 
 #if 0
-static void reaches_walker(mris_env_t *env, ir_node *irn, ir_node *tgt, int *found, unsigned long visited)
+static void reaches_walker(mris_env_t *env, ir_node *irn, ir_node *tgt, int *found, ir_visited_t visited)
 {
 	if(get_irn_visited(irn) < visited && get_nodes_block(irn) == env->bl) {
 
@@ -232,7 +232,7 @@ static void reaches_walker(mris_env_t *env, ir_node *irn, ir_node *tgt, int *fou
 static int reaches(mris_env_t *env, ir_node *src, ir_node *tgt)
 {
 	int found = 0;
-	unsigned long visited = get_irg_visited(env->irg) + 1;
+	ir_visited_t visited = get_irg_visited(env->irg) + 1;
 
 	set_irg_visited(env->irg, visited);
 	reaches_walker(env, src, tgt, &found, visited);
@@ -513,7 +513,7 @@ void dump_ir_block_graph_mris(mris_env_t *env, const char *suffix) {
 
 mris_env_t *be_sched_mris_preprocess(const be_irg_t *birg)
 {
-	mris_env_t *env = xmalloc(sizeof(env[0]));
+	mris_env_t *env = XMALLOC(mris_env_t);
 	ir_graph   *irg = be_get_birg_irg(birg);
 
 	phase_init(&env->ph, "mris", irg, 2 * PHASE_DEFAULT_GROWTH, mris_irn_data_init, NULL);