X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firvrfy.c;h=7e7ffd33c147a5f11952e4a9df4c0fc377142ac8;hb=2cee4704915e0e2ecc85568536570601419a251b;hp=58e5de00b908d338c93e7799d24e34b0a5b370a5;hpb=a09e658c8142719ef2be114547455bb5a68f480d;p=libfirm

diff --git a/ir/ir/irvrfy.c b/ir/ir/irvrfy.c
index 58e5de00b..7e7ffd33c 100644
--- a/ir/ir/irvrfy.c
+++ b/ir/ir/irvrfy.c
@@ -300,6 +300,7 @@ static int verify_node_Proj_Start(ir_node *n, ir_node *p) {
      (proj == pn_Start_M         && mode == mode_M) ||
      (proj == pn_Start_P_frame_base && mode_is_reference(mode)) ||
      (proj == pn_Start_P_globals && mode_is_reference(mode)) ||
+     (proj == pn_Start_P_tls     && mode_is_reference(mode)) ||
      (proj == pn_Start_T_args    && mode == mode_T) ||
      (proj == pn_Start_P_value_arg_base && mode_is_reference(mode)) ||
      (proj == pn_Start_P_value_arg_base && mode == mode_T)    /* FIXME: only one of those */
@@ -702,8 +703,9 @@ static int verify_node_Proj_CopyB(ir_node *n, ir_node *p) {
   long proj     = get_Proj_proj(p);
 
   ASSERT_AND_RET_DBG(
-    ((proj == pn_CopyB_M        && mode == mode_M) ||
-     (proj == pn_CopyB_X_except && mode == mode_X)),
+    ((proj == pn_CopyB_M_regular && mode == mode_M) ||
+     (proj == pn_CopyB_X_except  && mode == mode_X) ||
+     (proj == pn_CopyB_M_except  && mode == mode_M)),
     "wrong Proj from CopyB", 0,
     show_proj_failure(p);
   );
@@ -1425,6 +1427,28 @@ static int verify_node_Phi(ir_node *n, ir_graph *irg) {
       );
   }
   ASSERT_AND_RET( mode_is_dataM(mymode), "Phi node", 0 );
+
+  if (mymode == mode_M) {
+    for (i = get_Phi_n_preds(n) - 1; i >= 0; --i) {
+      int j;
+      ir_node *pred_i = get_Phi_pred(n, i);
+
+      if (is_Bad(pred_i))
+        continue;
+      for (j = i - 1; j >= 0; --j) {
+        ir_node *pred_j = get_Phi_pred(n, j);
+
+        if (is_Bad(pred_j))
+          continue;
+        ASSERT_AND_RET_DBG(
+          (pred_i == pred_j) || (get_irn_n(pred_i, -1) != get_irn_n(pred_j, -1)),
+          "At least two different PhiM predecessors are in the same block",
+          0,
+          ir_printf("%+F and %+F of %+F are in %+F\n", pred_i, pred_j, n, get_irn_n(pred_i, -1))
+        );
+      }
+    }
+  }
   return 1;
 }
 
@@ -1656,11 +1680,13 @@ static int verify_node_Bound(ir_node *n, ir_graph *irg) {
   return 1;
 }
 
-/*
+/**
  * Check dominance.
  * For each usage of a node, it is checked, if the block of the
  * node dominates the block of the usage (for phis: the predecessor
  * block of the phi for the corresponding edge).
+ *
+ * @return non-zero on success, 0 on dominance error
  */
 static int check_dominance_for_node(ir_node *use)
 {
@@ -1830,7 +1856,7 @@ int irn_vrfy_irg_dump(ir_node *n, ir_graph *irg, const char **bad_string)
   firm_vrfy_failure_msg = NULL;
   do_node_verification(FIRM_VERIFICATION_ERROR_ONLY);
   res = irn_vrfy_irg(n, irg);
-  if (! res && get_irg_dom_state(irg) == dom_consistent &&
+  if (res && get_irg_dom_state(irg) == dom_consistent &&
       get_irg_pinned(irg) == op_pin_state_pinned)
     res = check_dominance_for_node(n);
   do_node_verification(old);