Simplyfied firm arrays by deleting useless macro and union.

[libfirm] / ir / ir / irgraph_t.h

diff --git a/ir/ir/irgraph_t.h b/ir/ir/irgraph_t.h
index 165ff79..265a4ae 100644 (file)
--- a/ir/ir/irgraph_t.h
+++ b/ir/ir/irgraph_t.h
@@ -216,16 +216,6 @@ static inline void _set_irg_no_mem(ir_graph *irg, ir_node *node)
        set_irn_n(irg->anchor, anchor_no_mem, node);
 }
 
-static inline ir_node *_get_irg_current_block(const ir_graph *irg)
-{
-       return irg->current_block;
-}
-
-static inline void _set_irg_current_block(ir_graph *irg, ir_node *node)
-{
-       irg->current_block = node;
-}
-
 static inline ir_entity *_get_irg_entity(const ir_graph *irg)
 {
        assert(irg);
@@ -281,15 +271,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)
@@ -322,7 +312,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)
@@ -357,21 +347,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));
@@ -426,12 +416,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)
@@ -556,8 +546,6 @@ static inline ir_phase *irg_get_phase(const ir_graph *irg, ir_phase_id id)
 #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_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)