improve some verify messages

[libfirm] / ir / be / beschedrand.c

diff --git a/ir/be/beschedrand.c b/ir/be/beschedrand.c
index 6f7e38f..e7fc89c 100644 (file)
--- a/ir/be/beschedrand.c
+++ b/ir/be/beschedrand.c
@@ -28,7 +28,7 @@
 
 #include <stdlib.h>
 
-#include "besched_t.h"
+#include "besched.h"
 #include "belistsched.h"
 
 /**
@@ -46,8 +46,8 @@ static ir_node *random_select(void *block_env, ir_nodeset_t *ready_set,
 
        /* assure that branches and constants are executed last */
        ir_nodeset_iterator_init(&iter, ready_set);
-       while( (irn = ir_nodeset_iterator_next(&iter)) != NULL) {
-               if (!arch_irn_class_is(irn, branch)) {
+       while ( (irn = ir_nodeset_iterator_next(&iter)) != NULL) {
+               if (!is_cfop(irn)) {
                        only_branches_left = 0;
                        break;
                }
@@ -64,21 +64,21 @@ static ir_node *random_select(void *block_env, ir_nodeset_t *ready_set,
                        int i = 0;
                        ir_nodeset_iterator_init(&iter, ready_set);
                        while ((irn = ir_nodeset_iterator_next(&iter)) != NULL) {
-                               if(i == n) {
+                               if (i == n) {
                                        break;
                                }
                                ++i;
                        }
-               } while (arch_irn_class_is(irn, branch));
+               } while (is_cfop(irn));
        }
 
        return irn;
 }
 
-static void *random_init_graph(const list_sched_selector_t *vtab, const be_irg_t *birg)
+static void *random_init_graph(const list_sched_selector_t *vtab, ir_graph *irg)
 {
        (void)vtab;
-       (void)birg;
+       (void)irg;
        /* Using time(NULL) as a seed here gives really random results,
           but is NOT deterministic which makes debugging impossible.
           Moreover no-one want non-deterministic compilers ... */
@@ -97,7 +97,6 @@ const list_sched_selector_t random_selector = {
        random_init_graph,
        random_init_block,
        random_select,
-       NULL,                /* to_appear_in_schedule */
        NULL,                /* node_ready */
        NULL,                /* node_selected */
        NULL,                /* exectime */