X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyilp.c;h=dd79748b641d6f9587c5eb784cd2986be8c01941;hb=2814a774ee584b3c19ff3c87b3775ff46859b21e;hp=3c22accbe2612b79217286754ebcf0954601fa29;hpb=d64ea79ebc6d41bc4253f6b6fd0a09582dce20eb;p=libfirm

diff --git a/ir/be/becopyilp.c b/ir/be/becopyilp.c
index 3c22accbe..dd79748b6 100644
--- a/ir/be/becopyilp.c
+++ b/ir/be/becopyilp.c
@@ -24,15 +24,13 @@
  * @date        28.02.2006
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif /* HAVE_CONFIG_H */
 
 #include "irtools.h"
 #include "irprintf.h"
 
 #include "bestatevent.h"
-#include "beirg_t.h"
+#include "beirg.h"
 #include "bemodule.h"
 #include "error.h"
 
@@ -108,13 +106,15 @@ 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)
@@ -140,11 +140,11 @@ void sr_remove(size_red_t *sr) {
 	while (redo) {
 		redo = 0;
 		be_ifg_foreach_node(ifg, iter, irn) {
-			const arch_register_req_t *req = arch_get_register_req(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)) {
-					coloring_suffix_t *cs = obstack_alloc(&sr->ob, sizeof(*cs));
+					coloring_suffix_t *cs = OALLOC(&sr->ob, coloring_suffix_t);
 
 					cs->irn = irn;
 					cs->next = sr->col_suff;
@@ -176,7 +176,7 @@ 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));
 		}
 
 		/* now all bits not set are possible colors */
@@ -272,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 */