fixes

diff --git a/ir/be/beprofile.c b/ir/be/beprofile.c
index 8bcec99..d0ff4fb 100644 (file)
--- a/ir/be/beprofile.c
+++ b/ir/be/beprofile.c
@@ -42,6 +42,7 @@
 #include "beabi.h"
 #include "benode_t.h"
 #include "beutil.h"
+#include "ircons.h"
 
 #include "bechordal_t.h"
 
@@ -53,7 +54,7 @@
 typedef struct _block_id_walker_data {
        tarval        **array;
        unsigned int    id;
-       ir_node  *symconst;
+       ir_node *symconst;
 } block_id_walker_data;
 
 static void
@@ -78,23 +79,34 @@ count_blocks(ir_graph * irg)
 static void
 instrument_block(ir_node * bb, ir_node * address, unsigned int id)
 {
+       ir_graph *irg = get_irn_irg(bb);
+       ir_node *start_block = get_irg_start_block(irg);
        ir_node  *load, *store, *offset, *add, *projm, *proji;
-
-       offset = new_r_Add(get_irn_irg(bb), bb, address, new_Const_long(mode_Is, get_mode_size_bytes(mode_Iu)*id), mode_P);
-       load = new_r_Load(get_irn_irg(bb), bb, new_NoMem(), offset, mode_Iu);
-       projm = new_r_Proj(get_irn_irg(bb), bb, load, mode_M, 0);
-       proji = new_r_Proj(get_irn_irg(bb), bb, load, mode_Iu, 2);
-       add = new_r_Add(get_irn_irg(bb), bb, proji, new_Const_long(mode_Iu, 1), mode_Iu);
-       store = new_r_Store(get_irn_irg(bb), bb, projm, offset, add);
-       keep_alive(new_r_Proj(get_irn_irg(bb), bb, load, mode_M, 0));
+       ir_node *cnst;
+
+       if(bb == start_block || bb == get_irg_end_block(irg))
+               return;
+
+       cnst = new_r_Const_long(irg, start_block, mode_Iu, get_mode_size_bytes(mode_Iu) * id);
+       offset = new_r_Add(irg, bb, address, cnst, mode_P);
+       load = new_r_Load(irg, bb, new_NoMem(), offset, mode_Iu);
+       projm = new_r_Proj(irg, bb, load, mode_M, pn_Load_M);
+       proji = new_r_Proj(irg, bb, load, mode_Iu, pn_Load_res);
+       cnst =  new_r_Const_long(irg, start_block, mode_Iu, 1);
+       add = new_r_Add(irg, bb, proji, cnst, mode_Iu);
+       store = new_r_Store(irg, bb, projm, offset, add);
+       projm = new_r_Proj(irg, bb, store, mode_M, pn_Store_M);
+       keep_alive(projm);
 }
 
 /**
  * Generates a new irg which calls the initializer
  */
 static ir_graph *
-gen_initializer_irg(entity * bblock_id, entity * bblock_counts, entity * bblock_count)
+gen_initializer_irg(entity * bblock_id, entity * bblock_counts, int n_blocks)
 {
+       ir_node *start_block;
+
        ir_node   *ins[3];
        ident     *name = new_id_from_str("__firmprof_initializer");
        entity    *ent = new_entity(get_glob_type(), name, new_type_method(name, 0, 0));
@@ -118,15 +130,16 @@ gen_initializer_irg(entity * bblock_id, entity * bblock_counts, entity * bblock_
 
        ir_node *bb = get_cur_block();
 
+       start_block = get_irg_start_block(irg);
+
        sym.entity_p = init_ent;
-       symconst = new_SymConst(sym, symconst_addr_ent);
+       symconst = new_r_SymConst(irg, start_block, sym, symconst_addr_ent);
 
        sym.entity_p = bblock_id;
-       ins[0] = new_SymConst(sym, symconst_addr_ent);
+       ins[0] = new_r_SymConst(irg, start_block, sym, symconst_addr_ent);
        sym.entity_p = bblock_counts;
-       ins[1] = new_SymConst(sym, symconst_addr_ent);
-       sym.entity_p = bblock_count;
-       ins[2] = new_SymConst(sym, symconst_addr_ent);
+       ins[1] = new_r_SymConst(irg, start_block, sym, symconst_addr_ent);
+       ins[2] = new_r_Const_long(irg, start_block, mode_Iu, n_blocks);
 
        call = new_r_Call( irg,
                        bb,                                                     //ir_node *     block,
@@ -139,7 +152,7 @@ gen_initializer_irg(entity * bblock_id, entity * bblock_counts, entity * bblock_
 
        ret = new_r_Return ( irg,
                        bb,                                                                             //ir_node *     block,
-                       new_r_Proj(irg, bb, call, mode_M, 0),   //ir_node *     store,
+                       new_r_Proj(irg, bb, call, mode_M, pn_Call_M_regular),   //ir_node *     store,
                        0,                                                                              //int   arity,
                        NULL                                                                    //ir_node **    in
                        );
@@ -149,6 +162,8 @@ gen_initializer_irg(entity * bblock_id, entity * bblock_counts, entity * bblock_
        add_immBlock_pred(get_irg_end_block(irg), ret);
        mature_immBlock(get_irg_end_block(irg));
 
+       irg_finalize_cons(irg);
+
        return irg;
 }
 
@@ -165,6 +180,8 @@ block_id_walker(ir_node * bb, void * data)
 void
 be_profile_instrument(void)
 {
+       ir_graph *const_irg = get_const_code_irg();
+       ir_node *const_block = get_irg_start_block(const_irg);
        int            n, i;
        unsigned int   n_blocks = 0;
        entity     *bblock_id, *bblock_counts, *bblock_count;
@@ -172,14 +189,17 @@ be_profile_instrument(void)
        tarval       **tarval_array;
 
        block_id_walker_data  wd;
-       symconst_symbol       sym;
+       symconst_symbol sym;
 
        integer_type = new_type_primitive(new_id_from_str("__uint"), mode_Iu);
        array_type = new_type_array(new_id_from_str("__block_info_array"), 1, integer_type);
        set_array_bounds_int(array_type, 0, 0, n_blocks);
        bblock_id = new_entity(get_glob_type(), new_id_from_str("__BLOCK_IDS"), array_type);
+       set_entity_variability(bblock_id, variability_initialized);
        bblock_counts = new_entity(get_glob_type(), new_id_from_str("__BLOCK_COUNTS"), array_type);
+       set_entity_variability(bblock_counts, variability_initialized);
        bblock_count = new_entity(get_glob_type(), new_id_from_str("__N_BLOCKS"), integer_type);
+       set_entity_variability(bblock_count, variability_initialized);
 
        for (n = get_irp_n_irgs()-1; n>=0; --n) {
                ir_graph      *irg = get_irp_irg(n);
@@ -195,11 +215,10 @@ be_profile_instrument(void)
        set_array_entity_values(bblock_counts, tarval_array, n_blocks);
 
        /* initialize the block count entity */
-       set_atomic_ent_value(bblock_count, new_Const_long(mode_Iu, n_blocks));
+       set_atomic_ent_value(bblock_count, new_r_Const_long(const_irg, const_block, mode_Iu, n_blocks));
 
        /* generate a symbolic constant pointing to the count array */
        sym.entity_p = bblock_count;
-       wd.symconst = new_SymConst(sym, symconst_addr_ent);
 
        /* initialize block id array and instrument blocks */
        wd.array = tarval_array;
@@ -207,11 +226,13 @@ be_profile_instrument(void)
        for (n = get_irp_n_irgs()-1; n>=0; --n) {
                ir_graph      *irg = get_irp_irg(n);
 
+               wd.symconst = new_r_SymConst(irg, get_irg_start_block(irg), sym, symconst_addr_ent);
+
                irg_block_walk_graph(irg, block_id_walker, NULL, &wd);
        }
        set_array_entity_values(bblock_id, tarval_array, n_blocks);
 
-       gen_initializer_irg(bblock_id, bblock_counts, bblock_count);
+       gen_initializer_irg(bblock_id, bblock_counts, n_blocks);
 }