Remove address name SymConsts.
[libfirm] / ir / be / becopyilp.c
index 07d95e0..5f0134d 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
  * @date        28.02.2006
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif /* HAVE_CONFIG_H */
 
 #include "irtools.h"
 #include "irprintf.h"
 
 #include "bestatevent.h"
-#include "beirg_t.h"
+#include "beirg.h"
 #include "bemodule.h"
 #include "error.h"
 
-#include <libcore/lc_opts.h>
-#include <libcore/lc_opts_enum.h>
+#include "lc_opts.h"
+#include "lc_opts_enum.h"
 
 #ifdef WITH_ILP
 
@@ -64,7 +62,7 @@ static const lc_opt_table_entry_t options[] = {
        LC_OPT_ENT_BOOL     ("net",   "solve over the net", &solve_net),
        LC_OPT_ENT_BOOL     ("log",   "show ilp solving log",              &solve_log),
        LC_OPT_ENT_ENUM_MASK("dump",  "dump flags",             &dump_var),
-       LC_OPT_ENT_NULL
+       LC_OPT_LAST
 };
 
 void be_init_copyilp(void)
@@ -94,8 +92,9 @@ BE_REGISTER_MODULE_CONSTRUCTOR(be_init_copyilp);
  *****************************************************************************/
 
 
-size_red_t *new_size_red(copy_opt_t *co) {
-       size_red_t *res = xmalloc(sizeof(*res));
+size_red_t *new_size_red(copy_opt_t *co)
+{
+       size_red_t *res = XMALLOC(size_red_t);
 
        res->co = co;
        res->all_removed = pset_new_ptr_default();
@@ -108,19 +107,20 @@ size_red_t *new_size_red(copy_opt_t *co) {
 /**
  * Checks if a node is simplicial in the graph heeding the already removed nodes.
  */
-static INLINE int sr_is_simplicial(size_red_t *sr, const ir_node *ifn) {
-       int i, o, size = 0;
-       ir_node **all, *curr;
-       be_ifg_t *ifg = sr->co->cenv->ifg;
-       void *iter = be_ifg_neighbours_iter_alloca(ifg);
-
-       all = alloca(be_ifg_degree(ifg, ifn) * sizeof(*all));
+static inline int sr_is_simplicial(size_red_t *sr, const ir_node *ifn)
+{
+       be_ifg_t *ifg  = sr->co->cenv->ifg;
+       void     *iter = be_ifg_neighbours_iter_alloca(ifg);
+       ir_node **all  = ALLOCAN(ir_node*, be_ifg_degree(ifg, ifn));
+       ir_node  *curr;
+       int       size = 0;
+       int       i;
+       int       o;
 
        /* get all non-removed neighbors */
        be_ifg_foreach_neighbour(ifg, iter, ifn, curr)
                if (!sr_is_removed(sr, curr))
                        all[size++] = curr;
-       be_ifg_neighbours_break(ifg, iter);
 
        /* check if these form a clique */
        for (i=0; i<size; ++i)
@@ -132,7 +132,8 @@ static INLINE int sr_is_simplicial(size_red_t *sr, const ir_node *ifn) {
        return 1;
 }
 
-void sr_remove(size_red_t *sr) {
+void sr_remove(size_red_t *sr)
+{
        ir_node *irn;
        int redo = 1;
        const be_ifg_t *ifg = sr->co->cenv->ifg;
@@ -141,13 +142,11 @@ void sr_remove(size_red_t *sr) {
        while (redo) {
                redo = 0;
                be_ifg_foreach_node(ifg, iter, irn) {
-                       const arch_register_req_t *req;
-
-                       req = arch_get_register_req(sr->co->aenv, irn, -1);
+                       const arch_register_req_t *req = arch_get_register_req_out(irn);
 
                        if (!arch_register_req_is(req, limited) && !sr_is_removed(sr, irn) && !co_gs_is_optimizable(sr->co, irn)) {
-                       if (sr_is_simplicial(sr, irn)) {
-                                       coloring_suffix_t *cs = obstack_alloc(&sr->ob, sizeof(*cs));
+                               if (sr_is_simplicial(sr, irn)) {
+                                       coloring_suffix_t *cs = OALLOC(&sr->ob, coloring_suffix_t);
 
                                        cs->irn = irn;
                                        cs->next = sr->col_suff;
@@ -156,14 +155,14 @@ void sr_remove(size_red_t *sr) {
                                        pset_insert_ptr(sr->all_removed, irn);
 
                                        redo = 1;
-                       }
+                               }
                        }
                }
-               be_ifg_nodes_break(ifg, iter);
        }
 }
 
-void sr_reinsert(size_red_t *sr) {
+void sr_reinsert(size_red_t *sr)
+{
        coloring_suffix_t *cs;
        be_ifg_t *ifg        = sr->co->cenv->ifg;
        bitset_t *used_cols  = bitset_alloca(arch_register_class_n_regs(sr->co->cls));
@@ -180,9 +179,8 @@ void sr_reinsert(size_red_t *sr) {
 
                be_ifg_foreach_neighbour(ifg, iter, irn, other) {
                        if (!sr_is_removed(sr, other)) /* only inspect nodes which are in graph right now */
-                               bitset_set(used_cols, get_irn_col(sr->co, other));
+                               bitset_set(used_cols, get_irn_col(other));
                }
-               be_ifg_neighbours_break(ifg, iter);
 
                /* now all bits not set are possible colors */
                free_col = bitset_next_clear(used_cols, 0);
@@ -192,7 +190,8 @@ void sr_reinsert(size_red_t *sr) {
        }
 }
 
-void free_size_red(size_red_t *sr) {
+void free_size_red(size_red_t *sr)
+{
        del_pset(sr->all_removed);
        obstack_free(&sr->ob, NULL);
        free(sr);
@@ -210,9 +209,9 @@ void free_size_red(size_red_t *sr) {
 
 #include <stdio.h>
 
-ilp_env_t *new_ilp_env(copy_opt_t *co, ilp_callback build, ilp_callback apply, void *env) {
-       ilp_env_t *res = xmalloc(sizeof(*res));
-       assert(res);
+ilp_env_t *new_ilp_env(copy_opt_t *co, ilp_callback build, ilp_callback apply, void *env)
+{
+       ilp_env_t *res = XMALLOC(ilp_env_t);
 
        res->co         = co;
        res->build      = build;
@@ -223,7 +222,8 @@ ilp_env_t *new_ilp_env(copy_opt_t *co, ilp_callback build, ilp_callback apply, v
        return res;
 }
 
-lpp_sol_state_t ilp_go(ilp_env_t *ienv) {
+lpp_sol_state_t ilp_go(ilp_env_t *ienv)
+{
        be_main_env_t *main_env = ienv->co->cenv->birg->main_env;
 
        sr_remove(ienv->sr);
@@ -231,10 +231,10 @@ lpp_sol_state_t ilp_go(ilp_env_t *ienv) {
        ienv->build(ienv);
        lpp_set_time_limit(ienv->lp, time_limit);
 
-       if(solve_log)
+       if (solve_log)
                lpp_set_log(ienv->lp, stdout);
 
-       if(solve_net)
+       if (solve_net)
                lpp_solve_net(ienv->lp, main_env->options->ilp_server, main_env->options->ilp_solver);
        else {
 #ifdef LPP_SOLVE_NET
@@ -249,14 +249,14 @@ lpp_sol_state_t ilp_go(ilp_env_t *ienv) {
        be_stat_ev    ("co_ilp_iter",       ienv->lp->iterations);
        be_stat_ev_dbl("co_ilp_sol_time",   ienv->lp->sol_time);
 
-       if(dump_flags & DUMP_ILP) {
+       if (dump_flags & DUMP_ILP) {
                char buf[128];
                FILE *f;
 
                ir_snprintf(buf, sizeof(buf), "%F_%s-co.ilp", ienv->co->cenv->irg,
                            ienv->co->cenv->cls->name);
                f = fopen(buf, "wt");
-               if(f == NULL) {
+               if (f == NULL) {
                        panic("Couldn't open '%s' for writing", buf);
                }
                lpp_dump_plain(ienv->lp, f);
@@ -270,7 +270,8 @@ lpp_sol_state_t ilp_go(ilp_env_t *ienv) {
        return lpp_get_sol_state(ienv->lp);
 }
 
-void free_ilp_env(ilp_env_t *ienv) {
+void free_ilp_env(ilp_env_t *ienv)
+{
        free_size_red(ienv->sr);
        free_lpp(ienv->lp);
        free(ienv);
@@ -278,7 +279,8 @@ void free_ilp_env(ilp_env_t *ienv) {
 
 #else /* WITH_ILP */
 
-static INLINE 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 */