- add ir_bk_outport and ir_bk_inport

[libfirm] / ir / ir / irvrfy.c

diff --git a/ir/ir/irvrfy.c b/ir/ir/irvrfy.c
index 57d5a28..6c6b370 100644 (file)
--- a/ir/ir/irvrfy.c
+++ b/ir/ir/irvrfy.c
@@ -23,9 +23,7 @@
  * @author   Christian Schaefer, Goetz Lindenmaier, Till Riedel, Michael Beck
  * @version  $Id$
  */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "irprog.h"
 #include "irop_t.h"
@@ -60,11 +58,13 @@ static const char *get_mode_name_ex(ir_mode *mode) {
        return get_mode_name(mode);
 }
 
-/** the last IRG, on which a verify error was found */
+/** the last IRG, on which a verification error was found */
 static ir_graph *last_irg_error = NULL;
 
 /**
  * print the name of the entity of an verification failure
+ *
+ * @param node  the node caused the failure
  */
 static void show_entity_failure(ir_node *node) {
        ir_graph *irg = get_irn_irg(node);
@@ -1612,9 +1612,9 @@ static int verify_node_Phi(ir_node *n, ir_graph *irg) {
        }
 
        /* Phi: BB x dataM^n --> dataM */
-       for (i = get_irn_arity(n) - 1; i >= 0; --i) {
-               ir_node *pred = get_irn_n(n, i);
-               if (!is_Bad(pred) && !is_Unknown(pred)) {
+       for (i = get_Phi_n_preds(n) - 1; i >= 0; --i) {
+               ir_node *pred = get_Phi_pred(n, i);
+               if (!is_Bad(pred)) {
                        ASSERT_AND_RET_DBG(
                                get_irn_mode(pred) == mymode,
                                "Phi node", 0,
@@ -1677,9 +1677,6 @@ static int verify_node_Load(ir_node *n, ir_graph *irg) {
        ASSERT_AND_RET(op1mode == mode_M, "Load node", 0);
        if (get_irg_phase_state(irg) != phase_backend) {
                ASSERT_AND_RET(mode_is_reference(op2mode), "Load node", 0 );
-       } else {
-               ASSERT_AND_RET(mode_is_reference(op2mode) ||
-                       (mode_is_int(op2mode) && get_mode_size_bits(op2mode) == get_mode_size_bits(mode_P)), "Load node", 0 );
        }
        ASSERT_AND_RET( mymode == mode_T, "Load node", 0 );
 
@@ -1715,9 +1712,6 @@ static int verify_node_Store(ir_node *n, ir_graph *irg) {
        ASSERT_AND_RET(op1mode == mode_M && mode_is_datab(op3mode), "Store node", 0 );
        if (get_irg_phase_state(irg) != phase_backend) {
                ASSERT_AND_RET(mode_is_reference(op2mode), "Store node", 0 );
-       } else {
-               ASSERT_AND_RET(mode_is_reference(op2mode) ||
-                       (mode_is_int(op2mode) && get_mode_size_bits(op2mode) == get_mode_size_bits(mode_P)), "Store node", 0 );
        }
        ASSERT_AND_RET(mymode == mode_T, "Store node", 0);
 
@@ -1849,11 +1843,6 @@ static int verify_node_CopyB(ir_node *n, ir_graph *irg) {
        if (get_irg_phase_state(irg) != phase_backend) {
                ASSERT_AND_RET(mode_is_reference(op2mode) && mode_is_reference(op3mode),
                        "CopyB node", 0 );
-       } else {
-               ASSERT_AND_RET(mode_is_reference(op2mode) ||
-                       (mode_is_int(op2mode) && get_mode_size_bits(op2mode) == get_mode_size_bits(mode_P)), "CopyB node", 0 );
-               ASSERT_AND_RET(mode_is_reference(op3mode) ||
-                       (mode_is_int(op3mode) && get_mode_size_bits(op3mode) == get_mode_size_bits(mode_P)), "CopyB node", 0 );
        }
 
        ASSERT_AND_RET(