X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgraph_t.h;h=da43d0258898ecc7a5d78e2db207b5f1f7f792b6;hb=95ea45b6d9050f3638c68dda8c4fcc92a79c81ed;hp=ef3b38fe1cfca6bc378ff78014793277ed022ff0;hpb=1827aba4e571901d9f173b104d783324b27f9b3e;p=libfirm diff --git a/ir/ir/irgraph_t.h b/ir/ir/irgraph_t.h index ef3b38fe1..da43d0258 100644 --- a/ir/ir/irgraph_t.h +++ b/ir/ir/irgraph_t.h @@ -51,35 +51,39 @@ typedef struct _irg_edge_info_t { unsigned activated : 1; } irg_edge_info_t; +/** + * Index constants for nodes that can be accessed through the graph itself. + */ +enum irg_anchors { + anchor_start_block = 0, /**< block the start node will belong to */ + anchor_start, /**< start node of this ir_graph */ + anchor_end_block, /**< block the end node will belong to */ + anchor_end, /**< end node of this ir_graph */ + anchor_end_reg, /**< end node of this ir_graph */ + anchor_end_except, /**< end node of this ir_graph */ + anchor_cstore, /**< constant store -- no more needed!! */ + anchor_frame, /**< method's frame */ + anchor_globals, /**< pointer to the data segment containing all + globals as well as global procedures. */ + anchor_initial_mem, /**< initial memory of this graph */ + anchor_args, /**< methods arguments */ + anchor_bad, /**< bad node of this ir_graph, the one and + only in this graph */ + anchor_no_mem, /**< NoMem node of this ir_graph, the one and only in this graph */ + anchor_max +}; /** ir_graph holds all information for a procedure */ 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. */ - 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 */ + ir_type *frame_type; /**< A class type representing the stack frame. + Can include "inner" methods. */ + ir_node *anchors[anchor_max]; /**< anchor nodes */ + ir_node **proj_args; /**< projs of the methods arguments */ struct obstack *obst; /**< obstack where all of the ir_nodes live */ ir_node *current_block; /**< block for newly gen_*()-erated ir_nodes */ struct obstack *extbb_obst; /**< obstack for extended basic block info */ @@ -92,7 +96,8 @@ struct ir_graph { irg_phase_state phase_state; /**< compiler phase */ 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 */ @@ -111,12 +116,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. */ @@ -142,7 +147,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 @@ -199,102 +204,102 @@ _is_ir_graph(const void *thing) { /** Returns the start block of a graph. */ static INLINE ir_node * _get_irg_start_block(const ir_graph *irg) { - return irg->start_block; + return irg->anchors[anchor_start_block]; } static INLINE void _set_irg_start_block(ir_graph *irg, ir_node *node) { - irg->start_block = node; + irg->anchors[anchor_start_block] = node; } static INLINE ir_node * _get_irg_start(const ir_graph *irg) { - return irg->start; + return irg->anchors[anchor_start]; } static INLINE void _set_irg_start(ir_graph *irg, ir_node *node) { - irg->start = node; + irg->anchors[anchor_start] = node; } static INLINE ir_node * _get_irg_end_block(const ir_graph *irg) { - return irg->end_block; + return irg->anchors[anchor_end_block]; } static INLINE void _set_irg_end_block(ir_graph *irg, ir_node *node) { - irg->end_block = node; + irg->anchors[anchor_end_block] = node; } static INLINE ir_node * _get_irg_end(const ir_graph *irg) { - return irg->end; + return irg->anchors[anchor_end]; } static INLINE void _set_irg_end(ir_graph *irg, ir_node *node) { - irg->end = node; + irg->anchors[anchor_end] = node; } static INLINE ir_node * _get_irg_end_reg(const ir_graph *irg) { - return irg->end_reg; + return irg->anchors[anchor_end_reg]; } static INLINE ir_node * _get_irg_end_except (const ir_graph *irg) { - return irg->end_except; + return irg->anchors[anchor_end_except]; } static INLINE ir_node * _get_irg_cstore(const ir_graph *irg) { - return irg->cstore; + return irg->anchors[anchor_cstore]; } static INLINE void _set_irg_cstore(ir_graph *irg, ir_node *node) { - irg->cstore = node; + irg->anchors[anchor_cstore] = node; } static INLINE ir_node * _get_irg_frame(const ir_graph *irg) { - return irg->frame; + return irg->anchors[anchor_frame]; } static INLINE void _set_irg_frame(ir_graph *irg, ir_node *node) { - irg->frame = node; + irg->anchors[anchor_frame] = node; } static INLINE ir_node * _get_irg_globals(const ir_graph *irg) { - return irg->globals; + return irg->anchors[anchor_globals]; } static INLINE void _set_irg_globals(ir_graph *irg, ir_node *node) { - irg->globals = node; + irg->anchors[anchor_globals] = node; } static INLINE ir_node * _get_irg_initial_mem(const ir_graph *irg) { - return irg->initial_mem; + return irg->anchors[anchor_initial_mem]; } static INLINE void _set_irg_initial_mem(ir_graph *irg, ir_node *node) { - irg->initial_mem = node; + irg->anchors[anchor_initial_mem] = node; } static INLINE ir_node * _get_irg_args(const ir_graph *irg) { - return irg->args; + return irg->anchors[anchor_args]; } static INLINE void _set_irg_args(ir_graph *irg, ir_node *node) { - irg->args = node; + irg->anchors[anchor_args] = node; } static INLINE ir_node ** @@ -309,22 +314,22 @@ _set_irg_proj_args(ir_graph *irg, ir_node **nodes) { static INLINE ir_node * _get_irg_bad(const ir_graph *irg) { - return irg->bad; + return irg->anchors[anchor_bad]; } static INLINE void _set_irg_bad(ir_graph *irg, ir_node *node) { - irg->bad = node; + irg->anchors[anchor_bad] = node; } static INLINE ir_node * _get_irg_no_mem(const ir_graph *irg) { - return irg->no_mem; + return irg->anchors[anchor_no_mem]; } static INLINE void _set_irg_no_mem(ir_graph *irg, ir_node *node) { - irg->no_mem = node; + irg->anchors[anchor_no_mem] = node; } static INLINE ir_node * _get_irg_current_block(const ir_graph *irg) { @@ -347,15 +352,15 @@ _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) { - assert(is_Class_type(ftp)); +_set_irg_frame_type(ir_graph *irg, ir_type *ftp) { + assert(is_frame_type(ftp)); irg->frame_type = ftp; } @@ -371,8 +376,8 @@ _get_irg_phase_state(const ir_graph *irg) { } static INLINE void -_set_irg_phase_low(ir_graph *irg) { - irg->phase_state = phase_low; +_set_irg_phase_state(ir_graph *irg, irg_phase_state state) { + irg->phase_state = state; } static INLINE op_pin_state @@ -391,14 +396,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 @@ -540,12 +564,15 @@ _get_irg_estimated_node_cnt(const ir_graph *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 set_irg_phase_state(irg, state) _set_irg_phase_state(irg, state) #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)