X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgraph_t.h;h=b431f063cc5f0fe77e1bb8502e526e7863b69352;hb=1de3ff1c7f4478924c6348f774608e60b962d055;hp=d67759f2264eb876f9ac86fd929faec72cf0086f;hpb=e36a82c5aafb53c1b28723c88db898f8ccc3e6bb;p=libfirm diff --git a/ir/ir/irgraph_t.h b/ir/ir/irgraph_t.h index d67759f22..b431f063c 100644 --- a/ir/ir/irgraph_t.h +++ b/ir/ir/irgraph_t.h @@ -93,7 +93,7 @@ struct obstack *get_irg_obstack(const ir_graph *irg); * @param irg the IR graph * @param n the IR node */ -int node_is_in_irgs_storage(ir_graph *irg, ir_node *n); +int node_is_in_irgs_storage(const ir_graph *irg, const ir_node *n); /*-------------------------------------------------------------------*/ /* inline functions for graphs */ @@ -166,16 +166,6 @@ static inline void _set_irg_frame(ir_graph *irg, ir_node *node) set_irn_n(irg->anchor, anchor_frame, node); } -static inline ir_node *_get_irg_tls(const ir_graph *irg) -{ - return get_irn_n(irg->anchor, anchor_tls); -} - -static inline void _set_irg_tls(ir_graph *irg, ir_node *node) -{ - set_irn_n(irg->anchor, anchor_tls, node); -} - static inline ir_node *_get_irg_initial_mem(const ir_graph *irg) { return get_irn_n(irg->anchor, anchor_initial_mem); @@ -196,16 +186,6 @@ static inline void _set_irg_args(ir_graph *irg, ir_node *node) set_irn_n(irg->anchor, anchor_args, node); } -static inline ir_node *_get_irg_bad(const ir_graph *irg) -{ - return get_irn_n(irg->anchor, anchor_bad); -} - -static inline void _set_irg_bad(ir_graph *irg, ir_node *node) -{ - set_irn_n(irg->anchor, anchor_bad, node); -} - static inline ir_node * _get_irg_no_mem(const ir_graph *irg) { return get_irn_n(irg->anchor, anchor_no_mem); @@ -271,15 +251,15 @@ static inline void _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) +static inline irg_extblk_info_state _get_irg_extblk_state(const ir_graph *irg) { - return irg->extblk_state; + 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; + if (irg->extblk_state == ir_extblk_info_valid) + irg->extblk_state = ir_extblk_info_invalid; } static inline irg_dom_state _get_irg_dom_state(const ir_graph *irg) @@ -312,7 +292,7 @@ static inline void _set_irg_loopinfo_state(ir_graph *irg, irg_loopinfo_state s) static inline void _set_irg_loopinfo_inconsistent(ir_graph *irg) { - irg->loopinfo_state &= ~loopinfo_valid; + irg->loopinfo_state = (irg_loopinfo_state) (irg->loopinfo_state & ~loopinfo_valid); } static inline void _set_irg_pinned(ir_graph *irg, op_pin_state p) @@ -347,21 +327,21 @@ static inline void _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) +static inline mtp_additional_properties _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) +static inline void _set_irg_additional_properties(ir_graph *irg, mtp_additional_properties mask) { irg->additional_properties = mask & ~mtp_property_inherited; } -static inline void _set_irg_additional_property(ir_graph *irg, mtp_additional_property flag) +static inline void _add_irg_additional_properties(ir_graph *irg, mtp_additional_properties flag) { - unsigned prop = irg->additional_properties; + mtp_additional_properties prop = irg->additional_properties; if (prop & mtp_property_inherited) prop = get_method_additional_properties(get_entity_type(irg->ent)); @@ -416,12 +396,12 @@ static inline unsigned _get_irg_fp_model(const ir_graph *irg) static inline void _set_irg_state(ir_graph *irg, ir_graph_state_t state) { - irg->state |= state; + irg->state = (ir_graph_state_t) (irg->state | state); } static inline void _clear_irg_state(ir_graph *irg, ir_graph_state_t state) { - irg->state &= ~state; + irg->state = (ir_graph_state_t) (irg->state & ~state); } static inline int _is_irg_state(const ir_graph *irg, ir_graph_state_t state) @@ -435,7 +415,8 @@ static inline int _is_irg_state(const ir_graph *irg, ir_graph_state_t state) * @param irn The node. * @return The index allocated for the node. */ -static inline unsigned irg_register_node_idx(ir_graph *irg, ir_node *irn) { +static inline unsigned irg_register_node_idx(ir_graph *irg, ir_node *irn) +{ unsigned idx = irg->last_node_idx++; if (idx >= (unsigned)ARR_LEN(irg->idx_irn_map)) ARR_RESIZE(ir_node *, irg->idx_irn_map, idx + 1); @@ -466,7 +447,7 @@ static inline void irg_kill_node(ir_graph *irg, ir_node *n) * @return The node with that index or NULL, if there is no node with that index. * @note The node you got might be dead. */ -static inline ir_node *_get_idx_irn(ir_graph *irg, unsigned idx) +static inline ir_node *_get_idx_irn(const ir_graph *irg, unsigned idx) { assert(idx < (unsigned) ARR_LEN(irg->idx_irn_map)); return irg->idx_irn_map[idx]; @@ -536,14 +517,10 @@ static inline ir_phase *irg_get_phase(const ir_graph *irg, ir_phase_id id) #define set_irg_initial_exec(irg, node) _set_irg_initial_exec(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_tls(irg) _get_irg_tls(irg) -#define set_irg_tls(irg, node) _set_irg_tls(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_irn_no_mem(irg, node) _set_irn_no_mem(irg, node) #define get_irg_entity(irg) _get_irg_entity(irg)