fix handling of default pns in the backend (they don't need table entries)

[libfirm] / ir / be / becopyopt.c

diff --git a/ir/be/becopyopt.c b/ir/be/becopyopt.c
index b5d3ffc..fe51312 100644 (file)
--- a/ir/be/becopyopt.c
+++ b/ir/be/becopyopt.c
@@ -60,7 +60,6 @@
 #include "belive_t.h"
 #include "beinsn_t.h"
 #include "besched_t.h"
-#include "benodesets.h"
 #include "bejavacoal.h"
 #include "bestatevent.h"
 #include "beirg_t.h"
@@ -107,13 +106,9 @@ static const lc_opt_enum_mask_items_t algo_items[] = {
        { "none",   CO_ALGO_NONE  },
        { "heur",   CO_ALGO_HEUR  },
        { "heur2",  CO_ALGO_HEUR2 },
-#ifdef WITH_JVM
        { "heur3",  CO_ALGO_HEUR3 },
-#endif /* WITH_JVM */
        { "heur4",  CO_ALGO_HEUR4 },
-#ifdef WITH_ILP
        { "ilp",    CO_ALGO_ILP   },
-#endif /* WITH_ILP */
        { NULL,     0 }
 };
 
@@ -460,42 +455,37 @@ static void co_collect_units(ir_node *irn, void *env) {
 
                /* Src == Tgt of a 2-addr-code instruction */
                if (is_2addr_code(req)) {
-                       ir_node *other  = get_irn_n(skip_Proj(irn), req->other_same[0]);
-                       ir_node *other2 = NULL;
-                       int      count;
-
-                       if (arch_irn_is(co->aenv, other, ignore) ||
-                                       nodes_interfere(co->cenv, irn, other)) {
-                               other = NULL;
-                       }
-                       if (req->other_same[1] != -1) {
-                               other2 = get_irn_n(skip_Proj(irn), req->other_same[1]);
-                               if (arch_irn_is(co->aenv, other2, ignore) ||
-                                               nodes_interfere(co->cenv, irn, other2)) {
-                                       other2 = NULL;
+                       const unsigned other = req->other_same;
+                       int            count = 0;
+                       int            i;
+
+                       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) &&
+                                                       !nodes_interfere(co->cenv, irn, o)) {
+                                               ++count;
+                                       }
                                }
                        }
-                       count = 1 + (other != NULL) + (other2 != NULL && other != other2);
-
-                       if (count > 1) {
-                               int i = 0;
 
+                       if (count != 0) {
+                               int k = 0;
+                               ++count;
                                unit->nodes = xmalloc(count * sizeof(*unit->nodes));
                                unit->costs = xmalloc(count * sizeof(*unit->costs));
                                unit->node_count = count;
-                               unit->nodes[i] = irn;
-                               if (other != NULL) {
-                                       ++i;
-                                       unit->nodes[i] = other;
-                                       unit->costs[i] = co->get_costs(co, irn, other, -1);
-                               }
-                               if (other2 != NULL) {
-                                       if (other == other2) {
-                                               unit->costs[i] += co->get_costs(co, irn, other2, -1);
-                                       } else {
-                                               ++i;
-                                               unit->nodes[i] = other2;
-                                               unit->costs[i] = co->get_costs(co, irn, other2, -1);
+                               unit->nodes[k++] = irn;
+
+                               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) &&
+                                                               !nodes_interfere(co->cenv, irn, o)) {
+                                                       unit->nodes[k] = o;
+                                                       unit->costs[k] = co->get_costs(co, irn, o, -1);
+                                                       ++k;
+                                               }
                                        }
                                }
                        }
@@ -750,7 +740,7 @@ static void add_edge(copy_opt_t *co, ir_node *n1, ir_node *n2, int costs) {
        new_node.irn        = n1;
        new_node.degree     = 0;
        new_node.neighbours = NULL;
-       node = set_insert(co->nodes, &new_node, sizeof(new_node), nodeset_hash(new_node.irn));
+       node = set_insert(co->nodes, &new_node, sizeof(new_node), hash_irn(new_node.irn));
 
        for (nbr = node->neighbours; nbr; nbr = nbr->next)
                if (nbr->irn == n2) {
@@ -805,15 +795,15 @@ static void build_graph_walker(ir_node *irn, void *env) {
        else { /* 2-address code */
                const arch_register_req_t *req = arch_get_register_req(co->aenv, irn, -1);
                if (is_2addr_code(req)) {
-                       const int *i;
-                       for (i = req->other_same; i != ENDOF(req->other_same); ++i) {
-                               ir_node *other;
-
-                               if (*i == -1) break;
-
-                               other = get_irn_n(skip_Proj(irn), *i);
-                               if (! arch_irn_is(co->aenv, other, ignore))
-                                       add_edges(co, irn, other, co->get_costs(co, irn, other, 0));
+                       const unsigned other = req->other_same;
+                       int i;
+
+                       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))
+                                               add_edges(co, irn, other, co->get_costs(co, irn, other, 0));
+                               }
                        }
                }
        }
@@ -842,7 +832,7 @@ int co_gs_is_optimizable(copy_opt_t *co, ir_node *irn) {
        ASSERT_GS_AVAIL(co);
 
        new_node.irn = irn;
-       n = set_find(co->nodes, &new_node, sizeof(new_node), nodeset_hash(new_node.irn));
+       n = set_find(co->nodes, &new_node, sizeof(new_node), hash_irn(new_node.irn));
        if (n) {
                return (n->degree > 0);
        } else
@@ -1427,10 +1417,16 @@ static co_algo_info_t algos[] = {
        { void_algo,               "none",  0 },
        { co_solve_heuristic,      "heur1", 0 },
        { co_solve_heuristic_new,  "heur2", 0 },
+#ifdef WITH_JVM
        { co_solve_heuristic_java, "heur3", 0 },
+#else
+       { NULL,                    "heur3", 0 },
+#endif
        { co_solve_heuristic_mst,  "heur4", 0 },
 #ifdef WITH_ILP
        { co_solve_ilp2,           "ilp",   1 },
+#else
+       { NULL,                    "ilp",   1 },
 #endif
        { NULL,                    "",      0 }
 };