X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgraph.c;h=4a73c35fe61901640fb110bf173bce90536253f5;hb=169fd803ea2ed08171113c1fd7ab4e528e1ebc26;hp=f372e5046a2ba5d9c3b2e8f4fe6c574110a1bc17;hpb=adfd0cc78daa98548eae11c5144f796da54b0c7a;p=libfirm diff --git a/ir/ir/irgraph.c b/ir/ir/irgraph.c index f372e5046..4a73c35fe 100644 --- a/ir/ir/irgraph.c +++ b/ir/ir/irgraph.c @@ -92,13 +92,20 @@ void init_irgraph(void) { * allocated (new_r_ir_graph, new_const_code_irg). * @return Memory for a new graph. */ -static ir_graph *alloc_graph(void) -{ - size_t size = sizeof(ir_graph) + additional_graph_data_size; - char *ptr = xmalloc(size); - memset(ptr, 0, size); +static ir_graph *alloc_graph(void) { + size_t size = sizeof(ir_graph) + additional_graph_data_size; + char *ptr = xmalloc(size); + memset(ptr, 0, size); + + return (ir_graph *) (ptr + additional_graph_data_size); +} - return (ir_graph *) (ptr + additional_graph_data_size); +/** + * Frees an allocated IR graph + */ +static void free_graph(ir_graph *irg) { + char *ptr = (char *)irg; + free(ptr - additional_graph_data_size); } #if USE_EXPLICIT_PHI_IN_STACK @@ -161,29 +168,35 @@ new_r_ir_graph (entity *ent, int n_loc) #endif res->kind = k_ir_graph; res->obst = xmalloc (sizeof(*res->obst)); - obstack_init (res->obst); + obstack_init(res->obst); + res->extbb_obst = NULL; + res->value_table = new_identities (); /* value table for global value numbering for optimizing use in iropt.c */ res->outs = NULL; - res->phase_state = phase_building; + res->inline_property = irg_inline_any; + res->additional_properties = 0; + + res->phase_state = phase_building; res->op_pin_state_pinned = op_pin_state_pinned; - res->outs_state = outs_none; - res->dom_state = dom_none; - res->typeinfo_state = ir_typeinfo_none; + res->outs_state = outs_none; + res->dom_state = dom_none; + res->typeinfo_state = ir_typeinfo_none; set_irp_typeinfo_inconsistent(); /* there is a new graph with typeinfo_none. */ - res->loopinfo_state = loopinfo_none; + res->callee_info_state = irg_callee_info_none; + res->loopinfo_state = loopinfo_none; + res->execfreq_state = exec_freq_none; + res->class_cast_state = ir_class_casts_transitive; + res->extblk_state = ir_extblk_info_none; /*-- Type information for the procedure of the graph --*/ res->ent = ent; set_entity_irg(ent, res); /*-- a class type so that it can contain "inner" methods as in Pascal. --*/ - res->frame_type = new_type_class(mangle(get_entity_ident(ent), frame_type_suffix)); - - /* Remove type from type list. Must be treated differently than other types. */ - remove_irp_type_from_list(res->frame_type); + res->frame_type = new_type_frame(mangle(get_entity_ident(ent), frame_type_suffix)); /*-- Nodes needed in every graph --*/ res->end_block = new_immBlock(); @@ -198,8 +211,8 @@ new_r_ir_graph (entity *ent, int n_loc) /* Proj results of start node */ projX = new_Proj (res->start, mode_X, pn_Start_X_initial_exec); - res->frame = new_Proj (res->start, mode_P_mach, pn_Start_P_frame_base); - res->globals = new_Proj (res->start, mode_P_mach, pn_Start_P_globals); + res->frame = new_Proj (res->start, mode_P_data, pn_Start_P_frame_base); + res->globals = new_Proj (res->start, mode_P_data, pn_Start_P_globals); res->initial_mem = new_Proj (res->start, mode_M, pn_Start_M); res->args = new_Proj (res->start, mode_T, pn_Start_T_args); #ifdef DEBUG_libfirm @@ -256,8 +269,12 @@ ir_graph *new_const_code_irg(void) { res->kind = k_ir_graph; res->obst = xmalloc (sizeof(*res->obst)); obstack_init (res->obst); + res->extbb_obst = NULL; + res->phase_state = phase_building; res->op_pin_state_pinned = op_pin_state_pinned; + res->extblk_state = ir_extblk_info_none; + res->value_table = new_identities (); /* value table for global value numbering for optimizing use in iropt.c */ @@ -309,9 +326,10 @@ void del_identities (pset *value_table); Does not free types, entities or modes that are used only by this graph, nor the entity standing for this graph. */ void free_ir_graph (ir_graph *irg) { + assert(is_ir_graph(irg)); hook_free_graph(irg); - if (irg->outs_state != outs_none) free_outs(irg); + if (irg->outs_state != outs_none) free_irg_outs(irg); if (irg->frame_type) free_type(irg->frame_type); if (irg->value_table) del_identities(irg->value_table); if (irg->ent) { @@ -330,7 +348,7 @@ void free_ir_graph (ir_graph *irg) { if (irg->loc_descriptions) free(irg->loc_descriptions); irg->kind = k_BAD; - free(irg); + free_graph(irg); } /* access routines for all ir_graph attributes: @@ -516,7 +534,7 @@ void } type * -(get_irg_frame_type)(const ir_graph *irg) { +(get_irg_frame_type)(ir_graph *irg) { return _get_irg_frame_type(irg); } @@ -525,20 +543,6 @@ void _set_irg_frame_type(irg, ftp); } - -/* To test for a frame type */ -int -is_frame_type(const type *ftp) { - int i; - if (is_Class_type(ftp)) { - for (i = 0; i < get_irp_n_irgs(); i++) { - const type *frame_tp = get_irg_frame_type(get_irp_irg(i)); - if (ftp == frame_tp) return true; - } - } - return false; -} - int get_irg_n_locs (ir_graph *irg) { @@ -632,19 +636,18 @@ void } void -set_irg_loopinfo_inconsistent(ir_graph *irg) { - if (irg->loopinfo_state == loopinfo_ip_consistent) - irg->loopinfo_state = loopinfo_ip_inconsistent; +(set_irg_loopinfo_inconsistent)(ir_graph *irg) { + _set_irg_loopinfo_inconsistent(irg); +} - else if (irg->loopinfo_state == loopinfo_consistent) - irg->loopinfo_state = loopinfo_inconsistent; +void set_irp_loopinfo_inconsistent(void) { + int i, n_irgs = get_irp_n_irgs(); + for (i = 0; i < n_irgs; ++i) { + set_irg_loopinfo_inconsistent(get_irp_irg(i)); + } +} - else if (irg->loopinfo_state == loopinfo_cf_ip_consistent) - irg->loopinfo_state = loopinfo_cf_ip_inconsistent; - else if (irg->loopinfo_state == loopinfo_cf_consistent) - irg->loopinfo_state = loopinfo_cf_inconsistent; -} void (set_irg_pinned)(ir_graph *irg, op_pin_state p) { @@ -671,6 +674,21 @@ void _set_irg_inline_property(irg, s); } +unsigned +(get_irg_additional_properties)(const ir_graph *irg) { + return _get_irg_additional_properties(irg); +} + +void +(set_irg_additional_properties)(ir_graph *irg, unsigned property_mask) { + _set_irg_additional_properties(irg, property_mask); +} + +void +(set_irg_additional_property)(ir_graph *irg, irg_additional_property flag) { + _set_irg_additional_property(irg, flag); +} + void (set_irg_link)(ir_graph *irg, void *thing) { _set_irg_link(irg, thing);