X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firextbb2.c;h=31f77bea62c067b4c840aae5848f576c684e8522;hb=ed85eaaf130c68efbc2b671eee2910071bbc6c8d;hp=a18d12dd42824d81d407a393fbaba4a816760a35;hpb=ed9c74ceca0655fb484f0537dbea43afa2ca0a7e;p=libfirm diff --git a/ir/ana/irextbb2.c b/ir/ana/irextbb2.c index a18d12dd4..31f77bea6 100644 --- a/ir/ana/irextbb2.c +++ b/ir/ana/irextbb2.c @@ -1,25 +1,33 @@ /* - * Project: libFIRM - * File name: ir/ana/irextbb2.c - * Purpose: Alternate extended basic block computation - * Author: Matthias Braun - * Created: 5.2005 - * CVS-ID: $Id$ - * Copyright: (c) 2002-2005 Universität Karlsruhe - * Licence: This file protected by GPL - GNU GENERAL PUBLIC LICENSE. + * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. + * + * This file is part of libFirm. + * + * This file may be distributed and/or modified under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation and appearing in the file LICENSE.GPL included in the + * packaging of this file. + * + * Licensees holding valid libFirm Professional Edition licenses may use + * this file in accordance with the libFirm Commercial License. + * Agreement provided with the Software. + * + * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE + * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE. */ /** - * @file irextbb2.c - * + * @file + * @brief Alternative extended basic block computation + * @author Matthias Braun + * @date 5.2005 + * @version $Id$ + * @brief * Alternative algorithm for computing extended basic blocks (using out edges * and execution frequencies) - * - * @author Matthias Braun */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include "irextbb_t.h" #include "irgwalk.h" @@ -31,8 +39,8 @@ #include "irprintf.h" #include "execfreq.h" -typedef struct _env { - struct obstack *obst; /**< the obstack where allocations took place */ +typedef struct env { + struct obstack *obst; /**< the obstack where allocations took place */ ir_extblk *head; /**< head of the list of all extended blocks */ ir_exec_freq *execfreqs; } env_t; @@ -42,7 +50,7 @@ typedef struct _env { */ static ir_extblk *allocate_extblk(ir_node *block, env_t *env) { - ir_extblk *extblk = obstack_alloc(env->obst, sizeof(*extblk)); + ir_extblk *extblk = OALLOC(env->obst, ir_extblk); extblk->kind = k_ir_extblk; extblk->visited = 1; @@ -74,7 +82,8 @@ static void addto_extblk(ir_extblk *extblk, ir_node *block) * Returns the number of block successors. * we are interested only in 1, 2 and >2. */ -static int get_block_n_succs(ir_node *block) { +static int get_block_n_succs(ir_node *block) +{ if (edges_activated(current_ir_graph)) { const ir_edge_t *edge; @@ -99,11 +108,10 @@ static void create_extblk(ir_node *block, env_t *env) { ir_extblk *extblk; - if (irn_visited(block)) + if (irn_visited_else_mark(block)) return; extblk = allocate_extblk(block, env); - mark_irn_visited(block); pick_successor(block, extblk, env); } @@ -114,14 +122,12 @@ static void pick_successor(ir_node *block, ir_extblk *extblk, env_t *env) ir_node *best_succ = NULL; double best_execfreq = -1; - /* + /* More than two successors means we have a jump table. we cannot include a jump target into the current extended basic block, so create a new one here. */ if (get_block_n_succs(block) > 2) { - const ir_edge_t *edge; - foreach_block_succ(block, edge) { ir_node *succ = get_edge_src_irn(edge); create_extblk(succ, env); @@ -134,10 +140,10 @@ static void pick_successor(ir_node *block, ir_extblk *extblk, env_t *env) ir_node *succ = get_edge_src_irn(edge); double execfreq; - if(irn_visited(succ)) + if (irn_visited(succ)) continue; - if(get_Block_n_cfgpreds(succ) > 1) { + if (get_Block_n_cfgpreds(succ) > 1) { create_extblk(succ, env); continue; } @@ -162,7 +168,7 @@ static void pick_successor(ir_node *block, ir_extblk *extblk, env_t *env) } /* add best successor and recursively try to pick more */ - if(best_succ != NULL) { + if (best_succ != NULL) { addto_extblk(extblk, best_succ); mark_irn_visited(best_succ); pick_successor(best_succ, extblk, env); @@ -172,8 +178,9 @@ static void pick_successor(ir_node *block, ir_extblk *extblk, env_t *env) /* * Compute the extended basic blocks for a graph */ -void compute_extbb_execfreqs(ir_graph *irg, ir_exec_freq *execfreqs) { - env_t env; +void compute_extbb_execfreqs(ir_graph *irg, ir_exec_freq *execfreqs) +{ + env_t env; ir_extblk *extbb, *next; ir_node *endblock; @@ -181,7 +188,7 @@ void compute_extbb_execfreqs(ir_graph *irg, ir_exec_freq *execfreqs) { obstack_free(irg->extbb_obst, NULL); } else { - irg->extbb_obst = xmalloc(sizeof(*irg->extbb_obst)); + irg->extbb_obst = XMALLOC(struct obstack); } obstack_init(irg->extbb_obst); @@ -197,9 +204,7 @@ void compute_extbb_execfreqs(ir_graph *irg, ir_exec_freq *execfreqs) { /* the end block needs a extbb assigned (even for endless loops) */ endblock = get_irg_end_block(irg); - if (! irn_visited(endblock)) { - create_extblk(endblock, &env); - } + create_extblk(endblock, &env); /* Ok, we have now the list of all extended blocks starting with env.head @@ -216,8 +221,8 @@ void compute_extbb_execfreqs(ir_graph *irg, ir_exec_freq *execfreqs) { extbb->blks = NEW_ARR_D(ir_node *, env.obst, len); - for (block = extbb->link, i = 0; i < len; ++i) { - ir_node *nblock = get_irn_link(block); + for (block = (ir_node*) extbb->link, i = 0; i < len; ++i) { + ir_node *nblock = (ir_node*) get_irn_link(block); /* ensure that the leader is the first one */ extbb->blks[len - 1 - i] = block; @@ -226,8 +231,8 @@ void compute_extbb_execfreqs(ir_graph *irg, ir_exec_freq *execfreqs) { } #if 0 - for(i = 0; i < len; ++i) { - if(i > 0) + for (i = 0; i < len; ++i) { + if (i > 0) printf(", "); ir_printf("%+F", extbb->blks[i]); } @@ -238,5 +243,5 @@ void compute_extbb_execfreqs(ir_graph *irg, ir_exec_freq *execfreqs) { extbb->visited = 0; } - irg->extblk_state = extblk_valid; + irg->extblk_state = ir_extblk_info_valid; }