/* First pass: Create new vars */
for (ins = bb->code; ins; ins = ins->next) {
const char *spec = INS_INFO (ins->opcode);
+ int num_sregs;
+ int sregs [MONO_MAX_SRC_REGS];
#ifdef DEBUG_SSA
printf ("\tProcessing "); mono_print_ins (ins);
if (ins->opcode == OP_NOP)
continue;
- /* SREG1 */
- if (spec [MONO_INST_SRC1] != ' ') {
- MonoInst *var = get_vreg_to_inst (cfg, ins->sreg1);
- if (var && !(var->flags & (MONO_INST_VOLATILE|MONO_INST_INDIRECT))) {
- int idx = var->inst_c0;
- if (stack [idx]) {
- if (var->opcode != OP_ARG)
- g_assert (stack [idx]);
- ins->sreg1 = stack [idx]->dreg;
- record_use (cfg, stack [idx], bb, ins);
- }
- else
- record_use (cfg, var, bb, ins);
- }
- else if (G_UNLIKELY (!var && lvreg_stack [ins->sreg1]))
- ins->sreg1 = lvreg_stack [ins->sreg1];
- }
-
- /* SREG2 */
- if (spec [MONO_INST_SRC2] != ' ') {
- MonoInst *var = get_vreg_to_inst (cfg, ins->sreg2);
- if (var && !(var->flags & (MONO_INST_VOLATILE|MONO_INST_INDIRECT))) {
- int idx = var->inst_c0;
- if (stack [idx]) {
- if (var->opcode != OP_ARG)
- g_assert (stack [idx]);
-
- ins->sreg2 = stack [idx]->dreg;
- record_use (cfg, stack [idx], bb, ins);
+ /* SREGs */
+ num_sregs = mono_inst_get_src_registers (ins, sregs);
+ for (i = 0; i < num_sregs; ++i) {
+ if (spec [MONO_INST_SRC1 + i] != ' ') {
+ MonoInst *var = get_vreg_to_inst (cfg, sregs [i]);
+ if (var && !(var->flags & (MONO_INST_VOLATILE|MONO_INST_INDIRECT))) {
+ int idx = var->inst_c0;
+ if (stack [idx]) {
+ if (var->opcode != OP_ARG)
+ g_assert (stack [idx]);
+ sregs [i] = stack [idx]->dreg;
+ record_use (cfg, stack [idx], bb, ins);
+ }
+ else
+ record_use (cfg, var, bb, ins);
}
- else
- record_use (cfg, var, bb, ins);
+ else if (G_UNLIKELY (!var && lvreg_stack [sregs [i]]))
+ sregs [i] = lvreg_stack [sregs [i]];
}
- else if (G_UNLIKELY (!var && lvreg_stack [ins->sreg2]))
- ins->sreg2 = lvreg_stack [ins->sreg2];
}
+ mono_inst_set_src_registers (ins, sregs);
if (MONO_IS_STORE_MEMBASE (ins)) {
MonoInst *var = get_vreg_to_inst (cfg, ins->dreg);
}
else if (G_UNLIKELY (!var && lvreg_defined [ins->dreg] && (ins->dreg >= MONO_MAX_IREGS))) {
/* Perform renaming for local vregs */
- lvreg_stack [ins->dreg] = mono_alloc_preg (cfg);
+ lvreg_stack [ins->dreg] = vreg_is_ref (cfg, ins->dreg) ? mono_alloc_ireg_ref (cfg) : mono_alloc_preg (cfg);
ins->dreg = lvreg_stack [ins->dreg];
}
else
g_assert (!(cfg->comp_done & MONO_COMP_SSA));
- /* we dont support methods containing exception clauses */
- g_assert (mono_method_get_header (cfg->method)->num_clauses == 0);
g_assert (!cfg->disable_ssa);
if (cfg->verbose_level >= 4)
MonoInst *var = cfg->varinfo [i];
#if SIZEOF_REGISTER == 4
- if (var->type == STACK_I8)
+ if (var->type == STACK_I8 && !COMPILE_LLVM (cfg))
continue;
#endif
if (var->flags & (MONO_INST_VOLATILE|MONO_INST_INDIRECT))
/* fixme: create pruned SSA? we would need liveness information for that */
- if (bb == cfg->bb_exit)
+ if (bb == cfg->bb_exit && !COMPILE_LLVM (cfg))
continue;
if ((cfg->comp_done & MONO_COMP_LIVENESS) && !mono_bitset_test_fast (bb->live_in_set, i)) {
break;
case STACK_VTYPE:
ins->opcode = MONO_CLASS_IS_SIMD (cfg, var->klass) ? OP_XPHI : OP_VPHI;
- ins->klass = var->klass;
break;
}
+ if (var->inst_vtype->byref)
+ ins->klass = mono_defaults.int_class;
+ else
+ ins->klass = var->klass;
+
ins->inst_phi_args = mono_mempool_alloc0 (cfg->mempool, sizeof (int) * (cfg->bblocks [idx]->in_count + 1));
ins->inst_phi_args [0] = cfg->bblocks [idx]->in_count;
mono_ssa_rename_vars (cfg, cfg->num_varinfo, cfg->bb_entry, originals, stack, lvreg_stack, lvreg_defined, stack_history, stack_history_size);
g_free (stack_history);
g_free (originals);
+ g_free (lvreg_stack);
+ g_free (lvreg_defined);
if (cfg->verbose_level >= 4)
printf ("\nEND COMPUTE SSA.\n\n");
mono_ssa_remove (MonoCompile *cfg)
{
MonoInst *ins, *var, *move;
- int i, j, first;
+ int bbindex, i, j, first;
g_assert (cfg->comp_done & MONO_COMP_SSA);
* can coalesce them into the original variable.
*/
- for (i = 0; i < cfg->num_bblocks; ++i) {
- MonoBasicBlock *bb = cfg->bblocks [i];
+ for (bbindex = 0; bbindex < cfg->num_bblocks; ++bbindex) {
+ MonoBasicBlock *bb = cfg->bblocks [bbindex];
for (ins = bb->code; ins; ins = ins->next) {
const char *spec = INS_INFO (ins->opcode);
+ int num_sregs;
+ int sregs [MONO_MAX_SRC_REGS];
if (ins->opcode == OP_NOP)
continue;
}
}
- if (spec [MONO_INST_SRC1] != ' ') {
- MonoInst *var = get_vreg_to_inst (cfg, ins->sreg1);
-
- if (var) {
- MonoMethodVar *vmv = MONO_VARINFO (cfg, var->inst_c0);
-
- if ((vmv->reg != -1) && (vmv->idx != vmv->reg) && (MONO_VARINFO (cfg, vmv->reg)->reg != -1)) {
- printf ("COALESCE: R%d -> R%d\n", ins->sreg1, cfg->varinfo [vmv->reg]->dreg);
- ins->sreg1 = cfg->varinfo [vmv->reg]->dreg;
- }
- }
- }
-
- if (spec [MONO_INST_SRC2] != ' ') {
- MonoInst *var = get_vreg_to_inst (cfg, ins->sreg2);
+ num_sregs = mono_inst_get_src_registers (ins, sregs);
+ for (i = 0; i < num_sregs; ++i) {
+ MonoInst *var = get_vreg_to_inst (cfg, sregs [i]);
if (var) {
MonoMethodVar *vmv = MONO_VARINFO (cfg, var->inst_c0);
if ((vmv->reg != -1) && (vmv->idx != vmv->reg) && (MONO_VARINFO (cfg, vmv->reg)->reg != -1)) {
- printf ("COALESCE: R%d -> R%d\n", ins->sreg2, cfg->varinfo [vmv->reg]->dreg);
- ins->sreg2 = cfg->varinfo [vmv->reg]->dreg;
+ printf ("COALESCE: R%d -> R%d\n", sregs [i], cfg->varinfo [vmv->reg]->dreg);
+ sregs [i] = cfg->varinfo [vmv->reg]->dreg;
}
}
}
-
+ mono_inst_set_src_registers (ins, sregs);
}
}
for (ins = bb->code; ins; ins = ins->next) {
const char *spec = INS_INFO (ins->opcode);
MonoMethodVar *info;
+ int num_sregs;
+ int sregs [MONO_MAX_SRC_REGS];
if (ins->opcode == OP_NOP)
continue;
- /* SREG1 */
- if (spec [MONO_INST_SRC1] != ' ') {
- MonoInst *var = get_vreg_to_inst (cfg, ins->sreg1);
+ /* SREGs */
+ num_sregs = mono_inst_get_src_registers (ins, sregs);
+ for (i = 0; i < num_sregs; ++i) {
+ MonoInst *var = get_vreg_to_inst (cfg, sregs [i]);
if (var && !(var->flags & (MONO_INST_VOLATILE|MONO_INST_INDIRECT)))
record_use (cfg, var, bb, ins);
}
- /* SREG2 */
- if (spec [MONO_INST_SRC2] != ' ') {
- MonoInst *var = get_vreg_to_inst (cfg, ins->sreg2);
- if (var && !(var->flags & (MONO_INST_VOLATILE|MONO_INST_INDIRECT)))
- record_use (cfg, var, bb, ins);
- }
-
if (MONO_IS_STORE_MEMBASE (ins)) {
MonoInst *var = get_vreg_to_inst (cfg, ins->dreg);
if (var && !(var->flags & (MONO_INST_VOLATILE|MONO_INST_INDIRECT)))
MonoVarUsageInfo *u = (MonoVarUsageInfo*)l->data;
MonoInst *ins = u->inst;
GList *next = l->next;
+ int num_sregs;
+ int sregs [MONO_MAX_SRC_REGS];
spec = INS_INFO (ins->opcode);
- if (spec [MONO_INST_SRC1] != ' ' && ins->sreg1 == dreg) {
- ins->sreg1 = sreg1;
- } else if (spec [MONO_INST_SRC2] != ' ' && ins->sreg2 == dreg) {
- ins->sreg2 = sreg1;
+ num_sregs = mono_inst_get_src_registers (ins, sregs);
+ for (i = 0; i < num_sregs; ++i) {
+ if (sregs [i] == dreg)
+ break;
+ }
+ if (i < num_sregs) {
+ g_assert (sregs [i] == dreg);
+ sregs [i] = sreg1;
+ mono_inst_set_src_registers (ins, sregs);
} else if (MONO_IS_STORE_MEMBASE (ins) && ins->dreg == dreg) {
ins->dreg = sreg1;
} else if (MONO_IS_PHI (ins)) {
static int
evaluate_ins (MonoCompile *cfg, MonoInst *ins, MonoInst **res, MonoInst **carray)
{
- MonoInst *arg0, *arg1, *c0;
- int r1, r2;
- gboolean const_args = FALSE;
+ MonoInst *args [MONO_MAX_SRC_REGS];
+ int rs [MONO_MAX_SRC_REGS];
+ MonoInst *c0;
+ gboolean const_args = TRUE;
const char *spec = INS_INFO (ins->opcode);
+ int num_sregs, i;
+ int sregs [MONO_MAX_SRC_REGS];
/* Short-circuit this */
if (ins->opcode == OP_ICONST) {
if (ins->opcode == OP_NOP)
return 2;
- arg0 = NULL;
- if (spec [MONO_INST_SRC1] != ' ') {
- MonoInst *var = get_vreg_to_inst (cfg, ins->sreg1);
-
- r1 = 2;
- arg0 = carray [ins->sreg1];
- if (arg0)
- r1 = 1;
- else if (var && !(var->flags & (MONO_INST_VOLATILE|MONO_INST_INDIRECT)))
- r1 = MONO_VARINFO (cfg, var->inst_c0)->cpstate;
- } else {
- r1 = 2;
- }
-
- arg1 = NULL;
- if (spec [MONO_INST_SRC2] != ' ') {
- MonoInst *var = get_vreg_to_inst (cfg, ins->sreg2);
+ num_sregs = mono_inst_get_src_registers (ins, sregs);
+ for (i = 0; i < MONO_MAX_SRC_REGS; ++i)
+ args [i] = NULL;
+ for (i = 0; i < num_sregs; ++i) {
+ MonoInst *var = get_vreg_to_inst (cfg, sregs [i]);
- r2 = 2;
- arg1 = carray [ins->sreg2];
- if (arg1)
- r2 = 1;
+ rs [i] = 2;
+ args [i] = carray [sregs [i]];
+ if (args [i])
+ rs [i] = 1;
else if (var && !(var->flags & (MONO_INST_VOLATILE|MONO_INST_INDIRECT)))
- r2 = MONO_VARINFO (cfg, var->inst_c0)->cpstate;
- }
- else {
- r2 = 0;
+ rs [i] = MONO_VARINFO (cfg, var->inst_c0)->cpstate;
+ if (rs [i] != 1)
+ const_args = FALSE;
}
c0 = NULL;
- if ((spec [MONO_INST_SRC1] != ' ') && (spec [MONO_INST_SRC2] != ' ')) {
- /* Binop */
- const_args = (r1 == 1) && (r2 == 1);
- }
- else if (spec [MONO_INST_SRC1] != ' ') {
- /* Unop */
- const_args = (r1 == 1);
- }
- if (const_args) {
+ if (num_sregs > 0 && const_args) {
+ g_assert (num_sregs <= 2);
if ((spec [MONO_INST_DEST] != ' ') && carray [ins->dreg]) {
// Cached value
*res = carray [ins->dreg];
return 1;
}
- c0 = mono_constant_fold_ins (cfg, ins, arg0, arg1, FALSE);
+ c0 = mono_constant_fold_ins (cfg, ins, args [0], args [1], FALSE);
if (c0) {
if (G_UNLIKELY (cfg->verbose_level > 1)) {
printf ("\t cfold -> ");
return 2;
}
- if ((spec [MONO_INST_SRC1] != ' ') && (spec [MONO_INST_SRC2] != ' ')) {
- /* Binop */
- if ((r1 == 2) || (r2 == 2))
- return 2;
- else
- return 0;
- }
- else if (spec [MONO_INST_SRC1] != ' ') {
- /* Unop */
- if (r1 == 2)
+ if (num_sregs == 0)
+ return 2;
+ for (i = 0; i < num_sregs; ++i) {
+ if (rs [i] == 2)
return 2;
- else
- return 0;
}
- else
- return 2;
+ return 0;
}
static inline void
{
const char *spec = INS_INFO (ins->opcode);
int opcode2;
+ int num_sregs = mono_inst_get_num_src_registers (ins);
if ((ins->opcode != OP_NOP) && (ins->dreg != -1) && !MONO_IS_STORE_MEMBASE (ins)) {
if (carray [ins->dreg] && (spec [MONO_INST_DEST] == 'i') && (ins->dreg >= MONO_MAX_IREGS)) {
g_assert (carray [ins->dreg]->opcode == OP_ICONST);
ins->opcode = OP_ICONST;
ins->inst_c0 = carray [ins->dreg]->inst_c0;
- ins->sreg1 = ins->sreg2 = -1;
- }
- else if ((spec [MONO_INST_SRC2] != ' ') && carray [ins->sreg2]) {
+ MONO_INST_NULLIFY_SREGS (ins);
+ } else if (num_sregs == 2 && carray [ins->sreg2]) {
/* Perform op->op_imm conversion */
opcode2 = mono_op_to_op_imm (ins->opcode);
if (opcode2 != -1) {
if ((opcode2 == OP_VOIDCALL) || (opcode2 == OP_CALL) || (opcode2 == OP_LCALL) || (opcode2 == OP_FCALL))
((MonoCallInst*)ins)->fptr = (gpointer)ins->inst_imm;
}
+ } else {
+ /* FIXME: Handle 3 op insns */
}
if (MONO_IS_JUMP_TABLE (ins)) {
info->cpstate = 2;
}
+ for (bb = cfg->bb_entry->next_bb; bb; bb = bb->next_bb) {
+ /*
+ * FIXME: This should be bb->flags & BB_FLAG_EXCEPTION_HANDLER, but
+ * that would still allow unreachable try's to be removed.
+ */
+ if (bb->region)
+ add_cprop_bb (cfg, bb, &bblock_list);
+ }
+
cvars = NULL;
while (bblock_list) {
g_assert (bb->flags & BB_REACHABLE);
- if (bb->out_count == 1) {
- if (!(bb->out_bb [0]->flags & BB_REACHABLE)) {
- bb->out_bb [0]->flags |= BB_REACHABLE;
- bblock_list = g_list_prepend (bblock_list, bb->out_bb [0]);
- }
+ /*
+ * Some bblocks are linked to 2 others even through they fall through to the
+ * next bblock.
+ */
+ if (!(bb->last_ins && MONO_IS_BRANCH_OP (bb->last_ins))) {
+ for (i = 0; i < bb->out_count; ++i)
+ add_cprop_bb (cfg, bb->out_bb [i], &bblock_list);
}
if (cfg->verbose_level > 1)
projects / mono.git / blobdiff