X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fmips%2Fmips_scheduler.c;h=f4c7a7b6507d93300a58bb5f026d83596266d23a;hb=74d50906a1f9328184ebf5007775693e0dffe92b;hp=5b3a0430752f2037821acc4ce2d7cc3c31aca9c0;hpb=8b8eb5a03a324595089373eea170b1a5ddb0fe8b;p=libfirm

diff --git a/ir/be/mips/mips_scheduler.c b/ir/be/mips/mips_scheduler.c
index 5b3a04307..f4c7a7b65 100644
--- a/ir/be/mips/mips_scheduler.c
+++ b/ir/be/mips/mips_scheduler.c
@@ -30,7 +30,7 @@ typedef struct {
 	 * have to pass before we can access that register again
 	 * (because mips will write the register value back in the WB phase of the pipeline)
 	 */
-	int busy_registers[N_mips_general_purpose_REGS];
+	int busy_registers[N_mips_gp_REGS];
 	/// current block
 	ir_node* block;
 	ir_node* last_nop;
@@ -71,6 +71,8 @@ static void mips_scheduler_finish_block(void* graph_env)
 	// attach last nop to end node (so that firm doesn't discard it)
 	if(sched_env->last_nop != NULL) {
 		ir_node* end = get_irg_end(get_irn_irg(sched_env->block));
+		(void) end;
+		// TODO
 	}
 	sched_env->block = NULL;
 }
@@ -115,7 +117,7 @@ static int mips_scheduler_node_allowed(mips_sched_env_t *sched_env, ir_node* nod
 	return 1;
 }
 
-static ir_node *mips_scheduler_select(void *block_env, nodeset *ready_set)
+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;
@@ -128,7 +130,7 @@ static ir_node *mips_scheduler_select(void *block_env, nodeset *ready_set)
 	// 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_classify(arch_env, node) == arch_irn_class_branch) {
+		if (arch_irn_class_is(arch_env, node, branch)) {
 			if (is_irn_forking(node))
 				condjmp = node;
 			continue;
@@ -161,7 +163,7 @@ static ir_node *mips_scheduler_select(void *block_env, nodeset *ready_set)
 			return condjmp;
 		}
 		node = nodeset_first(ready_set);
-		assert(arch_irn_classify(arch_env, node) == arch_irn_class_branch);
+		assert(arch_irn_class_is(arch_env, node, branch));
 		nodeset_break(ready_set);
 		return node;
 	}
@@ -175,7 +177,7 @@ static ir_node *mips_scheduler_select(void *block_env, nodeset *ready_set)
 /**
  * Returns the reg_pressure scheduler with to_appear_in_schedule() overloaded
  */
-const list_sched_selector_t *mips_get_list_sched_selector(const void *self)
+const list_sched_selector_t *mips_get_list_sched_selector(const void *self, list_sched_selector_t *selector)
 {
 	memset(&mips_sched_selector, 0, sizeof(mips_sched_selector));
 	mips_sched_selector.init_graph = mips_scheduler_init_graph;
@@ -184,5 +186,10 @@ const list_sched_selector_t *mips_get_list_sched_selector(const void *self)
 	mips_sched_selector.to_appear_in_schedule = mips_scheduler_to_appear_in_schedule;
 	mips_sched_selector.finish_block = mips_scheduler_finish_block;
 	mips_sched_selector.finish_graph = mips_scheduler_finish_graph;
-	return &mips_sched_selector;
+	//return &mips_sched_selector;
+	return selector;
+}
+
+const ilp_sched_selector_t *mips_get_ilp_sched_selector(const void *self) {
+	return NULL;
 }