X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeschedtrivial.c;h=8f1f4bc76331c964d48f530c76d71a32b6da2a97;hb=d300330b1e6df8c8914b8fb70cf38ee1c8ca2634;hp=4c03acedfb78ebca887ca5b04765b0f1ccd074ff;hpb=4d5c3365a58cba59993045a9e08e686d8ae079a7;p=libfirm

diff --git a/ir/be/beschedtrivial.c b/ir/be/beschedtrivial.c
index 4c03acedf..8f1f4bc76 100644
--- a/ir/be/beschedtrivial.c
+++ b/ir/be/beschedtrivial.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.
  *
@@ -18,10 +18,11 @@
  */
 
 /**
- * Trivial node selector.
- * @author Christian Wuerdig
- * @date   29.08.2006
- * @cvs-id $Id$
+ * @file
+ * @brief       Trivial node selector.
+ * @author      Sebastian Hack
+ * @date        29.08.2006
+ * @version     $Id$
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -29,7 +30,11 @@
 
 #include <stdlib.h>
 
-#include "besched_t.h"
+#include "irgraph.h"
+#include "irnode.h"
+#include "irnodeset.h"
+
+#include "bearch.h"
 #include "belistsched.h"
 
 /**
@@ -37,11 +42,13 @@
  * Just assure that branches are executed last, otherwise select
  * the first node ready.
  */
-static ir_node *trivial_select(void *block_env, ir_nodeset_t *ready_set, ir_nodeset_t *live_set)
+static ir_node *trivial_select(void *block_env, ir_nodeset_t *ready_set,
+                               ir_nodeset_t *live_set)
 {
 	const arch_env_t *arch_env = block_env;
 	ir_node          *irn      = NULL;
 	ir_nodeset_iterator_t iter;
+	(void) live_set;
 
 	/* assure that branches and constants are executed last */
 	foreach_ir_nodeset(ready_set, irn, iter) {
@@ -57,17 +64,19 @@ static ir_node *trivial_select(void *block_env, ir_nodeset_t *ready_set, ir_node
 	return irn;
 }
 
-static void *trivial_init_graph(const list_sched_selector_t *vtab, const arch_env_t *arch_env, ir_graph *irg)
+static void *trivial_init_graph(const list_sched_selector_t *vtab, const be_irg_t *birg)
 {
-	return (void *)arch_env;
+	(void) vtab;
+	return (void *) be_get_birg_arch_env(birg);
 }
 
-static void *trivial_init_block(void *graph_env, ir_node *bl)
+static void *trivial_init_block(void *graph_env, ir_node *block)
 {
+	(void) block;
 	return graph_env;
 }
 
-static const list_sched_selector_t trivial_selector_struct = {
+const list_sched_selector_t trivial_selector = {
 	trivial_init_graph,
 	trivial_init_block,
 	trivial_select,
@@ -79,5 +88,3 @@ static const list_sched_selector_t trivial_selector_struct = {
 	NULL,                /* finish_block */
 	NULL                 /* finish_graph */
 };
-
-const list_sched_selector_t *trivial_selector = &trivial_selector_struct;