X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgraph.c;h=a4b8ae50e96867bf58c917ebadc3b7832f0270b7;hb=671ced672859c875de7c1d9c4a4750a29514446f;hp=465b30d078cc939982cbac87e0d0a963be39bd7a;hpb=2f500449b37a392471468c2924020098f95b2662;p=libfirm diff --git a/ir/ir/irgraph.c b/ir/ir/irgraph.c index 465b30d07..a4b8ae50e 100644 --- a/ir/ir/irgraph.c +++ b/ir/ir/irgraph.c @@ -23,13 +23,9 @@ * @author Martin Trapp, Christian Schaefer, Goetz Lindenmaier, Michael Beck * @version $Id$ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" -#ifdef HAVE_STRING_H -# include -#endif +#include #ifdef HAVE_STDDEF_H # include #endif @@ -52,6 +48,7 @@ #include "iredges_t.h" #include "type_t.h" #include "irmemory.h" +#include "irphase.h" #define INITIAL_IDX_IRN_MAP_SIZE 1024 @@ -68,22 +65,26 @@ static int forbid_new_data = 0; static size_t additional_graph_data_size = 0; ir_graph *current_ir_graph; -ir_graph *get_current_ir_graph(void) { +ir_graph *get_current_ir_graph(void) +{ return current_ir_graph; } -void set_current_ir_graph(ir_graph *graph) { +void set_current_ir_graph(ir_graph *graph) +{ current_ir_graph = graph; } #ifdef INTERPROCEDURAL_VIEW int firm_interprocedural_view = 0; -int (get_interprocedural_view)(void) { +int (get_interprocedural_view)(void) +{ return _get_interprocedural_view(); } -void (set_interprocedural_view)(int state) { +void (set_interprocedural_view)(int state) +{ firm_interprocedural_view = state; /* set function vectors for faster access */ @@ -102,7 +103,8 @@ void (set_interprocedural_view)(int state) { static ident *frame_type_suffix = NULL; /* initialize the IR graph module */ -void firm_init_irgraph(void) { +void firm_init_irgraph(void) +{ frame_type_suffix = new_id_from_str(FRAME_TP_SUFFIX); forbid_new_data = 1; } @@ -114,11 +116,11 @@ void firm_init_irgraph(void) { * allocated (new_r_ir_graph, new_const_code_irg). * @return Memory for a new graph. */ -static ir_graph *alloc_graph(void) { +static ir_graph *alloc_graph(void) +{ ir_graph *res; size_t size = sizeof(ir_graph) + additional_graph_data_size; - char *ptr = xmalloc(size); - memset(ptr, 0, size); + char *ptr = XMALLOCNZ(char, size); res = (ir_graph *)(ptr + additional_graph_data_size); res->kind = k_ir_graph; @@ -133,17 +135,44 @@ static ir_graph *alloc_graph(void) { /** * Frees an allocated IR graph */ -static void free_graph(ir_graph *irg) { +static void free_graph(ir_graph *irg) +{ char *ptr = (char *)irg; + int i; + + for (i = 0; i < EDGE_KIND_LAST; ++i) + edges_deactivate_kind(irg, i); + DEL_ARR_F(irg->idx_irn_map); free(ptr - additional_graph_data_size); } -#if USE_EXPLICIT_PHI_IN_STACK -/* really defined in ircons.c */ -typedef struct Phi_in_stack Phi_in_stack; -Phi_in_stack *new_Phi_in_stack(); -void free_Phi_in_stack(Phi_in_stack *s); -#endif +/** + * 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); + + if (get_opt_precise_exc_context()) { + res->n_loc = n_loc + 1 + 1; /* number of local variables that are never + dereferenced in this graph plus one for + the store plus one for links to fragile + operations. n_loc is not the number of + parameters to the procedure! */ + } else { + res->n_loc = n_loc + 1; /* number of local variables that are never + dereferenced in this graph plus one for + the store. This is not the number of parameters + to the procedure! */ + } + if (res->loc_descriptions) { + xfree(res->loc_descriptions); + res->loc_descriptions = NULL; + } +} /* Allocates a list of nodes: - The start block containing a start node and Proj nodes for it's four @@ -154,10 +183,11 @@ void free_Phi_in_stack(Phi_in_stack *s); 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 *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; + ir_node *end, *start, *start_block, *initial_mem, *projX, *bad; res = alloc_graph(); @@ -167,18 +197,12 @@ ir_graph *new_r_ir_graph(ir_entity *ent, int n_loc) { current_ir_graph = res; /*-- initialized for each graph. --*/ - if (get_opt_precise_exc_context()) { - res->n_loc = n_loc + 1 + 1; /* number of local variables that are never - dereferenced in this graph plus one for - the store plus one for links to fragile - operations. n_loc is not the number of - parameters to the procedure! */ - } else { - res->n_loc = n_loc + 1; /* number of local variables that are never - dereferenced in this graph plus one for - the store. This is not the number of parameters - to the procedure! */ - } + res->kind = k_ir_graph; + res->obst = XMALLOC(struct obstack); + obstack_init(res->obst); + + res->phase_state = phase_building; + irg_set_nloc(res, n_loc); /* descriptions will be allocated on demand */ res->loc_descriptions = NULL; @@ -186,25 +210,17 @@ 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 */ -#if USE_EXPLICIT_PHI_IN_STACK - res->Phi_in_stack = new_Phi_in_stack(); /* A stack needed for automatic Phi - generation */ -#endif - res->kind = k_ir_graph; - res->obst = xmalloc (sizeof(*res->obst)); - obstack_init(res->obst); res->extbb_obst = NULL; res->last_node_idx = 0; - res->value_table = new_identities (); /* value table for global value - numbering for optimizing use in iropt.c */ + res->value_table = new_identities(); /* value table for global value + numbering for optimizing use in iropt.c */ res->outs = NULL; res->inline_property = irg_inline_any; res->additional_properties = mtp_property_inherited; /* inherited from type */ - res->phase_state = phase_building; res->irg_pinned_state = op_pin_state_pinned; res->outs_state = outs_none; res->dom_state = dom_none; @@ -217,7 +233,7 @@ ir_graph *new_r_ir_graph(ir_entity *ent, int n_loc) { res->extblk_state = ir_extblk_info_none; res->execfreq_state = exec_freq_none; res->fp_model = fp_model_precise; - res->adr_taken_state = ir_address_taken_not_computed; + res->entity_usage_state = ir_entity_usage_not_computed; res->mem_disambig_opt = aa_opt_inherited; /*-- Type information for the procedure of the graph --*/ @@ -225,36 +241,38 @@ ir_graph *new_r_ir_graph(ir_entity *ent, int n_loc) { set_entity_irg(ent, res); /*-- a class type so that it can contain "inner" methods as in Pascal. --*/ - res->frame_type = new_type_frame(mangle(get_entity_ident(ent), frame_type_suffix)); + res->frame_type = new_type_frame(); /* the Anchor node must be created first */ res->anchor = new_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_reg (res, end); set_irg_end_except(res, end); start_block = new_immBlock(); + set_cur_block(start_block); set_irg_start_block(res, start_block); - set_irg_bad (res, new_ir_node(NULL, res, start_block, op_Bad, mode_T, 0, NULL)); + 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_start (res, start); /* Proj results of start node */ projX = new_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_globals (res, new_Proj(start, mode_P_data, pn_Start_P_globals)); 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)); - set_irg_value_param_base(res, new_Proj(start, mode_P_data, pn_Start_P_value_arg_base)); initial_mem = new_Proj(start, mode_M, pn_Start_M); set_irg_initial_mem(res, initial_mem); - add_immBlock_pred(start_block, projX); set_store(initial_mem); res->index = get_irp_new_irg_idx(); @@ -262,15 +280,11 @@ ir_graph *new_r_ir_graph(ir_entity *ent, int n_loc) { res->graph_nr = get_irp_new_node_nr(); #endif - /* - * The code generation needs it. leave it in now. - * Use of this edge is matter of discussion, unresolved. Also possible: - * add_immBlock_pred(res->start_block, res->start_block), but invalid typed. - */ mature_immBlock(res->current_block); /*-- Make a block to start with --*/ first_block = new_immBlock(); + set_cur_block(first_block); add_immBlock_pred(first_block, projX); res->method_execution_frequency = -1.0; @@ -279,7 +293,8 @@ ir_graph *new_r_ir_graph(ir_entity *ent, int n_loc) { return res; } -ir_graph *new_ir_graph(ir_entity *ent, int n_loc) { +ir_graph *new_ir_graph(ir_entity *ent, int n_loc) +{ ir_graph *res = new_r_ir_graph(ent, n_loc); add_irp_irg(res); /* remember this graph global. */ return res; @@ -287,24 +302,27 @@ ir_graph *new_ir_graph(ir_entity *ent, int n_loc) { /* 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; - ir_node *end, *start_block, *start, *projX; - - res = alloc_graph(); +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; + ir_node *no_mem; + ir_node *projX; + ir_node *start_block; + ir_node *start; /* 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 */ + 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 */ -#if USE_EXPLICIT_PHI_IN_STACK - res->Phi_in_stack = NULL; -#endif - res->obst = xmalloc(sizeof(*res->obst)); - obstack_init (res->obst); + res->obst = XMALLOC(struct obstack); + obstack_init(res->obst); res->extbb_obst = NULL; res->last_node_idx = 0; @@ -314,47 +332,53 @@ ir_graph *new_const_code_irg(void) { res->extblk_state = ir_extblk_info_none; res->fp_model = fp_model_precise; - res->value_table = new_identities(); /* value table for global value - numbering for optimizing use in - iropt.c */ - res->ent = NULL; + /* value table for global value numbering for optimizing use in iropt.c */ + res->value_table = new_identities(); + res->ent = NULL; res->frame_type = NULL; /* the Anchor node must be created first */ res->anchor = new_Anchor(res); /* -- The end block -- */ - set_irg_end_block (res, new_immBlock()); + end_block = new_immBlock(); + set_irg_end_block(res, end_block); + set_cur_block(end_block); end = new_End(); set_irg_end (res, end); set_irg_end_reg (res, end); set_irg_end_except(res, end); - mature_immBlock(get_cur_block()); /* mature the end block */ + mature_immBlock(end_block); /* -- The start block -- */ start_block = new_immBlock(); + set_cur_block(start_block); set_irg_start_block(res, start_block); - set_irg_bad (res, new_ir_node (NULL, res, start_block, op_Bad, mode_T, 0, NULL)); - set_irg_no_mem (res, new_ir_node (NULL, res, start_block, op_NoMem, mode_M, 0, NULL)); - start = new_Start(); - set_irg_start (res, start); + 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); + set_irg_no_mem(res, no_mem); + start = new_Start(); + 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); - add_immBlock_pred(start_block, projX); - mature_immBlock (start_block); /* mature the start block */ + mature_immBlock(start_block); - add_immBlock_pred(new_immBlock(), projX); - mature_immBlock (get_cur_block()); /* mature the 'body' block for expressions */ + 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 the visited flag high enough that the blocks will never be visited. */ - set_irn_visited(get_cur_block(), -1); - set_Block_block_visited(get_cur_block(), -1); + 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(get_irg_bad(res), -1); - set_irn_visited(get_irg_no_mem(res), -1); + set_irn_visited(bad, -1); + set_irn_visited(no_mem, -1); res->phase_state = phase_high; @@ -368,35 +392,17 @@ ir_graph *new_const_code_irg(void) { * @param n A node from the original method graph. * @param env The copied graph. */ -static void copy_all_nodes(ir_node *n, void *env) { - ir_graph *irg = current_ir_graph; - ir_op *op = get_irn_op(n); - ir_node *nn; - - nn = new_ir_node(get_irn_dbg_info(n), - irg, - NULL, /* no block yet, will be set later */ - op, - get_irn_mode(n), - get_irn_arity(n), - get_irn_in(n) + 1); - - - /* Copy the attributes. These might point to additional data. If this - was allocated on the old obstack the pointers now are dangling. This - frees e.g. the memory of the graph_arr allocated in new_immBlock. */ - copy_node_attr(n, nn); - new_backedge_info(nn); - set_irn_link(n, nn); - - /* fix the irg for blocks */ - if (is_Block(nn)) - nn->attr.block.irg = irg; +static void copy_all_nodes(ir_node *node, void *env) +{ + ir_graph *irg = env; + ir_node *new_node = irn_copy_into_irg(node, irg); + + set_irn_link(node, new_node); /* fix access to entities on the stack frame */ - if (is_Sel(nn)) { - ir_entity *ent = get_Sel_entity(nn); - ir_type *tp = get_entity_owner(ent); + if (is_Sel(new_node)) { + ir_entity *ent = get_Sel_entity(new_node); + ir_type *tp = get_entity_owner(ent); if (is_frame_type(tp)) { /* replace by the copied entity */ @@ -404,7 +410,7 @@ static void copy_all_nodes(ir_node *n, void *env) { assert(is_entity(ent)); assert(get_entity_owner(ent) == get_irg_frame_type(irg)); - set_Sel_entity(nn, ent); + set_Sel_entity(new_node, ent); } } } @@ -414,36 +420,22 @@ static void copy_all_nodes(ir_node *n, void *env) { * The copied nodes are set as link of their original nodes. The links of * "irn" predecessors are the predecessors of copied node. */ -static void set_all_preds(ir_node *irn, void *env) { - int i; - ir_node *nn, *pred; - ir_graph *clone_irg = env; - - nn = get_irn_link(irn); - - if (is_Block(irn)) { - ir_node *mbh = get_Block_MacroBlock(irn); - set_Block_MacroBlock(nn, get_irn_link(mbh)); - for (i = get_Block_n_cfgpreds(irn) - 1; i >= 0; i--) { - pred = get_Block_cfgpred(irn, i); - set_Block_cfgpred(nn, i, get_irn_link(pred)); - } - } else { - /* First we set the block our copy if it is not a block.*/ - set_nodes_block(nn, get_irn_link(get_nodes_block(irn))); - for (i = get_irn_arity(irn) - 1; i >= 0; i--) { - pred = get_irn_n(irn, i); - set_irn_n(nn, i, get_irn_link(pred)); - } - } +static void rewire(ir_node *irn, void *env) +{ + (void) env; + irn_rewire_inputs(irn); } -#define NN(irn) get_irn_link(irn) +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 *create_irg_copy(ir_graph *irg) +{ ir_graph *res; res = alloc_graph(); @@ -451,10 +443,7 @@ ir_graph *create_irg_copy(ir_graph *irg) { res->n_loc = 0; res->visited = 0; /* visited flag, for the ir walker */ res->block_visited = 0; /* visited flag, for the 'block'-walker */ -#if USE_EXPLICIT_PHI_IN_STACK - res->Phi_in_stack = NULL; -#endif - res->obst = xmalloc(sizeof(*res->obst)); + res->obst = XMALLOC(struct obstack); obstack_init(res->obst); res->extbb_obst = NULL; @@ -468,43 +457,43 @@ ir_graph *create_irg_copy(ir_graph *irg) { res->value_table = new_identities(); /* clone the frame type here for safety */ + irp_reserve_resources(irp, IR_RESOURCE_ENTITY_LINK); res->frame_type = clone_frame_type(irg->frame_type); res->phase_state = irg->phase_state; - set_using_irn_link(irg); + ir_reserve_resources(irg, IR_RESOURCE_IRN_LINK); /* copy all nodes from the graph irg to the new graph res */ - irg_walk_anchors(irg, copy_all_nodes, set_all_preds, res); + irg_walk_anchors(irg, copy_all_nodes, rewire, res); /* copy the Anchor node */ - res->anchor = NN(irg->anchor); + res->anchor = get_new_node(irg->anchor); /* -- The end block -- */ - set_irg_end_block (res, NN(get_irg_end_block(irg))); - set_irg_end (res, NN(get_irg_end(irg))); - set_irg_end_reg (res, NN(get_irg_end_reg(irg))); - set_irg_end_except(res, NN(get_irg_end_except(irg))); + set_irg_end_block (res, get_new_node(get_irg_end_block(irg))); + set_irg_end (res, get_new_node(get_irg_end(irg))); + set_irg_end_reg (res, get_new_node(get_irg_end_reg(irg))); + set_irg_end_except(res, get_new_node(get_irg_end_except(irg))); /* -- The start block -- */ - set_irg_start_block(res, NN(get_irg_start_block(irg))); - set_irg_bad (res, NN(get_irg_bad(irg))); - set_irg_no_mem (res, NN(get_irg_no_mem(irg))); - set_irg_start (res, NN(get_irg_start(irg))); + 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, NN(get_irg_initial_mem(irg))); + 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; - clear_using_irn_link(irg); + ir_free_resources(irg, IR_RESOURCE_IRN_LINK); + irp_free_resources(irp, IR_RESOURCE_ENTITY_LINK); return res; } -#undef NN - /* Frees the passed irgraph. Deallocates all nodes in this graph and the ir_graph structure. @@ -513,9 +502,12 @@ ir_graph *create_irg_copy(ir_graph *irg) { 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) { +void free_ir_graph(ir_graph *irg) +{ assert(is_ir_graph(irg)); + edges_deactivate(irg); + hook_free_graph(irg); if (irg->outs_state != outs_none) free_irg_outs(irg); @@ -524,18 +516,12 @@ void free_ir_graph(ir_graph *irg) { if (irg->value_table) del_identities(irg->value_table); if (irg->ent) { - ir_peculiarity pec = get_entity_peculiarity (irg->ent); - set_entity_peculiarity (irg->ent, peculiarity_description); set_entity_irg(irg->ent, NULL); /* not set in const code irg */ - set_entity_peculiarity (irg->ent, pec); } free_End(get_irg_end(irg)); obstack_free(irg->obst,NULL); free(irg->obst); -#if USE_EXPLICIT_PHI_IN_STACK - free_Phi_in_stack(irg->Phi_in_stack); -#endif if (irg->loc_descriptions) free(irg->loc_descriptions); irg->kind = k_BAD; @@ -547,215 +533,211 @@ void free_ir_graph(ir_graph *irg) { {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) { +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) { +long get_irg_graph_nr(const ir_graph *irg) +{ return irg->graph_nr; } #else -long get_irg_graph_nr(const ir_graph *irg) { +long get_irg_graph_nr(const ir_graph *irg) +{ return PTR_TO_INT(irg); } #endif -int get_irg_idx(const ir_graph *irg) { +int get_irg_idx(const ir_graph *irg) +{ return irg->index; } -ir_node * -(get_irg_start_block)(const ir_graph *irg) { +ir_node *(get_idx_irn)(ir_graph *irg, unsigned idx) +{ + return _get_idx_irn(irg, idx); +} + +ir_node *(get_irg_start_block)(const ir_graph *irg) +{ return _get_irg_start_block(irg); } -void -(set_irg_start_block)(ir_graph *irg, ir_node *node) { +void (set_irg_start_block)(ir_graph *irg, ir_node *node) +{ _set_irg_start_block(irg, node); } -ir_node * -(get_irg_start)(const ir_graph *irg) { +ir_node *(get_irg_start)(const ir_graph *irg) +{ return _get_irg_start(irg); } -void -(set_irg_start)(ir_graph *irg, ir_node *node) { +void (set_irg_start)(ir_graph *irg, ir_node *node) +{ _set_irg_start(irg, node); } -ir_node * -(get_irg_end_block)(const ir_graph *irg) { +ir_node *(get_irg_end_block)(const ir_graph *irg) +{ return _get_irg_end_block(irg); } -void -(set_irg_end_block)(ir_graph *irg, ir_node *node) { +void (set_irg_end_block)(ir_graph *irg, ir_node *node) +{ _set_irg_end_block(irg, node); } -ir_node * -(get_irg_end)(const ir_graph *irg) { +ir_node *(get_irg_end)(const ir_graph *irg) +{ return _get_irg_end(irg); } -void -(set_irg_end)(ir_graph *irg, ir_node *node) { +void (set_irg_end)(ir_graph *irg, ir_node *node) +{ _set_irg_end(irg, node); } -ir_node * -(get_irg_end_reg)(const ir_graph *irg) { +ir_node *(get_irg_end_reg)(const ir_graph *irg) +{ return _get_irg_end_reg(irg); } -void -(set_irg_end_reg)(ir_graph *irg, ir_node *node) { +void (set_irg_end_reg)(ir_graph *irg, ir_node *node) +{ _set_irg_end_reg(irg, node); } -ir_node * -(get_irg_end_except)(const ir_graph *irg) { +ir_node *(get_irg_end_except)(const ir_graph *irg) +{ return _get_irg_end_except(irg); } -void -(set_irg_end_except)(ir_graph *irg, ir_node *node) { - assert(get_irn_op(node) == op_EndExcept || get_irn_op(node) == op_End); +void (set_irg_end_except)(ir_graph *irg, ir_node *node) +{ + assert(get_irn_op(node) == op_EndExcept || is_End(node)); _set_irg_end_except(irg, node); } -ir_node * -(get_irg_frame)(const ir_graph *irg) { - return _get_irg_frame(irg); +ir_node *(get_irg_initial_exec)(const ir_graph *irg) +{ + return _get_irg_initial_exec(irg); } -void -(set_irg_frame)(ir_graph *irg, ir_node *node) { - _set_irg_frame(irg, node); +void (set_irg_initial_exec)(ir_graph *irg, ir_node *node) +{ + _set_irg_initial_exec(irg, node); } -ir_node * -(get_irg_globals)(const ir_graph *irg) { - return _get_irg_globals(irg); +ir_node *(get_irg_frame)(const ir_graph *irg) +{ + return _get_irg_frame(irg); } -void -(set_irg_globals)(ir_graph *irg, ir_node *node) { - _set_irg_globals(irg, node); +void (set_irg_frame)(ir_graph *irg, ir_node *node) +{ + _set_irg_frame(irg, node); } -ir_node * -(get_irg_tls)(const ir_graph *irg) { +ir_node *(get_irg_tls)(const ir_graph *irg) +{ return _get_irg_tls(irg); } -void -(set_irg_tls)(ir_graph *irg, ir_node *node) { +void (set_irg_tls)(ir_graph *irg, ir_node *node) +{ _set_irg_tls(irg, node); } -ir_node * -(get_irg_initial_mem)(const ir_graph *irg) { +ir_node *(get_irg_initial_mem)(const ir_graph *irg) +{ return _get_irg_initial_mem(irg); } -void -(set_irg_initial_mem)(ir_graph *irg, ir_node *node) { +void (set_irg_initial_mem)(ir_graph *irg, ir_node *node) +{ _set_irg_initial_mem(irg, node); } -ir_node * -(get_irg_args)(const ir_graph *irg) { +ir_node *(get_irg_args)(const ir_graph *irg) +{ return _get_irg_args(irg); } -void -(set_irg_args)(ir_graph *irg, ir_node *node) { +void (set_irg_args)(ir_graph *irg, ir_node *node) +{ _set_irg_args(irg, node); } -ir_node * -(get_irg_value_param_base)(const ir_graph *irg) { - return _get_irg_value_param_base(irg); -} - -void -(set_irg_value_param_base)(ir_graph *irg, ir_node *node) { - _set_irg_value_param_base(irg, node); -} - -ir_node * -(get_irg_bad)(const ir_graph *irg) { +ir_node *(get_irg_bad)(const ir_graph *irg) +{ return _get_irg_bad(irg); } -void -(set_irg_bad)(ir_graph *irg, ir_node *node) { +void (set_irg_bad)(ir_graph *irg, ir_node *node) +{ _set_irg_bad(irg, node); } -ir_node * -(get_irg_no_mem)(const ir_graph *irg) { +ir_node *(get_irg_no_mem)(const ir_graph *irg) +{ return _get_irg_no_mem(irg); } -void -(set_irg_no_mem)(ir_graph *irg, ir_node *node) { +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) { +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) { +void (set_irg_current_block)(ir_graph *irg, ir_node *node) +{ _set_irg_current_block(irg, node); } -ir_entity * -(get_irg_entity)(const ir_graph *irg) { +ir_entity *(get_irg_entity)(const ir_graph *irg) +{ return _get_irg_entity(irg); } -void -(set_irg_entity)(ir_graph *irg, ir_entity *ent) { +void (set_irg_entity)(ir_graph *irg, ir_entity *ent) +{ _set_irg_entity(irg, ent); } -ir_type * -(get_irg_frame_type)(ir_graph *irg) { +ir_type *(get_irg_frame_type)(ir_graph *irg) +{ return _get_irg_frame_type(irg); } -void -(set_irg_frame_type)(ir_graph *irg, ir_type *ftp) { +void (set_irg_frame_type)(ir_graph *irg, ir_type *ftp) +{ _set_irg_frame_type(irg, ftp); } -int -get_irg_n_locs(ir_graph *irg) { - if (get_opt_precise_exc_context()) - return irg->n_loc - 1 - 1; - else - return irg->n_loc - 1; +/* 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); } -void -set_irg_n_loc(ir_graph *irg, int n_loc) { +int get_irg_n_locs(ir_graph *irg) +{ if (get_opt_precise_exc_context()) - irg->n_loc = n_loc + 1 + 1; + return irg->n_loc - 1 - 1; else - irg->n_loc = n_loc + 1; + return irg->n_loc - 1; } - - /* Returns the obstack associated with the graph. */ struct obstack * (get_irg_obstack)(const ir_graph *irg) { @@ -767,7 +749,8 @@ struct obstack * * * 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(ir_graph *irg, ir_node *n) +{ struct _obstack_chunk *p; /* @@ -782,72 +765,73 @@ 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) { +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) { +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) { +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) { +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) { +void (set_irg_outs_inconsistent)(ir_graph *irg) +{ _set_irg_outs_inconsistent(irg); } -irg_extblk_state -(get_irg_extblk_state)(const ir_graph *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) { +void (set_irg_extblk_inconsistent)(ir_graph *irg) +{ _set_irg_extblk_inconsistent(irg); } -irg_dom_state -(get_irg_dom_state)(const ir_graph *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) { +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) { +void (set_irg_doms_inconsistent)(ir_graph *irg) +{ _set_irg_doms_inconsistent(irg); } -irg_loopinfo_state -(get_irg_loopinfo_state)(const ir_graph *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) { +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) { +void (set_irg_loopinfo_inconsistent)(ir_graph *irg) +{ _set_irg_loopinfo_inconsistent(irg); } -void set_irp_loopinfo_inconsistent(void) { +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)); @@ -856,135 +840,124 @@ void set_irp_loopinfo_inconsistent(void) { -void -(set_irg_pinned)(ir_graph *irg, op_pin_state p) { +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) { +irg_callee_info_state (get_irg_callee_info_state)(const ir_graph *irg) +{ return _get_irg_callee_info_state(irg); } -void -(set_irg_callee_info_state)(ir_graph *irg, irg_callee_info_state s) { +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) { +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) { +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) { +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) { +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) { +void (set_irg_additional_property)(ir_graph *irg, mtp_additional_property flag) +{ _set_irg_additional_property(irg, flag); } -void -(set_irg_link)(ir_graph *irg, void *thing) { +void (set_irg_link)(ir_graph *irg, void *thing) +{ _set_irg_link(irg, thing); } -void * -(get_irg_link)(const ir_graph *irg) { +void *(get_irg_link)(const ir_graph *irg) +{ return _get_irg_link(irg); } -unsigned long -(get_irg_visited)(const ir_graph *irg) { +ir_visited_t (get_irg_visited)(const ir_graph *irg) +{ return _get_irg_visited(irg); } -#ifdef INTERPROCEDURAL_VIEW /** maximum visited flag content of all ir_graph visited fields. */ -static unsigned long max_irg_visited = 0; -#endif /* INTERPROCEDURAL_VIEW */ +static ir_visited_t max_irg_visited = 0; -void -set_irg_visited(ir_graph *irg, unsigned long visited) { +void set_irg_visited(ir_graph *irg, ir_visited_t visited) +{ irg->visited = visited; -#ifdef INTERPROCEDURAL_VIEW if (irg->visited > max_irg_visited) { max_irg_visited = irg->visited; } -#endif /* INTERPROCEDURAL_VIEW */ } -void -inc_irg_visited(ir_graph *irg) { -#ifdef INTERPROCEDURAL_VIEW - if (++irg->visited > max_irg_visited) { +void inc_irg_visited(ir_graph *irg) +{ + ++irg->visited; + if (irg->visited > max_irg_visited) { max_irg_visited = irg->visited; } -#else - ++irg->visited; -#endif /* INTERPROCEDURAL_VIEW */ } -#ifdef INTERPROCEDURAL_VIEW -unsigned long -get_max_irg_visited(void) { - /* - int i; - for(i = 0; i < get_irp_n_irgs(); i++) - assert(max_irg_visited >= get_irg_visited(get_irp_irg(i))); - */ +ir_visited_t get_max_irg_visited(void) +{ return max_irg_visited; } -void set_max_irg_visited(int val) { +void set_max_irg_visited(int val) +{ max_irg_visited = val; } -unsigned long -inc_max_irg_visited(void) { - /* +ir_visited_t inc_max_irg_visited(void) +{ +#ifndef NDEBUG int i; - for(i = 0; i < get_irp_n_irgs(); i++) - assert(max_irg_visited >= get_irg_visited(get_irp_irg(i))); - */ + for (i = 0; i < get_irp_n_irgs(); i++) + assert(max_irg_visited >= get_irg_visited(get_irp_irg(i))); +#endif return ++max_irg_visited; } -#endif /* INTERPROCEDURAL_VIEW */ -unsigned long -(get_irg_block_visited)(const ir_graph *irg) { +ir_visited_t (get_irg_block_visited)(const ir_graph *irg) +{ return _get_irg_block_visited(irg); } -void -(set_irg_block_visited)(ir_graph *irg, unsigned long visited) { +void (set_irg_block_visited)(ir_graph *irg, ir_visited_t visited) +{ _set_irg_block_visited(irg, visited); } -void -(inc_irg_block_visited)(ir_graph *irg) { +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) { +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) { +void set_irg_fp_model(ir_graph *irg, unsigned model) +{ irg->fp_model = model; } @@ -995,7 +968,8 @@ void set_irg_fp_model(ir_graph *irg, unsigned model) { * @param n the node * @param env ignored */ -static void normalize_proj_walker(ir_node *n, void *env) { +static void normalize_proj_walker(ir_node *n, void *env) +{ (void) env; if (is_Proj(n)) { ir_node *pred = get_Proj_pred(n); @@ -1006,85 +980,85 @@ static void normalize_proj_walker(ir_node *n, void *env) { } /* move Proj nodes into the same block as its predecessors */ -void normalize_proj_nodes(ir_graph *irg) { +void normalize_proj_nodes(ir_graph *irg) +{ irg_walk_graph(irg, NULL, normalize_proj_walker, NULL); set_irg_outs_inconsistent(irg); } /* set a description for local value n */ -void set_irg_loc_description(ir_graph *irg, int n, void *description) { +void set_irg_loc_description(ir_graph *irg, int n, void *description) +{ assert(0 <= n && n < irg->n_loc); if (! irg->loc_descriptions) - irg->loc_descriptions = xcalloc(sizeof(*irg->loc_descriptions), irg->n_loc); + irg->loc_descriptions = XMALLOCNZ(void*, irg->n_loc); irg->loc_descriptions[n] = description; } /* get the description for local value n */ -void *get_irg_loc_description(ir_graph *irg, int 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; } -#ifndef NDEBUG -void set_using_block_visited(ir_graph *irg) { - assert(irg->using_block_visited == 0); - irg->using_block_visited = 1; +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 clear_using_block_visited(ir_graph *irg) { - assert(irg->using_block_visited == 1); - irg->using_block_visited = 0; -} - -int using_block_visited(const ir_graph *irg) { - return irg->using_block_visited; -} - - -void set_using_irn_visited(ir_graph *irg) { - assert(irg->using_irn_visited == 0); - irg->using_irn_visited = 1; -} +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; -void clear_using_irn_visited(ir_graph *irg) { - assert(irg->using_irn_visited == 1); - irg->using_irn_visited = 0; -} - -int using_irn_visited(const ir_graph *irg) { - return irg->using_irn_visited; + phase_free(phase); + irg->phases[p] = NULL; + } } - -void set_using_irn_link(ir_graph *irg) { - assert(irg->using_irn_link == 0); - irg->using_irn_link = 1; +#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; } -void clear_using_irn_link(ir_graph *irg) { - assert(irg->using_irn_link == 1); - irg->using_irn_link = 0; +void ir_free_resources(ir_graph *irg, ir_resources_t resources) +{ + assert((irg->reserved_resources & resources) == resources); + irg->reserved_resources &= ~resources; } -int using_irn_link(const ir_graph *irg) { - return irg->using_irn_link; +ir_resources_t ir_resources_reserved(const ir_graph *irg) +{ + return irg->reserved_resources; } -#endif +#endif /* NDEBUG */ /* Returns a estimated node count of the irg. */ -unsigned (get_irg_estimated_node_cnt)(const ir_graph *irg) { +unsigned (get_irg_estimated_node_cnt)(const ir_graph *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) { +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) { +size_t register_additional_graph_data(size_t size) +{ assert(!forbid_new_data && "Too late to register additional node data"); if (forbid_new_data) @@ -1092,3 +1066,18 @@ 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) +{ + _set_irg_state(irg, state); +} + +void (clear_irg_state)(ir_graph *irg, ir_graph_state_t state) +{ + _clear_irg_state(irg, state); +} + +int (is_irg_state)(const ir_graph *irg, ir_graph_state_t state) +{ + return _is_irg_state(irg, state); +}