amd64: Added Load and FrameAddr transformation. And fixed some corruption bugs w...

[libfirm] / ir / be / becopyopt.c

diff --git a/ir/be/becopyopt.c b/ir/be/becopyopt.c
index 32c9a89..b7afd30 100644 (file)
--- a/ir/be/becopyopt.c
+++ b/ir/be/becopyopt.c
@@ -50,7 +50,7 @@
 #include "bearch.h"
 #include "benode.h"
 #include "beutil.h"
-#include "beifg_t.h"
+#include "beifg.h"
 #include "beintlive_t.h"
 #include "becopyopt_t.h"
 #include "becopystat.h"
@@ -391,10 +391,13 @@ static int ou_max_ind_set_costs(unit_t *ou)
 
 static void co_collect_units(ir_node *irn, void *env)
 {
-       const arch_register_req_t *req = arch_get_register_req_out(irn);
+       const arch_register_req_t *req;
        copy_opt_t                *co  = env;
        unit_t *unit;
 
+       if (get_irn_mode(irn) == mode_T)
+               return;
+       req = arch_get_register_req_out(irn);
        if (req->cls != co->cls)
                return;
        if (!co_is_optimizable_root(irn))
@@ -796,11 +799,14 @@ static inline void add_edges(copy_opt_t *co, ir_node *n1, ir_node *n2, int costs
 
 static void build_graph_walker(ir_node *irn, void *env)
 {
-       const arch_register_req_t *req = arch_get_register_req_out(irn);
+       const arch_register_req_t *req;
        copy_opt_t                *co  = env;
        int pos, max;
        const arch_register_t *reg;
 
+       if (get_irn_mode(irn) == mode_T)
+               return;
+       req = arch_get_register_req_out(irn);
        if (req->cls != co->cls || arch_irn_is_ignore(irn))
                return;
 
@@ -893,7 +899,8 @@ void co_dump_appel_graph(const copy_opt_t *co, FILE *f)
        int      *node_map  = XMALLOCN(int, get_irg_last_idx(co->irg) + 1);
 
        ir_node *irn;
-       void *it, *nit;
+       nodes_iter_t it;
+       neighbours_iter_t nit;
        int n, n_regs;
        unsigned i;
 
@@ -908,11 +915,8 @@ void co_dump_appel_graph(const copy_opt_t *co, FILE *f)
         * the values below n are the pre-colored register nodes
         */
 
-       it  = be_ifg_nodes_iter_alloca(ifg);
-       nit = be_ifg_neighbours_iter_alloca(ifg);
-
        n = n_regs;
-       be_ifg_foreach_node(ifg, it, irn) {
+       be_ifg_foreach_node(ifg, &it, irn) {
                if (arch_irn_is_ignore(irn))
                        continue;
                node_map[get_irn_idx(irn)] = n++;
@@ -920,7 +924,7 @@ void co_dump_appel_graph(const copy_opt_t *co, FILE *f)
 
        fprintf(f, "%d %d\n", n, n_regs);
 
-       be_ifg_foreach_node(ifg, it, irn) {
+       be_ifg_foreach_node(ifg, &it, irn) {
                if (!arch_irn_is_ignore(irn)) {
                        int idx                        = node_map[get_irn_idx(irn)];
                        affinity_node_t           *a   = get_affinity_info(co, irn);
@@ -934,7 +938,7 @@ void co_dump_appel_graph(const copy_opt_t *co, FILE *f)
                                }
                        }
 
-                       be_ifg_foreach_neighbour(ifg, nit, irn, adj) {
+                       be_ifg_foreach_neighbour(ifg, &nit, irn, adj) {
                                if (!arch_irn_is_ignore(adj) &&
                                                !co_dump_appel_disjoint_constraints(co, irn, adj)) {
                                        int adj_idx = node_map[get_irn_idx(adj)];