ia32_x87: remove the distinction between vfp and fp concepts
[libfirm] / ir / be / ia32 / ia32_fpu.c
index 07a4e12..54e0680 100644 (file)
@@ -21,7 +21,6 @@
  * @file
  * @brief   Handles fpu rounding modes
  * @author  Matthias Braun
- * @version $Id$
  *
  * The problem we deal with here is that the x86 ABI says the user can control
  * the fpu rounding mode, which means that when we do some operations like float
 #include "tv.h"
 #include "array.h"
 
-#include "../beirgmod.h"
-#include "../bearch.h"
-#include "../besched.h"
-#include "../beabi.h"
-#include "../benode.h"
-#include "../bestate.h"
-#include "../beutil.h"
-#include "../bessaconstr.h"
-#include "../beirg.h"
+#include "beirgmod.h"
+#include "bearch.h"
+#include "besched.h"
+#include "beabi.h"
+#include "benode.h"
+#include "bestate.h"
+#include "beutil.h"
+#include "bessaconstr.h"
+#include "beirg.h"
 
 static ir_entity *fpcw_round    = NULL;
 static ir_entity *fpcw_truncate = NULL;
@@ -61,7 +60,7 @@ static ir_entity *create_ent(int value, const char *name)
        ir_graph  *cnst_irg;
        ir_entity *ent;
        ir_node   *cnst;
-       tarval    *tv;
+       ir_tarval *tv;
 
        set_type_alignment_bytes(type, 4);
 
@@ -87,8 +86,7 @@ static void create_fpcw_entities(void)
 static ir_node *create_fpu_mode_spill(void *env, ir_node *state, int force,
                                       ir_node *after)
 {
-       ia32_code_gen_t *cg = env;
-       ir_node *spill = NULL;
+       (void) env;
 
        /* we don't spill the fpcw in unsafe mode */
        if (ia32_cg_config.use_unsafe_floatconv) {
@@ -104,27 +102,28 @@ static ir_node *create_fpu_mode_spill(void *env, ir_node *state, int force,
        if (force == 1 || !is_ia32_ChangeCW(state)) {
                ir_graph *irg = get_irn_irg(state);
                ir_node *block = get_nodes_block(state);
-               ir_node *noreg = ia32_new_NoReg_gp(cg);
-               ir_node *nomem = new_NoMem();
+               ir_node *noreg = ia32_new_NoReg_gp(irg);
+               ir_node *nomem = get_irg_no_mem(irg);
                ir_node *frame = get_irg_frame(irg);
-
-               spill = new_bd_ia32_FnstCW(NULL, block, frame, noreg, nomem, state);
+               ir_node *spill
+                       = new_bd_ia32_FnstCW(NULL, block, frame, noreg, nomem, state);
                set_ia32_op_type(spill, ia32_AddrModeD);
                /* use mode_Iu, as movl has a shorter opcode than movw */
                set_ia32_ls_mode(spill, mode_Iu);
                set_ia32_use_frame(spill);
 
                sched_add_after(skip_Proj(after), spill);
+               return spill;
        }
 
-       return spill;
+       return NULL;
 }
 
-static ir_node *create_fldcw_ent(ia32_code_gen_t *cg, ir_node *block,
-                                 ir_entity *entity)
+static ir_node *create_fldcw_ent(ir_node *block, ir_entity *entity)
 {
-       ir_node  *nomem = new_NoMem();
-       ir_node  *noreg = ia32_new_NoReg_gp(cg);
+       ir_graph *irg   = get_irn_irg(block);
+       ir_node  *nomem = get_irg_no_mem(irg);
+       ir_node  *noreg = ia32_new_NoReg_gp(irg);
        ir_node  *reload;
 
        reload = new_bd_ia32_FldCW(NULL, block, noreg, noreg, nomem);
@@ -132,7 +131,7 @@ static ir_node *create_fldcw_ent(ia32_code_gen_t *cg, ir_node *block,
        set_ia32_ls_mode(reload, ia32_reg_classes[CLASS_ia32_fp_cw].mode);
        set_ia32_am_sc(reload, entity);
        set_ia32_use_frame(reload);
-       arch_set_irn_register(reload, &ia32_fp_cw_regs[REG_FPCW]);
+       arch_set_irn_register(reload, &ia32_registers[REG_FPCW]);
 
        return reload;
 }
@@ -141,21 +140,21 @@ static ir_node *create_fpu_mode_reload(void *env, ir_node *state,
                                        ir_node *spill, ir_node *before,
                                        ir_node *last_state)
 {
-       ia32_code_gen_t *cg    = env;
-       ir_graph        *irg   = get_irn_irg(state);
-       ir_node         *block = get_nodes_block(before);
-       ir_node         *frame = get_irg_frame(irg);
-       ir_node         *noreg = ia32_new_NoReg_gp(cg);
-       ir_node         *reload = NULL;
+       ir_graph *irg    = get_irn_irg(state);
+       ir_node  *block  = get_nodes_block(before);
+       ir_node  *frame  = get_irg_frame(irg);
+       ir_node  *noreg  = ia32_new_NoReg_gp(irg);
+       ir_node  *reload = NULL;
+       (void) env;
 
        if (ia32_cg_config.use_unsafe_floatconv) {
                if (fpcw_round == NULL) {
                        create_fpcw_entities();
                }
                if (spill != NULL) {
-                       reload = create_fldcw_ent(cg, block, fpcw_round);
+                       reload = create_fldcw_ent(block, fpcw_round);
                } else {
-                       reload = create_fldcw_ent(cg, block, fpcw_truncate);
+                       reload = create_fldcw_ent(block, fpcw_truncate);
                }
                sched_add_before(before, reload);
                return reload;
@@ -166,13 +165,14 @@ static ir_node *create_fpu_mode_reload(void *env, ir_node *state,
                set_ia32_op_type(reload, ia32_AddrModeS);
                set_ia32_ls_mode(reload, ia32_reg_classes[CLASS_ia32_fp_cw].mode);
                set_ia32_use_frame(reload);
-               arch_set_irn_register(reload, &ia32_fp_cw_regs[REG_FPCW]);
+               arch_set_irn_register(reload, &ia32_registers[REG_FPCW]);
 
                sched_add_before(before, reload);
        } else {
                ir_mode *lsmode = ia32_reg_classes[CLASS_ia32_fp_cw].mode;
-               ir_node *nomem = new_NoMem();
-               ir_node *cwstore, *load, *load_res, *or, *store, *fldcw;
+               ir_node *nomem  = get_irg_no_mem(irg);
+               ir_node *cwstore, *load, *load_res, *orn, *store, *fldcw;
+               ir_node *store_proj;
                ir_node *or_const;
 
                assert(last_state != NULL);
@@ -189,28 +189,29 @@ static ir_node *create_fpu_mode_reload(void *env, ir_node *state,
                set_ia32_use_frame(load);
                sched_add_before(before, load);
 
-               load_res = new_r_Proj(block, load, mode_Iu, pn_ia32_Load_res);
+               load_res = new_r_Proj(load, mode_Iu, pn_ia32_Load_res);
 
                /* TODO: make the actual mode configurable in ChangeCW... */
                or_const = new_bd_ia32_Immediate(NULL, get_irg_start_block(irg),
                                                 NULL, 0, 0, 3072);
-               arch_set_irn_register(or_const, &ia32_gp_regs[REG_GP_NOREG]);
-               or = new_bd_ia32_Or(NULL, block, noreg, noreg, nomem, load_res,
+               arch_set_irn_register(or_const, &ia32_registers[REG_GP_NOREG]);
+               orn = new_bd_ia32_Or(NULL, block, noreg, noreg, nomem, load_res,
                                    or_const);
-               sched_add_before(before, or);
+               sched_add_before(before, orn);
 
-               store = new_bd_ia32_Store(NULL, block, frame, noreg, nomem, or);
+               store = new_bd_ia32_Store(NULL, block, frame, noreg, nomem, orn);
                set_ia32_op_type(store, ia32_AddrModeD);
                /* use mode_Iu, as movl has a shorter opcode than movw */
                set_ia32_ls_mode(store, mode_Iu);
                set_ia32_use_frame(store);
+               store_proj = new_r_Proj(store, mode_M, pn_ia32_Store_M);
                sched_add_before(before, store);
 
-               fldcw = new_bd_ia32_FldCW(NULL, block, frame, noreg, store);
+               fldcw = new_bd_ia32_FldCW(NULL, block, frame, noreg, store_proj);
                set_ia32_op_type(fldcw, ia32_AddrModeS);
                set_ia32_ls_mode(fldcw, lsmode);
                set_ia32_use_frame(fldcw);
-               arch_set_irn_register(fldcw, &ia32_fp_cw_regs[REG_FPCW]);
+               arch_set_irn_register(fldcw, &ia32_registers[REG_FPCW]);
                sched_add_before(before, fldcw);
 
                reload = fldcw;
@@ -225,35 +226,32 @@ typedef struct collect_fpu_mode_nodes_env_t {
 
 static void collect_fpu_mode_nodes_walker(ir_node *node, void *data)
 {
-       collect_fpu_mode_nodes_env_t *env = data;
+       collect_fpu_mode_nodes_env_t *env = (collect_fpu_mode_nodes_env_t*)data;
        const arch_register_t *reg;
 
        if (!mode_is_data(get_irn_mode(node)))
                return;
 
        reg = arch_get_irn_register(node);
-       if (reg == &ia32_fp_cw_regs[REG_FPCW] && !is_ia32_ChangeCW(node)) {
+       if (reg == &ia32_registers[REG_FPCW] && !is_ia32_ChangeCW(node)) {
                ARR_APP1(ir_node*, env->state_nodes, node);
        }
 }
 
-static void rewire_fpu_mode_nodes(be_irg_t *birg)
+static void rewire_fpu_mode_nodes(ir_graph *irg)
 {
        collect_fpu_mode_nodes_env_t env;
        be_ssa_construction_env_t senv;
-       const arch_register_t *reg = &ia32_fp_cw_regs[REG_FPCW];
-       ir_graph *irg = be_get_birg_irg(birg);
+       const arch_register_t *reg = &ia32_registers[REG_FPCW];
        ir_node *initial_value;
        ir_node **phis;
-       be_lv_t *lv = be_get_birg_liveness(birg);
-       int i, len;
+       be_lv_t *lv = be_get_irg_liveness(irg);
+       size_t i, len;
 
        /* do ssa construction for the fpu modes */
        env.state_nodes = NEW_ARR_F(ir_node*, 0);
        irg_walk_graph(irg, collect_fpu_mode_nodes_walker, NULL, &env);
 
-       initial_value = be_abi_get_ignore_irn(birg->abi, reg);
-
        /* nothing needs to be done, in fact we must not continue as for endless
         * loops noone is using the initial_value and it will point to a bad node
         * now
@@ -263,7 +261,8 @@ static void rewire_fpu_mode_nodes(be_irg_t *birg)
                return;
        }
 
-       be_ssa_construction_init(&senv, birg);
+       initial_value = be_get_initial_reg_value(irg, reg);
+       be_ssa_construction_init(&senv, irg);
        be_ssa_construction_add_copies(&senv, env.state_nodes,
                                       ARR_LEN(env.state_nodes));
        be_ssa_construction_fix_users(&senv, initial_value);
@@ -276,7 +275,7 @@ static void rewire_fpu_mode_nodes(be_irg_t *birg)
                        be_liveness_update(lv, env.state_nodes[i]);
                }
        } else {
-               be_liveness_invalidate(birg->lv);
+               be_invalidate_live_sets(irg);
        }
 
        /* set registers for the phis */
@@ -289,15 +288,15 @@ static void rewire_fpu_mode_nodes(be_irg_t *birg)
        be_ssa_construction_destroy(&senv);
        DEL_ARR_F(env.state_nodes);
 
-       be_liveness_invalidate(be_get_birg_liveness(birg));
+       be_invalidate_live_sets(irg);
 }
 
-void ia32_setup_fpu_mode(ia32_code_gen_t *cg)
+void ia32_setup_fpu_mode(ir_graph *irg)
 {
        /* do ssa construction for the fpu modes */
-       rewire_fpu_mode_nodes(cg->birg);
+       rewire_fpu_mode_nodes(irg);
 
        /* ensure correct fpu mode for operations */
-       be_assure_state(cg->birg, &ia32_fp_cw_regs[REG_FPCW],
-                       cg, create_fpu_mode_spill, create_fpu_mode_reload);
+       be_assure_state(irg, &ia32_registers[REG_FPCW],
+                       NULL, create_fpu_mode_spill, create_fpu_mode_reload);
 }