More missing config.h

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

diff --git a/ir/be/ia32/bearch_ia32.c b/ir/be/ia32/bearch_ia32.c
index ecce61a..2c39f5c 100644 (file)
--- a/ir/be/ia32/bearch_ia32.c
+++ b/ir/be/ia32/bearch_ia32.c
@@ -33,6 +33,7 @@
 #include "irgopt.h"
 #include "irbitset.h"
 #include "pdeq.h"
+#include "pset.h"
 #include "debug.h"
 
 #include "../beabi.h"                 /* the general register allocator interface */
@@ -44,10 +45,14 @@
 #include "../beirgmod.h"
 #include "../be_dbgout.h"
 #include "../beblocksched.h"
+#include "../bemachine.h"
+#include "../beilpsched.h"
+
 #include "bearch_ia32_t.h"
 
 #include "ia32_new_nodes.h"           /* ia32 nodes interface */
 #include "gen_ia32_regalloc_if.h"     /* the generated interface (register type and class defenitions) */
+#include "gen_ia32_machine.h"
 #include "ia32_gen_decls.h"           /* interface declaration emitter */
 #include "ia32_transform.h"
 #include "ia32_emitter.h"
@@ -506,7 +511,7 @@ static ir_type *ia32_abi_get_between_type(void *self)
 
        ia32_abi_env_t *env = self;
 
-       if ( !between_type) {
+       if (! between_type) {
                entity *old_bp_ent;
                entity *ret_addr_ent;
                entity *omit_fp_ret_addr_ent;
@@ -550,7 +555,9 @@ static int ia32_get_op_estimated_cost(const void *self, const ir_node *irn)
        const ia32_irn_ops_t *ops = self;
 
        if (is_Proj(irn))
-         return 0;
+               return 0;
+       if (!is_ia32_irn(irn))
+               return 0;
 
        assert(is_ia32_irn(irn));
 
@@ -1362,9 +1369,7 @@ static void *ia32_cg_init(const be_irg_t *birg) {
        isa->cg = cg;
 
 #ifndef NDEBUG
-       if (isa->name_obst_size) {
-               //printf("freed %d bytes from name obst\n", isa->name_obst_size);
-               isa->name_obst_size = 0;
+       if (isa->name_obst) {
                obstack_free(isa->name_obst, NULL);
                obstack_init(isa->name_obst);
        }
@@ -1483,6 +1488,7 @@ static void *ia32_init(FILE *file_handle) {
        isa->types      = pmap_create();
        isa->tv_ent     = pmap_create();
        isa->out        = file_handle;
+       isa->cpu        = ia32_init_machine_description();
 
        ia32_build_16bit_reg_map(isa->regs_16bit);
        ia32_build_8bit_reg_map(isa->regs_8bit);
@@ -1500,7 +1506,6 @@ static void *ia32_init(FILE *file_handle) {
 #ifndef NDEBUG
        isa->name_obst = xmalloc(sizeof(*isa->name_obst));
        obstack_init(isa->name_obst);
-       isa->name_obst_size = 0;
 #endif /* NDEBUG */
 
        ia32_handle_intrinsics();
@@ -1533,7 +1538,6 @@ static void ia32_done(void *self) {
        pmap_destroy(isa->types);
 
 #ifndef NDEBUG
-       //printf("name obst size = %d bytes\n", isa->name_obst_size);
        obstack_free(isa->name_obst, NULL);
 #endif /* NDEBUG */
 
@@ -1719,6 +1723,10 @@ static const list_sched_selector_t *ia32_get_list_sched_selector(const void *sel
        return &ia32_sched_selector;
 }
 
+static const ilp_sched_selector_t *ia32_get_ilp_sched_selector(const void *self) {
+       return NULL;
+}
+
 /**
  * Returns the necessary byte alignment for storing a register of given class.
  */
@@ -1731,6 +1739,69 @@ static int ia32_get_reg_class_alignment(const void *self, const arch_register_cl
        return bytes;
 }
 
+static const be_execution_unit_t ***ia32_get_allowed_execution_units(const void *self, const ir_node *irn) {
+       static const be_execution_unit_t *_allowed_units_BRANCH[] = {
+               &ia32_execution_units_BRANCH[IA32_EXECUNIT_TP_BRANCH_BRANCH1],
+               &ia32_execution_units_BRANCH[IA32_EXECUNIT_TP_BRANCH_BRANCH2],
+               NULL,
+       };
+       static const be_execution_unit_t *_allowed_units_ALU[] = {
+               &ia32_execution_units_ALU[IA32_EXECUNIT_TP_ALU_ALU1],
+               &ia32_execution_units_ALU[IA32_EXECUNIT_TP_ALU_ALU2],
+               &ia32_execution_units_ALU[IA32_EXECUNIT_TP_ALU_ALU3],
+               &ia32_execution_units_ALU[IA32_EXECUNIT_TP_ALU_ALU4],
+               NULL,
+       };
+       static const be_execution_unit_t *_allowed_units_DUMMY[] = {
+               &ia32_execution_units_DUMMY[IA32_EXECUNIT_TP_DUMMY_DUMMY1],
+               &ia32_execution_units_DUMMY[IA32_EXECUNIT_TP_DUMMY_DUMMY2],
+               &ia32_execution_units_DUMMY[IA32_EXECUNIT_TP_DUMMY_DUMMY3],
+               &ia32_execution_units_DUMMY[IA32_EXECUNIT_TP_DUMMY_DUMMY4],
+               NULL,
+       };
+       static const be_execution_unit_t **_units_callret[] = {
+               _allowed_units_BRANCH,
+               NULL
+       };
+       static const be_execution_unit_t **_units_other[] = {
+               _allowed_units_ALU,
+               NULL
+       };
+       static const be_execution_unit_t **_units_dummy[] = {
+               _allowed_units_DUMMY,
+               NULL
+       };
+       const be_execution_unit_t ***ret;
+
+       if (is_ia32_irn(irn)) {
+               ret = get_ia32_exec_units(irn);
+       }
+       else if (is_be_node(irn)) {
+               if (be_is_Call(irn) || be_is_Return(irn)) {
+                       ret = _units_callret;
+               }
+               else if (be_is_Barrier(irn)) {
+                       ret = _units_dummy;
+               }
+               else {
+                        ret = _units_other;
+               }
+       }
+       else {
+               ret = _units_dummy;
+       }
+
+       return ret;
+}
+
+/**
+ * Return the abstract ia32 machine.
+ */
+static const be_machine_t *ia32_get_machine(const void *self) {
+       const ia32_isa_t *isa = self;
+       return isa->cpu;
+}
+
 /**
  * Allows or disallows the creation of Psi nodes for the given Phi nodes.
  * @return 1 if allowed, 0 otherwise
@@ -1910,8 +1981,11 @@ const arch_isa_if_t ia32_isa_if = {
        ia32_get_irn_handler,
        ia32_get_code_generator_if,
        ia32_get_list_sched_selector,
+       ia32_get_ilp_sched_selector,
        ia32_get_reg_class_alignment,
        ia32_get_libfirm_params,
+       ia32_get_allowed_execution_units,
+       ia32_get_machine,
 #ifdef WITH_LIBCORE
        ia32_register_options
 #endif