X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firnode_t.h;h=aa70bbd371ae74155695fa3c559dab00b5c965f7;hb=4f92e524762e0febc361676111b3b5b79addd03a;hp=63c85b3055a3826475171eb5fffba938f41145be;hpb=01ddc5c06877693df7d5f286d43e433fedd87103;p=libfirm

diff --git a/ir/ir/irnode_t.h b/ir/ir/irnode_t.h
index 63c85b305..aa70bbd37 100644
--- a/ir/ir/irnode_t.h
+++ b/ir/ir/irnode_t.h
@@ -47,17 +47,6 @@ ir_node     **get_irn_in            (const ir_node *node);
  */
 extern unsigned firm_add_node_size;
 
-/**
- * Sets the get_type operation for an ir_op_ops.
- *
- * @param code   the opcode for the default operation
- * @param ops    the operations initialized
- *
- * @return
- *    The operations.
- */
-ir_op_ops *firm_set_default_get_type(ir_opcode code, ir_op_ops *ops);
-
 /**
  * Sets the get_type_attr operation for an ir_op_ops.
  *
@@ -67,7 +56,7 @@ ir_op_ops *firm_set_default_get_type(ir_opcode code, ir_op_ops *ops);
  * @return
  *    The operations.
  */
-ir_op_ops *firm_set_default_get_type_attr(ir_opcode code, ir_op_ops *ops);
+ir_op_ops *firm_set_default_get_type_attr(unsigned code, ir_op_ops *ops);
 
 /**
  * Sets the get_entity_attr operation for an ir_op_ops.
@@ -78,7 +67,7 @@ ir_op_ops *firm_set_default_get_type_attr(ir_opcode code, ir_op_ops *ops);
  * @return
  *    The operations.
  */
-ir_op_ops *firm_set_default_get_entity_attr(ir_opcode code, ir_op_ops *ops);
+ir_op_ops *firm_set_default_get_entity_attr(unsigned code, ir_op_ops *ops);
 
 /**
  * Returns an array with the predecessors of the Block. Depending on
@@ -146,7 +135,7 @@ static inline unsigned _get_irn_opcode(const ir_node *node)
  */
 static inline int _get_irn_arity(const ir_node *node)
 {
-	return ARR_LEN(node->in) - 1;
+	return (int)(ARR_LEN(node->in) - 1);
 }
 
 /**
@@ -161,7 +150,7 @@ static inline ir_node *_get_irn_n(const ir_node *node, int n)
 	nn = node->in[n + 1];
 	if (nn == NULL) {
 		/* only block and Anchor inputs are allowed to be NULL */
-		assert((node->op == op_Anchor || n == -1) && "NULL input of a node");
+		assert((is_Anchor(node) || n == -1) && "NULL input of a node");
 		return NULL;
 	}
 	if (nn->op != op_Id) return nn;
@@ -178,12 +167,12 @@ static inline unsigned hash_irn(const ir_node *node)
 }
 
 static inline int _get_irn_deps(const ir_node *node) {
-	return node->deps ? ARR_LEN(node->deps) : 0;
+	return node->deps ? (int)ARR_LEN(node->deps) : 0;
 }
 
 static inline ir_node *_get_irn_dep(const ir_node *node, int pos) {
 	assert(node->deps && "dependency array node yet allocated. use add_irn_dep()");
-	assert(pos >= 0 && pos < ARR_LEN(node->deps) && "dependency index out of range");
+	assert(pos >= 0 && pos < (int)ARR_LEN(node->deps) && "dependency index out of range");
 	return node->deps[pos];
 }
 
@@ -195,7 +184,7 @@ static inline void _set_irn_dep(ir_node *node, int pos, ir_node *dep)
 	ir_node *old;
 
 	assert(node->deps && "dependency array node yet allocated. use add_irn_dep()");
-	assert(pos >= 0 && pos < ARR_LEN(node->deps) && "dependency index out of range");
+	assert(pos >= 0 && pos < (int)ARR_LEN(node->deps) && "dependency index out of range");
 	old = node->deps[pos];
 	node->deps[pos] = dep;
 	edges_notify_edge_kind(node, pos, dep, old, EDGE_KIND_DEP, get_irn_irg(node));
@@ -233,18 +222,28 @@ static inline void _set_irn_mode(ir_node *node, ir_mode *mode)
 	node->mode = mode;
 }
 
+static inline int ir_has_irg_ref(const ir_node *node)
+{
+	return is_Block(node) || is_Bad(node) || is_Anchor(node);
+}
+
 static inline ir_graph *_get_irn_irg(const ir_node *node)
 {
 	/*
-	 * Do not use get_nodes_Block() here, because this
+	 * Do not use get_nodes_block() here, because this
 	 * will check the pinned state.
-	 * However even a 'wrong' block is always in the proper
-	 * irg.
+	 * However even a 'wrong' block is always in the proper irg.
 	 */
 	if (! is_Block(node))
 		node = get_irn_n(node, -1);
-	/* note that get_Block_irg() can handle Bad nodes */
-	return get_Block_irg(node);
+	assert(ir_has_irg_ref(node));
+	return node->attr.irg.irg;
+}
+
+static inline ir_node *_get_nodes_block(const ir_node *node)
+{
+	assert(!is_Block(node));
+	return get_irn_n(node, -1);
 }
 
 /**
@@ -328,7 +327,8 @@ static inline op_pin_state _get_irn_pinned(const ir_node *node)
 	state = _get_op_pinned(_get_irn_op(node));
 
 	if (state >= op_pin_state_exc_pinned)
-		return get_opt_fragile_ops() ? node->attr.except.pin_state : op_pin_state_pinned;
+		return node->attr.except.pin_state;
+
 	return state;
 }
 
@@ -398,17 +398,16 @@ static inline ir_node  *_get_Block_cfgpred_block(const ir_node *node, int pos)
 
 static inline ir_visited_t _get_Block_block_visited(const ir_node *node)
 {
-	assert(node->op == op_Block);
+	assert(is_Block(node));
 	return node->attr.block.block_visited;
 }
 
 static inline void _set_Block_block_visited(ir_node *node, ir_visited_t visit)
 {
-	assert(node->op == op_Block);
+	assert(is_Block(node));
 	node->attr.block.block_visited = visit;
 }
 
-/* For this current_ir_graph must be set. */
 static inline void _mark_Block_block_visited(ir_node *node)
 {
 	ir_graph *irg = get_Block_irg(node);
@@ -433,9 +432,12 @@ static inline int _is_Block_dead(const ir_node *block)
 {
 	ir_op *op = _get_irn_op(block);
 
-	if (op == op_Bad)
+	/* we can have Bad, Anchor and Block nodes as block input */
+	if (op == op_Bad) {
 		return 1;
-	else {
+	} else if (op == op_Anchor) {
+		return 0;
+	} else {
 		assert(op == op_Block);
 		return block->attr.block.is_dead;
 	}
@@ -443,11 +445,11 @@ static inline int _is_Block_dead(const ir_node *block)
 
 static inline ir_graph *_get_Block_irg(const ir_node *block)
 {
-	assert(is_Block(block) || is_Bad(block));
+	assert(is_Block(block));
 	return block->attr.irg.irg;
 }
 
-static inline tarval *_get_Const_tarval(const ir_node *node) {
+static inline ir_tarval *_get_Const_tarval(const ir_node *node) {
 	assert(_get_irn_op(node) == op_Const);
 	return node->attr.con.tarval;
 }
@@ -468,10 +470,6 @@ static inline int _is_irn_forking(const ir_node *node) {
 	return is_op_forking(_get_irn_op(node));
 }
 
-static inline ir_type *_get_irn_type(ir_node *node) {
-	return _get_irn_op(node)->ops.get_type(node);
-}
-
 static inline ir_type *_get_irn_type_attr(ir_node *node) {
 	return _get_irn_op(node)->ops.get_type_attr(node);
 }
@@ -616,6 +614,7 @@ void init_irnode(void);
 #define get_irn_mode(node)                    _get_irn_mode(node)
 #define set_irn_mode(node, mode)              _set_irn_mode(node, mode)
 #define get_irn_irg(node)                     _get_irn_irg(node)
+#define get_nodes_block(node)                 _get_nodes_block(node)
 #define get_irn_op(node)                      _get_irn_op(node)
 #define set_irn_op(node, op)                  _set_irn_op(node, op)
 #define get_irn_opcode(node)                  _get_irn_opcode(node)