rename edges_assure to assure_edges

[libfirm] / ir / ir / instrument.c

diff --git a/ir/ir/instrument.c b/ir/ir/instrument.c
index 880ca3a..d740f1c 100644 (file)
--- a/ir/ir/instrument.c
+++ b/ir/ir/instrument.c
@@ -22,11 +22,8 @@
  * @brief   Instrumentation of graphs.
  * @date    14.4.2008
  * @author  Michael Beck
- * @version $Id$
  */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "irgraph_t.h"
 #include "iredges.h"
@@ -34,10 +31,8 @@
 #include "ircons.h"
 #include "instrument.h"
 
-/**
- * Adds a Call at the beginning of the given irg.
- */
-void instrument_initcall(ir_graph *irg, ir_entity *ent) {
+void instrument_initcall(ir_graph *irg, ir_entity *ent)
+{
        const ir_edge_t *edge;
        ir_node         *initial_exec;
        ir_node         *initial_mem;
@@ -47,7 +42,7 @@ void instrument_initcall(ir_graph *irg, ir_entity *ent) {
        int             i, idx, need_new_block;
        symconst_symbol sym;
 
-       edges_assure(irg);
+       assure_edges(irg);
 
        /* find the first block */
        initial_exec = get_irg_initial_exec(irg);
@@ -82,19 +77,19 @@ void instrument_initcall(ir_graph *irg, ir_entity *ent) {
 
        if (need_new_block) {
                ir_node *blk = new_r_Block(irg, 1, &initial_exec);
-               set_Block_cfgpred(first_block, idx, new_r_Jmp(irg, blk));
+               set_Block_cfgpred(first_block, idx, new_r_Jmp(blk));
                first_block = blk;
        }
 
        /* place the call */
        sym.entity_p = ent;
-       adr = new_r_SymConst(irg, start_block, mode_P_code, sym, symconst_addr_ent);
+       adr = new_r_SymConst(irg, mode_P_code, sym, symconst_addr_ent);
 
-       call    = new_r_Call(irg, first_block, get_irg_no_mem(irg), adr, 0, NULL, get_entity_type(ent));
-       new_mem = new_r_Proj(irg, first_block, call, mode_M, pn_Call_M_regular);
+       call    = new_r_Call(first_block, get_irg_no_mem(irg), adr, 0, NULL, get_entity_type(ent));
+       new_mem = new_r_Proj(call, mode_M, pn_Call_M);
 
        initial_mem = get_irg_initial_mem(irg);
-       edges_reroute(initial_mem, new_mem, irg);
+       edges_reroute(initial_mem, new_mem);
        /* beware: reroute routes anchor edges also, revert this */
        set_irg_initial_mem(irg, initial_mem);
        set_Call_mem(call, initial_mem);