Merge branch 'kaps-included' into master
[libfirm] / ir / be / ia32 / ia32_finish.c
index 9d8eff4..2e3519c 100644 (file)
@@ -41,7 +41,6 @@
 #include "bearch_ia32_t.h"
 #include "ia32_finish.h"
 #include "ia32_new_nodes.h"
-#include "ia32_map_regs.h"
 #include "ia32_common_transform.h"
 #include "ia32_transform.h"
 #include "ia32_dbg_stat.h"
@@ -111,7 +110,7 @@ static void ia32_transform_sub_to_neg_add(ir_node *irn)
                set_ia32_ls_mode(res, get_ia32_ls_mode(irn));
 
                /* exchange the add and the sub */
-               edges_reroute(irn, res, irg);
+               edges_reroute(irn, res);
 
                /* add to schedule */
                sched_add_before(irn, res);
@@ -149,7 +148,7 @@ static void ia32_transform_sub_to_neg_add(ir_node *irn)
                        set_ia32_commutative(res);
 
                        /* exchange the add and the sub */
-                       edges_reroute(irn, res, irg);
+                       edges_reroute(irn, res);
 
                        /* add to schedule */
                        sched_add_before(irn, res);
@@ -426,7 +425,7 @@ static void fix_am_source(ir_node *irn)
                                out_reg != arch_get_irn_register(get_irn_n(irn, n_ia32_index)))
                        continue;
 
-               load_res = turn_back_am(irn);
+               load_res = ia32_turn_back_am(irn);
                arch_set_irn_register(load_res, out_reg);
 
                DBG((dbg, LEVEL_3,