Skip to content

Commit b930975

Browse files
marceltaeumelmarceltaeumel
committed
Newspeak source as per VMMaker.oscog-dtl.3185
1 parent ad970a9 commit b930975

File tree

12 files changed

+122
-70
lines changed

12 files changed

+122
-70
lines changed

‎src/spur32.cog.newspeak/cogit.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Automatically generated by
2-
CCodeGenerator VMMaker.oscog-mt.3083 uuid: 0d345f2b-f29d-7148-b84c-cb4ed3775bb1
2+
CCodeGenerator VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9
33
*/
44

55

‎src/spur32.cog.newspeak/cointerp.c‎

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/* Automatically generated by
2-
CCodeGeneratorGlobalStructure VMMaker.oscog-mt.3184 uuid: 57b61827-3f1a-ab45-966e-7c5caaef28d7
2+
CCodeGeneratorGlobalStructure VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9
33
from
4-
CoInterpreter VMMaker.oscog-mt.3184 uuid: 57b61827-3f1a-ab45-966e-7c5caaef28d7
4+
CoInterpreter VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9
55
*/
6-
static char __buildInfo[] = "CoInterpreter VMMaker.oscog-mt.3184 uuid: 57b61827-3f1a-ab45-966e-7c5caaef28d7 " __DATE__ ;
6+
static char __buildInfo[] = "CoInterpreter VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9 " __DATE__ ;
77
char *__interpBuildInfo = __buildInfo;
88

99

@@ -1856,6 +1856,7 @@ _iss sqInt externalPrimitiveTableFirstFreeIndex;
18561856
_iss sqInt firstFieldOfRememberedSet;
18571857
_iss sqInt firstSegmentSize;
18581858
_iss usqInt lowSpaceThreshold;
1859+
_iss sqInt multipleBytecodeSetsActive;
18591860
_iss sqInt preemptionYields;
18601861
_iss FILE * scavengeLog;
18611862
_iss sqInt statMaxAllocSegmentTime;
@@ -1866,7 +1867,6 @@ _iss sqInt edenBytes;
18661867
_iss sqInt fullScreenFlag;
18671868
_iss usqInt lastHash;
18681869
_iss sqInt lastMethodCacheProbeWrite;
1869-
_iss sqInt multipleBytecodeSetsActive;
18701870
_iss sqInt newFinalization;
18711871
_iss sqInt rememberedSetRedZone;
18721872
_iss sqInt savedWindowSize;
@@ -2007,7 +2007,7 @@ static signed short primitiveMetadataTable[MaxPrimitiveIndex + 2 /* 581 */] = {
20072007
/*78*/ 0, 0,
20082008
/*80*/ -256,-256,-256, 4, 4, 0, 0x100, 0, 0x200,-256,-256, 0, 0, 0, 0x100,-256,-256,
20092009
/*97*/ -256, 0, 0,
2010-
/*100*/ 260, 0x200, 0x100, 0x200,-256, 513,-256,-256,-256,-256, 0, 0x100, 0, 0,-256,
2010+
/*100*/ 260, 0x200, 0x200, 0x200,-256, 513,-256,-256,-256,-256, 0, 0x100, 0, 0,-256,
20112011
/*115*/ 0x100, 0, 12, 260, 0,
20122012
/*120*/ 524, 0x100,-256,-256, 1, 0, 0, 0, 0,-255,-256,-256, 0, 0, 0,-256, 0,-256,-256,
20132013
/*139*/ 0,
@@ -2676,7 +2676,7 @@ sqInt debugCallbackInvokes;
26762676
sqInt debugCallbackReturns;
26772677
sqInt cannotDeferDisplayUpdates;
26782678
sqInt checkedPluginName;
2679-
const char *interpreterVersion = "Newspeak Virtual Machine [ Open Smalltalk, Spur] CoInterpreterPrimitives_VMMaker.oscog-mt.3184";
2679+
const char *interpreterVersion = "Newspeak Virtual Machine [ Open Smalltalk, Spur] CoInterpreterPrimitives_VMMaker.oscog-dtl.3185";
26802680
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
26812681
char expensiveAsserts = 0;
26822682
int (*showSurfaceFn)(sqIntptr_t, int, int, int, int);
@@ -34419,6 +34419,7 @@ primitiveIdentityHash(void)
3441934419
EXPORT(sqInt)
3442034420
primitiveImageFormatVersion(void)
3442134421
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
34422+
unsigned int integerValue;
3442234423
usqInt newLargeInteger;
3442334424
usqInt newObj;
3442434425
usqInt numBytes;
@@ -34427,10 +34428,20 @@ primitiveImageFormatVersion(void)
3442734428
char *sp;
3442834429

3442934430
/* begin pop:thenPush: */
34431+
if (GIV(multipleBytecodeSetsActive)) {
34432+
integerValue = ((sqInt) (6521 /* imageFormatVersion */ | MultipleBytecodeSetsBitmask));
34433+
goto l6;
34434+
}
34435+
else {
34436+
/* begin imageFormatVersion */
34437+
integerValue = 6521;
34438+
goto l6;
34439+
}
34440+
l6: /* end imageFormatVersionForSnapshot */;
3443034441
/* begin maybeInlinePositive32BitIntegerFor: */
3443134442
assert(!((hasSixtyFourBitImmediates())));
34432-
if ((((unsigned int) 6521 /* imageFormatVersion */)) <= (MaxSmallInteger)) {
34433-
oop = (((usqInt)6521 /* imageFormatVersion */ << 1) | 1);
34443+
if ((((unsigned int) integerValue)) <= (MaxSmallInteger)) {
34444+
oop = ((integerValue << 1) | 1);
3443434445
goto l5;
3443534446
}
3443634447
/* begin eeInstantiateSmallClassIndex:format:numSlots: */
@@ -34465,7 +34476,7 @@ primitiveImageFormatVersion(void)
3446534476
/* Memory is 8 byte aligned in Spur, make sure that oversized bytes are set to zero */
3446634477
/* eem 4/28/2016 questionable; they should never be read */
3446734478
/* begin storeLong32:ofObject:withValue: */
34468-
long32Atput((newLargeInteger + BaseHeaderSize), SQ_SWAP_4_BYTES_IF_BIGENDIAN(6521 /* imageFormatVersion */));
34479+
long32Atput((newLargeInteger + BaseHeaderSize), SQ_SWAP_4_BYTES_IF_BIGENDIAN(integerValue));
3446934480
/* begin storeLong32:ofObject:withValue: */
3447034481
long32Atput((newLargeInteger + BaseHeaderSize) + (4), 0);
3447134482
oop = newLargeInteger;
@@ -61866,7 +61877,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr)
6186661877
assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(obj)));
6186761878
contextSize = (sp >> 1);
6186861879
l6: /* end fetchStackPointerOf: */;
61869-
numPointerSlots = ((usqInt) (CtxtTempFrameStart + contextSize));
61880+
numPointerSlots = CtxtTempFrameStart + contextSize;
6187061881
goto l10;
6187161882
}
6187261883
/* begin numSlotsOf: */
@@ -61896,7 +61907,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr)
6189661907
/* begin literalCountOfMethodHeader: */
6189761908
assert((header & 1));
6189861909
numLiterals = ((header >> 1)) & AlternateHeaderNumLiteralsMask;
61899-
numPointerSlots = ((usqInt) (numLiterals + LiteralStart));
61910+
numPointerSlots = numLiterals + LiteralStart;
6190061911
l10: /* end numPointerSlotsWhileCompactingOf:withFormat:savedFirstFieldPointer: */;
6190161912
if ((fmt <= 5 /* lastPointerFormat */)
6190261913
&& (numPointerSlots > 0)) {

‎src/spur32.cog.newspeak/cointerp.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Automatically generated by
2-
CCodeGeneratorGlobalStructure VMMaker.oscog-mt.3184 uuid: 57b61827-3f1a-ab45-966e-7c5caaef28d7
2+
CCodeGeneratorGlobalStructure VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9
33
*/
44

55

‎src/spur32.cog.newspeak/gcc3x-cointerp.c‎

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33

44
/* Automatically generated by
5-
CCodeGeneratorGlobalStructure VMMaker.oscog-mt.3184 uuid: 57b61827-3f1a-ab45-966e-7c5caaef28d7
5+
CCodeGeneratorGlobalStructure VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9
66
from
7-
CoInterpreter VMMaker.oscog-mt.3184 uuid: 57b61827-3f1a-ab45-966e-7c5caaef28d7
7+
CoInterpreter VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9
88
*/
9-
static char __buildInfo[] = "CoInterpreter VMMaker.oscog-mt.3184 uuid: 57b61827-3f1a-ab45-966e-7c5caaef28d7 " __DATE__ ;
9+
static char __buildInfo[] = "CoInterpreter VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9 " __DATE__ ;
1010
char *__interpBuildInfo = __buildInfo;
1111

1212

@@ -1859,6 +1859,7 @@ _iss sqInt externalPrimitiveTableFirstFreeIndex;
18591859
_iss sqInt firstFieldOfRememberedSet;
18601860
_iss sqInt firstSegmentSize;
18611861
_iss usqInt lowSpaceThreshold;
1862+
_iss sqInt multipleBytecodeSetsActive;
18621863
_iss sqInt preemptionYields;
18631864
_iss FILE * scavengeLog;
18641865
_iss sqInt statMaxAllocSegmentTime;
@@ -1869,7 +1870,6 @@ _iss sqInt edenBytes;
18691870
_iss sqInt fullScreenFlag;
18701871
_iss usqInt lastHash;
18711872
_iss sqInt lastMethodCacheProbeWrite;
1872-
_iss sqInt multipleBytecodeSetsActive;
18731873
_iss sqInt newFinalization;
18741874
_iss sqInt rememberedSetRedZone;
18751875
_iss sqInt savedWindowSize;
@@ -2010,7 +2010,7 @@ static signed short primitiveMetadataTable[MaxPrimitiveIndex + 2 /* 581 */] = {
20102010
/*78*/ 0, 0,
20112011
/*80*/ -256,-256,-256, 4, 4, 0, 0x100, 0, 0x200,-256,-256, 0, 0, 0, 0x100,-256,-256,
20122012
/*97*/ -256, 0, 0,
2013-
/*100*/ 260, 0x200, 0x100, 0x200,-256, 513,-256,-256,-256,-256, 0, 0x100, 0, 0,-256,
2013+
/*100*/ 260, 0x200, 0x200, 0x200,-256, 513,-256,-256,-256,-256, 0, 0x100, 0, 0,-256,
20142014
/*115*/ 0x100, 0, 12, 260, 0,
20152015
/*120*/ 524, 0x100,-256,-256, 1, 0, 0, 0, 0,-255,-256,-256, 0, 0, 0,-256, 0,-256,-256,
20162016
/*139*/ 0,
@@ -2679,7 +2679,7 @@ sqInt debugCallbackInvokes;
26792679
sqInt debugCallbackReturns;
26802680
sqInt cannotDeferDisplayUpdates;
26812681
sqInt checkedPluginName;
2682-
const char *interpreterVersion = "Newspeak Virtual Machine [ Open Smalltalk, Spur] CoInterpreterPrimitives_VMMaker.oscog-mt.3184";
2682+
const char *interpreterVersion = "Newspeak Virtual Machine [ Open Smalltalk, Spur] CoInterpreterPrimitives_VMMaker.oscog-dtl.3185";
26832683
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
26842684
char expensiveAsserts = 0;
26852685
int (*showSurfaceFn)(sqIntptr_t, int, int, int, int);
@@ -34428,6 +34428,7 @@ primitiveIdentityHash(void)
3442834428
EXPORT(sqInt)
3442934429
primitiveImageFormatVersion(void)
3443034430
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
34431+
unsigned int integerValue;
3443134432
usqInt newLargeInteger;
3443234433
usqInt newObj;
3443334434
usqInt numBytes;
@@ -34436,10 +34437,20 @@ primitiveImageFormatVersion(void)
3443634437
char *sp;
3443734438

3443834439
/* begin pop:thenPush: */
34440+
if (GIV(multipleBytecodeSetsActive)) {
34441+
integerValue = ((sqInt) (6521 /* imageFormatVersion */ | MultipleBytecodeSetsBitmask));
34442+
goto l6;
34443+
}
34444+
else {
34445+
/* begin imageFormatVersion */
34446+
integerValue = 6521;
34447+
goto l6;
34448+
}
34449+
l6: /* end imageFormatVersionForSnapshot */;
3443934450
/* begin maybeInlinePositive32BitIntegerFor: */
3444034451
assert(!((hasSixtyFourBitImmediates())));
34441-
if ((((unsigned int) 6521 /* imageFormatVersion */)) <= (MaxSmallInteger)) {
34442-
oop = (((usqInt)6521 /* imageFormatVersion */ << 1) | 1);
34452+
if ((((unsigned int) integerValue)) <= (MaxSmallInteger)) {
34453+
oop = ((integerValue << 1) | 1);
3444334454
goto l5;
3444434455
}
3444534456
/* begin eeInstantiateSmallClassIndex:format:numSlots: */
@@ -34474,7 +34485,7 @@ primitiveImageFormatVersion(void)
3447434485
/* Memory is 8 byte aligned in Spur, make sure that oversized bytes are set to zero */
3447534486
/* eem 4/28/2016 questionable; they should never be read */
3447634487
/* begin storeLong32:ofObject:withValue: */
34477-
long32Atput((newLargeInteger + BaseHeaderSize), SQ_SWAP_4_BYTES_IF_BIGENDIAN(6521 /* imageFormatVersion */));
34488+
long32Atput((newLargeInteger + BaseHeaderSize), SQ_SWAP_4_BYTES_IF_BIGENDIAN(integerValue));
3447834489
/* begin storeLong32:ofObject:withValue: */
3447934490
long32Atput((newLargeInteger + BaseHeaderSize) + (4), 0);
3448034491
oop = newLargeInteger;
@@ -61875,7 +61886,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr)
6187561886
assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(obj)));
6187661887
contextSize = (sp >> 1);
6187761888
l6: /* end fetchStackPointerOf: */;
61878-
numPointerSlots = ((usqInt) (CtxtTempFrameStart + contextSize));
61889+
numPointerSlots = CtxtTempFrameStart + contextSize;
6187961890
goto l10;
6188061891
}
6188161892
/* begin numSlotsOf: */
@@ -61905,7 +61916,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr)
6190561916
/* begin literalCountOfMethodHeader: */
6190661917
assert((header & 1));
6190761918
numLiterals = ((header >> 1)) & AlternateHeaderNumLiteralsMask;
61908-
numPointerSlots = ((usqInt) (numLiterals + LiteralStart));
61919+
numPointerSlots = numLiterals + LiteralStart;
6190961920
l10: /* end numPointerSlotsWhileCompactingOf:withFormat:savedFirstFieldPointer: */;
6191061921
if ((fmt <= 5 /* lastPointerFormat */)
6191161922
&& (numPointerSlots > 0)) {

‎src/spur32.stack.newspeak/gcc3x-interp.c‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33

44
/* Automatically generated by
5-
CCodeGeneratorGlobalStructure VMMaker.oscog-mt.3184 uuid: 57b61827-3f1a-ab45-966e-7c5caaef28d7
5+
CCodeGeneratorGlobalStructure VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9
66
from
7-
StackInterpreter VMMaker.oscog-mt.3184 uuid: 57b61827-3f1a-ab45-966e-7c5caaef28d7
7+
StackInterpreter VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9
88
*/
9-
static char __buildInfo[] = "StackInterpreter VMMaker.oscog-mt.3184 uuid: 57b61827-3f1a-ab45-966e-7c5caaef28d7 " __DATE__ ;
9+
static char __buildInfo[] = "StackInterpreter VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9 " __DATE__ ;
1010
char *__interpBuildInfo = __buildInfo;
1111

1212

@@ -1609,6 +1609,7 @@ _iss sqInt statSurvivorCount;
16091609
_iss sqInt firstFieldOfRememberedSet;
16101610
_iss sqInt firstSegmentSize;
16111611
_iss usqInt lowSpaceThreshold;
1612+
_iss sqInt multipleBytecodeSetsActive;
16121613
_iss sqInt preemptionYields;
16131614
_iss FILE * scavengeLog;
16141615
_iss sqInt statMaxAllocSegmentTime;
@@ -1619,7 +1620,6 @@ _iss sqInt edenBytes;
16191620
_iss sqInt fullScreenFlag;
16201621
_iss usqInt lastHash;
16211622
_iss sqInt lastMethodCacheProbeWrite;
1622-
_iss sqInt multipleBytecodeSetsActive;
16231623
_iss sqInt newFinalization;
16241624
_iss sqInt rememberedSetRedZone;
16251625
_iss sqInt savedWindowSize;
@@ -2389,7 +2389,7 @@ sqInt debugCallbackInvokes;
23892389
sqInt debugCallbackReturns;
23902390
sqInt cannotDeferDisplayUpdates;
23912391
sqInt checkedPluginName;
2392-
const char *interpreterVersion = "Newspeak Virtual Machine [ Open Smalltalk, Spur] StackInterpreterPrimitives_VMMaker.oscog-mt.3184";
2392+
const char *interpreterVersion = "Newspeak Virtual Machine [ Open Smalltalk, Spur] StackInterpreterPrimitives_VMMaker.oscog-dtl.3185";
23932393
sqInt suppressHeartbeatFlag;
23942394
char expensiveAsserts = 0;
23952395
int (*showSurfaceFn)(sqIntptr_t, int, int, int, int);
@@ -21166,6 +21166,7 @@ primitiveIdentityHash(void)
2116621166
EXPORT(sqInt)
2116721167
primitiveImageFormatVersion(void)
2116821168
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
21169+
unsigned int integerValue;
2116921170
usqInt newLargeInteger;
2117021171
usqInt newObj;
2117121172
usqInt numBytes;
@@ -21174,10 +21175,20 @@ primitiveImageFormatVersion(void)
2117421175
char *sp;
2117521176

2117621177
/* begin pop:thenPush: */
21178+
if (GIV(multipleBytecodeSetsActive)) {
21179+
integerValue = ((sqInt) (6521 /* imageFormatVersion */ | MultipleBytecodeSetsBitmask));
21180+
goto l6;
21181+
}
21182+
else {
21183+
/* begin imageFormatVersion */
21184+
integerValue = 6521;
21185+
goto l6;
21186+
}
21187+
l6: /* end imageFormatVersionForSnapshot */;
2117721188
/* begin maybeInlinePositive32BitIntegerFor: */
2117821189
assert(!((hasSixtyFourBitImmediates())));
21179-
if ((((unsigned int) 6521 /* imageFormatVersion */)) <= (MaxSmallInteger)) {
21180-
oop = (((usqInt)6521 /* imageFormatVersion */ << 1) | 1);
21190+
if ((((unsigned int) integerValue)) <= (MaxSmallInteger)) {
21191+
oop = ((integerValue << 1) | 1);
2118121192
goto l5;
2118221193
}
2118321194
/* begin eeInstantiateSmallClassIndex:format:numSlots: */
@@ -21212,7 +21223,7 @@ primitiveImageFormatVersion(void)
2121221223
/* Memory is 8 byte aligned in Spur, make sure that oversized bytes are set to zero */
2121321224
/* eem 4/28/2016 questionable; they should never be read */
2121421225
/* begin storeLong32:ofObject:withValue: */
21215-
long32Atput((newLargeInteger + BaseHeaderSize), SQ_SWAP_4_BYTES_IF_BIGENDIAN(6521 /* imageFormatVersion */));
21226+
long32Atput((newLargeInteger + BaseHeaderSize), SQ_SWAP_4_BYTES_IF_BIGENDIAN(integerValue));
2121621227
/* begin storeLong32:ofObject:withValue: */
2121721228
long32Atput((newLargeInteger + BaseHeaderSize) + (4), 0);
2121821229
oop = newLargeInteger;

‎src/spur32.stack.newspeak/interp.c‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/* Automatically generated by
2-
CCodeGeneratorGlobalStructure VMMaker.oscog-mt.3184 uuid: 57b61827-3f1a-ab45-966e-7c5caaef28d7
2+
CCodeGeneratorGlobalStructure VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9
33
from
4-
StackInterpreter VMMaker.oscog-mt.3184 uuid: 57b61827-3f1a-ab45-966e-7c5caaef28d7
4+
StackInterpreter VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9
55
*/
6-
static char __buildInfo[] = "StackInterpreter VMMaker.oscog-mt.3184 uuid: 57b61827-3f1a-ab45-966e-7c5caaef28d7 " __DATE__ ;
6+
static char __buildInfo[] = "StackInterpreter VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9 " __DATE__ ;
77
char *__interpBuildInfo = __buildInfo;
88

99

@@ -1606,6 +1606,7 @@ _iss sqInt statSurvivorCount;
16061606
_iss sqInt firstFieldOfRememberedSet;
16071607
_iss sqInt firstSegmentSize;
16081608
_iss usqInt lowSpaceThreshold;
1609+
_iss sqInt multipleBytecodeSetsActive;
16091610
_iss sqInt preemptionYields;
16101611
_iss FILE * scavengeLog;
16111612
_iss sqInt statMaxAllocSegmentTime;
@@ -1616,7 +1617,6 @@ _iss sqInt edenBytes;
16161617
_iss sqInt fullScreenFlag;
16171618
_iss usqInt lastHash;
16181619
_iss sqInt lastMethodCacheProbeWrite;
1619-
_iss sqInt multipleBytecodeSetsActive;
16201620
_iss sqInt newFinalization;
16211621
_iss sqInt rememberedSetRedZone;
16221622
_iss sqInt savedWindowSize;
@@ -2386,7 +2386,7 @@ sqInt debugCallbackInvokes;
23862386
sqInt debugCallbackReturns;
23872387
sqInt cannotDeferDisplayUpdates;
23882388
sqInt checkedPluginName;
2389-
const char *interpreterVersion = "Newspeak Virtual Machine [ Open Smalltalk, Spur] StackInterpreterPrimitives_VMMaker.oscog-mt.3184";
2389+
const char *interpreterVersion = "Newspeak Virtual Machine [ Open Smalltalk, Spur] StackInterpreterPrimitives_VMMaker.oscog-dtl.3185";
23902390
sqInt suppressHeartbeatFlag;
23912391
char expensiveAsserts = 0;
23922392
int (*showSurfaceFn)(sqIntptr_t, int, int, int, int);
@@ -21157,6 +21157,7 @@ primitiveIdentityHash(void)
2115721157
EXPORT(sqInt)
2115821158
primitiveImageFormatVersion(void)
2115921159
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
21160+
unsigned int integerValue;
2116021161
usqInt newLargeInteger;
2116121162
usqInt newObj;
2116221163
usqInt numBytes;
@@ -21165,10 +21166,20 @@ primitiveImageFormatVersion(void)
2116521166
char *sp;
2116621167

2116721168
/* begin pop:thenPush: */
21169+
if (GIV(multipleBytecodeSetsActive)) {
21170+
integerValue = ((sqInt) (6521 /* imageFormatVersion */ | MultipleBytecodeSetsBitmask));
21171+
goto l6;
21172+
}
21173+
else {
21174+
/* begin imageFormatVersion */
21175+
integerValue = 6521;
21176+
goto l6;
21177+
}
21178+
l6: /* end imageFormatVersionForSnapshot */;
2116821179
/* begin maybeInlinePositive32BitIntegerFor: */
2116921180
assert(!((hasSixtyFourBitImmediates())));
21170-
if ((((unsigned int) 6521 /* imageFormatVersion */)) <= (MaxSmallInteger)) {
21171-
oop = (((usqInt)6521 /* imageFormatVersion */ << 1) | 1);
21181+
if ((((unsigned int) integerValue)) <= (MaxSmallInteger)) {
21182+
oop = ((integerValue << 1) | 1);
2117221183
goto l5;
2117321184
}
2117421185
/* begin eeInstantiateSmallClassIndex:format:numSlots: */
@@ -21203,7 +21214,7 @@ primitiveImageFormatVersion(void)
2120321214
/* Memory is 8 byte aligned in Spur, make sure that oversized bytes are set to zero */
2120421215
/* eem 4/28/2016 questionable; they should never be read */
2120521216
/* begin storeLong32:ofObject:withValue: */
21206-
long32Atput((newLargeInteger + BaseHeaderSize), SQ_SWAP_4_BYTES_IF_BIGENDIAN(6521 /* imageFormatVersion */));
21217+
long32Atput((newLargeInteger + BaseHeaderSize), SQ_SWAP_4_BYTES_IF_BIGENDIAN(integerValue));
2120721218
/* begin storeLong32:ofObject:withValue: */
2120821219
long32Atput((newLargeInteger + BaseHeaderSize) + (4), 0);
2120921220
oop = newLargeInteger;

‎src/spur64.cog.newspeak/cogit.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Automatically generated by
2-
CCodeGenerator VMMaker.oscog-mt.3083 uuid: 0d345f2b-f29d-7148-b84c-cb4ed3775bb1
2+
CCodeGenerator VMMaker.oscog-dtl.3185 uuid: 0e7f07b8-eed6-4362-b223-86c98594ddb9
33
*/
44

55

0 commit comments

Comments
 (0)