diff --git a/src/spur32.cog.lowcode/cointerp.c b/src/spur32.cog.lowcode/cointerp.c index 695e5745f0..1f85cfaed1 100644 --- a/src/spur32.cog.lowcode/cointerp.c +++ b/src/spur32.cog.lowcode/cointerp.c @@ -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; @@ -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); @@ -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, @@ -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); @@ -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)); } } } @@ -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: */ @@ -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: */ @@ -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; @@ -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)))); } @@ -80948,7 +80948,7 @@ prepareForSnapshot(void) sqInt limit; sqInt newEndOfMemory; sqInt next; - usqInt node; + sqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -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: */ diff --git a/src/spur32.cog.lowcode/cointerp.h b/src/spur32.cog.lowcode/cointerp.h index 99748941c3..8fc19c1f3d 100644 --- a/src/spur32.cog.lowcode/cointerp.h +++ b/src/spur32.cog.lowcode/cointerp.h @@ -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 */ diff --git a/src/spur32.cog.lowcode/gcc3x-cointerp.c b/src/spur32.cog.lowcode/gcc3x-cointerp.c index af34030b68..895f9f93e5 100644 --- a/src/spur32.cog.lowcode/gcc3x-cointerp.c +++ b/src/spur32.cog.lowcode/gcc3x-cointerp.c @@ -2,11 +2,11 @@ /* 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; @@ -626,7 +626,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); @@ -2028,7 +2028,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, @@ -2702,7 +2702,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); @@ -5426,17 +5426,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)); } } } @@ -13141,17 +13141,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: */ @@ -27244,17 +27244,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: */ @@ -39244,7 +39244,7 @@ printFrameWithSP(char *theFP, char *theSP) usqInt index; sqInt methodField; usqInt numArgs; - usqInt numTemps; + sqInt numTemps; char *rcvrAddress; sqInt rcvrOrClosure; CogBlockMethod * self_in_cmHomeMethod; @@ -41347,20 +41347,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)))); } @@ -80957,7 +80957,7 @@ prepareForSnapshot(void) sqInt limit; sqInt newEndOfMemory; sqInt next; - usqInt node; + sqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -95958,17 +95958,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: */ diff --git a/src/spur32.cog/cointerp.c b/src/spur32.cog/cointerp.c index e5cc46ff5e..5f4384a7dc 100644 --- a/src/spur32.cog/cointerp.c +++ b/src/spur32.cog/cointerp.c @@ -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; @@ -614,7 +614,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); @@ -2674,7 +2674,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); @@ -19276,7 +19276,7 @@ printFrameWithSP(char *theFP, char *theSP) usqInt index; sqInt methodField; usqInt numArgs; - sqInt numTemps; + usqInt numTemps; char *rcvrAddress; sqInt rcvrOrClosure; CogBlockMethod * self_in_cmHomeMethod; @@ -21365,20 +21365,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)))); } @@ -60288,7 +60288,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr) assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(obj))); contextSize = (sp >> 1); l10: /* end fetchStackPointerOf: */; - numPointerSlots = ((usqInt) (CtxtTempFrameStart + contextSize)); + numPointerSlots = CtxtTempFrameStart + contextSize; goto l11; } /* begin numSlotsOf: */ @@ -60324,7 +60324,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr) assert((header & 1)); /* begin literalCountOfAlternateHeader: */ numLiterals = ((header >> 1)) & AlternateHeaderNumLiteralsMask; - numPointerSlots = ((usqInt) (numLiterals + LiteralStart)); + numPointerSlots = numLiterals + LiteralStart; l11: /* end numPointerSlotsWhileCompactingOf:withFormat:savedFirstFieldPointer: */; if ((fmt <= 5 /* lastPointerFormat */) && (numPointerSlots > 0)) { @@ -60879,7 +60879,7 @@ prepareForSnapshot(void) sqInt limit; sqInt newEndOfMemory; sqInt next; - sqInt node; + usqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -64821,8 +64821,8 @@ 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; @@ -75776,17 +75776,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: */ diff --git a/src/spur32.cog/cointerp.h b/src/spur32.cog/cointerp.h index acebc5058c..6ab3fe4dd0 100644 --- a/src/spur32.cog/cointerp.h +++ b/src/spur32.cog/cointerp.h @@ -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 */ diff --git a/src/spur32.cog/cointerpmt.c b/src/spur32.cog/cointerpmt.c index dc2e2fe4e4..6cf4f28c4e 100644 --- a/src/spur32.cog/cointerpmt.c +++ b/src/spur32.cog/cointerpmt.c @@ -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 - CoInterpreterMT VMMaker.oscog-eem.3423 uuid: 83ef643c-2070-48fa-b2a0-8ffa0fdc55e9 + CoInterpreterMT VMMaker.oscog-eem.3424 uuid: 3a9df841-7659-406c-82d2-adcf87df8167 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.3423 uuid: 83ef643c-2070-48fa-b2a0-8ffa0fdc55e9 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.3424 uuid: 3a9df841-7659-406c-82d2-adcf87df8167 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -682,7 +682,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); extern void updateStackZoneReferencesToCompiledCodePreCompaction(void); static void NoDbgRegParms updateStateOfSpouseContextForFrameWithSP(char *theFP, char *theSP); extern sqInt validInstructionPointerinMethodframePointer(usqInt instrPointer, usqInt aMethod, char *fp); @@ -2113,7 +2113,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, @@ -2789,7 +2789,7 @@ sqInt debugCallbackReturns; sqInt suppressHeartbeatFlag; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.3423]"; +const char *interpreterVersion = "Open Smalltalk Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.3424]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; char expensiveAsserts = 0; int (*showSurfaceFn)(sqIntptr_t, int, int, int, int); @@ -21710,20 +21710,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)))); } @@ -68176,8 +68176,8 @@ static sqInt getErrorObjectFromPrimFailCode(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt classIndex; - sqInt clone; - sqInt errObj; + usqInt clone; + usqInt errObj; sqInt i; usqInt newObj; usqInt numBytes; @@ -78624,17 +78624,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: */ diff --git a/src/spur32.cog/cointerpmt.h b/src/spur32.cog/cointerpmt.h index 92e110c815..604f455907 100644 --- a/src/spur32.cog/cointerpmt.h +++ b/src/spur32.cog/cointerpmt.h @@ -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 */ diff --git a/src/spur32.cog/gcc3x-cointerp.c b/src/spur32.cog/gcc3x-cointerp.c index dbed40bd1c..d903038461 100644 --- a/src/spur32.cog/gcc3x-cointerp.c +++ b/src/spur32.cog/gcc3x-cointerp.c @@ -2,11 +2,11 @@ /* 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; @@ -617,7 +617,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); @@ -2677,7 +2677,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); @@ -19285,7 +19285,7 @@ printFrameWithSP(char *theFP, char *theSP) usqInt index; sqInt methodField; usqInt numArgs; - sqInt numTemps; + usqInt numTemps; char *rcvrAddress; sqInt rcvrOrClosure; CogBlockMethod * self_in_cmHomeMethod; @@ -21374,20 +21374,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)))); } @@ -60297,7 +60297,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr) assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(obj))); contextSize = (sp >> 1); l10: /* end fetchStackPointerOf: */; - numPointerSlots = ((usqInt) (CtxtTempFrameStart + contextSize)); + numPointerSlots = CtxtTempFrameStart + contextSize; goto l11; } /* begin numSlotsOf: */ @@ -60333,7 +60333,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr) assert((header & 1)); /* begin literalCountOfAlternateHeader: */ numLiterals = ((header >> 1)) & AlternateHeaderNumLiteralsMask; - numPointerSlots = ((usqInt) (numLiterals + LiteralStart)); + numPointerSlots = numLiterals + LiteralStart; l11: /* end numPointerSlotsWhileCompactingOf:withFormat:savedFirstFieldPointer: */; if ((fmt <= 5 /* lastPointerFormat */) && (numPointerSlots > 0)) { @@ -60888,7 +60888,7 @@ prepareForSnapshot(void) sqInt limit; sqInt newEndOfMemory; sqInt next; - sqInt node; + usqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -64830,8 +64830,8 @@ 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; @@ -75785,17 +75785,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: */ diff --git a/src/spur32.cog/gcc3x-cointerpmt.c b/src/spur32.cog/gcc3x-cointerpmt.c index d01ac0d231..ee96310eb8 100644 --- a/src/spur32.cog/gcc3x-cointerpmt.c +++ b/src/spur32.cog/gcc3x-cointerpmt.c @@ -2,11 +2,11 @@ /* 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 - CoInterpreterMT VMMaker.oscog-eem.3423 uuid: 83ef643c-2070-48fa-b2a0-8ffa0fdc55e9 + CoInterpreterMT VMMaker.oscog-eem.3424 uuid: 3a9df841-7659-406c-82d2-adcf87df8167 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.3423 uuid: 83ef643c-2070-48fa-b2a0-8ffa0fdc55e9 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.3424 uuid: 3a9df841-7659-406c-82d2-adcf87df8167 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -685,7 +685,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); extern void updateStackZoneReferencesToCompiledCodePreCompaction(void); static void NoDbgRegParms updateStateOfSpouseContextForFrameWithSP(char *theFP, char *theSP); extern sqInt validInstructionPointerinMethodframePointer(usqInt instrPointer, usqInt aMethod, char *fp); @@ -2116,7 +2116,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, @@ -2792,7 +2792,7 @@ sqInt debugCallbackReturns; sqInt suppressHeartbeatFlag; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.3423]"; +const char *interpreterVersion = "Open Smalltalk Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.3424]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; char expensiveAsserts = 0; int (*showSurfaceFn)(sqIntptr_t, int, int, int, int); @@ -21719,20 +21719,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)))); } @@ -68185,8 +68185,8 @@ static sqInt getErrorObjectFromPrimFailCode(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt classIndex; - sqInt clone; - sqInt errObj; + usqInt clone; + usqInt errObj; sqInt i; usqInt newObj; usqInt numBytes; @@ -78633,17 +78633,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: */ diff --git a/src/spur32.sista/cointerp.c b/src/spur32.sista/cointerp.c index 3deb6133b7..1408f6b8b6 100644 --- a/src/spur32.sista/cointerp.c +++ b/src/spur32.sista/cointerp.c @@ -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; @@ -618,7 +618,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); @@ -2690,7 +2690,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); @@ -22250,7 +22250,7 @@ printFrameWithSP(char *theFP, char *theSP) usqInt index; sqInt methodField; usqInt numArgs; - sqInt numTemps; + usqInt numTemps; char *rcvrAddress; sqInt rcvrOrClosure; CogBlockMethod * self_in_cmHomeMethod; @@ -24340,20 +24340,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)))); } @@ -63475,7 +63475,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr) assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(obj))); contextSize = (sp >> 1); l10: /* end fetchStackPointerOf: */; - numPointerSlots = CtxtTempFrameStart + contextSize; + numPointerSlots = ((usqInt) (CtxtTempFrameStart + contextSize)); goto l11; } /* begin numSlotsOf: */ @@ -63511,7 +63511,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr) assert((header & 1)); /* begin literalCountOfAlternateHeader: */ numLiterals = ((header >> 1)) & AlternateHeaderNumLiteralsMask; - numPointerSlots = numLiterals + LiteralStart; + numPointerSlots = ((usqInt) (numLiterals + LiteralStart)); l11: /* end numPointerSlotsWhileCompactingOf:withFormat:savedFirstFieldPointer: */; if ((fmt <= 5 /* lastPointerFormat */) && (numPointerSlots > 0)) { @@ -78989,17 +78989,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: */ diff --git a/src/spur32.sista/cointerp.h b/src/spur32.sista/cointerp.h index 37a38b67c3..8bb39738b1 100644 --- a/src/spur32.sista/cointerp.h +++ b/src/spur32.sista/cointerp.h @@ -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 */ diff --git a/src/spur32.sista/gcc3x-cointerp.c b/src/spur32.sista/gcc3x-cointerp.c index 668899f6a8..6a25d3fe64 100644 --- a/src/spur32.sista/gcc3x-cointerp.c +++ b/src/spur32.sista/gcc3x-cointerp.c @@ -2,11 +2,11 @@ /* 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; @@ -621,7 +621,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); @@ -2693,7 +2693,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); @@ -22259,7 +22259,7 @@ printFrameWithSP(char *theFP, char *theSP) usqInt index; sqInt methodField; usqInt numArgs; - sqInt numTemps; + usqInt numTemps; char *rcvrAddress; sqInt rcvrOrClosure; CogBlockMethod * self_in_cmHomeMethod; @@ -24349,20 +24349,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)))); } @@ -63484,7 +63484,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr) assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(obj))); contextSize = (sp >> 1); l10: /* end fetchStackPointerOf: */; - numPointerSlots = CtxtTempFrameStart + contextSize; + numPointerSlots = ((usqInt) (CtxtTempFrameStart + contextSize)); goto l11; } /* begin numSlotsOf: */ @@ -63520,7 +63520,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr) assert((header & 1)); /* begin literalCountOfAlternateHeader: */ numLiterals = ((header >> 1)) & AlternateHeaderNumLiteralsMask; - numPointerSlots = numLiterals + LiteralStart; + numPointerSlots = ((usqInt) (numLiterals + LiteralStart)); l11: /* end numPointerSlotsWhileCompactingOf:withFormat:savedFirstFieldPointer: */; if ((fmt <= 5 /* lastPointerFormat */) && (numPointerSlots > 0)) { @@ -78998,17 +78998,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: */ diff --git a/src/spur64.cog.lowcode/cointerp.c b/src/spur64.cog.lowcode/cointerp.c index 82974f3bee..bb41cf3568 100644 --- a/src/spur64.cog.lowcode/cointerp.c +++ b/src/spur64.cog.lowcode/cointerp.c @@ -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; @@ -624,7 +624,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); @@ -2718,7 +2718,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 */; int displayWidth; int displayDepth; @@ -5443,17 +5443,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)); } } } @@ -13065,17 +13065,17 @@ GIV(bytecodeSetSelector) = ((((sqLong) methodHeader11)) < 0 valueOop = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((sqInt)((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: */ @@ -27162,17 +27162,17 @@ currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); valueOop = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((sqInt)((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: */ @@ -41086,20 +41086,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)))); } @@ -81372,7 +81372,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr) assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(obj))); contextSize = (sp >> 3); l10: /* end fetchStackPointerOf: */; - numPointerSlots = CtxtTempFrameStart + contextSize; + numPointerSlots = ((usqInt) (CtxtTempFrameStart + contextSize)); goto l11; } /* begin numSlotsOf: */ @@ -81405,7 +81405,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr) assert((((header) & 7) == 1)); /* begin literalCountOfAlternateHeader: */ numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask; - numPointerSlots = numLiterals + LiteralStart; + numPointerSlots = ((usqInt) (numLiterals + LiteralStart)); l11: /* end numPointerSlotsWhileCompactingOf:withFormat:savedFirstFieldPointer: */; if ((fmt <= 5 /* lastPointerFormat */) && (numPointerSlots > 0)) { @@ -81960,7 +81960,7 @@ prepareForSnapshot(void) sqInt limit; sqInt newEndOfMemory; sqInt next; - sqInt node; + usqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -96947,17 +96947,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: */ diff --git a/src/spur64.cog.lowcode/cointerp.h b/src/spur64.cog.lowcode/cointerp.h index 4c02374ce8..d1b1137c55 100644 --- a/src/spur64.cog.lowcode/cointerp.h +++ b/src/spur64.cog.lowcode/cointerp.h @@ -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 */ diff --git a/src/spur64.cog.lowcode/gcc3x-cointerp.c b/src/spur64.cog.lowcode/gcc3x-cointerp.c index 6a8f6a06b2..1bbe2faf9a 100644 --- a/src/spur64.cog.lowcode/gcc3x-cointerp.c +++ b/src/spur64.cog.lowcode/gcc3x-cointerp.c @@ -2,11 +2,11 @@ /* 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; @@ -627,7 +627,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); @@ -2721,7 +2721,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 */; int displayWidth; int displayDepth; @@ -5452,17 +5452,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)); } } } @@ -13074,17 +13074,17 @@ GIV(bytecodeSetSelector) = ((((sqLong) methodHeader11)) < 0 valueOop = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((sqInt)((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: */ @@ -27171,17 +27171,17 @@ currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); valueOop = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((sqInt)((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: */ @@ -41095,20 +41095,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)))); } @@ -81381,7 +81381,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr) assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(obj))); contextSize = (sp >> 3); l10: /* end fetchStackPointerOf: */; - numPointerSlots = CtxtTempFrameStart + contextSize; + numPointerSlots = ((usqInt) (CtxtTempFrameStart + contextSize)); goto l11; } /* begin numSlotsOf: */ @@ -81414,7 +81414,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr) assert((((header) & 7) == 1)); /* begin literalCountOfAlternateHeader: */ numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask; - numPointerSlots = numLiterals + LiteralStart; + numPointerSlots = ((usqInt) (numLiterals + LiteralStart)); l11: /* end numPointerSlotsWhileCompactingOf:withFormat:savedFirstFieldPointer: */; if ((fmt <= 5 /* lastPointerFormat */) && (numPointerSlots > 0)) { @@ -81969,7 +81969,7 @@ prepareForSnapshot(void) sqInt limit; sqInt newEndOfMemory; sqInt next; - sqInt node; + usqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -96956,17 +96956,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: */ diff --git a/src/spur64.cog/cointerp.c b/src/spur64.cog/cointerp.c index c0c385abb3..b8747d9108 100644 --- a/src/spur64.cog/cointerp.c +++ b/src/spur64.cog/cointerp.c @@ -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; @@ -615,7 +615,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); @@ -2694,7 +2694,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 */; int displayWidth; int displayDepth; @@ -21322,20 +21322,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)))); } @@ -62107,7 +62107,7 @@ prepareForSnapshot(void) sqInt limit; sqInt newEndOfMemory; sqInt next; - sqInt node; + usqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -76990,17 +76990,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: */ diff --git a/src/spur64.cog/cointerp.h b/src/spur64.cog/cointerp.h index a2724e7cf6..27c290f017 100644 --- a/src/spur64.cog/cointerp.h +++ b/src/spur64.cog/cointerp.h @@ -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 */ diff --git a/src/spur64.cog/cointerpmt.c b/src/spur64.cog/cointerpmt.c index 7b56b34484..118a63aa9c 100644 --- a/src/spur64.cog/cointerpmt.c +++ b/src/spur64.cog/cointerpmt.c @@ -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 - CoInterpreterMT VMMaker.oscog-eem.3423 uuid: 83ef643c-2070-48fa-b2a0-8ffa0fdc55e9 + CoInterpreterMT VMMaker.oscog-eem.3424 uuid: 3a9df841-7659-406c-82d2-adcf87df8167 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.3423 uuid: 83ef643c-2070-48fa-b2a0-8ffa0fdc55e9 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.3424 uuid: 3a9df841-7659-406c-82d2-adcf87df8167 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -683,7 +683,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); extern void updateStackZoneReferencesToCompiledCodePreCompaction(void); static void NoDbgRegParms updateStateOfSpouseContextForFrameWithSP(char *theFP, char *theSP); extern sqInt validInstructionPointerinMethodframePointer(usqInt instrPointer, usqInt aMethod, char *fp); @@ -2137,7 +2137,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, @@ -2809,7 +2809,7 @@ sqInt debugCallbackReturns; sqInt suppressHeartbeatFlag; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.3423]"; +const char *interpreterVersion = "Open Smalltalk Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.3424]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; int displayWidth; int displayDepth; @@ -21667,20 +21667,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)))); } @@ -65559,7 +65559,7 @@ prepareForSnapshot(void) sqInt limit; sqInt newEndOfMemory; sqInt next; - sqInt node; + usqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -79838,17 +79838,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: */ diff --git a/src/spur64.cog/cointerpmt.h b/src/spur64.cog/cointerpmt.h index e44bce6d43..d753370d59 100644 --- a/src/spur64.cog/cointerpmt.h +++ b/src/spur64.cog/cointerpmt.h @@ -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 */ diff --git a/src/spur64.cog/gcc3x-cointerp.c b/src/spur64.cog/gcc3x-cointerp.c index 1e40c5778b..7a1a94bcc6 100644 --- a/src/spur64.cog/gcc3x-cointerp.c +++ b/src/spur64.cog/gcc3x-cointerp.c @@ -2,11 +2,11 @@ /* 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; @@ -618,7 +618,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); @@ -2697,7 +2697,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 */; int displayWidth; int displayDepth; @@ -21331,20 +21331,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)))); } @@ -62116,7 +62116,7 @@ prepareForSnapshot(void) sqInt limit; sqInt newEndOfMemory; sqInt next; - sqInt node; + usqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -76999,17 +76999,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: */ diff --git a/src/spur64.cog/gcc3x-cointerpmt.c b/src/spur64.cog/gcc3x-cointerpmt.c index 3096ac41b8..fe384018ba 100644 --- a/src/spur64.cog/gcc3x-cointerpmt.c +++ b/src/spur64.cog/gcc3x-cointerpmt.c @@ -2,11 +2,11 @@ /* 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 - CoInterpreterMT VMMaker.oscog-eem.3423 uuid: 83ef643c-2070-48fa-b2a0-8ffa0fdc55e9 + CoInterpreterMT VMMaker.oscog-eem.3424 uuid: 3a9df841-7659-406c-82d2-adcf87df8167 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.3423 uuid: 83ef643c-2070-48fa-b2a0-8ffa0fdc55e9 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.3424 uuid: 3a9df841-7659-406c-82d2-adcf87df8167 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -686,7 +686,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); extern void updateStackZoneReferencesToCompiledCodePreCompaction(void); static void NoDbgRegParms updateStateOfSpouseContextForFrameWithSP(char *theFP, char *theSP); extern sqInt validInstructionPointerinMethodframePointer(usqInt instrPointer, usqInt aMethod, char *fp); @@ -2140,7 +2140,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, @@ -2812,7 +2812,7 @@ sqInt debugCallbackReturns; sqInt suppressHeartbeatFlag; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.3423]"; +const char *interpreterVersion = "Open Smalltalk Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.3424]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; int displayWidth; int displayDepth; @@ -21676,20 +21676,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)))); } @@ -65568,7 +65568,7 @@ prepareForSnapshot(void) sqInt limit; sqInt newEndOfMemory; sqInt next; - sqInt node; + usqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -79847,17 +79847,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: */ diff --git a/src/spur64.sista/cointerp.c b/src/spur64.sista/cointerp.c index 8b3cd75932..467ff0861c 100644 --- a/src/spur64.sista/cointerp.c +++ b/src/spur64.sista/cointerp.c @@ -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; @@ -619,7 +619,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); @@ -2039,7 +2039,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, @@ -2709,7 +2709,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 */; int displayWidth; int displayDepth; @@ -24218,20 +24218,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)))); } @@ -65208,7 +65208,7 @@ prepareForSnapshot(void) sqInt limit; sqInt newEndOfMemory; sqInt next; - sqInt node; + usqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -69137,8 +69137,8 @@ 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; @@ -80117,17 +80117,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: */ diff --git a/src/spur64.sista/cointerp.h b/src/spur64.sista/cointerp.h index 17f679e44d..bc85fe6874 100644 --- a/src/spur64.sista/cointerp.h +++ b/src/spur64.sista/cointerp.h @@ -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 */ diff --git a/src/spur64.sista/gcc3x-cointerp.c b/src/spur64.sista/gcc3x-cointerp.c index 5100756f62..bd5efb052f 100644 --- a/src/spur64.sista/gcc3x-cointerp.c +++ b/src/spur64.sista/gcc3x-cointerp.c @@ -2,11 +2,11 @@ /* 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; @@ -622,7 +622,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); @@ -2042,7 +2042,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, @@ -2712,7 +2712,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 */; int displayWidth; int displayDepth; @@ -24227,20 +24227,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)))); } @@ -65217,7 +65217,7 @@ prepareForSnapshot(void) sqInt limit; sqInt newEndOfMemory; sqInt next; - sqInt node; + usqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -69146,8 +69146,8 @@ 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; @@ -80126,17 +80126,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: */ diff --git a/src/v3.cog/cointerp.c b/src/v3.cog/cointerp.c index 4562648659..bfd4b327b8 100644 --- a/src/v3.cog/cointerp.c +++ b/src/v3.cog/cointerp.c @@ -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; @@ -571,7 +571,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); @@ -2275,7 +2275,7 @@ sqInt debugCallbackReturns; sqInt suppressHeartbeatFlag; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Cog[SqueakV3] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3423]"; +const char *interpreterVersion = "Open Smalltalk Cog[SqueakV3] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3424]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; char expensiveAsserts = 0; int (*showSurfaceFn)(sqIntptr_t, int, int, int, int); @@ -15250,7 +15250,7 @@ printFrameWithSP(char *theFP, char *theSP) usqInt index; sqInt methodField; usqInt numArgs; - usqInt numTemps; + sqInt numTemps; sqInt oop1; char *rcvrAddress; sqInt rcvrOrClosure; @@ -17295,20 +17295,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)))); } @@ -54525,17 +54525,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: */ diff --git a/src/v3.cog/cointerp.h b/src/v3.cog/cointerp.h index 607f93c25a..bedf887a77 100644 --- a/src/v3.cog/cointerp.h +++ b/src/v3.cog/cointerp.h @@ -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 */ diff --git a/src/v3.cog/gcc3x-cointerp.c b/src/v3.cog/gcc3x-cointerp.c index 5043abeb07..855007203a 100644 --- a/src/v3.cog/gcc3x-cointerp.c +++ b/src/v3.cog/gcc3x-cointerp.c @@ -2,11 +2,11 @@ /* 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; @@ -574,7 +574,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); @@ -2278,7 +2278,7 @@ sqInt debugCallbackReturns; sqInt suppressHeartbeatFlag; sqInt cannotDeferDisplayUpdates; sqInt checkedPluginName; -const char *interpreterVersion = "Open Smalltalk Cog[SqueakV3] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3423]"; +const char *interpreterVersion = "Open Smalltalk Cog[SqueakV3] VM [CoInterpreterPrimitives VMMaker.oscog-eem.3424]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; char expensiveAsserts = 0; int (*showSurfaceFn)(sqIntptr_t, int, int, int, int); @@ -15259,7 +15259,7 @@ printFrameWithSP(char *theFP, char *theSP) usqInt index; sqInt methodField; usqInt numArgs; - usqInt numTemps; + sqInt numTemps; sqInt oop1; char *rcvrAddress; sqInt rcvrOrClosure; @@ -17304,20 +17304,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)))); } @@ -54534,17 +54534,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: */