same fix again on another place

[libfirm] / ir / ir / irnode_t.h

diff --git a/ir/ir/irnode_t.h b/ir/ir/irnode_t.h
index 75fbced..34da5e2 100644 (file)
--- a/ir/ir/irnode_t.h
+++ b/ir/ir/irnode_t.h
@@ -175,12 +175,18 @@ _get_irn_inter_arity(const ir_node *node) {
        return _get_irn_intra_arity(node);
 }
 
+#ifdef INTERPROCEDURAL_VIEW
 /**
  * Returns the number of predecessors without the block predecessor.
  * Intern version for libFirm.
  */
 extern int (*_get_irn_arity)(const ir_node *node);
 
+#else
+
+#define _get_irn_arity(n) _get_irn_intra_arity(n)
+#endif
+
 /**
  * Intern version for libFirm.
  */
@@ -228,7 +234,11 @@ _get_irn_inter_n(const ir_node *node, int n) {
  * If it is a block, the entry -1 is NULL.
  * Intern version for libFirm.
  */
+#ifdef INTERPROCEDURAL_VIEW
 extern ir_node *(*_get_irn_n)(const ir_node *node, int n);
+#else
+#define _get_irn_n(n,i) _get_irn_intra_n(n,i)
+#endif
 
 static INLINE int _get_irn_deps(const ir_node *node) {
        return node->deps ? ARR_LEN(node->deps) : 0;
@@ -394,6 +404,24 @@ _is_binop(const ir_node *node) {
        return (node->op->opar == oparity_binary);
 }
 
+static INLINE int
+_is_Phi(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_Phi);
+}
+
+static INLINE int
+_is_Proj(const ir_node *node) {
+       assert(node);
+       return (_get_irn_op(node) == op_Proj);
+}
+
 static INLINE int
 _is_Bad(const ir_node *node) {
        assert(node);
@@ -472,6 +500,30 @@ _is_Not(const ir_node *node) {
        return (_get_irn_op(node) == op_Not);
 }
 
+static INLINE int
+_is_Shl(const ir_node *node) {
+       assert(node);
+       return (_get_irn_op(node) == op_Shl);
+}
+
+static INLINE int
+_is_Shr(const ir_node *node) {
+       assert(node);
+       return (_get_irn_op(node) == op_Shr);
+}
+
+static INLINE int
+_is_Shrs(const ir_node *node) {
+       assert(node);
+       return (_get_irn_op(node) == op_Shrs);
+}
+
+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) {
        assert(node);
@@ -508,6 +560,12 @@ _is_Conv(const ir_node *node) {
        return (_get_irn_op(node) == op_Conv);
 }
 
+static INLINE int
+_is_Cast(const ir_node *node) {
+       assert(node);
+       return (_get_irn_op(node) == op_Cast);
+}
+
 static INLINE int
 _is_CopyB(const ir_node *node) {
        assert(node);
@@ -544,6 +602,12 @@ _is_Mul(const ir_node *node) {
        return (_get_irn_op(node) == op_Mul);
 }
 
+static INLINE int
+_is_Mulh(const ir_node *node) {
+       assert(node);
+       return (_get_irn_op(node) == op_Mulh);
+}
+
 static INLINE int
 _is_Mux(const ir_node *node) {
        assert(node);
@@ -730,18 +794,16 @@ static INLINE tarval *_get_Const_tarval(const ir_node *node) {
        return node->attr.con.tv;
 }
 
-static INLINE cnst_classify_t _classify_Const(ir_node *node) {
-       ir_op *op;
-       assert(_is_ir_node(node));
-
-       op = _get_irn_op(node);
+static INLINE int _is_Const_null(const ir_node *node) {
+       return tarval_is_null(_get_Const_tarval(node));
+}
 
-       if (op == op_Const)
-               return classify_tarval(_get_Const_tarval(node));
-       else if(op == op_SymConst)
-               return CNST_SYMCONST;
+static INLINE int _is_Const_one(const ir_node *node) {
+       return tarval_is_one(_get_Const_tarval(node));
+}
 
-       return CNST_NO_CONST;
+static INLINE int _is_Const_all_one(const ir_node *node) {
+       return tarval_is_all_one(_get_Const_tarval(node));
 }
 
 static INLINE int _is_irn_forking(const ir_node *node) {
@@ -847,13 +909,17 @@ static INLINE void _set_irn_dbg_info(ir_node *n, dbg_info *db) {
 #define is_irn_pinned_in_irg(node)            _is_irn_pinned_in_irg(node)
 #define is_unop(node)                         _is_unop(node)
 #define is_binop(node)                        _is_binop(node)
+#define is_Proj(node)                         _is_Proj(node)
+#define is_Phi(node)                          _is_Phi(node)
 #define is_Const(node)                        _is_Const(node)
 #define is_Conv(node)                         _is_Conv(node)
+#define is_Cast(node)                         _is_Cast(node)
 #define is_Unknown(node)                      _is_Unknown(node)
 #define is_Return(node)                       _is_Return(node)
 #define is_Call(node)                         _is_Call(node)
 #define is_Sel(node)                          _is_Sel(node)
 #define is_Mul(node)                          _is_Mul(node)
+#define is_Mulh(node)                         _is_Mulh(node)
 #define is_Mux(node)                          _is_Mux(node)
 #define is_Load(node)                         _is_Load(node)
 #define is_Sync(node)                         _is_Sync(node)
@@ -883,6 +949,10 @@ static INLINE void _set_irn_dbg_info(ir_node *n, dbg_info *db) {
 #define is_Eor(node)                          _is_Eor(node)
 #define is_Sub(node)                          _is_Sub(node)
 #define is_Not(node)                          _is_Not(node)
+#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_Tuple(node)                        _is_Tuple(node)
 #define is_no_Block(node)                     _is_no_Block(node)
@@ -898,7 +968,9 @@ static INLINE void _set_irn_dbg_info(ir_node *n, dbg_info *db) {
 #define set_Block_dead(block)                 _set_Block_dead(block)
 #define is_Block_dead(block)                  _is_Block_dead(block)
 #define get_Const_tarval(node)                _get_Const_tarval(node)
-#define classify_Const(node)                  _classify_Const(node)
+#define is_Const_null(node)                   _is_Const_null(node)
+#define is_Const_one(node)                    _is_Const_one(node)
+#define is_Const_all_one(node)                _is_Const_all_one(node)
 #define is_irn_forking(node)                  _is_irn_forking(node)
 #define get_irn_type(node)                    _get_irn_type(node)
 #define get_irn_type_attr(node)               _get_irn_type_attr(node)