X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firnode_t.h;h=63c85b3055a3826475171eb5fffba938f41145be;hb=2191be0d3ae45eeff8c70e48bbcfb03f1ea0d774;hp=88ca56a63b162ff05dd8c5115760cdebe2940899;hpb=671ced672859c875de7c1d9c4a4750a29514446f;p=libfirm

diff --git a/ir/ir/irnode_t.h b/ir/ir/irnode_t.h
index 88ca56a63..63c85b305 100644
--- a/ir/ir/irnode_t.h
+++ b/ir/ir/irnode_t.h
@@ -32,6 +32,7 @@
 #include "irgraph_t.h"
 #include "irflag_t.h"
 #include "array.h"
+#include "iredges_t.h"
 
 /**
  * Returns the array with the ins.  The content of the array may not be
@@ -41,24 +42,6 @@
  */
 ir_node     **get_irn_in            (const ir_node *node);
 
-/** @{ */
-/** access attributes directly */
-const_attr    *get_irn_const_attr    (ir_node *node);
-long          get_irn_proj_attr      (ir_node *node);
-alloc_attr    *get_irn_alloc_attr    (ir_node *node);
-free_attr     *get_irn_free_attr     (ir_node *node);
-symconst_attr *get_irn_symconst_attr (ir_node *node);
-call_attr     *get_irn_call_attr     (ir_node *node);
-sel_attr      *get_irn_sel_attr      (ir_node *node);
-phi_attr      *get_irn_phi_attr      (ir_node *node);
-block_attr    *get_irn_block_attr    (ir_node *node);
-load_attr     *get_irn_load_attr     (ir_node *node);
-store_attr    *get_irn_store_attr    (ir_node *node);
-except_attr   *get_irn_except_attr   (ir_node *node);
-divmod_attr   *get_irn_divmod_attr   (ir_node *node);
-builtin_attr  *get_irn_builtin_attr  (ir_node *node);
-/** @} */
-
 /**
  * The amount of additional space for custom data to be allocated upon creating a new node.
  */
@@ -161,49 +144,19 @@ static inline unsigned _get_irn_opcode(const ir_node *node)
  * Returns the number of predecessors without the block predecessor.
  * Intern version for libFirm.
  */
-static inline int _get_irn_intra_arity(const ir_node *node)
+static inline int _get_irn_arity(const ir_node *node)
 {
-	assert(node);
 	return ARR_LEN(node->in) - 1;
 }
 
 /**
- * Returns the number of predecessors without the block predecessor.
  * Intern version for libFirm.
  */
-static inline int _get_irn_inter_arity(const ir_node *node)
-{
-	assert(node);
-	if (_get_irn_op(node) == op_Filter) {
-		assert(node->attr.filter.in_cg);
-		return ARR_LEN(node->attr.filter.in_cg) - 1;
-	} else if (_get_irn_op(node) == op_Block && node->attr.block.in_cg) {
-		return ARR_LEN(node->attr.block.in_cg) - 1;
-	}
-	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.
- */
-static inline ir_node *_get_irn_intra_n(const ir_node *node, int n)
+static inline ir_node *_get_irn_n(const ir_node *node, int n)
 {
 	ir_node *nn;
 
-	assert(node);
-	assert(-1 <= n && n < _get_irn_intra_arity(node));
+	assert(-1 <= n && n < _get_irn_arity(node));
 
 	nn = node->in[n + 1];
 	if (nn == NULL) {
@@ -216,24 +169,6 @@ static inline ir_node *_get_irn_intra_n(const ir_node *node, int n)
 	return (node->in[n + 1] = skip_Id(nn));
 }
 
-/**
- * Intern version for libFirm.
- */
-static inline ir_node *_get_irn_inter_n(const ir_node *node, int n)
-{
-	assert(node); assert(-1 <= n && n < _get_irn_inter_arity(node));
-
-	/* handle Filter and Block specially */
-	if (_get_irn_op(node) == op_Filter) {
-		assert(node->attr.filter.in_cg);
-		return (node->attr.filter.in_cg[n + 1] = skip_Id(node->attr.filter.in_cg[n + 1]));
-	} else if (_get_irn_op(node) == op_Block && node->attr.block.in_cg) {
-		return (node->attr.block.in_cg[n + 1] = skip_Id(node->attr.block.in_cg[n + 1]));
-	}
-
-	return _get_irn_intra_n(node, n);
-}
-
 /**
  * returns a hash value for a node
  */
@@ -242,20 +177,6 @@ static inline unsigned hash_irn(const ir_node *node)
 	return (unsigned) get_irn_idx(node);
 }
 
-/**
- * Access to the predecessors of a node.
- * To iterate over the operands iterate from 0 to i < get_irn_arity(),
- * to iterate including the Block predecessor iterate from i = -1 to
- * i < get_irn_arity.
- * 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;
 }
@@ -266,6 +187,9 @@ static inline ir_node *_get_irn_dep(const ir_node *node, int pos) {
 	return node->deps[pos];
 }
 
+/* forward declaration outside iredges_t.h to avoid circular include problems */
+void edges_notify_edge_kind(ir_node *src, int pos, ir_node *tgt, ir_node *old_tgt, ir_edge_kind_t kind, ir_graph *irg);
+
 static inline void _set_irn_dep(ir_node *node, int pos, ir_node *dep)
 {
 	ir_node *old;
@@ -430,30 +354,6 @@ static inline int _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)
-{
-	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_strictConv(const ir_node *node)
 {
 	return _is_Conv(node) && get_Conv_strict(node);
@@ -464,12 +364,6 @@ static inline int _is_SymConst_addr_ent(const ir_node *node)
 	return is_SymConst(node) && get_SymConst_kind(node) == symconst_addr_ent;
 }
 
-static inline int _is_no_Block(const ir_node *node)
-{
-	assert(node && _is_ir_node(node));
-	return (_get_irn_op(node) != op_Block);
-}
-
 static inline int _get_Block_n_cfgpreds(const ir_node *node)
 {
 	assert(_is_Block(node));
@@ -668,19 +562,12 @@ static inline ir_node *_get_Block_phis(const ir_node *block)
 	return block->attr.block.phis;
 }
 
-/**
- * Sets the next link of a Phi.
- */
 static inline void _set_Phi_next(ir_node *phi, ir_node *next)
 {
 	assert(_is_Phi(phi));
 	phi->attr.phi.next = next;
 }
 
-/**
- * Returns the link of a node.
- * Intern version of libFirm.
- */
 static inline ir_node *_get_Phi_next(const ir_node *phi)
 {
 	assert(_is_Phi(phi));
@@ -724,11 +611,7 @@ void init_irnode(void);
 
 /* 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)
-#define get_irn_inter_arity(node)             _get_irn_inter_arity(node)
 #define get_irn_arity(node)                   _get_irn_arity(node)
-#define get_irn_intra_n(node, n)              _get_irn_intra_n(node, n)
-#define get_irn_inter_n(node, n)              _get_irn_inter_n(node, n)
 #define get_irn_n(node, n)                    _get_irn_n(node, n)
 #define get_irn_mode(node)                    _get_irn_mode(node)
 #define set_irn_mode(node, mode)              _set_irn_mode(node, mode)
@@ -751,7 +634,6 @@ void init_irnode(void);
 #define is_Phi(node)                          _is_Phi(node)
 #define is_strictConv(node)                   _is_strictConv(node)
 #define is_SymConst_addr_ent(node)            _is_SymConst_addr_ent(node)
-#define is_no_Block(node)                     _is_no_Block(node)
 #define get_Block_n_cfgpreds(node)            _get_Block_n_cfgpreds(node)
 #define get_Block_cfgpred(node, pos)          _get_Block_cfgpred(node, pos)
 #define get_Block_cfgpred_block(node, pos)    _get_Block_cfgpred_block(node, pos)