X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fmips%2Fmips_scheduler.c;h=9eb93c84500029d5e7794ec53b1ec2e01c38287c;hb=60e1f0141c1dffae0d779228addfa385c46748f5;hp=645bea1b88fa385000e0159cc60eb1aaa8451a17;hpb=9e56dbf066d3698df877e2a9f78caeca29ea5a03;p=libfirm

diff --git a/ir/be/mips/mips_scheduler.c b/ir/be/mips/mips_scheduler.c
index 645bea1b8..9eb93c845 100644
--- a/ir/be/mips/mips_scheduler.c
+++ b/ir/be/mips/mips_scheduler.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.
  *
@@ -23,9 +23,7 @@
  * @author  Matthias Braun, Mehdi
  * @version $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
@@ -45,7 +43,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 +58,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 +140,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 +149,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 +182,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;
 	}
@@ -208,8 +202,7 @@ int mips_to_appear_in_schedule(void *block_env, const ir_node *node)
 
 	if(!is_mips_irn(node))
 		return -1;
-
-	if(is_mips_zero(node))
+	if(is_mips_zero(node) || is_mips_Immediate(node))
 		return 0;
 
 	return 1;