/*
- * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved.
- *
* This file is part of libFirm.
- *
- * This file may be distributed and/or modified under the terms of the
- * GNU General Public License version 2 as published by the Free Software
- * Foundation and appearing in the file LICENSE.GPL included in the
- * packaging of this file.
- *
- * Licensees holding valid libFirm Professional Edition licenses may use
- * this file in accordance with the libFirm Commercial License.
- * Agreement provided with the Software.
- *
- * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE.
+ * Copyright (C) 2012 University of Karlsruhe.
*/
/**
*/
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 */
- 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;
}
}
+ ir_node *rand_node = NULL;
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;
- 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;
}
- } while (is_cfop(irn));
+ } while (is_cfop(rand_node));
}
- return irn;
+ return rand_node;
}
static void *random_init_graph(ir_graph *irg)