X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgraph_t.h;h=6e393ef6f08a57655bc9fb76d3a3ba24e6eab066;hb=357886575cb0becb5bd9be376fde49b57edd5385;hp=9cc9fdee7d27d2ba0d010c46278a7785ca6629da;hpb=b58fa7bff3669430bb2422735b193a043709d9d1;p=libfirm

diff --git a/ir/ir/irgraph_t.h b/ir/ir/irgraph_t.h
index 9cc9fdee7..6e393ef6f 100644
--- a/ir/ir/irgraph_t.h
+++ b/ir/ir/irgraph_t.h
@@ -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);
@@ -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);
@@ -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)