X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firprofile.c;h=913267d22e89bfe34db406fd618a4d72953ac012;hb=0f234e2d94155d13c0e4727871125beda0eaa66d;hp=84d307f70461c2d4946d310403b7a2a53a60088e;hpb=e1397b01aceb38b6bb62c319007146af3b922f39;p=libfirm diff --git a/ir/ir/irprofile.c b/ir/ir/irprofile.c index 84d307f70..913267d22 100644 --- a/ir/ir/irprofile.c +++ b/ir/ir/irprofile.c @@ -148,12 +148,12 @@ 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 { @@ -172,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"); @@ -183,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); } @@ -198,12 +197,12 @@ gen_initializer_irg(ir_entity *ent_filename, ir_entity *bblock_id, ir_entity *bb { 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; @@ -212,9 +211,9 @@ gen_initializer_irg(ir_entity *ent_filename, ir_entity *bblock_id, ir_entity *bb 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); @@ -226,6 +225,7 @@ gen_initializer_irg(ir_entity *ent_filename, ir_entity *bblock_id, ir_entity *bb 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(); @@ -241,7 +241,7 @@ gen_initializer_irg(ir_entity *ent_filename, ir_entity *bblock_id, ir_entity *bb ins[3] = new_r_Const_long(irg, mode_Iu, n_blocks); 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_regular), 0, NULL); + 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); @@ -275,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++); @@ -290,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; @@ -364,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); @@ -385,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); @@ -403,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); @@ -417,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); } @@ -438,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 */ @@ -500,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;