Skip to content

Commit

Permalink
CogVM source as per VMMaker.oscog-eem.3490
Browse files Browse the repository at this point in the history 
Windows whack-a-mole post VMMaker.oscog-eem.3487
  • Loading branch information
@eliotmiranda
eliotmiranda committed Dec 23, 2024
1 parent 2a562b2 commit a99d053
Show file tree
Hide file tree
Showing 37 changed files with 410 additions and 414 deletions.
26 changes: 13 additions & 13 deletions src/spur32.cog.lowcode/cointerp.c
View file
Original file line number Diff line number Diff line change
@@ -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;


Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -50942,7 +50942,7 @@ primitiveInvokeObjectAsMethod(void)
sqInt lookupClassTag;
usqInt newObj;
usqInt numBytes;
sqInt runArgs;
usqInt runArgs;
sqInt runReceiver;
char *sp;
sqInt tagBits;
Expand Down Expand Up @@ -56333,7 +56333,7 @@ primitiveSubtractLargeIntegers(void)
sqInt oopRcvr;
sqInt oopResult;
usqLong result;
sqInt resultIsNegative;
int resultIsNegative;
char *sp;

oopArg = longAt(GIV(stackPointer));
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -80125,7 +80125,7 @@ bridgeFor(SpurSegmentInfo *aSegment)
static NoDbgRegParms void
bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
{
sqInt bridgeSpan;
int bridgeSpan;
sqInt clifton;
usqInt segEnd;

Expand Down Expand Up @@ -80308,7 +80308,7 @@ prepareForSnapshot(void)
sqInt largeChild;
sqInt newEndOfMemory;
sqInt next;
usqInt node;
sqInt node;
SpurSegmentInfo *seg;
sqInt smallChild;
sqInt treeNode;
Expand Down Expand Up @@ -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()))))));
Expand Down Expand Up @@ -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()))))));
Expand Down
4 changes: 2 additions & 2 deletions src/spur32.cog.lowcode/cointerp.h
View file
Original file line number Diff line number Diff line change
@@ -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)
*/


Expand Down
26 changes: 13 additions & 13 deletions src/spur32.cog.lowcode/gcc3x-cointerp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;


Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -50949,7 +50949,7 @@ primitiveInvokeObjectAsMethod(void)
sqInt lookupClassTag;
usqInt newObj;
usqInt numBytes;
sqInt runArgs;
usqInt runArgs;
sqInt runReceiver;
char *sp;
sqInt tagBits;
Expand Down Expand Up @@ -56340,7 +56340,7 @@ primitiveSubtractLargeIntegers(void)
sqInt oopRcvr;
sqInt oopResult;
usqLong result;
sqInt resultIsNegative;
int resultIsNegative;
char *sp;

oopArg = longAt(GIV(stackPointer));
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -80132,7 +80132,7 @@ bridgeFor(SpurSegmentInfo *aSegment)
static NoDbgRegParms void
bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
{
sqInt bridgeSpan;
int bridgeSpan;
sqInt clifton;
usqInt segEnd;

Expand Down Expand Up @@ -80315,7 +80315,7 @@ prepareForSnapshot(void)
sqInt largeChild;
sqInt newEndOfMemory;
sqInt next;
usqInt node;
sqInt node;
SpurSegmentInfo *seg;
sqInt smallChild;
sqInt treeNode;
Expand Down Expand Up @@ -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()))))));
Expand Down Expand Up @@ -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()))))));
Expand Down
46 changes: 23 additions & 23 deletions src/spur32.cog/cointerp.c
View file
Original file line number Diff line number Diff line change
@@ -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;


Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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:;
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -54380,7 +54380,7 @@ numSlotsOfAny(sqInt objOop)
*/

/* SpurMemoryManager>>#numSlotsOfIndexablePointerObj: */
static NoDbgRegParms sqInt
static NoDbgRegParms usqInt
numSlotsOfIndexablePointerObj(sqInt objOop)
{
usqInt numSlots;
Expand Down Expand Up @@ -61746,7 +61746,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr)
contextSize = (sp >> 1);
/* end fetchStackPointerOf: */
l2:
numPointerSlots = CtxtTempFrameStart + contextSize;
numPointerSlots = ((usqInt) (CtxtTempFrameStart + contextSize));
goto l3;
}

Expand Down Expand Up @@ -62110,7 +62110,7 @@ bridgeFor(SpurSegmentInfo *aSegment)
static NoDbgRegParms void
bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
{
int bridgeSpan;
sqInt bridgeSpan;
sqInt clifton;
usqInt segEnd;

Expand Down Expand Up @@ -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()))))));
Expand Down Expand Up @@ -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()))))));
Expand Down
4 changes: 2 additions & 2 deletions src/spur32.cog/cointerp.h
View file
Original file line number Diff line number Diff line change
@@ -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)
*/


Expand Down
Loading

0 comments on commit a99d053

Please sign in to comment.