X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbepbqpcoloring.c;h=8d4f3dc92e52de1ce21cc0b863b6cec0e74873d6;hb=df2b95749623cb0c4768104ce3ceb85cf3d9307b;hp=99aadb39e61b0ca0d3269d323cb649a982ed8465;hpb=1a3b7d363474ab544c13093a2f0b578718d37c7a;p=libfirm

diff --git a/ir/be/bepbqpcoloring.c b/ir/be/bepbqpcoloring.c
index 99aadb39e..8d4f3dc92 100644
--- a/ir/be/bepbqpcoloring.c
+++ b/ir/be/bepbqpcoloring.c
@@ -28,8 +28,6 @@
 /* miscellaneous includes */
 #include "config.h"
 
-#ifdef FIRM_KAPS
-
 #include "debug.h"
 #include "error.h"
 
@@ -623,7 +621,11 @@ static void be_pbqp_coloring(be_chordal_env_t *env)
 	be_pbqp_alloc_env_t          pbqp_alloc_env;
 	unsigned                     col;
 	unsigned                     row;
-
+	pbqp_matrix_t               *ife_matrix;
+	num                          solution;
+#if KAPS_DUMP
+	FILE                        *file_before;
+#endif
 #if TIMER
 	ir_timer_t *t_ra_pbqp_alloc_create     = ir_timer_new();
 	ir_timer_t *t_ra_pbqp_alloc_solve      = ir_timer_new();
@@ -661,7 +663,7 @@ static void be_pbqp_coloring(be_chordal_env_t *env)
 
 
 	/* create costs matrix template for interference edges */
-	pbqp_matrix_t *ife_matrix = pbqp_matrix_alloc(pbqp_alloc_env.pbqp_inst, colors_n, colors_n);
+	ife_matrix = pbqp_matrix_alloc(pbqp_alloc_env.pbqp_inst, colors_n, colors_n);
 	/* set costs */
 	for (row = 0, col = 0; row < colors_n; row++, col++)
 		pbqp_matrix_set(ife_matrix, row, col, INF_COSTS);
@@ -711,18 +713,20 @@ static void be_pbqp_coloring(be_chordal_env_t *env)
 
 #if KAPS_DUMP
 	// dump graph before solving pbqp
-	FILE *file_before = my_open(env, "", "-pbqp_coloring.html");
+	file_before = my_open(env, "", "-pbqp_coloring.html");
 	set_dumpfile(pbqp_alloc_env.pbqp_inst, file_before);
 #endif
 
-	/* print out reverse perfect eleminiation order */
+	/* print out reverse perfect elimination order */
 #if PRINT_RPEO
-	plist_element_t *elements;
-	foreach_plist(pbqp_alloc_env.rpeo, elements) {
-		pbqp_node *node = elements->data;
-		printf(" %d(%lu);", node->index, get_idx_irn(irg, node->index)->node_nr);
+	{
+		plist_element_t *elements;
+		foreach_plist(pbqp_alloc_env.rpeo, elements) {
+			pbqp_node_t *node = elements->data;
+			printf(" %d(%ld);", node->index, get_idx_irn(irg, node->index)->node_nr);
+		}
+		printf("\n");
 	}
-	printf("\n");
 #endif
 
 	/* solve pbqp instance */
@@ -740,7 +744,7 @@ static void be_pbqp_coloring(be_chordal_env_t *env)
 #endif
 
 
-	num solution = get_solution(pbqp_alloc_env.pbqp_inst);
+	solution = get_solution(pbqp_alloc_env.pbqp_inst);
 	if (solution == INF_COSTS)
 		panic("No PBQP solution found");
 
@@ -797,5 +801,3 @@ void be_init_pbqp_coloring(void)
 	lc_opt_add_table(pbqp_grp, options);
 	be_register_chordal_coloring("pbqp", &coloring);
 }
-
-#endif