CogVM source as per VMMaker.oscog-eem.3347

Integrate Jörg Belger's fixes to growing memory by the right ammoun when the first attempt fails at growing the remembered set and/or an obj stack. Inline CogObjectRepresentationForSpur>>#cacheTagIsMarked: always. Fix a typo.
OpenSmalltalk · Jan 25, 2024 · b8d838c · b8d838c
1 parent cc2dd90
commit b8d838c
Show file tree

Hide file tree

Showing 58 changed files with 798 additions and 552 deletions.
diff --git a/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c b/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	VMPluginCodeGenerator VMMaker.oscog-eem.3268 uuid: b157851d-3135-4853-9b4a-b72296787205
+	VMPluginCodeGenerator VMMaker.oscog-eem.3347 uuid: 7e4df21b-b561-434b-b2d3-45e8806d7875
    from
-	B3DAcceleratorPlugin VMMaker.oscog-eem.3268 uuid: b157851d-3135-4853-9b4a-b72296787205
+	B3DAcceleratorPlugin VMMaker.oscog-eem.3347 uuid: 7e4df21b-b561-434b-b2d3-45e8806d7875
  */
-static char __buildInfo[] = "B3DAcceleratorPlugin VMMaker.oscog-eem.3268 uuid: b157851d-3135-4853-9b4a-b72296787205 " __DATE__ ;
+static char __buildInfo[] = "B3DAcceleratorPlugin VMMaker.oscog-eem.3347 uuid: 7e4df21b-b561-434b-b2d3-45e8806d7875 " __DATE__ ;
 
 
 #include "config.h"
@@ -146,7 +146,7 @@ extern sqInt topRemappableOop(void);
 extern
 #endif
 struct VirtualMachine* interpreterProxy;
-static const char *moduleName = "B3DAcceleratorPlugin VMMaker.oscog-eem.3268 " INT_EXT;
+static const char *moduleName = "B3DAcceleratorPlugin VMMaker.oscog-eem.3347 " INT_EXT;
 
 
 
@@ -1594,7 +1594,7 @@ stackPrimitiveVertexArrayofSize(sqInt index, sqInt nItems)
 	}
 	if (isWords(oop)) {
 		oopSize = slotSizeOf(oop);
-		if (((oopSize >= nItems) * 16)
+		if ((oopSize >= (nItems * 16))
 		 && ((oopSize % 16) == 0)) {
 			return firstIndexableField(oop);
 		}

diff --git a/src/spur32.cog.lowcode/cogit.h b/src/spur32.cog.lowcode/cogit.h
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.3339 uuid: b1c834e2-5de7-464c-aeb5-4f2a7b8812d6
+	CCodeGenerator VMMaker.oscog-eem.3347 uuid: 7e4df21b-b561-434b-b2d3-45e8806d7875
  */
 
 

diff --git a/src/spur32.cog.lowcode/cogitARMv5.c b/src/spur32.cog.lowcode/cogitARMv5.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.3339 uuid: b1c834e2-5de7-464c-aeb5-4f2a7b8812d6
+	CCodeGenerator VMMaker.oscog-eem.3347 uuid: 7e4df21b-b561-434b-b2d3-45e8806d7875
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.3339 uuid: b1c834e2-5de7-464c-aeb5-4f2a7b8812d6
+	StackToRegisterMappingCogit VMMaker.oscog-eem.3347 uuid: 7e4df21b-b561-434b-b2d3-45e8806d7875
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3339 uuid: b1c834e2-5de7-464c-aeb5-4f2a7b8812d6 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3347 uuid: 7e4df21b-b561-434b-b2d3-45e8806d7875 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 

diff --git a/src/spur32.cog.lowcode/cogitIA32.c b/src/spur32.cog.lowcode/cogitIA32.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.3339 uuid: b1c834e2-5de7-464c-aeb5-4f2a7b8812d6
+	CCodeGenerator VMMaker.oscog-eem.3347 uuid: 7e4df21b-b561-434b-b2d3-45e8806d7875
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.3339 uuid: b1c834e2-5de7-464c-aeb5-4f2a7b8812d6
+	StackToRegisterMappingCogit VMMaker.oscog-eem.3347 uuid: 7e4df21b-b561-434b-b2d3-45e8806d7875
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3339 uuid: b1c834e2-5de7-464c-aeb5-4f2a7b8812d6 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3347 uuid: 7e4df21b-b561-434b-b2d3-45e8806d7875 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 

diff --git a/src/spur32.cog.lowcode/cointerp.c b/src/spur32.cog.lowcode/cointerp.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3339 uuid: b1c834e2-5de7-464c-aeb5-4f2a7b8812d6
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3347 uuid: 7e4df21b-b561-434b-b2d3-45e8806d7875
    from
-	CoInterpreter VMMaker.oscog-eem.3339 uuid: b1c834e2-5de7-464c-aeb5-4f2a7b8812d6
+	CoInterpreter VMMaker.oscog-eem.3347 uuid: 7e4df21b-b561-434b-b2d3-45e8806d7875
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3339 uuid: b1c834e2-5de7-464c-aeb5-4f2a7b8812d6 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3347 uuid: 7e4df21b-b561-434b-b2d3-45e8806d7875 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2027,7 +2027,7 @@ static signed short primitiveMetadataTable[MaxPrimitiveIndex + 2 /* 584 */] = {
 /*78*/	 0, 0,
 /*80*/	-256,-256,-256, 4, 4, 0, 0x100, 0, 0x200,-256,-256, 0, 0, 0, 0x100,-256, 0,-256,
 /*98*/	 0, 0,
-/*100*/	 260, 0x200, 0x200, 0x200,-256, 513,-256,-256,-256,-256, 0, 0x100, 0, 0,-256,
+/*100*/	 260, 0x200, 0x100, 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,
@@ -2701,7 +2701,7 @@ sqInt debugCallbackReturns;
 sqInt suppressHeartbeatFlag;
 sqInt cannotDeferDisplayUpdates;
 sqInt checkedPluginName;
-const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3339]";
+const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3347]";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 char expensiveAsserts = 0;
 int (*showSurfaceFn)(sqIntptr_t, int, int, int, int);
@@ -37462,7 +37462,7 @@ getImageHeaderFlags(void)
 	? 0
 	: 0x100))) + ((upscaleDisplayIfHighDPI
 	? 0
-	: 0x400))) + (((GIV(imageHeaderFlags) | (2011)) - (2011)));
+	: 0x400))) + (((GIV(imageHeaderFlags) | (1499)) - (1499)));
 }
 
 
@@ -38971,7 +38971,7 @@ mnuMethodOrNilFor(sqInt rcvr)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
     sqInt currentClass;
     sqInt dictionary;
-    sqInt index;
+    usqInt index;
     usqInt length;
     sqInt mask;
     sqInt methodArray;
@@ -39020,7 +39020,7 @@ mnuMethodOrNilFor(sqInt rcvr)
 		wrapAround = 0;
 		while (1) {
 			/* begin fetchPointer:ofObject: */
-			nextSelector = longAt((dictionary + BaseHeaderSize) + (((sqInt)((usqInt)(index) << (shiftForWord())))));
+			nextSelector = longAt((dictionary + BaseHeaderSize) + (index << (shiftForWord())));
 			if (nextSelector == GIV(nilObj)) {
 				mnuMethod = null;
 				goto l11;
@@ -39038,7 +39038,7 @@ mnuMethodOrNilFor(sqInt rcvr)
 				}
 				methodArray = objOop;
 				/* begin followField:ofObject: */
-				objOop1 = longAt((methodArray + BaseHeaderSize) + (((sqInt)((usqInt)((index - SelectorStart)) << (shiftForWord())))));
+				objOop1 = longAt((methodArray + BaseHeaderSize) + ((index - SelectorStart) << (shiftForWord())));
 				if (((!(objOop1 & (tagMask()))))
 				 && ((!((longAt(objOop1)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun())))))) {
 					objOop1 = fixFollowedFieldofObjectwithInitialValue(index - SelectorStart, methodArray, objOop1);
@@ -53239,7 +53239,7 @@ primitiveInvokeObjectAsMethod(void)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
     sqInt i;
     sqInt lookupClassTag;
-    sqInt runArgs;
+    usqInt runArgs;
     sqInt runReceiver;
     char *sp;
     char *sp1;
@@ -61412,7 +61412,7 @@ growRememberedSet(void)
 		}
 		newObj = obj2;
 		if (!newObj) {
-			if (!(growOldSpaceByAtLeast(numSlots + 0x400))) {
+			if (!(growOldSpaceByAtLeast((numSlots + 0x400) * BytesPerOop))) {
 				error("could not grow remembered set");
 			}
 			/* begin allocatePinnedSlots: */
@@ -67599,7 +67599,7 @@ ensureRoomOnObjStackAt(sqInt objStackRootIndex)
 			if (!freeOrNewPage) {
 
 				/* Allocate a new segment an retry. This is very uncommon. But it happened to me (Clement). */
-				growOldSpaceByAtLeast(ObjStackPageSlots);
+				growOldSpaceByAtLeast(ObjStackPageSlots * BytesPerOop);
 				/* begin allocateSlotsInOldSpace:format:classIndex: */
 				formatField = firstLongFormat();
 				classIndex = thirtyTwoBitLongsClassIndexPun();
@@ -80555,7 +80555,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: */
@@ -80585,7 +80585,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)) {
@@ -81137,7 +81137,7 @@ prepareForSnapshot(void)
     sqInt limit;
     sqInt newEndOfMemory;
     sqInt next;
-    usqInt node;
+    sqInt node;
     SpurSegmentInfo *seg;
     sqInt smallChild;
     sqInt treeNode;
@@ -87217,7 +87217,7 @@ lookupSelectorinClass(sqInt selector, sqInt class)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
     sqInt currentClass;
     sqInt dictionary;
-    sqInt index;
+    usqInt index;
     usqInt length;
     sqInt mask;
     sqInt meth;
@@ -87261,7 +87261,7 @@ lookupSelectorinClass(sqInt selector, sqInt class)
 		wrapAround = 0;
 		while (1) {
 			/* begin fetchPointer:ofObject: */
-			nextSelector = longAt((dictionary + BaseHeaderSize) + (((sqInt)((usqInt)(index) << (shiftForWord())))));
+			nextSelector = longAt((dictionary + BaseHeaderSize) + (index << (shiftForWord())));
 			if (nextSelector == GIV(nilObj)) {
 				meth = null;
 				goto l8;
@@ -87279,7 +87279,7 @@ lookupSelectorinClass(sqInt selector, sqInt class)
 				}
 				methodArray = objOop2;
 				/* begin followField:ofObject: */
-				objOop1 = longAt((methodArray + BaseHeaderSize) + (((sqInt)((usqInt)((index - SelectorStart)) << (shiftForWord())))));
+				objOop1 = longAt((methodArray + BaseHeaderSize) + ((index - SelectorStart) << (shiftForWord())));
 				if (((!(objOop1 & (tagMask()))))
 				 && ((!((longAt(objOop1)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun())))))) {
 					objOop1 = fixFollowedFieldofObjectwithInitialValue(index - SelectorStart, methodArray, objOop1);
@@ -99503,6 +99503,8 @@ GIV(totalHeapSizeIncludingBridges))));
 				: ((GIV(imageHeaderFlags) | 32) - 32));
 			GIV(newFinalization) = ((arg & 16) != 0);
 			sendWheelEvents = ((arg & 32) != 0);
+
+			/* fileTimesInUTC := flags anyMask: 128. see FilePlugin & FileAttributesPlugin */
 			primitiveDoMixedArithmetic = (!(arg & 64));
 			GIV(imageHeaderFlags) = (((arg & 128) != 0)
 				? GIV(imageHeaderFlags) | 0x200

diff --git a/src/spur32.cog.lowcode/cointerp.h b/src/spur32.cog.lowcode/cointerp.h
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3339 uuid: b1c834e2-5de7-464c-aeb5-4f2a7b8812d6
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3347 uuid: 7e4df21b-b561-434b-b2d3-45e8806d7875
  */
 
 

diff --git a/src/spur32.cog.lowcode/gcc3x-cointerp.c b/src/spur32.cog.lowcode/gcc3x-cointerp.c
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3339 uuid: b1c834e2-5de7-464c-aeb5-4f2a7b8812d6
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3347 uuid: 7e4df21b-b561-434b-b2d3-45e8806d7875
    from
-	CoInterpreter VMMaker.oscog-eem.3339 uuid: b1c834e2-5de7-464c-aeb5-4f2a7b8812d6
+	CoInterpreter VMMaker.oscog-eem.3347 uuid: 7e4df21b-b561-434b-b2d3-45e8806d7875
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3339 uuid: b1c834e2-5de7-464c-aeb5-4f2a7b8812d6 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3347 uuid: 7e4df21b-b561-434b-b2d3-45e8806d7875 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2030,7 +2030,7 @@ static signed short primitiveMetadataTable[MaxPrimitiveIndex + 2 /* 584 */] = {
 /*78*/	 0, 0,
 /*80*/	-256,-256,-256, 4, 4, 0, 0x100, 0, 0x200,-256,-256, 0, 0, 0, 0x100,-256, 0,-256,
 /*98*/	 0, 0,
-/*100*/	 260, 0x200, 0x200, 0x200,-256, 513,-256,-256,-256,-256, 0, 0x100, 0, 0,-256,
+/*100*/	 260, 0x200, 0x100, 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,
@@ -2704,7 +2704,7 @@ sqInt debugCallbackReturns;
 sqInt suppressHeartbeatFlag;
 sqInt cannotDeferDisplayUpdates;
 sqInt checkedPluginName;
-const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3339]";
+const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3347]";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 char expensiveAsserts = 0;
 int (*showSurfaceFn)(sqIntptr_t, int, int, int, int);
@@ -37471,7 +37471,7 @@ getImageHeaderFlags(void)
 	? 0
 	: 0x100))) + ((upscaleDisplayIfHighDPI
 	? 0
-	: 0x400))) + (((GIV(imageHeaderFlags) | (2011)) - (2011)));
+	: 0x400))) + (((GIV(imageHeaderFlags) | (1499)) - (1499)));
 }
 
 
@@ -38980,7 +38980,7 @@ mnuMethodOrNilFor(sqInt rcvr)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
     sqInt currentClass;
     sqInt dictionary;
-    sqInt index;
+    usqInt index;
     usqInt length;
     sqInt mask;
     sqInt methodArray;
@@ -39029,7 +39029,7 @@ mnuMethodOrNilFor(sqInt rcvr)
 		wrapAround = 0;
 		while (1) {
 			/* begin fetchPointer:ofObject: */
-			nextSelector = longAt((dictionary + BaseHeaderSize) + (((sqInt)((usqInt)(index) << (shiftForWord())))));
+			nextSelector = longAt((dictionary + BaseHeaderSize) + (index << (shiftForWord())));
 			if (nextSelector == GIV(nilObj)) {
 				mnuMethod = null;
 				goto l11;
@@ -39047,7 +39047,7 @@ mnuMethodOrNilFor(sqInt rcvr)
 				}
 				methodArray = objOop;
 				/* begin followField:ofObject: */
-				objOop1 = longAt((methodArray + BaseHeaderSize) + (((sqInt)((usqInt)((index - SelectorStart)) << (shiftForWord())))));
+				objOop1 = longAt((methodArray + BaseHeaderSize) + ((index - SelectorStart) << (shiftForWord())));
 				if (((!(objOop1 & (tagMask()))))
 				 && ((!((longAt(objOop1)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun())))))) {
 					objOop1 = fixFollowedFieldofObjectwithInitialValue(index - SelectorStart, methodArray, objOop1);
@@ -53248,7 +53248,7 @@ primitiveInvokeObjectAsMethod(void)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
     sqInt i;
     sqInt lookupClassTag;
-    sqInt runArgs;
+    usqInt runArgs;
     sqInt runReceiver;
     char *sp;
     char *sp1;
@@ -61421,7 +61421,7 @@ growRememberedSet(void)
 		}
 		newObj = obj2;
 		if (!newObj) {
-			if (!(growOldSpaceByAtLeast(numSlots + 0x400))) {
+			if (!(growOldSpaceByAtLeast((numSlots + 0x400) * BytesPerOop))) {
 				error("could not grow remembered set");
 			}
 			/* begin allocatePinnedSlots: */
@@ -67608,7 +67608,7 @@ ensureRoomOnObjStackAt(sqInt objStackRootIndex)
 			if (!freeOrNewPage) {
 
 				/* Allocate a new segment an retry. This is very uncommon. But it happened to me (Clement). */
-				growOldSpaceByAtLeast(ObjStackPageSlots);
+				growOldSpaceByAtLeast(ObjStackPageSlots * BytesPerOop);
 				/* begin allocateSlotsInOldSpace:format:classIndex: */
 				formatField = firstLongFormat();
 				classIndex = thirtyTwoBitLongsClassIndexPun();
@@ -80564,7 +80564,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: */
@@ -80594,7 +80594,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)) {
@@ -81146,7 +81146,7 @@ prepareForSnapshot(void)
     sqInt limit;
     sqInt newEndOfMemory;
     sqInt next;
-    usqInt node;
+    sqInt node;
     SpurSegmentInfo *seg;
     sqInt smallChild;
     sqInt treeNode;
@@ -87226,7 +87226,7 @@ lookupSelectorinClass(sqInt selector, sqInt class)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
     sqInt currentClass;
     sqInt dictionary;
-    sqInt index;
+    usqInt index;
     usqInt length;
     sqInt mask;
     sqInt meth;
@@ -87270,7 +87270,7 @@ lookupSelectorinClass(sqInt selector, sqInt class)
 		wrapAround = 0;
 		while (1) {
 			/* begin fetchPointer:ofObject: */
-			nextSelector = longAt((dictionary + BaseHeaderSize) + (((sqInt)((usqInt)(index) << (shiftForWord())))));
+			nextSelector = longAt((dictionary + BaseHeaderSize) + (index << (shiftForWord())));
 			if (nextSelector == GIV(nilObj)) {
 				meth = null;
 				goto l8;
@@ -87288,7 +87288,7 @@ lookupSelectorinClass(sqInt selector, sqInt class)
 				}
 				methodArray = objOop2;
 				/* begin followField:ofObject: */
-				objOop1 = longAt((methodArray + BaseHeaderSize) + (((sqInt)((usqInt)((index - SelectorStart)) << (shiftForWord())))));
+				objOop1 = longAt((methodArray + BaseHeaderSize) + ((index - SelectorStart) << (shiftForWord())));
 				if (((!(objOop1 & (tagMask()))))
 				 && ((!((longAt(objOop1)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun())))))) {
 					objOop1 = fixFollowedFieldofObjectwithInitialValue(index - SelectorStart, methodArray, objOop1);
@@ -99512,6 +99512,8 @@ GIV(totalHeapSizeIncludingBridges))));
 				: ((GIV(imageHeaderFlags) | 32) - 32));
 			GIV(newFinalization) = ((arg & 16) != 0);
 			sendWheelEvents = ((arg & 32) != 0);
+
+			/* fileTimesInUTC := flags anyMask: 128. see FilePlugin & FileAttributesPlugin */
 			primitiveDoMixedArithmetic = (!(arg & 64));
 			GIV(imageHeaderFlags) = (((arg & 128) != 0)
 				? GIV(imageHeaderFlags) | 0x200

diff --git a/src/spur32.cog/cogit.h b/src/spur32.cog/cogit.h
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.3339 uuid: b1c834e2-5de7-464c-aeb5-4f2a7b8812d6
+	CCodeGenerator VMMaker.oscog-eem.3347 uuid: 7e4df21b-b561-434b-b2d3-45e8806d7875
  */