differentiate between Bad and Deleted (because of exchange) nodes, this avoid some...

[libfirm] / ir / be / beverify.c

diff --git a/ir/be/beverify.c b/ir/be/beverify.c
index bff057e..059b39e 100644 (file)
--- a/ir/be/beverify.c
+++ b/ir/be/beverify.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2010 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -285,50 +285,12 @@ static void verify_schedule_walker(ir_node *block, void *data)
        }
 }
 
-static int should_be_scheduled(ir_node *node)
-{
-       switch (get_irn_opcode(node)) {
-       case iro_Bad:
-       case iro_Block:
-       case iro_End:
-       case iro_NoMem:
-       case iro_Pin:
-       case iro_Proj:
-       case iro_Sync:
-       case iro_Unknown:
-               return 0;
-       case iro_Phi:
-               if (get_irn_mode(node) == mode_M)
-                       return 0;
-               break;
-       case iro_Start:
-       case iro_Jmp:
-       case beo_Return:
-               return 1;
-       default:
-               break;
-       }
-
-       if (get_irn_mode(node) != mode_T) {
-               if (arch_irn_is_ignore(node))
-                       return -1;
-       }
-
-       return 1;
-}
-
 static void check_schedule(ir_node *node, void *data)
 {
        be_verify_schedule_env_t *env = data;
-       int should_be;
-       int scheduled;
-
-       should_be = should_be_scheduled(node);
-       if (should_be == -1)
-               return;
+       bool should_be = to_appear_in_schedule(node);
+       bool scheduled = bitset_is_set(env->scheduled, get_irn_idx(node));
 
-       scheduled = bitset_is_set(env->scheduled, get_irn_idx(node)) ? 1 : 0;
-       should_be = should_be ? 1 : 0;
        if (should_be != scheduled) {
                ir_fprintf(stderr, "Verify warning: Node %+F in block %+F(%s) should%s be scheduled\n",
                        node, get_nodes_block(node), get_irg_dump_name(env->irg), should_be ? "" : " not");
@@ -360,7 +322,7 @@ int be_verify_schedule(ir_graph *irg)
 
 
 
-typedef struct _spill_t {
+typedef struct spill_t {
        ir_node *spill;
        ir_entity *ent;
 } spill_t;
@@ -727,10 +689,9 @@ static void check_input_constraints(ir_node *node)
        /* verify input register */
        arity = get_irn_arity(node);
        for (i = 0; i < arity; ++i) {
-               ir_node *pred = get_irn_n(node, i);
-
-               if (is_Unknown(pred))
-                       continue;
+               const arch_register_req_t *req      = arch_get_in_register_req(node, i);
+               ir_node                   *pred     = get_irn_n(node, i);
+               const arch_register_req_t *pred_req = arch_get_register_req_out(pred);
 
                if (is_Bad(pred)) {
                        ir_fprintf(stderr, "Verify warning: %+F in block %+F(%s) has Bad as input %d\n",
@@ -738,11 +699,24 @@ static void check_input_constraints(ir_node *node)
                        problem_found = 1;
                        continue;
                }
-
-               if (arch_get_irn_reg_class(node, i) == NULL)
+               if (req->cls == NULL)
                        continue;
 
+               if (req->width > pred_req->width) {
+                       ir_fprintf(stderr, "Verify warning: %+F in block %+F(%s) register width of value at input %d too small\n",
+                                  node, get_nodes_block(node), get_irg_dump_name(irg), i);
+                       problem_found = 1;
+               }
+
                reg = arch_get_irn_register(pred);
+               if (req->type & arch_register_req_type_aligned) {
+                       if (reg->index % req->width != 0) {
+                               ir_fprintf(stderr, "Verify warning: %+F in block %+F(%s) register allignment not fulfilled\n",
+                                          node, get_nodes_block(node), get_irg_dump_name(irg), i);
+                               problem_found = 1;
+                       }
+               }
+
                if (reg == NULL) {
                        ir_fprintf(stderr, "Verify warning: Node %+F in block %+F(%s) should have a register assigned (%+F input constraint)\n",
                                   pred, get_nodes_block(pred), get_irg_dump_name(irg), node);