X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firprofile.c;h=913267d22e89bfe34db406fd618a4d72953ac012;hb=0f234e2d94155d13c0e4727871125beda0eaa66d;hp=fc1757dece8b2e4f256b054e1b960736183e1d1f;hpb=b46379addadc82cadb2e151aa4cf6fa81d9dbf93;p=libfirm diff --git a/ir/ir/irprofile.c b/ir/ir/irprofile.c index fc1757dec..913267d22 100644 --- a/ir/ir/irprofile.c +++ b/ir/ir/irprofile.c @@ -122,14 +122,14 @@ instrument_block(ir_node *bb, ir_node *address, unsigned int id) unknown = new_r_Unknown(irg, mode_M); 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); - projm = new_r_Proj(irg, bb, load, mode_M, pn_Load_M); - proji = new_r_Proj(irg, bb, load, mode_Iu, pn_Load_res); + offset = new_r_Add(bb, address, cnst, get_modeP_data()); + load = new_r_Load(bb, unknown, offset, mode_Iu, 0); + projm = new_r_Proj(bb, load, mode_M, pn_Load_M); + proji = new_r_Proj(bb, load, mode_Iu, pn_Load_res); 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); - projm = new_r_Proj(irg, bb, store, mode_M, pn_Store_M); + add = new_r_Add(bb, proji, cnst, mode_Iu); + store = new_r_Store(bb, projm, offset, add, 0); + projm = new_r_Proj(bb, store, mode_M, pn_Store_M); set_irn_link(bb, projm); set_irn_link(projm, load); } @@ -148,24 +148,23 @@ fix_ssa(ir_node * bb, void * data) ir_node *mem; int arity = get_Block_n_cfgpreds(bb); - /* start and end block are not instrumented, skip! */ + /* end block are not instrumented, skip! */ if (bb == env->end_block) return; if (bb == get_irg_start_block(get_irn_irg(bb))) { - mem = new_NoMem(); + mem = get_irg_initial_mem(get_irn_irg(bb)); } else if (arity == 1) { mem = get_irn_link(get_Block_cfgpred_block(bb, 0)); } else { int n; ir_node **ins; - ir_graph *irg = current_ir_graph; NEW_ARR_A(ir_node*, ins, arity); for (n = arity - 1; n >= 0; --n) { ins[n] = get_irn_link(get_Block_cfgpred_block(bb, n)); } - mem = new_r_Phi(irg, bb, arity, ins, mode_M); + mem = new_r_Phi(bb, arity, ins, mode_M); } set_Load_mem(get_irn_link(get_irn_link(bb)), mem); } @@ -173,8 +172,7 @@ fix_ssa(ir_node * bb, void * data) static void add_constructor(ir_entity *method) { ir_type *method_type = get_entity_type(method); - ident *id = id_unique("constructor_ptrt.%u"); - ir_type *ptr_type = new_type_pointer(id, method_type, mode_P_code); + ir_type *ptr_type = new_type_pointer(method_type); ir_type *constructors = get_segment_type(IR_SEGMENT_CONSTRUCTORS); ident *ide = id_unique("constructor_ptr.%u"); @@ -184,7 +182,7 @@ static void add_constructor(ir_entity *method) method, NULL); set_entity_compiler_generated(ptr, 1); - set_entity_variability(ptr, variability_constant); + set_entity_linkage(ptr, IR_LINKAGE_CONSTANT); set_atomic_ent_value(ptr, val); } @@ -195,18 +193,16 @@ static void add_constructor(ir_entity *method) * void __firmprof_initializer(void) { __init_firmprof(ent_filename, bblock_id, bblock_counts, n_blocks); } */ static ir_graph * -gen_initializer_irg(ir_entity * ent_filename, ir_entity * bblock_id, ir_entity * bblock_counts, int n_blocks) +gen_initializer_irg(ir_entity *ent_filename, ir_entity *bblock_id, ir_entity *bblock_counts, int n_blocks) { - ir_node *start_block; - ir_node *ins[4]; ident *name = new_id_from_str("__firmprof_initializer"); - ir_entity *ent = new_entity(get_glob_type(), name, new_type_method(name, 0, 0)); + ir_entity *ent = new_entity(get_glob_type(), name, new_type_method(0, 0)); ir_node *ret, *call, *symconst; symconst_symbol sym; ident *init_name = new_id_from_str("__init_firmprof"); - ir_type *init_type = new_type_method(init_name, 4, 0); + ir_type *init_type = new_type_method(4, 0); ir_type *uint, *uintptr, *string; ir_entity *init_ent; ir_graph *irg; @@ -215,9 +211,9 @@ 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, 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()); + uint = new_type_primitive(mode_Iu); + uintptr = new_type_pointer(uint); + string = new_type_pointer(new_type_primitive(mode_Bs)); set_method_param_type(init_type, 0, string); set_method_param_type(init_type, 1, uintptr); @@ -229,24 +225,23 @@ gen_initializer_irg(ir_entity * ent_filename, ir_entity * bblock_id, ir_entity * irg = new_ir_graph(ent, 0); empty_frame_type = get_irg_frame_type(irg); set_type_size_bytes(empty_frame_type, 0); + set_type_state(empty_frame_type, layout_fixed); bb = get_cur_block(); - start_block = get_irg_start_block(irg); - sym.entity_p = init_ent; - symconst = new_r_SymConst(irg, start_block, mode_P_data, sym, symconst_addr_ent); + symconst = new_r_SymConst(irg, mode_P_data, sym, symconst_addr_ent); sym.entity_p = ent_filename; - ins[0] = new_r_SymConst(irg, start_block, mode_P_data, sym, symconst_addr_ent); + ins[0] = new_r_SymConst(irg, mode_P_data, sym, symconst_addr_ent); sym.entity_p = bblock_id; - ins[1] = new_r_SymConst(irg, start_block, mode_P_data, sym, symconst_addr_ent); + ins[1] = new_r_SymConst(irg, 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[2] = new_r_SymConst(irg, mode_P_data, sym, symconst_addr_ent); 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); + call = new_r_Call(bb, get_irg_initial_mem(irg), symconst, 4, ins, init_type); + ret = new_r_Return(bb, new_r_Proj(bb, call, mode_M, pn_Call_M), 0, NULL); mature_immBlock(bb); add_immBlock_pred(get_irg_end_block(irg), ret); @@ -280,7 +275,7 @@ static void create_location_data(dbg_info *dbg, block_id_walker_data_t *wd) tarval **tarval_string; snprintf(buf, sizeof(buf), "firm_name_arr.%d", nr); - arr = new_type_array(new_id_from_str(buf), 1, wd->tp_char); + arr = new_type_array(1, wd->tp_char); set_array_bounds_int(arr, 0, 0, len); snprintf(buf, sizeof(buf), "__firm_name.%d", nr++); @@ -295,7 +290,7 @@ static void create_location_data(dbg_info *dbg, block_id_walker_data_t *wd) for (i = 0; i < len; ++i) { tarval_string[i] = new_tarval_from_long(fname[i], mode_Bs); } - set_entity_variability(ent, variability_constant); + set_entity_linkage(ent, IR_LINKAGE_CONSTANT); set_array_entity_values(ent, tarval_string, len); } else { ent = entry->value; @@ -369,17 +364,17 @@ ir_profile_instrument(const char *filename, unsigned flags) /* create all the necessary types and entities. Note that the types must have a fixed layout, because we already running in the backend */ - uint_type = new_type_primitive(IDENT("__uint"), mode_Iu); + uint_type = new_type_primitive(mode_Iu); set_type_alignment_bytes(uint_type, get_type_size_bytes(uint_type)); - array_type = new_type_array(IDENT("__block_info_array"), 1, uint_type); + array_type = new_type_array(1, uint_type); set_array_bounds_int(array_type, 0, 0, n_blocks); set_type_size_bytes(array_type, n_blocks * get_mode_size_bytes(mode_Iu)); set_type_alignment_bytes(array_type, get_mode_size_bytes(mode_Iu)); set_type_state(array_type, layout_fixed); - character_type = new_type_primitive(IDENT("__char"), mode_Bs); - string_type = new_type_array(IDENT("__filename"), 1, character_type); + character_type = new_type_primitive(mode_Bs); + string_type = new_type_array(1, character_type); set_array_bounds_int(string_type, 0, 0, filename_len); set_type_size_bytes(string_type, filename_len); set_type_alignment_bytes(string_type, 1); @@ -390,12 +385,10 @@ ir_profile_instrument(const char *filename, unsigned flags) cur_ident = IDENT("__FIRMPROF__BLOCK_IDS"); bblock_id = new_entity(gtp, cur_ident, array_type); set_entity_ld_ident(bblock_id, cur_ident); - set_entity_variability(bblock_id, variability_initialized); cur_ident = IDENT("__FIRMPROF__BLOCK_COUNTS"); bblock_counts = new_entity(gtp, cur_ident, array_type); set_entity_ld_ident(bblock_counts, cur_ident); - set_entity_variability(bblock_counts, variability_initialized); cur_ident = IDENT("__FIRMPROF__FILE_NAME"); ent_filename = new_entity(gtp, cur_ident, string_type); @@ -408,7 +401,7 @@ ir_profile_instrument(const char *filename, unsigned flags) size = get_type_size_bytes(uint_type); set_entity_offset(loc_lineno, 0); - charptr_type = new_type_pointer(IDENT("__charptr"), character_type, mode_P_data); + charptr_type = new_type_pointer(character_type); align_n = get_type_size_bytes(charptr_type); set_type_alignment_bytes(charptr_type, align_n); loc_name = new_entity(loc_type, IDENT("name"), charptr_type); @@ -422,11 +415,11 @@ ir_profile_instrument(const char *filename, unsigned flags) set_type_size_bytes(loc_type, size); set_type_state(loc_type, layout_fixed); - loc_type = new_type_array(IDENT("__locarray"), 1, loc_type); + loc_type = new_type_array(1, loc_type); set_array_bounds_int(string_type, 0, 0, n_blocks); - cur_ident = IDENT("__FIRMPROF__LOCATIONS"); - ent_locations = new_entity(gtp, cur_ident, loc_type); + cur_ident = IDENT("__FIRMPROF__LOCATIONS"); + ent_locations = new_entity(gtp, cur_ident, loc_type); set_entity_ld_ident(ent_locations, cur_ident); } @@ -443,7 +436,7 @@ ir_profile_instrument(const char *filename, unsigned flags) for (i = 0; i < filename_len; ++i) { tarval_string[i] = new_tarval_from_long(filename[i], mode_Bs); } - set_entity_variability(ent_filename, variability_constant); + set_entity_linkage(ent_filename, IR_LINKAGE_CONSTANT); set_array_entity_values(ent_filename, tarval_string, filename_len); /* initialize block id array and instrument blocks */ @@ -466,7 +459,7 @@ ir_profile_instrument(const char *filename, unsigned flags) /* generate a symbolic constant pointing to the count array */ sym.entity_p = bblock_counts; - wd.symconst = new_r_SymConst(irg, get_irg_start_block(irg), mode_P_data, sym, symconst_addr_ent); + wd.symconst = new_r_SymConst(irg, mode_P_data, sym, symconst_addr_ent); irg_block_walk_graph(irg, block_id_walker, NULL, &wd); start_block = get_irg_start_block(irg); @@ -482,13 +475,13 @@ ir_profile_instrument(const char *filename, unsigned flags) case iro_Return: ins[0] = get_irn_link(bb); ins[1] = get_Return_mem(node); - sync = new_r_Sync(irg, bb, 2, ins); + sync = new_r_Sync(bb, 2, ins); set_Return_mem(node, sync); break; case iro_Raise: ins[0] = get_irn_link(bb); ins[1] = get_Raise_mem(node); - sync = new_r_Sync(irg, bb, 2, ins); + sync = new_r_Sync(bb, 2, ins); set_Raise_mem(node, sync); break; default: @@ -505,7 +498,7 @@ ir_profile_instrument(const char *filename, unsigned flags) rem = current_ir_graph; current_ir_graph = get_const_code_irg(); ent = get_array_element_entity(loc_type); - set_entity_variability(ent_locations, variability_constant); + set_entity_linkage(ent_locations, IR_LINKAGE_CONSTANT); for (i = 0; i < n_blocks; ++i) { compound_graph_path *path; tarval *tv; @@ -517,7 +510,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); @@ -528,7 +521,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); }