X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgraph.c;h=75f83573b987b1af9442fdd7d66b576edc3b8f0c;hb=3c3425a50a1d721b74a015c6812257e32feeac85;hp=df1b36af9e036a86b6b6e0e2d1ff3cf5dc7764ef;hpb=f6b78c1b4c5885ac0c3e20ae0afca754cb3edbf9;p=libfirm diff --git a/ir/ir/irgraph.c b/ir/ir/irgraph.c index df1b36af9..75f83573b 100644 --- a/ir/ir/irgraph.c +++ b/ir/ir/irgraph.c @@ -21,7 +21,6 @@ * @file * @brief Entry point to the representation of procedure code. * @author Martin Trapp, Christian Schaefer, Goetz Lindenmaier, Michael Beck - * @version $Id$ */ #include "config.h" @@ -41,11 +40,14 @@ #include "irouts.h" #include "irhooks.h" #include "irtools.h" +#include "util.h" #include "irgwalk.h" #include "irbackedge_t.h" #include "iredges_t.h" #include "type_t.h" #include "irmemory.h" +#include "iroptimize.h" +#include "irgopt.h" #define INITIAL_IDX_IRN_MAP_SIZE 1024 @@ -75,7 +77,6 @@ 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); @@ -119,12 +120,6 @@ static void free_graph(ir_graph *irg) free(ptr - additional_graph_data_size); } -/** - * 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); @@ -140,15 +135,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; @@ -174,8 +160,6 @@ ir_graph *new_r_ir_graph(ir_entity *ent, int n_loc) 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); @@ -203,7 +187,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,9 +213,8 @@ 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; @@ -246,8 +229,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(); @@ -267,7 +248,6 @@ ir_graph *new_const_code_irg(void) 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; @@ -310,7 +290,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,9 +340,6 @@ 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; @@ -375,7 +351,6 @@ ir_graph *create_irg_copy(ir_graph *irg) 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; @@ -421,13 +396,6 @@ ir_graph *create_irg_copy(ir_graph *irg) 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)); @@ -436,15 +404,13 @@ void free_ir_graph(ir_graph *irg) 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); + obstack_free(irg->obst, NULL); free(irg->obst); if (irg->loc_descriptions) free(irg->loc_descriptions); @@ -452,18 +418,12 @@ void free_ir_graph(ir_graph *irg) 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); + 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; @@ -482,117 +442,117 @@ size_t get_irg_idx(const ir_graph *irg) ir_node *(get_idx_irn)(const ir_graph *irg, unsigned idx) { - return _get_idx_irn(irg, idx); + return get_idx_irn_(irg, idx); } ir_node *(get_irg_start_block)(const ir_graph *irg) { - return _get_irg_start_block(irg); + return get_irg_start_block_(irg); } void (set_irg_start_block)(ir_graph *irg, ir_node *node) { - _set_irg_start_block(irg, node); + set_irg_start_block_(irg, node); } ir_node *(get_irg_start)(const ir_graph *irg) { - return _get_irg_start(irg); + return get_irg_start_(irg); } void (set_irg_start)(ir_graph *irg, ir_node *node) { - _set_irg_start(irg, node); + set_irg_start_(irg, node); } ir_node *(get_irg_end_block)(const ir_graph *irg) { - return _get_irg_end_block(irg); + return get_irg_end_block_(irg); } void (set_irg_end_block)(ir_graph *irg, ir_node *node) { - _set_irg_end_block(irg, node); + set_irg_end_block_(irg, node); } ir_node *(get_irg_end)(const ir_graph *irg) { - return _get_irg_end(irg); + return get_irg_end_(irg); } void (set_irg_end)(ir_graph *irg, ir_node *node) { - _set_irg_end(irg, node); + set_irg_end_(irg, node); } ir_node *(get_irg_initial_exec)(const ir_graph *irg) { - return _get_irg_initial_exec(irg); + return get_irg_initial_exec_(irg); } void (set_irg_initial_exec)(ir_graph *irg, ir_node *node) { - _set_irg_initial_exec(irg, node); + set_irg_initial_exec_(irg, node); } ir_node *(get_irg_frame)(const ir_graph *irg) { - return _get_irg_frame(irg); + return get_irg_frame_(irg); } void (set_irg_frame)(ir_graph *irg, ir_node *node) { - _set_irg_frame(irg, node); + set_irg_frame_(irg, node); } ir_node *(get_irg_initial_mem)(const ir_graph *irg) { - return _get_irg_initial_mem(irg); + return get_irg_initial_mem_(irg); } void (set_irg_initial_mem)(ir_graph *irg, ir_node *node) { - _set_irg_initial_mem(irg, node); + set_irg_initial_mem_(irg, node); } ir_node *(get_irg_args)(const ir_graph *irg) { - return _get_irg_args(irg); + return get_irg_args_(irg); } void (set_irg_args)(ir_graph *irg, ir_node *node) { - _set_irg_args(irg, node); + set_irg_args_(irg, node); } ir_node *(get_irg_no_mem)(const ir_graph *irg) { - return _get_irg_no_mem(irg); + return get_irg_no_mem_(irg); } void (set_irg_no_mem)(ir_graph *irg, ir_node *node) { - _set_irg_no_mem(irg, node); + set_irg_no_mem_(irg, node); } ir_entity *(get_irg_entity)(const ir_graph *irg) { - return _get_irg_entity(irg); + return get_irg_entity_(irg); } void (set_irg_entity)(ir_graph *irg, ir_entity *ent) { - _set_irg_entity(irg, ent); + set_irg_entity_(irg, ent); } ir_type *(get_irg_frame_type)(ir_graph *irg) { - return _get_irg_frame_type(irg); + return get_irg_frame_type_(irg); } void (set_irg_frame_type)(ir_graph *irg, ir_type *ftp) { - _set_irg_frame_type(irg, ftp); + set_irg_frame_type_(irg, ftp); } int get_irg_n_locs(ir_graph *irg) @@ -600,17 +560,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); +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; @@ -629,72 +583,72 @@ int node_is_in_irgs_storage(const ir_graph *irg, const ir_node *n) irg_phase_state (get_irg_phase_state)(const ir_graph *irg) { - return _get_irg_phase_state(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); + set_irg_phase_state_(irg, state); } op_pin_state (get_irg_pinned)(const ir_graph *irg) { - return _get_irg_pinned(irg); + return get_irg_pinned_(irg); } void (set_irg_pinned)(ir_graph *irg, op_pin_state p) { - _set_irg_pinned(irg, 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); + return get_irg_callee_info_state_(irg); } void (set_irg_callee_info_state)(ir_graph *irg, irg_callee_info_state s) { - _set_irg_callee_info_state(irg, 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); + return get_irg_inline_property_(irg); } void (set_irg_inline_property)(ir_graph *irg, irg_inline_property s) { - _set_irg_inline_property(irg, s); + set_irg_inline_property_(irg, s); } mtp_additional_properties (get_irg_additional_properties)(const ir_graph *irg) { - return _get_irg_additional_properties(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); + 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); + add_irg_additional_properties_(irg, flag); } void (set_irg_link)(ir_graph *irg, void *thing) { - _set_irg_link(irg, thing); + set_irg_link_(irg, thing); } void *(get_irg_link)(const ir_graph *irg) { - return _get_irg_link(irg); + return get_irg_link_(irg); } ir_visited_t (get_irg_visited)(const ir_graph *irg) { - return _get_irg_visited(irg); + return get_irg_visited_(irg); } /** maximum visited flag content of all ir_graph visited fields. */ @@ -738,32 +692,29 @@ ir_visited_t inc_max_irg_visited(void) ir_visited_t (get_irg_block_visited)(const ir_graph *irg) { - return _get_irg_block_visited(irg); + return get_irg_block_visited_(irg); } void (set_irg_block_visited)(ir_graph *irg, ir_visited_t visited) { - _set_irg_block_visited(irg, visited); + set_irg_block_visited_(irg, visited); } void (inc_irg_block_visited)(ir_graph *irg) { - _inc_irg_block_visited(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); + 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 +725,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,21 +748,18 @@ 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) { - return _get_irg_estimated_node_cnt(irg); + return get_irg_estimated_node_cnt_(irg); } -/* Returns the last irn index for this graph. */ unsigned get_irg_last_idx(const ir_graph *irg) { return irg->last_node_idx; } -/* register additional space in an IR graph */ size_t register_additional_graph_data(size_t size) { assert(!forbid_new_data && "Too late to register additional node data"); @@ -823,17 +770,75 @@ size_t register_additional_graph_data(size_t size) return additional_graph_data_size += size; } -void (set_irg_state)(ir_graph *irg, ir_graph_state_t state) +void add_irg_constraints(ir_graph *irg, ir_graph_constraints_t constraints) +{ + irg->constraints |= constraints; +} + +void clear_irg_constraints(ir_graph *irg, ir_graph_constraints_t constraints) { - _set_irg_state(irg, state); + irg->constraints &= ~constraints; } -void (clear_irg_state)(ir_graph *irg, ir_graph_state_t state) +int (irg_is_constrained)(const ir_graph *irg, ir_graph_constraints_t constraints) { - _clear_irg_state(irg, state); + return irg_is_constrained_(irg, constraints); +} + +void (add_irg_properties)(ir_graph *irg, ir_graph_properties_t props) +{ + add_irg_properties_(irg, props); +} + +void (clear_irg_properties)(ir_graph *irg, ir_graph_properties_t props) +{ + clear_irg_properties_(irg, props); +} + +int (irg_has_properties)(const ir_graph *irg, ir_graph_properties_t props) +{ + return irg_has_properties_(irg, props); +} + +typedef void (*assure_property_func)(ir_graph *irg); + +void assure_irg_properties(ir_graph *irg, ir_graph_properties_t props) +{ + 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); }