- constify

[libfirm] / ir / ir / irprofile.c

diff --git a/ir/ir/irprofile.c b/ir/ir/irprofile.c
index 472598f..8828375 100644 (file)
--- a/ir/ir/irprofile.c
+++ b/ir/ir/irprofile.c
@@ -111,7 +111,6 @@ 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, *unknown;
        ir_node  *cnst;
 
@@ -122,14 +121,14 @@ instrument_block(ir_node *bb, ir_node *address, unsigned int id)
                return;
 
        unknown = new_r_Unknown(irg, mode_M);
-       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, unknown, offset, mode_Iu);
+       cnst    = new_r_Const_long(irg, mode_Iu, get_mode_size_bytes(mode_Iu) * id);
+       offset  = new_r_Add(irg, bb, address, cnst, get_modeP_data());
+       load    = new_r_Load(irg, bb, unknown, offset, mode_Iu, 0);
        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);
+       cnst    = new_r_Const_long(irg, mode_Iu, 1);
        add     = new_r_Add(irg, bb, proji, cnst, mode_Iu);
-       store   = new_r_Store(irg, bb, projm, offset, add);
+       store   = new_r_Store(irg, bb, projm, offset, add, 0);
        projm   = new_r_Proj(irg, bb, store, mode_M, pn_Store_M);
        set_irn_link(bb, projm);
        set_irn_link(projm, load);
@@ -217,8 +216,8 @@ gen_initializer_irg(ir_entity * ent_filename, ir_entity * bblock_id, ir_entity *
        set_entity_ld_ident(ent, name);
 
        uint    = new_type_primitive(new_id_from_str("__uint"), mode_Iu);
-       uintptr = new_type_pointer(new_id_from_str("__uintptr"), uint, mode_P);
-       string  = new_type_pointer(new_id_from_str("__charptr"), new_type_primitive(new_id_from_str("__char"), mode_Bs), mode_P);
+       uintptr = new_type_pointer(new_id_from_str("__uintptr"), uint, get_modeP_data());
+       string  = new_type_pointer(new_id_from_str("__charptr"), new_type_primitive(new_id_from_str("__char"), mode_Bs), get_modeP_data());
 
        set_method_param_type(init_type, 0, string);
        set_method_param_type(init_type, 1, uintptr);
@@ -244,7 +243,7 @@ gen_initializer_irg(ir_entity * ent_filename, ir_entity * bblock_id, ir_entity *
        ins[1] = new_r_SymConst(irg, start_block, mode_P_data, sym, symconst_addr_ent);
        sym.entity_p = bblock_counts;
        ins[2] = new_r_SymConst(irg, start_block, mode_P_data, sym, symconst_addr_ent);
-       ins[3] = new_r_Const_long(irg, start_block, mode_Iu, n_blocks);
+       ins[3] = new_r_Const_long(irg, mode_Iu, n_blocks);
 
        call = new_r_Call(irg, bb, get_irg_initial_mem(irg), symconst, 4, ins, init_type);
        ret = new_r_Return(irg, bb, new_r_Proj(irg, bb, call, mode_M, pn_Call_M_regular), 0, NULL);
@@ -292,7 +291,7 @@ static void create_location_data(dbg_info *dbg, block_id_walker_data_t *wd)
                        pmap_insert(wd->fname_map, (void *)fname, ent);
 
                        /* initialize file name string constant */
-                       tarval_string = alloca(sizeof(*tarval_string) * (len));
+                       tarval_string = ALLOCAN(tarval*, len);
                        for (i = 0; i < len; ++i) {
                                tarval_string[i] = new_tarval_from_long(fname[i], mode_Bs);
                        }
@@ -440,7 +439,7 @@ ir_profile_instrument(const char *filename, unsigned flags)
        set_array_entity_values(bblock_counts, tarval_array, n_blocks);
 
        /* initialize function name string constant */
-       tarval_string = alloca(sizeof(*tarval_string) * (filename_len));
+       tarval_string = ALLOCAN(tarval*, filename_len);
        for (i = 0; i < filename_len; ++i) {
                tarval_string[i] = new_tarval_from_long(filename[i], mode_Bs);
        }
@@ -518,7 +517,7 @@ ir_profile_instrument(const char *filename, unsigned flags)
                        set_compound_graph_path_node(path, 0, ent);
                        set_compound_graph_path_node(path, 1, loc_lineno);
                        tv = new_tarval_from_long(wd.locs[i].lineno, mode_Iu);
-                       add_compound_ent_value_w_path(ent_locations, new_Const(mode_Iu, tv), path);
+                       add_compound_ent_value_w_path(ent_locations, new_Const(tv), path);
 
                        /* name */
                        path = new_compound_graph_path(loc_type, 2);
@@ -529,7 +528,7 @@ ir_profile_instrument(const char *filename, unsigned flags)
                                sym.entity_p = wd.locs[i].fname;
                                n = new_SymConst(mode_P_data, sym, symconst_addr_ent);
                        } else {
-                               n = new_Const(mode_P_data, get_mode_null(mode_P_data));
+                               n = new_Const(get_mode_null(mode_P_data));
                        }
                        add_compound_ent_value_w_path(ent_locations, n, path);
                }