[Vm-dev] [commit][3624] CogVM source as per VMMaker.oscog-eem.1689

commits at squeakvm.org commits at squeakvm.org
Sun Feb 21 04:45:47 UTC 2016


Revision: 3624
Author:   eliot
Date:     2016-02-20 20:45:39 -0800 (Sat, 20 Feb 2016)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.1689

ThreadedFFIPlugin:
Arrange that the plugin includes sqFFI.h, but defines ThreadedFFIPlugin as 1
before hand so as to prevent sqFFI.h from declaring the old API.  This allows
the preambleCCode to eliminate its declarations of the surface functions, which
(of course) fall foul of using ints where longts must be used on 64-bits.
Since sqFFI.h declares these functions and is included everywhere relevant
it is the gospel here.

StackInterpreter: Eliminate warnings from followForwardingPointersInStackZone:
by following the approach taken by the CoInterpreter's version.

Modified Paths:
--------------
    branches/Cog/nsspur64src/vm/cogit.h
    branches/Cog/nsspur64src/vm/cointerp.c
    branches/Cog/nsspur64src/vm/cointerp.h
    branches/Cog/nsspur64src/vm/gcc3x-cointerp.c
    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/spur64src/vm/cogit.h
    branches/Cog/spur64src/vm/cointerp.c
    branches/Cog/spur64src/vm/cointerp.h
    branches/Cog/spur64src/vm/gcc3x-cointerp.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/plugins/SqueakFFIPrims/ARM32FFIPlugin.c
    branches/Cog/src/plugins/SqueakFFIPrims/IA32FFIPlugin.c
    branches/Cog/src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c
    branches/Cog/src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c
    branches/Cog/src/vm/cogit.h
    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

Added Paths:
-----------
    branches/Cog/build.linux64x64/makeallsqueak

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

Copied: branches/Cog/build.linux64x64/makeallsqueak (from rev 3604, branches/Cog/build.linux64x64/makeall)
===================================================================
--- branches/Cog/build.linux64x64/makeallsqueak	                        (rev 0)
+++ branches/Cog/build.linux64x64/makeallsqueak	2016-02-21 04:45:39 UTC (rev 3624)
@@ -0,0 +1,9 @@
+#!/bin/bash
+trap 'exit 2' HUP INT PIPE TERM
+for d in squeak.*; do
+	if test -d "$d"; then
+		(cd ./$d;./makealldirty "$@")
+	else
+		echo no $d directory found
+	fi
+done

Modified: branches/Cog/nsspur64src/vm/cogit.h
===================================================================
--- branches/Cog/nsspur64src/vm/cogit.h	2016-02-21 04:23:34 UTC (rev 3623)
+++ branches/Cog/nsspur64src/vm/cogit.h	2016-02-21 04:45:39 UTC (rev 3624)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23
+	CCodeGenerator VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
  */
 
 

Modified: branches/Cog/nsspur64src/vm/cointerp.c
===================================================================
--- branches/Cog/nsspur64src/vm/cointerp.c	2016-02-21 04:23:34 UTC (rev 3623)
+++ branches/Cog/nsspur64src/vm/cointerp.c	2016-02-21 04:45:39 UTC (rev 3624)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
    from
-	CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+	CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2442,7 +2442,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.1685";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1689";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -19059,6 +19059,8 @@
 		thePage = stackPageAtpages(i, GIV(pages));
 		if (!(((thePage->baseFP)) == 0)) {
 			assert(ifCurrentStackPageHasValidHeadPointers(thePage));
+
+			/* Skip the instruction pointer on top of stack of inactive pages. */
 			theFP = (thePage->headFP);
 			theIPPtr = (thePage == GIV(stackPage)
 				? 0
@@ -61536,7 +61538,7 @@
     usqInt prevFree;
     usqInt prevFreeChunk;
     usqInt prevPrevFree;
-    usqInt prevPrevFreeChunk;
+    sqInt prevPrevFreeChunk;
     sqInt slotBytes;
     sqInt slotBytes1;
     usqInt there;
@@ -67273,7 +67275,7 @@
 static sqInt NoDbgRegParms
 readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
-    sqInt bridge;
+    usqInt bridge;
     usqInt bridgehead;
     usqLong bridgeSpan;
     sqInt bytesRead;

Modified: branches/Cog/nsspur64src/vm/cointerp.h
===================================================================
--- branches/Cog/nsspur64src/vm/cointerp.h	2016-02-21 04:23:34 UTC (rev 3623)
+++ branches/Cog/nsspur64src/vm/cointerp.h	2016-02-21 04:45:39 UTC (rev 3624)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
  */
 
 

Modified: branches/Cog/nsspur64src/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nsspur64src/vm/gcc3x-cointerp.c	2016-02-21 04:23:34 UTC (rev 3623)
+++ branches/Cog/nsspur64src/vm/gcc3x-cointerp.c	2016-02-21 04:45:39 UTC (rev 3624)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
    from
-	CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+	CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2445,7 +2445,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.1685";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1689";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -19068,6 +19068,8 @@
 		thePage = stackPageAtpages(i, GIV(pages));
 		if (!(((thePage->baseFP)) == 0)) {
 			assert(ifCurrentStackPageHasValidHeadPointers(thePage));
+
+			/* Skip the instruction pointer on top of stack of inactive pages. */
 			theFP = (thePage->headFP);
 			theIPPtr = (thePage == GIV(stackPage)
 				? 0
@@ -61545,7 +61547,7 @@
     usqInt prevFree;
     usqInt prevFreeChunk;
     usqInt prevPrevFree;
-    usqInt prevPrevFreeChunk;
+    sqInt prevPrevFreeChunk;
     sqInt slotBytes;
     sqInt slotBytes1;
     usqInt there;
@@ -67282,7 +67284,7 @@
 static sqInt NoDbgRegParms
 readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
-    sqInt bridge;
+    usqInt bridge;
     usqInt bridgehead;
     usqLong bridgeSpan;
     sqInt bytesRead;

Modified: branches/Cog/nsspursrc/vm/cogit.h
===================================================================
--- branches/Cog/nsspursrc/vm/cogit.h	2016-02-21 04:23:34 UTC (rev 3623)
+++ branches/Cog/nsspursrc/vm/cogit.h	2016-02-21 04:45:39 UTC (rev 3624)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23
+	CCodeGenerator VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
  */
 
 

Modified: branches/Cog/nsspursrc/vm/cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.c	2016-02-21 04:23:34 UTC (rev 3623)
+++ branches/Cog/nsspursrc/vm/cointerp.c	2016-02-21 04:45:39 UTC (rev 3624)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
    from
-	CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+	CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2411,7 +2411,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.1685";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1689";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -18388,6 +18388,8 @@
 		thePage = stackPageAtpages(i, GIV(pages));
 		if (!(((thePage->baseFP)) == 0)) {
 			assert(ifCurrentStackPageHasValidHeadPointers(thePage));
+
+			/* Skip the instruction pointer on top of stack of inactive pages. */
 			theFP = (thePage->headFP);
 			theIPPtr = (thePage == GIV(stackPage)
 				? 0
@@ -66221,7 +66223,7 @@
     sqInt limit;
     sqInt newEndOfMemory;
     sqInt next;
-    usqInt node;
+    sqInt node;
     usqInt numSlots;
     usqInt numSlots1;
     SpurSegmentInfo *seg;
@@ -66350,7 +66352,7 @@
 static sqInt NoDbgRegParms
 readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
-    sqInt bridge;
+    usqInt bridge;
     usqInt bridgehead;
     usqInt bridgeSpan;
     sqInt bytesRead;

Modified: branches/Cog/nsspursrc/vm/cointerp.h
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.h	2016-02-21 04:23:34 UTC (rev 3623)
+++ branches/Cog/nsspursrc/vm/cointerp.h	2016-02-21 04:45:39 UTC (rev 3624)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
  */
 
 

Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c	2016-02-21 04:23:34 UTC (rev 3623)
+++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c	2016-02-21 04:45:39 UTC (rev 3624)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
    from
-	CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+	CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2414,7 +2414,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.1685";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1689";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -18397,6 +18397,8 @@
 		thePage = stackPageAtpages(i, GIV(pages));
 		if (!(((thePage->baseFP)) == 0)) {
 			assert(ifCurrentStackPageHasValidHeadPointers(thePage));
+
+			/* Skip the instruction pointer on top of stack of inactive pages. */
 			theFP = (thePage->headFP);
 			theIPPtr = (thePage == GIV(stackPage)
 				? 0
@@ -66230,7 +66232,7 @@
     sqInt limit;
     sqInt newEndOfMemory;
     sqInt next;
-    usqInt node;
+    sqInt node;
     usqInt numSlots;
     usqInt numSlots1;
     SpurSegmentInfo *seg;
@@ -66359,7 +66361,7 @@
 static sqInt NoDbgRegParms
 readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
-    sqInt bridge;
+    usqInt bridge;
     usqInt bridgehead;
     usqInt bridgeSpan;
     sqInt bytesRead;

Modified: branches/Cog/nsspurstack64src/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/nsspurstack64src/vm/gcc3x-interp.c	2016-02-21 04:23:34 UTC (rev 3623)
+++ branches/Cog/nsspurstack64src/vm/gcc3x-interp.c	2016-02-21 04:45:39 UTC (rev 3624)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
    from
-	StackInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+	StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2185,7 +2185,7 @@
 	/* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1685";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1689";
 volatile int sendTrace;
 sqInt suppressHeartbeatFlag;
 
@@ -57795,14 +57795,14 @@
     sqInt delta;
     sqInt i;
     sqInt newOop;
+    sqInt offset;
     sqInt oop;
-    sqInt ptr;
     sqInt referent;
     sqInt referent1;
     sqInt referent2;
     sqInt referent3;
     char *theFP;
-    char *theIPPtr;
+    usqInt theIPPtr;
     StackPage *thePage;
 
 	/* begin externalWriteBackHeadFramePointers */
@@ -57819,7 +57819,7 @@
 	assert(pageListIsWellFormed());
 	if (theBecomeEffectsFlags & BecameCompiledMethodFlag) {
 		if (((longAt(GIV(method))) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) {
-			theIPPtr = GIV(instructionPointer) - GIV(method);
+			theIPPtr = GIV(instructionPointer) - (((void *)GIV(method)));
 			/* begin followForwarded: */
 			assert(isUnambiguouslyForwarder(GIV(method)));
 			referent = longAt((GIV(method) + BaseHeaderSize) + (0LL << (shiftForWord())));
@@ -57853,11 +57853,11 @@
 			theFP = (thePage->headFP);
 			theIPPtr = (thePage == GIV(stackPage)
 				? 0
-				: (thePage->headSP));
+				: ((usqInt)((thePage->headSP))));
 			while (1) {
 				assert(addressIsInPage(thePage, theFP));
 				assert((theIPPtr == 0)
-				 || (addressIsInPage(thePage, theIPPtr)));
+				 || (addressIsInPage(thePage, ((void *)theIPPtr))));
 				oop = longAt(theFP + FoxReceiver);
 				if (((oop & (tagMask())) == 0)
 				 && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) {
@@ -57884,14 +57884,14 @@
 					}
 					longAtput(theFP + FoxMethod, (oop = newOop));
 				}
-				ptr = ((sqInt)(theFP + ((FoxCallerSavedIP + BytesPerWord) + (((long)(byteAt((theFP + FoxFrameFlags) + 1))) << (shiftForWord())))));
-				oop = longAt(ptr);
+				offset = (FoxCallerSavedIP + BytesPerWord) + (((long)(byteAt((theFP + FoxFrameFlags) + 1))) << (shiftForWord()));
+				oop = longAt(theFP + offset);
 				if (((oop & (tagMask())) == 0)
 				 && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) {
-					longAtput(ptr, followForwarded(oop));
+					longAtput(theFP + offset, followForwarded(oop));
 				}
 				if (!(((callerFP = pointerForOop(longAt(theFP + FoxSavedFP)))) != 0)) break;
-				theIPPtr = ((sqInt)(theFP + FoxCallerSavedIP));
+				theIPPtr = ((usqInt)(theFP + FoxCallerSavedIP));
 				theFP = callerFP;
 			}
 			assert(theFP == ((thePage->baseFP)));

Modified: branches/Cog/nsspurstack64src/vm/interp.c
===================================================================
--- branches/Cog/nsspurstack64src/vm/interp.c	2016-02-21 04:23:34 UTC (rev 3623)
+++ branches/Cog/nsspurstack64src/vm/interp.c	2016-02-21 04:45:39 UTC (rev 3624)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
    from
-	StackInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+	StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2182,7 +2182,7 @@
 	/* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1685";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1689";
 volatile int sendTrace;
 sqInt suppressHeartbeatFlag;
 
@@ -57786,14 +57786,14 @@
     sqInt delta;
     sqInt i;
     sqInt newOop;
+    sqInt offset;
     sqInt oop;
-    sqInt ptr;
     sqInt referent;
     sqInt referent1;
     sqInt referent2;
     sqInt referent3;
     char *theFP;
-    char *theIPPtr;
+    usqInt theIPPtr;
     StackPage *thePage;
 
 	/* begin externalWriteBackHeadFramePointers */
@@ -57810,7 +57810,7 @@
 	assert(pageListIsWellFormed());
 	if (theBecomeEffectsFlags & BecameCompiledMethodFlag) {
 		if (((longAt(GIV(method))) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) {
-			theIPPtr = GIV(instructionPointer) - GIV(method);
+			theIPPtr = GIV(instructionPointer) - (((void *)GIV(method)));
 			/* begin followForwarded: */
 			assert(isUnambiguouslyForwarder(GIV(method)));
 			referent = longAt((GIV(method) + BaseHeaderSize) + (0LL << (shiftForWord())));
@@ -57844,11 +57844,11 @@
 			theFP = (thePage->headFP);
 			theIPPtr = (thePage == GIV(stackPage)
 				? 0
-				: (thePage->headSP));
+				: ((usqInt)((thePage->headSP))));
 			while (1) {
 				assert(addressIsInPage(thePage, theFP));
 				assert((theIPPtr == 0)
-				 || (addressIsInPage(thePage, theIPPtr)));
+				 || (addressIsInPage(thePage, ((void *)theIPPtr))));
 				oop = longAt(theFP + FoxReceiver);
 				if (((oop & (tagMask())) == 0)
 				 && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) {
@@ -57875,14 +57875,14 @@
 					}
 					longAtput(theFP + FoxMethod, (oop = newOop));
 				}
-				ptr = ((sqInt)(theFP + ((FoxCallerSavedIP + BytesPerWord) + (((long)(byteAt((theFP + FoxFrameFlags) + 1))) << (shiftForWord())))));
-				oop = longAt(ptr);
+				offset = (FoxCallerSavedIP + BytesPerWord) + (((long)(byteAt((theFP + FoxFrameFlags) + 1))) << (shiftForWord()));
+				oop = longAt(theFP + offset);
 				if (((oop & (tagMask())) == 0)
 				 && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) {
-					longAtput(ptr, followForwarded(oop));
+					longAtput(theFP + offset, followForwarded(oop));
 				}
 				if (!(((callerFP = pointerForOop(longAt(theFP + FoxSavedFP)))) != 0)) break;
-				theIPPtr = ((sqInt)(theFP + FoxCallerSavedIP));
+				theIPPtr = ((usqInt)(theFP + FoxCallerSavedIP));
 				theFP = callerFP;
 			}
 			assert(theFP == ((thePage->baseFP)));

Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c	2016-02-21 04:23:34 UTC (rev 3623)
+++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c	2016-02-21 04:45:39 UTC (rev 3624)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
    from
-	StackInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+	StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2155,7 +2155,7 @@
 	/* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1685";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1689";
 volatile int sendTrace;
 sqInt suppressHeartbeatFlag;
 
@@ -56528,14 +56528,14 @@
     sqInt delta;
     sqInt i;
     sqInt newOop;
+    sqInt offset;
     sqInt oop;
-    sqInt ptr;
     sqInt referent;
     sqInt referent1;
     sqInt referent2;
     sqInt referent3;
     char *theFP;
-    char *theIPPtr;
+    usqInt theIPPtr;
     StackPage *thePage;
 
 	/* begin externalWriteBackHeadFramePointers */
@@ -56552,7 +56552,7 @@
 	assert(pageListIsWellFormed());
 	if (theBecomeEffectsFlags & BecameCompiledMethodFlag) {
 		if (((longAt(GIV(method))) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) {
-			theIPPtr = GIV(instructionPointer) - GIV(method);
+			theIPPtr = GIV(instructionPointer) - (((void *)GIV(method)));
 			/* begin followForwarded: */
 			assert(isUnambiguouslyForwarder(GIV(method)));
 			referent = longAt((GIV(method) + BaseHeaderSize) + (0 << (shiftForWord())));
@@ -56586,11 +56586,11 @@
 			theFP = (thePage->headFP);
 			theIPPtr = (thePage == GIV(stackPage)
 				? 0
-				: (thePage->headSP));
+				: ((usqInt)((thePage->headSP))));
 			while (1) {
 				assert(addressIsInPage(thePage, theFP));
 				assert((theIPPtr == 0)
-				 || (addressIsInPage(thePage, theIPPtr)));
+				 || (addressIsInPage(thePage, ((void *)theIPPtr))));
 				oop = longAt(theFP + FoxReceiver);
 				if (((oop & (tagMask())) == 0)
 				 && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) {
@@ -56617,14 +56617,14 @@
 					}
 					longAtput(theFP + FoxMethod, (oop = newOop));
 				}
-				ptr = ((sqInt)(theFP + ((FoxCallerSavedIP + BytesPerWord) + ((byteAt((theFP + FoxFrameFlags) + 1)) << (shiftForWord())))));
-				oop = longAt(ptr);
+				offset = (FoxCallerSavedIP + BytesPerWord) + ((byteAt((theFP + FoxFrameFlags) + 1)) << (shiftForWord()));
+				oop = longAt(theFP + offset);
 				if (((oop & (tagMask())) == 0)
 				 && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) {
-					longAtput(ptr, followForwarded(oop));
+					longAtput(theFP + offset, followForwarded(oop));
 				}
 				if (!(((callerFP = pointerForOop(longAt(theFP + FoxSavedFP)))) != 0)) break;
-				theIPPtr = ((sqInt)(theFP + FoxCallerSavedIP));
+				theIPPtr = ((usqInt)(theFP + FoxCallerSavedIP));
 				theFP = callerFP;
 			}
 			assert(theFP == ((thePage->baseFP)));

Modified: branches/Cog/nsspurstacksrc/vm/interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/interp.c	2016-02-21 04:23:34 UTC (rev 3623)
+++ branches/Cog/nsspurstacksrc/vm/interp.c	2016-02-21 04:45:39 UTC (rev 3624)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
    from
-	StackInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+	StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2152,7 +2152,7 @@
 	/* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1685";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1689";
 volatile int sendTrace;
 sqInt suppressHeartbeatFlag;
 
@@ -56519,14 +56519,14 @@
     sqInt delta;
     sqInt i;
     sqInt newOop;
+    sqInt offset;
     sqInt oop;
-    sqInt ptr;
     sqInt referent;
     sqInt referent1;
     sqInt referent2;
     sqInt referent3;
     char *theFP;
-    char *theIPPtr;
+    usqInt theIPPtr;
     StackPage *thePage;
 
 	/* begin externalWriteBackHeadFramePointers */
@@ -56543,7 +56543,7 @@
 	assert(pageListIsWellFormed());
 	if (theBecomeEffectsFlags & BecameCompiledMethodFlag) {
 		if (((longAt(GIV(method))) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) {
-			theIPPtr = GIV(instructionPointer) - GIV(method);
+			theIPPtr = GIV(instructionPointer) - (((void *)GIV(method)));
 			/* begin followForwarded: */
 			assert(isUnambiguouslyForwarder(GIV(method)));
 			referent = longAt((GIV(method) + BaseHeaderSize) + (0 << (shiftForWord())));
@@ -56577,11 +56577,11 @@
 			theFP = (thePage->headFP);
 			theIPPtr = (thePage == GIV(stackPage)
 				? 0
-				: (thePage->headSP));
+				: ((usqInt)((thePage->headSP))));
 			while (1) {
 				assert(addressIsInPage(thePage, theFP));
 				assert((theIPPtr == 0)
-				 || (addressIsInPage(thePage, theIPPtr)));
+				 || (addressIsInPage(thePage, ((void *)theIPPtr))));
 				oop = longAt(theFP + FoxReceiver);
 				if (((oop & (tagMask())) == 0)
 				 && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) {
@@ -56608,14 +56608,14 @@
 					}
 					longAtput(theFP + FoxMethod, (oop = newOop));
 				}
-				ptr = ((sqInt)(theFP + ((FoxCallerSavedIP + BytesPerWord) + ((byteAt((theFP + FoxFrameFlags) + 1)) << (shiftForWord())))));
-				oop = longAt(ptr);
+				offset = (FoxCallerSavedIP + BytesPerWord) + ((byteAt((theFP + FoxFrameFlags) + 1)) << (shiftForWord()));
+				oop = longAt(theFP + offset);
 				if (((oop & (tagMask())) == 0)
 				 && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) {
-					longAtput(ptr, followForwarded(oop));
+					longAtput(theFP + offset, followForwarded(oop));
 				}
 				if (!(((callerFP = pointerForOop(longAt(theFP + FoxSavedFP)))) != 0)) break;
-				theIPPtr = ((sqInt)(theFP + FoxCallerSavedIP));
+				theIPPtr = ((usqInt)(theFP + FoxCallerSavedIP));
 				theFP = callerFP;
 			}
 			assert(theFP == ((thePage->baseFP)));


Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
   - Sat Feb 20 19:15:29 PST 2016
   + Sat Feb 20 20:43:54 PST 2016

Modified: branches/Cog/spur64src/vm/cogit.h
===================================================================
--- branches/Cog/spur64src/vm/cogit.h	2016-02-21 04:23:34 UTC (rev 3623)
+++ branches/Cog/spur64src/vm/cogit.h	2016-02-21 04:45:39 UTC (rev 3624)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23
+	CCodeGenerator VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
  */
 
 

Modified: branches/Cog/spur64src/vm/cointerp.c
===================================================================
--- branches/Cog/spur64src/vm/cointerp.c	2016-02-21 04:23:34 UTC (rev 3623)
+++ branches/Cog/spur64src/vm/cointerp.c	2016-02-21 04:45:39 UTC (rev 3624)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
    from
-	CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+	CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2405,7 +2405,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.1685]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1689]";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -14629,6 +14629,8 @@
 		thePage = stackPageAtpages(i, GIV(pages));
 		if (!(((thePage->baseFP)) == 0)) {
 			assert(ifCurrentStackPageHasValidHeadPointers(thePage));
+
+			/* Skip the instruction pointer on top of stack of inactive pages. */
 			theFP = (thePage->headFP);
 			theIPPtr = (thePage == GIV(stackPage)
 				? 0
@@ -62288,7 +62290,7 @@
     sqInt limit;
     sqInt newEndOfMemory;
     sqInt next;
-    sqInt node;
+    usqInt node;
     usqInt numSlots;
     usqInt numSlots1;
     SpurSegmentInfo *seg;

Modified: branches/Cog/spur64src/vm/cointerp.h
===================================================================
--- branches/Cog/spur64src/vm/cointerp.h	2016-02-21 04:23:34 UTC (rev 3623)
+++ branches/Cog/spur64src/vm/cointerp.h	2016-02-21 04:45:39 UTC (rev 3624)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
  */
 
 

Modified: branches/Cog/spur64src/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spur64src/vm/gcc3x-cointerp.c	2016-02-21 04:23:34 UTC (rev 3623)
+++ branches/Cog/spur64src/vm/gcc3x-cointerp.c	2016-02-21 04:45:39 UTC (rev 3624)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
    from
-	CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+	CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2408,7 +2408,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.1685]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1689]";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -14638,6 +14638,8 @@
 		thePage = stackPageAtpages(i, GIV(pages));
 		if (!(((thePage->baseFP)) == 0)) {
 			assert(ifCurrentStackPageHasValidHeadPointers(thePage));
+
+			/* Skip the instruction pointer on top of stack of inactive pages. */
 			theFP = (thePage->headFP);
 			theIPPtr = (thePage == GIV(stackPage)
 				? 0
@@ -62297,7 +62299,7 @@
     sqInt limit;
     sqInt newEndOfMemory;
     sqInt next;
-    sqInt node;
+    usqInt node;
     usqInt numSlots;
     usqInt numSlots1;
     SpurSegmentInfo *seg;

Modified: branches/Cog/spursistasrc/vm/cogit.h
===================================================================
--- branches/Cog/spursistasrc/vm/cogit.h	2016-02-21 04:23:34 UTC (rev 3623)
+++ branches/Cog/spursistasrc/vm/cogit.h	2016-02-21 04:45:39 UTC (rev 3624)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23
+	CCodeGenerator VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
  */
 
 

Modified: branches/Cog/spursistasrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.c	2016-02-21 04:23:34 UTC (rev 3623)
+++ branches/Cog/spursistasrc/vm/cointerp.c	2016-02-21 04:45:39 UTC (rev 3624)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
    from
-	CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+	CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2387,7 +2387,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.1685]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1689]";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -17387,6 +17387,8 @@
 		thePage = stackPageAtpages(i, GIV(pages));
 		if (!(((thePage->baseFP)) == 0)) {
 			assert(ifCurrentStackPageHasValidHeadPointers(thePage));
+
+			/* Skip the instruction pointer on top of stack of inactive pages. */
 			theFP = (thePage->headFP);
 			theIPPtr = (thePage == GIV(stackPage)
 				? 0
@@ -59237,7 +59239,7 @@
     usqInt prevFree;
     usqInt prevFreeChunk;
     usqInt prevPrevFree;
-    sqInt prevPrevFreeChunk;
+    usqInt prevPrevFreeChunk;
     sqInt slotBytes;
     sqInt slotBytes1;
     usqInt there;
@@ -64592,7 +64594,7 @@
 bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
 {
     usqInt bridgeSpan;
-    usqInt clifton;
+    sqInt clifton;
     usqInt segEnd;
 
 	segEnd = ((aSegment->segSize)) + ((aSegment->segStart));
@@ -64964,7 +64966,7 @@
 static sqInt NoDbgRegParms
 readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
-    sqInt bridge;
+    usqInt bridge;
     usqInt bridgehead;
     usqInt bridgeSpan;
     sqInt bytesRead;
@@ -65179,7 +65181,7 @@
     usqLong firstSavedBridgeWord;
     sqInt nWritten;
     usqInt pier1;
-    usqInt pier2;
+    sqInt pier2;
     usqLong secondSavedBridgeWord;
 
 	pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);

Modified: branches/Cog/spursistasrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.h	2016-02-21 04:23:34 UTC (rev 3623)
+++ branches/Cog/spursistasrc/vm/cointerp.h	2016-02-21 04:45:39 UTC (rev 3624)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
  */
 
 

Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c	2016-02-21 04:23:34 UTC (rev 3623)
+++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c	2016-02-21 04:45:39 UTC (rev 3624)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
    from
-	CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+	CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2390,7 +2390,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.1685]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1689]";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -17396,6 +17396,8 @@
 		thePage = stackPageAtpages(i, GIV(pages));
 		if (!(((thePage->baseFP)) == 0)) {
 			assert(ifCurrentStackPageHasValidHeadPointers(thePage));
+
+			/* Skip the instruction pointer on top of stack of inactive pages. */
 			theFP = (thePage->headFP);
 			theIPPtr = (thePage == GIV(stackPage)
 				? 0
@@ -59246,7 +59248,7 @@
     usqInt prevFree;
     usqInt prevFreeChunk;
     usqInt prevPrevFree;
-    sqInt prevPrevFreeChunk;
+    usqInt prevPrevFreeChunk;
     sqInt slotBytes;
     sqInt slotBytes1;
     usqInt there;
@@ -64601,7 +64603,7 @@
 bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
 {
     usqInt bridgeSpan;
-    usqInt clifton;
+    sqInt clifton;
     usqInt segEnd;
 
 	segEnd = ((aSegment->segSize)) + ((aSegment->segStart));
@@ -64973,7 +64975,7 @@
 static sqInt NoDbgRegParms
 readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
-    sqInt bridge;
+    usqInt bridge;
     usqInt bridgehead;
     usqInt bridgeSpan;
     sqInt bytesRead;
@@ -65188,7 +65190,7 @@
     usqLong firstSavedBridgeWord;
     sqInt nWritten;
     usqInt pier1;
-    usqInt pier2;
+    sqInt pier2;
     usqLong secondSavedBridgeWord;
 
 	pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);

Modified: branches/Cog/spursrc/vm/cogit.h
===================================================================
--- branches/Cog/spursrc/vm/cogit.h	2016-02-21 04:23:34 UTC (rev 3623)
+++ branches/Cog/spursrc/vm/cogit.h	2016-02-21 04:45:39 UTC (rev 3624)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23
+	CCodeGenerator VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
  */
 
 

Modified: branches/Cog/spursrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/cointerp.c	2016-02-21 04:23:34 UTC (rev 3623)
+++ branches/Cog/spursrc/vm/cointerp.c	2016-02-21 04:45:39 UTC (rev 3624)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
    from
-	CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+	CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __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 = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1685]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1689]";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -14272,6 +14272,8 @@
 		thePage = stackPageAtpages(i, GIV(pages));
 		if (!(((thePage->baseFP)) == 0)) {
 			assert(ifCurrentStackPageHasValidHeadPointers(thePage));
+
+			/* Skip the instruction pointer on top of stack of inactive pages. */
 			theFP = (thePage->headFP);
 			theIPPtr = (thePage == GIV(stackPage)
 				? 0
@@ -61675,7 +61677,7 @@
     sqInt limit;
     sqInt newEndOfMemory;
     sqInt next;
-    sqInt node;
+    usqInt node;
     usqInt numSlots;
     usqInt numSlots1;
     SpurSegmentInfo *seg;

Modified: branches/Cog/spursrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursrc/vm/cointerp.h	2016-02-21 04:23:34 UTC (rev 3623)
+++ branches/Cog/spursrc/vm/cointerp.h	2016-02-21 04:45:39 UTC (rev 3624)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
  */
 
 

Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/gcc3x-cointerp.c	2016-02-21 04:23:34 UTC (rev 3623)
+++ branches/Cog/spursrc/vm/gcc3x-cointerp.c	2016-02-21 04:45:39 UTC (rev 3624)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
    from
-	CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+	CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2377,7 +2377,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.1685]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1689]";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -14281,6 +14281,8 @@
 		thePage = stackPageAtpages(i, GIV(pages));
 		if (!(((thePage->baseFP)) == 0)) {
 			assert(ifCurrentStackPageHasValidHeadPointers(thePage));
+
+			/* Skip the instruction pointer on top of stack of inactive pages. */
 			theFP = (thePage->headFP);
 			theIPPtr = (thePage == GIV(stackPage)
 				? 0
@@ -61684,7 +61686,7 @@
     sqInt limit;
     sqInt newEndOfMemory;
     sqInt next;
-    sqInt node;
+    usqInt node;
     usqInt numSlots;
     usqInt numSlots1;
     SpurSegmentInfo *seg;

Modified: branches/Cog/spurstack64src/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/spurstack64src/vm/gcc3x-interp.c	2016-02-21 04:23:34 UTC (rev 3623)
+++ branches/Cog/spurstack64src/vm/gcc3x-interp.c	2016-02-21 04:45:39 UTC (rev 3624)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
    from
-	StackInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+	StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2149,7 +2149,7 @@
 	/* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1685]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1689]";
 volatile int sendTrace;
 sqInt suppressHeartbeatFlag;
 
@@ -53636,14 +53636,14 @@
     sqInt delta;
     sqInt i;
     sqInt newOop;
+    sqInt offset;
     sqInt oop;
-    sqInt ptr;
     sqInt referent;
     sqInt referent1;
     sqInt referent2;
     sqInt referent3;
     char *theFP;
-    char *theIPPtr;
+    usqInt theIPPtr;
     StackPage *thePage;
 
 	/* begin externalWriteBackHeadFramePointers */
@@ -53660,7 +53660,7 @@
 	assert(pageListIsWellFormed());
 	if (theBecomeEffectsFlags & BecameCompiledMethodFlag) {
 		if (((longAt(GIV(method))) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) {
-			theIPPtr = GIV(instructionPointer) - GIV(method);
+			theIPPtr = GIV(instructionPointer) - (((void *)GIV(method)));
 			/* begin followForwarded: */
 			assert(isUnambiguouslyForwarder(GIV(method)));
 			referent = longAt((GIV(method) + BaseHeaderSize) + (0LL << (shiftForWord())));
@@ -53694,11 +53694,11 @@
 			theFP = (thePage->headFP);
 			theIPPtr = (thePage == GIV(stackPage)
 				? 0
-				: (thePage->headSP));
+				: ((usqInt)((thePage->headSP))));
 			while (1) {
 				assert(addressIsInPage(thePage, theFP));
 				assert((theIPPtr == 0)
-				 || (addressIsInPage(thePage, theIPPtr)));
+				 || (addressIsInPage(thePage, ((void *)theIPPtr))));
 				oop = longAt(theFP + FoxReceiver);
 				if (((oop & (tagMask())) == 0)
 				 && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) {
@@ -53725,14 +53725,14 @@
 					}
 					longAtput(theFP + FoxMethod, (oop = newOop));
 				}
-				ptr = ((sqInt)(theFP + ((FoxCallerSavedIP + BytesPerWord) + (((long)(byteAt((theFP + FoxFrameFlags) + 1))) << (shiftForWord())))));
-				oop = longAt(ptr);
+				offset = (FoxCallerSavedIP + BytesPerWord) + (((long)(byteAt((theFP + FoxFrameFlags) + 1))) << (shiftForWord()));
+				oop = longAt(theFP + offset);
 				if (((oop & (tagMask())) == 0)
 				 && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) {
-					longAtput(ptr, followForwarded(oop));
+					longAtput(theFP + offset, followForwarded(oop));
 				}
 				if (!(((callerFP = pointerForOop(longAt(theFP + FoxSavedFP)))) != 0)) break;
-				theIPPtr = ((sqInt)(theFP + FoxCallerSavedIP));
+				theIPPtr = ((usqInt)(theFP + FoxCallerSavedIP));
 				theFP = callerFP;
 			}
 			assert(theFP == ((thePage->baseFP)));

Modified: branches/Cog/spurstack64src/vm/interp.c
===================================================================
--- branches/Cog/spurstack64src/vm/interp.c	2016-02-21 04:23:34 UTC (rev 3623)
+++ branches/Cog/spurstack64src/vm/interp.c	2016-02-21 04:45:39 UTC (rev 3624)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
    from
-	StackInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+	StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2146,7 +2146,7 @@
 	/* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1685]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1689]";
 volatile int sendTrace;
 sqInt suppressHeartbeatFlag;
 
@@ -53627,14 +53627,14 @@
     sqInt delta;
     sqInt i;
     sqInt newOop;
+    sqInt offset;
     sqInt oop;
-    sqInt ptr;
     sqInt referent;
     sqInt referent1;
     sqInt referent2;
     sqInt referent3;
     char *theFP;
-    char *theIPPtr;
+    usqInt theIPPtr;
     StackPage *thePage;
 
 	/* begin externalWriteBackHeadFramePointers */
@@ -53651,7 +53651,7 @@
 	assert(pageListIsWellFormed());
 	if (theBecomeEffectsFlags & BecameCompiledMethodFlag) {
 		if (((longAt(GIV(method))) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) {
-			theIPPtr = GIV(instructionPointer) - GIV(method);
+			theIPPtr = GIV(instructionPointer) - (((void *)GIV(method)));
 			/* begin followForwarded: */
 			assert(isUnambiguouslyForwarder(GIV(method)));
 			referent = longAt((GIV(method) + BaseHeaderSize) + (0LL << (shiftForWord())));
@@ -53685,11 +53685,11 @@
 			theFP = (thePage->headFP);
 			theIPPtr = (thePage == GIV(stackPage)
 				? 0
-				: (thePage->headSP));
+				: ((usqInt)((thePage->headSP))));
 			while (1) {
 				assert(addressIsInPage(thePage, theFP));
 				assert((theIPPtr == 0)
-				 || (addressIsInPage(thePage, theIPPtr)));
+				 || (addressIsInPage(thePage, ((void *)theIPPtr))));
 				oop = longAt(theFP + FoxReceiver);
 				if (((oop & (tagMask())) == 0)
 				 && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) {
@@ -53716,14 +53716,14 @@
 					}
 					longAtput(theFP + FoxMethod, (oop = newOop));
 				}
-				ptr = ((sqInt)(theFP + ((FoxCallerSavedIP + BytesPerWord) + (((long)(byteAt((theFP + FoxFrameFlags) + 1))) << (shiftForWord())))));
-				oop = longAt(ptr);
+				offset = (FoxCallerSavedIP + BytesPerWord) + (((long)(byteAt((theFP + FoxFrameFlags) + 1))) << (shiftForWord()));
+				oop = longAt(theFP + offset);
 				if (((oop & (tagMask())) == 0)
 				 && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) {
-					longAtput(ptr, followForwarded(oop));
+					longAtput(theFP + offset, followForwarded(oop));
 				}
 				if (!(((callerFP = pointerForOop(longAt(theFP + FoxSavedFP)))) != 0)) break;
-				theIPPtr = ((sqInt)(theFP + FoxCallerSavedIP));
+				theIPPtr = ((usqInt)(theFP + FoxCallerSavedIP));
 				theFP = callerFP;
 			}
 			assert(theFP == ((thePage->baseFP)));

Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/spurstacksrc/vm/gcc3x-interp.c	2016-02-21 04:23:34 UTC (rev 3623)
+++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c	2016-02-21 04:45:39 UTC (rev 3624)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
    from
-	StackInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8
+	StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1689 uuid: 4c473a09-7e78-4c59-b779-f2ad17e318ed " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2119,7 +2119,7 @@
 	/* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;

@@ Diff output truncated at 50000 characters. @@


More information about the Vm-dev mailing list