#define BITS_PER_CHUNK MONO_BITSET_BITS_PER_CHUNK
+#define BB_ID_SHIFT 18
+
/*
* The liveness2 pass can't handle long vars on 32 bit platforms because the component
* vars have the same 'idx'.
MonoInst *ins;
int sreg, inst_num;
MonoMethodVar *vars = cfg->vars;
- guint32 abs_pos = (bb->dfn << 16);
+ guint32 abs_pos = (bb->dfn << BB_ID_SHIFT);
/* 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) {
for (i = 0; i < cfg->num_bblocks; ++i) {
MonoBasicBlock *bb = cfg->bblocks [i];
guint32 max;
- guint32 abs_pos = (bb->dfn << 16);
+ guint32 abs_pos = (bb->dfn << BB_ID_SHIFT);
MonoMethodVar *vars = cfg->vars;
if (!bb->live_out_set)
if (bits_in & 1)
update_live_range (&vars [k], abs_pos + 0);
if (bits_out & 1)
- update_live_range (&vars [k], abs_pos + 0xffff);
+ update_live_range (&vars [k], abs_pos + ((1 << BB_ID_SHIFT) - 1));
bits_in >>= 1;
bits_out >>= 1;
k ++;
//printf ("DEAD: "); mono_print_ins (ins);
if (cfg->disable_initlocals_opt_refs && var->type == STACK_OBJ)
continue;
- if ((ins->opcode == OP_ICONST) || (ins->opcode == OP_I8CONST) || (ins->opcode == OP_R8CONST)) {
+ if ((ins->opcode == OP_ICONST) || (ins->opcode == OP_I8CONST) || (ins->opcode == OP_R8CONST) || (ins->opcode == OP_R4CONST)) {
NULLIFY_INS (ins);
MONO_VARINFO (cfg, var->inst_c0)->spill_costs -= 1;
/*
if (disabled)
return;
+ if (cfg->num_bblocks >= (1 << (32 - BB_ID_SHIFT)))
+ /* Ranges would overflow */
+ return;
+
+ for (bnum = cfg->num_bblocks - 1; bnum >= 0; --bnum) {
+ MonoBasicBlock *bb = cfg->bblocks [bnum];
+ MonoInst *ins;
+
+ nins = 0;
+ for (nins = 0, ins = bb->code; ins; ins = ins->next, ++nins)
+ nins ++;
+
+ if (nins >= ((1 << BB_ID_SHIFT) - 1))
+ /* Ranges would overflow */
+ return;
+ }
+
LIVENESS_DEBUG (printf ("LIVENESS 2 %s\n", mono_method_full_name (cfg->method, TRUE)));
/*
MonoBasicBlock *bb = cfg->bblocks [bnum];
MonoInst *ins;
- block_from = (bb->dfn << 16) + 1; /* so pos > 0 */
+ block_from = (bb->dfn << BB_ID_SHIFT) + 1; /* so pos > 0 */
if (bnum < cfg->num_bblocks - 1)
/* Beginning of the next bblock */
- block_to = (cfg->bblocks [bnum + 1]->dfn << 16) + 1;
+ block_to = (cfg->bblocks [bnum + 1]->dfn << BB_ID_SHIFT) + 1;
else
- block_to = (bb->dfn << 16) + 0xffff;
+ block_to = (bb->dfn << BB_ID_SHIFT) + ((1 << BB_ID_SHIFT) - 1);
LIVENESS_DEBUG (printf ("LIVENESS BLOCK BB%d:\n", bb->block_num));