X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeschedmris.c;h=eba8e5dcfd2349073e71f7b333764ed2db1084eb;hb=79d90510ce8f0cd7994b09f3fbfdab0d98940a4a;hp=8ac256e1fc97ecaed4b4e7f50acc38cc43930f4c;hpb=1ce363f80e6a204d4011f85813362d9bd1d0e7e4;p=libfirm

diff --git a/ir/be/beschedmris.c b/ir/be/beschedmris.c
index 8ac256e1f..eba8e5dcf 100644
--- a/ir/be/beschedmris.c
+++ b/ir/be/beschedmris.c
@@ -29,9 +29,7 @@
  * Minimum Register Instruction Sequencing to Reduce Register Spills
  * in out-of-order issue superscalar architectures
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <limits.h>
 
@@ -57,7 +55,6 @@
 struct _mris_env_t {
 	ir_phase          ph;
 	heights_t         *heights;
-	const arch_env_t  *aenv;
 	ir_graph          *irg;
 	ir_node           *bl;
 	int               visited;
@@ -89,7 +86,7 @@ static void *mris_irn_data_init(ir_phase *ph, const 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 +120,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 +206,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 +229,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);
@@ -240,7 +237,7 @@ static int reaches(mris_env_t *env, ir_node *src, ir_node *tgt)
 }
 #endif
 
-static INLINE ir_node *skip_Projs(ir_node *irn)
+static inline ir_node *skip_Projs(ir_node *irn)
 {
 	return is_Proj(irn) ? skip_Projs(get_Proj_pred(irn)) : irn;
 }
@@ -513,11 +510,10 @@ 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);
-	env->aenv     = be_get_birg_arch_env(birg);
 	env->irg      = irg;
 	env->visited  = 0;
 	env->heights  = heights_new(irg);