[Vm-dev] [commit][3229] CogVM source as per VMMaker.oscog-eem.1017

commits at squeakvm.org commits at squeakvm.org
Thu Jan 15 00:03:35 UTC 2015 

Revision: 3229
Author:   eliot
Date:     2015-01-14 16:03:32 -0800 (Wed, 14 Jan 2015)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.1017

Add an assert to check for forwarding in wakeHighestPriority to hunt bug CM sees

Comment typo


Fix slips in some sista build scripts (wrong install dir on linux, bad path for
plist edit on mac).

Modified Paths:
--------------
    branches/Cog/build.linux32x86/squeak.sista.spur/build/mvm
    branches/Cog/build.linux32x86/squeak.sista.spur/build.assert/mvm
    branches/Cog/build.linux32x86/squeak.sista.spur/build.assert.itimerheartbeat/mvm
    branches/Cog/build.linux32x86/squeak.sista.spur/build.debug/mvm
    branches/Cog/build.linux32x86/squeak.sista.spur/build.debug.itimerheartbeat/mvm
    branches/Cog/build.linux32x86/squeak.sista.spur/build.itimerheartbeat/mvm
    branches/Cog/build.macos32x86/squeak.sista.spur/makevm
    branches/Cog/build.macos64x64/squeak.sista.spur/makevm
    branches/Cog/nscogsrc/vm/cointerp.c
    branches/Cog/nscogsrc/vm/cointerp.h
    branches/Cog/nscogsrc/vm/gcc3x-cointerp.c
    branches/Cog/nsspursrc/vm/cointerp.c
    branches/Cog/nsspursrc/vm/cointerp.h
    branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
    branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c
    branches/Cog/nsspurstacksrc/vm/interp.c
    branches/Cog/sistasrc/vm/cogit.c
    branches/Cog/sistasrc/vm/cogit.h
    branches/Cog/sistasrc/vm/cointerp.c
    branches/Cog/sistasrc/vm/cointerp.h
    branches/Cog/sistasrc/vm/gcc3x-cointerp.c
    branches/Cog/spursistasrc/vm/cogit.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.c
    branches/Cog/spursrc/vm/cogit.h
    branches/Cog/spursrc/vm/cointerp.c
    branches/Cog/spursrc/vm/cointerp.h
    branches/Cog/spursrc/vm/gcc3x-cointerp.c
    branches/Cog/spurstack64src/vm/gcc3x-interp.c
    branches/Cog/spurstack64src/vm/interp.c
    branches/Cog/spurstacksrc/vm/gcc3x-interp.c
    branches/Cog/spurstacksrc/vm/interp.c
    branches/Cog/src/vm/cogit.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

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

Modified: branches/Cog/build.linux32x86/squeak.sista.spur/build/mvm
===================================================================
--- branches/Cog/build.linux32x86/squeak.sista.spur/build/mvm	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/build.linux32x86/squeak.sista.spur/build/mvm	2015-01-15 00:03:32 UTC (rev 3229)
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Spur VM with VM profiler and threaded heartbeat
-INSTALLDIR=cogspurlinuxht
+INSTALLDIR=sistaspurlinuxht
 # Some gcc versions create a broken VM using -O2
 case `gcc -v 2>&1 | grep version | sed 's/gcc version *//'` in
 3.4.*)	OPT="-g -O1 -DNDEBUG -DDEBUGVM=0";;

Modified: branches/Cog/build.linux32x86/squeak.sista.spur/build.assert/mvm
===================================================================
--- branches/Cog/build.linux32x86/squeak.sista.spur/build.assert/mvm	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/build.linux32x86/squeak.sista.spur/build.assert/mvm	2015-01-15 00:03:32 UTC (rev 3229)
@@ -1,6 +1,6 @@
 #!/bin/bash
 # assert VM with VM profiler and threaded heartbeat
-INSTALLDIR=assert/cogspurlinuxht
+INSTALLDIR=assert/sistaspurlinuxht
 OPT="-g3 -O1 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0"
 
 if [ $# -ge 1 ]; then

Modified: branches/Cog/build.linux32x86/squeak.sista.spur/build.assert.itimerheartbeat/mvm
===================================================================
--- branches/Cog/build.linux32x86/squeak.sista.spur/build.assert.itimerheartbeat/mvm	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/build.linux32x86/squeak.sista.spur/build.assert.itimerheartbeat/mvm	2015-01-15 00:03:32 UTC (rev 3229)
@@ -1,6 +1,6 @@
 #!/bin/bash
 # assert VM with VM profiler and itimer heartbeat
-INSTALLDIR=assert/cogspurlinux
+INSTALLDIR=assert/sistaspurlinux
 OPT="-g3 -O1 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0"
 
 if [ $# -ge 1 ]; then

Modified: branches/Cog/build.linux32x86/squeak.sista.spur/build.debug/mvm
===================================================================
--- branches/Cog/build.linux32x86/squeak.sista.spur/build.debug/mvm	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/build.linux32x86/squeak.sista.spur/build.debug/mvm	2015-01-15 00:03:32 UTC (rev 3229)
@@ -1,6 +1,6 @@
 #!/bin/bash
 # debug Spur VM with VM profiler and threaded heartbeat
-INSTALLDIR=debug/cogspurlinuxht
+INSTALLDIR=debug/sistaspurlinuxht
 OPT="-g3 -O0 -DDEBUGVM=1"
 
 if [ $# -ge 1 ]; then

Modified: branches/Cog/build.linux32x86/squeak.sista.spur/build.debug.itimerheartbeat/mvm
===================================================================
--- branches/Cog/build.linux32x86/squeak.sista.spur/build.debug.itimerheartbeat/mvm	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/build.linux32x86/squeak.sista.spur/build.debug.itimerheartbeat/mvm	2015-01-15 00:03:32 UTC (rev 3229)
@@ -1,6 +1,6 @@
 #!/bin/bash
 # debug Spur VM with VM profiler and itimer heartbeat
-INSTALLDIR=debug/cogspurlinux
+INSTALLDIR=debug/sistaspurlinux
 OPT="-g3 -O0 -DDEBUGVM=1"
 
 if [ $# -ge 1 ]; then

Modified: branches/Cog/build.linux32x86/squeak.sista.spur/build.itimerheartbeat/mvm
===================================================================
--- branches/Cog/build.linux32x86/squeak.sista.spur/build.itimerheartbeat/mvm	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/build.linux32x86/squeak.sista.spur/build.itimerheartbeat/mvm	2015-01-15 00:03:32 UTC (rev 3229)
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Spur VM with VM profiler and itimer heartbeat
-INSTALLDIR=cogspurlinux
+INSTALLDIR=sistaspurlinux
 # Some gcc versions create a broken VM using -O2
 case `gcc -v 2>&1 | grep version | sed 's/gcc version *//'` in
 3.4.*)	OPT="-g -O1 -DNDEBUG -DDEBUGVM=0";;

Modified: branches/Cog/build.macos32x86/squeak.sista.spur/makevm
===================================================================
--- branches/Cog/build.macos32x86/squeak.sista.spur/makevm	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/build.macos32x86/squeak.sista.spur/makevm	2015-01-15 00:03:32 UTC (rev 3229)
@@ -70,7 +70,7 @@
 else
 	mv build/$BUILD_CONFIGURATION/$APP "$DEST"
 fi
-../scripts/versionInfoPlist ../platforms CoreVM.plist "$DEST/Contents/Info.plist"
+../../scripts/versionInfoPlist ../../platforms CoreVM.plist "$DEST/Contents/Info.plist"
 
 # Build the Float plugin
 echo
@@ -116,7 +116,7 @@
 if false; then
 # Build the BochsIA32Plugin
 # N.B. To build the plugin you also have to build the Bochs libraries in
-# ../processors/IA32/bochs.  cd ../processors/IA32/bochs. Run conf.COG & makeem.
+# ../../processors/IA32/bochs.  cd ../../processors/IA32/bochs. Run conf.COG & makeem.
 echo BochsIA32Plugin xcodebuild -configuration $XCD_BUILD_CONFIGURATION -project BochsIA32Plugin/BochsIA32Plugin.xcodeproj
 xcodebuild -configuration $XCD_BUILD_CONFIGURATION -project BochsIA32Plugin/BochsIA32Plugin.xcodeproj
 rm -rf "$DEST/Contents/Resources/BochsIA32Plugin.bundle"

Modified: branches/Cog/build.macos64x64/squeak.sista.spur/makevm
===================================================================
--- branches/Cog/build.macos64x64/squeak.sista.spur/makevm	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/build.macos64x64/squeak.sista.spur/makevm	2015-01-15 00:03:32 UTC (rev 3229)
@@ -70,7 +70,7 @@
 else
 	mv build/$BUILD_CONFIGURATION/$APP "$DEST"
 fi
-../scripts/versionInfoPlist ../platforms CoreVM.plist "$DEST/Contents/Info.plist"
+../../scripts/versionInfoPlist ../../platforms CoreVM.plist "$DEST/Contents/Info.plist"
 
 # Build the Float plugin
 echo
@@ -116,7 +116,7 @@
 if false; then
 # Build the BochsIA32Plugin
 # N.B. To build the plugin you also have to build the Bochs libraries in
-# ../processors/IA32/bochs.  cd ../processors/IA32/bochs. Run conf.COG & makeem.
+# ../../processors/IA32/bochs.  cd ../../processors/IA32/bochs. Run conf.COG & makeem.
 echo BochsIA32Plugin xcodebuild -configuration $XCD_BUILD_CONFIGURATION -project BochsIA32Plugin/BochsIA32Plugin.xcodeproj
 xcodebuild -configuration $XCD_BUILD_CONFIGURATION -project BochsIA32Plugin/BochsIA32Plugin.xcodeproj
 rm -rf "$DEST/Contents/Resources/BochsIA32Plugin.bundle"

Modified: branches/Cog/nscogsrc/vm/cointerp.c
===================================================================
--- branches/Cog/nscogsrc/vm/cointerp.c	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/nscogsrc/vm/cointerp.c	2015-01-15 00:03:32 UTC (rev 3229)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
    from
-	CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2101,7 +2101,7 @@
 	/* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1014";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1017";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -46801,6 +46801,7 @@
 static sqInt
 isLiveContext(sqInt oop)
 {
+	assert(!((isOopForwarded(oop))));
 	if (!(((oop & 1) == 0)
 		 && (((((usqInt) (longAt(oop))) >> (compactClassFieldLSB())) & 0x1F) == ClassMethodContextCompactIndex))) {
 		return 0;

Modified: branches/Cog/nscogsrc/vm/cointerp.h
===================================================================
--- branches/Cog/nscogsrc/vm/cointerp.h	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/nscogsrc/vm/cointerp.h	2015-01-15 00:03:32 UTC (rev 3229)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
  */
 
 

Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c	2015-01-15 00:03:32 UTC (rev 3229)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
    from
-	CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2104,7 +2104,7 @@
 	/* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1014";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1017";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -46810,6 +46810,7 @@
 static sqInt
 isLiveContext(sqInt oop)
 {
+	assert(!((isOopForwarded(oop))));
 	if (!(((oop & 1) == 0)
 		 && (((((usqInt) (longAt(oop))) >> (compactClassFieldLSB())) & 0x1F) == ClassMethodContextCompactIndex))) {
 		return 0;

Modified: branches/Cog/nsspursrc/vm/cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.c	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/nsspursrc/vm/cointerp.c	2015-01-15 00:03:32 UTC (rev 3229)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
    from
-	CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2354,7 +2354,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.1014";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1017";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -48294,7 +48294,7 @@
 	10 - 11 32-bit indexable	(11 unused in 32 bits)
 	12 - 15 16-bit indexable	(14 & 15 unused in 32-bits)
 	16 - 23 byte indexable		(20-23 unused in 32-bits)
-	24 - 31 compiled method	(28-21 unused in 32-bits) */
+	24 - 31 compiled method	(28-31 unused in 32-bits) */
 
 static sqInt
 formatOf(sqInt objOop)
@@ -66358,6 +66358,7 @@
 static sqInt
 isLiveContext(sqInt oop)
 {
+	assert(!((isOopForwarded(oop))));
 	if (!(((oop & 3) == 0)
 		 && (((longAt(oop)) & 0x3FFFFF) == ClassMethodContextCompactIndex))) {
 		return 0;

Modified: branches/Cog/nsspursrc/vm/cointerp.h
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.h	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/nsspursrc/vm/cointerp.h	2015-01-15 00:03:32 UTC (rev 3229)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
  */
 
 

Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c	2015-01-15 00:03:32 UTC (rev 3229)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
    from
-	CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2357,7 +2357,7 @@
 /*560*/	-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
 	};
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1014";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1017";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -48303,7 +48303,7 @@
 	10 - 11 32-bit indexable	(11 unused in 32 bits)
 	12 - 15 16-bit indexable	(14 & 15 unused in 32-bits)
 	16 - 23 byte indexable		(20-23 unused in 32-bits)
-	24 - 31 compiled method	(28-21 unused in 32-bits) */
+	24 - 31 compiled method	(28-31 unused in 32-bits) */
 
 static sqInt
 formatOf(sqInt objOop)
@@ -66367,6 +66367,7 @@
 static sqInt
 isLiveContext(sqInt oop)
 {
+	assert(!((isOopForwarded(oop))));
 	if (!(((oop & 3) == 0)
 		 && (((longAt(oop)) & 0x3FFFFF) == ClassMethodContextCompactIndex))) {
 		return 0;

Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c	2015-01-15 00:03:32 UTC (rev 3229)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
    from
-	StackInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	StackInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2102,7 +2102,7 @@
 	/* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1014";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1017";
 volatile int sendTrace;
 sqInt suppressHeartbeatFlag;
 
@@ -34493,7 +34493,7 @@
 	10 - 11 32-bit indexable	(11 unused in 32 bits)
 	12 - 15 16-bit indexable	(14 & 15 unused in 32-bits)
 	16 - 23 byte indexable		(20-23 unused in 32-bits)
-	24 - 31 compiled method	(28-21 unused in 32-bits) */
+	24 - 31 compiled method	(28-31 unused in 32-bits) */
 
 static sqInt
 formatOf(sqInt objOop)
@@ -53265,6 +53265,7 @@
 static sqInt
 isLiveContext(sqInt oop)
 {
+	assert(!((isOopForwarded(oop))));
 	if (!(((oop & 3) == 0)
 		 && (((longAt(oop)) & 0x3FFFFF) == ClassMethodContextCompactIndex))) {
 		return 0;

Modified: branches/Cog/nsspurstacksrc/vm/interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/interp.c	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/nsspurstacksrc/vm/interp.c	2015-01-15 00:03:32 UTC (rev 3229)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
    from
-	StackInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	StackInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2099,7 +2099,7 @@
 	/* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1014";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1017";
 volatile int sendTrace;
 sqInt suppressHeartbeatFlag;
 
@@ -34484,7 +34484,7 @@
 	10 - 11 32-bit indexable	(11 unused in 32 bits)
 	12 - 15 16-bit indexable	(14 & 15 unused in 32-bits)
 	16 - 23 byte indexable		(20-23 unused in 32-bits)
-	24 - 31 compiled method	(28-21 unused in 32-bits) */
+	24 - 31 compiled method	(28-31 unused in 32-bits) */
 
 static sqInt
 formatOf(sqInt objOop)
@@ -53256,6 +53256,7 @@
 static sqInt
 isLiveContext(sqInt oop)
 {
+	assert(!((isOopForwarded(oop))));
 	if (!(((oop & 3) == 0)
 		 && (((longAt(oop)) & 0x3FFFFF) == ClassMethodContextCompactIndex))) {
 		return 0;


Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
   - Tue Jan 13 10:08:57 PST 2015
   + Wed Jan 14 16:02:15 PST 2015

Modified: branches/Cog/sistasrc/vm/cogit.c
===================================================================
--- branches/Cog/sistasrc/vm/cogit.c	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/sistasrc/vm/cogit.c	2015-01-15 00:03:32 UTC (rev 3229)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.1015 uuid: cc6ec010-1b1d-4ba3-8a4d-1c31b2931fbd
+	CCodeGenerator VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
    from
-	SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1015 uuid: cc6ec010-1b1d-4ba3-8a4d-1c31b2931fbd
+	SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
  */
-static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1015 uuid: cc6ec010-1b1d-4ba3-8a4d-1c31b2931fbd " __DATE__ ;
+static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 

Modified: branches/Cog/sistasrc/vm/cogit.h
===================================================================
--- branches/Cog/sistasrc/vm/cogit.h	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/sistasrc/vm/cogit.h	2015-01-15 00:03:32 UTC (rev 3229)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.1015 uuid: cc6ec010-1b1d-4ba3-8a4d-1c31b2931fbd
+	CCodeGenerator VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
  */
 
 

Modified: branches/Cog/sistasrc/vm/cointerp.c
===================================================================
--- branches/Cog/sistasrc/vm/cointerp.c	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/sistasrc/vm/cointerp.c	2015-01-15 00:03:32 UTC (rev 3229)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
    from
-	CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2098,7 +2098,7 @@
 	/* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1014]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1017]";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -46774,6 +46774,7 @@
 static sqInt
 isLiveContext(sqInt oop)
 {
+	assert(!((isOopForwarded(oop))));
 	if (!(((oop & 1) == 0)
 		 && (((((usqInt) (longAt(oop))) >> (compactClassFieldLSB())) & 0x1F) == ClassMethodContextCompactIndex))) {
 		return 0;

Modified: branches/Cog/sistasrc/vm/cointerp.h
===================================================================
--- branches/Cog/sistasrc/vm/cointerp.h	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/sistasrc/vm/cointerp.h	2015-01-15 00:03:32 UTC (rev 3229)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
  */
 
 

Modified: branches/Cog/sistasrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/sistasrc/vm/gcc3x-cointerp.c	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/sistasrc/vm/gcc3x-cointerp.c	2015-01-15 00:03:32 UTC (rev 3229)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
    from
-	CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2101,7 +2101,7 @@
 	/* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1014]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1017]";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -46783,6 +46783,7 @@
 static sqInt
 isLiveContext(sqInt oop)
 {
+	assert(!((isOopForwarded(oop))));
 	if (!(((oop & 1) == 0)
 		 && (((((usqInt) (longAt(oop))) >> (compactClassFieldLSB())) & 0x1F) == ClassMethodContextCompactIndex))) {
 		return 0;

Modified: branches/Cog/spursistasrc/vm/cogit.c
===================================================================
--- branches/Cog/spursistasrc/vm/cogit.c	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/spursistasrc/vm/cogit.c	2015-01-15 00:03:32 UTC (rev 3229)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.1015 uuid: cc6ec010-1b1d-4ba3-8a4d-1c31b2931fbd
+	CCodeGenerator VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
    from
-	SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1015 uuid: cc6ec010-1b1d-4ba3-8a4d-1c31b2931fbd
+	SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
  */
-static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1015 uuid: cc6ec010-1b1d-4ba3-8a4d-1c31b2931fbd " __DATE__ ;
+static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 

Modified: branches/Cog/spursistasrc/vm/cogit.h
===================================================================
--- branches/Cog/spursistasrc/vm/cogit.h	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/spursistasrc/vm/cogit.h	2015-01-15 00:03:32 UTC (rev 3229)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.1015 uuid: cc6ec010-1b1d-4ba3-8a4d-1c31b2931fbd
+	CCodeGenerator VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
  */
 
 

Modified: branches/Cog/spursistasrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.c	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/spursistasrc/vm/cointerp.c	2015-01-15 00:03:32 UTC (rev 3229)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
    from
-	CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2350,7 +2350,7 @@
 /*560*/	-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
 	};
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1014]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1017]";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -9167,7 +9167,7 @@
 			/* bytecodePrimBitShift */
 			{
 				sqInt integerArgument;
-				sqLong integerReceiver;
+				usqInt integerReceiver;
 				sqInt shifted;
 				char *sp;
 
@@ -9227,7 +9227,7 @@
 							null;
 							goto l77;
 						}
-						shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument);
+						shifted = ((usqInt) integerReceiver) >> (0 - integerArgument);
 					}
 					shifted = positive32BitIntegerFor(shifted);
 					/* begin pop:thenPush: */
@@ -11964,7 +11964,7 @@
 			/* bytecodePrimBitShift */
 			{
 				sqInt integerArgument;
-				sqLong integerReceiver;
+				usqInt integerReceiver;
 				sqInt shifted;
 				char *sp;
 
@@ -12024,7 +12024,7 @@
 							null;
 							goto l183;
 						}
-						shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument);
+						shifted = ((usqInt) integerReceiver) >> (0 - integerArgument);
 					}
 					shifted = positive32BitIntegerFor(shifted);
 					/* begin pop:thenPush: */
@@ -29608,7 +29608,7 @@
 primitiveBitShift(void)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
     sqInt integerArgument;
-    sqLong integerReceiver;
+    usqInt integerReceiver;
     sqInt shifted;
     char *sp;
 
@@ -29655,7 +29655,7 @@
 				}
 				return;
 			}
-			shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument);
+			shifted = ((usqInt) integerReceiver) >> (0 - integerArgument);
 		}
 		shifted = positive32BitIntegerFor(shifted);
 		/* begin pop:thenPush: */
@@ -48527,7 +48527,7 @@
 	10 - 11 32-bit indexable	(11 unused in 32 bits)
 	12 - 15 16-bit indexable	(14 & 15 unused in 32-bits)
 	16 - 23 byte indexable		(20-23 unused in 32-bits)
-	24 - 31 compiled method	(28-21 unused in 32-bits) */
+	24 - 31 compiled method	(28-31 unused in 32-bits) */
 
 static sqInt
 formatOf(sqInt objOop)
@@ -66470,6 +66470,7 @@
 static sqInt
 isLiveContext(sqInt oop)
 {
+	assert(!((isOopForwarded(oop))));
 	if (!(((oop & 3) == 0)
 		 && (((longAt(oop)) & 0x3FFFFF) == ClassMethodContextCompactIndex))) {
 		return 0;

Modified: branches/Cog/spursistasrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.h	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/spursistasrc/vm/cointerp.h	2015-01-15 00:03:32 UTC (rev 3229)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
  */
 
 

Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c	2015-01-15 00:03:32 UTC (rev 3229)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
    from
-	CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2353,7 +2353,7 @@
 /*560*/	-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
 	};
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1014]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1017]";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -9176,7 +9176,7 @@
 			/* bytecodePrimBitShift */
 			{
 				sqInt integerArgument;
-				sqLong integerReceiver;
+				usqInt integerReceiver;
 				sqInt shifted;
 				char *sp;
 
@@ -9236,7 +9236,7 @@
 							null;
 							goto l77;
 						}
-						shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument);
+						shifted = ((usqInt) integerReceiver) >> (0 - integerArgument);
 					}
 					shifted = positive32BitIntegerFor(shifted);
 					/* begin pop:thenPush: */
@@ -11973,7 +11973,7 @@
 			/* bytecodePrimBitShift */
 			{
 				sqInt integerArgument;
-				sqLong integerReceiver;
+				usqInt integerReceiver;
 				sqInt shifted;
 				char *sp;
 
@@ -12033,7 +12033,7 @@
 							null;
 							goto l183;
 						}
-						shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument);
+						shifted = ((usqInt) integerReceiver) >> (0 - integerArgument);
 					}
 					shifted = positive32BitIntegerFor(shifted);
 					/* begin pop:thenPush: */
@@ -29617,7 +29617,7 @@
 primitiveBitShift(void)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
     sqInt integerArgument;
-    sqLong integerReceiver;
+    usqInt integerReceiver;
     sqInt shifted;
     char *sp;
 
@@ -29664,7 +29664,7 @@
 				}
 				return;
 			}
-			shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument);
+			shifted = ((usqInt) integerReceiver) >> (0 - integerArgument);
 		}
 		shifted = positive32BitIntegerFor(shifted);
 		/* begin pop:thenPush: */
@@ -48536,7 +48536,7 @@
 	10 - 11 32-bit indexable	(11 unused in 32 bits)
 	12 - 15 16-bit indexable	(14 & 15 unused in 32-bits)
 	16 - 23 byte indexable		(20-23 unused in 32-bits)
-	24 - 31 compiled method	(28-21 unused in 32-bits) */
+	24 - 31 compiled method	(28-31 unused in 32-bits) */
 
 static sqInt
 formatOf(sqInt objOop)
@@ -66479,6 +66479,7 @@
 static sqInt
 isLiveContext(sqInt oop)
 {
+	assert(!((isOopForwarded(oop))));
 	if (!(((oop & 3) == 0)
 		 && (((longAt(oop)) & 0x3FFFFF) == ClassMethodContextCompactIndex))) {
 		return 0;

Modified: branches/Cog/spursrc/vm/cogit.c
===================================================================
--- branches/Cog/spursrc/vm/cogit.c	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/spursrc/vm/cogit.c	2015-01-15 00:03:32 UTC (rev 3229)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188
+	CCodeGenerator VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188
+	StackToRegisterMappingCogit VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 

Modified: branches/Cog/spursrc/vm/cogit.h
===================================================================
--- branches/Cog/spursrc/vm/cogit.h	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/spursrc/vm/cogit.h	2015-01-15 00:03:32 UTC (rev 3229)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188
+	CCodeGenerator VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
  */
 
 

Modified: branches/Cog/spursrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/cointerp.c	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/spursrc/vm/cointerp.c	2015-01-15 00:03:32 UTC (rev 3229)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
    from
-	CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2341,7 +2341,7 @@
 /*560*/	-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
 	};
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1014]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1017]";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -43425,7 +43425,7 @@
 	10 - 11 32-bit indexable	(11 unused in 32 bits)
 	12 - 15 16-bit indexable	(14 & 15 unused in 32-bits)
 	16 - 23 byte indexable		(20-23 unused in 32-bits)
-	24 - 31 compiled method	(28-21 unused in 32-bits) */
+	24 - 31 compiled method	(28-31 unused in 32-bits) */
 
 static sqInt
 formatOf(sqInt objOop)
@@ -61359,6 +61359,7 @@
 static sqInt
 isLiveContext(sqInt oop)
 {
+	assert(!((isOopForwarded(oop))));
 	if (!(((oop & 3) == 0)
 		 && (((longAt(oop)) & 0x3FFFFF) == ClassMethodContextCompactIndex))) {
 		return 0;

Modified: branches/Cog/spursrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursrc/vm/cointerp.h	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/spursrc/vm/cointerp.h	2015-01-15 00:03:32 UTC (rev 3229)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
  */
 
 

Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/gcc3x-cointerp.c	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/spursrc/vm/gcc3x-cointerp.c	2015-01-15 00:03:32 UTC (rev 3229)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
    from
-	CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2344,7 +2344,7 @@
 /*560*/	-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
 	};
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1014]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1017]";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -43434,7 +43434,7 @@
 	10 - 11 32-bit indexable	(11 unused in 32 bits)
 	12 - 15 16-bit indexable	(14 & 15 unused in 32-bits)
 	16 - 23 byte indexable		(20-23 unused in 32-bits)
-	24 - 31 compiled method	(28-21 unused in 32-bits) */
+	24 - 31 compiled method	(28-31 unused in 32-bits) */
 
 static sqInt
 formatOf(sqInt objOop)
@@ -61368,6 +61368,7 @@
 static sqInt
 isLiveContext(sqInt oop)
 {
+	assert(!((isOopForwarded(oop))));
 	if (!(((oop & 3) == 0)
 		 && (((longAt(oop)) & 0x3FFFFF) == ClassMethodContextCompactIndex))) {
 		return 0;

Modified: branches/Cog/spurstack64src/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/spurstack64src/vm/gcc3x-interp.c	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/spurstack64src/vm/gcc3x-interp.c	2015-01-15 00:03:32 UTC (rev 3229)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
    from
-	StackInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	StackInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2122,7 +2122,7 @@
 	/* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1014]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1017]";
 volatile int sendTrace;
 sqInt suppressHeartbeatFlag;
 
@@ -33278,7 +33278,7 @@
 	10 - 11 32-bit indexable	(11 unused in 32 bits)
 	12 - 15 16-bit indexable	(14 & 15 unused in 32-bits)
 	16 - 23 byte indexable		(20-23 unused in 32-bits)
-	24 - 31 compiled method	(28-21 unused in 32-bits) */
+	24 - 31 compiled method	(28-31 unused in 32-bits) */
 
 static sqInt
 formatOf(sqInt objOop)
@@ -53233,6 +53233,7 @@
 static sqInt
 isLiveContext(sqInt oop)
 {
+	assert(!((isOopForwarded(oop))));
 	if (!(((oop & 7) == 0)
 		 && (((longAt(oop)) & 0x3FFFFF) == ClassMethodContextCompactIndex))) {
 		return 0;

Modified: branches/Cog/spurstack64src/vm/interp.c
===================================================================
--- branches/Cog/spurstack64src/vm/interp.c	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/spurstack64src/vm/interp.c	2015-01-15 00:03:32 UTC (rev 3229)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
    from
-	StackInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	StackInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2119,7 +2119,7 @@
 	/* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1014]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1017]";
 volatile int sendTrace;
 sqInt suppressHeartbeatFlag;
 
@@ -33269,7 +33269,7 @@
 	10 - 11 32-bit indexable	(11 unused in 32 bits)
 	12 - 15 16-bit indexable	(14 & 15 unused in 32-bits)
 	16 - 23 byte indexable		(20-23 unused in 32-bits)
-	24 - 31 compiled method	(28-21 unused in 32-bits) */
+	24 - 31 compiled method	(28-31 unused in 32-bits) */
 
 static sqInt
 formatOf(sqInt objOop)
@@ -53224,6 +53224,7 @@
 static sqInt
 isLiveContext(sqInt oop)
 {
+	assert(!((isOopForwarded(oop))));
 	if (!(((oop & 7) == 0)
 		 && (((longAt(oop)) & 0x3FFFFF) == ClassMethodContextCompactIndex))) {
 		return 0;

Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/spurstacksrc/vm/gcc3x-interp.c	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c	2015-01-15 00:03:32 UTC (rev 3229)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
    from
-	StackInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	StackInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2092,7 +2092,7 @@
 	/* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1014]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1017]";
 volatile int sendTrace;
 sqInt suppressHeartbeatFlag;
 
@@ -30347,7 +30347,7 @@
 	10 - 11 32-bit indexable	(11 unused in 32 bits)
 	12 - 15 16-bit indexable	(14 & 15 unused in 32-bits)
 	16 - 23 byte indexable		(20-23 unused in 32-bits)
-	24 - 31 compiled method	(28-21 unused in 32-bits) */
+	24 - 31 compiled method	(28-31 unused in 32-bits) */
 
 static sqInt
 formatOf(sqInt objOop)
@@ -48611,6 +48611,7 @@
 static sqInt
 isLiveContext(sqInt oop)
 {
+	assert(!((isOopForwarded(oop))));
 	if (!(((oop & 3) == 0)
 		 && (((longAt(oop)) & 0x3FFFFF) == ClassMethodContextCompactIndex))) {
 		return 0;

Modified: branches/Cog/spurstacksrc/vm/interp.c
===================================================================
--- branches/Cog/spurstacksrc/vm/interp.c	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/spurstacksrc/vm/interp.c	2015-01-15 00:03:32 UTC (rev 3229)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
    from
-	StackInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	StackInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2089,7 +2089,7 @@
 	/* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1014]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1017]";
 volatile int sendTrace;
 sqInt suppressHeartbeatFlag;
 
@@ -30338,7 +30338,7 @@
 	10 - 11 32-bit indexable	(11 unused in 32 bits)
 	12 - 15 16-bit indexable	(14 & 15 unused in 32-bits)
 	16 - 23 byte indexable		(20-23 unused in 32-bits)
-	24 - 31 compiled method	(28-21 unused in 32-bits) */
+	24 - 31 compiled method	(28-31 unused in 32-bits) */
 
 static sqInt
 formatOf(sqInt objOop)
@@ -48602,6 +48602,7 @@
 static sqInt
 isLiveContext(sqInt oop)
 {
+	assert(!((isOopForwarded(oop))));
 	if (!(((oop & 3) == 0)
 		 && (((longAt(oop)) & 0x3FFFFF) == ClassMethodContextCompactIndex))) {
 		return 0;

Modified: branches/Cog/src/vm/cogit.c
===================================================================
--- branches/Cog/src/vm/cogit.c	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/src/vm/cogit.c	2015-01-15 00:03:32 UTC (rev 3229)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188
+	CCodeGenerator VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188
+	StackToRegisterMappingCogit VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 

Modified: branches/Cog/src/vm/cogit.h
===================================================================
--- branches/Cog/src/vm/cogit.h	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/src/vm/cogit.h	2015-01-15 00:03:32 UTC (rev 3229)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188
+	CCodeGenerator VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
  */
 
 

Modified: branches/Cog/src/vm/cointerp.c
===================================================================
--- branches/Cog/src/vm/cointerp.c	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/src/vm/cointerp.c	2015-01-15 00:03:32 UTC (rev 3229)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
    from
-	CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2089,7 +2089,7 @@
 	/* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1014]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1017]";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -42144,6 +42144,7 @@
 static sqInt
 isLiveContext(sqInt oop)
 {
+	assert(!((isOopForwarded(oop))));
 	if (!(((oop & 1) == 0)
 		 && (((((usqInt) (longAt(oop))) >> (compactClassFieldLSB())) & 0x1F) == ClassMethodContextCompactIndex))) {
 		return 0;

Modified: branches/Cog/src/vm/cointerp.h
===================================================================
--- branches/Cog/src/vm/cointerp.h	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/src/vm/cointerp.h	2015-01-15 00:03:32 UTC (rev 3229)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
  */
 
 

Modified: branches/Cog/src/vm/cointerpmt.c
===================================================================
--- branches/Cog/src/vm/cointerpmt.c	2015-01-13 18:10:05 UTC (rev 3228)
+++ branches/Cog/src/vm/cointerpmt.c	2015-01-15 00:03:32 UTC (rev 3229)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
    from
-	CoInterpreterMT VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d
+	CoInterpreterMT VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5
  */
-static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d " __DATE__ ;
+static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2186,7 +2186,7 @@
 	/* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.1014]";
+const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.1017]";

@@ Diff output truncated at 50000 characters. @@

More information about the Vm-dev mailing list