X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyilp.c;h=b4242fe2b75d543e8bfb0a2cf064eb85b50210ee;hb=b970c1e92d69012f76091aa1d9d2d2e2d3f6221b;hp=ad3953793e5746638a20f5f6f803e49a49e7b29c;hpb=4d5c3365a58cba59993045a9e08e686d8ae079a7;p=libfirm

diff --git a/ir/be/becopyilp.c b/ir/be/becopyilp.c
index ad3953793..b4242fe2b 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.
  *
@@ -18,17 +18,13 @@
  */
 
 /**
- * Author:      Daniel Grund
- * Date:		28.02.2006
- * Copyright:   (c) Universitaet Karlsruhe
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
- *
- * Common stuff used by all ILP fomulations.
- *
+ * @file
+ * @brief       Common stuff used by all ILP formulations.
+ * @author      Daniel Grund
+ * @date        28.02.2006
+ * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif /* HAVE_CONFIG_H */
 
 #include "irtools.h"
 #include "irprintf.h"
@@ -38,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
 
@@ -66,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)
@@ -97,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();
@@ -110,19 +106,20 @@ size_red_t *new_size_red(copy_opt_t *co) {
 /**
  * Checks if a node is simplicial in the graph heeding the already removed nodes.
  */
-static INLINE int sr_is_simplicial(size_red_t *sr, const ir_node *ifn) {
-	int i, o, size = 0;
-	ir_node **all, *curr;
-	be_ifg_t *ifg = sr->co->cenv->ifg;
-	void *iter = be_ifg_neighbours_iter_alloca(ifg);
-
-	all = alloca(be_ifg_degree(ifg, ifn) * sizeof(*all));
+static inline int sr_is_simplicial(size_red_t *sr, const ir_node *ifn)
+{
+	be_ifg_t *ifg  = sr->co->cenv->ifg;
+	void     *iter = be_ifg_neighbours_iter_alloca(ifg);
+	ir_node **all  = ALLOCAN(ir_node*, be_ifg_degree(ifg, ifn));
+	ir_node  *curr;
+	int       size = 0;
+	int       i;
+	int       o;
 
 	/* get all non-removed neighbors */
 	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)
@@ -143,12 +140,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_out(irn);
 
 			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;
@@ -158,10 +153,9 @@ void sr_remove(size_red_t *sr) {
 					pset_insert_ptr(sr->all_removed, irn);
 
 					redo = 1;
-          	 	}
+				}
 			}
 		}
-		be_ifg_nodes_break(ifg, iter);
 	}
 }
 
@@ -182,9 +176,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);
@@ -213,8 +206,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;
@@ -280,7 +272,7 @@ void free_ilp_env(ilp_env_t *ienv) {
 
 #else /* WITH_ILP */
 
-static INLINE void only_that_you_can_compile_without_WITH_ILP_defined(void) {
+static inline void only_that_you_can_compile_without_WITH_ILP_defined(void) {
 }
 
 #endif /* WITH_ILP */