Remove the unused before_sched callback.
[libfirm] / ir / be / ia32 / bearch_ia32.c
index 1ca37fc..eddb79f 100644 (file)
@@ -23,9 +23,7 @@
  * @author      Christian Wuerdig
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "lc_opts.h"
 #include "lc_opts_enum.h"
@@ -91,6 +89,8 @@
 
 #ifdef FIRM_GRGEN_BE
 #include "ia32_pbqp_transform.h"
+
+transformer_t be_transformer = TRANSFORMER_DEFAULT;
 #endif
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
@@ -121,7 +121,7 @@ static ia32_intrinsic_env_t intrinsic_env = {
 
 typedef ir_node *(*create_const_node_func) (dbg_info *dbg, ir_graph *irg, ir_node *block);
 
-static INLINE ir_node *create_const(ia32_code_gen_t *cg, ir_node **place,
+static inline ir_node *create_const(ia32_code_gen_t *cg, ir_node **place,
                                     create_const_node_func func,
                                     const arch_register_t* reg)
 {
@@ -132,7 +132,7 @@ static INLINE ir_node *create_const(ia32_code_gen_t *cg, ir_node **place,
 
        block = get_irg_start_block(cg->irg);
        res = func(NULL, cg->irg, block);
-       arch_set_irn_register(cg->arch_env, res, reg);
+       arch_set_irn_register(res, reg);
        *place = res;
 
        add_irn_dep(get_irg_end(cg->irg), res);
@@ -183,9 +183,8 @@ ir_node *ia32_new_Fpu_truncate(ia32_code_gen_t *cg) {
  */
 static ir_node *ia32_get_admissible_noreg(ia32_code_gen_t *cg, ir_node *irn, int pos)
 {
-       const arch_register_req_t *req;
+       const arch_register_req_t *req = arch_get_register_req(irn, pos);
 
-       req = arch_get_register_req(cg->arch_env, irn, pos);
        assert(req != NULL && "Missing register requirements");
        if (req->cls == &ia32_reg_classes[CLASS_ia32_gp])
                return ia32_new_NoReg_gp(cg);
@@ -280,10 +279,8 @@ static void ia32_set_irn_reg(ir_node *irn, const arch_register_t *reg)
 static const arch_register_t *ia32_get_irn_reg(const ir_node *irn)
 {
        int pos = 0;
-       const arch_register_t *reg = NULL;
 
        if (is_Proj(irn)) {
-
                if (get_irn_mode(irn) == mode_X) {
                        return NULL;
                }
@@ -293,19 +290,16 @@ static const arch_register_t *ia32_get_irn_reg(const ir_node *irn)
        }
 
        if (is_ia32_irn(irn)) {
-               const arch_register_t **slots;
-               slots = get_ia32_slots(irn);
+               const arch_register_t **slots = get_ia32_slots(irn);
                assert(pos < get_ia32_n_res(irn));
-               reg   = slots[pos];
+               return slots[pos];
        } else {
-               reg = ia32_get_firm_reg(irn, cur_reg_set);
+               return ia32_get_firm_reg(irn, cur_reg_set);
        }
-
-       return reg;
 }
 
 static arch_irn_class_t ia32_classify(const ir_node *irn) {
-       arch_irn_class_t classification = arch_irn_class_normal;
+       arch_irn_class_t classification = 0;
 
        irn = skip_Proj_const(irn);
 
@@ -313,13 +307,7 @@ static arch_irn_class_t ia32_classify(const ir_node *irn) {
                classification |= arch_irn_class_branch;
 
        if (! is_ia32_irn(irn))
-               return classification & ~arch_irn_class_normal;
-
-       if (is_ia32_Ld(irn))
-               classification |= arch_irn_class_load;
-
-       if (is_ia32_St(irn))
-               classification |= arch_irn_class_store;
+               return classification;
 
        if (is_ia32_is_reload(irn))
                classification |= arch_irn_class_reload;
@@ -453,7 +441,7 @@ static const arch_register_t *ia32_abi_prologue(void *self, ir_node **mem, pmap
                *mem    = new_r_Proj(irg, bl, push, mode_M, pn_ia32_Push_M);
 
                /* the push must have SP out register */
-               arch_set_irn_register(arch_env, curr_sp, arch_env->sp);
+               arch_set_irn_register(curr_sp, arch_env->sp);
                set_ia32_flags(push, arch_irn_flags_ignore);
 
                /* this modifies the stack bias, because we pushed 32bit */
@@ -462,13 +450,13 @@ static const arch_register_t *ia32_abi_prologue(void *self, ir_node **mem, pmap
                /* move esp to ebp */
                curr_bp  = be_new_Copy(arch_env->bp->reg_class, irg, bl, curr_sp);
                be_set_constr_single_reg(curr_bp, BE_OUT_POS(0), arch_env->bp);
-               arch_set_irn_register(arch_env, curr_bp, arch_env->bp);
+               arch_set_irn_register(curr_bp, arch_env->bp);
                be_node_set_flags(curr_bp, BE_OUT_POS(0), arch_irn_flags_ignore);
 
                /* beware: the copy must be done before any other sp use */
                curr_sp = be_new_CopyKeep_single(arch_env->sp->reg_class, irg, bl, curr_sp, curr_bp, get_irn_mode(curr_sp));
                be_set_constr_single_reg(curr_sp, BE_OUT_POS(0), arch_env->sp);
-               arch_set_irn_register(arch_env, curr_sp, arch_env->sp);
+               arch_set_irn_register(curr_sp, arch_env->sp);
                be_node_set_flags(curr_sp, BE_OUT_POS(0), arch_irn_flags_ignore);
 
                be_abi_reg_map_set(reg_map, arch_env->sp, curr_sp);
@@ -521,7 +509,7 @@ static void ia32_abi_epilogue(void *self, ir_node *bl, ir_node **mem, pmap *reg_
 
                        /* copy ebp to esp */
                        curr_sp = be_new_Copy(&ia32_reg_classes[CLASS_ia32_gp], irg, bl, curr_bp);
-                       arch_set_irn_register(arch_env, curr_sp, arch_env->sp);
+                       arch_set_irn_register(curr_sp, arch_env->sp);
                        be_node_set_flags(curr_sp, BE_OUT_POS(0), arch_irn_flags_ignore);
 
                        /* pop ebp */
@@ -532,8 +520,8 @@ static void ia32_abi_epilogue(void *self, ir_node *bl, ir_node **mem, pmap *reg_
 
                        *mem = new_r_Proj(irg, bl, pop, mode_M, pn_ia32_Pop_M);
                }
-               arch_set_irn_register(arch_env, curr_sp, arch_env->sp);
-               arch_set_irn_register(arch_env, curr_bp, arch_env->bp);
+               arch_set_irn_register(curr_sp, arch_env->sp);
+               arch_set_irn_register(curr_bp, arch_env->bp);
        }
 
        be_abi_reg_map_set(reg_map, arch_env->sp, curr_sp);
@@ -971,8 +959,6 @@ static void ia32_before_abi(void *self) {
        }
 }
 
-transformer_t be_transformer = TRANSFORMER_DEFAULT;
-
 /**
  * Transforms the standard firm graph into
  * an ia32 firm graph
@@ -995,20 +981,21 @@ static void ia32_prepare_graph(void *self) {
                be_dump(cg->irg, "-pre_transform", dump_ir_block_graph_sched);
 
        switch (be_transformer) {
-               case TRANSFORMER_DEFAULT:
-                       /* transform remaining nodes into assembler instructions */
-                       ia32_transform_graph(cg);
-                       break;
+       case TRANSFORMER_DEFAULT:
+               /* transform remaining nodes into assembler instructions */
+               ia32_transform_graph(cg);
+               break;
 
 #ifdef FIRM_GRGEN_BE
-               case TRANSFORMER_PBQP:
-               case TRANSFORMER_RAND:
-                       /* transform nodes into assembler instructions by PBQP magic */
-                       ia32_transform_graph_by_pbqp(cg);
-                       break;
+       case TRANSFORMER_PBQP:
+       case TRANSFORMER_RAND:
+               /* transform nodes into assembler instructions by PBQP magic */
+               ia32_transform_graph_by_pbqp(cg);
+               break;
 #endif
 
-               default: panic("invalid transformer");
+       default:
+               panic("invalid transformer");
        }
 
        /* do local optimizations (mainly CSE) */
@@ -1020,9 +1007,6 @@ static void ia32_prepare_graph(void *self) {
        /* optimize address mode */
        ia32_optimize_graph(cg);
 
-       if (cg->dump)
-               be_dump(cg->irg, "-am", dump_ir_block_graph_sched);
-
        /* do code placement, to optimize the position of constants */
        place_code(cg->irg);
 
@@ -1030,13 +1014,6 @@ static void ia32_prepare_graph(void *self) {
                be_dump(cg->irg, "-place", dump_ir_block_graph_sched);
 }
 
-/**
- * Dummy functions for hooks we don't need but which must be filled.
- */
-static void ia32_before_sched(void *self) {
-       (void) self;
-}
-
 ir_node *turn_back_am(ir_node *node)
 {
        ir_graph *irg   = current_ir_graph;
@@ -1200,8 +1177,8 @@ static void transform_to_Load(ia32_code_gen_t *cg, ir_node *node) {
        }
 
        /* copy the register from the old node to the new Load */
-       reg = arch_get_irn_register(cg->arch_env, node);
-       arch_set_irn_register(cg->arch_env, new_op, reg);
+       reg = arch_get_irn_register(node);
+       arch_set_irn_register(new_op, reg);
 
        SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(cg, node));
 
@@ -1310,7 +1287,8 @@ static ir_node *create_pop(ia32_code_gen_t *cg, ir_node *node, ir_node *schedpoi
        return pop;
 }
 
-static ir_node* create_spproj(ia32_code_gen_t *cg, ir_node *node, ir_node *pred, int pos) {
+static ir_node* create_spproj(ir_node *node, ir_node *pred, int pos)
+{
        ir_graph *irg = get_irn_irg(node);
        dbg_info *dbg = get_irn_dbg_info(node);
        ir_node *block = get_nodes_block(node);
@@ -1319,7 +1297,7 @@ static ir_node* create_spproj(ia32_code_gen_t *cg, ir_node *node, ir_node *pred,
        ir_node *sp;
 
        sp = new_rd_Proj(dbg, irg, block, pred, spmode, pos);
-       arch_set_irn_register(cg->arch_env, sp, spreg);
+       arch_set_irn_register(sp, spreg);
 
        return sp;
 }
@@ -1359,12 +1337,12 @@ static void transform_MemPerm(ia32_code_gen_t *cg, ir_node *node) {
                assert( (entsize == 4 || entsize == 8) && "spillslot on x86 should be 32 or 64 bit");
 
                push = create_push(cg, node, node, sp, mem, inent);
-               sp = create_spproj(cg, node, push, pn_ia32_Push_stack);
+               sp = create_spproj(node, push, pn_ia32_Push_stack);
                if(entsize == 8) {
                        /* add another push after the first one */
                        push = create_push(cg, node, node, sp, mem, inent);
                        add_ia32_am_offs_int(push, 4);
-                       sp = create_spproj(cg, node, push, pn_ia32_Push_stack);
+                       sp = create_spproj(node, push, pn_ia32_Push_stack);
                }
 
                set_irn_n(node, i, new_Bad());
@@ -1385,13 +1363,13 @@ static void transform_MemPerm(ia32_code_gen_t *cg, ir_node *node) {
                assert( (entsize == 4 || entsize == 8) && "spillslot on x86 should be 32 or 64 bit");
 
                pop = create_pop(cg, node, node, sp, outent);
-               sp = create_spproj(cg, node, pop, pn_ia32_Pop_stack);
+               sp = create_spproj(node, pop, pn_ia32_Pop_stack);
                if(entsize == 8) {
                        add_ia32_am_offs_int(pop, 4);
 
                        /* add another pop after the first one */
                        pop = create_pop(cg, node, node, sp, outent);
-                       sp = create_spproj(cg, node, pop, pn_ia32_Pop_stack);
+                       sp = create_spproj(node, pop, pn_ia32_Pop_stack);
                }
 
                pops[i] = pop;
@@ -1446,52 +1424,73 @@ static void ia32_after_ra_walker(ir_node *block, void *env) {
  */
 static void ia32_collect_frame_entity_nodes(ir_node *node, void *data)
 {
-       be_fec_env_t *env = data;
+       be_fec_env_t  *env = data;
+       const ir_mode *mode;
+       int            align;
 
        if (be_is_Reload(node) && be_get_frame_entity(node) == NULL) {
-               const ir_mode *mode = get_spill_mode_mode(get_irn_mode(node));
-               int align = get_mode_size_bytes(mode);
-               be_node_needs_frame_entity(env, node, mode, align);
-       } else if(is_ia32_irn(node) && get_ia32_frame_ent(node) == NULL
-                 && is_ia32_use_frame(node)) {
-               if (is_ia32_need_stackent(node) || is_ia32_Load(node)) {
-                       const ir_mode     *mode  = get_ia32_ls_mode(node);
-                       const ia32_attr_t *attr  = get_ia32_attr_const(node);
-                       int                align;
-
-                       if (is_ia32_is_reload(node)) {
-                               mode = get_spill_mode_mode(mode);
+               mode  = get_spill_mode_mode(get_irn_mode(node));
+               align = get_mode_size_bytes(mode);
+       } else if (is_ia32_irn(node)         &&
+                       get_ia32_frame_ent(node) == NULL &&
+                       is_ia32_use_frame(node)) {
+               if (is_ia32_need_stackent(node))
+                       goto need_stackent;
+
+               switch (get_ia32_irn_opcode(node)) {
+need_stackent:
+                       case iro_ia32_Load: {
+                               const ia32_attr_t *attr = get_ia32_attr_const(node);
+
+                               if (attr->data.need_32bit_stackent) {
+                                       mode = mode_Is;
+                               } else if (attr->data.need_64bit_stackent) {
+                                       mode = mode_Ls;
+                               } else {
+                                       mode = get_ia32_ls_mode(node);
+                                       if (is_ia32_is_reload(node))
+                                               mode = get_spill_mode_mode(mode);
+                               }
+                               align = get_mode_size_bytes(mode);
+                               break;
                        }
 
-                       if(attr->data.need_64bit_stackent) {
-                               mode = mode_Ls;
+                       case iro_ia32_vfild:
+                       case iro_ia32_vfld:
+                       case iro_ia32_xLoad: {
+                               mode  = get_ia32_ls_mode(node);
+                               align = 4;
+                               break;
                        }
-                       if(attr->data.need_32bit_stackent) {
-                               mode = mode_Is;
+
+                       case iro_ia32_FldCW: {
+                               /* although 2 byte would be enough 4 byte performs best */
+                               mode  = mode_Iu;
+                               align = 4;
+                               break;
                        }
-                       align = get_mode_size_bytes(mode);
-                       be_node_needs_frame_entity(env, node, mode, align);
-               } else if (is_ia32_vfild(node) || is_ia32_xLoad(node)
-                          || is_ia32_vfld(node)) {
-                       const ir_mode *mode  = get_ia32_ls_mode(node);
-                       int            align = 4;
-                       be_node_needs_frame_entity(env, node, mode, align);
-               } else if(is_ia32_FldCW(node)) {
-                       /* although 2 byte would be enough 4 byte performs best */
-                       const ir_mode *mode  = mode_Iu;
-                       int            align = 4;
-                       be_node_needs_frame_entity(env, node, mode, align);
-               } else {
+
+                       default:
 #ifndef NDEBUG
-                       assert(is_ia32_St(node) ||
-                                  is_ia32_xStoreSimple(node) ||
-                                  is_ia32_vfst(node) ||
-                                  is_ia32_vfist(node) ||
-                                  is_ia32_vfisttp(node) ||
-                              is_ia32_FnstCW(node));
+                               panic("unexpected frame user while collection frame entity nodes");
+
+                       case iro_ia32_FnstCW:
+                       case iro_ia32_Store8Bit:
+                       case iro_ia32_Store:
+                       case iro_ia32_fst:
+                       case iro_ia32_fstp:
+                       case iro_ia32_vfist:
+                       case iro_ia32_vfisttp:
+                       case iro_ia32_vfst:
+                       case iro_ia32_xStore:
+                       case iro_ia32_xStoreSimple:
 #endif
+                               return;
                }
+       } else {
+               return;
        }
+       be_node_needs_frame_entity(env, node, mode, align);
 }
 
 /**
@@ -1524,7 +1523,7 @@ static void ia32_finish(void *self) {
 
        /* we might have to rewrite x87 virtual registers */
        if (cg->do_x87_sim) {
-               x87_simulate_graph(cg->arch_env, cg->birg);
+               x87_simulate_graph(cg->birg);
        }
 
        /* do peephole optimisations */
@@ -1584,7 +1583,6 @@ static const arch_code_generator_if_t ia32_code_gen_if = {
        ia32_before_abi,     /* before abi introduce hook */
        ia32_prepare_graph,
        NULL,                /* spill */
-       ia32_before_sched,   /* before scheduling hook */
        ia32_before_ra,      /* before register allocation hook */
        ia32_after_ra,       /* after register allocation hook */
        ia32_finish,         /* called before codegen */
@@ -1602,7 +1600,6 @@ static void *ia32_cg_init(be_irg_t *birg) {
        cg->irg       = birg->irg;
        cg->reg_set   = new_set(ia32_cmp_irn_reg_assoc, 1024);
        cg->isa       = isa;
-       cg->arch_env  = birg->main_env->arch_env;
        cg->birg      = birg;
        cg->blk_sched = NULL;
        cg->dump      = (birg->main_env->options->dump_flags & DUMP_BE) ? 1 : 0;
@@ -2347,22 +2344,24 @@ static lc_opt_enum_int_var_t gas_var = {
        (int*) &be_gas_flavour, gas_items
 };
 
+#ifdef FIRM_GRGEN_BE
 static const lc_opt_enum_int_items_t transformer_items[] = {
        { "default", TRANSFORMER_DEFAULT },
-#ifdef FIRM_GRGEN_BE
        { "pbqp",    TRANSFORMER_PBQP    },
        { "random",  TRANSFORMER_RAND    },
-#endif
        { NULL,      0                   }
 };
 
 static lc_opt_enum_int_var_t transformer_var = {
        (int*)&be_transformer, transformer_items
 };
+#endif
 
 static const lc_opt_table_entry_t ia32_options[] = {
        LC_OPT_ENT_ENUM_INT("gasmode", "set the GAS compatibility mode", &gas_var),
+#ifdef FIRM_GRGEN_BE
        LC_OPT_ENT_ENUM_INT("transformer", "the transformer used for code selection", &transformer_var),
+#endif
        LC_OPT_ENT_INT("stackalign", "set power of two stack alignment for calls",
                       &ia32_isa_template.arch_env.stack_alignment),
        LC_OPT_LAST