X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgraph_t.h;h=d96bc2cca2f61499b129102ce96b13ec483b7910;hb=a5c804d0096b70e513d11c7770e15acd76b070ef;hp=05a3e0c968e780185c6b9db91ced0aabd4116b4d;hpb=0b7701da2342d425ae50f5dd23ddb4d3cc7572fd;p=libfirm diff --git a/ir/ir/irgraph_t.h b/ir/ir/irgraph_t.h index 05a3e0c96..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" @@ -55,32 +56,32 @@ 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 + 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 -- */ @@ -89,9 +90,10 @@ struct ir_graph { /* -- 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_loopinfo_state loopinfo_state; /**< state of loop information */ @@ -110,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 */ #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. */ @@ -141,7 +143,7 @@ struct ir_graph { 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 @@ -346,14 +348,14 @@ _set_irg_entity(ir_graph *irg, entity *ent) { irg->ent = ent; } -static INLINE type * +static INLINE ir_type * _get_irg_frame_type(ir_graph *irg) { assert(irg && 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; } @@ -376,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 @@ -390,14 +392,33 @@ _set_irg_outs_inconsistent(ir_graph *irg) { 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 _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 @@ -417,7 +438,7 @@ _set_irg_loopinfo_inconsistent(ir_graph *irg) { 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 @@ -543,8 +564,11 @@ _get_irg_estimated_node_cnt(const ir_graph *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 set_irg_dom_inconsistent(irg) _set_irg_dom_inconsistent(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)