s/Block_not_block_visited(x)/!Block_block_visited(x)/.

[libfirm] / ir / ir / irnode_t.h

diff --git a/ir/ir/irnode_t.h b/ir/ir/irnode_t.h
index 9413777..986f93f 100644 (file)
--- a/ir/ir/irnode_t.h
+++ b/ir/ir/irnode_t.h
@@ -493,6 +493,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);
@@ -542,15 +548,9 @@ _is_Shrs(const ir_node *node) {
 }
 
 static INLINE int
-_is_Rot(const ir_node *node) {
-       assert(node);
-       return (_get_irn_op(node) == op_Rot);
-}
-
-static INLINE int
-_is_Psi(const ir_node *node) {
+_is_Rotl(const ir_node *node) {
        assert(node);
-       return (_get_irn_op(node) == op_Psi);
+       return (_get_irn_op(node) == op_Rotl);
 }
 
 static INLINE int
@@ -657,11 +657,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
@@ -821,12 +817,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);
@@ -924,11 +914,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;
 }
@@ -1009,6 +994,18 @@ _set_Block_mark(ir_node *block, unsigned mark) {
        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)
@@ -1075,6 +1072,7 @@ _set_Block_mark(ir_node *block, unsigned mark) {
 #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)
@@ -1083,8 +1081,7 @@ _set_Block_mark(ir_node *block, unsigned mark) {
 #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)
@@ -1096,7 +1093,6 @@ _set_Block_mark(ir_node *block, unsigned mark) {
 #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)
@@ -1117,7 +1113,6 @@ _set_Block_mark(ir_node *block, unsigned mark) {
 #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)
@@ -1141,4 +1136,6 @@ _set_Block_mark(ir_node *block, unsigned 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