shouldn't be here anymore

[libfirm] / ir / be / ia32 / bearch_ia32.c

diff --git a/ir/be/ia32/bearch_ia32.c b/ir/be/ia32/bearch_ia32.c
index e2288b5..d20c867 100644 (file)
--- a/ir/be/ia32/bearch_ia32.c
+++ b/ir/be/ia32/bearch_ia32.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -27,8 +27,8 @@
 #include "config.h"
 #endif
 
-#include <libcore/lc_opts.h>
-#include <libcore/lc_opts_enum.h>
+#include "lc_opts.h"
+#include "lc_opts_enum.h"
 
 #include <math.h>
 
@@ -43,6 +43,7 @@
 #include "irgopt.h"
 #include "irbitset.h"
 #include "irgopt.h"
+#include "irdump_grgen.h"
 #include "pdeq.h"
 #include "pset.h"
 #include "debug.h"
@@ -75,6 +76,7 @@
 #include "gen_ia32_regalloc_if.h"
 #include "gen_ia32_machine.h"
 #include "ia32_transform.h"
+#include "ia32_pbqp_transform.h"
 #include "ia32_emitter.h"
 #include "ia32_map_regs.h"
 #include "ia32_optimize.h"
@@ -955,7 +957,18 @@ static void ia32_prepare_graph(void *self) {
        if(cg->dump)
                be_dump(cg->irg, "-pre_transform", dump_ir_block_graph_sched);
 
-       /* transform nodes into assembler instructions */
+        /* used for examination purposes only
+         * if(cg->dump)
+                dump_irg_grgen(cg->irg, "-pre_transform");
+         */
+
+        /* transform nodes into assembler instructions by PBQP magic */
+        ia32_transform_graph_by_pbqp(cg);
+
+       if(cg->dump)
+               be_dump(cg->irg, "-after_pbqp_transform", dump_ir_block_graph_sched);
+
+       /* transform remaining nodes into assembler instructions */
        ia32_transform_graph(cg);
 
        /* do local optimisations (mainly CSE) */
@@ -2083,8 +2096,10 @@ static const backend_params *ia32_get_libfirm_params(void) {
 }
 
 static const lc_opt_enum_int_items_t gas_items[] = {
-       { "normal",  GAS_FLAVOUR_NORMAL },
+       { "elf",     GAS_FLAVOUR_ELF },
        { "mingw",   GAS_FLAVOUR_MINGW  },
+       { "yasm",    GAS_FLAVOUR_YASM   },
+       { "macho",   GAS_FLAVOUR_MACH_O },
        { NULL,      0 }
 };