X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_x87.c;h=fe2607a41e620a39d2261b2e6b854f1382c43b7c;hb=6be797281b157f8f71b9c47d28b3d09f2a7918cc;hp=3f227611b5efe6b410ed0b4e738a96da359b4de3;hpb=e9c215cf4349b990b65b0cd9caf1978c3550ccaa;p=libfirm diff --git a/ir/be/ia32/ia32_x87.c b/ir/be/ia32/ia32_x87.c index 3f227611b..fe2607a41 100644 --- a/ir/be/ia32/ia32_x87.c +++ b/ir/be/ia32/ia32_x87.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. + * Copyright (C) 1995-2010 University of Karlsruhe. All right reserved. * * This file is part of libFirm. * @@ -22,7 +22,6 @@ * @brief This file implements the x87 support and virtual to stack * register translation for the ia32 backend. * @author Michael Beck - * @version $Id$ */ #include "config.h" @@ -43,9 +42,9 @@ #include "debug.h" #include "error.h" -#include "../belive_t.h" -#include "../besched.h" -#include "../benode.h" +#include "belive_t.h" +#include "besched.h" +#include "benode.h" #include "bearch_ia32_t.h" #include "ia32_new_nodes.h" #include "gen_ia32_new_nodes.h" @@ -53,18 +52,11 @@ #include "ia32_x87.h" #include "ia32_architecture.h" -#define N_x87_REGS 8 - -/* the unop index */ -#define UNOP_IDX 0 - -#define MASK_TOS(x) ((x) & (N_x87_REGS - 1)) - /** the debug handle */ DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;) /* Forward declaration. */ -typedef struct _x87_simulator x87_simulator; +typedef struct x87_simulator x87_simulator; /** * An exchange template. @@ -73,7 +65,7 @@ typedef struct _x87_simulator x87_simulator; * their opcodes! * Further, x87 supports inverse instructions, so we can handle them. */ -typedef struct _exchange_tmpl { +typedef struct exchange_tmpl { ir_op *normal_op; /**< the normal one */ ir_op *reverse_op; /**< the reverse one if exists */ ir_op *normal_pop_op; /**< the normal one with tos pop */ @@ -83,24 +75,22 @@ typedef struct _exchange_tmpl { /** * An entry on the simulated x87 stack. */ -typedef struct _st_entry { - int reg_idx; /**< the virtual register index of this stack value */ - ir_node *node; /**< the node that produced this value */ +typedef struct st_entry { + int reg_idx; /**< the virtual register index of this stack value */ + ir_node *node; /**< the node that produced this value */ } st_entry; /** * The x87 state. */ -typedef struct _x87_state { - st_entry st[N_x87_REGS]; /**< the register stack */ - int depth; /**< the current stack depth */ - int tos; /**< position of the tos */ - x87_simulator *sim; /**< The simulator. */ +typedef struct x87_state { + st_entry st[N_ia32_st_REGS]; /**< the register stack */ + int depth; /**< the current stack depth */ + x87_simulator *sim; /**< The simulator. */ } x87_state; /** An empty state, used for blocks without fp instructions. */ -static x87_state _empty = { { {0, NULL}, }, 0, 0, NULL }; -static x87_state *empty = (x87_state *)&_empty; +static x87_state empty = { { {0, NULL}, }, 0, NULL }; /** * Return values of the instruction simulator functions. @@ -126,27 +116,24 @@ typedef int (*sim_func)(x87_state *state, ir_node *n); /** * A block state: Every block has a x87 state at the beginning and at the end. */ -typedef struct _blk_state { +typedef struct blk_state { x87_state *begin; /**< state at the begin or NULL if not assigned */ x87_state *end; /**< state at the end or NULL if not assigned */ } blk_state; -#define PTR_TO_BLKSTATE(p) ((blk_state *)(p)) - /** liveness bitset for vfp registers. */ typedef unsigned char vfp_liveness; /** * The x87 simulator. */ -struct _x87_simulator { - struct obstack obst; /**< An obstack for fast allocating. */ - pmap *blk_states; /**< Map blocks to states. */ - be_lv_t *lv; /**< intrablock liveness. */ - vfp_liveness *live; /**< Liveness information. */ - unsigned n_idx; /**< The cached get_irg_last_idx() result. */ - waitq *worklist; /**< Worklist of blocks that must be processed. */ - ia32_isa_t *isa; /**< the ISA object */ +struct x87_simulator { + struct obstack obst; /**< An obstack for fast allocating. */ + pmap *blk_states; /**< Map blocks to states. */ + be_lv_t *lv; /**< intrablock liveness. */ + vfp_liveness *live; /**< Liveness information. */ + unsigned n_idx; /**< The cached get_irg_last_idx() result. */ + waitq *worklist; /**< Worklist of blocks that must be processed. */ }; /** @@ -159,7 +146,13 @@ struct _x87_simulator { static int x87_get_depth(const x87_state *state) { return state->depth; -} /* x87_get_depth */ +} + +static st_entry *x87_get_entry(x87_state *const state, int const pos) +{ + assert(0 <= pos && pos < state->depth); + return &state->st[N_ia32_st_REGS - state->depth + pos]; +} /** * Return the virtual register index at st(pos). @@ -171,25 +164,10 @@ static int x87_get_depth(const x87_state *state) */ static int x87_get_st_reg(const x87_state *state, int pos) { - assert(pos < state->depth); - return state->st[MASK_TOS(state->tos + pos)].reg_idx; -} /* x87_get_st_reg */ + return x87_get_entry((x87_state*)state, pos)->reg_idx; +} #ifdef DEBUG_libfirm -/** - * Return the node at st(pos). - * - * @param state the x87 state - * @param pos a stack position - * - * @return the IR node that produced the value at st(pos) - */ -static ir_node *x87_get_st_node(const x87_state *state, int pos) -{ - assert(pos < state->depth); - return state->st[MASK_TOS(state->tos + pos)].node; -} /* x87_get_st_node */ - /** * Dump the stack for debugging. * @@ -197,14 +175,12 @@ static ir_node *x87_get_st_node(const x87_state *state, int pos) */ static void x87_dump_stack(const x87_state *state) { - int i; - - for (i = state->depth - 1; i >= 0; --i) { - DB((dbg, LEVEL_2, "vf%d(%+F) ", x87_get_st_reg(state, i), - x87_get_st_node(state, i))); + for (int i = state->depth; i-- != 0;) { + st_entry const *const entry = x87_get_entry((x87_state*)state, i); + DB((dbg, LEVEL_2, "vf%d(%+F) ", entry->reg_idx, entry->node)); } DB((dbg, LEVEL_2, "<-- TOS\n")); -} /* x87_dump_stack */ +} #endif /* DEBUG_libfirm */ /** @@ -217,13 +193,13 @@ static void x87_dump_stack(const x87_state *state) */ static void x87_set_st(x87_state *state, int reg_idx, ir_node *node, int pos) { - assert(0 < state->depth); - state->st[MASK_TOS(state->tos + pos)].reg_idx = reg_idx; - state->st[MASK_TOS(state->tos + pos)].node = node; + st_entry *const entry = x87_get_entry(state, pos); + entry->reg_idx = reg_idx; + entry->node = node; DB((dbg, LEVEL_2, "After SET_REG: ")); - DEBUG_ONLY(x87_dump_stack(state)); -} /* x87_set_st */ + DEBUG_ONLY(x87_dump_stack(state);) +} /** * Set the tos virtual register. @@ -235,7 +211,7 @@ static void x87_set_st(x87_state *state, int reg_idx, ir_node *node, int pos) static void x87_set_tos(x87_state *state, int reg_idx, ir_node *node) { x87_set_st(state, reg_idx, node, 0); -} /* x87_set_tos */ +} /** * Swap st(0) with st(pos). @@ -245,15 +221,15 @@ static void x87_set_tos(x87_state *state, int reg_idx, ir_node *node) */ static void x87_fxch(x87_state *state, int pos) { - st_entry entry; - assert(pos < state->depth); - - entry = state->st[MASK_TOS(state->tos + pos)]; - state->st[MASK_TOS(state->tos + pos)] = state->st[MASK_TOS(state->tos)]; - state->st[MASK_TOS(state->tos)] = entry; - - DB((dbg, LEVEL_2, "After FXCH: ")); DEBUG_ONLY(x87_dump_stack(state)); -} /* x87_fxch */ + st_entry *const a = x87_get_entry(state, pos); + st_entry *const b = x87_get_entry(state, 0); + st_entry const t = *a; + *a = *b; + *b = t; + + DB((dbg, LEVEL_2, "After FXCH: ")); + DEBUG_ONLY(x87_dump_stack(state);) +} /** * Convert a virtual register to the stack index. @@ -266,13 +242,12 @@ static void x87_fxch(x87_state *state, int pos) */ static int x87_on_stack(const x87_state *state, int reg_idx) { - int i, tos = state->tos; - - for (i = 0; i < state->depth; ++i) - if (state->st[MASK_TOS(tos + i)].reg_idx == reg_idx) + for (int i = 0; i < state->depth; ++i) { + if (x87_get_st_reg(state, i) == reg_idx) return i; + } return -1; -} /* x87_on_stack */ +} /** * Push a virtual Register onto the stack, double pushed allowed. @@ -283,15 +258,15 @@ static int x87_on_stack(const x87_state *state, int reg_idx) */ static void x87_push_dbl(x87_state *state, int reg_idx, ir_node *node) { - assert(state->depth < N_x87_REGS && "stack overrun"); + assert(state->depth < N_ia32_st_REGS && "stack overrun"); ++state->depth; - state->tos = MASK_TOS(state->tos - 1); - state->st[state->tos].reg_idx = reg_idx; - state->st[state->tos].node = node; + st_entry *const entry = x87_get_entry(state, 0); + entry->reg_idx = reg_idx; + entry->node = node; - DB((dbg, LEVEL_2, "After PUSH: ")); DEBUG_ONLY(x87_dump_stack(state)); -} /* x87_push_dbl */ + DB((dbg, LEVEL_2, "After PUSH: ")); DEBUG_ONLY(x87_dump_stack(state);) +} /** * Push a virtual Register onto the stack, double pushes are NOT allowed. @@ -299,14 +274,13 @@ static void x87_push_dbl(x87_state *state, int reg_idx, ir_node *node) * @param state the x87 state * @param reg_idx the register vfp index * @param node the node that produces the value of the vfp register - * @param dbl_push if != 0 double pushes are allowed */ static void x87_push(x87_state *state, int reg_idx, ir_node *node) { assert(x87_on_stack(state, reg_idx) == -1 && "double push"); x87_push_dbl(state, reg_idx, node); -} /* x87_push */ +} /** * Pop a virtual Register from the stack. @@ -318,10 +292,9 @@ static void x87_pop(x87_state *state) assert(state->depth > 0 && "stack underrun"); --state->depth; - state->tos = MASK_TOS(state->tos + 1); - DB((dbg, LEVEL_2, "After POP: ")); DEBUG_ONLY(x87_dump_stack(state)); -} /* x87_pop */ + DB((dbg, LEVEL_2, "After POP: ")); DEBUG_ONLY(x87_dump_stack(state);) +} /** * Empty the fpu stack @@ -331,7 +304,6 @@ static void x87_pop(x87_state *state) static void x87_emms(x87_state *state) { state->depth = 0; - state->tos = 0; } /** @@ -344,34 +316,18 @@ static void x87_emms(x87_state *state) */ static blk_state *x87_get_bl_state(x87_simulator *sim, ir_node *block) { - pmap_entry *entry = pmap_find(sim->blk_states, block); + blk_state *res = pmap_get(blk_state, sim->blk_states, block); - if (! entry) { - blk_state *bl_state = obstack_alloc(&sim->obst, sizeof(*bl_state)); - bl_state->begin = NULL; - bl_state->end = NULL; + if (res == NULL) { + res = OALLOC(&sim->obst, blk_state); + res->begin = NULL; + res->end = NULL; - pmap_insert(sim->blk_states, block, bl_state); - return bl_state; + pmap_insert(sim->blk_states, block, res); } - return PTR_TO_BLKSTATE(entry->value); -} /* x87_get_bl_state */ - -/** - * Creates a new x87 state. - * - * @param sim the x87 simulator handle - * - * @return a new x87 state - */ -static x87_state *x87_alloc_state(x87_simulator *sim) -{ - x87_state *res = obstack_alloc(&sim->obst, sizeof(*res)); - - res->sim = sim; return res; -} /* x87_alloc_state */ +} /** * Clone a x87 state. @@ -383,11 +339,10 @@ static x87_state *x87_alloc_state(x87_simulator *sim) */ static x87_state *x87_clone_state(x87_simulator *sim, const x87_state *src) { - x87_state *res = x87_alloc_state(sim); - + x87_state *const res = OALLOC(&sim->obst, x87_state); *res = *src; return res; -} /* x87_clone_state */ +} /** * Patch a virtual instruction into a x87 one and return @@ -405,8 +360,6 @@ static ir_node *x87_patch_insn(ir_node *n, ir_op *op) if (mode == mode_T) { /* patch all Proj's */ - const ir_edge_t *edge; - foreach_out_edge(n, edge) { ir_node *proj = get_edge_src_irn(edge); if (is_Proj(proj)) { @@ -420,7 +373,7 @@ static ir_node *x87_patch_insn(ir_node *n, ir_op *op) } else if (mode_is_float(mode)) set_irn_mode(n, ia32_reg_classes[CLASS_ia32_st].mode); return res; -} /* x87_patch_insn */ +} /** * Returns the first Proj of a mode_T node having a given mode. @@ -431,8 +384,6 @@ static ir_node *x87_patch_insn(ir_node *n, ir_op *op) */ static ir_node *get_irn_Proj_for_mode(ir_node *n, ir_mode *m) { - const ir_edge_t *edge; - assert(get_irn_mode(n) == mode_T && "Need mode_T node"); foreach_out_edge(n, edge) { @@ -442,7 +393,7 @@ static ir_node *get_irn_Proj_for_mode(ir_node *n, ir_mode *m) } return NULL; -} /* get_irn_Proj_for_mode */ +} /** * Wrap the arch_* function here so we can check for errors. @@ -451,48 +402,51 @@ static inline const arch_register_t *x87_get_irn_register(const ir_node *irn) { const arch_register_t *res = arch_get_irn_register(irn); - assert(res->reg_class->regs == ia32_vfp_regs); + assert(res->reg_class == &ia32_reg_classes[CLASS_ia32_vfp]); return res; -} /* x87_get_irn_register */ +} static inline const arch_register_t *x87_irn_get_register(const ir_node *irn, int pos) { - const arch_register_t *res = arch_irn_get_register(irn, pos); + const arch_register_t *res = arch_get_irn_register_out(irn, pos); - assert(res->reg_class->regs == ia32_vfp_regs); + assert(res->reg_class == &ia32_reg_classes[CLASS_ia32_vfp]); return res; -} /* x87_irn_get_register */ +} -/* -------------- x87 perm --------------- */ +static inline const arch_register_t *get_st_reg(int index) +{ + return &ia32_registers[REG_ST0 + index]; +} /** - * Creates a fxch for shuffle. - * - * @param state the x87 state - * @param pos parameter for fxch - * @param block the block were fxch is inserted + * Create a fxch node before another node. * - * Creates a new fxch node and reroute the user of the old node - * to the fxch. + * @param state the x87 state + * @param n the node after the fxch + * @param pos exchange st(pos) with st(0) * - * @return the fxch node + * @return the fxch */ -static ir_node *x87_fxch_shuffle(x87_state *state, int pos, ir_node *block) +static ir_node *x87_create_fxch(x87_state *state, ir_node *n, int pos) { - ir_node *fxch; - ia32_x87_attr_t *attr; + x87_fxch(state, pos); - fxch = new_bd_ia32_fxch(NULL, block); - attr = get_ia32_x87_attr(fxch); - attr->x87[0] = &ia32_st_regs[pos]; - attr->x87[2] = &ia32_st_regs[0]; + ir_node *const block = get_nodes_block(n); + ir_node *const fxch = new_bd_ia32_fxch(NULL, block); + ia32_x87_attr_t *const attr = get_ia32_x87_attr(fxch); + attr->x87[0] = get_st_reg(pos); + attr->x87[2] = get_st_reg(0); keep_alive(fxch); - x87_fxch(state, pos); + sched_add_before(n, fxch); + DB((dbg, LEVEL_1, "<<< %s %s, %s\n", get_irn_opname(fxch), attr->x87[0]->name, attr->x87[2]->name)); return fxch; -} /* x87_fxch_shuffle */ +} + +/* -------------- x87 perm --------------- */ /** * Calculate the necessary permutations to reach dst_state. @@ -503,41 +457,33 @@ static ir_node *x87_fxch_shuffle(x87_state *state, int pos, ir_node *block) * Note that critical edges are removed here, so we need only * a shuffle if the current block has only one successor. * - * @param sim the simulator handle * @param block the current block * @param state the current x87 stack state, might be modified - * @param dst_block the destination block * @param dst_state destination state * * @return state */ -static x87_state *x87_shuffle(x87_simulator *sim, ir_node *block, - x87_state *state, ir_node *dst_block, - const x87_state *dst_state) +static x87_state *x87_shuffle(ir_node *block, x87_state *state, const x87_state *dst_state) { int i, n_cycles, k, ri; unsigned cycles[4], all_mask; char cycle_idx[4][8]; - ir_node *fxch, *before, *after; - (void) sim; - (void) dst_block; assert(state->depth == dst_state->depth); /* Some mathematics here: - If we have a cycle of length n that includes the tos, - we need n-1 exchange operations. - We can always add the tos and restore it, so we need - n+1 exchange operations for a cycle not containing the tos. - So, the maximum of needed operations is for a cycle of 7 - not including the tos == 8. - This is the same number of ops we would need for using stores, - so exchange is cheaper (we save the loads). - On the other hand, we might need an additional exchange - in the next block to bring one operand on top, so the - number of ops in the first case is identical. - Further, no more than 4 cycles can exists (4 x 2). - */ + * If we have a cycle of length n that includes the tos, + * we need n-1 exchange operations. + * We can always add the tos and restore it, so we need + * n+1 exchange operations for a cycle not containing the tos. + * So, the maximum of needed operations is for a cycle of 7 + * not including the tos == 8. + * This is the same number of ops we would need for using stores, + * so exchange is cheaper (we save the loads). + * On the other hand, we might need an additional exchange + * in the next block to bring one operand on top, so the + * number of ops in the first case is identical. + * Further, no more than 4 cycles can exists (4 x 2). */ all_mask = (1 << (state->depth)) - 1; for (n_cycles = 0; all_mask; ++n_cycles) { @@ -582,9 +528,9 @@ static x87_state *x87_shuffle(x87_simulator *sim, ir_node *block, /* Hmm: permutation needed */ DB((dbg, LEVEL_2, "\n%+F needs permutation: from\n", block)); - DEBUG_ONLY(x87_dump_stack(state)); + DEBUG_ONLY(x87_dump_stack(state);) DB((dbg, LEVEL_2, " to\n")); - DEBUG_ONLY(x87_dump_stack(dst_state)); + DEBUG_ONLY(x87_dump_stack(dst_state);) #ifdef DEBUG_libfirm @@ -597,72 +543,30 @@ static x87_state *x87_shuffle(x87_simulator *sim, ir_node *block, } #endif - after = NULL; - /* * Find the place node must be insert. * We have only one successor block, so the last instruction should * be a jump. */ - before = sched_last(block); + ir_node *const before = sched_last(block); assert(is_cfop(before)); /* now do the permutations */ for (ri = 0; ri < n_cycles; ++ri) { if ((cycles[ri] & 1) == 0) { /* this cycle does not include the tos */ - fxch = x87_fxch_shuffle(state, cycle_idx[ri][0], block); - if (after) - sched_add_after(after, fxch); - else - sched_add_before(before, fxch); - after = fxch; + x87_create_fxch(state, before, cycle_idx[ri][0]); } for (k = 1; cycle_idx[ri][k] != -1; ++k) { - fxch = x87_fxch_shuffle(state, cycle_idx[ri][k], block); - if (after) - sched_add_after(after, fxch); - else - sched_add_before(before, fxch); - after = fxch; + x87_create_fxch(state, before, cycle_idx[ri][k]); } if ((cycles[ri] & 1) == 0) { /* this cycle does not include the tos */ - fxch = x87_fxch_shuffle(state, cycle_idx[ri][0], block); - sched_add_after(after, fxch); + x87_create_fxch(state, before, cycle_idx[ri][0]); } } return state; -} /* x87_shuffle */ - -/** - * Create a fxch node before another node. - * - * @param state the x87 state - * @param n the node after the fxch - * @param pos exchange st(pos) with st(0) - * - * @return the fxch - */ -static ir_node *x87_create_fxch(x87_state *state, ir_node *n, int pos) -{ - ir_node *fxch; - ia32_x87_attr_t *attr; - ir_node *block = get_nodes_block(n); - - x87_fxch(state, pos); - - fxch = new_bd_ia32_fxch(NULL, block); - attr = get_ia32_x87_attr(fxch); - attr->x87[0] = &ia32_st_regs[pos]; - attr->x87[2] = &ia32_st_regs[0]; - - keep_alive(fxch); - - sched_add_before(n, fxch); - DB((dbg, LEVEL_1, "<<< %s %s, %s\n", get_irn_opname(fxch), attr->x87[0]->name, attr->x87[2]->name)); - return fxch; -} /* x87_create_fxch */ +} /** * Create a fpush before node n. @@ -670,26 +574,23 @@ static ir_node *x87_create_fxch(x87_state *state, ir_node *n, int pos) * @param state the x87 state * @param n the node after the fpush * @param pos push st(pos) on stack - * @param op_idx replace input op_idx of n with the fpush result + * @param val the value to push */ -static void x87_create_fpush(x87_state *state, ir_node *n, int pos, int op_idx) +static void x87_create_fpush(x87_state *state, ir_node *n, int pos, ir_node *const val) { - ir_node *fpush, *pred = get_irn_n(n, op_idx); - ia32_x87_attr_t *attr; - const arch_register_t *out = x87_get_irn_register(pred); + arch_register_t const *const out = x87_get_irn_register(val); + x87_push_dbl(state, arch_register_get_index(out), val); - x87_push_dbl(state, arch_register_get_index(out), pred); - - fpush = new_bd_ia32_fpush(NULL, get_nodes_block(n)); - attr = get_ia32_x87_attr(fpush); - attr->x87[0] = &ia32_st_regs[pos]; - attr->x87[2] = &ia32_st_regs[0]; + ir_node *const fpush = new_bd_ia32_fpush(NULL, get_nodes_block(n)); + ia32_x87_attr_t *const attr = get_ia32_x87_attr(fpush); + attr->x87[0] = get_st_reg(pos); + attr->x87[2] = get_st_reg(0); keep_alive(fpush); sched_add_before(n, fpush); DB((dbg, LEVEL_1, "<<< %s %s, %s\n", get_irn_opname(fpush), attr->x87[0]->name, attr->x87[2]->name)); -} /* x87_create_fpush */ +} /** * Create a fpop before node n. @@ -706,48 +607,22 @@ static ir_node *x87_create_fpop(x87_state *state, ir_node *n, int num) ia32_x87_attr_t *attr; assert(num > 0); - while (num > 0) { + do { x87_pop(state); if (ia32_cg_config.use_ffreep) fpop = new_bd_ia32_ffreep(NULL, get_nodes_block(n)); else fpop = new_bd_ia32_fpop(NULL, get_nodes_block(n)); attr = get_ia32_x87_attr(fpop); - attr->x87[0] = &ia32_st_regs[0]; - attr->x87[1] = &ia32_st_regs[0]; - attr->x87[2] = &ia32_st_regs[0]; + attr->x87[0] = get_st_reg(0); + attr->x87[1] = get_st_reg(0); + attr->x87[2] = get_st_reg(0); keep_alive(fpop); sched_add_before(n, fpop); DB((dbg, LEVEL_1, "<<< %s %s\n", get_irn_opname(fpop), attr->x87[0]->name)); - - --num; - } + } while (--num > 0); return fpop; -} /* x87_create_fpop */ - -/** - * Creates an fldz before node n - * - * @param state the x87 state - * @param n the node after the fldz - * - * @return the fldz node - */ -static ir_node *x87_create_fldz(x87_state *state, ir_node *n, int regidx) -{ - ir_node *block = get_nodes_block(n); - ir_node *fldz; - - fldz = new_bd_ia32_fldz(NULL, block, ia32_reg_classes[CLASS_ia32_st].mode); - - sched_add_before(n, fldz); - DB((dbg, LEVEL_1, "<<< %s\n", get_irn_opname(fldz))); - keep_alive(fldz); - - x87_push(state, regidx, fldz); - - return fldz; } /* --------------------------------- liveness ------------------------------------------ */ @@ -769,8 +644,6 @@ static vfp_liveness vfp_liveness_transfer(ir_node *irn, vfp_liveness live) const arch_register_class_t *cls = &ia32_reg_classes[CLASS_ia32_vfp]; if (get_irn_mode(irn) == mode_T) { - const ir_edge_t *edge; - foreach_out_edge(irn, edge) { ir_node *proj = get_edge_src_irn(edge); @@ -779,9 +652,7 @@ static vfp_liveness vfp_liveness_transfer(ir_node *irn, vfp_liveness live) live &= ~(1 << arch_register_get_index(reg)); } } - } - - if (arch_irn_consider_in_reg_alloc(cls, irn)) { + } else if (arch_irn_consider_in_reg_alloc(cls, irn)) { const arch_register_t *reg = x87_get_irn_register(irn); live &= ~(1 << arch_register_get_index(reg)); } @@ -796,27 +667,24 @@ static vfp_liveness vfp_liveness_transfer(ir_node *irn, vfp_liveness live) } } return live; -} /* vfp_liveness_transfer */ +} /** * Put all live virtual registers at the end of a block into a bitset. * * @param sim the simulator handle - * @param lv the liveness information * @param bl the block * * @return The live bitset at the end of this block */ static vfp_liveness vfp_liveness_end_of_block(x87_simulator *sim, const ir_node *block) { - int i; vfp_liveness live = 0; const arch_register_class_t *cls = &ia32_reg_classes[CLASS_ia32_vfp]; const be_lv_t *lv = sim->lv; - be_lv_foreach(lv, block, be_lv_state_end, i) { + be_lv_foreach(lv, block, be_lv_state_end, node) { const arch_register_t *reg; - const ir_node *node = be_lv_get_irn(lv, block, i); if (!arch_irn_consider_in_reg_alloc(cls, node)) continue; @@ -825,10 +693,10 @@ static vfp_liveness vfp_liveness_end_of_block(x87_simulator *sim, const ir_node } return live; -} /* vfp_liveness_end_of_block */ +} /** get the register mask from an arch_register */ -#define REGMASK(reg) (1 << (arch_register_get_index(reg))) +#define REGMASK(reg) (1 << (arch_register_get_index(reg))) /** * Return a bitset of argument registers which are live at the end of a node. @@ -845,20 +713,18 @@ static unsigned vfp_live_args_after(x87_simulator *sim, const ir_node *pos, unsi assert(idx < sim->n_idx); return sim->live[idx] & ~kill; -} /* vfp_live_args_after */ +} /** * Calculate the liveness for a whole block and cache it. * * @param sim the simulator handle - * @param lv the liveness handle * @param block the block */ static void update_liveness(x87_simulator *sim, ir_node *block) { vfp_liveness live = vfp_liveness_end_of_block(sim, block); unsigned idx; - ir_node *irn; /* now iterate through the block backward and cache the results */ sched_foreach_reverse(block, irn) { @@ -873,7 +739,7 @@ static void update_liveness(x87_simulator *sim, ir_node *block) } idx = get_irn_idx(block); sim->live[idx] = live; -} /* update_liveness */ +} /** * Returns true if a register is live in a set. @@ -900,7 +766,7 @@ static void vfp_dump_live(vfp_liveness live) } } DB((dbg, LEVEL_2, "\n")); -} /* vfp_dump_live */ +} #endif /* DEBUG_libfirm */ /* --------------------------------- simulators ---------------------------------------- */ @@ -937,35 +803,24 @@ static int sim_binop(x87_state *state, ir_node *n, const exchange_tmpl *tmpl) DB((dbg, LEVEL_1, ">>> %+F %s, %s -> %s\n", n, arch_register_get_name(op1_reg), arch_register_get_name(op2_reg), arch_register_get_name(out))); - DEBUG_ONLY(vfp_dump_live(live)); + DEBUG_ONLY(vfp_dump_live(live);) DB((dbg, LEVEL_1, "Stack before: ")); - DEBUG_ONLY(x87_dump_stack(state)); + DEBUG_ONLY(x87_dump_stack(state);) - if (reg_index_1 == REG_VFP_UKNWN) { - op1_idx = 0; - op1_live_after = 1; - } else { - op1_idx = x87_on_stack(state, reg_index_1); - assert(op1_idx >= 0); - op1_live_after = is_vfp_live(arch_register_get_index(op1_reg), live); - } + op1_idx = x87_on_stack(state, reg_index_1); + assert(op1_idx >= 0); + op1_live_after = is_vfp_live(reg_index_1, live); attr = get_ia32_x87_attr(n); permuted = attr->attr.data.ins_permuted; - if (reg_index_2 != REG_VFP_NOREG) { + if (reg_index_2 != REG_VFP_VFP_NOREG) { assert(!permuted); - if (reg_index_2 == REG_VFP_UKNWN) { - op2_idx = 0; - op2_live_after = 1; - } else { - /* second operand is a vfp register */ - op2_idx = x87_on_stack(state, reg_index_2); - assert(op2_idx >= 0); - op2_live_after - = is_vfp_live(arch_register_get_index(op2_reg), live); - } + /* second operand is a vfp register */ + op2_idx = x87_on_stack(state, reg_index_2); + assert(op2_idx >= 0); + op2_live_after = is_vfp_live(reg_index_2, live); if (op2_live_after) { /* Second operand is live. */ @@ -973,7 +828,7 @@ static int sim_binop(x87_state *state, ir_node *n, const exchange_tmpl *tmpl) if (op1_live_after) { /* Both operands are live: push the first one. This works even for op1 == op2. */ - x87_create_fpush(state, n, op1_idx, n_ia32_binary_right); + x87_create_fpush(state, n, op1_idx, op2); /* now do fxxx (tos=tos X op) */ op1_idx = 0; op2_idx += 1; @@ -1049,7 +904,7 @@ static int sim_binop(x87_state *state, ir_node *n, const exchange_tmpl *tmpl) /* second operand is an address mode */ if (op1_live_after) { /* first operand is live: push it here */ - x87_create_fpush(state, n, op1_idx, n_ia32_binary_left); + x87_create_fpush(state, n, op1_idx, op1); op1_idx = 0; } else { /* first operand is dead: bring it to tos */ @@ -1071,13 +926,13 @@ static int sim_binop(x87_state *state, ir_node *n, const exchange_tmpl *tmpl) } /* patch the operation */ - attr->x87[0] = op1_reg = &ia32_st_regs[op1_idx]; - if (reg_index_2 != REG_VFP_NOREG) { - attr->x87[1] = op2_reg = &ia32_st_regs[op2_idx]; + attr->x87[0] = op1_reg = get_st_reg(op1_idx); + if (reg_index_2 != REG_VFP_VFP_NOREG) { + attr->x87[1] = op2_reg = get_st_reg(op2_idx); } - attr->x87[2] = out = &ia32_st_regs[out_idx]; + attr->x87[2] = out = get_st_reg(out_idx); - if (reg_index_2 != REG_VFP_NOREG) { + if (reg_index_2 != REG_VFP_VFP_NOREG) { DB((dbg, LEVEL_1, "<<< %s %s, %s -> %s\n", get_irn_opname(n), arch_register_get_name(op1_reg), arch_register_get_name(op2_reg), arch_register_get_name(out))); @@ -1088,7 +943,7 @@ static int sim_binop(x87_state *state, ir_node *n, const exchange_tmpl *tmpl) } return NO_NODE_ADDED; -} /* sim_binop */ +} /** * Simulate a virtual Unop. @@ -1101,40 +956,32 @@ static int sim_binop(x87_state *state, ir_node *n, const exchange_tmpl *tmpl) */ static int sim_unop(x87_state *state, ir_node *n, ir_op *op) { - int op1_idx, out_idx; - x87_simulator *sim = state->sim; - const arch_register_t *op1 = x87_get_irn_register(get_irn_n(n, UNOP_IDX)); - const arch_register_t *out = x87_get_irn_register(n); - ia32_x87_attr_t *attr; - unsigned live = vfp_live_args_after(sim, n, REGMASK(out)); - + arch_register_t const *const out = x87_get_irn_register(n); + unsigned const live = vfp_live_args_after(state->sim, n, REGMASK(out)); DB((dbg, LEVEL_1, ">>> %+F -> %s\n", n, out->name)); - DEBUG_ONLY(vfp_dump_live(live)); + DEBUG_ONLY(vfp_dump_live(live);) - op1_idx = x87_on_stack(state, arch_register_get_index(op1)); - - if (is_vfp_live(arch_register_get_index(op1), live)) { + ir_node *const op1 = get_irn_n(n, 0); + arch_register_t const *const op1_reg = x87_get_irn_register(op1); + int const op1_reg_idx = arch_register_get_index(op1_reg); + int const op1_idx = x87_on_stack(state, op1_reg_idx); + if (is_vfp_live(op1_reg_idx, live)) { /* push the operand here */ - x87_create_fpush(state, n, op1_idx, UNOP_IDX); - op1_idx = 0; - } - else { + x87_create_fpush(state, n, op1_idx, op1); + } else { /* operand is dead, bring it to tos */ if (op1_idx != 0) { x87_create_fxch(state, n, op1_idx); - op1_idx = 0; } } x87_set_tos(state, arch_register_get_index(out), x87_patch_insn(n, op)); - out_idx = 0; - attr = get_ia32_x87_attr(n); - attr->x87[0] = op1 = &ia32_st_regs[0]; - attr->x87[2] = out = &ia32_st_regs[0]; - DB((dbg, LEVEL_1, "<<< %s -> %s\n", get_irn_opname(n), out->name)); + ia32_x87_attr_t *const attr = get_ia32_x87_attr(n); + attr->x87[2] = attr->x87[0] = get_st_reg(0); + DB((dbg, LEVEL_1, "<<< %s -> %s\n", get_irn_opname(n), attr->x87[2]->name)); return NO_NODE_ADDED; -} /* sim_unop */ +} /** * Simulate a virtual Load instruction. @@ -1154,11 +1001,11 @@ static int sim_load(x87_state *state, ir_node *n, ir_op *op, int res_pos) x87_push(state, arch_register_get_index(out), x87_patch_insn(n, op)); assert(out == x87_irn_get_register(n, res_pos)); attr = get_ia32_x87_attr(n); - attr->x87[2] = out = &ia32_st_regs[0]; + attr->x87[2] = out = get_st_reg(0); DB((dbg, LEVEL_1, "<<< %s -> %s\n", get_irn_opname(n), arch_register_get_name(out))); return NO_NODE_ADDED; -} /* sim_load */ +} /** * Rewire all users of @p old_val to @new_val iff they are scheduled after @p store. @@ -1169,9 +1016,7 @@ static int sim_load(x87_state *state, ir_node *n, ir_op *op, int res_pos) */ static void collect_and_rewire_users(ir_node *store, ir_node *old_val, ir_node *new_val) { - const ir_edge_t *edge, *ne; - - foreach_out_edge_safe(old_val, edge, ne) { + foreach_out_edge_safe(old_val, edge) { ir_node *user = get_edge_src_irn(edge); if (! user || user == store) @@ -1179,15 +1024,10 @@ static void collect_and_rewire_users(ir_node *store, ir_node *old_val, ir_node * /* if the user is scheduled after the store: rewire */ if (sched_is_scheduled(user) && sched_comes_after(store, user)) { - int i; - /* find the input of the user pointing to the old value */ - for (i = get_irn_arity(user) - 1; i >= 0; i--) { - if (get_irn_n(user, i) == old_val) - set_irn_n(user, i, new_val); - } + set_irn_n(user, get_edge_src_pos(edge), new_val); } } -} /* collect_and_rewire_users */ +} /** * Simulate a virtual Store. @@ -1199,64 +1039,39 @@ static void collect_and_rewire_users(ir_node *store, ir_node *old_val, ir_node * */ static int sim_store(x87_state *state, ir_node *n, ir_op *op, ir_op *op_p) { - ir_node *val = get_irn_n(n, n_ia32_vfst_val); - const arch_register_t *op2 = x87_get_irn_register(val); - unsigned live = vfp_live_args_after(state->sim, n, 0); - int insn = NO_NODE_ADDED; - ia32_x87_attr_t *attr; - int op2_reg_idx, op2_idx, depth; - int live_after_node; - ir_mode *mode; - - op2_reg_idx = arch_register_get_index(op2); - if (op2_reg_idx == REG_VFP_UKNWN) { - /* just take any value from stack */ - if (state->depth > 0) { - op2_idx = 0; - DEBUG_ONLY(op2 = NULL); - live_after_node = 1; - } else { - /* produce a new value which we will consume immediately */ - x87_create_fldz(state, n, op2_reg_idx); - live_after_node = 0; - op2_idx = x87_on_stack(state, op2_reg_idx); - assert(op2_idx >= 0); - } - } else { - op2_idx = x87_on_stack(state, op2_reg_idx); - live_after_node = is_vfp_live(arch_register_get_index(op2), live); - DB((dbg, LEVEL_1, ">>> %+F %s ->\n", n, arch_register_get_name(op2))); - assert(op2_idx >= 0); - } - - mode = get_ia32_ls_mode(n); - depth = x87_get_depth(state); - + ir_node *const val = get_irn_n(n, n_ia32_vfst_val); + arch_register_t const *const op2 = x87_get_irn_register(val); + DB((dbg, LEVEL_1, ">>> %+F %s ->\n", n, arch_register_get_name(op2))); + + int insn = NO_NODE_ADDED; + int const op2_reg_idx = arch_register_get_index(op2); + int const op2_idx = x87_on_stack(state, op2_reg_idx); + unsigned const live = vfp_live_args_after(state->sim, n, 0); + int const live_after_node = is_vfp_live(op2_reg_idx, live); + assert(op2_idx >= 0); if (live_after_node) { - /* - Problem: fst doesn't support 96bit modes (spills), only fstp does - fist doesn't support 64bit mode, only fistp - Solution: - - stack not full: push value and fstp - - stack full: fstp value and load again - Note that we cannot test on mode_E, because floats might be 96bit ... - */ - if (get_mode_size_bits(mode) > 64 || (mode_is_int(mode) && get_mode_size_bits(mode) > 32)) { - if (depth < N_x87_REGS) { + /* Problem: fst doesn't support 80bit modes (spills), only fstp does + * fist doesn't support 64bit mode, only fistp + * Solution: + * - stack not full: push value and fstp + * - stack full: fstp value and load again + * Note that we cannot test on mode_E, because floats might be 80bit ... */ + ir_mode *const mode = get_ia32_ls_mode(n); + if (get_mode_size_bits(mode) > (mode_is_int(mode) ? 32 : 64)) { + if (x87_get_depth(state) < N_ia32_st_REGS) { /* ok, we have a free register: push + fstp */ - x87_create_fpush(state, n, op2_idx, n_ia32_vfst_val); + x87_create_fpush(state, n, op2_idx, val); x87_pop(state); x87_patch_insn(n, op_p); } else { - ir_node *vfld, *mem, *block, *rproj, *mproj; - ir_graph *irg; - /* stack full here: need fstp + load */ x87_pop(state); x87_patch_insn(n, op_p); - block = get_nodes_block(n); - vfld = new_bd_ia32_vfld(NULL, block, get_irn_n(n, 0), get_irn_n(n, 1), new_NoMem(), get_ia32_ls_mode(n)); + ir_node *const block = get_nodes_block(n); + ir_graph *const irg = get_irn_irg(n); + ir_node *const nomem = get_irg_no_mem(irg); + ir_node *const vfld = new_bd_ia32_vfld(NULL, block, get_irn_n(n, 0), get_irn_n(n, 1), nomem, mode); /* copy all attributes */ set_ia32_frame_ent(vfld, get_ia32_frame_ent(n)); @@ -1265,19 +1080,18 @@ static int sim_store(x87_state *state, ir_node *n, ir_op *op, ir_op *op_p) set_ia32_op_type(vfld, ia32_AddrModeS); add_ia32_am_offs_int(vfld, get_ia32_am_offs_int(n)); set_ia32_am_sc(vfld, get_ia32_am_sc(n)); - set_ia32_ls_mode(vfld, get_ia32_ls_mode(n)); + set_ia32_ls_mode(vfld, mode); - rproj = new_r_Proj(block, vfld, get_ia32_ls_mode(vfld), pn_ia32_vfld_res); - mproj = new_r_Proj(block, vfld, mode_M, pn_ia32_vfld_M); - mem = get_irn_Proj_for_mode(n, mode_M); + ir_node *const rproj = new_r_Proj(vfld, mode, pn_ia32_vfld_res); + ir_node *const mproj = new_r_Proj(vfld, mode_M, pn_ia32_vfld_M); + ir_node *const mem = get_irn_Proj_for_mode(n, mode_M); assert(mem && "Store memory not found"); arch_set_irn_register(rproj, op2); /* reroute all former users of the store memory to the load memory */ - irg = get_irn_irg(n); - edges_reroute(mem, mproj, irg); + edges_reroute(mem, mproj); /* set the memory input of the load to the store memory */ set_irn_n(vfld, n_ia32_vfld_mem, mem); @@ -1306,12 +1120,12 @@ static int sim_store(x87_state *state, ir_node *n, ir_op *op, ir_op *op_p) x87_patch_insn(n, op_p); } - attr = get_ia32_x87_attr(n); - attr->x87[1] = op2 = &ia32_st_regs[0]; - DB((dbg, LEVEL_1, "<<< %s %s ->\n", get_irn_opname(n), arch_register_get_name(op2))); + ia32_x87_attr_t *const attr = get_ia32_x87_attr(n); + attr->x87[1] = get_st_reg(0); + DB((dbg, LEVEL_1, "<<< %s %s ->\n", get_irn_opname(n), arch_register_get_name(attr->x87[1]))); return insn; -} /* sim_store */ +} #define _GEN_BINOP(op, rev) \ static int sim_##op(x87_state *state, ir_node *n) { \ @@ -1320,7 +1134,7 @@ static int sim_##op(x87_state *state, ir_node *n) { \ } #define GEN_BINOP(op) _GEN_BINOP(op, op) -#define GEN_BINOPR(op) _GEN_BINOP(op, op##r) +#define GEN_BINOPR(op) _GEN_BINOP(op, op##r) #define GEN_LOAD(op) \ static int sim_##op(x87_state *state, ir_node *n) { \ @@ -1368,27 +1182,12 @@ static int sim_fisttp(x87_state *state, ir_node *n) ir_node *val = get_irn_n(n, n_ia32_vfst_val); const arch_register_t *op2 = x87_get_irn_register(val); ia32_x87_attr_t *attr; - int op2_reg_idx, op2_idx, depth; + int op2_reg_idx, op2_idx; op2_reg_idx = arch_register_get_index(op2); - if (op2_reg_idx == REG_VFP_UKNWN) { - /* just take any value from stack */ - if (state->depth > 0) { - op2_idx = 0; - DEBUG_ONLY(op2 = NULL); - } else { - /* produce a new value which we will consume immediately */ - x87_create_fldz(state, n, op2_reg_idx); - op2_idx = x87_on_stack(state, op2_reg_idx); - assert(op2_idx >= 0); - } - } else { - op2_idx = x87_on_stack(state, op2_reg_idx); - DB((dbg, LEVEL_1, ">>> %+F %s ->\n", n, arch_register_get_name(op2))); - assert(op2_idx >= 0); - } - - depth = x87_get_depth(state); + op2_idx = x87_on_stack(state, op2_reg_idx); + DB((dbg, LEVEL_1, ">>> %+F %s ->\n", n, arch_register_get_name(op2))); + assert(op2_idx >= 0); /* Note: although the value is still live here, it is destroyed because of the pop. The register allocator is aware of that and introduced a copy @@ -1402,11 +1201,11 @@ static int sim_fisttp(x87_state *state, ir_node *n) x87_patch_insn(n, op_ia32_fisttp); attr = get_ia32_x87_attr(n); - attr->x87[1] = op2 = &ia32_st_regs[0]; + attr->x87[1] = op2 = get_st_reg(0); DB((dbg, LEVEL_1, "<<< %s %s ->\n", get_irn_opname(n), arch_register_get_name(op2))); return NO_NODE_ADDED; -} /* sim_fisttp */ +} /** * Simulate a virtual FtstFnstsw. @@ -1427,9 +1226,9 @@ static int sim_FtstFnstsw(x87_state *state, ir_node *n) unsigned live = vfp_live_args_after(sim, n, 0); DB((dbg, LEVEL_1, ">>> %+F %s\n", n, arch_register_get_name(reg1))); - DEBUG_ONLY(vfp_dump_live(live)); + DEBUG_ONLY(vfp_dump_live(live);) DB((dbg, LEVEL_1, "Stack before: ")); - DEBUG_ONLY(x87_dump_stack(state)); + DEBUG_ONLY(x87_dump_stack(state);) assert(op1_idx >= 0); if (op1_idx != 0) { @@ -1440,7 +1239,7 @@ static int sim_FtstFnstsw(x87_state *state, ir_node *n) /* patch the operation */ x87_patch_insn(n, op_ia32_FtstFnstsw); - reg1 = &ia32_st_regs[op1_idx]; + reg1 = get_st_reg(op1_idx); attr->x87[0] = reg1; attr->x87[1] = NULL; attr->x87[2] = NULL; @@ -1449,7 +1248,7 @@ static int sim_FtstFnstsw(x87_state *state, ir_node *n) x87_create_fpop(state, sched_next(n), 1); return NO_NODE_ADDED; -} /* sim_FtstFnstsw */ +} /** * Simulate a Fucom @@ -1465,29 +1264,29 @@ static int sim_Fucom(x87_state *state, ir_node *n) int op2_idx = -1; ia32_x87_attr_t *attr = get_ia32_x87_attr(n); ir_op *dst; - x87_simulator *sim = state->sim; - ir_node *op1_node = get_irn_n(n, n_ia32_vFucomFnstsw_left); - ir_node *op2_node = get_irn_n(n, n_ia32_vFucomFnstsw_right); - const arch_register_t *op1 = x87_get_irn_register(op1_node); - const arch_register_t *op2 = x87_get_irn_register(op2_node); + x87_simulator *sim = state->sim; + ir_node *op1_node = get_irn_n(n, n_ia32_vFucomFnstsw_left); + ir_node *op2_node = get_irn_n(n, n_ia32_vFucomFnstsw_right); + const arch_register_t *op1 = x87_get_irn_register(op1_node); + const arch_register_t *op2 = x87_get_irn_register(op2_node); int reg_index_1 = arch_register_get_index(op1); - int reg_index_2 = arch_register_get_index(op2); - unsigned live = vfp_live_args_after(sim, n, 0); - int permuted = attr->attr.data.ins_permuted; - int xchg = 0; - int pops = 0; + int reg_index_2 = arch_register_get_index(op2); + unsigned live = vfp_live_args_after(sim, n, 0); + bool permuted = attr->attr.data.ins_permuted; + bool xchg = false; + int pops = 0; DB((dbg, LEVEL_1, ">>> %+F %s, %s\n", n, arch_register_get_name(op1), arch_register_get_name(op2))); - DEBUG_ONLY(vfp_dump_live(live)); + DEBUG_ONLY(vfp_dump_live(live);) DB((dbg, LEVEL_1, "Stack before: ")); - DEBUG_ONLY(x87_dump_stack(state)); + DEBUG_ONLY(x87_dump_stack(state);) op1_idx = x87_on_stack(state, reg_index_1); assert(op1_idx >= 0); /* BEWARE: check for comp a,a cases, they might happen */ - if (reg_index_2 != REG_VFP_NOREG) { + if (reg_index_2 != REG_VFP_VFP_NOREG) { /* second operand is a vfp register */ op2_idx = x87_on_stack(state, reg_index_2); assert(op2_idx >= 0); @@ -1503,12 +1302,15 @@ static int sim_Fucom(x87_state *state, ir_node *n) } else if (op2_idx == 0) { /* res = op X tos */ permuted = !permuted; - xchg = 1; + xchg = true; } else { /* bring the first one to tos */ x87_create_fxch(state, n, op1_idx); - if (op2_idx == 0) + if (op1_idx == op2_idx) { + op2_idx = 0; + } else if (op2_idx == 0) { op2_idx = op1_idx; + } op1_idx = 0; /* res = tos X op */ } @@ -1538,9 +1340,9 @@ static int sim_Fucom(x87_state *state, ir_node *n) op2_idx = 0; } /* res = op X tos, pop */ - pops = 1; + pops = 1; permuted = !permuted; - xchg = 1; + xchg = true; } else { /* both operands are dead here, check first for identity. */ if (op1_idx == op2_idx) { @@ -1575,8 +1377,8 @@ static int sim_Fucom(x87_state *state, ir_node *n) } /* res = op X tos, pop, pop */ permuted = !permuted; - xchg = 1; - pops = 2; + xchg = true; + pops = 2; } else { /* if one is already the TOS, we need two fxch */ if (op1_idx == 0) { @@ -1587,9 +1389,9 @@ static int sim_Fucom(x87_state *state, ir_node *n) x87_create_fxch(state, n, op2_idx); op2_idx = 0; /* res = op X tos, pop, pop */ - pops = 2; + pops = 2; permuted = !permuted; - xchg = 1; + xchg = true; } else if (op2_idx == 0) { /* second one is TOS, move to st(1) */ x87_create_fxch(state, n, 1); @@ -1639,7 +1441,7 @@ static int sim_Fucom(x87_state *state, ir_node *n) case 0: dst = op_ia32_FucomFnstsw; break; case 1: dst = op_ia32_FucompFnstsw; break; case 2: dst = op_ia32_FucomppFnstsw; break; - default: panic("invalid popcount in sim_Fucom"); + default: panic("invalid popcount"); } for (i = 0; i < pops; ++i) { @@ -1654,10 +1456,10 @@ static int sim_Fucom(x87_state *state, ir_node *n) x87_pop(state); x87_create_fpop(state, sched_next(n), 1); break; - default: panic("invalid popcount in sim_Fucom"); + default: panic("invalid popcount"); } } else { - panic("invalid operation %+F in sim_FucomFnstsw", n); + panic("invalid operation %+F", n); } x87_patch_insn(n, dst); @@ -1667,10 +1469,10 @@ static int sim_Fucom(x87_state *state, ir_node *n) op2_idx = tmp; } - op1 = &ia32_st_regs[op1_idx]; + op1 = get_st_reg(op1_idx); attr->x87[0] = op1; if (op2_idx >= 0) { - op2 = &ia32_st_regs[op2_idx]; + op2 = get_st_reg(op2_idx); attr->x87[1] = op2; } attr->x87[2] = NULL; @@ -1685,7 +1487,7 @@ static int sim_Fucom(x87_state *state, ir_node *n) } return NO_NODE_ADDED; -} /* sim_Fucom */ +} /** * Simulate a Keep. @@ -1722,10 +1524,10 @@ static int sim_Keep(x87_state *state, ir_node *node) } DB((dbg, LEVEL_1, "Stack after: ")); - DEBUG_ONLY(x87_dump_stack(state)); + DEBUG_ONLY(x87_dump_stack(state);) return NO_NODE_ADDED; -} /* sim_Keep */ +} /** * Keep the given node alive by adding a be_Keep. @@ -1734,15 +1536,12 @@ static int sim_Keep(x87_state *state, ir_node *node) */ static void keep_float_node_alive(ir_node *node) { - ir_node *block = get_nodes_block(node); - const arch_register_class_t *cls = arch_get_irn_reg_class_out(node); - ir_node *keep; - - keep = be_new_Keep(cls, block, 1, &node); + ir_node *block = get_nodes_block(node); + ir_node *keep = be_new_Keep(block, 1, &node); assert(sched_is_scheduled(node)); sched_add_after(node, keep); -} /* keep_float_node_alive */ +} /** * Create a copy of a node. Recreate the node if it's a constant. @@ -1766,7 +1565,6 @@ static ir_node *create_Copy(x87_state *state, ir_node *n) /* Do not copy constants, recreate them. */ switch (get_ia32_irn_opcode(pred)) { - case iro_ia32_Unknown_VFP: case iro_ia32_fldz: cnstr = new_bd_ia32_fldz; break; @@ -1802,7 +1600,7 @@ static ir_node *create_Copy(x87_state *state, ir_node *n) x87_push(state, arch_register_get_index(out), res); attr = get_ia32_x87_attr(res); - attr->x87[2] = &ia32_st_regs[0]; + attr->x87[2] = get_st_reg(0); } else { int op1_idx = x87_on_stack(state, arch_register_get_index(op1)); @@ -1811,13 +1609,13 @@ static ir_node *create_Copy(x87_state *state, ir_node *n) x87_push(state, arch_register_get_index(out), res); attr = get_ia32_x87_attr(res); - attr->x87[0] = &ia32_st_regs[op1_idx]; - attr->x87[2] = &ia32_st_regs[0]; + attr->x87[0] = get_st_reg(op1_idx); + attr->x87[2] = get_st_reg(0); } arch_set_irn_register(res, out); return res; -} /* create_Copy */ +} /** * Simulate a be_Copy. @@ -1829,53 +1627,23 @@ static ir_node *create_Copy(x87_state *state, ir_node *n) */ static int sim_Copy(x87_state *state, ir_node *n) { - ir_node *pred; - const arch_register_t *out; - const arch_register_t *op1; - const arch_register_class_t *cls; - ir_node *node, *next; - ia32_x87_attr_t *attr; - int op1_idx, out_idx; - unsigned live; - - cls = arch_get_irn_reg_class_out(n); - if (cls->regs != ia32_vfp_regs) - return 0; - - pred = get_irn_n(n, 0); - out = x87_get_irn_register(n); - op1 = x87_get_irn_register(pred); - live = vfp_live_args_after(state->sim, n, REGMASK(out)); + arch_register_class_t const *const cls = arch_get_irn_reg_class(n); + if (cls != &ia32_reg_classes[CLASS_ia32_vfp]) + return NO_NODE_ADDED; + + ir_node *const pred = be_get_Copy_op(n); + arch_register_t const *const op1 = x87_get_irn_register(pred); + arch_register_t const *const out = x87_get_irn_register(n); + unsigned const live = vfp_live_args_after(state->sim, n, REGMASK(out)); DB((dbg, LEVEL_1, ">>> %+F %s -> %s\n", n, arch_register_get_name(op1), arch_register_get_name(out))); - DEBUG_ONLY(vfp_dump_live(live)); - - /* handle the infamous unknown value */ - if (arch_register_get_index(op1) == REG_VFP_UKNWN) { - /* Operand is still live, a real copy. We need here an fpush that can - hold a a register, so use the fpushCopy or recreate constants */ - node = create_Copy(state, n); - - assert(is_ia32_fldz(node)); - next = sched_next(n); - sched_remove(n); - exchange(n, node); - sched_add_before(next, node); - - DB((dbg, LEVEL_1, "<<< %+F %s -> %s\n", node, op1->name, - arch_get_irn_register(node)->name)); - return NO_NODE_ADDED; - } - - op1_idx = x87_on_stack(state, arch_register_get_index(op1)); + DEBUG_ONLY(vfp_dump_live(live);) if (is_vfp_live(arch_register_get_index(op1), live)) { - ir_node *pred = get_irn_n(n, 0); - /* Operand is still live, a real copy. We need here an fpush that can hold a a register, so use the fpushCopy or recreate constants */ - node = create_Copy(state, n); + ir_node *const node = create_Copy(state, n); /* We have to make sure the old value doesn't go dead (which can happen * when we recreate constants). As the simulator expected that value in @@ -1883,7 +1651,7 @@ static int sim_Copy(x87_state *state, ir_node *n) * instruction, but we would have to rerun all the simulation to get * this correct... */ - next = sched_next(n); + ir_node *const next = sched_next(n); sched_remove(n); exchange(n, node); sched_add_before(next, node); @@ -1894,22 +1662,25 @@ static int sim_Copy(x87_state *state, ir_node *n) DB((dbg, LEVEL_1, "<<< %+F %s -> ?\n", node, op1->name)); } else { - out_idx = x87_on_stack(state, arch_register_get_index(out)); - + int const op1_idx = x87_on_stack(state, arch_register_get_index(op1)); + int const out_idx = x87_on_stack(state, arch_register_get_index(out)); if (out_idx >= 0 && out_idx != op1_idx) { /* Matze: out already on stack? how can this happen? */ - assert(0); + panic("invalid stack state"); +#if 0 /* op1 must be killed and placed where out is */ if (out_idx == 0) { + ia32_x87_attr_t *attr; /* best case, simple remove and rename */ x87_patch_insn(n, op_ia32_Pop); attr = get_ia32_x87_attr(n); - attr->x87[0] = op1 = &ia32_st_regs[0]; + attr->x87[0] = op1 = get_st_reg(0); x87_pop(state); x87_set_st(state, arch_register_get_index(out), n, op1_idx - 1); } else { + ia32_x87_attr_t *attr; /* move op1 to tos, store and pop it */ if (op1_idx != 0) { x87_create_fxch(state, n, op1_idx); @@ -1917,26 +1688,27 @@ static int sim_Copy(x87_state *state, ir_node *n) } x87_patch_insn(n, op_ia32_Pop); attr = get_ia32_x87_attr(n); - attr->x87[0] = op1 = &ia32_st_regs[out_idx]; + attr->x87[0] = op1 = get_st_reg(out_idx); x87_pop(state); x87_set_st(state, arch_register_get_index(out), n, out_idx - 1); } DB((dbg, LEVEL_1, "<<< %+F %s\n", n, op1->name)); +#endif } else { /* just a virtual copy */ - x87_set_st(state, arch_register_get_index(out), get_unop_op(n), op1_idx); + x87_set_st(state, arch_register_get_index(out), pred, op1_idx); /* don't remove the node to keep the verifier quiet :), the emitter won't emit any code for the node */ #if 0 sched_remove(n); DB((dbg, LEVEL_1, "<<< KILLED %s\n", get_irn_opname(n))); - exchange(n, get_unop_op(n)); + exchange(n, pred); #endif } } return NO_NODE_ADDED; -} /* sim_Copy */ +} /** * Returns the vf0 result Proj of a Call. @@ -1945,8 +1717,6 @@ static int sim_Copy(x87_state *state, ir_node *n) */ static ir_node *get_call_result_proj(ir_node *call) { - const ir_edge_t *edge; - /* search the result proj */ foreach_out_edge(call, edge) { ir_node *proj = get_edge_src_irn(edge); @@ -1956,8 +1726,27 @@ static ir_node *get_call_result_proj(ir_node *call) return proj; } - return NULL; -} /* get_call_result_proj */ + panic("result Proj missing"); +} + +static int sim_Asm(x87_state *const state, ir_node *const n) +{ + (void)state; + + for (size_t i = get_irn_arity(n); i-- != 0;) { + arch_register_req_t const *const req = arch_get_irn_register_req_in(n, i); + if (req->cls == &ia32_reg_classes[CLASS_ia32_vfp]) + panic("cannot handle %+F with x87 constraints", n); + } + + for (size_t i = arch_get_irn_n_outs(n); i-- != 0;) { + arch_register_req_t const *const req = arch_get_irn_register_req_out(n, i); + if (req->cls == &ia32_reg_classes[CLASS_ia32_vfp]) + panic("cannot handle %+F with x87 constraints", n); + } + + return NO_NODE_ADDED; +} /** * Simulate a ia32_Call. @@ -1969,71 +1758,29 @@ static ir_node *get_call_result_proj(ir_node *call) */ static int sim_Call(x87_state *state, ir_node *n) { - ir_type *call_tp = get_ia32_call_attr_const(n)->call_tp; - ir_type *res_type; - ir_mode *mode; - ir_node *resproj; - const arch_register_t *reg; - DB((dbg, LEVEL_1, ">>> %+F\n", n)); /* at the begin of a call the x87 state should be empty */ assert(state->depth == 0 && "stack not empty before call"); - if (get_method_n_ress(call_tp) <= 0) - goto end_call; - - /* - * If the called function returns a float, it is returned in st(0). - * This even happens if the return value is NOT used. - * Moreover, only one return result is supported. - */ - res_type = get_method_res_type(call_tp, 0); - mode = get_type_mode(res_type); - - if (mode == NULL || !mode_is_float(mode)) - goto end_call; - - resproj = get_call_result_proj(n); - assert(resproj != NULL); - - reg = x87_get_irn_register(resproj); - x87_push(state, arch_register_get_index(reg), resproj); - -end_call: + ir_type *const call_tp = get_ia32_call_attr_const(n)->call_tp; + if (get_method_n_ress(call_tp) != 0) { + /* If the called function returns a float, it is returned in st(0). + * This even happens if the return value is NOT used. + * Moreover, only one return result is supported. */ + ir_type *const res_type = get_method_res_type(call_tp, 0); + ir_mode *const mode = get_type_mode(res_type); + if (mode && mode_is_float(mode)) { + ir_node *const resproj = get_call_result_proj(n); + arch_register_t const *const reg = x87_get_irn_register(resproj); + x87_push(state, arch_register_get_index(reg), resproj); + } + } DB((dbg, LEVEL_1, "Stack after: ")); - DEBUG_ONLY(x87_dump_stack(state)); + DEBUG_ONLY(x87_dump_stack(state);) return NO_NODE_ADDED; -} /* sim_Call */ - -/** - * Simulate a be_Spill. - * - * @param state the x87 state - * @param n the node that should be simulated (and patched) - * - * Should not happen, spills are lowered before x87 simulator see them. - */ -static int sim_Spill(x87_state *state, ir_node *n) -{ - panic("Spill not lowered before x87 simulator run"); - return sim_fst(state, n); -} /* sim_Spill */ - -/** - * Simulate a be_Reload. - * - * @param state the x87 state - * @param n the node that should be simulated (and patched) - * - * Should not happen, reloads are lowered before x87 simulator see them. - */ -static int sim_Reload(x87_state *state, ir_node *n) -{ - panic("Reload not lowered before x87 simulator run"); - return sim_fld(state, n); -} /* sim_Reload */ +} /** * Simulate a be_Return. @@ -2045,29 +1792,22 @@ static int sim_Reload(x87_state *state, ir_node *n) */ static int sim_Return(x87_state *state, ir_node *n) { - int n_res = be_Return_get_n_rets(n); - int i, n_float_res = 0; - +#ifdef DEBUG_libfirm /* only floating point return values must reside on stack */ - for (i = 0; i < n_res; ++i) { - ir_node *res = get_irn_n(n, be_pos_Return_val + i); - + int n_float_res = 0; + int const n_res = be_Return_get_n_rets(n); + for (int i = 0; i < n_res; ++i) { + ir_node *const res = get_irn_n(n, n_be_Return_val + i); if (mode_is_float(get_irn_mode(res))) ++n_float_res; } assert(x87_get_depth(state) == n_float_res); +#endif /* pop them virtually */ - for (i = n_float_res - 1; i >= 0; --i) - x87_pop(state); - + x87_emms(state); return NO_NODE_ADDED; -} /* sim_Return */ - -typedef struct _perm_data_t { - const arch_register_t *in; - const arch_register_t *out; -} perm_data_t; +} /** * Simulate a be_Perm. @@ -2079,10 +1819,9 @@ typedef struct _perm_data_t { */ static int sim_Perm(x87_state *state, ir_node *irn) { - int i, n; - ir_node *pred = get_irn_n(irn, 0); - int *stack_pos; - const ir_edge_t *edge; + int i, n; + ir_node *pred = get_irn_n(irn, 0); + int *stack_pos; /* handle only floating point Perms */ if (! mode_is_float(get_irn_mode(pred))) @@ -2118,64 +1857,17 @@ static int sim_Perm(x87_state *state, ir_node *irn) DB((dbg, LEVEL_1, "<<< %+F\n", irn)); return NO_NODE_ADDED; -} /* sim_Perm */ - -/** - * Simulate the Barrier to generate Unknowns. - * We must push something on the stack for its value. - * - * @param state the x87 state - * @param irn the node that should be simulated (and patched) - * - * @return NO_NODE_ADDED - */ -static int sim_Barrier(x87_state *state, ir_node *node) -{ - int i, arity; - - /* materialize unknown if needed */ - arity = get_irn_arity(node); - for (i = 0; i < arity; ++i) { - const arch_register_t *reg; - ir_node *zero; - ir_node *block; - ia32_x87_attr_t *attr; - ir_node *in = get_irn_n(node, i); - - if (!is_ia32_Unknown_VFP(in)) - continue; - - /* TODO: not completely correct... */ - reg = &ia32_vfp_regs[REG_VFP_UKNWN]; - - /* create a zero */ - block = get_nodes_block(node); - zero = new_bd_ia32_fldz(NULL, block, ia32_reg_classes[CLASS_ia32_st].mode); - x87_push(state, arch_register_get_index(reg), zero); - - attr = get_ia32_x87_attr(zero); - attr->x87[2] = &ia32_st_regs[0]; - - sched_add_before(node, zero); - - set_irn_n(node, i, zero); - } - - return NO_NODE_ADDED; -} /* sim_Barrier */ +} /** * Kill any dead registers at block start by popping them from the stack. * - * @param sim the simulator handle - * @param block the current block - * @param start_state the x87 state at the begin of the block - * - * @return the x87 state after dead register killed + * @param sim the simulator handle + * @param block the current block + * @param state the x87 state at the begin of the block */ -static x87_state *x87_kill_deads(x87_simulator *sim, ir_node *block, x87_state *start_state) +static void x87_kill_deads(x87_simulator *const sim, ir_node *const block, x87_state *const state) { - x87_state *state = start_state; ir_node *first_insn = sched_first(block); ir_node *keep = NULL; unsigned live = vfp_live_args_after(sim, block, 0); @@ -2192,12 +1884,9 @@ static x87_state *x87_kill_deads(x87_simulator *sim, ir_node *block, x87_state * } if (kill_mask) { - /* create a new state, will be changed */ - state = x87_clone_state(sim, state); - DB((dbg, LEVEL_1, "Killing deads:\n")); - DEBUG_ONLY(vfp_dump_live(live)); - DEBUG_ONLY(x87_dump_stack(state)); + DEBUG_ONLY(vfp_dump_live(live);) + DEBUG_ONLY(x87_dump_stack(state);) if (kill_mask != 0 && live == 0) { /* special case: kill all registers */ @@ -2212,7 +1901,7 @@ static x87_state *x87_kill_deads(x87_simulator *sim, ir_node *block, x87_state * sched_add_before(first_insn, keep); keep_alive(keep); x87_emms(state); - return state; + return; } } /* now kill registers */ @@ -2248,47 +1937,7 @@ static x87_state *x87_kill_deads(x87_simulator *sim, ir_node *block, x87_state * } keep_alive(keep); } - return state; -} /* x87_kill_deads */ - -/** - * If we have PhiEs with unknown operands in a block - * we have to make sure that some value is actually put onto the stack. - * - * @param state the x87 state - * @param block the block that should be checked - * @param pred_block check inputs from this predecessor block - * @param pos index of pred_block - */ -static void fix_unknown_phis(x87_state *state, ir_node *block, - ir_node *pred_block, int pos) -{ - ir_node *phi, *op; - - sched_foreach_Phi(block, phi) { - ir_node *zero; - const arch_register_t *reg; - ia32_x87_attr_t *attr; - - op = get_Phi_pred(phi, pos); - if (!is_ia32_Unknown_VFP(op)) - continue; - - reg = arch_get_irn_register(phi); - - /* create a zero at end of pred block */ - zero = new_bd_ia32_fldz(NULL, pred_block, ia32_reg_classes[CLASS_ia32_st].mode); - x87_push(state, arch_register_get_index(reg), zero); - - attr = get_ia32_x87_attr(zero); - attr->x87[2] = &ia32_st_regs[0]; - - assert(is_ia32_fldz(zero)); - sched_add_before(sched_last(pred_block), zero); - - set_Phi_pred(phi, pos, zero); - } -} /* fix_unknown_phis */ +} /** * Run a simulation and fix all virtual instructions for a block. @@ -2301,7 +1950,6 @@ static void x87_simulate_block(x87_simulator *sim, ir_node *block) ir_node *n, *next; blk_state *bl_state = x87_get_bl_state(sim, block); x87_state *state = bl_state->begin; - const ir_edge_t *edge; ir_node *start_block; assert(state != NULL); @@ -2311,12 +1959,12 @@ static void x87_simulate_block(x87_simulator *sim, ir_node *block) DB((dbg, LEVEL_1, "Simulate %+F\n", block)); DB((dbg, LEVEL_2, "State at Block begin:\n ")); - DEBUG_ONLY(x87_dump_stack(state)); + DEBUG_ONLY(x87_dump_stack(state);) - /* at block begin, kill all dead registers */ - state = x87_kill_deads(sim, block, state); /* create a new state, will be changed */ state = x87_clone_state(sim, state); + /* at block begin, kill all dead registers */ + x87_kill_deads(sim, block, state); /* beware, n might change */ for (n = sched_first(block); !sched_is_end(n); n = next) { @@ -2348,7 +1996,7 @@ static void x87_simulate_block(x87_simulator *sim, ir_node *block) start_block = get_irg_start_block(get_irn_irg(block)); - DB((dbg, LEVEL_2, "State at Block end:\n ")); DEBUG_ONLY(x87_dump_stack(state)); + DB((dbg, LEVEL_2, "State at Block end:\n ")); DEBUG_ONLY(x87_dump_stack(state);) /* check if the state must be shuffled */ foreach_block_succ(block, edge) { @@ -2360,11 +2008,9 @@ static void x87_simulate_block(x87_simulator *sim, ir_node *block) succ_state = x87_get_bl_state(sim, succ); - fix_unknown_phis(state, succ, block, get_edge_src_pos(edge)); - if (succ_state->begin == NULL) { DB((dbg, LEVEL_2, "Set begin state for succ %+F:\n", succ)); - DEBUG_ONLY(x87_dump_stack(state)); + DEBUG_ONLY(x87_dump_stack(state);) succ_state->begin = state; waitq_put(sim->worklist, succ); @@ -2376,11 +2022,11 @@ static void x87_simulate_block(x87_simulator *sim, ir_node *block) If the successor has more than one possible input, then it must be the only one. */ - x87_shuffle(sim, block, state, succ, succ_state->begin); + x87_shuffle(block, state, succ_state->begin); } } bl_state->end = state; -} /* x87_simulate_block */ +} /** * Register a simulator function. @@ -2392,7 +2038,7 @@ static void register_sim(ir_op *op, sim_func func) { assert(op->ops.generic == NULL); op->ops.generic = (op_func) func; -} /* register_sim */ +} /** * Create a new x87 simulator. @@ -2405,14 +2051,15 @@ static void x87_init_simulator(x87_simulator *sim, ir_graph *irg) obstack_init(&sim->obst); sim->blk_states = pmap_create(); sim->n_idx = get_irg_last_idx(irg); - sim->live = obstack_alloc(&sim->obst, sizeof(*sim->live) * sim->n_idx); + sim->live = OALLOCN(&sim->obst, vfp_liveness, sim->n_idx); DB((dbg, LEVEL_1, "--------------------------------\n" "x87 Simulator started for %+F\n", irg)); /* set the generic function pointer of instruction we must simulate */ - clear_irp_opcodes_generic_func(); + ir_clear_opcodes_generic_func(); + register_sim(op_ia32_Asm, sim_Asm); register_sim(op_ia32_Call, sim_Call); register_sim(op_ia32_vfld, sim_fld); register_sim(op_ia32_vfild, sim_fild); @@ -2432,13 +2079,10 @@ static void x87_init_simulator(x87_simulator *sim, ir_graph *irg) register_sim(op_ia32_vFucomFnstsw, sim_Fucom); register_sim(op_ia32_vFucomi, sim_Fucom); register_sim(op_be_Copy, sim_Copy); - register_sim(op_be_Spill, sim_Spill); - register_sim(op_be_Reload, sim_Reload); register_sim(op_be_Return, sim_Return); register_sim(op_be_Perm, sim_Perm); register_sim(op_be_Keep, sim_Keep); - register_sim(op_be_Barrier, sim_Barrier); -} /* x87_init_simulator */ +} /** * Destroy a x87 simulator. @@ -2450,7 +2094,7 @@ static void x87_destroy_simulator(x87_simulator *sim) pmap_destroy(sim->blk_states); obstack_free(&sim->obst, NULL); DB((dbg, LEVEL_1, "x87 Simulator stopped\n\n")); -} /* x87_destroy_simulator */ +} /** * Pre-block walker: calculate the liveness information for the block @@ -2458,23 +2102,22 @@ static void x87_destroy_simulator(x87_simulator *sim) */ static void update_liveness_walker(ir_node *block, void *data) { - x87_simulator *sim = data; + x87_simulator *sim = (x87_simulator*)data; update_liveness(sim, block); -} /* update_liveness_walker */ +} /* * Run a simulation and fix all virtual instructions for a graph. * Replaces all virtual floating point instructions and registers * by real ones. */ -void x87_simulate_graph(be_irg_t *birg) +void ia32_x87_simulate_graph(ir_graph *irg) { /* TODO improve code quality (less executed fxch) by using execfreqs */ ir_node *block, *start_block; blk_state *bl_state; x87_simulator sim; - ir_graph *irg = be_get_birg_irg(birg); /* create the simulator */ x87_init_simulator(&sim, irg); @@ -2483,15 +2126,14 @@ void x87_simulate_graph(be_irg_t *birg) bl_state = x87_get_bl_state(&sim, start_block); /* start with the empty state */ - bl_state->begin = empty; - empty->sim = ∼ + empty.sim = ∼ + bl_state->begin = ∅ sim.worklist = new_waitq(); waitq_put(sim.worklist, start_block); - be_assure_liveness(birg); - sim.lv = be_get_birg_liveness(birg); - be_liveness_assure_sets(sim.lv); + be_assure_live_sets(irg); + sim.lv = be_get_irg_liveness(irg); /* Calculate the liveness for all nodes. We must precalculate this info, * because the simulator adds new nodes (possible before Phi nodes) which @@ -2503,17 +2145,17 @@ void x87_simulate_graph(be_irg_t *birg) /* iterate */ do { - block = waitq_get(sim.worklist); + block = (ir_node*)waitq_get(sim.worklist); x87_simulate_block(&sim, block); } while (! waitq_empty(sim.worklist)); /* kill it */ del_waitq(sim.worklist); x87_destroy_simulator(&sim); -} /* x87_simulate_graph */ +} /* Initializes the x87 simulator. */ void ia32_init_x87(void) { FIRM_DBG_REGISTER(dbg, "firm.be.ia32.x87"); -} /* ia32_init_x87 */ +}