X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeschedtrivial.c;h=b95fefedb82df60093276ca90d5cd96c2c6a035d;hb=badba7005cb265773aedb660a3d86cb80da4cefa;hp=044fca2846408fee23ef0dca8e533bb81021249b;hpb=e66230064eece9d3e28b66ae3a26bf8554459c60;p=libfirm

diff --git a/ir/be/beschedtrivial.c b/ir/be/beschedtrivial.c
index 044fca284..b95fefedb 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.
  *
@@ -24,9 +24,7 @@
  * @date        29.08.2006
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdlib.h>
 
@@ -45,14 +43,14 @@
 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;
+	ir_node               *irn;
+	ir_nodeset_iterator_t  iter;
+	(void)block_env;
+	(void)live_set;
 
 	/* 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;
 		}
 	}
@@ -66,17 +64,19 @@ static ir_node *trivial_select(void *block_env, ir_nodeset_t *ready_set,
 
 static void *trivial_init_graph(const list_sched_selector_t *vtab, const be_irg_t *birg)
 {
-	(void) vtab;
-	return (void *) be_get_birg_arch_env(birg);
+	(void)vtab;
+	(void)birg;
+	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 = {
+const list_sched_selector_t trivial_selector = {
 	trivial_init_graph,
 	trivial_init_block,
 	trivial_select,
@@ -88,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;