X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Fstructure.c;h=356225f2c63a5a2469949e3512d6e709edb75d58;hb=4f644c28c895de1ccd5ad686b5f8a0d8302867dd;hp=5b18d42b1350330a4006569f0f02e05254e510f3;hpb=ac09258e15dd059aa9302e2d0db91092fa4f72fa;p=libfirm diff --git a/ir/ana/structure.c b/ir/ana/structure.c index 5b18d42b1..356225f2c 100644 --- a/ir/ana/structure.c +++ b/ir/ana/structure.c @@ -1,17 +1,30 @@ /* - * Project: libFIRM - * File name: ir/ana/structure.c - * Purpose: Structure Analysis - * Author: Michael Beck - * Modified by: - * Created: 5.4.2007 - * CVS-ID: $Id: $ - * Copyright: (c) 2007 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 + * @brief Structure Analysis + * @author Michael Beck + * @date 5.4.2007 + * @version $Id$ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "firm_common.h" #include "irnode_t.h" @@ -59,7 +72,7 @@ union ir_reg_or_blk { }; /* The debug handle. */ -DEBUG_ONLY(firm_dbg_module_t *dbg;) +DEBUG_ONLY(static firm_dbg_module_t *dbg;) /** * Returns the link of a region. @@ -101,7 +114,7 @@ ir_region *get_irn_region(ir_node *n) { } /** - * Return non-if a given firm thing is a region. + * Return non-zero if a given firm thing is a region. */ int is_region(const void *thing) { const firm_kind *kind = thing; @@ -109,7 +122,7 @@ int is_region(const void *thing) { } /** - * Return the number of predecessors in a region. + * Return the number of predecessors of a region. */ int get_region_n_preds(const ir_region *reg) { return ARR_LEN(reg->pred); @@ -158,13 +171,13 @@ void set_region_succ(ir_region *reg, int pos, ir_region *n) { /** Walker environment. */ typedef struct walk_env { - struct obstack *obst; /**< an obstack to allocate from. */ + struct obstack *obst; /**< An obstack to allocate from. */ ir_region **post; /**< The list of all currently existent top regions. */ - unsigned l_post; /**< length of the allocated regions array. */ + unsigned l_post; /**< The length of the allocated regions array. */ unsigned premax; /**< maximum pre counter */ unsigned postmax; /**< maximum post counter */ - ir_node *start_block; /**< the start block of the graph. */ - ir_node *end_block; /**< the end block of the graph. */ + ir_node *start_block; /**< The start block of the graph. */ + ir_node *end_block; /**< The end block of the graph. */ } walk_env; /** @@ -215,7 +228,7 @@ static void wrap_BasicBlocks(ir_node *block, void *ctx) { ir_region *reg; /* Allocate a Block wrapper */ - reg = obstack_alloc(env->obst, sizeof(*reg)); + reg = OALLOC(env->obst, ir_region); reg->kind = k_ir_region; reg->type = ir_rk_BasicBlock; reg->parent = NULL; @@ -235,7 +248,7 @@ static void wrap_BasicBlocks(ir_node *block, void *ctx) { } /* wrap_BasicBlocks */ /** - * Create the pred and succ edges for Block wrapper. + * Post-walker: Create the pred and succ edges for Block wrapper. * Kill edges to the Start and End blocks. */ static void update_BasicBlock_regions(ir_node *blk, void *ctx) { @@ -244,7 +257,7 @@ static void update_BasicBlock_regions(ir_node *blk, void *ctx) { int i, j, len; if (blk == env->start_block) { - /* handle Firm's self loop */ + /* handle Firm's self loop: Start block has no predecessors */ reg->pred = NEW_ARR_D(ir_region *, env->obst, 0); } else { len = get_Block_n_cfgpreds(blk); @@ -265,10 +278,10 @@ static void update_BasicBlock_regions(ir_node *blk, void *ctx) { ARR_SHRINKLEN(reg->succ, j); } /* update_BasicBlock_regions */ -/** Allocate a new region of a obstack */ +/** Allocate a new region on an obstack */ #define ALLOC_REG(obst, reg, tp) \ do { \ - (reg) = obstack_alloc((obst), sizeof(*(reg))); \ + (reg) = OALLOC((obst), ir_region); \ (reg)->kind = k_ir_region; \ (reg)->type = tp; \ (reg)->parent = NULL; \ @@ -584,14 +597,14 @@ static ir_region *new_NaturalLoop(struct obstack *obst, ir_region *head) { } /* new_NaturalLoop */ /** - * Return true if a is an ancestor of b in DFS search. + * Return true if region a is an ancestor of region b in DFS search. */ static int is_ancestor(const ir_region *a, const ir_region *b) { return (a->prenum <= b->prenum && a->postnum > b->postnum); } /** - * Return true if region pred is a predecessor of region n. + * Return true if region pred is a predecessor of region n. */ static int pred_of(const ir_region *pred, const ir_region *n) { int i; @@ -603,7 +616,7 @@ static int pred_of(const ir_region *pred, const ir_region *n) { } /** - * Return true if region succ is a successor of region n. + * Return true if region succ is a successor of region n. */ static int succ_of(const ir_region *succ, const ir_region *n) { int i; @@ -615,7 +628,7 @@ static int succ_of(const ir_region *succ, const ir_region *n) { } /** - * Reverse linked list. + * Reverse a linked list of regions. */ static struct ir_region *reverse_list(ir_region *n) { ir_region *prev = NULL, *next; @@ -706,7 +719,7 @@ static ir_region *cyclic_region_type(struct obstack *obst, ir_region *node) { } /** - * Clear all links on a list. Needed, because we expect cleared links- + * Clear all links on a list. Needed, because we expect cleared links. */ static void clear_list(ir_region *list) { ir_region *next; @@ -964,7 +977,7 @@ static void reduce(walk_env *env, ir_region *reg) { replace_pred(succ, reg); } - /* second third: replace all succs in predessors */ + /* third step: replace all succs in predessors */ for (i = get_region_n_preds(reg) - 1; i >= 0; --i) { ir_region *pred = get_region_pred(reg, i); @@ -987,7 +1000,7 @@ static void reduce(walk_env *env, ir_region *reg) { ir_reg_tree *construct_region_tree(ir_graph *irg) { walk_env env; ir_graph *rem = current_ir_graph; - ir_reg_tree *res = xmalloc(sizeof(*res)); + ir_reg_tree *res = XMALLOC(ir_reg_tree); obstack_init(&res->obst); @@ -1025,7 +1038,7 @@ ir_reg_tree *construct_region_tree(ir_graph *irg) { do { ir_region *reg, *n = env.post[postctr]; do { - if (n->parent) { + if (n->parent != NULL) { /* already folded */ break; }