Use foreach_ir_nodeset() instead of reimplementing it.

diff --git a/ir/be/beschedrand.c b/ir/be/beschedrand.c
index 064b124..d675e01 100644 (file)
--- a/ir/be/beschedrand.c
+++ b/ir/be/beschedrand.c
@@ -43,8 +43,7 @@ static ir_node *random_select(void *block_env, ir_nodeset_t *ready_set)
        (void)block_env;
 
        /* assure that branches and constants are executed last */
-       ir_nodeset_iterator_init(&iter, ready_set);
-       while ( (irn = ir_nodeset_iterator_next(&iter)) != NULL) {
+       foreach_ir_nodeset(ready_set, irn, iter) {
                if (!is_cfop(irn)) {
                        only_branches_left = 0;
                        break;
@@ -60,8 +59,7 @@ static ir_node *random_select(void *block_env, ir_nodeset_t *ready_set)
                        /* take 1 random node */
                        int n = rand() % ir_nodeset_size(ready_set);
                        int i = 0;
-                       ir_nodeset_iterator_init(&iter, ready_set);
-                       while ((irn = ir_nodeset_iterator_next(&iter)) != NULL) {
+                       foreach_ir_nodeset(ready_set, irn, iter) {
                                if (i == n) {
                                        break;
                                }

diff --git a/ir/be/beschedregpress.c b/ir/be/beschedregpress.c
index 7c90b4d..c2f06b4 100644 (file)
--- a/ir/be/beschedregpress.c
+++ b/ir/be/beschedregpress.c
@@ -266,8 +266,7 @@ static ir_node *reg_pressure_select(void *block_env, ir_nodeset_t *ready_set)
 
        assert(ir_nodeset_size(ready_set) > 0);
 
-       ir_nodeset_iterator_init(&iter, ready_set);
-       while ( (irn = ir_nodeset_iterator_next(&iter)) != NULL) {
+       foreach_ir_nodeset(ready_set, irn, iter) {
                /*
                Ignore branch instructions for the time being.
                They should only be scheduled if there is nothing else.