projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement binary emitter for fpush.
[libfirm]
/
ir
/
adt
/
bipartite.c
diff --git
a/ir/adt/bipartite.c
b/ir/adt/bipartite.c
index
40f84e7
..
4c47e97
100644
(file)
--- a/
ir/adt/bipartite.c
+++ b/
ir/adt/bipartite.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 1995-200
7
University of Karlsruhe. All right reserved.
+ * Copyright (C) 1995-200
8
University of Karlsruhe. All right reserved.
*
* This file is part of libFirm.
*
*
* This file is part of libFirm.
*
@@
-19,13
+19,11
@@
/**
* @file
/**
* @file
- * @brief Specialized implementation for perfect bipartite matching.
- * @author Sebastian Hack
- * @
cvs-id
$Id$
+ * @brief
Specialized implementation for perfect bipartite matching.
+ * @author
Sebastian Hack
+ * @
version
$Id$
*/
*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
#include <stdio.h>
#include <assert.h>
#include <stdio.h>
#include <assert.h>
@@
-41,12
+39,8
@@
struct _bipartite_t {
bipartite_t *bipartite_new(int n_left, int n_right)
{
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;
gr->n_left = n_left;
gr->n_right = n_right;
@@
-135,10
+129,10
@@
static int apply_alternating_path(const bipartite_t *gr, int *matching,
assert(!bitset_is_set(matched_left, left));
bitset_andnot(tmp, matched_right);
assert(!bitset_is_set(matched_left, left));
bitset_andnot(tmp, matched_right);
- if(bitset_
popcnt(tmp) == 0
)
+ if(bitset_
is_empty(tmp)
)
continue;
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);
assert(!bitset_is_set(matched_right, right));
matching[left] = right;
bitset_set(matched_left, left);