X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fkaps%2Fbrute_force.c;h=ca8f9758297dd9f4f0dd5eb22e2dddcd9e5a9cf0;hb=5474a1c188c9d59eea2c915515980cd9cbab58d8;hp=94111ce085bf480b4cdbd98679c176a7c8ab6e61;hpb=1a3b7d363474ab544c13093a2f0b578718d37c7a;p=libfirm

diff --git a/ir/kaps/brute_force.c b/ir/kaps/brute_force.c
index 94111ce08..ca8f97582 100644
--- a/ir/kaps/brute_force.c
+++ b/ir/kaps/brute_force.c
@@ -22,7 +22,6 @@
  * @brief   Brute force PBQP solver.
  * @date    02.12.2008
  * @author  Sebastian Buchwald
- * @version $Id$
  */
 #include "config.h"
 
@@ -32,7 +31,7 @@
 #include "bucket.h"
 #include "brute_force.h"
 #include "optimal.h"
-#if	KAPS_DUMP
+#if KAPS_DUMP
 #include "html_dumper.h"
 #endif
 #include "kaps.h"
@@ -77,7 +76,6 @@ static unsigned get_minimal_alternative(pbqp_t *pbqp, pbqp_node_t *node)
 	unsigned  bucket_index;
 
 	assert(pbqp);
-	assert(node);
 	node_vec     = node->costs;
 	node_len     = node_vec->len;
 	bucket_index = node->bucket_index;
@@ -151,14 +149,13 @@ static void apply_Brute_Force(pbqp_t *pbqp)
 
 	/* We want to reduce a node with maximum degree. */
 	node = get_node_with_max_degree();
-	assert(node);
 	assert(pbqp_node_get_degree(node) > 2);
 
-#if	KAPS_DUMP
+#if KAPS_DUMP
 	if (pbqp->dump_file) {
 		char     txt[100];
 		sprintf(txt, "BF-Reduction of Node n%d", node->index);
-		dump_section(pbqp->dump_file, 2, txt);
+		pbqp_dump_section(pbqp->dump_file, 2, txt);
 		pbqp_dump_graph(pbqp);
 	}
 #endif
@@ -170,7 +167,7 @@ static void apply_Brute_Force(pbqp_t *pbqp)
 	min_index = get_minimal_alternative(pbqp, node);
 	node = pbqp->nodes[node->index];
 
-#if	KAPS_DUMP
+#if KAPS_DUMP
 	if (pbqp->dump_file) {
 		fprintf(pbqp->dump_file, "node n%d is set to %d<br><br>\n",
 					node->index, min_index);
@@ -202,7 +199,6 @@ static void back_propagate_RI(pbqp_t *pbqp, pbqp_node_t *node)
 	int            is_src;
 
 	assert(pbqp);
-	assert(node);
 
 	edge = node->edges[0];
 	mat = edge->costs;
@@ -211,7 +207,6 @@ static void back_propagate_RI(pbqp_t *pbqp, pbqp_node_t *node)
 
 	if (is_src) {
 		other = edge->tgt;
-		assert(other);
 
 		/* Update pointer for brute force solver. */
 		other = pbqp->nodes[other->index];
@@ -219,7 +214,6 @@ static void back_propagate_RI(pbqp_t *pbqp, pbqp_node_t *node)
 		node->solution = pbqp_matrix_get_col_min_index(mat, other->solution, vec);
 	} else {
 		other = edge->src;
-		assert(other);
 
 		/* Update pointer for brute force solver. */
 		other = pbqp->nodes[other->index];
@@ -227,7 +221,7 @@ static void back_propagate_RI(pbqp_t *pbqp, pbqp_node_t *node)
 		node->solution = pbqp_matrix_get_row_min_index(mat, other->solution, vec);
 	}
 
-#if	KAPS_DUMP
+#if KAPS_DUMP
 	if (pbqp->dump_file) {
 		fprintf(pbqp->dump_file, "node n%d is set to %d<br>\n", node->index, node->solution);
 	}
@@ -308,7 +302,7 @@ static void back_propagate_RII(pbqp_t *pbqp, pbqp_node_t *node)
 
 	node->solution = vector_get_min_index(vec);
 
-#if	KAPS_DUMP
+#if KAPS_DUMP
 	if (pbqp->dump_file) {
 		fprintf(pbqp->dump_file, "node n%d is set to %d<br>\n", node->index, node->solution);
 	}
@@ -324,9 +318,9 @@ static void back_propagate_brute_force(pbqp_t *pbqp)
 
 	assert(pbqp);
 
-#if	KAPS_DUMP
+#if KAPS_DUMP
 	if (pbqp->dump_file) {
-		dump_section(pbqp->dump_file, 2, "Back Propagation");
+		pbqp_dump_section(pbqp->dump_file, 2, "Back Propagation");
 	}
 #endif
 
@@ -342,7 +336,6 @@ static void back_propagate_brute_force(pbqp_t *pbqp)
 				break;
 			default:
 				panic("Only nodes with degree one or two should be in this bucket");
-				break;
 		}
 	}
 }