s/\<\(LC_\)\?INLINE\>/inline/.

[libfirm] / ir / be / becopyopt.c

diff --git a/ir/be/becopyopt.c b/ir/be/becopyopt.c
index 065b43d..ca32b86 100644 (file)
--- a/ir/be/becopyopt.c
+++ b/ir/be/becopyopt.c
@@ -29,9 +29,7 @@
  * - Register-constrained nodes
  * - Two-address code instructions
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "execfreq.h"
 #include "xmalloc.h"
@@ -196,7 +194,6 @@ copy_opt_t *new_copy_opt(be_chordal_env_t *chordal_env, cost_fct_t get_costs)
 
        co = XMALLOCZ(copy_opt_t);
        co->cenv      = chordal_env;
-       co->aenv      = chordal_env->birg->main_env->arch_env;
        co->irg       = chordal_env->irg;
        co->cls       = chordal_env->cls;
        co->get_costs = get_costs;
@@ -216,11 +213,16 @@ void free_copy_opt(copy_opt_t *co) {
        free(co);
 }
 
-int co_is_optimizable_root(const copy_opt_t *co, ir_node *irn) {
+/**
+ * Checks if a node is optimizable, viz. has something to do with coalescing
+ * @param irn  The irn to check
+ */
+static int co_is_optimizable_root(ir_node *irn)
+{
        const arch_register_req_t *req;
        const arch_register_t *reg;
 
-       if (arch_irn_is(co->aenv, irn, ignore))
+       if (arch_irn_is(irn, ignore))
                return 0;
 
        reg = arch_get_irn_register(irn);
@@ -380,7 +382,7 @@ static void co_collect_units(ir_node *irn, void *env) {
 
        if (!is_curr_reg_class(co, irn))
                return;
-       if (!co_is_optimizable_root(co, irn))
+       if (!co_is_optimizable_root(irn))
                return;
 
        /* Init a new unit */
@@ -415,7 +417,7 @@ static void co_collect_units(ir_node *irn, void *env) {
                        /* Else insert the argument of the phi to the members of this ou */
                        DBG((dbg, LEVEL_1, "\t   Member: %+F\n", arg));
 
-                       if (! arch_irn_is(co->aenv, arg, ignore)) {
+                       if (!arch_irn_is(arg, ignore)) {
                                /* Check if arg has occurred at a prior position in the arg/list */
                                arg_pos = 0;
                                for (o=1; o<unit->node_count; ++o) {
@@ -459,7 +461,7 @@ static void co_collect_units(ir_node *irn, void *env) {
                        for (i = 0; (1U << i) <= other; ++i) {
                                if (other & (1U << i)) {
                                        ir_node *o  = get_irn_n(skip_Proj(irn), i);
-                                       if (!arch_irn_is(co->aenv, o, ignore) &&
+                                       if (!arch_irn_is(o, ignore) &&
                                                        !nodes_interfere(co->cenv, irn, o)) {
                                                ++count;
                                        }
@@ -477,7 +479,7 @@ static void co_collect_units(ir_node *irn, void *env) {
                                for (i = 0; 1U << i <= other; ++i) {
                                        if (other & (1U << i)) {
                                                ir_node *o  = get_irn_n(skip_Proj(irn), i);
-                                               if (!arch_irn_is(co->aenv, o, ignore) &&
+                                               if (!arch_irn_is(o, ignore) &&
                                                                !nodes_interfere(co->cenv, irn, o)) {
                                                        unit->nodes[k] = o;
                                                        unit->costs[k] = co->get_costs(co, irn, o, -1);
@@ -759,7 +761,7 @@ static void add_edge(copy_opt_t *co, ir_node *n1, ir_node *n2, int costs) {
        nbr->costs += costs;
 }
 
-static INLINE void add_edges(copy_opt_t *co, ir_node *n1, ir_node *n2, int costs) {
+static inline void add_edges(copy_opt_t *co, ir_node *n1, ir_node *n2, int costs) {
        if (! be_ifg_connected(co->cenv->ifg, n1, n2)) {
                add_edge(co, n1, n2, costs);
                add_edge(co, n2, n1, costs);
@@ -771,7 +773,7 @@ static void build_graph_walker(ir_node *irn, void *env) {
        int pos, max;
        const arch_register_t *reg;
 
-       if (!is_curr_reg_class(co, irn) || arch_irn_is(co->aenv, irn, ignore))
+       if (!is_curr_reg_class(co, irn) || arch_irn_is(irn, ignore))
                return;
 
        reg = arch_get_irn_register(irn);
@@ -796,7 +798,7 @@ static void build_graph_walker(ir_node *irn, void *env) {
                        for (i = 0; 1U << i <= other; ++i) {
                                if (other & (1U << i)) {
                                        ir_node *other = get_irn_n(skip_Proj(irn), i);
-                                       if (! arch_irn_is(co->aenv, other, ignore))
+                                       if (!arch_irn_is(other, ignore))
                                                add_edges(co, irn, other, co->get_costs(co, irn, other, 0));
                                }
                        }
@@ -883,14 +885,14 @@ void co_dump_appel_graph(const copy_opt_t *co, FILE *f)
 
        n = n_regs;
        be_ifg_foreach_node(ifg, it, irn) {
-               if(!arch_irn_is(co->aenv, irn, ignore))
+               if (!arch_irn_is(irn, ignore))
                        node_map[get_irn_idx(irn)] = n++;
        }
 
        fprintf(f, "%d %d\n", n, n_regs);
 
        be_ifg_foreach_node(ifg, it, irn) {
-               if(!arch_irn_is(co->aenv, irn, ignore)) {
+               if (!arch_irn_is(irn, ignore)) {
                        int idx            = node_map[get_irn_idx(irn)];
                        affinity_node_t *a = get_affinity_info(co, irn);
 
@@ -906,7 +908,8 @@ void co_dump_appel_graph(const copy_opt_t *co, FILE *f)
                        }
 
                        be_ifg_foreach_neighbour(ifg, nit, irn, adj) {
-                               if(!arch_irn_is(co->aenv, adj, ignore) && !co_dump_appel_disjoint_constraints(co, irn, adj)) {
+                               if (!arch_irn_is(adj, ignore) &&
+                                               !co_dump_appel_disjoint_constraints(co, irn, adj)) {
                                        int adj_idx = node_map[get_irn_idx(adj)];
                                        if(idx < adj_idx)
                                                fprintf(f, "%d %d -1\n", idx, adj_idx);
@@ -917,7 +920,7 @@ void co_dump_appel_graph(const copy_opt_t *co, FILE *f)
                                neighb_t *n;
 
                                co_gs_foreach_neighb(a, n) {
-                                       if(!arch_irn_is(co->aenv, n->irn, ignore)) {
+                                       if (!arch_irn_is(n->irn, ignore)) {
                                                int n_idx = node_map[get_irn_idx(n->irn)];
                                                if(idx < n_idx)
                                                        fprintf(f, "%d %d %d\n", idx, n_idx, (int) n->costs);
@@ -991,8 +994,8 @@ static void ifg_dump_graph_attr(FILE *f, void *self)
 
 static int ifg_is_dump_node(void *self, ir_node *irn)
 {
-       co_ifg_dump_t *cod = self;
-       return !arch_irn_is(cod->co->aenv, irn, ignore);
+       (void)self;
+       return !arch_irn_is(irn, ignore);
 }
 
 static void ifg_dump_node_attr(FILE *f, void *self, ir_node *irn)