* Dietmar Maurer (dietmar@ximian.com)
*
* (C) 2002 Ximian, Inc.
+ * Copyright 2011 Xamarin, Inc (http://www.xamarin.com)
*/
+#include <config.h>
+
+#ifndef DISABLE_JIT
+
#include "mini.h"
#define SPILL_COST_INCREMENT (1 << (bb->nesting << 1))
{
MonoBasicBlock *bb;
GSList *visited = NULL;
+ MonoMethodHeader *header = cfg->header;
+ MonoExceptionClause *clause, *clause2;
+ int i, j;
+ gboolean *outer_try;
+
+ /*
+ * Determine which clauses are outer try clauses, i.e. they are not contained in any
+ * other non-try clause.
+ */
+ outer_try = mono_mempool_alloc0 (cfg->mempool, sizeof (gboolean) * header->num_clauses);
+ for (i = 0; i < header->num_clauses; ++i)
+ outer_try [i] = TRUE;
+ /* Iterate over the clauses backward, so outer clauses come first */
+ /* This avoids doing an O(2) search, since we can determine when inner clauses end */
+ for (i = header->num_clauses - 1; i >= 0; --i) {
+ clause = &header->clauses [i];
+
+ if (clause->flags != 0) {
+ outer_try [i] = TRUE;
+ /* Iterate over inner clauses */
+ for (j = i - 1; j >= 0; --j) {
+ clause2 = &header->clauses [j];
+
+ if (clause2->flags == 0 && MONO_OFFSET_IN_HANDLER (clause, clause2->try_offset)) {
+ outer_try [j] = FALSE;
+ break;
+ }
+ if (clause2->try_offset < clause->try_offset)
+ /* End of inner clauses */
+ break;
+ }
+ }
+ }
/*
* Variables in exception handler register cannot be allocated to registers
*/
for (bb = cfg->bb_entry; bb; bb = bb->next_bb) {
- if (bb->region == -1 || MONO_BBLOCK_IS_IN_REGION (bb, MONO_REGION_TRY))
+ if (bb->region == -1)
continue;
+ if (MONO_BBLOCK_IS_IN_REGION (bb, MONO_REGION_TRY) && outer_try [MONO_REGION_CLAUSE_INDEX (bb->region)])
+ continue;
+
+ if (cfg->verbose_level > 2)
+ printf ("pessimize variables in bb %d.\n", bb->block_num);
+
visit_bb (cfg, bb, &visited);
}
g_slist_free (visited);
MonoMethodVar *vars = cfg->vars;
guint32 abs_pos = (bb->dfn << 16);
- for (inst_num = 0, ins = bb->code; ins; ins = ins->next, inst_num += 2) {
+ /* Start inst_num from > 0, so last_use.abs_pos is only 0 for dead variables */
+ for (inst_num = 2, ins = bb->code; ins; ins = ins->next, inst_num += 2) {
const char *spec = INS_INFO (ins->opcode);
int num_sregs, i;
int sregs [MONO_MAX_SRC_REGS];
for (i = 0; i < cfg->num_bblocks; ++i) {
MonoBasicBlock *bb = cfg->bblocks [i];
- guint32 rem, max;
+ guint32 max;
guint32 abs_pos = (bb->dfn << 16);
MonoMethodVar *vars = cfg->vars;
if (!bb->live_out_set)
continue;
- rem = max_vars % BITS_PER_CHUNK;
max = ((max_vars + (BITS_PER_CHUNK -1)) / BITS_PER_CHUNK);
for (j = 0; j < max; ++j) {
gsize bits_in;
static void
mono_analyze_liveness2 (MonoCompile *cfg)
{
- int bnum, idx, i, j, nins, rem, max, max_vars, block_from, block_to, pos, reverse_len;
+ int bnum, idx, i, j, nins, max, max_vars, block_from, block_to, pos, reverse_len;
gint32 *last_use;
static guint32 disabled = -1;
MonoInst **reverse;
if (disabled == -1)
- disabled = getenv ("DISABLED") != NULL;
+ disabled = g_getenv ("DISABLED") != NULL;
if (disabled)
return;
/* For variables in bb->live_out, set last_use to block_to */
- rem = max_vars % BITS_PER_CHUNK;
max = ((max_vars + (BITS_PER_CHUNK -1)) / BITS_PER_CHUNK);
for (j = 0; j < max; ++j) {
gsize bits_out;
#endif
-#ifdef HAVE_SGEN_GC
-
#define ALIGN_TO(val,align) ((((guint64)val) + ((align) - 1)) & ~((align) - 1))
static inline void
-update_liveness_gc (MonoCompile *cfg, MonoInst *ins, gint32 *last_use, MonoMethodVar **vreg_to_varinfo, GSList **callsites)
+update_liveness_gc (MonoCompile *cfg, MonoBasicBlock *bb, MonoInst *ins, gint32 *last_use, MonoMethodVar **vreg_to_varinfo, GSList **callsites)
{
if (ins->opcode == OP_GC_LIVENESS_DEF || ins->opcode == OP_GC_LIVENESS_USE) {
int vreg = ins->inst_c1;
GCCallSite *callsite = mono_mempool_alloc0 (cfg->mempool, sizeof (GCCallSite));
int i;
+ LIVENESS_DEBUG (printf ("\t%x: ", ins->backend.pc_offset); mono_print_ins (ins));
+ LIVENESS_DEBUG (printf ("\t\tlive: "));
+
+ callsite->bb = bb;
callsite->liveness = mono_mempool_alloc0 (cfg->mempool, ALIGN_TO (cfg->num_varinfo, 8) / 8);
callsite->pc_offset = ins->backend.pc_offset;
for (i = 0; i < cfg->num_varinfo; ++i) {
- if (last_use [i] != 0)
+ if (last_use [i] != 0) {
+ LIVENESS_DEBUG (printf ("R%d", MONO_VARINFO (cfg, i)->vreg));
callsite->liveness [i / 8] |= (1 << (i % 8));
- }
+ }
+ }
+ LIVENESS_DEBUG (printf ("\n"));
*callsites = g_slist_prepend_mempool (cfg->mempool, *callsites, callsite);
}
}
void
mono_analyze_liveness_gc (MonoCompile *cfg)
{
- int idx, i, j, nins, rem, max, max_vars, block_from, block_to, pos, reverse_len;
+ int idx, i, j, nins, max, max_vars, block_from, block_to, pos, reverse_len;
gint32 *last_use;
MonoInst **reverse;
MonoMethodVar **vreg_to_varinfo = NULL;
/* For variables in bb->live_out, set last_use to block_to */
- rem = max_vars % BITS_PER_CHUNK;
max = ((max_vars + (BITS_PER_CHUNK -1)) / BITS_PER_CHUNK);
for (j = 0; j < max; ++j) {
gsize bits_out;
for (i = nins - 1; i >= 0; --i) {
MonoInst *ins = (MonoInst*)reverse [i];
- update_liveness_gc (cfg, ins, last_use, vreg_to_varinfo, &callsites);
+ update_liveness_gc (cfg, bb, ins, last_use, vreg_to_varinfo, &callsites);
}
/* The callsites should already be sorted by pc offset because we added them backwards */
bb->gc_callsites = callsites;
g_free (vreg_to_varinfo);
}
-#endif
+#endif /* DISABLE_JIT */