X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgmod.c;h=39f255c8cf15b8a7cb0a60289253b91fbcef10ba;hb=8399216d8aebc713bbda04b6e3e250a1d52b20bf;hp=9a5392e89d4fb78ac50e346500dc9e98c8ba0a22;hpb=3619d43beb322bc550e0a9d17a0d6037490410a2;p=libfirm diff --git a/ir/ir/irgmod.c b/ir/ir/irgmod.c index 9a5392e89..39f255c8c 100644 --- a/ir/ir/irgmod.c +++ b/ir/ir/irgmod.c @@ -11,7 +11,7 @@ */ #ifdef HAVE_CONFIG_H -# include +# include "config.h" #endif # include "irvrfy.h" @@ -37,9 +37,9 @@ turn_into_tuple (ir_node *node, int arity) /* keep old array */ } else { /* Allocate new array, don't free old in_array, it's on the obstack. */ - ir_node *block = get_nodes_Block(node); + ir_node *block = get_nodes_block(node); node->in = NEW_ARR_D (ir_node *, current_ir_graph->obst, arity+1); - set_nodes_Block(node, block); + set_nodes_block(node, block); } } @@ -84,8 +84,8 @@ static void collect (ir_node *n, void *env) { ir_node *pred; if (get_irn_op(n) == op_Phi) { - set_irn_link(n, get_irn_link(get_nodes_Block(n))); - set_irn_link(get_nodes_Block(n), n); + set_irn_link(n, get_irn_link(get_nodes_block(n))); + set_irn_link(get_nodes_block(n), n); } if (get_irn_op(n) == op_Proj) { pred = n; @@ -122,14 +122,14 @@ static void move (ir_node *node, ir_node *from_bl, ir_node *to_bl) { ir_node *proj, *pred; /* move this node */ - set_nodes_Block(node, to_bl); + set_nodes_block(node, to_bl); /* move its projs */ if (get_irn_mode(node) == mode_T) { proj = get_irn_link(node); while (proj) { - if (get_nodes_Block(proj) == from_bl) - set_nodes_Block(proj, to_bl); + if (get_nodes_block(proj) == from_bl) + set_nodes_block(proj, to_bl); proj = get_irn_link(proj); } } @@ -140,7 +140,7 @@ static void move (ir_node *node, ir_node *from_bl, ir_node *to_bl) { arity = get_irn_arity(node); for (i = 0; i < arity; i++) { pred = get_irn_n(node, i); - if (get_nodes_Block(pred) == from_bl) + if (get_nodes_block(pred) == from_bl) move(pred, from_bl, to_bl); } } @@ -155,7 +155,7 @@ void part_block(ir_node *node) { set_optimize(0); /* Transform the control flow */ - old_block = get_nodes_Block(node); + old_block = get_nodes_block(node); new_block = new_Block(get_Block_n_cfgpreds(old_block), get_Block_cfgpred_arr(old_block)); set_irg_current_block(current_ir_graph, new_block); @@ -174,10 +174,10 @@ void part_block(ir_node *node) { set_irn_link(new_block, phi); set_irn_link(old_block, NULL); while (phi) { - if(get_nodes_Block(phi) == old_block); /* @@@ inlinening chokes on phis that don't + if(get_nodes_block(phi) == old_block); /* @@@ inlinening chokes on phis that don't obey this condition. How do they get into the list??? Example: InterfaceIII */ - set_nodes_Block(phi, new_block); + set_nodes_block(phi, new_block); phi = get_irn_link(phi); }