projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adapted to Matze's changes
[libfirm]
/
ir
/
be
/
becopyilp2.c
diff --git
a/ir/be/becopyilp2.c
b/ir/be/becopyilp2.c
index
8054f48
..
d6d4b75
100644
(file)
--- a/
ir/be/becopyilp2.c
+++ b/
ir/be/becopyilp2.c
@@
-48,6
+48,8
@@
#include "config.h"
#endif /* HAVE_CONFIG_H */
#include "config.h"
#endif /* HAVE_CONFIG_H */
+#include "firm_config.h"
+
#ifdef WITH_ILP
#include "bitset.h"
#ifdef WITH_ILP
#include "bitset.h"
@@
-81,7
+83,8
@@
static void build_coloring_cstr(ilp_env_t *ienv) {
be_ifg_foreach_node(ifg, iter, irn)
if (!sr_is_removed(ienv->sr, irn)) {
be_ifg_foreach_node(ifg, iter, irn)
if (!sr_is_removed(ienv->sr, irn)) {
- int col, cst_idx;
+ bitset_pos_t col;
+ int cst_idx;
const arch_register_req_t *req;
int curr_node_color = get_irn_col(ienv->co, irn);
int node_nr = (int)get_irn_node_nr(irn);
const arch_register_req_t *req;
int curr_node_color = get_irn_col(ienv->co, irn);
int node_nr = (int)get_irn_node_nr(irn);
@@
-104,7
+107,7
@@
static void build_coloring_cstr(ilp_env_t *ienv) {
bitset_foreach(colors, col) {
int var_idx = lpp_add_var(ienv->lp, name_cdd(buf, 'x', node_nr, col), lpp_binary, 0.0);
bitset_foreach(colors, col) {
int var_idx = lpp_add_var(ienv->lp, name_cdd(buf, 'x', node_nr, col), lpp_binary, 0.0);
- lpp_set_start_value(ienv->lp, var_idx, (col == curr_node_color) ? 1.0 : 0.0);
+ lpp_set_start_value(ienv->lp, var_idx, (col ==
(unsigned)
curr_node_color) ? 1.0 : 0.0);
lpp_set_factor_fast(ienv->lp, cst_idx, var_idx, 1);
lenv->last_x_var = var_idx;
lpp_set_factor_fast(ienv->lp, cst_idx, var_idx, 1);
lenv->last_x_var = var_idx;
@@
-218,6
+221,7
@@
typedef struct _edge_t {
static int compare_edge_t(const void *k1, const void *k2, size_t size) {
const edge_t *e1 = k1;
const edge_t *e2 = k2;
static int compare_edge_t(const void *k1, const void *k2, size_t size) {
const edge_t *e1 = k1;
const edge_t *e2 = k2;
+ (void) size;
return ! (e1->n1 == e2->n1 && e1->n2 == e2->n2);
}
return ! (e1->n1 == e2->n1 && e1->n2 == e2->n2);
}