Vm-dev June 2015

vm-dev@lists.squeakfoundation.org

28 participants
149 discussions

[commit][3367] CogVM source as per VMMaker.oscog-eem.1333
by commits＠squeakvm.org 03 Jun '15

03 Jun '15

Revision: 3367 Author: eliot Date: 2015-06-03 09:00:39 -0700 (Wed, 03 Jun 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1333 Cogit: Fix assert-fails with absent receiver sends in Newspeak. Have the implicit and outer send lookup trampolines set the stacked receiver (when there is one) when setting the implciit receiver. Streamline send trampoline creation by refactoring trampoline name generation so that the two limits, NumSendTrampolines - 2 and numRegArgs are treated separately, and numArgsOrSendNumArgsReg: answers the relevant numArgs argument. This should clear up confusion between numRegArgs (which can be 0, 1 & 2) and NumSendTrampolines - 2, which is always 2. Modified Paths: -------------- branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogitARMv5.c branches/Cog/nsspursrc/vm/cogitIA32.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogitARMv5.c branches/Cog/spursistasrc/vm/cogitIA32.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogitARMv5.c branches/Cog/spursrc/vm/cogitIA32.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogitARMv5.c branches/Cog/src/vm/cogitIA32.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2015-06-02 18:10:30 UTC (rev 3366) +++ branches/Cog/nsspursrc/vm/cogit.h 2015-06-03 16:00:39 UTC (rev 3367) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 + CCodeGenerator VMMaker.oscog-eem.1333 uuid: bc9001c2-8816-4b4e-bf91-8e11cad6ed6b */ Modified: branches/Cog/nsspursrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-06-02 18:10:30 UTC (rev 3366) +++ branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-06-03 16:00:39 UTC (rev 3367) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 + CCodeGenerator VMMaker.oscog-eem.1333 uuid: bc9001c2-8816-4b4e-bf91-8e11cad6ed6b from - StackToRegisterMappingCogit VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 + StackToRegisterMappingCogit VMMaker.oscog-eem.1333 uuid: bc9001c2-8816-4b4e-bf91-8e11cad6ed6b */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1333 uuid: bc9001c2-8816-4b4e-bf91-8e11cad6ed6b " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -308,6 +308,7 @@ #define NotFullyInitialized -1 #define NSCClassTagIndex 0 #define NSCEnclosingObjectIndex 1 +#define NSCNumArgsIndex 4 #define NSCTargetIndex 2 #define NumObjRefsInRuntime 0 #define NumOopsPerNSC 6 @@ -759,7 +760,8 @@ void setSelectorOfto(CogMethod *cogMethod, sqInt aSelectorOop); static sqInt spanForCleanBlockStartingAt(sqInt startPC) NoDbgRegParms; sqInt traceLinkedSendOffset(void); -static char * trampolineNamenumArgs(char *routinePrefix, sqInt numArgs) NoDbgRegParms; +static char * trampolineNamenumArgs(sqInt routinePrefix, sqInt numArgs) NoDbgRegParms; +static char * trampolineNamenumRegArgs(sqInt routinePrefix, sqInt numArgs) NoDbgRegParms; static sqInt unimplementedPrimitive(void); static sqInt unknownBytecode(void); void unlinkAllSends(void); @@ -9912,7 +9914,7 @@ { sqInt classIndex; sqInt i; - usqInt pc; + sqInt pc; pc = (((((usqInt)cPIC)) + firstCPICCaseOffset) + cPICCaseSize) - (jumpLongConditionalByteSize(backEnd)); for (i = 2; i <= ((cPIC->cPICNumCases)); i += 1) { @@ -11070,6 +11072,7 @@ { AbstractInstruction *jumpItsTheReceiverStupid; AbstractInstruction *jumpMiss; + sqInt offset; opcodeIndex = 0; genGetInlineCacheClassTagFromintoforEntry(ReceiverResultReg, ClassReg, 0); @@ -11087,6 +11090,26 @@ jumpItsTheReceiverStupid = genoperand(JumpZero, ((sqInt)0)); /* begin MoveR:R: */ genoperandoperand(MoveRR, TempReg, ReceiverResultReg); + if (numArgs > 2) { + if (numArgs >= (NumSendTrampolines - 1)) { + + /* arbitrary argument count */ + + /* begin MoveMw:r:R: */ + genoperandoperandoperand(MoveMwrR, NSCNumArgsIndex * BytesPerWord, SendNumArgsReg, TempReg); + + /* begin MoveR:Xwr:R: */ + genoperandoperandoperand(MoveRXwrR, ReceiverResultReg, TempReg, SPReg); + } + else { + + /* Known argument count */ + + /* begin MoveR:Mw:r: */ + offset = ((0) + numArgs) * BytesPerWord; + genoperandoperandoperand(MoveRMwr, TempReg, offset, SPReg); + } + } jmpTarget(jumpItsTheReceiverStupid, gLabel()); /* begin MoveMw:r:R: */ genoperandoperandoperand(MoveMwrR, NSCTargetIndex * BytesPerWord, SendNumArgsReg, TempReg); @@ -14165,18 +14188,31 @@ return (cmNoCheckEntryOffset + (callInstructionByteSize(backEnd))) + (pushLinkRegisterByteSize(backEnd)); } + /* Cogit>>#trampolineName:numArgs: */ +static char * +trampolineNamenumArgs(sqInt routinePrefix, sqInt numArgs) +{ + char *theString; -/* Malloc a string with the contents for the trampoline table */ + /* begin trampolineName:numArgs:limit: */ + ; + theString = malloc((strlen(((char *) routinePrefix))) + 6); + sprintf(theString, "%s%cArgs", ((char *) routinePrefix), (numArgs <= (NumSendTrampolines - 2) + ? '0' + numArgs + : 'N')); + return theString; +} - /* Cogit>>#trampolineName:numArgs: */ + /* Cogit>>#trampolineName:numRegArgs: */ static char * -trampolineNamenumArgs(char *routinePrefix, sqInt numArgs) +trampolineNamenumRegArgs(sqInt routinePrefix, sqInt numArgs) { char *theString; - - theString = malloc((strlen(routinePrefix)) + 6); - sprintf(theString, "%s%cArgs", routinePrefix, (numArgs >= 0 + /* begin trampolineName:numArgs:limit: */ + ; + theString = malloc((strlen(((char *) routinePrefix))) + 6); + sprintf(theString, "%s%cArgs", ((char *) routinePrefix), (numArgs <= 2 ? '0' + numArgs : 'N')); return theString; @@ -22502,7 +22538,7 @@ enilopmart = methodZoneBase; methodZoneBase = alignUptoRoutineBoundary(endAddress); nopsFromto(backEnd, endAddress, methodZoneBase - 1); - recordGeneratedRunTimeaddress(trampolineNamenumArgs("ceCallPIC", numArgs), enilopmart); + recordGeneratedRunTimeaddress(trampolineNamenumRegArgs("ceCallPIC", numArgs), enilopmart); return ((void (*)(void)) enilopmart); } @@ -22899,7 +22935,6 @@ Read the class-side method trampolines for documentation on the various trampolines */ -/* Slang needs these apparently superfluous asSymbol sends. */ /* StackToRegisterMappingCogit>>#generateMissAbortTrampolines */ static void @@ -22920,9 +22955,7 @@ } -/* Self send, dynamic super send, and implicit receiver send. TODO: outer - send. - */ +/* Self send, dynamic super send, implicit receiver send, and outer send. */ /* Override to generate code to push the register arg(s) for <= numRegArg arity sends. */ @@ -22933,22 +22966,22 @@ { sqInt numArgs; - for (numArgs = 0; numArgs <= (NumSendTrampolines - 2); numArgs += 1) { - selfSendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargarg(ceSelfSendtonumArgs, numArgs, trampolineNamenumArgs("ceSelfSend", numArgs), ClassReg, ReceiverResultReg, numArgs)); + for (numArgs = 0; numArgs < NumSendTrampolines; numArgs += 1) { + selfSendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargarg(ceSelfSendtonumArgs, numArgs, trampolineNamenumArgs("ceSelfSend", numArgs), ClassReg, ReceiverResultReg, (numArgs <= (NumSendTrampolines - 2) + ? numArgs + : SendNumArgsReg))); } - selfSendTrampolines[NumSendTrampolines - 1] = (genSendTrampolineFornumArgscalledargargarg(ceSelfSendtonumArgs, 2 + 1, trampolineNamenumArgs("ceSelfSend", -1), ClassReg, ReceiverResultReg, SendNumArgsReg)); - for (numArgs = 0; numArgs <= (NumSendTrampolines - 2); numArgs += 1) { - dynamicSuperSendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargarg(ceDynamicSuperSendtonumArgs, numArgs, trampolineNamenumArgs("ceDynSuperSend", numArgs), ClassReg, ReceiverResultReg, numArgs)); + for (numArgs = 0; numArgs < NumSendTrampolines; numArgs += 1) { + dynamicSuperSendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargarg(ceDynamicSuperSendtonumArgs, numArgs, trampolineNamenumArgs("ceDynSuperSend", numArgs), ClassReg, ReceiverResultReg, (numArgs <= (NumSendTrampolines - 2) + ? numArgs + : SendNumArgsReg))); } - dynamicSuperSendTrampolines[NumSendTrampolines - 1] = (genSendTrampolineFornumArgscalledargargarg(ceDynamicSuperSendtonumArgs, 2 + 1, trampolineNamenumArgs("ceDynSuperSend", -1), ClassReg, ReceiverResultReg, SendNumArgsReg)); - for (numArgs = 0; numArgs <= (NumSendTrampolines - 2); numArgs += 1) { + for (numArgs = 0; numArgs < NumSendTrampolines; numArgs += 1) { implicitReceiverSendTrampolines[numArgs] = (genNSSendTrampolineFornumArgscalled(ceImplicitReceiverSendreceiver, numArgs, trampolineNamenumArgs("ceImplicitReceiverSend", numArgs))); } - implicitReceiverSendTrampolines[NumSendTrampolines - 1] = (genNSSendTrampolineFornumArgscalled(ceImplicitReceiverSendreceiver, 2 + 1, trampolineNamenumArgs("ceImplicitReceiverSend", -1))); - for (numArgs = 0; numArgs <= (NumSendTrampolines - 2); numArgs += 1) { + for (numArgs = 0; numArgs < NumSendTrampolines; numArgs += 1) { outerSendTrampolines[numArgs] = (genNSSendTrampolineFornumArgscalled(ceOuterSendreceiver, numArgs, trampolineNamenumArgs("ceOuterSend", numArgs))); } - outerSendTrampolines[NumSendTrampolines - 1] = (genNSSendTrampolineFornumArgscalled(ceOuterSendreceiver, 2 + 1, trampolineNamenumArgs("ceOuterSend", -1))); } @@ -22962,25 +22995,28 @@ { sqInt numArgs; - for (numArgs = 0; numArgs <= (NumSendTrampolines - 2); numArgs += 1) { - ordinarySendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargargarg(ceSendsupertonumArgs, numArgs, trampolineNamenumArgs("ceSend", numArgs), ClassReg, 0, ReceiverResultReg, numArgs)); + for (numArgs = 0; numArgs < NumSendTrampolines; numArgs += 1) { + ordinarySendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargargarg(ceSendsupertonumArgs, numArgs, trampolineNamenumArgs("ceSend", numArgs), ClassReg, 0, ReceiverResultReg, (numArgs <= (NumSendTrampolines - 2) + ? numArgs + : SendNumArgsReg))); } - ordinarySendTrampolines[NumSendTrampolines - 1] = (genSendTrampolineFornumArgscalledargargargarg(ceSendsupertonumArgs, 2 + 1, trampolineNamenumArgs("ceSend", -1), ClassReg, 0, ReceiverResultReg, SendNumArgsReg)); generateNewspeakSendTrampolines(); # if BytecodeSetHasDirectedSuperSend - for (numArgs = 0; numArgs <= (NumSendTrampolines - 2); numArgs += 1) { - directedSuperSendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargargarg(ceSendabovetonumArgs, numArgs, trampolineNamenumArgs("ceDirectedSuperSend", numArgs), ClassReg, TempReg, ReceiverResultReg, numArgs)); + for (numArgs = 0; numArgs < NumSendTrampolines; numArgs += 1) { + directedSuperSendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargargarg(ceSendabovetonumArgs, numArgs, trampolineNamenumArgs("ceDirectedSuperSend", numArgs), ClassReg, TempReg, ReceiverResultReg, (numArgs <= (NumSendTrampolines - 2) + ? numArgs + : SendNumArgsReg))); } - directedSuperSendTrampolines[NumSendTrampolines - 1] = (genSendTrampolineFornumArgscalledargargargarg(ceSendabovetonumArgs, 2 + 1, trampolineNamenumArgs("ceDirectedSuperSend", -1), ClassReg, TempReg, ReceiverResultReg, SendNumArgsReg)); # endif /* BytecodeSetHasDirectedSuperSend */ - for (numArgs = 0; numArgs <= (NumSendTrampolines - 2); numArgs += 1) { - superSendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargargarg(ceSendsupertonumArgs, numArgs, trampolineNamenumArgs("ceSuperSend", numArgs), ClassReg, 1, ReceiverResultReg, numArgs)); + for (numArgs = 0; numArgs < NumSendTrampolines; numArgs += 1) { + superSendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargargarg(ceSendsupertonumArgs, numArgs, trampolineNamenumArgs("ceSuperSend", numArgs), ClassReg, 1, ReceiverResultReg, (numArgs <= (NumSendTrampolines - 2) + ? numArgs + : SendNumArgsReg))); } - superSendTrampolines[NumSendTrampolines - 1] = (genSendTrampolineFornumArgscalledargargargarg(ceSendsupertonumArgs, 2 + 1, trampolineNamenumArgs("ceSuperSend", -1), ClassReg, 1, ReceiverResultReg, SendNumArgsReg)); firstSend = ordinarySendTrampolines[0]; lastSend = superSendTrampolines[NumSendTrampolines - 1]; } @@ -23206,9 +23242,7 @@ compileTrampolineFornumArgsargargargargsaveRegspushLinkRegresultReg(ceStackOverflow, 1, SendNumArgsReg, null, null, null, 0, 0, null); jmpTarget(jumpSICMiss, gLabel()); genPushRegisterArgsForAbortMissNumArgs(backEnd, numArgs); - return genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceSICMiss, trampolineNamenumArgs("ceMethodAbort", (numArgs <= 2 - ? numArgs - : -1)), 1, ReceiverResultReg, null, null, null, 0, 0, null, 1); + return genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceSICMiss, trampolineNamenumRegArgs("ceMethodAbort", numArgs), 1, ReceiverResultReg, null, null, null, 0, 0, null, 1); } @@ -23239,9 +23273,7 @@ { opcodeIndex = 0; genPushRegisterArgsForAbortMissNumArgs(backEnd, numArgs); - return genInnerPICAbortTrampoline(trampolineNamenumArgs("cePICAbort", (numArgs <= 2 - ? numArgs - : -1))); + return genInnerPICAbortTrampoline(trampolineNamenumRegArgs("cePICAbort", numArgs)); } /* StackToRegisterMappingCogit>>#genPICMissTrampolineFor: */ @@ -23256,9 +23288,7 @@ opcodeIndex = 0; genPushRegisterArgsForNumArgsscratchReg(backEnd, numArgs, SendNumArgsReg); - genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceCPICMissreceiver, trampolineNamenumArgs("cePICMiss", (numArgs <= 2 - ? numArgs - : -1)), 2, ClassReg, ReceiverResultReg, null, null, 0, 1, null, 1); + genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceCPICMissreceiver, trampolineNamenumRegArgs("cePICMiss", numArgs), 2, ClassReg, ReceiverResultReg, null, null, 0, 1, null, 1); return startAddress; } Modified: branches/Cog/nsspursrc/vm/cogitIA32.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitIA32.c 2015-06-02 18:10:30 UTC (rev 3366) +++ branches/Cog/nsspursrc/vm/cogitIA32.c 2015-06-03 16:00:39 UTC (rev 3367) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 + CCodeGenerator VMMaker.oscog-eem.1333 uuid: bc9001c2-8816-4b4e-bf91-8e11cad6ed6b from - StackToRegisterMappingCogit VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 + StackToRegisterMappingCogit VMMaker.oscog-eem.1333 uuid: bc9001c2-8816-4b4e-bf91-8e11cad6ed6b */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1333 uuid: bc9001c2-8816-4b4e-bf91-8e11cad6ed6b " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -305,6 +305,7 @@ #define NotFullyInitialized -1 #define NSCClassTagIndex 0 #define NSCEnclosingObjectIndex 1 +#define NSCNumArgsIndex 4 #define NSCTargetIndex 2 #define NumObjRefsInRuntime 0 #define NumOopsPerNSC 6 @@ -704,7 +705,8 @@ void setSelectorOfto(CogMethod *cogMethod, sqInt aSelectorOop); static sqInt spanForCleanBlockStartingAt(sqInt startPC) NoDbgRegParms; sqInt traceLinkedSendOffset(void); -static char * trampolineNamenumArgs(char *routinePrefix, sqInt numArgs) NoDbgRegParms; +static char * trampolineNamenumArgs(sqInt routinePrefix, sqInt numArgs) NoDbgRegParms; +static char * trampolineNamenumRegArgs(sqInt routinePrefix, sqInt numArgs) NoDbgRegParms; static sqInt unimplementedPrimitive(void); static sqInt unknownBytecode(void); void unlinkAllSends(void); @@ -9841,6 +9843,7 @@ { AbstractInstruction *jumpItsTheReceiverStupid; AbstractInstruction *jumpMiss; + sqInt offset; opcodeIndex = 0; genGetInlineCacheClassTagFromintoforEntry(ReceiverResultReg, ClassReg, 0); @@ -9858,6 +9861,28 @@ jumpItsTheReceiverStupid = genoperand(JumpZero, ((sqInt)0)); /* begin MoveR:R: */ genoperandoperand(MoveRR, TempReg, ReceiverResultReg); + if (numArgs > 2) { + if (numArgs >= (NumSendTrampolines - 1)) { + + /* arbitrary argument count */ + + /* begin MoveMw:r:R: */ + genoperandoperandoperand(MoveMwrR, NSCNumArgsIndex * BytesPerWord, SendNumArgsReg, TempReg); + /* begin AddCq:R: */ + genoperandoperand(AddCqR, 1, TempReg); + + /* begin MoveR:Xwr:R: */ + genoperandoperandoperand(MoveRXwrR, ReceiverResultReg, TempReg, SPReg); + } + else { + + /* Known argument count */ + + /* begin MoveR:Mw:r: */ + offset = ((1) + numArgs) * BytesPerWord; + genoperandoperandoperand(MoveRMwr, TempReg, offset, SPReg); + } + } jmpTarget(jumpItsTheReceiverStupid, gLabel()); /* begin MoveMw:r:R: */ genoperandoperandoperand(MoveMwrR, NSCTargetIndex * BytesPerWord, SendNumArgsReg, TempReg); @@ -12954,18 +12979,31 @@ return (cmNoCheckEntryOffset + (callInstructionByteSize(backEnd))) + (0); } + /* Cogit>>#trampolineName:numArgs: */ +static char * +trampolineNamenumArgs(sqInt routinePrefix, sqInt numArgs) +{ + char *theString; -/* Malloc a string with the contents for the trampoline table */ + /* begin trampolineName:numArgs:limit: */ + ; + theString = malloc((strlen(((char *) routinePrefix))) + 6); + sprintf(theString, "%s%cArgs", ((char *) routinePrefix), (numArgs <= (NumSendTrampolines - 2) + ? '0' + numArgs + : 'N')); + return theString; +} - /* Cogit>>#trampolineName:numArgs: */ + /* Cogit>>#trampolineName:numRegArgs: */ static char * -trampolineNamenumArgs(char *routinePrefix, sqInt numArgs) +trampolineNamenumRegArgs(sqInt routinePrefix, sqInt numArgs) { char *theString; - - theString = malloc((strlen(routinePrefix)) + 6); - sprintf(theString, "%s%cArgs", routinePrefix, (numArgs >= 0 + /* begin trampolineName:numArgs:limit: */ + ; + theString = malloc((strlen(((char *) routinePrefix))) + 6); + sprintf(theString, "%s%cArgs", ((char *) routinePrefix), (numArgs <= 2 ? '0' + numArgs : 'N')); return theString; @@ -21273,7 +21311,7 @@ enilopmart = methodZoneBase; methodZoneBase = alignUptoRoutineBoundary(endAddress); nopsFromto(backEnd, endAddress, methodZoneBase - 1); - recordGeneratedRunTimeaddress(trampolineNamenumArgs("ceCallPIC", numArgs), enilopmart); + recordGeneratedRunTimeaddress(trampolineNamenumRegArgs("ceCallPIC", numArgs), enilopmart); return ((void (*)(void)) enilopmart); } @@ -21669,7 +21707,6 @@ Read the class-side method trampolines for documentation on the various trampolines */ -/* Slang needs these apparently superfluous asSymbol sends. */ /* StackToRegisterMappingCogit>>#generateMissAbortTrampolines */ static void @@ -21690,9 +21727,7 @@ } -/* Self send, dynamic super send, and implicit receiver send. TODO: outer - send. - */ +/* Self send, dynamic super send, implicit receiver send, and outer send. */ /* Override to generate code to push the register arg(s) for <= numRegArg arity sends. */ @@ -21703,22 +21738,22 @@ { sqInt numArgs; - for (numArgs = 0; numArgs <= (NumSendTrampolines - 2); numArgs += 1) { - selfSendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargarg(ceSelfSendtonumArgs, numArgs, trampolineNamenumArgs("ceSelfSend", numArgs), ClassReg, ReceiverResultReg, numArgs)); + for (numArgs = 0; numArgs < NumSendTrampolines; numArgs += 1) { + selfSendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargarg(ceSelfSendtonumArgs, numArgs, trampolineNamenumArgs("ceSelfSend", numArgs), ClassReg, ReceiverResultReg, (numArgs <= (NumSendTrampolines - 2) + ? numArgs + : SendNumArgsReg))); } - selfSendTrampolines[NumSendTrampolines - 1] = (genSendTrampolineFornumArgscalledargargarg(ceSelfSendtonumArgs, 2 + 1, trampolineNamenumArgs("ceSelfSend", -1), ClassReg, ReceiverResultReg, SendNumArgsReg)); - for (numArgs = 0; numArgs <= (NumSendTrampolines - 2); numArgs += 1) { - dynamicSuperSendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargarg(ceDynamicSuperSendtonumArgs, numArgs, trampolineNamenumArgs("ceDynSuperSend", numArgs), ClassReg, ReceiverResultReg, numArgs)); + for (numArgs = 0; numArgs < NumSendTrampolines; numArgs += 1) { + dynamicSuperSendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargarg(ceDynamicSuperSendtonumArgs, numArgs, trampolineNamenumArgs("ceDynSuperSend", numArgs), ClassReg, ReceiverResultReg, (numArgs <= (NumSendTrampolines - 2) + ? numArgs + : SendNumArgsReg))); } - dynamicSuperSendTrampolines[NumSendTrampolines - 1] = (genSendTrampolineFornumArgscalledargargarg(ceDynamicSuperSendtonumArgs, 2 + 1, trampolineNamenumArgs("ceDynSuperSend", -1), ClassReg, ReceiverResultReg, SendNumArgsReg)); - for (numArgs = 0; numArgs <= (NumSendTrampolines - 2); numArgs += 1) { + for (numArgs = 0; numArgs < NumSendTrampolines; numArgs += 1) { implicitReceiverSendTrampolines[numArgs] = (genNSSendTrampolineFornumArgscalled(ceImplicitReceiverSendreceiver, numArgs, trampolineNamenumArgs("ceImplicitReceiverSend", numArgs))); } - implicitReceiverSendTrampolines[NumSendTrampolines - 1] = (genNSSendTrampolineFornumArgscalled(ceImplicitReceiverSendreceiver, 2 + 1, trampolineNamenumArgs("ceImplicitReceiverSend", -1))); - for (numArgs = 0; numArgs <= (NumSendTrampolines - 2); numArgs += 1) { + for (numArgs = 0; numArgs < NumSendTrampolines; numArgs += 1) { outerSendTrampolines[numArgs] = (genNSSendTrampolineFornumArgscalled(ceOuterSendreceiver, numArgs, trampolineNamenumArgs("ceOuterSend", numArgs))); } - outerSendTrampolines[NumSendTrampolines - 1] = (genNSSendTrampolineFornumArgscalled(ceOuterSendreceiver, 2 + 1, trampolineNamenumArgs("ceOuterSend", -1))); } @@ -21732,25 +21767,28 @@ { sqInt numArgs; - for (numArgs = 0; numArgs <= (NumSendTrampolines - 2); numArgs += 1) { - ordinarySendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargargarg(ceSendsupertonumArgs, numArgs, trampolineNamenumArgs("ceSend", numArgs), ClassReg, 0, ReceiverResultReg, numArgs)); + for (numArgs = 0; numArgs < NumSendTrampolines; numArgs += 1) { + ordinarySendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargargarg(ceSendsupertonumArgs, numArgs, trampolineNamenumArgs("ceSend", numArgs), ClassReg, 0, ReceiverResultReg, (numArgs <= (NumSendTrampolines - 2) + ? numArgs + : SendNumArgsReg))); } - ordinarySendTrampolines[NumSendTrampolines - 1] = (genSendTrampolineFornumArgscalledargargargarg(ceSendsupertonumArgs, 2 + 1, trampolineNamenumArgs("ceSend", -1), ClassReg, 0, ReceiverResultReg, SendNumArgsReg)); generateNewspeakSendTrampolines(); # if BytecodeSetHasDirectedSuperSend - for (numArgs = 0; numArgs <= (NumSendTrampolines - 2); numArgs += 1) { - directedSuperSendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargargarg(ceSendabovetonumArgs, numArgs, trampolineNamenumArgs("ceDirectedSuperSend", numArgs), ClassReg, TempReg, ReceiverResultReg, numArgs)); + for (numArgs = 0; numArgs < NumSendTrampolines; numArgs += 1) { + directedSuperSendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargargarg(ceSendabovetonumArgs, numArgs, trampolineNamenumArgs("ceDirectedSuperSend", numArgs), ClassReg, TempReg, ReceiverResultReg, (numArgs <= (NumSendTrampolines - 2) + ? numArgs + : SendNumArgsReg))); } - directedSuperSendTrampolines[NumSendTrampolines - 1] = (genSendTrampolineFornumArgscalledargargargarg(ceSendabovetonumArgs, 2 + 1, trampolineNamenumArgs("ceDirectedSuperSend", -1), ClassReg, TempReg, ReceiverResultReg, SendNumArgsReg)); # endif /* BytecodeSetHasDirectedSuperSend */ - for (numArgs = 0; numArgs <= (NumSendTrampolines - 2); numArgs += 1) { - superSendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargargarg(ceSendsupertonumArgs, numArgs, trampolineNamenumArgs("ceSuperSend", numArgs), ClassReg, 1, ReceiverResultReg, numArgs)); + for (numArgs = 0; numArgs < NumSendTrampolines; numArgs += 1) { + superSendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargargarg(ceSendsupertonumArgs, numArgs, trampolineNamenumArgs("ceSuperSend", numArgs), ClassReg, 1, ReceiverResultReg, (numArgs <= (NumSendTrampolines - 2) + ? numArgs + : SendNumArgsReg))); } - superSendTrampolines[NumSendTrampolines - 1] = (genSendTrampolineFornumArgscalledargargargarg(ceSendsupertonumArgs, 2 + 1, trampolineNamenumArgs("ceSuperSend", -1), ClassReg, 1, ReceiverResultReg, SendNumArgsReg)); firstSend = ordinarySendTrampolines[0]; lastSend = superSendTrampolines[NumSendTrampolines - 1]; } @@ -21974,9 +22012,7 @@ compileTrampolineFornumArgsargargargargsaveRegspushLinkRegresultReg(ceStackOverflow, 1, SendNumArgsReg, null, null, null, 0, 0, null); jmpTarget(jumpSICMiss, gLabel()); genPushRegisterArgsForAbortMissNumArgs(backEnd, numArgs); - return genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceSICMiss, trampolineNamenumArgs("ceMethodAbort", (numArgs <= 2 - ? numArgs - : -1)), 1, ReceiverResultReg, null, null, null, 0, 0, null, 1); + return genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceSICMiss, trampolineNamenumRegArgs("ceMethodAbort", numArgs), 1, ReceiverResultReg, null, null, null, 0, 0, null, 1); } @@ -22007,9 +22043,7 @@ { opcodeIndex = 0; genPushRegisterArgsForAbortMissNumArgs(backEnd, numArgs); - return genInnerPICAbortTrampoline(trampolineNamenumArgs("cePICAbort", (numArgs <= 2 - ? numArgs - : -1))); + return genInnerPICAbortTrampoline(trampolineNamenumRegArgs("cePICAbort", numArgs)); } /* StackToRegisterMappingCogit>>#genPICMissTrampolineFor: */ @@ -22024,9 +22058,7 @@ opcodeIndex = 0; genPushRegisterArgsForNumArgsscratchReg(backEnd, numArgs, SendNumArgsReg); - genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceCPICMissreceiver, trampolineNamenumArgs("cePICMiss", (numArgs <= 2 - ? numArgs - : -1)), 2, ClassReg, ReceiverResultReg, null, null, 0, 1, null, 1); + genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceCPICMissreceiver, trampolineNamenumRegArgs("cePICMiss", numArgs), 2, ClassReg, ReceiverResultReg, null, null, 0, 1, null, 1); return startAddress; } Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Tue Jun 2 11:10:08 PDT 2015 + Wed Jun 3 08:59:25 PDT 2015 Modified: branches/Cog/spursistasrc/vm/cogit.h =================================================================== --- branches/Cog/spursistasrc/vm/cogit.h 2015-06-02 18:10:30 UTC (rev 3366) +++ branches/Cog/spursistasrc/vm/cogit.h 2015-06-03 16:00:39 UTC (rev 3367) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 + CCodeGenerator VMMaker.oscog-eem.1333 uuid: bc9001c2-8816-4b4e-bf91-8e11cad6ed6b */ Modified: branches/Cog/spursistasrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/spursistasrc/vm/cogitARMv5.c 2015-06-02 18:10:30 UTC (rev 3366) +++ branches/Cog/spursistasrc/vm/cogitARMv5.c 2015-06-03 16:00:39 UTC (rev 3367) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 + CCodeGenerator VMMaker.oscog-eem.1333 uuid: bc9001c2-8816-4b4e-bf91-8e11cad6ed6b from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1333 uuid: bc9001c2-8816-4b4e-bf91-8e11cad6ed6b */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1333 uuid: bc9001c2-8816-4b4e-bf91-8e11cad6ed6b " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -754,7 +754,8 @@ void setSelectorOfto(CogMethod *cogMethod, sqInt aSelectorOop); static sqInt spanForCleanBlockStartingAt(sqInt startPC) NoDbgRegParms; sqInt traceLinkedSendOffset(void); -static char * trampolineNamenumArgs(char *routinePrefix, sqInt numArgs) NoDbgRegParms; +static char * trampolineNamenumArgs(sqInt routinePrefix, sqInt numArgs) NoDbgRegParms; +static char * trampolineNamenumRegArgs(sqInt routinePrefix, sqInt numArgs) NoDbgRegParms; static sqInt unimplementedPrimitive(void); static sqInt unknownBytecode(void); void unlinkAllSends(void); @@ -9822,7 +9823,7 @@ { sqInt classIndex; sqInt i; - usqInt pc; + sqInt pc; pc = (((((usqInt)cPIC)) + firstCPICCaseOffset) + cPICCaseSize) - (jumpLongConditionalByteSize(backEnd)); for (i = 2; i <= ((cPIC->cPICNumCases)); i += 1) { @@ -13734,18 +13735,31 @@ return (cmNoCheckEntryOffset + (callInstructionByteSize(backEnd))) + (pushLinkRegisterByteSize(backEnd)); } + /* Cogit>>#trampolineName:numArgs: */ +static char * +trampolineNamenumArgs(sqInt routinePrefix, sqInt numArgs) +{ + char *theString; -/* Malloc a string with the contents for the trampoline table */ + /* begin trampolineName:numArgs:limit: */ + ; + theString = malloc((strlen(((char *) routinePrefix))) + 6); + sprintf(theString, "%s%cArgs", ((char *) routinePrefix), (numArgs <= (NumSendTrampolines - 2) + ? '0' + numArgs + : 'N')); + return theString; +} - /* Cogit>>#trampolineName:numArgs: */ + /* Cogit>>#trampolineName:numRegArgs: */ static char * -trampolineNamenumArgs(char *routinePrefix, sqInt numArgs) +trampolineNamenumRegArgs(sqInt routinePrefix, sqInt numArgs) { char *theString; - - theString = malloc((strlen(routinePrefix)) + 6); - sprintf(theString, "%s%cArgs", routinePrefix, (numArgs >= 0 + /* begin trampolineName:numArgs:limit: */ + ; + theString = malloc((strlen(((char *) routinePrefix))) + 6); + sprintf(theString, "%s%cArgs", ((char *) routinePrefix), (numArgs <= 2 ? '0' + numArgs : 'N')); return theString; @@ -23513,7 +23527,7 @@ enilopmart = methodZoneBase; methodZoneBase = alignUptoRoutineBoundary(endAddress); nopsFromto(backEnd, endAddress, methodZoneBase - 1); - recordGeneratedRunTimeaddress(trampolineNamenumArgs("ceCallPIC", numArgs), enilopmart); + recordGeneratedRunTimeaddress(trampolineNamenumRegArgs("ceCallPIC", numArgs), enilopmart); return ((void (*)(void)) enilopmart); } @@ -23910,7 +23924,6 @@ Read the class-side method trampolines for documentation on the various trampolines */ -/* Slang needs these apparently superfluous asSymbol sends. */ /* StackToRegisterMappingCogit>>#generateMissAbortTrampolines */ static void @@ -23941,24 +23954,27 @@ { sqInt numArgs; - for (numArgs = 0; numArgs <= (NumSendTrampolines - 2); numArgs += 1) { - ordinarySendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargargarg(ceSendsupertonumArgs, numArgs, trampolineNamenumArgs("ceSend", numArgs), ClassReg, 0, ReceiverResultReg, numArgs)); + for (numArgs = 0; numArgs < NumSendTrampolines; numArgs += 1) { + ordinarySendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargargarg(ceSendsupertonumArgs, numArgs, trampolineNamenumArgs("ceSend", numArgs), ClassReg, 0, ReceiverResultReg, (numArgs <= (NumSendTrampolines - 2) + ? numArgs + : SendNumArgsReg))); } - ordinarySendTrampolines[NumSendTrampolines - 1] = (genSendTrampolineFornumArgscalledargargargarg(ceSendsupertonumArgs, 2 + 1, trampolineNamenumArgs("ceSend", -1), ClassReg, 0, ReceiverResultReg, SendNumArgsReg)); # if BytecodeSetHasDirectedSuperSend - for (numArgs = 0; numArgs <= (NumSendTrampolines - 2); numArgs += 1) { - directedSuperSendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargargarg(ceSendabovetonumArgs, numArgs, trampolineNamenumArgs("ceDirectedSuperSend", numArgs), ClassReg, TempReg, ReceiverResultReg, numArgs)); + for (numArgs = 0; numArgs < NumSendTrampolines; numArgs += 1) { + directedSuperSendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargargarg(ceSendabovetonumArgs, numArgs, trampolineNamenumArgs("ceDirectedSuperSend", numArgs), ClassReg, TempReg, ReceiverResultReg, (numArgs <= (NumSendTrampolines - 2) + ? numArgs + : SendNumArgsReg))); } - directedSuperSendTrampolines[NumSendTrampolines - 1] = (genSendTrampolineFornumArgscalledargargargarg(ceSendabovetonumArgs, 2 + 1, trampolineNamenumArgs("ceDirectedSuperSend", -1), ClassReg, TempReg, ReceiverResultReg, SendNumArgsReg)); # endif /* BytecodeSetHasDirectedSuperSend */ - for (numArgs = 0; numArgs <= (NumSendTrampolines - 2); numArgs += 1) { - superSendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargargarg(ceSendsupertonumArgs, numArgs, trampolineNamenumArgs("ceSuperSend", numArgs), ClassReg, 1, ReceiverResultReg, numArgs)); + for (numArgs = 0; numArgs < NumSendTrampolines; numArgs += 1) { + superSendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargargarg(ceSendsupertonumArgs, numArgs, trampolineNamenumArgs("ceSuperSend", numArgs), ClassReg, 1, ReceiverResultReg, (numArgs <= (NumSendTrampolines - 2) + ? numArgs + : SendNumArgsReg))); } - superSendTrampolines[NumSendTrampolines - 1] = (genSendTrampolineFornumArgscalledargargargarg(ceSendsupertonumArgs, 2 + 1, trampolineNamenumArgs("ceSuperSend", -1), ClassReg, 1, ReceiverResultReg, SendNumArgsReg)); firstSend = ordinarySendTrampolines[0]; lastSend = superSendTrampolines[NumSendTrampolines - 1]; } @@ -24103,9 +24119,7 @@ compileTrampolineFornumArgsargargargargsaveRegspushLinkRegresultReg(ceStackOverflow, 1, SendNumArgsReg, null, null, null, 0, 0, null); jmpTarget(jumpSICMiss, gLabel()); genPushRegisterArgsForAbortMissNumArgs(backEnd, numArgs); - return genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceSICMiss, trampolineNamenumArgs("ceMethodAbort", (numArgs <= 2 - ? numArgs - : -1)), 1, ReceiverResultReg, null, null, null, 0, 0, null, 1); + return genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceSICMiss, trampolineNamenumRegArgs("ceMethodAbort", numArgs), 1, ReceiverResultReg, null, null, null, 0, 0, null, 1); } @@ -24136,9 +24150,7 @@ { opcodeIndex = 0; genPushRegisterArgsForAbortMissNumArgs(backEnd, numArgs); - return genInnerPICAbortTrampoline(trampolineNamenumArgs("cePICAbort", (numArgs <= 2 - ? numArgs - : -1))); + return genInnerPICAbortTrampoline(trampolineNamenumRegArgs("cePICAbort", numArgs)); } /* StackToRegisterMappingCogit>>#genPICMissTrampolineFor: */ @@ -24153,9 +24165,7 @@ opcodeIndex = 0; genPushRegisterArgsForNumArgsscratchReg(backEnd, numArgs, SendNumArgsReg); - genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceCPICMissreceiver, trampolineNamenumArgs("cePICMiss", (numArgs <= 2 - ? numArgs - : -1)), 2, ClassReg, ReceiverResultReg, null, null, 0, 1, null, 1); + genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceCPICMissreceiver, trampolineNamenumRegArgs("cePICMiss", numArgs), 2, ClassReg, ReceiverResultReg, null, null, 0, 1, null, 1); return startAddress; } Modified: branches/Cog/spursistasrc/vm/cogitIA32.c =================================================================== --- branches/Cog/spursistasrc/vm/cogitIA32.c 2015-06-02 18:10:30 UTC (rev 3366) +++ branches/Cog/spursistasrc/vm/cogitIA32.c 2015-06-03 16:00:39 UTC (rev 3367) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 + CCodeGenerator VMMaker.oscog-eem.1333 uuid: bc9001c2-8816-4b4e-bf91-8e11cad6ed6b from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1333 uuid: bc9001c2-8816-4b4e-bf91-8e11cad6ed6b */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1333 uuid: bc9001c2-8816-4b4e-bf91-8e11cad6ed6b " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -698,7 +698,8 @@ void setSelectorOfto(CogMethod *cogMethod, sqInt aSelectorOop); static sqInt spanForCleanBlockStartingAt(sqInt startPC) NoDbgRegParms; sqInt traceLinkedSendOffset(void); -static char * trampolineNamenumArgs(char *routinePrefix, sqInt numArgs) NoDbgRegParms; +static char * trampolineNamenumArgs(sqInt routinePrefix, sqInt numArgs) NoDbgRegParms; +static char * trampolineNamenumRegArgs(sqInt routinePrefix, sqInt numArgs) NoDbgRegParms; static sqInt unimplementedPrimitive(void); static sqInt unknownBytecode(void); void unlinkAllSends(void); @@ -12511,18 +12512,31 @@ return (cmNoCheckEntryOffset + (callInstructionByteSize(backEnd))) + (0); } + /* Cogit>>#trampolineName:numArgs: */ +static char * +trampolineNamenumArgs(sqInt routinePrefix, sqInt numArgs) +{ + char *theString; -/* Malloc a string with the contents for the trampoline table */ + /* begin trampolineName:numArgs:limit: */ + ; + theString = malloc((strlen(((char *) routinePrefix))) + 6); + sprintf(theString, "%s%cArgs", ((char *) routinePrefix), (numArgs <= (NumSendTrampolines - 2) + ? '0' + numArgs + : 'N')); + return theString; +} - /* Cogit>>#trampolineName:numArgs: */ + /* Cogit>>#trampolineName:numRegArgs: */ static char * -trampolineNamenumArgs(char *routinePrefix, sqInt numArgs) +trampolineNamenumRegArgs(sqInt routinePrefix, sqInt numArgs) { char *theString; - - theString = malloc((strlen(routinePrefix)) + 6); - sprintf(theString, "%s%cArgs", routinePrefix, (numArgs >= 0 + /* begin trampolineName:numArgs:limit: */ + ; + theString = malloc((strlen(((char *) routinePrefix))) + 6); + sprintf(theString, "%s%cArgs", ((char *) routinePrefix), (numArgs <= 2 ? '0' + numArgs : 'N')); return theString; @@ -22270,7 +22284,7 @@ enilopmart = methodZoneBase; methodZoneBase = alignUptoRoutineBoundary(endAddress); nopsFromto(backEnd, endAddress, methodZoneBase - 1); - recordGeneratedRunTimeaddress(trampolineNamenumArgs("ceCallPIC", numArgs), enilopmart); + recordGeneratedRunTimeaddress(trampolineNamenumRegArgs("ceCallPIC", numArgs), enilopmart); return ((void (*)(void)) enilopmart); } @@ -22666,7 +22680,6 @@ Read the class-side method trampolines for documentation on the various trampolines */ -/* Slang needs these apparently superfluous asSymbol sends. */ /* StackToRegisterMappingCogit>>#generateMissAbortTrampolines */ static void @@ -22697,24 +22710,27 @@ { sqInt numArgs; - for (numArgs = 0; numArgs <= (NumSendTrampolines - 2); numArgs += 1) { - ordinarySendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargargarg(ceSendsupertonumArgs, numArgs, trampolineNamenumArgs("ceSend", numArgs), ClassReg, 0, ReceiverResultReg, numArgs)); + for (numArgs = 0; numArgs < NumSendTrampolines; numArgs += 1) { + ordinarySendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargargarg(ceSendsupertonumArgs, numArgs, trampolineNamenumArgs("ceSend", numArgs), ClassReg, 0, ReceiverResultReg, (numArgs <= (NumSendTrampolines - 2) + ? numArgs + : SendNumArgsReg))); } - ordinarySendTrampolines[NumSendTrampolines - 1] = (genSendTrampolineFornumArgscalledargargargarg(ceSendsupertonumArgs, 2 + 1, trampolineNamenumArgs("ceSend", -1), ClassReg, 0, ReceiverResultReg, SendNumArgsReg)); # if BytecodeSetHasDirectedSuperSend - for (numArgs = 0; numArgs <= (NumSendTrampolines - 2); numArgs += 1) { - directedSuperSendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargargarg(ceSendabovetonumArgs, numArgs, trampolineNamenumArgs("ceDirectedSuperSend", numArgs), ClassReg, TempReg, ReceiverResultReg, numArgs)); + for (numArgs = 0; numArgs < NumSendTrampolines; numArgs += 1) { + directedSuperSendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargargarg(ceSendabovetonumArgs, numArgs, trampolineNamenumArgs("ceDirectedSuperSend", numArgs), ClassReg, TempReg, ReceiverResultReg, (numArgs <= (NumSendTrampolines - 2) + ? numArgs + : SendNumArgsReg))); } - directedSuperSendTrampolines[NumSendTrampolines - 1] = (genSendTrampolineFornumArgscalledargargargarg(ceSendabovetonumArgs, 2 + 1, trampolineNamenumArgs("ceDirectedSuperSend", -1), ClassReg, TempReg, ReceiverResultReg, SendNumArgsReg)); # endif /* BytecodeSetHasDirectedSuperSend */ - for (numArgs = 0; numArgs <= (NumSendTrampolines - 2); numArgs += 1) { - superSendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargargarg(ceSendsupertonumArgs, numArgs, trampolineNamenumArgs("ceSuperSend", numArgs), ClassReg, 1, ReceiverResultReg, numArgs)); + for (numArgs = 0; numArgs < NumSendTrampolines; numArgs += 1) { + superSendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargargarg(ceSendsupertonumArgs, numArgs, trampolineNamenumArgs("ceSuperSend", numArgs), ClassReg, 1, ReceiverResultReg, (numArgs <= (NumSendTrampolines - 2) + ? numArgs + : SendNumArgsReg))); } - superSendTrampolines[NumSendTrampolines - 1] = (genSendTrampolineFornumArgscalledargargargarg(ceSendsupertonumArgs, 2 + 1, trampolineNamenumArgs("ceSuperSend", -1), ClassReg, 1, ReceiverResultReg, SendNumArgsReg)); firstSend = ordinarySendTrampolines[0]; lastSend = superSendTrampolines[NumSendTrampolines - 1]; } @@ -22857,9 +22873,7 @@ compileTrampolineFornumArgsargargargargsaveRegspushLinkRegresultReg(ceStackOverflow, 1, SendNumArgsReg, null, null, null, 0, 0, null); jmpTarget(jumpSICMiss, gLabel()); genPushRegisterArgsForAbortMissNumArgs(backEnd, numArgs); - return genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceSICMiss, trampolineNamenumArgs("ceMethodAbort", (numArgs <= 2 - ? numArgs - : -1)), 1, ReceiverResultReg, null, null, null, 0, 0, null, 1); + return genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceSICMiss, trampolineNamenumRegArgs("ceMethodAbort", numArgs), 1, ReceiverResultReg, null, null, null, 0, 0, null, 1); } @@ -22890,9 +22904,7 @@ { opcodeIndex = 0; genPushRegisterArgsForAbortMissNumArgs(backEnd, numArgs); - return genInnerPICAbortTrampoline(trampolineNamenumArgs("cePICAbort", (numArgs <= 2 - ? numArgs - : -1))); + return genInnerPICAbortTrampoline(trampolineNamenumRegArgs("cePICAbort", numArgs)); } /* StackToRegisterMappingCogit>>#genPICMissTrampolineFor: */ @@ -22907,9 +22919,7 @@ opcodeIndex = 0; genPushRegisterArgsForNumArgsscratchReg(backEnd, numArgs, SendNumArgsReg); - genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceCPICMissreceiver, trampolineNamenumArgs("cePICMiss", (numArgs <= 2 - ? numArgs - : -1)), 2, ClassReg, ReceiverResultReg, null, null, 0, 1, null, 1); + genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceCPICMissreceiver, trampolineNamenumRegArgs("cePICMiss", numArgs), 2, ClassReg, ReceiverResultReg, null, null, 0, 1, null, 1); return startAddress; } Modified: branches/Cog/spursrc/vm/cogit.h =================================================================== --- branches/Cog/spursrc/vm/cogit.h 2015-06-02 18:10:30 UTC (rev 3366) +++ branches/Cog/spursrc/vm/cogit.h 2015-06-03 16:00:39 UTC (rev 3367) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 + CCodeGenerator VMMaker.oscog-eem.1333 uuid: bc9001c2-8816-4b4e-bf91-8e11cad6ed6b */ Modified: branches/Cog/spursrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/spursrc/vm/cogitARMv5.c 2015-06-02 18:10:30 UTC (rev 3366) +++ branches/Cog/spursrc/vm/cogitARMv5.c 2015-06-03 16:00:39 UTC (rev 3367) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 + CCodeGenerator VMMaker.oscog-eem.1333 uuid: bc9001c2-8816-4b4e-bf91-8e11cad6ed6b from - StackToRegisterMappingCogit VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 + StackToRegisterMappingCogit VMMaker.oscog-eem.1333 uuid: bc9001c2-8816-4b4e-bf91-8e11cad6ed6b */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1333 uuid: bc9001c2-8816-4b4e-bf91-8e11cad6ed6b " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -749,7 +749,8 @@ void setSelectorOfto(CogMethod *cogMethod, sqInt aSelectorOop); static sqInt spanForCleanBlockStartingAt(sqInt startPC) NoDbgRegParms; sqInt traceLinkedSendOffset(void); -static char * trampolineNamenumArgs(char *routinePrefix, sqInt numArgs) NoDbgRegParms; +static char * trampolineNamenumArgs(sqInt routinePrefix, sqInt numArgs) NoDbgRegParms; +static char * trampolineNamenumRegArgs(sqInt routinePrefix, sqInt numArgs) NoDbgRegParms; static sqInt unimplementedPrimitive(void); static sqInt unknownBytecode(void); void unlinkAllSends(void); @@ -13370,18 +13371,31 @@ return (cmNoCheckEntryOffset + (callInstructionByteSize(backEnd))) + (pushLinkRegisterByteSize(backEnd)); } + /* Cogit>>#trampolineName:numArgs: */ +static char * +trampolineNamenumArgs(sqInt routinePrefix, sqInt numArgs) +{ + char *theString; -/* Malloc a string with the contents for the trampoline table */ + /* begin trampolineName:numArgs:limit: */ + ; + theString = malloc((strlen(((char *) routinePrefix))) + 6); + sprintf(theString, "%s%cArgs", ((char *) routinePrefix), (numArgs <= (NumSendTrampolines - 2) + ? '0' + numArgs + : 'N')); + return theString; +} - /* Cogit>>#trampolineName:numArgs: */ + /* Cogit>>#trampolineName:numRegArgs: */ static char * -trampolineNamenumArgs(char *routinePrefix, sqInt numArgs) +trampolineNamenumRegArgs(sqInt routinePrefix, sqInt numArgs) { char *theString; - - theString = malloc((strlen(routinePrefix)) + 6); - sprintf(theString, "%s%cArgs", routinePrefix, (numArgs >= 0 + /* begin trampolineName:numArgs:limit: */ + ; + theString = malloc((strlen(((char *) routinePrefix))) + 6); + sprintf(theString, "%s%cArgs", ((char *) routinePrefix), (numArgs <= 2 ? '0' + numArgs : 'N')); return theString; @@ -20346,7 +20360,7 @@ enilopmart = methodZoneBase; methodZoneBase = alignUptoRoutineBoundary(endAddress); nopsFromto(backEnd, endAddress, methodZoneBase - 1); - recordGeneratedRunTimeaddress(trampolineNamenumArgs("ceCallPIC", numArgs), enilopmart); + recordGeneratedRunTimeaddress(trampolineNamenumRegArgs("ceCallPIC", numArgs), enilopmart); return ((void (*)(void)) enilopmart); } @@ -20696,7 +20710,6 @@ Read the class-side method trampolines for documentation on the various trampolines */ -/* Slang needs these apparently superfluous asSymbol sends. */ /* StackToRegisterMappingCogit>>#generateMissAbortTrampolines */ static void @@ -20727,24 +20740,27 @@ { sqInt numArgs; - for (numArgs = 0; numArgs <= (NumSendTrampolines - 2); numArgs += 1) { - ordinarySendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargargarg(ceSendsupertonumArgs, numArgs, trampolineNamenumArgs("ceSend", numArgs), ClassReg, 0, ReceiverResultReg, numArgs)); + for (numArgs = 0; numArgs < NumSendTrampolines; numArgs += 1) { + ordinarySendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargargarg(ceSendsupertonumArgs, numArgs, trampolineNamenumArgs("ceSend", numArgs), ClassReg, 0, ReceiverResultReg, (numArgs <= (NumSendTrampolines - 2) + ? numArgs + : SendNumArgsReg))); } - ordinarySendTrampolines[NumSendTrampolines - 1] = (genSendTrampolineFornumArgscalledargargargarg(ceSendsupertonumArgs, 2 + 1, trampolineNamenumArgs("ceSend", -1), ClassReg, 0, ReceiverResultReg, SendNumArgsReg)); # if BytecodeSetHasDirectedSuperSend - for (numArgs = 0; numArgs <= (NumSendTrampolines - 2); numArgs += 1) { - directedSuperSendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargargarg(ceSendabovetonumArgs, numArgs, trampolineNamenumArgs("ceDirectedSuperSend", numArgs), ClassReg, TempReg, ReceiverResultReg, numArgs)); + for (numArgs = 0; numArgs < NumSendTrampolines; numArgs += 1) { + directedSuperSendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargargarg(ceSendabovetonumArgs, numArgs, trampolineNamenumArgs("ceDirectedSuperSend", numArgs), ClassReg, TempReg, ReceiverResultReg, (numArgs <= (NumSendTrampolines - 2) + ? numArgs + : SendNumArgsReg))); } - directedSuperSendTrampolines[NumSendTrampolines - 1] = (genSendTrampolineFornumArgscalledargargargarg(ceSendabovetonumArgs, 2 + 1, trampolineNamenumArgs("ceDirectedSuperSend", -1), ClassReg, TempReg, ReceiverResultReg, SendNumArgsReg)); # endif /* BytecodeSetHasDirectedSuperSend */ - for (numArgs = 0; numArgs <= (NumSendTrampolines - 2); numArgs += 1) { - superSendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargargarg(ceSendsupertonumArgs, numArgs, trampolineNamenumArgs("ceSuperSend", numArgs), ClassReg, 1, ReceiverResultReg, numArgs)); + for (numArgs = 0; numArgs < NumSendTrampolines; numArgs += 1) { + superSendTrampolines[numArgs] = (genSendTrampolineFornumArgscalledargargargarg(ceSendsupertonumArgs, numArgs, trampolineNamenumArgs("ceSuperSend", numArgs), ClassReg, 1, ReceiverResultReg, (numArgs <= (NumSendTrampolines - 2) + ? numArgs + : SendNumArgsReg))); } - superSendTrampolines[NumSendTrampolines - 1] = (genSendTrampolineFornumArgscalledargargargarg(ceSendsupertonumArgs, 2 + 1, trampolineNamenumArgs("ceSuperSend", -1), ClassReg, 1, ReceiverResultReg, SendNumArgsReg)); firstSend = ordinarySendTrampolines[0]; lastSend = superSendTrampolines[NumSendTrampolines - 1]; } @@ -20961,9 +20977,7 @@ compileTrampolineFornumArgsargargargargsaveRegspushLinkRegresultReg(ceStackOverflow, 1, SendNumArgsReg, null, null, null, 0, 0, null); jmpTarget(jumpSICMiss, gLabel()); genPushRegisterArgsForAbortMissNumArgs(backEnd, numArgs); - return genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceSICMiss, trampolineNamenumArgs("ceMethodAbort", (numArgs <= 2 - ? numArgs - : -1)), 1, ReceiverResultReg, null, null, null, 0, 0, null, 1); + return genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceSICMiss, trampolineNamenumRegArgs("ceMethodAbort", numArgs), 1, ReceiverResultReg, null, null, null, 0, 0, null, 1); } @@ -20994,9 +21008,7 @@ { opcodeIndex = 0; genPushRegisterArgsForAbortMissNumArgs(backEnd, numArgs); - return genInnerPICAbortTrampoline(trampolineNamenumArgs("cePICAbort", (numArgs <= 2 - ? numArgs - : -1))); + return genInnerPICAbortTrampoline(trampolineNamenumRegArgs("cePICAbort", numArgs)); } /* StackToRegisterMappingCogit>>#genPICMissTrampolineFor: */ @@ -21011,9 +21023,7 @@ opcodeIndex = 0; genPushRegisterArgsForNumArgsscratchReg(backEnd, numArgs, SendNumArgsReg); - genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceCPICMissreceiver, trampolineNamenumArgs("cePICMiss", (numArgs <= 2 - ? numArgs - : -1)), 2, ClassReg, ReceiverResultReg, null, null, 0, 1, null, 1); + genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceCPICMissreceiver, trampolineNamenumRegArgs("cePICMiss", numArgs), 2, ClassReg, ReceiverResultReg, null, null, 0, 1, null, 1); return startAddress; } Modified: branches/Cog/spursrc/vm/cogitIA32.c =================================================================== --- branches/Cog/spursrc/vm/cogitIA32.c 2015-06-02 18:10:30 UTC (rev 3366) +++ branches/Cog/spursrc/vm/cogitIA32.c 2015-06-03 16:00:39 UTC (rev 3367) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 + CCodeGenerator VMMaker.oscog-eem.1333 uuid: bc9001c2-8816-4b4e-bf91-8e11cad6ed6b from @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.1333.mcz
by commits＠source.squeak.org 03 Jun '15

03 Jun '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1333.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1333 Author: eem Time: 3 June 2015, 8:51:47.115 am UUID: bc9001c2-8816-4b4e-bf91-8e11cad6ed6b Ancestors: VMMaker.oscog-eem.1332 Cogit: Fix assert-fails with absent receiver sends in Newspeak. Have the implicit and outer send lookup trampolines set the stacked receiver (when there is one) when setting the implciit receiver. Streamline send trampoline creation by refactoring trampoline name generation so that the two limits, NumSendTrampolines - 2 and numRegArgs are treated separately, and numArgsOrSendNumArgsReg: answers the relevant numArgs argument. This should clear up confusion between numRegArgs (which can be 0, 1 & 2) and NumSendTrampolines - 2, which is always 2. =============== Diff against VMMaker.oscog-eem.1332 =============== Item was changed: ----- Method: Cogit>>genNSSendTrampolineFor:numArgs:called: (in category 'initialization') ----- genNSSendTrampolineFor: aRoutine numArgs: numArgs called: aString "ReceiverResultReg: method receiver SendNumArgsReg: the NSSendCache cache" <option: #NewspeakVM> <var: #aRoutine type: #'void *'> <var: #aString type: #'char *'> | jumpMiss jumpItsTheReceiverStupid | <var: #jumpMiss type: #'AbstractInstruction *'> <var: #jumpItsTheReceiverStupid type: #'AbstractInstruction *'> opcodeIndex := 0. objectRepresentation genGetInlineCacheClassTagFrom: ReceiverResultReg into: ClassReg forEntry: false. self MoveMw: NSCClassTagIndex * objectMemory wordSize r: SendNumArgsReg R: TempReg. self CmpR: ClassReg R: TempReg. jumpMiss := self JumpNonZero: 0. self MoveMw: NSCEnclosingObjectIndex * objectMemory wordSize r: SendNumArgsReg R: TempReg. self CmpCq: 0 R: TempReg. jumpItsTheReceiverStupid := self JumpZero: 0. self MoveR: TempReg R: ReceiverResultReg. + "Now set the stacked receiver, if needed. If there are reg args this is + not required; see genPushRegisterArgsForNumArgs:numArgs: below." + (self numRegArgs = 0 or: [numArgs > self numRegArgs]) ifTrue: + [numArgs >= (NumSendTrampolines - 1) + ifTrue: "arbitrary argument count" + [self MoveMw: NSCNumArgsIndex * objectMemory wordSize r: SendNumArgsReg R: TempReg. + backEnd hasLinkRegister ifFalse: + [self AddCq: 1 R: TempReg].. + self MoveR: ReceiverResultReg Xwr: TempReg R: SPReg] + ifFalse: "Known argument count" + [self MoveR: TempReg Mw: (backEnd hasLinkRegister ifTrue: [0] ifFalse: [1]) + numArgs * objectMemory wordSize r: SPReg]]. - "We don't patch stack(-numArgs). See comment in ceImplicitReceiverSend:receiver:" jumpItsTheReceiverStupid jmpTarget: self Label. self MoveMw: NSCTargetIndex * objectMemory wordSize r: SendNumArgsReg R: TempReg. self JumpR: TempReg. jumpMiss jmpTarget: self Label. objectRepresentation genEnsureObjInRegNotForwarded: ReceiverResultReg scratchReg: TempReg updatingMw: FoxMFReceiver r: FPReg. self numRegArgs > 0 ifTrue: [backEnd genPushRegisterArgsForNumArgs: numArgs scratchReg: TempReg]. ^self genTrampolineFor: aRoutine called: aString numArgs: 2 arg: SendNumArgsReg "The NSSendCache" arg: ReceiverResultReg arg: nil arg: nil saveRegs: false pushLinkReg: true resultReg: ReceiverResultReg "Never happens?" appendOpcodes: true! Item was changed: ----- Method: Cogit>>generateNewspeakSendTrampolines (in category 'initialization') ----- generateNewspeakSendTrampolines "Self send, dynamic super send, implicit receiver send, and outer send" <option: #NewspeakVM> + 0 to: NumSendTrampolines - 1 do: - 0 to: NumSendTrampolines - 2 do: [:numArgs| selfSendTrampolines at: numArgs put: (self genTrampolineFor: #ceSelfSend:to:numArgs: called: (self trampolineName: 'ceSelfSend' numArgs: numArgs) arg: ClassReg arg: ReceiverResultReg + arg: (self numArgsOrSendNumArgsReg: numArgs))]. - arg: numArgs)]. - selfSendTrampolines - at: NumSendTrampolines - 1 - put: (self genTrampolineFor: #ceSelfSend:to:numArgs: - called: (self trampolineName: 'ceSelfSend' numArgs: -1) - arg: ClassReg - arg: ReceiverResultReg - arg: SendNumArgsReg). + 0 to: NumSendTrampolines - 1 do: - 0 to: NumSendTrampolines - 2 do: [:numArgs| dynamicSuperSendTrampolines at: numArgs put: (self genTrampolineFor: #ceDynamicSuperSend:to:numArgs: called: (self trampolineName: 'ceDynSuperSend' numArgs: numArgs) arg: ClassReg arg: ReceiverResultReg + arg: (self numArgsOrSendNumArgsReg: numArgs))]. - arg: numArgs)]. - dynamicSuperSendTrampolines - at: NumSendTrampolines - 1 - put: (self genTrampolineFor: #ceDynamicSuperSend:to:numArgs: - called: (self trampolineName: 'ceDynSuperSend' numArgs: -1) - arg: ClassReg - arg: ReceiverResultReg - arg: SendNumArgsReg). + 0 to: NumSendTrampolines - 1 do: - 0 to: NumSendTrampolines - 2 do: [:numArgs| implicitReceiverSendTrampolines at: numArgs put: (self genNSSendTrampolineFor: #ceImplicitReceiverSend:receiver: numArgs: numArgs called: (self trampolineName: 'ceImplicitReceiverSend' numArgs: numArgs))]. - implicitReceiverSendTrampolines - at: NumSendTrampolines - 1 - put: (self - genNSSendTrampolineFor: #ceImplicitReceiverSend:receiver: - numArgs: self numRegArgs + 1 - called: (self trampolineName: 'ceImplicitReceiverSend' numArgs: -1)). + 0 to: NumSendTrampolines - 1 do: - 0 to: NumSendTrampolines - 2 do: [:numArgs| outerSendTrampolines at: numArgs put: (self genNSSendTrampolineFor: #ceOuterSend:receiver: numArgs: numArgs called: (self trampolineName: 'ceOuterSend' numArgs: numArgs))]. - outerSendTrampolines - at: NumSendTrampolines - 1 - put: (self - genNSSendTrampolineFor: #ceOuterSend:receiver: - numArgs: self numRegArgs + 1 - called: (self trampolineName: 'ceOuterSend' numArgs: -1)). ! Item was changed: ----- Method: Cogit>>generateSendTrampolines (in category 'initialization') ----- generateSendTrampolines + 0 to: NumSendTrampolines - 1 do: - 0 to: NumSendTrampolines - 2 do: [:numArgs| ordinarySendTrampolines at: numArgs put: (self genTrampolineFor: #ceSend:super:to:numArgs: called: (self trampolineName: 'ceSend' numArgs: numArgs) arg: ClassReg arg: 0 arg: ReceiverResultReg + arg: (self numArgsOrSendNumArgsReg: numArgs))]. - arg: numArgs)]. - ordinarySendTrampolines - at: NumSendTrampolines - 1 - put: (self genTrampolineFor: #ceSend:super:to:numArgs: - called: (self trampolineName: 'ceSend' numArgs: -1) - arg: ClassReg - arg: 0 - arg: ReceiverResultReg - arg: SendNumArgsReg). "Generate these in the middle so they are within [firstSend, lastSend]." self cppIf: NewspeakVM ifTrue: [self generateNewspeakSendTrampolines]. self cppIf: BytecodeSetHasDirectedSuperSend ifTrue: + [0 to: NumSendTrampolines - 1 do: - [0 to: NumSendTrampolines - 2 do: [:numArgs| directedSuperSendTrampolines at: numArgs put: (self genTrampolineFor: #ceSend:above:to:numArgs: called: (self trampolineName: 'ceDirectedSuperSend' numArgs: numArgs) arg: ClassReg arg: TempReg arg: ReceiverResultReg + arg: (self numArgsOrSendNumArgsReg: numArgs))]]. - arg: numArgs)]. - directedSuperSendTrampolines - at: NumSendTrampolines - 1 - put: (self genTrampolineFor: #ceSend:above:to:numArgs: - called: (self trampolineName: 'ceDirectedSuperSend' numArgs: -1) - arg: ClassReg - arg: TempReg - arg: ReceiverResultReg - arg: SendNumArgsReg)]. + 0 to: NumSendTrampolines - 1 do: - 0 to: NumSendTrampolines - 2 do: [:numArgs| superSendTrampolines at: numArgs put: (self genTrampolineFor: #ceSend:super:to:numArgs: called: (self trampolineName: 'ceSuperSend' numArgs: numArgs) arg: ClassReg arg: 1 arg: ReceiverResultReg + arg: (self numArgsOrSendNumArgsReg: numArgs))]. - arg: numArgs)]. - superSendTrampolines - at: NumSendTrampolines - 1 - put: (self genTrampolineFor: #ceSend:super:to:numArgs: - called: (self trampolineName: 'ceSuperSend' numArgs: -1) - arg: ClassReg - arg: 1 - arg: ReceiverResultReg - arg: SendNumArgsReg). firstSend := ordinarySendTrampolines at: 0. lastSend := superSendTrampolines at: NumSendTrampolines - 1! Item was added: + ----- Method: Cogit>>numArgsOrSendNumArgsReg: (in category 'initialization') ----- + numArgsOrSendNumArgsReg: numArgs + "The send trampolines have different versions for different arg counts, with special + cases for 0 through NumSendTrampolines - 2, and a general case for more, passing + the arg count in SendNumArgsReg. This computes the relevant argument." + <inline: true> + ^numArgs <= (NumSendTrampolines - 2) ifTrue: [numArgs] ifFalse: [SendNumArgsReg]! Item was changed: ----- Method: Cogit>>trampolineName:numArgs: (in category 'initialization') ----- trampolineName: routinePrefix numArgs: numArgs + ^self trampolineName: routinePrefix numArgs: numArgs limit: NumSendTrampolines - 2! - "Malloc a string with the contents for the trampoline table" - <returnTypeC: #'char *'> - <var: #routinePrefix type: #'char *'> - | theString | - <var: #theString type: #'char *'> - self cCode: '' inSmalltalk: - [^routinePrefix, (numArgs >= 0 ifTrue: [numArgs printString] ifFalse: ['N']), 'Args']. - theString := self malloc: (self strlen: routinePrefix) + 6. - self s: theString pr: '%s%cArgs' in: routinePrefix tf: (numArgs >= 0 ifTrue: [$0 + numArgs] ifFalse: [$N]). - ^theString! Item was added: + ----- Method: Cogit>>trampolineName:numArgs:limit: (in category 'initialization') ----- + trampolineName: routinePrefix numArgs: numArgs limit: argsLimit + "Malloc a string with the contents for the trampoline table" + <inline: true> + <returnTypeC: #'char *'> + <var: #routinePrefix type: #'char *'> + | theString | + <var: #theString type: #'char *'> + self cCode: '' inSmalltalk: + [^routinePrefix, (numArgs <= argsLimit ifTrue: [numArgs printString] ifFalse: ['N']), 'Args']. + theString := self malloc: (self strlen: routinePrefix) + 6. + self s: theString pr: '%s%cArgs' in: routinePrefix tf: (numArgs <= argsLimit ifTrue: [$0 + numArgs] ifFalse: [$N]). + ^theString! Item was added: + ----- Method: Cogit>>trampolineName:numRegArgs: (in category 'initialization') ----- + trampolineName: routinePrefix numRegArgs: numArgs + ^self trampolineName: routinePrefix numArgs: numArgs limit: self numRegArgs! Item was changed: ----- Method: SimpleStackBasedCogit>>genSendAbsentImplicitOrOuter:numArgs:depth:sendTable: (in category 'bytecode generators') ----- genSendAbsentImplicitOrOuter: selector numArgs: numArgs depth: depth sendTable: sendTable <var: #sendTable type: #'sqInt *'> | nsSendCache | (objectMemory isYoung: selector) ifTrue: [hasYoungReferent := true]. nsSendCache := theIRCs + (NumOopsPerNSC * objectMemory bytesPerOop * indexOfIRC). indexOfIRC := indexOfIRC + 1. self assert: (objectMemory isInOldSpace: nsSendCache). self initializeNSSendCache: nsSendCache selector: selector numArgs: numArgs depth: depth. + "This leaves the method receiver on the stack, which might not be the implicit receiver. + But the lookup trampoline will establish the on-stack receiver once it locates it." - "This leaves the method receiver on the stack, which might not be the implicit receiver. But we care - not: the callee will use ReceiverResultReg to build its frame, not the value beneath the arguments." self marshallAbsentReceiverSendArguments: numArgs. "Load the cache last so it is a fixed distance from the call." self MoveCw: nsSendCache R: SendNumArgsReg. self CallNewspeakSend: (sendTable at: (numArgs min: NumSendTrampolines - 1)). self PushR: ReceiverResultReg. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genCallPICEnilopmartNumArgs: (in category 'initialization') ----- genCallPICEnilopmartNumArgs: numArgs "Generate special versions of the ceCallCogCodePopReceiverAndClassRegs enilopmart that also pop register args from the stack to undo the pushing of register args in the abort/miss trampolines." <returnTypeC: 'void (*genCallPICEnilopmartNumArgs(sqInt numArgs))(void)'> | size endAddress enilopmart | opcodeIndex := 0. backEnd maybeEstablishVarBase. "Must happen first; value may be used in genLoadStackPointers" backEnd genLoadStackPointers. self PopR: ClassReg. "cacheTag" self PopR: TempReg. "entry-point" self PopR: (backEnd hasLinkRegister ifTrue: [LinkReg] ifFalse: [SendNumArgsReg]). "retpc" numArgs > 0 ifTrue: [numArgs > 1 ifTrue: [self PopR: Arg1Reg. self assert: self numRegArgs = 2]. self PopR: Arg0Reg]. self PopR: ReceiverResultReg. backEnd hasLinkRegister ifFalse: [self PushR: SendNumArgsReg]. "retpc" self JumpR: TempReg. self computeMaximumSizes. size := self generateInstructionsAt: methodZoneBase. endAddress := self outputInstructionsAt: methodZoneBase. self assert: methodZoneBase + size = endAddress. enilopmart := methodZoneBase. methodZoneBase := self alignUptoRoutineBoundary: endAddress. backEnd nopsFrom: endAddress to: methodZoneBase - 1. + self recordGeneratedRunTime: (self trampolineName: 'ceCallPIC' numRegArgs: numArgs) address: enilopmart. - self recordGeneratedRunTime: (self trampolineName: 'ceCallPIC' numArgs: numArgs) address: enilopmart. ^self cCoerceSimple: enilopmart to: #'void (*)(void)'! Item was changed: ----- Method: StackToRegisterMappingCogit>>genMethodAbortTrampolineFor: (in category 'initialization') ----- genMethodAbortTrampolineFor: numArgs "Generate the abort for a method. This abort performs either a call of ceSICMiss: to handle a single-in-line cache miss or a call of ceStackOverflow: to handle a stack overflow. It distinguishes the two by testing ResultReceiverReg. If the register is zero then this is a stack-overflow because a) the receiver has already been pushed and so can be set to zero before calling the abort, and b) the receiver must always contain an object (and hence be non-zero) on SIC miss." | jumpSICMiss | <var: #jumpSICMiss type: #'AbstractInstruction *'> opcodeIndex := 0. self CmpCq: 0 R: ReceiverResultReg. jumpSICMiss := self JumpNonZero: 0. "The abort sequence has pushed the LinkReg a second time - because a stack overflow can only happen after building a frame, which pushes LinkReg anyway, and we still need to push LinkReg in case we get to this routine from a sendMissAbort. (On ARM there is a simpler way; use two separate abort calls since all instructions are 32-bits but on x86 the zero receiver reg, call methodAbort sequence is smaller; we may fix this one day). Overwrite that duplicate with the right one - the return address for the call to the abort trampoline. The only reason it matters is an assert in ceStackOverflow: uses it" backEnd hasLinkRegister ifTrue: [self MoveR: LinkReg Mw: 0 r: SPReg]. self compileTrampolineFor: #ceStackOverflow: numArgs: 1 arg: SendNumArgsReg arg: nil arg: nil arg: nil saveRegs: false pushLinkReg: false "The LinkReg has already been set above." resultReg: nil. jumpSICMiss jmpTarget: self Label. backEnd genPushRegisterArgsForAbortMissNumArgs: numArgs. ^self genTrampolineFor: #ceSICMiss: + called: (self trampolineName: 'ceMethodAbort' numRegArgs: numArgs) - called: (self trampolineName: 'ceMethodAbort' numArgs: (numArgs <= self numRegArgs ifTrue: [numArgs] ifFalse: [-1])) numArgs: 1 arg: ReceiverResultReg arg: nil arg: nil arg: nil saveRegs: false pushLinkReg: false "The LinkReg will have been pushed in genPushRegisterArgsForAbortMissNumArgs: above." resultReg: nil appendOpcodes: true! Item was changed: ----- Method: StackToRegisterMappingCogit>>genPICAbortTrampolineFor: (in category 'initialization') ----- genPICAbortTrampolineFor: numArgs "Generate the abort for a PIC. This abort performs either a call of ceInterpretMethodFromPIC:receiver: to handle invoking an uncogged target or a call of ceMNUFromPICMNUMethod:receiver: to handle an MNU dispatch in a closed PIC. It distinguishes the two by testing ClassReg. If the register is zero then this is an MNU." opcodeIndex := 0. backEnd genPushRegisterArgsForAbortMissNumArgs: numArgs. + ^self genInnerPICAbortTrampoline: (self trampolineName: 'cePICAbort' numRegArgs: numArgs)! - ^self genInnerPICAbortTrampoline: (self trampolineName: 'cePICAbort' numArgs: (numArgs <= self numRegArgs ifTrue: [numArgs] ifFalse: [-1]))! Item was changed: ----- Method: StackToRegisterMappingCogit>>genPICMissTrampolineFor: (in category 'initialization') ----- genPICMissTrampolineFor: numArgs <inline: false> | startAddress | startAddress := methodZoneBase. opcodeIndex := 0. "N.B. a closed PIC jumps to the miss routine, not calls it, so there is only one retpc on the stack." backEnd genPushRegisterArgsForNumArgs: numArgs scratchReg: SendNumArgsReg. self genTrampolineFor: #ceCPICMiss:receiver: + called: (self trampolineName: 'cePICMiss' numRegArgs: numArgs) - called: (self trampolineName: 'cePICMiss' numArgs: (numArgs <= self numRegArgs ifTrue: [numArgs] ifFalse: [-1])) numArgs: 2 arg: ClassReg arg: ReceiverResultReg arg: nil arg: nil saveRegs: false pushLinkReg: true resultReg: nil appendOpcodes: true. ^startAddress! Item was changed: ----- Method: StackToRegisterMappingCogit>>genSendAbsentImplicitOrOuter:numArgs:depth:sendTable: (in category 'bytecode generators') ----- genSendAbsentImplicitOrOuter: selector numArgs: numArgs depth: depth sendTable: sendTable <var: #sendTable type: #'sqInt *'> | nsSendCache | (objectMemory isYoung: selector) ifTrue: [hasYoungReferent := true]. nsSendCache := theIRCs + (NumOopsPerNSC * objectMemory bytesPerOop * indexOfIRC). indexOfIRC := indexOfIRC + 1. self assert: (objectMemory isInOldSpace: nsSendCache). self initializeNSSendCache: nsSendCache selector: selector numArgs: numArgs depth: depth. self ssAllocateCallReg: SendNumArgsReg. + "This may leave the method receiver on the stack, which might not be the implicit receiver. + But the lookup trampoline will establish an on-stack receiver once it locates it." - "This leaves the method receiver on the stack, which might not be the implicit receiver. But we care - not: the callee will use ReceiverResultReg to build its frame, not the value beneath the arguments." self marshallAbsentReceiverSendArguments: numArgs. "Load the cache last so it is a fixed distance from the call." self MoveCw: nsSendCache R: SendNumArgsReg. self CallNewspeakSend: (sendTable at: (numArgs min: NumSendTrampolines - 1)). optStatus isReceiverResultRegLive: false. self ssPushRegister: ReceiverResultReg. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>generateMissAbortTrampolines (in category 'initialization') ----- generateMissAbortTrampolines "Generate the run-time entries for the various method and PIC entry misses and aborts. Read the class-side method trampolines for documentation on the various trampolines" - - "Slang needs these apparently superfluous asSymbol sends." 0 to: self numRegArgs + 1 do: [:numArgs| methodAbortTrampolines at: numArgs put: (self genMethodAbortTrampolineFor: numArgs)]. 0 to: self numRegArgs + 1 do: [:numArgs| picAbortTrampolines at: numArgs put: (self genPICAbortTrampolineFor: numArgs)]. 0 to: self numRegArgs + 1 do: [:numArgs| picMissTrampolines at: numArgs put: (self genPICMissTrampolineFor: numArgs)]! Item was changed: ----- Method: StackToRegisterMappingCogit>>generateNewspeakSendTrampolines (in category 'initialization') ----- generateNewspeakSendTrampolines + "Self send, dynamic super send, implicit receiver send, and outer send." - "Self send, dynamic super send, and implicit receiver send. TODO: outer send." "Override to generate code to push the register arg(s) for <= numRegArg arity sends." <option: #NewspeakVM> + 0 to: NumSendTrampolines - 1 do: - 0 to: NumSendTrampolines - 2 do: [:numArgs| selfSendTrampolines at: numArgs put: (self genSendTrampolineFor: #ceSelfSend:to:numArgs: numArgs: numArgs called: (self trampolineName: 'ceSelfSend' numArgs: numArgs) arg: ClassReg arg: ReceiverResultReg + arg: (self numArgsOrSendNumArgsReg: numArgs))]. - arg: numArgs)]. - selfSendTrampolines - at: NumSendTrampolines - 1 - put: (self genSendTrampolineFor: #ceSelfSend:to:numArgs: - numArgs: self numRegArgs + 1 - called: (self trampolineName: 'ceSelfSend' numArgs: -1) - arg: ClassReg - arg: ReceiverResultReg - arg: SendNumArgsReg). + 0 to: NumSendTrampolines - 1 do: - 0 to: NumSendTrampolines - 2 do: [:numArgs| dynamicSuperSendTrampolines at: numArgs put: (self genSendTrampolineFor: #ceDynamicSuperSend:to:numArgs: numArgs: numArgs called: (self trampolineName: 'ceDynSuperSend' numArgs: numArgs) arg: ClassReg arg: ReceiverResultReg + arg: (self numArgsOrSendNumArgsReg: numArgs))]. - arg: numArgs)]. - dynamicSuperSendTrampolines - at: NumSendTrampolines - 1 - put: (self genSendTrampolineFor: #ceDynamicSuperSend:to:numArgs: - numArgs: self numRegArgs + 1 - called: (self trampolineName: 'ceDynSuperSend' numArgs: -1) - arg: ClassReg - arg: ReceiverResultReg - arg: SendNumArgsReg). + 0 to: NumSendTrampolines - 1 do: - 0 to: NumSendTrampolines - 2 do: [:numArgs| implicitReceiverSendTrampolines at: numArgs put: (self genNSSendTrampolineFor: #ceImplicitReceiverSend:receiver: numArgs: numArgs called: (self trampolineName: 'ceImplicitReceiverSend' numArgs: numArgs))]. - implicitReceiverSendTrampolines - at: NumSendTrampolines - 1 - put: (self - genNSSendTrampolineFor: #ceImplicitReceiverSend:receiver: - numArgs: self numRegArgs + 1 - called: (self trampolineName: 'ceImplicitReceiverSend' numArgs: -1)). + 0 to: NumSendTrampolines - 1 do: - 0 to: NumSendTrampolines - 2 do: [:numArgs| outerSendTrampolines at: numArgs put: (self genNSSendTrampolineFor: #ceOuterSend:receiver: numArgs: numArgs + called: (self trampolineName: 'ceOuterSend' numArgs: numArgs))]! - called: (self trampolineName: 'ceOuterSend' numArgs: numArgs))]. - outerSendTrampolines - at: NumSendTrampolines - 1 - put: (self - genNSSendTrampolineFor: #ceOuterSend:receiver: - numArgs: self numRegArgs + 1 - called: (self trampolineName: 'ceOuterSend' numArgs: -1)).! Item was changed: ----- Method: StackToRegisterMappingCogit>>generateSendTrampolines (in category 'initialization') ----- generateSendTrampolines "Override to generate code to push the register arg(s) for <= numRegArg arity sends." + 0 to: NumSendTrampolines - 1 do: - 0 to: NumSendTrampolines - 2 do: [:numArgs| ordinarySendTrampolines at: numArgs put: (self genSendTrampolineFor: #ceSend:super:to:numArgs: numArgs: numArgs called: (self trampolineName: 'ceSend' numArgs: numArgs) arg: ClassReg arg: 0 arg: ReceiverResultReg + arg: (self numArgsOrSendNumArgsReg: numArgs))]. - arg: numArgs)]. - ordinarySendTrampolines - at: NumSendTrampolines - 1 - put: (self genSendTrampolineFor: #ceSend:super:to:numArgs: - numArgs: self numRegArgs + 1 - called: (self trampolineName: 'ceSend' numArgs: -1) - arg: ClassReg - arg: 0 - arg: ReceiverResultReg - arg: SendNumArgsReg). "Generate these in the middle so they are within [firstSend, lastSend]." self cppIf: NewspeakVM ifTrue: [self generateNewspeakSendTrampolines]. self cppIf: BytecodeSetHasDirectedSuperSend ifTrue: + [0 to: NumSendTrampolines - 1 do: - [0 to: NumSendTrampolines - 2 do: [:numArgs| directedSuperSendTrampolines at: numArgs put: (self genSendTrampolineFor: #ceSend:above:to:numArgs: numArgs: numArgs called: (self trampolineName: 'ceDirectedSuperSend' numArgs: numArgs) arg: ClassReg arg: TempReg arg: ReceiverResultReg + arg: (self numArgsOrSendNumArgsReg: numArgs))]]. - arg: numArgs)]. - directedSuperSendTrampolines - at: NumSendTrampolines - 1 - put: (self genSendTrampolineFor: #ceSend:above:to:numArgs: - numArgs: self numRegArgs + 1 - called: (self trampolineName: 'ceDirectedSuperSend' numArgs: -1) - arg: ClassReg - arg: TempReg - arg: ReceiverResultReg - arg: SendNumArgsReg)]. + 0 to: NumSendTrampolines - 1 do: - 0 to: NumSendTrampolines - 2 do: [:numArgs| superSendTrampolines at: numArgs put: (self genSendTrampolineFor: #ceSend:super:to:numArgs: numArgs: numArgs called: (self trampolineName: 'ceSuperSend' numArgs: numArgs) arg: ClassReg arg: 1 arg: ReceiverResultReg + arg: (self numArgsOrSendNumArgsReg: numArgs))]. - arg: numArgs)]. - superSendTrampolines - at: NumSendTrampolines - 1 - put: (self genSendTrampolineFor: #ceSend:super:to:numArgs: - numArgs: self numRegArgs + 1 - called: (self trampolineName: 'ceSuperSend' numArgs: -1) - arg: ClassReg - arg: 1 - arg: ReceiverResultReg - arg: SendNumArgsReg). firstSend := ordinarySendTrampolines at: 0. lastSend := superSendTrampolines at: NumSendTrampolines - 1!

1 0

[commit][3366] Fix VERSION_TAG format to agree with existing convention.
by commits＠squeakvm.org 02 Jun '15

02 Jun '15

Revision: 3366 Author: eliot Date: 2015-06-02 11:10:30 -0700 (Tue, 02 Jun 2015) Log Message: ----------- Fix VERSION_TAG format to agree with existing convention. Modified Paths: -------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h =================================================================== --- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h 2015-06-02 00:20:23 UTC (rev 3365) +++ branches/Cog/platforms/Cross/vm/sqSCCSVersion.h 2015-06-02 18:10:30 UTC (rev 3366) @@ -116,7 +116,7 @@ else if (argc == 2 && !strcmp(argv[1], "VM_RELEASE")) printf("%s\n", revisionAsString()); else if (argc == 2 && !strcmp(argv[1], "VERSION_TAG")) - printf("%s.%s\n", vm_version, revisionAsString()); + printf("%s-%s\n", vm_version, revisionAsString()); else return 1; Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Mon Jun 1 17:18:50 PDT 2015 + Tue Jun 2 11:10:08 PDT 2015

1 0

New Cog VMs available
by Eliot Miranda 02 Jun '15

02 Jun '15

... at http://www.mirandabanda.org/files/Cog/VM/VM.r3365 CogVM source as per VMMaker.oscog-eem.1332/r3365 Newspeak Cogit: Fix the regression in implicit receiver sends caused by VMMaker.oscog-eem.1317 (fix to performance regression caused by using XCHG on x86). The implicit receiver cache uses SendNumArgsReg to refer to the cache object. Hence we must use TempReg for genPushRegisterArgsForNumArgs: in this case. So refactor to genPushRegisterArgsForNumArgs:scratchReg:, passing either TempReg or SendNumArgsReg as approprate. -- best, Eliot

2 1

SqueakSSL + SAN certificates
by Levente Uzonyi 02 Jun '15

02 Jun '15

Hi All, I've implemented support for reading the domain names from the certificate's SAN extension[1] in SqueakSSL. The image side code is in the Inbox[2]. It is backwards compatible -- everything works as before without the VM changes. I've also uploaded the modified files[3][4] for the unix platform, and a diff[5] (which somehow doesn't include the changes of the .h file). The VM support code for other platforms are to be done. These changes fix the failing SqueakSSL test in the Trunk, so I suggest including the .mcz file in the 4.6 release. Levente [1] https://en.wikipedia.org/wiki/SubjectAltName [2] http://lists.squeakfoundation.org/pipermail/squeak-dev/2015-May/184581.html [3] http://leves.web.elte.hu/squeak/SqueakSSL/SqueakSSL.h [4] http://leves.web.elte.hu/squeak/SqueakSSL/sqUnixOpenSSL.c [5] http://leves.web.elte.hu/squeak/SqueakSSL/diff.txt

5 15

[commit][3365] CogVM source as per VMMaker.oscog-eem.1332
by commits＠squeakvm.org 02 Jun '15

02 Jun '15

Revision: 3365 Author: eliot Date: 2015-06-01 17:20:23 -0700 (Mon, 01 Jun 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1332 Newspeak Cogit: Fix the regression in implicit receiver sends caused by VMMaker.oscog-eem.1317 (fix to performance regression caused by using XCHG on x86). The implicit receiver cache uses SendNumArgsReg to refer to the cache object. Hence we must use TempReg for genPushRegisterArgsForNumArgs: in this case. So refactor to genPushRegisterArgsForNumArgs:scratchReg:, passing either TempReg or SendNumArgsReg as approprate. Modified Paths: -------------- branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogitARMv5.c branches/Cog/nsspursrc/vm/cogitIA32.c branches/Cog/platforms/Mac OS/vm/sqMacMain.c branches/Cog/platforms/unix/vm/sqUnixMain.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogitARMv5.c branches/Cog/spursistasrc/vm/cogitIA32.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogitARMv5.c branches/Cog/spursrc/vm/cogitIA32.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogitARMv5.c branches/Cog/src/vm/cogitIA32.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2015-06-01 18:53:32 UTC (rev 3364) +++ branches/Cog/nsspursrc/vm/cogit.h 2015-06-02 00:20:23 UTC (rev 3365) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1331 uuid: 2da6f9fc-7921-4c8b-8c78-dd47f9ddd76e + CCodeGenerator VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 */ Modified: branches/Cog/nsspursrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-06-01 18:53:32 UTC (rev 3364) +++ branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-06-02 00:20:23 UTC (rev 3365) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1331 uuid: 2da6f9fc-7921-4c8b-8c78-dd47f9ddd76e + CCodeGenerator VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1331 uuid: 2da6f9fc-7921-4c8b-8c78-dd47f9ddd76e + StackToRegisterMappingCogit VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1331 uuid: 2da6f9fc-7921-4c8b-8c78-dd47f9ddd76e " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -462,7 +462,7 @@ static sqInt genPassConstasArgument(AbstractInstruction * self_in_genPassConstasArgument, sqInt constant, sqInt zeroRelativeArgIndex) NoDbgRegParms; static sqInt genPassRegasArgument(AbstractInstruction * self_in_genPassRegasArgument, sqInt abstractRegister, sqInt zeroRelativeArgIndex) NoDbgRegParms; static AbstractInstruction * genPushRegisterArgsForAbortMissNumArgs(AbstractInstruction * self_in_genPushRegisterArgsForAbortMissNumArgs, sqInt numArgs) NoDbgRegParms; -static AbstractInstruction * genPushRegisterArgsForNumArgs(AbstractInstruction * self_in_genPushRegisterArgsForNumArgs, sqInt numArgs) NoDbgRegParms; +static AbstractInstruction * genPushRegisterArgsForNumArgsscratchReg(AbstractInstruction * self_in_genPushRegisterArgsForNumArgsscratchReg, sqInt numArgs, sqInt ignored) NoDbgRegParms; static sqInt genRemoveNArgsFromStack(AbstractInstruction * self_in_genRemoveNArgsFromStack, sqInt n) NoDbgRegParms; static AbstractInstruction * genRestoreRegs(AbstractInstruction * self_in_genRestoreRegs) NoDbgRegParms; static AbstractInstruction * genRestoreRegsExcept(AbstractInstruction * self_in_genRestoreRegsExcept, sqInt abstractReg) NoDbgRegParms; @@ -6263,9 +6263,9 @@ NOTA BENE: we do NOT push the return address here, which means it must be dealt with later. */ - /* CogARMCompiler>>#genPushRegisterArgsForNumArgs: */ + /* CogARMCompiler>>#genPushRegisterArgsForNumArgs:scratchReg: */ static AbstractInstruction * -genPushRegisterArgsForNumArgs(AbstractInstruction * self_in_genPushRegisterArgsForNumArgs, sqInt numArgs) +genPushRegisterArgsForNumArgsscratchReg(AbstractInstruction * self_in_genPushRegisterArgsForNumArgsscratchReg, sqInt numArgs, sqInt ignored) { if (numArgs <= 2) { assert((numRegArgs()) <= 2); @@ -6280,7 +6280,7 @@ } } } - return self_in_genPushRegisterArgsForNumArgs; + return self_in_genPushRegisterArgsForNumArgsscratchReg; } @@ -9912,7 +9912,7 @@ { sqInt classIndex; sqInt i; - sqInt pc; + usqInt pc; pc = (((((usqInt)cPIC)) + firstCPICCaseOffset) + cPICCaseSize) - (jumpLongConditionalByteSize(backEnd)); for (i = 2; i <= ((cPIC->cPICNumCases)); i += 1) { @@ -11094,7 +11094,8 @@ genoperand(JumpR, TempReg); jmpTarget(jumpMiss, gLabel()); genEnsureObjInRegNotForwardedscratchRegupdatingMwr(ReceiverResultReg, TempReg, FoxMFReceiver, FPReg); - genPushRegisterArgsForNumArgs(backEnd, numArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, numArgs, TempReg); + return genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(aRoutine, aString, 2, SendNumArgsReg, ReceiverResultReg, null, null, 0, 1, ReceiverResultReg, 1); } @@ -21816,7 +21817,7 @@ /* begin JumpZero: */ genoperand(JumpZero, ((sqInt)itsAHit)); jmpTarget(jumpSelectorMiss, gLabel()); - genPushRegisterArgsForNumArgs(backEnd, numArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, numArgs, SendNumArgsReg); genSmalltalkToCStackSwitch(1); addDependent(methodLabel, annotateAbsolutePCRef(gMoveCwR(((sqInt)methodLabel), SendNumArgsReg))); compileCallFornumArgsargargargargresultRegsaveRegs(ceSendFromInLineCacheMiss, 1, SendNumArgsReg, null, null, null, null, 0); @@ -22588,7 +22589,7 @@ if (!(preOpCheckOrNil == null)) { jmpTarget(jumpFailCheck, getJmpTarget(jumpFailClass)); } - genPushRegisterArgsForNumArgs(backEnd, methodOrBlockNumArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, methodOrBlockNumArgs, SendNumArgsReg); /* begin Jump: */ jumpFailClass = genoperand(Jump, ((sqInt)0)); jmpTarget(jumpImmediate, gLabel()); @@ -23254,7 +23255,7 @@ /* N.B. a closed PIC jumps to the miss routine, not calls it, so there is only one retpc on the stack. */ opcodeIndex = 0; - genPushRegisterArgsForNumArgs(backEnd, numArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, numArgs, SendNumArgsReg); genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceCPICMissreceiver, trampolineNamenumArgs("cePICMiss", (numArgs <= 2 ? numArgs : -1)), 2, ClassReg, ReceiverResultReg, null, null, 0, 1, null, 1); @@ -24268,7 +24269,7 @@ { if (!(regArgsHaveBeenPushed || (methodOrBlockNumArgs > 2))) { - genPushRegisterArgsForNumArgs(backEnd, methodOrBlockNumArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, methodOrBlockNumArgs, SendNumArgsReg); regArgsHaveBeenPushed = 1; } } @@ -24415,7 +24416,7 @@ startAddress = methodZoneBase; opcodeIndex = 0; - genPushRegisterArgsForNumArgs(backEnd, numArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, numArgs, SendNumArgsReg); genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(aRoutine, aString, 3, regOrConst0, regOrConst1, regOrConst2, null, 0, 1, null, 1); return startAddress; } @@ -24433,7 +24434,7 @@ startAddress = methodZoneBase; opcodeIndex = 0; - genPushRegisterArgsForNumArgs(backEnd, numArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, numArgs, SendNumArgsReg); genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(aRoutine, aString, 4, regOrConst0, regOrConst1, regOrConst2, regOrConst3, 0, 1, null, 1); return startAddress; } Modified: branches/Cog/nsspursrc/vm/cogitIA32.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitIA32.c 2015-06-01 18:53:32 UTC (rev 3364) +++ branches/Cog/nsspursrc/vm/cogitIA32.c 2015-06-02 00:20:23 UTC (rev 3365) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1331 uuid: 2da6f9fc-7921-4c8b-8c78-dd47f9ddd76e + CCodeGenerator VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1331 uuid: 2da6f9fc-7921-4c8b-8c78-dd47f9ddd76e + StackToRegisterMappingCogit VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1331 uuid: 2da6f9fc-7921-4c8b-8c78-dd47f9ddd76e " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -439,7 +439,7 @@ static sqInt genPassConstasArgument(AbstractInstruction * self_in_genPassConstasArgument, sqInt constant, sqInt zeroRelativeArgIndex) NoDbgRegParms; static sqInt genPassRegasArgument(AbstractInstruction * self_in_genPassRegasArgument, sqInt abstractRegister, sqInt zeroRelativeArgIndex) NoDbgRegParms; static AbstractInstruction * genPushRegisterArgsForAbortMissNumArgs(AbstractInstruction * self_in_genPushRegisterArgsForAbortMissNumArgs, sqInt numArgs) NoDbgRegParms; -static AbstractInstruction * genPushRegisterArgsForNumArgs(AbstractInstruction * self_in_genPushRegisterArgsForNumArgs, sqInt numArgs) NoDbgRegParms; +static AbstractInstruction * genPushRegisterArgsForNumArgsscratchReg(AbstractInstruction * self_in_genPushRegisterArgsForNumArgsscratchReg, sqInt numArgs, sqInt scratchReg) NoDbgRegParms; static sqInt genRemoveNArgsFromStack(AbstractInstruction * self_in_genRemoveNArgsFromStack, sqInt n) NoDbgRegParms; static sqInt genRestoreRegs(AbstractInstruction * self_in_genRestoreRegs) NoDbgRegParms; static sqInt genRestoreRegsExcept(AbstractInstruction * self_in_genRestoreRegsExcept, sqInt abstractReg) NoDbgRegParms; @@ -5458,7 +5458,7 @@ /* Ensure that the register args are pushed before the retpc for arity <= self numRegArgs. This - won't be as clumsy on a RISC. But putting the receiver and args above the + isn't as clumsy on a RISC. But putting the receiver and args above the return address means the CoInterpreter has a single machine-code frame format which saves us a lot of work. @@ -5470,9 +5470,9 @@ use SendNumArgsReg because it is only live in sends of arity >= (NumSendTrampolines - 1). */ - /* CogIA32Compiler>>#genPushRegisterArgsForNumArgs: */ + /* CogIA32Compiler>>#genPushRegisterArgsForNumArgs:scratchReg: */ static AbstractInstruction * -genPushRegisterArgsForNumArgs(AbstractInstruction * self_in_genPushRegisterArgsForNumArgs, sqInt numArgs) +genPushRegisterArgsForNumArgsscratchReg(AbstractInstruction * self_in_genPushRegisterArgsForNumArgsscratchReg, sqInt numArgs, sqInt scratchReg) { assert((numRegArgs()) < (NumSendTrampolines - 1)); if (numArgs <= 2) { @@ -5483,7 +5483,7 @@ but XCHG is slow. */ /* begin MoveMw:r:R: */ - genoperandoperandoperand(MoveMwrR, 0, SPReg, SendNumArgsReg); + genoperandoperandoperand(MoveMwrR, 0, SPReg, scratchReg); /* begin MoveR:Mw:r: */ genoperandoperandoperand(MoveRMwr, ReceiverResultReg, 0, SPReg); if (numArgs > 0) { @@ -5495,10 +5495,10 @@ } } /* begin PushR: */ - genoperand(PushR, SendNumArgsReg); + genoperand(PushR, scratchReg); } - return self_in_genPushRegisterArgsForNumArgs; + return self_in_genPushRegisterArgsForNumArgsscratchReg; } /* CogIA32Compiler>>#genRemoveNArgsFromStack: */ @@ -9865,7 +9865,8 @@ genoperand(JumpR, TempReg); jmpTarget(jumpMiss, gLabel()); genEnsureObjInRegNotForwardedscratchRegupdatingMwr(ReceiverResultReg, TempReg, FoxMFReceiver, FPReg); - genPushRegisterArgsForNumArgs(backEnd, numArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, numArgs, TempReg); + return genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(aRoutine, aString, 2, SendNumArgsReg, ReceiverResultReg, null, null, 0, 1, ReceiverResultReg, 1); } @@ -20585,7 +20586,7 @@ /* begin JumpZero: */ genoperand(JumpZero, ((sqInt)itsAHit)); jmpTarget(jumpSelectorMiss, gLabel()); - genPushRegisterArgsForNumArgs(backEnd, numArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, numArgs, SendNumArgsReg); genSmalltalkToCStackSwitch(1); addDependent(methodLabel, annotateAbsolutePCRef(gMoveCwR(((sqInt)methodLabel), SendNumArgsReg))); compileCallFornumArgsargargargargresultRegsaveRegs(ceSendFromInLineCacheMiss, 1, SendNumArgsReg, null, null, null, null, 0); @@ -21359,7 +21360,7 @@ if (!(preOpCheckOrNil == null)) { jmpTarget(jumpFailCheck, getJmpTarget(jumpFailClass)); } - genPushRegisterArgsForNumArgs(backEnd, methodOrBlockNumArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, methodOrBlockNumArgs, SendNumArgsReg); /* begin Jump: */ jumpFailClass = genoperand(Jump, ((sqInt)0)); jmpTarget(jumpImmediate, gLabel()); @@ -22022,7 +22023,7 @@ /* N.B. a closed PIC jumps to the miss routine, not calls it, so there is only one retpc on the stack. */ opcodeIndex = 0; - genPushRegisterArgsForNumArgs(backEnd, numArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, numArgs, SendNumArgsReg); genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceCPICMissreceiver, trampolineNamenumArgs("cePICMiss", (numArgs <= 2 ? numArgs : -1)), 2, ClassReg, ReceiverResultReg, null, null, 0, 1, null, 1); @@ -23036,7 +23037,7 @@ { if (!(regArgsHaveBeenPushed || (methodOrBlockNumArgs > 2))) { - genPushRegisterArgsForNumArgs(backEnd, methodOrBlockNumArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, methodOrBlockNumArgs, SendNumArgsReg); regArgsHaveBeenPushed = 1; } } @@ -23183,7 +23184,7 @@ startAddress = methodZoneBase; opcodeIndex = 0; - genPushRegisterArgsForNumArgs(backEnd, numArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, numArgs, SendNumArgsReg); genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(aRoutine, aString, 3, regOrConst0, regOrConst1, regOrConst2, null, 0, 1, null, 1); return startAddress; } @@ -23201,7 +23202,7 @@ startAddress = methodZoneBase; opcodeIndex = 0; - genPushRegisterArgsForNumArgs(backEnd, numArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, numArgs, SendNumArgsReg); genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(aRoutine, aString, 4, regOrConst0, regOrConst1, regOrConst2, regOrConst3, 0, 1, null, 1); return startAddress; } Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Mon Jun 1 11:53:22 PDT 2015 + Mon Jun 1 17:18:50 PDT 2015 Modified: branches/Cog/platforms/Mac OS/vm/sqMacMain.c =================================================================== --- branches/Cog/platforms/Mac OS/vm/sqMacMain.c 2015-06-01 18:53:32 UTC (rev 3364) +++ branches/Cog/platforms/Mac OS/vm/sqMacMain.c 2015-06-02 00:20:23 UTC (rev 3365) @@ -291,7 +291,7 @@ printf("blocking e.g. to allow attaching debugger\n"); printf("pid: %d pwd: %s vm:%s\n", - (int)getpid(), argVec[0], getcwd(pwd,PATH_MAX+1)); + (int)getpid(), getcwd(pwd,PATH_MAX+1), argVec[0]); while (1) { while_away_the_hours.tv_sec = 3600; nanosleep(&while_away_the_hours, 0); Modified: branches/Cog/platforms/unix/vm/sqUnixMain.c =================================================================== --- branches/Cog/platforms/unix/vm/sqUnixMain.c 2015-06-01 18:53:32 UTC (rev 3364) +++ branches/Cog/platforms/unix/vm/sqUnixMain.c 2015-06-02 00:20:23 UTC (rev 3365) @@ -939,7 +939,7 @@ printf("blocking e.g. to allow attaching debugger\n"); printf("pid: %d pwd: %s vm:%s\n", - (int)getpid(), argVec[0], getcwd(pwd,MAXPATHLEN+1)); + (int)getpid(), getcwd(pwd,MAXPATHLEN+1), argVec[0]); while (1) { while_away_the_hours.tv_sec = 3600; nanosleep(&while_away_the_hours, 0); Modified: branches/Cog/spursistasrc/vm/cogit.h =================================================================== --- branches/Cog/spursistasrc/vm/cogit.h 2015-06-01 18:53:32 UTC (rev 3364) +++ branches/Cog/spursistasrc/vm/cogit.h 2015-06-02 00:20:23 UTC (rev 3365) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1331 uuid: 2da6f9fc-7921-4c8b-8c78-dd47f9ddd76e + CCodeGenerator VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 */ Modified: branches/Cog/spursistasrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/spursistasrc/vm/cogitARMv5.c 2015-06-01 18:53:32 UTC (rev 3364) +++ branches/Cog/spursistasrc/vm/cogitARMv5.c 2015-06-02 00:20:23 UTC (rev 3365) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1331 uuid: 2da6f9fc-7921-4c8b-8c78-dd47f9ddd76e + CCodeGenerator VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1331 uuid: 2da6f9fc-7921-4c8b-8c78-dd47f9ddd76e + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1331 uuid: 2da6f9fc-7921-4c8b-8c78-dd47f9ddd76e " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -461,7 +461,7 @@ static sqInt genPassConstasArgument(AbstractInstruction * self_in_genPassConstasArgument, sqInt constant, sqInt zeroRelativeArgIndex) NoDbgRegParms; static sqInt genPassRegasArgument(AbstractInstruction * self_in_genPassRegasArgument, sqInt abstractRegister, sqInt zeroRelativeArgIndex) NoDbgRegParms; static AbstractInstruction * genPushRegisterArgsForAbortMissNumArgs(AbstractInstruction * self_in_genPushRegisterArgsForAbortMissNumArgs, sqInt numArgs) NoDbgRegParms; -static AbstractInstruction * genPushRegisterArgsForNumArgs(AbstractInstruction * self_in_genPushRegisterArgsForNumArgs, sqInt numArgs) NoDbgRegParms; +static AbstractInstruction * genPushRegisterArgsForNumArgsscratchReg(AbstractInstruction * self_in_genPushRegisterArgsForNumArgsscratchReg, sqInt numArgs, sqInt ignored) NoDbgRegParms; static sqInt genRemoveNArgsFromStack(AbstractInstruction * self_in_genRemoveNArgsFromStack, sqInt n) NoDbgRegParms; static AbstractInstruction * genRestoreRegs(AbstractInstruction * self_in_genRestoreRegs) NoDbgRegParms; static AbstractInstruction * genRestoreRegsExcept(AbstractInstruction * self_in_genRestoreRegsExcept, sqInt abstractReg) NoDbgRegParms; @@ -6264,9 +6264,9 @@ NOTA BENE: we do NOT push the return address here, which means it must be dealt with later. */ - /* CogARMCompiler>>#genPushRegisterArgsForNumArgs: */ + /* CogARMCompiler>>#genPushRegisterArgsForNumArgs:scratchReg: */ static AbstractInstruction * -genPushRegisterArgsForNumArgs(AbstractInstruction * self_in_genPushRegisterArgsForNumArgs, sqInt numArgs) +genPushRegisterArgsForNumArgsscratchReg(AbstractInstruction * self_in_genPushRegisterArgsForNumArgsscratchReg, sqInt numArgs, sqInt ignored) { if (numArgs <= 2) { assert((numRegArgs()) <= 2); @@ -6281,7 +6281,7 @@ } } } - return self_in_genPushRegisterArgsForNumArgs; + return self_in_genPushRegisterArgsForNumArgsscratchReg; } @@ -9822,7 +9822,7 @@ { sqInt classIndex; sqInt i; - sqInt pc; + usqInt pc; pc = (((((usqInt)cPIC)) + firstCPICCaseOffset) + cPICCaseSize) - (jumpLongConditionalByteSize(backEnd)); for (i = 2; i <= ((cPIC->cPICNumCases)); i += 1) { @@ -22828,7 +22828,7 @@ /* begin JumpZero: */ genoperand(JumpZero, ((sqInt)itsAHit)); jmpTarget(jumpSelectorMiss, gLabel()); - genPushRegisterArgsForNumArgs(backEnd, numArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, numArgs, SendNumArgsReg); genSmalltalkToCStackSwitch(1); addDependent(methodLabel, annotateAbsolutePCRef(gMoveCwR(((sqInt)methodLabel), SendNumArgsReg))); compileCallFornumArgsargargargargresultRegsaveRegs(ceSendFromInLineCacheMiss, 1, SendNumArgsReg, null, null, null, null, 0); @@ -23600,7 +23600,7 @@ if (!(preOpCheckOrNil == null)) { jmpTarget(jumpFailCheck, getJmpTarget(jumpFailClass)); } - genPushRegisterArgsForNumArgs(backEnd, methodOrBlockNumArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, methodOrBlockNumArgs, SendNumArgsReg); /* begin Jump: */ jumpFailClass = genoperand(Jump, ((sqInt)0)); jmpTarget(jumpImmediate, gLabel()); @@ -24152,7 +24152,7 @@ /* N.B. a closed PIC jumps to the miss routine, not calls it, so there is only one retpc on the stack. */ opcodeIndex = 0; - genPushRegisterArgsForNumArgs(backEnd, numArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, numArgs, SendNumArgsReg); genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceCPICMissreceiver, trampolineNamenumArgs("cePICMiss", (numArgs <= 2 ? numArgs : -1)), 2, ClassReg, ReceiverResultReg, null, null, 0, 1, null, 1); @@ -25195,7 +25195,7 @@ { if (!(regArgsHaveBeenPushed || (methodOrBlockNumArgs > 2))) { - genPushRegisterArgsForNumArgs(backEnd, methodOrBlockNumArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, methodOrBlockNumArgs, SendNumArgsReg); regArgsHaveBeenPushed = 1; } } @@ -25297,7 +25297,7 @@ startAddress = methodZoneBase; opcodeIndex = 0; - genPushRegisterArgsForNumArgs(backEnd, numArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, numArgs, SendNumArgsReg); genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(aRoutine, aString, 4, regOrConst0, regOrConst1, regOrConst2, regOrConst3, 0, 1, null, 1); return startAddress; } Modified: branches/Cog/spursistasrc/vm/cogitIA32.c =================================================================== --- branches/Cog/spursistasrc/vm/cogitIA32.c 2015-06-01 18:53:32 UTC (rev 3364) +++ branches/Cog/spursistasrc/vm/cogitIA32.c 2015-06-02 00:20:23 UTC (rev 3365) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1331 uuid: 2da6f9fc-7921-4c8b-8c78-dd47f9ddd76e + CCodeGenerator VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1331 uuid: 2da6f9fc-7921-4c8b-8c78-dd47f9ddd76e + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1331 uuid: 2da6f9fc-7921-4c8b-8c78-dd47f9ddd76e " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -438,7 +438,7 @@ static sqInt genPassConstasArgument(AbstractInstruction * self_in_genPassConstasArgument, sqInt constant, sqInt zeroRelativeArgIndex) NoDbgRegParms; static sqInt genPassRegasArgument(AbstractInstruction * self_in_genPassRegasArgument, sqInt abstractRegister, sqInt zeroRelativeArgIndex) NoDbgRegParms; static AbstractInstruction * genPushRegisterArgsForAbortMissNumArgs(AbstractInstruction * self_in_genPushRegisterArgsForAbortMissNumArgs, sqInt numArgs) NoDbgRegParms; -static AbstractInstruction * genPushRegisterArgsForNumArgs(AbstractInstruction * self_in_genPushRegisterArgsForNumArgs, sqInt numArgs) NoDbgRegParms; +static AbstractInstruction * genPushRegisterArgsForNumArgsscratchReg(AbstractInstruction * self_in_genPushRegisterArgsForNumArgsscratchReg, sqInt numArgs, sqInt scratchReg) NoDbgRegParms; static sqInt genRemoveNArgsFromStack(AbstractInstruction * self_in_genRemoveNArgsFromStack, sqInt n) NoDbgRegParms; static sqInt genRestoreRegs(AbstractInstruction * self_in_genRestoreRegs) NoDbgRegParms; static sqInt genRestoreRegsExcept(AbstractInstruction * self_in_genRestoreRegsExcept, sqInt abstractReg) NoDbgRegParms; @@ -5458,7 +5458,7 @@ /* Ensure that the register args are pushed before the retpc for arity <= self numRegArgs. This - won't be as clumsy on a RISC. But putting the receiver and args above the + isn't as clumsy on a RISC. But putting the receiver and args above the return address means the CoInterpreter has a single machine-code frame format which saves us a lot of work. @@ -5470,9 +5470,9 @@ use SendNumArgsReg because it is only live in sends of arity >= (NumSendTrampolines - 1). */ - /* CogIA32Compiler>>#genPushRegisterArgsForNumArgs: */ + /* CogIA32Compiler>>#genPushRegisterArgsForNumArgs:scratchReg: */ static AbstractInstruction * -genPushRegisterArgsForNumArgs(AbstractInstruction * self_in_genPushRegisterArgsForNumArgs, sqInt numArgs) +genPushRegisterArgsForNumArgsscratchReg(AbstractInstruction * self_in_genPushRegisterArgsForNumArgsscratchReg, sqInt numArgs, sqInt scratchReg) { assert((numRegArgs()) < (NumSendTrampolines - 1)); if (numArgs <= 2) { @@ -5483,7 +5483,7 @@ but XCHG is slow. */ /* begin MoveMw:r:R: */ - genoperandoperandoperand(MoveMwrR, 0, SPReg, SendNumArgsReg); + genoperandoperandoperand(MoveMwrR, 0, SPReg, scratchReg); /* begin MoveR:Mw:r: */ genoperandoperandoperand(MoveRMwr, ReceiverResultReg, 0, SPReg); if (numArgs > 0) { @@ -5495,10 +5495,10 @@ } } /* begin PushR: */ - genoperand(PushR, SendNumArgsReg); + genoperand(PushR, scratchReg); } - return self_in_genPushRegisterArgsForNumArgs; + return self_in_genPushRegisterArgsForNumArgsscratchReg; } /* CogIA32Compiler>>#genRemoveNArgsFromStack: */ @@ -21583,7 +21583,7 @@ /* begin JumpZero: */ genoperand(JumpZero, ((sqInt)itsAHit)); jmpTarget(jumpSelectorMiss, gLabel()); - genPushRegisterArgsForNumArgs(backEnd, numArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, numArgs, SendNumArgsReg); genSmalltalkToCStackSwitch(1); addDependent(methodLabel, annotateAbsolutePCRef(gMoveCwR(((sqInt)methodLabel), SendNumArgsReg))); compileCallFornumArgsargargargargresultRegsaveRegs(ceSendFromInLineCacheMiss, 1, SendNumArgsReg, null, null, null, null, 0); @@ -22357,7 +22357,7 @@ if (!(preOpCheckOrNil == null)) { jmpTarget(jumpFailCheck, getJmpTarget(jumpFailClass)); } - genPushRegisterArgsForNumArgs(backEnd, methodOrBlockNumArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, methodOrBlockNumArgs, SendNumArgsReg); /* begin Jump: */ jumpFailClass = genoperand(Jump, ((sqInt)0)); jmpTarget(jumpImmediate, gLabel()); @@ -22906,7 +22906,7 @@ /* N.B. a closed PIC jumps to the miss routine, not calls it, so there is only one retpc on the stack. */ opcodeIndex = 0; - genPushRegisterArgsForNumArgs(backEnd, numArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, numArgs, SendNumArgsReg); genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceCPICMissreceiver, trampolineNamenumArgs("cePICMiss", (numArgs <= 2 ? numArgs : -1)), 2, ClassReg, ReceiverResultReg, null, null, 0, 1, null, 1); @@ -23949,7 +23949,7 @@ { if (!(regArgsHaveBeenPushed || (methodOrBlockNumArgs > 2))) { - genPushRegisterArgsForNumArgs(backEnd, methodOrBlockNumArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, methodOrBlockNumArgs, SendNumArgsReg); regArgsHaveBeenPushed = 1; } } @@ -24051,7 +24051,7 @@ startAddress = methodZoneBase; opcodeIndex = 0; - genPushRegisterArgsForNumArgs(backEnd, numArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, numArgs, SendNumArgsReg); genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(aRoutine, aString, 4, regOrConst0, regOrConst1, regOrConst2, regOrConst3, 0, 1, null, 1); return startAddress; } Modified: branches/Cog/spursrc/vm/cogit.h =================================================================== --- branches/Cog/spursrc/vm/cogit.h 2015-06-01 18:53:32 UTC (rev 3364) +++ branches/Cog/spursrc/vm/cogit.h 2015-06-02 00:20:23 UTC (rev 3365) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1331 uuid: 2da6f9fc-7921-4c8b-8c78-dd47f9ddd76e + CCodeGenerator VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 */ Modified: branches/Cog/spursrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/spursrc/vm/cogitARMv5.c 2015-06-01 18:53:32 UTC (rev 3364) +++ branches/Cog/spursrc/vm/cogitARMv5.c 2015-06-02 00:20:23 UTC (rev 3365) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1331 uuid: 2da6f9fc-7921-4c8b-8c78-dd47f9ddd76e + CCodeGenerator VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1331 uuid: 2da6f9fc-7921-4c8b-8c78-dd47f9ddd76e + StackToRegisterMappingCogit VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1331 uuid: 2da6f9fc-7921-4c8b-8c78-dd47f9ddd76e " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -458,7 +458,7 @@ static sqInt genPassConstasArgument(AbstractInstruction * self_in_genPassConstasArgument, sqInt constant, sqInt zeroRelativeArgIndex) NoDbgRegParms; static sqInt genPassRegasArgument(AbstractInstruction * self_in_genPassRegasArgument, sqInt abstractRegister, sqInt zeroRelativeArgIndex) NoDbgRegParms; static AbstractInstruction * genPushRegisterArgsForAbortMissNumArgs(AbstractInstruction * self_in_genPushRegisterArgsForAbortMissNumArgs, sqInt numArgs) NoDbgRegParms; -static AbstractInstruction * genPushRegisterArgsForNumArgs(AbstractInstruction * self_in_genPushRegisterArgsForNumArgs, sqInt numArgs) NoDbgRegParms; +static AbstractInstruction * genPushRegisterArgsForNumArgsscratchReg(AbstractInstruction * self_in_genPushRegisterArgsForNumArgsscratchReg, sqInt numArgs, sqInt ignored) NoDbgRegParms; static sqInt genRemoveNArgsFromStack(AbstractInstruction * self_in_genRemoveNArgsFromStack, sqInt n) NoDbgRegParms; static AbstractInstruction * genRestoreRegs(AbstractInstruction * self_in_genRestoreRegs) NoDbgRegParms; static AbstractInstruction * genRestoreRegsExcept(AbstractInstruction * self_in_genRestoreRegsExcept, sqInt abstractReg) NoDbgRegParms; @@ -5939,9 +5939,9 @@ NOTA BENE: we do NOT push the return address here, which means it must be dealt with later. */ - /* CogARMCompiler>>#genPushRegisterArgsForNumArgs: */ + /* CogARMCompiler>>#genPushRegisterArgsForNumArgs:scratchReg: */ static AbstractInstruction * -genPushRegisterArgsForNumArgs(AbstractInstruction * self_in_genPushRegisterArgsForNumArgs, sqInt numArgs) +genPushRegisterArgsForNumArgsscratchReg(AbstractInstruction * self_in_genPushRegisterArgsForNumArgsscratchReg, sqInt numArgs, sqInt ignored) { if (numArgs <= 2) { assert((numRegArgs()) <= 2); @@ -5956,7 +5956,7 @@ } } } - return self_in_genPushRegisterArgsForNumArgs; + return self_in_genPushRegisterArgsForNumArgsscratchReg; } @@ -19661,7 +19661,7 @@ /* begin JumpZero: */ genoperand(JumpZero, ((sqInt)itsAHit)); jmpTarget(jumpSelectorMiss, gLabel()); - genPushRegisterArgsForNumArgs(backEnd, numArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, numArgs, SendNumArgsReg); genSmalltalkToCStackSwitch(1); addDependent(methodLabel, annotateAbsolutePCRef(gMoveCwR(((sqInt)methodLabel), SendNumArgsReg))); compileCallFornumArgsargargargargresultRegsaveRegs(ceSendFromInLineCacheMiss, 1, SendNumArgsReg, null, null, null, null, 0); @@ -20433,7 +20433,7 @@ if (!(preOpCheckOrNil == null)) { jmpTarget(jumpFailCheck, getJmpTarget(jumpFailClass)); } - genPushRegisterArgsForNumArgs(backEnd, methodOrBlockNumArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, methodOrBlockNumArgs, SendNumArgsReg); /* begin Jump: */ jumpFailClass = genoperand(Jump, ((sqInt)0)); jmpTarget(jumpImmediate, gLabel()); @@ -21010,7 +21010,7 @@ /* N.B. a closed PIC jumps to the miss routine, not calls it, so there is only one retpc on the stack. */ opcodeIndex = 0; - genPushRegisterArgsForNumArgs(backEnd, numArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, numArgs, SendNumArgsReg); genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceCPICMissreceiver, trampolineNamenumArgs("cePICMiss", (numArgs <= 2 ? numArgs : -1)), 2, ClassReg, ReceiverResultReg, null, null, 0, 1, null, 1); @@ -21985,7 +21985,7 @@ { if (!(regArgsHaveBeenPushed || (methodOrBlockNumArgs > 2))) { - genPushRegisterArgsForNumArgs(backEnd, methodOrBlockNumArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, methodOrBlockNumArgs, SendNumArgsReg); regArgsHaveBeenPushed = 1; } } @@ -22076,7 +22076,7 @@ startAddress = methodZoneBase; opcodeIndex = 0; - genPushRegisterArgsForNumArgs(backEnd, numArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, numArgs, SendNumArgsReg); genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(aRoutine, aString, 4, regOrConst0, regOrConst1, regOrConst2, regOrConst3, 0, 1, null, 1); return startAddress; } Modified: branches/Cog/spursrc/vm/cogitIA32.c =================================================================== --- branches/Cog/spursrc/vm/cogitIA32.c 2015-06-01 18:53:32 UTC (rev 3364) +++ branches/Cog/spursrc/vm/cogitIA32.c 2015-06-02 00:20:23 UTC (rev 3365) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1331 uuid: 2da6f9fc-7921-4c8b-8c78-dd47f9ddd76e + CCodeGenerator VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1331 uuid: 2da6f9fc-7921-4c8b-8c78-dd47f9ddd76e + StackToRegisterMappingCogit VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1331 uuid: 2da6f9fc-7921-4c8b-8c78-dd47f9ddd76e " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -435,7 +435,7 @@ static sqInt genPassConstasArgument(AbstractInstruction * self_in_genPassConstasArgument, sqInt constant, sqInt zeroRelativeArgIndex) NoDbgRegParms; static sqInt genPassRegasArgument(AbstractInstruction * self_in_genPassRegasArgument, sqInt abstractRegister, sqInt zeroRelativeArgIndex) NoDbgRegParms; static AbstractInstruction * genPushRegisterArgsForAbortMissNumArgs(AbstractInstruction * self_in_genPushRegisterArgsForAbortMissNumArgs, sqInt numArgs) NoDbgRegParms; -static AbstractInstruction * genPushRegisterArgsForNumArgs(AbstractInstruction * self_in_genPushRegisterArgsForNumArgs, sqInt numArgs) NoDbgRegParms; +static AbstractInstruction * genPushRegisterArgsForNumArgsscratchReg(AbstractInstruction * self_in_genPushRegisterArgsForNumArgsscratchReg, sqInt numArgs, sqInt scratchReg) NoDbgRegParms; static sqInt genRemoveNArgsFromStack(AbstractInstruction * self_in_genRemoveNArgsFromStack, sqInt n) NoDbgRegParms; static sqInt genRestoreRegs(AbstractInstruction * self_in_genRestoreRegs) NoDbgRegParms; static sqInt genRestoreRegsExcept(AbstractInstruction * self_in_genRestoreRegsExcept, sqInt abstractReg) NoDbgRegParms; @@ -5133,7 +5133,7 @@ /* Ensure that the register args are pushed before the retpc for arity <= self numRegArgs. This - won't be as clumsy on a RISC. But putting the receiver and args above the + isn't as clumsy on a RISC. But putting the receiver and args above the return address means the CoInterpreter has a single machine-code frame format which saves us a lot of work. @@ -5145,9 +5145,9 @@ use SendNumArgsReg because it is only live in sends of arity >= (NumSendTrampolines - 1). */ - /* CogIA32Compiler>>#genPushRegisterArgsForNumArgs: */ + /* CogIA32Compiler>>#genPushRegisterArgsForNumArgs:scratchReg: */ static AbstractInstruction * -genPushRegisterArgsForNumArgs(AbstractInstruction * self_in_genPushRegisterArgsForNumArgs, sqInt numArgs) +genPushRegisterArgsForNumArgsscratchReg(AbstractInstruction * self_in_genPushRegisterArgsForNumArgsscratchReg, sqInt numArgs, sqInt scratchReg) { assert((numRegArgs()) < (NumSendTrampolines - 1)); if (numArgs <= 2) { @@ -5158,7 +5158,7 @@ but XCHG is slow. */ /* begin MoveMw:r:R: */ - genoperandoperandoperand(MoveMwrR, 0, SPReg, SendNumArgsReg); + genoperandoperandoperand(MoveMwrR, 0, SPReg, scratchReg); /* begin MoveR:Mw:r: */ genoperandoperandoperand(MoveRMwr, ReceiverResultReg, 0, SPReg); if (numArgs > 0) { @@ -5170,10 +5170,10 @@ } } /* begin PushR: */ - genoperand(PushR, SendNumArgsReg); + genoperand(PushR, scratchReg); } - return self_in_genPushRegisterArgsForNumArgs; + return self_in_genPushRegisterArgsForNumArgsscratchReg; } /* CogIA32Compiler>>#genRemoveNArgsFromStack: */ @@ -18418,7 +18418,7 @@ /* begin JumpZero: */ genoperand(JumpZero, ((sqInt)itsAHit)); jmpTarget(jumpSelectorMiss, gLabel()); - genPushRegisterArgsForNumArgs(backEnd, numArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, numArgs, SendNumArgsReg); genSmalltalkToCStackSwitch(1); addDependent(methodLabel, annotateAbsolutePCRef(gMoveCwR(((sqInt)methodLabel), SendNumArgsReg))); compileCallFornumArgsargargargargresultRegsaveRegs(ceSendFromInLineCacheMiss, 1, SendNumArgsReg, null, null, null, null, 0); @@ -19192,7 +19192,7 @@ if (!(preOpCheckOrNil == null)) { jmpTarget(jumpFailCheck, getJmpTarget(jumpFailClass)); } - genPushRegisterArgsForNumArgs(backEnd, methodOrBlockNumArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, methodOrBlockNumArgs, SendNumArgsReg); /* begin Jump: */ jumpFailClass = genoperand(Jump, ((sqInt)0)); jmpTarget(jumpImmediate, gLabel()); @@ -19766,7 +19766,7 @@ /* N.B. a closed PIC jumps to the miss routine, not calls it, so there is only one retpc on the stack. */ opcodeIndex = 0; - genPushRegisterArgsForNumArgs(backEnd, numArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, numArgs, SendNumArgsReg); genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceCPICMissreceiver, trampolineNamenumArgs("cePICMiss", (numArgs <= 2 ? numArgs : -1)), 2, ClassReg, ReceiverResultReg, null, null, 0, 1, null, 1); @@ -20741,7 +20741,7 @@ { if (!(regArgsHaveBeenPushed || (methodOrBlockNumArgs > 2))) { - genPushRegisterArgsForNumArgs(backEnd, methodOrBlockNumArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, methodOrBlockNumArgs, SendNumArgsReg); regArgsHaveBeenPushed = 1; } } @@ -20832,7 +20832,7 @@ startAddress = methodZoneBase; opcodeIndex = 0; - genPushRegisterArgsForNumArgs(backEnd, numArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, numArgs, SendNumArgsReg); genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(aRoutine, aString, 4, regOrConst0, regOrConst1, regOrConst2, regOrConst3, 0, 1, null, 1); return startAddress; } Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2015-06-01 18:53:32 UTC (rev 3364) +++ branches/Cog/src/vm/cogit.h 2015-06-02 00:20:23 UTC (rev 3365) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1331 uuid: 2da6f9fc-7921-4c8b-8c78-dd47f9ddd76e + CCodeGenerator VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 */ Modified: branches/Cog/src/vm/cogitARMv5.c =================================================================== --- branches/Cog/src/vm/cogitARMv5.c 2015-06-01 18:53:32 UTC (rev 3364) +++ branches/Cog/src/vm/cogitARMv5.c 2015-06-02 00:20:23 UTC (rev 3365) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1331 uuid: 2da6f9fc-7921-4c8b-8c78-dd47f9ddd76e + CCodeGenerator VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1331 uuid: 2da6f9fc-7921-4c8b-8c78-dd47f9ddd76e + StackToRegisterMappingCogit VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1331 uuid: 2da6f9fc-7921-4c8b-8c78-dd47f9ddd76e " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -463,7 +463,7 @@ static sqInt genPassConstasArgument(AbstractInstruction * self_in_genPassConstasArgument, sqInt constant, sqInt zeroRelativeArgIndex) NoDbgRegParms; static sqInt genPassRegasArgument(AbstractInstruction * self_in_genPassRegasArgument, sqInt abstractRegister, sqInt zeroRelativeArgIndex) NoDbgRegParms; static AbstractInstruction * genPushRegisterArgsForAbortMissNumArgs(AbstractInstruction * self_in_genPushRegisterArgsForAbortMissNumArgs, sqInt numArgs) NoDbgRegParms; -static AbstractInstruction * genPushRegisterArgsForNumArgs(AbstractInstruction * self_in_genPushRegisterArgsForNumArgs, sqInt numArgs) NoDbgRegParms; +static AbstractInstruction * genPushRegisterArgsForNumArgsscratchReg(AbstractInstruction * self_in_genPushRegisterArgsForNumArgsscratchReg, sqInt numArgs, sqInt ignored) NoDbgRegParms; static sqInt genRemoveNArgsFromStack(AbstractInstruction * self_in_genRemoveNArgsFromStack, sqInt n) NoDbgRegParms; static AbstractInstruction * genRestoreRegs(AbstractInstruction * self_in_genRestoreRegs) NoDbgRegParms; static AbstractInstruction * genRestoreRegsExcept(AbstractInstruction * self_in_genRestoreRegsExcept, sqInt abstractReg) NoDbgRegParms; @@ -5903,9 +5903,9 @@ NOTA BENE: we do NOT push the return address here, which means it must be dealt with later. */ - /* CogARMCompiler>>#genPushRegisterArgsForNumArgs: */ + /* CogARMCompiler>>#genPushRegisterArgsForNumArgs:scratchReg: */ static AbstractInstruction * -genPushRegisterArgsForNumArgs(AbstractInstruction * self_in_genPushRegisterArgsForNumArgs, sqInt numArgs) +genPushRegisterArgsForNumArgsscratchReg(AbstractInstruction * self_in_genPushRegisterArgsForNumArgsscratchReg, sqInt numArgs, sqInt ignored) { if (numArgs <= 1) { assert((numRegArgs()) <= 2); @@ -5920,7 +5920,7 @@ } } } - return self_in_genPushRegisterArgsForNumArgs; + return self_in_genPushRegisterArgsForNumArgsscratchReg; } @@ -17930,7 +17930,7 @@ /* begin JumpZero: */ genoperand(JumpZero, ((sqInt)itsAHit)); jmpTarget(jumpSelectorMiss, gLabel()); - genPushRegisterArgsForNumArgs(backEnd, numArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, numArgs, SendNumArgsReg); genSmalltalkToCStackSwitch(1); addDependent(methodLabel, annotateAbsolutePCRef(gMoveCwR(((sqInt)methodLabel), SendNumArgsReg))); compileCallFornumArgsargargargargresultRegsaveRegs(ceSendFromInLineCacheMiss, 1, SendNumArgsReg, null, null, null, null, 0); @@ -18230,7 +18230,7 @@ if (!(preOpCheckOrNil == null)) { jmpTarget(jumpFailCheck, getJmpTarget(jumpFailClass)); } - genPushRegisterArgsForNumArgs(backEnd, methodOrBlockNumArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, methodOrBlockNumArgs, SendNumArgsReg); /* begin Jump: */ jumpFailClass = genoperand(Jump, ((sqInt)0)); jmpTarget(jumpImmediate, gLabel()); @@ -18786,7 +18786,7 @@ /* N.B. a closed PIC jumps to the miss routine, not calls it, so there is only one retpc on the stack. */ opcodeIndex = 0; - genPushRegisterArgsForNumArgs(backEnd, numArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, numArgs, SendNumArgsReg); genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceCPICMissreceiver, trampolineNamenumArgs("cePICMiss", (numArgs <= 1 ? numArgs : -1)), 2, ClassReg, ReceiverResultReg, null, null, 0, 1, null, 1); @@ -19763,7 +19763,7 @@ { if (!(regArgsHaveBeenPushed || (methodOrBlockNumArgs > 1))) { - genPushRegisterArgsForNumArgs(backEnd, methodOrBlockNumArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, methodOrBlockNumArgs, SendNumArgsReg); regArgsHaveBeenPushed = 1; } } @@ -19854,7 +19854,7 @@ startAddress = methodZoneBase; opcodeIndex = 0; - genPushRegisterArgsForNumArgs(backEnd, numArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, numArgs, SendNumArgsReg); genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(aRoutine, aString, 4, regOrConst0, regOrConst1, regOrConst2, regOrConst3, 0, 1, null, 1); return startAddress; } Modified: branches/Cog/src/vm/cogitIA32.c =================================================================== --- branches/Cog/src/vm/cogitIA32.c 2015-06-01 18:53:32 UTC (rev 3364) +++ branches/Cog/src/vm/cogitIA32.c 2015-06-02 00:20:23 UTC (rev 3365) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1331 uuid: 2da6f9fc-7921-4c8b-8c78-dd47f9ddd76e + CCodeGenerator VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1331 uuid: 2da6f9fc-7921-4c8b-8c78-dd47f9ddd76e + StackToRegisterMappingCogit VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1331 uuid: 2da6f9fc-7921-4c8b-8c78-dd47f9ddd76e " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1332 uuid: 528336b3-25ab-41f7-b788-2b9155e5d980 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -439,7 +439,7 @@ static sqInt genPassConstasArgument(AbstractInstruction * self_in_genPassConstasArgument, sqInt constant, sqInt zeroRelativeArgIndex) NoDbgRegParms; static sqInt genPassRegasArgument(AbstractInstruction * self_in_genPassRegasArgument, sqInt abstractRegister, sqInt zeroRelativeArgIndex) NoDbgRegParms; static AbstractInstruction * genPushRegisterArgsForAbortMissNumArgs(AbstractInstruction * self_in_genPushRegisterArgsForAbortMissNumArgs, sqInt numArgs) NoDbgRegParms; -static AbstractInstruction * genPushRegisterArgsForNumArgs(AbstractInstruction * self_in_genPushRegisterArgsForNumArgs, sqInt numArgs) NoDbgRegParms; +static AbstractInstruction * genPushRegisterArgsForNumArgsscratchReg(AbstractInstruction * self_in_genPushRegisterArgsForNumArgsscratchReg, sqInt numArgs, sqInt scratchReg) NoDbgRegParms; static sqInt genRemoveNArgsFromStack(AbstractInstruction * self_in_genRemoveNArgsFromStack, sqInt n) NoDbgRegParms; static sqInt genRestoreRegs(AbstractInstruction * self_in_genRestoreRegs) NoDbgRegParms; static sqInt genRestoreRegsExcept(AbstractInstruction * self_in_genRestoreRegsExcept, sqInt abstractReg) NoDbgRegParms; @@ -5096,7 +5096,7 @@ /* Ensure that the register args are pushed before the retpc for arity <= self numRegArgs. This - won't be as clumsy on a RISC. But putting the receiver and args above the + isn't as clumsy on a RISC. But putting the receiver and args above the return address means the CoInterpreter has a single machine-code frame format which saves us a lot of work. @@ -5108,9 +5108,9 @@ use SendNumArgsReg because it is only live in sends of arity >= (NumSendTrampolines - 1). */ - /* CogIA32Compiler>>#genPushRegisterArgsForNumArgs: */ + /* CogIA32Compiler>>#genPushRegisterArgsForNumArgs:scratchReg: */ static AbstractInstruction * -genPushRegisterArgsForNumArgs(AbstractInstruction * self_in_genPushRegisterArgsForNumArgs, sqInt numArgs) +genPushRegisterArgsForNumArgsscratchReg(AbstractInstruction * self_in_genPushRegisterArgsForNumArgsscratchReg, sqInt numArgs, sqInt scratchReg) { assert((numRegArgs()) < (NumSendTrampolines - 1)); if (numArgs <= 1) { @@ -5121,7 +5121,7 @@ but XCHG is slow. */ /* begin MoveMw:r:R: */ - genoperandoperandoperand(MoveMwrR, 0, SPReg, SendNumArgsReg); + genoperandoperandoperand(MoveMwrR, 0, SPReg, scratchReg); /* begin MoveR:Mw:r: */ genoperandoperandoperand(MoveRMwr, ReceiverResultReg, 0, SPReg); if (numArgs > 0) { @@ -5133,10 +5133,10 @@ } } /* begin PushR: */ - genoperand(PushR, SendNumArgsReg); + genoperand(PushR, scratchReg); } - return self_in_genPushRegisterArgsForNumArgs; + return self_in_genPushRegisterArgsForNumArgsscratchReg; } /* CogIA32Compiler>>#genRemoveNArgsFromStack: */ @@ -16701,7 +16701,7 @@ /* begin JumpZero: */ genoperand(JumpZero, ((sqInt)itsAHit)); jmpTarget(jumpSelectorMiss, gLabel()); - genPushRegisterArgsForNumArgs(backEnd, numArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, numArgs, SendNumArgsReg); genSmalltalkToCStackSwitch(1); addDependent(methodLabel, annotateAbsolutePCRef(gMoveCwR(((sqInt)methodLabel), SendNumArgsReg))); compileCallFornumArgsargargargargresultRegsaveRegs(ceSendFromInLineCacheMiss, 1, SendNumArgsReg, null, null, null, null, 0); @@ -17003,7 +17003,7 @@ if (!(preOpCheckOrNil == null)) { jmpTarget(jumpFailCheck, getJmpTarget(jumpFailClass)); } - genPushRegisterArgsForNumArgs(backEnd, methodOrBlockNumArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, methodOrBlockNumArgs, SendNumArgsReg); /* begin Jump: */ jumpFailClass = genoperand(Jump, ((sqInt)0)); jmpTarget(jumpImmediate, gLabel()); @@ -17556,7 +17556,7 @@ /* N.B. a closed PIC jumps to the miss routine, not calls it, so there is only one retpc on the stack. */ opcodeIndex = 0; - genPushRegisterArgsForNumArgs(backEnd, numArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, numArgs, SendNumArgsReg); genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceCPICMissreceiver, trampolineNamenumArgs("cePICMiss", (numArgs <= 1 ? numArgs : -1)), 2, ClassReg, ReceiverResultReg, null, null, 0, 1, null, 1); @@ -18533,7 +18533,7 @@ { if (!(regArgsHaveBeenPushed || (methodOrBlockNumArgs > 1))) { - genPushRegisterArgsForNumArgs(backEnd, methodOrBlockNumArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, methodOrBlockNumArgs, SendNumArgsReg); regArgsHaveBeenPushed = 1; } } @@ -18624,7 +18624,7 @@ startAddress = methodZoneBase; opcodeIndex = 0; - genPushRegisterArgsForNumArgs(backEnd, numArgs); + genPushRegisterArgsForNumArgsscratchReg(backEnd, numArgs, SendNumArgsReg); genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(aRoutine, aString, 4, regOrConst0, regOrConst1, regOrConst2, regOrConst3, 0, 1, null, 1); return startAddress; }

1 0

VM Maker: VMMaker.oscog-eem.1332.mcz
by commits＠source.squeak.org 02 Jun '15

02 Jun '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1332.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1332 Author: eem Time: 1 June 2015, 5:02:18.369 pm UUID: 528336b3-25ab-41f7-b788-2b9155e5d980 Ancestors: VMMaker.oscog-eem.1331 Fix the regression in implicit receiver sends caused by VMMaker.oscog-eem.1317 (fix to performance regression caused by using XCHG on x86). The implicit receiver cache uses SendNumArgsReg to refer to the cache object. Hence we must use TempReg for genPushRegisterArgsForNumArgs: in this case. So refactor to genPushRegisterArgsForNumArgs:scratchReg:, passing either TempReg or SendNumArgsReg as approprate. =============== Diff against VMMaker.oscog-eem.1331 =============== Item was removed: - ----- Method: CogARMCompiler>>genPushRegisterArgsForNumArgs: (in category 'smalltalk calling convention') ----- - genPushRegisterArgsForNumArgs: numArgs - "Ensure that the register args are pushed before the retpc for arity <= self numRegArgs." - "This is easy on a RISC like ARM because the return address is in the link register. Putting - the receiver and args above the return address means the CoInterpreter has a single - machine-code frame format which saves us a lot of work - NOTA BENE: we do NOT push the return address here, which means it must be dealt with later." - numArgs <= cogit numRegArgs ifTrue: - [self assert: cogit numRegArgs <= 2. - cogit PushR: ReceiverResultReg. - numArgs > 0 ifTrue: - [cogit PushR: Arg0Reg. - numArgs > 1 ifTrue: - [cogit PushR: Arg1Reg]]]! Item was added: + ----- Method: CogARMCompiler>>genPushRegisterArgsForNumArgs:scratchReg: (in category 'smalltalk calling convention') ----- + genPushRegisterArgsForNumArgs: numArgs scratchReg: ignored + "Ensure that the register args are pushed before the retpc for arity <= self numRegArgs." + "This is easy on a RISC like ARM because the return address is in the link register. Putting + the receiver and args above the return address means the CoInterpreter has a single + machine-code frame format which saves us a lot of work + NOTA BENE: we do NOT push the return address here, which means it must be dealt with later." + numArgs <= cogit numRegArgs ifTrue: + [self assert: cogit numRegArgs <= 2. + cogit PushR: ReceiverResultReg. + numArgs > 0 ifTrue: + [cogit PushR: Arg0Reg. + numArgs > 1 ifTrue: + [cogit PushR: Arg1Reg]]]! Item was removed: - ----- Method: CogAbstractInstruction>>genPushRegisterArgsForNumArgs: (in category 'smalltalk calling convention') ----- - genPushRegisterArgsForNumArgs: numArgs - "Ensure that the register args are pushed before the retpc for arity <= self numRegArgs." - "This won't be as clumsy on a RISC. But putting the receiver and - args above the return address means the CoInterpreter has a - single machine-code frame format which saves us a lot of work." - - "This won't be as clumsy on a RISC. But putting the receiver and - args above the return address means the CoInterpreter has a - single machine-code frame format which saves us a lot of work." - - "Iff there are register args convert - sp -> retpc (send site retpc) - to - base -> receiver - (arg0) - (arg1) - sp -> retpc (send site retpc)" - self subclassResponsibility! Item was added: + ----- Method: CogAbstractInstruction>>genPushRegisterArgsForNumArgs:scratchReg: (in category 'smalltalk calling convention') ----- + genPushRegisterArgsForNumArgs: numArgs scratchReg: scratchReg + "Ensure that the register args are pushed before the retpc for arity <= self numRegArgs. + This isn't as clumsy on a RISC. But putting the receiver and + args above the return address means the CoInterpreter has a + single machine-code frame format which saves us a lot of work." + + "Iff there are register args convert + sp -> retpc (send site retpc) + to + base -> receiver + (arg0) + (arg1) + sp -> retpc (send site retpc)" + self subclassResponsibility! Item was removed: - ----- Method: CogIA32Compiler>>genPushRegisterArgsForNumArgs: (in category 'smalltalk calling convention') ----- - genPushRegisterArgsForNumArgs: numArgs - "Ensure that the register args are pushed before the retpc for arity <= self numRegArgs. This - won't be as clumsy on a RISC. But putting the receiver and args above the return address - means the CoInterpreter has a single machine-code frame format which saves us a lot of work. - N.B. Take great care to /not/ smash TempReg, which is used in directed send marshalling. - We could use XCHG to swap the ReceiverResultReg and top-of-stack return address, pushing the - the ret pc (now in ReceiverResultReg) later, but XCHG is very slow. We can use SendNumArgsReg - because it is only live in sends of arity >= (NumSendTrampolines - 1)." - self assert: cogit numRegArgs < (NumSendTrampolines - 1). - numArgs <= cogit numRegArgs ifTrue: - [self assert: cogit numRegArgs <= 2. - false "these two variants show the same performance on Intel Core i7, but the second one may be shorter." - ifTrue: - [cogit MoveMw: 0 r: SPReg R: SendNumArgsReg. "Save return pc" - numArgs > 0 ifTrue: - [cogit PushR: Arg0Reg. - numArgs > 1 ifTrue: - [cogit PushR: Arg1Reg]]. - cogit PushR: SendNumArgsReg. - cogit MoveR: ReceiverResultReg Mw: objectMemory wordSize * (1 + numArgs) r: SPReg] - ifFalse: - ["a.k.a. - cogit gen: XCHGMwrR operand: 0 operand: SPReg operand: ReceiverResultReg. - but XCHG is slow." - cogit MoveMw: 0 r: SPReg R: SendNumArgsReg. "Save return pc" - cogit MoveR: ReceiverResultReg Mw: 0 r: SPReg. - numArgs > 0 ifTrue: - [cogit PushR: Arg0Reg. - numArgs > 1 ifTrue: - [cogit PushR: Arg1Reg]]. - cogit PushR: SendNumArgsReg]] "Restore return address"! Item was added: + ----- Method: CogIA32Compiler>>genPushRegisterArgsForNumArgs:scratchReg: (in category 'smalltalk calling convention') ----- + genPushRegisterArgsForNumArgs: numArgs scratchReg: scratchReg + "Ensure that the register args are pushed before the retpc for arity <= self numRegArgs. This + isn't as clumsy on a RISC. But putting the receiver and args above the return address + means the CoInterpreter has a single machine-code frame format which saves us a lot of work. + N.B. Take great care to /not/ smash TempReg, which is used in directed send marshalling. + We could use XCHG to swap the ReceiverResultReg and top-of-stack return address, pushing the + the ret pc (now in ReceiverResultReg) later, but XCHG is very slow. We can use SendNumArgsReg + because it is only live in sends of arity >= (NumSendTrampolines - 1)." + self assert: cogit numRegArgs < (NumSendTrampolines - 1). + numArgs <= cogit numRegArgs ifTrue: + [self assert: cogit numRegArgs <= 2. + false "these two variants show the same performance on Intel Core i7, but the second one may be shorter." + ifTrue: + [cogit MoveMw: 0 r: SPReg R: scratchReg. "Save return pc" + numArgs > 0 ifTrue: + [cogit PushR: Arg0Reg. + numArgs > 1 ifTrue: + [cogit PushR: Arg1Reg]]. + cogit PushR: scratchReg. + cogit MoveR: ReceiverResultReg Mw: objectMemory wordSize * (1 + numArgs) r: SPReg] + ifFalse: + ["a.k.a. + cogit gen: XCHGMwrR operand: 0 operand: SPReg operand: ReceiverResultReg. + but XCHG is slow." + cogit MoveMw: 0 r: SPReg R: scratchReg. "Save return pc" + cogit MoveR: ReceiverResultReg Mw: 0 r: SPReg. + numArgs > 0 ifTrue: + [cogit PushR: Arg0Reg. + numArgs > 1 ifTrue: + [cogit PushR: Arg1Reg]]. + cogit PushR: scratchReg]] "Restore return address"! Item was changed: ----- Method: Cogit>>genNSSendTrampolineFor:numArgs:called: (in category 'initialization') ----- genNSSendTrampolineFor: aRoutine numArgs: numArgs called: aString "ReceiverResultReg: method receiver SendNumArgsReg: the NSSendCache cache" <option: #NewspeakVM> <var: #aRoutine type: #'void *'> <var: #aString type: #'char *'> | jumpMiss jumpItsTheReceiverStupid | <var: #jumpMiss type: #'AbstractInstruction *'> <var: #jumpItsTheReceiverStupid type: #'AbstractInstruction *'> opcodeIndex := 0. objectRepresentation genGetInlineCacheClassTagFrom: ReceiverResultReg into: ClassReg forEntry: false. self MoveMw: NSCClassTagIndex * objectMemory wordSize r: SendNumArgsReg R: TempReg. self CmpR: ClassReg R: TempReg. jumpMiss := self JumpNonZero: 0. self MoveMw: NSCEnclosingObjectIndex * objectMemory wordSize r: SendNumArgsReg R: TempReg. self CmpCq: 0 R: TempReg. jumpItsTheReceiverStupid := self JumpZero: 0. self MoveR: TempReg R: ReceiverResultReg. "We don't patch stack(-numArgs). See comment in ceImplicitReceiverSend:receiver:" jumpItsTheReceiverStupid jmpTarget: self Label. self MoveMw: NSCTargetIndex * objectMemory wordSize r: SendNumArgsReg R: TempReg. self JumpR: TempReg. jumpMiss jmpTarget: self Label. objectRepresentation genEnsureObjInRegNotForwarded: ReceiverResultReg scratchReg: TempReg updatingMw: FoxMFReceiver r: FPReg. + self numRegArgs > 0 ifTrue: + [backEnd genPushRegisterArgsForNumArgs: numArgs scratchReg: TempReg]. - backEnd genPushRegisterArgsForNumArgs: numArgs. ^self genTrampolineFor: aRoutine called: aString numArgs: 2 arg: SendNumArgsReg "The NSSendCache" arg: ReceiverResultReg arg: nil arg: nil saveRegs: false pushLinkReg: true resultReg: ReceiverResultReg "Never happens?" appendOpcodes: true! Item was changed: ----- Method: StackToRegisterMappingCogit>>compileOpenPIC:numArgs: (in category 'in-line cacheing') ----- compileOpenPIC: selector numArgs: numArgs "Compile the code for an open PIC. Perform a probe of the first-level method lookup cache followed by a call of ceSendFromInLineCacheMiss: if the probe fails. Override to push the register args when calling ceSendFromInLineCacheMiss:" | jumpSelectorMiss jumpClassMiss itsAHit jumpBCMethod | <var: #jumpSelectorMiss type: #'AbstractInstruction *'> <var: #jumpClassMiss type: #'AbstractInstruction *'> <var: #itsAHit type: #'AbstractInstruction *'> <var: #jumpBCMethod type: #'AbstractInstruction *'> self compilePICAbort: numArgs. entry := objectRepresentation genGetClassTagOf: ReceiverResultReg into: ClassReg scratchReg: TempReg. "Do first of three probes. See CoInterpreter>>lookupInMethodCacheSel:classTag:" self flag: #lookupInMethodCacheSel:classTag:. "so this method shows up as a sender of lookupInMethodCacheSel:class:" self MoveR: ClassReg R: SendNumArgsReg. self annotate: (self XorCw: selector R: ClassReg) objRef: selector. self LogicalShiftLeftCq: objectMemory shiftForWord R: ClassReg. self AndCq: MethodCacheMask << objectMemory shiftForWord R: ClassReg. self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheSelector << objectMemory shiftForWord) r: ClassReg R: TempReg. self annotate: (self CmpCw: selector R: TempReg) objRef: selector. jumpSelectorMiss := self JumpNonZero: 0. self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheClass << objectMemory shiftForWord) r: ClassReg R: TempReg. self CmpR: SendNumArgsReg R: TempReg. jumpClassMiss := self JumpNonZero: 0. itsAHit := self Label. "Fetch the method. The interpret trampoline requires the bytecoded method in SendNumArgsReg" self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheMethod << objectMemory shiftForWord) r: ClassReg R: SendNumArgsReg. "If the method is compiled jump to its unchecked entry-point, otherwise interpret it." objectRepresentation genLoadSlot: HeaderIndex sourceReg: SendNumArgsReg destReg: TempReg. self MoveR: TempReg R: ClassReg. jumpBCMethod := objectRepresentation genJumpSmallIntegerInScratchReg: TempReg. jumpBCMethod jmpTarget: picInterpretAbort. self AddCq: cmNoCheckEntryOffset R: ClassReg. self JumpR: ClassReg. "First probe missed. Do second of three probes. Shift hash right one and retry." jumpSelectorMiss jmpTarget: (jumpClassMiss jmpTarget: self Label). self MoveR: SendNumArgsReg R: ClassReg. self annotate: (self XorCw: selector R: ClassReg) objRef: selector. self LogicalShiftLeftCq: objectMemory shiftForWord - 1 R: ClassReg. self AndCq: MethodCacheMask << objectMemory shiftForWord R: ClassReg. self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheSelector << objectMemory shiftForWord) r: ClassReg R: TempReg. self annotate: (self CmpCw: selector R: TempReg) objRef: selector. jumpSelectorMiss := self JumpNonZero: 0. self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheClass << objectMemory shiftForWord) r: ClassReg R: TempReg. self CmpR: SendNumArgsReg R: TempReg. self JumpZero: itsAHit. "Second probe missed. Do last probe. Shift hash right two and retry." jumpSelectorMiss jmpTarget: self Label. self MoveR: SendNumArgsReg R: ClassReg. self annotate: (self XorCw: selector R: ClassReg) objRef: selector. objectMemory shiftForWord > 2 ifTrue: [self LogicalShiftLeftCq: objectMemory shiftForWord - 1 R: ClassReg]. self AndCq: MethodCacheMask << objectMemory shiftForWord R: ClassReg. self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheSelector << objectMemory shiftForWord) r: ClassReg R: TempReg. self annotate: (self CmpCw: selector R: TempReg) objRef: selector. jumpSelectorMiss := self JumpNonZero: 0. self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheClass << objectMemory shiftForWord) r: ClassReg R: TempReg. self CmpR: SendNumArgsReg R: TempReg. self JumpZero: itsAHit. "Last probe missed. Call ceSendFromInLineCacheMiss: to do the full lookup." jumpSelectorMiss jmpTarget: self Label. + backEnd genPushRegisterArgsForNumArgs: numArgs scratchReg: SendNumArgsReg. - backEnd genPushRegisterArgsForNumArgs: numArgs. self genSmalltalkToCStackSwitch: true. methodLabel addDependent: (self annotateAbsolutePCRef: (self MoveCw: methodLabel asInteger R: SendNumArgsReg)). self compileCallFor: #ceSendFromInLineCacheMiss: numArgs: 1 arg: SendNumArgsReg arg: nil arg: nil arg: nil resultReg: nil saveRegs: false "Note that this call does not return."! Item was changed: ----- Method: StackToRegisterMappingCogit>>genDoubleArithmetic:preOpCheck: (in category 'primitive generators') ----- genDoubleArithmetic: arithmeticOperator preOpCheck: preOpCheckOrNil "Receiver and arg in registers. Stack looks like return address" <var: #preOpCheckOrNil declareC: 'AbstractInstruction *(*preOpCheckOrNil)(int rcvrReg, int argReg)'> | jumpFailClass jumpFailAlloc jumpFailCheck jumpImmediate jumpNonInt doOp | <var: #jumpFailClass type: #'AbstractInstruction *'> <var: #jumpFailAlloc type: #'AbstractInstruction *'> <var: #jumpImmediate type: #'AbstractInstruction *'> <var: #jumpNonInt type: #'AbstractInstruction *'> <var: #jumpFailCheck type: #'AbstractInstruction *'> <var: #doOp type: #'AbstractInstruction *'> self MoveR: Arg0Reg R: TempReg. objectRepresentation genGetDoubleValueOf: ReceiverResultReg into: DPFPReg0. self MoveR: Arg0Reg R: ClassReg. jumpImmediate := objectRepresentation genJumpImmediateInScratchReg: TempReg. objectRepresentation genGetCompactClassIndexNonImmOf: Arg0Reg into: SendNumArgsReg. objectRepresentation genCmpClassFloatCompactIndexR: SendNumArgsReg. jumpFailClass := self JumpNonZero: 0. objectRepresentation genGetDoubleValueOf: Arg0Reg into: DPFPReg1. doOp := self Label. preOpCheckOrNil ifNotNil: [jumpFailCheck := self perform: preOpCheckOrNil with: DPFPReg0 with: DPFPReg1]. self gen: arithmeticOperator operand: DPFPReg1 operand: DPFPReg0. jumpFailAlloc := objectRepresentation genAllocFloatValue: DPFPReg0 into: SendNumArgsReg scratchReg: ClassReg scratchReg: TempReg. self MoveR: SendNumArgsReg R: ReceiverResultReg. self RetN: 0. "We need to push the register args on two paths; this one and the interpreter primitive path. But the interpreter primitive path won't unless regArgsHaveBeenPushed is false." self assert: methodOrBlockNumArgs <= self numRegArgs. jumpFailClass jmpTarget: self Label. preOpCheckOrNil ifNotNil: [jumpFailCheck jmpTarget: jumpFailClass getJmpTarget]. + backEnd genPushRegisterArgsForNumArgs: methodOrBlockNumArgs scratchReg: SendNumArgsReg. - backEnd genPushRegisterArgsForNumArgs: methodOrBlockNumArgs. jumpFailClass := self Jump: 0. jumpImmediate jmpTarget: self Label. objectRepresentation smallIntegerIsOnlyImmediateType ifFalse: [jumpNonInt := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg]. objectRepresentation genConvertSmallIntegerToIntegerInReg: ClassReg. self ConvertR: ClassReg Rd: DPFPReg1. self Jump: doOp. jumpFailAlloc jmpTarget: self Label. self compileFallbackToInterpreterPrimitive. jumpFailClass jmpTarget: self Label. objectRepresentation smallIntegerIsOnlyImmediateType ifFalse: [jumpNonInt jmpTarget: jumpFailClass getJmpTarget]. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genPICMissTrampolineFor: (in category 'initialization') ----- genPICMissTrampolineFor: numArgs <inline: false> | startAddress | startAddress := methodZoneBase. opcodeIndex := 0. "N.B. a closed PIC jumps to the miss routine, not calls it, so there is only one retpc on the stack." + backEnd genPushRegisterArgsForNumArgs: numArgs scratchReg: SendNumArgsReg. - backEnd genPushRegisterArgsForNumArgs: numArgs. self genTrampolineFor: #ceCPICMiss:receiver: called: (self trampolineName: 'cePICMiss' numArgs: (numArgs <= self numRegArgs ifTrue: [numArgs] ifFalse: [-1])) numArgs: 2 arg: ClassReg arg: ReceiverResultReg arg: nil arg: nil saveRegs: false pushLinkReg: true resultReg: nil appendOpcodes: true. ^startAddress! Item was changed: ----- Method: StackToRegisterMappingCogit>>genPushRegisterArgs (in category 'compile abstract instructions') ----- genPushRegisterArgs "Ensure that the register args are pushed before the retpc for methods with arity <= self numRegArgs." "This won't be as clumsy on a RISC. But putting the receiver and args above the return address means the CoInterpreter has a single machine-code frame format which saves us a lot of work." (regArgsHaveBeenPushed or: [methodOrBlockNumArgs > self numRegArgs]) ifFalse: + [backEnd genPushRegisterArgsForNumArgs: methodOrBlockNumArgs scratchReg: SendNumArgsReg. - [backEnd genPushRegisterArgsForNumArgs: methodOrBlockNumArgs. regArgsHaveBeenPushed := true]! Item was changed: ----- Method: StackToRegisterMappingCogit>>genSendTrampolineFor:numArgs:called:arg:arg:arg: (in category 'initialization') ----- genSendTrampolineFor: aRoutine numArgs: numArgs called: aString arg: regOrConst0 arg: regOrConst1 arg: regOrConst2 "Generate a trampoline with three arguments. Hack: a negative value indicates an abstract register, a non-negative value indicates a constant." <var: #aRoutine type: #'void *'> <var: #aString type: #'char *'> | startAddress | <inline: false> startAddress := methodZoneBase. opcodeIndex := 0. + backEnd genPushRegisterArgsForNumArgs: numArgs scratchReg: SendNumArgsReg. - backEnd genPushRegisterArgsForNumArgs: numArgs. self genTrampolineFor: aRoutine called: aString numArgs: 3 arg: regOrConst0 arg: regOrConst1 arg: regOrConst2 arg: nil saveRegs: false pushLinkReg: true resultReg: nil appendOpcodes: true. ^startAddress! Item was changed: ----- Method: StackToRegisterMappingCogit>>genSendTrampolineFor:numArgs:called:arg:arg:arg:arg: (in category 'initialization') ----- genSendTrampolineFor: aRoutine numArgs: numArgs called: aString arg: regOrConst0 arg: regOrConst1 arg: regOrConst2 arg: regOrConst3 "Generate a trampoline with four arguments. Hack: a negative value indicates an abstract register, a non-negative value indicates a constant." <var: #aRoutine type: #'void *'> <var: #aString type: #'char *'> | startAddress | <inline: false> startAddress := methodZoneBase. opcodeIndex := 0. + backEnd genPushRegisterArgsForNumArgs: numArgs scratchReg: SendNumArgsReg. - backEnd genPushRegisterArgsForNumArgs: numArgs. self genTrampolineFor: aRoutine called: aString numArgs: 4 arg: regOrConst0 arg: regOrConst1 arg: regOrConst2 arg: regOrConst3 saveRegs: false pushLinkReg: true resultReg: nil appendOpcodes: true. ^startAddress!

1 0

New Cog VMs available
by Eliot Miranda 02 Jun '15

02 Jun '15

... at http://www.mirandabanda.org/files/Cog/VM/VM.r3364 CogVM binaries as per VMMaker.oscog-eem.1331/r3364 General: Merge with Pharo (with VMMaker.oscog-EstebanLorenzano.1322). Changes are null to Squeak VM. Pulled in are conditionally compiled changes for directory & file creation (added ceration permissions) and to macro used to read image file (for iPhone). Cogit: Test the outerContext and method for sanity in the machine code closure value primitive(s). Spur must check to fail in the presence of forwarders. To support the primitive provide TstCqR support on x86 (already exists on ARM), and use it to implement genJumpImmediate: et al. Use the new genJumpImmediate: et al in various basic access primitives. Good for a 5%-10% increase in 0 tinyBenchmarks on Spur. Guard access to the inline cache tag in PICs in GC routines by inlineCacheTagsMayBeObjects. Spur: Spur must follow forwarders in machine code before it follows forwarders in stack pages (since stack page parsing examines methods). Further, closed PICs that refer to unmarked objects must be discarded in freeUnmarkedMachineCode. And closedPICRefersToUnmarkedObject: should guard against an immediate selector. -- best, Eliot

2 1

[commit][3364] The Unix build needs an extra dependency.
by commits＠squeakvm.org 01 Jun '15

01 Jun '15

Revision: 3364 Author: eliot Date: 2015-06-01 11:53:32 -0700 (Mon, 01 Jun 2015) Log Message: ----------- The Unix build needs an extra dependency. Add a convenience to make makefiles. Modified Paths: -------------- branches/Cog/platforms/unix/vm/Makefile.in Added Paths: ----------- branches/Cog/build.linux32x86/makeallmakefiles Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Added: branches/Cog/build.linux32x86/makeallmakefiles =================================================================== --- branches/Cog/build.linux32x86/makeallmakefiles (rev 0) +++ branches/Cog/build.linux32x86/makeallmakefiles 2015-06-01 18:53:32 UTC (rev 3364) @@ -0,0 +1,11 @@ +#!/bin/bash +trap 'exit 2' HUP INT PIPE TERM +for td in *.v3 *.spur; do + for d in $td/build*; do + if test -d "$d"; then + (cd $d;../../../platforms/unix/config/mkmf) + else + echo no $d directory found + fi + done +done Property changes on: branches/Cog/build.linux32x86/makeallmakefiles ___________________________________________________________________ Added: svn:executable + * Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Sat May 30 13:20:39 PDT 2015 + Mon Jun 1 11:53:22 PDT 2015 Modified: branches/Cog/platforms/unix/vm/Makefile.in =================================================================== --- branches/Cog/platforms/unix/vm/Makefile.in 2015-05-30 20:21:09 UTC (rev 3363) +++ branches/Cog/platforms/unix/vm/Makefile.in 2015-06-01 18:53:32 UTC (rev 3364) @@ -74,6 +74,9 @@ # cogit.c merely includes specific a specific cogitPROCESSOR.c cogit$o : $(srcdir)/vm/cogitARMv5.c $(srcdir)/vm/cogitIA32.c +# sqUnixHeartbeat.c includes sqSCCSVersion.h +sqUnixHeartbeat$o : $(topdir)/platforms/Cross/vm/sqSCCSVersion.h + # rebuild sqExtPrims sqUnixMain if config.h changes sqUnixExternalPrims$o sqUnixMain$o : ../config.h $(topdir)/platforms/unix/vm/dlfcn-dyld.c

1 0

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 June 2015