X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeschedrand.c;h=b074c4c2e1dc44b1ace7f4cfd4348a3507cc3e38;hb=a8e4a954b36da58bce5413b569532ef54b87abcd;hp=566f22ad324236b90c7d399eee989d91592ffd7f;hpb=a007290a226265687b1efe8d396ed3406565206f;p=libfirm

diff --git a/ir/be/beschedrand.c b/ir/be/beschedrand.c
index 566f22ad3..b074c4c2e 100644
--- a/ir/be/beschedrand.c
+++ b/ir/be/beschedrand.c
@@ -1,9 +1,32 @@
+/*
+ * Copyright (C) 1995-2007 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.
+ */
+
 /**
- * Trivial node selector.
- * @author Christian Wuerdig
- * @date   29.08.2006
- * @cvs-id $Id$
+ * @file
+ * @brief       Random node selector.
+ * @author      Matthias Braun
+ * @date        29.08.2006
+ * @version     $Id$
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <stdlib.h>
 
@@ -14,33 +37,35 @@
  * The random selector:
  * Just assure that branches are executed last, otherwise select a random node
  */
-static ir_node *random_select(void *block_env, nodeset *ready_set, nodeset *live_set)
+static ir_node *random_select(void *block_env, ir_nodeset_t *ready_set,
+                              ir_nodeset_t *live_set)
 {
+	ir_nodeset_iterator_t iter;
 	const arch_env_t *arch_env = block_env;
 	ir_node          *irn      = NULL;
 	int only_branches_left = 1;
 
 	/* assure that branches and constants are executed last */
-	for (irn = nodeset_first(ready_set); irn; irn = nodeset_next(ready_set)) {
+	ir_nodeset_iterator_init(&iter, ready_set);
+	while( (irn = ir_nodeset_iterator_next(&iter)) != NULL) {
 		if (! arch_irn_class_is(arch_env, irn, branch)) {
 			only_branches_left = 0;
-			nodeset_break(ready_set);
 			break;
 		}
 	}
 
-	if(only_branches_left) {
+	if (only_branches_left) {
 		/* at last: schedule branches */
-		irn = nodeset_first(ready_set);
-		nodeset_break(ready_set);
+		ir_nodeset_iterator_init(&iter, ready_set);
+		irn = ir_nodeset_iterator_next(&iter);
 	} else {
 		do {
-			// take 1 random node
-			int n = rand() % pset_count(ready_set);
+			/* take 1 random node */
+			int n = rand() % ir_nodeset_size(ready_set);
 			int i = 0;
-			for(irn = nodeset_first(ready_set); irn; irn = nodeset_next(ready_set)) {
+			ir_nodeset_iterator_init(&iter, ready_set);
+			while ((irn = ir_nodeset_iterator_next(&iter)) != NULL) {
 				if(i == n) {
-					nodeset_break(ready_set);
 					break;
 				}
 				++i;