Newspeak source as per VMMaker.oscog-dtl.3185

OpenSmalltalk · Jun 2, 2022 · b930975 · b930975
1 parent ad970a9
commit b930975
Show file tree

Hide file tree

Showing 12 changed files with 122 additions and 70 deletions.
diff --git a/src/spur32.cog.newspeak/cogit.h b/src/spur32.cog.newspeak/cogit.h
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-mt.3083 uuid: 0d345f2b-f29d-7148-b84c-cb4ed3775bb1
+	CCodeGenerator VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9
  */
 
 

diff --git a/src/spur32.cog.newspeak/cointerp.c b/src/spur32.cog.newspeak/cointerp.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-mt.3184 uuid: 57b61827-3f1a-ab45-966e-7c5caaef28d7
+	CCodeGeneratorGlobalStructure VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9
    from
-	CoInterpreter VMMaker.oscog-mt.3184 uuid: 57b61827-3f1a-ab45-966e-7c5caaef28d7
+	CoInterpreter VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-mt.3184 uuid: 57b61827-3f1a-ab45-966e-7c5caaef28d7 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -1856,6 +1856,7 @@ _iss sqInt externalPrimitiveTableFirstFreeIndex;
 _iss sqInt firstFieldOfRememberedSet;
 _iss sqInt firstSegmentSize;
 _iss usqInt lowSpaceThreshold;
+_iss sqInt multipleBytecodeSetsActive;
 _iss sqInt preemptionYields;
 _iss FILE * scavengeLog;
 _iss sqInt statMaxAllocSegmentTime;
@@ -1866,7 +1867,6 @@ _iss sqInt edenBytes;
 _iss sqInt fullScreenFlag;
 _iss usqInt lastHash;
 _iss sqInt lastMethodCacheProbeWrite;
-_iss sqInt multipleBytecodeSetsActive;
 _iss sqInt newFinalization;
 _iss sqInt rememberedSetRedZone;
 _iss sqInt savedWindowSize;
@@ -2007,7 +2007,7 @@ static signed short primitiveMetadataTable[MaxPrimitiveIndex + 2 /* 581 */] = {
 /*78*/	 0, 0,
 /*80*/	-256,-256,-256, 4, 4, 0, 0x100, 0, 0x200,-256,-256, 0, 0, 0, 0x100,-256,-256,
 /*97*/	-256, 0, 0,
-/*100*/	 260, 0x200, 0x100, 0x200,-256, 513,-256,-256,-256,-256, 0, 0x100, 0, 0,-256,
+/*100*/	 260, 0x200, 0x200, 0x200,-256, 513,-256,-256,-256,-256, 0, 0x100, 0, 0,-256,
 /*115*/	 0x100, 0, 12, 260, 0,
 /*120*/	 524, 0x100,-256,-256, 1, 0, 0, 0, 0,-255,-256,-256, 0, 0, 0,-256, 0,-256,-256,
 /*139*/	 0,
@@ -2676,7 +2676,7 @@ sqInt debugCallbackInvokes;
 sqInt debugCallbackReturns;
 sqInt cannotDeferDisplayUpdates;
 sqInt checkedPluginName;
-const char *interpreterVersion = "Newspeak Virtual Machine [ Open Smalltalk, Spur] CoInterpreterPrimitives_VMMaker.oscog-mt.3184";
+const char *interpreterVersion = "Newspeak Virtual Machine [ Open Smalltalk, Spur] CoInterpreterPrimitives_VMMaker.oscog-dtl.3185";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 char expensiveAsserts = 0;
 int (*showSurfaceFn)(sqIntptr_t, int, int, int, int);
@@ -34419,6 +34419,7 @@ primitiveIdentityHash(void)
 EXPORT(sqInt)
 primitiveImageFormatVersion(void)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
+    unsigned int integerValue;
     usqInt newLargeInteger;
     usqInt newObj;
     usqInt numBytes;
@@ -34427,10 +34428,20 @@ primitiveImageFormatVersion(void)
     char *sp;
 
 	/* begin pop:thenPush: */
+	if (GIV(multipleBytecodeSetsActive)) {
+		integerValue = ((sqInt) (6521 /* imageFormatVersion */ | MultipleBytecodeSetsBitmask));
+		goto l6;
+	}
+	else {
+		/* begin imageFormatVersion */
+		integerValue = 6521;
+		goto l6;
+	}
+	l6:	/* end imageFormatVersionForSnapshot */;
 	/* begin maybeInlinePositive32BitIntegerFor: */
 	assert(!((hasSixtyFourBitImmediates())));
-	if ((((unsigned int) 6521 /* imageFormatVersion */)) <= (MaxSmallInteger)) {
-		oop = (((usqInt)6521 /* imageFormatVersion */ << 1) | 1);
+	if ((((unsigned int) integerValue)) <= (MaxSmallInteger)) {
+		oop = ((integerValue << 1) | 1);
 		goto l5;
 	}
 	/* begin eeInstantiateSmallClassIndex:format:numSlots: */
@@ -34465,7 +34476,7 @@ primitiveImageFormatVersion(void)
 	/* Memory is 8 byte aligned in Spur, make sure that oversized bytes are set to zero */
 	/* eem 4/28/2016 questionable; they should never be read */
 	/* begin storeLong32:ofObject:withValue: */
-	long32Atput((newLargeInteger + BaseHeaderSize), SQ_SWAP_4_BYTES_IF_BIGENDIAN(6521 /* imageFormatVersion */));
+	long32Atput((newLargeInteger + BaseHeaderSize), SQ_SWAP_4_BYTES_IF_BIGENDIAN(integerValue));
 	/* begin storeLong32:ofObject:withValue: */
 	long32Atput((newLargeInteger + BaseHeaderSize) + (4), 0);
 	oop = newLargeInteger;
@@ -61866,7 +61877,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr)
 			assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(obj)));
 			contextSize = (sp >> 1);
 	l6:	/* end fetchStackPointerOf: */;
-			numPointerSlots = ((usqInt) (CtxtTempFrameStart + contextSize));
+			numPointerSlots = CtxtTempFrameStart + contextSize;
 			goto l10;
 		}
 		/* begin numSlotsOf: */
@@ -61896,7 +61907,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr)
 	/* begin literalCountOfMethodHeader: */
 	assert((header & 1));
 	numLiterals = ((header >> 1)) & AlternateHeaderNumLiteralsMask;
-	numPointerSlots = ((usqInt) (numLiterals + LiteralStart));
+	numPointerSlots = numLiterals + LiteralStart;
 	l10:	/* end numPointerSlotsWhileCompactingOf:withFormat:savedFirstFieldPointer: */;
 	if ((fmt <= 5 /* lastPointerFormat */)
 	 && (numPointerSlots > 0)) {

diff --git a/src/spur32.cog.newspeak/cointerp.h b/src/spur32.cog.newspeak/cointerp.h
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-mt.3184 uuid: 57b61827-3f1a-ab45-966e-7c5caaef28d7
+	CCodeGeneratorGlobalStructure VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9
  */
 
 

diff --git a/src/spur32.cog.newspeak/gcc3x-cointerp.c b/src/spur32.cog.newspeak/gcc3x-cointerp.c
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-mt.3184 uuid: 57b61827-3f1a-ab45-966e-7c5caaef28d7
+	CCodeGeneratorGlobalStructure VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9
    from
-	CoInterpreter VMMaker.oscog-mt.3184 uuid: 57b61827-3f1a-ab45-966e-7c5caaef28d7
+	CoInterpreter VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-mt.3184 uuid: 57b61827-3f1a-ab45-966e-7c5caaef28d7 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -1859,6 +1859,7 @@ _iss sqInt externalPrimitiveTableFirstFreeIndex;
 _iss sqInt firstFieldOfRememberedSet;
 _iss sqInt firstSegmentSize;
 _iss usqInt lowSpaceThreshold;
+_iss sqInt multipleBytecodeSetsActive;
 _iss sqInt preemptionYields;
 _iss FILE * scavengeLog;
 _iss sqInt statMaxAllocSegmentTime;
@@ -1869,7 +1870,6 @@ _iss sqInt edenBytes;
 _iss sqInt fullScreenFlag;
 _iss usqInt lastHash;
 _iss sqInt lastMethodCacheProbeWrite;
-_iss sqInt multipleBytecodeSetsActive;
 _iss sqInt newFinalization;
 _iss sqInt rememberedSetRedZone;
 _iss sqInt savedWindowSize;
@@ -2010,7 +2010,7 @@ static signed short primitiveMetadataTable[MaxPrimitiveIndex + 2 /* 581 */] = {
 /*78*/	 0, 0,
 /*80*/	-256,-256,-256, 4, 4, 0, 0x100, 0, 0x200,-256,-256, 0, 0, 0, 0x100,-256,-256,
 /*97*/	-256, 0, 0,
-/*100*/	 260, 0x200, 0x100, 0x200,-256, 513,-256,-256,-256,-256, 0, 0x100, 0, 0,-256,
+/*100*/	 260, 0x200, 0x200, 0x200,-256, 513,-256,-256,-256,-256, 0, 0x100, 0, 0,-256,
 /*115*/	 0x100, 0, 12, 260, 0,
 /*120*/	 524, 0x100,-256,-256, 1, 0, 0, 0, 0,-255,-256,-256, 0, 0, 0,-256, 0,-256,-256,
 /*139*/	 0,
@@ -2679,7 +2679,7 @@ sqInt debugCallbackInvokes;
 sqInt debugCallbackReturns;
 sqInt cannotDeferDisplayUpdates;
 sqInt checkedPluginName;
-const char *interpreterVersion = "Newspeak Virtual Machine [ Open Smalltalk, Spur] CoInterpreterPrimitives_VMMaker.oscog-mt.3184";
+const char *interpreterVersion = "Newspeak Virtual Machine [ Open Smalltalk, Spur] CoInterpreterPrimitives_VMMaker.oscog-dtl.3185";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 char expensiveAsserts = 0;
 int (*showSurfaceFn)(sqIntptr_t, int, int, int, int);
@@ -34428,6 +34428,7 @@ primitiveIdentityHash(void)
 EXPORT(sqInt)
 primitiveImageFormatVersion(void)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
+    unsigned int integerValue;
     usqInt newLargeInteger;
     usqInt newObj;
     usqInt numBytes;
@@ -34436,10 +34437,20 @@ primitiveImageFormatVersion(void)
     char *sp;
 
 	/* begin pop:thenPush: */
+	if (GIV(multipleBytecodeSetsActive)) {
+		integerValue = ((sqInt) (6521 /* imageFormatVersion */ | MultipleBytecodeSetsBitmask));
+		goto l6;
+	}
+	else {
+		/* begin imageFormatVersion */
+		integerValue = 6521;
+		goto l6;
+	}
+	l6:	/* end imageFormatVersionForSnapshot */;
 	/* begin maybeInlinePositive32BitIntegerFor: */
 	assert(!((hasSixtyFourBitImmediates())));
-	if ((((unsigned int) 6521 /* imageFormatVersion */)) <= (MaxSmallInteger)) {
-		oop = (((usqInt)6521 /* imageFormatVersion */ << 1) | 1);
+	if ((((unsigned int) integerValue)) <= (MaxSmallInteger)) {
+		oop = ((integerValue << 1) | 1);
 		goto l5;
 	}
 	/* begin eeInstantiateSmallClassIndex:format:numSlots: */
@@ -34474,7 +34485,7 @@ primitiveImageFormatVersion(void)
 	/* Memory is 8 byte aligned in Spur, make sure that oversized bytes are set to zero */
 	/* eem 4/28/2016 questionable; they should never be read */
 	/* begin storeLong32:ofObject:withValue: */
-	long32Atput((newLargeInteger + BaseHeaderSize), SQ_SWAP_4_BYTES_IF_BIGENDIAN(6521 /* imageFormatVersion */));
+	long32Atput((newLargeInteger + BaseHeaderSize), SQ_SWAP_4_BYTES_IF_BIGENDIAN(integerValue));
 	/* begin storeLong32:ofObject:withValue: */
 	long32Atput((newLargeInteger + BaseHeaderSize) + (4), 0);
 	oop = newLargeInteger;
@@ -61875,7 +61886,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr)
 			assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(obj)));
 			contextSize = (sp >> 1);
 	l6:	/* end fetchStackPointerOf: */;
-			numPointerSlots = ((usqInt) (CtxtTempFrameStart + contextSize));
+			numPointerSlots = CtxtTempFrameStart + contextSize;
 			goto l10;
 		}
 		/* begin numSlotsOf: */
@@ -61905,7 +61916,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr)
 	/* begin literalCountOfMethodHeader: */
 	assert((header & 1));
 	numLiterals = ((header >> 1)) & AlternateHeaderNumLiteralsMask;
-	numPointerSlots = ((usqInt) (numLiterals + LiteralStart));
+	numPointerSlots = numLiterals + LiteralStart;
 	l10:	/* end numPointerSlotsWhileCompactingOf:withFormat:savedFirstFieldPointer: */;
 	if ((fmt <= 5 /* lastPointerFormat */)
 	 && (numPointerSlots > 0)) {

diff --git a/src/spur32.stack.newspeak/gcc3x-interp.c b/src/spur32.stack.newspeak/gcc3x-interp.c
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-mt.3184 uuid: 57b61827-3f1a-ab45-966e-7c5caaef28d7
+	CCodeGeneratorGlobalStructure VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9
    from
-	StackInterpreter VMMaker.oscog-mt.3184 uuid: 57b61827-3f1a-ab45-966e-7c5caaef28d7
+	StackInterpreter VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-mt.3184 uuid: 57b61827-3f1a-ab45-966e-7c5caaef28d7 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -1609,6 +1609,7 @@ _iss sqInt statSurvivorCount;
 _iss sqInt firstFieldOfRememberedSet;
 _iss sqInt firstSegmentSize;
 _iss usqInt lowSpaceThreshold;
+_iss sqInt multipleBytecodeSetsActive;
 _iss sqInt preemptionYields;
 _iss FILE * scavengeLog;
 _iss sqInt statMaxAllocSegmentTime;
@@ -1619,7 +1620,6 @@ _iss sqInt edenBytes;
 _iss sqInt fullScreenFlag;
 _iss usqInt lastHash;
 _iss sqInt lastMethodCacheProbeWrite;
-_iss sqInt multipleBytecodeSetsActive;
 _iss sqInt newFinalization;
 _iss sqInt rememberedSetRedZone;
 _iss sqInt savedWindowSize;
@@ -2389,7 +2389,7 @@ sqInt debugCallbackInvokes;
 sqInt debugCallbackReturns;
 sqInt cannotDeferDisplayUpdates;
 sqInt checkedPluginName;
-const char *interpreterVersion = "Newspeak Virtual Machine [ Open Smalltalk, Spur] StackInterpreterPrimitives_VMMaker.oscog-mt.3184";
+const char *interpreterVersion = "Newspeak Virtual Machine [ Open Smalltalk, Spur] StackInterpreterPrimitives_VMMaker.oscog-dtl.3185";
 sqInt suppressHeartbeatFlag;
 char expensiveAsserts = 0;
 int (*showSurfaceFn)(sqIntptr_t, int, int, int, int);
@@ -21166,6 +21166,7 @@ primitiveIdentityHash(void)
 EXPORT(sqInt)
 primitiveImageFormatVersion(void)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
+    unsigned int integerValue;
     usqInt newLargeInteger;
     usqInt newObj;
     usqInt numBytes;
@@ -21174,10 +21175,20 @@ primitiveImageFormatVersion(void)
     char *sp;
 
 	/* begin pop:thenPush: */
+	if (GIV(multipleBytecodeSetsActive)) {
+		integerValue = ((sqInt) (6521 /* imageFormatVersion */ | MultipleBytecodeSetsBitmask));
+		goto l6;
+	}
+	else {
+		/* begin imageFormatVersion */
+		integerValue = 6521;
+		goto l6;
+	}
+	l6:	/* end imageFormatVersionForSnapshot */;
 	/* begin maybeInlinePositive32BitIntegerFor: */
 	assert(!((hasSixtyFourBitImmediates())));
-	if ((((unsigned int) 6521 /* imageFormatVersion */)) <= (MaxSmallInteger)) {
-		oop = (((usqInt)6521 /* imageFormatVersion */ << 1) | 1);
+	if ((((unsigned int) integerValue)) <= (MaxSmallInteger)) {
+		oop = ((integerValue << 1) | 1);
 		goto l5;
 	}
 	/* begin eeInstantiateSmallClassIndex:format:numSlots: */
@@ -21212,7 +21223,7 @@ primitiveImageFormatVersion(void)
 	/* Memory is 8 byte aligned in Spur, make sure that oversized bytes are set to zero */
 	/* eem 4/28/2016 questionable; they should never be read */
 	/* begin storeLong32:ofObject:withValue: */
-	long32Atput((newLargeInteger + BaseHeaderSize), SQ_SWAP_4_BYTES_IF_BIGENDIAN(6521 /* imageFormatVersion */));
+	long32Atput((newLargeInteger + BaseHeaderSize), SQ_SWAP_4_BYTES_IF_BIGENDIAN(integerValue));
 	/* begin storeLong32:ofObject:withValue: */
 	long32Atput((newLargeInteger + BaseHeaderSize) + (4), 0);
 	oop = newLargeInteger;

diff --git a/src/spur32.stack.newspeak/interp.c b/src/spur32.stack.newspeak/interp.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-mt.3184 uuid: 57b61827-3f1a-ab45-966e-7c5caaef28d7
+	CCodeGeneratorGlobalStructure VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9
    from
-	StackInterpreter VMMaker.oscog-mt.3184 uuid: 57b61827-3f1a-ab45-966e-7c5caaef28d7
+	StackInterpreter VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-mt.3184 uuid: 57b61827-3f1a-ab45-966e-7c5caaef28d7 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -1606,6 +1606,7 @@ _iss sqInt statSurvivorCount;
 _iss sqInt firstFieldOfRememberedSet;
 _iss sqInt firstSegmentSize;
 _iss usqInt lowSpaceThreshold;
+_iss sqInt multipleBytecodeSetsActive;
 _iss sqInt preemptionYields;
 _iss FILE * scavengeLog;
 _iss sqInt statMaxAllocSegmentTime;
@@ -1616,7 +1617,6 @@ _iss sqInt edenBytes;
 _iss sqInt fullScreenFlag;
 _iss usqInt lastHash;
 _iss sqInt lastMethodCacheProbeWrite;
-_iss sqInt multipleBytecodeSetsActive;
 _iss sqInt newFinalization;
 _iss sqInt rememberedSetRedZone;
 _iss sqInt savedWindowSize;
@@ -2386,7 +2386,7 @@ sqInt debugCallbackInvokes;
 sqInt debugCallbackReturns;
 sqInt cannotDeferDisplayUpdates;
 sqInt checkedPluginName;
-const char *interpreterVersion = "Newspeak Virtual Machine [ Open Smalltalk, Spur] StackInterpreterPrimitives_VMMaker.oscog-mt.3184";
+const char *interpreterVersion = "Newspeak Virtual Machine [ Open Smalltalk, Spur] StackInterpreterPrimitives_VMMaker.oscog-dtl.3185";
 sqInt suppressHeartbeatFlag;
 char expensiveAsserts = 0;
 int (*showSurfaceFn)(sqIntptr_t, int, int, int, int);
@@ -21157,6 +21157,7 @@ primitiveIdentityHash(void)
 EXPORT(sqInt)
 primitiveImageFormatVersion(void)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
+    unsigned int integerValue;
     usqInt newLargeInteger;
     usqInt newObj;
     usqInt numBytes;
@@ -21165,10 +21166,20 @@ primitiveImageFormatVersion(void)
     char *sp;
 
 	/* begin pop:thenPush: */
+	if (GIV(multipleBytecodeSetsActive)) {
+		integerValue = ((sqInt) (6521 /* imageFormatVersion */ | MultipleBytecodeSetsBitmask));
+		goto l6;
+	}
+	else {
+		/* begin imageFormatVersion */
+		integerValue = 6521;
+		goto l6;
+	}
+	l6:	/* end imageFormatVersionForSnapshot */;
 	/* begin maybeInlinePositive32BitIntegerFor: */
 	assert(!((hasSixtyFourBitImmediates())));
-	if ((((unsigned int) 6521 /* imageFormatVersion */)) <= (MaxSmallInteger)) {
-		oop = (((usqInt)6521 /* imageFormatVersion */ << 1) | 1);
+	if ((((unsigned int) integerValue)) <= (MaxSmallInteger)) {
+		oop = ((integerValue << 1) | 1);
 		goto l5;
 	}
 	/* begin eeInstantiateSmallClassIndex:format:numSlots: */
@@ -21203,7 +21214,7 @@ primitiveImageFormatVersion(void)
 	/* Memory is 8 byte aligned in Spur, make sure that oversized bytes are set to zero */
 	/* eem 4/28/2016 questionable; they should never be read */
 	/* begin storeLong32:ofObject:withValue: */
-	long32Atput((newLargeInteger + BaseHeaderSize), SQ_SWAP_4_BYTES_IF_BIGENDIAN(6521 /* imageFormatVersion */));
+	long32Atput((newLargeInteger + BaseHeaderSize), SQ_SWAP_4_BYTES_IF_BIGENDIAN(integerValue));
 	/* begin storeLong32:ofObject:withValue: */
 	long32Atput((newLargeInteger + BaseHeaderSize) + (4), 0);
 	oop = newLargeInteger;

diff --git a/src/spur64.cog.newspeak/cogit.h b/src/spur64.cog.newspeak/cogit.h
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-mt.3083 uuid: 0d345f2b-f29d-7148-b84c-cb4ed3775bb1
+	CCodeGenerator VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9
  */