projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
start register allocator again, fix typo
[libfirm]
/
ir
/
be
/
becopyilp2.c
diff --git
a/ir/be/becopyilp2.c
b/ir/be/becopyilp2.c
index
ee02479
..
9e2cf82
100644
(file)
--- a/
ir/be/becopyilp2.c
+++ b/
ir/be/becopyilp2.c
@@
-40,6
+40,7
@@
#include "becopyilp_t.h"
#include "beifg_t.h"
#include "besched_t.h"
#include "becopyilp_t.h"
#include "beifg_t.h"
#include "besched_t.h"
+#include "benodesets.h"
#define DEBUG_LVL 1
#define DEBUG_LVL 1
@@
-202,7
+203,7
@@
static int compare_edge_t(const void *k1, const void *k2, size_t size) {
return ! (e1->n1 == e2->n1 && e1->n2 == e2->n2);
}
return ! (e1->n1 == e2->n1 && e1->n2 == e2->n2);
}
-#define HASH_EDGE(e) (
HASH_PTR((e)->n1) ^ HASH_PTR
((e)->n2))
+#define HASH_EDGE(e) (
nodeset_hash((e)->n1) ^ nodeset_hash
((e)->n2))
static INLINE edge_t *add_edge(set *edges, ir_node *n1, ir_node *n2, int *counter) {
edge_t new_edge;
static INLINE edge_t *add_edge(set *edges, ir_node *n1, ir_node *n2, int *counter) {
edge_t new_edge;
@@
-296,6
+297,9
@@
static void build_clique_star_cstr(ilp_env_t *ienv) {
for (e=set_first(edges); !e->n1; e=set_next(edges))
/*nothing*/ ;
for (e=set_first(edges); !e->n1; e=set_next(edges))
/*nothing*/ ;
+ /* we could be stepped out of the loop before the set iterated to the end */
+ set_break(edges);
+
pset_insert_ptr(clique, e->n1);
pset_insert_ptr(clique, e->n2);
remove_edge(edges, e->n1, e->n2, &n_edges);
pset_insert_ptr(clique, e->n1);
pset_insert_ptr(clique, e->n2);
remove_edge(edges, e->n1, e->n2, &n_edges);
@@
-503,7
+507,7
@@
static void ilp2_apply(ilp_env_t *ienv) {
#endif
}
#endif
}
-int co_solve_ilp2(copy_opt_t *co
, double time_limit
) {
+int co_solve_ilp2(copy_opt_t *co) {
lpp_sol_state_t sol_state;
ilp_env_t *ienv;
local_env_t my;
lpp_sol_state_t sol_state;
ilp_env_t *ienv;
local_env_t my;
@@
-511,7
+515,7
@@
int co_solve_ilp2(copy_opt_t *co, double time_limit) {
ASSERT_OU_AVAIL(co); //See build_clique_st
ASSERT_GS_AVAIL(co);
ASSERT_OU_AVAIL(co); //See build_clique_st
ASSERT_GS_AVAIL(co);
- my.time_limit =
time_limit
;
+ my.time_limit =
0
;
my.first_x_var = -1;
my.last_x_var = -1;
my.nr_2_irn = pmap_create();
my.first_x_var = -1;
my.last_x_var = -1;
my.nr_2_irn = pmap_create();
@@
-529,7
+533,7
@@
int co_solve_ilp2(copy_opt_t *co, double time_limit) {
#else /* WITH_ILP */
#else /* WITH_ILP */
-static void only_that_you_can_compile_without_WITH_ILP_defined(void) {
+static
INLINE
void only_that_you_can_compile_without_WITH_ILP_defined(void) {
}
#endif /* WITH_ILP */
}
#endif /* WITH_ILP */