Complement r22830.

[libfirm] / ir / be / becopyilp.c

diff --git a/ir/be/becopyilp.c b/ir/be/becopyilp.c
index b42cad0..3120588 100644 (file)
--- a/ir/be/becopyilp.c
+++ b/ir/be/becopyilp.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.
  *
@@ -24,9 +24,7 @@
  * @date        28.02.2006
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif /* HAVE_CONFIG_H */
+#include "config.h" /* HAVE_CONFIG_H */
 
 #include "irtools.h"
 #include "irprintf.h"
@@ -36,8 +34,8 @@
 #include "bemodule.h"
 #include "error.h"
 
-#include <libcore/lc_opts.h>
-#include <libcore/lc_opts_enum.h>
+#include "lc_opts.h"
+#include "lc_opts_enum.h"
 
 #ifdef WITH_ILP
 
@@ -64,7 +62,7 @@ static const lc_opt_table_entry_t options[] = {
        LC_OPT_ENT_BOOL     ("net",   "solve over the net", &solve_net),
        LC_OPT_ENT_BOOL     ("log",   "show ilp solving log",              &solve_log),
        LC_OPT_ENT_ENUM_MASK("dump",  "dump flags",             &dump_var),
-       { NULL }
+       LC_OPT_LAST
 };
 
 void be_init_copyilp(void)
@@ -95,7 +93,7 @@ BE_REGISTER_MODULE_CONSTRUCTOR(be_init_copyilp);
 
 
 size_red_t *new_size_red(copy_opt_t *co) {
-       size_red_t *res = xmalloc(sizeof(*res));
+       size_red_t *res = XMALLOC(size_red_t);
 
        res->co = co;
        res->all_removed = pset_new_ptr_default();
@@ -120,7 +118,6 @@ static INLINE int sr_is_simplicial(size_red_t *sr, const ir_node *ifn) {
        be_ifg_foreach_neighbour(ifg, iter, ifn, curr)
                if (!sr_is_removed(sr, curr))
                        all[size++] = curr;
-       be_ifg_neighbours_break(ifg, iter);
 
        /* check if these form a clique */
        for (i=0; i<size; ++i)
@@ -141,12 +138,10 @@ void sr_remove(size_red_t *sr) {
        while (redo) {
                redo = 0;
                be_ifg_foreach_node(ifg, iter, irn) {
-                       const arch_register_req_t *req;
-
-                       req = arch_get_register_req(sr->co->aenv, irn, -1);
+                       const arch_register_req_t *req = arch_get_register_req(irn, -1);
 
                        if (!arch_register_req_is(req, limited) && !sr_is_removed(sr, irn) && !co_gs_is_optimizable(sr->co, irn)) {
-                       if (sr_is_simplicial(sr, irn)) {
+                               if (sr_is_simplicial(sr, irn)) {
                                        coloring_suffix_t *cs = obstack_alloc(&sr->ob, sizeof(*cs));
 
                                        cs->irn = irn;
@@ -156,10 +151,9 @@ void sr_remove(size_red_t *sr) {
                                        pset_insert_ptr(sr->all_removed, irn);
 
                                        redo = 1;
-                       }
+                               }
                        }
                }
-               be_ifg_nodes_break(ifg, iter);
        }
 }
 
@@ -180,9 +174,8 @@ void sr_reinsert(size_red_t *sr) {
 
                be_ifg_foreach_neighbour(ifg, iter, irn, other) {
                        if (!sr_is_removed(sr, other)) /* only inspect nodes which are in graph right now */
-                               bitset_set(used_cols, get_irn_col(sr->co, other));
+                               bitset_set(used_cols, get_irn_col(other));
                }
-               be_ifg_neighbours_break(ifg, iter);
 
                /* now all bits not set are possible colors */
                free_col = bitset_next_clear(used_cols, 0);
@@ -211,8 +204,7 @@ void free_size_red(size_red_t *sr) {
 #include <stdio.h>
 
 ilp_env_t *new_ilp_env(copy_opt_t *co, ilp_callback build, ilp_callback apply, void *env) {
-       ilp_env_t *res = xmalloc(sizeof(*res));
-       assert(res);
+       ilp_env_t *res = XMALLOC(ilp_env_t);
 
        res->co         = co;
        res->build      = build;