X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeschedrand.c;h=6f7e38f9d407668f8995b1cd65e7cd1f80209c04;hb=81d44459b367b64abbb26feeb7c2f31738f542c0;hp=917c0e655270ec13b84742bdb0a02af1ab52e310;hpb=9e56dbf066d3698df877e2a9f78caeca29ea5a03;p=libfirm

diff --git a/ir/be/beschedrand.c b/ir/be/beschedrand.c
index 917c0e655..6f7e38f9d 100644
--- a/ir/be/beschedrand.c
+++ b/ir/be/beschedrand.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.
  *
@@ -24,9 +24,7 @@
  * @date        29.08.2006
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdlib.h>
 
@@ -41,15 +39,15 @@ static ir_node *random_select(void *block_env, ir_nodeset_t *ready_set,
                               ir_nodeset_t *live_set)
 {
 	ir_nodeset_iterator_t iter;
-	const arch_env_t *arch_env = block_env;
 	ir_node          *irn      = NULL;
 	int only_branches_left = 1;
-	(void) live_set;
+	(void)block_env;
+	(void)live_set;
 
 	/* assure that branches and constants are executed last */
 	ir_nodeset_iterator_init(&iter, ready_set);
 	while( (irn = ir_nodeset_iterator_next(&iter)) != NULL) {
-		if (! arch_irn_class_is(arch_env, irn, branch)) {
+		if (!arch_irn_class_is(irn, branch)) {
 			only_branches_left = 0;
 			break;
 		}
@@ -71,31 +69,31 @@ static ir_node *random_select(void *block_env, ir_nodeset_t *ready_set,
 				}
 				++i;
 			}
-		} while(arch_irn_class_is(arch_env, irn, branch));
+		} while (arch_irn_class_is(irn, branch));
 	}
 
 	return irn;
 }
 
-static void *random_init_graph(const list_sched_selector_t *vtab,
-                               const arch_env_t *arch_env, ir_graph *irg)
+static void *random_init_graph(const list_sched_selector_t *vtab, const be_irg_t *birg)
 {
-	(void) vtab;
-	(void) irg;
+	(void)vtab;
+	(void)birg;
 	/* Using time(NULL) as a seed here gives really random results,
 	   but is NOT deterministic which makes debugging impossible.
 	   Moreover no-one want non-deterministic compilers ... */
 	srand(0x4711);
-	return (void *)arch_env;
+	return NULL;
 }
 
 static void *random_init_block(void *graph_env, ir_node *block)
 {
-	(void) block;
-	return graph_env;
+	(void)graph_env;
+	(void)block;
+	return NULL;
 }
 
-static const list_sched_selector_t random_selector_struct = {
+const list_sched_selector_t random_selector = {
 	random_init_graph,
 	random_init_block,
 	random_select,
@@ -107,5 +105,3 @@ static const list_sched_selector_t random_selector_struct = {
 	NULL,                /* finish_block */
 	NULL                 /* finish_graph */
 };
-
-const list_sched_selector_t *random_selector = &random_selector_struct;