X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fmips%2Fmips_scheduler.c;h=156d05694c2927860f8f05422eb8cf32030a480a;hb=644c7ca46f7d4b85ba28c6e59f31068f3e323216;hp=5da62ee1b4464d59aeb5a977554c6a6361a8120f;hpb=1ce363f80e6a204d4011f85813362d9bd1d0e7e4;p=libfirm

diff --git a/ir/be/mips/mips_scheduler.c b/ir/be/mips/mips_scheduler.c
index 5da62ee1b..156d05694 100644
--- a/ir/be/mips/mips_scheduler.c
+++ b/ir/be/mips/mips_scheduler.c
@@ -23,13 +23,7 @@
  * @author  Matthias Braun, Mehdi
  * @version $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
-
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
 
 #include "mips_scheduler.h"
 
@@ -45,7 +39,6 @@
 list_sched_selector_t mips_sched_selector;
 
 typedef struct {
-	const arch_env_t* arch_env;
 	pset *div_set;
 	/**
 	 * This array holds an entry for each register that specifies how much cycles
@@ -61,12 +54,10 @@ typedef struct {
 /* Matze: deprecated and totally broken */
 #if 0
 
-static void *mips_scheduler_init_graph(const list_sched_selector_t *vtab, const arch_env_t *arch_env, ir_graph *irg)
+static void *mips_scheduler_init_graph(const list_sched_selector_t *vtab, ir_graph *irg)
 {
-	mips_sched_env_t *sched_env = xmalloc(sizeof(sched_env[0]));
-	memset(sched_env, 0, sizeof(sched_env[0]));
+	mips_sched_env_t *sched_env = XMALLOCZ(mips_sched_env_t);
 
-	sched_env->arch_env = arch_env;
 	sched_env->div_set = new_pset(pset_default_ptr_cmp, 4);
 
 	return sched_env;
@@ -145,7 +136,6 @@ static int mips_scheduler_node_allowed(mips_sched_env_t *sched_env, ir_node* nod
 static ir_node *mips_scheduler_select(void *block_env, nodeset *ready_set, nodeset *live_set)
 {
 	mips_sched_env_t *sched_env = (mips_sched_env_t*) block_env;
-	const arch_env_t *arch_env = (const arch_env_t*) sched_env->arch_env;
 	ir_node *node = NULL;
 	ir_node *block = sched_env->block;
 	ir_node *condjmp = NULL;
@@ -155,7 +145,7 @@ static ir_node *mips_scheduler_select(void *block_env, nodeset *ready_set, nodes
 	// test all nodes in the ready set and take the first non-branch that
 	// is allowed
 	for (node = nodeset_first(ready_set); node != NULL; node = nodeset_next(ready_set)) {
-		if (arch_irn_class_is(arch_env, node, branch)) {
+		if (arch_irn_class_is(node, branch)) {
 			if (is_irn_forking(node))
 				condjmp = node;
 			continue;
@@ -188,7 +178,7 @@ static ir_node *mips_scheduler_select(void *block_env, nodeset *ready_set, nodes
 			return condjmp;
 		}
 		node = nodeset_first(ready_set);
-		assert(arch_irn_class_is(arch_env, node, branch));
+		assert(arch_irn_class_is(node, branch));
 		nodeset_break(ready_set);
 		return node;
 	}