X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeschedtrivial.c;h=8f1f4bc76331c964d48f530c76d71a32b6da2a97;hb=0cf1285126c03f408d0e6567547ce98864fd6e30;hp=80f1156e1beec1a4f1d087996c5a34406d6e1b11;hpb=0c92b911be3d9d02b4a49b2a142dab8d7ba978a6;p=libfirm

diff --git a/ir/be/beschedtrivial.c b/ir/be/beschedtrivial.c
index 80f1156e1..8f1f4bc76 100644
--- a/ir/be/beschedtrivial.c
+++ b/ir/be/beschedtrivial.c
@@ -1,8 +1,28 @@
+/*
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ *
+ * This file is part of libFirm.
+ *
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
+ *
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
+ *
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
+ */
+
 /**
- * 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"
@@ -10,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"
 
 /**
@@ -18,37 +42,41 @@
  * Just assure that branches are executed last, otherwise select
  * the first node ready.
  */
-static ir_node *trivial_select(void *block_env, nodeset *ready_set, nodeset *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 */
-	for (irn = nodeset_first(ready_set); irn; irn = nodeset_next(ready_set)) {
+	foreach_ir_nodeset(ready_set, irn, iter) {
 		if (! arch_irn_class_is(arch_env, irn, branch)) {
-			nodeset_break(ready_set);
 			return irn;
 		}
 	}
 
 	/* at last: schedule branches */
-	irn = nodeset_first(ready_set);
-	nodeset_break(ready_set);
+	ir_nodeset_iterator_init(&iter, ready_set);
+	irn = ir_nodeset_iterator_next(&iter);
 
 	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,
@@ -60,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;