remove #ifdef HAVE_CONFIG_Hs

[libfirm] / ir / be / beschedrand.c

diff --git a/ir/be/beschedrand.c b/ir/be/beschedrand.c
index 5162eec..6f7e38f 100644 (file)
--- a/ir/be/beschedrand.c
+++ b/ir/be/beschedrand.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -18,14 +18,13 @@
  */
 
 /**
- * Trivial node selector.
- * @author Matthias Braun
- * @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>
 
@@ -40,56 +39,61 @@ 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;
+       (void)block_env;
+       (void)live_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(arch_env, irn, branch)) {
+               if (!arch_irn_class_is(irn, branch)) {
                        only_branches_left = 0;
                        break;
                }
        }
 
-       if(only_branches_left) {
+       if (only_branches_left) {
                /* at last: schedule branches */
                ir_nodeset_iterator_init(&iter, ready_set);
                irn = ir_nodeset_iterator_next(&iter);
        } else {
                do {
-                       // take 1 random node
+                       /* 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) {
+                       while ((irn = ir_nodeset_iterator_next(&iter)) != NULL) {
                                if(i == n) {
                                        break;
                                }
                                ++i;
                        }
-               } while(arch_irn_class_is(arch_env, irn, branch));
+               } while (arch_irn_class_is(irn, branch));
        }
 
        return irn;
 }
 
-static void *random_init_graph(const list_sched_selector_t *vtab, const arch_env_t *arch_env, ir_graph *irg)
+static void *random_init_graph(const list_sched_selector_t *vtab, const be_irg_t *birg)
 {
+       (void)vtab;
+       (void)birg;
        /* 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 ... */
        srand(0x4711);
-       return (void *)arch_env;
+       return NULL;
 }
 
-static void *random_init_block(void *graph_env, ir_node *bl)
+static void *random_init_block(void *graph_env, ir_node *block)
 {
-       return graph_env;
+       (void)graph_env;
+       (void)block;
+       return NULL;
 }
 
-static const list_sched_selector_t random_selector_struct = {
+const list_sched_selector_t random_selector = {
        random_init_graph,
        random_init_block,
        random_select,
@@ -101,5 +105,3 @@ static const list_sched_selector_t random_selector_struct = {
        NULL,                /* finish_block */
        NULL                 /* finish_graph */
 };
-
-const list_sched_selector_t *random_selector = &random_selector_struct;