sparc: Do not force the object file format to ELF.

[libfirm] / ir / be / beschedtrivial.c

diff --git a/ir/be/beschedtrivial.c b/ir/be/beschedtrivial.c
index 044fca2..4fe8a18 100644 (file)
--- 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.
  *
@@ -22,11 +22,8 @@
  * @brief       Trivial node selector.
  * @author      Sebastian Hack
  * @date        29.08.2006
- * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdlib.h>
 
@@ -36,57 +33,58 @@
 
 #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, ir_nodeset_t *ready_set,
-                               ir_nodeset_t *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_nodeset_iterator_t iter;
-       (void) live_set;
+       (void)block_env;
 
        /* assure that branches and constants are executed last */
        foreach_ir_nodeset(ready_set, irn, iter) {
-               if (! arch_irn_class_is(arch_env, irn, branch)) {
+               if (!is_cfop(irn)) {
                        return irn;
                }
        }
 
        /* at last: schedule branches */
-       ir_nodeset_iterator_init(&iter, ready_set);
-       irn = ir_nodeset_iterator_next(&iter);
-
-       return irn;
+       return ir_nodeset_first(ready_set);
 }
 
-static void *trivial_init_graph(const list_sched_selector_t *vtab, const be_irg_t *birg)
+static void *trivial_init_graph(ir_graph *irg)
 {
-       (void) vtab;
-       return (void *) be_get_birg_arch_env(birg);
+       (void)irg;
+       return NULL;
 }
 
 static void *trivial_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 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 */
-};
+static void sched_trivial(ir_graph *irg)
+{
+       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);
+}
 
-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);
+}