X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyilp.c;h=07e64947923298f8207da0cf150f7a0f7e20853f;hb=afbbc0b1ccd684c4c24bfd43d0f994123245f39f;hp=1199df0b677323a1c7bdf8a540cd48d367925792;hpb=e885f504c9e7ab65a17968745884cabd3d14bf4b;p=libfirm

diff --git a/ir/be/becopyilp.c b/ir/be/becopyilp.c
index 1199df0b6..07e649479 100644
--- 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.
  *
@@ -36,8 +36,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
 
@@ -95,7 +95,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 +120,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)
@@ -146,7 +145,7 @@ void sr_remove(size_red_t *sr) {
 			req = arch_get_register_req(sr->co->aenv, 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 +155,9 @@ void sr_remove(size_red_t *sr) {
 					pset_insert_ptr(sr->all_removed, irn);
 
 					redo = 1;
-          	 	}
+				}
 			}
 		}
-		be_ifg_nodes_break(ifg, iter);
 	}
 }
 
@@ -182,7 +180,6 @@ void sr_reinsert(size_red_t *sr) {
 			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));
 		}
-		be_ifg_neighbours_break(ifg, iter);
 
 		/* now all bits not set are possible colors */
 		free_col = bitset_next_clear(used_cols, 0);
@@ -211,8 +208,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;