projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
besched: Add and use sched_replace().
[libfirm]
/
ir
/
be
/
beschedrand.c
diff --git
a/ir/be/beschedrand.c
b/ir/be/beschedrand.c
index
064b124
..
394b771
100644
(file)
--- a/
ir/be/beschedrand.c
+++ b/
ir/be/beschedrand.c
@@
-37,40
+37,37
@@
*/
static ir_node *random_select(void *block_env, ir_nodeset_t *ready_set)
{
*/
static ir_node *random_select(void *block_env, ir_nodeset_t *ready_set)
{
- ir_nodeset_iterator_t iter;
- ir_node *irn = NULL;
int only_branches_left = 1;
(void)block_env;
/* assure that branches and constants are executed last */
int only_branches_left = 1;
(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;
}
}
if (!is_cfop(irn)) {
only_branches_left = 0;
break;
}
}
+ ir_node *rand_node = NULL;
if (only_branches_left) {
/* at last: schedule branches */
if (only_branches_left) {
/* at last: schedule branches */
- ir_nodeset_iterator_init(&iter, ready_set);
- irn = ir_nodeset_iterator_next(&iter);
+ rand_node = ir_nodeset_first(ready_set);
} else {
do {
/* take 1 random node */
int n = rand() % ir_nodeset_size(ready_set);
int i = 0;
} else {
do {
/* 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) {
+ rand_node = irn;
if (i == n) {
break;
}
++i;
}
if (i == n) {
break;
}
++i;
}
- } while (is_cfop(
irn
));
+ } while (is_cfop(
rand_node
));
}
}
- return
irn
;
+ return
rand_node
;
}
static void *random_init_graph(ir_graph *irg)
}
static void *random_init_graph(ir_graph *irg)