[Vm-dev] [commit][3302] CogVM source as per VMMaker.oscog-eem.1152

commits at squeakvm.org commits at squeakvm.org
Thu Apr 2 17:02:47 UTC 2015


Revision: 3302
Author:   eliot
Date:     2015-04-02 10:02:47 -0700 (Thu, 02 Apr 2015)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.1152

Better living through compile-time type checking.  Fix offset calculation in
followForwardingPointersInStackZone: as indicated by a C compiler warning.

Modified Paths:
--------------
    branches/Cog/nsspursrc/vm/cointerp.c
    branches/Cog/nsspursrc/vm/cointerp.h
    branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
    branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c
    branches/Cog/nsspurstacksrc/vm/interp.c
    branches/Cog/spursistasrc/vm/cointerp.c
    branches/Cog/spursistasrc/vm/cointerp.h
    branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
    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/cointerp.c
    branches/Cog/src/vm/cointerp.h
    branches/Cog/src/vm/cointerpmt.c
    branches/Cog/src/vm/cointerpmt.h
    branches/Cog/src/vm/gcc3x-cointerp.c
    branches/Cog/src/vm/gcc3x-cointerpmt.c
    branches/Cog/stacksrc/vm/gcc3x-interp.c
    branches/Cog/stacksrc/vm/interp.c

Property Changed:
----------------
    branches/Cog/platforms/Cross/vm/sqSCCSVersion.h

Modified: branches/Cog/nsspursrc/vm/cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.c	2015-04-02 16:42:51 UTC (rev 3301)
+++ branches/Cog/nsspursrc/vm/cointerp.c	2015-04-02 17:02:47 UTC (rev 3302)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
    from
-	CoInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2
+	CoInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2371,7 +2371,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.1147";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1152";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -17361,7 +17361,6 @@
     sqInt delta;
     sqInt i;
     sqInt newOop;
-    sqInt numArgs;
     char *offset;
     sqInt oop;
     sqInt referent;
@@ -17430,11 +17429,9 @@
 				assert(addressIsInPage(thePage, theFP));
 				assert((theIPPtr == 0)
 				 || (addressIsInPage(thePage, ((void *)theIPPtr))));
-				/* begin frameStackedReceiverOffsetNumArgs: */
-				numArgs = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
-					? ((mframeCogMethod(theFP))->cmNumArgs)
-					: byteAt((theFP + FoxIFrameFlags) + 1));
-				offset = (FoxCallerSavedIP + BytesPerWord) + (numArgs << (shiftForWord()));
+				offset = theFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
+	? ((mframeCogMethod(theFP))->cmNumArgs)
+	: byteAt((theFP + FoxIFrameFlags) + 1))));
 				while (theSP <= offset) {
 					oop = longAt(theSP);
 					if (((oop & 3) == 0)
@@ -28658,8 +28655,8 @@
     sqInt totalLength1;
     sqInt value;
     sqInt value1;
-    usqInt valueToStore;
-    usqInt valueToStore1;
+    sqInt valueToStore;
+    sqInt valueToStore1;
 
 	/* begin commonAtPut: */
 	value = longAt(GIV(stackPointer));
@@ -31277,7 +31274,7 @@
     sqInt arg;
     sqInt fmt;
     sqInt i;
-    sqInt length;
+    usqInt length;
     usqInt numBytes;
     usqInt numSlots;
     usqInt numSlots1;
@@ -31318,18 +31315,18 @@
 
 			/* bytes (the common case), including CompiledMethod */
 
-			length = numBytes - (fmt & 7);
+			length = ((sqInt) (numBytes - (fmt & 7)));
 			goto l1;
 		}
 		if (fmt <= 9) {
-			length = numBytes;
+			length = ((sqInt) numBytes);
 			goto l1;
 		}
 		if (fmt >= 12) {
-			length = numBytes - ((fmt & 3) << 1);
+			length = ((sqInt) (numBytes - ((fmt & 3) << 1)));
 			goto l1;
 		}
-		length = numBytes - ((fmt & 1) << 2);
+		length = ((sqInt) (numBytes - ((fmt & 1) << 2)));
 	l1:	/* end numBytesOf: */;
 		if (!((((((usqInt) (longAt(rcvr))) >> 24) & 0x1F) == ((((usqInt) (longAt(arg))) >> 24) & 0x1F))
 			 && (length == (numBytesOf(arg))))) {
@@ -31347,9 +31344,9 @@
 		flag("endianness");
 		assert((classIndexOf(rcvr)) > (isForwardedObjectClassIndexPun()));
 		numSlots1 = byteAt(rcvr + 7);
-		length = ((usqInt) ((numSlots1 == 0xFF
-	? longAt(rcvr - BaseHeaderSize)
-	: numSlots1)));
+		length = (numSlots1 == 0xFF
+			? longAt(rcvr - BaseHeaderSize)
+			: numSlots1);
 		if (!((isAppropriateForCopyObject(arg))
 			 && (length == (lengthOfformat(arg, (((usqInt) (longAt(arg))) >> 24) & 0x1F))))) {
 			(GIV(primFailCode) = PrimErrBadArgument);
@@ -38682,8 +38679,8 @@
     sqInt totalLength1;
     sqInt value;
     sqInt value1;
-    usqInt valueToStore;
-    usqInt valueToStore1;
+    sqInt valueToStore;
+    sqInt valueToStore1;
 
 	/* begin commonAtPut: */
 	value = longAt(GIV(stackPointer));
@@ -41256,7 +41253,7 @@
     sqInt fillValue;
     sqInt hash;
     sqInt instSpec;
-    usqInt newObj;
+    sqInt newObj;
     usqInt newObj1;
     usqInt numBytes;
     usqInt numSlots;
@@ -41357,7 +41354,7 @@
 				GIV(needGCFlag) = 1;
 				forceInterruptCheck();
 			}
-			newObj = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex);
+			newObj = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex)));
 			goto l1;
 		}
 		if (numSlots >= 0xFF) {
@@ -43189,7 +43186,7 @@
     sqInt ptr2;
     sqInt slotBytes;
     usqInt smallObj;
-    sqInt start;
+    usqInt start;
 
 	classIndex = (long32At(aClass + 4)) & 0x3FFFFF;
 	if (classIndex == 0) {
@@ -46066,7 +46063,7 @@
     sqInt fmt;
     sqInt hasYoung;
     sqInt i;
-    usqInt newObj;
+    sqInt newObj;
     usqInt newObj1;
     usqInt numBytes;
     usqInt numSlots;
@@ -46108,7 +46105,7 @@
 				GIV(needGCFlag) = 1;
 				forceInterruptCheck();
 			}
-			newObj = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, fmt, (longAt(objOop)) & 0x3FFFFF);
+			newObj = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, fmt, (longAt(objOop)) & 0x3FFFFF)));
 			goto l1;
 		}
 		if (numSlots >= 0xFF) {
@@ -73375,7 +73372,7 @@
     sqInt sp1;
     sqInt stSize;
     sqInt totalLength;
-    usqInt valueToStore;
+    sqInt valueToStore;
 
 	hdr = long64At(array);
 	fmt = (((unsigned sqLong)hdr) >> 24) & 0x1F;
@@ -74638,8 +74635,8 @@
     sqInt totalLength;
     sqInt totalLength1;
     sqInt value;
-    usqInt valueToStore;
-    usqInt valueToStore1;
+    sqInt valueToStore;
+    sqInt valueToStore1;
 
 	value = longAt(GIV(stackPointer));
 	index = longAt(GIV(stackPointer) + (1 * BytesPerWord));
@@ -76411,7 +76408,7 @@
     sqInt rcvr;
     char *sp;
     sqInt totalLength;
-    usqInt valueToStore;
+    sqInt valueToStore;
 
 	newValue = longAt(GIV(stackPointer));
 	/* begin stackIntegerValue: */

Modified: branches/Cog/nsspursrc/vm/cointerp.h
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.h	2015-04-02 16:42:51 UTC (rev 3301)
+++ branches/Cog/nsspursrc/vm/cointerp.h	2015-04-02 17:02:47 UTC (rev 3302)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
  */
 
 

Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c	2015-04-02 16:42:51 UTC (rev 3301)
+++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c	2015-04-02 17:02:47 UTC (rev 3302)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
    from
-	CoInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2
+	CoInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2374,7 +2374,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.1147";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1152";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -17370,7 +17370,6 @@
     sqInt delta;
     sqInt i;
     sqInt newOop;
-    sqInt numArgs;
     char *offset;
     sqInt oop;
     sqInt referent;
@@ -17439,11 +17438,9 @@
 				assert(addressIsInPage(thePage, theFP));
 				assert((theIPPtr == 0)
 				 || (addressIsInPage(thePage, ((void *)theIPPtr))));
-				/* begin frameStackedReceiverOffsetNumArgs: */
-				numArgs = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
-					? ((mframeCogMethod(theFP))->cmNumArgs)
-					: byteAt((theFP + FoxIFrameFlags) + 1));
-				offset = (FoxCallerSavedIP + BytesPerWord) + (numArgs << (shiftForWord()));
+				offset = theFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
+	? ((mframeCogMethod(theFP))->cmNumArgs)
+	: byteAt((theFP + FoxIFrameFlags) + 1))));
 				while (theSP <= offset) {
 					oop = longAt(theSP);
 					if (((oop & 3) == 0)
@@ -28667,8 +28664,8 @@
     sqInt totalLength1;
     sqInt value;
     sqInt value1;
-    usqInt valueToStore;
-    usqInt valueToStore1;
+    sqInt valueToStore;
+    sqInt valueToStore1;
 
 	/* begin commonAtPut: */
 	value = longAt(GIV(stackPointer));
@@ -31286,7 +31283,7 @@
     sqInt arg;
     sqInt fmt;
     sqInt i;
-    sqInt length;
+    usqInt length;
     usqInt numBytes;
     usqInt numSlots;
     usqInt numSlots1;
@@ -31327,18 +31324,18 @@
 
 			/* bytes (the common case), including CompiledMethod */
 
-			length = numBytes - (fmt & 7);
+			length = ((sqInt) (numBytes - (fmt & 7)));
 			goto l1;
 		}
 		if (fmt <= 9) {
-			length = numBytes;
+			length = ((sqInt) numBytes);
 			goto l1;
 		}
 		if (fmt >= 12) {
-			length = numBytes - ((fmt & 3) << 1);
+			length = ((sqInt) (numBytes - ((fmt & 3) << 1)));
 			goto l1;
 		}
-		length = numBytes - ((fmt & 1) << 2);
+		length = ((sqInt) (numBytes - ((fmt & 1) << 2)));
 	l1:	/* end numBytesOf: */;
 		if (!((((((usqInt) (longAt(rcvr))) >> 24) & 0x1F) == ((((usqInt) (longAt(arg))) >> 24) & 0x1F))
 			 && (length == (numBytesOf(arg))))) {
@@ -31356,9 +31353,9 @@
 		flag("endianness");
 		assert((classIndexOf(rcvr)) > (isForwardedObjectClassIndexPun()));
 		numSlots1 = byteAt(rcvr + 7);
-		length = ((usqInt) ((numSlots1 == 0xFF
-	? longAt(rcvr - BaseHeaderSize)
-	: numSlots1)));
+		length = (numSlots1 == 0xFF
+			? longAt(rcvr - BaseHeaderSize)
+			: numSlots1);
 		if (!((isAppropriateForCopyObject(arg))
 			 && (length == (lengthOfformat(arg, (((usqInt) (longAt(arg))) >> 24) & 0x1F))))) {
 			(GIV(primFailCode) = PrimErrBadArgument);
@@ -38691,8 +38688,8 @@
     sqInt totalLength1;
     sqInt value;
     sqInt value1;
-    usqInt valueToStore;
-    usqInt valueToStore1;
+    sqInt valueToStore;
+    sqInt valueToStore1;
 
 	/* begin commonAtPut: */
 	value = longAt(GIV(stackPointer));
@@ -41265,7 +41262,7 @@
     sqInt fillValue;
     sqInt hash;
     sqInt instSpec;
-    usqInt newObj;
+    sqInt newObj;
     usqInt newObj1;
     usqInt numBytes;
     usqInt numSlots;
@@ -41366,7 +41363,7 @@
 				GIV(needGCFlag) = 1;
 				forceInterruptCheck();
 			}
-			newObj = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex);
+			newObj = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex)));
 			goto l1;
 		}
 		if (numSlots >= 0xFF) {
@@ -43198,7 +43195,7 @@
     sqInt ptr2;
     sqInt slotBytes;
     usqInt smallObj;
-    sqInt start;
+    usqInt start;
 
 	classIndex = (long32At(aClass + 4)) & 0x3FFFFF;
 	if (classIndex == 0) {
@@ -46075,7 +46072,7 @@
     sqInt fmt;
     sqInt hasYoung;
     sqInt i;
-    usqInt newObj;
+    sqInt newObj;
     usqInt newObj1;
     usqInt numBytes;
     usqInt numSlots;
@@ -46117,7 +46114,7 @@
 				GIV(needGCFlag) = 1;
 				forceInterruptCheck();
 			}
-			newObj = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, fmt, (longAt(objOop)) & 0x3FFFFF);
+			newObj = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, fmt, (longAt(objOop)) & 0x3FFFFF)));
 			goto l1;
 		}
 		if (numSlots >= 0xFF) {
@@ -73384,7 +73381,7 @@
     sqInt sp1;
     sqInt stSize;
     sqInt totalLength;
-    usqInt valueToStore;
+    sqInt valueToStore;
 
 	hdr = long64At(array);
 	fmt = (((unsigned sqLong)hdr) >> 24) & 0x1F;
@@ -74647,8 +74644,8 @@
     sqInt totalLength;
     sqInt totalLength1;
     sqInt value;
-    usqInt valueToStore;
-    usqInt valueToStore1;
+    sqInt valueToStore;
+    sqInt valueToStore1;
 
 	value = longAt(GIV(stackPointer));
 	index = longAt(GIV(stackPointer) + (1 * BytesPerWord));
@@ -76420,7 +76417,7 @@
     sqInt rcvr;
     char *sp;
     sqInt totalLength;
-    usqInt valueToStore;
+    sqInt valueToStore;
 
 	newValue = longAt(GIV(stackPointer));
 	/* begin stackIntegerValue: */

Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c	2015-04-02 16:42:51 UTC (rev 3301)
+++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c	2015-04-02 17:02:47 UTC (rev 3302)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
    from
-	StackInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2
+	StackInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2117,7 +2117,7 @@
 	/* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1147";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1152";
 volatile int sendTrace;
 sqInt suppressHeartbeatFlag;
 

Modified: branches/Cog/nsspurstacksrc/vm/interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/interp.c	2015-04-02 16:42:51 UTC (rev 3301)
+++ branches/Cog/nsspurstacksrc/vm/interp.c	2015-04-02 17:02:47 UTC (rev 3302)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
    from
-	StackInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2
+	StackInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2114,7 +2114,7 @@
 	/* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1147";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1152";
 volatile int sendTrace;
 sqInt suppressHeartbeatFlag;
 


Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
   - Thu Apr  2 09:42:33 PDT 2015
   + Thu Apr  2 10:02:32 PDT 2015

Modified: branches/Cog/spursistasrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.c	2015-04-02 16:42:51 UTC (rev 3301)
+++ branches/Cog/spursistasrc/vm/cointerp.c	2015-04-02 17:02:47 UTC (rev 3302)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1151 uuid: 4356fa11-234c-40ba-b3cc-fc9797b15238
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
    from
-	CoInterpreter VMMaker.oscog-eem.1151 uuid: 4356fa11-234c-40ba-b3cc-fc9797b15238
+	CoInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1151 uuid: 4356fa11-234c-40ba-b3cc-fc9797b15238 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -1176,7 +1176,7 @@
 static sqInt storeImageSegmentIntooutPointersroots(sqInt segmentWordArray, sqInt outPointerArray, sqInt arrayOfRoots) NoDbgRegParms;
 sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
 sqInt storePointerofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
-usqInt stringForCString(const char *aCString);
+sqInt stringForCString(const char *aCString);
 static sqInt sufficientSpaceAfterGC(sqInt numBytes) NoDbgRegParms;
 static sqInt swizzleObjStackAt(sqInt objStackRootIndex) NoDbgRegParms;
 void tenuringIncrementalGC(void);
@@ -2368,7 +2368,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 VM [CoInterpreterPrimitives VMMaker.oscog-eem.1151]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1152]";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -5623,6 +5623,7 @@
 							GIV(framePointer) = localFP;
 							
 							ceEnterCogCodePopReceiverReg();
+							null;
 							goto l228;
 						}
 						localIP = pointerForOop(longAt(localFP + FoxIFSavedIP));
@@ -5641,7 +5642,7 @@
 					/* begin fetchNextBytecode */
 					currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector);
 
-					/* return self */
+					null;
 				l228:	/* end baseFrameReturn */;
 					goto l227;
 				}
@@ -17806,7 +17807,6 @@
     sqInt delta;
     sqInt i;
     sqInt newOop;
-    sqInt numArgs;
     char *offset;
     sqInt oop;
     sqInt referent;
@@ -17875,11 +17875,9 @@
 				assert(addressIsInPage(thePage, theFP));
 				assert((theIPPtr == 0)
 				 || (addressIsInPage(thePage, ((void *)theIPPtr))));
-				/* begin frameStackedReceiverOffsetNumArgs: */
-				numArgs = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
-					? ((mframeCogMethod(theFP))->cmNumArgs)
-					: byteAt((theFP + FoxIFrameFlags) + 1));
-				offset = (FoxCallerSavedIP + BytesPerWord) + (numArgs << (shiftForWord()));
+				offset = theFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
+	? ((mframeCogMethod(theFP))->cmNumArgs)
+	: byteAt((theFP + FoxIFrameFlags) + 1))));
 				while (theSP <= offset) {
 					oop = longAt(theSP);
 					if (((oop & 3) == 0)
@@ -28929,8 +28927,8 @@
     sqInt totalLength1;
     sqInt value;
     sqInt value1;
-    sqInt valueToStore;
-    sqInt valueToStore1;
+    usqInt valueToStore;
+    usqInt valueToStore1;
 
 	/* begin commonAtPut: */
 	value = longAt(GIV(stackPointer));
@@ -30232,7 +30230,7 @@
 				GIV(needGCFlag) = 1;
 				forceInterruptCheck();
 			}
-			s = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex)));
+			s = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex);
 			goto l1;
 		}
 		if (numSlots >= 0xFF) {
@@ -35621,7 +35619,7 @@
     sqInt err;
     sqInt hash;
     sqInt instSpec;
-    usqInt newObj;
+    sqInt newObj;
     usqInt newObj1;
     usqInt numBytes;
     sqInt numSlots;
@@ -35736,7 +35734,7 @@
     sqInt i;
     sqInt instSpec;
     sqInt literalCount;
-    usqInt newObj;
+    sqInt newObj;
     usqInt newObj1;
     usqInt numBytes;
     sqInt numSlots;
@@ -38943,8 +38941,8 @@
     sqInt totalLength1;
     sqInt value;
     sqInt value1;
-    sqInt valueToStore;
-    sqInt valueToStore1;
+    usqInt valueToStore;
+    usqInt valueToStore1;
 
 	/* begin commonAtPut: */
 	value = longAt(GIV(stackPointer));
@@ -41517,7 +41515,7 @@
     sqInt fillValue;
     sqInt hash;
     sqInt instSpec;
-    usqInt newObj;
+    sqInt newObj;
     usqInt newObj1;
     usqInt numBytes;
     usqInt numSlots;
@@ -43410,7 +43408,7 @@
     sqInt entry;
     sqInt expectedIndex;
     sqInt expectedIndex1;
-    usqInt freeChunk;
+    sqInt freeChunk;
     sqInt i;
     sqInt i1;
     sqInt index;
@@ -43449,8 +43447,8 @@
     sqInt ptr1;
     sqInt ptr2;
     sqInt slotBytes;
-    usqInt smallObj;
-    usqInt start;
+    sqInt smallObj;
+    sqInt start;
 
 	classIndex = (long32At(aClass + 4)) & 0x3FFFFF;
 	if (classIndex == 0) {
@@ -46327,7 +46325,7 @@
     sqInt fmt;
     sqInt hasYoung;
     sqInt i;
-    usqInt newObj;
+    sqInt newObj;
     usqInt newObj1;
     usqInt numBytes;
     usqInt numSlots;
@@ -57427,13 +57425,13 @@
     sqInt obj21;
     sqInt pigBytes;
     usqInt prevFree;
-    sqInt prevFreeChunk;
+    usqInt prevFreeChunk;
     usqInt prevPrevFree;
-    sqInt prevPrevFreeChunk;
+    usqInt prevPrevFreeChunk;
     sqInt slotBytes;
     sqInt slotBytes1;
     usqInt there;
-    sqInt thisFreeChunk;
+    usqInt thisFreeChunk;
     sqInt usedChunk;
 
 	here = startAddress;
@@ -60658,8 +60656,8 @@
     sqInt prevPrevObj;
     sqInt prevPrevObj1;
     sqInt ptr;
-    usqInt savedInHashes;
-    usqInt savedOutHashes;
+    sqInt savedInHashes;
+    sqInt savedOutHashes;
     sqInt segAddr;
     sqInt segStart;
     sqInt slotBytes;
@@ -61126,13 +61124,13 @@
 /*	Answer a new String copied from a null-terminated C string,
 	or nil if out of memory. */
 
-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;
 
@@ -62048,7 +62046,7 @@
     sqInt largeChild;
     sqInt newEndOfMemory;
     sqInt next;
-    usqInt node;
+    sqInt node;
     SpurSegmentInfo *seg;
     sqInt smallChild;
     sqInt treeNode;
@@ -73580,7 +73578,7 @@
     sqInt sp1;
     sqInt stSize;
     sqInt totalLength;
-    sqInt valueToStore;
+    usqInt valueToStore;
 
 	hdr = long64At(array);
 	fmt = (((unsigned sqLong)hdr) >> 24) & 0x1F;
@@ -74843,8 +74841,8 @@
     sqInt totalLength;
     sqInt totalLength1;
     sqInt value;
-    sqInt valueToStore;
-    sqInt valueToStore1;
+    usqInt valueToStore;
+    usqInt valueToStore1;
 
 	value = longAt(GIV(stackPointer));
 	index = longAt(GIV(stackPointer) + (1 * BytesPerWord));
@@ -76616,7 +76614,7 @@
     sqInt rcvr;
     char *sp;
     sqInt totalLength;
-    sqInt valueToStore;
+    usqInt valueToStore;
 
 	newValue = longAt(GIV(stackPointer));
 	/* begin stackIntegerValue: */
@@ -76851,7 +76849,7 @@
     sqInt header1;
     sqInt i;
     sqInt methodHeader;
-    usqInt numSlots;
+    sqInt numSlots;
     usqInt numSlots1;
     sqInt rcvr;
     char *sp;
@@ -76907,9 +76905,9 @@
 			flag("endianness");
 			assert((classIndexOf(rcvr)) > (isForwardedObjectClassIndexPun()));
 			numSlots1 = byteAt(rcvr + 7);
-			numSlots = (numSlots1 == 0xFF
-				? longAt(rcvr - BaseHeaderSize)
-				: numSlots1);
+			numSlots = ((usqInt) ((numSlots1 == 0xFF
+	? longAt(rcvr - BaseHeaderSize)
+	: numSlots1)));
 		}
 	}
 	else {

Modified: branches/Cog/spursistasrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.h	2015-04-02 16:42:51 UTC (rev 3301)
+++ branches/Cog/spursistasrc/vm/cointerp.h	2015-04-02 17:02:47 UTC (rev 3302)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1151 uuid: 4356fa11-234c-40ba-b3cc-fc9797b15238
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
  */
 
 
@@ -252,7 +252,7 @@
 sqInt splObj(sqInt index);
 usqInt storeCheckBoundary(void);
 sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
-usqInt stringForCString(const char *aCString);
+sqInt stringForCString(const char *aCString);
 void tenuringIncrementalGC(void);
 sqInt topRemappableOop(void);
 sqInt validFreeTree(void);

Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c	2015-04-02 16:42:51 UTC (rev 3301)
+++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c	2015-04-02 17:02:47 UTC (rev 3302)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1151 uuid: 4356fa11-234c-40ba-b3cc-fc9797b15238
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
    from
-	CoInterpreter VMMaker.oscog-eem.1151 uuid: 4356fa11-234c-40ba-b3cc-fc9797b15238
+	CoInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1151 uuid: 4356fa11-234c-40ba-b3cc-fc9797b15238 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -1179,7 +1179,7 @@
 static sqInt storeImageSegmentIntooutPointersroots(sqInt segmentWordArray, sqInt outPointerArray, sqInt arrayOfRoots) NoDbgRegParms;
 sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
 sqInt storePointerofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
-usqInt stringForCString(const char *aCString);
+sqInt stringForCString(const char *aCString);
 static sqInt sufficientSpaceAfterGC(sqInt numBytes) NoDbgRegParms;
 static sqInt swizzleObjStackAt(sqInt objStackRootIndex) NoDbgRegParms;
 void tenuringIncrementalGC(void);
@@ -2371,7 +2371,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 VM [CoInterpreterPrimitives VMMaker.oscog-eem.1151]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1152]";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -5632,6 +5632,7 @@
 							GIV(framePointer) = localFP;
 							
 							ceEnterCogCodePopReceiverReg();
+							null;
 							goto l228;
 						}
 						localIP = pointerForOop(longAt(localFP + FoxIFSavedIP));
@@ -5650,7 +5651,7 @@
 					/* begin fetchNextBytecode */
 					currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector);
 
-					/* return self */
+					null;
 				l228:	/* end baseFrameReturn */;
 					goto l227;
 				}
@@ -17815,7 +17816,6 @@
     sqInt delta;
     sqInt i;
     sqInt newOop;
-    sqInt numArgs;
     char *offset;
     sqInt oop;
     sqInt referent;
@@ -17884,11 +17884,9 @@
 				assert(addressIsInPage(thePage, theFP));
 				assert((theIPPtr == 0)
 				 || (addressIsInPage(thePage, ((void *)theIPPtr))));
-				/* begin frameStackedReceiverOffsetNumArgs: */
-				numArgs = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
-					? ((mframeCogMethod(theFP))->cmNumArgs)
-					: byteAt((theFP + FoxIFrameFlags) + 1));
-				offset = (FoxCallerSavedIP + BytesPerWord) + (numArgs << (shiftForWord()));
+				offset = theFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
+	? ((mframeCogMethod(theFP))->cmNumArgs)
+	: byteAt((theFP + FoxIFrameFlags) + 1))));
 				while (theSP <= offset) {
 					oop = longAt(theSP);
 					if (((oop & 3) == 0)
@@ -28938,8 +28936,8 @@
     sqInt totalLength1;
     sqInt value;
     sqInt value1;
-    sqInt valueToStore;
-    sqInt valueToStore1;
+    usqInt valueToStore;
+    usqInt valueToStore1;
 
 	/* begin commonAtPut: */
 	value = longAt(GIV(stackPointer));
@@ -30241,7 +30239,7 @@
 				GIV(needGCFlag) = 1;
 				forceInterruptCheck();
 			}
-			s = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex)));
+			s = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex);
 			goto l1;
 		}
 		if (numSlots >= 0xFF) {
@@ -35630,7 +35628,7 @@
     sqInt err;
     sqInt hash;
     sqInt instSpec;
-    usqInt newObj;
+    sqInt newObj;
     usqInt newObj1;
     usqInt numBytes;
     sqInt numSlots;
@@ -35745,7 +35743,7 @@
     sqInt i;
     sqInt instSpec;
     sqInt literalCount;
-    usqInt newObj;
+    sqInt newObj;
     usqInt newObj1;
     usqInt numBytes;
     sqInt numSlots;
@@ -38952,8 +38950,8 @@
     sqInt totalLength1;
     sqInt value;
     sqInt value1;
-    sqInt valueToStore;
-    sqInt valueToStore1;
+    usqInt valueToStore;
+    usqInt valueToStore1;
 
 	/* begin commonAtPut: */
 	value = longAt(GIV(stackPointer));
@@ -41526,7 +41524,7 @@
     sqInt fillValue;
     sqInt hash;
     sqInt instSpec;
-    usqInt newObj;
+    sqInt newObj;
     usqInt newObj1;
     usqInt numBytes;
     usqInt numSlots;
@@ -43419,7 +43417,7 @@
     sqInt entry;
     sqInt expectedIndex;
     sqInt expectedIndex1;
-    usqInt freeChunk;
+    sqInt freeChunk;
     sqInt i;
     sqInt i1;
     sqInt index;
@@ -43458,8 +43456,8 @@
     sqInt ptr1;
     sqInt ptr2;
     sqInt slotBytes;
-    usqInt smallObj;
-    usqInt start;
+    sqInt smallObj;
+    sqInt start;
 
 	classIndex = (long32At(aClass + 4)) & 0x3FFFFF;
 	if (classIndex == 0) {
@@ -46336,7 +46334,7 @@
     sqInt fmt;
     sqInt hasYoung;
     sqInt i;
-    usqInt newObj;
+    sqInt newObj;
     usqInt newObj1;
     usqInt numBytes;
     usqInt numSlots;
@@ -57436,13 +57434,13 @@
     sqInt obj21;
     sqInt pigBytes;
     usqInt prevFree;
-    sqInt prevFreeChunk;
+    usqInt prevFreeChunk;
     usqInt prevPrevFree;
-    sqInt prevPrevFreeChunk;
+    usqInt prevPrevFreeChunk;
     sqInt slotBytes;
     sqInt slotBytes1;
     usqInt there;
-    sqInt thisFreeChunk;
+    usqInt thisFreeChunk;
     sqInt usedChunk;
 
 	here = startAddress;
@@ -60667,8 +60665,8 @@
     sqInt prevPrevObj;
     sqInt prevPrevObj1;
     sqInt ptr;
-    usqInt savedInHashes;
-    usqInt savedOutHashes;
+    sqInt savedInHashes;
+    sqInt savedOutHashes;
     sqInt segAddr;
     sqInt segStart;
     sqInt slotBytes;
@@ -61135,13 +61133,13 @@
 /*	Answer a new String copied from a null-terminated C string,
 	or nil if out of memory. */
 
-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;
 
@@ -62057,7 +62055,7 @@
     sqInt largeChild;
     sqInt newEndOfMemory;
     sqInt next;
-    usqInt node;
+    sqInt node;
     SpurSegmentInfo *seg;
     sqInt smallChild;
     sqInt treeNode;
@@ -73589,7 +73587,7 @@
     sqInt sp1;
     sqInt stSize;
     sqInt totalLength;
-    sqInt valueToStore;
+    usqInt valueToStore;
 
 	hdr = long64At(array);
 	fmt = (((unsigned sqLong)hdr) >> 24) & 0x1F;
@@ -74852,8 +74850,8 @@
     sqInt totalLength;
     sqInt totalLength1;
     sqInt value;
-    sqInt valueToStore;
-    sqInt valueToStore1;
+    usqInt valueToStore;
+    usqInt valueToStore1;
 
 	value = longAt(GIV(stackPointer));
 	index = longAt(GIV(stackPointer) + (1 * BytesPerWord));
@@ -76625,7 +76623,7 @@
     sqInt rcvr;
     char *sp;
     sqInt totalLength;
-    sqInt valueToStore;
+    usqInt valueToStore;
 
 	newValue = longAt(GIV(stackPointer));
 	/* begin stackIntegerValue: */
@@ -76860,7 +76858,7 @@
     sqInt header1;
     sqInt i;
     sqInt methodHeader;
-    usqInt numSlots;
+    sqInt numSlots;
     usqInt numSlots1;
     sqInt rcvr;
     char *sp;
@@ -76916,9 +76914,9 @@
 			flag("endianness");
 			assert((classIndexOf(rcvr)) > (isForwardedObjectClassIndexPun()));
 			numSlots1 = byteAt(rcvr + 7);
-			numSlots = (numSlots1 == 0xFF
-				? longAt(rcvr - BaseHeaderSize)
-				: numSlots1);
+			numSlots = ((usqInt) ((numSlots1 == 0xFF
+	? longAt(rcvr - BaseHeaderSize)
+	: numSlots1)));
 		}
 	}
 	else {

Modified: branches/Cog/spursrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/cointerp.c	2015-04-02 16:42:51 UTC (rev 3301)
+++ branches/Cog/spursrc/vm/cointerp.c	2015-04-02 17:02:47 UTC (rev 3302)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
    from
-	CoInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2
+	CoInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -1167,7 +1167,7 @@
 static sqInt storeImageSegmentIntooutPointersroots(sqInt segmentWordArray, sqInt outPointerArray, sqInt arrayOfRoots) NoDbgRegParms;
 sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
 sqInt storePointerofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
-sqInt stringForCString(const char *aCString);
+usqInt stringForCString(const char *aCString);
 static sqInt sufficientSpaceAfterGC(sqInt numBytes) NoDbgRegParms;
 static sqInt swizzleObjStackAt(sqInt objStackRootIndex) NoDbgRegParms;
 void tenuringIncrementalGC(void);
@@ -2357,7 +2357,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 VM [CoInterpreterPrimitives VMMaker.oscog-eem.1147]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1152]";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -12985,7 +12985,6 @@
     sqInt delta;
     sqInt i;
     sqInt newOop;
-    sqInt numArgs;
     char *offset;
     sqInt oop;
     sqInt referent;
@@ -13054,11 +13053,9 @@
 				assert(addressIsInPage(thePage, theFP));
 				assert((theIPPtr == 0)
 				 || (addressIsInPage(thePage, ((void *)theIPPtr))));
-				/* begin frameStackedReceiverOffsetNumArgs: */
-				numArgs = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
-					? ((mframeCogMethod(theFP))->cmNumArgs)
-					: byteAt((theFP + FoxIFrameFlags) + 1));
-				offset = (FoxCallerSavedIP + BytesPerWord) + (numArgs << (shiftForWord()));
+				offset = theFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
+	? ((mframeCogMethod(theFP))->cmNumArgs)
+	: byteAt((theFP + FoxIFrameFlags) + 1))));
 				while (theSP <= offset) {
 					oop = longAt(theSP);
 					if (((oop & 3) == 0)
@@ -24035,8 +24032,8 @@
     sqInt totalLength1;
     sqInt value;
     sqInt value1;
-    usqInt valueToStore;
-    usqInt valueToStore1;
+    sqInt valueToStore;
+    sqInt valueToStore1;
 
 	/* begin commonAtPut: */
 	value = longAt(GIV(stackPointer));
@@ -25289,7 +25286,7 @@
     usqInt newObj;
     usqInt numBytes;
     sqInt numSlots;
-    sqInt s;
+    usqInt s;
     char *sp;
     sqInt sz;
 
@@ -25338,7 +25335,7 @@
 				GIV(needGCFlag) = 1;
 				forceInterruptCheck();
 			}
-			s = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex)));
+			s = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex);
 			goto l1;
 		}
 		if (numSlots >= 0xFF) {
@@ -34040,8 +34037,8 @@
     sqInt totalLength1;
     sqInt value;
     sqInt value1;
-    usqInt valueToStore;
-    usqInt valueToStore1;
+    sqInt valueToStore;
+    sqInt valueToStore1;
 
 	/* begin commonAtPut: */
 	value = longAt(GIV(stackPointer));
@@ -36614,7 +36611,7 @@
     sqInt fillValue;
     sqInt hash;
     sqInt instSpec;
-    usqInt newObj;
+    sqInt newObj;
     usqInt newObj1;
     usqInt numBytes;
     usqInt numSlots;
@@ -36715,7 +36712,7 @@
 				GIV(needGCFlag) = 1;
 				forceInterruptCheck();
 			}
-			newObj = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex);
+			newObj = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex)));
 			goto l1;
 		}
 		if (numSlots >= 0xFF) {
@@ -38547,7 +38544,7 @@
     sqInt ptr2;
     sqInt slotBytes;
     usqInt smallObj;
-    usqInt start;
+    sqInt start;
 
 	classIndex = (long32At(aClass + 4)) & 0x3FFFFF;
 	if (classIndex == 0) {
@@ -56207,7 +56204,7 @@
 /*	Answer a new String copied from a null-terminated C string,
 	or nil if out of memory. */
 
-sqInt
+usqInt
 stringForCString(const char *aCString)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
     sqInt formatField;
@@ -56898,7 +56895,7 @@
 bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
 {
     sqInt bridgeSpan;
-    sqInt clifton;
+    usqInt clifton;
     usqInt segEnd;
 
 	segEnd = ((aSegment->segSize)) + ((aSegment->segStart));
@@ -68627,7 +68624,7 @@
     sqInt sp1;
     sqInt stSize;
     sqInt totalLength;
-    usqInt valueToStore;
+    sqInt valueToStore;
 
 	hdr = long64At(array);
 	fmt = (((unsigned sqLong)hdr) >> 24) & 0x1F;
@@ -69890,8 +69887,8 @@
     sqInt totalLength;
     sqInt totalLength1;
     sqInt value;
-    usqInt valueToStore;
-    usqInt valueToStore1;
+    sqInt valueToStore;
+    sqInt valueToStore1;
 
 	value = longAt(GIV(stackPointer));
 	index = longAt(GIV(stackPointer) + (1 * BytesPerWord));
@@ -71663,7 +71660,7 @@
     sqInt rcvr;
     char *sp;
     sqInt totalLength;
-    usqInt valueToStore;
+    sqInt valueToStore;
 
 	newValue = longAt(GIV(stackPointer));
 	/* begin stackIntegerValue: */

Modified: branches/Cog/spursrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursrc/vm/cointerp.h	2015-04-02 16:42:51 UTC (rev 3301)
+++ branches/Cog/spursrc/vm/cointerp.h	2015-04-02 17:02:47 UTC (rev 3302)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
  */
 
 
@@ -250,7 +250,7 @@
 sqInt splObj(sqInt index);
 usqInt storeCheckBoundary(void);
 sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
-sqInt stringForCString(const char *aCString);
+usqInt stringForCString(const char *aCString);
 void tenuringIncrementalGC(void);
 sqInt topRemappableOop(void);
 sqInt validFreeTree(void);

Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/gcc3x-cointerp.c	2015-04-02 16:42:51 UTC (rev 3301)
+++ branches/Cog/spursrc/vm/gcc3x-cointerp.c	2015-04-02 17:02:47 UTC (rev 3302)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
    from
-	CoInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2
+	CoInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -1170,7 +1170,7 @@
 static sqInt storeImageSegmentIntooutPointersroots(sqInt segmentWordArray, sqInt outPointerArray, sqInt arrayOfRoots) NoDbgRegParms;
 sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
 sqInt storePointerofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
-sqInt stringForCString(const char *aCString);
+usqInt stringForCString(const char *aCString);
 static sqInt sufficientSpaceAfterGC(sqInt numBytes) NoDbgRegParms;
 static sqInt swizzleObjStackAt(sqInt objStackRootIndex) NoDbgRegParms;
 void tenuringIncrementalGC(void);
@@ -2360,7 +2360,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 VM [CoInterpreterPrimitives VMMaker.oscog-eem.1147]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1152]";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -12994,7 +12994,6 @@
     sqInt delta;
     sqInt i;
     sqInt newOop;
-    sqInt numArgs;
     char *offset;
     sqInt oop;
     sqInt referent;
@@ -13063,11 +13062,9 @@
 				assert(addressIsInPage(thePage, theFP));
 				assert((theIPPtr == 0)
 				 || (addressIsInPage(thePage, ((void *)theIPPtr))));
-				/* begin frameStackedReceiverOffsetNumArgs: */
-				numArgs = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
-					? ((mframeCogMethod(theFP))->cmNumArgs)
-					: byteAt((theFP + FoxIFrameFlags) + 1));
-				offset = (FoxCallerSavedIP + BytesPerWord) + (numArgs << (shiftForWord()));
+				offset = theFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
+	? ((mframeCogMethod(theFP))->cmNumArgs)
+	: byteAt((theFP + FoxIFrameFlags) + 1))));
 				while (theSP <= offset) {
 					oop = longAt(theSP);
 					if (((oop & 3) == 0)
@@ -24044,8 +24041,8 @@
     sqInt totalLength1;
     sqInt value;
     sqInt value1;
-    usqInt valueToStore;
-    usqInt valueToStore1;
+    sqInt valueToStore;
+    sqInt valueToStore1;
 
 	/* begin commonAtPut: */
 	value = longAt(GIV(stackPointer));
@@ -25298,7 +25295,7 @@
     usqInt newObj;
     usqInt numBytes;
     sqInt numSlots;
-    sqInt s;
+    usqInt s;
     char *sp;
     sqInt sz;
 
@@ -25347,7 +25344,7 @@
 				GIV(needGCFlag) = 1;
 				forceInterruptCheck();
 			}
-			s = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex)));
+			s = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex);
 			goto l1;
 		}
 		if (numSlots >= 0xFF) {
@@ -34049,8 +34046,8 @@
     sqInt totalLength1;
     sqInt value;
     sqInt value1;
-    usqInt valueToStore;
-    usqInt valueToStore1;
+    sqInt valueToStore;
+    sqInt valueToStore1;
 
 	/* begin commonAtPut: */
 	value = longAt(GIV(stackPointer));
@@ -36623,7 +36620,7 @@
     sqInt fillValue;
     sqInt hash;
     sqInt instSpec;
-    usqInt newObj;
+    sqInt newObj;
     usqInt newObj1;
     usqInt numBytes;
     usqInt numSlots;
@@ -36724,7 +36721,7 @@
 				GIV(needGCFlag) = 1;
 				forceInterruptCheck();
 			}
-			newObj = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex);
+			newObj = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex)));
 			goto l1;
 		}
 		if (numSlots >= 0xFF) {
@@ -38556,7 +38553,7 @@
     sqInt ptr2;
     sqInt slotBytes;
     usqInt smallObj;
-    usqInt start;
+    sqInt start;
 
 	classIndex = (long32At(aClass + 4)) & 0x3FFFFF;
 	if (classIndex == 0) {
@@ -56216,7 +56213,7 @@
 /*	Answer a new String copied from a null-terminated C string,
 	or nil if out of memory. */
 
-sqInt
+usqInt
 stringForCString(const char *aCString)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
     sqInt formatField;
@@ -56907,7 +56904,7 @@
 bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
 {
     sqInt bridgeSpan;
-    sqInt clifton;
+    usqInt clifton;
     usqInt segEnd;
 
 	segEnd = ((aSegment->segSize)) + ((aSegment->segStart));
@@ -68636,7 +68633,7 @@
     sqInt sp1;
     sqInt stSize;
     sqInt totalLength;
-    usqInt valueToStore;
+    sqInt valueToStore;
 
 	hdr = long64At(array);
 	fmt = (((unsigned sqLong)hdr) >> 24) & 0x1F;
@@ -69899,8 +69896,8 @@
     sqInt totalLength;
     sqInt totalLength1;
     sqInt value;
-    usqInt valueToStore;
-    usqInt valueToStore1;
+    sqInt valueToStore;
+    sqInt valueToStore1;
 
 	value = longAt(GIV(stackPointer));
 	index = longAt(GIV(stackPointer) + (1 * BytesPerWord));
@@ -71672,7 +71669,7 @@
     sqInt rcvr;
     char *sp;
     sqInt totalLength;
-    usqInt valueToStore;
+    sqInt valueToStore;
 
 	newValue = longAt(GIV(stackPointer));
 	/* begin stackIntegerValue: */

Modified: branches/Cog/spurstack64src/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/spurstack64src/vm/gcc3x-interp.c	2015-04-02 16:42:51 UTC (rev 3301)
+++ branches/Cog/spurstack64src/vm/gcc3x-interp.c	2015-04-02 17:02:47 UTC (rev 3302)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
    from
-	StackInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2
+	StackInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2136,7 +2136,7 @@
 	/* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1147]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1152]";
 volatile int sendTrace;
 sqInt suppressHeartbeatFlag;
 

Modified: branches/Cog/spurstack64src/vm/interp.c
===================================================================
--- branches/Cog/spurstack64src/vm/interp.c	2015-04-02 16:42:51 UTC (rev 3301)
+++ branches/Cog/spurstack64src/vm/interp.c	2015-04-02 17:02:47 UTC (rev 3302)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
    from
-	StackInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2
+	StackInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2133,7 +2133,7 @@
 	/* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1147]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1152]";
 volatile int sendTrace;
 sqInt suppressHeartbeatFlag;
 

Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/spurstacksrc/vm/gcc3x-interp.c	2015-04-02 16:42:51 UTC (rev 3301)
+++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c	2015-04-02 17:02:47 UTC (rev 3302)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
    from
-	StackInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2
+	StackInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2107,7 +2107,7 @@
 	/* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1147]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1152]";
 volatile int sendTrace;
 sqInt suppressHeartbeatFlag;
 

Modified: branches/Cog/spurstacksrc/vm/interp.c
===================================================================
--- branches/Cog/spurstacksrc/vm/interp.c	2015-04-02 16:42:51 UTC (rev 3301)
+++ branches/Cog/spurstacksrc/vm/interp.c	2015-04-02 17:02:47 UTC (rev 3302)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
    from
-	StackInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2
+	StackInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2104,7 +2104,7 @@
 	/* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1147]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1152]";
 volatile int sendTrace;
 sqInt suppressHeartbeatFlag;
 

Modified: branches/Cog/src/vm/cointerp.c
===================================================================
--- branches/Cog/src/vm/cointerp.c	2015-04-02 16:42:51 UTC (rev 3301)
+++ branches/Cog/src/vm/cointerp.c	2015-04-02 17:02:47 UTC (rev 3302)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
    from
-	CoInterpreter VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2
+	CoInterpreter VMMaker.oscog-eem.1152 uuid: 9ca91213-b542-43ee-8410-354257eaa7b1
  */

@@ Diff output truncated at 50000 characters. @@


More information about the Vm-dev mailing list