X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyilp_t.h;h=1dcd6f344e7a6db8818601821d5ce523f8008e67;hb=5474a1c188c9d59eea2c915515980cd9cbab58d8;hp=e19709812a389fa12e5b86b5178254c3aa2fc7fb;hpb=ab182d4b9ed44239ab3ff1d08b2f8e14a3699ccf;p=libfirm diff --git a/ir/be/becopyilp_t.h b/ir/be/becopyilp_t.h index e19709812..1dcd6f344 100644 --- a/ir/be/becopyilp_t.h +++ b/ir/be/becopyilp_t.h @@ -22,7 +22,6 @@ * @brief Common stuff used by all ILP formulations. * @author Daniel Grund * @date 28.02.2006 - * @version $Id$ */ #ifndef FIRM_BE_BECOPYILP_T_H #define FIRM_BE_BECOPYILP_T_H @@ -63,7 +62,7 @@ size_red_t *new_size_red(copy_opt_t *co); /** * Checks if a node has already been removed */ -#define sr_is_removed(sr, irn) pset_find_ptr((sr)->all_removed, irn) +#define sr_is_removed(sr, irn) pset_find_ptr((sr)->all_removed, irn) /** * Virtually remove all nodes not related to the problem @@ -115,9 +114,8 @@ static inline int co_ilp_get_costs(copy_opt_t *co, ir_node *root, ir_node *arg) *****************************************************************************/ -#ifdef WITH_ILP -#include -#include +#include "lpp.h" +#include "lpp_net.h" #define EPSILON 0.00001 @@ -140,13 +138,4 @@ lpp_sol_state_t ilp_go(ilp_env_t *ienv); void free_ilp_env(ilp_env_t *ienv); - -#define name_cdd(buf, char1, int1, int2) \ - (snprintf(buf, sizeof(buf), "%c_%d_%d", char1, int1, int2), buf) - -#define name_cdd_sorted(buf, char1, int1, int2) \ - name_cdd(buf, char1, MIN(int1, int2), MAX(int1, int2)) - -#endif - #endif