From a99d053f216e2dac81a2ce8c9a423987dac18a9a Mon Sep 17 00:00:00 2001 From: Eliot Miranda Date: Sun, 22 Dec 2024 21:28:20 -0800 Subject: [PATCH] CogVM source as per VMMaker.oscog-eem.3490 Windows whack-a-mole post VMMaker.oscog-eem.3487 --- src/spur32.cog.lowcode/cointerp.c | 26 +++++------ src/spur32.cog.lowcode/cointerp.h | 4 +- src/spur32.cog.lowcode/gcc3x-cointerp.c | 26 +++++------ src/spur32.cog/cointerp.c | 46 +++++++++---------- src/spur32.cog/cointerp.h | 4 +- src/spur32.cog/cointerpmt.c | 42 ++++++++--------- src/spur32.cog/cointerpmt.h | 4 +- src/spur32.cog/gcc3x-cointerp.c | 46 +++++++++---------- src/spur32.cog/gcc3x-cointerpmt.c | 42 ++++++++--------- src/spur32.sista/cointerp.c | 60 ++++++++++++------------- src/spur32.sista/cointerp.h | 4 +- src/spur32.sista/gcc3x-cointerp.c | 60 ++++++++++++------------- src/spur32.stack.lowcode/gcc3x-interp.c | 14 +++--- src/spur32.stack.lowcode/interp.c | 14 +++--- src/spur32.stack/gcc3x-interp.c | 16 +++---- src/spur32.stack/interp.c | 16 +++---- src/spur64.cog.lowcode/cointerp.c | 22 ++++----- src/spur64.cog.lowcode/cointerp.h | 4 +- src/spur64.cog.lowcode/gcc3x-cointerp.c | 22 ++++----- src/spur64.cog/cointerp.c | 46 +++++++++---------- src/spur64.cog/cointerp.h | 4 +- src/spur64.cog/cointerpmt.c | 42 ++++++++--------- src/spur64.cog/cointerpmt.h | 4 +- src/spur64.cog/gcc3x-cointerp.c | 46 +++++++++---------- src/spur64.cog/gcc3x-cointerpmt.c | 42 ++++++++--------- src/spur64.sista/cointerp.c | 18 ++++---- src/spur64.sista/cointerp.h | 4 +- src/spur64.sista/gcc3x-cointerp.c | 18 ++++---- src/spur64.stack.lowcode/gcc3x-interp.c | 14 +++--- src/spur64.stack.lowcode/interp.c | 14 +++--- src/spur64.stack/gcc3x-interp.c | 14 +++--- src/spur64.stack/interp.c | 14 +++--- src/v3.cog/cointerp.c | 20 ++++----- src/v3.cog/cointerp.h | 4 +- src/v3.cog/gcc3x-cointerp.c | 20 ++++----- src/v3.stack/gcc3x-interp.c | 14 +++--- src/v3.stack/interp.c | 14 +++--- 37 files changed, 410 insertions(+), 414 deletions(-) diff --git a/src/spur32.cog.lowcode/cointerp.c b/src/spur32.cog.lowcode/cointerp.c index db4ca597df..25f6b201cc 100644 --- a/src/spur32.cog.lowcode/cointerp.c +++ b/src/spur32.cog.lowcode/cointerp.c @@ -1,10 +1,10 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b - (Compiler-eem.512) + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 + (* Compiler-eem.512) from - CoInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b + CoInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 " __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-eem.3488]"; +const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3490]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; char expensiveAsserts = 0; int (*showSurfaceFn)(sqIntptr_t, int, int, int, int); @@ -50942,7 +50942,7 @@ primitiveInvokeObjectAsMethod(void) sqInt lookupClassTag; usqInt newObj; usqInt numBytes; - sqInt runArgs; + usqInt runArgs; sqInt runReceiver; char *sp; sqInt tagBits; @@ -56333,7 +56333,7 @@ primitiveSubtractLargeIntegers(void) sqInt oopRcvr; sqInt oopResult; usqLong result; - sqInt resultIsNegative; + int resultIsNegative; char *sp; oopArg = longAt(GIV(stackPointer)); @@ -73240,8 +73240,8 @@ oldSpaceObjectAfter(sqInt objOop) static NoDbgRegParms NeverInline void outOfPlaceBecomeandcopyHashFlag(sqInt obj1, sqInt obj2, sqInt copyHashFlag) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt clone1; - sqInt clone2; + usqInt clone1; + usqInt clone2; sqInt hash; clone1 = (((longAt(obj1)) & (classIndexMask())) == ClassMethodContextCompactIndex @@ -80125,7 +80125,7 @@ bridgeFor(SpurSegmentInfo *aSegment) static NoDbgRegParms void bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil) { - sqInt bridgeSpan; + int bridgeSpan; sqInt clifton; usqInt segEnd; @@ -80308,7 +80308,7 @@ prepareForSnapshot(void) sqInt largeChild; sqInt newEndOfMemory; sqInt next; - usqInt node; + sqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -89337,7 +89337,7 @@ printCallStackOf(sqInt aContextOrProcessOrFrame) return printCallStackFP(((char *)aContextOrProcessOrFrame)); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printCallStackOf(GIV(framePointer)); + return printCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); @@ -90554,7 +90554,7 @@ printStackCallStackOf(sqInt aContextOrProcessOrFrame) return printStackCallStackOf(((sqInt)(frameOfMarriedContext(aContextOrProcessOrFrame)))); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printStackCallStackOf(GIV(framePointer)); + return printStackCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); diff --git a/src/spur32.cog.lowcode/cointerp.h b/src/spur32.cog.lowcode/cointerp.h index 7ad4bec92f..190683ddd2 100644 --- a/src/spur32.cog.lowcode/cointerp.h +++ b/src/spur32.cog.lowcode/cointerp.h @@ -1,6 +1,6 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b - (Compiler-eem.512) + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 + (* Compiler-eem.512) */ diff --git a/src/spur32.cog.lowcode/gcc3x-cointerp.c b/src/spur32.cog.lowcode/gcc3x-cointerp.c index ba79ca7412..c450ea962c 100644 --- a/src/spur32.cog.lowcode/gcc3x-cointerp.c +++ b/src/spur32.cog.lowcode/gcc3x-cointerp.c @@ -2,12 +2,12 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b - (Compiler-eem.512) + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 + (* Compiler-eem.512) from - CoInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b + CoInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 " __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-eem.3488]"; +const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3490]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; char expensiveAsserts = 0; int (*showSurfaceFn)(sqIntptr_t, int, int, int, int); @@ -50949,7 +50949,7 @@ primitiveInvokeObjectAsMethod(void) sqInt lookupClassTag; usqInt newObj; usqInt numBytes; - sqInt runArgs; + usqInt runArgs; sqInt runReceiver; char *sp; sqInt tagBits; @@ -56340,7 +56340,7 @@ primitiveSubtractLargeIntegers(void) sqInt oopRcvr; sqInt oopResult; usqLong result; - sqInt resultIsNegative; + int resultIsNegative; char *sp; oopArg = longAt(GIV(stackPointer)); @@ -73247,8 +73247,8 @@ oldSpaceObjectAfter(sqInt objOop) static NoDbgRegParms NeverInline void outOfPlaceBecomeandcopyHashFlag(sqInt obj1, sqInt obj2, sqInt copyHashFlag) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt clone1; - sqInt clone2; + usqInt clone1; + usqInt clone2; sqInt hash; clone1 = (((longAt(obj1)) & (classIndexMask())) == ClassMethodContextCompactIndex @@ -80132,7 +80132,7 @@ bridgeFor(SpurSegmentInfo *aSegment) static NoDbgRegParms void bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil) { - sqInt bridgeSpan; + int bridgeSpan; sqInt clifton; usqInt segEnd; @@ -80315,7 +80315,7 @@ prepareForSnapshot(void) sqInt largeChild; sqInt newEndOfMemory; sqInt next; - usqInt node; + sqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -89344,7 +89344,7 @@ printCallStackOf(sqInt aContextOrProcessOrFrame) return printCallStackFP(((char *)aContextOrProcessOrFrame)); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printCallStackOf(GIV(framePointer)); + return printCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); @@ -90561,7 +90561,7 @@ printStackCallStackOf(sqInt aContextOrProcessOrFrame) return printStackCallStackOf(((sqInt)(frameOfMarriedContext(aContextOrProcessOrFrame)))); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printStackCallStackOf(GIV(framePointer)); + return printStackCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); diff --git a/src/spur32.cog/cointerp.c b/src/spur32.cog/cointerp.c index f5e9250691..255b8cdf6d 100644 --- a/src/spur32.cog/cointerp.c +++ b/src/spur32.cog/cointerp.c @@ -1,10 +1,10 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b - (Compiler-eem.512) + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 + (* Compiler-eem.512) from - CoInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b + CoInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1208,7 +1208,7 @@ extern sqInt numBytesOf(sqInt objOop); static NoDbgRegParms usqInt numPointerSlotsOf(sqInt objOop); static NoDbgRegParms sqInt numSlotsForBytes(sqInt numBytes); static NoDbgRegParms usqInt numSlotsOfAny(sqInt objOop); -static NoDbgRegParms sqInt numSlotsOfIndexablePointerObj(sqInt objOop); +static NoDbgRegParms usqInt numSlotsOfIndexablePointerObj(sqInt objOop); extern usqInt numSlotsOf(sqInt objOop); static NoDbgRegParms sqInt numStrongSlotsOfInephemeral(sqInt objOop); static NoDbgRegParms sqInt numStrongSlotsOfWeakling(sqInt objOop); @@ -2654,7 +2654,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3488]"; +const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3490]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; char expensiveAsserts = 0; int (*showSurfaceFn)(sqIntptr_t, int, int, int, int); @@ -41199,9 +41199,9 @@ allWeakSurvivorsOnWeakList(void) /* begin nextCorpseOrNil: */ assert(isYoung(corpse)); listOffset = ((((usqInt)(((long32At(corpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(corpse)))) >> (formatShift())) & (formatMask())); - corpse = ((sqInt) ((listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0))); + corpse = (listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0); } return 0; return 0; @@ -41828,9 +41828,9 @@ isonWeaklingList(sqInt oop, sqInt listHead) /* begin nextCorpseOrNil: */ assert(isYoung(corpse)); listOffset = ((((usqInt)(((long32At(corpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(corpse)))) >> (formatShift())) & (formatMask())); - corpse = ((sqInt) ((listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0))); + corpse = (listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0); } return 0; } @@ -42061,9 +42061,9 @@ processEphemerons(void) /* begin nextCorpseOrNil: */ assert(isYoung(ephemeronCorpse)); listOffset = ((((usqInt)(((long32At(ephemeronCorpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(ephemeronCorpse)))) >> (formatShift())) & (formatMask())); - ephemeronCorpse = ((sqInt) ((listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0))); + ephemeronCorpse = (listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0); } /* end fireEphemeronsOnEphemeronList */ l1:; @@ -42136,9 +42136,9 @@ processWeaklings(void) /* begin nextCorpseOrNil: */ assert(isYoung(weakCorpse)); listOffset = ((((usqInt)(((long32At(weakCorpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(weakCorpse)))) >> (formatShift())) & (formatMask())); - weakCorpse = ((sqInt) ((listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0))); + weakCorpse = (listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0); } GIV(weakList) = null; } @@ -54380,7 +54380,7 @@ numSlotsOfAny(sqInt objOop) */ /* SpurMemoryManager>>#numSlotsOfIndexablePointerObj: */ -static NoDbgRegParms sqInt +static NoDbgRegParms usqInt numSlotsOfIndexablePointerObj(sqInt objOop) { usqInt numSlots; @@ -61746,7 +61746,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr) contextSize = (sp >> 1); /* end fetchStackPointerOf: */ l2: - numPointerSlots = CtxtTempFrameStart + contextSize; + numPointerSlots = ((usqInt) (CtxtTempFrameStart + contextSize)); goto l3; } @@ -62110,7 +62110,7 @@ bridgeFor(SpurSegmentInfo *aSegment) static NoDbgRegParms void bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil) { - int bridgeSpan; + sqInt bridgeSpan; sqInt clifton; usqInt segEnd; @@ -71249,7 +71249,7 @@ printCallStackOf(sqInt aContextOrProcessOrFrame) return printCallStackFP(((char *)aContextOrProcessOrFrame)); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printCallStackOf(GIV(framePointer)); + return printCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); @@ -72463,7 +72463,7 @@ printStackCallStackOf(sqInt aContextOrProcessOrFrame) return printStackCallStackOf(((sqInt)(frameOfMarriedContext(aContextOrProcessOrFrame)))); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printStackCallStackOf(GIV(framePointer)); + return printStackCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); diff --git a/src/spur32.cog/cointerp.h b/src/spur32.cog/cointerp.h index 8d9fbe893b..6f9882df58 100644 --- a/src/spur32.cog/cointerp.h +++ b/src/spur32.cog/cointerp.h @@ -1,6 +1,6 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b - (Compiler-eem.512) + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 + (* Compiler-eem.512) */ diff --git a/src/spur32.cog/cointerpmt.c b/src/spur32.cog/cointerpmt.c index 3ef2054c30..5b0ca42698 100644 --- a/src/spur32.cog/cointerpmt.c +++ b/src/spur32.cog/cointerpmt.c @@ -1,10 +1,10 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b - (Compiler-eem.512) + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 + (* Compiler-eem.512) from - CoInterpreterMT VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b + CoInterpreterMT VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2768,7 +2768,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.3488]"; +const char *interpreterVersion = "Open Smalltalk Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.3490]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; char expensiveAsserts = 0; int (*showSurfaceFn)(sqIntptr_t, int, int, int, int); @@ -42113,7 +42113,7 @@ primitiveSubtractLargeIntegers(void) sqInt oopRcvr; sqInt oopResult; usqLong result; - int resultIsNegative; + sqInt resultIsNegative; char *sp; oopArg = longAt(GIV(stackPointer)); @@ -44925,9 +44925,9 @@ allWeakSurvivorsOnWeakList(void) /* begin nextCorpseOrNil: */ assert(isYoung(corpse)); listOffset = ((((usqInt)(((long32At(corpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(corpse)))) >> (formatShift())) & (formatMask())); - corpse = ((sqInt) ((listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0))); + corpse = (listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0); } return 0; return 0; @@ -45554,9 +45554,9 @@ isonWeaklingList(sqInt oop, sqInt listHead) /* begin nextCorpseOrNil: */ assert(isYoung(corpse)); listOffset = ((((usqInt)(((long32At(corpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(corpse)))) >> (formatShift())) & (formatMask())); - corpse = ((sqInt) ((listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0))); + corpse = (listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0); } return 0; } @@ -45787,9 +45787,9 @@ processEphemerons(void) /* begin nextCorpseOrNil: */ assert(isYoung(ephemeronCorpse)); listOffset = ((((usqInt)(((long32At(ephemeronCorpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(ephemeronCorpse)))) >> (formatShift())) & (formatMask())); - ephemeronCorpse = ((sqInt) ((listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0))); + ephemeronCorpse = (listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0); } /* end fireEphemeronsOnEphemeronList */ l1:; @@ -45862,9 +45862,9 @@ processWeaklings(void) /* begin nextCorpseOrNil: */ assert(isYoung(weakCorpse)); listOffset = ((((usqInt)(((long32At(weakCorpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(weakCorpse)))) >> (formatShift())) & (formatMask())); - weakCorpse = ((sqInt) ((listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0))); + weakCorpse = (listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0); } GIV(weakList) = null; } @@ -66039,7 +66039,7 @@ prepareForSnapshot(void) sqInt largeChild; sqInt newEndOfMemory; sqInt next; - sqInt node; + usqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -74513,7 +74513,7 @@ printCallStackOf(sqInt aContextOrProcessOrFrame) return printCallStackFP(((char *)aContextOrProcessOrFrame)); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printCallStackOf(GIV(framePointer)); + return printCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); @@ -75727,7 +75727,7 @@ printStackCallStackOf(sqInt aContextOrProcessOrFrame) return printStackCallStackOf(((sqInt)(frameOfMarriedContext(aContextOrProcessOrFrame)))); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printStackCallStackOf(GIV(framePointer)); + return printStackCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); diff --git a/src/spur32.cog/cointerpmt.h b/src/spur32.cog/cointerpmt.h index f41c887030..81b4567731 100644 --- a/src/spur32.cog/cointerpmt.h +++ b/src/spur32.cog/cointerpmt.h @@ -1,6 +1,6 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b - (Compiler-eem.512) + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 + (* Compiler-eem.512) */ diff --git a/src/spur32.cog/gcc3x-cointerp.c b/src/spur32.cog/gcc3x-cointerp.c index ac0bd75d55..48956eaaed 100644 --- a/src/spur32.cog/gcc3x-cointerp.c +++ b/src/spur32.cog/gcc3x-cointerp.c @@ -2,12 +2,12 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b - (Compiler-eem.512) + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 + (* Compiler-eem.512) from - CoInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b + CoInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1211,7 +1211,7 @@ extern sqInt numBytesOf(sqInt objOop); static NoDbgRegParms usqInt numPointerSlotsOf(sqInt objOop); static NoDbgRegParms sqInt numSlotsForBytes(sqInt numBytes); static NoDbgRegParms usqInt numSlotsOfAny(sqInt objOop); -static NoDbgRegParms sqInt numSlotsOfIndexablePointerObj(sqInt objOop); +static NoDbgRegParms usqInt numSlotsOfIndexablePointerObj(sqInt objOop); extern usqInt numSlotsOf(sqInt objOop); static NoDbgRegParms sqInt numStrongSlotsOfInephemeral(sqInt objOop); static NoDbgRegParms sqInt numStrongSlotsOfWeakling(sqInt objOop); @@ -2657,7 +2657,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3488]"; +const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3490]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; char expensiveAsserts = 0; int (*showSurfaceFn)(sqIntptr_t, int, int, int, int); @@ -41206,9 +41206,9 @@ allWeakSurvivorsOnWeakList(void) /* begin nextCorpseOrNil: */ assert(isYoung(corpse)); listOffset = ((((usqInt)(((long32At(corpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(corpse)))) >> (formatShift())) & (formatMask())); - corpse = ((sqInt) ((listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0))); + corpse = (listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0); } return 0; return 0; @@ -41835,9 +41835,9 @@ isonWeaklingList(sqInt oop, sqInt listHead) /* begin nextCorpseOrNil: */ assert(isYoung(corpse)); listOffset = ((((usqInt)(((long32At(corpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(corpse)))) >> (formatShift())) & (formatMask())); - corpse = ((sqInt) ((listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0))); + corpse = (listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0); } return 0; } @@ -42068,9 +42068,9 @@ processEphemerons(void) /* begin nextCorpseOrNil: */ assert(isYoung(ephemeronCorpse)); listOffset = ((((usqInt)(((long32At(ephemeronCorpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(ephemeronCorpse)))) >> (formatShift())) & (formatMask())); - ephemeronCorpse = ((sqInt) ((listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0))); + ephemeronCorpse = (listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0); } /* end fireEphemeronsOnEphemeronList */ l1:; @@ -42143,9 +42143,9 @@ processWeaklings(void) /* begin nextCorpseOrNil: */ assert(isYoung(weakCorpse)); listOffset = ((((usqInt)(((long32At(weakCorpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(weakCorpse)))) >> (formatShift())) & (formatMask())); - weakCorpse = ((sqInt) ((listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0))); + weakCorpse = (listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0); } GIV(weakList) = null; } @@ -54387,7 +54387,7 @@ numSlotsOfAny(sqInt objOop) */ /* SpurMemoryManager>>#numSlotsOfIndexablePointerObj: */ -static NoDbgRegParms sqInt +static NoDbgRegParms usqInt numSlotsOfIndexablePointerObj(sqInt objOop) { usqInt numSlots; @@ -61753,7 +61753,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr) contextSize = (sp >> 1); /* end fetchStackPointerOf: */ l2: - numPointerSlots = CtxtTempFrameStart + contextSize; + numPointerSlots = ((usqInt) (CtxtTempFrameStart + contextSize)); goto l3; } @@ -62117,7 +62117,7 @@ bridgeFor(SpurSegmentInfo *aSegment) static NoDbgRegParms void bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil) { - int bridgeSpan; + sqInt bridgeSpan; sqInt clifton; usqInt segEnd; @@ -71256,7 +71256,7 @@ printCallStackOf(sqInt aContextOrProcessOrFrame) return printCallStackFP(((char *)aContextOrProcessOrFrame)); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printCallStackOf(GIV(framePointer)); + return printCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); @@ -72470,7 +72470,7 @@ printStackCallStackOf(sqInt aContextOrProcessOrFrame) return printStackCallStackOf(((sqInt)(frameOfMarriedContext(aContextOrProcessOrFrame)))); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printStackCallStackOf(GIV(framePointer)); + return printStackCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); diff --git a/src/spur32.cog/gcc3x-cointerpmt.c b/src/spur32.cog/gcc3x-cointerpmt.c index 17cc42de8c..56983a2291 100644 --- a/src/spur32.cog/gcc3x-cointerpmt.c +++ b/src/spur32.cog/gcc3x-cointerpmt.c @@ -2,12 +2,12 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b - (Compiler-eem.512) + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 + (* Compiler-eem.512) from - CoInterpreterMT VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b + CoInterpreterMT VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2771,7 +2771,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.3488]"; +const char *interpreterVersion = "Open Smalltalk Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.3490]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; char expensiveAsserts = 0; int (*showSurfaceFn)(sqIntptr_t, int, int, int, int); @@ -42120,7 +42120,7 @@ primitiveSubtractLargeIntegers(void) sqInt oopRcvr; sqInt oopResult; usqLong result; - int resultIsNegative; + sqInt resultIsNegative; char *sp; oopArg = longAt(GIV(stackPointer)); @@ -44932,9 +44932,9 @@ allWeakSurvivorsOnWeakList(void) /* begin nextCorpseOrNil: */ assert(isYoung(corpse)); listOffset = ((((usqInt)(((long32At(corpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(corpse)))) >> (formatShift())) & (formatMask())); - corpse = ((sqInt) ((listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0))); + corpse = (listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0); } return 0; return 0; @@ -45561,9 +45561,9 @@ isonWeaklingList(sqInt oop, sqInt listHead) /* begin nextCorpseOrNil: */ assert(isYoung(corpse)); listOffset = ((((usqInt)(((long32At(corpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(corpse)))) >> (formatShift())) & (formatMask())); - corpse = ((sqInt) ((listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0))); + corpse = (listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0); } return 0; } @@ -45794,9 +45794,9 @@ processEphemerons(void) /* begin nextCorpseOrNil: */ assert(isYoung(ephemeronCorpse)); listOffset = ((((usqInt)(((long32At(ephemeronCorpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(ephemeronCorpse)))) >> (formatShift())) & (formatMask())); - ephemeronCorpse = ((sqInt) ((listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0))); + ephemeronCorpse = (listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0); } /* end fireEphemeronsOnEphemeronList */ l1:; @@ -45869,9 +45869,9 @@ processWeaklings(void) /* begin nextCorpseOrNil: */ assert(isYoung(weakCorpse)); listOffset = ((((usqInt)(((long32At(weakCorpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(weakCorpse)))) >> (formatShift())) & (formatMask())); - weakCorpse = ((sqInt) ((listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0))); + weakCorpse = (listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0); } GIV(weakList) = null; } @@ -66046,7 +66046,7 @@ prepareForSnapshot(void) sqInt largeChild; sqInt newEndOfMemory; sqInt next; - sqInt node; + usqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -74520,7 +74520,7 @@ printCallStackOf(sqInt aContextOrProcessOrFrame) return printCallStackFP(((char *)aContextOrProcessOrFrame)); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printCallStackOf(GIV(framePointer)); + return printCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); @@ -75734,7 +75734,7 @@ printStackCallStackOf(sqInt aContextOrProcessOrFrame) return printStackCallStackOf(((sqInt)(frameOfMarriedContext(aContextOrProcessOrFrame)))); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printStackCallStackOf(GIV(framePointer)); + return printStackCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); diff --git a/src/spur32.sista/cointerp.c b/src/spur32.sista/cointerp.c index aded4f5c0f..a238cf15a0 100644 --- a/src/spur32.sista/cointerp.c +++ b/src/spur32.sista/cointerp.c @@ -1,10 +1,10 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b - (Compiler-eem.512) + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 + (* Compiler-eem.512) from - CoInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b + CoInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1222,7 +1222,7 @@ extern sqInt numBytesOf(sqInt objOop); static NoDbgRegParms usqInt numPointerSlotsOf(sqInt objOop); static NoDbgRegParms sqInt numSlotsForBytes(sqInt numBytes); static NoDbgRegParms usqInt numSlotsOfAny(sqInt objOop); -static NoDbgRegParms sqInt numSlotsOfIndexablePointerObj(sqInt objOop); +static NoDbgRegParms usqInt numSlotsOfIndexablePointerObj(sqInt objOop); extern usqInt numSlotsOf(sqInt objOop); static NoDbgRegParms sqInt numStrongSlotsOfInephemeral(sqInt objOop); static NoDbgRegParms sqInt numStrongSlotsOfWeakling(sqInt objOop); @@ -2670,7 +2670,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3488]"; +const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3490]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; char expensiveAsserts = 0; int (*showSurfaceFn)(sqIntptr_t, int, int, int, int); @@ -44464,9 +44464,9 @@ allWeakSurvivorsOnWeakList(void) /* begin nextCorpseOrNil: */ assert(isYoung(corpse)); listOffset = ((((usqInt)(((long32At(corpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(corpse)))) >> (formatShift())) & (formatMask())); - corpse = (listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0); + corpse = ((sqInt) ((listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0))); } return 0; return 0; @@ -45093,9 +45093,9 @@ isonWeaklingList(sqInt oop, sqInt listHead) /* begin nextCorpseOrNil: */ assert(isYoung(corpse)); listOffset = ((((usqInt)(((long32At(corpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(corpse)))) >> (formatShift())) & (formatMask())); - corpse = (listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0); + corpse = ((sqInt) ((listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0))); } return 0; } @@ -45326,9 +45326,9 @@ processEphemerons(void) /* begin nextCorpseOrNil: */ assert(isYoung(ephemeronCorpse)); listOffset = ((((usqInt)(((long32At(ephemeronCorpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(ephemeronCorpse)))) >> (formatShift())) & (formatMask())); - ephemeronCorpse = (listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0); + ephemeronCorpse = ((sqInt) ((listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0))); } /* end fireEphemeronsOnEphemeronList */ l1:; @@ -45401,9 +45401,9 @@ processWeaklings(void) /* begin nextCorpseOrNil: */ assert(isYoung(weakCorpse)); listOffset = ((((usqInt)(((long32At(weakCorpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(weakCorpse)))) >> (formatShift())) & (formatMask())); - weakCorpse = (listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0); + weakCorpse = ((sqInt) ((listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0))); } GIV(weakList) = null; } @@ -57693,7 +57693,7 @@ numSlotsOfAny(sqInt objOop) */ /* SpurMemoryManager>>#numSlotsOfIndexablePointerObj: */ -static NoDbgRegParms sqInt +static NoDbgRegParms usqInt numSlotsOfIndexablePointerObj(sqInt objOop) { usqInt numSlots; @@ -65433,7 +65433,7 @@ bridgeFor(SpurSegmentInfo *aSegment) static NoDbgRegParms void bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil) { - sqInt bridgeSpan; + int bridgeSpan; sqInt clifton; usqInt segEnd; @@ -65616,7 +65616,7 @@ prepareForSnapshot(void) sqInt largeChild; sqInt newEndOfMemory; sqInt next; - sqInt node; + usqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -69928,14 +69928,13 @@ static sqInt getErrorObjectFromPrimFailCode(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt classIndex; - usqInt clone; - usqInt errObj; + sqInt clone; + sqInt errObj; sqInt i; usqInt newObj; usqInt numBytes; usqInt numSlots; usqInt numSlotsUsqInt; - sqInt objOop; sqInt table; sqInt valuePointer; @@ -69947,13 +69946,12 @@ getErrorObjectFromPrimFailCode(void) ? longAt(table - BaseHeaderSize) : numSlots)))) { /* begin followField:ofObject: */ - objOop = longAt((table + BaseHeaderSize) + ((((usqInt)((GIV(primFailCode) - 1)) << (shiftForWord()))))); + errObj = longAt((table + BaseHeaderSize) + ((((usqInt)((GIV(primFailCode) - 1)) << (shiftForWord()))))); if (/* isOopForwarded: */ - ((!(objOop & (tagMask())))) - && ((!((longAt(objOop)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun())))))) { - objOop = fixFollowedFieldofObjectwithInitialValue(GIV(primFailCode) - 1, table, objOop); + ((!(errObj & (tagMask())))) + && ((!((longAt(errObj)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun())))))) { + errObj = fixFollowedFieldofObjectwithInitialValue(GIV(primFailCode) - 1, table, errObj); } - errObj = objOop; /* If there's a clonable object in the table at that index, answer a clone of the error object with the second slot set to the value of secondaryErrorCode. */ @@ -74593,7 +74591,7 @@ printCallStackOf(sqInt aContextOrProcessOrFrame) return printCallStackFP(((char *)aContextOrProcessOrFrame)); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printCallStackOf(GIV(framePointer)); + return printCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); @@ -75810,7 +75808,7 @@ printStackCallStackOf(sqInt aContextOrProcessOrFrame) return printStackCallStackOf(((sqInt)(frameOfMarriedContext(aContextOrProcessOrFrame)))); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printStackCallStackOf(GIV(framePointer)); + return printStackCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); diff --git a/src/spur32.sista/cointerp.h b/src/spur32.sista/cointerp.h index 1ef5332343..1647d54a40 100644 --- a/src/spur32.sista/cointerp.h +++ b/src/spur32.sista/cointerp.h @@ -1,6 +1,6 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b - (Compiler-eem.512) + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 + (* Compiler-eem.512) */ diff --git a/src/spur32.sista/gcc3x-cointerp.c b/src/spur32.sista/gcc3x-cointerp.c index 982d57356c..a73a5e7212 100644 --- a/src/spur32.sista/gcc3x-cointerp.c +++ b/src/spur32.sista/gcc3x-cointerp.c @@ -2,12 +2,12 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b - (Compiler-eem.512) + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 + (* Compiler-eem.512) from - CoInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b + CoInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1225,7 +1225,7 @@ extern sqInt numBytesOf(sqInt objOop); static NoDbgRegParms usqInt numPointerSlotsOf(sqInt objOop); static NoDbgRegParms sqInt numSlotsForBytes(sqInt numBytes); static NoDbgRegParms usqInt numSlotsOfAny(sqInt objOop); -static NoDbgRegParms sqInt numSlotsOfIndexablePointerObj(sqInt objOop); +static NoDbgRegParms usqInt numSlotsOfIndexablePointerObj(sqInt objOop); extern usqInt numSlotsOf(sqInt objOop); static NoDbgRegParms sqInt numStrongSlotsOfInephemeral(sqInt objOop); static NoDbgRegParms sqInt numStrongSlotsOfWeakling(sqInt objOop); @@ -2673,7 +2673,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3488]"; +const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3490]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; char expensiveAsserts = 0; int (*showSurfaceFn)(sqIntptr_t, int, int, int, int); @@ -44471,9 +44471,9 @@ allWeakSurvivorsOnWeakList(void) /* begin nextCorpseOrNil: */ assert(isYoung(corpse)); listOffset = ((((usqInt)(((long32At(corpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(corpse)))) >> (formatShift())) & (formatMask())); - corpse = (listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0); + corpse = ((sqInt) ((listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0))); } return 0; return 0; @@ -45100,9 +45100,9 @@ isonWeaklingList(sqInt oop, sqInt listHead) /* begin nextCorpseOrNil: */ assert(isYoung(corpse)); listOffset = ((((usqInt)(((long32At(corpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(corpse)))) >> (formatShift())) & (formatMask())); - corpse = (listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0); + corpse = ((sqInt) ((listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0))); } return 0; } @@ -45333,9 +45333,9 @@ processEphemerons(void) /* begin nextCorpseOrNil: */ assert(isYoung(ephemeronCorpse)); listOffset = ((((usqInt)(((long32At(ephemeronCorpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(ephemeronCorpse)))) >> (formatShift())) & (formatMask())); - ephemeronCorpse = (listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0); + ephemeronCorpse = ((sqInt) ((listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0))); } /* end fireEphemeronsOnEphemeronList */ l1:; @@ -45408,9 +45408,9 @@ processWeaklings(void) /* begin nextCorpseOrNil: */ assert(isYoung(weakCorpse)); listOffset = ((((usqInt)(((long32At(weakCorpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(weakCorpse)))) >> (formatShift())) & (formatMask())); - weakCorpse = (listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0); + weakCorpse = ((sqInt) ((listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0))); } GIV(weakList) = null; } @@ -57700,7 +57700,7 @@ numSlotsOfAny(sqInt objOop) */ /* SpurMemoryManager>>#numSlotsOfIndexablePointerObj: */ -static NoDbgRegParms sqInt +static NoDbgRegParms usqInt numSlotsOfIndexablePointerObj(sqInt objOop) { usqInt numSlots; @@ -65440,7 +65440,7 @@ bridgeFor(SpurSegmentInfo *aSegment) static NoDbgRegParms void bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil) { - sqInt bridgeSpan; + int bridgeSpan; sqInt clifton; usqInt segEnd; @@ -65623,7 +65623,7 @@ prepareForSnapshot(void) sqInt largeChild; sqInt newEndOfMemory; sqInt next; - sqInt node; + usqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -69935,14 +69935,13 @@ static sqInt getErrorObjectFromPrimFailCode(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt classIndex; - usqInt clone; - usqInt errObj; + sqInt clone; + sqInt errObj; sqInt i; usqInt newObj; usqInt numBytes; usqInt numSlots; usqInt numSlotsUsqInt; - sqInt objOop; sqInt table; sqInt valuePointer; @@ -69954,13 +69953,12 @@ getErrorObjectFromPrimFailCode(void) ? longAt(table - BaseHeaderSize) : numSlots)))) { /* begin followField:ofObject: */ - objOop = longAt((table + BaseHeaderSize) + ((((usqInt)((GIV(primFailCode) - 1)) << (shiftForWord()))))); + errObj = longAt((table + BaseHeaderSize) + ((((usqInt)((GIV(primFailCode) - 1)) << (shiftForWord()))))); if (/* isOopForwarded: */ - ((!(objOop & (tagMask())))) - && ((!((longAt(objOop)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun())))))) { - objOop = fixFollowedFieldofObjectwithInitialValue(GIV(primFailCode) - 1, table, objOop); + ((!(errObj & (tagMask())))) + && ((!((longAt(errObj)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun())))))) { + errObj = fixFollowedFieldofObjectwithInitialValue(GIV(primFailCode) - 1, table, errObj); } - errObj = objOop; /* If there's a clonable object in the table at that index, answer a clone of the error object with the second slot set to the value of secondaryErrorCode. */ @@ -74600,7 +74598,7 @@ printCallStackOf(sqInt aContextOrProcessOrFrame) return printCallStackFP(((char *)aContextOrProcessOrFrame)); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printCallStackOf(GIV(framePointer)); + return printCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); @@ -75817,7 +75815,7 @@ printStackCallStackOf(sqInt aContextOrProcessOrFrame) return printStackCallStackOf(((sqInt)(frameOfMarriedContext(aContextOrProcessOrFrame)))); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printStackCallStackOf(GIV(framePointer)); + return printStackCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); diff --git a/src/spur32.stack.lowcode/gcc3x-interp.c b/src/spur32.stack.lowcode/gcc3x-interp.c index d79e05a043..5365007666 100644 --- a/src/spur32.stack.lowcode/gcc3x-interp.c +++ b/src/spur32.stack.lowcode/gcc3x-interp.c @@ -2,12 +2,12 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b - (Compiler-eem.512) + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 + (* Compiler-eem.512) from - StackInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b + StackInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2393,7 +2393,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.3488]"; +const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.3490]"; sqInt suppressHeartbeatFlag; char expensiveAsserts = 0; int (*showSurfaceFn)(sqIntptr_t, int, int, int, int); @@ -71393,7 +71393,7 @@ printCallStackOf(sqInt aContextOrProcessOrFrame) return printCallStackFP(((char *)aContextOrProcessOrFrame)); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printCallStackOf(GIV(framePointer)); + return printCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); @@ -72727,7 +72727,7 @@ printStackCallStackOf(sqInt aContextOrProcessOrFrame) return printStackCallStackOf(((sqInt)(frameOfMarriedContext(aContextOrProcessOrFrame)))); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printStackCallStackOf(GIV(framePointer)); + return printStackCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); diff --git a/src/spur32.stack.lowcode/interp.c b/src/spur32.stack.lowcode/interp.c index ef011fbf47..29788948ca 100644 --- a/src/spur32.stack.lowcode/interp.c +++ b/src/spur32.stack.lowcode/interp.c @@ -1,10 +1,10 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b - (Compiler-eem.512) + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 + (* Compiler-eem.512) from - StackInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b + StackInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2390,7 +2390,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.3488]"; +const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.3490]"; sqInt suppressHeartbeatFlag; char expensiveAsserts = 0; int (*showSurfaceFn)(sqIntptr_t, int, int, int, int); @@ -71386,7 +71386,7 @@ printCallStackOf(sqInt aContextOrProcessOrFrame) return printCallStackFP(((char *)aContextOrProcessOrFrame)); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printCallStackOf(GIV(framePointer)); + return printCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); @@ -72720,7 +72720,7 @@ printStackCallStackOf(sqInt aContextOrProcessOrFrame) return printStackCallStackOf(((sqInt)(frameOfMarriedContext(aContextOrProcessOrFrame)))); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printStackCallStackOf(GIV(framePointer)); + return printStackCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); diff --git a/src/spur32.stack/gcc3x-interp.c b/src/spur32.stack/gcc3x-interp.c index 5df82ab202..dbe181ff25 100644 --- a/src/spur32.stack/gcc3x-interp.c +++ b/src/spur32.stack/gcc3x-interp.c @@ -2,12 +2,12 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b - (Compiler-eem.512) + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 + (* Compiler-eem.512) from - StackInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b + StackInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1726,7 +1726,7 @@ static signed char primitiveAccessorDepthTable[MaxPrimitiveIndex + 2 /* 584 */] /*40*/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /*60*/ 0, 0, 0, 0, 0,-1,-1,-1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, /*80*/ -1,-1,-1, 0, 0, 0, 1, 0, 2,-1,-1, 0, 0, 0, 1,-1, 0,-1, 0, 0, -/*100*/ 1, 2, 1, 2,-1, 2,-1,-1,-1,-1, 0, 1, 0, 0,-1, 1, 0, 0, 1, 0, +/*100*/ 1, 2, 2, 2,-1, 2,-1,-1,-1,-1, 0, 1, 0, 0,-1, 1, 0, 0, 1, 0, /*120*/ 2, 1,-1,-1, 0, 0, 0, 0, 0,-1,-1, 0, 0, 0, 0,-1, 0,-1,-1, 0, /*140*/ -1, 1,-1, 1, 1, 1,-1,-1, 0, 0, 0,-1,-1,-1,-1,-1,-1,-1, 1, 1, /*160*/ 0, 0,-1, 0, 0, 1, 1,-1, 1, 0, 0, 0,-1, 1, 1, 0,-1, 0,-1,-1, @@ -2367,7 +2367,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.3488]"; +const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.3490]"; sqInt suppressHeartbeatFlag; char expensiveAsserts = 0; int (*showSurfaceFn)(sqIntptr_t, int, int, int, int); @@ -58323,7 +58323,7 @@ printCallStackOf(sqInt aContextOrProcessOrFrame) return printCallStackFP(((char *)aContextOrProcessOrFrame)); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printCallStackOf(GIV(framePointer)); + return printCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); @@ -59657,7 +59657,7 @@ printStackCallStackOf(sqInt aContextOrProcessOrFrame) return printStackCallStackOf(((sqInt)(frameOfMarriedContext(aContextOrProcessOrFrame)))); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printStackCallStackOf(GIV(framePointer)); + return printStackCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); diff --git a/src/spur32.stack/interp.c b/src/spur32.stack/interp.c index 645a18d1a5..92ec134485 100644 --- a/src/spur32.stack/interp.c +++ b/src/spur32.stack/interp.c @@ -1,10 +1,10 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b - (Compiler-eem.512) + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 + (* Compiler-eem.512) from - StackInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b + StackInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1723,7 +1723,7 @@ static signed char primitiveAccessorDepthTable[MaxPrimitiveIndex + 2 /* 584 */] /*40*/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /*60*/ 0, 0, 0, 0, 0,-1,-1,-1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, /*80*/ -1,-1,-1, 0, 0, 0, 1, 0, 2,-1,-1, 0, 0, 0, 1,-1, 0,-1, 0, 0, -/*100*/ 1, 2, 1, 2,-1, 2,-1,-1,-1,-1, 0, 1, 0, 0,-1, 1, 0, 0, 1, 0, +/*100*/ 1, 2, 2, 2,-1, 2,-1,-1,-1,-1, 0, 1, 0, 0,-1, 1, 0, 0, 1, 0, /*120*/ 2, 1,-1,-1, 0, 0, 0, 0, 0,-1,-1, 0, 0, 0, 0,-1, 0,-1,-1, 0, /*140*/ -1, 1,-1, 1, 1, 1,-1,-1, 0, 0, 0,-1,-1,-1,-1,-1,-1,-1, 1, 1, /*160*/ 0, 0,-1, 0, 0, 1, 1,-1, 1, 0, 0, 0,-1, 1, 1, 0,-1, 0,-1,-1, @@ -2364,7 +2364,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.3488]"; +const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.3490]"; sqInt suppressHeartbeatFlag; char expensiveAsserts = 0; int (*showSurfaceFn)(sqIntptr_t, int, int, int, int); @@ -58316,7 +58316,7 @@ printCallStackOf(sqInt aContextOrProcessOrFrame) return printCallStackFP(((char *)aContextOrProcessOrFrame)); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printCallStackOf(GIV(framePointer)); + return printCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); @@ -59650,7 +59650,7 @@ printStackCallStackOf(sqInt aContextOrProcessOrFrame) return printStackCallStackOf(((sqInt)(frameOfMarriedContext(aContextOrProcessOrFrame)))); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printStackCallStackOf(GIV(framePointer)); + return printStackCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); diff --git a/src/spur64.cog.lowcode/cointerp.c b/src/spur64.cog.lowcode/cointerp.c index 89fb4ada87..db2a643d55 100644 --- a/src/spur64.cog.lowcode/cointerp.c +++ b/src/spur64.cog.lowcode/cointerp.c @@ -1,10 +1,10 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b - (Compiler-eem.512) + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 + (* Compiler-eem.512) from - CoInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b + CoInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2030,7 +2030,7 @@ static signed short primitiveMetadataTable[MaxPrimitiveIndex + 2 /* 584 */] = { /*78*/ 0, 0, /*80*/ -256,-256,-256, 4, 4, 0, 0x100, 0, 0x200,-256,-256, 0, 0, 0, 0x100,-256, 0,-256, /*98*/ 0, 0, -/*100*/ 260, 0x200, 0x200, 0x200,-256, 513,-256,-256,-256,-256, 0, 0x100, 0, 0,-256, +/*100*/ 260, 0x200, 0x100, 0x200,-256, 513,-256,-256,-256,-256, 0, 0x100, 0, 0,-256, /*115*/ 0x100, 0, 12, 260, 0, /*120*/ 524, 0x100,-256,-256, 1, 0, 0, 0, 0,-255,-256, 0, 0, 0, 0,-256, 0,-256,-256, /*139*/ 0, @@ -2700,7 +2700,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3488]"; +const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3490]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; int displayWidth; int displayDepth; @@ -50240,7 +50240,7 @@ primitiveInvokeObjectAsMethod(void) sqInt lookupClassTag; usqInt newObj; usqInt numBytes; - usqInt runArgs; + sqInt runArgs; sqInt runReceiver; char *sp; sqInt tagBits; @@ -50255,7 +50255,7 @@ primitiveInvokeObjectAsMethod(void) /* begin allocateNewSpaceSlots:format:classIndex: */ if (GIV(argumentCount) >= (numSlotsMask())) { if (GIV(argumentCount) > 0xFFFFFFFFU) { - runArgs = null; + runArgs = ((usqInt) null); goto l1; } newObj = GIV(freeStart) + BaseHeaderSize; @@ -56717,7 +56717,7 @@ primitiveSubtractLargeIntegers(void) sqInt oopRcvr; sqInt oopResult; usqLong result; - int resultIsNegative; + sqInt resultIsNegative; char *sp; oopArg = longAt(GIV(stackPointer)); @@ -90159,7 +90159,7 @@ printCallStackOf(sqInt aContextOrProcessOrFrame) return printCallStackFP(((char *)aContextOrProcessOrFrame)); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printCallStackOf(GIV(framePointer)); + return printCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); @@ -91403,7 +91403,7 @@ printStackCallStackOf(sqInt aContextOrProcessOrFrame) return printStackCallStackOf(((sqInt)(frameOfMarriedContext(aContextOrProcessOrFrame)))); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printStackCallStackOf(GIV(framePointer)); + return printStackCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); diff --git a/src/spur64.cog.lowcode/cointerp.h b/src/spur64.cog.lowcode/cointerp.h index 57dd5ed9ae..dbbe2664f3 100644 --- a/src/spur64.cog.lowcode/cointerp.h +++ b/src/spur64.cog.lowcode/cointerp.h @@ -1,6 +1,6 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b - (Compiler-eem.512) + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 + (* Compiler-eem.512) */ diff --git a/src/spur64.cog.lowcode/gcc3x-cointerp.c b/src/spur64.cog.lowcode/gcc3x-cointerp.c index de99914ba6..191e91a324 100644 --- a/src/spur64.cog.lowcode/gcc3x-cointerp.c +++ b/src/spur64.cog.lowcode/gcc3x-cointerp.c @@ -2,12 +2,12 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b - (Compiler-eem.512) + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 + (* Compiler-eem.512) from - CoInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b + CoInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2033,7 +2033,7 @@ static signed short primitiveMetadataTable[MaxPrimitiveIndex + 2 /* 584 */] = { /*78*/ 0, 0, /*80*/ -256,-256,-256, 4, 4, 0, 0x100, 0, 0x200,-256,-256, 0, 0, 0, 0x100,-256, 0,-256, /*98*/ 0, 0, -/*100*/ 260, 0x200, 0x200, 0x200,-256, 513,-256,-256,-256,-256, 0, 0x100, 0, 0,-256, +/*100*/ 260, 0x200, 0x100, 0x200,-256, 513,-256,-256,-256,-256, 0, 0x100, 0, 0,-256, /*115*/ 0x100, 0, 12, 260, 0, /*120*/ 524, 0x100,-256,-256, 1, 0, 0, 0, 0,-255,-256, 0, 0, 0, 0,-256, 0,-256,-256, /*139*/ 0, @@ -2703,7 +2703,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3488]"; +const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3490]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; int displayWidth; int displayDepth; @@ -50247,7 +50247,7 @@ primitiveInvokeObjectAsMethod(void) sqInt lookupClassTag; usqInt newObj; usqInt numBytes; - usqInt runArgs; + sqInt runArgs; sqInt runReceiver; char *sp; sqInt tagBits; @@ -50262,7 +50262,7 @@ primitiveInvokeObjectAsMethod(void) /* begin allocateNewSpaceSlots:format:classIndex: */ if (GIV(argumentCount) >= (numSlotsMask())) { if (GIV(argumentCount) > 0xFFFFFFFFU) { - runArgs = null; + runArgs = ((usqInt) null); goto l1; } newObj = GIV(freeStart) + BaseHeaderSize; @@ -56724,7 +56724,7 @@ primitiveSubtractLargeIntegers(void) sqInt oopRcvr; sqInt oopResult; usqLong result; - int resultIsNegative; + sqInt resultIsNegative; char *sp; oopArg = longAt(GIV(stackPointer)); @@ -90166,7 +90166,7 @@ printCallStackOf(sqInt aContextOrProcessOrFrame) return printCallStackFP(((char *)aContextOrProcessOrFrame)); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printCallStackOf(GIV(framePointer)); + return printCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); @@ -91410,7 +91410,7 @@ printStackCallStackOf(sqInt aContextOrProcessOrFrame) return printStackCallStackOf(((sqInt)(frameOfMarriedContext(aContextOrProcessOrFrame)))); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printStackCallStackOf(GIV(framePointer)); + return printStackCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); diff --git a/src/spur64.cog/cointerp.c b/src/spur64.cog/cointerp.c index 758c3ff9b1..fcc496433b 100644 --- a/src/spur64.cog/cointerp.c +++ b/src/spur64.cog/cointerp.c @@ -1,10 +1,10 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b - (Compiler-eem.512) + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 + (* Compiler-eem.512) from - CoInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b + CoInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2676,7 +2676,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3488]"; +const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3490]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; int displayWidth; int displayDepth; @@ -32572,7 +32572,7 @@ primitiveInvokeObjectAsMethod(void) sqInt lookupClassTag; usqInt newObj; usqInt numBytes; - usqInt runArgs; + sqInt runArgs; sqInt runReceiver; char *sp; sqInt tagBits; @@ -32587,7 +32587,7 @@ primitiveInvokeObjectAsMethod(void) /* begin allocateNewSpaceSlots:format:classIndex: */ if (GIV(argumentCount) >= (numSlotsMask())) { if (GIV(argumentCount) > 0xFFFFFFFFU) { - runArgs = null; + runArgs = ((usqInt) null); goto l1; } newObj = GIV(freeStart) + BaseHeaderSize; @@ -39049,7 +39049,7 @@ primitiveSubtractLargeIntegers(void) sqInt oopRcvr; sqInt oopResult; usqLong result; - sqInt resultIsNegative; + int resultIsNegative; char *sp; oopArg = longAt(GIV(stackPointer)); @@ -41979,9 +41979,9 @@ allWeakSurvivorsOnWeakList(void) /* begin nextCorpseOrNil: */ assert(isYoung(corpse)); listOffset = ((((usqInt)(((long32At(corpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(corpse)))) >> (formatShift())) & (formatMask())); - corpse = (listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0); + corpse = ((sqInt) ((listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0))); } return 0; return 0; @@ -42610,9 +42610,9 @@ isonWeaklingList(sqInt oop, sqInt listHead) /* begin nextCorpseOrNil: */ assert(isYoung(corpse)); listOffset = ((((usqInt)(((long32At(corpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(corpse)))) >> (formatShift())) & (formatMask())); - corpse = (listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0); + corpse = ((sqInt) ((listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0))); } return 0; } @@ -42843,9 +42843,9 @@ processEphemerons(void) /* begin nextCorpseOrNil: */ assert(isYoung(ephemeronCorpse)); listOffset = ((((usqInt)(((long32At(ephemeronCorpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(ephemeronCorpse)))) >> (formatShift())) & (formatMask())); - ephemeronCorpse = (listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0); + ephemeronCorpse = ((sqInt) ((listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0))); } /* end fireEphemeronsOnEphemeronList */ l1:; @@ -42918,9 +42918,9 @@ processWeaklings(void) /* begin nextCorpseOrNil: */ assert(isYoung(weakCorpse)); listOffset = ((((usqInt)(((long32At(weakCorpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(weakCorpse)))) >> (formatShift())) & (formatMask())); - weakCorpse = (listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0); + weakCorpse = ((sqInt) ((listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0))); } GIV(weakList) = null; } @@ -63354,7 +63354,7 @@ prepareForSnapshot(void) sqInt largeChild; sqInt newEndOfMemory; sqInt next; - sqInt node; + usqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -72362,7 +72362,7 @@ printCallStackOf(sqInt aContextOrProcessOrFrame) return printCallStackFP(((char *)aContextOrProcessOrFrame)); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printCallStackOf(GIV(framePointer)); + return printCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); @@ -73603,7 +73603,7 @@ printStackCallStackOf(sqInt aContextOrProcessOrFrame) return printStackCallStackOf(((sqInt)(frameOfMarriedContext(aContextOrProcessOrFrame)))); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printStackCallStackOf(GIV(framePointer)); + return printStackCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); diff --git a/src/spur64.cog/cointerp.h b/src/spur64.cog/cointerp.h index 3af11d582c..22c894d71f 100644 --- a/src/spur64.cog/cointerp.h +++ b/src/spur64.cog/cointerp.h @@ -1,6 +1,6 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b - (Compiler-eem.512) + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 + (* Compiler-eem.512) */ diff --git a/src/spur64.cog/cointerpmt.c b/src/spur64.cog/cointerpmt.c index 34481a2cea..2750d3dcf5 100644 --- a/src/spur64.cog/cointerpmt.c +++ b/src/spur64.cog/cointerpmt.c @@ -1,10 +1,10 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b - (Compiler-eem.512) + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 + (* Compiler-eem.512) from - CoInterpreterMT VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b + CoInterpreterMT VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2118,7 +2118,7 @@ static signed short primitiveMetadataTable[MaxPrimitiveIndex + 2 /* 584 */] = { /*78*/ 0, 0, /*80*/ -256,-256,-256, 4, 4, 0, 0x100, 0, 0x200,-256,-256, 0, 0, 0, 0x100,-256, 0,-256, /*98*/ 0, 0, -/*100*/ 260, 0x200, 0x200, 0x200,-256, 513,-256,-256,-256,-256, 0, 0x100, 0, 0,-256, +/*100*/ 260, 0x200, 0x100, 0x200,-256, 513,-256,-256,-256,-256, 0, 0x100, 0, 0,-256, /*115*/ 0x100, 0, 12, 260, 0, /*120*/ 524, 0x100,-256,-256, 1, 0, 0, 0, 0,-255,-256, 0, 0, 0, 0,-256, 0,-256,-256, /*139*/ 0, @@ -2790,7 +2790,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.3488]"; +const char *interpreterVersion = "Open Smalltalk Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.3490]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; int displayWidth; int displayDepth; @@ -45705,9 +45705,9 @@ allWeakSurvivorsOnWeakList(void) /* begin nextCorpseOrNil: */ assert(isYoung(corpse)); listOffset = ((((usqInt)(((long32At(corpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(corpse)))) >> (formatShift())) & (formatMask())); - corpse = (listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0); + corpse = ((sqInt) ((listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0))); } return 0; return 0; @@ -46336,9 +46336,9 @@ isonWeaklingList(sqInt oop, sqInt listHead) /* begin nextCorpseOrNil: */ assert(isYoung(corpse)); listOffset = ((((usqInt)(((long32At(corpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(corpse)))) >> (formatShift())) & (formatMask())); - corpse = (listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0); + corpse = ((sqInt) ((listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0))); } return 0; } @@ -46569,9 +46569,9 @@ processEphemerons(void) /* begin nextCorpseOrNil: */ assert(isYoung(ephemeronCorpse)); listOffset = ((((usqInt)(((long32At(ephemeronCorpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(ephemeronCorpse)))) >> (formatShift())) & (formatMask())); - ephemeronCorpse = (listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0); + ephemeronCorpse = ((sqInt) ((listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0))); } /* end fireEphemeronsOnEphemeronList */ l1:; @@ -46644,9 +46644,9 @@ processWeaklings(void) /* begin nextCorpseOrNil: */ assert(isYoung(weakCorpse)); listOffset = ((((usqInt)(((long32At(weakCorpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(weakCorpse)))) >> (formatShift())) & (formatMask())); - weakCorpse = (listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0); + weakCorpse = ((sqInt) ((listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0))); } GIV(weakList) = null; } @@ -67100,7 +67100,7 @@ prepareForSnapshot(void) sqInt largeChild; sqInt newEndOfMemory; sqInt next; - sqInt node; + usqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -75626,7 +75626,7 @@ printCallStackOf(sqInt aContextOrProcessOrFrame) return printCallStackFP(((char *)aContextOrProcessOrFrame)); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printCallStackOf(GIV(framePointer)); + return printCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); @@ -76867,7 +76867,7 @@ printStackCallStackOf(sqInt aContextOrProcessOrFrame) return printStackCallStackOf(((sqInt)(frameOfMarriedContext(aContextOrProcessOrFrame)))); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printStackCallStackOf(GIV(framePointer)); + return printStackCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); diff --git a/src/spur64.cog/cointerpmt.h b/src/spur64.cog/cointerpmt.h index c6cbd88061..ca5374b389 100644 --- a/src/spur64.cog/cointerpmt.h +++ b/src/spur64.cog/cointerpmt.h @@ -1,6 +1,6 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b - (Compiler-eem.512) + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 + (* Compiler-eem.512) */ diff --git a/src/spur64.cog/gcc3x-cointerp.c b/src/spur64.cog/gcc3x-cointerp.c index f7d5e5e312..39110ab2cb 100644 --- a/src/spur64.cog/gcc3x-cointerp.c +++ b/src/spur64.cog/gcc3x-cointerp.c @@ -2,12 +2,12 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b - (Compiler-eem.512) + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 + (* Compiler-eem.512) from - CoInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b + CoInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 " __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-eem.3488]"; +const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3490]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; int displayWidth; int displayDepth; @@ -32579,7 +32579,7 @@ primitiveInvokeObjectAsMethod(void) sqInt lookupClassTag; usqInt newObj; usqInt numBytes; - usqInt runArgs; + sqInt runArgs; sqInt runReceiver; char *sp; sqInt tagBits; @@ -32594,7 +32594,7 @@ primitiveInvokeObjectAsMethod(void) /* begin allocateNewSpaceSlots:format:classIndex: */ if (GIV(argumentCount) >= (numSlotsMask())) { if (GIV(argumentCount) > 0xFFFFFFFFU) { - runArgs = null; + runArgs = ((usqInt) null); goto l1; } newObj = GIV(freeStart) + BaseHeaderSize; @@ -39056,7 +39056,7 @@ primitiveSubtractLargeIntegers(void) sqInt oopRcvr; sqInt oopResult; usqLong result; - sqInt resultIsNegative; + int resultIsNegative; char *sp; oopArg = longAt(GIV(stackPointer)); @@ -41986,9 +41986,9 @@ allWeakSurvivorsOnWeakList(void) /* begin nextCorpseOrNil: */ assert(isYoung(corpse)); listOffset = ((((usqInt)(((long32At(corpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(corpse)))) >> (formatShift())) & (formatMask())); - corpse = (listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0); + corpse = ((sqInt) ((listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0))); } return 0; return 0; @@ -42617,9 +42617,9 @@ isonWeaklingList(sqInt oop, sqInt listHead) /* begin nextCorpseOrNil: */ assert(isYoung(corpse)); listOffset = ((((usqInt)(((long32At(corpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(corpse)))) >> (formatShift())) & (formatMask())); - corpse = (listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0); + corpse = ((sqInt) ((listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0))); } return 0; } @@ -42850,9 +42850,9 @@ processEphemerons(void) /* begin nextCorpseOrNil: */ assert(isYoung(ephemeronCorpse)); listOffset = ((((usqInt)(((long32At(ephemeronCorpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(ephemeronCorpse)))) >> (formatShift())) & (formatMask())); - ephemeronCorpse = (listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0); + ephemeronCorpse = ((sqInt) ((listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0))); } /* end fireEphemeronsOnEphemeronList */ l1:; @@ -42925,9 +42925,9 @@ processWeaklings(void) /* begin nextCorpseOrNil: */ assert(isYoung(weakCorpse)); listOffset = ((((usqInt)(((long32At(weakCorpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(weakCorpse)))) >> (formatShift())) & (formatMask())); - weakCorpse = (listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0); + weakCorpse = ((sqInt) ((listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0))); } GIV(weakList) = null; } @@ -63361,7 +63361,7 @@ prepareForSnapshot(void) sqInt largeChild; sqInt newEndOfMemory; sqInt next; - sqInt node; + usqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -72369,7 +72369,7 @@ printCallStackOf(sqInt aContextOrProcessOrFrame) return printCallStackFP(((char *)aContextOrProcessOrFrame)); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printCallStackOf(GIV(framePointer)); + return printCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); @@ -73610,7 +73610,7 @@ printStackCallStackOf(sqInt aContextOrProcessOrFrame) return printStackCallStackOf(((sqInt)(frameOfMarriedContext(aContextOrProcessOrFrame)))); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printStackCallStackOf(GIV(framePointer)); + return printStackCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); diff --git a/src/spur64.cog/gcc3x-cointerpmt.c b/src/spur64.cog/gcc3x-cointerpmt.c index 639e4431e0..53cd8f3c49 100644 --- a/src/spur64.cog/gcc3x-cointerpmt.c +++ b/src/spur64.cog/gcc3x-cointerpmt.c @@ -2,12 +2,12 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b - (Compiler-eem.512) + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 + (* Compiler-eem.512) from - CoInterpreterMT VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b + CoInterpreterMT VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2121,7 +2121,7 @@ static signed short primitiveMetadataTable[MaxPrimitiveIndex + 2 /* 584 */] = { /*78*/ 0, 0, /*80*/ -256,-256,-256, 4, 4, 0, 0x100, 0, 0x200,-256,-256, 0, 0, 0, 0x100,-256, 0,-256, /*98*/ 0, 0, -/*100*/ 260, 0x200, 0x200, 0x200,-256, 513,-256,-256,-256,-256, 0, 0x100, 0, 0,-256, +/*100*/ 260, 0x200, 0x100, 0x200,-256, 513,-256,-256,-256,-256, 0, 0x100, 0, 0,-256, /*115*/ 0x100, 0, 12, 260, 0, /*120*/ 524, 0x100,-256,-256, 1, 0, 0, 0, 0,-255,-256, 0, 0, 0, 0,-256, 0,-256,-256, /*139*/ 0, @@ -2793,7 +2793,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.3488]"; +const char *interpreterVersion = "Open Smalltalk Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.3490]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; int displayWidth; int displayDepth; @@ -45712,9 +45712,9 @@ allWeakSurvivorsOnWeakList(void) /* begin nextCorpseOrNil: */ assert(isYoung(corpse)); listOffset = ((((usqInt)(((long32At(corpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(corpse)))) >> (formatShift())) & (formatMask())); - corpse = (listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0); + corpse = ((sqInt) ((listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0))); } return 0; return 0; @@ -46343,9 +46343,9 @@ isonWeaklingList(sqInt oop, sqInt listHead) /* begin nextCorpseOrNil: */ assert(isYoung(corpse)); listOffset = ((((usqInt)(((long32At(corpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(corpse)))) >> (formatShift())) & (formatMask())); - corpse = (listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0); + corpse = ((sqInt) ((listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0))); } return 0; } @@ -46576,9 +46576,9 @@ processEphemerons(void) /* begin nextCorpseOrNil: */ assert(isYoung(ephemeronCorpse)); listOffset = ((((usqInt)(((long32At(ephemeronCorpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(ephemeronCorpse)))) >> (formatShift())) & (formatMask())); - ephemeronCorpse = (listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0); + ephemeronCorpse = ((sqInt) ((listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0))); } /* end fireEphemeronsOnEphemeronList */ l1:; @@ -46651,9 +46651,9 @@ processWeaklings(void) /* begin nextCorpseOrNil: */ assert(isYoung(weakCorpse)); listOffset = ((((usqInt)(((long32At(weakCorpse + 4)) & (identityHashHalfWordMask()))) << (formatFieldWidthShift())))) + ((((usqInt)((longAt(weakCorpse)))) >> (formatShift())) & (formatMask())); - weakCorpse = (listOffset - ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) - : 0); + weakCorpse = ((sqInt) ((listOffset + ? ((((usqInt)((listOffset - 1)) << 3 /* shiftForAllocationUnit */))) + GIV(newSpaceStart) + : 0))); } GIV(weakList) = null; } @@ -67107,7 +67107,7 @@ prepareForSnapshot(void) sqInt largeChild; sqInt newEndOfMemory; sqInt next; - sqInt node; + usqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -75633,7 +75633,7 @@ printCallStackOf(sqInt aContextOrProcessOrFrame) return printCallStackFP(((char *)aContextOrProcessOrFrame)); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printCallStackOf(GIV(framePointer)); + return printCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); @@ -76874,7 +76874,7 @@ printStackCallStackOf(sqInt aContextOrProcessOrFrame) return printStackCallStackOf(((sqInt)(frameOfMarriedContext(aContextOrProcessOrFrame)))); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printStackCallStackOf(GIV(framePointer)); + return printStackCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); diff --git a/src/spur64.sista/cointerp.c b/src/spur64.sista/cointerp.c index cac487c3ac..6fde618eaf 100644 --- a/src/spur64.sista/cointerp.c +++ b/src/spur64.sista/cointerp.c @@ -1,10 +1,10 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b - (Compiler-eem.512) + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 + (* Compiler-eem.512) from - CoInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b + CoInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2022,7 +2022,7 @@ static signed short primitiveMetadataTable[MaxPrimitiveIndex + 2 /* 584 */] = { /*78*/ 0, 0, /*80*/ -256,-256,-256, 4, 4, 0, 0x100, 0, 0x200,-256,-256, 0, 0, 0, 0x100,-256, 0,-256, /*98*/ 0, 0, -/*100*/ 260, 0x200, 0x100, 0x200,-256, 513,-256,-256,-256,-256, 0, 0x100, 0, 0,-256, +/*100*/ 260, 0x200, 0x200, 0x200,-256, 513,-256,-256,-256,-256, 0, 0x100, 0, 0,-256, /*115*/ 0x100, 0, 12, 260, 0, /*120*/ 524, 0x100,-256,-256, 1, 0, 0, 0, 0,-255,-256, 0, 0, 0, 0,-256, 0,-256,-256, /*139*/ 0, @@ -2692,7 +2692,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3488]"; +const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3490]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; int displayWidth; int displayDepth; @@ -42175,7 +42175,7 @@ primitiveSubtractLargeIntegers(void) sqInt oopRcvr; sqInt oopResult; usqLong result; - sqInt resultIsNegative; + int resultIsNegative; char *sp; oopArg = longAt(GIV(stackPointer)); @@ -75589,7 +75589,7 @@ printCallStackOf(sqInt aContextOrProcessOrFrame) return printCallStackFP(((char *)aContextOrProcessOrFrame)); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printCallStackOf(GIV(framePointer)); + return printCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); @@ -76833,7 +76833,7 @@ printStackCallStackOf(sqInt aContextOrProcessOrFrame) return printStackCallStackOf(((sqInt)(frameOfMarriedContext(aContextOrProcessOrFrame)))); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printStackCallStackOf(GIV(framePointer)); + return printStackCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); diff --git a/src/spur64.sista/cointerp.h b/src/spur64.sista/cointerp.h index 73267a02b7..f267f40893 100644 --- a/src/spur64.sista/cointerp.h +++ b/src/spur64.sista/cointerp.h @@ -1,6 +1,6 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b - (Compiler-eem.512) + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 + (* Compiler-eem.512) */ diff --git a/src/spur64.sista/gcc3x-cointerp.c b/src/spur64.sista/gcc3x-cointerp.c index 4254f0f2fd..6d64873be4 100644 --- a/src/spur64.sista/gcc3x-cointerp.c +++ b/src/spur64.sista/gcc3x-cointerp.c @@ -2,12 +2,12 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b - (Compiler-eem.512) + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 + (* Compiler-eem.512) from - CoInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b + CoInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2025,7 +2025,7 @@ static signed short primitiveMetadataTable[MaxPrimitiveIndex + 2 /* 584 */] = { /*78*/ 0, 0, /*80*/ -256,-256,-256, 4, 4, 0, 0x100, 0, 0x200,-256,-256, 0, 0, 0, 0x100,-256, 0,-256, /*98*/ 0, 0, -/*100*/ 260, 0x200, 0x100, 0x200,-256, 513,-256,-256,-256,-256, 0, 0x100, 0, 0,-256, +/*100*/ 260, 0x200, 0x200, 0x200,-256, 513,-256,-256,-256,-256, 0, 0x100, 0, 0,-256, /*115*/ 0x100, 0, 12, 260, 0, /*120*/ 524, 0x100,-256,-256, 1, 0, 0, 0, 0,-255,-256, 0, 0, 0, 0,-256, 0,-256,-256, /*139*/ 0, @@ -2695,7 +2695,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3488]"; +const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3490]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; int displayWidth; int displayDepth; @@ -42182,7 +42182,7 @@ primitiveSubtractLargeIntegers(void) sqInt oopRcvr; sqInt oopResult; usqLong result; - sqInt resultIsNegative; + int resultIsNegative; char *sp; oopArg = longAt(GIV(stackPointer)); @@ -75596,7 +75596,7 @@ printCallStackOf(sqInt aContextOrProcessOrFrame) return printCallStackFP(((char *)aContextOrProcessOrFrame)); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printCallStackOf(GIV(framePointer)); + return printCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); @@ -76840,7 +76840,7 @@ printStackCallStackOf(sqInt aContextOrProcessOrFrame) return printStackCallStackOf(((sqInt)(frameOfMarriedContext(aContextOrProcessOrFrame)))); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printStackCallStackOf(GIV(framePointer)); + return printStackCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); diff --git a/src/spur64.stack.lowcode/gcc3x-interp.c b/src/spur64.stack.lowcode/gcc3x-interp.c index 49717c019d..37c957e1fa 100644 --- a/src/spur64.stack.lowcode/gcc3x-interp.c +++ b/src/spur64.stack.lowcode/gcc3x-interp.c @@ -2,12 +2,12 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b - (Compiler-eem.512) + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 + (* Compiler-eem.512) from - StackInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b + StackInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2413,7 +2413,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.3488]"; +const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.3490]"; sqInt suppressHeartbeatFlag; int displayWidth; int displayDepth; @@ -72283,7 +72283,7 @@ printCallStackOf(sqInt aContextOrProcessOrFrame) return printCallStackFP(((char *)aContextOrProcessOrFrame)); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printCallStackOf(GIV(framePointer)); + return printCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); @@ -73644,7 +73644,7 @@ printStackCallStackOf(sqInt aContextOrProcessOrFrame) return printStackCallStackOf(((sqInt)(frameOfMarriedContext(aContextOrProcessOrFrame)))); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printStackCallStackOf(GIV(framePointer)); + return printStackCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); diff --git a/src/spur64.stack.lowcode/interp.c b/src/spur64.stack.lowcode/interp.c index 95a9b6ad8d..2dc52e8172 100644 --- a/src/spur64.stack.lowcode/interp.c +++ b/src/spur64.stack.lowcode/interp.c @@ -1,10 +1,10 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b - (Compiler-eem.512) + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 + (* Compiler-eem.512) from - StackInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b + StackInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2410,7 +2410,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.3488]"; +const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.3490]"; sqInt suppressHeartbeatFlag; int displayWidth; int displayDepth; @@ -72276,7 +72276,7 @@ printCallStackOf(sqInt aContextOrProcessOrFrame) return printCallStackFP(((char *)aContextOrProcessOrFrame)); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printCallStackOf(GIV(framePointer)); + return printCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); @@ -73637,7 +73637,7 @@ printStackCallStackOf(sqInt aContextOrProcessOrFrame) return printStackCallStackOf(((sqInt)(frameOfMarriedContext(aContextOrProcessOrFrame)))); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printStackCallStackOf(GIV(framePointer)); + return printStackCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); diff --git a/src/spur64.stack/gcc3x-interp.c b/src/spur64.stack/gcc3x-interp.c index 1c7a7f2760..f9690fd140 100644 --- a/src/spur64.stack/gcc3x-interp.c +++ b/src/spur64.stack/gcc3x-interp.c @@ -2,12 +2,12 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b - (Compiler-eem.512) + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 + (* Compiler-eem.512) from - StackInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b + StackInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2388,7 +2388,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.3488]"; +const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.3490]"; sqInt suppressHeartbeatFlag; int displayWidth; int displayDepth; @@ -59509,7 +59509,7 @@ printCallStackOf(sqInt aContextOrProcessOrFrame) return printCallStackFP(((char *)aContextOrProcessOrFrame)); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printCallStackOf(GIV(framePointer)); + return printCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); @@ -60870,7 +60870,7 @@ printStackCallStackOf(sqInt aContextOrProcessOrFrame) return printStackCallStackOf(((sqInt)(frameOfMarriedContext(aContextOrProcessOrFrame)))); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printStackCallStackOf(GIV(framePointer)); + return printStackCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); diff --git a/src/spur64.stack/interp.c b/src/spur64.stack/interp.c index 9ccee5edf7..f553223301 100644 --- a/src/spur64.stack/interp.c +++ b/src/spur64.stack/interp.c @@ -1,10 +1,10 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b - (Compiler-eem.512) + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 + (* Compiler-eem.512) from - StackInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b + StackInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.3488 uuid: 077ba5f9-f78e-4a31-b0e4-9270558f594b " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 " __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-eem.3488]"; +const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.3490]"; sqInt suppressHeartbeatFlag; int displayWidth; int displayDepth; @@ -59502,7 +59502,7 @@ printCallStackOf(sqInt aContextOrProcessOrFrame) return printCallStackFP(((char *)aContextOrProcessOrFrame)); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printCallStackOf(GIV(framePointer)); + return printCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); @@ -60863,7 +60863,7 @@ printStackCallStackOf(sqInt aContextOrProcessOrFrame) return printStackCallStackOf(((sqInt)(frameOfMarriedContext(aContextOrProcessOrFrame)))); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printStackCallStackOf(GIV(framePointer)); + return printStackCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); diff --git a/src/v3.cog/cointerp.c b/src/v3.cog/cointerp.c index 8eaceac673..46d86a0a69 100644 --- a/src/v3.cog/cointerp.c +++ b/src/v3.cog/cointerp.c @@ -1,10 +1,10 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3487 uuid: 0cb5e53f-fb06-4acf-87f3-c6ec09b46e4b - (Compiler-eem.512) + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 + (* Compiler-eem.512) from - CoInterpreter VMMaker.oscog-eem.3487 uuid: 0cb5e53f-fb06-4acf-87f3-c6ec09b46e4b + CoInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3487 uuid: 0cb5e53f-fb06-4acf-87f3-c6ec09b46e4b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2254,7 +2254,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Cog[SqueakV3] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3487]"; +const char *interpreterVersion = "Open Smalltalk Cog[SqueakV3] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3490]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; char expensiveAsserts = 0; int (*showSurfaceFn)(sqIntptr_t, int, int, int, int); @@ -40895,7 +40895,7 @@ updatePointersInRangeFromto(sqInt memStart, sqInt memEnd) usqInt numLiterals; sqInt oop; sqInt realHeader; - unsigned int size; + usqInt size; sqInt sp; unsigned int sz; unsigned int sz1; @@ -41076,7 +41076,7 @@ updatePointersInRootObjectsFromto(sqInt memStart, sqInt memEnd) sqInt newOop; usqInt numLiterals; sqInt oop; - unsigned int size; + usqInt size; sqInt sp; for (i = 1; i <= GIV(rootTableCount); i += 1) { @@ -48814,7 +48814,7 @@ printCallStackOf(sqInt aContextOrProcessOrFrame) return printCallStackFP(((char *)aContextOrProcessOrFrame)); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printCallStackOf(GIV(framePointer)); + return printCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); @@ -50033,7 +50033,7 @@ printStackCallStackOf(sqInt aContextOrProcessOrFrame) return printStackCallStackOf(((sqInt)(frameOfMarriedContext(aContextOrProcessOrFrame)))); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printStackCallStackOf(GIV(framePointer)); + return printStackCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); @@ -55265,7 +55265,7 @@ primitiveObjectPointsTo(void) sqInt headerSqInt; sqInt i; sqInt methodHeader; - sqInt numSlots; + usqInt numSlots; sqInt rcvr; char *sp; usqInt sz; diff --git a/src/v3.cog/cointerp.h b/src/v3.cog/cointerp.h index 054420a39d..93720145a2 100644 --- a/src/v3.cog/cointerp.h +++ b/src/v3.cog/cointerp.h @@ -1,6 +1,6 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3487 uuid: 0cb5e53f-fb06-4acf-87f3-c6ec09b46e4b - (Compiler-eem.512) + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 + (* Compiler-eem.512) */ diff --git a/src/v3.cog/gcc3x-cointerp.c b/src/v3.cog/gcc3x-cointerp.c index a09512cadb..87f5448005 100644 --- a/src/v3.cog/gcc3x-cointerp.c +++ b/src/v3.cog/gcc3x-cointerp.c @@ -2,12 +2,12 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3487 uuid: 0cb5e53f-fb06-4acf-87f3-c6ec09b46e4b - (Compiler-eem.512) + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 + (* Compiler-eem.512) from - CoInterpreter VMMaker.oscog-eem.3487 uuid: 0cb5e53f-fb06-4acf-87f3-c6ec09b46e4b + CoInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3487 uuid: 0cb5e53f-fb06-4acf-87f3-c6ec09b46e4b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2257,7 +2257,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Cog[SqueakV3] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3487]"; +const char *interpreterVersion = "Open Smalltalk Cog[SqueakV3] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3490]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; char expensiveAsserts = 0; int (*showSurfaceFn)(sqIntptr_t, int, int, int, int); @@ -40898,7 +40898,7 @@ updatePointersInRangeFromto(sqInt memStart, sqInt memEnd) usqInt numLiterals; sqInt oop; sqInt realHeader; - unsigned int size; + usqInt size; sqInt sp; unsigned int sz; unsigned int sz1; @@ -41079,7 +41079,7 @@ updatePointersInRootObjectsFromto(sqInt memStart, sqInt memEnd) sqInt newOop; usqInt numLiterals; sqInt oop; - unsigned int size; + usqInt size; sqInt sp; for (i = 1; i <= GIV(rootTableCount); i += 1) { @@ -48817,7 +48817,7 @@ printCallStackOf(sqInt aContextOrProcessOrFrame) return printCallStackFP(((char *)aContextOrProcessOrFrame)); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printCallStackOf(GIV(framePointer)); + return printCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); @@ -50036,7 +50036,7 @@ printStackCallStackOf(sqInt aContextOrProcessOrFrame) return printStackCallStackOf(((sqInt)(frameOfMarriedContext(aContextOrProcessOrFrame)))); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printStackCallStackOf(GIV(framePointer)); + return printStackCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); @@ -55268,7 +55268,7 @@ primitiveObjectPointsTo(void) sqInt headerSqInt; sqInt i; sqInt methodHeader; - sqInt numSlots; + usqInt numSlots; sqInt rcvr; char *sp; usqInt sz; diff --git a/src/v3.stack/gcc3x-interp.c b/src/v3.stack/gcc3x-interp.c index 36be9bc29a..2110b30673 100644 --- a/src/v3.stack/gcc3x-interp.c +++ b/src/v3.stack/gcc3x-interp.c @@ -2,12 +2,12 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3487 uuid: 0cb5e53f-fb06-4acf-87f3-c6ec09b46e4b - (Compiler-eem.512) + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 + (* Compiler-eem.512) from - StackInterpreter VMMaker.oscog-eem.3487 uuid: 0cb5e53f-fb06-4acf-87f3-c6ec09b46e4b + StackInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.3487 uuid: 0cb5e53f-fb06-4acf-87f3-c6ec09b46e4b " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1985,7 +1985,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.3487]"; +const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.3490]"; sqInt suppressHeartbeatFlag; char expensiveAsserts = 0; int (*showSurfaceFn)(sqIntptr_t, int, int, int, int); @@ -37392,7 +37392,7 @@ printCallStackOf(sqInt aContextOrProcessOrFrame) return printCallStackFP(((char *)aContextOrProcessOrFrame)); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printCallStackOf(GIV(framePointer)); + return printCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); @@ -38727,7 +38727,7 @@ printStackCallStackOf(sqInt aContextOrProcessOrFrame) return printStackCallStackOf(((sqInt)(frameOfMarriedContext(aContextOrProcessOrFrame)))); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printStackCallStackOf(GIV(framePointer)); + return printStackCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); diff --git a/src/v3.stack/interp.c b/src/v3.stack/interp.c index ab4d9be65d..c68d5c1a28 100644 --- a/src/v3.stack/interp.c +++ b/src/v3.stack/interp.c @@ -1,10 +1,10 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3487 uuid: 0cb5e53f-fb06-4acf-87f3-c6ec09b46e4b - (Compiler-eem.512) + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 + (* Compiler-eem.512) from - StackInterpreter VMMaker.oscog-eem.3487 uuid: 0cb5e53f-fb06-4acf-87f3-c6ec09b46e4b + StackInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.3487 uuid: 0cb5e53f-fb06-4acf-87f3-c6ec09b46e4b " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.3490 uuid: 801a5167-7737-401c-b567-bfffbe2273d3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1982,7 +1982,7 @@ sqInt debugCallbackInvokes; sqInt debugCallbackReturns; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.3487]"; +const char *interpreterVersion = "Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.3490]"; sqInt suppressHeartbeatFlag; char expensiveAsserts = 0; int (*showSurfaceFn)(sqIntptr_t, int, int, int, int); @@ -37389,7 +37389,7 @@ printCallStackOf(sqInt aContextOrProcessOrFrame) return printCallStackFP(((char *)aContextOrProcessOrFrame)); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printCallStackOf(GIV(framePointer)); + return printCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord())))))); @@ -38724,7 +38724,7 @@ printStackCallStackOf(sqInt aContextOrProcessOrFrame) return printStackCallStackOf(((sqInt)(frameOfMarriedContext(aContextOrProcessOrFrame)))); } if (aContextOrProcessOrFrame == (activeProcess())) { - return printStackCallStackOf(GIV(framePointer)); + return printStackCallStackOf(((sqInt)GIV(framePointer))); } if (couldBeProcess(aContextOrProcessOrFrame)) { return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + ((((usqInt)(SuspendedContextIndex) << (shiftForWord()))))));