amd64: small changes w.r.t. stack alignment.

[libfirm] / ir / be / becopyilp.c

diff --git a/ir/be/becopyilp.c b/ir/be/becopyilp.c
index 3a9446a..3a3b488 100644 (file)
--- a/ir/be/becopyilp.c
+++ b/ir/be/becopyilp.c
@@ -65,6 +65,7 @@ static const lc_opt_table_entry_t options[] = {
        LC_OPT_LAST
 };
 
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_copyilp);
 void be_init_copyilp(void)
 {
        lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be");
@@ -76,10 +77,8 @@ void be_init_copyilp(void)
        lc_opt_add_table(ilp_grp, options);
 }
 
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_copyilp);
-
 #include "becopyilp_t.h"
-#include "beifg_t.h"
+#include "beifg.h"
 
 /******************************************************************************
     _____ _                        _            _   _
@@ -92,7 +91,8 @@ BE_REGISTER_MODULE_CONSTRUCTOR(be_init_copyilp);
  *****************************************************************************/
 
 
-size_red_t *new_size_red(copy_opt_t *co) {
+size_red_t *new_size_red(copy_opt_t *co)
+{
        size_red_t *res = XMALLOC(size_red_t);
 
        res->co = co;
@@ -109,7 +109,7 @@ size_red_t *new_size_red(copy_opt_t *co) {
 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);
+       neighbours_iter_t iter;
        ir_node **all  = ALLOCAN(ir_node*, be_ifg_degree(ifg, ifn));
        ir_node  *curr;
        int       size = 0;
@@ -117,7 +117,7 @@ static inline int sr_is_simplicial(size_red_t *sr, const ir_node *ifn)
        int       o;
 
        /* get all non-removed neighbors */
-       be_ifg_foreach_neighbour(ifg, iter, ifn, curr)
+       be_ifg_foreach_neighbour(ifg, &iter, ifn, curr)
                if (!sr_is_removed(sr, curr))
                        all[size++] = curr;
 
@@ -131,20 +131,21 @@ 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;
-       void *iter = be_ifg_nodes_iter_alloca(ifg);
+       nodes_iter_t iter;
 
        while (redo) {
                redo = 0;
-               be_ifg_foreach_node(ifg, iter, irn) {
+               be_ifg_foreach_node(ifg, &iter, irn) {
                        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));
+                                       coloring_suffix_t *cs = OALLOC(&sr->ob, coloring_suffix_t);
 
                                        cs->irn = irn;
                                        cs->next = sr->col_suff;
@@ -159,11 +160,12 @@ void sr_remove(size_red_t *sr) {
        }
 }
 
-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));
-       void *iter           = be_ifg_neighbours_iter_alloca(ifg);
+       neighbours_iter_t iter;
 
        /* color the removed nodes in right order */
        for (cs = sr->col_suff; cs; cs = cs->next) {
@@ -174,7 +176,7 @@ void sr_reinsert(size_red_t *sr) {
                irn = cs->irn;
                bitset_clear_all(used_cols);
 
-               be_ifg_foreach_neighbour(ifg, iter, irn, other) {
+               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(other));
                }
@@ -187,7 +189,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);
@@ -205,7 +208,8 @@ 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 *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;
@@ -217,7 +221,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);
@@ -225,10 +230,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
@@ -243,14 +248,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);
@@ -264,7 +269,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);
@@ -272,7 +278,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 */