reorganize beabi - save wether we are using omit_fp in the stack_layout structure
[libfirm] / ir / be / ia32 / bearch_ia32.c
index 4ff347a..f7bbde8 100644 (file)
@@ -42,6 +42,7 @@
 #include "irgopt.h"
 #include "irbitset.h"
 #include "irgopt.h"
+#include "irdump.h"
 #include "pdeq.h"
 #include "pset.h"
 #include "debug.h"
@@ -162,24 +163,6 @@ ir_node *ia32_new_NoReg_xmm(ia32_code_gen_t *cg)
                            &ia32_xmm_regs[REG_XMM_NOREG]);
 }
 
-ir_node *ia32_new_Unknown_gp(ia32_code_gen_t *cg)
-{
-       return create_const(cg, &cg->unknown_gp, new_bd_ia32_Unknown_GP,
-                           &ia32_gp_regs[REG_GP_UKNWN]);
-}
-
-ir_node *ia32_new_Unknown_vfp(ia32_code_gen_t *cg)
-{
-       return create_const(cg, &cg->unknown_vfp, new_bd_ia32_Unknown_VFP,
-                           &ia32_vfp_regs[REG_VFP_UKNWN]);
-}
-
-ir_node *ia32_new_Unknown_xmm(ia32_code_gen_t *cg)
-{
-       return create_const(cg, &cg->unknown_xmm, new_bd_ia32_Unknown_XMM,
-                           &ia32_xmm_regs[REG_XMM_UKNWN]);
-}
-
 ir_node *ia32_new_Fpu_truncate(ia32_code_gen_t *cg)
 {
        return create_const(cg, &cg->fpu_trunc_mode, new_bd_ia32_ChangeCW,
@@ -205,16 +188,6 @@ static ir_node *ia32_get_admissible_noreg(ia32_code_gen_t *cg, ir_node *irn, int
        }
 }
 
-/**************************************************
- *                         _ _              _  __
- *                        | | |            (_)/ _|
- *  _ __ ___  __ _    __ _| | | ___   ___   _| |_
- * | '__/ _ \/ _` |  / _` | | |/ _ \ / __| | |  _|
- * | | |  __/ (_| | | (_| | | | (_) | (__  | | |
- * |_|  \___|\__, |  \__,_|_|_|\___/ \___| |_|_|
- *            __/ |
- *           |___/
- **************************************************/
 
 static const arch_register_req_t *get_ia32_SwitchJmp_out_req(
                const ir_node *node, int pos)
@@ -267,9 +240,9 @@ static void ia32_set_frame_offset(ir_node *irn, int bias)
                return;
 
        if (is_ia32_Pop(irn) || is_ia32_PopMem(irn)) {
-               ia32_code_gen_t *cg = ia32_current_cg;
-               int omit_fp = be_abi_omit_fp(cg->birg->abi);
-               if (omit_fp) {
+               ir_graph          *irg     = get_irn_irg(irn);
+               be_stack_layout_t *layout  = be_get_irg_stack_layout(irg);
+               if (layout->sp_relative) {
                        /* Pop nodes modify the stack pointer before calculating the
                         * destination address, so fix this here
                         */
@@ -558,6 +531,13 @@ static int ia32_get_op_estimated_cost(const ir_node *irn)
  */
 static arch_inverse_t *ia32_get_inverse(const ir_node *irn, int i, arch_inverse_t *inverse, struct obstack *obst)
 {
+       (void) irn;
+       (void) i;
+       (void) inverse;
+       (void) obst;
+       return NULL;
+
+#if 0
        ir_mode  *mode;
        ir_mode  *irn_mode;
        ir_node  *block, *noreg, *nomem;
@@ -670,6 +650,7 @@ static arch_inverse_t *ia32_get_inverse(const ir_node *irn, int i, arch_inverse_
        }
 
        return inverse;
+#endif
 }
 
 static ir_mode *get_spill_mode_mode(const ir_mode *mode)
@@ -838,16 +819,6 @@ static const arch_irn_ops_t ia32_SwitchJmp_irn_ops = {
        ia32_perform_memory_operand,
 };
 
-/**************************************************
- *                _                         _  __
- *               | |                       (_)/ _|
- *   ___ ___   __| | ___  __ _  ___ _ __    _| |_
- *  / __/ _ \ / _` |/ _ \/ _` |/ _ \ '_ \  | |  _|
- * | (_| (_) | (_| |  __/ (_| |  __/ | | | | | |
- *  \___\___/ \__,_|\___|\__, |\___|_| |_| |_|_|
- *                        __/ |
- *                       |___/
- **************************************************/
 
 static ir_entity *mcount = NULL;
 
@@ -864,7 +835,7 @@ static void ia32_before_abi(void *self)
 
        ir_lower_mode_b(cg->irg, &lower_mode_b_config);
        if (cg->dump)
-               be_dump(cg->irg, "-lower_modeb", dump_ir_block_graph_sched);
+               dump_ir_graph(cg->irg, "lower_modeb");
 
        if (cg->gprof) {
                if (mcount == NULL) {
@@ -886,29 +857,31 @@ static void ia32_prepare_graph(void *self)
 {
        ia32_code_gen_t *cg = self;
 
+#ifdef FIRM_GRGEN_BE
        switch (be_transformer) {
        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;
-#endif
 
        default:
                panic("invalid transformer");
        }
+#else
+       ia32_transform_graph(cg);
+#endif
 
        /* do local optimizations (mainly CSE) */
        optimize_graph_df(cg->irg);
 
        if (cg->dump)
-               be_dump(cg->irg, "-transformed", dump_ir_block_graph_sched);
+               dump_ir_graph(cg->irg, "transformed");
 
        /* optimize address mode */
        ia32_optimize_graph(cg);
@@ -917,7 +890,7 @@ static void ia32_prepare_graph(void *self)
        place_code(cg->irg);
 
        if (cg->dump)
-               be_dump(cg->irg, "-place", dump_ir_block_graph_sched);
+               dump_ir_graph(cg->irg, "place");
 }
 
 ir_node *turn_back_am(ir_node *node)
@@ -1026,7 +999,7 @@ static void ia32_before_ra(void *self)
        ia32_setup_fpu_mode(cg);
 
        /* fixup flags */
-       be_sched_fix_flags(cg->birg, &ia32_reg_classes[CLASS_ia32_flags],
+       be_sched_fix_flags(cg->irg, &ia32_reg_classes[CLASS_ia32_flags],
                           &flags_remat);
 
        ia32_add_missing_keeps(cg);
@@ -1114,18 +1087,6 @@ static void transform_to_Store(ia32_code_gen_t *cg, ir_node *node)
                sched_point = sched_prev(node);
        }
 
-       /* No need to spill unknown values... */
-       if (is_ia32_Unknown_GP(val) ||
-               is_ia32_Unknown_VFP(val) ||
-               is_ia32_Unknown_XMM(val)) {
-               store = nomem;
-               if (sched_point)
-                       sched_remove(node);
-
-               exchange(node, store);
-               return;
-       }
-
        if (mode_is_float(mode)) {
                if (ia32_cg_config.use_sse2)
                        store = new_bd_ia32_xStore(dbg, block, ptr, noreg, nomem, val);
@@ -1218,7 +1179,7 @@ static ir_node* create_spproj(ir_node *node, ir_node *pred, int pos)
 static void transform_MemPerm(ia32_code_gen_t *cg, ir_node *node)
 {
        ir_node         *block = get_nodes_block(node);
-       ir_node         *sp    = be_abi_get_ignore_irn(cg->birg->abi, &ia32_gp_regs[REG_ESP]);
+       ir_node         *sp    = be_abi_get_ignore_irn(be_get_irg_abi(cg->irg), &ia32_gp_regs[REG_ESP]);
        int              arity = be_get_MemPerm_entity_arity(node);
        ir_node        **pops  = ALLOCAN(ir_node*, arity);
        ir_node         *in[1];
@@ -1408,7 +1369,7 @@ static void ia32_after_ra(void *self)
 {
        ia32_code_gen_t *cg = self;
        ir_graph *irg = cg->irg;
-       be_fec_env_t *fec_env = be_new_frame_entity_coalescer(cg->birg);
+       be_fec_env_t *fec_env = be_new_frame_entity_coalescer(cg->irg);
 
        /* create and coalesce frame entities */
        irg_walk_graph(irg, NULL, ia32_collect_frame_entity_nodes, fec_env);
@@ -1432,7 +1393,7 @@ static void ia32_finish(void *self)
 
        /* we might have to rewrite x87 virtual registers */
        if (cg->do_x87_sim) {
-               x87_simulate_graph(cg->birg);
+               x87_simulate_graph(cg->irg);
        }
 
        /* do peephole optimisations */
@@ -1440,7 +1401,7 @@ static void ia32_finish(void *self)
 
        /* create block schedule, this also removes empty blocks which might
         * produce critical edges */
-       cg->blk_sched = be_create_block_schedule(irg, cg->birg->exec_freq);
+       cg->blk_sched = be_create_block_schedule(irg);
 }
 
 /**
@@ -1487,7 +1448,7 @@ static ir_node *ia32_get_pic_base(void *self)
        return get_eip;
 }
 
-static void *ia32_cg_init(be_irg_t *birg);
+static void *ia32_cg_init(ir_graph *irg);
 
 static const arch_code_generator_if_t ia32_code_gen_if = {
        ia32_cg_init,
@@ -1504,22 +1465,21 @@ static const arch_code_generator_if_t ia32_code_gen_if = {
 /**
  * Initializes a IA32 code generator.
  */
-static void *ia32_cg_init(be_irg_t *birg)
+static void *ia32_cg_init(ir_graph *irg)
 {
-       ia32_isa_t      *isa = (ia32_isa_t *)birg->main_env->arch_env;
+       ia32_isa_t      *isa = (ia32_isa_t *)be_get_irg_arch_env(irg);
        ia32_code_gen_t *cg  = XMALLOCZ(ia32_code_gen_t);
 
        cg->impl      = &ia32_code_gen_if;
-       cg->irg       = birg->irg;
+       cg->irg       = irg;
        cg->isa       = isa;
-       cg->birg      = birg;
        cg->blk_sched = NULL;
-       cg->dump      = (birg->main_env->options->dump_flags & DUMP_BE) ? 1 : 0;
-       cg->gprof     = (birg->main_env->options->gprof) ? 1 : 0;
+       cg->dump      = (be_get_irg_options(irg)->dump_flags & DUMP_BE) ? 1 : 0;
+       cg->gprof     = (be_get_irg_options(irg)->gprof) ? 1 : 0;
 
        if (cg->gprof) {
                /* Linux gprof implementation needs base pointer */
-               birg->main_env->options->omit_fp = 0;
+               be_get_irg_options(irg)->omit_fp = 0;
        }
 
        /* enter it */
@@ -1539,17 +1499,6 @@ static void *ia32_cg_init(be_irg_t *birg)
 }
 
 
-
-/*****************************************************************
- *  ____             _                  _   _____  _____
- * |  _ \           | |                | | |_   _|/ ____|  /\
- * | |_) | __ _  ___| | _____ _ __   __| |   | | | (___   /  \
- * |  _ < / _` |/ __| |/ / _ \ '_ \ / _` |   | |  \___ \ / /\ \
- * | |_) | (_| | (__|   <  __/ | | | (_| |  _| |_ ____) / ____ \
- * |____/ \__,_|\___|_|\_\___|_| |_|\__,_| |_____|_____/_/    \_\
- *
- *****************************************************************/
-
 /**
  * Set output modes for GCC
  */
@@ -1592,6 +1541,7 @@ static ia32_isa_t ia32_isa_template = {
                NULL,                    /* main environment */
                7,                       /* costs for a spill instruction */
                5,                       /* costs for a reload instruction */
+               false,                   /* no custom abi handling */
        },
        NULL,                    /* 16bit register names */
        NULL,                    /* 8bit register names */
@@ -1919,7 +1869,7 @@ static void ia32_get_call_abi(const void *self, ir_type *method_type,
                        reg  = ia32_get_RegParam_reg(cc, regnum, mode);
                }
                if (reg != NULL) {
-                       be_abi_call_param_reg(abi, i, reg);
+                       be_abi_call_param_reg(abi, i, reg, ABI_CONTEXT_BOTH);
                        ++regnum;
                } else {
                        /* Micro optimisation: if the mode is shorter than 4 bytes, load 4 bytes.
@@ -1936,7 +1886,7 @@ static void ia32_get_call_abi(const void *self, ir_type *method_type,
                                if (size < 4) load_mode = mode_Iu;
                        }
 
-                       be_abi_call_param_stack(abi, i, load_mode, 4, 0, 0);
+                       be_abi_call_param_stack(abi, i, load_mode, 4, 0, 0, ABI_CONTEXT_BOTH);
                }
        }
 
@@ -1959,8 +1909,8 @@ static void ia32_get_call_abi(const void *self, ir_type *method_type,
 
                assert(!mode_is_float(mode) && "mixed INT, FP results not supported");
 
-               be_abi_call_res_reg(abi, 0, &ia32_gp_regs[REG_EAX]);
-               be_abi_call_res_reg(abi, 1, &ia32_gp_regs[REG_EDX]);
+               be_abi_call_res_reg(abi, 0, &ia32_gp_regs[REG_EAX], ABI_CONTEXT_BOTH);
+               be_abi_call_res_reg(abi, 1, &ia32_gp_regs[REG_EDX], ABI_CONTEXT_BOTH);
        }
        else if (n == 1) {
                const arch_register_t *reg;
@@ -1971,7 +1921,7 @@ static void ia32_get_call_abi(const void *self, ir_type *method_type,
 
                reg = mode_is_float(mode) ? &ia32_vfp_regs[REG_VF0] : &ia32_gp_regs[REG_EAX];
 
-               be_abi_call_res_reg(abi, 0, reg);
+               be_abi_call_res_reg(abi, 0, reg, ABI_CONTEXT_BOTH);
        }
 }
 
@@ -1984,9 +1934,7 @@ static int ia32_to_appear_in_schedule(void *block_env, const ir_node *irn)
        }
 
        if (is_ia32_NoReg_GP(irn) || is_ia32_NoReg_VFP(irn) || is_ia32_NoReg_XMM(irn)
-               || is_ia32_Unknown_GP(irn) || is_ia32_Unknown_XMM(irn)
-               || is_ia32_Unknown_VFP(irn) || is_ia32_ChangeCW(irn)
-               || is_ia32_Immediate(irn))
+           || is_ia32_ChangeCW(irn) || is_ia32_Immediate(irn))
                return 0;
 
        return 1;