X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Fabsgraph.c;h=f5663440ad14d3eac33fee156211cbb7649a7f65;hb=78bac126e7f9ca55761ab892ebfa9c19a4a65fcf;hp=1d483e24f781ec593cb675b65c0b73b083b5766f;hpb=af109afbf71762ec216c011a6d8f5b7761be078d;p=libfirm diff --git a/ir/ana/absgraph.c b/ir/ana/absgraph.c index 1d483e24f..f5663440a 100644 --- a/ir/ana/absgraph.c +++ b/ir/ana/absgraph.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. * @@ -22,13 +22,11 @@ * @author Sebastian Hack * @date 20.04.2007 * @version $Id$ - * @summary + * @brief * * Abstract graph implementations for the CFG of a ir_graph. */ -#ifdef HAVE_CONFIG_H #include -#endif #include "irgraph_t.h" #include "iredges_t.h" @@ -36,14 +34,20 @@ static void *irg_cfg_succ_get_root(void *self) { - ir_graph *irg = self; - edges_activate_kind(irg, EDGE_KIND_BLOCK); + ir_graph *irg = (ir_graph*) self; + edges_assure_kind(irg, EDGE_KIND_BLOCK); return get_irg_start_block(irg); } +static void *irg_cfg_succ_get_end(void *self) +{ + ir_graph *irg = (ir_graph*) self; + return get_irg_end_block(irg); +} + static void irg_cfg_succ_grow_succs(void *self, void *node, struct obstack *obst) { - ir_node *bl = node; + ir_node *bl = (ir_node*) node; const ir_edge_t *edge; (void) self; @@ -54,12 +58,18 @@ static void irg_cfg_succ_grow_succs(void *self, void *node, struct obstack *obst const absgraph_t absgraph_irg_cfg_succ = { irg_cfg_succ_get_root, - irg_cfg_succ_grow_succs + irg_cfg_succ_grow_succs, + irg_cfg_succ_get_end }; static void *irg_cfg_pred_get_root(void *self) { - return get_irg_end_block(self); + return get_irg_end_block((ir_graph*) self); +} + +static void *irg_cfg_pred_get_end(void *self) +{ + return get_irg_start_block((ir_graph*) self); } static void irg_cfg_pred_grow_succs(void *self, void *node, struct obstack *obst) @@ -67,12 +77,13 @@ static void irg_cfg_pred_grow_succs(void *self, void *node, struct obstack *obst int i, n; (void) self; - for (i = 0, n = get_irn_arity(node); i < n; ++i) { - obstack_ptr_grow(obst, get_irn_n(node, i)); + for (i = 0, n = get_irn_arity((ir_node*) node); i < n; ++i) { + obstack_ptr_grow(obst, get_irn_n((ir_node*) node, i)); } } const absgraph_t absgraph_irg_cfg_pred = { irg_cfg_pred_get_root, - irg_cfg_pred_grow_succs + irg_cfg_pred_grow_succs, + irg_cfg_pred_get_end };