X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Flinear-scan.c;h=287022daad738c08857273cf5d686eb060edc1eb;hb=3fc81be928a070d9aee16fba5f36e144f42d3c91;hp=df681a68ac1bfe2210099fb04e1d977c4aa78bc3;hpb=8ef4e4703172fd32ada3f74b22df5203b4683493;p=mono.git

diff --git a/mono/mini/linear-scan.c b/mono/mini/linear-scan.c
index df681a68ac1..287022daad7 100644
--- a/mono/mini/linear-scan.c
+++ b/mono/mini/linear-scan.c
@@ -23,7 +23,7 @@ mono_varlist_insert_sorted (MonoCompile *cfg, GList *list, MonoMethodVar *mv, in
 		return g_list_prepend (NULL, mv);
 
 	for (l = list; l; l = l->next) {
-		MonoMethodVar *v1 = l->data;
+		MonoMethodVar *v1 = (MonoMethodVar *)l->data;
 		
 		if (sort_type == 2) {
 			if (mv->spill_costs >= v1->spill_costs) {
@@ -80,10 +80,12 @@ mono_linear_scan (MonoCompile *cfg, GList *vars, GList *regs, regmask_t *used_ma
 	regmask_t used_regs = 0;
 	gboolean cost_driven;
 
- 	if (vars && (((MonoMethodVar*)vars->data)->interval != NULL)) {
- 		mono_linear_scan2 (cfg, vars, regs, used_mask);
- 		return;
- 	}
+	if (!cfg->disable_reuse_registers && vars && (((MonoMethodVar*)vars->data)->interval != NULL)) {
+		mono_linear_scan2 (cfg, vars, regs, used_mask);
+		g_list_free (regs);
+		g_list_free (vars);
+		return;
+	}
 
 	cost_driven = TRUE;
 
@@ -108,7 +110,7 @@ mono_linear_scan (MonoCompile *cfg, GList *vars, GList *regs, regmask_t *used_ma
 
 	/* linear scan */
 	for (l = vars; l; l = l->next) {
-		vmv = l->data;
+		vmv = (MonoMethodVar *)l->data;
 
 #ifdef DEBUG_LSCAN
 		printf ("START  %2d %08x %08x\n",  vmv->idx, vmv->range.first_use.abs_pos, 
@@ -199,7 +201,7 @@ mono_linear_scan (MonoCompile *cfg, GList *vars, GList *regs, regmask_t *used_ma
 
 	n_regvars = 0;
 	for (l = vars; l; l = l->next) {
-		vmv = l->data;
+		vmv = (MonoMethodVar *)l->data;
 		
 		if (vmv->reg >= 0)  {
 			if ((gains [vmv->reg] > mono_arch_regalloc_cost (cfg, vmv)) && (cfg->varinfo [vmv->idx]->opcode != OP_REGVAR)) {
@@ -222,12 +224,12 @@ mono_linear_scan (MonoCompile *cfg, GList *vars, GList *regs, regmask_t *used_ma
 		}
 	}
 
-	mono_jit_stats.regvars += n_regvars;
+	cfg->stat_n_regvars = n_regvars;
 
 	/* Compute used regs */
 	used_regs = 0;
 	for (l = vars; l; l = l->next) {
-		vmv = l->data;
+		vmv = (MonoMethodVar *)l->data;
 		
 		if (vmv->reg >= 0)
 			used_regs |= 1LL << vmv->reg;
@@ -288,7 +290,7 @@ mono_linear_scan2 (MonoCompile *cfg, GList *vars, GList *regs, regmask_t *used_m
 	int n_regs, n_regvars, i;
 
 	for (l = vars; l; l = l->next) {
-		vmv = l->data;
+		vmv = (MonoMethodVar *)l->data;
 		LSCAN_DEBUG (printf ("VAR R%d %08x %08x C%d\n", cfg->varinfo [vmv->idx]->dreg, vmv->range.first_use.abs_pos, 
 							 vmv->range.last_use.abs_pos, vmv->spill_costs));
 	}
@@ -302,7 +304,7 @@ mono_linear_scan2 (MonoCompile *cfg, GList *vars, GList *regs, regmask_t *used_m
 	inactive = NULL;
 
 	while (unhandled) {
-		MonoMethodVar *current = unhandled->data;
+		MonoMethodVar *current = (MonoMethodVar *)unhandled->data;
 		int pos, reg, max_free_pos;
 		gboolean changed;
 
@@ -470,7 +472,7 @@ mono_linear_scan2 (MonoCompile *cfg, GList *vars, GList *regs, regmask_t *used_m
 	/* Do the actual register assignment */
 	n_regvars = 0;
 	for (l = vars; l; l = l->next) {
-		vmv = l->data;
+		vmv = (MonoMethodVar *)l->data;
 
 		if (vmv->reg >= 0) {
 			int reg_index = vmv->reg;
@@ -493,12 +495,12 @@ mono_linear_scan2 (MonoCompile *cfg, GList *vars, GList *regs, regmask_t *used_m
 		}
 	}
 
-	mono_jit_stats.regvars += n_regvars;
+	cfg->stat_n_regvars = n_regvars;
 
 	/* Compute used regs */
 	used_regs = 0;
 	for (l = vars; l; l = l->next) {
-		vmv = l->data;
+		vmv = (MonoMethodVar *)l->data;
 		
 		if (vmv->reg >= 0)
 			used_regs |= 1LL << vmv->reg;