X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgraph_t.h;h=d96bc2cca2f61499b129102ce96b13ec483b7910;hb=a5c804d0096b70e513d11c7770e15acd76b070ef;hp=622d89f50c5fc2568d627213fdfe17abcdb83b70;hpb=117757dc1040d09bac419950ed2cc07f0d38d2c4;p=libfirm diff --git a/ir/ir/irgraph_t.h b/ir/ir/irgraph_t.h index 622d89f50..d96bc2cca 100644 --- a/ir/ir/irgraph_t.h +++ b/ir/ir/irgraph_t.h @@ -22,6 +22,7 @@ #ifndef _IRGRAPH_T_H_ #define _IRGRAPH_T_H_ +#include "firm_types.h" #include "irgraph.h" #include "firm_common_t.h" @@ -29,6 +30,9 @@ #include "irprog.h" #include "pseudo_irg.h" #include "type_t.h" +#include "entity_t.h" +#include "typegmod.h" +#include "tr_inheritance.h" #include "irloop.h" #include "execution_frequency.h" @@ -52,44 +56,50 @@ typedef struct _irg_edge_info_t { struct ir_graph { firm_kind kind; /**< always set to k_ir_graph*/ /* -- Basics of the representation -- */ - struct entity *ent; /**< The entity of this procedure, i.e., + entity *ent; /**< The entity of this procedure, i.e., the type of the procedure and the class it belongs to. */ - struct type *frame_type; /**< A class type representing the stack frame. - Can include "inner" methods. */ - struct ir_node *start_block; /**< block the start node will belong to */ - struct ir_node *start; /**< start node of this ir_graph */ - struct ir_node *end_block; /**< block the end node will belong to */ - struct ir_node *end; /**< end node of this ir_graph */ - struct ir_node *end_reg; /**< end node of this ir_graph */ - struct ir_node *end_except; /**< end node of this ir_graph */ - struct ir_node *cstore; /**< constant store -- no more needed!! */ - struct ir_node *frame; /**< method's frame */ - struct ir_node *globals; /**< pointer to the data segment containing all - globals as well as global procedures. */ - struct ir_node *initial_mem; /**< initial memory of this graph */ - struct ir_node *args; /**< methods arguments */ - struct ir_node **proj_args; /**< projs of the methods arguments */ - struct ir_node *bad; /**< bad node of this ir_graph, the one and - only in this graph */ - struct ir_node *no_mem; /**< NoMem node of this ir_graph, the one and - only in this graph */ + ir_type *frame_type; /**< A class type representing the stack frame. + Can include "inner" methods. */ + ir_node *start_block; /**< block the start node will belong to */ + ir_node *start; /**< start node of this ir_graph */ + ir_node *end_block; /**< block the end node will belong to */ + ir_node *end; /**< end node of this ir_graph */ + ir_node *end_reg; /**< end node of this ir_graph */ + ir_node *end_except; /**< end node of this ir_graph */ + ir_node *cstore; /**< constant store -- no more needed!! */ + ir_node *frame; /**< method's frame */ + ir_node *globals; /**< pointer to the data segment containing all + globals as well as global procedures. */ + ir_node *initial_mem; /**< initial memory of this graph */ + ir_node *args; /**< methods arguments */ + ir_node **proj_args; /**< projs of the methods arguments */ + ir_node *bad; /**< bad node of this ir_graph, the one and + only in this graph */ + ir_node *no_mem; /**< NoMem node of this ir_graph, the one and + only in this graph */ /* GL removed: we need unknown with mode for analyses. */ /* struct ir_node *unknown;*/ /**< unknown node of this ir_graph */ struct obstack *obst; /**< obstack where all of the ir_nodes live */ - struct ir_node *current_block; /**< block for newly gen_*()-erated - ir_nodes */ + ir_node *current_block; /**< block for newly gen_*()-erated ir_nodes */ + struct obstack *extbb_obst; /**< obstack for extended basic block info */ + + /* -- Fields for graph properties -- */ + irg_inline_property inline_property; /**< How to handle inlineing. */ + unsigned additional_properties; /**< additional graph properties. */ /* -- Fields indicating different states of irgraph -- */ irg_phase_state phase_state; /**< compiler phase */ - op_pin_state op_pin_state_pinned; /**< Flag for status of nodes */ + op_pin_state irg_pinned_state; /**< Flag for status of nodes */ irg_outs_state outs_state; /**< Out edges. */ - irg_dom_state dom_state; /**< Dominator information */ + irg_dom_state dom_state; /**< Dominator state information */ + irg_dom_state pdom_state; /**< Post Dominator state information */ ir_typeinfo_state typeinfo_state; /**< Validity of type information */ irg_callee_info_state callee_info_state; /**< Validity of callee information */ - irg_inline_property inline_property; /**< How to handle inlineing. */ irg_loopinfo_state loopinfo_state; /**< state of loop information */ - exec_freq_state execfreq_state; /**< state of execution freqency information */ + exec_freq_state execfreq_state; /**< state of execution frequency information */ + ir_class_cast_state class_cast_state; /**< kind of cast operations in code. */ + irg_extblk_info_state extblk_state; /**< state of extended basic block info */ /* -- Fields for construction -- */ #if USE_EXPLICIT_PHI_IN_STACK @@ -102,12 +112,12 @@ struct ir_graph { /* -- Fields for optimizations / analysis information -- */ pset *value_table; /**< hash table for global value numbering (cse) for optimizing use in iropt.c */ - struct ir_node **outs; /**< Space for the out arrays. */ + ir_node **outs; /**< Space for the out arrays. */ #ifdef DEBUG_libfirm - int n_outs; /* < Size wasted for outs */ + int n_outs; /**< Size wasted for outs */ #endif /* defined DEBUG_libfirm */ - struct ir_loop *loop; /**< The outermost loop */ + ir_loop *loop; /**< The outermost loop */ void *link; /**< A void* field to link any information to the node. */ @@ -127,20 +137,22 @@ struct ir_graph { every time someone walks through the graph */ unsigned long block_visited; /**< same as visited, for a complete block */ + unsigned estimated_node_count; /**< estimated number of nodes in this graph, + updated after every walk */ +#if FIRM_EDGES_INPLACE + irg_edge_info_t edge_info; /**< edge info for automatic outs */ +#endif #ifdef DEBUG_libfirm - int graph_nr; /**< a unique graph number for each graph to make output + long graph_nr; /**< a unique graph number for each graph to make output readable. */ #endif -#if FIRM_EDGES_INPLACE - irg_edge_info_t edge_info; /**< edge info for automatic outs */ -#endif }; /** * Initializes the graph construction module */ -void init_irgraph(void); +void firm_init_irgraph(void); /* Internal constructor that does not add to irp_irgs or the like. */ ir_graph *new_r_ir_graph (entity *ent, int n_loc); @@ -173,11 +185,11 @@ int node_is_in_irgs_storage(ir_graph *irg, ir_node *n); /* inline functions for graphs */ /*-------------------------------------------------------------------*/ -extern int __interprocedural_view; +extern int firm_interprocedural_view; static INLINE int _get_interprocedural_view(void) { - return __interprocedural_view; + return firm_interprocedural_view; } static INLINE int @@ -336,14 +348,14 @@ _set_irg_entity(ir_graph *irg, entity *ent) { irg->ent = ent; } -static INLINE type * -_get_irg_frame_type(const ir_graph *irg) { +static INLINE ir_type * +_get_irg_frame_type(ir_graph *irg) { assert(irg && irg->frame_type); - return irg->frame_type; + return irg->frame_type = skip_tid(irg->frame_type); } static INLINE void -_set_irg_frame_type(ir_graph *irg, type *ftp) { +_set_irg_frame_type(ir_graph *irg, ir_type *ftp) { assert(is_Class_type(ftp)); irg->frame_type = ftp; } @@ -366,7 +378,7 @@ _set_irg_phase_low(ir_graph *irg) { static INLINE op_pin_state _get_irg_pinned(const ir_graph *irg) { - return irg->op_pin_state_pinned; + return irg->irg_pinned_state; } static INLINE irg_outs_state @@ -376,7 +388,19 @@ _get_irg_outs_state(const ir_graph *irg) { static INLINE void _set_irg_outs_inconsistent(ir_graph *irg) { - irg->outs_state = outs_inconsistent; + if (irg->outs_state == outs_consistent) + irg->outs_state = outs_inconsistent; +} + +static INLINE irg_extblk_state +_get_irg_extblk_state(const ir_graph *irg) { + return irg->extblk_state; +} + +static INLINE void +_set_irg_extblk_inconsistent(ir_graph *irg) { + if (irg->extblk_state == extblk_valid) + irg->extblk_state = extblk_invalid; } static INLINE irg_dom_state @@ -384,9 +408,17 @@ _get_irg_dom_state(const ir_graph *irg) { return irg->dom_state; } +static INLINE irg_dom_state +_get_irg_postdom_state(const ir_graph *irg) { + return irg->pdom_state; +} + static INLINE void -_set_irg_dom_inconsistent(ir_graph *irg) { - irg->dom_state = dom_inconsistent; +_set_irg_doms_inconsistent(ir_graph *irg) { + if (irg->dom_state != dom_none) + irg->dom_state = dom_inconsistent; + if (irg->pdom_state != dom_none) + irg->pdom_state = dom_inconsistent; } static INLINE irg_loopinfo_state @@ -399,9 +431,14 @@ _set_irg_loopinfo_state(ir_graph *irg, irg_loopinfo_state s) { irg->loopinfo_state = s; } +static INLINE void +_set_irg_loopinfo_inconsistent(ir_graph *irg) { + irg->loopinfo_state &= ~loopinfo_valid; +} + static INLINE void _set_irg_pinned(ir_graph *irg, op_pin_state p) { - irg->op_pin_state_pinned = p; + irg->irg_pinned_state = p; } static INLINE irg_callee_info_state @@ -431,6 +468,29 @@ _set_irg_inline_property(ir_graph *irg, irg_inline_property s) { irg->inline_property = s; } +static INLINE unsigned +_get_irg_additional_properties(const ir_graph *irg) { + if (irg->additional_properties & mtp_property_inherited) + return get_method_additional_properties(get_entity_type(irg->ent)); + return irg->additional_properties; +} + +static INLINE void +_set_irg_additional_properties(ir_graph *irg, unsigned mask) { + /* do not allow to set the mtp_property_inherited flag or + * the automatic inheritance of flags will not work */ + irg->additional_properties = mask & ~mtp_property_inherited; +} + +static INLINE void +_set_irg_additional_property(ir_graph *irg, mtp_additional_property flag) { + unsigned prop = irg->additional_properties; + + if (prop & mtp_property_inherited) + prop = get_method_additional_properties(get_entity_type(irg->ent)); + irg->additional_properties = prop | flag; +} + static INLINE void _set_irg_link(ir_graph *irg, void *thing) { irg->link = thing; @@ -461,58 +521,71 @@ _inc_irg_block_visited(ir_graph *irg) { ++irg->block_visited; } -#define get_interprocedural_view() _get_interprocedural_view() -#define is_ir_graph(thing) _is_ir_graph(thing) -#define get_irg_start_block(irg) _get_irg_start_block(irg) -#define set_irg_start_block(irg, node) _set_irg_start_block(irg, node) -#define get_irg_start(irg) _get_irg_start(irg) -#define set_irg_start(irg, node) _set_irg_start(irg, node) -#define get_irg_end_block(irg) _get_irg_end_block(irg) -#define set_irg_end_block(irg, node) _set_irg_end_block(irg, node) -#define get_irg_end(irg) _get_irg_end(irg) -#define set_irg_end(irg, node) _set_irg_end(irg, node) -#define get_irg_end_reg(irg) _get_irg_end_reg(irg) -#define get_irg_end_except(irg) _get_irg_end_except(irg) -#define get_irg_cstore(irg) _get_irg_cstore(irg) -#define set_irg_cstore(irg, node) _set_irg_cstore(irg, node) -#define get_irg_frame(irg) _get_irg_frame(irg) -#define set_irg_frame(irg, node) _set_irg_frame(irg, node) -#define get_irg_globals(irg) _get_irg_globals(irg) -#define set_irg_globals(irg, node) _set_irg_globals(irg, node) -#define get_irg_initial_mem(irg) _get_irg_initial_mem(irg) -#define set_irg_initial_mem(irg, node) _set_irg_initial_mem(irg, node) -#define get_irg_args(irg) _get_irg_args(irg) -#define set_irg_args(irg, node) _set_irg_args(irg, node) -#define get_irg_bad(irg) _get_irg_bad(irg) -#define set_irg_bad(irg, node) _set_irg_bad(irg, node) -#define get_irg_no_mem(irg) _get_irg_no_mem(irg) -#define set_irg_no_mem(irg, node) _set_irg_no_mem(irg, node) -#define get_irg_current_block(irg) _get_irg_current_block(irg) -#define set_irg_current_block(irg, node) _set_irg_current_block(irg, node) -#define get_irg_entity(irg) _get_irg_entity(irg) -#define set_irg_entity(irg, ent) _set_irg_entity(irg, ent) -#define get_irg_frame_type(irg) _get_irg_frame_type(irg) -#define set_irg_frame_type(irg, ftp) _set_irg_frame_type(irg, ftp) -#define get_irg_obstack(irg) _get_irg_obstack(irg) -#define get_irg_phase_state(irg) _get_irg_phase_state(irg) -#define set_irg_phase_low(irg) _set_irg_phase_low(irg) -#define get_irg_pinned(irg) _get_irg_pinned(irg) -#define get_irg_outs_state(irg) _get_irg_outs_state(irg) -#define set_irg_outs_inconsistent(irg) _set_irg_outs_inconsistent(irg) -#define get_irg_dom_state(irg) _get_irg_dom_state(irg) -#define set_irg_dom_inconsistent(irg) _set_irg_dom_inconsistent(irg) -#define get_irg_loopinfo_state(irg) _get_irg_loopinfo_state(irg) -#define set_irg_loopinfo_state(irg, s) _set_irg_loopinfo_state(irg, s) -#define set_irg_pinned(irg, p) _set_irg_pinned(irg, p) -#define get_irg_callee_info_state(irg) _get_irg_callee_info_state(irg) -#define set_irg_callee_info_state(irg, s) _set_irg_callee_info_state(irg, s) -#define get_irg_inline_property(irg) _get_irg_inline_property(irg) -#define set_irg_inline_property(irg, s) _set_irg_inline_property(irg, s) -#define set_irg_link(irg, thing) _set_irg_link(irg, thing) -#define get_irg_link(irg) _get_irg_link(irg) -#define get_irg_visited(irg) _get_irg_visited(irg) -#define get_irg_block_visited(irg) _get_irg_block_visited(irg) -#define set_irg_block_visited(irg, v) _set_irg_block_visited(irg, v) -#define inc_irg_block_visited(irg) _inc_irg_block_visited(irg) +static INLINE unsigned +_get_irg_estimated_node_cnt(const ir_graph *irg) { + return irg->estimated_node_count; +} + +#define get_interprocedural_view() _get_interprocedural_view() +#define is_ir_graph(thing) _is_ir_graph(thing) +#define get_irg_start_block(irg) _get_irg_start_block(irg) +#define set_irg_start_block(irg, node) _set_irg_start_block(irg, node) +#define get_irg_start(irg) _get_irg_start(irg) +#define set_irg_start(irg, node) _set_irg_start(irg, node) +#define get_irg_end_block(irg) _get_irg_end_block(irg) +#define set_irg_end_block(irg, node) _set_irg_end_block(irg, node) +#define get_irg_end(irg) _get_irg_end(irg) +#define set_irg_end(irg, node) _set_irg_end(irg, node) +#define get_irg_end_reg(irg) _get_irg_end_reg(irg) +#define get_irg_end_except(irg) _get_irg_end_except(irg) +#define get_irg_cstore(irg) _get_irg_cstore(irg) +#define set_irg_cstore(irg, node) _set_irg_cstore(irg, node) +#define get_irg_frame(irg) _get_irg_frame(irg) +#define set_irg_frame(irg, node) _set_irg_frame(irg, node) +#define get_irg_globals(irg) _get_irg_globals(irg) +#define set_irg_globals(irg, node) _set_irg_globals(irg, node) +#define get_irg_initial_mem(irg) _get_irg_initial_mem(irg) +#define set_irg_initial_mem(irg, node) _set_irg_initial_mem(irg, node) +#define get_irg_args(irg) _get_irg_args(irg) +#define set_irg_args(irg, node) _set_irg_args(irg, node) +#define get_irg_bad(irg) _get_irg_bad(irg) +#define set_irg_bad(irg, node) _set_irg_bad(irg, node) +#define get_irg_no_mem(irg) _get_irg_no_mem(irg) +#define set_irg_no_mem(irg, node) _set_irg_no_mem(irg, node) +#define get_irg_current_block(irg) _get_irg_current_block(irg) +#define set_irg_current_block(irg, node) _set_irg_current_block(irg, node) +#define get_irg_entity(irg) _get_irg_entity(irg) +#define set_irg_entity(irg, ent) _set_irg_entity(irg, ent) +#define get_irg_frame_type(irg) _get_irg_frame_type(irg) +#define set_irg_frame_type(irg, ftp) _set_irg_frame_type(irg, ftp) +#define get_irg_obstack(irg) _get_irg_obstack(irg) +#define get_irg_phase_state(irg) _get_irg_phase_state(irg) +#define set_irg_phase_low(irg) _set_irg_phase_low(irg) +#define get_irg_pinned(irg) _get_irg_pinned(irg) +#define get_irg_outs_state(irg) _get_irg_outs_state(irg) +#define set_irg_outs_inconsistent(irg) _set_irg_outs_inconsistent(irg) +#define get_irg_extblk_state(irg) _get_irg_extblk_state(irg) +#define set_irg_extblk_inconsistent(irg) _set_irg_extblk_inconsistent(irg) +#define get_irg_dom_state(irg) _get_irg_dom_state(irg) +#define get_irg_postdom_state(irg) _get_irg_postdom_state(irg) +#define set_irg_doms_inconsistent(irg) _set_irg_doms_inconsistent(irg) +#define get_irg_loopinfo_state(irg) _get_irg_loopinfo_state(irg) +#define set_irg_loopinfo_state(irg, s) _set_irg_loopinfo_state(irg, s) +#define set_irg_loopinfo_inconsistent(irg) _set_irg_loopinfo_inconsistent(irg) +#define set_irg_pinned(irg, p) _set_irg_pinned(irg, p) +#define get_irg_callee_info_state(irg) _get_irg_callee_info_state(irg) +#define set_irg_callee_info_state(irg, s) _set_irg_callee_info_state(irg, s) +#define get_irg_inline_property(irg) _get_irg_inline_property(irg) +#define set_irg_inline_property(irg, s) _set_irg_inline_property(irg, s) +#define get_irg_additional_properties(irg) _get_irg_additional_properties(irg) +#define set_irg_additional_properties(irg, m) _set_irg_additional_properties(irg, m) +#define set_irg_additional_property(irg, f) _set_irg_additional_property(irg, f) +#define set_irg_link(irg, thing) _set_irg_link(irg, thing) +#define get_irg_link(irg) _get_irg_link(irg) +#define get_irg_visited(irg) _get_irg_visited(irg) +#define get_irg_block_visited(irg) _get_irg_block_visited(irg) +#define set_irg_block_visited(irg, v) _set_irg_block_visited(irg, v) +#define inc_irg_block_visited(irg) _inc_irg_block_visited(irg) +#define get_irg_estimated_node_cnt(irg) _get_irg_estimated_node_cnt(irg) # endif /* _IRGRAPH_T_H_ */