X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firnode_t.h;h=b89396b3650c0524b853d1e932109cc3bd2f25f6;hb=31ef53136fdb86d4a98919c2148c95cadea4ea81;hp=0f60161fd2677b712dde44a643f785e3fadab565;hpb=8e76398ffc94b18d1f1bc34a967fc3c2bd574aca;p=libfirm

diff --git a/ir/ir/irnode_t.h b/ir/ir/irnode_t.h
index 0f60161fd..b89396b36 100644
--- a/ir/ir/irnode_t.h
+++ b/ir/ir/irnode_t.h
@@ -306,7 +306,7 @@ _set_irn_mode(ir_node *node, ir_mode *mode) {
  * Gets the visited counter of a node.
  * Intern version for libFirm.
  */
-static INLINE unsigned long
+static INLINE ir_visited_t
 _get_irn_visited(const ir_node *node) {
 	assert(node);
 	return node->visited;
@@ -317,7 +317,7 @@ _get_irn_visited(const ir_node *node) {
  * Intern version for libFirm.
  */
 static INLINE void
-_set_irn_visited(ir_node *node, unsigned long visited) {
+_set_irn_visited(ir_node *node, ir_visited_t visited) {
 	assert(node);
 	node->visited = visited;
 }
@@ -342,14 +342,12 @@ _irn_visited(const ir_node *node) {
 	return (node->visited >= current_ir_graph->visited);
 }
 
-/**
- * Returns non-zero if a node of was NOT visited.
- * Intern version for libFirm.
- */
 static INLINE int
-_irn_not_visited(const ir_node *node) {
-	assert(node);
-	return (node->visited < current_ir_graph->visited);
+_irn_visited_else_mark(ir_node *node) {
+	if (_irn_visited(node))
+		return 1;
+	_mark_irn_visited(node);
+	return 0;
 }
 
 /**
@@ -423,8 +421,20 @@ _is_Phi(const ir_node *node) {
 
 static INLINE int
 _is_Proj(const ir_node *node) {
+	ir_op *op;
+	assert(node);
+
+	op = _get_irn_op(node);
+#ifdef INTERPROCEDURAL_VIEW
+	if (op == op_Filter) return !get_interprocedural_view();
+#endif
+	return (op == op_Proj);
+}
+
+static INLINE int
+_is_Filter(const ir_node *node) {
 	assert(node);
-	return (_get_irn_op(node) == op_Proj);
+	return (_get_irn_op(node) == op_Filter);
 }
 
 static INLINE int
@@ -481,6 +491,12 @@ _is_Add(const ir_node *node) {
 	return (_get_irn_op(node) == op_Add);
 }
 
+static INLINE int
+_is_Carry(const ir_node *node) {
+	assert(node);
+	return (_get_irn_op(node) == op_Carry);
+}
+
 static INLINE int
 _is_And(const ir_node *node) {
 	assert(node);
@@ -530,15 +546,15 @@ _is_Shrs(const ir_node *node) {
 }
 
 static INLINE int
-_is_Rot(const ir_node *node) {
+_is_Rotl(const ir_node *node) {
 	assert(node);
-	return (_get_irn_op(node) == op_Rot);
+	return (_get_irn_op(node) == op_Rotl);
 }
 
 static INLINE int
-_is_Psi(const ir_node *node) {
+_is_Id(const ir_node *node) {
 	assert(node);
-	return (_get_irn_op(node) == op_Psi);
+	return (_get_irn_op(node) == op_Id);
 }
 
 static INLINE int
@@ -612,6 +628,12 @@ _is_Call(const ir_node *node) {
 	return (_get_irn_op(node) == op_Call);
 }
 
+static INLINE int
+_is_CallBegin(const ir_node *node) {
+	assert(node);
+	return (_get_irn_op(node) == op_CallBegin);
+}
+
 static INLINE int
 _is_Sel(const ir_node *node) {
 	assert(node);
@@ -633,11 +655,7 @@ _is_Mulh(const ir_node *node) {
 static INLINE int
 _is_Mux(const ir_node *node) {
 	assert(node);
-	if (node) {
-		ir_op *op = _get_irn_op(node);
-		return (op == op_Mux || ((op == op_Psi) && _get_irn_arity(node) == 3));
-	}
-	return 0;
+	return (_get_irn_op(node) == op_Mux);
 }
 
 static INLINE int
@@ -699,12 +717,24 @@ _is_Alloc(const ir_node *node) {
 	return (_get_irn_op(node) == op_Alloc);
 }
 
+static INLINE int
+_is_Free(const ir_node *node) {
+	assert(node);
+	return (_get_irn_op(node) == op_Free);
+}
+
 static INLINE int
 _is_Jmp(const ir_node *node) {
 	assert(node);
 	return (_get_irn_op(node) == op_Jmp);
 }
 
+static INLINE int
+_is_IJmp(const ir_node *node) {
+	assert(node);
+	return (_get_irn_op(node) == op_IJmp);
+}
+
 static INLINE int
 _is_Raise(const ir_node *node) {
 	assert(node);
@@ -766,14 +796,14 @@ _get_Block_cfgpred_block(const ir_node *node, int pos) {
 	return res;
 }
 
-static INLINE unsigned long
+static INLINE ir_visited_t
 _get_Block_block_visited(const ir_node *node) {
 	assert(node->op == op_Block);
 	return node->attr.block.block_visited;
 }
 
 static INLINE void
-_set_Block_block_visited(ir_node *node, unsigned long visit) {
+_set_Block_block_visited(ir_node *node, ir_visited_t visit) {
 	assert(node->op == op_Block);
 	node->attr.block.block_visited = visit;
 }
@@ -785,12 +815,6 @@ _mark_Block_block_visited(ir_node *node) {
 	node->attr.block.block_visited = get_irg_block_visited(current_ir_graph);
 }
 
-static INLINE int
-_Block_not_block_visited(const ir_node *node) {
-	assert(node->op == op_Block);
-	return (node->attr.block.block_visited < get_irg_block_visited(current_ir_graph));
-}
-
 static INLINE int
 _Block_block_visited(const ir_node *node) {
 	assert(node->op == op_Block);
@@ -888,11 +912,6 @@ static INLINE void _set_Cond_jmp_pred(ir_node *node, cond_jmp_predicate pred) {
 	node->attr.cond.pred = pred;
 }
 
-static INLINE int _get_Psi_n_conds(const ir_node *node) {
-	assert(_get_irn_op(node) == op_Psi);
-	return _get_irn_arity(node) >> 1;
-}
-
 static INLINE void *_get_irn_generic_attr(ir_node *node) {
 	return &node->attr;
 }
@@ -952,6 +971,39 @@ _get_Phi_next(const ir_node *phi) {
 	return phi->attr.phi.next;
 }
 
+/** Add a Phi node to the list of Block Phi's. */
+static INLINE void
+_add_Block_phi(ir_node *block, ir_node *phi) {
+	_set_Phi_next(phi, _get_Block_phis(block));
+	_set_Block_phis(block, phi);
+}
+
+/** Get the Block mark (single bit). */
+static INLINE unsigned
+_get_Block_mark(const ir_node *block) {
+	assert(_is_Block(block));
+	return block->attr.block.marked;
+}
+
+/** Set the Block mark (single bit). */
+static INLINE void
+_set_Block_mark(ir_node *block, unsigned mark) {
+	assert(_is_Block(block));
+	block->attr.block.marked = mark;
+}
+
+/** Returns non-zero if a node is a routine parameter. */
+static INLINE int
+_is_arg_Proj(const ir_node *node) {
+	if (! is_Proj(node))
+		return 0;
+	node = get_Proj_pred(node);
+	if (! is_Proj(node))
+		return 0;
+	return pn_Start_T_args == get_Proj_proj(node) && is_Start(get_Proj_pred(node));
+}
+
+
 /* this section MUST contain all inline functions */
 #define is_ir_node(thing)                     _is_ir_node(thing)
 #define get_irn_intra_arity(node)             _get_irn_intra_arity(node)
@@ -969,7 +1021,7 @@ _get_Phi_next(const ir_node *phi) {
 #define set_irn_visited(node, v)              _set_irn_visited(node, v)
 #define mark_irn_visited(node)                _mark_irn_visited(node)
 #define irn_visited(node)                     _irn_visited(node)
-#define irn_not_visited(node)                 _irn_not_visited(node)
+#define irn_visited_else_mark(node)           _irn_visited_else_mark(node)
 #define set_irn_link(node, link)              _set_irn_link(node, link)
 #define get_irn_link(node)                    _get_irn_link(node)
 #define get_irn_pinned(node)                  _get_irn_pinned(node)
@@ -977,6 +1029,7 @@ _get_Phi_next(const ir_node *phi) {
 #define is_unop(node)                         _is_unop(node)
 #define is_binop(node)                        _is_binop(node)
 #define is_Proj(node)                         _is_Proj(node)
+#define is_Filter(node)                       _is_Filter(node)
 #define is_Phi(node)                          _is_Phi(node)
 #define is_Const(node)                        _is_Const(node)
 #define is_Conv(node)                         _is_Conv(node)
@@ -985,6 +1038,7 @@ _get_Phi_next(const ir_node *phi) {
 #define is_Unknown(node)                      _is_Unknown(node)
 #define is_Return(node)                       _is_Return(node)
 #define is_Call(node)                         _is_Call(node)
+#define is_CallBegin(node)                    _is_CallBegin(node)
 #define is_Sel(node)                          _is_Sel(node)
 #define is_Mul(node)                          _is_Mul(node)
 #define is_Mulh(node)                         _is_Mulh(node)
@@ -999,7 +1053,9 @@ _get_Phi_next(const ir_node *phi) {
 #define is_CopyB(node)                        _is_CopyB(node)
 #define is_Cmp(node)                          _is_Cmp(node)
 #define is_Alloc(node)                        _is_Alloc(node)
+#define is_Free(node)                         _is_Free(node)
 #define is_Jmp(node)                          _is_Jmp(node)
+#define is_IJmp(node)                         _is_IJmp(node)
 #define is_Raise(node)                        _is_Raise(node)
 #define is_ASM(node)                          _is_ASM(node)
 #define is_Anchor(node)                       _is_Anchor(node)
@@ -1014,6 +1070,7 @@ _get_Phi_next(const ir_node *phi) {
 #define is_DivMod(node)                       _is_DivMod(node)
 #define is_Quot(node)                         _is_Quot(node)
 #define is_Add(node)                          _is_Add(node)
+#define is_Carry(node)                        _is_Carry(node)
 #define is_And(node)                          _is_And(node)
 #define is_Or(node)                           _is_Or(node)
 #define is_Eor(node)                          _is_Eor(node)
@@ -1022,8 +1079,8 @@ _get_Phi_next(const ir_node *phi) {
 #define is_Shl(node)                          _is_Shl(node)
 #define is_Shr(node)                          _is_Shr(node)
 #define is_Shrs(node)                         _is_Shrs(node)
-#define is_Rot(node)                          _is_Rot(node)
-#define is_Psi(node)                          _is_Psi(node)
+#define is_Rotl(node)                         _is_Rotl(node)
+#define is_Id(node)                           _is_Id(node)
 #define is_Tuple(node)                        _is_Tuple(node)
 #define is_Bound(node)                        _is_Bound(node)
 #define is_no_Block(node)                     _is_no_Block(node)
@@ -1034,7 +1091,6 @@ _get_Phi_next(const ir_node *phi) {
 #define get_Block_block_visited(node)         _get_Block_block_visited(node)
 #define set_Block_block_visited(node, visit)  _set_Block_block_visited(node, visit)
 #define mark_Block_block_visited(node)        _mark_Block_block_visited(node)
-#define Block_not_block_visited(node)         _Block_not_block_visited(node)
 #define Block_block_visited(node)             _Block_block_visited(node)
 #define set_Block_dead(block)                 _set_Block_dead(block)
 #define is_Block_dead(block)                  _is_Block_dead(block)
@@ -1055,7 +1111,6 @@ _get_Phi_next(const ir_node *phi) {
 #define is_irn_machine_user(node, n)          _is_irn_machine_user(node, n)
 #define get_Cond_jmp_pred(node)               _get_Cond_jmp_pred(node)
 #define set_Cond_jmp_pred(node, pred)         _set_Cond_jmp_pred(node, pred)
-#define get_Psi_n_conds(node)                 _get_Psi_n_conds(node)
 #define get_irn_generic_attr(node)            _get_irn_generic_attr(node)
 #define get_irn_generic_attr_const(node)      _get_irn_generic_attr_const(node)
 #define get_irn_idx(node)                     _get_irn_idx(node)
@@ -1070,9 +1125,15 @@ _get_Phi_next(const ir_node *phi) {
 #define get_irn_dbg_info(node)                _get_irn_dbg_info(node)
 #define set_irn_dbg_info(node, db)            _set_irn_dbg_info(node, db)
 
-#define set_Block_phis(node, phi)             _set_Block_phis(node, phi)
-#define get_Block_phis(node)                  _get_Block_phis(node)
+#define set_Block_phis(block, phi)            _set_Block_phis(block, phi)
+#define get_Block_phis(block)                 _get_Block_phis(block)
+#define add_Block_phi(block, phi)             _add_Block_phi(block, phi)
+#define get_Block_mark(block)                 _get_Block_mark(block)
+#define set_Block_mark(block, mark)           _set_Block_mark(block, mark)
+
 #define set_Phi_next(node, phi)               _set_Phi_next(node, phi)
 #define get_Phi_next(node)                    _get_Phi_next(node)
 
+#define is_arg_Proj(node)                     _is_arg_Proj(node)
+
 #endif