[Vm-dev] [commit][3648] CogVM source as per VMMaker.oscog-nice.1729

commits at squeakvm.org commits at squeakvm.org
Thu Mar 17 00:57:30 UTC 2016


Revision: 3648
Author:   eliot
Date:     2016-03-16 17:57:27 -0700 (Wed, 16 Mar 2016)
Log Message:
-----------
CogVM source as per VMMaker.oscog-nice.1729

Fix some printf format/argument mismatches.

Now that UUIDs are created with purely image-based code in Squeak trunk, make
the UUIDPlugin external in all Squeak Spur VMs.

Modified Paths:
--------------
    branches/Cog/build.macos32x86/squeak.cog.spur/plugins.ext
    branches/Cog/build.macos32x86/squeak.cog.spur/plugins.int
    branches/Cog/build.macos32x86/squeak.cog.spur.immutability/plugins.ext
    branches/Cog/build.macos32x86/squeak.cog.spur.immutability/plugins.int
    branches/Cog/build.macos32x86/squeak.sista.spur/plugins.ext
    branches/Cog/build.macos32x86/squeak.sista.spur/plugins.int
    branches/Cog/build.macos32x86/squeak.stack.spur/plugins.ext
    branches/Cog/build.macos32x86/squeak.stack.spur/plugins.int
    branches/Cog/build.macos64x64/squeak.cog.spur/plugins.ext
    branches/Cog/build.macos64x64/squeak.cog.spur/plugins.int
    branches/Cog/build.macos64x64/squeak.cog.spur.immutability/plugins.ext
    branches/Cog/build.macos64x64/squeak.cog.spur.immutability/plugins.int
    branches/Cog/build.macos64x64/squeak.sista.spur/plugins.ext
    branches/Cog/build.macos64x64/squeak.sista.spur/plugins.int
    branches/Cog/build.macos64x64/squeak.stack.spur/plugins.ext
    branches/Cog/build.macos64x64/squeak.stack.spur/plugins.int
    branches/Cog/build.win32x86/squeak.cog.spur/plugins.ext
    branches/Cog/build.win32x86/squeak.cog.spur/plugins.int
    branches/Cog/build.win32x86/squeak.stack.spur/plugins.ext
    branches/Cog/build.win32x86/squeak.stack.spur/plugins.int
    branches/Cog/nsspur64src/vm/cogit.h
    branches/Cog/nsspur64src/vm/cogitX64.c
    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/cogitARMv5.c
    branches/Cog/nsspursrc/vm/cogitIA32.c
    branches/Cog/nsspursrc/vm/cogitMIPSEL.c
    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/cogitX64.c
    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/cogitARMv5.c
    branches/Cog/spursistasrc/vm/cogitIA32.c
    branches/Cog/spursistasrc/vm/cogitMIPSEL.c
    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/cogitARMv5.c
    branches/Cog/spursrc/vm/cogitIA32.c
    branches/Cog/spursrc/vm/cogitMIPSEL.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/cogit.h
    branches/Cog/src/vm/cogitARMv5.c
    branches/Cog/src/vm/cogitIA32.c
    branches/Cog/src/vm/cogitMIPSEL.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/build.macos32x86/squeak.cog.spur/plugins.ext
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.spur/plugins.ext	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/build.macos32x86/squeak.cog.spur/plugins.ext	2016-03-17 00:57:27 UTC (rev 3648)
@@ -9,4 +9,5 @@
 Mpeg3Plugin \
 SqueakFFIPrims \
 SqueakSSL \
+UUIDPlugin \
 UnixOSProcessPlugin

Modified: branches/Cog/build.macos32x86/squeak.cog.spur/plugins.int
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.spur/plugins.int	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/build.macos32x86/squeak.cog.spur/plugins.int	2016-03-17 00:57:27 UTC (rev 3648)
@@ -31,7 +31,6 @@
 SoundPlugin \
 StarSqueakPlugin \
 SurfacePlugin \
-UUIDPlugin \
 VMProfileMacSupportPlugin \
 # B3DAcceleratorPlugin \
 # InternetConfigPlugin \

Modified: branches/Cog/build.macos32x86/squeak.cog.spur.immutability/plugins.ext
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.spur.immutability/plugins.ext	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/build.macos32x86/squeak.cog.spur.immutability/plugins.ext	2016-03-17 00:57:27 UTC (rev 3648)
@@ -9,4 +9,5 @@
 Mpeg3Plugin \
 SqueakFFIPrims \
 SqueakSSL \
+UUIDPlugin \
 UnixOSProcessPlugin

Modified: branches/Cog/build.macos32x86/squeak.cog.spur.immutability/plugins.int
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.spur.immutability/plugins.int	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/build.macos32x86/squeak.cog.spur.immutability/plugins.int	2016-03-17 00:57:27 UTC (rev 3648)
@@ -31,7 +31,6 @@
 SoundPlugin \
 StarSqueakPlugin \
 SurfacePlugin \
-UUIDPlugin \
 VMProfileMacSupportPlugin \
 # B3DAcceleratorPlugin \
 # InternetConfigPlugin \

Modified: branches/Cog/build.macos32x86/squeak.sista.spur/plugins.ext
===================================================================
--- branches/Cog/build.macos32x86/squeak.sista.spur/plugins.ext	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/build.macos32x86/squeak.sista.spur/plugins.ext	2016-03-17 00:57:27 UTC (rev 3648)
@@ -9,4 +9,5 @@
 Mpeg3Plugin \
 SqueakFFIPrims \
 SqueakSSL \
+UUIDPlugin \
 UnixOSProcessPlugin

Modified: branches/Cog/build.macos32x86/squeak.sista.spur/plugins.int
===================================================================
--- branches/Cog/build.macos32x86/squeak.sista.spur/plugins.int	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/build.macos32x86/squeak.sista.spur/plugins.int	2016-03-17 00:57:27 UTC (rev 3648)
@@ -29,6 +29,5 @@
 SoundPlugin \
 StarSqueakPlugin \
 SurfacePlugin \
-UUIDPlugin \
 VMProfileMacSupportPlugin \
 # JoystickTabletPlugin

Modified: branches/Cog/build.macos32x86/squeak.stack.spur/plugins.ext
===================================================================
--- branches/Cog/build.macos32x86/squeak.stack.spur/plugins.ext	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/build.macos32x86/squeak.stack.spur/plugins.ext	2016-03-17 00:57:27 UTC (rev 3648)
@@ -6,4 +6,5 @@
 Mpeg3Plugin \
 SqueakFFIPrims \
 SqueakSSL \
+UUIDPlugin \
 UnixOSProcessPlugin

Modified: branches/Cog/build.macos32x86/squeak.stack.spur/plugins.int
===================================================================
--- branches/Cog/build.macos32x86/squeak.stack.spur/plugins.int	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/build.macos32x86/squeak.stack.spur/plugins.int	2016-03-17 00:57:27 UTC (rev 3648)
@@ -29,6 +29,5 @@
 SoundPlugin \
 StarSqueakPlugin \
 SurfacePlugin \
-UUIDPlugin \
 VMProfileMacSupportPlugin \
 # JoystickTabletPlugin

Modified: branches/Cog/build.macos64x64/squeak.cog.spur/plugins.ext
===================================================================
--- branches/Cog/build.macos64x64/squeak.cog.spur/plugins.ext	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/build.macos64x64/squeak.cog.spur/plugins.ext	2016-03-17 00:57:27 UTC (rev 3648)
@@ -7,4 +7,5 @@
 Mpeg3Plugin \
 SqueakFFIPrims \
 SqueakSSL \
+UUIDPlugin \
 UnixOSProcessPlugin

Modified: branches/Cog/build.macos64x64/squeak.cog.spur/plugins.int
===================================================================
--- branches/Cog/build.macos64x64/squeak.cog.spur/plugins.int	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/build.macos64x64/squeak.cog.spur/plugins.int	2016-03-17 00:57:27 UTC (rev 3648)
@@ -29,7 +29,6 @@
 SoundPlugin \
 StarSqueakPlugin \
 SurfacePlugin \
-UUIDPlugin \
 VMProfileMacSupportPlugin \
 # B3DAcceleratorPlugin \
 # InternetConfigPlugin \

Modified: branches/Cog/build.macos64x64/squeak.cog.spur.immutability/plugins.ext
===================================================================
--- branches/Cog/build.macos64x64/squeak.cog.spur.immutability/plugins.ext	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/build.macos64x64/squeak.cog.spur.immutability/plugins.ext	2016-03-17 00:57:27 UTC (rev 3648)
@@ -7,4 +7,5 @@
 Mpeg3Plugin \
 SqueakFFIPrims \
 SqueakSSL \
+UUIDPlugin \
 UnixOSProcessPlugin

Modified: branches/Cog/build.macos64x64/squeak.cog.spur.immutability/plugins.int
===================================================================
--- branches/Cog/build.macos64x64/squeak.cog.spur.immutability/plugins.int	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/build.macos64x64/squeak.cog.spur.immutability/plugins.int	2016-03-17 00:57:27 UTC (rev 3648)
@@ -29,7 +29,6 @@
 SoundPlugin \
 StarSqueakPlugin \
 SurfacePlugin \
-UUIDPlugin \
 VMProfileMacSupportPlugin \
 # B3DAcceleratorPlugin \
 # InternetConfigPlugin \

Modified: branches/Cog/build.macos64x64/squeak.sista.spur/plugins.ext
===================================================================
--- branches/Cog/build.macos64x64/squeak.sista.spur/plugins.ext	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/build.macos64x64/squeak.sista.spur/plugins.ext	2016-03-17 00:57:27 UTC (rev 3648)
@@ -7,4 +7,5 @@
 Mpeg3Plugin \
 SqueakFFIPrims \
 SqueakSSL \
+UUIDPlugin \
 UnixOSProcessPlugin

Modified: branches/Cog/build.macos64x64/squeak.sista.spur/plugins.int
===================================================================
--- branches/Cog/build.macos64x64/squeak.sista.spur/plugins.int	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/build.macos64x64/squeak.sista.spur/plugins.int	2016-03-17 00:57:27 UTC (rev 3648)
@@ -29,7 +29,6 @@
 SoundPlugin \
 StarSqueakPlugin \
 SurfacePlugin \
-UUIDPlugin \
 VMProfileMacSupportPlugin \
 # B3DAcceleratorPlugin \
 # InternetConfigPlugin \

Modified: branches/Cog/build.macos64x64/squeak.stack.spur/plugins.ext
===================================================================
--- branches/Cog/build.macos64x64/squeak.stack.spur/plugins.ext	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/build.macos64x64/squeak.stack.spur/plugins.ext	2016-03-17 00:57:27 UTC (rev 3648)
@@ -7,4 +7,5 @@
 Mpeg3Plugin \
 SqueakFFIPrims \
 SqueakSSL \
+UUIDPlugin \
 UnixOSProcessPlugin

Modified: branches/Cog/build.macos64x64/squeak.stack.spur/plugins.int
===================================================================
--- branches/Cog/build.macos64x64/squeak.stack.spur/plugins.int	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/build.macos64x64/squeak.stack.spur/plugins.int	2016-03-17 00:57:27 UTC (rev 3648)
@@ -29,7 +29,6 @@
 SoundPlugin \
 StarSqueakPlugin \
 SurfacePlugin \
-UUIDPlugin \
 VMProfileMacSupportPlugin \
 # B3DAcceleratorPlugin \
 # InternetConfigPlugin \

Modified: branches/Cog/build.win32x86/squeak.cog.spur/plugins.ext
===================================================================
--- branches/Cog/build.win32x86/squeak.cog.spur/plugins.ext	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/build.win32x86/squeak.cog.spur/plugins.ext	2016-03-17 00:57:27 UTC (rev 3648)
@@ -5,5 +5,5 @@
 BochsIA32Plugin \
 BochsX64Plugin \
 SqueakFFIPrims \
+UUIDPlugin \
 Win32OSProcessPlugin
-

Modified: branches/Cog/build.win32x86/squeak.cog.spur/plugins.int
===================================================================
--- branches/Cog/build.win32x86/squeak.cog.spur/plugins.int	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/build.win32x86/squeak.cog.spur/plugins.int	2016-03-17 00:57:27 UTC (rev 3648)
@@ -34,5 +34,4 @@
 SoundGenerationPlugin \
 SoundPlugin \
 StarSqueakPlugin \
-SurfacePlugin \
-UUIDPlugin
+SurfacePlugin

Modified: branches/Cog/build.win32x86/squeak.stack.spur/plugins.ext
===================================================================
--- branches/Cog/build.win32x86/squeak.stack.spur/plugins.ext	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/build.win32x86/squeak.stack.spur/plugins.ext	2016-03-17 00:57:27 UTC (rev 3648)
@@ -3,5 +3,5 @@
 # See platforms/win32/plugins/SqueakSSL/Makefile
 EXTERNAL_PLUGINS = \
 SqueakFFIPrims \
+UUIDPlugin \
 Win32OSProcessPlugin
-

Modified: branches/Cog/build.win32x86/squeak.stack.spur/plugins.int
===================================================================
--- branches/Cog/build.win32x86/squeak.stack.spur/plugins.int	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/build.win32x86/squeak.stack.spur/plugins.int	2016-03-17 00:57:27 UTC (rev 3648)
@@ -34,5 +34,4 @@
 SoundGenerationPlugin \
 SoundPlugin \
 StarSqueakPlugin \
-SurfacePlugin \
-UUIDPlugin
+SurfacePlugin

Modified: branches/Cog/nsspur64src/vm/cogit.h
===================================================================
--- branches/Cog/nsspur64src/vm/cogit.h	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/nsspur64src/vm/cogit.h	2016-03-17 00:57:27 UTC (rev 3648)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe
+	CCodeGenerator VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
  */
 
 

Modified: branches/Cog/nsspur64src/vm/cogitX64.c
===================================================================
--- branches/Cog/nsspur64src/vm/cogitX64.c	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/nsspur64src/vm/cogitX64.c	2016-03-17 00:57:27 UTC (rev 3648)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe
+	CCodeGenerator VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe
+	StackToRegisterMappingCogit VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -3637,7 +3637,7 @@
 closedPICRefersToUnmarkedObject(CogMethod *cPIC)
 {
     sqInt i;
-    usqInt object;
+    sqInt object;
     sqInt pc;
 
 	if (!((isImmediate((cPIC->selector)))
@@ -5834,12 +5834,12 @@
 generateMapAtstart(sqInt addressOrNull, sqInt startAddress)
 {
     unsigned char annotation;
-    usqInt delta;
+    sqInt delta;
     sqInt i;
     AbstractInstruction *instruction;
     sqInt length;
-    usqInt location;
-    usqInt mapEntry;
+    sqInt location;
+    sqInt mapEntry;
     sqInt maxDelta;
     usqInt mcpc;
 
@@ -8549,7 +8549,7 @@
 {
     sqInt annotation;
     sqInt map;
-    sqInt mapByte;
+    unsigned char mapByte;
     sqInt mcpc;
     sqInt value;
 
@@ -9245,8 +9245,8 @@
 
 	/* begin trampolineName:numArgs:limit: */
 	theString = malloc((strlen(routinePrefix)) + 6);
-	sprintf(theString, "%s%cArgs", routinePrefix, (numArgs <= (NumSendTrampolines - 2)
-		? '0' + numArgs
+	sprintf(theString, "%s%cArgs", routinePrefix, ((((int) numArgs)) <= (NumSendTrampolines - 2)
+		? '0' + (((int) numArgs))
 		: 'N'));
 	return theString;
 }
@@ -9259,8 +9259,8 @@
 
 	/* begin trampolineName:numArgs:limit: */
 	theString = malloc((strlen(routinePrefix)) + 6);
-	sprintf(theString, "%s%cArgs", routinePrefix, (numArgs <= 2
-		? '0' + numArgs
+	sprintf(theString, "%s%cArgs", routinePrefix, ((((int) numArgs)) <= 2
+		? '0' + (((int) numArgs))
 		: 'N'));
 	return theString;
 }

Modified: branches/Cog/nsspur64src/vm/cointerp.c
===================================================================
--- branches/Cog/nsspur64src/vm/cointerp.c	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/nsspur64src/vm/cointerp.c	2016-03-17 00:57:27 UTC (rev 3648)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe
+	CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
    from
-	CoInterpreter VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe
+	CoInterpreter VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2439,7 +2439,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.1722";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-nice.1729";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -61269,7 +61269,7 @@
     usqInt prevFree;
     usqInt prevFreeChunk;
     usqInt prevPrevFree;
-    sqInt prevPrevFreeChunk;
+    usqInt prevPrevFreeChunk;
     sqInt slotBytes;
     sqInt slotBytes1;
     usqInt there;
@@ -67270,7 +67270,7 @@
     usqLong firstSavedBridgeWord;
     sqInt nWritten;
     usqInt pier1;
-    usqInt pier2;
+    sqInt pier2;
     usqLong secondSavedBridgeWord;
 
 	pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);
@@ -72153,10 +72153,10 @@
 		column = 1;
 		for (index = startIP; index <= lastIndex; index += 1) {
 			if (column == 1) {
-				printf("0x%08x: ", oop+BaseHeaderSize+index-1);
+				printf("0x%08lx: ", oop+BaseHeaderSize+index-1);
 			}
 			byte = byteAt((oop + BaseHeaderSize) + (index - 1));
-			printf(" %02x/%-3d", byte,byte);
+			printf(" %02x/%-3d", (int)byte,(int)byte);
 			column += 1;
 			if (column > bytecodesPerLine) {
 				column = 1;
@@ -76873,10 +76873,10 @@
 		column = 1;
 		for (index = startIP; index <= lastIndex; index += 1) {
 			if (column == 1) {
-				printf("0x%08x: ", oop+BaseHeaderSize+index-1);
+				printf("0x%08lx: ", oop+BaseHeaderSize+index-1);
 			}
 			byte = byteAt((oop + BaseHeaderSize) + (index - 1));
-			printf(" %02x/%-3d", byte,byte);
+			printf(" %02x/%-3d", (int)byte,(int)byte);
 			column += 1;
 			if (column > bytecodesPerLine) {
 				column = 1;

Modified: branches/Cog/nsspur64src/vm/cointerp.h
===================================================================
--- branches/Cog/nsspur64src/vm/cointerp.h	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/nsspur64src/vm/cointerp.h	2016-03-17 00:57:27 UTC (rev 3648)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe
+	CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
  */
 
 

Modified: branches/Cog/nsspur64src/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nsspur64src/vm/gcc3x-cointerp.c	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/nsspur64src/vm/gcc3x-cointerp.c	2016-03-17 00:57:27 UTC (rev 3648)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe
+	CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
    from
-	CoInterpreter VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe
+	CoInterpreter VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668 " __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.1722";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-nice.1729";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -61278,7 +61278,7 @@
     usqInt prevFree;
     usqInt prevFreeChunk;
     usqInt prevPrevFree;
-    sqInt prevPrevFreeChunk;
+    usqInt prevPrevFreeChunk;
     sqInt slotBytes;
     sqInt slotBytes1;
     usqInt there;
@@ -67279,7 +67279,7 @@
     usqLong firstSavedBridgeWord;
     sqInt nWritten;
     usqInt pier1;
-    usqInt pier2;
+    sqInt pier2;
     usqLong secondSavedBridgeWord;
 
 	pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);
@@ -72162,10 +72162,10 @@
 		column = 1;
 		for (index = startIP; index <= lastIndex; index += 1) {
 			if (column == 1) {
-				printf("0x%08x: ", oop+BaseHeaderSize+index-1);
+				printf("0x%08lx: ", oop+BaseHeaderSize+index-1);
 			}
 			byte = byteAt((oop + BaseHeaderSize) + (index - 1));
-			printf(" %02x/%-3d", byte,byte);
+			printf(" %02x/%-3d", (int)byte,(int)byte);
 			column += 1;
 			if (column > bytecodesPerLine) {
 				column = 1;
@@ -76882,10 +76882,10 @@
 		column = 1;
 		for (index = startIP; index <= lastIndex; index += 1) {
 			if (column == 1) {
-				printf("0x%08x: ", oop+BaseHeaderSize+index-1);
+				printf("0x%08lx: ", oop+BaseHeaderSize+index-1);
 			}
 			byte = byteAt((oop + BaseHeaderSize) + (index - 1));
-			printf(" %02x/%-3d", byte,byte);
+			printf(" %02x/%-3d", (int)byte,(int)byte);
 			column += 1;
 			if (column > bytecodesPerLine) {
 				column = 1;

Modified: branches/Cog/nsspursrc/vm/cogit.h
===================================================================
--- branches/Cog/nsspursrc/vm/cogit.h	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/nsspursrc/vm/cogit.h	2016-03-17 00:57:27 UTC (rev 3648)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe
+	CCodeGenerator VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
  */
 
 

Modified: branches/Cog/nsspursrc/vm/cogitARMv5.c
===================================================================
--- branches/Cog/nsspursrc/vm/cogitARMv5.c	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/nsspursrc/vm/cogitARMv5.c	2016-03-17 00:57:27 UTC (rev 3648)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe
+	CCodeGenerator VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe
+	StackToRegisterMappingCogit VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -13318,7 +13318,7 @@
 {
     sqInt annotation;
     sqInt map;
-    sqInt mapByte;
+    unsigned char mapByte;
     sqInt mcpc;
     sqInt value;
 

Modified: branches/Cog/nsspursrc/vm/cogitIA32.c
===================================================================
--- branches/Cog/nsspursrc/vm/cogitIA32.c	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/nsspursrc/vm/cogitIA32.c	2016-03-17 00:57:27 UTC (rev 3648)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe
+	CCodeGenerator VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe
+	StackToRegisterMappingCogit VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -9575,12 +9575,12 @@
 generateMapAtstart(sqInt addressOrNull, sqInt startAddress)
 {
     unsigned char annotation;
-    usqInt delta;
+    sqInt delta;
     sqInt i;
     AbstractInstruction *instruction;
     sqInt length;
-    usqInt location;
-    usqInt mapEntry;
+    sqInt location;
+    sqInt mapEntry;
     sqInt maxDelta;
     usqInt mcpc;
 
@@ -12324,7 +12324,7 @@
 {
     sqInt annotation;
     sqInt map;
-    sqInt mapByte;
+    unsigned char mapByte;
     sqInt mcpc;
     sqInt value;
 

Modified: branches/Cog/nsspursrc/vm/cogitMIPSEL.c
===================================================================
--- branches/Cog/nsspursrc/vm/cogitMIPSEL.c	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/nsspursrc/vm/cogitMIPSEL.c	2016-03-17 00:57:27 UTC (rev 3648)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe
+	CCodeGenerator VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe
+	StackToRegisterMappingCogit VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -5691,12 +5691,12 @@
 generateMapAtstart(sqInt addressOrNull, sqInt startAddress)
 {
     unsigned char annotation;
-    usqInt delta;
+    sqInt delta;
     sqInt i;
     AbstractInstruction *instruction;
     sqInt length;
-    usqInt location;
-    usqInt mapEntry;
+    sqInt location;
+    sqInt mapEntry;
     sqInt maxDelta;
     usqInt mcpc;
 
@@ -8400,7 +8400,7 @@
 {
     sqInt annotation;
     sqInt map;
-    sqInt mapByte;
+    unsigned char mapByte;
     sqInt mcpc;
     sqInt value;
 

Modified: branches/Cog/nsspursrc/vm/cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.c	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/nsspursrc/vm/cointerp.c	2016-03-17 00:57:27 UTC (rev 3648)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe
+	CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
    from
-	CoInterpreter VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe
+	CoInterpreter VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668 " __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 = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1722";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-nice.1729";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -17101,7 +17101,7 @@
 static sqInt
 checkForAndFollowForwardedPrimitiveState(void)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
-    sqInt accessorDepth;
+    signed char accessorDepth;
     sqInt firstBytecode;
     sqInt found;
     sqInt found1;
@@ -60376,7 +60376,7 @@
     usqInt prevFree;
     usqInt prevFreeChunk;
     usqInt prevPrevFree;
-    usqInt prevPrevFreeChunk;
+    sqInt prevPrevFreeChunk;
     sqInt slotBytes;
     sqInt slotBytes1;
     usqInt there;
@@ -65773,7 +65773,7 @@
 bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
 {
     usqInt bridgeSpan;
-    usqInt clifton;
+    sqInt clifton;
     usqInt segEnd;
 
 	segEnd = ((aSegment->segSize)) + ((aSegment->segStart));
@@ -71267,10 +71267,10 @@
 		column = 1;
 		for (index = startIP; index <= lastIndex; index += 1) {
 			if (column == 1) {
-				printf("0x%08x: ", oop+BaseHeaderSize+index-1);
+				printf("0x%08lx: ", oop+BaseHeaderSize+index-1);
 			}
 			byte = byteAt((oop + BaseHeaderSize) + (index - 1));
-			printf(" %02x/%-3d", byte,byte);
+			printf(" %02x/%-3d", (int)byte,(int)byte);
 			column += 1;
 			if (column > bytecodesPerLine) {
 				column = 1;
@@ -76081,10 +76081,10 @@
 		column = 1;
 		for (index = startIP; index <= lastIndex; index += 1) {
 			if (column == 1) {
-				printf("0x%08x: ", oop+BaseHeaderSize+index-1);
+				printf("0x%08lx: ", oop+BaseHeaderSize+index-1);
 			}
 			byte = byteAt((oop + BaseHeaderSize) + (index - 1));
-			printf(" %02x/%-3d", byte,byte);
+			printf(" %02x/%-3d", (int)byte,(int)byte);
 			column += 1;
 			if (column > bytecodesPerLine) {
 				column = 1;

Modified: branches/Cog/nsspursrc/vm/cointerp.h
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.h	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/nsspursrc/vm/cointerp.h	2016-03-17 00:57:27 UTC (rev 3648)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe
+	CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
  */
 
 

Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c	2016-03-17 00:57:27 UTC (rev 3648)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe
+	CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
    from
-	CoInterpreter VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe
+	CoInterpreter VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668 " __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.1722";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-nice.1729";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -17110,7 +17110,7 @@
 static sqInt
 checkForAndFollowForwardedPrimitiveState(void)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
-    sqInt accessorDepth;
+    signed char accessorDepth;
     sqInt firstBytecode;
     sqInt found;
     sqInt found1;
@@ -60385,7 +60385,7 @@
     usqInt prevFree;
     usqInt prevFreeChunk;
     usqInt prevPrevFree;
-    usqInt prevPrevFreeChunk;
+    sqInt prevPrevFreeChunk;
     sqInt slotBytes;
     sqInt slotBytes1;
     usqInt there;
@@ -65782,7 +65782,7 @@
 bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
 {
     usqInt bridgeSpan;
-    usqInt clifton;
+    sqInt clifton;
     usqInt segEnd;
 
 	segEnd = ((aSegment->segSize)) + ((aSegment->segStart));
@@ -71276,10 +71276,10 @@
 		column = 1;
 		for (index = startIP; index <= lastIndex; index += 1) {
 			if (column == 1) {
-				printf("0x%08x: ", oop+BaseHeaderSize+index-1);
+				printf("0x%08lx: ", oop+BaseHeaderSize+index-1);
 			}
 			byte = byteAt((oop + BaseHeaderSize) + (index - 1));
-			printf(" %02x/%-3d", byte,byte);
+			printf(" %02x/%-3d", (int)byte,(int)byte);
 			column += 1;
 			if (column > bytecodesPerLine) {
 				column = 1;
@@ -76090,10 +76090,10 @@
 		column = 1;
 		for (index = startIP; index <= lastIndex; index += 1) {
 			if (column == 1) {
-				printf("0x%08x: ", oop+BaseHeaderSize+index-1);
+				printf("0x%08lx: ", oop+BaseHeaderSize+index-1);
 			}
 			byte = byteAt((oop + BaseHeaderSize) + (index - 1));
-			printf(" %02x/%-3d", byte,byte);
+			printf(" %02x/%-3d", (int)byte,(int)byte);
 			column += 1;
 			if (column > bytecodesPerLine) {
 				column = 1;

Modified: branches/Cog/nsspurstack64src/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/nsspurstack64src/vm/gcc3x-interp.c	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/nsspurstack64src/vm/gcc3x-interp.c	2016-03-17 00:57:27 UTC (rev 3648)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe
+	CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
    from
-	StackInterpreter VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe
+	StackInterpreter VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2183,7 +2183,7 @@
 	/* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1722";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-nice.1729";
 volatile int sendTrace;
 sqInt suppressHeartbeatFlag;
 
@@ -59126,10 +59126,10 @@
 		column = 1;
 		for (index = startIP; index <= lastIndex; index += 1) {
 			if (column == 1) {
-				printf("0x%08x: ", oop+BaseHeaderSize+index-1);
+				printf("0x%08lx: ", oop+BaseHeaderSize+index-1);
 			}
 			byte = byteAt((oop + BaseHeaderSize) + (index - 1));
-			printf(" %02x/%-3d", byte,byte);
+			printf(" %02x/%-3d", (int)byte,(int)byte);
 			column += 1;
 			if (column > bytecodesPerLine) {
 				column = 1;
@@ -65065,10 +65065,10 @@
 		column = 1;
 		for (index = startIP; index <= lastIndex; index += 1) {
 			if (column == 1) {
-				printf("0x%08x: ", oop+BaseHeaderSize+index-1);
+				printf("0x%08lx: ", oop+BaseHeaderSize+index-1);
 			}
 			byte = byteAt((oop + BaseHeaderSize) + (index - 1));
-			printf(" %02x/%-3d", byte,byte);
+			printf(" %02x/%-3d", (int)byte,(int)byte);
 			column += 1;
 			if (column > bytecodesPerLine) {
 				column = 1;

Modified: branches/Cog/nsspurstack64src/vm/interp.c
===================================================================
--- branches/Cog/nsspurstack64src/vm/interp.c	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/nsspurstack64src/vm/interp.c	2016-03-17 00:57:27 UTC (rev 3648)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe
+	CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
    from
-	StackInterpreter VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe
+	StackInterpreter VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2180,7 +2180,7 @@
 	/* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1722";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-nice.1729";
 volatile int sendTrace;
 sqInt suppressHeartbeatFlag;
 
@@ -59117,10 +59117,10 @@
 		column = 1;
 		for (index = startIP; index <= lastIndex; index += 1) {
 			if (column == 1) {
-				printf("0x%08x: ", oop+BaseHeaderSize+index-1);
+				printf("0x%08lx: ", oop+BaseHeaderSize+index-1);
 			}
 			byte = byteAt((oop + BaseHeaderSize) + (index - 1));
-			printf(" %02x/%-3d", byte,byte);
+			printf(" %02x/%-3d", (int)byte,(int)byte);
 			column += 1;
 			if (column > bytecodesPerLine) {
 				column = 1;
@@ -65056,10 +65056,10 @@
 		column = 1;
 		for (index = startIP; index <= lastIndex; index += 1) {
 			if (column == 1) {
-				printf("0x%08x: ", oop+BaseHeaderSize+index-1);
+				printf("0x%08lx: ", oop+BaseHeaderSize+index-1);
 			}
 			byte = byteAt((oop + BaseHeaderSize) + (index - 1));
-			printf(" %02x/%-3d", byte,byte);
+			printf(" %02x/%-3d", (int)byte,(int)byte);
 			column += 1;
 			if (column > bytecodesPerLine) {
 				column = 1;

Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c	2016-03-17 00:57:27 UTC (rev 3648)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe
+	CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
    from
-	StackInterpreter VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe
+	StackInterpreter VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2153,7 +2153,7 @@
 	/* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1722";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-nice.1729";
 volatile int sendTrace;
 sqInt suppressHeartbeatFlag;
 
@@ -57871,10 +57871,10 @@
 		column = 1;
 		for (index = startIP; index <= lastIndex; index += 1) {
 			if (column == 1) {
-				printf("0x%08x: ", oop+BaseHeaderSize+index-1);
+				printf("0x%08lx: ", oop+BaseHeaderSize+index-1);
 			}
 			byte = byteAt((oop + BaseHeaderSize) + (index - 1));
-			printf(" %02x/%-3d", byte,byte);
+			printf(" %02x/%-3d", (int)byte,(int)byte);
 			column += 1;
 			if (column > bytecodesPerLine) {
 				column = 1;
@@ -63929,10 +63929,10 @@
 		column = 1;
 		for (index = startIP; index <= lastIndex; index += 1) {
 			if (column == 1) {
-				printf("0x%08x: ", oop+BaseHeaderSize+index-1);
+				printf("0x%08lx: ", oop+BaseHeaderSize+index-1);
 			}
 			byte = byteAt((oop + BaseHeaderSize) + (index - 1));
-			printf(" %02x/%-3d", byte,byte);
+			printf(" %02x/%-3d", (int)byte,(int)byte);
 			column += 1;
 			if (column > bytecodesPerLine) {
 				column = 1;

Modified: branches/Cog/nsspurstacksrc/vm/interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/interp.c	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/nsspurstacksrc/vm/interp.c	2016-03-17 00:57:27 UTC (rev 3648)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe
+	CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
    from
-	StackInterpreter VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe
+	StackInterpreter VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2150,7 +2150,7 @@
 	/* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1722";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-nice.1729";
 volatile int sendTrace;
 sqInt suppressHeartbeatFlag;
 
@@ -57862,10 +57862,10 @@
 		column = 1;
 		for (index = startIP; index <= lastIndex; index += 1) {
 			if (column == 1) {
-				printf("0x%08x: ", oop+BaseHeaderSize+index-1);
+				printf("0x%08lx: ", oop+BaseHeaderSize+index-1);
 			}
 			byte = byteAt((oop + BaseHeaderSize) + (index - 1));
-			printf(" %02x/%-3d", byte,byte);
+			printf(" %02x/%-3d", (int)byte,(int)byte);
 			column += 1;
 			if (column > bytecodesPerLine) {
 				column = 1;
@@ -63920,10 +63920,10 @@
 		column = 1;
 		for (index = startIP; index <= lastIndex; index += 1) {
 			if (column == 1) {
-				printf("0x%08x: ", oop+BaseHeaderSize+index-1);
+				printf("0x%08lx: ", oop+BaseHeaderSize+index-1);
 			}
 			byte = byteAt((oop + BaseHeaderSize) + (index - 1));
-			printf(" %02x/%-3d", byte,byte);
+			printf(" %02x/%-3d", (int)byte,(int)byte);
 			column += 1;
 			if (column > bytecodesPerLine) {
 				column = 1;


Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
   - Wed Mar 16 11:44:16 PDT 2016
   + Wed Mar 16 17:51:15 PDT 2016

Modified: branches/Cog/spur64src/vm/cogit.h
===================================================================
--- branches/Cog/spur64src/vm/cogit.h	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/spur64src/vm/cogit.h	2016-03-17 00:57:27 UTC (rev 3648)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe
+	CCodeGenerator VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
  */
 
 

Modified: branches/Cog/spur64src/vm/cogitX64.c
===================================================================
--- branches/Cog/spur64src/vm/cogitX64.c	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/spur64src/vm/cogitX64.c	2016-03-17 00:57:27 UTC (rev 3648)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe
+	CCodeGenerator VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe
+	StackToRegisterMappingCogit VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -7816,7 +7816,7 @@
 {
     sqInt annotation;
     sqInt map;
-    sqInt mapByte;
+    unsigned char mapByte;
     sqInt mcpc;
     sqInt value;
 
@@ -8404,8 +8404,8 @@
 
 	/* begin trampolineName:numArgs:limit: */
 	theString = malloc((strlen(routinePrefix)) + 6);
-	sprintf(theString, "%s%cArgs", routinePrefix, (numArgs <= (NumSendTrampolines - 2)
-		? '0' + numArgs
+	sprintf(theString, "%s%cArgs", routinePrefix, ((((int) numArgs)) <= (NumSendTrampolines - 2)
+		? '0' + (((int) numArgs))
 		: 'N'));
 	return theString;
 }
@@ -8418,8 +8418,8 @@
 
 	/* begin trampolineName:numArgs:limit: */
 	theString = malloc((strlen(routinePrefix)) + 6);
-	sprintf(theString, "%s%cArgs", routinePrefix, (numArgs <= 2
-		? '0' + numArgs
+	sprintf(theString, "%s%cArgs", routinePrefix, ((((int) numArgs)) <= 2
+		? '0' + (((int) numArgs))
 		: 'N'));
 	return theString;
 }

Modified: branches/Cog/spur64src/vm/cointerp.c
===================================================================
--- branches/Cog/spur64src/vm/cointerp.c	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/spur64src/vm/cointerp.c	2016-03-17 00:57:27 UTC (rev 3648)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe
+	CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
    from
-	CoInterpreter VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe
+	CoInterpreter VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2402,7 +2402,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.1722]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-nice.1729]";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -62076,7 +62076,7 @@
     sqInt limit;
     sqInt newEndOfMemory;
     sqInt next;
-    usqInt node;
+    sqInt node;
     usqInt numSlots;
     usqInt numSlots1;
     SpurSegmentInfo *seg;
@@ -67057,10 +67057,10 @@
 		column = 1;
 		for (index = startIP; index <= lastIndex; index += 1) {
 			if (column == 1) {
-				printf("0x%08x: ", oop+BaseHeaderSize+index-1);
+				printf("0x%08lx: ", oop+BaseHeaderSize+index-1);
 			}
 			byte = byteAt((oop + BaseHeaderSize) + (index - 1));
-			printf(" %02x/%-3d", byte,byte);
+			printf(" %02x/%-3d", (int)byte,(int)byte);
 			column += 1;
 			if (column > bytecodesPerLine) {
 				column = 1;
@@ -71141,10 +71141,10 @@
 		column = 1;
 		for (index = startIP; index <= lastIndex; index += 1) {
 			if (column == 1) {
-				printf("0x%08x: ", oop+BaseHeaderSize+index-1);
+				printf("0x%08lx: ", oop+BaseHeaderSize+index-1);
 			}
 			byte = byteAt((oop + BaseHeaderSize) + (index - 1));
-			printf(" %02x/%-3d", byte,byte);
+			printf(" %02x/%-3d", (int)byte,(int)byte);
 			column += 1;
 			if (column > bytecodesPerLine) {
 				column = 1;

Modified: branches/Cog/spur64src/vm/cointerp.h
===================================================================
--- branches/Cog/spur64src/vm/cointerp.h	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/spur64src/vm/cointerp.h	2016-03-17 00:57:27 UTC (rev 3648)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe
+	CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
  */
 
 

Modified: branches/Cog/spur64src/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spur64src/vm/gcc3x-cointerp.c	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/spur64src/vm/gcc3x-cointerp.c	2016-03-17 00:57:27 UTC (rev 3648)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe
+	CCodeGeneratorGlobalStructure VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
    from
-	CoInterpreter VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe
+	CoInterpreter VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668 " __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.1722]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-nice.1729]";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -62085,7 +62085,7 @@
     sqInt limit;
     sqInt newEndOfMemory;
     sqInt next;
-    usqInt node;
+    sqInt node;
     usqInt numSlots;
     usqInt numSlots1;
     SpurSegmentInfo *seg;
@@ -67066,10 +67066,10 @@
 		column = 1;
 		for (index = startIP; index <= lastIndex; index += 1) {
 			if (column == 1) {
-				printf("0x%08x: ", oop+BaseHeaderSize+index-1);
+				printf("0x%08lx: ", oop+BaseHeaderSize+index-1);
 			}
 			byte = byteAt((oop + BaseHeaderSize) + (index - 1));
-			printf(" %02x/%-3d", byte,byte);
+			printf(" %02x/%-3d", (int)byte,(int)byte);
 			column += 1;
 			if (column > bytecodesPerLine) {
 				column = 1;
@@ -71150,10 +71150,10 @@
 		column = 1;
 		for (index = startIP; index <= lastIndex; index += 1) {
 			if (column == 1) {
-				printf("0x%08x: ", oop+BaseHeaderSize+index-1);
+				printf("0x%08lx: ", oop+BaseHeaderSize+index-1);
 			}
 			byte = byteAt((oop + BaseHeaderSize) + (index - 1));
-			printf(" %02x/%-3d", byte,byte);
+			printf(" %02x/%-3d", (int)byte,(int)byte);
 			column += 1;
 			if (column > bytecodesPerLine) {
 				column = 1;

Modified: branches/Cog/spursistasrc/vm/cogit.h
===================================================================
--- branches/Cog/spursistasrc/vm/cogit.h	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/spursistasrc/vm/cogit.h	2016-03-17 00:57:27 UTC (rev 3648)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.1726 uuid: 6a968923-b541-4573-bc4f-64fb95e6462d
+	CCodeGenerator VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
  */
 
 

Modified: branches/Cog/spursistasrc/vm/cogitARMv5.c
===================================================================
--- branches/Cog/spursistasrc/vm/cogitARMv5.c	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/spursistasrc/vm/cogitARMv5.c	2016-03-17 00:57:27 UTC (rev 3648)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.1726 uuid: 6a968923-b541-4573-bc4f-64fb95e6462d
+	CCodeGenerator VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
    from
-	SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1726 uuid: 6a968923-b541-4573-bc4f-64fb95e6462d
+	SistaStackToRegisterMappingCogit VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
  */
-static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1726 uuid: 6a968923-b541-4573-bc4f-64fb95e6462d " __DATE__ ;
+static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -12844,7 +12844,7 @@
 {
     sqInt annotation;
     sqInt map;
-    sqInt mapByte;
+    unsigned char mapByte;
     sqInt mcpc;
     sqInt value;
 

Modified: branches/Cog/spursistasrc/vm/cogitIA32.c
===================================================================
--- branches/Cog/spursistasrc/vm/cogitIA32.c	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/spursistasrc/vm/cogitIA32.c	2016-03-17 00:57:27 UTC (rev 3648)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.1726 uuid: 6a968923-b541-4573-bc4f-64fb95e6462d
+	CCodeGenerator VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
    from
-	SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1726 uuid: 6a968923-b541-4573-bc4f-64fb95e6462d
+	SistaStackToRegisterMappingCogit VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
  */
-static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1726 uuid: 6a968923-b541-4573-bc4f-64fb95e6462d " __DATE__ ;
+static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -9429,12 +9429,12 @@
 generateMapAtstart(sqInt addressOrNull, sqInt startAddress)
 {
     unsigned char annotation;
-    usqInt delta;
+    sqInt delta;
     sqInt i;
     AbstractInstruction *instruction;
     sqInt length;
-    usqInt location;
-    usqInt mapEntry;
+    sqInt location;
+    sqInt mapEntry;
     sqInt maxDelta;
     usqInt mcpc;
 
@@ -11834,7 +11834,7 @@
 {
     sqInt annotation;
     sqInt map;
-    sqInt mapByte;
+    unsigned char mapByte;
     sqInt mcpc;
     sqInt value;
 

Modified: branches/Cog/spursistasrc/vm/cogitMIPSEL.c
===================================================================
--- branches/Cog/spursistasrc/vm/cogitMIPSEL.c	2016-03-16 18:45:05 UTC (rev 3647)
+++ branches/Cog/spursistasrc/vm/cogitMIPSEL.c	2016-03-17 00:57:27 UTC (rev 3648)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.1726 uuid: 6a968923-b541-4573-bc4f-64fb95e6462d
+	CCodeGenerator VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
    from
-	SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1726 uuid: 6a968923-b541-4573-bc4f-64fb95e6462d
+	SistaStackToRegisterMappingCogit VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668
  */
-static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1726 uuid: 6a968923-b541-4573-bc4f-64fb95e6462d " __DATE__ ;
+static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-nice.1729 uuid: 4f72e8e6-9dd6-4446-93c4-f85d1b4fa668 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 

@@ Diff output truncated at 50000 characters. @@


More information about the Vm-dev mailing list