Vm-dev January 2016

vm-dev@lists.squeakfoundation.org

40 participants
156 discussions

[commit][3565] CogVM source as per VMMaker.oscog-eem.1662
by commits＠squeakvm.org 23 Jan '16

23 Jan '16

Revision: 3565 Author: eliot Date: 2016-01-22 16:34:50 -0800 (Fri, 22 Jan 2016) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1662 Slang: Fix bad regression in type inference from VMMaker.oscog-eem.1587. returnTypeForSend:in: can only default return types to sqInt for unknown selectors. The rewrite in VMMaker.oscog-eem.1587 inadvertently defaulted the return type of known methods whose return type was yet to be determined to sqInt. The fix is to only default to sqInt if there is no known method for the given selector. This fixes, for instance, the weird flipping of the type of 32-bit Spur's headerWhileForwardingOf:,which should always be #sqLong. Modified Paths: -------------- branches/Cog/nsspur64src/vm/cogit.h branches/Cog/nsspur64src/vm/cogitX64.c branches/Cog/nsspur64src/vm/cointerp.c branches/Cog/nsspur64src/vm/cointerp.h branches/Cog/nsspur64src/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/plugins/B2DPlugin/B2DPlugin.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogitARMv5.c branches/Cog/nsspursrc/vm/cogitIA32.c branches/Cog/nsspursrc/vm/cogitMIPSEL.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstack64src/vm/gcc3x-interp.c branches/Cog/nsspurstack64src/vm/interp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/spur64src/vm/cogit.h branches/Cog/spur64src/vm/cogitX64.c branches/Cog/spur64src/vm/cointerp.c branches/Cog/spur64src/vm/cointerp.h branches/Cog/spur64src/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogitARMv5.c branches/Cog/spursistasrc/vm/cogitIA32.c branches/Cog/spursistasrc/vm/cogitMIPSEL.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogitARMv5.c branches/Cog/spursrc/vm/cogitIA32.c branches/Cog/spursrc/vm/cogitMIPSEL.c branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogitARMv5.c branches/Cog/src/vm/cogitIA32.c branches/Cog/src/vm/cogitMIPSEL.c branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspur64src/vm/cogit.h =================================================================== --- branches/Cog/nsspur64src/vm/cogit.h 2016-01-22 01:28:22 UTC (rev 3564) +++ branches/Cog/nsspur64src/vm/cogit.h 2016-01-23 00:34:50 UTC (rev 3565) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1661 uuid: a34e0ec2-d251-4618-bd67-cef5b3eddcf5 + CCodeGenerator VMMaker.oscog-eem.1662 uuid: 686f2648-1716-445e-8440-ec23d22489a5 */ @@ -25,7 +25,7 @@ extern sqInt bytecodePCForstartBcpcin(sqInt mcpc, sqInt startbcpc, CogBlockMethod *cogMethod); extern void callCogCodePopReceiver(void); extern void callCogCodePopReceiverAndClassRegs(void); -extern sqInt ceCPICMissreceiver(CogMethod *cPIC, sqInt receiver); +extern void ceCPICMissreceiver(CogMethod *cPIC, sqInt receiver); extern sqInt ceSICMiss(sqInt receiver); extern void checkAssertsEnabledInCogit(void); extern sqInt checkIntegrityOfObjectReferencesInCode(sqInt gcModes); Modified: branches/Cog/nsspur64src/vm/cogitX64.c =================================================================== --- branches/Cog/nsspur64src/vm/cogitX64.c 2016-01-22 01:28:22 UTC (rev 3564) +++ branches/Cog/nsspur64src/vm/cogitX64.c 2016-01-23 00:34:50 UTC (rev 3565) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1661 uuid: a34e0ec2-d251-4618-bd67-cef5b3eddcf5 + CCodeGenerator VMMaker.oscog-eem.1662 uuid: 686f2648-1716-445e-8440-ec23d22489a5 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1661 uuid: a34e0ec2-d251-4618-bd67-cef5b3eddcf5 + StackToRegisterMappingCogit VMMaker.oscog-eem.1662 uuid: 686f2648-1716-445e-8440-ec23d22489a5 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1661 uuid: a34e0ec2-d251-4618-bd67-cef5b3eddcf5 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1662 uuid: 686f2648-1716-445e-8440-ec23d22489a5 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -461,7 +461,7 @@ static AbstractInstruction * NoDbgRegParms gCmpRR(sqInt reg1, sqInt reg2); extern void callCogCodePopReceiver(void); extern void callCogCodePopReceiverAndClassRegs(void); -extern sqInt ceCPICMissreceiver(CogMethod *cPIC, sqInt receiver); +extern void ceCPICMissreceiver(CogMethod *cPIC, sqInt receiver); extern sqInt ceSICMiss(sqInt receiver); extern void checkAssertsEnabledInCogit(void); static sqInt NoDbgRegParms checkIfValidOopRefAndTargetpccogMethod(sqInt annotation, char *mcpc, sqInt cogMethod); @@ -483,7 +483,7 @@ extern CogMethod * cogselector(sqInt aMethodObj, sqInt aSelectorOop); extern void compactCogCompiledCode(void); static AbstractInstruction * compileAbort(void); -static sqInt NoDbgRegParms compileBlockDispatchFromto(sqInt lowBlockStartIndex, sqInt highBlockStartIndex); +static void NoDbgRegParms compileBlockDispatchFromto(sqInt lowBlockStartIndex, sqInt highBlockStartIndex); static void NoDbgRegParms compileBlockEntry(BlockStart *blockStart); static void NoDbgRegParms compileCallFornumArgsargargargargresultRegsaveRegs(void *aRoutine, sqInt numArgs, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2, sqInt regOrConst3, sqInt resultRegOrNone, sqInt saveRegs); static AbstractInstruction * compileCPICEntry(void); @@ -962,9 +962,8 @@ static sqInt genLongUnconditionalBackwardJump(void); static sqInt genLongUnconditionalForwardJump(void); static sqInt NoDbgRegParms genLookupForPerformNumArgs(sqInt numArgs); -static AbstractInstruction * NoDbgRegParms genMoveConstantR(sqInt constant, sqInt reg); static AbstractInstruction * NoDbgRegParms genMoveFalseR(sqInt reg); -static sqInt NoDbgRegParms genMoveTrueR(sqInt reg); +static AbstractInstruction * NoDbgRegParms genMoveTrueR(sqInt reg); static sqInt NoDbgRegParms genMustBeBooleanTrampolineForcalled(sqInt boolean, char *trampolineName); static void NoDbgRegParms genPrimReturnEnterCogCodeEnilopmart(sqInt profiling); static sqInt genPushClosureTempsBytecode(void); @@ -3056,7 +3055,7 @@ sp=> sender return address */ /* Cogit>>#ceCPICMiss:receiver: */ -sqInt +void ceCPICMissreceiver(CogMethod *cPIC, sqInt receiver) { sqInt cacheTag; @@ -3070,7 +3069,8 @@ sqInt selector; if (isOopForwarded(receiver)) { - return ceSendFromInLineCacheMiss(cPIC); + ceSendFromInLineCacheMiss(cPIC); + return; } outerReturn = stackTop(); assert(!(((inlineCacheTagAt(backEnd, outerReturn)) == (picAbortDiscriminatorValue())))); @@ -3133,11 +3133,12 @@ || (isYoung(newTargetMethodOrNil))))) { result = patchToOpenPICFornumArgsreceiver((cPIC->selector), (cPIC->cmNumArgs), receiver); assert(!result); - return ceSendFromInLineCacheMiss(cPIC); + ceSendFromInLineCacheMiss(cPIC); + return; } cogExtendPICCaseNMethodtagisMNUCase(cPIC, newTargetMethodOrNil, cacheTag, errorSelectorOrNil == SelectorDoesNotUnderstand); executeCogPICfromLinkedSendWithReceiverandCacheTag(cPIC, receiver, inlineCacheTagAt(backEnd, outerReturn)); - return null; + return; } @@ -4247,7 +4248,7 @@ } /* Cogit>>#compileBlockDispatchFrom:to: */ -static sqInt NoDbgRegParms +static void NoDbgRegParms compileBlockDispatchFromto(sqInt lowBlockStartIndex, sqInt highBlockStartIndex) { AbstractInstruction *anInstruction; @@ -4264,7 +4265,7 @@ /* begin Jump: */ jumpTarget = (blockStart->entryLabel); genoperand(Jump, ((sqInt)jumpTarget)); - return null; + return; } halfWay = (highBlockStartIndex + lowBlockStartIndex) / 2; assert(((halfWay >= lowBlockStartIndex) && (halfWay <= highBlockStartIndex))); @@ -4280,14 +4281,15 @@ jumpTarget1 = (blockStart->entryLabel); genConditionalBranchoperand(JumpLessOrEqual, ((sqInt)jumpTarget1)); compileBlockDispatchFromto(halfWay + 1, highBlockStartIndex); - return null; + return; } if ((halfWay + 1) == highBlockStartIndex) { blockStart = blockStartAt(highBlockStartIndex); /* begin JumpGreater: */ jumpTarget2 = (blockStart->entryLabel); genConditionalBranchoperand(JumpGreater, ((sqInt)jumpTarget2)); - return compileBlockDispatchFromto(lowBlockStartIndex, halfWay); + compileBlockDispatchFromto(lowBlockStartIndex, halfWay); + return; } /* begin JumpGreater: */ jmp = genConditionalBranchoperand(JumpGreater, ((sqInt)0)); @@ -5878,12 +5880,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - sqInt delta; + usqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - sqInt location; - sqInt mapEntry; + usqInt location; + usqInt mapEntry; sqInt maxDelta; usqInt mcpc; @@ -11689,7 +11691,7 @@ assert(methodOrBlockNumArgs <= (numRegArgs())); /* begin RetN: */ genoperand(RetN, 0); - jmpTarget(jumpTrue, genMoveConstantR(trueObject(), ReceiverResultReg)); + jmpTarget(jumpTrue, genMoveTrueR(ReceiverResultReg)); /* begin genPrimReturn */ assert(methodOrBlockNumArgs <= (numRegArgs())); /* begin RetN: */ @@ -11757,7 +11759,7 @@ assert(methodOrBlockNumArgs <= (numRegArgs())); /* begin RetN: */ genoperand(RetN, 0); - jmpTarget(jumpCond, genMoveConstantR(trueObject(), ReceiverResultReg)); + jmpTarget(jumpCond, genMoveTrueR(ReceiverResultReg)); /* begin genPrimReturn */ assert(methodOrBlockNumArgs <= (numRegArgs())); /* begin RetN: */ @@ -12133,7 +12135,7 @@ assert(methodOrBlockNumArgs <= (numRegArgs())); /* begin RetN: */ genoperand(RetN, 0); - jmpTarget(jumpCond, genMoveConstantR(trueObject(), ReceiverResultReg)); + jmpTarget(jumpCond, genMoveTrueR(ReceiverResultReg)); /* begin genPrimReturn */ assert(methodOrBlockNumArgs <= (numRegArgs())); /* begin RetN: */ @@ -15447,7 +15449,7 @@ /* begin JumpNonZero: */ jumpCmp = genConditionalBranchoperand(JumpNonZero, ((sqInt)0)); } - /* begin genMoveConstant:R: */ + /* begin genMoveTrueR: */ constant = trueObject(); if (shouldAnnotateObjectReference(constant)) { annotateobjRef(gMoveCwR(constant, ReceiverResultReg), constant); @@ -21975,19 +21977,6 @@ return 0; } - /* SimpleStackBasedCogit>>#genMoveConstant:R: */ -static AbstractInstruction * NoDbgRegParms -genMoveConstantR(sqInt constant, sqInt reg) -{ - AbstractInstruction *anInstruction; - - return (shouldAnnotateObjectReference(constant) - ? annotateobjRef(gMoveCwR(constant, reg), constant) - : (/* begin MoveCq:R: */ - (anInstruction = genoperandoperand(MoveCqR, constant, reg)), - anInstruction)); -} - /* SimpleStackBasedCogit>>#genMoveFalseR: */ static AbstractInstruction * NoDbgRegParms genMoveFalseR(sqInt reg) @@ -22005,7 +21994,7 @@ } /* SimpleStackBasedCogit>>#genMoveTrueR: */ -static sqInt NoDbgRegParms +static AbstractInstruction * NoDbgRegParms genMoveTrueR(sqInt reg) { AbstractInstruction *anInstruction; Modified: branches/Cog/nsspur64src/vm/cointerp.c =================================================================== --- branches/Cog/nsspur64src/vm/cointerp.c 2016-01-22 01:28:22 UTC (rev 3564) +++ branches/Cog/nsspur64src/vm/cointerp.c 2016-01-23 00:34:50 UTC (rev 3565) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1660 uuid: 372f5635-366a-462d-8979-ae86dee05577 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1662 uuid: 686f2648-1716-445e-8440-ec23d22489a5 from - CoInterpreter VMMaker.oscog-eem.1660 uuid: 372f5635-366a-462d-8979-ae86dee05577 + CoInterpreter VMMaker.oscog-eem.1662 uuid: 686f2648-1716-445e-8440-ec23d22489a5 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1660 uuid: 372f5635-366a-462d-8979-ae86dee05577 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1662 uuid: 686f2648-1716-445e-8440-ec23d22489a5 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -479,9 +479,9 @@ extern sqInt ceReturnToInterpreter(sqInt anOop); extern void ceSelfSendreceiver(sqInt cacheAddress, sqInt methodReceiver); extern sqInt ceSendAborttonumArgs(sqInt selector, sqInt rcvr, sqInt numArgs); -extern sqInt ceSendFromInLineCacheMiss(CogMethod *cogMethodOrPIC); +extern void ceSendFromInLineCacheMiss(CogMethod *cogMethodOrPIC); extern sqInt ceSendMustBeBoolean(sqInt anObject); -extern sqInt ceSendsupertonumArgs(sqInt selector, sqInt superNormalBar, sqInt rcvr, sqInt numArgs); +extern void ceSendsupertonumArgs(sqInt selector, sqInt superNormalBar, sqInt rcvr, sqInt numArgs); extern void ceStackOverflow(sqInt contextSwitchIfNotNil); extern void ceTraceBlockActivation(void); extern void ceTraceLinkedSend(sqInt theReceiver); @@ -527,7 +527,7 @@ extern sqInt getCurrentBytecode(void); extern char * getFramePointer(void); static sqInt NoDbgRegParms handleForwardedSendFaultForReceiverstackDelta(sqInt forwardedReceiver, sqInt stackDelta); -static sqInt NoDbgRegParms handleMNUInMachineCodeToclassForMessage(sqInt selectorIndex, sqInt rcvr, sqInt classForMessage); +static void NoDbgRegParms handleMNUInMachineCodeToclassForMessage(sqInt selectorIndex, sqInt rcvr, sqInt classForMessage); static sqInt NoDbgRegParms iframeIsBlockActivation(char *theFP); static sqInt NoDbgRegParms iframeReceiver(char *theFP); static sqInt NoDbgRegParms iframeSavedIP(char *theFP); @@ -584,7 +584,7 @@ extern sqInt primitivePropertyFlags(sqInt primIndex); extern void * primTraceLogAddress(void); extern usqInt primTraceLogIndexAddress(void); -extern sqInt printCogMethod(CogMethod *cogMethod); +extern void printCogMethod(CogMethod *cogMethod); static void NoDbgRegParms printFrameFlagsForFP(char *theFP); static void NoDbgRegParms printFrameMethodFor(char *theFP); static void NoDbgRegParms printFrameThingatextraString(char *name, char *address, char *extraStringOrNil); @@ -875,7 +875,7 @@ extern void ensureNoForwardedLiteralsIn(sqInt aMethodObj); extern usqInt freeStartAddress(void); extern usqInt getScavengeThreshold(void); -static sqInt NoDbgRegParms headerWhileForwardingOf(sqInt aCompiledMethodObjOop); +static sqLong NoDbgRegParms headerWhileForwardingOf(sqInt aCompiledMethodObjOop); extern sqInt isForwardedClassIndex(sqInt maybeClassIndex); extern sqInt isImmediateClass(sqInt classObj); extern sqInt isReallyYoungObject(sqInt objOop); @@ -1124,8 +1124,8 @@ static sqInt NoDbgRegParms isValidFreeObject(sqInt objOop); static sqInt NoDbgRegParms isValidObjStackAt(sqInt objStackRootIndex); static sqInt NoDbgRegParms isValidObjStackPagemyIndex(sqInt objStackPage, sqInt myx); -static sqInt NoDbgRegParms isValidObjStackPagemyIndexfirstPage(sqInt objStackPage, sqInt myx, sqInt isFirstPage); -static sqInt NoDbgRegParms isValidObjStack(sqInt objStack); +static void NoDbgRegParms isValidObjStackPagemyIndexfirstPage(sqInt objStackPage, sqInt myx, sqInt isFirstPage); +static void NoDbgRegParms isValidObjStack(sqInt objStack); static sqInt NoDbgRegParms isWeakFormat(sqInt format); static sqInt NoDbgRegParms isWeakNonImm(sqInt objOop); extern sqInt isWeak(sqInt oop); @@ -1196,7 +1196,7 @@ extern void printFreeChunk(sqInt freeChunk); static void NoDbgRegParms printFreeChunkprintAsTreeNode(sqInt freeChunk, sqInt printAsTreeNode); extern void printFreeListHeads(void); -extern sqInt printFreeList(sqInt chunkOrIndex); +extern void printFreeList(sqInt chunkOrIndex); extern void printFreeTree(void); static void NoDbgRegParms printFreeTreeChunk(sqInt chunkOrZero); extern void printHeaderOf(sqInt objOop); @@ -1343,8 +1343,8 @@ static sqInt NoDbgRegParms findClassContainingMethodstartingAt(sqInt meth, sqInt classObj); extern sqInt findClassOfMethodforReceiver(sqInt meth, sqInt rcvr); static char * NoDbgRegParms findFrameAboveinPage(char *theFP, StackPage *thePage); -static sqInt NoDbgRegParms findHomeForContext(sqInt aContext); -static sqInt NoDbgRegParms findMethodWithPrimitiveFromContextUpToContext(sqInt primitive, sqInt senderContext, sqInt homeContext); +static void NoDbgRegParms findHomeForContext(sqInt aContext); +static void NoDbgRegParms findMethodWithPrimitiveFromContextUpToContext(sqInt primitive, sqInt senderContext, sqInt homeContext); extern sqInt findSelectorOfMethod(sqInt methArg); static char * NoDbgRegParms findSPOfon(char *theFP, StackPage *thePage); static sqInt NoDbgRegParms findUnwindThroughContext(sqInt homeContext); @@ -1399,7 +1399,7 @@ extern sqInt isKindOfClass(sqInt oop, sqInt aClass); extern sqInt isKindOf(sqInt oop, char *className); extern sqInt isMemberOf(sqInt oop, char *className); -static sqInt NoDbgRegParms lengthOfNameOfClass(sqInt classOop); +static void NoDbgRegParms lengthOfNameOfClass(sqInt classOop); extern sqInt literalofMethod(sqInt offset, sqInt methodPointer); extern sqInt loadBitBltFrom(sqInt bb); extern void loadInitialContext(void); @@ -1407,7 +1407,7 @@ extern sqInt longStoreBytecodeForHeader(sqInt methodHeader); static sqInt NoDbgRegParms lookupInMethodCacheSelclassTag(sqInt selector, sqInt classTag); static sqInt NoDbgRegParms lookupLexicalfromrule(sqInt selector, sqInt mixin, sqInt rule); -static sqInt NoDbgRegParms lookupMethodInClass(sqInt class); +static void NoDbgRegParms lookupMethodInClass(sqInt class); static sqInt lookupMNU(void); static sqInt NoDbgRegParms lookupMNUInClass(sqInt class); static sqInt NoDbgRegParms lookupOrdinaryNoMNUEtcInClass(sqInt class); @@ -1453,7 +1453,7 @@ extern void printAllStacks(void); extern void printCallStack(void); static sqInt NoDbgRegParms printCallStackFP(char *theFP); -extern sqInt printCallStackOf(sqInt aContextOrProcessOrFrame); +extern void printCallStackOf(sqInt aContextOrProcessOrFrame); static sqInt NoDbgRegParms printCallStackOfcurrentFP(sqInt aContext, char *currFP); extern void printChar(sqInt aByte); static sqInt NoDbgRegParms printContextCallStackOf(sqInt aContext); @@ -1478,7 +1478,7 @@ extern void printOop(sqInt oop); extern void printProcessStack(sqInt aProcess); extern sqInt printProcsOnList(sqInt procList); -extern sqInt printStackCallStackOf(sqInt aContextOrProcessOrFrame); +extern void printStackCallStackOf(sqInt aContextOrProcessOrFrame); extern void printStackPageList(void); extern void printStackPageListInUse(void); extern void printStackPages(void); @@ -2436,7 +2436,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1660"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1662"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -18259,7 +18259,7 @@ /* self printStringOf: selector */ /* CoInterpreter>>#ceSendFromInLineCacheMiss: */ -sqInt +void ceSendFromInLineCacheMiss(CogMethod *cogMethodOrPIC) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt classObj; @@ -18314,11 +18314,13 @@ else { if (isOopForwarded((cogMethodOrPIC->selector))) { handleForwardedSelectorFaultFor((cogMethodOrPIC->selector)); - return ceSendFromInLineCacheMiss(cogMethodOrPIC); + ceSendFromInLineCacheMiss(cogMethodOrPIC); + return; } if (classTag == (isForwardedObjectClassIndexPun())) { handleForwardedSendFaultForReceiverstackDelta(rcvr, 1); - return ceSendFromInLineCacheMiss(cogMethodOrPIC); + ceSendFromInLineCacheMiss(cogMethodOrPIC); + return; } GIV(messageSelector) = (cogMethodOrPIC->selector); /* begin classAtIndex: */ @@ -18351,7 +18353,8 @@ executeNewMethod(); assert(0); } - return interpretMethodFromMachineCode(); + interpretMethodFromMachineCode(); + return; } /* CoInterpreter>>#ceSendMustBeBoolean: */ @@ -18394,7 +18397,7 @@ cogged or not. */ /* CoInterpreter>>#ceSend:super:to:numArgs: */ -sqInt +void ceSendsupertonumArgs(sqInt selector, sqInt superNormalBar, sqInt rcvr, sqInt numArgs) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt classObj; @@ -18481,11 +18484,13 @@ else { if (((selector & (tagMask())) == 0) && (((longAt(selector)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - return ceSendsupertonumArgs(handleForwardedSelectorFaultFor(selector), superNormalBar, rcvr, numArgs); + ceSendsupertonumArgs(handleForwardedSelectorFaultFor(selector), superNormalBar, rcvr, numArgs); + return; } if (classTag == (isForwardedObjectClassIndexPun())) { assert(superNormalBar == 0); - return ceSendsupertonumArgs(selector, superNormalBar, handleForwardedSendFaultForReceiverstackDelta(rcvr, 1), numArgs); + ceSendsupertonumArgs(selector, superNormalBar, handleForwardedSendFaultForReceiverstackDelta(rcvr, 1), numArgs); + return; } GIV(messageSelector) = selector; /* begin classAtIndex: */ @@ -18557,7 +18562,8 @@ top1 = longAt(GIV(stackPointer)); GIV(stackPointer) += BytesPerWord; GIV(instructionPointer) = top1; - return interpretMethodFromMachineCode(); + interpretMethodFromMachineCode(); + return; } @@ -18694,7 +18700,7 @@ static sqInt checkForAndFollowForwardedPrimitiveState(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt accessorDepth; + signed char accessorDepth; sqInt firstBytecode; sqInt found; sqInt found1; @@ -20253,7 +20259,7 @@ method. messageSelector is an implicit argument (yuck). */ /* CoInterpreter>>#handleMNU:InMachineCodeTo:classForMessage: */ -static sqInt NoDbgRegParms +static void NoDbgRegParms handleMNUInMachineCodeToclassForMessage(sqInt selectorIndex, sqInt rcvr, sqInt classForMessage) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt classForThisMessage; @@ -20302,7 +20308,8 @@ /* begin push: */ longAtput((sp = GIV(stackPointer) - BytesPerWord), GIV(instructionPointer)); GIV(stackPointer) = sp; - return handleMNUInMachineCodeToclassForMessage(errSelIdx, rcvr, classForThisMessage); + handleMNUInMachineCodeToclassForMessage(errSelIdx, rcvr, classForThisMessage); + return; } } if (((GIV(newMethod) & (tagMask())) == 0) @@ -20314,7 +20321,8 @@ executeCogMethodfromUnlinkedSendWithReceiver(cogMethodOf(GIV(newMethod)), rcvr); assert(0); } - return interpretMethodFromMachineCode(); + interpretMethodFromMachineCode(); + return; } @@ -24761,7 +24769,7 @@ } /* CoInterpreter>>#printCogMethod: */ -sqInt +void printCogMethod(CogMethod *cogMethod) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt address; @@ -43303,7 +43311,7 @@ (which shouldn't happen with Spur). */ /* Spur64BitCoMemoryManager>>#headerWhileForwardingOf: */ -static sqInt NoDbgRegParms +static sqLong NoDbgRegParms headerWhileForwardingOf(sqInt aCompiledMethodObjOop) { assert(!(isForwarded(aCompiledMethodObjOop))); @@ -54145,7 +54153,7 @@ /* Answer if the obj stack at stackRootIndex is valid. */ /* SpurMemoryManager>>#isValidObjStackPage:myIndex:firstPage: */ -static sqInt NoDbgRegParms +static void NoDbgRegParms isValidObjStackPagemyIndexfirstPage(sqInt objStackPage, sqInt myx, sqInt isFirstPage) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt freeOrNextPage; @@ -54154,33 +54162,33 @@ sqInt page; if (!(isValidObjStackPagemyIndex(objStackPage, myx))) { - return 0; + return; } freeOrNextPage = longAt((objStackPage + BaseHeaderSize) + (((long)ObjStackFreex) << (shiftForWord()))); while (freeOrNextPage != 0) { if (!isFirstPage) { GIV(objStackInvalidBecause) = "free page on other than first page"; GIV(invalidObjStackPage) = objStackPage; - return 0; + return; } if (freeOrNextPage == (longAt((objStackPage + BaseHeaderSize) + (((long)ObjStackNextx) << (shiftForWord()))))) { GIV(objStackInvalidBecause) = "free page = next page"; GIV(invalidObjStackPage) = freeOrNextPage; - return 0; + return; } if (!(isValidObjStackPagemyIndex(freeOrNextPage, myx))) { ns = malloc(((strlen(GIV(objStackInvalidBecause))) + (strlen(", on next page"))) + 2); strcpy(ns, GIV(objStackInvalidBecause)); GIV(objStackInvalidBecause) = strcat(ns, ", on next page"); - return 0; + return; } page = longAt((freeOrNextPage + BaseHeaderSize) + (((long)ObjStackFreex) << (shiftForWord()))); if ((page == freeOrNextPage) || (page == objStackPage)) { GIV(objStackInvalidBecause) = "circularity in free page list"; GIV(invalidObjStackPage) = page; - return 0; + return; } freeOrNextPage = page; } @@ -54188,46 +54196,48 @@ if (!(((myx >= (1LL << (22 - (classTableMajorIndexShift())))) && (myx <= (((1LL << (22 - (classTableMajorIndexShift()))) + 8) - 1))))) { GIV(objStackInvalidBecause) = "myx out of range"; GIV(invalidObjStackPage) = objStackPage; - return 0; + return; } if (!((longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (((long)myx) << (shiftForWord())))) == objStackPage)) { GIV(objStackInvalidBecause) = "firstPage is not root"; GIV(invalidObjStackPage) = objStackPage; - return 0; + return; } } index = longAt((objStackPage + BaseHeaderSize) + (((long)ObjStackTopx) << (shiftForWord()))); if (!(((index >= 0) && (index <= ObjStackLimit)))) { GIV(objStackInvalidBecause) = "bad topx"; GIV(invalidObjStackPage) = objStackPage; - return 0; + return; } freeOrNextPage = longAt((objStackPage + BaseHeaderSize) + (((long)ObjStackNextx) << (shiftForWord()))); if (freeOrNextPage == 0) { - return 1; + return; } if (freeOrNextPage == objStackPage) { GIV(objStackInvalidBecause) = "circularity in objStack page list"; GIV(invalidObjStackPage) = objStackPage; - return 0; + return; } - return isValidObjStackPagemyIndexfirstPage(freeOrNextPage, myx, 0); + isValidObjStackPagemyIndexfirstPage(freeOrNextPage, myx, 0); + return; } /* Answer if the obj stack at objStackRootIndex is valid. */ /* SpurMemoryManager>>#isValidObjStack: */ -static sqInt NoDbgRegParms +static void NoDbgRegParms isValidObjStack(sqInt objStack) { DECL_MAYBE_SQ_GLOBAL_STRUCT if (!((addressCouldBeObj(objStack)) && ((numSlotsOfAny(objStack)) == ObjStackPageSlots))) { GIV(objStackInvalidBecause) = "first page not obj or wrong size"; GIV(invalidObjStackPage) = objStack; - return 0; + return; } - return isValidObjStackPagemyIndexfirstPage(objStack, longAt((objStack + BaseHeaderSize) + (((long)ObjStackMyx) << (shiftForWord()))), 1); + isValidObjStackPagemyIndexfirstPage(objStack, longAt((objStack + BaseHeaderSize) + (((long)ObjStackMyx) << (shiftForWord()))), 1); + return; } /* SpurMemoryManager>>#isWeakFormat: */ @@ -63970,14 +63980,15 @@ } /* SpurMemoryManager>>#printFreeList: */ -sqInt +void printFreeList(sqInt chunkOrIndex) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt freeChunk; if ((chunkOrIndex >= 0) && (chunkOrIndex < 64)) { - return printFreeList(GIV(freeLists)[chunkOrIndex]); + printFreeList(GIV(freeLists)[chunkOrIndex]); + return; } freeChunk = chunkOrIndex; while (freeChunk != 0) { @@ -67210,7 +67221,7 @@ bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil) { usqInt bridgeSpan; - sqInt clifton; + usqInt clifton; usqInt segEnd; segEnd = ((aSegment->segSize)) + ((aSegment->segStart)); @@ -67390,7 +67401,7 @@ static void postSnapshot(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt address; + usqInt address; sqInt bytes; usqInt freeChunk; sqInt i; @@ -67579,7 +67590,7 @@ static sqInt NoDbgRegParms readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes) { DECL_MAYBE_SQ_GLOBAL_STRUCT - usqInt bridge; + sqInt bridge; usqInt bridgehead; usqLong bridgeSpan; sqInt bytesRead; @@ -67791,8 +67802,8 @@ { usqLong firstSavedBridgeWord; sqInt nWritten; - sqInt pier1; - sqInt pier2; + usqInt pier1; + usqInt pier2; usqLong secondSavedBridgeWord; pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize); @@ -70833,7 +70844,7 @@ } /* StackInterpreter>>#findHomeForContext: */ -static sqInt NoDbgRegParms +static void NoDbgRegParms findHomeForContext(sqInt aContext) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt closureOrNil; @@ -70841,18 +70852,19 @@ if (!(((aContext & (tagMask())) == 0) && (((longAt(aContext)) & (classIndexMask())) == ClassMethodContextCompactIndex))) { - return null; + return; } closureOrNil = longAt((aContext + BaseHeaderSize) + (((long)ClosureIndex) << (shiftForWord()))); if (closureOrNil == GIV(nilObj)) { - return aContext; + return; } if (((((tagBits = closureOrNil & (tagMask()))) != 0 ? longAt((GIV(classTableFirstPage) + BaseHeaderSize) + (((long)tagBits) << (shiftForWord()))) : fetchClassOfNonImm(closureOrNil))) != (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)ClassBlockClosure) << (shiftForWord()))))) { - return null; + return; } - return findHomeForContext(longAt((closureOrNil + BaseHeaderSize) + (((long)ClosureOuterContextIndex) << (shiftForWord())))); + findHomeForContext(longAt((closureOrNil + BaseHeaderSize) + (((long)ClosureOuterContextIndex) << (shiftForWord())))); + return; } @@ -70862,7 +70874,7 @@ wait. */ /* StackInterpreter>>#findMethodWithPrimitive:FromContext:UpToContext: */ -static sqInt NoDbgRegParms +static void NoDbgRegParms findMethodWithPrimitiveFromContextUpToContext(sqInt primitive, sqInt senderContext, sqInt homeContext) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt callerContextOrNil; @@ -70885,23 +70897,23 @@ theContext = senderContext; while (1) { if (theContext == GIV(nilObj)) { - return theContext; + return; } if (((((longAt((theContext + BaseHeaderSize) + (((long)SenderIndex) << (shiftForWord()))))) & 7) == 1)) break; if (theContext == homeContext) { - return 0; + return; } if (!((primitive == 0) || ((longAt((theContext + BaseHeaderSize) + (((long)ClosureIndex) << (shiftForWord())))) != GIV(nilObj)))) { theMethod = longAt((theContext + BaseHeaderSize) + (((long)MethodIndex) << (shiftForWord()))); if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == primitive) { - return theContext; + return; } } theContext = longAt((theContext + BaseHeaderSize) + (((long)SenderIndex) << (shiftForWord()))); } if (isWidowedContext(theContext)) { - return GIV(nilObj); + return; } /* begin findMethodWithPrimitive:FromFP:UpToContext: */ senderOop = longAt((theContext + BaseHeaderSize) + (((long)SenderIndex) << (shiftForWord()))); @@ -70915,7 +70927,7 @@ ? ((longAt(theFP + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 : (byteAt((theFP + FoxIFrameFlags) + 2)) != 0)) && (homeContext == (longAt(theFP + FoxThisContext)))) { - return 0; + return; } if (!((primitive == 0) || (((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) @@ -70940,9 +70952,11 @@ ? ((longAt(theFP + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 : (byteAt((theFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(theFP))); - return longAt(theFP + FoxThisContext); + longAt(theFP + FoxThisContext); + return; } - return marryFrameSP(theFP, theSP); + marryFrameSP(theFP, theSP); + return; } } theFPAbove = theFP; @@ -70961,9 +70975,10 @@ senderContext1 = callerContextOrNil; if (!(((senderContext1 & (tagMask())) == 0) && (((longAt(senderContext1)) & (classIndexMask())) == ClassMethodContextCompactIndex))) { - return GIV(nilObj); + return; } - return findMethodWithPrimitiveFromContextUpToContext(primitive, senderContext1, homeContext); + findMethodWithPrimitiveFromContextUpToContext(primitive, senderContext1, homeContext); + return; } /* StackInterpreter>>#findSelectorOfMethod: */ @@ -72390,7 +72405,7 @@ } /* StackInterpreter>>#lengthOfNameOfClass: */ -static sqInt NoDbgRegParms +static void NoDbgRegParms lengthOfNameOfClass(sqInt classOop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt fmt; @@ -72408,10 +72423,11 @@ ? ((usqInt) (((unsigned long)(((long)(longAt(classOop - BaseHeaderSize))) << 8)))) >> 8 : numSlots1); if (numSlots == GIV(metaclassNumSlots)) { - return lengthOfNameOfClass(longAt((classOop + BaseHeaderSize) + (((long)GIV(thisClassIndex)) << (shiftForWord())))); + lengthOfNameOfClass(longAt((classOop + BaseHeaderSize) + (((long)GIV(thisClassIndex)) << (shiftForWord())))); + return; } if (numSlots <= GIV(classNameIndex)) { - return 0; + return; } /* begin lengthOf: */ objOop = longAt((classOop + BaseHeaderSize) + (((long)GIV(classNameIndex)) << (shiftForWord()))); @@ -72423,23 +72439,26 @@ ? ((usqInt) (((unsigned long)(((long)(longAt(objOop - BaseHeaderSize))) << 8)))) >> 8 : numSlots11); if (fmt <= 5) { - return numSlots2; + return; } if (fmt >= (firstByteFormat())) { /* bytes, including CompiledMethod */ - return (((long)numSlots2) << (shiftForWord())) - (fmt & 7); + (((long)numSlots2) << (shiftForWord())) - (fmt & 7); + return; } if (fmt >= (firstShortFormat())) { - return (((long)numSlots2) << ((shiftForWord()) - 1)) - (fmt & 3); + (((long)numSlots2) << ((shiftForWord()) - 1)) - (fmt & 3); + return; } if (fmt >= (firstLongFormat())) { - return (((long)numSlots2) << ((shiftForWord()) - 2)) - (fmt & 1); + (((long)numSlots2) << ((shiftForWord()) - 2)) - (fmt & 1); + return; } if (fmt == (sixtyFourBitIndexableFormat())) { - return numSlots2; + return; } - return 0; + return; } /* StackInterpreter>>#literal:ofMethod: */ @@ -72939,7 +72958,7 @@ } /* StackInterpreter>>#lookupMethodInClass: */ -static sqInt NoDbgRegParms +static void NoDbgRegParms lookupMethodInClass(sqInt class) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt currentClass; @@ -72979,7 +72998,8 @@ GIV(messageSelector) = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)SelectorCannotInterpret) << (shiftForWord()))); /* begin sendBreakpoint:receiver: */ sendBreakpointreceiver(firstFixedFieldOfMaybeImmediate(GIV(messageSelector)), lengthOfMaybeImmediate(GIV(messageSelector)), null); - return lookupMethodInClass(followFieldofObject(SuperclassIndex, currentClass)); + lookupMethodInClass(followFieldofObject(SuperclassIndex, currentClass)); + return; } /* begin lookupMethodInDictionary: */ flag("endianness"); @@ -73084,7 +73104,7 @@ found = 0; l1: /* end lookupMethodInDictionary: */; if (found) { - return currentClass; + return; } /* begin followField:ofObject: */ objOop1 = longAt((currentClass + BaseHeaderSize) + (((long)SuperclassIndex) << (shiftForWord()))); @@ -73100,7 +73120,8 @@ createActualMessageTo(class); GIV(messageSelector) = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)SelectorDoesNotUnderstand) << (shiftForWord()))); sendBreakpointreceiver(GIV(messageSelector) + BaseHeaderSize, lengthOfformat(GIV(messageSelector), (((usqInt) (longAt(GIV(messageSelector)))) >> (formatShift())) & (formatMask())), null); - return lookupMethodInClass(class); + lookupMethodInClass(class); + return; } @@ -75643,24 +75664,26 @@ } /* StackInterpreter>>#printCallStackOf: */ -sqInt +void printCallStackOf(sqInt aContextOrProcessOrFrame) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt context; if ((((((usqInt)aContextOrProcessOrFrame)) & (BytesPerWord - 1)) == 0) && ((((((usqInt)aContextOrProcessOrFrame)) >= (((usqInt)(GIV(stackBasePlus1) - 1)))) && ((((usqInt)aContextOrProcessOrFrame)) <= (((usqInt)GIV(pages))))))) { - return printCallStackFP(((char *) aContextOrProcessOrFrame)); + printCallStackFP(((char *) aContextOrProcessOrFrame)); + return; } if (couldBeProcess(aContextOrProcessOrFrame)) { - return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + (((long)SuspendedContextIndex) << (shiftForWord())))); + printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + (((long)SuspendedContextIndex) << (shiftForWord())))); + return; } context = aContextOrProcessOrFrame; while (!(context == GIV(nilObj))) { if (((((longAt((context + BaseHeaderSize) + (((long)SenderIndex) << (shiftForWord()))))) & 7) == 1)) { if (!(checkIsStillMarriedContextcurrentFP(context, GIV(framePointer)))) { shortPrintContext(context); - return null; + return; } context = shortReversePrintFrameAndCallers(frameOfMarriedContext(context)); } @@ -77545,7 +77568,7 @@ } /* StackInterpreter>>#printStackCallStackOf: */ -sqInt +void printStackCallStackOf(sqInt aContextOrProcessOrFrame) { sqInt context; @@ -77555,12 +77578,14 @@ if ((((aContextOrProcessOrFrame & (tagMask())) == 0) && (((longAt(aContextOrProcessOrFrame)) & (classIndexMask())) == ClassMethodContextCompactIndex)) && (checkIsStillMarriedContextcurrentFP(aContextOrProcessOrFrame, null))) { - return printStackCallStackOf(((sqInt)(frameOfMarriedContext(aContextOrProcessOrFrame)))); + printStackCallStackOf(((sqInt)(frameOfMarriedContext(aContextOrProcessOrFrame)))); + return; } if (couldBeProcess(aContextOrProcessOrFrame)) { - return printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + (((long)SuspendedContextIndex) << (shiftForWord())))); + printCallStackOf(longAt((aContextOrProcessOrFrame + BaseHeaderSize) + (((long)SuspendedContextIndex) << (shiftForWord())))); + return; } - return null; + return; } theFP = ((void *)aContextOrProcessOrFrame); @@ -77569,7 +77594,7 @@ if (!((((((longAt((context + BaseHeaderSize) + (((long)SenderIndex) << (shiftForWord()))))) & 7) == 1)) && (((theFP = frameOfMarriedContext(context)), checkIsStillMarriedContextcurrentFP(context, theFP))))) { - return null; + return; } } } @@ -80648,7 +80673,7 @@ sqInt headerSize; squeakFileOffsetType headerStart; sqInt i; - sqInt imageBytes; + usqInt imageBytes; extern char imageName[]; sqInt okToWrite; void *sCWIfn; Modified: branches/Cog/nsspur64src/vm/cointerp.h =================================================================== --- branches/Cog/nsspur64src/vm/cointerp.h 2016-01-22 01:28:22 UTC (rev 3564) +++ branches/Cog/nsspur64src/vm/cointerp.h 2016-01-23 00:34:50 UTC (rev 3565) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1660 uuid: 372f5635-366a-462d-8979-ae86dee05577 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1662 uuid: 686f2648-1716-445e-8440-ec23d22489a5 */ @@ -42,9 +42,9 @@ extern sqInt ceReturnToInterpreter(sqInt anOop); extern void ceSelfSendreceiver(sqInt cacheAddress, sqInt methodReceiver); extern sqInt ceSendAborttonumArgs(sqInt selector, sqInt rcvr, sqInt numArgs); -extern sqInt ceSendFromInLineCacheMiss(CogMethod *cogMethodOrPIC); +extern void ceSendFromInLineCacheMiss(CogMethod *cogMethodOrPIC); extern sqInt ceSendMustBeBoolean(sqInt anObject); -extern sqInt ceSendsupertonumArgs(sqInt selector, sqInt superNormalBar, sqInt rcvr, sqInt numArgs); +extern void ceSendsupertonumArgs(sqInt selector, sqInt superNormalBar, sqInt rcvr, sqInt numArgs); extern void ceStackOverflow(sqInt contextSwitchIfNotNil); extern void ceTraceBlockActivation(void); extern void ceTraceLinkedSend(sqInt theReceiver); @@ -89,7 +89,7 @@ extern sqInt primitivePropertyFlags(sqInt primIndex); extern void * primTraceLogAddress(void); extern usqInt primTraceLogIndexAddress(void); -extern sqInt printCogMethod(CogMethod *cogMethod); +extern void printCogMethod(CogMethod *cogMethod); extern sqInt printFrameWithSP(char *theFP, char *theSP); extern void printMethodCacheFor(sqInt thing); extern sqInt quickPrimitiveConstantFor(sqInt aQuickPrimitiveIndex); @@ -222,7 +222,7 @@ extern void printFreeChunks(void); extern void printFreeChunk(sqInt freeChunk); extern void printFreeListHeads(void); -extern sqInt printFreeList(sqInt chunkOrIndex); +extern void printFreeList(sqInt chunkOrIndex); extern void printFreeTree(void); extern void printHeaderOf(sqInt objOop); extern void printInstancesOf(sqInt aClassOop); @@ -283,7 +283,7 @@ extern sqInt primitiveIndexOfMethodheader(sqInt theMethod, sqInt methodHeader); extern sqInt primitiveIndexOf(sqInt methodPointer); extern void printAllStacks(void); -extern sqInt printCallStackOf(sqInt aContextOrProcessOrFrame); +extern void printCallStackOf(sqInt aContextOrProcessOrFrame); extern void printChar(sqInt aByte); extern void printHex(sqInt n); extern void printLikelyImplementorsOfSelector(sqInt selector); @@ -292,7 +292,7 @@ extern void printMethodDictionary(sqInt dictionary); extern void printProcessStack(sqInt aProcess); extern sqInt printProcsOnList(sqInt procList); -extern sqInt printStackCallStackOf(sqInt aContextOrProcessOrFrame); +extern void printStackCallStackOf(sqInt aContextOrProcessOrFrame); extern void printStackReferencesTo(sqInt oop); extern void print(char *s); extern void setBreakMNUSelector(char *aString); Modified: branches/Cog/nsspur64src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspur64src/vm/gcc3x-cointerp.c 2016-01-22 01:28:22 UTC (rev 3564) +++ branches/Cog/nsspur64src/vm/gcc3x-cointerp.c 2016-01-23 00:34:50 UTC (rev 3565) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1660 uuid: 372f5635-366a-462d-8979-ae86dee05577 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1662 uuid: 686f2648-1716-445e-8440-ec23d22489a5 from - CoInterpreter VMMaker.oscog-eem.1660 uuid: 372f5635-366a-462d-8979-ae86dee05577 + CoInterpreter VMMaker.oscog-eem.1662 uuid: 686f2648-1716-445e-8440-ec23d22489a5 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1660 uuid: 372f5635-366a-462d-8979-ae86dee05577 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1662 uuid: 686f2648-1716-445e-8440-ec23d22489a5 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -482,9 +482,9 @@ extern sqInt ceReturnToInterpreter(sqInt anOop); extern void ceSelfSendreceiver(sqInt cacheAddress, sqInt methodReceiver); extern sqInt ceSendAborttonumArgs(sqInt selector, sqInt rcvr, sqInt numArgs); -extern sqInt ceSendFromInLineCacheMiss(CogMethod *cogMethodOrPIC); +extern void ceSendFromInLineCacheMiss(CogMethod *cogMethodOrPIC); extern sqInt ceSendMustBeBoolean(sqInt anObject); -extern sqInt ceSendsupertonumArgs(sqInt selector, sqInt superNormalBar, sqInt rcvr, sqInt numArgs); +extern void ceSendsupertonumArgs(sqInt selector, sqInt superNormalBar, sqInt rcvr, sqInt numArgs); extern void ceStackOverflow(sqInt contextSwitchIfNotNil); extern void ceTraceBlockActivation(void); extern void ceTraceLinkedSend(sqInt theReceiver); @@ -530,7 +530,7 @@ extern sqInt getCurrentBytecode(void); extern char * getFramePointer(void); static sqInt NoDbgRegParms handleForwardedSendFaultForReceiverstackDelta(sqInt forwardedReceiver, sqInt stackDelta); -static sqInt NoDbgRegParms handleMNUInMachineCodeToclassForMessage(sqInt selectorIndex, sqInt rcvr, sqInt classForMessage); +static void NoDbgRegParms handleMNUInMachineCodeToclassForMessage(sqInt selectorIndex, sqInt rcvr, sqInt classForMessage); static sqInt NoDbgRegParms iframeIsBlockActivation(char *theFP); static sqInt NoDbgRegParms iframeReceiver(char *theFP); static sqInt NoDbgRegParms iframeSavedIP(char *theFP); @@ -587,7 +587,7 @@ extern sqInt primitivePropertyFlags(sqInt primIndex); extern void * primTraceLogAddress(void); extern usqInt primTraceLogIndexAddress(void); -extern sqInt printCogMethod(CogMethod *cogMethod); +extern void printCogMethod(CogMethod *cogMethod); static void NoDbgRegParms printFrameFlagsForFP(char *theFP); static void NoDbgRegParms printFrameMethodFor(char *theFP); static void NoDbgRegParms printFrameThingatextraString(char *name, char *address, char *extraStringOrNil); @@ -878,7 +878,7 @@ extern void ensureNoForwardedLiteralsIn(sqInt aMethodObj); extern usqInt freeStartAddress(void); extern usqInt getScavengeThreshold(void); -static sqInt NoDbgRegParms headerWhileForwardingOf(sqInt aCompiledMethodObjOop); +static sqLong NoDbgRegParms headerWhileForwardingOf(sqInt aCompiledMethodObjOop); extern sqInt isForwardedClassIndex(sqInt maybeClassIndex); extern sqInt isImmediateClass(sqInt classObj); extern sqInt isReallyYoungObject(sqInt objOop); @@ -1127,8 +1127,8 @@ static sqInt NoDbgRegParms isValidFreeObject(sqInt objOop); static sqInt NoDbgRegParms isValidObjStackAt(sqInt objStackRootIndex); static sqInt NoDbgRegParms isValidObjStackPagemyIndex(sqInt objStackPage, sqInt myx); -static sqInt NoDbgRegParms isValidObjStackPagemyIndexfirstPage(sqInt objStackPage, sqInt myx, sqInt isFirstPage); -static sqInt NoDbgRegParms isValidObjStack(sqInt objStack); +static void NoDbgRegParms isValidObjStackPagemyIndexfirstPage(sqInt objStackPage, sqInt myx, sqInt isFirstPage); +static void NoDbgRegParms isValidObjStack(sqInt objStack); static sqInt NoDbgRegParms isWeakFormat(sqInt format); static sqInt NoDbgRegParms isWeakNonImm(sqInt objOop); extern sqInt isWeak(sqInt oop); @@ -1199,7 +1199,7 @@ extern void printFreeChunk(sqInt freeChunk); static void NoDbgRegParms printFreeChunkprintAsTreeNode(sqInt freeChunk, sqInt printAsTreeNode); extern void printFreeListHeads(void); -extern sqInt printFreeList(sqInt chunkOrIndex); +extern void printFreeList(sqInt chunkOrIndex); extern void printFreeTree(void); static void NoDbgRegParms printFreeTreeChunk(sqInt chunkOrZero); extern void printHeaderOf(sqInt objOop); @@ -1346,8 +1346,8 @@ static sqInt NoDbgRegParms findClassContainingMethodstartingAt(sqInt meth, sqInt classObj); extern sqInt findClassOfMethodforReceiver(sqInt meth, sqInt rcvr); static char * NoDbgRegParms findFrameAboveinPage(char *theFP, StackPage *thePage); -static sqInt NoDbgRegParms findHomeForContext(sqInt aContext); -static sqInt NoDbgRegParms findMethodWithPrimitiveFromContextUpToContext(sqInt primitive, sqInt senderContext, sqInt homeContext); +static void NoDbgRegParms findHomeForContext(sqInt aContext); +static void NoDbgRegParms findMethodWithPrimitiveFromContextUpToContext(sqInt primitive, sqInt senderContext, sqInt homeContext); extern sqInt findSelectorOfMethod(sqInt methArg); static char * NoDbgRegParms findSPOfon(char *theFP, StackPage *thePage); static sqInt NoDbgRegParms findUnwindThroughContext(sqInt homeContext); @@ -1402,7 +1402,7 @@ extern sqInt isKindOfClass(sqInt oop, sqInt aClass); extern sqInt isKindOf(sqInt oop, char *className); extern sqInt isMemberOf(sqInt oop, char *className); -static sqInt NoDbgRegParms lengthOfNameOfClass(sqInt classOop); +static void NoDbgRegParms lengthOfNameOfClass(sqInt classOop); extern sqInt literalofMethod(sqInt offset, sqInt methodPointer); extern sqInt loadBitBltFrom(sqInt bb); extern void loadInitialContext(void); @@ -1410,7 +1410,7 @@ extern sqInt longStoreBytecodeForHeader(sqInt methodHeader); static sqInt NoDbgRegParms lookupInMethodCacheSelclassTag(sqInt selector, sqInt classTag); static sqInt NoDbgRegParms lookupLexicalfromrule(sqInt selector, sqInt mixin, sqInt rule); -static sqInt NoDbgRegParms lookupMethodInClass(sqInt class); +static void NoDbgRegParms lookupMethodInClass(sqInt class); static sqInt lookupMNU(void); static sqInt NoDbgRegParms lookupMNUInClass(sqInt class); static sqInt NoDbgRegParms lookupOrdinaryNoMNUEtcInClass(sqInt class); @@ -1456,7 +1456,7 @@ extern void printAllStacks(void); extern void printCallStack(void); static sqInt NoDbgRegParms printCallStackFP(char *theFP); -extern sqInt printCallStackOf(sqInt aContextOrProcessOrFrame); +extern void printCallStackOf(sqInt aContextOrProcessOrFrame); static sqInt NoDbgRegParms printCallStackOfcurrentFP(sqInt aContext, char *currFP); extern void printChar(sqInt aByte); static sqInt NoDbgRegParms printContextCallStackOf(sqInt aContext); @@ -1481,7 +1481,7 @@ extern void printOop(sqInt oop); extern void printProcessStack(sqInt aProcess); extern sqInt printProcsOnList(sqInt procList); -extern sqInt printStackCallStackOf(sqInt aContextOrProcessOrFrame); +extern void printStackCallStackOf(sqInt aContextOrProcessOrFrame); extern void printStackPageList(void); extern void printStackPageListInUse(void); extern void printStackPages(void); @@ -2439,7 +2439,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1660"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1662"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -18268,7 +18268,7 @@ /* self printStringOf: selector */ /* CoInterpreter>>#ceSendFromInLineCacheMiss: */ -sqInt +void ceSendFromInLineCacheMiss(CogMethod *cogMethodOrPIC) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt classObj; @@ -18323,11 +18323,13 @@ else { if (isOopForwarded((cogMethodOrPIC->selector))) { handleForwardedSelectorFaultFor((cogMethodOrPIC->selector)); - return ceSendFromInLineCacheMiss(cogMethodOrPIC); + ceSendFromInLineCacheMiss(cogMethodOrPIC); + return; } if (classTag == (isForwardedObjectClassIndexPun())) { handleForwardedSendFaultForReceiverstackDelta(rcvr, 1); - return ceSendFromInLineCacheMiss(cogMethodOrPIC); + ceSendFromInLineCacheMiss(cogMethodOrPIC); + return; } GIV(messageSelector) = (cogMethodOrPIC->selector); /* begin classAtIndex: */ @@ -18360,7 +18362,8 @@ executeNewMethod(); assert(0); } - return interpretMethodFromMachineCode(); + interpretMethodFromMachineCode(); + return; } /* CoInterpreter>>#ceSendMustBeBoolean: */ @@ -18403,7 +18406,7 @@ cogged or not. */ /* CoInterpreter>>#ceSend:super:to:numArgs: */ -sqInt +void ceSendsupertonumArgs(sqInt selector, sqInt superNormalBar, sqInt rcvr, sqInt numArgs) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt classObj; @@ -18490,11 +18493,13 @@ else { if (((selector & (tagMask())) == 0) && (((longAt(selector)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - return ceSendsupertonumArgs(handleForwardedSelectorFaultFor(selector), superNormalBar, rcvr, numArgs); + ceSendsupertonumArgs(handleForwardedSelectorFaultFor(selector), superNormalBar, rcvr, numArgs); + return; } if (classTag == (isForwardedObjectClassIndexPun())) { assert(superNormalBar == 0); - return ceSendsupertonumArgs(selector, superNormalBar, handleForwardedSendFaultForReceiverstackDelta(rcvr, 1), numArgs); + ceSendsupertonumArgs(selector, superNormalBar, handleForwardedSendFaultForReceiverstackDelta(rcvr, 1), numArgs); + return; } GIV(messageSelector) = selector; /* begin classAtIndex: */ @@ -18566,7 +18571,8 @@ top1 = longAt(GIV(stackPointer)); GIV(stackPointer) += BytesPerWord; GIV(instructionPointer) = top1; - return interpretMethodFromMachineCode(); + interpretMethodFromMachineCode(); + return; } @@ -18703,7 +18709,7 @@ static sqInt checkForAndFollowForwardedPrimitiveState(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt accessorDepth; + signed char accessorDepth; sqInt firstBytecode; sqInt found; sqInt found1; @@ -20262,7 +20268,7 @@ method. messageSelector is an implicit argument (yuck). */ /* CoInterpreter>>#handleMNU:InMachineCodeTo:classForMessage: */ -static sqInt NoDbgRegParms +static void NoDbgRegParms handleMNUInMachineCodeToclassForMessage(sqInt selectorIndex, sqInt rcvr, sqInt classForMessage) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt classForThisMessage; @@ -20311,7 +20317,8 @@ /* begin push: */ longAtput((sp = GIV(stackPointer) - BytesPerWord), GIV(instructionPointer)); GIV(stackPointer) = sp; - return handleMNUInMachineCodeToclassForMessage(errSelIdx, rcvr, classForThisMessage); + handleMNUInMachineCodeToclassForMessage(errSelIdx, rcvr, classForThisMessage); + return; } } if (((GIV(newMethod) & (tagMask())) == 0) @@ -20323,7 +20330,8 @@ executeCogMethodfromUnlinkedSendWithReceiver(cogMethodOf(GIV(newMethod)), rcvr); assert(0); } - return interpretMethodFromMachineCode(); + interpretMethodFromMachineCode(); + return; } @@ -24770,7 +24778,7 @@ } /* CoInterpreter>>#printCogMethod: */ -sqInt +void printCogMethod(CogMethod *cogMethod) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt address; @@ -43312,7 +43320,7 @@ (which shouldn't happen with Spur). */ /* Spur64BitCoMemoryManager>>#headerWhileForwardingOf: */ -static sqInt NoDbgRegParms +static sqLong NoDbgRegParms headerWhileForwardingOf(sqInt aCompiledMethodObjOop) { assert(!(isForwarded(aCompiledMethodObjOop))); @@ -54154,7 +54162,7 @@ /* Answer if the obj stack at stackRootIndex is valid. */ /* SpurMemoryManager>>#isValidObjStackPage:myIndex:firstPage: */ -static sqInt NoDbgRegParms +static void NoDbgRegParms isValidObjStackPagemyIndexfirstPage(sqInt objStackPage, sqInt myx, sqInt isFirstPage) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt freeOrNextPage; @@ -54163,33 +54171,33 @@ sqInt page; if (!(isValidObjStackPagemyIndex(objStackPage, myx))) { - return 0; + return; } freeOrNextPage = longAt((objStackPage + BaseHeaderSize) + (((long)ObjStackFreex) << (shiftForWord()))); while (freeOrNextPage != 0) { if (!isFirstPage) { GIV(objStackInvalidBecause) = "free page on other than first page"; GIV(invalidObjStackPage) = objStackPage; - return 0; + return; } if (freeOrNextPage == (longAt((objStackPage + BaseHeaderSize) + (((long)ObjStackNextx) << (shiftForWord()))))) { @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.1662.mcz
by commits＠source.squeak.org 23 Jan '16

23 Jan '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1662.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1662 Author: eem Time: 23 January 2016, 4:15:00.048507 pm UUID: 686f2648-1716-445e-8440-ec23d22489a5 Ancestors: VMMaker.oscog-eem.1661 Slang: Fix bad regression in type inference from VMMaker.oscog-eem.1587. returnTypeForSend:in: can only default return types to sqInt for unknown sdelectors. The rewrite in VMMaker.oscog-eem.1587 inadvertently defaulted the return type of known methods whose return type was yet to be determined to sqInt. The fix is to only default to sqInt if there is no known method for the given selector. This fixes the weird flipping of the type of 32-bit Spur's headerWhileForwardingOf: StackInterpreterSimulator: determine the endPC of a method without depending on Cogit. This allows StackInterpreter to do symbolicMethod: also. =============== Diff against VMMaker.oscog-eem.1661 =============== Item was changed: ----- Method: CCodeGenerator>>returnTypeForSend:in: (in category 'type inference') ----- returnTypeForSend: sendNode in: aTMethod "Answer the return type for a send. Absent sends default to #sqInt. The bitwise operators answer unsigned versions of their argument types, at least in gcc although this author can't find that in the C99 spec. If you can find this, please let me know." + | sel methodOrNil | + methodOrNil := self anyMethodNamed: (sel := sendNode selector). + (methodOrNil notNil and: [methodOrNil returnType notNil]) ifTrue: + [^self baseTypeForType: methodOrNil returnType]. - | sel | - (self anyMethodNamed: (sel := sendNode selector)) ifNotNil: - [:m| - m returnType ifNotNil: [:type| ^self baseTypeForType: type]]. ^kernelReturnTypes at: sel ifAbsent: [sel caseOf: { [#+] -> [self typeForArithmetic: sendNode in: aTMethod]. [#-] -> [self typeForArithmetic: sendNode in: aTMethod]. [#*] -> [self typeForArithmetic: sendNode in: aTMethod]. [#/] -> [self typeForArithmetic: sendNode in: aTMethod]. [#addressOf:] -> [(self typeFor: sendNode receiver in: aTMethod) ifNil: [#sqInt] ifNotNil: [:type| type, (type last isLetter ifTrue: [' *'] ifFalse: ['*'])]]. [#at:] -> [self typeForDereference: sendNode in: aTMethod]. [#bitAnd:] -> [self typeForArithmetic: sendNode in: aTMethod]. [#bitOr:] -> [self typeForArithmetic: sendNode in: aTMethod]. [#bitXor:] -> [self typeForArithmetic: sendNode in: aTMethod]. [#asFloat] -> [#double]. [#atan] -> [#double]. [#exp] -> [#double]. [#log] -> [#double]. [#sin] -> [#double]. [#sqrt] -> [#double]. [#asLong] -> [#long]. [#asUnsignedInteger] -> [#usqInt]. [#asUnsignedLong] -> [#'unsigned long']. [#asVoidPointer] -> [#'void *']. [#signedIntToLong] -> [#usqInt]. "c.f. generateSignedIntToLong:on:indent:" [#signedIntToShort] -> [#usqInt]. "c.f. generateSignedIntToShort:on:indent:" [#cCoerce:to:] -> [sendNode args last value]. [#cCoerceSimple:to:] -> [sendNode args last value]. [#ifTrue:ifFalse:] -> [self typeForConditional: sendNode in: aTMethod]. [#ifFalse:ifTrue:] -> [self typeForConditional: sendNode in: aTMethod]. [#ifTrue:] -> [self typeForConditional: sendNode in: aTMethod]. [#ifFalse:] -> [self typeForConditional: sendNode in: aTMethod] } + otherwise: "If there /is/ a method for sel but its retrn type is as yet unknown we /mustn't/ default it. + We can only default unbound selectors." + [methodOrNil ifNotNil: [nil] ifNil: [#sqInt]]]! - otherwise: [#sqInt]]! Item was added: + ----- Method: StackInterpreterSimulator>>cogit (in category 'simulation only') ----- + cogit + "We don't have a cogit; try and get by on our own devices." + ^self! Item was added: + ----- Method: StackInterpreterSimulator>>endPCOf: (in category 'compiled methods') ----- + endPCOf: aMethod + "Determine the endPC of a method in the heap using interpretation that looks for returns." + + <var: #descriptor type: #'BytecodeDescriptor *'> + | pc end farthestContinuation prim encoderClass inst is | + (prim := self primitiveIndexOf: aMethod) > 0 ifTrue: + [(self isQuickPrimitiveIndex: prim) ifTrue: + [^(self startPCOfMethod: aMethod) - 1]]. + encoderClass := self encoderClassForHeader: (objectMemory methodHeaderOf: aMethod). + is := (InstructionStream + on: (VMCompiledMethodProxy new + for: aMethod + coInterpreter: self + objectMemory: objectMemory)). + pc := farthestContinuation := self startPCOfMethod: aMethod. + end := objectMemory numBytesOf: aMethod. + is pc: pc + 1. + [pc <= end] whileTrue: + [inst := encoderClass interpretNextInstructionFor: MessageCatcher new in: is. + inst selector + caseOf: { + [#pushClosureCopyNumCopiedValues:numArgs:blockSize:] + -> [is pc: is pc + inst arguments last. + farthestContinuation := farthestContinuation max: pc]. + [#jump:] -> [farthestContinuation := farthestContinuation max: pc + inst arguments first]. + [#jump:if:] -> [farthestContinuation := farthestContinuation max: pc + inst arguments first]. + [#methodReturnConstant:] -> [pc >= farthestContinuation ifTrue: [end := pc]]. + [#methodReturnReceiver] -> [pc >= farthestContinuation ifTrue: [end := pc]]. + [#methodReturnTop] -> [pc >= farthestContinuation ifTrue: [end := pc]] } + otherwise: []. + pc := is pc - 1]. + ^end!

1 0

Re: [Pharo-dev] [ANN] Pharo bootstrap
by Guillermo Polito 22 Jan '16

22 Jan '16

Well, there is no formal specification… But I could summarize the features as follows (and as Christophe points mostly out) OzVM supports having two images in logically separated spaces. This separation is achieved by using the free bit in the object header. Thus we support only two spaces by now. - The main addition is actually a new primitive: #resumeFromSpecialObjectsArray that receives an special objects array as argument and: - resumes the execution from the active process of such array - on context switch, if the VM is running from a second special objects array, it will return to the first one instead. - fixes to primitives/bytecodes that assume a single special objects array. e.g., - #someObject and #nextObject should only iterate objects from the correct “space” - #isNil comparisons should take the correct nil - the GC should set the correct nil object on Weak containers The extensions I made are about 20 overrides to StackPrimitive and NewObjectMemory methods. The rest is implemented completely on image side. We use mirror primitives to manipulate objects from other space (as each image/space has it’s own selector table). I have in my long TODO list see if the "clever hack” I did can be supported in a nice manner on top of Spur’s segmented memory. However, I should stop commencing new projects and start finishing them :P. > On 20 ene 2016, at 9:03 a.m., Christophe Demarey <Christophe.Demarey(a)inria.fr> wrote: > > Hi Eliot, > > Le 19 janv. 2016 à 19:29, Eliot Miranda a écrit : > >> Hi All, >> >> great news! Where can I read a specification of the Oz VM facilities? > > I do not know all the details of the Oz VM but basically, it is a standard stack interpreter vm specialized to be able to run 2 images at the same time on top of it. > Guillermo made it possible by using one available bit in the object header of objects to mark the ownership of an object (e.g. is my object from image1 or image2?). Then, he mainly had to specialize VM primitives dealing with objects retrieval from memory. By example, he had to modify the garbage collector to set the right nil instance (yes, we have 2 images so 2 nil instances. we need to take the one of the active image) when an object is garbage collected; the primitive someObject has to return an object from the active image, etc. > There is also a way to switch execution from an image to the other just by switching the special objects array reference. > > You can find some information in: https://guillep.github.io/files/publications/Poli15Thesis.pdf <https://guillep.github.io/files/publications/Poli15Thesis.pdf>. > The Oz code is in http://smalltalkhub.com/#!/~Guille/ObjectSpace <http://smalltalkhub.com/#!/~Guille/ObjectSpace> and in https://github.com/guillep/OzVM <https://github.com/guillep/OzVM> > The current implementation uses Cog 6.6.1and OzVM-GuillermoPolito.22. > I do not know if Guille has a more formal specification of the Oz VM. > > If you have advices on what is the best way to handle two distinct object (memory) spaces in Spur, they will be welcomed :) > > Cheers, > Christophe > > >> _,,,^..^,,,_ (phone) >> >> On Jan 19, 2016, at 6:29 AM, Christophe Demarey <christophe.demarey(a)inria.fr <mailto:christophe.demarey@inria.fr>> wrote: >> >>> Hi all, >>> >>> In case you do not know, we work on bootstrapping Pharo, i.e. create a Pharo image from sources, not based on a previous image (well, we use a pharo image to produce it but no code / state from it). >>> >>> This process will allow to define a minimal Pharo kernel (currently 52 packages but we could have it far smaller) and to modularize the whole image (currently packages have too much dependencies on packages already loaded into the image). >>> The bootstrap process also allows to write down the recipe to initialize a new image from scratch (some code is missing in the image or is wrong). In addition, I think we will clean a lot of historical objects that are not used anymore. >>> >>> With the amazing work done by Guillermo Polito during his Phd (around Espell, Oz): https://guillep.github.io/files/publications/Poli15Thesis.pdf <https://guillep.github.io/files/publications/Poli15Thesis.pdf>, we succeeded to get a first prototype of a bootstraped Pharo 5 image (from 5.392). >>> This prototype is able to run an eval command line handler and to log output / errors. Not all classes are yet initialized and you cannot yet save / restart this image but it is a big step forward. >>> It is a 4 mb image (could be half the size without unicode data). You can download it at: http://chercheurs.lille.inria.fr/~demarey/pmwiki/pub/pharo-bootstrap/pharo-… <http://chercheurs.lille.inria.fr/~demarey/pmwiki/pub/pharo-bootstrap/pharo-…>. >>> >>> Next steps are to have a bootstrapped image fully working, then to load packages on top of it (like network, sunit) to produce a minimal image. >>> Then, we need to implement an Oz VM on top of Spur. >>> After that, we need to work on a reliable way to build the bootstrap (not too sensitive to changes in the image). >>> >>> Christophe. >>> >>> ------- >>> demarey@193-51-236-143:~/dev/rmod/bootstrap/bootstrap-2016-01-19$ ../pharo bootstrap.image --no-default-preferences eval "1 + 1" >>> 2 >>> demarey@193-51-236-143:~/dev/rmod/bootstrap/bootstrap-2016-01-19$ ../pharo bootstrap.image --no-default-preferences eval "'a' , 'b'" >>> 'ab' >>> demarey@193-51-236-143:~/dev/rmod/bootstrap/bootstrap-2016-01-19$ ../pharo bootstrap.image --no-default-preferences eval "1 / 0" >>> ZeroDivide >>> SmallInteger>>/ >>> UndefinedObject>>DoIt >>> OpalCompiler>>evaluate >>> OpalCompiler(AbstractCompiler)>>evaluate: >>> SmalltalkImage>>evaluate: >>> >>> EvaluateCommandLineHandler>>no (source is Undeclared) >>> no source in EvaluateCommandLineHandler>>evaluate: in Block: no source >>> BlockClosure>>on:do: >>> EvaluateCommandLineHandler>>evaluate: >>> EvaluateCommandLineHandler>>evaluateArguments >>> EvaluateCommandLineHandler>>activate >>> EvaluateCommandLineHandler class(CommandLineHandler class)>>activateWith: >>> >>> BasicCommandLineHandler>>no (source is Undeclared) >>> no source in PharoCommandLineHandler(BasicCommandLineHandler)>>activateSubCommand: in Block: no source >>> BlockClosure>>on:do: >>> PharoCommandLineHandler(BasicCommandLineHandler)>>activateSubCommand: >>> PharoCommandLineHandler(BasicCommandLineHandler)>>handleSubcommand >>> PharoCommandLineHandler(BasicCommandLineHandler)>>handleArgument: >>> >>> BasicCommandLineHandler>>no (source is Undeclared) >>> no source in PharoCommandLineHandler(BasicCommandLineHandler)>>activate in Block: no source >>> BlockClosure>>on:do: >>> PharoCommandLineHandler(BasicCommandLineHandler)>>activate >>> PharoCommandLineHandler>>activate >>> PharoCommandLineHandler class(CommandLineHandler class)>>activateWith: >>> >>> PharoCommandLineHandler class>>no (source is Undeclared) >>> no source in PharoCommandLineHandler class>>activateWith: in Block: no source >>> NonInteractiveUIManager(UIManager)>>defer: >>> PharoCommandLineHandler class>>activateWith: >>> no source in BasicCommandLineHandler>>activateSubCommand: in Block: no source >>> BlockClosure>>on:do: >>> BasicCommandLineHandler>>activateSubCommand: >>> BasicCommandLineHandler>>handleSubcommand >>> BasicCommandLineHandler>>handleArgument: >>> no source in BasicCommandLineHandler>>activate in Block: no source >>> >>> SmallInteger>>no (source is Undeclared) >>> >>> UndefinedObject>>no (source is Undeclared) >>> >>> AbstractCompiler>>no (source is Undeclared) >>> >>> SmalltalkImage>>no (source is Undeclared) >>> >>> BlockClosure>>no (source is Undeclared) >>> >>> EvaluateCommandLineHandler>>no (source is Undeclared) >>> >>> EvaluateCommandLineHandler>>no (source is Undeclared) >>> >>> CommandLineHandler class>>no (source is Undeclared) >>> >>> BasicCommandLineHandler>>no (source is Undeclared) >>> >>> BasicCommandLineHandler>>no (source is Undeclared) >>> >>> PharoCommandLineHandler>>no (source is Undeclared) >>> >>> UIManager>>no (source is Undeclared) >>> >>> UndefinedObject>>no (source is Undeclared) >>> >>> CommandLineUIManager>>no (source is Undeclared) >>> >>> SmalltalkImage>>no (source is Undeclared) >>> >>> DelayMicrosecondScheduler>>no (source is Undeclared) >>> >>> BlockClosure>>no (source is Undeclared) >>> >>> SmalltalkImage>>no (source is Undeclared) >>> >>> WeakArray class>>no (source is Undeclared) >>> >>> >>> ps: source cannot be displayed because there is no formatter available in the bootstrap >>> >

2 1

Re: [Vm-dev] VM Maker: VMMaker.oscog-eem.1661.mcz
by David T. Lewis 22 Jan '16

22 Jan '16

Surely one of the all time great commit comments :-) Dave On Fri, Jan 22, 2016 at 01:13:56AM +0000, commits(a)source.squeak.org wrote: > > Eliot Miranda uploaded a new version of VMMaker to project VM Maker: > http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1661.mcz > > ==================== Summary ==================== > > Name: VMMaker.oscog-eem.1661 > Author: eem > Time: 22 January 2016, 5:13:11.061636 pm > UUID: a34e0ec2-d251-4618-bd67-cef5b3eddcf5 > Ancestors: VMMaker.oscog-eem.1660 > > Cogit IMMUTABILITY cleanups. > > Remove the need to map the primitive error code store bytecode by having mapFor:bcpc:performUntil:arg: skip the CallPrimitive & StoreTemp bytecoees if present. Also avoid the set-up overhead when mapping the first bytecode by moving the first invocation early. > > Correct and simplify testBcToMcPcMappingForCogMethod:; is compiled method parameter was never used, and the startpc of a method should be derived from the cogmethod's method obj. > > Refactor genImmutableCheck:slotIndex:sourceReg:scratchReg:needRestoreRcvr: to lose its unused popBoolean: keyword. > > Implement IMMTABILITY in SimpleStackBasedCogit. All combinations of SimpleStackBasedCogit x StackToRegisterMappingCogit x IMMTABILITY=true/false work on the reader image in the simulator. THANKS Cl�ment!! > Add SimpleStackBasedCogit>>putSelfInReceiverResultReg and use it where appropriate. > > Fix a comment or three. > > Oh we will, we will not be moved. > Oh we have im-mut-a-bil-i-ty > Just by a bit in every object header, > we will not be moved. > > [ed: that's pinning, surely] > > =============== Diff against VMMaker.oscog-eem.1660 =============== >

1 0

[commit][3564] CogVM source as per VMMaker.oscog-eem.1661
by commits＠squeakvm.org 22 Jan '16

22 Jan '16

Revision: 3564 Author: eliot Date: 2016-01-21 17:28:22 -0800 (Thu, 21 Jan 2016) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1661 Release Clement's IMMUTABILITY work. Make IMMUTABILITY something that is defined on the C compiler command line. Cogit IMMUTABILITY cleanups: Remove the need to map the primitive error code store bytecode by having mapFor:bcpc:performUntil:arg: skip the CallPrimitive & StoreTemp bytecoedes if present. Also avoid the set-up overhead when mapping the first bytecode by moving the first invocation early. Make the married context inst var assign methods deny immutability for their contexts. Plugins: Fix the FilePlugin's unnecessary fullGC on Spur. Modified Paths: -------------- branches/Cog/nsspur64src/vm/cogit.h branches/Cog/nsspur64src/vm/cogitX64.c branches/Cog/nsspur64src/vm/cointerp.c branches/Cog/nsspur64src/vm/cointerp.h branches/Cog/nsspur64src/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/plugins/FilePlugin/FilePlugin.c branches/Cog/nsspursrc/plugins/IA32ABI/IA32ABI.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogitARMv5.c branches/Cog/nsspursrc/vm/cogitIA32.c branches/Cog/nsspursrc/vm/cogitMIPSEL.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstack64src/vm/gcc3x-interp.c branches/Cog/nsspurstack64src/vm/interp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/spur64src/vm/cogit.h branches/Cog/spur64src/vm/cogitX64.c branches/Cog/spur64src/vm/cointerp.c branches/Cog/spur64src/vm/cointerp.h branches/Cog/spur64src/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogitARMv5.c branches/Cog/spursistasrc/vm/cogitIA32.c branches/Cog/spursistasrc/vm/cogitMIPSEL.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogitARMv5.c branches/Cog/spursrc/vm/cogitIA32.c branches/Cog/spursrc/vm/cogitMIPSEL.c branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/plugins/B2DPlugin/B2DPlugin.c branches/Cog/src/plugins/FilePlugin/FilePlugin.c branches/Cog/src/plugins/IA32ABI/IA32ABI.c branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/IA32FFIPlugin.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogitARMv5.c branches/Cog/src/vm/cogitIA32.c branches/Cog/src/vm/cogitMIPSEL.c branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Added Paths: ----------- branches/Cog/build.linux32x86/nsnac.cog.spur/ branches/Cog/build.linux32x86/nsnac.cog.spur/build/ branches/Cog/build.linux32x86/nsnac.cog.spur/build/mvm branches/Cog/build.linux32x86/nsnac.cog.spur/build.assert/ branches/Cog/build.linux32x86/nsnac.cog.spur/build.assert/mvm branches/Cog/build.linux32x86/nsnac.cog.spur/build.assert.itimerheartbeat/ branches/Cog/build.linux32x86/nsnac.cog.spur/build.assert.itimerheartbeat/mvm branches/Cog/build.linux32x86/nsnac.cog.spur/build.debug/ branches/Cog/build.linux32x86/nsnac.cog.spur/build.debug/mvm branches/Cog/build.linux32x86/nsnac.cog.spur/build.debug.itimerheartbeat/ branches/Cog/build.linux32x86/nsnac.cog.spur/build.debug.itimerheartbeat/mvm branches/Cog/build.linux32x86/nsnac.cog.spur/build.itimerheartbeat/ branches/Cog/build.linux32x86/nsnac.cog.spur/build.itimerheartbeat/mvm branches/Cog/build.linux32x86/nsnac.cog.spur/makeallclean branches/Cog/build.linux32x86/nsnac.cog.spur/makealldirty branches/Cog/build.linux32x86/nsnac.cog.spur/plugins.ext branches/Cog/build.linux32x86/nsnac.cog.spur/plugins.int Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Added: branches/Cog/build.linux32x86/nsnac.cog.spur/build/mvm =================================================================== --- branches/Cog/build.linux32x86/nsnac.cog.spur/build/mvm (rev 0) +++ branches/Cog/build.linux32x86/nsnac.cog.spur/build/mvm 2016-01-22 01:28:22 UTC (rev 3564) @@ -0,0 +1,39 @@ +#!/bin/bash +# VM with VM profiler and threaded heartbeat +INSTALLDIR=nscogspurlinuxht +# Some gcc versions create a broken VM using -O2 +case `gcc -v 2>&1 | grep version | sed 's/gcc version *//'` in +3.4.*) OPT="-g -O1 -fwrapv -DNDEBUG -DDEBUGVM=0";; +*) OPT="-g -O2 -DNDEBUG -DDEBUGVM=0";; +esac + +if [ $# -ge 1 ]; then + case "$1" in + -*) ;; + *) INSTALLDIR="$1"; shift + esac +fi + +echo -n "clean? " +read a +case $a in +n|no|N|NO) echo "ok but this isn't safe!!";; +*) rm config.h; test -f Makefile && make reallyclean +esac +test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .) +test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .) +test -f config.h || ../../../platforms/unix/config/configure \ + --with-vmversion=5.0 \ + --with-src=nsspursrc --with-plugins=nsspursrc/plugins \ + --without-vm-display-fbdev --without-npsqueak \ + CC="gcc -m32" \ + CXX="g++ -m32" \ + CFLAGS="$OPT -DEnforceAccessControl=0 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" \ + LIBS="-lpthread -luuid" \ + LDFLAGS=-Wl,-z,now +rm -f vm/sqUnixMain.o # nuke version info +rm -rf ../../../products/$INSTALLDIR +# prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` +# but older linux readlinks lack the -f flag +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@" Property changes on: branches/Cog/build.linux32x86/nsnac.cog.spur/build/mvm ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32x86/nsnac.cog.spur/build.assert/mvm =================================================================== --- branches/Cog/build.linux32x86/nsnac.cog.spur/build.assert/mvm (rev 0) +++ branches/Cog/build.linux32x86/nsnac.cog.spur/build.assert/mvm 2016-01-22 01:28:22 UTC (rev 3564) @@ -0,0 +1,35 @@ +#!/bin/bash +# assert Spur VM with VM profiler and threaded heartbeat +INSTALLDIR=assert/nscogspurlinuxht +OPT="-g3 -O1 -fwrapv -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0" + +if [ $# -ge 1 ]; then + case "$1" in + -*) ;; + *) INSTALLDIR="$1"; shift + esac +fi + +echo -n "clean? " +read a +case $a in +n|no|N|NO) echo "ok but this isn't safe!!";; +*) rm config.h; test -f Makefile && make reallyclean +esac +test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .) +test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .) +test -f config.h || ../../../platforms/unix/config/configure \ + --with-vmversion=5.0 \ + --with-src=nsspursrc --with-plugins=nsspursrc/plugins \ + --without-vm-display-fbdev --without-npsqueak \ + CC="gcc -m32" \ + CXX="g++ -m32" \ + CFLAGS="$OPT -DEnforceAccessControl=0 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" \ + LIBS="-lpthread -luuid" \ + LDFLAGS=-Wl,-z,now +rm -f vm/sqUnixMain.o # nuke version info +rm -rf ../../../products/$INSTALLDIR +# prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` +# but older linux readlinks lack the -f flag +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@" Property changes on: branches/Cog/build.linux32x86/nsnac.cog.spur/build.assert/mvm ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32x86/nsnac.cog.spur/build.assert.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux32x86/nsnac.cog.spur/build.assert.itimerheartbeat/mvm (rev 0) +++ branches/Cog/build.linux32x86/nsnac.cog.spur/build.assert.itimerheartbeat/mvm 2016-01-22 01:28:22 UTC (rev 3564) @@ -0,0 +1,33 @@ +#!/bin/bash +# assert Spur VM with VM profiler and itimer heartbeat +INSTALLDIR=assert/nscogspurlinux +OPT="-g3 -O1 -fwrapv -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0" + +if [ $# -ge 1 ]; then + case "$1" in + -*) ;; + *) INSTALLDIR="$1"; shift + esac +fi + +echo -n "clean? " +read a +case $a in +n|no|N|NO) echo "ok but this isn't safe!!";; +*) rm config.h; test -f Makefile && make reallyclean +esac +test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .) +test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .) +test -f config.h || ../../../platforms/unix/config/configure \ + --with-vmversion=5.0 \ + --with-src=nsspursrc --with-plugins=nsspursrc/plugins \ + --without-vm-display-fbdev --without-npsqueak \ + CC="gcc -m32" \ + CXX="g++ -m32" \ + CFLAGS="$OPT -DEnforceAccessControl=0 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DITIMER_HEARTBEAT=1" \ + LIBS="-lpthread -luuid" \ + LDFLAGS=-Wl,-z,now +rm -f vm/sqUnixMain.o # nuke version info +rm -rf ../../../products/$INSTALLDIR +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@" Property changes on: branches/Cog/build.linux32x86/nsnac.cog.spur/build.assert.itimerheartbeat/mvm ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32x86/nsnac.cog.spur/build.debug/mvm =================================================================== --- branches/Cog/build.linux32x86/nsnac.cog.spur/build.debug/mvm (rev 0) +++ branches/Cog/build.linux32x86/nsnac.cog.spur/build.debug/mvm 2016-01-22 01:28:22 UTC (rev 3564) @@ -0,0 +1,35 @@ +#!/bin/bash +# debug Spur VM with VM profiler and threaded heartbeat +INSTALLDIR=debug/nscogspurlinuxht +OPT="-g3 -O0 -fwrapv -DDEBUGVM=1" + +if [ $# -ge 1 ]; then + case "$1" in + -*) ;; + *) INSTALLDIR="$1"; shift + esac +fi + +echo -n "clean? " +read a +case $a in +n|no|N|NO) echo "ok but this isn't safe!!";; +*) rm config.h; test -f Makefile && make reallyclean +esac +test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .) +test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .) +test -f config.h || ../../../platforms/unix/config/configure \ + --with-vmversion=5.0 \ + --with-src=nsspursrc --with-plugins=nsspursrc/plugins \ + --without-vm-display-fbdev --without-npsqueak \ + CC="gcc -m32" \ + CXX="g++ -m32" \ + CFLAGS="$OPT -DEnforceAccessControl=0 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" \ + LIBS="-lpthread -luuid" \ + LDFLAGS=-Wl,-z,now +rm -f vm/sqUnixMain.o # nuke version info +rm -rf ../../../products/$INSTALLDIR +# prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` +# but older linux readlinks lack the -f flag +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@" Property changes on: branches/Cog/build.linux32x86/nsnac.cog.spur/build.debug/mvm ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32x86/nsnac.cog.spur/build.debug.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux32x86/nsnac.cog.spur/build.debug.itimerheartbeat/mvm (rev 0) +++ branches/Cog/build.linux32x86/nsnac.cog.spur/build.debug.itimerheartbeat/mvm 2016-01-22 01:28:22 UTC (rev 3564) @@ -0,0 +1,33 @@ +#!/bin/bash +# debug Spur VM with VM profiler and itimer heartbeat +INSTALLDIR=debug/nscogspurlinux +OPT="-g3 -O0 -fwrapv -DDEBUGVM=1" + +if [ $# -ge 1 ]; then + case "$1" in + -*) ;; + *) INSTALLDIR="$1"; shift + esac +fi + +echo -n "clean? " +read a +case $a in +n|no|N|NO) echo "ok but this isn't safe!!";; +*) rm config.h; test -f Makefile && make reallyclean +esac +test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .) +test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .) +test -f config.h || ../../../platforms/unix/config/configure \ + --with-vmversion=5.0 \ + --with-src=nsspursrc --with-plugins=nsspursrc/plugins \ + --without-vm-display-fbdev --without-npsqueak \ + CC="gcc -m32" \ + CXX="g++ -m32" \ + CFLAGS="$OPT -DEnforceAccessControl=0 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DITIMER_HEARTBEAT=1" \ + LIBS="-lpthread -luuid" \ + LDFLAGS=-Wl,-z,now +rm -f vm/sqUnixMain.o # nuke version info +rm -rf ../../../products/$INSTALLDIR +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@" Property changes on: branches/Cog/build.linux32x86/nsnac.cog.spur/build.debug.itimerheartbeat/mvm ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32x86/nsnac.cog.spur/build.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux32x86/nsnac.cog.spur/build.itimerheartbeat/mvm (rev 0) +++ branches/Cog/build.linux32x86/nsnac.cog.spur/build.itimerheartbeat/mvm 2016-01-22 01:28:22 UTC (rev 3564) @@ -0,0 +1,37 @@ +#!/bin/bash +# Spur VM with VM profiler and itimer heartbeat +INSTALLDIR=nscogspurlinux +# Some gcc versions create a broken VM using -O2 +case `gcc -v 2>&1 | grep version | sed 's/gcc version *//'` in +3.4.*) OPT="-g -O1 -fwrapv -DNDEBUG -DDEBUGVM=0";; +*) OPT="-g -O2 -DNDEBUG -DDEBUGVM=0";; +esac + +if [ $# -ge 1 ]; then + case "$1" in + -*) ;; + *) INSTALLDIR="$1"; shift + esac +fi + +echo -n "clean? " +read a +case $a in +n|no|N|NO) echo "ok but this isn't safe!!";; +*) rm config.h; test -f Makefile && make reallyclean +esac +test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .) +test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .) +test -f config.h || ../../../platforms/unix/config/configure \ + --with-vmversion=5.0 \ + --with-src=nsspursrc --with-plugins=nsspursrc/plugins \ + --without-vm-display-fbdev --without-npsqueak \ + CC="gcc -m32" \ + CXX="g++ -m32" \ + CFLAGS="$OPT -DEnforceAccessControl=0 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DITIMER_HEARTBEAT=1" \ + LIBS="-lpthread -luuid" \ + LDFLAGS=-Wl,-z,now +rm -f vm/sqUnixMain.o # nuke version info +rm -rf ../../../products/$INSTALLDIR +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@" Property changes on: branches/Cog/build.linux32x86/nsnac.cog.spur/build.itimerheartbeat/mvm ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32x86/nsnac.cog.spur/makeallclean =================================================================== --- branches/Cog/build.linux32x86/nsnac.cog.spur/makeallclean (rev 0) +++ branches/Cog/build.linux32x86/nsnac.cog.spur/makeallclean 2016-01-22 01:28:22 UTC (rev 3564) @@ -0,0 +1,15 @@ +#!/bin/sh +trap 'exit 2' HUP INT PIPE TERM +if [ "$1" = -fork ]; then + shift + for d in `dirname $0`/build*; do + (cd ./$d + echo y | ./mvm "$@") & + done + wait +else + for d in `dirname $0`/build*; do + (cd ./$d + echo y | ./mvm "$@") + done +fi Property changes on: branches/Cog/build.linux32x86/nsnac.cog.spur/makeallclean ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32x86/nsnac.cog.spur/makealldirty =================================================================== --- branches/Cog/build.linux32x86/nsnac.cog.spur/makealldirty (rev 0) +++ branches/Cog/build.linux32x86/nsnac.cog.spur/makealldirty 2016-01-22 01:28:22 UTC (rev 3564) @@ -0,0 +1,15 @@ +#!/bin/sh +trap 'exit 2' HUP INT PIPE TERM +if [ "$1" = -fork ]; then + shift + for d in `dirname $0`/build*; do + (cd ./$d + echo n | ./mvm "$@") & + done + wait +else + for d in `dirname $0`/build*; do + (cd ./$d + echo n | ./mvm "$@") + done +fi Property changes on: branches/Cog/build.linux32x86/nsnac.cog.spur/makealldirty ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32x86/nsnac.cog.spur/plugins.ext =================================================================== --- branches/Cog/build.linux32x86/nsnac.cog.spur/plugins.ext (rev 0) +++ branches/Cog/build.linux32x86/nsnac.cog.spur/plugins.ext 2016-01-22 01:28:22 UTC (rev 3564) @@ -0,0 +1,3 @@ +# Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.ext +EXTERNAL_PLUGINS = \ +SqueakSSL Added: branches/Cog/build.linux32x86/nsnac.cog.spur/plugins.int =================================================================== --- branches/Cog/build.linux32x86/nsnac.cog.spur/plugins.int (rev 0) +++ branches/Cog/build.linux32x86/nsnac.cog.spur/plugins.int 2016-01-22 01:28:22 UTC (rev 3564) @@ -0,0 +1,27 @@ +# Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int +INTERNAL_PLUGINS = \ +AioPlugin \ +AsynchFilePlugin \ +BMPReadWriterPlugin \ +B2DPlugin \ +BitBltPlugin \ +DSAPrims \ +DropPlugin \ +FileCopyPlugin \ +FilePlugin \ +FloatArrayPlugin \ +FloatMathPlugin \ +ZipPlugin \ +JPEGReadWriter2Plugin \ +JPEGReaderPlugin \ +LargeIntegers \ +Matrix2x3Plugin \ +MiscPrimitivePlugin \ +IA32ABI \ +RePlugin \ +SecurityPlugin \ +SocketPlugin \ +SurfacePlugin \ +UUIDPlugin \ +UnixOSProcessPlugin \ +VMProfileLinuxSupportPlugin Modified: branches/Cog/nsspur64src/vm/cogit.h =================================================================== --- branches/Cog/nsspur64src/vm/cogit.h 2016-01-20 02:33:22 UTC (rev 3563) +++ branches/Cog/nsspur64src/vm/cogit.h 2016-01-22 01:28:22 UTC (rev 3564) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1656 uuid: 02086cbf-8db3-4035-9f0d-f2671db50748 + CCodeGenerator VMMaker.oscog-eem.1661 uuid: a34e0ec2-d251-4618-bd67-cef5b3eddcf5 */ Modified: branches/Cog/nsspur64src/vm/cogitX64.c =================================================================== --- branches/Cog/nsspur64src/vm/cogitX64.c 2016-01-20 02:33:22 UTC (rev 3563) +++ branches/Cog/nsspur64src/vm/cogitX64.c 2016-01-22 01:28:22 UTC (rev 3564) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1656 uuid: 02086cbf-8db3-4035-9f0d-f2671db50748 + CCodeGenerator VMMaker.oscog-eem.1661 uuid: a34e0ec2-d251-4618-bd67-cef5b3eddcf5 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1656 uuid: 02086cbf-8db3-4035-9f0d-f2671db50748 + StackToRegisterMappingCogit VMMaker.oscog-eem.1661 uuid: a34e0ec2-d251-4618-bd67-cef5b3eddcf5 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1656 uuid: 02086cbf-8db3-4035-9f0d-f2671db50748 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1661 uuid: a34e0ec2-d251-4618-bd67-cef5b3eddcf5 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -184,7 +184,9 @@ #define HasBytecodePC 4 #define HeaderIndex 0 #define IDIVR 117 +#if !defined(IMMUTABILITY) /* Allow this to be overridden on the compiler command line */ #define IMMUTABILITY 0 +#endif #define IMULRR 118 #define InstanceSpecificationIndex 2 #define InstructionPointerIndex 1 @@ -499,6 +501,7 @@ static sqInt NoDbgRegParms cPICHasTarget(CogMethod *cPIC, CogMethod *targetMethod); static AbstractInstruction * NoDbgRegParms gDivRRQuoRem(sqInt rDivisor, sqInt rDividend, sqInt rQuotient, sqInt rRemainder); extern sqInt defaultCogCodeSize(void); +static sqInt NoDbgRegParms deltaToSkipPrimAndErrorStoreInheader(sqInt aMethodObj, sqInt aMethodHeader); static sqInt NoDbgRegParms endPCOf(sqInt aMethod); extern void enterCogCodePopReceiver(void); static sqInt NoDbgRegParms expectedClosedPICPrototype(CogMethod *cPIC); @@ -959,8 +962,9 @@ static sqInt genLongUnconditionalBackwardJump(void); static sqInt genLongUnconditionalForwardJump(void); static sqInt NoDbgRegParms genLookupForPerformNumArgs(sqInt numArgs); +static AbstractInstruction * NoDbgRegParms genMoveConstantR(sqInt constant, sqInt reg); static AbstractInstruction * NoDbgRegParms genMoveFalseR(sqInt reg); -static AbstractInstruction * NoDbgRegParms genMoveTrueR(sqInt reg); +static sqInt NoDbgRegParms genMoveTrueR(sqInt reg); static sqInt NoDbgRegParms genMustBeBooleanTrampolineForcalled(sqInt boolean, char *trampolineName); static void NoDbgRegParms genPrimReturnEnterCogCodeEnilopmart(sqInt profiling); static sqInt genPushClosureTempsBytecode(void); @@ -1000,7 +1004,6 @@ static sqInt genStoreAndPopTemporaryVariableBytecode(void); static sqInt genStoreRemoteTempLongBytecode(void); static void maybeCompileAllocFillerCheck(void); -static sqInt methodUsesPrimitiveErrorCode(void); static sqInt numSpecialSelectors(void); static PrimitiveDescriptor * primitiveGeneratorOrNil(void); extern void recordCallOffsetIn(CogMethod *cogMethod); @@ -1167,7 +1170,6 @@ void (*ceCallCogCodePopReceiverArg0Regs)(void); void (*ceCallCogCodePopReceiverArg1Arg0Regs)(void); void (*ceCallCogCodePopReceiverReg)(void); -static sqInt ceCannotAssignToWithIndexTrampoline; sqInt ceCannotResumeTrampoline; void (*ceCaptureCStackPointers)(void); static unsigned long (*ceCheckFeaturesFunction)(void); @@ -2804,6 +2806,18 @@ latestContinuation = 0; /* begin mapFor:bcpc:performUntil:arg: */ assert(((cogMethod->stackCheckOffset)) > 0); + + /* The stack check maps to the start of the first bytecode, + the first bytecode being effectively after frame build. */ + mcpc1 = (((usqInt)cogMethod)) + ((cogMethod->stackCheckOffset)); + result = findIsBackwardBranchMcpcBcpcMatchingMcpc(null, 0, (((char *) mcpc1)), startbcpc, (((void *)mcpc))); + if (result != 0) { + return result; + } + + /* In both CMMethod and CMBlock cases find the start of the map and + skip forward to the bytecode pc map entry for the stack check. */ + bcpc = startbcpc; if (((cogMethod->cmType)) == CMMethod) { isInBlock = 0; homeMethod = ((CogMethod *) cogMethod); @@ -2821,9 +2835,11 @@ bsOffset = (headerIndicatesAlternateBytecodeSet(aMethodHeader) ? 256 : 0); + bcpc += deltaToSkipPrimAndErrorStoreInheader(aMethodObj, (homeMethod->methodHeader)); } else { isInBlock = 1; + assert(bcpc == ((cogMethod->startpc))); homeMethod = cmHomeMethod(cogMethod); map = findMapLocationForMcpcinMethod((((usqInt)cogMethod)) + (sizeof(CogBlockMethod)), homeMethod); assert(map != 0); @@ -2847,17 +2863,11 @@ endbcpc = (bcpc + ((descriptor->numBytes))) + (((descriptor->isBlockCreation) ? ((descriptor->spanFunction))(descriptor, bcpc, -1, aMethodObj) : 0)); + bcpc = startbcpc; } - bcpc = startbcpc; - mcpc1 = (((usqInt)cogMethod)) + ((cogMethod->stackCheckOffset)); - /* The stack check maps to the start of the first bytecode, - the first bytecode being effectively after frame build. */ + /* Now skip up through the bytecode pc map entry for the stack check. */ nExts = 0; - result = findIsBackwardBranchMcpcBcpcMatchingMcpc(null, 0, (((char *) mcpc1)), startbcpc, (((void *)mcpc))); - if (result != 0) { - return result; - } while ((((usqInt) (byteAt(map))) >> AnnotationShift) != HasBytecodePC) { map -= 1; } @@ -4548,15 +4558,10 @@ static sqInt compileMethodBody(void) { - sqInt deltaForPrimErrorCode; - if (endPC < initialPC) { return 0; } - deltaForPrimErrorCode = (methodUsesPrimitiveErrorCode() - ? (sizeOfCallPrimitiveBytecode(methodHeader)) + (sizeOfLongStoreTempBytecode(methodHeader)) - : 0); - return compileAbstractInstructionsFromthrough(initialPC + deltaForPrimErrorCode, endPC); + return compileAbstractInstructionsFromthrough(initialPC + (deltaToSkipPrimAndErrorStoreInheader(methodObj, methodHeader)), endPC); } @@ -4920,6 +4925,20 @@ return 1024 * 1400; } + +/* Answer the number of bytecodes to skip to get to the first bytecode + past the primitive call and any store of the error code. */ + + /* Cogit>>#deltaToSkipPrimAndErrorStoreIn:header: */ +static sqInt NoDbgRegParms +deltaToSkipPrimAndErrorStoreInheader(sqInt aMethodObj, sqInt aMethodHeader) +{ + return (((primitiveIndexOfMethodheader(aMethodObj, aMethodHeader)) > 0) + && ((longStoreBytecodeForHeader(aMethodHeader)) == (fetchByteofObject(initialPC + (sizeOfCallPrimitiveBytecode(aMethodHeader)), aMethodObj))) + ? (sizeOfCallPrimitiveBytecode(aMethodHeader)) + (sizeOfLongStoreTempBytecode(aMethodHeader)) + : 0); +} + /* Cogit>>#endPCOf: */ static sqInt NoDbgRegParms endPCOf(sqInt aMethod) @@ -8177,6 +8196,18 @@ latestContinuation = 0; /* begin mapFor:bcpc:performUntil:arg: */ assert(((cogMethod->stackCheckOffset)) > 0); + + /* The stack check maps to the start of the first bytecode, + the first bytecode being effectively after frame build. */ + mcpc = (((usqInt)cogMethod)) + ((cogMethod->stackCheckOffset)); + result = 0; + if (result != 0) { + return result; + } + + /* In both CMMethod and CMBlock cases find the start of the map and + skip forward to the bytecode pc map entry for the stack check. */ + bcpc1 = startbcpc; if (((cogMethod->cmType)) == CMMethod) { isInBlock = 0; homeMethod = ((CogMethod *) cogMethod); @@ -8194,9 +8225,11 @@ bsOffset = (headerIndicatesAlternateBytecodeSet(aMethodHeader) ? 256 : 0); + bcpc1 += deltaToSkipPrimAndErrorStoreInheader(aMethodObj, (homeMethod->methodHeader)); } else { isInBlock = 1; + assert(bcpc1 == ((cogMethod->startpc))); homeMethod = cmHomeMethod(cogMethod); map = findMapLocationForMcpcinMethod((((usqInt)cogMethod)) + (sizeof(CogBlockMethod)), homeMethod); assert(map != 0); @@ -8220,17 +8253,11 @@ endbcpc = (bcpc1 + ((descriptor->numBytes))) + (((descriptor->isBlockCreation) ? ((descriptor->spanFunction))(descriptor, bcpc1, -1, aMethodObj) : 0)); + bcpc1 = startbcpc; } - bcpc1 = startbcpc; - mcpc = (((usqInt)cogMethod)) + ((cogMethod->stackCheckOffset)); - /* The stack check maps to the start of the first bytecode, - the first bytecode being effectively after frame build. */ + /* Now skip up through the bytecode pc map entry for the stack check. */ nExts = 0; - result = 0; - if (result != 0) { - return result; - } while ((((usqInt) (byteAt(map))) >> AnnotationShift) != HasBytecodePC) { map -= 1; } @@ -11418,6 +11445,7 @@ jumpNotSI = genJumpNotSmallIntegerscratchReg(Arg0Reg, TempReg); genShiftAwaySmallIntegerTagsInScratchReg(ClassReg); genRemoveSmallIntegerTagsInScratchReg(Arg1Reg); + /* begin MulR:R: */ genMulRR(backEnd, Arg1Reg, ClassReg); /* begin JumpOverflow: */ jumpOvfl = genConditionalBranchoperand(JumpOverflow, ((sqInt)0)); @@ -11661,7 +11689,7 @@ assert(methodOrBlockNumArgs <= (numRegArgs())); /* begin RetN: */ genoperand(RetN, 0); - jmpTarget(jumpTrue, genMoveTrueR(ReceiverResultReg)); + jmpTarget(jumpTrue, genMoveConstantR(trueObject(), ReceiverResultReg)); /* begin genPrimReturn */ assert(methodOrBlockNumArgs <= (numRegArgs())); /* begin RetN: */ @@ -11729,7 +11757,7 @@ assert(methodOrBlockNumArgs <= (numRegArgs())); /* begin RetN: */ genoperand(RetN, 0); - jmpTarget(jumpCond, genMoveTrueR(ReceiverResultReg)); + jmpTarget(jumpCond, genMoveConstantR(trueObject(), ReceiverResultReg)); /* begin genPrimReturn */ assert(methodOrBlockNumArgs <= (numRegArgs())); /* begin RetN: */ @@ -12105,7 +12133,7 @@ assert(methodOrBlockNumArgs <= (numRegArgs())); /* begin RetN: */ genoperand(RetN, 0); - jmpTarget(jumpCond, genMoveTrueR(ReceiverResultReg)); + jmpTarget(jumpCond, genMoveConstantR(trueObject(), ReceiverResultReg)); /* begin genPrimReturn */ assert(methodOrBlockNumArgs <= (numRegArgs())); /* begin RetN: */ @@ -12720,6 +12748,7 @@ AbstractInstruction * jumpFixedFieldsOutOfBounds; AbstractInstruction *jumpHasFixedFields; AbstractInstruction *jumpImmediate; + sqInt jumpImmutable; AbstractInstruction *jumpIsBytes; AbstractInstruction * jumpIsCompiledMethod; AbstractInstruction *jumpIsContext; @@ -12739,6 +12768,7 @@ sqInt quickConstant4; sqInt quickConstant5; + jumpImmutable = 0; /* begin genLoadArgAtDepth:into: */ assert(1 < (numRegArgs())); /* begin genLoadArgAtDepth:into: */ @@ -12748,8 +12778,16 @@ genConvertSmallIntegerToIntegerInReg(Arg0Reg); /* begin SubCq:R: */ anInstruction16 = genoperandoperand(SubCqR, 1, Arg0Reg); + +# if IMMUTABILITY + genGetFormatOfintoleastSignificantHalfOfBaseHeaderIntoScratch(ReceiverResultReg, (formatReg = SendNumArgsReg), TempReg); + jumpImmutable = genJumpBaseHeaderImmutable(TempReg); + +# else /* IMMUTABILITY */ genGetFormatOfintoleastSignificantHalfOfBaseHeaderIntoScratch(ReceiverResultReg, (formatReg = SendNumArgsReg), NoReg); +# endif /* IMMUTABILITY */ + genGetNumSlotsOfinto(ReceiverResultReg, ClassReg); /* begin CmpCq:R: */ quickConstant = weakArrayFormat(); @@ -12913,6 +12951,12 @@ /* begin RetN: */ genoperand(RetN, 0); jmpTarget(jumpIsContext, jmpTarget(jumpNotIndexableBits, jmpTarget(jumpBytesOutOfRange, jmpTarget(jumpShortsOutOfRange, jmpTarget(jumpWordsOutOfRange, jmpTarget(jumpIsCompiledMethod, jmpTarget(jumpArrayOutOfBounds, jmpTarget(jumpBytesOutOfBounds, jmpTarget(jumpShortsOutOfBounds, jmpTarget(jumpWordsOutOfBounds, jmpTarget(jumpNotIndexablePointers, jmpTarget(jumpNonSmallIntegerValue, jmpTarget(jumpFixedFieldsOutOfBounds, gLabel()))))))))))))); + +# if IMMUTABILITY + jmpTarget(jumpImmutable, getJmpTarget(jumpIsContext)); + +# endif /* IMMUTABILITY */ + /* begin AddCq:R: */ anInstruction15 = genoperandoperand(AddCqR, 1, Arg0Reg); genConvertIntegerToSmallIntegerInReg(Arg0Reg); @@ -13995,6 +14039,7 @@ AbstractInstruction *jumpBadIndex; AbstractInstruction *jumpBytesOutOfBounds; AbstractInstruction *jumpBytesOutOfRange; + sqInt jumpImmutable; AbstractInstruction *jumpIsBytes; AbstractInstruction * jumpIsCompiledMethod; AbstractInstruction *jumpIsShorts; @@ -14009,6 +14054,7 @@ sqInt quickConstant3; sqInt quickConstant4; + jumpImmutable = 0; /* begin genLoadArgAtDepth:into: */ assert(1 < (numRegArgs())); /* begin genLoadArgAtDepth:into: */ @@ -14018,8 +14064,16 @@ genConvertSmallIntegerToIntegerInReg(Arg0Reg); /* begin SubCq:R: */ anInstruction11 = genoperandoperand(SubCqR, 1, Arg0Reg); + +# if IMMUTABILITY + genGetFormatOfintoleastSignificantHalfOfBaseHeaderIntoScratch(ReceiverResultReg, (formatReg = SendNumArgsReg), TempReg); + jumpImmutable = genJumpBaseHeaderImmutable(TempReg); + +# else /* IMMUTABILITY */ genGetFormatOfintoleastSignificantHalfOfBaseHeaderIntoScratch(ReceiverResultReg, (formatReg = SendNumArgsReg), NoReg); +# endif /* IMMUTABILITY */ + genGetNumSlotsOfinto(ReceiverResultReg, ClassReg); /* begin CmpCq:R: */ quickConstant = firstLongFormat(); @@ -14127,6 +14181,12 @@ /* begin RetN: */ genoperand(RetN, 0); jmpTarget(jumpNotString, jmpTarget(jumpBytesOutOfRange, jmpTarget(jumpShortsOutOfRange, jmpTarget(jumpWordsOutOfRange, jmpTarget(jumpIsCompiledMethod, jmpTarget(jumpBytesOutOfBounds, jmpTarget(jumpShortsOutOfBounds, jmpTarget(jumpWordsOutOfBounds, gLabel())))))))); + +# if IMMUTABILITY + jmpTarget(jumpImmutable, getJmpTarget(jumpNotString)); + +# endif /* IMMUTABILITY */ + /* begin AddCq:R: */ anInstruction10 = genoperandoperand(AddCqR, 1, Arg0Reg); genConvertIntegerToSmallIntegerInReg(Arg0Reg); @@ -14588,6 +14648,16 @@ static void generateObjectRepresentationTrampolines(void) { + sqInt ceCannotAssignToWithIndexTrampoline; + + +# if IMMUTABILITY + + /* c.f. genImmutableCheck:slotIndex:sourceReg:scratchReg:popBoolean:needRestoreRcvr: */ + ceCannotAssignToWithIndexTrampoline = genTrampolineForcalledargargarg(ceCannotAssignTowithIndexvalueToAssign, "ceCannotAssignToWithIndexTrampoline", ReceiverResultReg, TempReg, ClassReg); + +# endif /* IMMUTABILITY */ + ceStoreCheckTrampoline = genTrampolineForcalledargresult(remember, "ceStoreCheckTrampoline", ReceiverResultReg, returnRegForStoreCheck()); ceStoreCheckContextReceiverTrampoline = genStoreCheckContextReceiverTrampoline(); ceScheduleScavengeTrampoline = genSafeTrampolineForcalled(ceScheduleScavenge, "ceScheduleScavengeTrampoline"); @@ -15377,7 +15447,7 @@ /* begin JumpNonZero: */ jumpCmp = genConditionalBranchoperand(JumpNonZero, ((sqInt)0)); } - /* begin genMoveTrueR: */ + /* begin genMoveConstant:R: */ constant = trueObject(); if (shouldAnnotateObjectReference(constant)) { annotateobjRef(gMoveCwR(constant, ReceiverResultReg), constant); @@ -21140,7 +21210,8 @@ return 0; } if ((code == CompletePrimitive) - && (!(methodUsesPrimitiveErrorCode()))) { + && (!(((primitiveIndexOfMethodheader(methodObj, methodHeader)) > 0) + && ((longStoreBytecodeForHeader(methodHeader)) == (fetchByteofObject(initialPC + (sizeOfCallPrimitiveBytecode(methodHeader)), methodObj)))))) { return 0; } if (code == UnimplementedPrimitive) { @@ -21179,6 +21250,7 @@ static sqInt extendedStoreAndPopBytecode(void) { + AbstractInstruction *abstractInstruction; sqInt variableIndex; sqInt variableType; @@ -21189,6 +21261,14 @@ } if (variableType == 1) { genStorePopTemporaryVariable(1, variableIndex); + +# if IMMUTABILITY + /* begin annotateBytecode: */ + abstractInstruction = genoperandoperand(Label, (labelCounter += 1), bytecodePC); + (abstractInstruction->annotation = HasBytecodePC); + +# endif /* IMMUTABILITY */ + return 0; } if (variableType == 3) { @@ -21201,6 +21281,7 @@ static sqInt extendedStoreBytecode(void) { + AbstractInstruction *abstractInstruction; sqInt variableIndex; sqInt variableType; @@ -21211,6 +21292,14 @@ } if (variableType == 1) { genStorePopTemporaryVariable(0, variableIndex); + +# if IMMUTABILITY + /* begin annotateBytecode: */ + abstractInstruction = genoperandoperand(Label, (labelCounter += 1), bytecodePC); + (abstractInstruction->annotation = HasBytecodePC); + +# endif /* IMMUTABILITY */ + return 0; } if (variableType == 3) { @@ -21886,6 +21975,19 @@ return 0; } + /* SimpleStackBasedCogit>>#genMoveConstant:R: */ +static AbstractInstruction * NoDbgRegParms +genMoveConstantR(sqInt constant, sqInt reg) +{ + AbstractInstruction *anInstruction; + + return (shouldAnnotateObjectReference(constant) + ? annotateobjRef(gMoveCwR(constant, reg), constant) + : (/* begin MoveCq:R: */ + (anInstruction = genoperandoperand(MoveCqR, constant, reg)), + anInstruction)); +} + /* SimpleStackBasedCogit>>#genMoveFalseR: */ static AbstractInstruction * NoDbgRegParms genMoveFalseR(sqInt reg) @@ -21903,7 +22005,7 @@ } /* SimpleStackBasedCogit>>#genMoveTrueR: */ -static AbstractInstruction * NoDbgRegParms +static sqInt NoDbgRegParms genMoveTrueR(sqInt reg) { AbstractInstruction *anInstruction; @@ -22467,19 +22569,6 @@ } } - -/* Answer if methodObj contains a primitive and uses the primitive error - code. - */ - - /* SimpleStackBasedCogit>>#methodUsesPrimitiveErrorCode */ -static sqInt -methodUsesPrimitiveErrorCode(void) -{ - return ((primitiveIndexOfMethodheader(methodObj, methodHeader)) > 0) - && ((longStoreBytecodeForHeader(methodHeader)) == (fetchByteofObject(initialPC + (sizeOfCallPrimitiveBytecode(methodHeader)), methodObj))); -} - /* SimpleStackBasedCogit>>#numSpecialSelectors */ static sqInt numSpecialSelectors(void) @@ -24009,7 +24098,8 @@ /* begin PushR: */ genoperand(PushR, SendNumArgsReg); } - if (methodUsesPrimitiveErrorCode()) { + if (((primitiveIndexOfMethodheader(methodObj, methodHeader)) > 0) + && ((longStoreBytecodeForHeader(methodHeader)) == (fetchByteofObject(initialPC + (sizeOfCallPrimitiveBytecode(methodHeader)), methodObj)))) { compileGetErrorCode(); } /* begin MoveAw:R: */ @@ -24099,7 +24189,15 @@ break; case 7: genStorePopLiteralVariable(0, byte2); - break; + +# if IMMUTABILITY + + /* genStorePop:LiteralVariable: annotates; don't annotate twice */ + return 0; + +# endif /* IMMUTABILITY */ + + break; default: /* 5 & 6 */ @@ -24110,6 +24208,14 @@ genStorePopReceiverVariable(opType == 6, byte2); } +# if IMMUTABILITY + + /* genStorePop:LiteralVariable: annotates; don't annotate twice */ + return 0; + +# endif /* IMMUTABILITY */ + +; } assert(needsFrame); assert(!(prevInstIsPCAnnotated())); @@ -25128,6 +25234,7 @@ return ssPushRegister(SendNumArgsReg); } genLoadSlotsourceRegdestReg(SenderIndex, ReceiverResultReg, TempReg); + /* begin genJumpNotSmallIntegerInScratchReg: */ jmpSingle = genJumpNotSmallIntegerscratchReg(TempReg, TempReg); /* begin MoveCq:R: */ anInstruction1 = genoperandoperand(MoveCqR, slotIndex, SendNumArgsReg); @@ -25359,6 +25466,8 @@ AbstractInstruction *instToAnnotate; AbstractInstruction *jumpContinue; AbstractInstruction *jumpNotSmallInts; + sqInt literal; + sqInt literal1; BytecodeDescriptor *primDescriptor; sqInt rcvrInt; sqInt rcvrIsConst; @@ -25427,6 +25536,7 @@ } if (argIsInt || (rcvrIsInt)) { + /* begin genJumpNotSmallIntegerInScratchReg: */ jumpNotSmallInts = genJumpNotSmallIntegerscratchReg(TempReg, TempReg); } else { @@ -25437,6 +25547,7 @@ case AddRR: if (argIsInt) { /* begin AddCq:R: */ + literal = argInt - ConstZero; anInstruction = genoperandoperand(AddCqR, argInt - ConstZero, ReceiverResultReg); instToAnnotate = anInstruction; /* begin JumpNoOverflow: */ @@ -25469,6 +25580,7 @@ /* begin JumpNoOverflow: */ jumpContinue = genConditionalBranchoperand(JumpNoOverflow, ((sqInt)0)); /* begin AddCq:R: */ + literal1 = argInt - ConstZero; anInstruction4 = genoperandoperand(AddCqR, argInt - ConstZero, ReceiverResultReg); } else { @@ -25642,6 +25754,7 @@ } if (argIsInt || (rcvrIsInt)) { + /* begin genJumpNotSmallIntegerInScratchReg: */ jumpNotSmallInts = genJumpNotSmallIntegerscratchReg(TempReg, TempReg); } else { @@ -25650,13 +25763,13 @@ if (argIsInt) { if (annotateInst) { /* begin annotateBytecode: */ - anInstruction2 = genoperandoperand(CmpCqR, argInt, ReceiverResultReg); - abstractInstruction = anInstruction2; + anInstruction = genoperandoperand(CmpCqR, argInt, ReceiverResultReg); + abstractInstruction = anInstruction; (abstractInstruction->annotation = HasBytecodePC); } else { /* begin CmpCq:R: */ - anInstruction = genoperandoperand(CmpCqR, argInt, ReceiverResultReg); + anInstruction1 = genoperandoperand(CmpCqR, argInt, ReceiverResultReg); } } else { @@ -25672,7 +25785,7 @@ jmpTarget(jumpNotSmallInts, gLabel()); if (argIsInt) { /* begin MoveCq:R: */ - anInstruction1 = genoperandoperand(MoveCqR, argInt, Arg0Reg); + anInstruction2 = genoperandoperand(MoveCqR, argInt, Arg0Reg); } index = byte0 - ((bytecodeSetOffset == 256 ? AltFirstSpecialSelector + 256 @@ -26026,10 +26139,18 @@ AbstractInstruction *abstractInstruction; AbstractInstruction *anInstruction; sqInt association; + sqInt immutabilityFailure; sqInt needStoreCheck; sqInt topReg; + immutabilityFailure = 0; assert(needsFrame); + +# if IMMUTABILITY + ssFlushTo(simStackPtr - 1); + +# endif /* IMMUTABILITY */ + needStoreCheck = !(isUnannotatableConstant(ssTop())); association = getLiteral(litVarIndex); (optStatus.isReceiverResultRegLive = 0); @@ -26043,9 +26164,20 @@ anInstruction = genoperandoperand(MoveCqR, association, ReceiverResultReg); } genEnsureObjInRegNotForwardedscratchReg(ReceiverResultReg, TempReg); + +# if IMMUTABILITY + ssAllocateRequiredReg(ClassReg); + topReg = ClassReg; + ssStoreAndReplacePoptoReg(popBoolean, ClassReg); + ssFlushTo(simStackPtr); + immutabilityFailure = genImmutableCheckslotIndexsourceRegscratchRegneedRestoreRcvr(ReceiverResultReg, ValueIndex, ClassReg, TempReg, 0); + +# else /* IMMUTABILITY */ topReg = allocateRegForStackEntryAtnotConflictingWith(0, registerMaskFor(ReceiverResultReg)); ssStorePoptoReg(popBoolean, topReg); +# endif /* IMMUTABILITY */ + if (traceStores > 0) { /* begin MoveR:R: */ genoperandoperand(MoveRR, topReg, TempReg); @@ -26054,6 +26186,12 @@ (abstractInstruction->annotation = IsRelativeCall); } genStoreSourceRegslotIndexdestRegscratchReginFrameneedsStoreCheck(topReg, ValueIndex, ReceiverResultReg, TempReg, needsFrame, needStoreCheck); + +# if IMMUTABILITY + jmpTarget(immutabilityFailure, gLabel()); + +# endif /* IMMUTABILITY */ + return 0; } @@ -26064,6 +26202,7 @@ AbstractInstruction *abstractInstruction; AbstractInstruction *abstractInstruction1; AbstractInstruction *anInstruction; + sqInt immutabilityFailure; AbstractInstruction *jmpDone; AbstractInstruction *jmpSingle; sqInt needStoreCheck; @@ -26072,7 +26211,14 @@ /* The reason we need a frame here is that assigning to an inst var of a context may involve wholesale reorganization of stack pages, and the only way to preserve the execution state of an activation in that case is if it has a frame. */ + immutabilityFailure = 0; assert(needsFrame); + +# if IMMUTABILITY + ssFlushTo(simStackPtr - 1); + +# endif /* IMMUTABILITY */ + ssFlushUpThroughReceiverVariable(slotIndex); /* Note that ReceiverResultReg remains live after both @@ -26083,8 +26229,17 @@ ssAllocateCallRegand(ClassReg, SendNumArgsReg); ssPush(1); genLoadSlotsourceRegdestReg(SenderIndex, ReceiverResultReg, TempReg); + +# if IMMUTABILITY + ssStoreAndReplacePoptoReg(popBoolean, ClassReg); + ssFlushTo(simStackPtr); + +# else /* IMMUTABILITY */ ssStorePoptoReg(popBoolean, ClassReg); +# endif /* IMMUTABILITY */ + + /* begin genJumpNotSmallIntegerInScratchReg: */ jmpSingle = genJumpNotSmallIntegerscratchReg(TempReg, TempReg); /* begin MoveCq:R: */ anInstruction = genoperandoperand(MoveCqR, slotIndex, SendNumArgsReg); @@ -26101,8 +26256,20 @@ abstractInstruction = genoperand(Call, ceTraceStoreTrampoline); (abstractInstruction->annotation = IsRelativeCall); } + +# if IMMUTABILITY + immutabilityFailure = genImmutableCheckslotIndexsourceRegscratchRegneedRestoreRcvr(ReceiverResultReg, ValueIndex, ClassReg, TempReg, 1); + +# endif /* IMMUTABILITY */ + genStoreSourceRegslotIndexdestRegscratchReginFrameneedsStoreCheck(ClassReg, slotIndex, ReceiverResultReg, TempReg, 1, needStoreCheck); jmpTarget(jmpDone, gLabel()); + +# if IMMUTABILITY + jmpTarget(immutabilityFailure, gLabel()); + +# endif /* IMMUTABILITY */ + return 0; } @@ -26112,17 +26279,37 @@ { AbstractInstruction *abstractInstruction; AbstractInstruction *abstractInstruction1; + sqInt immutabilityFailure; sqInt needStoreCheck; sqInt topReg; + immutabilityFailure = 0; + +# if IMMUTABILITY + assert(needsFrame); + ssFlushTo(simStackPtr - 1); + +# endif /* IMMUTABILITY */ + ssFlushUpThroughReceiverVariable(slotIndex); /* Note that ReceiverResultReg remains live after ceStoreCheckTrampoline. */ needStoreCheck = !(isUnannotatableConstant(ssTop())); ensureReceiverResultRegContainsSelf(); + +# if IMMUTABILITY + ssAllocateRequiredReg(ClassReg); + topReg = ClassReg; + ssStoreAndReplacePoptoReg(popBoolean, ClassReg); + ssFlushTo(simStackPtr); + immutabilityFailure = genImmutableCheckslotIndexsourceRegscratchRegneedRestoreRcvr(ReceiverResultReg, slotIndex, ClassReg, TempReg, 1); + +# else /* IMMUTABILITY */ topReg = allocateRegForStackEntryAtnotConflictingWith(0, registerMaskFor(ReceiverResultReg)); ssStorePoptoReg(popBoolean, topReg); +# endif /* IMMUTABILITY */ + if (traceStores > 0) { /* begin MoveR:R: */ genoperandoperand(MoveRR, topReg, TempReg); @@ -26142,6 +26329,12 @@ } } genStoreSourceRegslotIndexdestRegscratchReginFrameneedsStoreCheck(topReg, slotIndex, ReceiverResultReg, TempReg, needsFrame, needStoreCheck); + +# if IMMUTABILITY + jmpTarget(immutabilityFailure, gLabel()); + +# endif /* IMMUTABILITY */ + return 0; } @@ -26427,14 +26620,13 @@ AbstractInstruction *anInstruction1; AbstractInstruction *anInstruction2; AbstractInstruction *anInstruction3; - AbstractInstruction *anInstruction4; sqInt index; sqInt numSpilled; assert(needsFrame); ssAllocateCallReg(ReceiverResultReg); - /* begin MoveMw:r:R: */ - anInstruction4 = genoperandoperandoperand(MoveMwrR, FoxMFReceiver, FPReg, ReceiverResultReg); + /* begin putSelfInReceiverResultReg */ + storeToReg((&simSelf), ReceiverResultReg); ssFlushTo(simStackPtr - numArgs); if (numArgs > 2) { Modified: branches/Cog/nsspur64src/vm/cointerp.c =================================================================== --- branches/Cog/nsspur64src/vm/cointerp.c 2016-01-20 02:33:22 UTC (rev 3563) +++ branches/Cog/nsspur64src/vm/cointerp.c 2016-01-22 01:28:22 UTC (rev 3564) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1656 uuid: 02086cbf-8db3-4035-9f0d-f2671db50748 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1660 uuid: 372f5635-366a-462d-8979-ae86dee05577 from - CoInterpreter VMMaker.oscog-eem.1656 uuid: 02086cbf-8db3-4035-9f0d-f2671db50748 + CoInterpreter VMMaker.oscog-eem.1660 uuid: 372f5635-366a-462d-8979-ae86dee05577 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1656 uuid: 02086cbf-8db3-4035-9f0d-f2671db50748 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1660 uuid: 372f5635-366a-462d-8979-ae86dee05577 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -226,8 +226,8 @@ #define EnclosingObjectIndex 4 #define EncounteredUnknownBytecode -6 #define EndOfRun 0x101 -#if !defined(EnforceAccessControl) /* Allow EnforceAccessControl to be overridden on the compiler command line */ -# define EnforceAccessControl 1 +#if !defined(EnforceAccessControl) /* Allow this to be overridden on the compiler command line */ +#define EnforceAccessControl 1 #endif #define ExcessSignalsIndex 2 #define ExternalObjectsArray 38 @@ -252,7 +252,9 @@ #define HasBeenReturnedFromMCPCOop 0xFFFFFFFFFFFFFFF9ULL #define HeaderIndex 0 #define IFrameSlots 7 +#if !defined(IMMUTABILITY) /* Allow this to be overridden on the compiler command line */ #define IMMUTABILITY 0 +#endif #define InstanceSpecificationIndex 2 #define InstructionPointerIndex 1 #define KeyIndex 0 @@ -407,6 +409,9 @@ #define TrueObject 2 #define V3PrimitiveBitsMask 0x80000FF8ULL #define ValueIndex 1 +#if !defined(VMBIGENDIAN) /* Allow this to be overridden on the compiler command line */ +#define VMBIGENDIAN 0 +#endif #define WeaklingStackRootIndex 0x1001 #define XIndex 0 #define YIndex 1 @@ -870,7 +875,7 @@ extern void ensureNoForwardedLiteralsIn(sqInt aMethodObj); extern usqInt freeStartAddress(void); extern usqInt getScavengeThreshold(void); -static sqLong NoDbgRegParms headerWhileForwardingOf(sqInt aCompiledMethodObjOop); +static sqInt NoDbgRegParms headerWhileForwardingOf(sqInt aCompiledMethodObjOop); extern sqInt isForwardedClassIndex(sqInt maybeClassIndex); extern sqInt isImmediateClass(sqInt classObj); extern sqInt isReallyYoungObject(sqInt objOop); @@ -1100,6 +1105,7 @@ extern sqInt isInOldSpace(sqInt address); static sqInt NoDbgRegParms isInPastSpace(sqInt address); extern sqInt isNonImmediate(sqInt oop); +static sqInt NoDbgRegParms isObjImmutable(sqInt anOop); extern sqInt isOldObject(sqInt objOop); extern sqInt isOopCompiledMethod(sqInt oop); extern sqInt isOopForwarded(sqInt oop); @@ -2430,7 +2436,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1656"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1660"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -4766,6 +4772,16 @@ /* begin internalPop: */ localSP += 1 * BytesPerOop; /* begin storePointerImmutabilityCheck:ofObject:withValue: */ + +# if IMMUTABILITY + assert(!((isImmediate(rcvr)))); + if (((((usqInt) (longAt(rcvr))) >> 23) & 1) != 0) { + cannotAssigntowithIndex(top, rcvr, instVarIndex); + goto l1; + } + +# endif /* IMMUTABILITY */ + /* begin storePointer:ofObject:withValue: */ assert(!(isForwarded(rcvr))); if (isOldObject(rcvr)) { @@ -5744,6 +5760,16 @@ if (variableType == 0) { /* begin storePointerImmutabilityCheck:ofObject:withValue: */ objOop = longAt(localFP + FoxIFReceiver); + +# if IMMUTABILITY + assert(!((isImmediate(objOop)))); + if (((((usqInt) (longAt(objOop))) >> 23) & 1) != 0) { + cannotAssigntowithIndex(value, objOop, variableIndex); + goto l4; + } + +# endif /* IMMUTABILITY */ + /* begin storePointer:ofObject:withValue: */ assert(!(isForwarded(objOop))); if (isOldObject(objOop)) { @@ -5791,6 +5817,16 @@ litVar = referent; } /* begin storePointerImmutabilityCheck:ofObject:withValue: */ + +# if IMMUTABILITY + assert(!((isImmediate(litVar)))); + if (((((usqInt) (longAt(litVar))) >> 23) & 1) != 0) { + cannotAssigntowithIndex(value, litVar, ValueIndex); + goto l5; + } + +# endif /* IMMUTABILITY */ + /* begin storePointer:ofObject:withValue: */ assert(!(isForwarded(litVar))); if (isOldObject(litVar)) { @@ -5839,6 +5875,16 @@ if (variableType == 0) { /* begin storePointerImmutabilityCheck:ofObject:withValue: */ objOop = longAt(localFP + FoxIFReceiver); + +# if IMMUTABILITY + assert(!((isImmediate(objOop)))); + if (((((usqInt) (longAt(objOop))) >> 23) & 1) != 0) { + cannotAssigntowithIndex(value, objOop, variableIndex); + goto l7; + } + +# endif /* IMMUTABILITY */ + /* begin storePointer:ofObject:withValue: */ assert(!(isForwarded(objOop))); if (isOldObject(objOop)) { @@ -5886,6 +5932,16 @@ litVar = referent; } /* begin storePointerImmutabilityCheck:ofObject:withValue: */ + +# if IMMUTABILITY + assert(!((isImmediate(litVar)))); + if (((((usqInt) (longAt(litVar))) >> 23) & 1) != 0) { + cannotAssigntowithIndex(value, litVar, ValueIndex); + goto l8; + } + +# endif /* IMMUTABILITY */ + /* begin storePointer:ofObject:withValue: */ assert(!(isForwarded(litVar))); if (isOldObject(litVar)) { @@ -6530,6 +6586,16 @@ litVar = referent; } /* begin storePointerImmutabilityCheck:ofObject:withValue: */ + +# if IMMUTABILITY + assert(!((isImmediate(litVar)))); + if (((((usqInt) (longAt(litVar))) >> 23) & 1) != 0) { + cannotAssigntowithIndex(top, litVar, ValueIndex); + goto l14; + } + +# endif /* IMMUTABILITY */ + /* begin storePointer:ofObject:withValue: */ assert(!(isForwarded(litVar))); if (isOldObject(litVar)) { @@ -6561,6 +6627,7 @@ && (((((longAt((rcvr1 + BaseHeaderSize) + (((long)SenderIndex) << (shiftForWord()))))) & 7) == 1)))) { /* begin instVar:ofContext:put: */ assert(isMarriedOrWidowedContext(rcvr1)); + assert(!((isObjImmutable(rcvr1)))); /* begin writeBackHeadFramePointers */ assert(GIV(stackPage) == (mostRecentlyUsedPage())); /* begin setHeadFP:andSP:inPage: */ @@ -6649,6 +6716,16 @@ } else { /* begin storePointerImmutabilityCheck:ofObject:withValue: */ + +# if IMMUTABILITY + assert(!((isImmediate(rcvr1)))); + if (((((usqInt) (longAt(rcvr1))) >> 23) & 1) != 0) { + cannotAssigntowithIndex(top, rcvr1, byte3); + goto l11; + } + +# endif /* IMMUTABILITY */ + /* begin storePointer:ofObject:withValue: */ assert(!(isForwarded(rcvr1))); if (isOldObject(rcvr1)) { @@ -9388,8 +9465,16 @@ value = longAtPointer(localSP); index = longAtPointer(localSP + (1 * BytesPerOop)); rcvr = longAtPointer(localSP + (2 * BytesPerOop)); + +# if IMMUTABILITY + correctRcvr = ((rcvr & (tagMask())) == 0) + && (!(((((usqInt) (longAt(rcvr))) >> 23) & 1) != 0)); + +# else /* IMMUTABILITY */ correctRcvr = (rcvr & (tagMask())) == 0; +# endif /* IMMUTABILITY */ + if (correctRcvr && ((((index) & 7) == 1))) { @@ -12205,8 +12290,16 @@ value = longAtPointer(localSP); index = longAtPointer(localSP + (1 * BytesPerOop)); rcvr = longAtPointer(localSP + (2 * BytesPerOop)); + +# if IMMUTABILITY + correctRcvr = ((rcvr & (tagMask())) == 0) + && (!(((((usqInt) (longAt(rcvr))) >> 23) & 1) != 0)); + +# else /* IMMUTABILITY */ correctRcvr = (rcvr & (tagMask())) == 0; +# endif /* IMMUTABILITY */ + if (correctRcvr && ((((index) & 7) == 1))) { @@ -12815,6 +12908,16 @@ /* begin internalPop: */ localSP += 1 * BytesPerOop; /* begin storePointerImmutabilityCheck:ofObject:withValue: */ + +# if IMMUTABILITY + assert(!((isImmediate(rcvr)))); + if (((((usqInt) (longAt(rcvr))) >> 23) & 1) != 0) { + cannotAssigntowithIndex(top, rcvr, instVarIndex); + goto l165; + } + +# endif /* IMMUTABILITY */ + /* begin storePointer:ofObject:withValue: */ assert(!(isForwarded(rcvr))); if (isOldObject(rcvr)) { @@ -13297,6 +13400,7 @@ && (((((longAt((rcvr + BaseHeaderSize) + (((long)SenderIndex) << (shiftForWord()))))) & 7) == 1)))) { /* begin instVar:ofContext:put: */ assert(isMarriedOrWidowedContext(rcvr)); + assert(!((isObjImmutable(rcvr)))); /* begin writeBackHeadFramePointers */ assert(GIV(stackPage) == (mostRecentlyUsedPage())); /* begin setHeadFP:andSP:inPage: */ @@ -13385,6 +13489,16 @@ } else { /* begin storePointerImmutabilityCheck:ofObject:withValue: */ + +# if IMMUTABILITY + assert(!((isImmediate(rcvr)))); + if (((((usqInt) (longAt(rcvr))) >> 23) & 1) != 0) { + cannotAssigntowithIndex(anObject, rcvr, variableIndex); + goto l172; + } + +# endif /* IMMUTABILITY */ + /* begin storePointer:ofObject:withValue: */ assert(!(isForwarded(rcvr))); if (isOldObject(rcvr)) { @@ -13430,6 +13544,16 @@ litVar = referent; } /* begin storePointerImmutabilityCheck:ofObject:withValue: */ + +# if IMMUTABILITY + assert(!((isImmediate(litVar)))); + if (((((usqInt) (longAt(litVar))) >> 23) & 1) != 0) { + cannotAssigntowithIndex(longAtPointer(localSP), litVar, ValueIndex); + goto l174; @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.1661.mcz
by commits＠source.squeak.org 22 Jan '16

22 Jan '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1661.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1661 Author: eem Time: 22 January 2016, 5:13:11.061636 pm UUID: a34e0ec2-d251-4618-bd67-cef5b3eddcf5 Ancestors: VMMaker.oscog-eem.1660 Cogit IMMUTABILITY cleanups. Remove the need to map the primitive error code store bytecode by having mapFor:bcpc:performUntil:arg: skip the CallPrimitive & StoreTemp bytecoees if present. Also avoid the set-up overhead when mapping the first bytecode by moving the first invocation early. Correct and simplify testBcToMcPcMappingForCogMethod:; is compiled method parameter was never used, and the startpc of a method should be derived from the cogmethod's method obj. Refactor genImmutableCheck:slotIndex:sourceReg:scratchReg:needRestoreRcvr: to lose its unused popBoolean: keyword. Implement IMMTABILITY in SimpleStackBasedCogit. All combinations of SimpleStackBasedCogit x StackToRegisterMappingCogit x IMMTABILITY=true/false work on the reader image in the simulator. THANKS Clément!! Add SimpleStackBasedCogit>>putSelfInReceiverResultReg and use it where appropriate. Fix a comment or three. Oh we will, we will not be moved. Oh we have im-mut-a-bil-i-ty Just by a bit in every object header, we will not be moved. [ed: that's pinning, surely] =============== Diff against VMMaker.oscog-eem.1660 =============== Item was added: + ----- Method: CogObjectRepresentationForSpur>>genImmutableCheck:slotIndex:sourceReg:scratchReg:needRestoreRcvr: (in category 'compile abstract instructions') ----- + genImmutableCheck: regHoldingObjectMutated slotIndex: index sourceReg: regHoldingValueToStore scratchReg: scratchReg needRestoreRcvr: needRestoreRcvr + | mutableJump fail | + <var: #mutableJump type: #'AbstractInstruction *'> + <var: #fail type: #'AbstractInstruction *'> + <inline: true> + <option: #IMMUTABILITY> + "Trampoline convention: + - objectMutated passed in ReceiverResultReg + - index (unboxed) passed in TempReg + - valueToStore passed in ClassReg. + Simulated stack is flushed, but if needRestoreRcvr is true + the receiver has to be live after this operation." + self assert: regHoldingObjectMutated == ReceiverResultReg. + self assert: scratchReg == TempReg. + self assert: regHoldingValueToStore == ClassReg. + mutableJump := self genJumpMutable: ReceiverResultReg scratchReg: TempReg. + + "We reach this code if the object mutated is immutable." + cogit MoveCq: index R: TempReg. + "trampoline call and mcpc to bcpc annotation." + cogit CallRT: ceCannotAssignToWithIndexTrampoline. + cogit annotateBytecode: cogit Label. + "restore ReceiverResultReg state if needed, the rest of the state is spilled" + needRestoreRcvr ifTrue: [ cogit putSelfInReceiverResultReg ]. + fail := cogit Jump: 0. + + "We reach this code is the object mutated is mutable" + mutableJump jmpTarget: cogit Label. + + ^ fail! Item was removed: - ----- Method: CogObjectRepresentationForSpur>>genImmutableCheck:slotIndex:sourceReg:scratchReg:popBoolean:needRestoreRcvr: (in category 'compile abstract instructions') ----- - genImmutableCheck: regHoldingObjectMutated slotIndex: index sourceReg: regHoldingValueToStore scratchReg: scratchReg popBoolean: popBoolean needRestoreRcvr: needRestoreRcvr - | mutableJump fail | - <var: #mutableJump type: #'AbstractInstruction *'> - <var: #fail type: #'AbstractInstruction *'> - <inline: true> - <option: #IMMUTABILITY> - "Trampoline convention: - - objectMutated passed in ReceiverResultReg - - index (unboxed) passed in TempReg - - valueToStore passed in ClassReg. - Simulated stack is flushed, but if needRestoreRcvr is true - the receiver has to be live after this operation." - self assert: regHoldingObjectMutated == ReceiverResultReg. - self assert: scratchReg == TempReg. - self assert: regHoldingValueToStore == ClassReg. - mutableJump := self genJumpMutable: ReceiverResultReg scratchReg: TempReg. - - "We reach this code if the object mutated is immutable." - cogit MoveCq: index R: TempReg. - "trampoline call and mcpc to bcpc annotation." - cogit CallRT: ceCannotAssignToWithIndexTrampoline. - cogit annotateBytecode: cogit Label. - "restore ReceiverResultReg state if needed, the rest of the state is spilled" - needRestoreRcvr ifTrue: [ cogit putSelfInReceiverResultReg ]. - fail := cogit Jump: 0. - - "We reach this code is the object mutated is mutable" - mutableJump jmpTarget: cogit Label. - - ^ fail! Item was changed: ----- Method: Cogit>>bcpcsAndDescriptorsFor:bsOffset:do: (in category 'tests-method map') ----- bcpcsAndDescriptorsFor: aMethod bsOffset: bsOffset do: quaternaryBlock "Evaluate quaternaryBlock with the pc, byte, descriptor and numExtensions for all the bytecodes in aMethod. Evaluate with byte, descriptor and numExtensions nil for the initialPC of the mehtod and any blocks within it." <doNotGenerate> | nExts byte descriptor endpc latestContinuation pc primIdx | ((primIdx := coInterpreter primitiveIndexOf: aMethod) > 0 and: [coInterpreter isQuickPrimitiveIndex: primIdx]) ifTrue: [^self]. latestContinuation := pc := coInterpreter startPCOfMethod: aMethod. quaternaryBlock value: pc value: nil value: nil value: 0. "stackCheck/entry pc" + primIdx > 0 ifTrue: + [pc := pc + (self deltaToSkipPrimAndErrorStoreIn: aMethod + header: (coInterpreter methodHeaderOf: aMethod))]. nExts := 0. endpc := objectMemory numBytesOf: aMethod. [pc <= endpc] whileTrue: [byte := objectMemory fetchByte: pc ofObject: aMethod. descriptor := self generatorAt: byte + bsOffset. descriptor isExtension ifFalse: [quaternaryBlock value: pc value: byte value: descriptor value: nExts]. (descriptor isReturn and: [pc >= latestContinuation]) ifTrue: [endpc := pc]. (descriptor isBranch or: [descriptor isBlockCreation]) ifTrue: [| targetPC | descriptor isBlockCreation ifTrue: [quaternaryBlock value: pc + descriptor numBytes value: nil value: nil value: 0]. "stackCheck/entry pc" targetPC := self latestContinuationPCFor: descriptor at: pc exts: nExts in: aMethod. self assert: targetPC < endpc. latestContinuation := latestContinuation max: targetPC]. pc := pc + descriptor numBytes. nExts := descriptor isExtension ifTrue: [nExts + 1] ifFalse: [0]]! Item was changed: ----- Method: Cogit>>compileMethodBody (in category 'compile abstract instructions') ----- compileMethodBody "Compile the top-level method body." - | deltaForPrimErrorCode | <inline: true> endPC < initialPC ifTrue: [^0]. "quick primitives" + "When compiling, skip any initial CallPrimitive and optional StorePrimErrCode bytecodes. + These are dealt with in compileFrameBuild." + ^self compileAbstractInstructionsFrom: initialPC + + (self deltaToSkipPrimAndErrorStoreIn: methodObj + header: methodHeader) + through: endPC! - deltaForPrimErrorCode := self methodUsesPrimitiveErrorCode - ifTrue: - [ self cppIf: IMMUTABILITY ifTrue: - [ self Nop. "to avoid conflict with interrrupt check mapping". - self annotateBytecode: self Label ]. - (coInterpreter sizeOfCallPrimitiveBytecode: methodHeader) - + (coInterpreter sizeOfLongStoreTempBytecode: methodHeader)] - ifFalse: [0]. - ^self compileAbstractInstructionsFrom: initialPC + deltaForPrimErrorCode through: endPC! Item was added: + ----- Method: Cogit>>deltaToSkipPrimAndErrorStoreIn:header: (in category 'compile abstract instructions') ----- + deltaToSkipPrimAndErrorStoreIn: aMethodObj header: aMethodHeader + "Answer the number of bytecodes to skip to get to the first bytecode + past the primitive call and any store of the error code." + ^(self methodUsesPrimitiveErrorCode: aMethodObj header: aMethodHeader) + ifTrue: [(coInterpreter sizeOfCallPrimitiveBytecode: aMethodHeader) + + (coInterpreter sizeOfLongStoreTempBytecode: aMethodHeader)] + ifFalse: [0]! Item was changed: ----- Method: Cogit>>mapFor:bcpc:performUntil:arg: (in category 'method map') ----- mapFor: cogMethod bcpc: startbcpc performUntil: functionSymbol arg: arg "Machine-code <-> bytecode pc mapping support. Evaluate functionSymbol for each mcpc, bcpc pair in the map until the function returns non-zero, answering that result, or 0 if it fails to. This works only for frameful methods." <var: #cogMethod type: #'CogBlockMethod *'> <var: #functionSymbol declareC: 'sqInt (*functionSymbol)(BytecodeDescriptor *desc, sqInt isBackwardBranch, char *mcpc, sqInt bcpc, void *arg)'> <var: #arg type: #'void *'> <inline: true> | isInBlock mcpc bcpc endbcpc map mapByte homeMethod aMethodObj result latestContinuation byte descriptor bsOffset nExts | <var: #descriptor type: #'BytecodeDescriptor *'> <var: #homeMethod type: #'CogMethod *'> + self assert: cogMethod stackCheckOffset > 0. + mcpc := cogMethod asUnsignedInteger + cogMethod stackCheckOffset. + "The stack check maps to the start of the first bytecode, + the first bytecode being effectively after frame build." + result := self perform: functionSymbol + with: nil + with: false + with: (self cCoerceSimple: mcpc to: #'char *') + with: startbcpc + with: arg. + result ~= 0 ifTrue: + [^result]. + bcpc := startbcpc. "In both CMMethod and CMBlock cases find the start of the map and skip forward to the bytecode pc map entry for the stack check." cogMethod cmType = CMMethod ifTrue: [isInBlock := false. homeMethod := self cCoerceSimple: cogMethod to: #'CogMethod *'. self assert: startbcpc = (coInterpreter startPCOfMethodHeader: homeMethod methodHeader). map := self mapStartFor: homeMethod. self assert: ((objectMemory byteAt: map) >> AnnotationShift = IsAbsPCReference or: [(objectMemory byteAt: map) >> AnnotationShift = IsObjectReference or: [(objectMemory byteAt: map) >> AnnotationShift = IsRelativeCall or: [(objectMemory byteAt: map) >> AnnotationShift = IsDisplacementX2N]]]). latestContinuation := startbcpc. aMethodObj := homeMethod methodObject. endbcpc := (objectMemory numBytesOf: aMethodObj) - 1. + bsOffset := self bytecodeSetOffsetForHeader: homeMethod methodHeader. + "If the method has a primitive, skip it and the error code store, if any; + Logically. these come before the stack check and so must be ignored." + bcpc := bcpc + (self deltaToSkipPrimAndErrorStoreIn: aMethodObj + header: homeMethod methodHeader)] - bsOffset := self bytecodeSetOffsetForHeader: homeMethod methodHeader] ifFalse: [isInBlock := true. + self assert: bcpc = cogMethod startpc. homeMethod := cogMethod cmHomeMethod. map := self findMapLocationForMcpc: cogMethod asUnsignedInteger + (self sizeof: CogBlockMethod) inMethod: homeMethod. self assert: map ~= 0. self assert: ((objectMemory byteAt: map) >> AnnotationShift = HasBytecodePC "fiducial" or: [(objectMemory byteAt: map) >> AnnotationShift = IsDisplacementX2N]). [(objectMemory byteAt: map) >> AnnotationShift ~= HasBytecodePC] whileTrue: [map := map - 1]. map := map - 1. "skip fiducial; i.e. the map entry for the pc immediately following the method header." aMethodObj := homeMethod methodObject. bcpc := startbcpc - (self blockCreationBytecodeSizeForHeader: homeMethod methodHeader). bsOffset := self bytecodeSetOffsetForHeader: homeMethod methodHeader. byte := (objectMemory fetchByte: bcpc ofObject: aMethodObj) + bsOffset. descriptor := self generatorAt: byte. + endbcpc := self nextBytecodePCFor: descriptor at: bcpc exts: -1 in: aMethodObj. + bcpc := startbcpc]. - endbcpc := self nextBytecodePCFor: descriptor at: bcpc exts: -1 in: aMethodObj]. - bcpc := startbcpc. - mcpc := cogMethod asUnsignedInteger + cogMethod stackCheckOffset. nExts := 0. - "The stack check maps to the start of the first bytecode, - the first bytecode being effectively after frame build." - result := self perform: functionSymbol - with: nil - with: false - with: (self cCoerceSimple: mcpc to: #'char *') - with: startbcpc - with: arg. - result ~= 0 ifTrue: - [^result]. "Now skip up through the bytecode pc map entry for the stack check." [(objectMemory byteAt: map) >> AnnotationShift ~= HasBytecodePC] whileTrue: [map := map - 1]. map := map - 1. [(mapByte := objectMemory byteAt: map) ~= MapEnd] whileTrue: "defensive; we exit on bcpc" [mapByte >= FirstAnnotation ifTrue: [| annotation nextBcpc isBackwardBranch | annotation := mapByte >> AnnotationShift. mcpc := mcpc + ((mapByte bitAnd: DisplacementMask) * backEnd codeGranularity). (self isPCMappedAnnotation: annotation) ifTrue: [[byte := (objectMemory fetchByte: bcpc ofObject: aMethodObj) + bsOffset. descriptor := self generatorAt: byte. isInBlock ifTrue: [bcpc >= endbcpc ifTrue: [^0]] ifFalse: [(descriptor isReturn and: [bcpc >= latestContinuation]) ifTrue: [^0]. (descriptor isBranch or: [descriptor isBlockCreation]) ifTrue: [| targetPC | targetPC := self latestContinuationPCFor: descriptor at: bcpc exts: nExts in: aMethodObj. latestContinuation := latestContinuation max: targetPC]]. nextBcpc := self nextBytecodePCFor: descriptor at: bcpc exts: nExts in: aMethodObj. descriptor isMapped or: [isInBlock and: [descriptor isMappedInBlock]]] whileFalse: [bcpc := nextBcpc. nExts := descriptor isExtension ifTrue: [nExts + 1] ifFalse: [0]]. isBackwardBranch := descriptor isBranch and: [self isBackwardBranch: descriptor at: bcpc exts: nExts in: aMethodObj]. result := self perform: functionSymbol with: descriptor with: isBackwardBranch with: (self cCoerceSimple: mcpc to: #'char *') with: bcpc with: arg. result ~= 0 ifTrue: [^result]. bcpc := nextBcpc. nExts := descriptor isExtension ifTrue: [nExts + 1] ifFalse: [0]]] ifFalse: [self assert: (mapByte >> AnnotationShift = IsDisplacementX2N or: [mapByte >> AnnotationShift = IsAnnotationExtension]). mapByte < (IsAnnotationExtension << AnnotationShift) ifTrue: [mcpc := mcpc + ((mapByte - DisplacementX2N << AnnotationShift) * backEnd codeGranularity)]]. map := map - 1]. ^0! Item was added: + ----- Method: Cogit>>testBcToMcPcMappingForCogMethod: (in category 'testing') ----- + testBcToMcPcMappingForCogMethod: cogMethod + <doNotGenerate> + "self disassembleMethod: cogMethod" + "self printPCMapPairsFor: cogMethod on: Transcript" + | aMethodObj subMethods bsOffset | + aMethodObj := cogMethod methodObject. + subMethods := self subMethodsAsRangesFor: cogMethod. + subMethods first endPC: (self endPCOf: aMethodObj). + bsOffset := self bytecodeSetOffsetFor: aMethodObj. + self bcpcsAndDescriptorsFor: aMethodObj bsOffset: bsOffset do: + [:bcpc :byte :desc :nExts| | subMethod | + (desc notNil and: [desc isBlockCreation]) ifTrue: + [subMethod := subMethods detect: [:sm| sm startpc = (bcpc + desc numBytes)]. + subMethod endPC: bcpc + desc numBytes + (self spanFor: desc at: bcpc exts: -1 in: aMethodObj) - 1]]. + subMethods allButFirst do: + [:blockSubMethod| | cogBlockMethod | + cogBlockMethod := self + findMethodForStartBcpc: blockSubMethod startpc + inHomeMethod: cogMethod. + self assert: cogBlockMethod address = (blockSubMethod first - (self sizeof: CogBlockMethod))]. + self bcpcsAndDescriptorsFor: aMethodObj bsOffset: bsOffset do: + [:bcpc :byte :desc :nExts| | startBcpc currentSubMethod subCogMethod absMcpc mappedBcpc | + currentSubMethod := self innermostSubMethodFor: bcpc in: subMethods startingAt: 1. + subCogMethod := currentSubMethod cogMethod. + (subCogMethod stackCheckOffset > 0 + and: [desc isNil or: [desc isMapped]]) ifTrue: + [startBcpc := subCogMethod = cogMethod + ifTrue: [coInterpreter startPCOfMethod: aMethodObj] + ifFalse: [currentSubMethod startpc]. + "The first bytecode and backward branch bytecodes are mapped to their pc. + Other bytecodes map to their following pc." + absMcpc := (desc notNil + and: [desc isBranch + and: [self isBackwardBranch: desc at: bcpc exts: nExts in: aMethodObj]]) + ifTrue: "Backward branches have a special mapper" + [mappedBcpc := bcpc. + self + mcPCForBackwardBranch: mappedBcpc + startBcpc: startBcpc + in: subCogMethod] + ifFalse: "All others use the generic mapper" + [mappedBcpc := desc ifNil: [bcpc] ifNotNil: [bcpc + desc numBytes]. + self + mcPCFor: mappedBcpc + startBcpc: startBcpc + in: subCogMethod]. + self assert: absMcpc >= (subCogMethod asInteger + subCogMethod stackCheckOffset). + self assert: (self bytecodePCFor: absMcpc startBcpc: startBcpc in: subCogMethod) = mappedBcpc]]! Item was removed: - ----- Method: Cogit>>testBcToMcPcMappingForCompiledMethod:cogMethod: (in category 'tests-method map') ----- - testBcToMcPcMappingForCompiledMethod: aCompiledMethod cogMethod: cogMethod - <doNotGenerate> - "self disassembleMethod: cogMethod" - "self printPCMapPairsFor: cogMethod on: Transcript" - | aMethodObj subMethods bsOffset | - aMethodObj := cogMethod methodObject. - subMethods := self subMethodsAsRangesFor: cogMethod. - subMethods first endPC: (self endPCOf: aMethodObj). - bsOffset := self bytecodeSetOffsetFor: aMethodObj. - self bcpcsAndDescriptorsFor: aMethodObj bsOffset: bsOffset do: - [:bcpc :byte :desc :nExts| | subMethod | - (desc notNil and: [desc isBlockCreation]) ifTrue: - [subMethod := subMethods detect: [:sm| sm startpc = (bcpc + desc numBytes)]. - subMethod endPC: bcpc + desc numBytes + (self spanFor: desc at: bcpc exts: -1 in: aMethodObj) - 1]]. - subMethods allButFirst do: - [:blockSubMethod| | cogBlockMethod | - cogBlockMethod := self - findMethodForStartBcpc: blockSubMethod startpc - inHomeMethod: cogMethod. - self assert: cogBlockMethod address = (blockSubMethod first - (self sizeof: CogBlockMethod))]. - self bcpcsAndDescriptorsFor: aMethodObj bsOffset: bsOffset do: - [:bcpc :byte :desc :nExts| | currentSubMethod subCogMethod absMcpc mappedBcpc | - currentSubMethod := self innermostSubMethodFor: bcpc in: subMethods startingAt: 1. - subCogMethod := currentSubMethod cogMethod. - (subCogMethod stackCheckOffset > 0 - and: [desc isNil or: [desc isMapped]]) ifTrue: - ["The first bytecode and backward branch bytecodes are mapped to their pc. - Other bytecodes map to their following pc." - absMcpc := (desc notNil - and: [desc isBranch - and: [self isBackwardBranch: desc at: bcpc exts: nExts in: aMethodObj]]) - ifTrue: "Backward branches have a special mapper" - [mappedBcpc := bcpc. - self - mcPCForBackwardBranch: mappedBcpc - startBcpc: currentSubMethod startpc - in: subCogMethod] - ifFalse: "All others use the generic mapper" - [mappedBcpc := desc ifNil: [bcpc] ifNotNil: [bcpc + desc numBytes]. - self - mcPCFor: mappedBcpc - startBcpc: currentSubMethod startpc - in: subCogMethod]. - self assert: absMcpc >= (subCogMethod asInteger + subCogMethod stackCheckOffset). - self assert: (self bytecodePCFor: absMcpc startBcpc: currentSubMethod startpc in: subCogMethod) = mappedBcpc]]! Item was changed: ----- Method: Cogit>>testPCMappingForCompiledMethod:cogMethod: (in category 'tests-method map') ----- testPCMappingForCompiledMethod: aCompiledMethod cogMethod: cm <doNotGenerate> methodObj := methodHeader := nil. self testMcToBcPcMappingForCompiledMethod: aCompiledMethod cogMethod: cm; + testBcToMcPcMappingForCogMethod: cm! - testBcToMcPcMappingForCompiledMethod: aCompiledMethod cogMethod: cm! Item was changed: ----- Method: SimpleStackBasedCogit>>compileFrameBuild (in category 'compile abstract instructions') ----- compileFrameBuild "Build a frame for a CogMethod activation. See CoInterpreter class>>initializeFrameIndices. receiver (in ReceiverResultReg) arg0 ... argN caller's saved ip/this stackPage (for a base frame) fp-> saved fp method context (uninitialized?) receiver first temp ... sp-> Nth temp If there is a primitive and an error code the Nth temp is the error code. Ensure SendNumArgsReg is set early on (incidentally to nilObj) because it is the flag determining whether context switch is allowed on stack-overflow." | jumpSkip | <inline: false> <var: #jumpSkip type: #'AbstractInstruction *'> needsFrame ifFalse: [^self]. backEnd hasLinkRegister ifTrue: [self PushR: LinkReg]. self PushR: FPReg. self MoveR: SPReg R: FPReg. methodLabel addDependent: (self annotateAbsolutePCRef: (self PushCw: methodLabel asInteger)). "method" self genMoveConstant: objectMemory nilObject R: SendNumArgsReg. self PushR: SendNumArgsReg. "context" self PushR: ReceiverResultReg. methodOrBlockNumArgs + 1 to: (coInterpreter temporaryCountOfMethodHeader: methodHeader) do: [:i| self PushR: SendNumArgsReg]. + (self methodUsesPrimitiveErrorCode: methodObj header: methodHeader) ifTrue: - self methodUsesPrimitiveErrorCode ifTrue: [self compileGetErrorCode]. self MoveAw: coInterpreter stackLimitAddress R: TempReg. self CmpR: TempReg R: SPReg. "N.B. FLAGS := SPReg - TempReg" "If we can't context switch for this method, use a slightly slower overflow check that clears SendNumArgsReg." (coInterpreter canContextSwitchIfActivating: methodObj header: methodHeader) ifTrue: [self JumpBelow: stackOverflowCall. stackCheckLabel := self Label] ifFalse: [jumpSkip := self JumpAboveOrEqual: 0. self MoveCq: 0 R: SendNumArgsReg. self Jump: stackOverflowCall. jumpSkip jmpTarget: (stackCheckLabel := self Label)]. self annotateBytecode: stackCheckLabel. self cppIf: #NewspeakVM ifTrue: [numIRCs > 0 ifTrue: [self PrefetchAw: theIRCs]]! Item was changed: ----- Method: SimpleStackBasedCogit>>compilePrimitive (in category 'primitive generators') ----- compilePrimitive "Compile a primitive. If possible, performance-critical primtiives will be generated by their own routines (primitiveGenerator). Otherwise, if there is a primitive at all, we call the C routine with the usual stack-switching dance, test the primFailCode and then either return on success or continue to the method body." <inline: false> | code opcodeIndexAtPrimitive primitiveDescriptor primitiveRoutine | <var: #primitiveDescriptor type: #'PrimitiveDescriptor *'> <var: #primitiveRoutine declareC: 'void (*primitiveRoutine)(void)'> primitiveIndex = 0 ifTrue: [^0]. code := 0. "Note opcodeIndex so that compileFallbackToInterpreterPrimitive: can discard arg load instructions for unimplemented primitives." opcodeIndexAtPrimitive := opcodeIndex. "If a descriptor specifies an argument count (by numArgs >= 0) then it must match for the generated code to be correct. For example for speed many primitives use ResultReceiverReg instead of accessing the stack, so the receiver better be at numArgs down the stack. Use the interpreter version if not." ((primitiveDescriptor := self primitiveGeneratorOrNil) notNil and: [primitiveDescriptor primitiveGenerator notNil and: [(primitiveDescriptor primNumArgs < 0 "means don't care" or: [primitiveDescriptor primNumArgs = (coInterpreter argumentCountOf: methodObj)])]]) ifTrue: [code := objectRepresentation perform: primitiveDescriptor primitiveGenerator]. (code < 0 and: [code ~= UnimplementedPrimitive]) ifTrue: "Generator failed, so no point continuing..." [^code]. code = UnfailingPrimitive ifTrue: [^0]. + "If the machine code verison handles all cases the only reason to call the interpreter + primitive is to reap the primitive error code. Don't bother if it isn't used." (code = CompletePrimitive + and: [(self methodUsesPrimitiveErrorCode: methodObj header: methodHeader) not]) ifTrue: - and: [(self methodUsesPrimitiveErrorCode) not]) ifTrue: [^0]. "Discard any arg load code generated by the primitive generator." code = UnimplementedPrimitive ifTrue: [opcodeIndex := opcodeIndexAtPrimitive]. ((primitiveRoutine := coInterpreter functionPointerForCompiledMethod: methodObj primitiveIndex: primitiveIndex) isNil "no primitive" or: [primitiveRoutine = (coInterpreter functionPointerFor: 0 inClass: nil) "routine = primitiveFail"]) ifTrue: [^self genFastPrimFail]. minValidCallAddress := minValidCallAddress min: primitiveRoutine asUnsignedInteger. ^self compileInterpreterPrimitive: primitiveRoutine! Item was changed: ----- Method: SimpleStackBasedCogit>>doubleExtendedDoAnythingBytecode (in category 'bytecode generators') ----- doubleExtendedDoAnythingBytecode "Replaces the Blue Book double-extended send [132], in which the first byte was wasted on 8 bits of argument count. Here we use 3 bits for the operation sub-type (opType), and the remaining 5 bits for argument count where needed. The last byte give access to 256 instVars or literals. See also secondExtendedSendBytecode" | opType | opType := byte1 >> 5. opType = 0 ifTrue: [^self genSend: byte2 numArgs: (byte1 bitAnd: 31)]. opType = 1 ifTrue: [^self genSendSuper: byte2 numArgs: (byte1 bitAnd: 31)]. "We need a map entry for this bytecode for correct parsing. + The sends will get an IsSend entry anyway. The other cases need a fake one." - The sends will get an IsSend entry anyway. The other cases need a - fake one. We could of course special case the scanning but that's silly." opType caseOf: { [2] -> [(coInterpreter isReadMediatedContextInstVarIndex: byte2) ifTrue: [self genPushMaybeContextReceiverVariable: byte2] ifFalse: [self genPushReceiverVariable: byte2]]. [3] -> [self genPushLiteralIndex: byte2]. [4] -> [self genPushLiteralVariable: byte2]. + [7] -> [self genStorePop: false LiteralVariable: byte2. + self cppIf: IMMUTABILITY ifTrue: ["genStorePop:LiteralVariable: annotates; don't annotate twice" ^0]] } - [7] -> [self genStorePop: false LiteralVariable: byte2] } otherwise: "5 & 6" [(coInterpreter isWriteMediatedContextInstVarIndex: byte2) ifTrue: [self genStorePop: opType = 6 MaybeContextReceiverVariable: byte2] + ifFalse: [self genStorePop: opType = 6 ReceiverVariable: byte2]. + self cppIf: IMMUTABILITY ifTrue: ["genStorePop:...ReceiverVariable: annotate; don't annotate twice" ^0]]. + "We need a map entry for this bytecode for correct parsing (if the method builds a frame)." - ifFalse: [self genStorePop: opType = 6 ReceiverVariable: byte2]]. - "We need a map entry for this bytecode for correct parsing (if the method builds a frame). - We could of course special case the scanning but that's silly." needsFrame ifTrue: [self annotateBytecode: self Label]. ^0! Item was changed: ----- Method: SimpleStackBasedCogit>>extendedStoreAndPopBytecode (in category 'bytecode generators') ----- extendedStoreAndPopBytecode | variableType variableIndex | variableType := byte1 >> 6 bitAnd: 3. variableIndex := byte1 bitAnd: 63. variableType = 0 ifTrue: [^self genStorePop: true ReceiverVariable: variableIndex]. variableType = 1 ifTrue: [self genStorePop: true TemporaryVariable: variableIndex. + "needs a fake map entry if Immutability is ON..." - "needs a fake map entry is Immutability is ON..." self cppIf: IMMUTABILITY ifTrue: [ self annotateBytecode: self Label. ]. ^ 0]. variableType = 3 ifTrue: [^self genStorePop: true LiteralVariable: variableIndex]. ^EncounteredUnknownBytecode! Item was changed: ----- Method: SimpleStackBasedCogit>>extendedStoreBytecode (in category 'bytecode generators') ----- extendedStoreBytecode | variableType variableIndex | variableType := byte1 >> 6 bitAnd: 3. variableIndex := byte1 bitAnd: 63. variableType = 0 ifTrue: [^self genStorePop: false ReceiverVariable: variableIndex]. variableType = 1 ifTrue: [self genStorePop: false TemporaryVariable: variableIndex. + "needs a fake map entry if Immutability is ON..." - "needs a fake map entry is Immutability is ON..." self cppIf: IMMUTABILITY ifTrue: [ self annotateBytecode: self Label. ]. ^ 0]. variableType = 3 ifTrue: [^self genStorePop: false LiteralVariable: variableIndex]. ^EncounteredUnknownBytecode! Item was changed: ----- Method: SimpleStackBasedCogit>>genPushMaybeContextReceiverVariable: (in category 'bytecode generator support') ----- genPushMaybeContextReceiverVariable: slotIndex <inline: false> | jmpSingle jmpDone | <var: #jmpSingle type: #'AbstractInstruction *'> <var: #jmpDone type: #'AbstractInstruction *'> self assert: needsFrame. "See CoInterpreter>>contextInstructionPointer:frame: for an explanation of the instruction pointer slot handling." slotIndex = InstructionPointerIndex ifTrue: + [self putSelfInReceiverResultReg. - [self MoveMw: FoxMFReceiver r: FPReg R: ReceiverResultReg. self MoveCq: slotIndex R: SendNumArgsReg. self CallRT: ceFetchContextInstVarTrampoline. self PushR: SendNumArgsReg. ^0]. self MoveMw: FoxMFReceiver r: FPReg R: ReceiverResultReg. objectRepresentation genLoadSlot: SenderIndex sourceReg: ReceiverResultReg destReg: TempReg. jmpSingle := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg. self MoveCq: slotIndex R: SendNumArgsReg. self CallRT: ceFetchContextInstVarTrampoline. jmpDone := self Jump: 0. jmpSingle jmpTarget: self Label. objectRepresentation genLoadSlot: slotIndex sourceReg: ReceiverResultReg destReg: SendNumArgsReg. jmpDone jmpTarget: (self PushR: SendNumArgsReg). ^0! Item was changed: ----- Method: SimpleStackBasedCogit>>genPushReceiverVariable: (in category 'bytecode generator support') ----- genPushReceiverVariable: index <inline: false> | maybeErr | needsFrame ifTrue: + [self putSelfInReceiverResultReg]. - [self MoveMw: FoxMFReceiver r: FPReg R: ReceiverResultReg]. maybeErr := objectRepresentation genLoadSlot: index sourceReg: ReceiverResultReg destReg: TempReg. maybeErr < 0 ifTrue: [^maybeErr]. self PushR: TempReg. ^0! Item was changed: ----- Method: SimpleStackBasedCogit>>genReturnReceiver (in category 'bytecode generators') ----- genReturnReceiver "Frameless method activation looks like receiver args sp-> ret pc. Return pops receiver and arguments off the stack. Callee pushes the result." needsFrame ifTrue: + [self putSelfInReceiverResultReg]. - [self MoveMw: FoxMFReceiver r: FPReg R: ReceiverResultReg]. ^self genUpArrowReturn! Item was changed: ----- Method: SimpleStackBasedCogit>>genStorePop:LiteralVariable: (in category 'bytecode generator support') ----- genStorePop: popBoolean LiteralVariable: litVarIndex <inline: false> + | association immutabilityFailure | + <var: #immutabilityFailure type: #'AbstractInstruction *'> - | association | "The only reason we assert needsFrame here is that in a frameless method ReceiverResultReg must and does contain only self, but the ceStoreCheck trampoline expects the target of the store to be in ReceiverResultReg. So in a frameless method we would have a conflict between the receiver and the literal store, unless we we smart enough to realise that ReceiverResultReg was unused after the literal variable store, unlikely given that methods return self by default." self assert: needsFrame. association := self getLiteral: litVarIndex. self genMoveConstant: association R: ReceiverResultReg. objectRepresentation genEnsureObjInRegNotForwarded: ReceiverResultReg scratchReg: TempReg. popBoolean ifTrue: [self PopR: ClassReg] ifFalse: [self MoveMw: 0 r: SPReg R: ClassReg]. traceStores > 0 ifTrue: [self CallRT: ceTraceStoreTrampoline]. + self cppIf: IMMUTABILITY ifTrue: + [immutabilityFailure := objectRepresentation + genImmutableCheck: ReceiverResultReg + slotIndex: ValueIndex + sourceReg: ClassReg + scratchReg: TempReg + needRestoreRcvr: true]. + objectRepresentation - ^objectRepresentation genStoreSourceReg: ClassReg slotIndex: ValueIndex destReg: ReceiverResultReg scratchReg: TempReg + inFrame: needsFrame. + + self cppIf: IMMUTABILITY ifTrue: + [immutabilityFailure jmpTarget: self Label]. + + ^0! - inFrame: needsFrame! Item was changed: ----- Method: SimpleStackBasedCogit>>genStorePop:MaybeContextReceiverVariable: (in category 'bytecode generator support') ----- genStorePop: popBoolean MaybeContextReceiverVariable: slotIndex <inline: false> + | jmpSingle jmpDone immutabilityFailure | + <var: #immutabilityFailure type: #'AbstractInstruction *'> - | jmpSingle jmpDone | <var: #jmpSingle type: #'AbstractInstruction *'> <var: #jmpDone type: #'AbstractInstruction *'> "The reason we need a frame here is that assigning to an inst var of a context may involve wholesale reorganization of stack pages, and the only way to preserve the execution state of an activation in that case is if it has a frame." self assert: needsFrame. + self putSelfInReceiverResultReg. - self MoveMw: FoxMFReceiver r: FPReg R: ReceiverResultReg. objectRepresentation genLoadSlot: SenderIndex sourceReg: ReceiverResultReg destReg: TempReg. self MoveMw: 0 r: SPReg R: ClassReg. jmpSingle := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg. self MoveCq: slotIndex R: SendNumArgsReg. self CallRT: ceStoreContextInstVarTrampoline. jmpDone := self Jump: 0. jmpSingle jmpTarget: self Label. traceStores > 0 ifTrue: [self CallRT: ceTraceStoreTrampoline]. + self cppIf: IMMUTABILITY ifTrue: + [immutabilityFailure := objectRepresentation + genImmutableCheck: ReceiverResultReg + slotIndex: slotIndex + sourceReg: ClassReg + scratchReg: TempReg + needRestoreRcvr: true]. objectRepresentation genStoreSourceReg: ClassReg slotIndex: slotIndex destReg: ReceiverResultReg scratchReg: TempReg inFrame: true. jmpDone jmpTarget: self Label. popBoolean ifTrue: [self AddCq: objectMemory wordSize R: SPReg]. + self cppIf: IMMUTABILITY ifTrue: + [immutabilityFailure jmpTarget: self Label]. ^0! Item was changed: ----- Method: SimpleStackBasedCogit>>genStorePop:ReceiverVariable: (in category 'bytecode generator support') ----- genStorePop: popBoolean ReceiverVariable: slotIndex <inline: false> + | immutabilityFailure | + <var: #immutabilityFailure type: #'AbstractInstruction *'> needsFrame ifTrue: + [self putSelfInReceiverResultReg]. - [self MoveMw: FoxMFReceiver r: FPReg R: ReceiverResultReg]. popBoolean ifTrue: [self PopR: ClassReg] ifFalse: [self MoveMw: 0 r: SPReg R: ClassReg]. traceStores > 0 ifTrue: [self CallRT: ceTraceStoreTrampoline]. + self cppIf: IMMUTABILITY ifTrue: + [immutabilityFailure := objectRepresentation + genImmutableCheck: ReceiverResultReg + slotIndex: slotIndex + sourceReg: ClassReg + scratchReg: TempReg + needRestoreRcvr: true]. + objectRepresentation - ^objectRepresentation genStoreSourceReg: ClassReg slotIndex: slotIndex destReg: ReceiverResultReg scratchReg: TempReg + inFrame: needsFrame. + + self cppIf: IMMUTABILITY ifTrue: + [immutabilityFailure jmpTarget: self Label]. + + ^0! - inFrame: needsFrame! Item was changed: ----- Method: SimpleStackBasedCogit>>marshallAbsentReceiverSendArguments: (in category 'bytecode generators') ----- marshallAbsentReceiverSendArguments: numArgs self assert: needsFrame. + self putSelfInReceiverResultReg. - self MoveMw: FoxMFReceiver r: FPReg R: ReceiverResultReg. "Shuffle arguments if necessary and push receiver." numArgs = 0 ifTrue: [self PushR: ReceiverResultReg] ifFalse: [self MoveMw: 0 r: SPReg R: TempReg. self PushR: TempReg. 2 to: numArgs do: [:index| self MoveMw: index * objectMemory wordSize r: SPReg R: TempReg. self MoveR: TempReg Mw: index - 1 * BytesPerWord r: SPReg]. self MoveR: ReceiverResultReg Mw: numArgs * BytesPerWord r: SPReg].! Item was added: + ----- Method: SimpleStackBasedCogit>>methodUsesPrimitiveErrorCode:header: (in category 'compile abstract instructions') ----- + methodUsesPrimitiveErrorCode: aMethodObj header: aMethodHeader + "Answer if aMethodObj contains a primitive and uses the primitive error code." + <inline: true> + ^(coInterpreter primitiveIndexOfMethod: aMethodObj header: aMethodHeader) > 0 + and: [(coInterpreter longStoreBytecodeForHeader: aMethodHeader) + = (objectMemory + fetchByte: initialPC + (coInterpreter sizeOfCallPrimitiveBytecode: aMethodHeader) + ofObject: aMethodObj)]! Item was added: + ----- Method: SimpleStackBasedCogit>>putSelfInReceiverResultReg (in category 'bytecode generator support') ----- + putSelfInReceiverResultReg + <inline: true> + self MoveMw: FoxMFReceiver r: FPReg R: ReceiverResultReg! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>genMustBeBooleanTrampolineFor:called: (in category 'initialization') ----- genMustBeBooleanTrampolineFor: boolean called: trampolineName "This can be entered in one of two states, depending on SendNumArgsReg. See e.g. genJumpIf:to:. If SendNumArgsReg is non-zero then this has been entered via the initial test of the counter in the jump executed count (i.e. the counter has tripped). In this case TempReg contains the boolean to be tested and should not be offset, and ceCounterTripped should be invoked with the unoffset TempReg. If SendNumArgsReg is zero then this has been entered for must-be-boolean processing. TempReg has been offset by boolean and must be corrected and ceSendMustBeBoolean: invoked with the corrected value." <var: #trampolineName type: #'char *'> | jumpMBB | <var: #jumpMBB type: #'AbstractInstruction *'> <inline: false> self zeroOpcodeIndex. self CmpCq: 0 R: SendNumArgsReg. jumpMBB := self JumpZero: 0. "Open-code self compileTrampolineFor: #ceCounterTripped: numArgs: 1 arg: TempReg ... so we can restore ResultReceiverReg." self genSmalltalkToCStackSwitch: true. self compileCallFor: #ceCounterTripped: numArgs: 1 arg: TempReg arg: nil arg: nil arg: nil resultReg: TempReg "(*)" saveRegs: false. "(*) For the case where the ceCounterTripped: call returns (e.g. because there's no callback selector installed), the call to the ceSendMustBeBooleanAddTrue/FalseTrampoline is followed by a jump back to the start of the counter/condition test sequence. For this case copy the C result to TempReg (the register that is tested), to reload it with the boolean to be tested." backEnd genLoadStackPointers. backEnd hasLinkRegister ifTrue: [self PopR: LinkReg]. + "To keep ResultReceiverReg live if optStatus thought it was, simply reload it - "To keep ResultReceiverReg live if optStatus thiught it was, simply reload it from the frame pointer. This avoids having to reload it in the common case (counter does not trip) if it was live." + self putSelfInReceiverResultReg. - self MoveMw: FoxMFReceiver r: FPReg R: ReceiverResultReg. self RetN: 0. "If the objectRepresentation does want true & false to be mobile then we need to record these addresses." self assert: (objectRepresentation shouldAnnotateObjectReference: boolean) not. jumpMBB jmpTarget: (self AddCq: boolean R: TempReg). ^self genTrampolineFor: #ceSendMustBeBoolean: called: trampolineName numArgs: 1 arg: TempReg arg: nil arg: nil arg: nil saveRegs: false pushLinkReg: true resultReg: NoReg appendOpcodes: true! Item was changed: ----- Method: StackToRegisterMappingCogit>>doubleExtendedDoAnythingBytecode (in category 'bytecode generators') ----- doubleExtendedDoAnythingBytecode "Replaces the Blue Book double-extended send [132], in which the first byte was wasted on 8 bits of argument count. Here we use 3 bits for the operation sub-type (opType), and the remaining 5 bits for argument count where needed. The last byte give access to 256 instVars or literals. See also secondExtendedSendBytecode" | opType | opType := byte1 >> 5. opType = 0 ifTrue: [^self genSend: byte2 numArgs: (byte1 bitAnd: 31)]. opType = 1 ifTrue: [^self genSendSuper: byte2 numArgs: (byte1 bitAnd: 31)]. "We need a map entry for this bytecode for correct parsing. + The sends will get an IsSend entry anyway. The other cases need a fake one." - The sends will get an IsSend entry anyway. The other cases need a - fake one. We could of course special case the scanning but that's silly." opType caseOf: { [2] -> [(coInterpreter isReadMediatedContextInstVarIndex: byte2) ifTrue: [self genPushMaybeContextReceiverVariable: byte2] ifFalse: [self genPushReceiverVariable: byte2. self ssTop annotateUse: true. ^0]]. [3] -> [self genPushLiteralIndex: byte2. self ssTop annotateUse: true. ^0]. [4] -> [self genPushLiteralVariable: byte2.]. [7] -> [self genStorePop: false LiteralVariable: byte2. + self cppIf: IMMUTABILITY ifTrue: [ "genStorePop:LiteralVariable: annotates; don't annotate twice" ^0 ] ] } - self cppIf: IMMUTABILITY ifTrue: [ "instruction is mapped" ^0 ] ] } otherwise: "5 & 6" [(coInterpreter isWriteMediatedContextInstVarIndex: byte2) ifTrue: [self genStorePop: opType = 6 MaybeContextReceiverVariable: byte2] ifFalse: [self genStorePop: opType = 6 ReceiverVariable: byte2]. + self cppIf: IMMUTABILITY ifTrue: [ "genStorePop:LiteralVariable: annotates; don't annotate twice" ^0 ]]. + "We need a map entry for this bytecode for correct parsing (if the method builds a frame)." - self cppIf: IMMUTABILITY ifTrue: [ "instruction is mapped" ^0 ]]. - "We need a map entry for this bytecode for correct parsing (if the method builds a frame). - We could of course special case the scanning but that's silly (or is it?)." self assert: needsFrame. "genPushMaybeContextInstVar, pushListVar, store & storePop all generate code" self assert: self prevInstIsPCAnnotated not. self annotateBytecode: self Label. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genStorePop:LiteralVariable: (in category 'bytecode generator support') ----- genStorePop: popBoolean LiteralVariable: litVarIndex <inline: false> | topReg association needStoreCheck immutabilityFailure | "The only reason we assert needsFrame here is that in a frameless method ReceiverResultReg must and does contain only self, but the ceStoreCheck trampoline expects the target of the store to be in ReceiverResultReg. So in a frameless method we would have a conflict between the receiver and the literal store, unless we we smart enough to realise that ReceiverResultReg was unused after the literal variable store, unlikely given that methods return self by default." self assert: needsFrame. self cppIf: IMMUTABILITY ifTrue: [ self ssFlushTo: simStackPtr - 1 ]. "N.B. No need to check the stack for references because we generate code for literal variable loads that stores the result in a register, deferring only the register push." needStoreCheck := (objectRepresentation isUnannotatableConstant: self ssTop) not. association := self getLiteral: litVarIndex. optStatus isReceiverResultRegLive: false. self ssAllocateRequiredReg: ReceiverResultReg. "for ceStoreCheck call in genStoreSourceReg: has to be ReceiverResultReg" self genMoveConstant: association R: ReceiverResultReg. objectRepresentation genEnsureObjInRegNotForwarded: ReceiverResultReg scratchReg: TempReg. self cppIf: IMMUTABILITY ifTrue: [ self ssAllocateRequiredReg: ClassReg. topReg := ClassReg. self ssStoreAndReplacePop: popBoolean toReg: ClassReg. "stack is flushed except maybe ssTop if popBoolean is false. ssTop is a SSregister in this case due to #ssStoreAndReplacePop: to avoid a second indirect read / annotation in case of SSConstant or SSBaseRegister" self ssFlushTo: simStackPtr. + immutabilityFailure := objectRepresentation + genImmutableCheck: ReceiverResultReg + slotIndex: ValueIndex + sourceReg: ClassReg + scratchReg: TempReg + needRestoreRcvr: false ] - immutabilityFailure := objectRepresentation - genImmutableCheck: ReceiverResultReg - slotIndex: ValueIndex - sourceReg: ClassReg - scratchReg: TempReg - popBoolean: popBoolean - needRestoreRcvr: false ] ifFalse: [ topReg := self allocateRegForStackEntryAt: 0 notConflictingWith: (self registerMaskFor: ReceiverResultReg). self ssStorePop: popBoolean toReg: topReg ]. traceStores > 0 ifTrue: [self MoveR: topReg R: TempReg. self CallRT: ceTraceStoreTrampoline]. objectRepresentation genStoreSourceReg: topReg slotIndex: ValueIndex destReg: ReceiverResultReg scratchReg: TempReg inFrame: needsFrame needsStoreCheck: needStoreCheck. self cppIf: IMMUTABILITY ifTrue: [ immutabilityFailure jmpTarget: self Label ]. ^ 0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genStorePop:MaybeContextReceiverVariable: (in category 'bytecode generator support') ----- genStorePop: popBoolean MaybeContextReceiverVariable: slotIndex <inline: false> | jmpSingle jmpDone needStoreCheck immutabilityFailure | <var: #jmpSingle type: #'AbstractInstruction *'> <var: #jmpDone type: #'AbstractInstruction *'> "The reason we need a frame here is that assigning to an inst var of a context may involve wholesale reorganization of stack pages, and the only way to preserve the execution state of an activation in that case is if it has a frame." self assert: needsFrame. self cppIf: IMMUTABILITY ifTrue: [ self ssFlushTo: simStackPtr - 1 ]. self ssFlushUpThroughReceiverVariable: slotIndex. needStoreCheck := (objectRepresentation isUnannotatableConstant: self ssTop) not. "Note that ReceiverResultReg remains live after both ceStoreContextInstVarTrampoline and ceStoreCheckTrampoline." self ensureReceiverResultRegContainsSelf. self ssPop: 1. self ssAllocateCallReg: ClassReg and: SendNumArgsReg. "for ceStoreContextInstVarTrampoline" self ssPush: 1. objectRepresentation genLoadSlot: SenderIndex sourceReg: ReceiverResultReg destReg: TempReg. self cppIf: IMMUTABILITY ifTrue: [ self ssStoreAndReplacePop: popBoolean toReg: ClassReg. "stack is flushed except maybe ssTop if popBoolean is false. ssTop is a SSregister in this case due to #ssStoreAndReplacePop: to avoid a second indirect read / annotation in case of SSConstant or SSBaseRegister" self ssFlushTo: simStackPtr. ] ifFalse: [ self ssStorePop: popBoolean toReg: ClassReg ]. jmpSingle := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg. self MoveCq: slotIndex R: SendNumArgsReg. self CallRT: ceStoreContextInstVarTrampoline. jmpDone := self Jump: 0. jmpSingle jmpTarget: self Label. traceStores > 0 ifTrue: [self MoveR: ClassReg R: TempReg. self CallRT: ceTraceStoreTrampoline]. self cppIf: IMMUTABILITY ifTrue: + [ immutabilityFailure := objectRepresentation + genImmutableCheck: ReceiverResultReg + slotIndex: ValueIndex + sourceReg: ClassReg + scratchReg: TempReg + needRestoreRcvr: true ]. - [ immutabilityFailure := objectRepresentation - genImmutableCheck: ReceiverResultReg - slotIndex: ValueIndex - sourceReg: ClassReg - scratchReg: TempReg - popBoolean: popBoolean - needRestoreRcvr: true ]. objectRepresentation genStoreSourceReg: ClassReg slotIndex: slotIndex destReg: ReceiverResultReg scratchReg: TempReg inFrame: true needsStoreCheck: needStoreCheck. jmpDone jmpTarget: self Label. self cppIf: IMMUTABILITY ifTrue: [ immutabilityFailure jmpTarget: self Label ]. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genStorePop:ReceiverVariable: (in category 'bytecode generator support') ----- genStorePop: popBoolean ReceiverVariable: slotIndex <inline: false> | topReg needStoreCheck immutabilityFailure | self cppIf: IMMUTABILITY ifTrue: [ self assert: needsFrame. self ssFlushTo: simStackPtr - 1 ]. self ssFlushUpThroughReceiverVariable: slotIndex. needStoreCheck := (objectRepresentation isUnannotatableConstant: self ssTop) not. "Note that ReceiverResultReg remains live after ceStoreCheckTrampoline." self ensureReceiverResultRegContainsSelf. self cppIf: IMMUTABILITY ifTrue: [ self ssAllocateRequiredReg: ClassReg. topReg := ClassReg. self ssStoreAndReplacePop: popBoolean toReg: ClassReg. "stack is flushed except maybe ssTop if popBoolean is false. ssTop is a SSregister in this case due to #ssStoreAndReplacePop: to avoid a second indirect read / annotation in case of SSConstant or SSBaseRegister" self ssFlushTo: simStackPtr. + immutabilityFailure := objectRepresentation + genImmutableCheck: ReceiverResultReg + slotIndex: slotIndex + sourceReg: ClassReg + scratchReg: TempReg + needRestoreRcvr: true ] - immutabilityFailure := objectRepresentation - genImmutableCheck: ReceiverResultReg - slotIndex: slotIndex - sourceReg: ClassReg - scratchReg: TempReg - popBoolean: popBoolean - needRestoreRcvr: true ] ifFalse: [ topReg := self allocateRegForStackEntryAt: 0 notConflictingWith: (self registerMaskFor: ReceiverResultReg). self ssStorePop: popBoolean toReg: topReg ]. traceStores > 0 ifTrue: [ self MoveR: topReg R: TempReg. self evaluateTrampolineCallBlock: [ self CallRT: ceTraceStoreTrampoline ] protectLinkRegIfNot: needsFrame ]. objectRepresentation genStoreSourceReg: topReg slotIndex: slotIndex destReg: ReceiverResultReg scratchReg: TempReg inFrame: needsFrame needsStoreCheck: needStoreCheck. self cppIf: IMMUTABILITY ifTrue: [ immutabilityFailure jmpTarget: self Label ]. ^ 0! Item was changed: ----- Method: StackToRegisterMappingCogit>>marshallAbsentReceiverSendArguments: (in category 'simulation stack') ----- marshallAbsentReceiverSendArguments: numArgs self assert: needsFrame. self ssAllocateCallReg: ReceiverResultReg. + self putSelfInReceiverResultReg. - self MoveMw: FoxMFReceiver r: FPReg R: ReceiverResultReg. "Spill everything on the simulated stack that needs spilling (that below arguments). Marshall arguments to stack and/or registers depending on arg count. If the args don't fit in registers push receiver and args (spill everything). Assume receiver already in ResultReceiverReg so shuffle args and push it if necessary." self ssFlushTo: simStackPtr - numArgs. numArgs > self numRegArgs ifTrue: ["The arguments must be pushed to the stack, and hence the receiver must be inserted beneath the args. Reduce or eliminate the argument shuffle by only moving already spilled items." | numSpilled | numSpilled := self numberOfSpillsInTopNItems: numArgs. numSpilled > 0 ifTrue: [self MoveMw: 0 r: SPReg R: TempReg. self PushR: TempReg. 2 to: numSpilled do: [:index| self MoveMw: index * objectMemory wordSize r: SPReg R: TempReg. self MoveR: TempReg Mw: index - 1 * objectMemory wordSize r: SPReg]. self MoveR: ReceiverResultReg Mw: numSpilled * objectMemory wordSize r: SPReg] ifFalse: [self PushR: ReceiverResultReg]. self ssFlushTo: simStackPtr] "Move the args to the register arguments, being careful to do so last to first so e.g. previous contents don't get overwritten. Also check for any arg registers in use by other args." ifFalse: [numArgs > 0 ifTrue: [(self numRegArgs > 1 and: [numArgs > 1]) ifTrue: [self ssAllocateRequiredReg: Arg0Reg upThrough: simStackPtr - 2. self ssAllocateRequiredReg: Arg1Reg upThrough: simStackPtr - 1] ifFalse: [self ssAllocateRequiredReg: Arg0Reg upThrough: simStackPtr - 1]]. (self numRegArgs > 1 and: [numArgs > 1]) ifTrue: [(self simStackAt: simStackPtr) popToReg: Arg1Reg]. numArgs > 0 ifTrue: [(self simStackAt: simStackPtr - numArgs + 1) popToReg: Arg0Reg]]. self ssPop: numArgs!

1 0

Re: [Vm-dev] VM Maker: VMMaker.oscog-cb.1654.mcz
by Eliot Miranda 21 Jan '16

21 Jan '16

Hi Clément, alas the bytecode <-> machine code mapping machinery isn't capable of distinguishing different variants of a complex bytecode such as extendedStoreAndPopBytecode. The map machinery is based on parsing bytecodes by looking up their descriptors. So if a bytecode descriptor is marked as mapped, all instantiations of the bytecode in machine code must be mapped, not just the ones we know we're going to need a map entry for for message handling etc. So where you write extendedStoreAndPopBytecode | variableType variableIndex | variableType := byte1 >> 6 bitAnd: 3. variableIndex := byte1 bitAnd: 63. variableType = 0 ifTrue: [^self genStorePop: true ReceiverVariable: variableIndex]. variableType = 1 ifTrue: [self genStorePop: true TemporaryVariable: variableIndex. "needs a fake map entry is Immutability is ON..." self cppIf: IMMUTABILITY ifTrue: [ self annotateBytecode: self Label. ]. ^ 0]. variableType = 3 ifTrue: [^self genStorePop: true LiteralVariable: variableIndex]. ^EncounteredUnknownBytecode you're actually going to have to write something like extendedStoreAndPopBytecode | variableType variableIndex | variableType := byte1 >> 6 bitAnd: 3. variableIndex := byte1 bitAnd: 63. variableType = 0 ifTrue: [self genStorePop: true ReceiverVariable: variableIndex]. variableType = 1 ifTrue: [self genStorePop: true TemporaryVariable: variableIndex]. variableType = 2 ifTrue: [^EncounteredUnknownBytecode]. variableType = 3 ifTrue: [self genStorePop: true LiteralVariable: variableIndex]. "If IMMUTABILITY is on then this bytecode could send back and so must be mapped." self cppIf: IMMUTABILITY ifTrue: [self annotateBytecode: self lastOpcode] I think this should fix your instabilities. What's happening is that your nearly-correct code creates the occasional method with a bad map and if the map is used (which it isn't often, but is in the debugger) then method execution can get screwed up. HTH On Tue, Jan 19, 2016 at 5:29 AM, <commits(a)source.squeak.org> wrote: > > Eliot Miranda uploaded a new version of VMMaker to project VM Maker: > http://source.squeak.org/VMMaker/VMMaker.oscog-cb.1654.mcz > > ==================== Summary ==================== > > Name: VMMaker.oscog-cb.1654 > Author: cb > Time: 19 January 2016, 2:28:37.278 pm > UUID: 35bdf68b-ea60-4f01-8799-14baa71ab416 > Ancestors: VMMaker.oscog-cb.1653 > > In the SqueakV3Bytecode set, extendedStore and extStoreAndPop are now > mapped as instVar and LiteralVar stores need to be mapped for immutability. > We need to generate a fake mapping to make the mcpc to bcpc mapping happy. > > Starting from this version, the mcpc to bcpc is happy *except* for > primitive error code. In this case, an extStore bytecode is used for the > error code but is still not mapped. > > =============== Diff against VMMaker.oscog-cb.1653 =============== > > Item was changed: > ----- Method: SimpleStackBasedCogit>>extendedStoreAndPopBytecode (in > category 'bytecode generators') ----- > extendedStoreAndPopBytecode > | variableType variableIndex | > variableType := byte1 >> 6 bitAnd: 3. > variableIndex := byte1 bitAnd: 63. > variableType = 0 ifTrue: > [^self genStorePop: true ReceiverVariable: variableIndex]. > variableType = 1 ifTrue: > + [self genStorePop: true TemporaryVariable: variableIndex. > + "needs a fake map entry is Immutability is ON..." > + self cppIf: IMMUTABILITY ifTrue: [ self annotateBytecode: > self Label. ]. > + ^ 0]. > - [^self genStorePop: true TemporaryVariable: variableIndex]. > variableType = 3 ifTrue: > [^self genStorePop: true LiteralVariable: variableIndex]. > ^EncounteredUnknownBytecode! > > Item was changed: > ----- Method: SimpleStackBasedCogit>>extendedStoreBytecode (in category > 'bytecode generators') ----- > extendedStoreBytecode > | variableType variableIndex | > variableType := byte1 >> 6 bitAnd: 3. > variableIndex := byte1 bitAnd: 63. > variableType = 0 ifTrue: > [^self genStorePop: false ReceiverVariable: variableIndex]. > variableType = 1 ifTrue: > + [self genStorePop: false TemporaryVariable: variableIndex. > + "needs a fake map entry is Immutability is ON..." > + self cppIf: IMMUTABILITY ifTrue: [ self annotateBytecode: > self Label. ]. > + ^ 0]. > - [^self genStorePop: false TemporaryVariable: > variableIndex]. > variableType = 3 ifTrue: > [^self genStorePop: false LiteralVariable: variableIndex]. > ^EncounteredUnknownBytecode! > > Item was changed: > ----- Method: > StackToRegisterMappingCogit>>doubleExtendedDoAnythingBytecode (in category > 'bytecode generators') ----- > doubleExtendedDoAnythingBytecode > "Replaces the Blue Book double-extended send [132], in which the > first byte was wasted on 8 bits of argument count. > Here we use 3 bits for the operation sub-type (opType), and the > remaining 5 bits for argument count where needed. > The last byte give access to 256 instVars or literals. > See also secondExtendedSendBytecode" > | opType | > opType := byte1 >> 5. > opType = 0 ifTrue: > [^self genSend: byte2 numArgs: (byte1 bitAnd: 31)]. > opType = 1 ifTrue: > [^self genSendSuper: byte2 numArgs: (byte1 bitAnd: 31)]. > "We need a map entry for this bytecode for correct parsing. > The sends will get an IsSend entry anyway. The other cases need a > fake one. We could of course special case the scanning but > that's silly." > opType caseOf: { > [2] -> [(coInterpreter > isReadMediatedContextInstVarIndex: byte2) > ifTrue: [self > genPushMaybeContextReceiverVariable: byte2] > ifFalse: [self > genPushReceiverVariable: byte2. > self ssTop > annotateUse: true. > ^0]]. > [3] -> [self genPushLiteralIndex: byte2. > self ssTop annotateUse: true. > ^0]. > [4] -> [self genPushLiteralVariable: > byte2.]. > + [7] -> [self genStorePop: false > LiteralVariable: byte2. > + self cppIf: IMMUTABILITY ifTrue: [ > "instruction is mapped" ^0 ] ] } > - [7] -> [self genStorePop: false > LiteralVariable: byte2] } > otherwise: "5 & 6" > [(coInterpreter > isWriteMediatedContextInstVarIndex: byte2) > ifTrue: [self genStorePop: opType = 6 > MaybeContextReceiverVariable: byte2] > + ifFalse: [self genStorePop: opType = 6 > ReceiverVariable: byte2]. > + self cppIf: IMMUTABILITY ifTrue: [ "instruction is > mapped" ^0 ]]. > - ifFalse: [self genStorePop: opType = 6 > ReceiverVariable: byte2]]. > "We need a map entry for this bytecode for correct parsing (if the > method builds a frame). > We could of course special case the scanning but that's silly (or > is it?)." > self assert: needsFrame. > "genPushMaybeContextInstVar, pushListVar, store & storePop all > generate code" > self assert: self prevInstIsPCAnnotated not. > self annotateBytecode: self Label. > ^0! > > -- _,,,^..^,,,_ best, Eliot

2 2

VM Maker: VMMaker.oscog-eem.1660.mcz
by commits＠source.squeak.org 21 Jan '16

21 Jan '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1660.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1660 Author: eem Time: 21 January 2016, 8:32:44.580527 pm UUID: 372f5635-366a-462d-8979-ae86dee05577 Ancestors: VMMaker.oscog-cb.1659 Immutability: Add the immutability info to the bytecode tables in SimpleStackBasedCogit Use isObjImmutable: externally to SpurMemoryManager and hence get rid of the cppIf:ifrue: around the failure. Make the married context inst var assign methods deny immutability for their contexts. Streamline primitiveSetImmutability to use booleanObjectOf:. Cogit: Move debugBytecodePointers up into Cogit to help debugging code generation in SimpleStackBasedCogit. Plugins: Fix the FilePlugin's unnecessary fullGC on Spur. Slang vs simulation: Get rid of the hacks for variables defined on the C command line or in headers such as IMMUTABILITY or VMBIGENDIAN. Introduce VMBasicConstants class>>namesDefinedAtCompileTime to define these names and - have dead code elimination check for these names and not eliminate - have emitCConstants:on: query them to decide which variables are to be output as #if !defined(... forms. Eliminate the !defined hacks from various declareCVars:. Make sure that IMMUTABILITY et al /are/ defaulted to appropriate values for simulation if not defined. Nuke the now incomprehensible copyOptionsBackTo:. =============== Diff against VMMaker.oscog-cb.1659 =============== Item was changed: ----- Method: CCodeGenerator>>emitCConstants:on: (in category 'C code generator') ----- emitCConstants: constList on: aStream "Store the global variable declarations on the given stream." constList isEmpty ifTrue: [^self]. aStream cr; nextPutAll: '/*** Constants ***/'; cr. (self sortStrings: constList) do: + [:varName| | node default value conditional | - [:varName| | node default value | node := constants at: varName. node name isEmpty ifFalse: ["If the definition includes a C comment, take it as is, otherwise convert the value from Smalltalk to C. Allow the class to provide an alternative definition, either of just the value or the whole shebang." default := (node value isString and: [node value includesSubString: '/*']) ifTrue: [node value] ifFalse: [self cLiteralFor: node value name: varName]. default = #undefined ifTrue: [aStream nextPutAll: '#undef '; nextPutAll: node name; cr] ifFalse: + [conditional := VMBasicConstants namesDefinedAtCompileTime includes: node name. + conditional ifTrue: + [aStream nextPutAll: '#if !!defined('; nextPutAll: node name; nextPutAll: ') /* Allow this to be overridden on the compiler command line */'; cr]. + value := vmClass - [value := vmClass ifNotNil: [(vmClass specialValueForConstant: node name default: default) ifNotNil: [:specialDef| specialDef] ifNil: [default]] ifNil: [default]. value first ~= $# ifTrue: [aStream nextPutAll: '#define '; nextPutAll: node name; space]. + aStream nextPutAll: value; cr. + conditional ifTrue: + [aStream nextPutAll: '#endif'; cr]]]]. - aStream nextPutAll: value; cr]]]. aStream cr! Item was changed: ----- Method: CCodeGenerator>>isConstantNode:valueInto: (in category 'utilities') ----- isConstantNode: aNode valueInto: aBlock "Answer if aNode evaluates to a constant, and if so, evaluate aBlock with the value of that constant." aNode isConstant ifTrue: + [(aNode isDefine + and: [VMBasicConstants namesDefinedAtCompileTime includes: aNode name]) ifTrue: + [^false]. + aBlock value: aNode value. - [aBlock value: aNode value. ^true]. (aNode isVariable and: [aNode name = #nil]) ifTrue: [aBlock value: nil. ^true]. aNode isSend ifFalse: [^false]. (self anyMethodNamed: aNode selector) ifNil: [(VMBasicConstants valueOfBasicSelector: aNode selector) ifNotNil: [:value| aBlock value: value. ^true]] ifNotNil: [:m| (m statements size = 1 and: [m statements last isReturn]) ifTrue: [^self isConstantNode: m statements last expression valueInto: aBlock]]. ^false! Item was changed: ----- Method: CCodeGenerator>>vmClass: (in category 'accessing') ----- vmClass: aClass "Set the main translation class if any. This is nil other than for the core VM. It may be an interpreter or a cogit" vmClass := aClass. vmClass ifNotNil: + [generateDeadCode := vmClass shouldGenerateDeadCode]! - [generateDeadCode := vmClass shouldGenerateDeadCode. - vmClass copyOptionsBackTo: optionsDictionary]! Item was changed: ----- Method: CoInterpreterPrimitives>>primitiveObjectAtPut (in category 'object access primitives') ----- primitiveObjectAtPut "Store a literal into a CompiledMethod at the given index. Defined for CompiledMethods only." | thisReceiver rawHeader realHeader index newValue | newValue := self stackValue: 0. index := self stackValue: 1. (objectMemory isNonIntegerObject: index) ifTrue: [^self primitiveFailFor: PrimErrBadArgument]. index := objectMemory integerValueOf: index. thisReceiver := self stackValue: 2. + (objectMemory isObjImmutable: thisReceiver) ifTrue: + [^self primitiveFailFor: PrimErrNoModification]. - self cppIf: IMMUTABILITY - ifTrue: [ (objectMemory isImmutable: thisReceiver) ifTrue: [ ^self primitiveFailFor: PrimErrNoModification ] ]. rawHeader := self rawHeaderOf: thisReceiver. realHeader := (self isCogMethodReference: rawHeader) ifTrue: [(self cCoerceSimple: rawHeader to: #'CogMethod *') methodHeader] ifFalse: [rawHeader]. (index > 0 and: [index <= ((objectMemory literalCountOfMethodHeader: realHeader) + LiteralStart)]) ifFalse: [^self primitiveFailFor: PrimErrBadIndex]. index = 1 ifTrue: [((objectMemory isNonIntegerObject: newValue) or: [(objectMemory literalCountOfMethodHeader: newValue) ~= (objectMemory literalCountOfMethodHeader: realHeader)]) ifTrue: [^self primitiveFailFor: PrimErrBadArgument]. (self isCogMethodReference: rawHeader) ifTrue: [(self cCoerceSimple: rawHeader to: #'CogMethod *') methodHeader: newValue] ifFalse: [objectMemory storePointerUnchecked: 0 ofObject: thisReceiver withValue: newValue]] ifFalse: [objectMemory storePointer: index - 1 ofObject: thisReceiver withValue: newValue]. self pop: 3 thenPush: newValue! Item was changed: CogClass subclass: #Cogit + instanceVariableNames: 'coInterpreter objectMemory objectRepresentation processor threadManager methodZone methodZoneBase codeBase minValidCallAddress lastNInstructions simulatedAddresses simulatedTrampolines simulatedVariableGetters simulatedVariableSetters printRegisters printInstructions compilationTrace clickConfirm breakPC breakBlock singleStep guardPageSize traceFlags traceStores breakMethod methodObj enumeratingCogMethod methodHeader initialPC endPC methodOrBlockNumArgs inBlock needsFrame hasYoungReferent primitiveIndex backEnd literalsManager callerSavedRegMask postCompileHook methodLabel stackCheckLabel blockEntryLabel blockEntryNoContextSwitch blockNoContextSwitchOffset stackOverflowCall sendMiss missOffset entryPointMask checkedEntryAlignment uncheckedEntryAlignment cmEntryOffset entry cmNoCheckEntryOffset noCheckEntry picMNUAbort picInterpretAbort endCPICCase0 endCPICCase1 firstCPICCaseOffset cPICCaseSize cPICEndSize closedPICSize openPICSize fixups abstractOpcodes generatorTable byte0 byte1 byte2 byte3 bytecodePC bytecodeSetOffset opcodeIndex numAbstractOpcodes blockStarts blockCount labelCounter cStackAlignment expectedSPAlignment expectedFPAlignment codeModified maxLitIndex ceMethodAbortTrampoline cePICAbortTrampoline ceCheckForInterruptTrampoline ceCPICMissTrampoline ceReturnToInterpreterTrampoline ceBaseFrameReturnTrampoline ceSendMustBeBooleanAddTrueTrampoline ceSendMustBeBooleanAddFalseTrampoline ceCannotResumeTrampoline ceEnterCogCodePopReceiverReg ceCallCogCodePopReceiverReg ceCallCogCodePopReceiverAndClassRegs cePrimReturnEnterCogCode cePrimReturnEnterCogCodeProfiling ceNonLocalReturnTrampoline ceFetchContextInstVarTrampoline ceStoreContextInstVarTrampoline ceEnclosingObjectTrampoline ceFlushICache ceCheckFeaturesFunction ceTraceLinkedSendTrampoline ceTraceBlockActivationTrampoline ceTraceStoreTrampoline ceGetFP ceGetSP ceCaptureCStackPointers ordinarySendTrampolines superSendTrampolines directedSuperSendTrampolines dynamicSuperSendTrampolines outerSendTrampolines selfSendTrampolines firstSend lastSend realCEEnterCogCodePopReceiverReg realCECallCogCodePopReceiverReg realCECallCogCodePopReceiverAndClassRegs trampolineTableIndex trampolineAddresses objectReferencesInRuntime runtimeObjectRefIndex cFramePointerInUse debugPrimCallStackOffset ceTryLockVMOwner ceUnlockVMOwner extA extB tempOop numIRCs indexOfIRC theIRCs implicitReceiverSendTrampolines cogMethodSurrogateClass cogBlockMethodSurrogateClass nsSendCacheSurrogateClass CStackPointer CFramePointer cPICPrototype cPICEndOfCodeOffset cPICEndOfCodeLabel maxCPICCases debugBytecodePointers debugOpcodeIndices disassemblingMethod' - instanceVariableNames: 'coInterpreter objectMemory objectRepresentation processor threadManager methodZone methodZoneBase codeBase minValidCallAddress lastNInstructions simulatedAddresses simulatedTrampolines simulatedVariableGetters simulatedVariableSetters printRegisters printInstructions compilationTrace clickConfirm breakPC breakBlock singleStep guardPageSize traceFlags traceStores breakMethod methodObj enumeratingCogMethod methodHeader initialPC endPC methodOrBlockNumArgs inBlock needsFrame hasYoungReferent primitiveIndex backEnd literalsManager callerSavedRegMask postCompileHook methodLabel stackCheckLabel blockEntryLabel blockEntryNoContextSwitch blockNoContextSwitchOffset stackOverflowCall sendMiss missOffset entryPointMask checkedEntryAlignment uncheckedEntryAlignment cmEntryOffset entry cmNoCheckEntryOffset noCheckEntry picMNUAbort picInterpretAbort endCPICCase0 endCPICCase1 firstCPICCaseOffset cPICCaseSize cPICEndSize closedPICSize openPICSize fixups abstractOpcodes generatorTable byte0 byte1 byte2 byte3 bytecodePC bytecodeSetOffset opcodeIndex numAbstractOpcodes blockStarts blockCount labelCounter cStackAlignment expectedSPAlignment expectedFPAlignment codeModified maxLitIndex ceMethodAbortTrampoline cePICAbortTrampoline ceCheckForInterruptTrampoline ceCPICMissTrampoline ceReturnToInterpreterTrampoline ceBaseFrameReturnTrampoline ceSendMustBeBooleanAddTrueTrampoline ceSendMustBeBooleanAddFalseTrampoline ceCannotResumeTrampoline ceEnterCogCodePopReceiverReg ceCallCogCodePopReceiverReg ceCallCogCodePopReceiverAndClassRegs cePrimReturnEnterCogCode cePrimReturnEnterCogCodeProfiling ceNonLocalReturnTrampoline ceFetchContextInstVarTrampoline ceStoreContextInstVarTrampoline ceEnclosingObjectTrampoline ceFlushICache ceCheckFeaturesFunction ceTraceLinkedSendTrampoline ceTraceBlockActivationTrampoline ceTraceStoreTrampoline ceGetFP ceGetSP ceCaptureCStackPointers ordinarySendTrampolines superSendTrampolines directedSuperSendTrampolines dynamicSuperSendTrampolines outerSendTrampolines selfSendTrampolines firstSend lastSend realCEEnterCogCodePopReceiverReg realCECallCogCodePopReceiverReg realCECallCogCodePopReceiverAndClassRegs trampolineTableIndex trampolineAddresses objectReferencesInRuntime runtimeObjectRefIndex cFramePointerInUse debugPrimCallStackOffset ceTryLockVMOwner ceUnlockVMOwner extA extB tempOop numIRCs indexOfIRC theIRCs implicitReceiverSendTrampolines cogMethodSurrogateClass cogBlockMethodSurrogateClass nsSendCacheSurrogateClass CStackPointer CFramePointer cPICPrototype cPICEndOfCodeOffset cPICEndOfCodeLabel maxCPICCases debugOpcodeIndices disassemblingMethod' classVariableNames: 'AltBlockCreationBytecodeSize AltFirstSpecialSelector AltNSSendIsPCAnnotated AltNumSpecialSelectors AnnotationConstantNames AnnotationShift AnnotationsWithBytecodePCs BlockCreationBytecodeSize Debug DisplacementMask DisplacementX2N EagerInstructionDecoration FirstAnnotation FirstSpecialSelector HasBytecodePC IsAbsPCReference IsAnnotationExtension IsDirectedSuperSend IsDisplacementX2N IsNSDynamicSuperSend IsNSImplicitReceiverSend IsNSSelfSend IsNSSendCall IsObjectReference IsRelativeCall IsSendCall IsSuperSend MapEnd MaxCompiledPrimitiveIndex MaxStackAllocSize MaxX2NDisplacement NSCClassTagIndex NSCEnclosingObjectIndex NSCNumArgsIndex NSCSelectorIndex NSCTargetIndex NSSendIsPCAnnotated NumObjRefsInRuntime NumOopsPerNSC NumSpecialSelectors NumTrampolines ProcessorClass' poolDictionaries: 'CogAbstractRegisters CogCompilationConstants CogMethodConstants CogRTLOpcodes VMBasicConstants VMBytecodeConstants VMObjectIndices VMStackFrameOffsets' category: 'VMMaker-JIT'! Cogit class instanceVariableNames: 'generatorTable primitiveTable'! !Cogit commentStamp: 'eem 4/6/2015 15:56' prior: 0! I am the code generator for the Cog VM. My job is to produce machine code versions of methods for faster execution and to manage inline caches for faster send performance. I can be tested in the current image using my class-side in-image compilation facilities. e.g. try StackToRegisterMappingCogit genAndDis: (Integer >> #benchFib) I have concrete subclasses that implement different levels of optimization: SimpleStackBasedCogit is the simplest code generator. StackToRegisterMappingCogit is the current production code generator It defers pushing operands to the stack until necessary and implements a register-based calling convention for low-arity sends. StackToRegisterMappingCogit is an experimental code generator with support for counting conditional branches, intended to support adaptive optimization. coInterpreter <CoInterpreterSimulator> the VM's interpreter with which I cooperate methodZoneManager <CogMethodZoneManager> the manager of the machine code zone objectRepresentation <CogObjectRepresentation> the object used to generate object accesses processor <BochsIA32Alien|?> the simulator that executes the IA32/x86 machine code I generate when simulating execution in Smalltalk simulatedTrampolines <Dictionary of Integer -> MessageSend> the dictionary mapping trap jump addresses to run-time routines used to warp from simulated machine code in to the Smalltalk run-time. simulatedVariableGetters <Dictionary of Integer -> MessageSend> the dictionary mapping trap read addresses to variables in run-time objects used to allow simulated machine code to read variables in the Smalltalk run-time. simulatedVariableSetters <Dictionary of Integer -> MessageSend> the dictionary mapping trap write addresses to variables in run-time objects used to allow simulated machine code to write variables in the Smalltalk run-time. printRegisters printInstructions clickConfirm <Boolean> flags controlling debug printing and code simulation breakPC <Integer> machine code pc breakpoint cFramePointer cStackPointer <Integer> the variables representing the C stack & frame pointers, which must change on FFI callback and return selectorOop <sqInt> the oop of the methodObj being compiled methodObj <sqInt> the bytecode method being compiled initialPC endPC <Integer> the start and end pcs of the methodObj being compiled methodOrBlockNumArgs <Integer> argument count of current method or block being compiled needsFrame <Boolean> whether methodObj or block needs a frame to execute primitiveIndex <Integer> primitive index of current method being compiled methodLabel <CogAbstractOpcode> label for the method header blockEntryLabel <CogAbstractOpcode> label for the start of the block dispatch code stackOverflowCall <CogAbstractOpcode> label for the call of ceStackOverflow in the method prolog sendMissCall <CogAbstractOpcode> label for the call of ceSICMiss in the method prolog entryOffset <Integer> offset of method entry code from start (header) of method entry <CogAbstractOpcode> label for the first instruction of the method entry code noCheckEntryOffset <Integer> offset of the start of a method proper (after the method entry code) from start (header) of method noCheckEntry <CogAbstractOpcode> label for the first instruction of start of a method proper fixups <Array of <AbstractOpcode Label | nil>> the labels for forward jumps that will be fixed up when reaching the relevant bytecode. fixup shas one element per byte in methodObj's bytecode abstractOpcodes <Array of <AbstractOpcode>> the code generated when compiling methodObj byte0 byte1 byte2 byte3 <Integer> individual bytes of current bytecode being compiled in methodObj bytecodePointer <Integer> bytecode pc (same as Smalltalk) of the current bytecode being compiled opcodeIndex <Integer> the index of the next free entry in abstractOpcodes (this code is translated into C where OrderedCollection et al do not exist) numAbstractOpcodes <Integer> the number of elements in abstractOpcocdes blockStarts <Array of <BlockStart>> the starts of blocks in the current method blockCount the index into blockStarts as they are being noted, and hence eventually the total number of blocks in the current method labelCounter <Integer> a nicety for numbering labels not needed in the production system but probably not expensive enough to worry about ceStackOverflowTrampoline <Integer> ceSend0ArgsTrampoline <Integer> ceSend1ArgsTrampoline <Integer> ceSend2ArgsTrampoline <Integer> ceSendNArgsTrampoline <Integer> ceSendSuper0ArgsTrampoline <Integer> ceSendSuper1ArgsTrampoline <Integer> ceSendSuper2ArgsTrampoline <Integer> ceSendSuperNArgsTrampoline <Integer> ceSICMissTrampoline <Integer> ceCPICMissTrampoline <Integer> ceStoreCheckTrampoline <Integer> ceReturnToInterpreterTrampoline <Integer> ceBaseFrameReturnTrampoline <Integer> ceSendMustBeBooleanTrampoline <Integer> ceClosureCopyTrampoline <Integer> the various trampolines (system-call-like jumps from machine code to the run-time). See Cogit>>generateTrampolines for the mapping from trampoline to run-time routine and then read the run-time routine for a funcitonal description. ceEnterCogCodePopReceiverReg <Integer> the enilopmart (jump from run-time to machine-code) methodZoneBase <Integer> ! Cogit class instanceVariableNames: 'generatorTable primitiveTable'! Item was changed: ----- Method: Cogit>>compileAbstractInstructionsFrom:through: (in category 'compile abstract instructions') ----- compileAbstractInstructionsFrom: start through: end "Loop over bytecodes, dispatching to the generator for each bytecode, handling fixups in due course." | nextOpcodeIndex descriptor fixup result nExts | <var: #descriptor type: #'BytecodeDescriptor *'> <var: #fixup type: #'BytecodeFixup *'> bytecodePC := start. + nExts := result := 0. + [self cCode: '' inSmalltalk: + [(debugBytecodePointers includes: bytecodePC) ifTrue: [self halt]]. + byte0 := (objectMemory fetchByte: bytecodePC ofObject: methodObj) + bytecodeSetOffset. - nExts := 0. - [byte0 := (objectMemory fetchByte: bytecodePC ofObject: methodObj) + bytecodeSetOffset. descriptor := self generatorAt: byte0. self loadSubsequentBytesForDescriptor: descriptor at: bytecodePC. nextOpcodeIndex := opcodeIndex. result := self perform: descriptor generator. descriptor isExtension ifFalse: "extended bytecodes must consume their extensions" [self assert: (extA = 0 and: [extB = 0])]. fixup := self fixupAt: bytecodePC - initialPC. fixup targetInstruction ~= 0 ifTrue: ["There is a fixup for this bytecode. It must point to the first generated instruction for this bytecode. If there isn't one we need to add a label." opcodeIndex = nextOpcodeIndex ifTrue: [self Label]. fixup targetInstruction: (self abstractInstructionAt: nextOpcodeIndex)]. self maybeDumpLiterals: descriptor. bytecodePC := self nextBytecodePCFor: descriptor at: bytecodePC exts: nExts in: methodObj. result = 0 and: [bytecodePC <= end]] whileTrue: [nExts := descriptor isExtension ifTrue: [nExts + 1] ifFalse: [0]]. self checkEnoughOpcodes. ^result! Item was changed: ----- Method: Cogit>>setInterpreter: (in category 'initialization') ----- setInterpreter: aCoInterpreter "Initialization of the code generator in the simulator. These objects already exist in the generated C VM or are used only in the simulation." <doNotGenerate> coInterpreter := aCoInterpreter. objectMemory := aCoInterpreter objectMemory. threadManager := aCoInterpreter threadManager. "N.B. may be nil" methodZone := CogMethodZone new. objectRepresentation := objectMemory objectRepresentationClass forCogit: self methodZone: methodZone. methodZone setInterpreter: aCoInterpreter objectRepresentation: objectRepresentation cogit: self. generatorTable := self class generatorTable. processor := ProcessorClass new. simulatedAddresses := Dictionary new. simulatedTrampolines := Dictionary new. simulatedVariableGetters := Dictionary new. simulatedVariableSetters := Dictionary new. traceStores := 0. traceFlags := (self class initializationOptions at: #recordPrimTrace ifAbsent: [true]) ifTrue: [8] "record prim trace on by default (see Cogit class>>decareCVarsIn:)" ifFalse: [0]. debugPrimCallStackOffset := 0. singleStep := printRegisters := printInstructions := clickConfirm := false. backEnd := CogCompilerClass for: self. methodLabel := CogCompilerClass for: self. (literalsManager := backEnd class literalsManagerClass new) cogit: self. ordinarySendTrampolines := CArrayAccessor on: (Array new: NumSendTrampolines). superSendTrampolines := CArrayAccessor on: (Array new: NumSendTrampolines). BytecodeSetHasDirectedSuperSend ifTrue: [directedSuperSendTrampolines := CArrayAccessor on: (Array new: NumSendTrampolines)]. NewspeakVM ifTrue: [selfSendTrampolines := CArrayAccessor on: (Array new: NumSendTrampolines). dynamicSuperSendTrampolines := CArrayAccessor on: (Array new: NumSendTrampolines). implicitReceiverSendTrampolines := CArrayAccessor on: (Array new: NumSendTrampolines). outerSendTrampolines := CArrayAccessor on: (Array new: NumSendTrampolines)]. "debug metadata" objectReferencesInRuntime := CArrayAccessor on: (Array new: NumObjRefsInRuntime). runtimeObjectRefIndex := 0. "debug metadata" trampolineAddresses := CArrayAccessor on: (Array new: NumTrampolines * 2). trampolineTableIndex := 0. extA := extB := 0. compilationTrace ifNil: [compilationTrace := self class initializationOptions at: #compilationTrace ifAbsent: [0]]. + debugOpcodeIndices := self class initializationOptions at: #debugOpcodeIndices ifAbsent: [Set new]. + debugBytecodePointers := self class initializationOptions at: #debugBytecodePointers ifAbsent: [Set new]! - debugOpcodeIndices := self class initializationOptions at: #debugOpcodeIndices ifAbsent: [Set new].! Item was changed: ----- Method: FilePlugin class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator self declareC: #('sCCPfn' 'sCDFfn' 'sCDPfn' 'sCGFTfn' 'sCLPfn' 'sCOFfn' 'sCRFfn' 'sCSFTfn' 'sDFAfn' 'sHFAfn') as: #'void *' in: aCCodeGenerator. - aCCodeGenerator - const: #PharoVM - declareC: ('#if !!defined(PharoVM) /* Allow PharoVM to be overridden on the compiler command line */\# define PharoVM 0\#endif') withCRs. aCCodeGenerator addHeaderFile: '"FilePlugin.h"'! Item was changed: ----- Method: FilePlugin>>primitiveFileStdioHandles (in category 'file primitives') ----- primitiveFileStdioHandles "Answer an Array of file handles for standard in, standard out and standard error, with nil in entries that are unvailable, e.g. because the platform does not provide standard error, etc. Fail if there are no standard i/o facilities on the platform or if the security plugin denies access or if memory runs out." | fileRecords result validMask | <export: true> <var: 'fileRecords' declareC: 'SQFile fileRecords[3]'> sHFAfn ~= 0 ifTrue: [(self cCode: ' ((sqInt (*)(void))sHFAfn)()' inSmalltalk: [true]) ifFalse: [^interpreterProxy primitiveFailFor: PrimErrUnsupported]]. self cCode: '' inSmalltalk: [fileRecords := Array new: 3]. validMask := self sqFileStdioHandlesInto: fileRecords. validMask = 0 ifTrue: [^interpreterProxy primitiveFailFor: PrimErrUnsupported]. result := interpreterProxy instantiateClass: interpreterProxy classArray indexableSize: 3. result = nil ifTrue: [^interpreterProxy primitiveFailFor: PrimErrNoMemory]. interpreterProxy pushRemappableOop: result. 0 to: 2 do: [:index| (validMask bitAnd: (1 << index)) ~= 0 ifTrue: [result := interpreterProxy instantiateClass: interpreterProxy classByteArray indexableSize: self fileRecordSize. result = nil ifTrue: [interpreterProxy popRemappableOop. ^interpreterProxy primitiveFailFor: PrimErrNoMemory]. interpreterProxy storePointer: index ofObject: interpreterProxy topRemappableOop withValue: result. self cCode: [self mem: (interpreterProxy firstIndexableField: result) cp: (self addressOf: (fileRecords at: index)) y: self fileRecordSize] inSmalltalk: [(interpreterProxy firstIndexableField: result) unitSize: interpreterProxy wordSize; at: 0 put: (fileRecords at: index + 1)]]]. + "In the non-Spur threaded VM ensure the handles are old, so that sqFileReadIntoAt is unaffected + by incremental GCs. See platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c. The Spur + VM uses pinning, so it doesn't need the GC." - "In the threaded VM ensure the handles are old, so that sqFileReadIntoAt is unaffected - by incremental GCs. See platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c." self cppIf: COGMTVM + ifTrue: [self cppIf: SPURVM + ifTrue: [] + ifFalse: [interpreterProxy fullGC]]. - ifTrue: [interpreterProxy fullGC]. result := interpreterProxy popRemappableOop. interpreterProxy pop: 1 thenPush: result! Item was changed: ----- Method: InterpreterPrimitives>>primitiveFloatAtPut (in category 'indexing primitives') ----- primitiveFloatAtPut "Provide platform-independent access to 32-bit words comprising a Float. Map index 1 onto the most significant word and index 2 onto the least significant word." | rcvr index oopToStore valueToStore | <var: #valueToStore type: #usqInt> oopToStore := self stackTop. valueToStore := self positive32BitValueOf: oopToStore. self successful ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. rcvr := self stackValue: 2. index := self stackValue: 1. (objectMemory isImmediateFloat: rcvr) ifTrue: [^self primitiveFailFor: PrimErrBadReceiver]. + (objectMemory isObjImmutable: rcvr) ifTrue: + [^self primitiveFailFor: PrimErrNoModification]. - self cppIf: IMMUTABILITY - ifTrue: [ (objectMemory isImmutable: rcvr) ifTrue: [^self primitiveFailFor: PrimErrNoModification] ]. index = ConstOne ifTrue: [objectMemory storeLong32: (VMBIGENDIAN ifTrue: [0] ifFalse: [1]) ofObject: rcvr withValue: valueToStore. ^self pop: 3 thenPush: oopToStore]. index = ConstTwo ifTrue: [objectMemory storeLong32: (VMBIGENDIAN ifTrue: [1] ifFalse: [0]) ofObject: rcvr withValue: valueToStore. ^self pop: 3 thenPush: oopToStore]. self primitiveFailFor: ((objectMemory isIntegerObject: index) ifTrue: [PrimErrBadIndex] ifFalse: [PrimErrBadArgument])! Item was changed: ----- Method: InterpreterPrimitives>>primitiveIntegerAtPut (in category 'sound primitives') ----- primitiveIntegerAtPut "Return the 32bit signed integer contents of a words receiver" | index rcvr sz addr value valueOop | <var: 'value' type: 'int'> valueOop := self stackValue: 0. index := self stackIntegerValue: 1. value := self signed32BitValueOf: valueOop. self successful ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. rcvr := self stackValue: 2. (objectMemory isWords: rcvr) ifFalse: [^self primitiveFailFor: PrimErrInappropriate]. + (objectMemory isObjImmutable: rcvr) ifTrue: + [^self primitiveFailFor: PrimErrNoModification]. - self cppIf: IMMUTABILITY "isWords: ensure non immediate" - ifTrue: [ (objectMemory isImmutable: rcvr) ifTrue: [ ^self primitiveFailFor: PrimErrNoModification ] ]. sz := objectMemory lengthOf: rcvr. "number of fields" (index >= 1 and: [index <= sz]) ifFalse: [^self primitiveFailFor: PrimErrBadIndex]. "4 = 32 bits / 8" addr := rcvr + objectMemory baseHeaderSize + (index - 1 * 4). "for zero indexing" value := objectMemory intAt: addr put: value. self pop: 3 thenPush: valueOop "pop all; return value" ! Item was changed: ----- Method: InterpreterPrimitives>>primitiveObjectAtPut (in category 'object access primitives') ----- primitiveObjectAtPut "Store a literal into a CompiledMethod at the given index. Defined for CompiledMethods only." | thisReceiver index newValue | newValue := self stackValue: 0. index := self stackValue: 1. ((objectMemory isNonIntegerObject: index) or: [index = ConstOne and: [(objectMemory isNonIntegerObject: newValue)]]) ifTrue: [^self primitiveFailFor: PrimErrBadArgument]. index := objectMemory integerValueOf: index. thisReceiver := self stackValue: 2. + (objectMemory isObjImmutable: thisReceiver) ifTrue: + [^self primitiveFailFor: PrimErrNoModification]. - self cppIf: IMMUTABILITY - ifTrue: [ (objectMemory isImmutable: thisReceiver) ifTrue: [ ^self primitiveFailFor: PrimErrNoModification ] ]. (index > 0 and: [index <= ((objectMemory literalCountOf: thisReceiver) + LiteralStart)]) ifFalse: [^self primitiveFailFor: PrimErrBadIndex]. objectMemory storePointer: index - 1 ofObject: thisReceiver withValue: newValue. self pop: 3 thenPush: newValue! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSetImmutability (in category 'object access primitives') ----- primitiveSetImmutability <option: #IMMUTABILITY> | rcvr boolean wasImmutable | rcvr := self stackValue: 1. + (objectMemory isImmediate: rcvr) ifTrue: + [^self primitiveFailFor: PrimErrBadReceiver]. - (objectMemory isImmediate: rcvr) ifTrue: [ ^ self primitiveFailFor: PrimErrInappropriate ]. boolean := self booleanValueOf: self stackTop. self successful ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. boolean ifTrue: + [(self canBeImmutable: rcvr) ifFalse: + [^self primitiveFailFor: PrimErrInappropriate]]. + wasImmutable := objectMemory booleanObjectOf: (objectMemory isOopImmutable: rcvr). - [ (self canBeImmutable: rcvr) ifFalse: [ ^ self primitiveFailFor: PrimErrInappropriate ] ]. - wasImmutable := (objectMemory isOopImmutable: rcvr) - ifTrue: [ TrueObject ] - ifFalse: [ FalseObject ]. objectMemory setIsImmutableOf: rcvr to: boolean. + self pop: argumentCount + 1 thenPush: wasImmutable! - self pop: argumentCount + 1 thenPush: (objectMemory splObj: wasImmutable)! Item was changed: ----- Method: InterpreterPrimitives>>primitiveShortAtPut (in category 'sound primitives') ----- primitiveShortAtPut "Treat the receiver, which can be indexible by either bytes or words, as an array of signed 16-bit values. Set the contents of the given index to the given value. Note that the index specifies the i-th 16-bit entry, not the i-th byte or word." | index rcvr value | value := self stackTop. index := self stackValue: 1. ((objectMemory isIntegerObject: value) and: [(objectMemory isIntegerObject: index) and: [value := objectMemory integerValueOf: value. (value >= -32768) and: [value <= 32767]]]) ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. rcvr := self stackValue: 2. (objectMemory isWordsOrBytes: rcvr) ifFalse: [^self primitiveFailFor: PrimErrInappropriate]. + (objectMemory isObjImmutable: rcvr) ifTrue: + [^self primitiveFailFor: PrimErrNoModification]. - self cppIf: IMMUTABILITY "isWordsOrBytes ensure non immediate" - ifTrue: [ (objectMemory isImmutable: rcvr) ifTrue: [ ^self primitiveFailFor: PrimErrNoModification ] ]. index := objectMemory integerValueOf: index. (index >= 1 and: [index <= (objectMemory num16BitUnitsOf: rcvr)]) ifFalse: [^self primitiveFailFor: PrimErrBadIndex]. objectMemory storeShort16: index - 1 ofObject: rcvr withValue: value. self pop: 3 thenPush: (objectMemory integerObjectOf: value)! Item was changed: ----- Method: InterpreterPrimitives>>primitiveStringReplace (in category 'indexing primitives') ----- primitiveStringReplace " <array> primReplaceFrom: start to: stop with: replacement startingAt: repStart <primitive: 105> " | array start stop repl replStart hdr arrayFmt totalLength arrayInstSize replFmt replInstSize srcIndex | array := self stackValue: 4. start := self stackIntegerValue: 3. stop := self stackIntegerValue: 2. repl := self stackValue: 1. replStart := self stackIntegerValue: 0. self successful ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. (objectMemory isImmediate: repl) ifTrue: "can happen in LgInt copy" [^self primitiveFailFor: PrimErrBadArgument]. + (objectMemory isObjImmutable: array) ifTrue: + [^self primitiveFailFor: PrimErrNoModification]. - self cppIf: IMMUTABILITY ifTrue: - [(objectMemory isImmutable: array) ifTrue: - [^self primitiveFailFor: PrimErrNoModification]]. hdr := objectMemory baseHeader: array. arrayFmt := objectMemory formatOfHeader: hdr. totalLength := objectMemory lengthOf: array baseHeader: hdr format: arrayFmt. arrayInstSize := objectMemory fixedFieldsOf: array format: arrayFmt length: totalLength. (start >= 1 and: [start - 1 <= stop and: [stop + arrayInstSize <= totalLength]]) ifFalse: [^self primitiveFailFor: PrimErrBadIndex]. hdr := objectMemory baseHeader: repl. replFmt := objectMemory formatOfHeader: hdr. totalLength := objectMemory lengthOf: repl baseHeader: hdr format: replFmt. replInstSize := objectMemory fixedFieldsOf: repl format: replFmt length: totalLength. (replStart >= 1 and: [stop - start + replStart + replInstSize <= totalLength]) ifFalse: [^self primitiveFailFor: PrimErrBadIndex]. "Still to do: rewrite the below to accomodate short & long access" (objectMemory hasSpurMemoryManagerAPI and: [(arrayFmt between: objectMemory firstShortFormat and: objectMemory firstLongFormat - 1) or: [arrayFmt = objectMemory sixtyFourBitIndexableFormat]]) ifTrue: [^self primitiveFailFor: PrimErrUnsupported]. "Array formats (without byteSize bits, if bytes array) must be the same" arrayFmt < objectMemory firstByteFormat ifTrue: [arrayFmt = replFmt ifFalse: [^self primitiveFailFor: PrimErrInappropriate]] ifFalse: [(arrayFmt bitAnd: objectMemory byteFormatMask) = (replFmt bitAnd: objectMemory byteFormatMask) ifFalse: [^self primitiveFailFor: PrimErrInappropriate]]. srcIndex := replStart + replInstSize - 1. "- 1 for 0-based access" arrayFmt <= objectMemory lastPointerFormat ifTrue: [start + arrayInstSize - 1 to: stop + arrayInstSize - 1 do: [:i | objectMemory storePointer: i ofObject: array withValue: (objectMemory fetchPointer: srcIndex ofObject: repl). srcIndex := srcIndex + 1]] ifFalse: [arrayFmt < objectMemory firstByteFormat ifTrue: "32-bit-word type objects" [start + arrayInstSize - 1 to: stop + arrayInstSize - 1 do: [:i | objectMemory storeLong32: i ofObject: array withValue: (objectMemory fetchLong32: srcIndex ofObject: repl). srcIndex := srcIndex + 1]] ifFalse: "byte-type objects" [start + arrayInstSize - 1 to: stop + arrayInstSize - 1 do: [:i | objectMemory storeByte: i ofObject: array withValue: (objectMemory fetchByte: srcIndex ofObject: repl). srcIndex := srcIndex + 1]]]. "We might consider comparing stop - start to some value here and using forceInterruptCheck" self pop: argumentCount "leave rcvr on stack"! Item was changed: ----- Method: SimpleStackBasedCogit class>>initializeBytecodeTableForNewspeakV4 (in category 'class initialization') ----- initializeBytecodeTableForNewspeakV4 "SimpleStackBasedCogit initializeBytecodeTableForNewspeakV4" NSSendIsPCAnnotated := false. "IsNSSendCall used by SendAbsentImplicit" FirstSpecialSelector := 80. NumSpecialSelectors := 32. self flag: 'Special selector send class must be inlined to agree with the interpreter, which inlines class. If class is sent to e.g. a general instance of ProtoObject then unless class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit have identical semantics. We get away with not hardwiring the other special selectors either because in the Cointerpreter they are not inlined or because they are inlined only to instances of classes for which there will always be a method.'. self generatorTableFrom: #( "1 byte bytecodes" (1 0 15 genPushReceiverVariableBytecode isInstVarRef) (1 16 31 genPushLiteralVariable16CasesBytecode needsFrameNever: 1) (1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1) (1 64 75 genPushTemporaryVariableBytecode) (1 76 76 genPushReceiverBytecode) (1 77 77 genExtPushPseudoVariableOrOuterBytecode) (1 78 78 genPushConstantZeroBytecode) (1 79 79 genPushConstantOneBytecode) (1 80 101 genSpecialSelectorSend isMapped) "#+ #- #< #> #<= #>= #= #~= #* #/ #\\ #@ #bitShift: #// #bitAnd: #bitOr: #at: #at:put: #size #next #nextPut: #atEnd" (1 102 102 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)" (1 103 103 genSpecialSelectorClass needsFrameNever: notMapped 0) "not mapped because it is directly inlined (for now)" (1 104 111 genSpecialSelectorSend isMapped) "#blockCopy: #value #value: #do: #new #new: #x #y" (1 112 127 genSendLiteralSelector0ArgsBytecode isMapped) (1 128 143 genSendLiteralSelector1ArgBytecode isMapped) (1 144 159 genSendLiteralSelector2ArgsBytecode isMapped) (1 160 175 genSendAbsentImplicit0ArgsBytecode isMapped hasIRC) + (1 176 183 genStoreAndPopReceiverVariableBytecode isInstVarRef isMappedIfImmutability needsFrameIfImmutability: -1) + - (1 176 183 genStoreAndPopReceiverVariableBytecode isInstVarRef needsFrameNever: -1) "N.B. not frameless if immutability" (1 184 191 genStoreAndPopTemporaryVariableBytecode) (1 192 199 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:) (1 200 207 genShortJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (1 208 215 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (1 216 216 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0) (1 217 217 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1) (1 218 218 genExtReturnTopFromBlock return needsFrameNever: -1) (1 219 219 duplicateTopBytecode needsFrameNever: 1) (1 220 220 genPopStackBytecode needsFrameNever: -1) (1 221 221 genExtNopBytecode needsFrameNever: 0) (1 222 223 unknownBytecode) "2 byte bytecodes" (2 224 224 extABytecode extension) (2 225 225 extBBytecode extension) (2 226 226 genExtPushReceiverVariableBytecode isInstVarRef) (2 227 227 genExtPushLiteralVariableBytecode needsFrameNever: 1) (2 228 228 genExtPushLiteralBytecode needsFrameNever: 1) (2 229 229 genExtPushIntegerBytecode needsFrameNever: 1) (2 230 230 genLongPushTemporaryVariableBytecode) (2 231 231 genPushNewArrayBytecode) + (2 232 232 genExtStoreReceiverVariableBytecode isInstVarRef isMappedIfImmutability) + (2 233 233 genExtStoreLiteralVariableBytecode isMappedIfImmutability) - (2 232 232 genExtStoreReceiverVariableBytecode isInstVarRef) - (2 233 233 genExtStoreLiteralVariableBytecode) (2 234 234 genLongStoreTemporaryVariableBytecode) + (2 235 235 genExtStoreAndPopReceiverVariableBytecode isInstVarRef isMappedIfImmutability) + (2 236 236 genExtStoreAndPopLiteralVariableBytecode isMappedIfImmutability) - (2 235 235 genExtStoreAndPopReceiverVariableBytecode isInstVarRef) - (2 236 236 genExtStoreAndPopLiteralVariableBytecode) (2 237 237 genLongStoreAndPopTemporaryVariableBytecode) (2 238 238 genExtSendBytecode isMapped) (2 239 239 genExtSendSuperBytecode isMapped) (2 240 240 genExtSendAbsentImplicitBytecode isMapped hasIRC) (2 241 241 genExtSendAbsentDynamicSuperBytecode isMapped hasIRC) (2 242 242 genExtUnconditionalJump branch isMapped "because of interrupt check" v4:Long:Branch:Distance:) (2 243 243 genExtJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) (2 244 244 genExtJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) (2 245 245 genExtSendAbsentSelfBytecode isMapped hasIRC) (2 246 248 unknownBytecode) "3 byte bytecodes" (3 249 249 genCallPrimitiveBytecode) (3 250 250 genPushRemoteTempLongBytecode) (3 251 251 genStoreRemoteTempLongBytecode) (3 252 252 genStoreAndPopRemoteTempLongBytecode) (3 253 253 genExtPushClosureBytecode block v4:Block:Code:Size:) (3 254 254 genExtSendAbsentOuterBytecode isMapped hasIRC) (3 255 255 unknownBytecode))! Item was changed: ----- Method: SimpleStackBasedCogit class>>initializeBytecodeTableForSistaV1 (in category 'class initialization') ----- initializeBytecodeTableForSistaV1 "SimpleStackBasedCogit initializeBytecodeTableForSistaV1" BytecodeSetHasDirectedSuperSend := true. FirstSpecialSelector := 96. NumSpecialSelectors := 32. self flag: 'Special selector send class must be inlined to agree with the interpreter, which inlines class. If class is sent to e.g. a general instance of ProtoObject then unless class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit have identical semantics. We get away with not hardwiring the other special selectors either because in the Cointerpreter they are not inlined or because they are inlined only to instances of classes for which there will always be a method.'. self generatorTableFrom: #( "1 byte bytecodes" "pushes" (1 0 15 genPushReceiverVariableBytecode isInstVarRef) (1 16 31 genPushLiteralVariable16CasesBytecode needsFrameNever: 1) (1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1) (1 64 75 genPushTemporaryVariableBytecode) (1 76 76 genPushReceiverBytecode) (1 77 77 genPushConstantTrueBytecode needsFrameNever: 1) (1 78 78 genPushConstantFalseBytecode needsFrameNever: 1) (1 79 79 genPushConstantNilBytecode needsFrameNever: 1) (1 80 80 genPushConstantZeroBytecode needsFrameNever: 1) (1 81 81 genPushConstantOneBytecode needsFrameNever: 1) (1 82 82 genExtPushPseudoVariable) (1 83 83 duplicateTopBytecode needsFrameNever: 1) (1 84 87 unknownBytecode) "returns" (1 88 88 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0) (1 89 89 genReturnTrue return needsFrameIfInBlock: isMappedInBlock 0) (1 90 90 genReturnFalse return needsFrameIfInBlock: isMappedInBlock 0) (1 91 91 genReturnNil return needsFrameIfInBlock: isMappedInBlock 0) (1 92 92 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1) (1 93 93 genReturnNilFromBlock return needsFrameNever: -1) (1 94 94 genReturnTopFromBlock return needsFrameNever: -1) (1 95 95 genExtNopBytecode needsFrameNever: 0) "sends" (1 96 117 genSpecialSelectorSend isMapped) "#+ #- #< #> #<= #>= #= #~= #* #/ #\\ #@ #bitShift: #// #bitAnd: #bitOr: #at: #at:put: #size #next #nextPut: #atEnd" (1 118 118 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)" (1 119 119 genSpecialSelectorClass needsFrameNever: notMapped 0) "not mapped because it is directly inlined (for now)" (1 120 127 genSpecialSelectorSend isMapped) "#blockCopy: #value #value: #do: #new #new: #x #y" (1 128 143 genSendLiteralSelector0ArgsBytecode isMapped) (1 144 159 genSendLiteralSelector1ArgBytecode isMapped) (1 160 175 genSendLiteralSelector2ArgsBytecode isMapped) "jumps" (1 176 183 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:) (1 184 191 genShortJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (1 192 199 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) "stores" + (1 200 207 genStoreAndPopReceiverVariableBytecode isInstVarRef isMappedIfImmutability needsFrameIfImmutability: -1) - (1 200 207 genStoreAndPopReceiverVariableBytecode isInstVarRef needsFrameNever: -1) "N.B. not frameless if immutability" (1 208 215 genStoreAndPopTemporaryVariableBytecode) (1 216 216 genPopStackBytecode needsFrameNever: -1) (1 217 217 genUnconditionalTrapBytecode isMapped) (1 218 223 unknownBytecode) "2 byte bytecodes" (2 224 224 extABytecode extension) (2 225 225 extBBytecode extension) "pushes" (2 226 226 genExtPushReceiverVariableBytecode isInstVarRef) "Needs a frame for context inst var access" (2 227 227 genExtPushLiteralVariableBytecode needsFrameNever: 1) (2 228 228 genExtPushLiteralBytecode needsFrameNever: 1) (2 229 229 genLongPushTemporaryVariableBytecode) (2 230 230 genPushClosureTempsBytecode) (2 231 231 genPushNewArrayBytecode) (2 232 232 genExtPushIntegerBytecode needsFrameNever: 1) (2 233 233 genExtPushCharacterBytecode needsFrameNever: 1) "returns" "sends" (2 234 234 genExtSendBytecode isMapped) (2 235 235 genExtSendSuperBytecode isMapped) "sista bytecodes" (2 236 236 unknownBytecode) "jumps" (2 237 237 genExtUnconditionalJump branch isMapped "because of interrupt check" v4:Long:Branch:Distance:) (2 238 238 genExtJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) (2 239 239 genExtJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) "stores" + (2 240 240 genExtStoreAndPopReceiverVariableBytecode isInstVarRef isMappedIfImmutability) + (2 241 241 genExtStoreAndPopLiteralVariableBytecode isMappedIfImmutability) - (2 240 240 genExtStoreAndPopReceiverVariableBytecode isInstVarRef) - (2 241 241 genExtStoreAndPopLiteralVariableBytecode) (2 242 242 genLongStoreAndPopTemporaryVariableBytecode) + (2 243 243 genExtStoreReceiverVariableBytecode isInstVarRef isMappedIfImmutability) + (2 244 244 genExtStoreLiteralVariableBytecode isMappedIfImmutability) - (2 243 243 genExtStoreReceiverVariableBytecode isInstVarRef) - (2 244 244 genExtStoreLiteralVariableBytecode) (2 245 245 genLongStoreTemporaryVariableBytecode) (2 246 247 unknownBytecode) "3 byte bytecodes" (3 248 248 genCallPrimitiveBytecode) (3 249 249 unknownBytecode) "reserved for Push Float" (3 250 250 genExtPushClosureBytecode block v4:Block:Code:Size:) (3 251 251 genPushRemoteTempLongBytecode) (3 252 252 genStoreRemoteTempLongBytecode) (3 253 253 genStoreAndPopRemoteTempLongBytecode) (3 254 254 genExtJumpIfNotInstanceOfBehaviorsOrPopBytecode) (3 255 255 unknownBytecode))! Item was changed: ----- Method: SimpleStackBasedCogit class>>initializeBytecodeTableForSqueakV3PlusClosures (in category 'class initialization') ----- initializeBytecodeTableForSqueakV3PlusClosures "SimpleStackBasedCogit initializeBytecodeTableForSqueakV3PlusClosures" FirstSpecialSelector := 176. NumSpecialSelectors := 32. self flag: 'Special selector send class must be inlined to agree with the interpreter, which inlines class. If class is sent to e.g. a general instance of ProtoObject then unless class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit have identical semantics. We get away with not hardwiring the other special selectors either because in the Cointerpreter they are not inlined or because they are inlined only to instances of classes for which there will always be a method.'. self generatorTableFrom: #( (1 0 15 genPushReceiverVariableBytecode isInstVarRef) (1 16 31 genPushTemporaryVariableBytecode) (1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1) (1 64 95 genPushLiteralVariableBytecode needsFrameNever: 1) + (1 96 103 genStoreAndPopReceiverVariableBytecode isInstVarRef isMappedIfImmutability needsFrameIfImmutability: -1) - (1 96 103 genStoreAndPopReceiverVariableBytecode isInstVarRef needsFrameNever: -1) "N.B. not frameless if immutability" (1 104 111 genStoreAndPopTemporaryVariableBytecode) (1 112 112 genPushReceiverBytecode) (1 113 113 genPushConstantTrueBytecode needsFrameNever: 1) (1 114 114 genPushConstantFalseBytecode needsFrameNever: 1) (1 115 115 genPushConstantNilBytecode needsFrameNever: 1) (1 116 119 genPushQuickIntegerConstantBytecode needsFrameNever: 1) "method returns in blocks need a frame because of nonlocalReturn:through:" (1 120 120 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0) (1 121 121 genReturnTrue return needsFrameIfInBlock: isMappedInBlock 0) (1 122 122 genReturnFalse return needsFrameIfInBlock: isMappedInBlock 0) (1 123 123 genReturnNil return needsFrameIfInBlock: isMappedInBlock 0) (1 124 124 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1) (1 125 125 genReturnTopFromBlock return needsFrameNever: -1) (1 126 127 unknownBytecode) (2 128 128 extendedPushBytecode isInstVarRef) "well, maybe inst var ref" + (2 129 129 extendedStoreBytecode isInstVarRef isMappedIfImmutability) "well, maybe inst var ref" + (2 130 130 extendedStoreAndPopBytecode isInstVarRef isMappedIfImmutability) "well, maybe inst var ref" - (2 129 129 extendedStoreBytecode isInstVarRef) "well, maybe inst var ref" - (2 130 130 extendedStoreAndPopBytecode isInstVarRef) "well, maybe inst var ref" (2 131 131 genExtendedSendBytecode isMapped) (3 132 132 doubleExtendedDoAnythingBytecode isInstVarRef isMapped) "well, maybe inst var ref" (2 133 133 genExtendedSuperBytecode isMapped) (2 134 134 genSecondExtendedSendBytecode isMapped) (1 135 135 genPopStackBytecode needsFrameNever: -1) (1 136 136 duplicateTopBytecode needsFrameNever: 1) (1 137 137 genPushActiveContextBytecode) (2 138 138 genPushNewArrayBytecode)), ((initializationOptions at: #SpurObjectMemory ifAbsent: [false]) ifTrue: [#((3 139 139 genCallPrimitiveBytecode))] ifFalse: [#((1 139 139 unknownBytecode))]), #( (3 140 140 genPushRemoteTempLongBytecode) (3 141 141 genStoreRemoteTempLongBytecode) (3 142 142 genStoreAndPopRemoteTempLongBytecode) (4 143 143 genPushClosureCopyCopiedValuesBytecode block v3:Block:Code:Size:) (1 144 151 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:) (1 152 159 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (2 160 163 genLongUnconditionalBackwardJump branch isMapped "because of interrupt check" v3:Long:Branch:Distance:) (2 164 167 genLongUnconditionalForwardJump branch v3:Long:Branch:Distance:) (2 168 171 genLongJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v3:LongForward:Branch:Distance:) (2 172 175 genLongJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:LongForward:Branch:Distance:) (1 176 197 genSpecialSelectorSend isMapped) (1 198 198 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)" (1 199 199 genSpecialSelectorClass needsFrameNever: notMapped 0) "not mapped because it is directly inlined (for now)" (1 200 207 genSpecialSelectorSend isMapped) (1 208 223 genSendLiteralSelector0ArgsBytecode isMapped) (1 224 239 genSendLiteralSelector1ArgBytecode isMapped) (1 240 255 genSendLiteralSelector2ArgsBytecode isMapped))! Item was changed: ----- Method: Spur32BitMemoryManager>>changeClassOf:to: (in category 'interpreter access') ----- changeClassOf: rcvr to: argClass "Attempt to change the class of the receiver to the argument given that the format of the receiver matches the format of the argument. If successful, answer 0, otherwise answer an error code indicating the reason for failure. Fail if the format of the receiver is incompatible with the format of the argument, or if the argument is a fixed class and the receiver's size differs from the size that an instance of the argument should have." <inline: false> | classFormat fixedFields instFormat normalizedInstFormat newFormat classIndex | + (self isObjImmutable: rcvr) ifTrue: + [^PrimErrNoModification]. - self cppIf: IMMUTABILITY ifTrue: - [(self isImmutable: rcvr) ifTrue: [ ^PrimErrNoModification]]. classFormat := self formatOfClass: argClass. fixedFields := self fixedFieldsOfClassFormat: classFormat. classFormat := self instSpecOfClassFormat: classFormat. instFormat := self formatOf: rcvr. normalizedInstFormat := self classFormatForInstanceFormat: instFormat. (normalizedInstFormat > self lastPointerFormat and: [normalizedInstFormat = classFormat]) ifTrue: [newFormat := instFormat] ifFalse: [normalizedInstFormat <= self lastPointerFormat ifTrue: [classFormat > self lastPointerFormat ifTrue: [^PrimErrInappropriate]. (self numSlotsOf: rcvr) < fixedFields ifTrue: [^PrimErrBadReceiver]. newFormat := classFormat] ifFalse: [| instBytes | instBytes := self numBytesOf: rcvr. normalizedInstFormat caseOf: { [self sixtyFourBitIndexableFormat] -> [(classFormat < self sixtyFourBitIndexableFormat or: [classFormat >= self firstCompiledMethodFormat]) ifTrue: [^PrimErrInappropriate]. newFormat := classFormat]. [self firstLongFormat] -> [(classFormat < self sixtyFourBitIndexableFormat or: [classFormat >= self firstCompiledMethodFormat]) ifTrue: [^PrimErrInappropriate]. (classFormat = self sixtyFourBitIndexableFormat and: [instBytes anyMask: 1]) ifTrue: [^PrimErrBadReceiver]. newFormat := classFormat]. [self firstShortFormat] -> [(classFormat < self sixtyFourBitIndexableFormat or: [classFormat >= self firstCompiledMethodFormat]) ifTrue: [^PrimErrInappropriate]. classFormat caseOf: { [self sixtyFourBitIndexableFormat] -> [(instBytes anyMask: 3) ifTrue: [^PrimErrBadReceiver]. newFormat := classFormat]. [self firstLongFormat] -> [(instBytes anyMask: 1) ifTrue: [^PrimErrBadReceiver]. newFormat := classFormat]. [self firstByteFormat] -> [newFormat := classFormat + (4 - instBytes bitAnd: 3)] }]. [self firstByteFormat] -> [(classFormat < self sixtyFourBitIndexableFormat or: [classFormat >= self firstCompiledMethodFormat]) ifTrue: [^PrimErrInappropriate]. classFormat caseOf: { [self sixtyFourBitIndexableFormat] -> [(instBytes anyMask: 7) ifTrue: [^PrimErrBadReceiver]]. [self firstLongFormat] -> [(instBytes anyMask: 3) ifTrue: [^PrimErrBadReceiver]]. [self firstShortFormat] -> [(instBytes anyMask: 1) ifTrue: [^PrimErrBadReceiver]] }. newFormat := classFormat]. [self firstCompiledMethodFormat] -> [classFormat ~= self firstCompiledMethodFormat ifTrue: [^PrimErrInappropriate]. newFormat := instFormat] }]]. (classIndex := self ensureBehaviorHash: argClass) < 0 ifTrue: [^classIndex negated]. self set: rcvr classIndexTo: classIndex formatTo: newFormat. "ok" ^0! Item was changed: ----- Method: Spur64BitMemoryManager>>changeClassOf:to: (in category 'interpreter access') ----- changeClassOf: rcvr to: argClass "Attempt to change the class of the receiver to the argument given that the format of the receiver matches the format of the argument. If successful, answer 0, otherwise answer an error code indicating the reason for failure. Fail if the format of the receiver is incompatible with the format of the argument, or if the argument is a fixed class and the receiver's size differs from the size that an instance of the argument should have." <inline: false> | classFormat fixedFields instFormat normalizedInstFormat newFormat classIndex | + (self isObjImmutable: rcvr) ifTrue: + [^PrimErrNoModification]. - self cppIf: IMMUTABILITY ifTrue: - [(self isImmutable: rcvr) ifTrue: [ ^PrimErrNoModification]]. classFormat := self formatOfClass: argClass. fixedFields := self fixedFieldsOfClassFormat: classFormat. classFormat := self instSpecOfClassFormat: classFormat. instFormat := self formatOf: rcvr. normalizedInstFormat := self classFormatForInstanceFormat: instFormat. (normalizedInstFormat > self lastPointerFormat and: [normalizedInstFormat = classFormat]) ifTrue: [newFormat := instFormat] ifFalse: [normalizedInstFormat <= self lastPointerFormat ifTrue: [classFormat > self lastPointerFormat ifTrue: [^PrimErrInappropriate]. (self numSlotsOf: rcvr) < fixedFields ifTrue: [^PrimErrBadReceiver]. newFormat := classFormat] ifFalse: [| instBytes | instBytes := self numBytesOf: rcvr. normalizedInstFormat caseOf: { [self sixtyFourBitIndexableFormat] -> [(classFormat < self sixtyFourBitIndexableFormat or: [classFormat >= self firstCompiledMethodFormat]) ifTrue: [^PrimErrInappropriate]. newFormat := classFormat]. [self firstLongFormat] -> [(classFormat < self sixtyFourBitIndexableFormat or: [classFormat >= self firstCompiledMethodFormat]) ifTrue: [^PrimErrInappropriate]. (classFormat = self sixtyFourBitIndexableFormat and: [instBytes anyMask: 1]) ifTrue: [^PrimErrBadReceiver]. newFormat := classFormat]. [self firstShortFormat] -> [(classFormat < self sixtyFourBitIndexableFormat or: [classFormat >= self firstCompiledMethodFormat]) ifTrue: [^PrimErrInappropriate]. classFormat caseOf: { [self sixtyFourBitIndexableFormat] -> [(instBytes anyMask: 7) ifTrue: [^PrimErrBadReceiver]. newFormat := classFormat]. [self firstLongFormat] -> [(instBytes anyMask: 3) ifTrue: [^PrimErrBadReceiver]. newFormat := classFormat + (2 - instBytes bitAnd: 1)]. [self firstByteFormat] -> [newFormat := classFormat + (8 - instBytes bitAnd: 7)] }]. [self firstByteFormat] -> [(classFormat < self sixtyFourBitIndexableFormat or: [classFormat >= self firstCompiledMethodFormat]) ifTrue: [^PrimErrInappropriate]. classFormat caseOf: { [self sixtyFourBitIndexableFormat] -> [(instBytes anyMask: 7) ifTrue: [^PrimErrBadReceiver]. newFormat := classFormat]. [self firstLongFormat] -> [(instBytes anyMask: 3) ifTrue: [^PrimErrBadReceiver]. newFormat := classFormat + (2 - instBytes bitAnd: 1)]. [self firstShortFormat] -> [(instBytes anyMask: 1) ifTrue: [^PrimErrBadReceiver]. newFormat := classFormat + (4 - instBytes bitAnd: 3)] }. newFormat := classFormat]. [self firstCompiledMethodFormat] -> [classFormat ~= self firstCompiledMethodFormat ifTrue: [^PrimErrInappropriate]. newFormat := instFormat] }]]. (classIndex := self ensureBehaviorHash: argClass) < 0 ifTrue: [^classIndex negated]. self set: rcvr classIndexTo: classIndex formatTo: newFormat. "ok" ^0! Item was added: + ----- Method: SpurMemoryManager>>isObjImmutable: (in category 'header access') ----- + isObjImmutable: anOop + <inline: true> + ^self cppIf: IMMUTABILITY + ifTrue: [self isImmutable: anOop] + ifFalse: [false]! Item was changed: ----- Method: SpurMemoryManager>>isOopValidBecome: (in category 'become implementation') ----- isOopValidBecome: oop "Answers 0 if the oop can be become. Answers an error code in the other case" (self isImmediate: oop) ifTrue: [^PrimErrInappropriate]. (self isPinned: oop) ifTrue: [^PrimErrObjectIsPinned]. + (self isObjImmutable: oop) ifTrue: [^PrimErrNoModification]. + ^0! - self - cppIf: IMMUTABILITY - ifTrue: [ (self isImmutable: oop) ifTrue: [^PrimErrNoModification] ]. - ^ 0! Item was changed: ----- Method: SpurMemoryManager>>storePointerImmutabilityCheck:ofObject:withValue: (in category 'object access') ----- storePointerImmutabilityCheck: fieldIndex ofObject: objOop withValue: valuePointer "Note must check here for stores of young objects into old ones." + <inline: true> "Must be inlined for the normal send in cannotAssign:to:withIndex:" - <inline: true> "normal send in cannotAssign" self cppIf: IMMUTABILITY ifTrue: + [self deny: (self isImmediate: objOop). + (self isImmutable: objOop) ifTrue: + [^coInterpreter cannotAssign: valuePointer to: objOop withIndex: fieldIndex]]. - [ self assert: (self isImmediate: objOop) not. - (self isImmutable: objOop) ifTrue: - [ ^ coInterpreter cannotAssign: valuePointer to: objOop withIndex: fieldIndex ] ]. + ^self storePointer: fieldIndex ofObject: objOop withValue: valuePointer! - ^ self storePointer: fieldIndex ofObject: objOop withValue: valuePointer! Item was changed: ----- Method: StackInterpreter class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator | vmClass | self class == thisContext methodClass ifFalse: [^self]. "Don't duplicate decls in subclasses" vmClass := aCCodeGenerator vmClass. "Generate primitiveTable etc based on vmClass, not just StackInterpreter" aCCodeGenerator addHeaderFile:'<stddef.h> /* for e.g. alloca */'; addHeaderFile:'<setjmp.h>'; addHeaderFile:'<wchar.h> /* for wint_t */'; addHeaderFile:'"vmCallback.h"'; addHeaderFile:'"sqMemoryFence.h"'; addHeaderFile:'"dispdbg.h"'. vmClass declareInterpreterVersionIn: aCCodeGenerator defaultName: 'Stack'. aCCodeGenerator var: #interpreterProxy type: #'struct VirtualMachine*'. aCCodeGenerator declareVar: #sendTrace type: 'volatile int'; declareVar: #byteCount type: 'unsigned long'. "These need to be pointers or unsigned." self declareC: #(instructionPointer method newMethod) as: #usqInt in: aCCodeGenerator. "These are all pointers; char * because Slang has no support for C pointer arithmetic." self declareC: #(localIP localSP localFP stackPointer framePointer stackLimit stackMemory breakSelector) as: #'char *' in: aCCodeGenerator. aCCodeGenerator var: #breakSelectorLength declareC: 'sqInt breakSelectorLength = MinSmallInteger'. self declareC: #(stackPage overflowedPage) as: #'StackPage *' in: aCCodeGenerator. aCCodeGenerator removeVariable: 'stackPages'. "this is an implicit receiver in the translated code." + NewspeakVM ifFalse: + [aCCodeGenerator + removeVariable: 'localAbsentReceiver'; + removeVariable: 'localAbsentReceiverOrZero'; + removeVariable: 'nsMethodCache']. - NewspeakVM - ifTrue: - [aCCodeGenerator - const: #EnforceAccessControl - declareC: ('#if !!defined(EnforceAccessControl) /* Allow EnforceAccessControl to be overridden on the compiler command line */\# define EnforceAccessControl ', (aCCodeGenerator cLiteralFor: EnforceAccessControl),'\#endif') withCRs] - ifFalse: - [aCCodeGenerator - removeVariable: 'localAbsentReceiver'; - removeVariable: 'localAbsentReceiverOrZero'; - removeVariable: 'nsMethodCache']. "This defines bytecodeSetSelector as 0 if MULTIPLEBYTECODESETS is not defined, for the benefit of the interpreter on slow machines." aCCodeGenerator addConstantForBinding: (self bindingOf: #MULTIPLEBYTECODESETS). MULTIPLEBYTECODESETS == false ifTrue: [aCCodeGenerator removeVariable: 'extA'; removeVariable: 'extB'; removeVariable: 'bytecodeSetSelector']. aCCodeGenerator var: #methodCache declareC: 'long methodCache[MethodCacheSize + 1 /* ', (MethodCacheSize + 1) printString, ' */]'. aCCodeGenerator var: #nsMethodCache declareC: 'long nsMethodCache[NSMethodCacheSize + 1 /* ', (NSMethodCacheSize + 1) printString, ' */]'. aCCodeGenerator var: #atCache declareC: 'sqInt atCache[AtCacheTotalSize + 1 /* ', (AtCacheTotalSize + 1) printString, ' */]'. aCCodeGenerator var: #primitiveTable declareC: 'void (*primitiveTable[MaxPrimitiveIndex + 2 /* ', (MaxPrimitiveIndex + 2) printString, ' */])(void) = ', vmClass primitiveTableString. vmClass primitiveTable do: [:symbolOrNot| (symbolOrNot isSymbol and: [symbolOrNot ~~ #primitiveFail]) ifTrue: [(aCCodeGenerator methodNamed: symbolOrNot) ifNotNil: [:tMethod| tMethod returnType: #void]]]. vmClass objectMemoryClass hasSpurMemoryManagerAPI ifTrue: [aCCodeGenerator var: #primitiveAccessorDepthTable type: 'signed char' sizeString: 'MaxPrimitiveIndex + 2 /* ', (MaxPrimitiveIndex + 2) printString, ' */' array: vmClass primitiveAccessorDepthTable] ifFalse: [aCCodeGenerator removeVariable: #primitiveAccessorDepthTable]. aCCodeGenerator var: #primitiveFunctionPointer declareC: 'void (*primitiveFunctionPointer)()'. aCCodeGenerator var: #externalPrimitiveTable declareC: 'void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* ', (MaxExternalPrimitiveTableSize + 1) printString, ' */])(void)'. aCCodeGenerator var: #showSurfaceFn type: #'void *'. aCCodeGenerator var: #jmpBuf declareC: 'jmp_buf jmpBuf[MaxJumpBuf + 1 /* ', (MaxJumpBuf + 1) printString, ' */]'. aCCodeGenerator var: #suspendedCallbacks declareC: 'usqInt suspendedCallbacks[MaxJumpBuf + 1 /* ', (MaxJumpBuf + 1) printString, ' */]'. aCCodeGenerator var: #suspendedMethods declareC: 'usqInt suspendedMethods[MaxJumpBuf + 1 /* ', (MaxJumpBuf + 1) printString, ' */]'. aCCodeGenerator var: #interruptCheckChain declareC: 'void (*interruptCheckChain)(void) = 0'. self declareCAsUSqLong: #(nextPollUsecs nextWakeupUsecs longRunningPrimitiveGCUsecs longRunningPrimitiveStartUsecs longRunningPrimitiveStopUsecs "these are high-frequency enough that they're overflowing quite quickly on modern hardware" statProcessSwitch statIOProcessEvents statForceInterruptCheck statCheckForEvents statStackOverflow statStackPageDivorce) in: aCCodeGenerator. aCCodeGenerator var: #nextProfileTick type: #sqLong! Item was changed: ----- Method: StackInterpreter class>>initializeMiscConstants (in category 'initialization') ----- initializeMiscConstants super initializeMiscConstants. STACKVM := true. "These flags function to identify a GC operation, or to specify what operations the leak checker should be run for." GCModeFull := 1. "stop-the-world global GC" GCModeNewSpace := 2. "Spur's scavenge, or V3's incremental" GCModeIncremental := 4. "incremental global gc (Dijkstra tri-colour marking); as yet unimplemented" GCModeBecome := 8. "v3 post-become sweeping" GCModeImageSegment := 16. "just a flag for leak checking image segments" StackPageTraceInvalid := -1. StackPageUnreached := 0. StackPageReachedButUntraced := 1. StackPageTraced := 2. DumpStackOnLowSpace := 0. PrimitiveExternalCallIndex := 117. "Primitive index for #primitiveExternalCall" MillisecondClockMask := 16r1FFFFFFF. "Note: The external primitive table should actually be dynamically sized but for the sake of inferior platforms (e.g., Mac :-) who cannot allocate memory in any reasonable way, we keep it static (and cross our fingers...)" MaxExternalPrimitiveTableSize := 4096. "entries" MaxJumpBuf := 32. "max. callback depth" FailImbalancedPrimitives := initializationOptions at: #FailImbalancedPrimitives ifAbsentPut: [true]. + EnforceAccessControl := initializationOptions at: #EnforceAccessControl ifAbsent: [true]! - - EnforceAccessControl := initializationOptions at: #EnforceAccessControl ifAbsentPut: [false]! Item was changed: ----- Method: StackInterpreter>>commonAtPut: (in category 'indexing primitive support') ----- commonAtPut: stringy "This code is called if the receiver responds primitively to at:Put:. N.B. this does *not* use the at cache, instead inlining stObject:at:put:. Using the at cache here would require that callers set messageSelector and lkupClass and that is onerous and error-prone, and in any case, inlining produces much better performance than using the at cache here." | value index rcvr | <inline: true> "to get it inlined in primitiveAtPut and primitiveStringAtPut" self initPrimCall. rcvr := self stackValue: 2. index := self stackValue: 1. value := self stackTop. (objectMemory isImmediate: rcvr) ifTrue: [^self primitiveFailFor: PrimErrInappropriate]. "No need to test for large positive integers here. No object has 1g elements" ((objectMemory isNonIntegerObject: index) or: [argumentCount > 2 "e.g. object:basicAt:put:" and: [objectMemory isForwarded: rcvr]]) ifTrue: [^self primitiveFailFor: PrimErrBadArgument]. + (objectMemory isObjImmutable: rcvr) ifTrue: + [^self primitiveFailFor: PrimErrNoModification]. - self cppIf: IMMUTABILITY ifTrue: - [(objectMemory isImmutable: rcvr) ifTrue: - [^self primitiveFailFor: PrimErrNoModification]]. index := objectMemory integerValueOf: index. stringy ifTrue: [self stObject: rcvr at: index put: (self asciiOfCharacter: value)] ifFalse: [self stObject: rcvr at: index put: value]. self successful ifTrue: [self pop: argumentCount+1 thenPush: value]! Item was changed: ----- Method: StackInterpreter>>externalInstVar:ofContext:put: (in category 'frame access') ----- externalInstVar: index ofContext: maybeMarriedContext put: anOop | theFP thePage onCurrentPage | <var: #theFP type: #'char *'> <var: #thePage type: #'StackPage *'> self assert: (objectMemory isContext: maybeMarriedContext). self externalWriteBackHeadFramePointers. "Assign the field of a married context." + self deny: (objectMemory isObjImmutable: maybeMarriedContext). (self isStillMarriedContext: maybeMarriedContext) ifFalse: [objectMemory storePointer: index ofObject: maybeMarriedContext withValue: anOop. index = StackPointerIndex ifTrue: [self ensureContextIsExecutionSafeAfterAssignToStackPointer: maybeMarriedContext]. ^nil]. theFP := self frameOfMarriedContext: maybeMarriedContext. thePage := stackPages stackPageFor: theFP. self assert: stackPage = stackPages mostRecentlyUsedPage. onCurrentPage := thePage = stackPage. index == SenderIndex ifTrue: [self storeSenderOfFrame: theFP withValue: anOop] ifFalse: [self externalDivorceFrame: theFP andContext: maybeMarriedContext. objectMemory storePointer: index ofObject: maybeMarriedContext withValue: anOop. index = StackPointerIndex ifTrue: [self ensureContextIsExecutionSafeAfterAssignToStackPointer: maybeMarriedContext]]. onCurrentPage ifTrue: [framePointer := stackPage headFP. stackPointer := stackPage headSP] ifFalse: [stackPages markStackPageMostRecentlyUsed: stackPage]. stackPages assert: stackPage = stackPages mostRecentlyUsedPage. stackPages assert: stackPages pageListIsWellFormed. stackPages assert: self validStackPageBaseFrames! Item was changed: ----- Method: StackInterpreter>>instVar:ofContext:put: (in category 'frame access') ----- instVar: index ofContext: aMarriedContext put: anOop | theFP | "Assign the field of a married context. The important case to optimize is assigning the sender. We could also consider optimizing assigning the IP but typically that is followed by an assignment to the stack pointer and we can't efficiently assign the stack pointer because it involves moving frames around." <inline: true> self assert: (self isMarriedOrWidowedContext: aMarriedContext). + self deny: (objectMemory isObjImmutable: aMarriedContext). self writeBackHeadFramePointers. (self isStillMarriedContext: aMarriedContext) ifFalse: [objectMemory storePointer: index ofObject: aMarriedContext withValue: anOop. index = StackPointerIndex ifTrue: [self ensureContextIsExecutionSafeAfterAssignToStackPointer: aMarriedContext]. ^nil]. theFP := self frameOfMarriedContext: aMarriedContext. index == SenderIndex ifTrue: [| thePage onCurrentPage | thePage := stackPages stackPageFor: theFP. self assert: stackPage = stackPages mostRecentlyUsedPage. onCurrentPage := thePage = stackPage. self storeSenderOfFrame: theFP withValue: anOop. onCurrentPage ifTrue: [localFP := stackPage headFP. localSP := stackPage headSP] ifFalse: [stackPages markStackPageMostRecentlyUsed: stackPage]. ^nil]. self externalizeIPandSP. self externalDivorceFrame: theFP andContext: aMarriedContext. objectMemory storePointer: index ofObject: aMarriedContext withValue: anOop. index = StackPointerIndex ifTrue: [self ensureContextIsExecutionSafeAfterAssignToStackPointer: aMarriedContext]. self internalizeIPandSP. "Assigning various fields can force a divorce which can change the stackPage." stackPages markStackPageMostRecentlyUsed: stackPage. self assertValidExecutionPointe: localIP asUnsignedInteger r: localFP s: localSP imbar: true line: #'__LINE__'! Item was changed: ----- Method: StackInterpreterPrimitives>>primitiveInstVarAtPut (in category 'object access primitives') ----- primitiveInstVarAtPut | newValue index rcvr hdr fmt totalLength fixedFields | newValue := self stackTop. index := self stackValue: 1. rcvr := self stackValue: 2. ((objectMemory isNonIntegerObject: index) or: [argumentCount > 2 "e.g. object:instVarAt:put:" and: [objectMemory isOopForwarded: rcvr]]) ifTrue: [^self primitiveFailFor: PrimErrBadArgument]. + (objectMemory isImmediate: rcvr) ifTrue: + [^self primitiveFailFor: PrimErrBadReceiver]. + (objectMemory isObjImmutable: rcvr) ifTrue: + [^self primitiveFailFor: PrimErrNoModification]. - (objectMemory isImmediate: rcvr) ifTrue: [ ^ self primitiveFailFor: PrimErrInappropriate]. - self - cppIf: IMMUTABILITY - ifTrue: [ (objectMemory isImmutable: rcvr) ifTrue: [ ^ self primitiveFailFor: PrimErrNoModification] ]. index := objectMemory integerValueOf: index. hdr := objectMemory baseHeader: rcvr. fmt := objectMemory formatOfHeader: hdr. totalLength := objectMemory lengthOf: rcvr baseHeader: hdr format: fmt. fixedFields := objectMemory fixedFieldsOf: rcvr format: fmt length: totalLength. (index >= 1 and: [index <= fixedFields]) ifFalse: [^self primitiveFailFor: PrimErrBadIndex]. (fmt = objectMemory indexablePointersFormat and: [objectMemory isContextHeader: hdr]) ifTrue: [self externalInstVar: index - 1 ofContext: rcvr put: newValue] ifFalse: [self subscript: rcvr with: index storing: newValue format: fmt]. self pop: argumentCount + 1 thenPush: newValue! Item was changed: SimpleStackBasedCogit subclass: #StackToRegisterMappingCogit + instanceVariableNames: 'prevBCDescriptor numPushNilsFunction pushNilSizeFunction methodOrBlockNumTemps regArgsHaveBeenPushed simSelf simStack simStackPtr simSpillBase optStatus ceCallCogCodePopReceiverArg0Regs ceCallCogCodePopReceiverArg1Arg0Regs methodAbortTrampolines picAbortTrampolines picMissTrampolines ceCall0ArgsPIC ceCall1ArgsPIC ceCall2ArgsPIC debugStackPointers debugFixupBreaks realCECallCogCodePopReceiverArg0Regs realCECallCogCodePopReceiverArg1Arg0Regs deadCode' - instanceVariableNames: 'prevBCDescriptor numPushNilsFunction pushNilSizeFunction methodOrBlockNumTemps regArgsHaveBeenPushed simSelf simStack simStackPtr simSpillBase optStatus ceCallCogCodePopReceiverArg0Regs ceCallCogCodePopReceiverArg1Arg0Regs methodAbortTrampolines picAbortTrampolines picMissTrampolines ceCall0ArgsPIC ceCall1ArgsPIC ceCall2ArgsPIC debugStackPointers debugFixupBreaks debugBytecodePointers realCECallCogCodePopReceiverArg0Regs realCECallCogCodePopReceiverArg1Arg0Regs deadCode' classVariableNames: '' poolDictionaries: 'CogCompilationConstants VMMethodCacheConstants VMObjectIndices VMStackFrameOffsets' category: 'VMMaker-JIT'! StackToRegisterMappingCogit class instanceVariableNames: 'numPushNilsFunction pushNilSizeFunction'! !StackToRegisterMappingCogit commentStamp: 'eem 12/19/2010 18:12' prior: 0! StackToRegisterMappingCogit is an optimizing code generator that eliminates a lot of stack operations and inlines some special selector arithmetic. It does so by a simple stack-to-register mapping scheme based on deferring the generation of code to produce operands until operand-consuming operations. The operations that consume operands are sends, stores and returns. See methods in the class-side documentation protocol for more detail. Instance Variables callerSavedRegMask: <Integer> ceEnter0ArgsPIC: <Integer> ceEnter1ArgsPIC: <Integer> ceEnter2ArgsPIC: <Integer> ceEnterCogCodePopReceiverArg0Regs: <Integer> ceEnterCogCodePopReceiverArg1Arg0Regs: <Integer> debugBytecodePointers: <Set of Integer> debugFixupBreaks: <Set of Integer> debugStackPointers: <CArrayAccessor of (Integer|nil)> methodAbortTrampolines: <CArrayAccessor of Integer> methodOrBlockNumTemps: <Integer> optStatus: <Integer> picAbortTrampolines: <CArrayAccessor of Integer> picMissTrampolines: <CArrayAccessor of Integer> realCEEnterCogCodePopReceiverArg0Regs: <Integer> realCEEnterCogCodePopReceiverArg1Arg0Regs: <Integer> regArgsHaveBeenPushed: <Boolean> simSelf: <CogSimStackEntry> simSpillBase: <Integer> simStack: <CArrayAccessor of CogSimStackEntry> simStackPtr: <Integer> traceSimStack: <Integer> callerSavedRegMask - the bitmask of the ABI's caller-saved registers ceEnter0ArgsPIC ceEnter1ArgsPIC ceEnter2ArgsPIC - the trampoline for entering an N-arg PIC ceEnterCogCodePopReceiverArg0Regs ceEnterCogCodePopReceiverArg1Arg0Regs - teh trampoline for entering a method with N register args debugBytecodePointers - a Set of bytecode pcs for setting breakpoints (simulation only) debugFixupBreaks - a Set of fixup indices for setting breakpoints (simulation only) debugStackPointers - an Array of stack depths for each bytecode for code verification methodAbortTrampolines - a CArrayAccessor of abort trampolines for 0, 1, 2 and N args methodOrBlockNumTemps - the number of method or block temps (including args) in the current compilation unit (method or block) optStatus - the variable used to track the status of ReceiverResultReg for avoiding reloading that register with self between adjacent inst var accesses picAbortTrampolines - a CArrayAccessor of abort trampolines for 0, 1, 2 and N args picMissTrampolines - a CArrayAccessor of abort trampolines for 0, 1, 2 and N args realCEEnterCogCodePopReceiverArg0Regs realCEEnterCogCodePopReceiverArg1Arg0Regs - the real trampolines for ebtering machine code with N reg args when in the Debug regime regArgsHaveBeenPushed - whether the register args have been pushed before frame build (e.g. when an interpreter primitive is called) simSelf - the simulation stack entry representing self in the current compilation unit simSpillBase - the variable tracking how much of the simulation stack has been spilled to the real stack simStack - the simulation stack itself simStackPtr - the pointer to the top of the simulation stack ! StackToRegisterMappingCogit class instanceVariableNames: 'numPushNilsFunction pushNilSizeFunction'! Item was changed: ----- Method: StackToRegisterMappingCogit class>>initializeBytecodeTableForNewspeakV4 (in category 'class initialization') ----- initializeBytecodeTableForNewspeakV4 "StackToRegisterMappingCogit initializeBytecodeTableForNewspeakV4" numPushNilsFunction := #v4:Num:Push:Nils:. pushNilSizeFunction := #v4PushNilSize:numInitialNils:. NSSendIsPCAnnotated := true. "IsNSSendCall used by SendAbsentImplicit" FirstSpecialSelector := 80. NumSpecialSelectors := 32. self flag: 'Special selector send class must be inlined to agree with the interpreter, which inlines class. If class is sent to e.g. a general instance of ProtoObject then unless class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit have identical semantics. We get away with not hardwiring the other special selectors either because in the Cointerpreter they are not inlined or because they are inlined only to instances of classes for which there will always be a method.'. self generatorTableFrom: #( "1 byte bytecodes" (1 0 15 genPushReceiverVariableBytecode isInstVarRef needsFrameNever: 1) (1 16 31 genPushLiteralVariable16CasesBytecode needsFrameNever: 1) (1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1) (1 64 75 genPushTemporaryVariableBytecode needsFrameIfMod16GENumArgs: 1) (1 76 76 genPushReceiverBytecode needsFrameNever: 1) (1 77 77 genExtPushPseudoVariableOrOuterBytecode needsFrameIfExtBGT2: 1) (1 78 78 genPushConstantZeroBytecode needsFrameNever: 1) (1 79 79 genPushConstantOneBytecode needsFrameNever: 1) (1 80 80 genSpecialSelectorArithmetic isMapped AddRR) (1 81 81 genSpecialSelectorArithmetic isMapped SubRR) (1 82 82 genSpecialSelectorComparison isMapped JumpLess) (1 83 83 genSpecialSelectorComparison isMapped JumpGreater) (1 84 84 genSpecialSelectorComparison isMapped JumpLessOrEqual) (1 85 85 genSpecialSelectorComparison isMapped JumpGreaterOrEqual) (1 86 86 genSpecialSelectorComparison isMapped JumpZero) (1 87 87 genSpecialSelectorComparison isMapped JumpNonZero) (1 88 93 genSpecialSelectorSend isMapped) " #* #/ #\\ #@ #bitShift: //" (1 94 94 genSpecialSelectorArithmetic isMapped AndRR) (1 95 95 genSpecialSelectorArithmetic isMapped OrRR) (1 96 101 genSpecialSelectorSend isMapped) "#at: #at:put: #size #next #nextPut: #atEnd" (1 102 102 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)" (1 103 103 genSpecialSelectorClass needsFrameIfStackGreaterThanOne: notMapped 0) "not mapped because it is directly inlined (for now)" (1 104 111 genSpecialSelectorSend isMapped) "#blockCopy: #value #value: #do: #new #new: #x #y" (1 112 127 genSendLiteralSelector0ArgsBytecode isMapped) (1 128 143 genSendLiteralSelector1ArgBytecode isMapped) (1 144 159 genSendLiteralSelector2ArgsBytecode isMapped) (1 160 175 genSendAbsentImplicit0ArgsBytecode isMapped hasIRC) (1 176 183 genStoreAndPopReceiverVariableBytecode isInstVarRef isMappedIfImmutability needsFrameIfImmutability: -1) (1 184 191 genStoreAndPopTemporaryVariableBytecode) (1 192 199 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:) (1 200 207 genShortJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (1 208 215 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (1 216 216 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0) (1 217 217 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1) (1 218 218 genExtReturnTopFromBlock return needsFrameNever: -1) (1 219 219 duplicateTopBytecode needsFrameNever: 1) (1 220 220 genPopStackBytecode needsFrameNever: -1) (1 221 221 genExtNopBytecode needsFrameNever: 0) (1 222 223 unknownBytecode) "2 byte bytecodes" (2 224 224 extABytecode extension needsFrameNever: 0) (2 225 225 extBBytecode extension needsFrameNever: 0) (2 226 226 genExtPushReceiverVariableBytecode isInstVarRef) (2 227 227 genExtPushLiteralVariableBytecode needsFrameNever: 1) (2 228 228 genExtPushLiteralBytecode needsFrameNever: 1) (2 229 229 genExtPushIntegerBytecode needsFrameNever: 1) (2 230 230 genLongPushTemporaryVariableBytecode) (2 231 231 genPushNewArrayBytecode) (2 232 232 genExtStoreReceiverVariableBytecode isInstVarRef isMappedIfImmutability) + (2 233 233 genExtStoreLiteralVariableBytecode isMappedIfImmutability) - (2 233 233 genExtStoreLiteralVariableBytecode) (2 234 234 genLongStoreTemporaryVariableBytecode) (2 235 235 genExtStoreAndPopReceiverVariableBytecode isInstVarRef isMappedIfImmutability) + (2 236 236 genExtStoreAndPopLiteralVariableBytecode isMappedIfImmutability) - (2 236 236 genExtStoreAndPopLiteralVariableBytecode) (2 237 237 genLongStoreAndPopTemporaryVariableBytecode) (2 238 238 genExtSendBytecode isMapped) (2 239 239 genExtSendSuperBytecode isMapped) (2 240 240 genExtSendAbsentImplicitBytecode isMapped hasIRC) (2 241 241 genExtSendAbsentDynamicSuperBytecode isMapped hasIRC) (2 242 242 genExtUnconditionalJump branch isMapped "because of interrupt check" v4:Long:Branch:Distance:) (2 243 243 genExtJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) (2 244 244 genExtJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) (2 245 245 genExtSendAbsentSelfBytecode isMapped hasIRC) (2 246 248 unknownBytecode) "3 byte bytecodes" (3 249 249 genCallPrimitiveBytecode) (3 250 250 genPushRemoteTempLongBytecode) (3 251 251 genStoreRemoteTempLongBytecode) (3 252 252 genStoreAndPopRemoteTempLongBytecode) (3 253 253 genExtPushClosureBytecode block v4:Block:Code:Size:) (3 254 254 genExtSendAbsentOuterBytecode isMapped hasIRC) (3 255 255 unknownBytecode))! Item was changed: ----- Method: StackToRegisterMappingCogit class>>initializeBytecodeTableForSistaV1 (in category 'class initialization') ----- initializeBytecodeTableForSistaV1 "StackToRegisterMappingCogit initializeBytecodeTableForSistaV1" numPushNilsFunction := #sistaV1:Num:Push:Nils:. pushNilSizeFunction := #sistaV1PushNilSize:numInitialNils:. BytecodeSetHasDirectedSuperSend := true. FirstSpecialSelector := 96. NumSpecialSelectors := 32. self flag: 'Special selector send class must be inlined to agree with the interpreter, which inlines class. If class is sent to e.g. a general instance of ProtoObject then unless class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit have identical semantics. We get away with not hardwiring the other special selectors either because in the Cointerpreter they are not inlined or because they are inlined only to instances of classes for which there will always be a method.'. self generatorTableFrom: #( "1 byte bytecodes" "pushes" (1 0 15 genPushReceiverVariableBytecode isInstVarRef needsFrameNever: 1) (1 16 31 genPushLitVarDirSup16CasesBytecode needsFrameNever: 1) (1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1) (1 64 75 genPushTemporaryVariableBytecode needsFrameIfMod16GENumArgs: 1) (1 76 76 genPushReceiverBytecode needsFrameNever: 1) (1 77 77 genPushConstantTrueBytecode needsFrameNever: 1) (1 78 78 genPushConstantFalseBytecode needsFrameNever: 1) (1 79 79 genPushConstantNilBytecode needsFrameNever: 1) (1 80 80 genPushConstantZeroBytecode needsFrameNever: 1) (1 81 81 genPushConstantOneBytecode needsFrameNever: 1) (1 82 82 genExtPushPseudoVariable) (1 83 83 duplicateTopBytecode needsFrameNever: 1) (1 84 87 unknownBytecode) "returns" (1 88 88 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0) (1 89 89 genReturnTrue return needsFrameIfInBlock: isMappedInBlock 0) (1 90 90 genReturnFalse return needsFrameIfInBlock: isMappedInBlock 0) (1 91 91 genReturnNil return needsFrameIfInBlock: isMappedInBlock 0) (1 92 92 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1) (1 93 93 genReturnNilFromBlock return needsFrameNever: -1) (1 94 94 genReturnTopFromBlock return needsFrameNever: -1) (1 95 95 genExtNopBytecode needsFrameNever: 0) "sends" (1 96 96 genSpecialSelectorArithmetic isMapped AddRR) (1 97 97 genSpecialSelectorArithmetic isMapped SubRR) (1 98 98 genSpecialSelectorComparison isMapped JumpLess) (1 99 99 genSpecialSelectorComparison isMapped JumpGreater) (1 100 100 genSpecialSelectorComparison isMapped JumpLessOrEqual) (1 101 101 genSpecialSelectorComparison isMapped JumpGreaterOrEqual) (1 102 102 genSpecialSelectorComparison isMapped JumpZero) (1 103 103 genSpecialSelectorComparison isMapped JumpNonZero) (1 104 109 genSpecialSelectorSend isMapped) " #* #/ #\\ #@ #bitShift: //" (1 110 110 genSpecialSelectorArithmetic isMapped AndRR) (1 111 111 genSpecialSelectorArithmetic isMapped OrRR) (1 112 117 genSpecialSelectorSend isMapped) "#at: #at:put: #size #next #nextPut: #atEnd" (1 118 118 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)" (1 119 119 genSpecialSelectorClass needsFrameIfStackGreaterThanOne: notMapped 0) "not mapped because it is directly inlined (for now)" (1 120 127 genSpecialSelectorSend isMapped) "#blockCopy: #value #value: #do: #new #new: #x #y" (1 128 143 genSendLiteralSelector0ArgsBytecode isMapped) (1 144 159 genSendLiteralSelector1ArgBytecode isMapped) (1 160 175 genSendLiteralSelector2ArgsBytecode isMapped) "jumps" (1 176 183 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:) (1 184 191 genShortJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (1 192 199 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (1 200 207 genStoreAndPopReceiverVariableBytecode isInstVarRef isMappedIfImmutability needsFrameIfImmutability: -1) (1 208 215 genStoreAndPopTemporaryVariableBytecode) (1 216 216 genPopStackBytecode needsFrameNever: -1) (1 217 217 genUnconditionalTrapBytecode isMapped) (1 218 223 unknownBytecode) "2 byte bytecodes" (2 224 224 extABytecode extension) (2 225 225 extBBytecode extension) "pushes" (2 226 226 genExtPushReceiverVariableBytecode isInstVarRef) "Needs a frame for context inst var access" (2 227 227 genExtPushLitVarDirSupBytecode needsFrameNever: 1) (2 228 228 genExtPushLiteralBytecode needsFrameNever: 1) (2 229 229 genLongPushTemporaryVariableBytecode) (2 230 230 genPushClosureTempsBytecode) (2 231 231 genPushNewArrayBytecode) (2 232 232 genExtPushIntegerBytecode needsFrameNever: 1) (2 233 233 genExtPushCharacterBytecode needsFrameNever: 1) "returns" "sends" (2 234 234 genExtSendBytecode isMapped) (2 235 235 genExtSendSuperBytecode isMapped) "sista bytecodes" (2 236 236 unknownBytecode) "jumps" (2 237 237 genExtUnconditionalJump branch isMapped "because of interrupt check" v4:Long:Branch:Distance:) (2 238 238 genExtJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) (2 239 239 genExtJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) "stores" (2 240 240 genExtStoreAndPopReceiverVariableBytecode isInstVarRef isMappedIfImmutability) + (2 241 241 genExtStoreAndPopLiteralVariableBytecode isMappedIfImmutability) - (2 241 241 genExtStoreAndPopLiteralVariableBytecode) (2 242 242 genLongStoreAndPopTemporaryVariableBytecode) (2 243 243 genExtStoreReceiverVariableBytecode isInstVarRef isMappedIfImmutability) + (2 244 244 genExtStoreLiteralVariableBytecode isMappedIfImmutability) - (2 244 244 genExtStoreLiteralVariableBytecode) (2 245 245 genLongStoreTemporaryVariableBytecode) (2 246 247 unknownBytecode) "3 byte bytecodes" (3 248 248 genCallPrimitiveBytecode) (3 249 249 unknownBytecode) "reserved for Push Float" (3 250 250 genExtPushClosureBytecode block v4:Block:Code:Size:) (3 251 251 genPushRemoteTempLongBytecode) (3 252 252 genStoreRemoteTempLongBytecode) (3 253 253 genStoreAndPopRemoteTempLongBytecode) (3 254 254 genExtJumpIfNotInstanceOfBehaviorsOrPopBytecode branch v4:Long:BranchIfNotInstanceOf:Distance:) (3 255 255 unknownBytecode))! Item was changed: ----- Method: StackToRegisterMappingCogit>>setInterpreter: (in category 'initialization') ----- setInterpreter: aCoInterpreter "Initialization of the code generator in the simulator. These objects already exist in the generated C VM or are used only in the simulation." <doNotGenerate> super setInterpreter: aCoInterpreter. methodAbortTrampolines := CArrayAccessor on: (Array new: self numRegArgs + 2). picAbortTrampolines := CArrayAccessor on: (Array new: self numRegArgs + 2). picMissTrampolines := CArrayAccessor on: (Array new: self numRegArgs + 2). simStack := CArrayAccessor on: ((1 to: 256) collect: [:i| CogSimStackEntry new cogit: self]). simSelf := CogSimStackEntry new cogit: self. optStatus := CogSSOptStatus new. debugFixupBreaks := self class initializationOptions at: #debugFixupBreaks ifAbsent: [Set new]. - debugBytecodePointers := self class initializationOptions at: #debugBytecodePointers ifAbsent: [Set new]. numPushNilsFunction := self class numPushNilsFunction. pushNilSizeFunction := self class pushNilSizeFunction! Item was added: + ----- Method: TDefineNode>>isDefine (in category 'testing') ----- + isDefine + + ^true! Item was added: + ----- Method: TParseNode>>isDefine (in category 'testing') ----- + isDefine + + ^false! Item was changed: SharedPool subclass: #VMBasicConstants instanceVariableNames: '' + classVariableNames: 'BaseHeaderSize Byte0Mask Byte0Shift Byte1Mask Byte1Shift Byte1ShiftNegated Byte2Mask Byte2Shift Byte3Mask Byte3Shift Byte3ShiftNegated Byte4Mask Byte4Shift Byte4ShiftNegated Byte5Mask Byte5Shift Byte5ShiftNegated Byte6Mask Byte6Shift Byte7Mask Byte7Shift Byte7ShiftNegated Bytes3to0Mask Bytes7to4Mask BytesPerOop BytesPerWord COGMTVM COGVM DisownVMLockOutFullGC DoAssertionChecks DoExpensiveAssertionChecks GCModeBecome GCModeFull GCModeImageSegment GCModeIncremental GCModeNewSpace IMMUTABILITY MULTIPLEBYTECODESETS NewspeakVM PharoVM PrimErrBadArgument PrimErrBadIndex PrimErrBadMethod PrimErrBadNumArgs PrimErrBadReceiver PrimErrGenericFailure PrimErrInappropriate PrimErrLimitExceeded PrimErrNamedInternal PrimErrNoCMemory PrimErrNoMemory PrimErrNoModification PrimErrNotFound PrimErrObjectIsPinned PrimErrObjectMayMove PrimErrUnsupported PrimErrWritePastObject PrimNoErr SPURVM STACKVM SistaVM VMBIGENDIAN' - classVariableNames: 'BaseHeaderSize Byte0Mask Byte0Shift Byte1Mask Byte1Shift Byte1ShiftNegated Byte2Mask Byte2Shift Byte3Mask Byte3Shift Byte3ShiftNegated Byte4Mask Byte4Shift Byte4ShiftNegated Byte5Mask Byte5Shift Byte5ShiftNegated Byte6Mask Byte6Shift Byte7Mask Byte7Shift Byte7ShiftNegated Bytes3to0Mask Bytes7to4Mask BytesPerOop BytesPerWord COGMTVM COGVM DisownVMLockOutFullGC DoAssertionChecks DoExpensiveAssertionChecks GCModeBecome GCModeFull GCModeImageSegment GCModeIncremental GCModeNewSpace IMMUTABILITY MULTIPLEBYTECODESETS NewspeakVM PharoVM PrimErrBadArgument PrimErrBadIndex PrimErrBadMethod PrimErrBadNumArgs PrimErrBadReceiver PrimErrGenericFailure PrimErrInappropriate PrimErrLimitExceeded PrimErrNamedInternal PrimErrNoCMemory PrimErrNoMemory PrimErrNoModification PrimErrNotFound PrimErrObjectIsPinned PrimErrObjectMayMove PrimErrUnsupported PrimErrWritePastObject PrimNoErr STACKVM SistaVM VMBIGENDIAN' poolDictionaries: '' category: 'VMMaker-Interpreter'! !VMBasicConstants commentStamp: '<historical>' prior: 0! I am a shared pool for basic constants upon which the VM as a whole depends. self ensureClassPool. self classPool declare: #BytesPerWord from: VMSqueakV3ObjectRepresentationConstants classPool. self classPool declare: #BaseHeaderSize from: VMSqueakV3ObjectRepresentationConstants classPool (ObjectMemory classPool keys select: [:k| k beginsWith: 'Byte']) do: [:k| self classPool declare: k from: ObjectMemory classPool]! Item was added: + ----- Method: VMBasicConstants class>>namesDefinedAtCompileTime (in category 'C translation') ----- + namesDefinedAtCompileTime + "Answer the set of names for variables that should be defined at compile time. + Some of these get default values during simulation, and hence get defaulted in + the various initializeMiscConstants methods. But that they have values should + /not/ cause the code generator to do dead code elimination based on their + default values." + ^#( VMBIGENDIAN + IMMUTABILITY + STACKVM COGVM COGMTVM SPURVM + "Pharo vs Squeak" PharoVM + "Newspeak" EnforceAccessControl)! Item was removed: - ----- Method: VMClass class>>copyOptionsBackTo: (in category 'initialization') ----- - copyOptionsBackTo: optionsDictionary - "Ugh. Copy back those options that the CCodeGenerator will do - dead-code elimination for that are not yet set in optionsDictionary. - This lets the CCodeGenerator see defaults for the options below." - - optionsDictionary ifNil: [^self]. - initializationOptions ifNil: [^self]. - #(MULTIPLEBYTECODESETS IMMUTABILITY) do: - [:option| - ((initializationOptions includesKey: option) - and: [(optionsDictionary includesKey: option) not]) ifTrue: - [optionsDictionary at: option put: (initializationOptions at: option)]]! Item was changed: ----- Method: VMClass class>>initializeMiscConstants (in category 'initialization') ----- initializeMiscConstants + "Falsify the `what type of VM is this?' flags that are defined in the various interp.h files. - "Falsify the `what type of VM is this?' flags that are defined in the various interp.h files, - or in the case of VMBIGENDIAN the various sqConfig.h files. Subclass implementations need to include a super initializeMiscConstants" | omc | - "VMBIGENDIAN & IMMUTABILITY are intended to be defined on the C compiler command line/in an include file, etc. - Don't inline them." VMBIGENDIAN class. "Mention this for the benefit of CCodeGenerator>>emitCConstantsOn:" + SPURVM := STACKVM := COGVM := COGMTVM := false. - IMMUTABILITY class. - self isInterpreterClass ifTrue: - [STACKVM := COGVM := COGMTVM := false]. - initializationOptions ifNil: [self initializationOptions: Dictionary new]. omc := initializationOptions at: #ObjectMemory ifAbsent: nil. (omc isNil and: [self defaultObjectMemoryClass notNil]) ifTrue: [omc := initializationOptions at: #ObjectMemory put: self defaultObjectMemoryClass name]. initializationOptions at: #SqueakV3ObjectMemory "the good ole default" ifAbsentPut: (omc ifNil: [true] ifNotNil: [(Smalltalk at: omc) includesBehavior: ObjectMemory]); at: #SpurObjectMemory "the new contender" ifAbsentPut: (omc ifNil: [false] ifNotNil: [(Smalltalk at: omc) includesBehavior: SpurMemoryManager]). "Use ifAbsentPut: so that they will get copied back to the VMMaker's options and dead code will likely be eliminated." PharoVM := initializationOptions at: #PharoVM ifAbsentPut: [false]. NewspeakVM := initializationOptions at: #NewspeakVM ifAbsentPut: [false]. SistaVM := initializationOptions at: #SistaVM ifAbsentPut: [false]. + "But not these; they're compile-time" + MULTIPLEBYTECODESETS := initializationOptions at: #MULTIPLEBYTECODESETS ifAbsent: [false]. + IMMUTABILITY := initializationOptions at: #IMMUTABILITY ifAbsent: [false]. - MULTIPLEBYTECODESETS := initializationOptions at: #MULTIPLEBYTECODESETS ifAbsentPut: [false]. + "These must be set only if specified, not defaulted, because they are set on the command line or in include files." + initializationOptions + at: #VMBIGENDIAN ifPresent: [:value| VMBIGENDIAN := value]; + at: #STACKVM ifPresent: [:value| STACKVM := value]; + at: #COGVM ifPresent: [:value| COGVM := initializationOptions at: #COGVM]; + at: #COGMTVM ifPresent: [:value| COGMTVM := initializationOptions at: #COGMTVM]! - "These for scripts etc... Usually they should get set by an Interpreter class's initializeMiscConstantsWith:" - (initializationOptions includesKey: #STACKVM) ifTrue: - [STACKVM := initializationOptions at: #STACKVM]. - (initializationOptions includesKey: #COGVM) ifTrue: - [COGVM := initializationOptions at: #COGVM]. - (initializationOptions includesKey: #COGMTVM) ifTrue: - [COGMTVM := initializationOptions at: #COGMTVM]! Item was changed: ----- Method: VMMaker class>>generateNewspeakSpurCog64VM (in category 'configurations') ----- generateNewspeakSpurCog64VM "No primitives since we can use those for the Spur Cog Newspeak VM" ^VMMaker generate: CoInterpreter and: StackToRegisterMappingCogit with: #( ObjectMemory Spur64BitCoMemoryManager MULTIPLEBYTECODESETS true + NewspeakVM true) - NewspeakVM true - EnforceAccessControl true) to: (FileDirectory default directoryNamed: self sourceTree, '/nsspur64src') fullName platformDir: (FileDirectory default directoryNamed: self sourceTree, '/platforms') fullName including:#() ! Item was changed: ----- Method: VMMaker class>>generateNewspeakSpurCogVM (in category 'configurations') ----- generateNewspeakSpurCogVM "This tree also includes the Newspeak plugins. But once the Alien plugins are harmonised (which can be done now immutability support is being added to Spur) all VMs can share a single set of plugin sources." ^VMMaker generate: CoInterpreter and: StackToRegisterMappingCogit with: #( ObjectMemory Spur32BitCoMemoryManager MULTIPLEBYTECODESETS true + NewspeakVM true) - NewspeakVM true - EnforceAccessControl true) to: (FileDirectory default pathFromURI: self sourceTree, '/nsspursrc') platformDir: (FileDirectory default pathFromURI: self sourceTree, '/platforms') including:#( AsynchFilePlugin BMPReadWriterPlugin BalloonEnginePlugin BitBltSimulation DeflatePlugin DSAPlugin DropPlugin FileCopyPlugin FilePlugin FloatArrayPlugin FloatMathPlugin ImmX11Plugin JPEGReadWriter2Plugin JPEGReaderPlugin LargeIntegersPlugin Matrix2x3Plugin MiscPrimitivePlugin NewsqueakIA32ABIPlugin RePlugin SecurityPlugin SocketPlugin SoundPlugin SqueakSSLPlugin SurfacePlugin UUIDPlugin UnixOSProcessPlugin UnixAioPlugin VMProfileLinuxSupportPlugin VMProfileMacSupportPlugin Win32OSProcessPlugin) ! Item was changed: ----- Method: VMMaker class>>generateNewspeakSpurStack64VM (in category 'configurations') ----- generateNewspeakSpurStack64VM "No primitives since we can use those from the Spur Cog Newspeak VM" ^VMMaker generate: StackInterpreter with: #( ObjectMemory Spur64BitMemoryManager MULTIPLEBYTECODESETS true NewspeakVM true + FailImbalancedPrimitives false) - FailImbalancedPrimitives false - EnforceAccessControl true) to: (FileDirectory default directoryNamed: self sourceTree, '/nsspurstack64src') fullName platformDir: (FileDirectory default directoryNamed: self sourceTree, '/platforms') fullName including: #()! Item was changed: ----- Method: VMMaker class>>generateNewspeakSpurStackVM (in category 'configurations') ----- generateNewspeakSpurStackVM "No primitives since we can use those from the Spur Cog Newspeak VM" ^VMMaker generate: StackInterpreter with: #( ObjectMemory Spur32BitMemoryManager MULTIPLEBYTECODESETS true NewspeakVM true + FailImbalancedPrimitives false) - FailImbalancedPrimitives false - EnforceAccessControl true) to: (FileDirectory default directoryNamed: self sourceTree, '/nsspurstacksrc') fullName platformDir: (FileDirectory default directoryNamed: self sourceTree, '/platforms') fullName including: #()! Item was changed: ----- Method: VMMaker>>buildCodeGeneratorForCogit:includeAPIMethods:initializeClasses: (in category 'generate sources') ----- buildCodeGeneratorForCogit: cogitClass includeAPIMethods: getAPIMethods initializeClasses: initializeClasses "Answer the code generator for translating the cogit." | cg cogitClasses | cg := self createCogitCodeGenerator. cg vmClass: cogitClass. initializeClasses ifTrue: [{ cogitClass. self interpreterClass. self interpreterClass objectMemoryClass } do: [:cgc| (cgc respondsTo: #initializeWithOptions:) ifTrue: [cgc initializeWithOptions: optionsDictionary] ifFalse: [cgc initialize]]]. cogitClasses := OrderedCollection withAll: (cogitClass withAllSuperclasses copyUpThrough: VMClass) reverse. cogitClasses addAllLast: ((cogitClass ancilliaryClasses: optionsDictionary) reject: [:class| class isStructClass]). cogitClasses do: [:cgc| cg addClass: cgc]. cg addStructClasses: (cg structClassesForTranslationClasses: cogitClasses). getAPIMethods ifTrue: [cg includeAPIFrom: (self buildCodeGeneratorForInterpreter: self interpreterClass includeAPIMethods: false initializeClasses: false)]. - cg - removeConstant: #VMBIGENDIAN; "this should be defined in platforms/??/vm/sqConfig.h" - const: #IMMUTABILITY "this can be defined on the C compiler command line." - declareC: ('#if !!defined(IMMUTABILITY)\/* Allow IMMUTABILITY to be overridden on the compiler command line */\# define IMMUTABILITY ', (cg cLiteralFor: false),'\#endif') withCRs. - ^cg! Item was changed: ----- Method: VMMaker>>buildCodeGeneratorForInterpreter:includeAPIMethods:initializeClasses: (in category 'generate sources') ----- buildCodeGeneratorForInterpreter: interpreterClass includeAPIMethods: getAPIMethods initializeClasses: initializeClasses "Answer the code generator for translating the interpreter." | cg interpreterClasses | initializeClasses ifTrue: [interpreterClass initializeWithOptions: optionsDictionary. interpreterClass hasCogit ifTrue: [interpreterClass cogitClass initializeWithOptions: optionsDictionary]]. (cg := self createCodeGenerator) vmClass: interpreterClass. "Construct interpreterClasses as all classes from interpreterClass & objectMemoryClass up to VMClass in superclass to subclass order." interpreterClasses := OrderedCollection new. {interpreterClass. interpreterClass objectMemoryClass} do: [:vmClass| | theClass | theClass := vmClass. [theClass ~~ VMClass] whileTrue: [interpreterClasses addFirst: theClass. theClass := theClass superclass]]. interpreterClasses addFirst: VMClass; addAllLast: (cg nonStructClassesForTranslationClasses: interpreterClasses). initializeClasses ifTrue: [interpreterClasses do: [:ic| (ic respondsTo: #initializeWithOptions:) ifTrue: [ic initializeWithOptions: optionsDictionary] ifFalse: [ic initialize]]. (cg structClassesForTranslationClasses: interpreterClasses) do: [:structClass| structClass initialize]]. cg addStructClasses: (cg structClassesForTranslationClasses: interpreterClasses). interpreterClasses do: [:ic| cg addClass: ic]. getAPIMethods ifTrue: [interpreterClass cogitClass ifNotNil: [:cogitClass| cg includeAPIFrom: (self buildCodeGeneratorForCogit: cogitClass includeAPIMethods: false initializeClasses: false)]]. - cg removeConstant: #VMBIGENDIAN; "this should be defined in platforms/??/vm/sqConfig.h" - const: #IMMUTABILITY "this can be defined on the C compiler command line." - declareC: ('#if !!defined(IMMUTABILITY)\/* Allow IMMUTABILITY to be overridden on the compiler command line */\# define IMMUTABILITY ', (cg cLiteralFor: false),'\#endif') withCRs. - ^cg!

1 0

Re: [Vm-dev] VM Maker: VMMaker.oscog-cb.1659.mcz
by Clément Bera 20 Jan '16

20 Jan '16

Starting from this commit I can compile the Cog Spur VM with Immutability ON and I used it for an hour of development without any bugs, including all the Immutability use-cases. Now Eliot said this was buggy so let's wait he confirms that this is a success. Here is a package to make some experiments: http://smalltalkhub.com/mc/ClementBera/Immutability/main 2016-01-20 11:01 GMT+01:00 <commits(a)source.squeak.org>: > > Eliot Miranda uploaded a new version of VMMaker to project VM Maker: > http://source.squeak.org/VMMaker/VMMaker.oscog-cb.1659.mcz > > ==================== Summary ==================== > > Name: VMMaker.oscog-cb.1659 > Author: cb > Time: 20 January 2016, 11:00:55.667 am > UUID: db25d5fe-a6c3-4db3-882f-f9c87e239dd2 > Ancestors: VMMaker.oscog-cb.1658 > > Now that the Cog Simulator runs fine Spur images with immutability ON, I > compiled the VM. > > This <api> pragma was missing, It now compiles fine. > > =============== Diff against VMMaker.oscog-cb.1658 =============== > > Item was changed: > ----- Method: SpurMemoryManager>>immutableBitMask (in category 'header > format') ----- > immutableBitMask > "mask the immutable bit in the base header word" > + <api> > <option: #IMMUTABILITY> > ^ 1 << self immutableBitShift! > >

1 0

VM Maker: VMMaker.oscog-cb.1659.mcz
by commits＠source.squeak.org 20 Jan '16

20 Jan '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-cb.1659.mcz ==================== Summary ==================== Name: VMMaker.oscog-cb.1659 Author: cb Time: 20 January 2016, 11:00:55.667 am UUID: db25d5fe-a6c3-4db3-882f-f9c87e239dd2 Ancestors: VMMaker.oscog-cb.1658 Now that the Cog Simulator runs fine Spur images with immutability ON, I compiled the VM. This <api> pragma was missing, It now compiles fine. =============== Diff against VMMaker.oscog-cb.1658 =============== Item was changed: ----- Method: SpurMemoryManager>>immutableBitMask (in category 'header format') ----- immutableBitMask "mask the immutable bit in the base header word" + <api> <option: #IMMUTABILITY> ^ 1 << self immutableBitShift!

1 0

← Newer
1
2
3
4
5
6
7
8
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev January 2016