X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Favr%2Fralloc.c;h=706ae3cefffb6905e65da6b653189803a4996782;hb=b0528af48546cdfe3f2be3c126732eaff8933fe2;hp=074e374daa202de7a65c4fd2edffa59d2a88edd0;hpb=ef6c54dcfb7e493adac6af8e9904df3c1a8b949b;p=fw%2Fsdcc

diff --git a/src/avr/ralloc.c b/src/avr/ralloc.c
index 074e374d..706ae3ce 100644
--- a/src/avr/ralloc.c
+++ b/src/avr/ralloc.c
@@ -692,7 +692,7 @@ leastUsedLR (set * sset)
 
 	}
 
-	setToNull ((void **) &sset);
+	setToNull ((void *) &sset);
 	sym->blockSpil = 0;
 	return sym;
 }
@@ -1163,6 +1163,7 @@ deassignLRs (iCode * ic, eBBlock * ebp)
 			    (result = OP_SYMBOL (IC_RESULT (ic))) &&	/* has a result */
 			    result->liveTo > ic->seq &&	/* and will live beyond this */
 			    result->liveTo <= ebp->lSeq &&	/* does not go beyond this block */
+			    result->liveFrom == ic->seq &&    /* does not start before here */
 			    result->regType == sym->regType &&	/* same register types */
 			    result->nRegs &&	/* which needs registers */
 			    !result->isspilt &&	/* and does not already have them */
@@ -1393,6 +1394,17 @@ serialRegAssign (eBBlock ** ebbs, int count)
 					continue;
 				}
 
+				/* If the live range preceeds the point of definition 
+				   then ideally we must take into account registers that 
+				   have been allocated after sym->liveFrom but freed
+				   before ic->seq. This is complicated, so spill this
+				   symbol instead and let fillGaps handle the allocation. */
+				if (sym->liveFrom < ic->seq)
+				{
+					spillThis (sym);
+					continue;		      
+				}
+
 				/* if it has a spillocation & is used less than
 				   all other live ranges then spill this */
 				if (willCS) {
@@ -2230,6 +2242,10 @@ avr_assignRegisters (eBBlock ** ebbs, int count)
 	for (i = 0; i < count; i++)
 		packRegisters (ebbs[i]);
 
+	/* liveranges probably changed by register packing
+	   so we compute them again */
+	recomputeLiveRanges (ebbs, count);
+
 	if (options.dump_pack)
 		dumpEbbsToFileExt (DUMP_PACK, ebbs, count);
 
@@ -2276,8 +2292,8 @@ avr_assignRegisters (eBBlock ** ebbs, int count)
 	/* free up any _G.stackSpil locations allocated */
 	applyToSet (_G.stackSpil, deallocStackSpil);
 	_G.slocNum = 0;
-	setToNull ((void **) &_G.stackSpil);
-	setToNull ((void **) &_G.spiltSet);
+	setToNull ((void *) &_G.stackSpil);
+	setToNull ((void *) &_G.spiltSet);
 	/* mark all registers as free */
 
 	return;