X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fmips%2Fmips_scheduler.c;h=807744278691e608295623764c100717d0557868;hb=1a26f4853c07d1ecd68a097409dd602edfe29eff;hp=5ab8ca69714e6414aee269102d17a91abc005b8c;hpb=21d6dc90da67b8ef549565754b353e700e901cac;p=libfirm diff --git a/ir/be/mips/mips_scheduler.c b/ir/be/mips/mips_scheduler.c index 5ab8ca697..807744278 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,19 +23,14 @@ * @author Matthias Braun, Mehdi * @version $Id$ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif - -#ifdef HAVE_STDLIB_H -#include -#endif #include "mips_scheduler.h" -#include "../besched_t.h" +#include "../besched.h" #include "be.h" #include "../beabi.h" +#include "../belistsched.h" #include "iredges.h" #include "ircons.h" #include "gen_mips_regalloc_if.h" @@ -45,7 +40,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 +55,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; @@ -94,7 +86,7 @@ static void mips_scheduler_finish_block(void* graph_env) { mips_sched_env_t *sched_env = (mips_sched_env_t*) graph_env; // attach last nop to end node (so that firm doesn't discard it) - if(sched_env->last_nop != NULL) { + if (sched_env->last_nop != NULL) { ir_node* end = get_irg_end(get_irn_irg(sched_env->block)); (void) end; // TODO @@ -107,27 +99,28 @@ static int mips_scheduler_to_appear_in_schedule(void *block_env, const ir_node * return is_mips_irn(irn) && !is_mips_zero(irn) && !is_mips_reinterpret_conv(irn) && !is_mips_fallthrough(irn); } -static void mips_collect_mflohis(pset* set, ir_node* node) { +static void mips_collect_mflohis(pset* set, ir_node* node) +{ // construct a list of nodes that need to be scheduled before // we are allowed to schedule another div or mul instruction const ir_edge_t *edge, *edge2; - if(is_mips_div(node)) { + if (is_mips_div(node)) { foreach_out_edge(node, edge) { const ir_node* node2 = get_edge_src_irn(edge); assert(is_Proj(node2)); foreach_out_edge(node2, edge2) { const ir_node* node3 = get_edge_src_irn(edge2); - if(is_mips_mfhi(node3) || is_mips_mflo(node3)) + if (is_mips_mfhi(node3) || is_mips_mflo(node3)) pset_insert_ptr(set, node3); } } - } else if(is_mips_mult(node)) { + } else if (is_mips_mult(node)) { foreach_out_edge(node, edge) { const ir_node* node2 = get_edge_src_irn(edge); - if(is_mips_mfhi(node2) || is_mips_mflo(node2)) + if (is_mips_mfhi(node2) || is_mips_mflo(node2)) pset_insert_ptr(set, node2); } } @@ -135,7 +128,7 @@ static void mips_collect_mflohis(pset* set, ir_node* node) { static int mips_scheduler_node_allowed(mips_sched_env_t *sched_env, ir_node* node) { - if(pset_count(sched_env->div_set) != 0 && (is_mips_div(node) || is_mips_mult(node))) { + if (pset_count(sched_env->div_set) != 0 && (is_mips_div(node) || is_mips_mult(node))) { return 0; } @@ -145,7 +138,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 +147,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; @@ -171,7 +163,7 @@ static ir_node *mips_scheduler_select(void *block_env, nodeset *ready_set, nodes if (is_mips_div(node) || is_mips_mult(node)) { mips_collect_mflohis(sched_env->div_set, node); - } else if(is_mips_mflo(node) || is_mips_mfhi(node)) { + } else if (is_mips_mflo(node) || is_mips_mfhi(node)) { pset_remove_ptr(sched_env->div_set, node); } @@ -182,13 +174,13 @@ static ir_node *mips_scheduler_select(void *block_env, nodeset *ready_set, nodes // if we arrive here no non-branch node was found that we can emit // return a branch if there are just branches left - if(!have_non_branch_nodes) { + if (!have_non_branch_nodes) { // schedule conditional branches before non-conditional ones - if(condjmp != NULL) { + if (condjmp != NULL) { 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; } @@ -206,9 +198,9 @@ int mips_to_appear_in_schedule(void *block_env, const ir_node *node) { (void) block_env; - if(!is_mips_irn(node)) + if (!is_mips_irn(node)) return -1; - if(is_mips_zero(node) || is_mips_Immediate(node)) + if (is_mips_zero(node) || is_mips_Immediate(node)) return 0; return 1;