X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firnode.c;h=ec5d4d965f12d651b69b267a3f0ed2c39c1d7f20;hb=7c9171526adbd5ee4135027fb436770e91ca7434;hp=505d61ede8b6de99b67b512dee7e9f982b944e8b;hpb=c0b2acecb95ade6bec10f03ad4c0d50a8aafeeac;p=libfirm

diff --git a/ir/ir/irnode.c b/ir/ir/irnode.c
index 505d61ede..ec5d4d965 100644
--- a/ir/ir/irnode.c
+++ b/ir/ir/irnode.c
@@ -23,9 +23,7 @@
  * @author  Martin Trapp, Christian Schaefer, Goetz Lindenmaier, Michael Beck
  * @version $Id$
  */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #ifdef HAVE_STRING_H
 # include <string.h>
@@ -46,6 +44,8 @@
 #include "irhooks.h"
 #include "irtools.h"
 
+#include "beinfo.h"
+
 /* some constants fixing the positions of nodes predecessors
    in the in array */
 #define CALL_PARAM_OFFSET     2
@@ -138,7 +138,9 @@ new_ir_node(dbg_info *db, ir_graph *irg, ir_node *block, ir_op *op, ir_mode *mod
 	char *p;
 	int i;
 
-	assert(irg && op && mode);
+	assert(irg);
+	assert(op);
+	assert(mode);
 	p = obstack_alloc(irg->obst, node_size);
 	memset(p, 0, node_size);
 	res = (ir_node *)(p + firm_add_node_size);
@@ -179,6 +181,9 @@ new_ir_node(dbg_info *db, ir_graph *irg, ir_node *block, ir_op *op, ir_mode *mod
 		edges_notify_edge(res, i - 1, res->in[i], NULL, irg);
 
 	hook_new_node(irg, res);
+	if (get_irg_phase_state(irg) == phase_backend) {
+		be_info_new_node(res);
+	}
 
 	return res;
 }
@@ -443,11 +448,11 @@ ident *get_irn_opident(const ir_node *node) {
 	return node->op->name;
 }
 
-unsigned long (get_irn_visited)(const ir_node *node) {
+ir_visited_t (get_irn_visited)(const ir_node *node) {
 	return _get_irn_visited(node);
 }
 
-void (set_irn_visited)(ir_node *node, unsigned long visited) {
+void (set_irn_visited)(ir_node *node, ir_visited_t visited) {
 	_set_irn_visited(node, visited);
 }
 
@@ -455,14 +460,14 @@ void (mark_irn_visited)(ir_node *node) {
 	_mark_irn_visited(node);
 }
 
-int (irn_not_visited)(const ir_node *node) {
-	return _irn_not_visited(node);
-}
-
 int (irn_visited)(const ir_node *node) {
 	return _irn_visited(node);
 }
 
+int (irn_visited_else_mark)(ir_node *node) {
+	return _irn_visited_else_mark(node);
+}
+
 void (set_irn_link)(ir_node *node, void *link) {
 	_set_irn_link(node, link);
 }
@@ -481,7 +486,7 @@ op_pin_state (is_irn_pinned_in_irg) (const ir_node *node) {
 
 void set_irn_pinned(ir_node *node, op_pin_state state) {
 	/* due to optimization an opt may be turned into a Tuple */
-	if (get_irn_op(node) == op_Tuple)
+	if (is_Tuple(node))
 		return;
 
 	assert(node && get_op_pinned(get_irn_op(node)) >= op_pin_state_exc_pinned);
@@ -490,43 +495,6 @@ void set_irn_pinned(ir_node *node, op_pin_state state) {
 	node->attr.except.pin_state = state;
 }
 
-#ifdef DO_HEAPANALYSIS
-/* Access the abstract interpretation information of a node.
-   Returns NULL if no such information is available. */
-struct abstval *get_irn_abst_value(ir_node *n) {
-	return n->av;
-}
-/* Set the abstract interpretation information of a node. */
-void set_irn_abst_value(ir_node *n, struct abstval *os) {
-	n->av = os;
-}
-struct section *firm_get_irn_section(ir_node *n) {
-	return n->sec;
-}
-void firm_set_irn_section(ir_node *n, struct section *s) {
-	n->sec = s;
-}
-#else
-/* Dummies needed for firmjni. */
-struct abstval *get_irn_abst_value(ir_node *n) {
-	(void) n;
-	return NULL;
-}
-void set_irn_abst_value(ir_node *n, struct abstval *os) {
-	(void) n;
-	(void) os;
-}
-struct section *firm_get_irn_section(ir_node *n) {
-	(void) n;
-	return NULL;
-}
-void firm_set_irn_section(ir_node *n, struct section *s) {
-	(void) n;
-	(void) s;
-}
-#endif /* DO_HEAPANALYSIS */
-
-
 /* Outputs a unique number for this node */
 long get_irn_node_nr(const ir_node *node) {
 	assert(node);
@@ -717,11 +685,11 @@ void set_Block_matured(ir_node *node, int matured) {
 	node->attr.block.is_matured = matured;
 }
 
-unsigned long (get_Block_block_visited)(const ir_node *node) {
+ir_visited_t (get_Block_block_visited)(const ir_node *node) {
 	return _get_Block_block_visited(node);
 }
 
-void (set_Block_block_visited)(ir_node *node, unsigned long visit) {
+void (set_Block_block_visited)(ir_node *node, ir_visited_t visit) {
 	_set_Block_block_visited(node, visit);
 }
 
@@ -730,10 +698,6 @@ void (mark_Block_block_visited)(ir_node *node) {
 	_mark_Block_block_visited(node);
 }
 
-int (Block_not_block_visited)(const ir_node *node) {
-	return _Block_not_block_visited(node);
-}
-
 int (Block_block_visited)(const ir_node *node) {
 	return _Block_block_visited(node);
 }
@@ -901,7 +865,6 @@ ir_node *get_End_keepalive(const ir_node *end, int pos) {
 
 void add_End_keepalive(ir_node *end, ir_node *ka) {
 	assert(is_End(end));
-	assert((is_Phi(ka) || is_Proj(ka) || is_Block(ka) || is_irn_keep(ka)) && "Only Phi, Block or Keep nodes can be kept alive!");
 	add_irn_n(end, ka);
 }
 
@@ -2451,7 +2414,7 @@ get_irn_irg(const ir_node *node) {
 		node = get_irn_n(node, -1);
 	if (is_Bad(node))  /* sometimes bad is predecessor of nodes instead of block: in case of optimization */
 		node = get_irn_n(node, -1);
-	assert(get_irn_op(node) == op_Block);
+	assert(is_Block(node));
 	return node->attr.block.irg;
 }
 
@@ -2530,9 +2493,16 @@ const ir_node *skip_Cast_const(const ir_node *node) {
 	return node;
 }
 
+/* returns operand of node if node is a Pin */
+ir_node *skip_Pin(ir_node *node) {
+	if (is_Pin(node))
+		return get_Pin_op(node);
+	return node;
+}
+
 /* returns operand of node if node is a Confirm */
 ir_node *skip_Confirm(ir_node *node) {
-	if (get_irn_op(node) == op_Confirm)
+	if (is_Confirm(node))
 		return get_Confirm_value(node);
 	return node;
 }