projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix for c++ commit
[libfirm]
/
ir
/
be
/
becopyilp_t.h
diff --git
a/ir/be/becopyilp_t.h
b/ir/be/becopyilp_t.h
index
1212fb6
..
e197098
100644
(file)
--- a/
ir/be/becopyilp_t.h
+++ b/
ir/be/becopyilp_t.h
@@
-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.
*
@@
-27,7
+27,6
@@
#ifndef FIRM_BE_BECOPYILP_T_H
#define FIRM_BE_BECOPYILP_T_H
#ifndef FIRM_BE_BECOPYILP_T_H
#define FIRM_BE_BECOPYILP_T_H
-#include "firm_config.h"
#include "firm_types.h"
#include "pset.h"
#include "becopyopt_t.h"
#include "firm_types.h"
#include "pset.h"
#include "becopyopt_t.h"
@@
-42,14
+41,14
@@
*****************************************************************************/
*****************************************************************************/
-typedef struct
_
coloring_suffix_t coloring_suffix_t;
+typedef struct coloring_suffix_t coloring_suffix_t;
-struct
_
coloring_suffix_t {
+struct coloring_suffix_t {
coloring_suffix_t *next;
ir_node *irn;
};
coloring_suffix_t *next;
ir_node *irn;
};
-typedef struct
_
size_red_t {
+typedef struct size_red_t {
copy_opt_t *co;
pset *all_removed; /**< All nodes removed during problem size reduction */
coloring_suffix_t *col_suff; /**< Coloring suffix. Reverse would be a PEO prefix */
copy_opt_t *co;
pset *all_removed; /**< All nodes removed during problem size reduction */
coloring_suffix_t *col_suff; /**< Coloring suffix. Reverse would be a PEO prefix */
@@
-87,7
+86,7
@@
void free_size_red(size_red_t *sr);
* units (ou's) args could be merged and weights are accumulated.
* Is this necessary?
*/
* units (ou's) args could be merged and weights are accumulated.
* Is this necessary?
*/
-static
INLINE
int co_ilp_get_costs(copy_opt_t *co, ir_node *root, ir_node *arg) {
+static
inline
int co_ilp_get_costs(copy_opt_t *co, ir_node *root, ir_node *arg) {
int i;
unit_t *curr;
int i;
unit_t *curr;
@@
-118,22
+117,15
@@
static INLINE int co_ilp_get_costs(copy_opt_t *co, ir_node *root, ir_node *arg)
#ifdef WITH_ILP
#include <lpp/lpp.h>
#ifdef WITH_ILP
#include <lpp/lpp.h>
-
-#define LPP_SOLVE_NET
-
-#ifdef LPP_SOLVE_NET
-# include <lpp/lpp_net.h>
-#else
-# include <lpp/lpp_cplex.h>
-#endif
+#include <lpp/lpp_net.h>
#define EPSILON 0.00001
#define EPSILON 0.00001
-typedef struct
_
ilp_env_t ilp_env_t;
+typedef struct ilp_env_t ilp_env_t;
typedef void(*ilp_callback)(ilp_env_t*);
typedef void(*ilp_callback)(ilp_env_t*);
-struct
_
ilp_env_t {
+struct ilp_env_t {
const copy_opt_t *co; /**< the copy opt problem */
size_red_t *sr; /**< problem size reduction. removes simple nodes */
lpp_t *lp; /**< the linear programming problem */
const copy_opt_t *co; /**< the copy opt problem */
size_red_t *sr; /**< problem size reduction. removes simple nodes */
lpp_t *lp; /**< the linear programming problem */
@@
-155,6
+147,6
@@
void free_ilp_env(ilp_env_t *ienv);
#define name_cdd_sorted(buf, char1, int1, int2) \
name_cdd(buf, char1, MIN(int1, int2), MAX(int1, int2))
#define name_cdd_sorted(buf, char1, int1, int2) \
name_cdd(buf, char1, MIN(int1, int2), MAX(int1, int2))
-#endif
/* WITH_ILP */
+#endif
-#endif
/* FIRM_BE_BECOPYILP_T_H */
+#endif