X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyilp2.c;h=32a039556eea6496874ced129275e767ce2002b0;hb=4414cc5000681584a075ad1f6242d4a0b8445f57;hp=408ee2785a54061b3ce5bf57a51ac9e5db58012d;hpb=220777144d5892ecc0f689450c42b2bec0607d68;p=libfirm

diff --git a/ir/be/becopyilp2.c b/ir/be/becopyilp2.c
index 408ee2785..32a039556 100644
--- a/ir/be/becopyilp2.c
+++ b/ir/be/becopyilp2.c
@@ -240,7 +240,6 @@ static void make_affinity_var_name(char *buf, size_t buf_size,
 static void build_affinity_cstr(ilp_env_t *ienv)
 {
 	unsigned  n_colors = arch_register_class_n_regs(ienv->co->cls);
-	unit_t   *curr;
 
 	/* for all optimization units */
 	list_for_each_entry(unit_t, curr, &ienv->co->units, units) {
@@ -348,7 +347,7 @@ static inline void remove_edge(set *edges, ir_node *n1, ir_node *n2, size_t *cou
 	}
 }
 
-#define pset_foreach(pset, irn)  for (irn=(ir_node*)pset_first(pset); irn; irn=(ir_node*)pset_next(pset))
+#define pset_foreach(pset, irn) foreach_pset((pset), ir_node, (irn))
 
 /**
  * Search for an interference clique and an external node
@@ -357,12 +356,9 @@ static inline void remove_edge(set *edges, ir_node *n1, ir_node *n2, size_t *cou
  */
 static void build_clique_star_cstr(ilp_env_t *ienv)
 {
-	affinity_node_t *aff;
-
 	/* for each node with affinity edges */
 	co_gs_foreach_aff_node(ienv->co, aff) {
 		struct obstack ob;
-		neighb_t *nbr;
 		const ir_node *center = aff->irn;
 		ir_node **nodes;
 		set *edges;
@@ -417,7 +413,6 @@ static void build_clique_star_cstr(ilp_env_t *ienv)
 				/* search for a candidate to extend the clique */
 				for (i=0; i<n_nodes; ++i) {
 					ir_node *cand = nodes[i];
-					ir_node *member;
 					bool     is_cand;
 
 					/* if its already in the clique try the next */
@@ -450,10 +445,9 @@ static void build_clique_star_cstr(ilp_env_t *ienv)
 
 			/* now the clique is maximal. Finally add the constraint */
 			{
-				ir_node *member;
-				int      var_idx;
-				int      cst_idx;
-				char     buf[32];
+				int  var_idx;
+				int  cst_idx;
+				char buf[32];
 
 				cst_idx = lpp_add_cst(ienv->lp, NULL, lpp_greater_equal, pset_count(clique)-1);
 
@@ -478,7 +472,6 @@ static void extend_path(ilp_env_t *ienv, pdeq *path, const ir_node *irn)
 	int i, len;
 	ir_node **curr_path;
 	affinity_node_t *aff;
-	neighb_t *nbr;
 
 	/* do not walk backwards or in circles */
 	if (pdeq_contains(path, irn))
@@ -540,8 +533,6 @@ end:
  */
 static void build_path_cstr(ilp_env_t *ienv)
 {
-	affinity_node_t *aff_info;
-
 	/* for each node with affinity edges */
 	co_gs_foreach_aff_node(ienv->co, aff_info) {
 		pdeq *path = new_pdeq();