Skip to content

Commit

Permalink
CogVM source as per VMMaker.oscog-eem.3424
Browse files Browse the repository at this point in the history 
Fix a type signature bug.
  • Loading branch information
@eliotmiranda
eliotmiranda committed Jul 31, 2024
1 parent fad32be commit 1af9a9b
Show file tree
Hide file tree
Showing 27 changed files with 457 additions and 457 deletions.
78 changes: 39 additions & 39 deletions src/spur32.cog.lowcode/cointerp.c
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/* Automatically generated by
CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3423 uuid: 83ef643c-2070-48fa-b2a0-8ffa0fdc55e9
CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3424 uuid: 3a9df841-7659-406c-82d2-adcf87df8167
from
CoInterpreter VMMaker.oscog-eem.3423 uuid: 83ef643c-2070-48fa-b2a0-8ffa0fdc55e9
CoInterpreter VMMaker.oscog-eem.3424 uuid: 3a9df841-7659-406c-82d2-adcf87df8167
*/
static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3423 uuid: 83ef643c-2070-48fa-b2a0-8ffa0fdc55e9 " __DATE__ ;
static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.3424 uuid: 3a9df841-7659-406c-82d2-adcf87df8167 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;


Expand Down Expand Up @@ -623,7 +623,7 @@ extern sqInt startPCOrNilOfLiteralin(sqInt lit, sqInt aMethodObj);
static sqInt NoDbgRegParms synchronousSignal(sqInt aSemaphore);
static void NoDbgRegParms tearDownAndRebuildFrameForCannotReturnBaseFrameReturnFromtoreturnValue(sqInt contextToReturnFrom, sqInt contextToReturnTo, sqInt returnValue);
static sqInt NoDbgRegParms temporaryin(sqInt offset, char *theFP);
static sqInt NoDbgRegParms temporaryinput(sqInt offset, sqInt theFP, sqInt valueOop);
static sqInt NoDbgRegParms temporaryinput(sqInt offset, char *theFP, sqInt valueOop);
static void NoDbgRegParms transferTofrom(sqInt newProc, sqInt sourceCode);
extern void updateStackZoneReferencesToCompiledCodePreCompaction(void);
static void NoDbgRegParms updateStateOfSpouseContextForFrameWithSP(char *theFP, char *theSP);
Expand Down Expand Up @@ -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, 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,
Expand Down Expand Up @@ -2699,7 +2699,7 @@ sqInt debugCallbackReturns;
sqInt suppressHeartbeatFlag;
sqInt cannotDeferDisplayUpdates;
sqInt checkedPluginName;
const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3423]";
const char *interpreterVersion = "Open Smalltalk Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3424]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
char expensiveAsserts = 0;
int (*showSurfaceFn)(sqIntptr_t, int, int, int, int);
Expand Down Expand Up @@ -5417,17 +5417,17 @@ GIV(bytecodeSetSelector) = (methodUsesAlternateBytecodeSet(GIV(method))
}
if ((((usqInt)(longAt(localFP + FoxMethod)))) < (startOfMemory())) {
/* begin mtemporary:in:put: */
longAtput((offset1 < ((frameNumArgs11 = ((mframeCogMethod(((char *) localFP)))->cmNumArgs)))
? ((((char *) localFP)) + FoxCallerSavedIP) + ((frameNumArgs11 - offset1) * BytesPerWord)
: (((((char *) localFP)) + FoxMFReceiver) - BytesPerWord) + ((frameNumArgs11 - offset1) * BytesPerWord)), GIV(nilObj));
longAtput((offset1 < ((frameNumArgs11 = ((mframeCogMethod(localFP))->cmNumArgs)))
? (localFP + FoxCallerSavedIP) + ((frameNumArgs11 - offset1) * BytesPerWord)
: ((localFP + FoxMFReceiver) - BytesPerWord) + ((frameNumArgs11 - offset1) * BytesPerWord)), GIV(nilObj));
}
else {
/* begin itemporary:in:put: */
if (offset1 < ((frameNumArgs2 = byteAt(((((char *) localFP)) + FoxIFrameFlags) + 1)))) {
longAtput(((((char *) localFP)) + FoxCallerSavedIP) + ((frameNumArgs2 - offset1) * BytesPerWord), GIV(nilObj));
if (offset1 < ((frameNumArgs2 = byteAt((localFP + FoxIFrameFlags) + 1)))) {
longAtput((localFP + FoxCallerSavedIP) + ((frameNumArgs2 - offset1) * BytesPerWord), GIV(nilObj));
}
else {
longAtput((((((char *) localFP)) + FoxIFReceiver) - BytesPerWord) + ((frameNumArgs2 - offset1) * BytesPerWord), GIV(nilObj));
longAtput(((localFP + FoxIFReceiver) - BytesPerWord) + ((frameNumArgs2 - offset1) * BytesPerWord), GIV(nilObj));
}
}
}
Expand Down Expand Up @@ -13132,17 +13132,17 @@ GIV(bytecodeSetSelector) = ((((int) methodHeader11)) < 0
valueOop = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((int)((usqInt)(LowcodeContextMark) << (shiftForWord())))));
if ((((usqInt)(longAt(localFP + FoxMethod)))) < (startOfMemory())) {
/* begin mtemporary:in:put: */
longAtput((offset3 < ((frameNumArgs1 = ((mframeCogMethod(((char *) localFP)))->cmNumArgs)))
? ((((char *) localFP)) + FoxCallerSavedIP) + ((frameNumArgs1 - offset3) * BytesPerWord)
: (((((char *) localFP)) + FoxMFReceiver) - BytesPerWord) + ((frameNumArgs1 - offset3) * BytesPerWord)), valueOop);
longAtput((offset3 < ((frameNumArgs1 = ((mframeCogMethod(localFP))->cmNumArgs)))
? (localFP + FoxCallerSavedIP) + ((frameNumArgs1 - offset3) * BytesPerWord)
: ((localFP + FoxMFReceiver) - BytesPerWord) + ((frameNumArgs1 - offset3) * BytesPerWord)), valueOop);
}
else {
/* begin itemporary:in:put: */
if (offset3 < ((frameNumArgs = byteAt(((((char *) localFP)) + FoxIFrameFlags) + 1)))) {
longAtput(((((char *) localFP)) + FoxCallerSavedIP) + ((frameNumArgs - offset3) * BytesPerWord), valueOop);
if (offset3 < ((frameNumArgs = byteAt((localFP + FoxIFrameFlags) + 1)))) {
longAtput((localFP + FoxCallerSavedIP) + ((frameNumArgs - offset3) * BytesPerWord), valueOop);
}
else {
longAtput((((((char *) localFP)) + FoxIFReceiver) - BytesPerWord) + ((frameNumArgs - offset3) * BytesPerWord), valueOop);
longAtput(((localFP + FoxIFReceiver) - BytesPerWord) + ((frameNumArgs - offset3) * BytesPerWord), valueOop);
}
}
/* begin nativePreviousStackPointerIn:put: */
Expand Down Expand Up @@ -27235,17 +27235,17 @@ currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector);
valueOop = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((int)((usqInt)(LowcodeContextMark) << (shiftForWord())))));
if ((((usqInt)(longAt(localFP + FoxMethod)))) < (startOfMemory())) {
/* begin mtemporary:in:put: */
longAtput((offset3 < ((frameNumArgs1 = ((mframeCogMethod(((char *) localFP)))->cmNumArgs)))
? ((((char *) localFP)) + FoxCallerSavedIP) + ((frameNumArgs1 - offset3) * BytesPerWord)
: (((((char *) localFP)) + FoxMFReceiver) - BytesPerWord) + ((frameNumArgs1 - offset3) * BytesPerWord)), valueOop);
longAtput((offset3 < ((frameNumArgs1 = ((mframeCogMethod(localFP))->cmNumArgs)))
? (localFP + FoxCallerSavedIP) + ((frameNumArgs1 - offset3) * BytesPerWord)
: ((localFP + FoxMFReceiver) - BytesPerWord) + ((frameNumArgs1 - offset3) * BytesPerWord)), valueOop);
}
else {
/* begin itemporary:in:put: */
if (offset3 < ((frameNumArgs = byteAt(((((char *) localFP)) + FoxIFrameFlags) + 1)))) {
longAtput(((((char *) localFP)) + FoxCallerSavedIP) + ((frameNumArgs - offset3) * BytesPerWord), valueOop);
if (offset3 < ((frameNumArgs = byteAt((localFP + FoxIFrameFlags) + 1)))) {
longAtput((localFP + FoxCallerSavedIP) + ((frameNumArgs - offset3) * BytesPerWord), valueOop);
}
else {
longAtput((((((char *) localFP)) + FoxIFReceiver) - BytesPerWord) + ((frameNumArgs - offset3) * BytesPerWord), valueOop);
longAtput(((localFP + FoxIFReceiver) - BytesPerWord) + ((frameNumArgs - offset3) * BytesPerWord), valueOop);
}
}
/* begin nativePreviousStackPointerIn:put: */
Expand Down Expand Up @@ -39235,7 +39235,7 @@ printFrameWithSP(char *theFP, char *theSP)
usqInt index;
sqInt methodField;
usqInt numArgs;
usqInt numTemps;
sqInt numTemps;
char *rcvrAddress;
sqInt rcvrOrClosure;
CogBlockMethod * self_in_cmHomeMethod;
Expand Down Expand Up @@ -41338,20 +41338,20 @@ temporaryin(sqInt offset, char *theFP)

/* CoInterpreter>>#temporary:in:put: */
static sqInt NoDbgRegParms
temporaryinput(sqInt offset, sqInt theFP, sqInt valueOop)
temporaryinput(sqInt offset, char *theFP, sqInt valueOop)
{
sqInt frameNumArgs;
sqInt frameNumArgs1;

return ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
? (/* begin mtemporary:in:put: */
longAtput((offset < ((frameNumArgs1 = ((mframeCogMethod(((char *) theFP)))->cmNumArgs)))
? ((((char *) theFP)) + FoxCallerSavedIP) + ((frameNumArgs1 - offset) * BytesPerWord)
: (((((char *) theFP)) + FoxMFReceiver) - BytesPerWord) + ((frameNumArgs1 - offset) * BytesPerWord)), valueOop))
longAtput((offset < ((frameNumArgs1 = ((mframeCogMethod(theFP))->cmNumArgs)))
? (theFP + FoxCallerSavedIP) + ((frameNumArgs1 - offset) * BytesPerWord)
: ((theFP + FoxMFReceiver) - BytesPerWord) + ((frameNumArgs1 - offset) * BytesPerWord)), valueOop))
: (/* begin itemporary:in:put: */
(offset < ((frameNumArgs = byteAt(((((char *) theFP)) + FoxIFrameFlags) + 1)))
? longAtput(((((char *) theFP)) + FoxCallerSavedIP) + ((frameNumArgs - offset) * BytesPerWord), valueOop)
: longAtput((((((char *) theFP)) + FoxIFReceiver) - BytesPerWord) + ((frameNumArgs - offset) * BytesPerWord), valueOop))));
(offset < ((frameNumArgs = byteAt((theFP + FoxIFrameFlags) + 1)))
? longAtput((theFP + FoxCallerSavedIP) + ((frameNumArgs - offset) * BytesPerWord), valueOop)
: longAtput(((theFP + FoxIFReceiver) - BytesPerWord) + ((frameNumArgs - offset) * BytesPerWord), valueOop))));
}


Expand Down Expand Up @@ -80948,7 +80948,7 @@ prepareForSnapshot(void)
sqInt limit;
sqInt newEndOfMemory;
sqInt next;
usqInt node;
sqInt node;
SpurSegmentInfo *seg;
sqInt smallChild;
sqInt treeNode;
Expand Down Expand Up @@ -95949,17 +95949,17 @@ primitiveContextAtPut(void)
/* begin temporary:in:put: */
if ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory())) {
/* begin mtemporary:in:put: */
longAtput(((index - 1) < ((frameNumArgs1 = ((mframeCogMethod(((char *) spouseFP)))->cmNumArgs)))
? ((((char *) spouseFP)) + FoxCallerSavedIP) + ((frameNumArgs1 - (index - 1)) * BytesPerWord)
: (((((char *) spouseFP)) + FoxMFReceiver) - BytesPerWord) + ((frameNumArgs1 - (index - 1)) * BytesPerWord)), value);
longAtput(((index - 1) < ((frameNumArgs1 = ((mframeCogMethod(spouseFP))->cmNumArgs)))
? (spouseFP + FoxCallerSavedIP) + ((frameNumArgs1 - (index - 1)) * BytesPerWord)
: ((spouseFP + FoxMFReceiver) - BytesPerWord) + ((frameNumArgs1 - (index - 1)) * BytesPerWord)), value);
}
else {
/* begin itemporary:in:put: */
if ((index - 1) < ((frameNumArgs = byteAt(((((char *) spouseFP)) + FoxIFrameFlags) + 1)))) {
longAtput(((((char *) spouseFP)) + FoxCallerSavedIP) + ((frameNumArgs - (index - 1)) * BytesPerWord), value);
if ((index - 1) < ((frameNumArgs = byteAt((spouseFP + FoxIFrameFlags) + 1)))) {
longAtput((spouseFP + FoxCallerSavedIP) + ((frameNumArgs - (index - 1)) * BytesPerWord), value);
}
else {
longAtput((((((char *) spouseFP)) + FoxIFReceiver) - BytesPerWord) + ((frameNumArgs - (index - 1)) * BytesPerWord), value);
longAtput(((spouseFP + FoxIFReceiver) - BytesPerWord) + ((frameNumArgs - (index - 1)) * BytesPerWord), value);
}
}
/* begin pop:thenPush: */
Expand Down
2 changes: 1 addition & 1 deletion src/spur32.cog.lowcode/cointerp.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* Automatically generated by
CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3423 uuid: 83ef643c-2070-48fa-b2a0-8ffa0fdc55e9
CCodeGeneratorGlobalStructure VMMaker.oscog-eem.3424 uuid: 3a9df841-7659-406c-82d2-adcf87df8167
*/


Expand Down
Loading

0 comments on commit 1af9a9b

Please sign in to comment.