X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firvrfy.c;h=146c3eca96ed63bd7e08e89ebd53c965979561f7;hb=f9d25133f86594ca2b1f33fb0b41a591ecc9b914;hp=e7dcd623c847214196d453346b9de1e9de6b3331;hpb=db82d2698179ba19f3180ef2dd014f804230c174;p=libfirm

diff --git a/ir/ir/irvrfy.c b/ir/ir/irvrfy.c
index e7dcd623c..146c3eca9 100644
--- a/ir/ir/irvrfy.c
+++ b/ir/ir/irvrfy.c
@@ -23,6 +23,7 @@
 # include "irdump.h"
 # include "irdom_t.h"
 # include "irprintf.h"
+# include "irouts.h"
 
 /** if this flag is set, verify entity types in Load & Store nodes */
 static int vrfy_entities = 0;
@@ -829,11 +830,12 @@ static int verify_node_Cond(ir_node *n, ir_graph *irg) {
   );
   ASSERT_AND_RET(mymode == mode_T, "Cond mode is not a tuple", 0);
 
-  if (op1mode == mode_b && get_irg_outs_state(irg) == outs_consistent) {
+  if (op1mode == mode_b && get_irg_outs_state(irg) == outs_consistent &&
+      !is_Block_dead(get_nodes_block(n))) {
     /* we have consistent outs, check for the right number of Proj's */
     ASSERT_AND_RET(
-      get_irn_n_outs(n) == 2,
-      "BinaryCond node must have 2 successors", 0);
+    get_irn_n_outs(n) == 2,
+   "Live binary Cond node must have 2 successors", 0);
   }
   return 1;
 }
@@ -1568,6 +1570,37 @@ static int verify_node_Mux(ir_node *n, ir_graph *irg) {
   return 1;
 }
 
+/**
+ * verify a CopyB node
+ */
+static int verify_node_CopyB(ir_node *n, ir_graph *irg) {
+  ir_mode *mymode  = get_irn_mode(n);
+  ir_mode *op1mode = get_irn_mode(get_CopyB_mem(n));
+  ir_mode *op2mode = get_irn_mode(get_CopyB_dst(n));
+  ir_mode *op3mode = get_irn_mode(get_CopyB_src(n));
+  type *t = get_CopyB_type(n);
+
+  /* CopyB: BB x M x ref x ref --> M x X */
+  ASSERT_AND_RET(
+    mymode == mode_T &&
+    op1mode == mode_M &&
+    mode_is_reference(op2mode) &&
+    mode_is_reference(op3mode),
+    "CopyB node", 0 );  /* operand M x ref x ref */
+
+  ASSERT_AND_RET(
+    is_compound_type(t),
+    "CopyB node should copy compound types only", 0 );
+
+  /* NoMem nodes are only allowed as memory input if the CopyB is NOT pinned.
+     This should happen RARELY, as CopyB COPIES MEMORY */
+  ASSERT_AND_RET(
+    (get_irn_op(get_CopyB_mem(n)) == op_NoMem) ||
+    (get_irn_op(get_CopyB_mem(n)) != op_NoMem && get_irn_pinned(n) == op_pin_state_pinned),
+    "CopyB node with wrong memory input", 0 );
+  return 1;
+}
+
 /*
  * Check dominance.
  * For each usage of a node, it is checked, if the block of the
@@ -1610,6 +1643,7 @@ static int check_dominance_for_node(ir_node *use)
   return 1;
 }
 
+/* Tests the modes of n and its predecessors. */
 int irn_vrfy_irg(ir_node *n, ir_graph *irg)
 {
   int i;
@@ -1700,7 +1734,7 @@ int irg_verify(ir_graph *irg, unsigned flags)
   current_ir_graph = irg;
   last_irg_error = NULL;
 
-  assert(get_irg_pinned(irg) == op_pin_state_pinned);
+  assert(get_irg_pinned(irg) == op_pin_state_pinned && "Verification need pinned graph");
 
   if (flags & VRFY_ENFORCE_SSA)
     compute_doms(irg);
@@ -1913,6 +1947,7 @@ void firm_set_default_verifyer(ir_op *op)
    CASE(Sync);
    CASE(Confirm);
    CASE(Mux);
+   CASE(CopyB);
    default:
      op->verify_node = NULL;
    }