X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=inline;f=ir%2Fir%2Firgraph.c;h=8ecf734ffc9636fd5b9ec240ccfc1b2422860b21;hb=f09e60a5d5ea53e7cccf3e56de9bc129f285e2b0;hp=311a7dcc299a9108967911ab3ff6bd9c116ca972;hpb=e5eb3be009a71eeb9134077fe0cf9b9ccfe97a90;p=libfirm diff --git a/ir/ir/irgraph.c b/ir/ir/irgraph.c index 311a7dcc2..8ecf734ff 100644 --- a/ir/ir/irgraph.c +++ b/ir/ir/irgraph.c @@ -1,27 +1,12 @@ /* - * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. - * * This file is part of libFirm. - * - * This file may be distributed and/or modified under the terms of the - * GNU General Public License version 2 as published by the Free Software - * Foundation and appearing in the file LICENSE.GPL included in the - * packaging of this file. - * - * Licensees holding valid libFirm Professional Edition licenses may use - * this file in accordance with the libFirm Commercial License. - * Agreement provided with the Software. - * - * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE - * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE. + * Copyright (C) 2012 University of Karlsruhe. */ /** * @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,26 +26,18 @@ #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 "irphase.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) @@ -76,11 +53,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; } /** @@ -92,16 +67,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; } @@ -111,24 +86,15 @@ static ir_graph *alloc_graph(void) */ static void free_graph(ir_graph *irg) { - char *ptr = (char *)irg; - int i; - - for (i = 0; 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 @@ -141,65 +107,26 @@ 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 it's 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; ir_node *first_block; - ir_node *end, *start, *start_block, *initial_mem, *projX, *bad; + ir_node *start, *start_block, *initial_mem, *projX; res = alloc_graph(); /* inform statistics here, as blocks will be already build on this graph */ hook_new_graph(res, ent); - current_ir_graph = res; - - /*-- 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->outs_state = outs_none; - res->dom_state = dom_none; - res->pdom_state = dom_none; 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->loopinfo_state = loopinfo_none; - res->class_cast_state = ir_class_casts_transitive; - res->extblk_state = ir_extblk_info_none; - res->execfreq_state = exec_freq_none; res->fp_model = fp_model_precise; - res->entity_usage_state = ir_entity_usage_not_computed; res->mem_disambig_opt = aa_opt_inherited; /*-- Type information for the procedure of the graph --*/ @@ -210,49 +137,39 @@ ir_graph *new_r_ir_graph(ir_entity *ent, int n_loc) res->frame_type = new_type_frame(); /* the Anchor node must be created first */ - res->anchor = new_Anchor(res); + res->anchor = new_r_Anchor(res); /*-- Nodes needed in every graph --*/ - set_irg_end_block (res, new_immBlock()); - set_cur_block(get_irg_end_block(res)); - end = new_End(); - set_irg_end (res, end); + set_irg_end_block(res, new_r_immBlock(res)); + set_irg_end(res, new_r_End(res, 0, NULL)); - start_block = new_immBlock(); - set_cur_block(start_block); + start_block = new_r_Block_noopt(res, 0, NULL); set_irg_start_block(res, start_block); - bad = new_ir_node(NULL, res, start_block, op_Bad, mode_T, 0, NULL); - bad->attr.irg.irg = res; - set_irg_bad (res, bad); - set_irg_no_mem (res, new_ir_node(NULL, res, start_block, op_NoMem, mode_M, 0, NULL)); - start = new_Start(); + set_irg_no_mem (res, new_r_NoMem(res)); + start = new_r_Start(res); set_irg_start (res, start); /* Proj results of start node */ - projX = new_Proj(start, mode_X, pn_Start_X_initial_exec); + projX = new_r_Proj(start, mode_X, pn_Start_X_initial_exec); set_irg_initial_exec (res, projX); - set_irg_frame (res, new_Proj(start, mode_P_data, pn_Start_P_frame_base)); - set_irg_tls (res, new_Proj(start, mode_P_data, pn_Start_P_tls)); - set_irg_args (res, new_Proj(start, mode_T, pn_Start_T_args)); - initial_mem = new_Proj(start, mode_M, pn_Start_M); + set_irg_frame (res, new_r_Proj(start, mode_P_data, pn_Start_P_frame_base)); + set_irg_args (res, new_r_Proj(start, mode_T, pn_Start_T_args)); + initial_mem = new_r_Proj(start, mode_M, pn_Start_M); set_irg_initial_mem(res, initial_mem); - set_store(initial_mem); - res->index = get_irp_new_irg_idx(); #ifdef DEBUG_libfirm res->graph_nr = get_irp_new_node_nr(); #endif - mature_immBlock(res->current_block); + set_r_cur_block(res, start_block); + set_r_store(res, initial_mem); /*-- Make a block to start with --*/ - first_block = new_immBlock(); - set_cur_block(first_block); - add_immBlock_pred(first_block, projX); + first_block = new_r_Block(res, 1, &projX); + set_r_cur_block(res, first_block); res->method_execution_frequency = -1.0; - res->estimated_node_count = 0; return res; } @@ -264,12 +181,9 @@ 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(); - ir_node *bad; ir_node *body_block; ir_node *end; ir_node *end_block; @@ -281,66 +195,42 @@ ir_graph *new_const_code_irg(void) /* inform statistics here, as blocks will be already build on this graph */ hook_new_graph(res, NULL); - current_ir_graph = res; - 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->extblk_state = ir_extblk_info_none; 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_Anchor(res); + res->anchor = new_r_Anchor(res); /* -- The end block -- */ - end_block = new_immBlock(); + end_block = new_r_Block_noopt(res, 0, NULL); set_irg_end_block(res, end_block); - set_cur_block(end_block); - end = new_End(); - set_irg_end (res, end); - mature_immBlock(end_block); + end = new_r_End(res, 0, NULL); + set_irg_end(res, end); /* -- The start block -- */ - start_block = new_immBlock(); - set_cur_block(start_block); + start_block = new_r_Block_noopt(res, 0, NULL); set_irg_start_block(res, start_block); - bad = new_ir_node(NULL, res, start_block, op_Bad, mode_T, 0, NULL); - bad->attr.irg.irg = res; - set_irg_bad(res, bad); - no_mem = new_ir_node(NULL, res, start_block, op_NoMem, mode_M, 0, NULL); + no_mem = new_r_NoMem(res); set_irg_no_mem(res, no_mem); - start = new_Start(); + start = new_r_Start(res); set_irg_start(res, start); /* Proj results of start node */ - set_irg_initial_mem(res, new_Proj(start, mode_M, pn_Start_M)); - projX = new_Proj(start, mode_X, pn_Start_X_initial_exec); - mature_immBlock(start_block); + set_irg_initial_mem(res, new_r_Proj(start, mode_M, pn_Start_M)); + projX = new_r_Proj(start, mode_X, pn_Start_X_initial_exec); + + body_block = new_r_Block(res, 1, &projX); - body_block = new_immBlock(); - add_immBlock_pred(body_block, projX); - mature_immBlock(body_block); /* mature the 'body' block for expressions */ - set_cur_block(body_block); + set_r_cur_block(res, body_block); /* Set the visited flag high enough that the blocks will never be visited. */ set_irn_visited(body_block, -1); set_Block_block_visited(body_block, -1); set_Block_block_visited(start_block, -1); set_irn_visited(start_block, -1); - set_irn_visited(bad, -1); - set_irn_visited(no_mem, -1); return res; } @@ -354,7 +244,7 @@ ir_graph *new_const_code_irg(void) */ static void copy_all_nodes(ir_node *node, void *env) { - ir_graph *irg = env; + ir_graph *irg = (ir_graph*)env; ir_node *new_node = irn_copy_into_irg(node, irg); set_irn_link(node, new_node); @@ -366,7 +256,7 @@ static void copy_all_nodes(ir_node *node, void *env) if (is_frame_type(tp)) { /* replace by the copied entity */ - ent = get_entity_link(ent); + ent = (ir_entity*)get_entity_link(ent); assert(is_entity(ent)); assert(get_entity_owner(ent) == get_irg_frame_type(irg)); @@ -391,37 +281,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->extblk_state = ir_extblk_info_none; res->fp_model = irg->fp_model; - new_identities(res); - /* clone the frame type here for safety */ - irp_reserve_resources(irp, IR_RESOURCE_ENTITY_LINK); + 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 */ @@ -436,234 +308,172 @@ ir_graph *create_irg_copy(ir_graph *irg) /* -- The start block -- */ set_irg_start_block(res, get_new_node(get_irg_start_block(irg))); - set_irg_bad (res, get_new_node(get_irg_bad(irg))); set_irg_no_mem (res, get_new_node(get_irg_no_mem(irg))); set_irg_start (res, get_new_node(get_irg_start(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, IR_RESOURCE_ENTITY_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); - if (irg->outs_state != outs_none) - free_irg_outs(irg); - if (irg->frame_type) - free_type(irg->frame_type); + free_irg_outs(irg); 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); + return is_ir_graph_(thing); } -#ifdef DEBUG_libfirm -/* Outputs a unique number for this node */ long get_irg_graph_nr(const ir_graph *irg) { +#ifdef DEBUG_libfirm return irg->graph_nr; -} #else -long get_irg_graph_nr(const ir_graph *irg) -{ return PTR_TO_INT(irg); -} #endif +} -int get_irg_idx(const ir_graph *irg) +size_t get_irg_idx(const ir_graph *irg) { return irg->index; } -ir_node *(get_idx_irn)(ir_graph *irg, unsigned idx) +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); -} - -ir_node *(get_irg_tls)(const ir_graph *irg) -{ - return _get_irg_tls(irg); -} - -void (set_irg_tls)(ir_graph *irg, ir_node *node) -{ - _set_irg_tls(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); -} - -ir_node *(get_irg_bad)(const ir_graph *irg) -{ - return _get_irg_bad(irg); -} - -void (set_irg_bad)(ir_graph *irg, ir_node *node) -{ - _set_irg_bad(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); -} - -ir_node *(get_irg_current_block)(const ir_graph *irg) -{ - return _get_irg_current_block(irg); -} - -void (set_irg_current_block)(ir_graph *irg, ir_node *node) -{ - _set_irg_current_block(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); -} - -/* Returns the value parameter type of an IR graph. */ -ir_type *get_irg_value_param_type(ir_graph *irg) -{ - ir_entity *ent = get_irg_entity(irg); - ir_type *mtp = get_entity_type(ent); - return get_method_value_param_type(mtp); + set_irg_frame_type_(irg, ftp); } int get_irg_n_locs(ir_graph *irg) @@ -671,26 +481,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(ir_graph *irg, ir_node *n) +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; } @@ -698,134 +493,34 @@ int node_is_in_irgs_storage(ir_graph *irg, 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); -} - -irg_outs_state (get_irg_outs_state)(const ir_graph *irg) -{ - return _get_irg_outs_state(irg); -} - -void (set_irg_outs_inconsistent)(ir_graph *irg) -{ - _set_irg_outs_inconsistent(irg); -} - -irg_extblk_state (get_irg_extblk_state)(const ir_graph *irg) -{ - return _get_irg_extblk_state(irg); -} - -void (set_irg_extblk_inconsistent)(ir_graph *irg) -{ - _set_irg_extblk_inconsistent(irg); -} - -irg_dom_state (get_irg_dom_state)(const ir_graph *irg) -{ - return _get_irg_dom_state(irg); -} - -irg_dom_state (get_irg_postdom_state)(const ir_graph *irg) -{ - return _get_irg_postdom_state(irg); -} - -void (set_irg_doms_inconsistent)(ir_graph *irg) -{ - _set_irg_doms_inconsistent(irg); -} - -irg_loopinfo_state (get_irg_loopinfo_state)(const ir_graph *irg) -{ - return _get_irg_loopinfo_state(irg); -} - -void (set_irg_loopinfo_state)(ir_graph *irg, irg_loopinfo_state s) -{ - _set_irg_loopinfo_state(irg, s); -} - -void (set_irg_loopinfo_inconsistent)(ir_graph *irg) -{ - _set_irg_loopinfo_inconsistent(irg); -} - -void set_irp_loopinfo_inconsistent(void) -{ - int i; - for (i = get_irp_n_irgs() - 1; i >= 0; --i) { - set_irg_loopinfo_inconsistent(get_irp_irg(i)); - } -} - - - -void (set_irg_pinned)(ir_graph *irg, op_pin_state p) -{ - _set_irg_pinned(irg, p); + return get_irg_pinned_(irg); } 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); -} - -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); -} - -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, mtp_additional_property flag) -{ - _set_irg_additional_property(irg, flag); + set_irg_callee_info_state_(irg, s); } 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. */ @@ -860,7 +555,7 @@ void set_max_irg_visited(int val) ir_visited_t inc_max_irg_visited(void) { #ifndef NDEBUG - int i; + size_t i; for (i = 0; i < get_irp_n_irgs(); i++) assert(max_irg_visited >= get_irg_visited(get_irp_irg(i))); #endif @@ -869,32 +564,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); @@ -905,37 +597,15 @@ 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); return irg->loc_descriptions ? irg->loc_descriptions[n] : NULL; } -void irg_register_phase(ir_graph *irg, ir_phase_id id, ir_phase *phase) -{ - assert(id <= PHASE_LAST); - assert(irg->phases[id] == NULL); - irg->phases[id] = phase; -} - -void irg_invalidate_phases(ir_graph *irg) -{ - int p; - for (p = 0; p <= PHASE_LAST; ++p) { - ir_phase *phase = irg->phases[p]; - if (phase == NULL) - continue; - - phase_free(phase); - irg->phases[p] = NULL; - } -} - #ifndef NDEBUG void ir_reserve_resources(ir_graph *irg, ir_resources_t resources) { - assert((resources & ~IR_RESOURCE_LOCAL_MASK) == 0); assert((irg->reserved_resources & resources) == 0); irg->reserved_resources |= resources; } @@ -950,42 +620,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; +} + +int (irg_is_constrained)(const ir_graph *irg, ir_graph_constraints_t constraints) +{ + return irg_is_constrained_(irg, constraints); +} - if (forbid_new_data) - return 0; +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); }