11/* Automatically generated by
2- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3639 uuid: d69ad4cd-71c7-4c5b-a14b-ba9167bda131
3- (Cog-eem.493 , * Compiler-ct.519)
2+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3641 uuid: c5662f60-c23c-4b21-bbbf-647f0a53592e
3+ (Cog-eem.494 , * Compiler-ct.519)
44 from
5- CoInterpreter VMMaker.oscog-eem.3639 uuid: d69ad4cd-71c7-4c5b-a14b-ba9167bda131
5+ CoInterpreter VMMaker.oscog-eem.3641 uuid: c5662f60-c23c-4b21-bbbf-647f0a53592e
66 */
7- static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3639 uuid: d69ad4cd-71c7-4c5b-a14b-ba9167bda131 " __DATE__ ;
7+ static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3641 uuid: c5662f60-c23c-4b21-bbbf-647f0a53592e " __DATE__ ;
88char *__interpBuildInfo = __buildInfo;
99
1010
@@ -622,7 +622,7 @@ extern char * whereIs(sqInt anOop);
622622static NoDbgRegParms NeverInline void widowOrForceToBytecodePC(sqInt ctxt);
623623static NoDbgRegParms int frameIsMarked(sqInt theFPInt);
624624#if VMInvestigations
625- EXPORT(sqInt ) primitiveAllMethodsCompiledToMachineCode(void);
625+ EXPORT(int ) primitiveAllMethodsCompiledToMachineCode(void);
626626#endif /* VMInvestigations */
627627#if VMInvestigations
628628EXPORT(void) primitiveBenchmarkFollowForwardersInStackZone(void);
@@ -2708,7 +2708,7 @@ sqInt debugCallbackReturns;
27082708sqInt suppressHeartbeatFlag;
27092709sqInt cannotDeferDisplayUpdates;
27102710sqInt checkedPluginName;
2711- const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3639 ]";
2711+ const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3641 ]";
27122712const char * leakCheckFlagsMeanings[] = {
27132713 "1: check full GC", "2: check new space GC", "4: check incremental GC", "8: check become",
27142714 "16: check image segment", "32: check free space", "64: check shorten", "128: check prim call",
@@ -37443,7 +37443,7 @@ frameIsMarked(sqInt theFPInt)
3744337443
3744437444 /* CoInterpreterPrimitives>>#primitiveAllMethodsCompiledToMachineCode */
3744537445#if VMInvestigations
37446- EXPORT(sqInt )
37446+ EXPORT(int )
3744737447primitiveAllMethodsCompiledToMachineCode(void)
3744837448{ DECL_MAYBE_SQ_GLOBAL_STRUCT
3744937449 sqInt arrayObj;
@@ -37773,7 +37773,7 @@ primitiveCogStaticSymbols(void)
3777337773 && (!(isForwarded(symbols))));
3777437774 assert(validStorePointerUncheckedArgs(7, symbols, valuePointer));
3777537775 longAtput((void *)((symbols + BaseHeaderSize) + (7U << (shiftForWord()))),valuePointer);
37776- valuePointer = stringForCString("cFramePointer ");
37776+ valuePointer = stringForCString("CFramePointer ");
3777737777
3777837778 /* begin storePointerUnchecked:ofObject:withValue: */
3777937779 assert((isNonImmediate(symbols))
@@ -37787,7 +37787,7 @@ primitiveCogStaticSymbols(void)
3778737787 && (!(isForwarded(symbols))));
3778837788 assert(validStorePointerUncheckedArgs(9, symbols, valuePointer));
3778937789 longAtput((void *)((symbols + BaseHeaderSize) + (9U << (shiftForWord()))),valuePointer);
37790- valuePointer = stringForCString("cStackPointer ");
37790+ valuePointer = stringForCString("CStackPointer ");
3779137791
3779237792 /* begin storePointerUnchecked:ofObject:withValue: */
3779337793 assert((isNonImmediate(symbols))
@@ -56785,9 +56785,9 @@ allWeakSurvivorsOnWeakList(void)
5678556785 /* begin nextCorpseOrNil: */
5678656786 assert(isYoung(corpse));
5678756787 listOffset = ((((usqInt)(((long32At((void *)(corpse + 4))) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((byteAt((void *)(corpse + (formatFieldByteOffset())))) & (formatMask()));
56788- corpse = ((sqInt) (( listOffset
56789- ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart)
56790- : 0)) );
56788+ corpse = (listOffset
56789+ ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart)
56790+ : 0);
5679156791 }
5679256792 return 0;
5679356793 return 0;
@@ -57626,9 +57626,9 @@ processEphemerons(void)
5762657626 /* begin nextCorpseOrNil: */
5762757627 assert(isYoung(ephemeronCorpse));
5762857628 listOffset = ((((usqInt)(((long32At((void *)(ephemeronCorpse + 4))) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((byteAt((void *)(ephemeronCorpse + (formatFieldByteOffset())))) & (formatMask()));
57629- ephemeronCorpse = ((sqInt) (( listOffset
57630- ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart)
57631- : 0)) );
57629+ ephemeronCorpse = (listOffset
57630+ ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart)
57631+ : 0);
5763257632 }
5763357633 /* end fireEphemeronsOnEphemeronList */
5763457634l1:;
@@ -57700,9 +57700,9 @@ processWeaklings(void)
5770057700 /* begin nextCorpseOrNil: */
5770157701 assert(isYoung(weakCorpse));
5770257702 listOffset = ((((usqInt)(((long32At((void *)(weakCorpse + 4))) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((byteAt((void *)(weakCorpse + (formatFieldByteOffset())))) & (formatMask()));
57703- weakCorpse = ((sqInt) (( listOffset
57704- ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart)
57705- : 0)) );
57703+ weakCorpse = (listOffset
57704+ ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart)
57705+ : 0);
5770657706 }
5770757707 GIV(weakList) = null;
5770857708 }
@@ -77503,7 +77503,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr)
7750377503 contextSize = (sp >> 1);
7750477504 /* end fetchStackPointerOf: */
7750577505l2:
77506- numPointerSlots = ((usqInt) ( CtxtTempFrameStart + contextSize)) ;
77506+ numPointerSlots = CtxtTempFrameStart + contextSize;
7750777507 goto l3;
7750877508 }
7750977509
@@ -77866,7 +77866,7 @@ bridgeFor(SpurSegmentInfo *aSegment)
7786677866static NoDbgRegParms void
7786777867bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
7786877868{
77869- int bridgeSpan;
77869+ sqInt bridgeSpan;
7787077870 sqInt clifton;
7787177871 usqInt segEnd;
7787277872
@@ -82431,13 +82431,14 @@ static sqInt
8243182431getErrorObjectFromPrimFailCode(void)
8243282432{ DECL_MAYBE_SQ_GLOBAL_STRUCT
8243382433 sqInt classIndex;
82434- sqInt clone;
82435- sqInt errObj;
82434+ usqInt clone;
82435+ usqInt errObj;
8243682436 sqInt i;
8243782437 usqInt newObj;
8243882438 usqInt numBytes;
8243982439 usqInt numSlots;
8244082440 usqInt numSlotsUsqInt;
82441+ sqInt objOop;
8244182442 sqInt table;
8244282443 sqInt valuePointer;
8244382444
@@ -82449,12 +82450,13 @@ getErrorObjectFromPrimFailCode(void)
8244982450 ? longAt((void *)(table - BaseHeaderSize))
8245082451 : numSlots)))) {
8245182452 /* begin followField:ofObject: */
82452- errObj = longAt((void *)((table + BaseHeaderSize) + ((((usqInt)((GIV(primFailCode) - 1)) << (shiftForWord()))))));
82453+ objOop = longAt((void *)((table + BaseHeaderSize) + ((((usqInt)((GIV(primFailCode) - 1)) << (shiftForWord()))))));
8245382454 if (/* isOopForwarded: */
82454- ((!(errObj & (tagMask()))))
82455- && ((!((longAt((void *)(errObj ))) & ((classIndexMask()) - (isForwardedObjectClassIndexPun())))))) {
82456- errObj = fixFollowedFieldofObjectwithInitialValue(GIV(primFailCode) - 1, table, errObj );
82455+ ((!(objOop & (tagMask()))))
82456+ && ((!((longAt((void *)(objOop ))) & ((classIndexMask()) - (isForwardedObjectClassIndexPun())))))) {
82457+ objOop = fixFollowedFieldofObjectwithInitialValue(GIV(primFailCode) - 1, table, objOop );
8245782458 }
82459+ errObj = objOop;
8245882460
8245982461 /* If there's a clonable object in the table at that index,
8246082462 answer a clone of the error object with the second slot set to the value of secondaryErrorCode. */
0 commit comments