X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgraph.c;h=f0ef088e3c8da4d81b5681ee7043da5e6955c396;hb=3db23eee84cbabb3f399f1ca820948114a9c837c;hp=d93b2d99e5f25798eb52b9b4277fccd75880c25f;hpb=f8cc15664f571aa7ef89d6f6bc8d5bd2b8ca7d53;p=libfirm diff --git a/ir/ir/irgraph.c b/ir/ir/irgraph.c index d93b2d99e..f0ef088e3 100644 --- a/ir/ir/irgraph.c +++ b/ir/ir/irgraph.c @@ -46,20 +46,12 @@ #include "iredges_t.h" #include "type_t.h" #include "irmemory.h" +#include "iroptimize.h" +#include "irgopt.h" #define INITIAL_IDX_IRN_MAP_SIZE 1024 - -/** - * Indicates, whether additional data can be registered to graphs. - * If set to 1, this is not possible anymore. - */ -static int forbid_new_data = 0; - -/** - * The amount of additional space for custom data to be allocated upon - * creating a new graph. - */ -static size_t additional_graph_data_size = 0; +/** Suffix that is added to every frame type. */ +#define FRAME_TP_SUFFIX "frame_tp" ir_graph *current_ir_graph; ir_graph *get_current_ir_graph(void) @@ -75,11 +67,9 @@ void set_current_ir_graph(ir_graph *graph) /** contains the suffix for frame type names */ static ident *frame_type_suffix = NULL; -/* initialize the IR graph module */ void firm_init_irgraph(void) { frame_type_suffix = new_id_from_str(FRAME_TP_SUFFIX); - forbid_new_data = 1; } /** @@ -91,16 +81,16 @@ void firm_init_irgraph(void) */ static ir_graph *alloc_graph(void) { - ir_graph *res; - size_t size = sizeof(ir_graph) + additional_graph_data_size; - char *ptr = XMALLOCNZ(char, size); - - res = (ir_graph *)(ptr + additional_graph_data_size); + ir_graph *const res = XMALLOCZ(ir_graph); res->kind = k_ir_graph; /* initialize the idx->node map. */ - res->idx_irn_map = NEW_ARR_F(ir_node *, INITIAL_IDX_IRN_MAP_SIZE); - memset(res->idx_irn_map, 0, INITIAL_IDX_IRN_MAP_SIZE * sizeof(res->idx_irn_map[0])); + res->idx_irn_map = NEW_ARR_FZ(ir_node*, INITIAL_IDX_IRN_MAP_SIZE); + + obstack_init(&res->obst); + + /* value table for global value numbering for optimizing use in iropt.c */ + new_identities(res); return res; } @@ -110,24 +100,15 @@ static ir_graph *alloc_graph(void) */ static void free_graph(ir_graph *irg) { - char *ptr = (char *)irg; - ir_edge_kind_t i; - - for (i = EDGE_KIND_FIRST; i < EDGE_KIND_LAST; ++i) + for (ir_edge_kind_t i = EDGE_KIND_FIRST; i < EDGE_KIND_LAST; ++i) edges_deactivate_kind(irg, i); DEL_ARR_F(irg->idx_irn_map); - free(ptr - additional_graph_data_size); + free(irg); } -/** - * Set the number of locals for a given graph. - * - * @param irg the graph - * @param n_loc number of locals - */ void irg_set_nloc(ir_graph *res, int n_loc) { - assert(res->phase_state == phase_building); + assert(irg_is_constrained(res, IR_GRAPH_CONSTRAINT_CONSTRUCTION)); res->n_loc = n_loc + 1; /* number of local variables that are never dereferenced in this graph plus one for @@ -140,15 +121,6 @@ void irg_set_nloc(ir_graph *res, int n_loc) } } -/* Allocates a list of nodes: - - The start block containing a start node and Proj nodes for its four - results (X, M, P, Tuple). - - The end block containing an end node. This block is not matured after - new_ir_graph as predecessors need to be added to it. - - The current block, which is empty and also not matured. - Further it allocates several datastructures needed for graph construction - and optimization. -*/ ir_graph *new_r_ir_graph(ir_entity *ent, int n_loc) { ir_graph *res; @@ -160,35 +132,14 @@ ir_graph *new_r_ir_graph(ir_entity *ent, int n_loc) /* inform statistics here, as blocks will be already build on this graph */ hook_new_graph(res, ent); - /*-- initialized for each graph. --*/ - res->kind = k_ir_graph; - res->obst = XMALLOC(struct obstack); - obstack_init(res->obst); - - res->phase_state = phase_building; + /* graphs are in construction mode by default */ + add_irg_constraints(res, IR_GRAPH_CONSTRAINT_CONSTRUCTION); irg_set_nloc(res, n_loc); - /* descriptions will be allocated on demand */ - res->loc_descriptions = NULL; - - res->visited = 0; /* visited flag, for the ir walker */ - res->block_visited = 0; /* visited flag, for the 'block'-walker */ - - res->extbb_obst = NULL; - - res->last_node_idx = 0; - - new_identities(res); - res->outs = NULL; - - res->inline_property = irg_inline_any; - res->additional_properties = mtp_property_inherited; /* inherited from type */ - res->irg_pinned_state = op_pin_state_pinned; res->typeinfo_state = ir_typeinfo_none; set_irp_typeinfo_inconsistent(); /* there is a new graph with typeinfo_none. */ res->callee_info_state = irg_callee_info_none; - res->class_cast_state = ir_class_casts_transitive; res->fp_model = fp_model_precise; res->mem_disambig_opt = aa_opt_inherited; @@ -203,7 +154,7 @@ ir_graph *new_r_ir_graph(ir_entity *ent, int n_loc) res->anchor = new_r_Anchor(res); /*-- Nodes needed in every graph --*/ - set_irg_end_block (res, new_r_immBlock(res)); + set_irg_end_block(res, new_r_immBlock(res)); set_irg_end(res, new_r_End(res, 0, NULL)); start_block = new_r_Block_noopt(res, 0, NULL); @@ -229,12 +180,10 @@ ir_graph *new_r_ir_graph(ir_entity *ent, int n_loc) set_r_store(res, initial_mem); /*-- Make a block to start with --*/ - first_block = new_r_immBlock(res); + first_block = new_r_Block(res, 1, &projX); set_r_cur_block(res, first_block); - add_immBlock_pred(first_block, projX); res->method_execution_frequency = -1.0; - res->estimated_node_count = 0; return res; } @@ -246,8 +195,6 @@ ir_graph *new_ir_graph(ir_entity *ent, int n_loc) return res; } -/* Make a rudimentary IR graph for the constant code. - Must look like a correct irg, spare everything else. */ ir_graph *new_const_code_irg(void) { ir_graph *res = alloc_graph(); @@ -262,23 +209,11 @@ ir_graph *new_const_code_irg(void) /* inform statistics here, as blocks will be already build on this graph */ hook_new_graph(res, NULL); - res->n_loc = 1; /* Only the memory. */ - res->visited = 0; /* visited flag, for the ir walker */ - res->block_visited = 0; /* visited flag, for the 'block'-walker */ - res->obst = XMALLOC(struct obstack); - obstack_init(res->obst); - res->extbb_obst = NULL; - - res->last_node_idx = 0; - - res->phase_state = phase_building; + res->n_loc = 1; /* Only the memory. */ res->irg_pinned_state = op_pin_state_pinned; res->fp_model = fp_model_precise; - /* value table for global value numbering for optimizing use in iropt.c */ - new_identities(res); - res->ent = NULL; - res->frame_type = NULL; + add_irg_constraints(res, IR_GRAPH_CONSTRAINT_CONSTRUCTION); /* the Anchor node must be created first */ res->anchor = new_r_Anchor(res); @@ -310,7 +245,6 @@ ir_graph *new_const_code_irg(void) set_Block_block_visited(body_block, -1); set_Block_block_visited(start_block, -1); set_irn_visited(start_block, -1); - set_irn_visited(no_mem, -1); return res; } @@ -361,36 +295,19 @@ static ir_node *get_new_node(const ir_node *old_node) return (ir_node*) get_irn_link(old_node); } -/* - * Create a new graph that is a copy of a given one. - */ ir_graph *create_irg_copy(ir_graph *irg) { ir_graph *res; res = alloc_graph(); - res->n_loc = 0; - res->visited = 0; /* visited flag, for the ir walker */ - res->block_visited = 0; /* visited flag, for the 'block'-walker */ - res->obst = XMALLOC(struct obstack); - obstack_init(res->obst); - res->extbb_obst = NULL; - - res->last_node_idx = 0; - - res->phase_state = irg->phase_state; res->irg_pinned_state = irg->irg_pinned_state; res->fp_model = irg->fp_model; - new_identities(res); - /* clone the frame type here for safety */ irp_reserve_resources(irp, IRP_RESOURCE_ENTITY_LINK); res->frame_type = clone_frame_type(irg->frame_type); - res->phase_state = irg->phase_state; - ir_reserve_resources(irg, IR_RESOURCE_IRN_LINK); /* copy all nodes from the graph irg to the new graph res */ @@ -411,59 +328,40 @@ ir_graph *create_irg_copy(ir_graph *irg) /* Proj results of start node */ set_irg_initial_mem(res, get_new_node(get_irg_initial_mem(irg))); - /* Copy the node count estimation. Would be strange if this - is different from the original one. */ - res->estimated_node_count = irg->estimated_node_count; - ir_free_resources(irg, IR_RESOURCE_IRN_LINK); irp_free_resources(irp, IRP_RESOURCE_ENTITY_LINK); return res; } -/* Frees the passed irgraph. - Deallocates all nodes in this graph and the ir_graph structure. - Sets the field irgraph in the corresponding entity to NULL. - Does not remove the irgraph from the list in irprog (requires - inefficient search, call remove_irp_irg by hand). - 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)); - edges_deactivate(irg); + remove_irp_irg(irg); + confirm_irg_properties(irg, IR_GRAPH_PROPERTIES_NONE); hook_free_graph(irg); free_irg_outs(irg); - if (irg->frame_type) - free_type(irg->frame_type); del_identities(irg); if (irg->ent) { set_entity_irg(irg->ent, NULL); /* not set in const code irg */ } free_End(get_irg_end(irg)); - obstack_free(irg->obst,NULL); - free(irg->obst); + obstack_free(&irg->obst, NULL); if (irg->loc_descriptions) free(irg->loc_descriptions); irg->kind = k_BAD; free_graph(irg); } -/* access routines for all ir_graph attributes: - templates: - {attr type} get_irg_{attribute name} (ir_graph *irg); - void set_irg_{attr name} (ir_graph *irg, {attr type} {attr}); */ - int (is_ir_graph)(const void *thing) { return is_ir_graph_(thing); } #ifdef DEBUG_libfirm -/* Outputs a unique number for this node */ long get_irg_graph_nr(const ir_graph *irg) { return irg->graph_nr; @@ -600,26 +498,11 @@ int get_irg_n_locs(ir_graph *irg) return irg->n_loc - 1; } -/* Returns the obstack associated with the graph. */ -struct obstack *(get_irg_obstack)(const ir_graph *irg) -{ - return get_irg_obstack_(irg); -} - -/* - * Returns true if the node n is allocated on the storage of graph irg. - * - * Implementation is GLIBC specific as is uses the internal _obstack_chunk implementation. - */ int node_is_in_irgs_storage(const ir_graph *irg, const ir_node *n) { - struct _obstack_chunk *p; - - /* - * checks weather the ir_node pointer is on the obstack. - * A more sophisticated check would test the "whole" ir_node - */ - for (p = irg->obst->chunk; p; p = p->prev) { + /* Check whether the ir_node pointer is on the obstack. + * A more sophisticated check would test the "whole" ir_node. */ + for (struct _obstack_chunk const *p = irg->obst.chunk; p; p = p->prev) { if (((char *)p->contents <= (char *)n) && ((char *)n < (char *)p->limit)) return 1; } @@ -627,26 +510,11 @@ int node_is_in_irgs_storage(const ir_graph *irg, const ir_node *n) return 0; } -irg_phase_state (get_irg_phase_state)(const ir_graph *irg) -{ - return get_irg_phase_state_(irg); -} - -void (set_irg_phase_state)(ir_graph *irg, irg_phase_state state) -{ - set_irg_phase_state_(irg, state); -} - op_pin_state (get_irg_pinned)(const ir_graph *irg) { return get_irg_pinned_(irg); } -void (set_irg_pinned)(ir_graph *irg, op_pin_state p) -{ - set_irg_pinned_(irg, p); -} - irg_callee_info_state (get_irg_callee_info_state)(const ir_graph *irg) { return get_irg_callee_info_state_(irg); @@ -657,31 +525,6 @@ void (set_irg_callee_info_state)(ir_graph *irg, irg_callee_info_state s) set_irg_callee_info_state_(irg, s); } -irg_inline_property (get_irg_inline_property)(const ir_graph *irg) -{ - return get_irg_inline_property_(irg); -} - -void (set_irg_inline_property)(ir_graph *irg, irg_inline_property s) -{ - set_irg_inline_property_(irg, s); -} - -mtp_additional_properties (get_irg_additional_properties)(const ir_graph *irg) -{ - return get_irg_additional_properties_(irg); -} - -void (set_irg_additional_properties)(ir_graph *irg, mtp_additional_properties property_mask) -{ - set_irg_additional_properties_(irg, property_mask); -} - -void (add_irg_additional_properties)(ir_graph *irg, mtp_additional_properties flag) -{ - add_irg_additional_properties_(irg, flag); -} - void (set_irg_link)(ir_graph *irg, void *thing) { set_irg_link_(irg, thing); @@ -751,19 +594,16 @@ void (inc_irg_block_visited)(ir_graph *irg) inc_irg_block_visited_(irg); } -/* Return the floating point model of this graph. */ unsigned (get_irg_fp_model)(const ir_graph *irg) { return get_irg_fp_model_(irg); } -/* Sets the floating point model for this graph. */ void set_irg_fp_model(ir_graph *irg, unsigned model) { irg->fp_model = model; } -/* set a description for local value n */ void set_irg_loc_description(ir_graph *irg, int n, void *description) { assert(0 <= n && n < irg->n_loc); @@ -774,7 +614,6 @@ void set_irg_loc_description(ir_graph *irg, int n, void *description) irg->loc_descriptions[n] = description; } -/* get the description for local value n */ void *get_irg_loc_description(ir_graph *irg, int n) { assert(0 <= n && n < irg->n_loc); @@ -798,42 +637,82 @@ ir_resources_t ir_resources_reserved(const ir_graph *irg) { return irg->reserved_resources; } -#endif /* NDEBUG */ +#endif -/* Returns a estimated node count of the irg. */ -unsigned (get_irg_estimated_node_cnt)(const ir_graph *irg) +unsigned get_irg_last_idx(const ir_graph *irg) { - return get_irg_estimated_node_cnt_(irg); + return irg->last_node_idx; } -/* Returns the last irn index for this graph. */ -unsigned get_irg_last_idx(const ir_graph *irg) +void add_irg_constraints(ir_graph *irg, ir_graph_constraints_t constraints) { - return irg->last_node_idx; + irg->constraints |= constraints; } -/* register additional space in an IR graph */ -size_t register_additional_graph_data(size_t size) +void clear_irg_constraints(ir_graph *irg, ir_graph_constraints_t constraints) { - assert(!forbid_new_data && "Too late to register additional node data"); + irg->constraints &= ~constraints; +} - if (forbid_new_data) - return 0; +int (irg_is_constrained)(const ir_graph *irg, ir_graph_constraints_t constraints) +{ + return irg_is_constrained_(irg, constraints); +} + +void (add_irg_properties)(ir_graph *irg, ir_graph_properties_t props) +{ + add_irg_properties_(irg, props); +} - return additional_graph_data_size += size; +void (clear_irg_properties)(ir_graph *irg, ir_graph_properties_t props) +{ + clear_irg_properties_(irg, props); } -void (set_irg_state)(ir_graph *irg, ir_graph_state_t state) +int (irg_has_properties)(const ir_graph *irg, ir_graph_properties_t props) { - set_irg_state_(irg, state); + return irg_has_properties_(irg, props); } -void (clear_irg_state)(ir_graph *irg, ir_graph_state_t state) +typedef void (*assure_property_func)(ir_graph *irg); + +void assure_irg_properties(ir_graph *irg, ir_graph_properties_t props) { - clear_irg_state_(irg, state); + static struct { + ir_graph_properties_t property; + assure_property_func func; + } property_functions[] = { + { IR_GRAPH_PROPERTY_ONE_RETURN, normalize_one_return }, + { IR_GRAPH_PROPERTY_MANY_RETURNS, normalize_n_returns }, + { IR_GRAPH_PROPERTY_NO_CRITICAL_EDGES, remove_critical_cf_edges }, + { IR_GRAPH_PROPERTY_NO_UNREACHABLE_CODE, remove_unreachable_code }, + { IR_GRAPH_PROPERTY_NO_BADS, remove_bads }, + { IR_GRAPH_PROPERTY_NO_TUPLES, remove_tuples }, + { IR_GRAPH_PROPERTY_CONSISTENT_DOMINANCE, assure_doms }, + { IR_GRAPH_PROPERTY_CONSISTENT_POSTDOMINANCE, assure_postdoms }, + { IR_GRAPH_PROPERTY_CONSISTENT_OUT_EDGES, assure_edges }, + { IR_GRAPH_PROPERTY_CONSISTENT_OUTS, assure_irg_outs }, + { IR_GRAPH_PROPERTY_CONSISTENT_LOOPINFO, assure_loopinfo }, + { IR_GRAPH_PROPERTY_CONSISTENT_ENTITY_USAGE, assure_irg_entity_usage_computed }, + { IR_GRAPH_PROPERTY_CONSISTENT_DOMINANCE_FRONTIERS, ir_compute_dominance_frontiers }, + }; + size_t i; + for (i = 0; i < ARRAY_SIZE(property_functions); ++i) { + ir_graph_properties_t missing = props & ~irg->properties; + if (missing & property_functions[i].property) + property_functions[i].func(irg); + } + assert((props & ~irg->properties) == IR_GRAPH_PROPERTIES_NONE); } -int (is_irg_state)(const ir_graph *irg, ir_graph_state_t state) +void confirm_irg_properties(ir_graph *irg, ir_graph_properties_t props) { - return is_irg_state_(irg, state); + clear_irg_properties(irg, ~props); + if (! (props & IR_GRAPH_PROPERTY_CONSISTENT_OUT_EDGES)) + edges_deactivate(irg); + if (! (props & IR_GRAPH_PROPERTY_CONSISTENT_OUTS) + && (irg->properties & IR_GRAPH_PROPERTY_CONSISTENT_OUTS)) + free_irg_outs(irg); + if (! (props & IR_GRAPH_PROPERTY_CONSISTENT_DOMINANCE_FRONTIERS)) + ir_free_dominance_frontiers(irg); }