X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fia32%2Fia32_x87.c;h=3aca3391eaa079f33378e1dd9e8db854de9c938a;hb=65f6cc39305e6880fe45709a8a2e1c24445395e3;hp=de83f8f21d85c483ce50ee1fd3e7078543258934;hpb=9e56dbf066d3698df877e2a9f78caeca29ea5a03;p=libfirm diff --git a/ir/be/ia32/ia32_x87.c b/ir/be/ia32/ia32_x87.c index de83f8f21..3aca3391e 100644 --- a/ir/be/ia32/ia32_x87.c +++ b/ir/be/ia32/ia32_x87.c @@ -47,6 +47,7 @@ #include "../belive_t.h" #include "../besched_t.h" #include "../benode_t.h" +#include "bearch_ia32_t.h" #include "ia32_new_nodes.h" #include "gen_ia32_new_nodes.h" #include "gen_ia32_regalloc_if.h" @@ -54,16 +55,9 @@ #define N_x87_REGS 8 -/* first and second binop index */ -#define BINOP_IDX_1 2 -#define BINOP_IDX_2 3 - /* the unop index */ #define UNOP_IDX 0 -/* the store val index */ -#define STORE_VAL_IDX 2 - #define MASK_TOS(x) ((x) & (N_x87_REGS - 1)) /** the debug handle */ @@ -148,6 +142,7 @@ struct _x87_simulator { 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 */ }; /** @@ -313,6 +308,16 @@ static void x87_pop(x87_state *state) { DB((dbg, LEVEL_2, "After POP: ")); DEBUG_ONLY(x87_dump_stack(state)); } /* x87_pop */ +/** + * Empty the fpu stack + * + * @param state the x87 state + */ +static void x87_emms(x87_state *state) { + state->depth = 0; + state->tos = 0; +} + /** * Returns the block state of a block. * @@ -668,10 +673,14 @@ static ir_node *x87_create_fpop(x87_state *state, ir_node *n, int num) { ir_node *fpop; ia32_x87_attr_t *attr; + int cpu = state->sim->isa->opt_arch; while (num > 0) { x87_pop(state); - fpop = new_rd_ia32_fpop(NULL, get_irn_irg(n), get_nodes_block(n), mode_E); + if (ARCH_ATHLON(cpu)) + fpop = new_rd_ia32_ffreep(NULL, get_irn_irg(n), get_nodes_block(n), mode_E); + else + fpop = new_rd_ia32_fpop(NULL, get_irn_irg(n), get_nodes_block(n), mode_E); attr = get_ia32_x87_attr(fpop); attr->x87[0] = &ia32_st_regs[0]; attr->x87[1] = &ia32_st_regs[0]; @@ -730,9 +739,22 @@ static vfp_liveness vfp_liveness_transfer(x87_simulator *sim, ir_node *irn, vfp_ const arch_register_class_t *cls = &ia32_reg_classes[CLASS_ia32_vfp]; const arch_env_t *arch_env = sim->arch_env; + 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); + + if (arch_irn_consider_in_reg_alloc(arch_env, cls, proj)) { + const arch_register_t *reg = x87_get_irn_register(sim, proj); + live &= ~(1 << arch_register_get_index(reg)); + } + } + } + if (arch_irn_consider_in_reg_alloc(arch_env, cls, irn)) { - const arch_register_t *reg = x87_get_irn_register(sim, irn); - live &= ~(1 << arch_register_get_index(reg)); + const arch_register_t *reg = x87_get_irn_register(sim, irn); + live &= ~(1 << arch_register_get_index(reg)); } for (i = 0, n = get_irn_arity(irn); i < n; ++i) { @@ -854,6 +876,15 @@ static void vfp_dump_live(vfp_liveness live) { #define XCHG(a, b) do { int t = (a); (a) = (b); (b) = t; } while (0) +/* Pseudocode: + + + + + + +*/ + /** * Simulate a virtual binop. * @@ -869,36 +900,53 @@ static int sim_binop(x87_state *state, ir_node *n, const exchange_tmpl *tmpl) { ia32_x87_attr_t *attr; ir_node *patched_insn; ir_op *dst; - x87_simulator *sim = state->sim; - const arch_register_t *op1 = x87_get_irn_register(sim, get_irn_n(n, BINOP_IDX_1)); - const arch_register_t *op2 = x87_get_irn_register(sim, get_irn_n(n, BINOP_IDX_2)); - const arch_register_t *out = x87_get_irn_register(sim, n); - int reg_index_1 = arch_register_get_index(op1); - int reg_index_2 = arch_register_get_index(op2); - vfp_liveness live = vfp_live_args_after(sim, n, REGMASK(out)); + x87_simulator *sim = state->sim; + ir_node *op1 = get_irn_n(n, n_ia32_binary_left); + ir_node *op2 = get_irn_n(n, n_ia32_binary_right); + const arch_register_t *op1_reg = x87_get_irn_register(sim, op1); + const arch_register_t *op2_reg = x87_get_irn_register(sim, op2); + const arch_register_t *out = x87_get_irn_register(sim, n); + int reg_index_1 = arch_register_get_index(op1_reg); + int reg_index_2 = arch_register_get_index(op2_reg); + vfp_liveness live = vfp_live_args_after(sim, n, REGMASK(out)); + int op1_live_after; + int op2_live_after; DB((dbg, LEVEL_1, ">>> %+F %s, %s -> %s\n", n, - arch_register_get_name(op1), arch_register_get_name(op2), + arch_register_get_name(op1_reg), arch_register_get_name(op2_reg), arch_register_get_name(out))); DEBUG_ONLY(vfp_dump_live(live)); DB((dbg, LEVEL_1, "Stack before: ")); DEBUG_ONLY(x87_dump_stack(state)); - op1_idx = x87_on_stack(state, reg_index_1); - assert(op1_idx >= 0); + 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); + } if (reg_index_2 != REG_VFP_NOREG) { - /* second operand is a vfp register */ - op2_idx = x87_on_stack(state, reg_index_2); - assert(op2_idx >= 0); + 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); + } - if (is_vfp_live(arch_register_get_index(op2), live)) { + if (op2_live_after) { /* Second operand is live. */ - if (is_vfp_live(arch_register_get_index(op1), live)) { + 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, BINOP_IDX_2); + x87_create_fpush(state, n, op1_idx, n_ia32_binary_right); /* now do fxxx (tos=tos X op) */ op1_idx = 0; op2_idx += 1; @@ -918,7 +966,7 @@ static int sim_binop(x87_state *state, ir_node *n, const exchange_tmpl *tmpl) { } } else { /* Second operand is dead. */ - if (is_vfp_live(arch_register_get_index(op1), live)) { + if (op1_live_after) { /* First operand is live: bring second to tos. */ if (op2_idx != 0) { x87_create_fxch(state, n, op2_idx); @@ -972,9 +1020,9 @@ static int sim_binop(x87_state *state, ir_node *n, const exchange_tmpl *tmpl) { } } else { /* second operand is an address mode */ - if (is_vfp_live(arch_register_get_index(op1), live)) { + if (op1_live_after) { /* first operand is live: push it here */ - x87_create_fpush(state, n, op1_idx, BINOP_IDX_1); + x87_create_fpush(state, n, op1_idx, n_ia32_binary_left); op1_idx = 0; /* use fxxx (tos = tos X mem) */ dst = tmpl->normal_op; @@ -1000,19 +1048,19 @@ static int sim_binop(x87_state *state, ir_node *n, const exchange_tmpl *tmpl) { /* patch the operation */ attr = get_ia32_x87_attr(n); - attr->x87[0] = op1 = &ia32_st_regs[op1_idx]; + attr->x87[0] = op1_reg = &ia32_st_regs[op1_idx]; if (reg_index_2 != REG_VFP_NOREG) { - attr->x87[1] = op2 = &ia32_st_regs[op2_idx]; + attr->x87[1] = op2_reg = &ia32_st_regs[op2_idx]; } attr->x87[2] = out = &ia32_st_regs[out_idx]; if (reg_index_2 != REG_VFP_NOREG) { DB((dbg, LEVEL_1, "<<< %s %s, %s -> %s\n", get_irn_opname(n), - arch_register_get_name(op1), arch_register_get_name(op2), + arch_register_get_name(op1_reg), arch_register_get_name(op2_reg), arch_register_get_name(out))); } else { DB((dbg, LEVEL_1, "<<< %s %s, [AM] -> %s\n", get_irn_opname(n), - arch_register_get_name(op1), + arch_register_get_name(op1_reg), arch_register_get_name(out))); } @@ -1125,7 +1173,7 @@ 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) { x87_simulator *sim = state->sim; - ir_node *val = get_irn_n(n, STORE_VAL_IDX); + ir_node *val = get_irn_n(n, n_ia32_vfst_val); const arch_register_t *op2 = x87_get_irn_register(sim, val); unsigned live = vfp_live_args_after(sim, n, 0); int insn = NO_NODE_ADDED; @@ -1151,8 +1199,8 @@ static int sim_store(x87_state *state, ir_node *n, ir_op *op, ir_op *op_p) { } else { op2_idx = x87_on_stack(state, op2_reg_idx); live_after_node = is_vfp_live(arch_register_get_index(op2), live); - assert(op2_idx >= 0); DB((dbg, LEVEL_1, ">>> %+F %s ->\n", n, arch_register_get_name(op2))); + assert(op2_idx >= 0); } mode = get_ia32_ls_mode(n); @@ -1165,10 +1213,10 @@ static int sim_store(x87_state *state, ir_node *n, ir_op *op, ir_op *op_p) { - stack not full: push value and fstp - stack full: fstp value and load again */ - if (mode == mode_E) { + if (mode == mode_E || mode == mode_Ls) { if (depth < N_x87_REGS) { /* ok, we have a free register: push + fstp */ - x87_create_fpush(state, n, op2_idx, STORE_VAL_IDX); + x87_create_fpush(state, n, op2_idx, n_ia32_vfst_val); x87_pop(state); x87_patch_insn(n, op_p); } else { @@ -1181,13 +1229,12 @@ static int sim_store(x87_state *state, ir_node *n, ir_op *op, ir_op *op_p) { block = get_nodes_block(n); irg = get_irn_irg(n); - vfld = new_rd_ia32_vfld(NULL, irg, block, get_irn_n(n, 0), get_irn_n(n, 1), new_rd_NoMem(irg)); + vfld = new_rd_ia32_vfld(NULL, irg, block, get_irn_n(n, 0), get_irn_n(n, 1), new_rd_NoMem(irg), get_ia32_ls_mode(n)); /* copy all attributes */ set_ia32_frame_ent(vfld, get_ia32_frame_ent(n)); if (is_ia32_use_frame(n)) set_ia32_use_frame(vfld); - set_ia32_am_flavour(vfld, get_ia32_am_flavour(n)); set_ia32_op_type(vfld, ia32_am_Source); add_ia32_am_offs_int(vfld, get_ia32_am_offs_int(n)); set_ia32_am_sc(vfld, get_ia32_am_sc(n)); @@ -1204,7 +1251,7 @@ static int sim_store(x87_state *state, ir_node *n, ir_op *op, ir_op *op_p) { /* reroute all former users of the store memory to the load memory */ edges_reroute(mem, mproj, irg); /* set the memory input of the load to the store memory */ - set_irn_n(vfld, 2, mem); + set_irn_n(vfld, n_ia32_vfld_mem, mem); sched_add_after(n, vfld); sched_add_after(vfld, rproj); @@ -1273,9 +1320,6 @@ GEN_BINOP(fprem) GEN_UNOP(fabs) GEN_UNOP(fchs) -GEN_UNOP(fsin) -GEN_UNOP(fcos) -GEN_UNOP(fsqrt) GEN_LOAD(fld) GEN_LOAD(fild) @@ -1286,25 +1330,27 @@ GEN_STORE(fst) GEN_STORE(fist) /** - * Simulate a fCondJmp. - * * @param state the x87 state * @param n the node that should be simulated (and patched) * * @return NO_NODE_ADDED */ -static int sim_fCondJmp(x87_state *state, ir_node *n) { +static int sim_FucomFnstsw(x87_state *state, ir_node *n) { int op1_idx; int op2_idx = -1; int pop_cnt = 0; - ia32_x87_attr_t *attr; + ia32_x87_attr_t *attr = get_ia32_x87_attr(n); ir_op *dst; x87_simulator *sim = state->sim; - const arch_register_t *op1 = x87_get_irn_register(sim, get_irn_n(n, BINOP_IDX_1)); - const arch_register_t *op2 = x87_get_irn_register(sim, get_irn_n(n, BINOP_IDX_2)); + 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(sim, op1_node); + const arch_register_t *op2 = x87_get_irn_register(sim, 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 flipped = attr->attr.data.cmp_flipped; + int xchg = 0; DB((dbg, LEVEL_1, ">>> %+F %s, %s\n", n, arch_register_get_name(op1), arch_register_get_name(op2))); @@ -1329,10 +1375,12 @@ static int sim_fCondJmp(x87_state *state, ir_node *n) { if (op1_idx == 0) { /* res = tos X op */ - dst = op_ia32_fcomJmp; + dst = op_ia32_FucomFnstsw; } else if (op2_idx == 0) { /* res = op X tos */ - dst = op_ia32_fcomrJmp; + dst = op_ia32_FucomFnstsw; + flipped = !flipped; + xchg = 1; } else { /* bring the first one to tos */ x87_create_fxch(state, n, op1_idx); @@ -1340,7 +1388,7 @@ static int sim_fCondJmp(x87_state *state, ir_node *n) { op2_idx = op1_idx; op1_idx = 0; /* res = tos X op */ - dst = op_ia32_fcomJmp; + dst = op_ia32_FucomFnstsw; } } else { /* second live, first operand is dead here, bring it to tos. @@ -1353,7 +1401,7 @@ static int sim_fCondJmp(x87_state *state, ir_node *n) { op1_idx = 0; } /* res = tos X op, pop */ - dst = op_ia32_fcompJmp; + dst = op_ia32_FucompFnstsw; pop_cnt = 1; } } else { @@ -1369,7 +1417,9 @@ static int sim_fCondJmp(x87_state *state, ir_node *n) { op2_idx = 0; } /* res = op X tos, pop */ - dst = op_ia32_fcomrpJmp; + dst = op_ia32_FucompFnstsw; + flipped = !flipped; + xchg = 1; pop_cnt = 1; } else { /* both operands are dead here, check first for identity. */ @@ -1381,7 +1431,7 @@ static int sim_fCondJmp(x87_state *state, ir_node *n) { op2_idx = 0; } /* res = tos X op, pop */ - dst = op_ia32_fcompJmp; + dst = op_ia32_FucompFnstsw; pop_cnt = 1; } /* different, move them to st and st(1) and pop both. @@ -1395,7 +1445,7 @@ static int sim_fCondJmp(x87_state *state, ir_node *n) { op1_idx = 0; } /* res = tos X op, pop, pop */ - dst = op_ia32_fcomppJmp; + dst = op_ia32_FucomppFnstsw; pop_cnt = 2; } else if (op1_idx == 1) { /* good, first operand is already in the right place, move the second */ @@ -1405,7 +1455,10 @@ static int sim_fCondJmp(x87_state *state, ir_node *n) { assert(op1_idx != 0); op2_idx = 0; } - dst = op_ia32_fcomrppJmp; + /* res = op X tos, pop, pop */ + dst = op_ia32_FucomppFnstsw; + flipped = !flipped; + xchg = 1; pop_cnt = 2; } else { /* if one is already the TOS, we need two fxch */ @@ -1417,7 +1470,9 @@ static int sim_fCondJmp(x87_state *state, ir_node *n) { x87_create_fxch(state, n, op2_idx); op2_idx = 0; /* res = op X tos, pop, pop */ - dst = op_ia32_fcomrppJmp; + dst = op_ia32_FucomppFnstsw; + flipped = !flipped; + xchg = 1; pop_cnt = 2; } else if (op2_idx == 0) { /* second one is TOS, move to st(1) */ @@ -1427,7 +1482,7 @@ static int sim_fCondJmp(x87_state *state, ir_node *n) { x87_create_fxch(state, n, op1_idx); op1_idx = 0; /* res = tos X op, pop, pop */ - dst = op_ia32_fcomppJmp; + dst = op_ia32_FucomppFnstsw; pop_cnt = 2; } else { /* none of them is either TOS or st(1), 3 fxch needed */ @@ -1438,7 +1493,7 @@ static int sim_fCondJmp(x87_state *state, ir_node *n) { x87_create_fxch(state, n, op1_idx); op1_idx = 0; /* res = tos X op, pop, pop */ - dst = op_ia32_fcomppJmp; + dst = op_ia32_FucomppFnstsw; pop_cnt = 2; } } @@ -1452,14 +1507,14 @@ static int sim_fCondJmp(x87_state *state, ir_node *n) { x87_create_fxch(state, n, op1_idx); op1_idx = 0; } - dst = op_ia32_fcomJmp; + dst = op_ia32_FucomFnstsw; } else { /* first operand is dead: bring it to tos */ if (op1_idx != 0) { x87_create_fxch(state, n, op1_idx); op1_idx = 0; } - dst = op_ia32_fcompJmp; + dst = op_ia32_FucompFnstsw; pop_cnt = 1; } } @@ -1471,8 +1526,13 @@ static int sim_fCondJmp(x87_state *state, ir_node *n) { if (pop_cnt >= 1) x87_pop(state); + if(xchg) { + int tmp = op1_idx; + op1_idx = op2_idx; + op2_idx = tmp; + } + /* patch the operation */ - attr = get_ia32_x87_attr(n); op1 = &ia32_st_regs[op1_idx]; attr->x87[0] = op1; if (op2_idx >= 0) { @@ -1480,6 +1540,7 @@ static int sim_fCondJmp(x87_state *state, ir_node *n) { attr->x87[1] = op2; } attr->x87[2] = NULL; + attr->attr.data.cmp_flipped = flipped; if (op2_idx >= 0) DB((dbg, LEVEL_1, "<<< %s %s, %s\n", get_irn_opname(n), @@ -1489,32 +1550,41 @@ static int sim_fCondJmp(x87_state *state, ir_node *n) { arch_register_get_name(op1))); return NO_NODE_ADDED; -} /* sim_fCondJmp */ +} -static -int sim_Keep(x87_state *state, ir_node *node) +static int sim_Keep(x87_state *state, ir_node *node) { const ir_node *op; const arch_register_t *op_reg; int reg_id; int op_stack_idx; unsigned live; + int i, arity; + int node_added = NO_NODE_ADDED; - op = get_irn_n(node, 0); - op_reg = arch_get_irn_register(state->sim->arch_env, op); - if(arch_register_get_class(op_reg) != &ia32_reg_classes[CLASS_ia32_vfp]) - return NO_NODE_ADDED; + DB((dbg, LEVEL_1, ">>> %+F\n", node)); - reg_id = arch_register_get_index(op_reg); - live = vfp_live_args_after(state->sim, node, 0); + arity = get_irn_arity(node); + for(i = 0; i < arity; ++i) { + op = get_irn_n(node, i); + op_reg = arch_get_irn_register(state->sim->arch_env, op); + if(arch_register_get_class(op_reg) != &ia32_reg_classes[CLASS_ia32_vfp]) + continue; + + reg_id = arch_register_get_index(op_reg); + live = vfp_live_args_after(state->sim, node, 0); - op_stack_idx = x87_on_stack(state, reg_id); - if(op_stack_idx >= 0 && !is_vfp_live(reg_id, live)) { - x87_create_fpop(state, sched_next(node), 1); - return NODE_ADDED; + op_stack_idx = x87_on_stack(state, reg_id); + if(op_stack_idx >= 0 && !is_vfp_live(reg_id, live)) { + x87_create_fpop(state, sched_next(node), 1); + node_added = NODE_ADDED; + } } - return NO_NODE_ADDED; + DB((dbg, LEVEL_1, "Stack after: ")); + DEBUG_ONLY(x87_dump_stack(state)); + + return node_added; } static @@ -1621,24 +1691,23 @@ static ir_node *create_Copy(x87_state *state, ir_node *n) { * @return NO_NODE_ADDED */ static int sim_Copy(x87_state *state, ir_node *n) { - x87_simulator *sim; - ir_node *pred; - const arch_register_t *out; - const arch_register_t *op1; - ir_node *node, *next; - ia32_x87_attr_t *attr; - int op1_idx, out_idx; - unsigned live; - - ir_mode *mode = get_irn_mode(n); - - if (!mode_is_float(mode)) + x87_simulator *sim = state->sim; + ir_node *pred; + const arch_register_t *out; + const arch_register_t *op1; + const arch_register_class_t *class; + ir_node *node, *next; + ia32_x87_attr_t *attr; + int op1_idx, out_idx; + unsigned live; + + class = arch_get_irn_reg_class(sim->arch_env, n, -1); + if (class->regs != ia32_vfp_regs) return 0; - sim = state->sim; pred = get_irn_n(n, 0); - out = x87_get_irn_register(sim, n); - op1 = x87_get_irn_register(sim, pred); + out = x87_get_irn_register(sim, n); + op1 = x87_get_irn_register(sim, pred); live = vfp_live_args_after(sim, n, REGMASK(out)); DB((dbg, LEVEL_1, ">>> %+F %s -> %s\n", n, @@ -1734,11 +1803,10 @@ static int sim_Copy(x87_state *state, ir_node *n) { } /* sim_Copy */ /** - * Returns the result proj of the call, or NULL if the result is not used + * Returns the result proj of the call */ static ir_node *get_call_result_proj(ir_node *call) { const ir_edge_t *edge; - ir_node *resproj = NULL; /* search the result proj */ foreach_out_edge(call, edge) { @@ -1746,23 +1814,10 @@ static ir_node *get_call_result_proj(ir_node *call) { long pn = get_Proj_proj(proj); if (pn == pn_be_Call_first_res) { - resproj = proj; - break; - } - } - if (resproj == NULL) { - return NULL; - } - - /* the result proj is connected to a Keep and maybe other nodes */ - foreach_out_edge(resproj, edge) { - ir_node *pred = get_edge_src_irn(edge); - if (!be_is_Keep(pred)) { - return resproj; + return proj; } } - /* only be_Keep found, so result is not used */ return NULL; } /* get_call_result_proj */ @@ -1784,11 +1839,13 @@ static int sim_Call(x87_state *state, ir_node *n, const arch_env_t *arch_env) const arch_register_t *reg; (void) arch_env; + 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) - return NO_NODE_ADDED; + goto end_call; /* * If the called function returns a float, it is returned in st(0). @@ -1799,15 +1856,18 @@ static int sim_Call(x87_state *state, ir_node *n, const arch_env_t *arch_env) mode = get_type_mode(res_type); if (mode == NULL || !mode_is_float(mode)) - return NO_NODE_ADDED; + goto end_call; resproj = get_call_result_proj(n); - if (resproj == NULL) - return NO_NODE_ADDED; + assert(resproj != NULL); reg = x87_get_irn_register(state->sim, resproj); x87_push(state, arch_register_get_index(reg), resproj); +end_call: + DB((dbg, LEVEL_1, "Stack after: ")); + DEBUG_ONLY(x87_dump_stack(state)); + return NO_NODE_ADDED; } /* sim_Call */ @@ -1921,6 +1981,42 @@ static int sim_Perm(x87_state *state, ir_node *irn) { return NO_NODE_ADDED; } /* sim_Perm */ +static int sim_Barrier(x87_state *state, ir_node *node) { + //const arch_env_t *arch_env = state->sim->arch_env; + 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_rd_ia32_fldz(NULL, current_ir_graph, block, mode_E); + 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; +} + + /** * Kill any dead registers at block start by popping them from the stack. * @@ -1955,6 +2051,24 @@ static x87_state *x87_kill_deads(x87_simulator *sim, ir_node *block, x87_state * DEBUG_ONLY(vfp_dump_live(live)); DEBUG_ONLY(x87_dump_stack(state)); + if (kill_mask != 0 && live == 0) { + int cpu = sim->isa->arch; + + /* special case: kill all registers */ + if (ARCH_ATHLON(sim->isa->opt_arch) && ARCH_MMX(cpu)) { + if (ARCH_AMD(cpu)) { + /* use FEMMS on AMD processors to clear all */ + keep = new_rd_ia32_femms(NULL, get_irn_irg(block), block, mode_E); + } else { + /* use EMMS to clear all */ + keep = new_rd_ia32_emms(NULL, get_irn_irg(block), block, mode_E); + } + sched_add_before(first_insn, keep); + keep_alive(keep); + x87_emms(state); + return state; + } + } /* now kill registers */ while (kill_mask) { /* we can only kill from TOS, so bring them up */ @@ -1991,6 +2105,43 @@ static x87_state *x87_kill_deads(x87_simulator *sim, ir_node *block, x87_state * return state; } /* x87_kill_deads */ +/** + * If we have PhiEs with unknown operands then we have to make sure that some + * value is actually put onto the stack. + */ +static void fix_unknown_phis(x87_state *state, ir_node *block, + ir_node *pred_block, int pos) +{ + ir_node *node, *op; + + sched_foreach(block, node) { + ir_node *zero; + const arch_register_t *reg; + ia32_x87_attr_t *attr; + + if(!is_Phi(node)) + break; + + op = get_Phi_pred(node, pos); + if(!is_ia32_Unknown_VFP(op)) + continue; + + reg = arch_get_irn_register(state->sim->arch_env, node); + + /* create a zero at end of pred block */ + zero = new_rd_ia32_fldz(NULL, current_ir_graph, pred_block, mode_E); + 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(node, pos, zero); + } +} + /** * Run a simulation and fix all virtual instructions for a block. * @@ -2015,6 +2166,8 @@ static void x87_simulate_block(x87_simulator *sim, ir_node *block) { /* 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); /* beware, n might change */ for (n = sched_first(block); !sched_is_end(n); n = next) { @@ -2028,12 +2181,6 @@ static void x87_simulate_block(x87_simulator *sim, ir_node *block) { func = (sim_func)op->ops.generic; - /* have work to do */ - if (state == bl_state->begin) { - /* create a new state, will be changed */ - state = x87_clone_state(sim, state); - } - /* simulate it */ node_inserted = (*func)(state, n); @@ -2049,6 +2196,8 @@ 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)); + /* check if the state must be shuffled */ foreach_block_succ(block, edge) { ir_node *succ = get_edge_src_irn(edge); @@ -2059,10 +2208,16 @@ 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)); succ_state->begin = state; + waitq_put(sim->worklist, succ); } else { + DB((dbg, LEVEL_2, "succ %+F already has a state, shuffling\n", succ)); /* There is already a begin state for the successor, bad. Do the necessary permutations. Note that critical edges are removed, so this is always possible: @@ -2073,8 +2228,6 @@ static void x87_simulate_block(x87_simulator *sim, ir_node *block) { } } bl_state->end = state; - - DB((dbg, LEVEL_2, "State at Block end:\n ")); DEBUG_ONLY(x87_dump_stack(state)); } /* x87_simulate_block */ /** @@ -2092,6 +2245,7 @@ static void x87_init_simulator(x87_simulator *sim, ir_graph *irg, sim->arch_env = arch_env; sim->n_idx = get_irg_last_idx(irg); sim->live = obstack_alloc(&sim->obst, sizeof(*sim->live) * sim->n_idx); + sim->isa = (ia32_isa_t *)arch_env->isa; DB((dbg, LEVEL_1, "--------------------------------\n" "x87 Simulator started for %+F\n", irg)); @@ -2113,12 +2267,9 @@ static void x87_init_simulator(x87_simulator *sim, ir_graph *irg, ASSOC_IA32(fprem); ASSOC_IA32(fabs); ASSOC_IA32(fchs); - ASSOC_IA32(fsin); - ASSOC_IA32(fcos); - ASSOC_IA32(fsqrt); ASSOC_IA32(fist); ASSOC_IA32(fst); - ASSOC_IA32(fCondJmp); + ASSOC_IA32(FucomFnstsw); ASSOC_BE(Copy); ASSOC_BE(Call); ASSOC_BE(Spill); @@ -2126,6 +2277,7 @@ static void x87_init_simulator(x87_simulator *sim, ir_graph *irg, ASSOC_BE(Return); ASSOC_BE(Perm); ASSOC_BE(Keep); + ASSOC_BE(Barrier); #undef ASSOC_BE #undef ASSOC_IA32 #undef ASSOC @@ -2169,7 +2321,7 @@ void x87_simulate_graph(const arch_env_t *arch_env, be_irg_t *birg) { x87_init_simulator(&sim, irg, arch_env); start_block = get_irg_start_block(irg); - bl_state = x87_get_bl_state(&sim, start_block); + bl_state = x87_get_bl_state(&sim, start_block); /* start with the empty state */ bl_state->begin = empty;