[commit][3394] Fix the syntax error due to edit droppings left at the end of a method. - Vm-dev

30 Jun 2015

Revision: 3394
Author:   eliot
Date:     2015-06-29 17:54:16 -0700 (Mon, 29 Jun 2015)
Log Message:
-----------
Fix the syntax error due to edit droppings left at the end of a method.
Modified Paths:
--------------
    branches/Cog/nsspursrc/vm/cogit.h
    branches/Cog/nsspursrc/vm/cointerp.c
    branches/Cog/nsspursrc/vm/cointerp.h
    branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
    branches/Cog/nsspurstack64src/vm/gcc3x-interp.c
    branches/Cog/nsspurstack64src/vm/interp.c
    branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c
    branches/Cog/nsspurstacksrc/vm/interp.c
    branches/Cog/spursistasrc/vm/cogit.h
    branches/Cog/spursistasrc/vm/cointerp.c
    branches/Cog/spursistasrc/vm/cointerp.h
    branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
    branches/Cog/spursrc/vm/cogit.h
    branches/Cog/spursrc/vm/cointerp.c
    branches/Cog/spursrc/vm/cointerp.h
    branches/Cog/spursrc/vm/gcc3x-cointerp.c
    branches/Cog/spurstack64src/vm/gcc3x-interp.c
    branches/Cog/spurstack64src/vm/interp.c
    branches/Cog/spurstacksrc/vm/gcc3x-interp.c
    branches/Cog/spurstacksrc/vm/interp.c
    branches/Cog/src/vm/cogit.h
Property Changed:
----------------
    branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nsspursrc/vm/cogit.h
===================================================================

--- branches/Cog/nsspursrc/vm/cogit.h	2015-06-29 23:59:01 UTC (rev 3393)
+++ branches/Cog/nsspursrc/vm/cogit.h	2015-06-30 00:54:16 UTC (rev 3394)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+	CCodeGenerator VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
  */
Modified: branches/Cog/nsspursrc/vm/cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.c	2015-06-29 23:59:01 UTC (rev 3393)
+++ branches/Cog/nsspursrc/vm/cointerp.c	2015-06-30 00:54:16 UTC (rev 3394)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
    from
-	CoInterpreter VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+	CoInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
@@ -2410,7 +2410,7 @@
 /*560*/	-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
    };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1401";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1402";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
@@ -51962,25 +51962,25 @@
    		ammount = headroom;
    	}
    }
-	return (addSegmentOfSize(ammount)
-		? totalBytesInSegments(maxOldSpaceSize(			/* begin assimilateNewSegment: */
-			if ((((segInfo->segSize)) + ((segInfo->segStart))) >= GIV(endOfMemory)) {
-				GIV(freeOldSpaceStart) = (GIV(endOfMemory) = (((segInfo->segSize)) + ((segInfo->segStart))) - (2 * BaseHeaderSize));
-			}
-			sqMakeMemoryNotExecutableFromTo((segInfo->segStart), ((segInfo->segSize)) + ((segInfo->segStart)));
-			/* begin addFreeChunkWithBytes:at: */
-			bytes = ((segInfo->segSize)) - (2 * BaseHeaderSize);
-			address = (segInfo->segStart);
-			freeChunkWithBytesat(bytes, address);
-			GIV(totalFreeOldSpace) += bytes;
-			assert((addressAfter(objectStartingAt((segInfo->segStart)))) == ((segLimit(segInfo)) - (bridgeSize())));
-			/* begin checkFreeSpace */
-			assert(bitsSetInFreeSpaceMaskForAllFreeLists());
-			assert(GIV(totalFreeOldSpace) == (totalFreeListBytes()));
-			checkSegments();
-			(segInfo->segSize);
-))
-		: 0);
+	return ((segInfo = addSegmentOfSize(ammount)),
+	(!(segInfo == null)
+			? (/* begin assimilateNewSegment: */
+				((((segInfo->segSize)) + ((segInfo->segStart))) >= GIV(endOfMemory)
+						? (GIV(freeOldSpaceStart) = (GIV(endOfMemory) = (((segInfo->segSize)) + ((segInfo->segStart))) - (2 * BaseHeaderSize)))
+						: 0),
+				sqMakeMemoryNotExecutableFromTo((segInfo->segStart), ((segInfo->segSize)) + ((segInfo->segStart))),
+				/* begin addFreeChunkWithBytes:at: */
+				(bytes = ((segInfo->segSize)) - (2 * BaseHeaderSize)),
+				(address = (segInfo->segStart)),
+				freeChunkWithBytesat(bytes, address),
+				(GIV(totalFreeOldSpace) += bytes),
+				assert((addressAfter(objectStartingAt((segInfo->segStart)))) == ((segLimit(segInfo)) - (bridgeSize()))),
+				/* begin checkFreeSpace */
+				assert(bitsSetInFreeSpaceMaskForAllFreeLists()),
+				assert(GIV(totalFreeOldSpace) == (totalFreeListBytes())),
+				checkSegments(),
+				(segInfo->segSize))
+			: 0));
 }
@@ -60603,7 +60603,7 @@
     usqInt prevFree;
     usqInt prevFreeChunk;
     usqInt prevPrevFree;
-    usqInt prevPrevFreeChunk;
+    sqInt prevPrevFreeChunk;
     sqInt slotBytes;
     sqInt slotBytes1;
     usqInt there;
@@ -65136,7 +65136,7 @@
 bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
 {
     usqInt bridgeSpan;
-    sqInt clifton;
+    usqInt clifton;
     usqInt segEnd;
segEnd = ((aSegment->segSize)) + ((aSegment->segStart));
@@ -65697,7 +65697,7 @@
     usqLong firstSavedBridgeWord;
     sqInt nWritten;
     usqInt pier1;
-    sqInt pier2;
+    usqInt pier2;
     usqLong secondSavedBridgeWord;
pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);
Modified: branches/Cog/nsspursrc/vm/cointerp.h
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.h	2015-06-29 23:59:01 UTC (rev 3393)
+++ branches/Cog/nsspursrc/vm/cointerp.h	2015-06-30 00:54:16 UTC (rev 3394)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
  */
Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c	2015-06-29 23:59:01 UTC (rev 3393)
+++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c	2015-06-30 00:54:16 UTC (rev 3394)
@@ -2,11 +2,11 @@
/* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
    from
-	CoInterpreter VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+	CoInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
@@ -2413,7 +2413,7 @@
 /*560*/	-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
    };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1401";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1402";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
@@ -51971,25 +51971,25 @@
    		ammount = headroom;
    	}
    }
-	return (addSegmentOfSize(ammount)
-		? totalBytesInSegments(maxOldSpaceSize(			/* begin assimilateNewSegment: */
-			if ((((segInfo->segSize)) + ((segInfo->segStart))) >= GIV(endOfMemory)) {
-				GIV(freeOldSpaceStart) = (GIV(endOfMemory) = (((segInfo->segSize)) + ((segInfo->segStart))) - (2 * BaseHeaderSize));
-			}
-			sqMakeMemoryNotExecutableFromTo((segInfo->segStart), ((segInfo->segSize)) + ((segInfo->segStart)));
-			/* begin addFreeChunkWithBytes:at: */
-			bytes = ((segInfo->segSize)) - (2 * BaseHeaderSize);
-			address = (segInfo->segStart);
-			freeChunkWithBytesat(bytes, address);
-			GIV(totalFreeOldSpace) += bytes;
-			assert((addressAfter(objectStartingAt((segInfo->segStart)))) == ((segLimit(segInfo)) - (bridgeSize())));
-			/* begin checkFreeSpace */
-			assert(bitsSetInFreeSpaceMaskForAllFreeLists());
-			assert(GIV(totalFreeOldSpace) == (totalFreeListBytes()));
-			checkSegments();
-			(segInfo->segSize);
-))
-		: 0);
+	return ((segInfo = addSegmentOfSize(ammount)),
+	(!(segInfo == null)
+			? (/* begin assimilateNewSegment: */
+				((((segInfo->segSize)) + ((segInfo->segStart))) >= GIV(endOfMemory)
+						? (GIV(freeOldSpaceStart) = (GIV(endOfMemory) = (((segInfo->segSize)) + ((segInfo->segStart))) - (2 * BaseHeaderSize)))
+						: 0),
+				sqMakeMemoryNotExecutableFromTo((segInfo->segStart), ((segInfo->segSize)) + ((segInfo->segStart))),
+				/* begin addFreeChunkWithBytes:at: */
+				(bytes = ((segInfo->segSize)) - (2 * BaseHeaderSize)),
+				(address = (segInfo->segStart)),
+				freeChunkWithBytesat(bytes, address),
+				(GIV(totalFreeOldSpace) += bytes),
+				assert((addressAfter(objectStartingAt((segInfo->segStart)))) == ((segLimit(segInfo)) - (bridgeSize()))),
+				/* begin checkFreeSpace */
+				assert(bitsSetInFreeSpaceMaskForAllFreeLists()),
+				assert(GIV(totalFreeOldSpace) == (totalFreeListBytes())),
+				checkSegments(),
+				(segInfo->segSize))
+			: 0));
 }
@@ -60612,7 +60612,7 @@
     usqInt prevFree;
     usqInt prevFreeChunk;
     usqInt prevPrevFree;
-    usqInt prevPrevFreeChunk;
+    sqInt prevPrevFreeChunk;
     sqInt slotBytes;
     sqInt slotBytes1;
     usqInt there;
@@ -65145,7 +65145,7 @@
 bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
 {
     usqInt bridgeSpan;
-    sqInt clifton;
+    usqInt clifton;
     usqInt segEnd;
segEnd = ((aSegment->segSize)) + ((aSegment->segStart));
@@ -65706,7 +65706,7 @@
     usqLong firstSavedBridgeWord;
     sqInt nWritten;
     usqInt pier1;
-    sqInt pier2;
+    usqInt pier2;
     usqLong secondSavedBridgeWord;
pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);
Modified: branches/Cog/nsspurstack64src/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/nsspurstack64src/vm/gcc3x-interp.c	2015-06-29 23:59:01 UTC (rev 3393)
+++ branches/Cog/nsspurstack64src/vm/gcc3x-interp.c	2015-06-30 00:54:16 UTC (rev 3394)
@@ -2,11 +2,11 @@
/* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
    from
-	StackInterpreter VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+	StackInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
@@ -2173,7 +2173,7 @@
    /* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1401";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1402";
 volatile int sendTrace;
 sqInt suppressHeartbeatFlag;
@@ -39577,24 +39577,24 @@
    		ammount = headroom;
    	}
    }
-	return (addSegmentOfSize(ammount)
-		? totalBytesInSegments(maxOldSpaceSize(			/* begin assimilateNewSegment: */
-			if ((((segInfo->segSize)) + ((segInfo->segStart))) >= GIV(endOfMemory)) {
-				GIV(freeOldSpaceStart) = (GIV(endOfMemory) = (((segInfo->segSize)) + ((segInfo->segStart))) - (2 * BaseHeaderSize));
-			}
-			/* begin addFreeChunkWithBytes:at: */
-			bytes = ((segInfo->segSize)) - (2 * BaseHeaderSize);
-			address = (segInfo->segStart);
-			freeChunkWithBytesat(bytes, address);
-			GIV(totalFreeOldSpace) += bytes;
-			assert((addressAfter(objectStartingAt((segInfo->segStart)))) == ((segLimit(segInfo)) - (bridgeSize())));
-			/* begin checkFreeSpace */
-			assert(bitsSetInFreeSpaceMaskForAllFreeLists());
-			assert(GIV(totalFreeOldSpace) == (totalFreeListBytes()));
-			checkSegments();
-			(segInfo->segSize);
-))
-		: 0);
+	return ((segInfo = addSegmentOfSize(ammount)),
+	(!(segInfo == null)
+			? (/* begin assimilateNewSegment: */
+				((((segInfo->segSize)) + ((segInfo->segStart))) >= GIV(endOfMemory)
+						? (GIV(freeOldSpaceStart) = (GIV(endOfMemory) = (((segInfo->segSize)) + ((segInfo->segStart))) - (2 * BaseHeaderSize)))
+						: 0),
+				/* begin addFreeChunkWithBytes:at: */
+				(bytes = ((segInfo->segSize)) - (2 * BaseHeaderSize)),
+				(address = (segInfo->segStart)),
+				freeChunkWithBytesat(bytes, address),
+				(GIV(totalFreeOldSpace) += bytes),
+				assert((addressAfter(objectStartingAt((segInfo->segStart)))) == ((segLimit(segInfo)) - (bridgeSize()))),
+				/* begin checkFreeSpace */
+				assert(bitsSetInFreeSpaceMaskForAllFreeLists()),
+				assert(GIV(totalFreeOldSpace) == (totalFreeListBytes())),
+				checkSegments(),
+				(segInfo->segSize))
+			: 0));
 }
Modified: branches/Cog/nsspurstack64src/vm/interp.c
===================================================================
--- branches/Cog/nsspurstack64src/vm/interp.c	2015-06-29 23:59:01 UTC (rev 3393)
+++ branches/Cog/nsspurstack64src/vm/interp.c	2015-06-30 00:54:16 UTC (rev 3394)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
    from
-	StackInterpreter VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+	StackInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
@@ -2170,7 +2170,7 @@
    /* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1401";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1402";
 volatile int sendTrace;
 sqInt suppressHeartbeatFlag;
@@ -39568,24 +39568,24 @@
    		ammount = headroom;
    	}
    }
-	return (addSegmentOfSize(ammount)
-		? totalBytesInSegments(maxOldSpaceSize(			/* begin assimilateNewSegment: */
-			if ((((segInfo->segSize)) + ((segInfo->segStart))) >= GIV(endOfMemory)) {
-				GIV(freeOldSpaceStart) = (GIV(endOfMemory) = (((segInfo->segSize)) + ((segInfo->segStart))) - (2 * BaseHeaderSize));
-			}
-			/* begin addFreeChunkWithBytes:at: */
-			bytes = ((segInfo->segSize)) - (2 * BaseHeaderSize);
-			address = (segInfo->segStart);
-			freeChunkWithBytesat(bytes, address);
-			GIV(totalFreeOldSpace) += bytes;
-			assert((addressAfter(objectStartingAt((segInfo->segStart)))) == ((segLimit(segInfo)) - (bridgeSize())));
-			/* begin checkFreeSpace */
-			assert(bitsSetInFreeSpaceMaskForAllFreeLists());
-			assert(GIV(totalFreeOldSpace) == (totalFreeListBytes()));
-			checkSegments();
-			(segInfo->segSize);
-))
-		: 0);
+	return ((segInfo = addSegmentOfSize(ammount)),
+	(!(segInfo == null)
+			? (/* begin assimilateNewSegment: */
+				((((segInfo->segSize)) + ((segInfo->segStart))) >= GIV(endOfMemory)
+						? (GIV(freeOldSpaceStart) = (GIV(endOfMemory) = (((segInfo->segSize)) + ((segInfo->segStart))) - (2 * BaseHeaderSize)))
+						: 0),
+				/* begin addFreeChunkWithBytes:at: */
+				(bytes = ((segInfo->segSize)) - (2 * BaseHeaderSize)),
+				(address = (segInfo->segStart)),
+				freeChunkWithBytesat(bytes, address),
+				(GIV(totalFreeOldSpace) += bytes),
+				assert((addressAfter(objectStartingAt((segInfo->segStart)))) == ((segLimit(segInfo)) - (bridgeSize()))),
+				/* begin checkFreeSpace */
+				assert(bitsSetInFreeSpaceMaskForAllFreeLists()),
+				assert(GIV(totalFreeOldSpace) == (totalFreeListBytes())),
+				checkSegments(),
+				(segInfo->segSize))
+			: 0));
 }
Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c	2015-06-29 23:59:01 UTC (rev 3393)
+++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c	2015-06-30 00:54:16 UTC (rev 3394)
@@ -2,11 +2,11 @@
/* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
    from
-	StackInterpreter VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+	StackInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
@@ -2144,7 +2144,7 @@
    /* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1401";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1402";
 volatile int sendTrace;
 sqInt suppressHeartbeatFlag;
@@ -36802,24 +36802,24 @@
    		ammount = headroom;
    	}
    }
-	return (addSegmentOfSize(ammount)
-		? totalBytesInSegments(maxOldSpaceSize(			/* begin assimilateNewSegment: */
-			if ((((segInfo->segSize)) + ((segInfo->segStart))) >= GIV(endOfMemory)) {
-				GIV(freeOldSpaceStart) = (GIV(endOfMemory) = (((segInfo->segSize)) + ((segInfo->segStart))) - (2 * BaseHeaderSize));
-			}
-			/* begin addFreeChunkWithBytes:at: */
-			bytes = ((segInfo->segSize)) - (2 * BaseHeaderSize);
-			address = (segInfo->segStart);
-			freeChunkWithBytesat(bytes, address);
-			GIV(totalFreeOldSpace) += bytes;
-			assert((addressAfter(objectStartingAt((segInfo->segStart)))) == ((segLimit(segInfo)) - (bridgeSize())));
-			/* begin checkFreeSpace */
-			assert(bitsSetInFreeSpaceMaskForAllFreeLists());
-			assert(GIV(totalFreeOldSpace) == (totalFreeListBytes()));
-			checkSegments();
-			(segInfo->segSize);
-))
-		: 0);
+	return ((segInfo = addSegmentOfSize(ammount)),
+	(!(segInfo == null)
+			? (/* begin assimilateNewSegment: */
+				((((segInfo->segSize)) + ((segInfo->segStart))) >= GIV(endOfMemory)
+						? (GIV(freeOldSpaceStart) = (GIV(endOfMemory) = (((segInfo->segSize)) + ((segInfo->segStart))) - (2 * BaseHeaderSize)))
+						: 0),
+				/* begin addFreeChunkWithBytes:at: */
+				(bytes = ((segInfo->segSize)) - (2 * BaseHeaderSize)),
+				(address = (segInfo->segStart)),
+				freeChunkWithBytesat(bytes, address),
+				(GIV(totalFreeOldSpace) += bytes),
+				assert((addressAfter(objectStartingAt((segInfo->segStart)))) == ((segLimit(segInfo)) - (bridgeSize()))),
+				/* begin checkFreeSpace */
+				assert(bitsSetInFreeSpaceMaskForAllFreeLists()),
+				assert(GIV(totalFreeOldSpace) == (totalFreeListBytes())),
+				checkSegments(),
+				(segInfo->segSize))
+			: 0));
 }
Modified: branches/Cog/nsspurstacksrc/vm/interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/interp.c	2015-06-29 23:59:01 UTC (rev 3393)
+++ branches/Cog/nsspurstacksrc/vm/interp.c	2015-06-30 00:54:16 UTC (rev 3394)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
    from
-	StackInterpreter VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+	StackInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
@@ -2141,7 +2141,7 @@
    /* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1401";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1402";
 volatile int sendTrace;
 sqInt suppressHeartbeatFlag;
@@ -36793,24 +36793,24 @@
    		ammount = headroom;
    	}
    }
-	return (addSegmentOfSize(ammount)
-		? totalBytesInSegments(maxOldSpaceSize(			/* begin assimilateNewSegment: */
-			if ((((segInfo->segSize)) + ((segInfo->segStart))) >= GIV(endOfMemory)) {
-				GIV(freeOldSpaceStart) = (GIV(endOfMemory) = (((segInfo->segSize)) + ((segInfo->segStart))) - (2 * BaseHeaderSize));
-			}
-			/* begin addFreeChunkWithBytes:at: */
-			bytes = ((segInfo->segSize)) - (2 * BaseHeaderSize);
-			address = (segInfo->segStart);
-			freeChunkWithBytesat(bytes, address);
-			GIV(totalFreeOldSpace) += bytes;
-			assert((addressAfter(objectStartingAt((segInfo->segStart)))) == ((segLimit(segInfo)) - (bridgeSize())));
-			/* begin checkFreeSpace */
-			assert(bitsSetInFreeSpaceMaskForAllFreeLists());
-			assert(GIV(totalFreeOldSpace) == (totalFreeListBytes()));
-			checkSegments();
-			(segInfo->segSize);
-))
-		: 0);
+	return ((segInfo = addSegmentOfSize(ammount)),
+	(!(segInfo == null)
+			? (/* begin assimilateNewSegment: */
+				((((segInfo->segSize)) + ((segInfo->segStart))) >= GIV(endOfMemory)
+						? (GIV(freeOldSpaceStart) = (GIV(endOfMemory) = (((segInfo->segSize)) + ((segInfo->segStart))) - (2 * BaseHeaderSize)))
+						: 0),
+				/* begin addFreeChunkWithBytes:at: */
+				(bytes = ((segInfo->segSize)) - (2 * BaseHeaderSize)),
+				(address = (segInfo->segStart)),
+				freeChunkWithBytesat(bytes, address),
+				(GIV(totalFreeOldSpace) += bytes),
+				assert((addressAfter(objectStartingAt((segInfo->segStart)))) == ((segLimit(segInfo)) - (bridgeSize()))),
+				/* begin checkFreeSpace */
+				assert(bitsSetInFreeSpaceMaskForAllFreeLists()),
+				assert(GIV(totalFreeOldSpace) == (totalFreeListBytes())),
+				checkSegments(),
+				(segInfo->segSize))
+			: 0));
 }
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
   - Mon Jun 29 16:53:36 PDT 2015
   + Mon Jun 29 17:53:25 PDT 2015
Modified: branches/Cog/spursistasrc/vm/cogit.h
===================================================================
--- branches/Cog/spursistasrc/vm/cogit.h	2015-06-29 23:59:01 UTC (rev 3393)
+++ branches/Cog/spursistasrc/vm/cogit.h	2015-06-30 00:54:16 UTC (rev 3394)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+	CCodeGenerator VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
  */
Modified: branches/Cog/spursistasrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.c	2015-06-29 23:59:01 UTC (rev 3393)
+++ branches/Cog/spursistasrc/vm/cointerp.c	2015-06-30 00:54:16 UTC (rev 3394)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
    from
-	CoInterpreter VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+	CoInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
@@ -1194,7 +1194,7 @@
 static sqInt storeImageSegmentIntooutPointersroots(sqInt segmentWordArray, sqInt outPointerArray, sqInt arrayOfRoots) NoDbgRegParms;
 extern sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
 extern sqInt storePointerofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
-extern usqInt stringForCString(const char *aCString);
+extern sqInt stringForCString(const char *aCString);
 static sqInt sufficientSpaceAfterGC(sqInt numBytes) NoDbgRegParms;
 static sqInt swizzleObjStackAt(sqInt objStackRootIndex) NoDbgRegParms;
 extern void tenuringIncrementalGC(void);
@@ -2385,7 +2385,7 @@
 /*560*/	-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
    };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1401]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1402]";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
@@ -30849,7 +30849,7 @@
     usqInt newObj;
     usqInt numBytes;
     sqInt numSlots;
-    usqInt s;
+    sqInt s;
     char *sp;
     sqInt sz;
@@ -36526,7 +36526,7 @@
     sqInt err;
     sqInt hash;
     sqInt instSpec;
-    usqInt newObj;
+    sqInt newObj;
     usqInt newObj1;
     usqInt numBytes;
     sqInt numSlots;
@@ -36644,7 +36644,7 @@
     sqInt i;
     usqInt instSpec;
     sqInt literalCount;
-    usqInt newObj;
+    sqInt newObj;
     usqInt newObj1;
     usqInt numBytes;
     sqInt numSlots;
@@ -42542,7 +42542,7 @@
     sqInt fillValue;
     sqInt hash;
     usqInt instSpec;
-    usqInt newObj;
+    sqInt newObj;
     usqInt newObj1;
     usqInt numBytes;
     usqInt numSlots;
@@ -44674,7 +44674,7 @@
     sqInt entry;
     sqInt expectedIndex;
     sqInt expectedIndex1;
-    usqInt freeChunk;
+    sqInt freeChunk;
     sqInt i;
     sqInt i1;
     sqInt index;
@@ -44713,8 +44713,8 @@
     sqInt ptr1;
     sqInt ptr2;
     sqInt slotBytes;
-    usqInt smallObj;
-    usqInt start;
+    sqInt smallObj;
+    sqInt start;
classIndex = (long32At(aClass + 4)) & 0x3FFFFF;
    if (classIndex == 0) {
@@ -47655,7 +47655,7 @@
     sqInt fmt;
     sqInt hasYoung;
     sqInt i;
-    usqInt newObj;
+    sqInt newObj;
     usqInt newObj1;
     usqInt numBytes;
     usqInt numSlots;
@@ -50350,25 +50350,25 @@
    		ammount = headroom;
    	}
    }
-	return (addSegmentOfSize(ammount)
-		? totalBytesInSegments(maxOldSpaceSize(			/* begin assimilateNewSegment: */
-			if ((((segInfo->segSize)) + ((segInfo->segStart))) >= GIV(endOfMemory)) {
-				GIV(freeOldSpaceStart) = (GIV(endOfMemory) = (((segInfo->segSize)) + ((segInfo->segStart))) - (2 * BaseHeaderSize));
-			}
-			sqMakeMemoryNotExecutableFromTo((segInfo->segStart), ((segInfo->segSize)) + ((segInfo->segStart)));
-			/* begin addFreeChunkWithBytes:at: */
-			bytes = ((segInfo->segSize)) - (2 * BaseHeaderSize);
-			address = (segInfo->segStart);
-			freeChunkWithBytesat(bytes, address);
-			GIV(totalFreeOldSpace) += bytes;
-			assert((addressAfter(objectStartingAt((segInfo->segStart)))) == ((segLimit(segInfo)) - (bridgeSize())));
-			/* begin checkFreeSpace */
-			assert(bitsSetInFreeSpaceMaskForAllFreeLists());
-			assert(GIV(totalFreeOldSpace) == (totalFreeListBytes()));
-			checkSegments();
-			(segInfo->segSize);
-))
-		: 0);
+	return ((segInfo = addSegmentOfSize(ammount)),
+	(!(segInfo == null)
+			? (/* begin assimilateNewSegment: */
+				((((segInfo->segSize)) + ((segInfo->segStart))) >= GIV(endOfMemory)
+						? (GIV(freeOldSpaceStart) = (GIV(endOfMemory) = (((segInfo->segSize)) + ((segInfo->segStart))) - (2 * BaseHeaderSize)))
+						: 0),
+				sqMakeMemoryNotExecutableFromTo((segInfo->segStart), ((segInfo->segSize)) + ((segInfo->segStart))),
+				/* begin addFreeChunkWithBytes:at: */
+				(bytes = ((segInfo->segSize)) - (2 * BaseHeaderSize)),
+				(address = (segInfo->segStart)),
+				freeChunkWithBytesat(bytes, address),
+				(GIV(totalFreeOldSpace) += bytes),
+				assert((addressAfter(objectStartingAt((segInfo->segStart)))) == ((segLimit(segInfo)) - (bridgeSize()))),
+				/* begin checkFreeSpace */
+				assert(bitsSetInFreeSpaceMaskForAllFreeLists()),
+				assert(GIV(totalFreeOldSpace) == (totalFreeListBytes())),
+				checkSegments(),
+				(segInfo->segSize))
+			: 0));
 }
@@ -58991,7 +58991,7 @@
     usqInt prevFree;
     usqInt prevFreeChunk;
     usqInt prevPrevFree;
-    sqInt prevPrevFreeChunk;
+    usqInt prevPrevFreeChunk;
     sqInt slotBytes;
     sqInt slotBytes1;
     usqInt there;
@@ -62344,8 +62344,8 @@
     sqInt prevPrevObj;
     sqInt prevPrevObj1;
     sqInt ptr;
-    usqInt savedInHashes;
-    usqInt savedOutHashes;
+    sqInt savedInHashes;
+    sqInt savedOutHashes;
     sqInt segAddr;
     sqInt segStart;
     sqInt slotBytes;
@@ -62815,13 +62815,13 @@
    or nil if out of memory. */
/* SpurMemoryManager>>#stringForCString: */
-usqInt
+sqInt
 stringForCString(const char *aCString)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
     sqInt formatField;
     sqInt len;
     usqInt newObj;
-    usqInt newString;
+    sqInt newString;
     usqInt numBytes;
     sqInt numSlots;
@@ -63531,7 +63531,7 @@
 bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
 {
     usqInt bridgeSpan;
-    sqInt clifton;
+    usqInt clifton;
     usqInt segEnd;
segEnd = ((aSegment->segSize)) + ((aSegment->segStart));
@@ -63772,7 +63772,7 @@
     sqInt largeChild;
     sqInt newEndOfMemory;
     sqInt next;
-    sqInt node;
+    usqInt node;
     SpurSegmentInfo *seg;
     sqInt smallChild;
     sqInt treeNode;
@@ -63876,7 +63876,7 @@
 static sqInt
 readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
-    usqInt bridge;
+    sqInt bridge;
     usqInt bridgehead;
     usqInt bridgeSpan;
     sqInt bytesRead;
Modified: branches/Cog/spursistasrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.h	2015-06-29 23:59:01 UTC (rev 3393)
+++ branches/Cog/spursistasrc/vm/cointerp.h	2015-06-30 00:54:16 UTC (rev 3394)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
  */
@@ -254,7 +254,7 @@
 extern sqInt splObj(sqInt index);
 extern usqInt storeCheckBoundary(void);
 extern sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
-extern usqInt stringForCString(const char *aCString);
+extern sqInt stringForCString(const char *aCString);
 extern void tenuringIncrementalGC(void);
 extern sqInt topRemappableOop(void);
 extern sqInt validFreeTree(void);
Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c	2015-06-29 23:59:01 UTC (rev 3393)
+++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c	2015-06-30 00:54:16 UTC (rev 3394)
@@ -2,11 +2,11 @@
/* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
    from
-	CoInterpreter VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+	CoInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
@@ -1197,7 +1197,7 @@
 static sqInt storeImageSegmentIntooutPointersroots(sqInt segmentWordArray, sqInt outPointerArray, sqInt arrayOfRoots) NoDbgRegParms;
 extern sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
 extern sqInt storePointerofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
-extern usqInt stringForCString(const char *aCString);
+extern sqInt stringForCString(const char *aCString);
 static sqInt sufficientSpaceAfterGC(sqInt numBytes) NoDbgRegParms;
 static sqInt swizzleObjStackAt(sqInt objStackRootIndex) NoDbgRegParms;
 extern void tenuringIncrementalGC(void);
@@ -2388,7 +2388,7 @@
 /*560*/	-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
    };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1401]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1402]";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
@@ -30858,7 +30858,7 @@
     usqInt newObj;
     usqInt numBytes;
     sqInt numSlots;
-    usqInt s;
+    sqInt s;
     char *sp;
     sqInt sz;
@@ -36535,7 +36535,7 @@
     sqInt err;
     sqInt hash;
     sqInt instSpec;
-    usqInt newObj;
+    sqInt newObj;
     usqInt newObj1;
     usqInt numBytes;
     sqInt numSlots;
@@ -36653,7 +36653,7 @@
     sqInt i;
     usqInt instSpec;
     sqInt literalCount;
-    usqInt newObj;
+    sqInt newObj;
     usqInt newObj1;
     usqInt numBytes;
     sqInt numSlots;
@@ -42551,7 +42551,7 @@
     sqInt fillValue;
     sqInt hash;
     usqInt instSpec;
-    usqInt newObj;
+    sqInt newObj;
     usqInt newObj1;
     usqInt numBytes;
     usqInt numSlots;
@@ -44683,7 +44683,7 @@
     sqInt entry;
     sqInt expectedIndex;
     sqInt expectedIndex1;
-    usqInt freeChunk;
+    sqInt freeChunk;
     sqInt i;
     sqInt i1;
     sqInt index;
@@ -44722,8 +44722,8 @@
     sqInt ptr1;
     sqInt ptr2;
     sqInt slotBytes;
-    usqInt smallObj;
-    usqInt start;
+    sqInt smallObj;
+    sqInt start;
classIndex = (long32At(aClass + 4)) & 0x3FFFFF;
    if (classIndex == 0) {
@@ -47664,7 +47664,7 @@
     sqInt fmt;
     sqInt hasYoung;
     sqInt i;
-    usqInt newObj;
+    sqInt newObj;
     usqInt newObj1;
     usqInt numBytes;
     usqInt numSlots;
@@ -50359,25 +50359,25 @@
    		ammount = headroom;
    	}
    }
-	return (addSegmentOfSize(ammount)
-		? totalBytesInSegments(maxOldSpaceSize(			/* begin assimilateNewSegment: */
-			if ((((segInfo->segSize)) + ((segInfo->segStart))) >= GIV(endOfMemory)) {
-				GIV(freeOldSpaceStart) = (GIV(endOfMemory) = (((segInfo->segSize)) + ((segInfo->segStart))) - (2 * BaseHeaderSize));
-			}
-			sqMakeMemoryNotExecutableFromTo((segInfo->segStart), ((segInfo->segSize)) + ((segInfo->segStart)));
-			/* begin addFreeChunkWithBytes:at: */
-			bytes = ((segInfo->segSize)) - (2 * BaseHeaderSize);
-			address = (segInfo->segStart);
-			freeChunkWithBytesat(bytes, address);
-			GIV(totalFreeOldSpace) += bytes;
-			assert((addressAfter(objectStartingAt((segInfo->segStart)))) == ((segLimit(segInfo)) - (bridgeSize())));
-			/* begin checkFreeSpace */
-			assert(bitsSetInFreeSpaceMaskForAllFreeLists());
-			assert(GIV(totalFreeOldSpace) == (totalFreeListBytes()));
-			checkSegments();
-			(segInfo->segSize);
-))
-		: 0);
+	return ((segInfo = addSegmentOfSize(ammount)),
+	(!(segInfo == null)
+			? (/* begin assimilateNewSegment: */
+				((((segInfo->segSize)) + ((segInfo->segStart))) >= GIV(endOfMemory)
+						? (GIV(freeOldSpaceStart) = (GIV(endOfMemory) = (((segInfo->segSize)) + ((segInfo->segStart))) - (2 * BaseHeaderSize)))
+						: 0),
+				sqMakeMemoryNotExecutableFromTo((segInfo->segStart), ((segInfo->segSize)) + ((segInfo->segStart))),
+				/* begin addFreeChunkWithBytes:at: */
+				(bytes = ((segInfo->segSize)) - (2 * BaseHeaderSize)),
+				(address = (segInfo->segStart)),
+				freeChunkWithBytesat(bytes, address),
+				(GIV(totalFreeOldSpace) += bytes),
+				assert((addressAfter(objectStartingAt((segInfo->segStart)))) == ((segLimit(segInfo)) - (bridgeSize()))),
+				/* begin checkFreeSpace */
+				assert(bitsSetInFreeSpaceMaskForAllFreeLists()),
+				assert(GIV(totalFreeOldSpace) == (totalFreeListBytes())),
+				checkSegments(),
+				(segInfo->segSize))
+			: 0));
 }
@@ -59000,7 +59000,7 @@
     usqInt prevFree;
     usqInt prevFreeChunk;
     usqInt prevPrevFree;
-    sqInt prevPrevFreeChunk;
+    usqInt prevPrevFreeChunk;
     sqInt slotBytes;
     sqInt slotBytes1;
     usqInt there;
@@ -62353,8 +62353,8 @@
     sqInt prevPrevObj;
     sqInt prevPrevObj1;
     sqInt ptr;
-    usqInt savedInHashes;
-    usqInt savedOutHashes;
+    sqInt savedInHashes;
+    sqInt savedOutHashes;
     sqInt segAddr;
     sqInt segStart;
     sqInt slotBytes;
@@ -62824,13 +62824,13 @@
    or nil if out of memory. */
/* SpurMemoryManager>>#stringForCString: */
-usqInt
+sqInt
 stringForCString(const char *aCString)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
     sqInt formatField;
     sqInt len;
     usqInt newObj;
-    usqInt newString;
+    sqInt newString;
     usqInt numBytes;
     sqInt numSlots;
@@ -63540,7 +63540,7 @@
 bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
 {
     usqInt bridgeSpan;
-    sqInt clifton;
+    usqInt clifton;
     usqInt segEnd;
segEnd = ((aSegment->segSize)) + ((aSegment->segStart));
@@ -63781,7 +63781,7 @@
     sqInt largeChild;
     sqInt newEndOfMemory;
     sqInt next;
-    sqInt node;
+    usqInt node;
     SpurSegmentInfo *seg;
     sqInt smallChild;
     sqInt treeNode;
@@ -63885,7 +63885,7 @@
 static sqInt
 readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
-    usqInt bridge;
+    sqInt bridge;
     usqInt bridgehead;
     usqInt bridgeSpan;
     sqInt bytesRead;
Modified: branches/Cog/spursrc/vm/cogit.h
===================================================================
--- branches/Cog/spursrc/vm/cogit.h	2015-06-29 23:59:01 UTC (rev 3393)
+++ branches/Cog/spursrc/vm/cogit.h	2015-06-30 00:54:16 UTC (rev 3394)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+	CCodeGenerator VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
  */
Modified: branches/Cog/spursrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/cointerp.c	2015-06-29 23:59:01 UTC (rev 3393)
+++ branches/Cog/spursrc/vm/cointerp.c	2015-06-30 00:54:16 UTC (rev 3394)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
    from
-	CoInterpreter VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+	CoInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
@@ -2372,7 +2372,7 @@
 /*560*/	-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
    };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1401]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1402]";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
@@ -45281,25 +45281,25 @@
    		ammount = headroom;
    	}
    }
-	return (addSegmentOfSize(ammount)
-		? totalBytesInSegments(maxOldSpaceSize(			/* begin assimilateNewSegment: */
-			if ((((segInfo->segSize)) + ((segInfo->segStart))) >= GIV(endOfMemory)) {
-				GIV(freeOldSpaceStart) = (GIV(endOfMemory) = (((segInfo->segSize)) + ((segInfo->segStart))) - (2 * BaseHeaderSize));
-			}
-			sqMakeMemoryNotExecutableFromTo((segInfo->segStart), ((segInfo->segSize)) + ((segInfo->segStart)));
-			/* begin addFreeChunkWithBytes:at: */
-			bytes = ((segInfo->segSize)) - (2 * BaseHeaderSize);
-			address = (segInfo->segStart);
-			freeChunkWithBytesat(bytes, address);
-			GIV(totalFreeOldSpace) += bytes;
-			assert((addressAfter(objectStartingAt((segInfo->segStart)))) == ((segLimit(segInfo)) - (bridgeSize())));
-			/* begin checkFreeSpace */
-			assert(bitsSetInFreeSpaceMaskForAllFreeLists());
-			assert(GIV(totalFreeOldSpace) == (totalFreeListBytes()));
-			checkSegments();
-			(segInfo->segSize);
-))
-		: 0);
+	return ((segInfo = addSegmentOfSize(ammount)),
+	(!(segInfo == null)
+			? (/* begin assimilateNewSegment: */
+				((((segInfo->segSize)) + ((segInfo->segStart))) >= GIV(endOfMemory)
+						? (GIV(freeOldSpaceStart) = (GIV(endOfMemory) = (((segInfo->segSize)) + ((segInfo->segStart))) - (2 * BaseHeaderSize)))
+						: 0),
+				sqMakeMemoryNotExecutableFromTo((segInfo->segStart), ((segInfo->segSize)) + ((segInfo->segStart))),
+				/* begin addFreeChunkWithBytes:at: */
+				(bytes = ((segInfo->segSize)) - (2 * BaseHeaderSize)),
+				(address = (segInfo->segStart)),
+				freeChunkWithBytesat(bytes, address),
+				(GIV(totalFreeOldSpace) += bytes),
+				assert((addressAfter(objectStartingAt((segInfo->segStart)))) == ((segLimit(segInfo)) - (bridgeSize()))),
+				/* begin checkFreeSpace */
+				assert(bitsSetInFreeSpaceMaskForAllFreeLists()),
+				assert(GIV(totalFreeOldSpace) == (totalFreeListBytes())),
+				checkSegments(),
+				(segInfo->segSize))
+			: 0));
 }
@@ -53922,7 +53922,7 @@
     usqInt prevFree;
     usqInt prevFreeChunk;
     usqInt prevPrevFree;
-    usqInt prevPrevFreeChunk;
+    sqInt prevPrevFreeChunk;
     sqInt slotBytes;
     sqInt slotBytes1;
     usqInt there;
@@ -58677,7 +58677,7 @@
     sqInt largeChild;
     sqInt newEndOfMemory;
     sqInt next;
-    usqInt node;
+    sqInt node;
     SpurSegmentInfo *seg;
     sqInt smallChild;
     sqInt treeNode;
@@ -58781,7 +58781,7 @@
 static sqInt
 readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
-    sqInt bridge;
+    usqInt bridge;
     usqInt bridgehead;
     usqInt bridgeSpan;
     sqInt bytesRead;
Modified: branches/Cog/spursrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursrc/vm/cointerp.h	2015-06-29 23:59:01 UTC (rev 3393)
+++ branches/Cog/spursrc/vm/cointerp.h	2015-06-30 00:54:16 UTC (rev 3394)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
  */
Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/gcc3x-cointerp.c	2015-06-29 23:59:01 UTC (rev 3393)
+++ branches/Cog/spursrc/vm/gcc3x-cointerp.c	2015-06-30 00:54:16 UTC (rev 3394)
@@ -2,11 +2,11 @@
/* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
    from
-	CoInterpreter VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+	CoInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
@@ -2375,7 +2375,7 @@
 /*560*/	-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
    };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1401]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1402]";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
@@ -45290,25 +45290,25 @@
    		ammount = headroom;
    	}
    }
-	return (addSegmentOfSize(ammount)
-		? totalBytesInSegments(maxOldSpaceSize(			/* begin assimilateNewSegment: */
-			if ((((segInfo->segSize)) + ((segInfo->segStart))) >= GIV(endOfMemory)) {
-				GIV(freeOldSpaceStart) = (GIV(endOfMemory) = (((segInfo->segSize)) + ((segInfo->segStart))) - (2 * BaseHeaderSize));
-			}
-			sqMakeMemoryNotExecutableFromTo((segInfo->segStart), ((segInfo->segSize)) + ((segInfo->segStart)));
-			/* begin addFreeChunkWithBytes:at: */
-			bytes = ((segInfo->segSize)) - (2 * BaseHeaderSize);
-			address = (segInfo->segStart);
-			freeChunkWithBytesat(bytes, address);
-			GIV(totalFreeOldSpace) += bytes;
-			assert((addressAfter(objectStartingAt((segInfo->segStart)))) == ((segLimit(segInfo)) - (bridgeSize())));
-			/* begin checkFreeSpace */
-			assert(bitsSetInFreeSpaceMaskForAllFreeLists());
-			assert(GIV(totalFreeOldSpace) == (totalFreeListBytes()));
-			checkSegments();
-			(segInfo->segSize);
-))
-		: 0);
+	return ((segInfo = addSegmentOfSize(ammount)),
+	(!(segInfo == null)
+			? (/* begin assimilateNewSegment: */
+				((((segInfo->segSize)) + ((segInfo->segStart))) >= GIV(endOfMemory)
+						? (GIV(freeOldSpaceStart) = (GIV(endOfMemory) = (((segInfo->segSize)) + ((segInfo->segStart))) - (2 * BaseHeaderSize)))
+						: 0),
+				sqMakeMemoryNotExecutableFromTo((segInfo->segStart), ((segInfo->segSize)) + ((segInfo->segStart))),
+				/* begin addFreeChunkWithBytes:at: */
+				(bytes = ((segInfo->segSize)) - (2 * BaseHeaderSize)),
+				(address = (segInfo->segStart)),
+				freeChunkWithBytesat(bytes, address),
+				(GIV(totalFreeOldSpace) += bytes),
+				assert((addressAfter(objectStartingAt((segInfo->segStart)))) == ((segLimit(segInfo)) - (bridgeSize()))),
+				/* begin checkFreeSpace */
+				assert(bitsSetInFreeSpaceMaskForAllFreeLists()),
+				assert(GIV(totalFreeOldSpace) == (totalFreeListBytes())),
+				checkSegments(),
+				(segInfo->segSize))
+			: 0));
 }
@@ -53931,7 +53931,7 @@
     usqInt prevFree;
     usqInt prevFreeChunk;
     usqInt prevPrevFree;
-    usqInt prevPrevFreeChunk;
+    sqInt prevPrevFreeChunk;
     sqInt slotBytes;
     sqInt slotBytes1;
     usqInt there;
@@ -58686,7 +58686,7 @@
     sqInt largeChild;
     sqInt newEndOfMemory;
     sqInt next;
-    usqInt node;
+    sqInt node;
     SpurSegmentInfo *seg;
     sqInt smallChild;
     sqInt treeNode;
@@ -58790,7 +58790,7 @@
 static sqInt
 readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
-    sqInt bridge;
+    usqInt bridge;
     usqInt bridgehead;
     usqInt bridgeSpan;
     sqInt bytesRead;
Modified: branches/Cog/spurstack64src/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/spurstack64src/vm/gcc3x-interp.c	2015-06-29 23:59:01 UTC (rev 3393)
+++ branches/Cog/spurstack64src/vm/gcc3x-interp.c	2015-06-30 00:54:16 UTC (rev 3394)
@@ -2,11 +2,11 @@
/* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
    from
-	StackInterpreter VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+	StackInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
@@ -2137,7 +2137,7 @@
    /* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1401]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1402]";
 volatile int sendTrace;
 sqInt suppressHeartbeatFlag;
@@ -34203,24 +34203,24 @@
    		ammount = headroom;
    	}
    }
-	return (addSegmentOfSize(ammount)
-		? totalBytesInSegments(maxOldSpaceSize(			/* begin assimilateNewSegment: */
-			if ((((segInfo->segSize)) + ((segInfo->segStart))) >= GIV(endOfMemory)) {
-				GIV(freeOldSpaceStart) = (GIV(endOfMemory) = (((segInfo->segSize)) + ((segInfo->segStart))) - (2 * BaseHeaderSize));
-			}
-			/* begin addFreeChunkWithBytes:at: */
-			bytes = ((segInfo->segSize)) - (2 * BaseHeaderSize);
-			address = (segInfo->segStart);
-			freeChunkWithBytesat(bytes, address);
-			GIV(totalFreeOldSpace) += bytes;
-			assert((addressAfter(objectStartingAt((segInfo->segStart)))) == ((segLimit(segInfo)) - (bridgeSize())));
-			/* begin checkFreeSpace */
-			assert(bitsSetInFreeSpaceMaskForAllFreeLists());
-			assert(GIV(totalFreeOldSpace) == (totalFreeListBytes()));
-			checkSegments();
-			(segInfo->segSize);
-))
-		: 0);
+	return ((segInfo = addSegmentOfSize(ammount)),
+	(!(segInfo == null)
+			? (/* begin assimilateNewSegment: */
+				((((segInfo->segSize)) + ((segInfo->segStart))) >= GIV(endOfMemory)
+						? (GIV(freeOldSpaceStart) = (GIV(endOfMemory) = (((segInfo->segSize)) + ((segInfo->segStart))) - (2 * BaseHeaderSize)))
+						: 0),
+				/* begin addFreeChunkWithBytes:at: */
+				(bytes = ((segInfo->segSize)) - (2 * BaseHeaderSize)),
+				(address = (segInfo->segStart)),
+				freeChunkWithBytesat(bytes, address),
+				(GIV(totalFreeOldSpace) += bytes),
+				assert((addressAfter(objectStartingAt((segInfo->segStart)))) == ((segLimit(segInfo)) - (bridgeSize()))),
+				/* begin checkFreeSpace */
+				assert(bitsSetInFreeSpaceMaskForAllFreeLists()),
+				assert(GIV(totalFreeOldSpace) == (totalFreeListBytes())),
+				checkSegments(),
+				(segInfo->segSize))
+			: 0));
 }
Modified: branches/Cog/spurstack64src/vm/interp.c
===================================================================
--- branches/Cog/spurstack64src/vm/interp.c	2015-06-29 23:59:01 UTC (rev 3393)
+++ branches/Cog/spurstack64src/vm/interp.c	2015-06-30 00:54:16 UTC (rev 3394)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
    from
-	StackInterpreter VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+	StackInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
@@ -2134,7 +2134,7 @@
    /* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1401]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1402]";
 volatile int sendTrace;
 sqInt suppressHeartbeatFlag;
@@ -34194,24 +34194,24 @@
    		ammount = headroom;
    	}
    }
-	return (addSegmentOfSize(ammount)
@@ Diff output truncated at 50000 characters. @@

    