X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgraph.c;h=810007bcb21dec3f69abbf4622cbc308f97ac299;hb=e1c33a238578342a072e1c95ff12eefe6d0acd37;hp=8c1eab796a495048c3b9f680f5f6fd3f5aab5091;hpb=348959a403356deedce9930950f502b230ad634f;p=libfirm diff --git a/ir/ir/irgraph.c b/ir/ir/irgraph.c index 8c1eab796..810007bcb 100644 --- a/ir/ir/irgraph.c +++ b/ir/ir/irgraph.c @@ -20,20 +20,24 @@ #include -# include "xmalloc.h" -# include "ircons.h" -# include "irgraph_t.h" -# include "irprog_t.h" -# include "irnode_t.h" -# include "iropt_t.h" -# include "irflag_t.h" -# include "array.h" -# include "irgmod.h" -# include "mangle.h" -# include "irouts.h" -# include "irhooks.h" -# include "irgwalk.h" -# include "iredges_t.h" +#include "xmalloc.h" +#include "ircons.h" +#include "irgraph_t.h" +#include "irprog_t.h" +#include "irnode_t.h" +#include "iropt_t.h" +#include "irflag_t.h" +#include "array.h" +#include "irgmod.h" +#include "mangle.h" +#include "irouts.h" +#include "irhooks.h" +#include "irtools.h" +#include "irgwalk.h" +#include "iredges_t.h" +#include "type_t.h" + +#define INITIAL_IDX_IRN_MAP_SIZE 1024 /** * Indicates, whether additional data can be registered to graphs. @@ -56,14 +60,14 @@ void set_current_ir_graph(ir_graph *graph) { } -int __interprocedural_view = false; +int firm_interprocedural_view = 0; int (get_interprocedural_view)(void) { return _get_interprocedural_view(); } void (set_interprocedural_view)(int state) { - __interprocedural_view = state; + firm_interprocedural_view = state; /* set function vectors for faster access */ if (state) { @@ -79,24 +83,10 @@ void (set_interprocedural_view)(int state) { /** contains the suffix for frame type names */ static ident *frame_type_suffix = NULL; -/** The default firm calling convention mask. */ -static unsigned firm_default_cc_mask = 0; - /* initialize the IR graph module */ -void firm_init_irgraph(unsigned default_cc_mask) { +void firm_init_irgraph(void) { frame_type_suffix = new_id_from_str(FRAME_TP_SUFFIX); - forbid_new_data = 1; - firm_default_cc_mask = default_cc_mask; -} - -/* Gets the default calling convention for new constructed graphs. */ -unsigned get_firm_default_calling_convention(void) { - return firm_default_cc_mask; -} - -/* Sets the default calling convention for new constructed graphs. */ -void set_firm_default_calling_convention(unsigned cc_mask) { - firm_default_cc_mask = cc_mask; + forbid_new_data = 1; } /** @@ -142,14 +132,18 @@ ir_graph * new_r_ir_graph (entity *ent, int n_loc) { ir_graph *res; - ir_node *first_block; - ir_node *projX; + ir_node *first_block; + ir_node *end, *start, *start_block, *initial_mem, *projX; res = alloc_graph(); res->kind = k_ir_graph; edges_init_graph(res); + /* 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])); + /* inform statistics here, as blocks will be already build on this graph */ hook_new_graph(res, ent); @@ -185,18 +179,21 @@ new_r_ir_graph (entity *ent, int n_loc) 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->outs = NULL; res->inline_property = irg_inline_any; - res->additional_properties = irg_no_property; + res->additional_properties = mtp_property_inherited; /* inherited from type */ res->phase_state = phase_building; - res->op_pin_state_pinned = op_pin_state_pinned; + 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; @@ -204,7 +201,6 @@ new_r_ir_graph (entity *ent, int n_loc) res->execfreq_state = exec_freq_none; res->class_cast_state = ir_class_casts_transitive; res->extblk_state = ir_extblk_info_none; - res->calling_conv = get_firm_default_calling_convention(); /*-- Type information for the procedure of the graph --*/ res->ent = ent; @@ -214,30 +210,35 @@ new_r_ir_graph (entity *ent, int n_loc) res->frame_type = new_type_frame(mangle(get_entity_ident(ent), frame_type_suffix)); /*-- Nodes needed in every graph --*/ - res->end_block = new_immBlock(); - res->end = new_End(); - res->end_reg = res->end; - res->end_except = res->end; - - res->start_block = new_immBlock(); - res->start = new_Start(); - res->bad = new_ir_node(NULL, res, res->start_block, op_Bad, mode_T, 0, NULL); - res->no_mem = new_ir_node(NULL, res, res->start_block, op_NoMem, mode_M, 0, NULL); + set_irg_end_block (res, new_immBlock()); + 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_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); /* Proj results of start node */ - projX = new_Proj (res->start, mode_X, pn_Start_X_initial_exec); - res->frame = new_Proj (res->start, mode_P_data, pn_Start_P_frame_base); - res->globals = new_Proj (res->start, mode_P_data, pn_Start_P_globals); - res->initial_mem = new_Proj (res->start, mode_M, pn_Start_M); - res->args = new_Proj (res->start, mode_T, pn_Start_T_args); + projX = new_Proj(start, mode_X, pn_Start_X_initial_exec); + 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_args (res, new_Proj(start, mode_T, pn_Start_T_args)); + 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); + #ifdef DEBUG_libfirm res->graph_nr = get_irp_new_node_nr(); #endif res->proj_args = NULL; - set_store(res->initial_mem); - - add_immBlock_pred(res->start_block, projX); /* * The code generation needs it. leave it in now. * Use of this edge is matter of discussion, unresolved. Also possible: @@ -250,6 +251,7 @@ new_r_ir_graph (entity *ent, int n_loc) add_immBlock_pred (first_block, projX); res->method_execution_frequency = -1; + res->estimated_node_count = 0; return res; } @@ -267,17 +269,21 @@ new_ir_graph (entity *ent, int n_loc) Must look like a correct irg, spare everything else. */ ir_graph *new_const_code_irg(void) { ir_graph *res; - ir_node *projX; + ir_node *end, *start_block, *start, *projX; res = alloc_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])); + /* 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->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 @@ -286,9 +292,11 @@ ir_graph *new_const_code_irg(void) { obstack_init (res->obst); res->extbb_obst = NULL; - res->phase_state = phase_building; - res->op_pin_state_pinned = op_pin_state_pinned; - res->extblk_state = ir_extblk_info_none; + res->last_node_idx = 0; + + res->phase_state = phase_building; + res->irg_pinned_state = op_pin_state_pinned; + res->extblk_state = ir_extblk_info_none; res->value_table = new_identities (); /* value table for global value numbering for optimizing use in @@ -297,33 +305,37 @@ ir_graph *new_const_code_irg(void) { res->frame_type = NULL; /* -- The end block -- */ - res->end_block = new_immBlock (); - res->end = new_End (); - res->end_reg = res->end; - res->end_except = res->end; + set_irg_end_block (res, new_immBlock()); + 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 */ /* -- The start block -- */ - res->start_block = new_immBlock (); - res->bad = new_ir_node (NULL, res, res->start_block, op_Bad, mode_T, 0, NULL); - res->no_mem = new_ir_node (NULL, res, res->start_block, op_NoMem, mode_M, 0, NULL); - res->start = new_Start (); + start_block = new_immBlock(); + 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); + /* Proj results of start node */ - res->initial_mem = new_Proj (res->start, mode_M, pn_Start_M); - projX = new_Proj (res->start, mode_X, pn_Start_X_initial_exec); - add_immBlock_pred (res->start_block, projX); - mature_immBlock (res->start_block); /* mature the start block */ + 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 */ - add_immBlock_pred (new_immBlock (), projX); - mature_immBlock (get_cur_block()); /* mature the 'body' block for expressions */ + add_immBlock_pred(new_immBlock(), projX); + mature_immBlock (get_cur_block()); /* mature the 'body' block for expressions */ /* 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_Block_block_visited(res->start_block, -1); - set_irn_visited(res->start_block, -1); - set_irn_visited(res->bad, -1); - set_irn_visited(res->no_mem, -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); res->phase_state = phase_high; @@ -354,7 +366,7 @@ void free_ir_graph (ir_graph *irg) { set_entity_peculiarity (irg->ent, pec); } - free_End(irg->end); + free_End(get_irg_end(irg)); obstack_free(irg->obst,NULL); free(irg->obst); #if USE_EXPLICIT_PHI_IN_STACK @@ -377,14 +389,12 @@ int } /* Outputs a unique number for this node */ - -long -get_irg_graph_nr(ir_graph *irg) { +long get_irg_graph_nr(ir_graph *irg) { assert(irg); #ifdef DEBUG_libfirm return irg->graph_nr; #else - return (long)irg; + return (long)PTR_TO_INT(irg); #endif } @@ -435,7 +445,7 @@ ir_node * void set_irg_end_reg (ir_graph *irg, ir_node *node) { assert(get_irn_op(node) == op_EndReg || get_irn_op(node) == op_End); - irg->end_reg = node; + irg->anchors[anchor_end_reg] = node; } ir_node * @@ -445,17 +455,7 @@ ir_node * void set_irg_end_except (ir_graph *irg, ir_node *node) { assert(get_irn_op(node) == op_EndExcept || get_irn_op(node) == op_End); - irg->end_except = node; -} - -ir_node * -(get_irg_cstore)(const ir_graph *irg) { - return _get_irg_cstore(irg); -} - -void -(set_irg_cstore)(ir_graph *irg, ir_node *node) { - _set_irg_cstore(irg, node); + irg->anchors[anchor_end_except] = node; } ir_node * @@ -548,13 +548,13 @@ void _set_irg_entity(irg, ent); } -type * +ir_type * (get_irg_frame_type)(ir_graph *irg) { return _get_irg_frame_type(irg); } void -(set_irg_frame_type)(ir_graph *irg, type *ftp) { +(set_irg_frame_type)(ir_graph *irg, ir_type *ftp) { _set_irg_frame_type(irg, ftp); } @@ -611,8 +611,8 @@ irg_phase_state } void -(set_irg_phase_low)(ir_graph *irg) { - _set_irg_phase_low(irg); +(set_irg_phase_state)(ir_graph *irg, irg_phase_state state) { + _set_irg_phase_state(irg, state); } op_pin_state @@ -630,14 +630,29 @@ void _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_dom_inconsistent)(ir_graph *irg) { - _set_irg_dom_inconsistent(irg); +(set_irg_doms_inconsistent)(ir_graph *irg) { + _set_irg_doms_inconsistent(irg); } irg_loopinfo_state @@ -700,22 +715,10 @@ void } void -(set_irg_additional_property)(ir_graph *irg, irg_additional_property flag) { +(set_irg_additional_property)(ir_graph *irg, mtp_additional_property flag) { _set_irg_additional_property(irg, flag); } -/* Returns the calling convention of a graph. */ -unsigned -(get_irg_calling_convention)(const ir_graph *irg) { - return _get_irg_calling_convention(irg); -} - -/* Sets the calling convention of a graph. */ -void -(set_irg_calling_convention)(ir_graph *irg, unsigned cc_mask) { - _set_irg_calling_convention(irg, cc_mask); -} - void (set_irg_link)(ir_graph *irg, void *thing) { _set_irg_link(irg, thing); @@ -836,6 +839,16 @@ void *get_irg_loc_description(ir_graph *irg, int n) return irg->loc_descriptions ? irg->loc_descriptions[n] : NULL; } +/* 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); +} + +/* 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) {