- kill keep-alive edges to dead blocks before doing apply_result(),

[libfirm] / ir / adt / bipartite.c

diff --git a/ir/adt/bipartite.c b/ir/adt/bipartite.c
index a114e01..2acb390 100644 (file)
--- a/ir/adt/bipartite.c
+++ b/ir/adt/bipartite.c
@@ -1,8 +1,29 @@
 /*
- * Specialized implementation for perfect bipartite matching.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ *
+ * This file is part of libFirm.
+ *
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
+ *
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
+ *
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
+ */
+
+/**
+ * @file
+ * @brief  Specialized implementation for perfect bipartite matching.
  * @author Sebastian Hack
  * @cvs-id $Id$
  */
+#include "config.h"
 
 #include <stdio.h>
 #include <assert.h>
@@ -18,12 +39,8 @@ struct _bipartite_t {
 
 bipartite_t *bipartite_new(int n_left, int n_right)
 {
-       int i, size;
-       bipartite_t *gr;
-
-       size = n_left > 0 ? n_left - 1 : 0;
-       gr = xmalloc(sizeof(*gr) + size * sizeof(void *));
-       memset(gr, 0, sizeof(*gr));
+       bipartite_t *gr = XMALLOCFZ(bipartite_t, adj, n_left);
+       int i;
 
        gr->n_left = n_left;
        gr->n_right = n_right;
@@ -115,7 +132,7 @@ static int apply_alternating_path(const bipartite_t *gr, int *matching,
                        if(bitset_popcnt(tmp) == 0)
                                continue;
 
-                       right = bitset_min(tmp);
+                       right = bitset_next_set(tmp, 0);
                        assert(!bitset_is_set(matched_right, right));
                        matching[left] = right;
                        bitset_set(matched_left, left);