From ad970a90344ad9d2ee56bff9741bc9d68289ea79 Mon Sep 17 00:00:00 2001 From: Marcel Taeumel Date: Thu, 2 Jun 2022 15:45:56 +0200 Subject: [PATCH] CogVM source as per VMMaker.oscog-dtl.3185 Let primitiveImageFormatVersion answer the correct image format number when multiple byte codes are active. --- src/spur32.cog.lowcode/cointerp.c | 25 ++++++++++++++++++------- src/spur32.cog.lowcode/gcc3x-cointerp.c | 25 ++++++++++++++++++------- src/spur32.cog/cointerp.c | 25 ++++++++++++++++++------- src/spur32.cog/cointerpmt.c | 25 ++++++++++++++++++------- src/spur32.cog/gcc3x-cointerp.c | 25 ++++++++++++++++++------- src/spur32.cog/gcc3x-cointerpmt.c | 25 ++++++++++++++++++------- src/spur32.sista/cointerp.c | 25 ++++++++++++++++++------- src/spur32.sista/gcc3x-cointerp.c | 25 ++++++++++++++++++------- src/spur32.stack.lowcode/gcc3x-interp.c | 25 ++++++++++++++++++------- src/spur32.stack.lowcode/interp.c | 25 ++++++++++++++++++------- src/spur32.stack/gcc3x-interp.c | 25 ++++++++++++++++++------- src/spur32.stack/interp.c | 25 ++++++++++++++++++------- src/spur32.stack/validImage.c | 8 ++++---- src/spur64.cog.lowcode/cointerp.c | 12 +++++++----- src/spur64.cog.lowcode/gcc3x-cointerp.c | 12 +++++++----- src/spur64.cog/cointerp.c | 12 +++++++----- src/spur64.cog/cointerpmt.c | 12 +++++++----- src/spur64.cog/gcc3x-cointerp.c | 12 +++++++----- src/spur64.cog/gcc3x-cointerpmt.c | 12 +++++++----- src/spur64.sista/cointerp.c | 12 +++++++----- src/spur64.sista/gcc3x-cointerp.c | 12 +++++++----- src/spur64.stack.lowcode/gcc3x-interp.c | 12 +++++++----- src/spur64.stack.lowcode/interp.c | 12 +++++++----- src/spur64.stack/gcc3x-interp.c | 12 +++++++----- src/spur64.stack/interp.c | 12 +++++++----- src/spur64.stack/validImage.c | 8 ++++---- src/v3.cog/cointerp.c | 18 +++++++++++++----- src/v3.cog/gcc3x-cointerp.c | 18 +++++++++++++----- src/v3.stack/gcc3x-interp.c | 18 +++++++++++++----- src/v3.stack/interp.c | 18 +++++++++++++----- 30 files changed, 360 insertions(+), 172 deletions(-) diff --git a/src/spur32.cog.lowcode/cointerp.c b/src/spur32.cog.lowcode/cointerp.c index 5fa0ba8cc2..567faa4a33 100644 --- a/src/spur32.cog.lowcode/cointerp.c +++ b/src/spur32.cog.lowcode/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; @@ -2671,7 +2671,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-mt.3184]"; +const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-dtl.3185]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; char expensiveAsserts = 0; int (*showSurfaceFn)(sqIntptr_t, int, int, int, int); @@ -52497,6 +52497,7 @@ primitiveIdentityHash(void) EXPORT(sqInt) primitiveImageFormatVersion(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT + unsigned int integerValue; usqInt newLargeInteger; usqInt newObj; usqInt numBytes; @@ -52505,10 +52506,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: */ @@ -52543,7 +52554,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.cog.lowcode/gcc3x-cointerp.c b/src/spur32.cog.lowcode/gcc3x-cointerp.c index 174e064347..e26ac51213 100644 --- 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-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; @@ -2674,7 +2674,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-mt.3184]"; +const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-dtl.3185]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; char expensiveAsserts = 0; int (*showSurfaceFn)(sqIntptr_t, int, int, int, int); @@ -52506,6 +52506,7 @@ primitiveIdentityHash(void) EXPORT(sqInt) primitiveImageFormatVersion(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT + unsigned int integerValue; usqInt newLargeInteger; usqInt newObj; usqInt numBytes; @@ -52514,10 +52515,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: */ @@ -52552,7 +52563,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.cog/cointerp.c b/src/spur32.cog/cointerp.c index 4e18246bf0..23a7333a4e 100644 --- a/src/spur32.cog/cointerp.c +++ b/src/spur32.cog/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; @@ -2646,7 +2646,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-mt.3184]"; +const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-dtl.3185]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; char expensiveAsserts = 0; int (*showSurfaceFn)(sqIntptr_t, int, int, int, int); @@ -32609,6 +32609,7 @@ primitiveIdentityHash(void) EXPORT(sqInt) primitiveImageFormatVersion(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT + unsigned int integerValue; usqInt newLargeInteger; usqInt newObj; usqInt numBytes; @@ -32617,10 +32618,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: */ @@ -32655,7 +32666,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.cog/cointerpmt.c b/src/spur32.cog/cointerpmt.c index 86f9f72fb2..09294032f5 100644 --- a/src/spur32.cog/cointerpmt.c +++ b/src/spur32.cog/cointerpmt.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 - CoInterpreterMT VMMaker.oscog-mt.3184 uuid: 57b61827-3f1a-ab45-966e-7c5caaef28d7 + CoInterpreterMT VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-mt.3184 uuid: 57b61827-3f1a-ab45-966e-7c5caaef28d7 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2739,7 +2739,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Cog MT VM [CoInterpreterMT VMMaker.oscog-mt.3184]"; +const char *interpreterVersion = "Open Smalltalk Cog MT VM [CoInterpreterMT VMMaker.oscog-dtl.3185]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; char expensiveAsserts = 0; int (*showSurfaceFn)(sqIntptr_t, int, int, int, int); @@ -35353,6 +35353,7 @@ primitiveIdentityHash(void) EXPORT(sqInt) primitiveImageFormatVersion(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT + unsigned int integerValue; usqInt newLargeInteger; usqInt newObj; usqInt numBytes; @@ -35361,10 +35362,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: */ @@ -35399,7 +35410,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.cog/gcc3x-cointerp.c b/src/spur32.cog/gcc3x-cointerp.c index 14a740f741..ec4f4be497 100644 --- a/src/spur32.cog/gcc3x-cointerp.c +++ b/src/spur32.cog/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; @@ -2649,7 +2649,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-mt.3184]"; +const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-dtl.3185]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; char expensiveAsserts = 0; int (*showSurfaceFn)(sqIntptr_t, int, int, int, int); @@ -32618,6 +32618,7 @@ primitiveIdentityHash(void) EXPORT(sqInt) primitiveImageFormatVersion(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT + unsigned int integerValue; usqInt newLargeInteger; usqInt newObj; usqInt numBytes; @@ -32626,10 +32627,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: */ @@ -32664,7 +32675,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.cog/gcc3x-cointerpmt.c b/src/spur32.cog/gcc3x-cointerpmt.c index 507baec99d..6427e5f79d 100644 --- a/src/spur32.cog/gcc3x-cointerpmt.c +++ b/src/spur32.cog/gcc3x-cointerpmt.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 - CoInterpreterMT VMMaker.oscog-mt.3184 uuid: 57b61827-3f1a-ab45-966e-7c5caaef28d7 + CoInterpreterMT VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-mt.3184 uuid: 57b61827-3f1a-ab45-966e-7c5caaef28d7 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2742,7 +2742,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Cog MT VM [CoInterpreterMT VMMaker.oscog-mt.3184]"; +const char *interpreterVersion = "Open Smalltalk Cog MT VM [CoInterpreterMT VMMaker.oscog-dtl.3185]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; char expensiveAsserts = 0; int (*showSurfaceFn)(sqIntptr_t, int, int, int, int); @@ -35362,6 +35362,7 @@ primitiveIdentityHash(void) EXPORT(sqInt) primitiveImageFormatVersion(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT + unsigned int integerValue; usqInt newLargeInteger; usqInt newObj; usqInt numBytes; @@ -35370,10 +35371,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: */ @@ -35408,7 +35419,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.sista/cointerp.c b/src/spur32.sista/cointerp.c index 39c65269e7..d18ed31db0 100644 --- a/src/spur32.sista/cointerp.c +++ b/src/spur32.sista/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; @@ -2661,7 +2661,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-mt.3184]"; +const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-dtl.3185]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; char expensiveAsserts = 0; int (*showSurfaceFn)(sqIntptr_t, int, int, int, int); @@ -35580,6 +35580,7 @@ primitiveIdentityHash(void) EXPORT(sqInt) primitiveImageFormatVersion(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT + unsigned int integerValue; usqInt newLargeInteger; usqInt newObj; usqInt numBytes; @@ -35588,10 +35589,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: */ @@ -35626,7 +35637,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.sista/gcc3x-cointerp.c b/src/spur32.sista/gcc3x-cointerp.c index b1164e3d32..10c8e29753 100644 --- a/src/spur32.sista/gcc3x-cointerp.c +++ b/src/spur32.sista/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; @@ -2664,7 +2664,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-mt.3184]"; +const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-dtl.3185]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; char expensiveAsserts = 0; int (*showSurfaceFn)(sqIntptr_t, int, int, int, int); @@ -35589,6 +35589,7 @@ primitiveIdentityHash(void) EXPORT(sqInt) primitiveImageFormatVersion(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT + unsigned int integerValue; usqInt newLargeInteger; usqInt newObj; usqInt numBytes; @@ -35597,10 +35598,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: */ @@ -35635,7 +35646,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.lowcode/gcc3x-interp.c b/src/spur32.stack.lowcode/gcc3x-interp.c index bca9685a92..c4ba2ca146 100644 --- a/src/spur32.stack.lowcode/gcc3x-interp.c +++ b/src/spur32.stack.lowcode/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; @@ -2385,7 +2385,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-mt.3184]"; +const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-dtl.3185]"; sqInt suppressHeartbeatFlag; char expensiveAsserts = 0; int (*showSurfaceFn)(sqIntptr_t, int, int, int, int); @@ -33252,6 +33252,7 @@ primitiveIdentityHash(void) EXPORT(sqInt) primitiveImageFormatVersion(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT + unsigned int integerValue; usqInt newLargeInteger; usqInt newObj; usqInt numBytes; @@ -33260,10 +33261,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: */ @@ -33298,7 +33309,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.lowcode/interp.c b/src/spur32.stack.lowcode/interp.c index 5dc6e7bd87..0c1e0654d6 100644 --- a/src/spur32.stack.lowcode/interp.c +++ b/src/spur32.stack.lowcode/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; @@ -2382,7 +2382,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-mt.3184]"; +const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-dtl.3185]"; sqInt suppressHeartbeatFlag; char expensiveAsserts = 0; int (*showSurfaceFn)(sqIntptr_t, int, int, int, int); @@ -33243,6 +33243,7 @@ primitiveIdentityHash(void) EXPORT(sqInt) primitiveImageFormatVersion(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT + unsigned int integerValue; usqInt newLargeInteger; usqInt newObj; usqInt numBytes; @@ -33251,10 +33252,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: */ @@ -33289,7 +33300,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/gcc3x-interp.c b/src/spur32.stack/gcc3x-interp.c index 87f14262c7..1917e522a7 100644 --- a/src/spur32.stack/gcc3x-interp.c +++ b/src/spur32.stack/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; @@ -2360,7 +2360,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-mt.3184]"; +const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-dtl.3185]"; sqInt suppressHeartbeatFlag; char expensiveAsserts = 0; int (*showSurfaceFn)(sqIntptr_t, int, int, int, int); @@ -20268,6 +20268,7 @@ primitiveIdentityHash(void) EXPORT(sqInt) primitiveImageFormatVersion(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT + unsigned int integerValue; usqInt newLargeInteger; usqInt newObj; usqInt numBytes; @@ -20276,10 +20277,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: */ @@ -20314,7 +20325,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/interp.c b/src/spur32.stack/interp.c index 5c5f3d663f..d477b54b94 100644 --- a/src/spur32.stack/interp.c +++ b/src/spur32.stack/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; @@ -2357,7 +2357,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-mt.3184]"; +const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-dtl.3185]"; sqInt suppressHeartbeatFlag; char expensiveAsserts = 0; int (*showSurfaceFn)(sqIntptr_t, int, int, int, int); @@ -20259,6 +20259,7 @@ primitiveIdentityHash(void) EXPORT(sqInt) primitiveImageFormatVersion(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT + unsigned int integerValue; usqInt newLargeInteger; usqInt newObj; usqInt numBytes; @@ -20267,10 +20268,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: */ @@ -20305,7 +20316,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/validImage.c b/src/spur32.stack/validImage.c index c9a6dd9b92..2816dd4de0 100644 --- a/src/spur32.stack/validImage.c +++ b/src/spur32.stack/validImage.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 - ImageLeakChecker VMMaker.oscog-mt.3184 uuid: 57b61827-3f1a-ab45-966e-7c5caaef28d7 + ImageLeakChecker VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9 */ -static char __buildInfo[] = "ImageLeakChecker VMMaker.oscog-mt.3184 uuid: 57b61827-3f1a-ab45-966e-7c5caaef28d7 " __DATE__ ; +static char __buildInfo[] = "ImageLeakChecker VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -944,7 +944,7 @@ sqInt extraVMMemory; sqInt ffiExceptionResponse; sqInt inIOProcessEvents; struct VirtualMachine* interpreterProxy; -const char *interpreterVersion = "Open Smalltalk ImageChecker VM [ImageLeakChecker VMMaker.oscog-mt.3184]"; +const char *interpreterVersion = "Open Smalltalk ImageChecker VM [ImageLeakChecker VMMaker.oscog-dtl.3185]"; sqInt suppressHeartbeatFlag; char expensiveAsserts = 0; volatile int sendTrace; diff --git a/src/spur64.cog.lowcode/cointerp.c b/src/spur64.cog.lowcode/cointerp.c index 50a8ee3181..90a8722222 100644 --- a/src/spur64.cog.lowcode/cointerp.c +++ b/src/spur64.cog.lowcode/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; @@ -2689,7 +2689,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-mt.3184]"; +const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-dtl.3185]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; int displayWidth; int displayDepth; @@ -52087,11 +52087,13 @@ primitiveIdentityHash(void) EXPORT(sqInt) primitiveImageFormatVersion(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT + unsigned int integerValue; sqInt oop; char *sp; /* begin pop:thenPush: */ - oop = ((((((usqInt)68021 /* imageFormatVersion */)) & 0xFFFFFFFFU) << 3) | 1); + integerValue = ((unsigned int) (imageFormatVersionForSnapshot())); + oop = ((((((usqInt)integerValue)) & 0xFFFFFFFFU) << 3) | 1); goto l1; l1: /* end positive32BitIntegerFor: */; longAtput((sp = GIV(stackPointer) + ((0) * BytesPerWord)), oop); diff --git a/src/spur64.cog.lowcode/gcc3x-cointerp.c b/src/spur64.cog.lowcode/gcc3x-cointerp.c index 6c8bdcf72c..6cfacf7ec6 100644 --- a/src/spur64.cog.lowcode/gcc3x-cointerp.c +++ b/src/spur64.cog.lowcode/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; @@ -2692,7 +2692,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-mt.3184]"; +const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-dtl.3185]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; int displayWidth; int displayDepth; @@ -52096,11 +52096,13 @@ primitiveIdentityHash(void) EXPORT(sqInt) primitiveImageFormatVersion(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT + unsigned int integerValue; sqInt oop; char *sp; /* begin pop:thenPush: */ - oop = ((((((usqInt)68021 /* imageFormatVersion */)) & 0xFFFFFFFFU) << 3) | 1); + integerValue = ((unsigned int) (imageFormatVersionForSnapshot())); + oop = ((((((usqInt)integerValue)) & 0xFFFFFFFFU) << 3) | 1); goto l1; l1: /* end positive32BitIntegerFor: */; longAtput((sp = GIV(stackPointer) + ((0) * BytesPerWord)), oop); diff --git a/src/spur64.cog/cointerp.c b/src/spur64.cog/cointerp.c index a642157388..de4ce988f6 100644 --- a/src/spur64.cog/cointerp.c +++ b/src/spur64.cog/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; @@ -2665,7 +2665,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-mt.3184]"; +const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-dtl.3185]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; int displayWidth; int displayDepth; @@ -32404,11 +32404,13 @@ primitiveIdentityHash(void) EXPORT(sqInt) primitiveImageFormatVersion(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT + unsigned int integerValue; sqInt oop; char *sp; /* begin pop:thenPush: */ - oop = ((((((usqInt)68021 /* imageFormatVersion */)) & 0xFFFFFFFFU) << 3) | 1); + integerValue = ((unsigned int) (imageFormatVersionForSnapshot())); + oop = ((((((usqInt)integerValue)) & 0xFFFFFFFFU) << 3) | 1); goto l1; l1: /* end positive32BitIntegerFor: */; longAtput((sp = GIV(stackPointer) + ((0) * BytesPerWord)), oop); diff --git a/src/spur64.cog/cointerpmt.c b/src/spur64.cog/cointerpmt.c index febea14a6f..6bd89b7111 100644 --- a/src/spur64.cog/cointerpmt.c +++ b/src/spur64.cog/cointerpmt.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 - CoInterpreterMT VMMaker.oscog-mt.3184 uuid: 57b61827-3f1a-ab45-966e-7c5caaef28d7 + CoInterpreterMT VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-mt.3184 uuid: 57b61827-3f1a-ab45-966e-7c5caaef28d7 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2758,7 +2758,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Cog MT VM [CoInterpreterMT VMMaker.oscog-mt.3184]"; +const char *interpreterVersion = "Open Smalltalk Cog MT VM [CoInterpreterMT VMMaker.oscog-dtl.3185]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; int displayWidth; int displayDepth; @@ -35148,11 +35148,13 @@ primitiveIdentityHash(void) EXPORT(sqInt) primitiveImageFormatVersion(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT + unsigned int integerValue; sqInt oop; char *sp; /* begin pop:thenPush: */ - oop = ((((((usqInt)68021 /* imageFormatVersion */)) & 0xFFFFFFFFU) << 3) | 1); + integerValue = ((unsigned int) (imageFormatVersionForSnapshot())); + oop = ((((((usqInt)integerValue)) & 0xFFFFFFFFU) << 3) | 1); goto l1; l1: /* end positive32BitIntegerFor: */; longAtput((sp = GIV(stackPointer) + ((0) * BytesPerWord)), oop); diff --git a/src/spur64.cog/gcc3x-cointerp.c b/src/spur64.cog/gcc3x-cointerp.c index 4381df8ab8..5929b81489 100644 --- a/src/spur64.cog/gcc3x-cointerp.c +++ b/src/spur64.cog/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; @@ -2668,7 +2668,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-mt.3184]"; +const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-dtl.3185]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; int displayWidth; int displayDepth; @@ -32413,11 +32413,13 @@ primitiveIdentityHash(void) EXPORT(sqInt) primitiveImageFormatVersion(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT + unsigned int integerValue; sqInt oop; char *sp; /* begin pop:thenPush: */ - oop = ((((((usqInt)68021 /* imageFormatVersion */)) & 0xFFFFFFFFU) << 3) | 1); + integerValue = ((unsigned int) (imageFormatVersionForSnapshot())); + oop = ((((((usqInt)integerValue)) & 0xFFFFFFFFU) << 3) | 1); goto l1; l1: /* end positive32BitIntegerFor: */; longAtput((sp = GIV(stackPointer) + ((0) * BytesPerWord)), oop); diff --git a/src/spur64.cog/gcc3x-cointerpmt.c b/src/spur64.cog/gcc3x-cointerpmt.c index 6dfe416877..ee60124e05 100644 --- a/src/spur64.cog/gcc3x-cointerpmt.c +++ b/src/spur64.cog/gcc3x-cointerpmt.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 - CoInterpreterMT VMMaker.oscog-mt.3184 uuid: 57b61827-3f1a-ab45-966e-7c5caaef28d7 + CoInterpreterMT VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-mt.3184 uuid: 57b61827-3f1a-ab45-966e-7c5caaef28d7 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2761,7 +2761,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Cog MT VM [CoInterpreterMT VMMaker.oscog-mt.3184]"; +const char *interpreterVersion = "Open Smalltalk Cog MT VM [CoInterpreterMT VMMaker.oscog-dtl.3185]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; int displayWidth; int displayDepth; @@ -35157,11 +35157,13 @@ primitiveIdentityHash(void) EXPORT(sqInt) primitiveImageFormatVersion(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT + unsigned int integerValue; sqInt oop; char *sp; /* begin pop:thenPush: */ - oop = ((((((usqInt)68021 /* imageFormatVersion */)) & 0xFFFFFFFFU) << 3) | 1); + integerValue = ((unsigned int) (imageFormatVersionForSnapshot())); + oop = ((((((usqInt)integerValue)) & 0xFFFFFFFFU) << 3) | 1); goto l1; l1: /* end positive32BitIntegerFor: */; longAtput((sp = GIV(stackPointer) + ((0) * BytesPerWord)), oop); diff --git a/src/spur64.sista/cointerp.c b/src/spur64.sista/cointerp.c index beefcd5f2a..1e2c371c52 100644 --- a/src/spur64.sista/cointerp.c +++ b/src/spur64.sista/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; @@ -2679,7 +2679,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-mt.3184]"; +const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-dtl.3185]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; int displayWidth; int displayDepth; @@ -35300,11 +35300,13 @@ primitiveIdentityHash(void) EXPORT(sqInt) primitiveImageFormatVersion(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT + unsigned int integerValue; sqInt oop; char *sp; /* begin pop:thenPush: */ - oop = ((((((usqInt)68021 /* imageFormatVersion */)) & 0xFFFFFFFFU) << 3) | 1); + integerValue = ((unsigned int) (imageFormatVersionForSnapshot())); + oop = ((((((usqInt)integerValue)) & 0xFFFFFFFFU) << 3) | 1); goto l1; l1: /* end positive32BitIntegerFor: */; longAtput((sp = GIV(stackPointer) + ((0) * BytesPerWord)), oop); diff --git a/src/spur64.sista/gcc3x-cointerp.c b/src/spur64.sista/gcc3x-cointerp.c index c74145b8fc..06afd3ca33 100644 --- a/src/spur64.sista/gcc3x-cointerp.c +++ b/src/spur64.sista/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; @@ -2682,7 +2682,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-mt.3184]"; +const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-dtl.3185]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; int displayWidth; int displayDepth; @@ -35309,11 +35309,13 @@ primitiveIdentityHash(void) EXPORT(sqInt) primitiveImageFormatVersion(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT + unsigned int integerValue; sqInt oop; char *sp; /* begin pop:thenPush: */ - oop = ((((((usqInt)68021 /* imageFormatVersion */)) & 0xFFFFFFFFU) << 3) | 1); + integerValue = ((unsigned int) (imageFormatVersionForSnapshot())); + oop = ((((((usqInt)integerValue)) & 0xFFFFFFFFU) << 3) | 1); goto l1; l1: /* end positive32BitIntegerFor: */; longAtput((sp = GIV(stackPointer) + ((0) * BytesPerWord)), oop); diff --git a/src/spur64.stack.lowcode/gcc3x-interp.c b/src/spur64.stack.lowcode/gcc3x-interp.c index 4a3a8465b8..c05936583d 100644 --- a/src/spur64.stack.lowcode/gcc3x-interp.c +++ b/src/spur64.stack.lowcode/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; @@ -2402,7 +2402,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-mt.3184]"; +const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-dtl.3185]"; sqInt suppressHeartbeatFlag; int displayWidth; int displayDepth; @@ -32863,11 +32863,13 @@ primitiveIdentityHash(void) EXPORT(sqInt) primitiveImageFormatVersion(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT + unsigned int integerValue; sqInt oop; char *sp; /* begin pop:thenPush: */ - oop = ((((((usqInt)68021 /* imageFormatVersion */)) & 0xFFFFFFFFU) << 3) | 1); + integerValue = ((unsigned int) (imageFormatVersionForSnapshot())); + oop = ((((((usqInt)integerValue)) & 0xFFFFFFFFU) << 3) | 1); goto l1; l1: /* end positive32BitIntegerFor: */; longAtput((sp = GIV(stackPointer) + ((0) * BytesPerWord)), oop); diff --git a/src/spur64.stack.lowcode/interp.c b/src/spur64.stack.lowcode/interp.c index ee6a5e1a3e..98fc7a0697 100644 --- a/src/spur64.stack.lowcode/interp.c +++ b/src/spur64.stack.lowcode/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; @@ -2399,7 +2399,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-mt.3184]"; +const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-dtl.3185]"; sqInt suppressHeartbeatFlag; int displayWidth; int displayDepth; @@ -32854,11 +32854,13 @@ primitiveIdentityHash(void) EXPORT(sqInt) primitiveImageFormatVersion(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT + unsigned int integerValue; sqInt oop; char *sp; /* begin pop:thenPush: */ - oop = ((((((usqInt)68021 /* imageFormatVersion */)) & 0xFFFFFFFFU) << 3) | 1); + integerValue = ((unsigned int) (imageFormatVersionForSnapshot())); + oop = ((((((usqInt)integerValue)) & 0xFFFFFFFFU) << 3) | 1); goto l1; l1: /* end positive32BitIntegerFor: */; longAtput((sp = GIV(stackPointer) + ((0) * BytesPerWord)), oop); diff --git a/src/spur64.stack/gcc3x-interp.c b/src/spur64.stack/gcc3x-interp.c index acdbfbc2b9..be45217884 100644 --- a/src/spur64.stack/gcc3x-interp.c +++ b/src/spur64.stack/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; @@ -2378,7 +2378,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-mt.3184]"; +const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-dtl.3185]"; sqInt suppressHeartbeatFlag; int displayWidth; int displayDepth; @@ -20098,11 +20098,13 @@ primitiveIdentityHash(void) EXPORT(sqInt) primitiveImageFormatVersion(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT + unsigned int integerValue; sqInt oop; char *sp; /* begin pop:thenPush: */ - oop = ((((((usqInt)68021 /* imageFormatVersion */)) & 0xFFFFFFFFU) << 3) | 1); + integerValue = ((unsigned int) (imageFormatVersionForSnapshot())); + oop = ((((((usqInt)integerValue)) & 0xFFFFFFFFU) << 3) | 1); goto l1; l1: /* end positive32BitIntegerFor: */; longAtput((sp = GIV(stackPointer) + ((0) * BytesPerWord)), oop); diff --git a/src/spur64.stack/interp.c b/src/spur64.stack/interp.c index 5a1beaf500..3712e2f504 100644 --- a/src/spur64.stack/interp.c +++ b/src/spur64.stack/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; @@ -2375,7 +2375,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-mt.3184]"; +const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-dtl.3185]"; sqInt suppressHeartbeatFlag; int displayWidth; int displayDepth; @@ -20089,11 +20089,13 @@ primitiveIdentityHash(void) EXPORT(sqInt) primitiveImageFormatVersion(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT + unsigned int integerValue; sqInt oop; char *sp; /* begin pop:thenPush: */ - oop = ((((((usqInt)68021 /* imageFormatVersion */)) & 0xFFFFFFFFU) << 3) | 1); + integerValue = ((unsigned int) (imageFormatVersionForSnapshot())); + oop = ((((((usqInt)integerValue)) & 0xFFFFFFFFU) << 3) | 1); goto l1; l1: /* end positive32BitIntegerFor: */; longAtput((sp = GIV(stackPointer) + ((0) * BytesPerWord)), oop); diff --git a/src/spur64.stack/validImage.c b/src/spur64.stack/validImage.c index 6720ddfe53..eaf73270a8 100644 --- a/src/spur64.stack/validImage.c +++ b/src/spur64.stack/validImage.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 - ImageLeakChecker VMMaker.oscog-mt.3184 uuid: 57b61827-3f1a-ab45-966e-7c5caaef28d7 + ImageLeakChecker VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9 */ -static char __buildInfo[] = "ImageLeakChecker VMMaker.oscog-mt.3184 uuid: 57b61827-3f1a-ab45-966e-7c5caaef28d7 " __DATE__ ; +static char __buildInfo[] = "ImageLeakChecker VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -949,7 +949,7 @@ sqInt extraVMMemory; sqInt ffiExceptionResponse; sqInt inIOProcessEvents; struct VirtualMachine* interpreterProxy; -const char *interpreterVersion = "Open Smalltalk ImageChecker VM [ImageLeakChecker VMMaker.oscog-mt.3184]"; +const char *interpreterVersion = "Open Smalltalk ImageChecker VM [ImageLeakChecker VMMaker.oscog-dtl.3185]"; sqInt suppressHeartbeatFlag; int displayDepth; int displayHeight; diff --git a/src/v3.cog/cointerp.c b/src/v3.cog/cointerp.c index 25e3d5872a..93e2e7fa8e 100644 --- a/src/v3.cog/cointerp.c +++ b/src/v3.cog/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; @@ -2244,7 +2244,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Cog[SqueakV3] VM [CoInterpreterPrimitives VMMaker.oscog-mt.3184]"; +const char *interpreterVersion = "Open Smalltalk Cog[SqueakV3] VM [CoInterpreterPrimitives VMMaker.oscog-dtl.3185]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; char expensiveAsserts = 0; int (*showSurfaceFn)(sqIntptr_t, int, int, int, int); @@ -25643,7 +25643,15 @@ primitiveImageFormatVersion(void) char *sp; /* begin pop:thenPush: */ - integerValue = 6505; + if (GIV(multipleBytecodeSetsActive)) { + integerValue = ((sqInt) ((6505) | MultipleBytecodeSetsBitmask)); + goto l5; + } + else { + integerValue = ((sqInt) (6505)); + goto l5; + } + l5: /* end imageFormatVersionForSnapshot */; /* begin maybeInlinePositive32BitIntegerFor: */ assert(!((hasSixtyFourBitImmediates()))); if ((((unsigned int) integerValue)) <= (MaxSmallInteger)) { diff --git a/src/v3.cog/gcc3x-cointerp.c b/src/v3.cog/gcc3x-cointerp.c index e5c370c955..ee2ea06148 100644 --- a/src/v3.cog/gcc3x-cointerp.c +++ b/src/v3.cog/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; @@ -2247,7 +2247,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Cog[SqueakV3] VM [CoInterpreterPrimitives VMMaker.oscog-mt.3184]"; +const char *interpreterVersion = "Open Smalltalk Cog[SqueakV3] VM [CoInterpreterPrimitives VMMaker.oscog-dtl.3185]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; char expensiveAsserts = 0; int (*showSurfaceFn)(sqIntptr_t, int, int, int, int); @@ -25652,7 +25652,15 @@ primitiveImageFormatVersion(void) char *sp; /* begin pop:thenPush: */ - integerValue = 6505; + if (GIV(multipleBytecodeSetsActive)) { + integerValue = ((sqInt) ((6505) | MultipleBytecodeSetsBitmask)); + goto l5; + } + else { + integerValue = ((sqInt) (6505)); + goto l5; + } + l5: /* end imageFormatVersionForSnapshot */; /* begin maybeInlinePositive32BitIntegerFor: */ assert(!((hasSixtyFourBitImmediates()))); if ((((unsigned int) integerValue)) <= (MaxSmallInteger)) { diff --git a/src/v3.stack/gcc3x-interp.c b/src/v3.stack/gcc3x-interp.c index ee4cae08df..80e5b3b510 100644 --- a/src/v3.stack/gcc3x-interp.c +++ b/src/v3.stack/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; @@ -1978,7 +1978,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-mt.3184]"; +const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-dtl.3185]"; sqInt suppressHeartbeatFlag; char expensiveAsserts = 0; int (*showSurfaceFn)(sqIntptr_t, int, int, int, int); @@ -14477,7 +14477,15 @@ primitiveImageFormatVersion(void) char *sp; /* begin pop:thenPush: */ - integerValue = 6505; + if (GIV(multipleBytecodeSetsActive)) { + integerValue = ((sqInt) ((6505) | MultipleBytecodeSetsBitmask)); + goto l5; + } + else { + integerValue = ((sqInt) (6505)); + goto l5; + } + l5: /* end imageFormatVersionForSnapshot */; /* begin maybeInlinePositive32BitIntegerFor: */ assert(!((hasSixtyFourBitImmediates()))); if ((((unsigned int) integerValue)) <= (MaxSmallInteger)) { diff --git a/src/v3.stack/interp.c b/src/v3.stack/interp.c index 623aaf051d..f5dc8c4d5e 100644 --- a/src/v3.stack/interp.c +++ b/src/v3.stack/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; @@ -1975,7 +1975,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-mt.3184]"; +const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-dtl.3185]"; sqInt suppressHeartbeatFlag; char expensiveAsserts = 0; int (*showSurfaceFn)(sqIntptr_t, int, int, int, int); @@ -14468,7 +14468,15 @@ primitiveImageFormatVersion(void) char *sp; /* begin pop:thenPush: */ - integerValue = 6505; + if (GIV(multipleBytecodeSetsActive)) { + integerValue = ((sqInt) ((6505) | MultipleBytecodeSetsBitmask)); + goto l5; + } + else { + integerValue = ((sqInt) (6505)); + goto l5; + } + l5: /* end imageFormatVersionForSnapshot */; /* begin maybeInlinePositive32BitIntegerFor: */ assert(!((hasSixtyFourBitImmediates()))); if ((((unsigned int) integerValue)) <= (MaxSmallInteger)) {