X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeschedtrivial.c;h=d05a0a98e420aecdcc845eae7f74981153b74b45;hb=0318dc1a48ce72b311592c28affc31fabc95f026;hp=2a4f6adaff5fd343e281cfe3d0e2629ef2b2ade7;hpb=08bb312485d8a28679504d97402b70fde8073a66;p=libfirm

diff --git a/ir/be/beschedtrivial.c b/ir/be/beschedtrivial.c
index 2a4f6adaf..d05a0a98e 100644
--- a/ir/be/beschedtrivial.c
+++ b/ir/be/beschedtrivial.c
@@ -1,61 +1,96 @@
+/*
+ * 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$
  */
+#include "config.h"
 
 #include <stdlib.h>
 
-#include "besched_t.h"
+#include "irgraph.h"
+#include "irnode.h"
+#include "irnodeset.h"
+
+#include "bearch.h"
 #include "belistsched.h"
+#include "bemodule.h"
+#include "besched.h"
 
 /**
  * The trivial selector:
  * 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)
 {
-	const arch_env_t *arch_env = block_env;
-	ir_node          *irn      = NULL;
+	ir_node               *irn;
+	ir_nodeset_iterator_t  iter;
+	(void)block_env;
 
 	/* assure that branches and constants are executed last */
-	for (irn = nodeset_first(ready_set); irn; irn = nodeset_next(ready_set)) {
-		if (! arch_irn_class_is(arch_env, irn, branch)) {
-			nodeset_break(ready_set);
+	foreach_ir_nodeset(ready_set, irn, iter) {
+		if (!is_cfop(irn)) {
 			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(ir_graph *irg)
+{
+	(void)irg;
+	return NULL;
+}
+
+static void *trivial_init_block(void *graph_env, ir_node *block)
 {
-	return (void *)arch_env;
+	(void)graph_env;
+	(void)block;
+	return NULL;
 }
 
-static void *trivial_init_block(void *graph_env, ir_node *bl)
+static void sched_trivial(ir_graph *irg)
 {
-	return graph_env;
+	static const list_sched_selector_t trivial_selector = {
+		trivial_init_graph,
+		trivial_init_block,
+		trivial_select,
+		NULL,                /* node_ready */
+		NULL,                /* node_selected */
+		NULL,                /* finish_block */
+		NULL                 /* finish_graph */
+	};
+	be_list_sched_graph(irg, &trivial_selector);
 }
 
-static const list_sched_selector_t trivial_selector_struct = {
-	trivial_init_graph,
-	trivial_init_block,
-	trivial_select,
-	NULL,                /* to_appear_in_schedule */
-	NULL,                /* node_ready */
-	NULL,                /* node_selected */
-	NULL,                /* exectime */
-	NULL,                /* latency */
-	NULL,                /* finish_block */
-	NULL                 /* finish_graph */
-};
-
-const list_sched_selector_t *trivial_selector = &trivial_selector_struct;
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_sched_trivial);
+void be_init_sched_trivial(void)
+{
+	be_register_scheduler("trivial", sched_trivial);
+}