* Dietmar Maurer (dietmar@ximian.com)
*
* (C) 2003 Ximian, Inc.
+ * Copyright 2011 Xamarin, Inc (http://www.xamarin.com)
*/
#include <config.h>
#include <string.h>
}
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)
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, j;
+ int num_sregs;
int sregs [MONO_MAX_SRC_REGS];
if (ins->opcode == OP_NOP)
}
num_sregs = mono_inst_get_src_registers (ins, sregs);
- for (j = 0; j < num_sregs; ++j) {
+ for (i = 0; i < num_sregs; ++i) {
MonoInst *var = get_vreg_to_inst (cfg, sregs [i]);
if (var) {
/* Rewrite all uses of var to be uses of var2 */
int dreg = var->dreg;
int sreg1 = var2->dreg;
- const char *spec;
l = info->uses;
while (l) {
int num_sregs;
int sregs [MONO_MAX_SRC_REGS];
- spec = INS_INFO (ins->opcode);
-
num_sregs = mono_inst_get_src_registers (ins, sregs);
for (i = 0; i < num_sregs; ++i) {
if (sregs [i] == dreg)
/* Unlink target bblocks */
for (i = 0; i < table->table_size; ++i) {
- if (i != idx) {
+ if (table->table [i] != table->table [idx]) {
remove_bb_from_phis (cfg, bb, table->table [i]);
mono_unlink_bblock (cfg, bb, table->table [i]);
}
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)