X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firnode.c;h=d2762252a4e64041c827d6bae2b7d127bf45dbe8;hb=357886575cb0becb5bd9be376fde49b57edd5385;hp=b082af4a5188e31cc5502d6fefa2abf4d458a49e;hpb=3cbd413165c32732a2752738997b0bee27b9f51b;p=libfirm

diff --git a/ir/ir/irnode.c b/ir/ir/irnode.c
index b082af4a5..d2762252a 100644
--- a/ir/ir/irnode.c
+++ b/ir/ir/irnode.c
@@ -1237,24 +1237,28 @@ int is_memop(const ir_node *node)
 ir_node *get_memop_mem(const ir_node *node)
 {
 	assert(is_memop(node));
+	assert(n_Load_mem == 0 && n_Store_mem == 0);
 	return get_irn_n(node, 0);
 }
 
 void set_memop_mem(ir_node *node, ir_node *mem)
 {
 	assert(is_memop(node));
+	assert(n_Load_mem == 0 && n_Store_mem == 0);
 	set_irn_n(node, 0, mem);
 }
 
 ir_node *get_memop_ptr(const ir_node *node)
 {
 	assert(is_memop(node));
+	assert(n_Load_mem == 1 && n_Store_mem == 1);
 	return get_irn_n(node, 1);
 }
 
 void set_memop_ptr(ir_node *node, ir_node *ptr)
 {
 	assert(is_memop(node));
+	assert(n_Load_mem == 1 && n_Store_mem == 1);
 	set_irn_n(node, 1, ptr);
 }
 
@@ -1302,6 +1306,28 @@ int (is_arg_Proj)(const ir_node *node)
 	return _is_arg_Proj(node);
 }
 
+int is_x_except_Proj(const ir_node *node)
+{
+	ir_node *pred;
+	if (!is_Proj(node))
+		return false;
+	pred = get_Proj_pred(node);
+	if (!is_fragile_op(pred))
+		return false;
+	return get_Proj_proj(node) == pred->op->pn_x_except;
+}
+
+int is_x_regular_Proj(const ir_node *node)
+{
+	ir_node *pred;
+	if (!is_Proj(node))
+		return false;
+	pred = get_Proj_pred(node);
+	if (!is_fragile_op(pred))
+		return false;
+	return get_Proj_proj(node) == pred->op->pn_x_regular;
+}
+
 ir_node **get_Tuple_preds_arr(ir_node *node)
 {
 	assert(is_Tuple(node));
@@ -1517,23 +1543,7 @@ int is_fragile_op(const ir_node *node)
 ir_node *get_fragile_op_mem(ir_node *node)
 {
 	assert(node && is_fragile_op(node));
-
-	switch (get_irn_opcode(node)) {
-	case iro_Call  :
-	case iro_Div   :
-	case iro_Mod   :
-	case iro_Load  :
-	case iro_Store :
-	case iro_Alloc :
-	case iro_Bound :
-	case iro_CopyB :
-		return get_irn_n(node, pn_Generic_M);
-	case iro_Bad   :
-	case iro_Unknown:
-		return node;
-	default:
-		panic("should not be reached");
-	}
+	return get_irn_n(node, node->op->fragile_mem_index);
 }
 
 /* Returns true if the operation is a forking control flow operation. */