Adapted to new copyopt

diff --git a/ir/be/bechordal_main.c b/ir/be/bechordal_main.c
index b83293d..ab169a3 100644 (file)
--- a/ir/be/bechordal_main.c
+++ b/ir/be/bechordal_main.c
@@ -46,7 +46,7 @@
 #include "bespillilp.h"
 #include "belower.h"
 
-#include "becopyoptmain.h"
+#include "becopyopt.h"
 #include "bessadestr.h"
 #include "becopystat.h"
 
@@ -295,7 +295,7 @@ static void be_ra_chordal_main(const be_irg_t *bi)
 
                /* copy minimization */
                copystat_collect_cls(&chordal_env);
-               be_copy_opt(&chordal_env);
+               co_compare_solvers(&chordal_env);
                dump(BE_CH_DUMP_COPYMIN, irg, chordal_env.cls, "-copymin", dump_ir_block_graph_sched);
                be_ra_chordal_check(&chordal_env);
 

diff --git a/ir/be/bemain.c b/ir/be/bemain.c
index 7f873ba..82d00aa 100644 (file)
--- a/ir/be/bemain.c
+++ b/ir/be/bemain.c
@@ -46,7 +46,7 @@
 #include "bechordal_t.h"
 #include "beifg.h"
 #include "beifg_impl.h"
-#include "becopyoptmain.h"
+#include "becopyopt.h"
 #include "becopystat.h"
 #include "bessadestr.h"
 #include "beabi.h"
@@ -72,7 +72,7 @@ be_options_t be_options = {
 static unsigned dump_flags = 2 * DUMP_FINAL - 1;
 
 /* register allocator to use. */
-static const be_ra_t *ra = &be_ra_chordal_allocator;
+static const be_ra_t *ra = &be_ra_external_allocator;
 
 /* back end instruction set architecture to use */
 static const arch_isa_if_t *isa_if = &ia32_isa_if;