Vm-dev August 2013

vm-dev@lists.squeakfoundation.org

26 participants
167 discussions

[commit][2775] CogVM source as per VMMaker.oscog-eem.329
by commits＠squeakvm.org 21 Aug '13

21 Aug '13

Revision: 2775 Author: eliot Date: 2013-08-20 18:28:22 -0700 (Tue, 20 Aug 2013) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.329 Set the inBlock variable in scanBlock and scanMethod. Change the argument to the needsFrameFunction to be the stack delta. Change genSpecialSelectorClass's needsFrameFunction to needsFrameIfStackGreaterThanOne: which better handles e.g. TextColor>>dominates: other ^self class == other class than needsFrameIfFollowsSend:. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2013-08-20 01:18:13 UTC (rev 2774) +++ branches/Cog/nscogsrc/vm/cogit.c 2013-08-21 01:28:22 UTC (rev 2775) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde + CCodeGenerator VMMaker.oscog-eem.329 uuid: 5bf1ecce-8cdb-48fd-bc66-b41b4cff2efe from - StackToRegisterMappingCogit VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde + StackToRegisterMappingCogit VMMaker.oscog-eem.329 uuid: 5bf1ecce-8cdb-48fd-bc66-b41b4cff2efe */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.329 uuid: 5bf1ecce-8cdb-48fd-bc66-b41b4cff2efe " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -918,10 +918,10 @@ sqInt mnuOffset(void); static sqInt modRMRO(AbstractInstruction * self_in_modRMRO, sqInt mod, sqInt regMode, sqInt regOpcode); static AbstractInstruction * gNegateR(sqInt reg); -static sqInt needsFrameIfFollowsSend(sqInt isInBlock); -static sqInt needsFrameIfInBlock(sqInt isInBlock); -static sqInt needsFrameIfMod16GENumArgs(sqInt isInBlock); -static sqInt needsFrameNever(sqInt isInBlock); +static sqInt needsFrameIfInBlock(sqInt stackDelta); +static sqInt needsFrameIfMod16GENumArgs(sqInt stackDelta); +static sqInt needsFrameIfStackGreaterThanOne(sqInt stackDelta); +static sqInt needsFrameNever(sqInt stackDelta); static sqInt noAssertMethodClassAssociationOf(sqInt methodPointer); static sqInt noCogMethodsMaximallyMarked(void); static void nopsFromto(AbstractInstruction * self_in_nopsFromto, sqInt startAddr, sqInt endAddr); @@ -1355,8 +1355,8 @@ { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 }, { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 }, { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 }, - { genSpecialSelectorEqualsEquals, 0, needsFrameIfFollowsSend, -1, 0, 1, 0, 0, 0, 0, 0, 0, 0 }, - { genSpecialSelectorClass, 0, needsFrameIfFollowsSend, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0 }, + { genSpecialSelectorEqualsEquals, 0, needsFrameNever, -1, 0, 1, 0, 0, 0, 0, 0, 0, 0 }, + { genSpecialSelectorClass, 0, needsFrameIfStackGreaterThanOne, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0 }, { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 }, { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 }, { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 }, @@ -1515,8 +1515,8 @@ { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 }, { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 }, { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 }, - { genSpecialSelectorEqualsEquals, 0, needsFrameIfFollowsSend, -1, 0, 1, 0, 0, 0, 0, 0, 0, 0 }, - { genSpecialSelectorClass, 0, needsFrameIfFollowsSend, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0 }, + { genSpecialSelectorEqualsEquals, 0, needsFrameNever, -1, 0, 1, 0, 0, 0, 0, 0, 0, 0 }, + { genSpecialSelectorClass, 0, needsFrameIfStackGreaterThanOne, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0 }, { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 }, { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 }, { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 }, @@ -16106,42 +16106,38 @@ return genoperand(NegateR, reg); } - -/* As of August 2013, the code generator can't deal with spills in frameless - methods (the - issue is to do with the stack offset to get at an argument, which is - changed when there's a spill). - The only context in a spill is needed in a frameless method that I can - think of is sends - following sends as in e.g. TextColor>>#dominates: other ^other class == - self class. - Only need to check for the frameless sends since all other sends will - force a frame. - */ - static sqInt -needsFrameIfFollowsSend(sqInt isInBlock) +needsFrameIfInBlock(sqInt stackDelta) { - assert((prevBCDescriptor != null) - && (((prevBCDescriptor->needsFrameFunction)) != null)); - return (((prevBCDescriptor->generator)) == genSpecialSelectorEqualsEquals) - || (((prevBCDescriptor->generator)) == genSpecialSelectorClass); + return inBlock; } static sqInt -needsFrameIfInBlock(sqInt isInBlock) +needsFrameIfMod16GENumArgs(sqInt stackDelta) { - return inBlock; + return (byte0 % 16) >= methodOrBlockNumArgs; } + +/* As of August 2013, the code generator can't deal with spills in frameless + methods (the + issue is to do with the stack offset to get at an argument, which is + changed when there's a spill). + In e.g. TextColor>>#dominates: other ^other class == self class the second + send of class + needs also rto allocate a register that the first one used, but the first + one's register can't be + spilled. So avoid this by only allowing class to be sent if the stack + contains a single element. */ + static sqInt -needsFrameIfMod16GENumArgs(sqInt isInBlock) +needsFrameIfStackGreaterThanOne(sqInt stackDelta) { - return (byte0 % 16) >= methodOrBlockNumArgs; + return stackDelta > 1; } static sqInt -needsFrameNever(sqInt isInBlock) +needsFrameNever(sqInt stackDelta) { return 0; } @@ -17478,30 +17474,30 @@ { BytecodeDescriptor *descriptor; sqInt end; + sqInt framelessStackDelta; sqInt (* const isPushNilFunction)(struct _BytecodeDescriptor *,sqInt,sqInt,sqInt) = v3or4IsPushNil; sqInt nExts; sqInt pc; sqInt pushingNils; - sqInt stackDelta; needsFrame = 0; prevBCDescriptor = null; methodOrBlockNumArgs = (blockStart->numArgs); - nExts = 0; + inBlock = 1; pc = (blockStart->startpc); end = ((blockStart->startpc)) + ((blockStart->span)); - stackDelta = 0; + framelessStackDelta = (nExts = 0); pushingNils = 1; while (pc < end) { byte0 = (fetchByteofObject(pc, methodObj)) + bytecodeSetOffset; descriptor = generatorAt(byte0); if (!needsFrame) { if ((((descriptor->needsFrameFunction)) == null) - || (((descriptor->needsFrameFunction))(1))) { + || (((descriptor->needsFrameFunction))(framelessStackDelta))) { needsFrame = 1; } else { - stackDelta += (descriptor->stackDelta); + framelessStackDelta += (descriptor->stackDelta); } } if (pushingNils @@ -17528,9 +17524,9 @@ prevBCDescriptor = descriptor; } if (!needsFrame) { - assert((stackDelta >= 0) - && (((blockStart->numInitialNils)) >= stackDelta)); - (blockStart->numInitialNils = ((blockStart->numInitialNils)) - stackDelta); + assert((framelessStackDelta >= 0) + && (((blockStart->numInitialNils)) >= framelessStackDelta)); + (blockStart->numInitialNils = ((blockStart->numInitialNils)) - framelessStackDelta); } } @@ -17560,7 +17556,7 @@ } -/* Scan the method to determine +/* Scan the method (and all embedded blocks) to determine - what the last bytecode is; extra bytes at the end of a method are used to encode things like source pointers or temp names - if the method needs a frame or not @@ -17573,6 +17569,7 @@ { BytecodeDescriptor *descriptor; sqInt distance; + sqInt framelessStackDelta; sqInt latestContinuation; sqInt nExts; sqInt numBlocks; @@ -17580,14 +17577,14 @@ sqInt targetPC; needsFrame = 0; + inBlock = 0; prevBCDescriptor = null; if ((primitiveIndex > 0) && (isQuickPrimitiveIndex(primitiveIndex))) { return 0; } - numBlocks = 0; pc = (latestContinuation = initialPC); - nExts = 0; + numBlocks = (framelessStackDelta = (nExts = 0)); while (pc <= endPC) { byte0 = (fetchByteofObject(pc, methodObj)) + bytecodeSetOffset; descriptor = generatorAt(byte0); @@ -17595,10 +17592,14 @@ && (pc >= latestContinuation)) { endPC = pc; } - if ((!needsFrame) - && ((((descriptor->needsFrameFunction)) == null) - || (((descriptor->needsFrameFunction))(0)))) { - needsFrame = 1; + if (!needsFrame) { + if ((((descriptor->needsFrameFunction)) == null) + || (((descriptor->needsFrameFunction))(framelessStackDelta))) { + needsFrame = 1; + } + else { + framelessStackDelta += (descriptor->stackDelta); + } } if (isBranch(descriptor)) { distance = ((descriptor->spanFunction))(descriptor, pc, nExts, methodObj); Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2013-08-20 01:18:13 UTC (rev 2774) +++ branches/Cog/nscogsrc/vm/cogit.h 2013-08-21 01:28:22 UTC (rev 2775) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde + CCodeGenerator VMMaker.oscog-eem.329 uuid: 5bf1ecce-8cdb-48fd-bc66-b41b4cff2efe */ Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2013-08-20 01:18:13 UTC (rev 2774) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2013-08-21 01:28:22 UTC (rev 2775) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde + CCodeGenerator VMMaker.oscog-eem.329 uuid: 5bf1ecce-8cdb-48fd-bc66-b41b4cff2efe */ typedef struct { Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Sat Aug 17 14:48:34 PDT 2013 + Tue Aug 20 18:27:27 PDT 2013 Modified: branches/Cog/src/vm/cogit.c =================================================================== --- branches/Cog/src/vm/cogit.c 2013-08-20 01:18:13 UTC (rev 2774) +++ branches/Cog/src/vm/cogit.c 2013-08-21 01:28:22 UTC (rev 2775) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde + CCodeGenerator VMMaker.oscog-eem.329 uuid: 5bf1ecce-8cdb-48fd-bc66-b41b4cff2efe from - StackToRegisterMappingCogit VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde + StackToRegisterMappingCogit VMMaker.oscog-eem.329 uuid: 5bf1ecce-8cdb-48fd-bc66-b41b4cff2efe */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.329 uuid: 5bf1ecce-8cdb-48fd-bc66-b41b4cff2efe " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -873,10 +873,10 @@ sqInt mnuOffset(void); static sqInt modRMRO(AbstractInstruction * self_in_modRMRO, sqInt mod, sqInt regMode, sqInt regOpcode); static AbstractInstruction * gNegateR(sqInt reg); -static sqInt needsFrameIfFollowsSend(sqInt isInBlock); -static sqInt needsFrameIfInBlock(sqInt isInBlock); -static sqInt needsFrameIfMod16GENumArgs(sqInt isInBlock); -static sqInt needsFrameNever(sqInt isInBlock); +static sqInt needsFrameIfInBlock(sqInt stackDelta); +static sqInt needsFrameIfMod16GENumArgs(sqInt stackDelta); +static sqInt needsFrameIfStackGreaterThanOne(sqInt stackDelta); +static sqInt needsFrameNever(sqInt stackDelta); static sqInt noAssertMethodClassAssociationOf(sqInt methodPointer); static sqInt noCogMethodsMaximallyMarked(void); static void nopsFromto(AbstractInstruction * self_in_nopsFromto, sqInt startAddr, sqInt endAddr); @@ -1298,8 +1298,8 @@ { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 }, { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 }, { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 }, - { genSpecialSelectorEqualsEquals, 0, needsFrameIfFollowsSend, -1, 0, 1, 0, 0, 0, 0, 0, 0, 0 }, - { genSpecialSelectorClass, 0, needsFrameIfFollowsSend, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0 }, + { genSpecialSelectorEqualsEquals, 0, needsFrameNever, -1, 0, 1, 0, 0, 0, 0, 0, 0, 0 }, + { genSpecialSelectorClass, 0, needsFrameIfStackGreaterThanOne, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0 }, { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 }, { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 }, { genSpecialSelectorSend, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0 }, @@ -14756,42 +14756,38 @@ return genoperand(NegateR, reg); } - -/* As of August 2013, the code generator can't deal with spills in frameless - methods (the - issue is to do with the stack offset to get at an argument, which is - changed when there's a spill). - The only context in a spill is needed in a frameless method that I can - think of is sends - following sends as in e.g. TextColor>>#dominates: other ^other class == - self class. - Only need to check for the frameless sends since all other sends will - force a frame. - */ - static sqInt -needsFrameIfFollowsSend(sqInt isInBlock) +needsFrameIfInBlock(sqInt stackDelta) { - assert((prevBCDescriptor != null) - && (((prevBCDescriptor->needsFrameFunction)) != null)); - return (((prevBCDescriptor->generator)) == genSpecialSelectorEqualsEquals) - || (((prevBCDescriptor->generator)) == genSpecialSelectorClass); + return inBlock; } static sqInt -needsFrameIfInBlock(sqInt isInBlock) +needsFrameIfMod16GENumArgs(sqInt stackDelta) { - return inBlock; + return (byte0 % 16) >= methodOrBlockNumArgs; } + +/* As of August 2013, the code generator can't deal with spills in frameless + methods (the + issue is to do with the stack offset to get at an argument, which is + changed when there's a spill). + In e.g. TextColor>>#dominates: other ^other class == self class the second + send of class + needs also rto allocate a register that the first one used, but the first + one's register can't be + spilled. So avoid this by only allowing class to be sent if the stack + contains a single element. */ + static sqInt -needsFrameIfMod16GENumArgs(sqInt isInBlock) +needsFrameIfStackGreaterThanOne(sqInt stackDelta) { - return (byte0 % 16) >= methodOrBlockNumArgs; + return stackDelta > 1; } static sqInt -needsFrameNever(sqInt isInBlock) +needsFrameNever(sqInt stackDelta) { return 0; } @@ -16018,30 +16014,30 @@ { BytecodeDescriptor *descriptor; sqInt end; + sqInt framelessStackDelta; sqInt (* const isPushNilFunction)(struct _BytecodeDescriptor *,sqInt,sqInt,sqInt) = v3IsPushNil; sqInt nExts; sqInt pc; sqInt pushingNils; - sqInt stackDelta; needsFrame = 0; prevBCDescriptor = null; methodOrBlockNumArgs = (blockStart->numArgs); - nExts = 0; + inBlock = 1; pc = (blockStart->startpc); end = ((blockStart->startpc)) + ((blockStart->span)); - stackDelta = 0; + framelessStackDelta = (nExts = 0); pushingNils = 1; while (pc < end) { byte0 = (fetchByteofObject(pc, methodObj)) + bytecodeSetOffset; descriptor = generatorAt(byte0); if (!needsFrame) { if ((((descriptor->needsFrameFunction)) == null) - || (((descriptor->needsFrameFunction))(1))) { + || (((descriptor->needsFrameFunction))(framelessStackDelta))) { needsFrame = 1; } else { - stackDelta += (descriptor->stackDelta); + framelessStackDelta += (descriptor->stackDelta); } } if (pushingNils @@ -16068,9 +16064,9 @@ prevBCDescriptor = descriptor; } if (!needsFrame) { - assert((stackDelta >= 0) - && (((blockStart->numInitialNils)) >= stackDelta)); - (blockStart->numInitialNils = ((blockStart->numInitialNils)) - stackDelta); + assert((framelessStackDelta >= 0) + && (((blockStart->numInitialNils)) >= framelessStackDelta)); + (blockStart->numInitialNils = ((blockStart->numInitialNils)) - framelessStackDelta); } } @@ -16100,7 +16096,7 @@ } -/* Scan the method to determine +/* Scan the method (and all embedded blocks) to determine - what the last bytecode is; extra bytes at the end of a method are used to encode things like source pointers or temp names - if the method needs a frame or not @@ -16113,6 +16109,7 @@ { BytecodeDescriptor *descriptor; sqInt distance; + sqInt framelessStackDelta; sqInt latestContinuation; sqInt nExts; sqInt numBlocks; @@ -16120,14 +16117,14 @@ sqInt targetPC; needsFrame = 0; + inBlock = 0; prevBCDescriptor = null; if ((primitiveIndex > 0) && (isQuickPrimitiveIndex(primitiveIndex))) { return 0; } - numBlocks = 0; pc = (latestContinuation = initialPC); - nExts = 0; + numBlocks = (framelessStackDelta = (nExts = 0)); while (pc <= endPC) { byte0 = (fetchByteofObject(pc, methodObj)) + bytecodeSetOffset; descriptor = generatorAt(byte0); @@ -16135,10 +16132,14 @@ && (pc >= latestContinuation)) { endPC = pc; } - if ((!needsFrame) - && ((((descriptor->needsFrameFunction)) == null) - || (((descriptor->needsFrameFunction))(0)))) { - needsFrame = 1; + if (!needsFrame) { + if ((((descriptor->needsFrameFunction)) == null) + || (((descriptor->needsFrameFunction))(framelessStackDelta))) { + needsFrame = 1; + } + else { + framelessStackDelta += (descriptor->stackDelta); + } } if (isBranch(descriptor)) { distance = ((descriptor->spanFunction))(descriptor, pc, nExts, methodObj); Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2013-08-20 01:18:13 UTC (rev 2774) +++ branches/Cog/src/vm/cogit.h 2013-08-21 01:28:22 UTC (rev 2775) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde + CCodeGenerator VMMaker.oscog-eem.329 uuid: 5bf1ecce-8cdb-48fd-bc66-b41b4cff2efe */ Modified: branches/Cog/src/vm/cogmethod.h =================================================================== --- branches/Cog/src/vm/cogmethod.h 2013-08-20 01:18:13 UTC (rev 2774) +++ branches/Cog/src/vm/cogmethod.h 2013-08-21 01:28:22 UTC (rev 2775) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde + CCodeGenerator VMMaker.oscog-eem.329 uuid: 5bf1ecce-8cdb-48fd-bc66-b41b4cff2efe */ typedef struct {

1 0

Broken links on http://squeakvm.org/mac/ & Latest official Squeak Mac VM
by Bernhard Pieber 20 Aug '13

20 Aug '13

Dear VM maintainers, It seems that the links to the latest builds of the Mac VM for Squeak on http://squeakvm.org/mac/ are broken. I wonder where I can get the latest official release of the Squeak Mac VM? The latest release in http://squeakvm.org/mac/release/ is 5.7.4.1 from March 2011. I downloaded the Squeak-4.4-All-in-One.app from www.squeak.org. It shows the following VM information: Virtual Machine --------------- /Users/bernhard/Downloads/Squeak-4.4-All-in-One.app/Contents/MacOS/Squeak VM Opt Squeak3.8.1 of '28 Aug 2006' [latest update: #6747] 4.4 Mac Carbon 4.2.4b1 28-Mar-10 >45CAAEAC-5A1E-4327-9702-7973E3473FDE< Loaded VM Modules ----------------- B2DPlugin 28 March 2010 (i) BitBltPlugin 28 March 2010 (i) DropPlugin 28 March 2010 (i) FilePlugin 28 March 2010 (i) FloatArrayPlugin 28 March 2010 (i) InternetConfigPlugin 28 March 2010 (i) LargeIntegers v1.5 28 March 2010 (i) Matrix2x3Plugin 28 March 2010 (i) MiscPrimitivePlugin 28 March 2010 (i) SecurityPlugin 28 March 2010 (i) SocketPlugin 28 March 2010 (i) That seems to be an even older VM, 4.2.4b1 from March 2010. Can that be the case? Cheers, Bernhard

3 3

[commit][2774] add instructions for --enableFastBlt on arm/linux
by commits＠squeakvm.org 20 Aug '13

20 Aug '13

Revision: 2774 Author: piumarta Date: 2013-08-19 18:18:13 -0700 (Mon, 19 Aug 2013) Log Message: ----------- add instructions for --enableFastBlt on arm/linux Modified Paths: -------------- trunk/platforms/unix/ChangeLog Added Paths: ----------- trunk/platforms/unix/doc/README.FastBitBlt Modified: trunk/platforms/unix/ChangeLog =================================================================== --- trunk/platforms/unix/ChangeLog 2013-08-17 21:49:08 UTC (rev 2773) +++ trunk/platforms/unix/ChangeLog 2013-08-20 01:18:13 UTC (rev 2774) @@ -1,3 +1,8 @@ +2013-08-19 Ian Piumarta <com -dot- gmail -at- piumarta (backwards)> + + * doc/README.FastBitBlt: Added instructions for compiling on ARM + running Linux. + 2013-08-15 Ian Piumarta <piumarta@raspberrypi> * cmake/Plugins.cmake: Process ${plugin}_extra_sources in both Added: trunk/platforms/unix/doc/README.FastBitBlt =================================================================== --- trunk/platforms/unix/doc/README.FastBitBlt (rev 0) +++ trunk/platforms/unix/doc/README.FastBitBlt 2013-08-20 01:18:13 UTC (rev 2774) @@ -0,0 +1,56 @@ +If you enable fast BitBlt using 'configure --enableFastBlt' then you +might need to install or build additional assembly language tools for +your platform. + +Linux on ARM (e.g., Rapsberry Pi) +--------------------------------- + +You will need to build 'asasm' from source. It is currenly not +provided as an installable package in any of the ARM repositories that +I use. + +1. Install packages to satisfy its dependencies: + + sudo apt-get install bison flex libarchive-dev + + (Depending on your setup, you might also need to install automake, + autoconf, and libtool.) + +2. Obtain the asasm sources: + + svn co svn://svn.riscos.info/gccsdk/trunk/tools/asasm + cd asasm + +3. Kludge a workaround for a bug that the maintainer seems unwilling + to fix: + + - open src/output.c with your favourite editor + - at the very top, insert the line + + #define ELF_EABI + +4. Fix the maintainer's incomplete packaging of the sources so that + 'configure' will actually work: + + autoreconf --install + + You should now have a 'configure' script and all the paraphernalia + that it requires (config.guess, ltmain.sh, etc.); if not then + perhaps running 'autoconf' will generate some stuff for you. If + not, complain to the maintainer of asasm that the whole point of + autotools is that you should never, ever have to do any of the + nonsense in step 4 of these instructions. + +5. Generate a Makefile: + + ./configure --target=arm-linux-gnueabihf + +6. Build an assember: + + make + +7. Install it so that the Squeak build process can find it: + + sudo make install + +You should now be able to build Squeak with fast BitBlt enabled.

1 0

Fwd: [Pharo-dev] Put issues from cog issue tracker into pharo issue tracker
by Nicolas Cellier 19 Aug '13

19 Aug '13

---------- Forwarded message ---------- From: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2013/8/19 Subject: Re: [Pharo-dev] Put issues from cog issue tracker into pharo issue tracker To: Pharo Development List <pharo-dev(a)lists.pharo.org> Reporting bugs on fogbugz is not a problem for me. However, the main concern I have is about the efficiency of these reports... Will Eliot have access to these reports and use them for his oscog branch? Will David have access for backporting some common bugs to interpreter VM? Will the reports be mailed to vm-dev? After all, I'm not really sure how the old bug tracker was usefull for oscog or interpreter VM... But I have the feeling that the reports on fogbugz will be for Pharo VM branch only. I'm very happy if I can be usefull to Pharo. But I'm even more if I can be usefull to Squeak/Cuis too for the same price, so I feel the move a bit like a loss. Cheers Nicolas 2013/8/10 Camillo Bruni <camillobruni(a)gmail.com> > Nicolas Cellier, > Are you willing to report and maintain VM bugs on the fogbugz issue > tracker? > Since you already filed reports on pharo.fogbugz.com I think this is not > much of a change. > > thank you. > > On 2013-08-09, at 09:33, Igor Stasenko <siguctua(a)gmail.com> wrote: > > > On 9 August 2013 13:28, Camillo Bruni <camillobruni(a)gmail.com> wrote: > >> thanks, perfect! > >> > >> that's very nice, now we have everything in one place. > >> Nobody besides Pharo guys touched this issue tracker anyway :) > >> > > if that would be true, i wouldn't say anything.. > > > > The truth is that pharo team is most active on it.. yes. But does that > > give us right to decide > > what to do with it? > > > > > > -- > > Best regards, > > Igor Stasenko. > > <Screen Shot 2013-08-09 at 2.31.15 PM.png> > > >

1 0

Re: [Vm-dev] Register allocation and debugging in Squeak
by Stefan Marr 19 Aug '13

19 Aug '13

Hi Igor: On 14 Aug 2013, at 19:26, Jecel Assumpcao Jr. <jecel(a)merlintec.com> wrote: > > Igor Stasenko wrote: >> yes, but you need to know how to map existing activations (which >> optimized stack frames), >> back to smalltalk contexts. if you can do it, the rest is trivial.. >> but that's the question: imagine you interrupting machine code at random point: >> - now, how to match it with smalltalk piece of code/AST node? > > A popular solution is to not allow the machine code to be interrupted at > random points. In the Self VM, for example, you have two defined "safe > points": at message sends and at the backwards jump at the end of a loop > without any message sends. The mapping of the optimized stack frames to > the language level contexts only has to be possible at these points and > can be arbitrarily complicated between them. I tend to agree with Jecel. I belief that it is not only popular, but probably the only really maintainable solution. The GC literature is full of approaches how to figure out what's included in the root set. And having to maintain information about which registers or stack slots are live for a given machine code fragment is quite a bit of overhead. I would guess, that's true for maintaining code-to-code mapping information for highly optimized code as well. So safepoints seem to be a comparably simple, low-overhead solution. Best regards Stefan > > -- Jecel > -- Stefan Marr Software Languages Lab Vrije Universiteit Brussel Pleinlaan 2 / B-1050 Brussels / Belgium http://soft.vub.ac.be/~smarr Phone: +32 2 629 2974 Fax: +32 2 629 3525

1 0

VM Maker: VMMaker.oscog-eem.329.mcz
by commits＠source.squeak.org 18 Aug '13

18 Aug '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.329.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.329 Author: eem Time: 17 August 2013, 7:06:11.213 pm UUID: 5bf1ecce-8cdb-48fd-bc66-b41b4cff2efe Ancestors: VMMaker.oscog-eem.328 Set the inBlock variable in scanBlock and scanMethod. Change the argument to the needsFrameFunction to be the stack delta. Change genSpecialSelectorClass's needsFrameFunction to needsFrameIfStackGreaterThanOne: which better handles e.g. TextColor>>dominates: other ^self class == other class than needsFrameIfFollowsSend:. =============== Diff against VMMaker.oscog-eem.328 =============== Item was changed: ----- Method: Cogit>>needsFrameIfInBlock: (in category 'compile abstract instructions') ----- + needsFrameIfInBlock: stackDelta - needsFrameIfInBlock: isInBlock ^inBlock! Item was changed: ----- Method: Cogit>>needsFrameNever: (in category 'compile abstract instructions') ----- + needsFrameNever: stackDelta - needsFrameNever: isInBlock ^false! Item was changed: ----- Method: Cogit>>scanBlock: (in category 'compile abstract instructions') ----- scanBlock: blockStart "Scan the block to determine if the block needs a frame or not" + | descriptor pc end framelessStackDelta nExts | - | descriptor pc end stackDelta nExts | <var: #blockStart type: #'BlockStart *'> <var: #descriptor type: #'BytecodeDescriptor *'> needsFrame := false. methodOrBlockNumArgs := blockStart numArgs. + inBlock := true. - nExts := 0. pc := blockStart startpc. end := blockStart startpc + blockStart span. + framelessStackDelta := nExts := 0. - stackDelta := 0. [pc < end] whileTrue: [byte0 := (objectMemory fetchByte: pc ofObject: methodObj) + bytecodeSetOffset. descriptor := self generatorAt: byte0. needsFrame ifFalse: [(descriptor needsFrameFunction isNil + or: [self perform: descriptor needsFrameFunction with: framelessStackDelta]) - or: [self perform: descriptor needsFrameFunction with: true]) ifTrue: [needsFrame := true] + ifFalse: [framelessStackDelta := framelessStackDelta + descriptor stackDelta]]. - ifFalse: [stackDelta := stackDelta + descriptor stackDelta]]. pc := self nextBytecodePCFor: descriptor at: pc exts: nExts in: methodObj. nExts := descriptor isExtension ifTrue: [nExts + 1] ifFalse: [0]]. needsFrame ifFalse: + [framelessStackDelta < 0 ifTrue: - [stackDelta < 0 ifTrue: [self error: 'negative stack delta in block; block contains bogus code or internal error']. + [framelessStackDelta > 0] whileTrue: - [stackDelta > 0] whileTrue: [descriptor := self generatorAt: (objectMemory fetchByte: blockStart startpc ofObject: methodObj) + bytecodeSetOffset. descriptor generator ~~ #genPushConstantNilBytecode ifTrue: [self error: 'frameless block doesn''t start with enough pushNils']. blockStart startpc: blockStart startpc + descriptor numBytes; span: blockStart span - descriptor numBytes. + framelessStackDelta := framelessStackDelta - 1]]! - stackDelta := stackDelta - 1]]! Item was changed: ----- Method: Cogit>>scanMethod (in category 'compile abstract instructions') ----- scanMethod + "Scan the method (and all embedded blocks) to determine - "Scan the method to determine - what the last bytecode is; extra bytes at the end of a method are used to encode things like source pointers or temp names - if the method needs a frame or not - what are the targets of any backward branches. - how many blocks it creates Answer the block count or on error a negative error code" + | latestContinuation nExts descriptor pc numBlocks distance targetPC framelessStackDelta | - | latestContinuation nExts descriptor pc numBlocks distance targetPC | <var: #descriptor type: #'BytecodeDescriptor *'> needsFrame := false. + inBlock := false. (primitiveIndex > 0 and: [coInterpreter isQuickPrimitiveIndex: primitiveIndex]) ifTrue: [^0]. - numBlocks := 0. pc := latestContinuation := initialPC. + numBlocks := framelessStackDelta := nExts := 0. - nExts := 0. [pc <= endPC] whileTrue: [byte0 := (objectMemory fetchByte: pc ofObject: methodObj) + bytecodeSetOffset. descriptor := self generatorAt: byte0. (descriptor isReturn and: [pc >= latestContinuation]) ifTrue: [endPC := pc]. + needsFrame ifFalse: + [(descriptor needsFrameFunction isNil + or: [self perform: descriptor needsFrameFunction with: framelessStackDelta]) + ifTrue: [needsFrame := true] + ifFalse: [framelessStackDelta := framelessStackDelta + descriptor stackDelta]]. - (needsFrame not - and: [descriptor needsFrameFunction isNil - or: [self perform: descriptor needsFrameFunction with: false]]) ifTrue: - [needsFrame := true]. descriptor isBranch ifTrue: [distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. (self isBackwardBranch: descriptor at: pc exts: nExts in: methodObj) ifTrue: [self initializeFixupAt: targetPC - initialPC] ifFalse: [latestContinuation := latestContinuation max: targetPC]]. descriptor isBlockCreation ifTrue: [numBlocks := numBlocks + 1. distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. latestContinuation := latestContinuation max: targetPC]. pc := pc + descriptor numBytes. nExts := descriptor isExtension ifTrue: [nExts + 1] ifFalse: [0]]. ^numBlocks! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>scanMethod (in category 'compile abstract instructions') ----- scanMethod + "Scan the method (and all embedded blocks) to determine - "Scan the method to determine - what the last bytecode is; extra bytes at the end of a method are used to encode things like source pointers or temp names - if the method needs a frame or not - what are the targets of any backward branches. - how many blocks it creates - how many counters it needs/conditional branches it contains Answer the block count or on error a negative error code" + | latestContinuation nExts descriptor pc numBlocks distance targetPC framelessStackDelta | - | latestContinuation nExts descriptor pc numBlocks distance targetPC | <var: #descriptor type: #'BytecodeDescriptor *'> needsFrame := false. + inBlock := false. prevBCDescriptor := nil. numCounters := 0. (primitiveIndex > 0 and: [coInterpreter isQuickPrimitiveIndex: primitiveIndex]) ifTrue: [^0]. - numBlocks := 0. pc := latestContinuation := initialPC. + numBlocks := framelessStackDelta := nExts := 0. - nExts := 0. [pc <= endPC] whileTrue: [byte0 := (objectMemory fetchByte: pc ofObject: methodObj) + bytecodeSetOffset. descriptor := self generatorAt: byte0. (descriptor isReturn and: [pc >= latestContinuation]) ifTrue: [endPC := pc]. + needsFrame ifFalse: + [(descriptor needsFrameFunction isNil + or: [self perform: descriptor needsFrameFunction with: framelessStackDelta]) + ifTrue: [needsFrame := true] + ifFalse: [framelessStackDelta := framelessStackDelta + descriptor stackDelta]]. - (needsFrame not - and: [descriptor needsFrameFunction isNil - or: [self perform: descriptor needsFrameFunction with: false]]) ifTrue: - [needsFrame := true]. descriptor isBranch ifTrue: [distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. (self isBackwardBranch: descriptor at: pc exts: nExts in: methodObj) ifTrue: [self initializeFixupAt: targetPC - initialPC] ifFalse: [latestContinuation := latestContinuation max: targetPC. (descriptor isBranchTrue or: [descriptor isBranchFalse]) ifTrue: [numCounters := numCounters + 1]]]. descriptor isBlockCreation ifTrue: [numBlocks := numBlocks + 1. distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. latestContinuation := latestContinuation max: targetPC]. pc := pc + descriptor numBytes. nExts := descriptor isExtension ifTrue: [nExts + 1] ifFalse: [0]. prevBCDescriptor := descriptor]. ^numBlocks! Item was changed: ----- Method: StackToRegisterMappingCogit class>>initializeBytecodeTableForNewspeakV3PlusClosures (in category 'class initialization') ----- initializeBytecodeTableForNewspeakV3PlusClosures "StackToRegisterMappingCogit initializeBytecodeTableForNewspeakV3PlusClosures" isPushNilFunction := #v3:Is:Push:Nil:. pushNilSizeFunction := #v3PushNilSize:. NSSendIsPCAnnotated := true. "IsNSSendCall used by PushImplicitReceiver" self flag: 'Special selector send class must be inlined to agree with the interpreter, which inlines class. If class is sent to e.g. a general instance of ProtoObject then unless class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit have identical semantics. We get away with not hardwiring the other special selectors either because in the Cointerpreter they are not inlined or because they are inlined only to instances of classes for which there will always be a method.'. self generatorTableFrom: #( (1 0 15 genPushReceiverVariableBytecode needsFrameNever: 1) (1 16 31 genPushTemporaryVariableBytecode needsFrameIfMod16GENumArgs: 1) (1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1) (1 64 95 genPushLiteralVariableBytecode needsFrameNever: 1) (1 96 103 genStoreAndPopReceiverVariableBytecode needsFrameNever: -1) "N.B. not frameless if immutability" (1 104 111 genStoreAndPopTemporaryVariableBytecode) (1 112 112 genPushReceiverBytecode needsFrameNever: 1) (1 113 113 genPushConstantTrueBytecode needsFrameNever: 1) (1 114 114 genPushConstantFalseBytecode needsFrameNever: 1) (1 115 115 genPushConstantNilBytecode needsFrameNever: 1) (1 116 119 genPushQuickIntegerConstantBytecode needsFrameNever: 1) "method returns in blocks need a frame because of nonlocalReturn:through:" (1 120 120 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0) (1 121 121 genReturnTrue return needsFrameIfInBlock: isMappedInBlock 0) (1 122 122 genReturnFalse return needsFrameIfInBlock: isMappedInBlock 0) (1 123 123 genReturnNil return needsFrameIfInBlock: isMappedInBlock 0) (1 124 124 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1) (1 125 125 genReturnTopFromBlock return needsFrameNever: -1) (3 126 126 genDynamicSuperSendBytecode isMapped) "Newspeak" (2 127 127 genPushImplicitReceiverBytecode isMapped) "Newspeak" (2 128 128 extendedPushBytecode needsFrameNever: 1) (2 129 129 extendedStoreBytecode) (2 130 130 extendedStoreAndPopBytecode) (2 131 131 genExtendedSendBytecode isMapped) (3 132 132 doubleExtendedDoAnythingBytecode isMapped) (2 133 133 genExtendedSuperBytecode isMapped) (2 134 134 genSecondExtendedSendBytecode isMapped) (1 135 135 genPopStackBytecode needsFrameNever: -1) (1 136 136 duplicateTopBytecode needsFrameNever: 1) (1 137 137 genPushActiveContextBytecode) (2 138 138 genPushNewArrayBytecode) (2 139 139 genPushExplicitOuterSendReceiverBytecode isMapped) "Newspeak" (3 140 140 genPushRemoteTempLongBytecode) (3 141 141 genStoreRemoteTempLongBytecode) (3 142 142 genStoreAndPopRemoteTempLongBytecode) (4 143 143 genPushClosureCopyCopiedValuesBytecode block v3:Block:Code:Size:) (1 144 151 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:) (1 152 159 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (2 160 163 genLongUnconditionalBackwardJump branch isMapped "because of interrupt check" v3:Long:Branch:Distance:) (2 164 167 genLongUnconditionalForwardJump branch v3:Long:Branch:Distance:) (2 168 171 genLongJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v3:LongForward:Branch:Distance:) (2 172 175 genLongJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:LongForward:Branch:Distance:) (1 176 176 genSpecialSelectorArithmetic isMapped AddRR) (1 177 177 genSpecialSelectorArithmetic isMapped SubRR) (1 178 178 genSpecialSelectorComparison isMapped JumpLess) (1 179 179 genSpecialSelectorComparison isMapped JumpGreater) (1 180 180 genSpecialSelectorComparison isMapped JumpLessOrEqual) (1 181 181 genSpecialSelectorComparison isMapped JumpGreaterOrEqual) (1 182 182 genSpecialSelectorComparison isMapped JumpZero) (1 183 183 genSpecialSelectorComparison isMapped JumpNonZero) (1 184 189 genSpecialSelectorSend isMapped) " #* #/ #\\ #@ #bitShift: //" (1 190 190 genSpecialSelectorArithmetic isMapped AndRR) (1 191 191 genSpecialSelectorArithmetic isMapped OrRR) (1 192 197 genSpecialSelectorSend isMapped) "#at: #at:put: #size #next #nextPut: #atEnd" + (1 198 198 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)" + (1 199 199 genSpecialSelectorClass needsFrameIfStackGreaterThanOne: notMapped 0) "not mapped because it is directly inlined (for now)" - (1 198 198 genSpecialSelectorEqualsEquals needsFrameIfFollowsSend: notMapped -1) "not mapped because it is directly inlined (for now)" - (1 199 199 genSpecialSelectorClass needsFrameIfFollowsSend: notMapped 0) "not mapped because it is directly inlined (for now)" (1 200 207 genSpecialSelectorSend isMapped) "#blockCopy: #value #value: #do: #new #new: #x #y" (1 208 223 genSendLiteralSelector0ArgsBytecode isMapped) (1 224 239 genSendLiteralSelector1ArgBytecode isMapped) (1 240 255 genSendLiteralSelector2ArgsBytecode isMapped))! Item was changed: ----- Method: StackToRegisterMappingCogit class>>initializeBytecodeTableForNewspeakV4 (in category 'class initialization') ----- initializeBytecodeTableForNewspeakV4 "StackToRegisterMappingCogit initializeBytecodeTableForNewspeakV4" isPushNilFunction := #v4:Is:Push:Nil:. pushNilSizeFunction := #v4PushNilSize:. NSSendIsPCAnnotated := false. "IsNSSendCall used by SendAbsentImplicit" self flag: 'Special selector send class must be inlined to agree with the interpreter, which inlines class. If class is sent to e.g. a general instance of ProtoObject then unless class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit have identical semantics. We get away with not hardwiring the other special selectors either because in the Cointerpreter they are not inlined or because they are inlined only to instances of classes for which there will always be a method.'. self generatorTableFrom: #( "1 byte bytecodes" (1 0 15 genPushReceiverVariableBytecode needsFrameNever: 1) (1 16 31 genPushLiteralVariable16CasesBytecode needsFrameNever: 1) (1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1) (1 64 75 genPushTemporaryVariableBytecode needsFrameIfMod16GENumArgs: 1) (1 76 76 genPushReceiverBytecode needsFrameNever: 1) (1 77 77 genExtPushPseudoVariableOrOuterBytecode) (1 78 78 genPushConstantZeroBytecode needsFrameNever: 1) (1 79 79 genPushConstantOneBytecode needsFrameNever: 1) (1 80 80 genSpecialSelectorArithmetic isMapped AddRR) (1 81 81 genSpecialSelectorArithmetic isMapped SubRR) (1 82 82 genSpecialSelectorComparison isMapped JumpLess) (1 83 83 genSpecialSelectorComparison isMapped JumpGreater) (1 84 84 genSpecialSelectorComparison isMapped JumpLessOrEqual) (1 85 85 genSpecialSelectorComparison isMapped JumpGreaterOrEqual) (1 86 86 genSpecialSelectorComparison isMapped JumpZero) (1 87 87 genSpecialSelectorComparison isMapped JumpNonZero) (1 88 93 genSpecialSelectorSend isMapped) " #* #/ #\\ #@ #bitShift: //" (1 94 94 genSpecialSelectorArithmetic isMapped AndRR) (1 95 95 genSpecialSelectorArithmetic isMapped OrRR) (1 96 101 genSpecialSelectorSend isMapped) "#at: #at:put: #size #next #nextPut: #atEnd" + (1 102 102 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)" + (1 103 103 genSpecialSelectorClass needsFrameIfStackGreaterThanOne: notMapped 0) "not mapped because it is directly inlined (for now)" - (1 102 102 genSpecialSelectorEqualsEquals needsFrameIfFollowsSend: notMapped -1) "not mapped because it is directly inlined (for now)" - (1 103 103 genSpecialSelectorClass needsFrameIfFollowsSend: notMapped 0) "not mapped because it is directly inlined (for now)" (1 104 111 genSpecialSelectorSend isMapped) "#blockCopy: #value #value: #do: #new #new: #x #y" (1 112 127 genSendLiteralSelector0ArgsBytecode isMapped) (1 128 143 genSendLiteralSelector1ArgBytecode isMapped) (1 144 159 genSendLiteralSelector2ArgsBytecode isMapped) (1 160 175 genSendAbsentImplicit0ArgsBytecode isMapped) (1 176 183 genStoreAndPopReceiverVariableBytecode needsFrameNever: -1) "N.B. not frameless if immutability" (1 184 191 genStoreAndPopTemporaryVariableBytecode) (1 192 199 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:) (1 200 207 genShortJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (1 208 215 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (1 216 216 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0) (1 217 217 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1) (1 218 218 genExtReturnTopFromBlock return needsFrameNever: -1) (1 219 219 duplicateTopBytecode needsFrameNever: 1) (1 220 220 genPopStackBytecode needsFrameNever: -1) (1 221 221 genExtNopBytecode needsFrameNever: 0) (1 222 223 unknownBytecode) "2 byte bytecodes" (2 224 224 extABytecode extension needsFrameNever: 0) (2 225 225 extBBytecode extension needsFrameNever: 0) (2 226 226 genExtPushReceiverVariableBytecode) (2 227 227 genExtPushLiteralVariableBytecode needsFrameNever: 1) (2 228 228 genExtPushLiteralBytecode needsFrameNever: 1) (2 229 229 genExtPushIntegerBytecode needsFrameNever: 1) (2 230 230 genLongPushTemporaryVariableBytecode) (2 231 231 genPushNewArrayBytecode) (2 232 232 genExtStoreReceiverVariableBytecode) (2 233 233 genExtStoreLiteralVariableBytecode) (2 234 234 genLongStoreTemporaryVariableBytecode) (2 235 235 genExtStoreAndPopReceiverVariableBytecode) (2 236 236 genExtStoreAndPopLiteralVariableBytecode) (2 237 237 genLongStoreAndPopTemporaryVariableBytecode) (2 238 238 genExtSendBytecode isMapped) (2 239 239 genExtSendSuperBytecode isMapped) (2 240 240 genExtSendAbsentImplicitBytecode isMapped) (2 241 241 genExtSendAbsentDynamicSuperBytecode isMapped) (2 242 242 genExtUnconditionalJump branch isMapped "because of interrupt check" v4:Long:Branch:Distance:) (2 243 243 genExtJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) (2 244 244 genExtJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) (2 245 248 unknownBytecode) "3 byte bytecodes" (3 249 249 callPrimitiveBytecode) (3 250 250 genPushRemoteTempLongBytecode) (3 251 251 genStoreRemoteTempLongBytecode) (3 252 252 genStoreAndPopRemoteTempLongBytecode) (3 253 253 genExtPushClosureBytecode block v4:Block:Code:Size:) (3 254 255 unknownBytecode))! Item was changed: ----- Method: StackToRegisterMappingCogit class>>initializeBytecodeTableForSqueakV3PlusClosures (in category 'class initialization') ----- initializeBytecodeTableForSqueakV3PlusClosures "StackToRegisterMappingCogit initializeBytecodeTableForSqueakV3PlusClosures" isPushNilFunction := #v3:Is:Push:Nil:. pushNilSizeFunction := #v3PushNilSize:. self flag: 'Special selector send class must be inlined to agree with the interpreter, which inlines class. If class is sent to e.g. a general instance of ProtoObject then unless class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit have identical semantics. We get away with not hardwiring the other special selectors either because in the Cointerpreter they are not inlined or because they are inlined only to instances of classes for which there will always be a method.'. self generatorTableFrom: #( (1 0 15 genPushReceiverVariableBytecode needsFrameNever: 1) (1 16 31 genPushTemporaryVariableBytecode needsFrameIfMod16GENumArgs: 1) (1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1) (1 64 95 genPushLiteralVariableBytecode needsFrameNever: 1) (1 96 103 genStoreAndPopReceiverVariableBytecode needsFrameNever: -1) "N.B. not frameless if immutability" (1 104 111 genStoreAndPopTemporaryVariableBytecode) (1 112 112 genPushReceiverBytecode needsFrameNever: 1) (1 113 113 genPushConstantTrueBytecode needsFrameNever: 1) (1 114 114 genPushConstantFalseBytecode needsFrameNever: 1) (1 115 115 genPushConstantNilBytecode needsFrameNever: 1) (1 116 119 genPushQuickIntegerConstantBytecode needsFrameNever: 1) "method returns in blocks need a frame because of nonlocalReturn:through:" (1 120 120 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0) (1 121 121 genReturnTrue return needsFrameIfInBlock: isMappedInBlock 0) (1 122 122 genReturnFalse return needsFrameIfInBlock: isMappedInBlock 0) (1 123 123 genReturnNil return needsFrameIfInBlock: isMappedInBlock 0) (1 124 124 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1) (1 125 125 genReturnTopFromBlock return needsFrameNever: -1) (1 126 127 unknownBytecode) (2 128 128 extendedPushBytecode needsFrameNever: 1) (2 129 129 extendedStoreBytecode) (2 130 130 extendedStoreAndPopBytecode) (2 131 131 genExtendedSendBytecode isMapped) (3 132 132 doubleExtendedDoAnythingBytecode isMapped) (2 133 133 genExtendedSuperBytecode isMapped) (2 134 134 genSecondExtendedSendBytecode isMapped) (1 135 135 genPopStackBytecode needsFrameNever: -1) (1 136 136 duplicateTopBytecode needsFrameNever: 1) (1 137 137 genPushActiveContextBytecode) (2 138 138 genPushNewArrayBytecode) (1 139 139 unknownBytecode) (3 140 140 genPushRemoteTempLongBytecode) (3 141 141 genStoreRemoteTempLongBytecode) (3 142 142 genStoreAndPopRemoteTempLongBytecode) (4 143 143 genPushClosureCopyCopiedValuesBytecode block v3:Block:Code:Size:) (1 144 151 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:) (1 152 159 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (2 160 163 genLongUnconditionalBackwardJump branch isMapped "because of interrupt check" v3:Long:Branch:Distance:) (2 164 167 genLongUnconditionalForwardJump branch v3:Long:Branch:Distance:) (2 168 171 genLongJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v3:LongForward:Branch:Distance:) (2 172 175 genLongJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:LongForward:Branch:Distance:) (1 176 176 genSpecialSelectorArithmetic isMapped AddRR) (1 177 177 genSpecialSelectorArithmetic isMapped SubRR) (1 178 178 genSpecialSelectorComparison isMapped JumpLess) (1 179 179 genSpecialSelectorComparison isMapped JumpGreater) (1 180 180 genSpecialSelectorComparison isMapped JumpLessOrEqual) (1 181 181 genSpecialSelectorComparison isMapped JumpGreaterOrEqual) (1 182 182 genSpecialSelectorComparison isMapped JumpZero) (1 183 183 genSpecialSelectorComparison isMapped JumpNonZero) (1 184 189 genSpecialSelectorSend isMapped) " #* #/ #\\ #@ #bitShift: //" (1 190 190 genSpecialSelectorArithmetic isMapped AndRR) (1 191 191 genSpecialSelectorArithmetic isMapped OrRR) (1 192 197 genSpecialSelectorSend isMapped) "#at: #at:put: #size #next #nextPut: #atEnd" + (1 198 198 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)" + (1 199 199 genSpecialSelectorClass needsFrameIfStackGreaterThanOne: notMapped 0) "not mapped because it is directly inlined (for now)" - (1 198 198 genSpecialSelectorEqualsEquals needsFrameIfFollowsSend: notMapped -1) "not mapped because it is directly inlined (for now)" - (1 199 199 genSpecialSelectorClass needsFrameIfFollowsSend: notMapped 0) "not mapped because it is directly inlined (for now)" (1 200 207 genSpecialSelectorSend isMapped) "#blockCopy: #value #value: #do: #new #new: #x #y" (1 208 223 genSendLiteralSelector0ArgsBytecode isMapped) (1 224 239 genSendLiteralSelector1ArgBytecode isMapped) (1 240 255 genSendLiteralSelector2ArgsBytecode isMapped))! Item was changed: ----- Method: StackToRegisterMappingCogit class>>newInitializeBytecodeTableForNewspeakV3PlusClosures (in category 'class initialization') ----- newInitializeBytecodeTableForNewspeakV3PlusClosures "StackToRegisterMappingCogit newInitializeBytecodeTableForNewspeakV3PlusClosures" isPushNilFunction := #v3:Is:Push:Nil:. pushNilSizeFunction := #v3PushNilSize:. NSSendIsPCAnnotated := true. "IsNSSendCall used by PushImplicitReceiver" self flag: 'Special selector send class must be inlined to agree with the interpreter, which inlines class. If class is sent to e.g. a general instance of ProtoObject then unless class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit have identical semantics. We get away with not hardwiring the other special selectors either because in the Cointerpreter they are not inlined or because they are inlined only to instances of classes for which there will always be a method.'. self generatorTableFrom: #( (1 0 15 genPushReceiverVariableBytecode needsFrameNever: 1) (1 16 31 genPushTemporaryVariableBytecode needsFrameIfMod16GENumArgs: 1) (1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1) (1 64 95 genPushLiteralVariableBytecode needsFrameNever: 1) (1 96 103 genStoreAndPopReceiverVariableBytecode needsFrameNever: -1) "N.B. not frameless if immutability" (1 104 111 genStoreAndPopTemporaryVariableBytecode) (1 112 112 genPushReceiverBytecode needsFrameNever: 1) (1 113 113 genPushConstantTrueBytecode needsFrameNever: 1) (1 114 114 genPushConstantFalseBytecode needsFrameNever: 1) (1 115 115 genPushConstantNilBytecode needsFrameNever: 1) (1 116 119 genPushQuickIntegerConstantBytecode needsFrameNever: 1) "method returns in blocks need a frame because of nonlocalReturn:through:" (1 120 120 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0) (1 121 121 genReturnTrue return needsFrameIfInBlock: isMappedInBlock 0) (1 122 122 genReturnFalse return needsFrameIfInBlock: isMappedInBlock 0) (1 123 123 genReturnNil return needsFrameIfInBlock: isMappedInBlock 0) (1 124 124 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1) (1 125 125 genReturnTopFromBlock return needsFrameNever: -1) (3 126 126 genDynamicSuperSendBytecode isMapped) "Newspeak" (2 127 127 genPushImplicitReceiverBytecode isMapped) "Newspeak" (2 128 128 extendedPushBytecode needsFrameNever: 1) (2 129 129 extendedStoreBytecode) (2 130 130 extendedStoreAndPopBytecode) (2 131 131 genExtendedSendBytecode isMapped) (3 132 132 doubleExtendedDoAnythingBytecode isMapped) (2 133 133 genExtendedSuperBytecode isMapped) (2 134 134 genSecondExtendedSendBytecode isMapped) (1 135 135 genPopStackBytecode needsFrameNever: -1) (1 136 136 duplicateTopBytecode needsFrameNever: 1) (1 137 137 genPushActiveContextBytecode) (2 138 138 genPushNewArrayBytecode) (2 139 139 genPushExplicitOuterSendReceiverBytecode isMapped) "Newspeak" (3 140 140 genPushRemoteTempLongBytecode) (3 141 141 genStoreRemoteTempLongBytecode) (3 142 142 genStoreAndPopRemoteTempLongBytecode) (4 143 143 genPushClosureCopyCopiedValuesBytecode block v3:Block:Code:Size:) (1 144 151 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:) (1 152 159 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (2 160 163 genLongUnconditionalBackwardJump branch isMapped "because of interrupt check" v3:Long:Branch:Distance:) (2 164 167 genLongUnconditionalForwardJump branch v3:Long:Branch:Distance:) (2 168 171 genLongJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v3:LongForward:Branch:Distance:) (2 172 175 genLongJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:LongForward:Branch:Distance:) (1 176 176 genSpecialSelectorArithmetic isMapped AddRR) (1 177 177 genSpecialSelectorArithmetic isMapped SubRR) (1 178 178 genSpecialSelectorComparison isMapped JumpLess) (1 179 179 genSpecialSelectorComparison isMapped JumpGreater) (1 180 180 genSpecialSelectorComparison isMapped JumpLessOrEqual) (1 181 181 genSpecialSelectorComparison isMapped JumpGreaterOrEqual) (1 182 182 genSpecialSelectorComparison isMapped JumpZero) (1 183 183 genSpecialSelectorComparison isMapped JumpNonZero) (1 184 189 genSpecialSelectorSend isMapped) " #* #/ #\\ #@ #bitShift: //" (1 190 190 genSpecialSelectorArithmetic isMapped AndRR) (1 191 191 genSpecialSelectorArithmetic isMapped OrRR) (1 192 197 genSpecialSelectorSend isMapped) "#at: #at:put: #size #next #nextPut: #atEnd" + (1 198 198 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)" + (1 199 199 genSpecialSelectorClass needsFrameIfStackGreaterThanOne: notMapped 0) "not mapped because it is directly inlined (for now)" - (1 198 198 genSpecialSelectorEqualsEquals needsFrameIfFollowsSend: notMapped -1) "not mapped because it is directly inlined (for now)" - (1 199 199 genSpecialSelectorClass needsFrameIfFollowsSend: notMapped 0) "not mapped because it is directly inlined (for now)" (1 200 207 genSpecialSelectorSend isMapped) "#blockCopy: #value #value: #do: #new #new: #x #y" (1 208 223 genSendLiteralSelector0ArgsBytecode isMapped) (1 224 239 genSendLiteralSelector1ArgBytecode isMapped) (1 240 255 genSendLiteralSelector2ArgsBytecode isMapped))! Item was changed: ----- Method: StackToRegisterMappingCogit class>>newInitializeBytecodeTableForNewspeakV4 (in category 'class initialization') ----- newInitializeBytecodeTableForNewspeakV4 "StackToRegisterMappingCogit newInitializeBytecodeTableForNewspeakV4" isPushNilFunction := #v4:Is:Push:Nil:. pushNilSizeFunction := #v4PushNilSize:. NSSendIsPCAnnotated := false. "IsNSSendCall used by SendAbsentImplicit" self flag: 'Special selector send class must be inlined to agree with the interpreter, which inlines class. If class is sent to e.g. a general instance of ProtoObject then unless class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit have identical semantics. We get away with not hardwiring the other special selectors either because in the Cointerpreter they are not inlined or because they are inlined only to instances of classes for which there will always be a method.'. self generatorTableFrom: #( "1 byte bytecodes" (1 0 15 genPushReceiverVariableBytecode needsFrameNever: 1) (1 16 31 genPushLiteralVariable16CasesBytecode needsFrameNever: 1) (1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1) (1 64 75 genPushTemporaryVariableBytecode needsFrameIfMod16GENumArgs: 1) (1 76 76 genPushReceiverBytecode needsFrameNever: 1) (1 77 77 genExtPushPseudoVariableOrOuterBytecode) (1 78 78 genPushConstantZeroBytecode needsFrameNever: 1) (1 79 79 genPushConstantOneBytecode needsFrameNever: 1) (1 80 80 genSpecialSelectorArithmetic isMapped AddRR) (1 81 81 genSpecialSelectorArithmetic isMapped SubRR) (1 82 82 genSpecialSelectorComparison isMapped JumpLess) (1 83 83 genSpecialSelectorComparison isMapped JumpGreater) (1 84 84 genSpecialSelectorComparison isMapped JumpLessOrEqual) (1 85 85 genSpecialSelectorComparison isMapped JumpGreaterOrEqual) (1 86 86 genSpecialSelectorComparison isMapped JumpZero) (1 87 87 genSpecialSelectorComparison isMapped JumpNonZero) (1 88 93 genSpecialSelectorSend isMapped) " #* #/ #\\ #@ #bitShift: //" (1 94 94 genSpecialSelectorArithmetic isMapped AndRR) (1 95 95 genSpecialSelectorArithmetic isMapped OrRR) (1 96 101 genSpecialSelectorSend isMapped) "#at: #at:put: #size #next #nextPut: #atEnd" + (1 102 102 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)" + (1 103 103 genSpecialSelectorClass needsFrameIfStackGreaterThanOne: notMapped 0) "not mapped because it is directly inlined (for now)" - (1 102 102 genSpecialSelectorEqualsEquals needsFrameIfFollowsSend: notMapped -1) "not mapped because it is directly inlined (for now)" - (1 103 103 genSpecialSelectorClass needsFrameIfFollowsSend: notMapped 0) "not mapped because it is directly inlined (for now)" (1 104 111 genSpecialSelectorSend isMapped) "#blockCopy: #value #value: #do: #new #new: #x #y" (1 112 127 genSendLiteralSelector0ArgsBytecode isMapped) (1 128 143 genSendLiteralSelector1ArgBytecode isMapped) (1 144 159 genSendLiteralSelector2ArgsBytecode isMapped) (1 160 175 genSendAbsentImplicit0ArgsBytecode isMapped) (1 176 183 genStoreAndPopReceiverVariableBytecode needsFrameNever: -1) "N.B. not frameless if immutability" (1 184 191 genStoreAndPopTemporaryVariableBytecode) (1 192 199 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:) (1 200 207 genShortJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (1 208 215 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (1 216 216 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0) (1 217 217 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1) (1 218 218 genExtReturnTopFromBlock return needsFrameNever: -1) (1 219 219 duplicateTopBytecode needsFrameNever: 1) (1 220 220 genPopStackBytecode needsFrameNever: -1) (1 221 221 genExtNopBytecode needsFrameNever: 0) (1 222 223 unknownBytecode) "2 byte bytecodes" (2 224 224 extABytecode extension needsFrameNever: 0) (2 225 225 extBBytecode extension needsFrameNever: 0) (2 226 226 genExtPushReceiverVariableBytecode) (2 227 227 genExtPushLiteralVariableBytecode needsFrameNever: 1) (2 228 228 genExtPushLiteralBytecode needsFrameNever: 1) (2 229 229 genExtPushIntegerBytecode needsFrameNever: 1) (2 230 230 genLongPushTemporaryVariableBytecode) (2 231 231 genPushNewArrayBytecode) (2 232 232 genExtStoreReceiverVariableBytecode) (2 233 233 genExtStoreLiteralVariableBytecode) (2 234 234 genLongStoreTemporaryVariableBytecode) (2 235 235 genExtStoreAndPopReceiverVariableBytecode) (2 236 236 genExtStoreAndPopLiteralVariableBytecode) (2 237 237 genLongStoreAndPopTemporaryVariableBytecode) (2 238 238 genExtSendBytecode isMapped) (2 239 239 genExtSendSuperBytecode isMapped) (2 240 240 genExtSendAbsentImplicitBytecode isMapped) (2 241 241 genExtSendAbsentDynamicSuperBytecode isMapped) (2 242 242 genExtUnconditionalJump branch isMapped "because of interrupt check" v4:Long:Branch:Distance:) (2 243 243 genExtJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) (2 244 244 genExtJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) (2 245 248 unknownBytecode) "3 byte bytecodes" (3 249 249 callPrimitiveBytecode) (3 250 250 genPushRemoteTempLongBytecode) (3 251 251 genStoreRemoteTempLongBytecode) (3 252 252 genStoreAndPopRemoteTempLongBytecode) (3 253 253 genExtPushClosureBytecode block v4:Block:Code:Size:) (3 254 255 unknownBytecode))! Item was changed: ----- Method: StackToRegisterMappingCogit class>>newInitializeBytecodeTableForSqueakV3PlusClosures (in category 'class initialization') ----- newInitializeBytecodeTableForSqueakV3PlusClosures "StackToRegisterMappingCogit newInitializeBytecodeTableForSqueakV3PlusClosures" isPushNilFunction := #v3:Is:Push:Nil:. pushNilSizeFunction := #v3PushNilSize:. self flag: 'Special selector send class must be inlined to agree with the interpreter, which inlines class. If class is sent to e.g. a general instance of ProtoObject then unless class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit have identical semantics. We get away with not hardwiring the other special selectors either because in the Cointerpreter they are not inlined or because they are inlined only to instances of classes for which there will always be a method.'. self generatorTableFrom: #( (1 0 15 genPushReceiverVariableBytecode needsFrameNever: 1) (1 16 31 genPushTemporaryVariableBytecode needsFrameIfMod16GENumArgs: 1) (1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1) (1 64 95 genPushLiteralVariableBytecode needsFrameNever: 1) (1 96 103 genStoreAndPopReceiverVariableBytecode needsFrameNever: -1) "N.B. not frameless if immutability" (1 104 111 genStoreAndPopTemporaryVariableBytecode) (1 112 112 genPushReceiverBytecode needsFrameNever: 1) (1 113 113 genPushConstantTrueBytecode needsFrameNever: 1) (1 114 114 genPushConstantFalseBytecode needsFrameNever: 1) (1 115 115 genPushConstantNilBytecode needsFrameNever: 1) (1 116 119 genPushQuickIntegerConstantBytecode needsFrameNever: 1) "method returns in blocks need a frame because of nonlocalReturn:through:" (1 120 120 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0) (1 121 121 genReturnTrue return needsFrameIfInBlock: isMappedInBlock 0) (1 122 122 genReturnFalse return needsFrameIfInBlock: isMappedInBlock 0) (1 123 123 genReturnNil return needsFrameIfInBlock: isMappedInBlock 0) (1 124 124 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1) (1 125 125 genReturnTopFromBlock return needsFrameNever: -1) (1 126 127 unknownBytecode) (2 128 128 extendedPushBytecode needsFrameNever: 1) (2 129 129 extendedStoreBytecode) (2 130 130 extendedStoreAndPopBytecode) (2 131 131 genExtendedSendBytecode isMapped) (3 132 132 doubleExtendedDoAnythingBytecode isMapped) (2 133 133 genExtendedSuperBytecode isMapped) (2 134 134 genSecondExtendedSendBytecode isMapped) (1 135 135 genPopStackBytecode needsFrameNever: -1) (1 136 136 duplicateTopBytecode needsFrameNever: 1) (1 137 137 genPushActiveContextBytecode) (2 138 138 genPushNewArrayBytecode) (1 139 139 unknownBytecode) (3 140 140 genPushRemoteTempLongBytecode) (3 141 141 genStoreRemoteTempLongBytecode) (3 142 142 genStoreAndPopRemoteTempLongBytecode) (4 143 143 genPushClosureCopyCopiedValuesBytecode block v3:Block:Code:Size:) (1 144 151 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:) (1 152 159 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (2 160 163 genLongUnconditionalBackwardJump branch isMapped "because of interrupt check" v3:Long:Branch:Distance:) (2 164 167 genLongUnconditionalForwardJump branch v3:Long:Branch:Distance:) (2 168 171 genLongJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v3:LongForward:Branch:Distance:) (2 172 175 genLongJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:LongForward:Branch:Distance:) (1 176 176 genSpecialSelectorArithmetic isMapped AddRR) (1 177 177 genSpecialSelectorArithmetic isMapped SubRR) (1 178 178 genSpecialSelectorComparison isMapped JumpLess) (1 179 179 genSpecialSelectorComparison isMapped JumpGreater) (1 180 180 genSpecialSelectorComparison isMapped JumpLessOrEqual) (1 181 181 genSpecialSelectorComparison isMapped JumpGreaterOrEqual) (1 182 182 genSpecialSelectorComparison isMapped JumpZero) (1 183 183 genSpecialSelectorComparison isMapped JumpNonZero) (1 184 189 genSpecialSelectorSend isMapped) " #* #/ #\\ #@ #bitShift: //" (1 190 190 genSpecialSelectorArithmetic isMapped AndRR) (1 191 191 genSpecialSelectorArithmetic isMapped OrRR) (1 192 197 genSpecialSelectorSend isMapped) "#at: #at:put: #size #next #nextPut: #atEnd" + (1 198 198 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)" + (1 199 199 genSpecialSelectorClass needsFrameIfStackGreaterThanOne: notMapped 0) "not mapped because it is directly inlined (for now)" - (1 198 198 genSpecialSelectorEqualsEquals needsFrameIfFollowsSend: notMapped -1) "not mapped because it is directly inlined (for now)" - (1 199 199 genSpecialSelectorClass needsFrameIfFollowsSend: notMapped 0) "not mapped because it is directly inlined (for now)" (1 200 207 genSpecialSelectorSend isMapped) "#blockCopy: #value #value: #do: #new #new: #x #y" (1 208 223 genSendLiteralSelector0ArgsBytecode isMapped) (1 224 239 genSendLiteralSelector1ArgBytecode isMapped) (1 240 255 genSendLiteralSelector2ArgsBytecode isMapped))! Item was changed: ----- Method: StackToRegisterMappingCogit>>needsFrameIfFollowsSend: (in category 'compile abstract instructions') ----- + needsFrameIfFollowsSend: stackDelta - needsFrameIfFollowsSend: isInBlock "As of August 2013, the code generator can't deal with spills in frameless methods (the issue is to do with the stack offset to get at an argument, which is changed when there's a spill). The only context in a spill is needed in a frameless method that I can think of is sends following sends as in e.g. TextColor>>#dominates: other ^other class == self class. Only need to check for the frameless sends since all other sends will force a frame." self assert: (prevBCDescriptor notNil and: [prevBCDescriptor needsFrameFunction notNil]). ^prevBCDescriptor generator == #genSpecialSelectorEqualsEquals or: [prevBCDescriptor generator == #genSpecialSelectorClass]! Item was changed: ----- Method: StackToRegisterMappingCogit>>needsFrameIfMod16GENumArgs: (in category 'compile abstract instructions') ----- + needsFrameIfMod16GENumArgs: stackDelta - needsFrameIfMod16GENumArgs: isInBlock ^byte0 \\ 16 >= methodOrBlockNumArgs! Item was added: + ----- Method: StackToRegisterMappingCogit>>needsFrameIfStackGreaterThanOne: (in category 'compile abstract instructions') ----- + needsFrameIfStackGreaterThanOne: stackDelta + "As of August 2013, the code generator can't deal with spills in frameless methods (the + issue is to do with the stack offset to get at an argument, which is changed when there's a spill). + In e.g. TextColor>>#dominates: other ^other class == self class the second send of class + needs also rto allocate a register that the first one used, but the first one's register can't be + spilled. So avoid this by only allowing class to be sent if the stack contains a single element." + + ^stackDelta > 1! Item was changed: ----- Method: StackToRegisterMappingCogit>>scanBlock: (in category 'compile abstract instructions') ----- scanBlock: blockStart "Scan the block to determine if the block needs a frame or not" + | descriptor pc end framelessStackDelta nExts pushingNils | - | descriptor pc end stackDelta nExts pushingNils | <var: #blockStart type: #'BlockStart *'> <var: #descriptor type: #'BytecodeDescriptor *'> needsFrame := false. prevBCDescriptor := nil. methodOrBlockNumArgs := blockStart numArgs. + inBlock := true. - nExts := 0. pc := blockStart startpc. end := blockStart startpc + blockStart span. + framelessStackDelta := nExts := 0. - stackDelta := 0. pushingNils := true. [pc < end] whileTrue: [byte0 := (objectMemory fetchByte: pc ofObject: methodObj) + bytecodeSetOffset. descriptor := self generatorAt: byte0. needsFrame ifFalse: [(descriptor needsFrameFunction isNil + or: [self perform: descriptor needsFrameFunction with: framelessStackDelta]) - or: [self perform: descriptor needsFrameFunction with: true]) ifTrue: [needsFrame := true] + ifFalse: [framelessStackDelta := framelessStackDelta + descriptor stackDelta]]. - ifFalse: [stackDelta := stackDelta + descriptor stackDelta]]. (pushingNils and: [descriptor isExtension not]) ifTrue: ["Count the initial number of pushed nils acting as temp initializers. We can't tell whether an initial pushNil is an operand reference or a temp initializer, except when the pushNil is a jump target (has a fixup) in which case it is definitely an operand reference. So rarely we may end up over-estimating. We will correct by checking the stack depth at the end of the block in compileBlockBodies." (pushingNils := (self isPushNil: descriptor pc: pc nExts: nExts method: methodObj) and: [(self fixupAt: pc - initialPC) targetInstruction = 0]) ifTrue: [self assert: descriptor numBytes = 1. "see compileMethodBody" blockStart numInitialNils: blockStart numInitialNils + 1]]. pc := self nextBytecodePCFor: descriptor at: pc exts: nExts in: methodObj. nExts := descriptor isExtension ifTrue: [nExts + 1] ifFalse: [0]. prevBCDescriptor := descriptor]. "It would be nice of this wasn't necessary but alas we need to do the eager scan for frameless methods so that we don't end up popping too much off the simulated stack, e.g. for pushNil; returnTopFromBlock methods." needsFrame ifFalse: + [self assert: (framelessStackDelta >= 0 and: [blockStart numInitialNils >= framelessStackDelta]). + blockStart numInitialNils: blockStart numInitialNils - framelessStackDelta]! - [self assert: (stackDelta >= 0 and: [blockStart numInitialNils >= stackDelta]). - blockStart numInitialNils: blockStart numInitialNils - stackDelta]! Item was changed: ----- Method: StackToRegisterMappingCogit>>scanMethod (in category 'compile abstract instructions') ----- scanMethod + "Scan the method (and all embedded blocks) to determine - "Scan the method to determine - what the last bytecode is; extra bytes at the end of a method are used to encode things like source pointers or temp names - if the method needs a frame or not - what are the targets of any backward branches. - how many blocks it creates Answer the block count or on error a negative error code" + | latestContinuation nExts descriptor pc numBlocks distance targetPC framelessStackDelta | - | latestContinuation nExts descriptor pc numBlocks distance targetPC | <var: #descriptor type: #'BytecodeDescriptor *'> needsFrame := false. + inBlock := false. prevBCDescriptor := nil. (primitiveIndex > 0 and: [coInterpreter isQuickPrimitiveIndex: primitiveIndex]) ifTrue: [^0]. - numBlocks := 0. pc := latestContinuation := initialPC. + numBlocks := framelessStackDelta := nExts := 0. - nExts := 0. [pc <= endPC] whileTrue: [byte0 := (objectMemory fetchByte: pc ofObject: methodObj) + bytecodeSetOffset. descriptor := self generatorAt: byte0. (descriptor isReturn and: [pc >= latestContinuation]) ifTrue: [endPC := pc]. + needsFrame ifFalse: + [(descriptor needsFrameFunction isNil + or: [self perform: descriptor needsFrameFunction with: framelessStackDelta]) + ifTrue: [needsFrame := true] + ifFalse: [framelessStackDelta := framelessStackDelta + descriptor stackDelta]]. - (needsFrame not - and: [descriptor needsFrameFunction isNil - or: [self perform: descriptor needsFrameFunction with: false]]) ifTrue: - [needsFrame := true]. descriptor isBranch ifTrue: [distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. (self isBackwardBranch: descriptor at: pc exts: nExts in: methodObj) ifTrue: [self initializeFixupAt: targetPC - initialPC] ifFalse: [latestContinuation := latestContinuation max: targetPC]]. descriptor isBlockCreation ifTrue: [numBlocks := numBlocks + 1. distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. latestContinuation := latestContinuation max: targetPC]. pc := pc + descriptor numBytes. nExts := descriptor isExtension ifTrue: [nExts + 1] ifFalse: [0]. prevBCDescriptor := descriptor]. ^numBlocks!

1 0

[commit][2773] CogVM source as per VMMaker.oscog-eem.328.
by commits＠squeakvm.org 17 Aug '13

17 Aug '13

Revision: 2773 Author: eliot Date: 2013-08-17 14:49:08 -0700 (Sat, 17 Aug 2013) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.328. Fix StackToRegisterMappingCogit>>genPrimitiveClass for case where numArgs > 0 (must use other than ReceiverResultReg, e.g. objectClass:). Improve register usage in genSpecialSelectorClass. Save & restore methodOrBlockNumTemps in compileBlockBodies for symmetry with needsFrame & methodOrBlockNumArgs. Slang: fix formatting of WhileForeverBreakIf loops. Tweak startPCOrNilOfLiteral:in: to filter-out arrays from its check for closure literals. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/src/vm/interp.h branches/Cog/src/vm/vmCallback.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2013-08-15 18:55:10 UTC (rev 2772) +++ branches/Cog/nscogsrc/vm/cogit.c 2013-08-17 21:49:08 UTC (rev 2773) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.322 uuid: 15da84de-4866-48ae-b478-c2c96002c5eb + CCodeGenerator VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde from - StackToRegisterMappingCogit VMMaker.oscog-eem.322 uuid: 15da84de-4866-48ae-b478-c2c96002c5eb + StackToRegisterMappingCogit VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.322 uuid: 15da84de-4866-48ae-b478-c2c96002c5eb " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -2114,7 +2114,7 @@ if (blockCount > 0) { i = blockCount - 1; - while (1) { + while (1) { /* check for repeat addition during recompilation due to initialNil miscount. */ @@ -3890,10 +3890,12 @@ sqInt result; sqInt savedNeedsFrame; sqInt savedNumArgs; + sqInt savedNumTemps; assert(blockCount > 0); savedNeedsFrame = needsFrame; savedNumArgs = methodOrBlockNumArgs; + savedNumTemps = methodOrBlockNumTemps; inBlock = 1; compiledBlocksCount = 0; while (compiledBlocksCount < blockCount) { @@ -3901,7 +3903,7 @@ scanBlock(blockStart); initialOpcodeIndex = opcodeIndex; initialAnnotationIndex = annotationIndex; - while (1) { + while (1) { compileBlockEntry(blockStart); initialStackPtr = simStackPtr; if (((result = compileAbstractInstructionsFromthrough(((blockStart->startpc)) + ((pushNilSizeFunction(methodObj)) * ((blockStart->numInitialNils))), (((blockStart->startpc)) + ((blockStart->span))) - 1))) < 0) { @@ -3921,6 +3923,7 @@ } needsFrame = savedNeedsFrame; methodOrBlockNumArgs = savedNumArgs; + methodOrBlockNumTemps = savedNumTemps; return 0; } @@ -11352,10 +11355,28 @@ return 0; } + +/* Depending on argument count the argument is either + 0 args: ReceiverResultReg + 1 args: Arg0Reg + N args: top of stack (assuming 1 reg arg for now) */ + static sqInt genPrimitiveClass(void) { - genGetClassObjectOfintoscratchReg(ReceiverResultReg, ReceiverResultReg, TempReg); + sqInt reg; + + if (methodOrBlockNumArgs == 1) { + reg = Arg0Reg; + } + else { + if (methodOrBlockNumArgs > 0) { + /* begin MoveMw:r:R: */ + genoperandoperandoperand(MoveMwrR, BytesPerWord, SPReg, ReceiverResultReg); + } + reg = ReceiverResultReg; + } + genGetClassObjectOfintoscratchReg(reg, ReceiverResultReg, TempReg); /* begin RetN: */ genoperand(RetN, 0); return 0; @@ -12109,7 +12130,7 @@ /* N.B. Do _not_ use ReceiverResultReg to avoid overwriting receiver in assignment in frameless methods. */ /* So far descriptors are not rich enough to describe the entire dereference so generate the register - load but don't push the result. There is an order-or-evaluation issue if we defer the dereference. */ + load but don't push the result. There is an order-of-evaluation issue if we defer the dereference. */ association = getLiteral(literalIndex); annotateobjRef(gMoveCwR(association, TempReg), association); @@ -12991,11 +13012,20 @@ static sqInt genSpecialSelectorClass(void) { + sqInt topReg; + + topReg = registerOrNil(ssTop()); ssPop(1); - ssAllocateRequiredRegand(SendNumArgsReg, ClassReg); + if ((topReg == null) + || (topReg == ClassReg)) { + ssAllocateRequiredRegand((topReg = SendNumArgsReg), ClassReg); + } + else { + ssAllocateRequiredReg(ClassReg); + } ssPush(1); - popToReg(ssTop(), SendNumArgsReg); - genGetClassObjectOfintoscratchReg(SendNumArgsReg, ClassReg, TempReg); + popToReg(ssTop(), topReg); + genGetClassObjectOfintoscratchReg(topReg, ClassReg, TempReg); return (ssPop(1), ssPushRegister(ClassReg)); } @@ -14925,7 +14955,7 @@ ? AltNSSendIsPCAnnotated : NSSendIsPCAnnotated))) || (annotation == HasBytecodePC))) { - while (1) { + while (1) { byte = (fetchByteofObject(bcpc, aMethodObj)) + bsOffset; descriptor = generatorAt(byte); if (isInBlock) { Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2013-08-15 18:55:10 UTC (rev 2772) +++ branches/Cog/nscogsrc/vm/cogit.h 2013-08-17 21:49:08 UTC (rev 2773) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.322 uuid: 15da84de-4866-48ae-b478-c2c96002c5eb + CCodeGenerator VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde */ Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2013-08-15 18:55:10 UTC (rev 2772) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2013-08-17 21:49:08 UTC (rev 2773) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.322 uuid: 15da84de-4866-48ae-b478-c2c96002c5eb + CCodeGenerator VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde */ typedef struct { Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2013-08-15 18:55:10 UTC (rev 2772) +++ branches/Cog/nscogsrc/vm/cointerp.c 2013-08-17 21:49:08 UTC (rev 2773) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.321 uuid: 6134e40b-c38c-41ec-8f31-64a7f1c002b3 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde from - CoInterpreter VMMaker.oscog-eem.321 uuid: 6134e40b-c38c-41ec-8f31-64a7f1c002b3 + CoInterpreter VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.321 uuid: 6134e40b-c38c-41ec-8f31-64a7f1c002b3 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1993,7 +1993,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.321"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.328"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -15220,7 +15220,7 @@ currentCtx = callerContextOrNil2; assert(isContext(currentCtx)); freeStackPage(GIV(stackPage)); - while (1) { + while (1) { assert(isContext(currentCtx)); if ((((longAt((currentCtx + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) && ((stackPageFor((theFP = frameOfMarriedContext(currentCtx)))) == newPage)) break; @@ -17161,7 +17161,7 @@ if (!(thePage == GIV(stackPage))) { theSP += BytesPerWord; } - while (1) { + while (1) { frameRcvrOffset = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) ? theFP + FoxMFReceiver : theFP + FoxIFReceiver); @@ -23262,7 +23262,7 @@ VM_LABEL(0nextImplicitReceiverForwithMixin); implicitReceiver = longAt((mixinApplication + BaseHeaderSize) + (EnclosingObjectIndex << ShiftForWord)); targetMixin = longAt((theMixin + BaseHeaderSize) + (EnclosingMixinIndex << ShiftForWord)); - while (1) { + while (1) { if (targetMixin == GIV(nilObj)) { /* or: [implicitReceiver = objectMemory nilObject] */ @@ -27188,7 +27188,7 @@ theIPPtr = theSP; theSP += BytesPerWord; } - while (1) { + while (1) { assert(addressIsInPage(thePage, theFP)); assert(addressIsInPage(thePage, theSP)); assert((theIPPtr == 0) @@ -27806,7 +27806,7 @@ if (action == StartField) { /* begin startField */ VM_LABEL(0startField); - while (1) { + while (1) { child = longAt(field); if (!((child & 1))) break; @@ -43156,7 +43156,7 @@ } else { tempLink = firstLink; - while (1) { + while (1) { if (tempLink == GIV(nilObj)) { /* begin success: */ if (!0) { @@ -45833,7 +45833,7 @@ : theSP1 + BytesPerWord); goto l1; } - while (1) { + while (1) { /* begin frameCallerSP: */ assert(!(isBaseFrame(aFrame))); theSP1 = (aFrame + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(aFrame + FoxMethod)))) < (startOfMemory()) @@ -51127,6 +51127,9 @@ if ((lastPointerOf(lit)) <= ClosureCopiedValuesIndex) { return null; } + if (((((usqInt) (longAt(lit))) >> 8) & 15) == 2) { + return null; + } outerContext = longAt((lit + BaseHeaderSize) + (ClosureOuterContextIndex << ShiftForWord)); if (!(((outerContext & 1) == 0) && (((((usqInt) (longAt(outerContext))) >> 12) & 31) == ClassMethodContextCompactIndex))) { @@ -53045,7 +53048,7 @@ if (!(isFree(thePage))) { theIPPtr = (thePage->headSP); theFP = (thePage->headFP); - while (1) { + while (1) { if ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())) { theMethodField = longAt(theFP + FoxMethod); theFlags = theMethodField & MFMethodFlagsMask; Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2013-08-15 18:55:10 UTC (rev 2772) +++ branches/Cog/nscogsrc/vm/cointerp.h 2013-08-17 21:49:08 UTC (rev 2773) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.321 uuid: 6134e40b-c38c-41ec-8f31-64a7f1c002b3 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-08-15 18:55:10 UTC (rev 2772) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-08-17 21:49:08 UTC (rev 2773) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.321 uuid: 6134e40b-c38c-41ec-8f31-64a7f1c002b3 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde from - CoInterpreter VMMaker.oscog-eem.321 uuid: 6134e40b-c38c-41ec-8f31-64a7f1c002b3 + CoInterpreter VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.321 uuid: 6134e40b-c38c-41ec-8f31-64a7f1c002b3 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1996,7 +1996,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.321"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.328"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -15229,7 +15229,7 @@ currentCtx = callerContextOrNil2; assert(isContext(currentCtx)); freeStackPage(GIV(stackPage)); - while (1) { + while (1) { assert(isContext(currentCtx)); if ((((longAt((currentCtx + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) && ((stackPageFor((theFP = frameOfMarriedContext(currentCtx)))) == newPage)) break; @@ -17170,7 +17170,7 @@ if (!(thePage == GIV(stackPage))) { theSP += BytesPerWord; } - while (1) { + while (1) { frameRcvrOffset = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) ? theFP + FoxMFReceiver : theFP + FoxIFReceiver); @@ -23271,7 +23271,7 @@ VM_LABEL(0nextImplicitReceiverForwithMixin); implicitReceiver = longAt((mixinApplication + BaseHeaderSize) + (EnclosingObjectIndex << ShiftForWord)); targetMixin = longAt((theMixin + BaseHeaderSize) + (EnclosingMixinIndex << ShiftForWord)); - while (1) { + while (1) { if (targetMixin == GIV(nilObj)) { /* or: [implicitReceiver = objectMemory nilObject] */ @@ -27197,7 +27197,7 @@ theIPPtr = theSP; theSP += BytesPerWord; } - while (1) { + while (1) { assert(addressIsInPage(thePage, theFP)); assert(addressIsInPage(thePage, theSP)); assert((theIPPtr == 0) @@ -27815,7 +27815,7 @@ if (action == StartField) { /* begin startField */ VM_LABEL(0startField); - while (1) { + while (1) { child = longAt(field); if (!((child & 1))) break; @@ -43165,7 +43165,7 @@ } else { tempLink = firstLink; - while (1) { + while (1) { if (tempLink == GIV(nilObj)) { /* begin success: */ if (!0) { @@ -45842,7 +45842,7 @@ : theSP1 + BytesPerWord); goto l1; } - while (1) { + while (1) { /* begin frameCallerSP: */ assert(!(isBaseFrame(aFrame))); theSP1 = (aFrame + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(aFrame + FoxMethod)))) < (startOfMemory()) @@ -51136,6 +51136,9 @@ if ((lastPointerOf(lit)) <= ClosureCopiedValuesIndex) { return null; } + if (((((usqInt) (longAt(lit))) >> 8) & 15) == 2) { + return null; + } outerContext = longAt((lit + BaseHeaderSize) + (ClosureOuterContextIndex << ShiftForWord)); if (!(((outerContext & 1) == 0) && (((((usqInt) (longAt(outerContext))) >> 12) & 31) == ClassMethodContextCompactIndex))) { @@ -53054,7 +53057,7 @@ if (!(isFree(thePage))) { theIPPtr = (thePage->headSP); theFP = (thePage->headFP); - while (1) { + while (1) { if ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())) { theMethodField = longAt(theFP + FoxMethod); theFlags = theMethodField & MFMethodFlagsMask; Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2013-08-15 18:55:10 UTC (rev 2772) +++ branches/Cog/nscogsrc/vm/interp.h 2013-08-17 21:49:08 UTC (rev 2773) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.321 uuid: 6134e40b-c38c-41ec-8f31-64a7f1c002b3 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2013-08-15 18:55:10 UTC (rev 2772) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2013-08-17 21:49:08 UTC (rev 2773) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.321 uuid: 6134e40b-c38c-41ec-8f31-64a7f1c002b3 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Thu Aug 15 11:54:48 PDT 2013 + Sat Aug 17 14:48:34 PDT 2013 Modified: branches/Cog/src/vm/cogit.c =================================================================== --- branches/Cog/src/vm/cogit.c 2013-08-15 18:55:10 UTC (rev 2772) +++ branches/Cog/src/vm/cogit.c 2013-08-17 21:49:08 UTC (rev 2773) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.322 uuid: 15da84de-4866-48ae-b478-c2c96002c5eb + CCodeGenerator VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde from - StackToRegisterMappingCogit VMMaker.oscog-eem.322 uuid: 15da84de-4866-48ae-b478-c2c96002c5eb + StackToRegisterMappingCogit VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.322 uuid: 15da84de-4866-48ae-b478-c2c96002c5eb " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -1801,7 +1801,7 @@ if (blockCount > 0) { i = blockCount - 1; - while (1) { + while (1) { /* check for repeat addition during recompilation due to initialNil miscount. */ @@ -3473,10 +3473,12 @@ sqInt result; sqInt savedNeedsFrame; sqInt savedNumArgs; + sqInt savedNumTemps; assert(blockCount > 0); savedNeedsFrame = needsFrame; savedNumArgs = methodOrBlockNumArgs; + savedNumTemps = methodOrBlockNumTemps; inBlock = 1; compiledBlocksCount = 0; while (compiledBlocksCount < blockCount) { @@ -3484,7 +3486,7 @@ scanBlock(blockStart); initialOpcodeIndex = opcodeIndex; initialAnnotationIndex = annotationIndex; - while (1) { + while (1) { compileBlockEntry(blockStart); initialStackPtr = simStackPtr; if (((result = compileAbstractInstructionsFromthrough(((blockStart->startpc)) + ((pushNilSizeFunction(methodObj)) * ((blockStart->numInitialNils))), (((blockStart->startpc)) + ((blockStart->span))) - 1))) < 0) { @@ -3504,6 +3506,7 @@ } needsFrame = savedNeedsFrame; methodOrBlockNumArgs = savedNumArgs; + methodOrBlockNumTemps = savedNumTemps; return 0; } @@ -10374,10 +10377,28 @@ return 0; } + +/* Depending on argument count the argument is either + 0 args: ReceiverResultReg + 1 args: Arg0Reg + N args: top of stack (assuming 1 reg arg for now) */ + static sqInt genPrimitiveClass(void) { - genGetClassObjectOfintoscratchReg(ReceiverResultReg, ReceiverResultReg, TempReg); + sqInt reg; + + if (methodOrBlockNumArgs == 1) { + reg = Arg0Reg; + } + else { + if (methodOrBlockNumArgs > 0) { + /* begin MoveMw:r:R: */ + genoperandoperandoperand(MoveMwrR, BytesPerWord, SPReg, ReceiverResultReg); + } + reg = ReceiverResultReg; + } + genGetClassObjectOfintoscratchReg(reg, ReceiverResultReg, TempReg); /* begin RetN: */ genoperand(RetN, 0); return 0; @@ -11064,7 +11085,7 @@ /* N.B. Do _not_ use ReceiverResultReg to avoid overwriting receiver in assignment in frameless methods. */ /* So far descriptors are not rich enough to describe the entire dereference so generate the register - load but don't push the result. There is an order-or-evaluation issue if we defer the dereference. */ + load but don't push the result. There is an order-of-evaluation issue if we defer the dereference. */ association = getLiteral(literalIndex); annotateobjRef(gMoveCwR(association, TempReg), association); @@ -11877,11 +11898,20 @@ static sqInt genSpecialSelectorClass(void) { + sqInt topReg; + + topReg = registerOrNil(ssTop()); ssPop(1); - ssAllocateRequiredRegand(SendNumArgsReg, ClassReg); + if ((topReg == null) + || (topReg == ClassReg)) { + ssAllocateRequiredRegand((topReg = SendNumArgsReg), ClassReg); + } + else { + ssAllocateRequiredReg(ClassReg); + } ssPush(1); - popToReg(ssTop(), SendNumArgsReg); - genGetClassObjectOfintoscratchReg(SendNumArgsReg, ClassReg, TempReg); + popToReg(ssTop(), topReg); + genGetClassObjectOfintoscratchReg(topReg, ClassReg, TempReg); return (ssPop(1), ssPushRegister(ClassReg)); } @@ -13784,7 +13814,7 @@ mcpc += mapByte & DisplacementMask; if ((annotation == IsSendCall) || (annotation == HasBytecodePC)) { - while (1) { + while (1) { byte = (fetchByteofObject(bcpc, aMethodObj)) + bsOffset; descriptor = generatorAt(byte); if (isInBlock) { Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2013-08-15 18:55:10 UTC (rev 2772) +++ branches/Cog/src/vm/cogit.h 2013-08-17 21:49:08 UTC (rev 2773) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.322 uuid: 15da84de-4866-48ae-b478-c2c96002c5eb + CCodeGenerator VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde */ Modified: branches/Cog/src/vm/cogmethod.h =================================================================== --- branches/Cog/src/vm/cogmethod.h 2013-08-15 18:55:10 UTC (rev 2772) +++ branches/Cog/src/vm/cogmethod.h 2013-08-17 21:49:08 UTC (rev 2773) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.322 uuid: 15da84de-4866-48ae-b478-c2c96002c5eb + CCodeGenerator VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde */ typedef struct { Modified: branches/Cog/src/vm/cointerp.c =================================================================== --- branches/Cog/src/vm/cointerp.c 2013-08-15 18:55:10 UTC (rev 2772) +++ branches/Cog/src/vm/cointerp.c 2013-08-17 21:49:08 UTC (rev 2773) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.321 uuid: 6134e40b-c38c-41ec-8f31-64a7f1c002b3 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde from - CoInterpreter VMMaker.oscog-eem.321 uuid: 6134e40b-c38c-41ec-8f31-64a7f1c002b3 + CoInterpreter VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.321 uuid: 6134e40b-c38c-41ec-8f31-64a7f1c002b3 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1983,7 +1983,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.321]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.328]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -11154,7 +11154,7 @@ currentCtx = callerContextOrNil2; assert(isContext(currentCtx)); freeStackPage(GIV(stackPage)); - while (1) { + while (1) { assert(isContext(currentCtx)); if ((((longAt((currentCtx + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) && ((stackPageFor((theFP = frameOfMarriedContext(currentCtx)))) == newPage)) break; @@ -13086,7 +13086,7 @@ if (!(thePage == GIV(stackPage))) { theSP += BytesPerWord; } - while (1) { + while (1) { frameRcvrOffset = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) ? theFP + FoxMFReceiver : theFP + FoxIFReceiver); @@ -22780,7 +22780,7 @@ theIPPtr = theSP; theSP += BytesPerWord; } - while (1) { + while (1) { assert(addressIsInPage(thePage, theFP)); assert(addressIsInPage(thePage, theSP)); assert((theIPPtr == 0) @@ -23396,7 +23396,7 @@ if (action == StartField) { /* begin startField */ VM_LABEL(0startField); - while (1) { + while (1) { child = longAt(field); if (!((child & 1))) break; @@ -38643,7 +38643,7 @@ } else { tempLink = firstLink; - while (1) { + while (1) { if (tempLink == GIV(nilObj)) { /* begin success: */ if (!0) { @@ -41315,7 +41315,7 @@ : theSP1 + BytesPerWord); goto l1; } - while (1) { + while (1) { /* begin frameCallerSP: */ assert(!(isBaseFrame(aFrame))); theSP1 = (aFrame + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(aFrame + FoxMethod)))) < (startOfMemory()) @@ -46560,6 +46560,9 @@ if ((lastPointerOf(lit)) <= ClosureCopiedValuesIndex) { return null; } + if (((((usqInt) (longAt(lit))) >> 8) & 15) == 2) { + return null; + } outerContext = longAt((lit + BaseHeaderSize) + (ClosureOuterContextIndex << ShiftForWord)); if (!(((outerContext & 1) == 0) && (((((usqInt) (longAt(outerContext))) >> 12) & 31) == ClassMethodContextCompactIndex))) { @@ -48471,7 +48474,7 @@ if (!(isFree(thePage))) { theIPPtr = (thePage->headSP); theFP = (thePage->headFP); - while (1) { + while (1) { if ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())) { theMethodField = longAt(theFP + FoxMethod); theFlags = theMethodField & MFMethodFlagsMask; Modified: branches/Cog/src/vm/cointerp.h =================================================================== --- branches/Cog/src/vm/cointerp.h 2013-08-15 18:55:10 UTC (rev 2772) +++ branches/Cog/src/vm/cointerp.h 2013-08-17 21:49:08 UTC (rev 2773) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.321 uuid: 6134e40b-c38c-41ec-8f31-64a7f1c002b3 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde */ Modified: branches/Cog/src/vm/cointerpmt.c =================================================================== --- branches/Cog/src/vm/cointerpmt.c 2013-08-15 18:55:10 UTC (rev 2772) +++ branches/Cog/src/vm/cointerpmt.c 2013-08-17 21:49:08 UTC (rev 2773) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.321 uuid: 6134e40b-c38c-41ec-8f31-64a7f1c002b3 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde from - CoInterpreterMT VMMaker.oscog-eem.321 uuid: 6134e40b-c38c-41ec-8f31-64a7f1c002b3 + CoInterpreterMT VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.321 uuid: 6134e40b-c38c-41ec-8f31-64a7f1c002b3 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2082,7 +2082,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.321]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.328]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -11493,7 +11493,7 @@ currentCtx = callerContextOrNil2; assert(isContext(currentCtx)); freeStackPage(GIV(stackPage)); - while (1) { + while (1) { assert(isContext(currentCtx)); if ((((longAt((currentCtx + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) && ((stackPageFor((theFP = frameOfMarriedContext(currentCtx)))) == newPage)) break; @@ -13438,7 +13438,7 @@ if (!(thePage == GIV(stackPage))) { theSP += BytesPerWord; } - while (1) { + while (1) { frameRcvrOffset = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) ? theFP + FoxMFReceiver : theFP + FoxIFReceiver); @@ -23579,7 +23579,7 @@ theIPPtr = theSP; theSP += BytesPerWord; } - while (1) { + while (1) { assert(addressIsInPage(thePage, theFP)); assert(addressIsInPage(thePage, theSP)); assert((theIPPtr == 0) @@ -24212,7 +24212,7 @@ if (action == StartField) { /* begin startField */ VM_LABEL(0startField); - while (1) { + while (1) { child = longAt(field); if (!((child & 1))) break; @@ -40002,7 +40002,7 @@ } else { tempLink = firstLink; - while (1) { + while (1) { if (tempLink == GIV(nilObj)) { /* begin success: */ if (!0) { @@ -42692,7 +42692,7 @@ : theSP1 + BytesPerWord); goto l1; } - while (1) { + while (1) { /* begin frameCallerSP: */ assert(!(isBaseFrame(aFrame))); theSP1 = (aFrame + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(aFrame + FoxMethod)))) < (startOfMemory()) @@ -48038,6 +48038,9 @@ if ((lastPointerOf(lit)) <= ClosureCopiedValuesIndex) { return null; } + if (((((usqInt) (longAt(lit))) >> 8) & 15) == 2) { + return null; + } outerContext = longAt((lit + BaseHeaderSize) + (ClosureOuterContextIndex << ShiftForWord)); if (!(((outerContext & 1) == 0) && (((((usqInt) (longAt(outerContext))) >> 12) & 31) == ClassMethodContextCompactIndex))) { @@ -50220,7 +50223,7 @@ if (!(isFree(thePage))) { theIPPtr = (thePage->headSP); theFP = (thePage->headFP); - while (1) { + while (1) { if ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())) { theMethodField = longAt(theFP + FoxMethod); theFlags = theMethodField & MFMethodFlagsMask; Modified: branches/Cog/src/vm/cointerpmt.h =================================================================== --- branches/Cog/src/vm/cointerpmt.h 2013-08-15 18:55:10 UTC (rev 2772) +++ branches/Cog/src/vm/cointerpmt.h 2013-08-17 21:49:08 UTC (rev 2773) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.321 uuid: 6134e40b-c38c-41ec-8f31-64a7f1c002b3 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde */ Modified: branches/Cog/src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerp.c 2013-08-15 18:55:10 UTC (rev 2772) +++ branches/Cog/src/vm/gcc3x-cointerp.c 2013-08-17 21:49:08 UTC (rev 2773) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.321 uuid: 6134e40b-c38c-41ec-8f31-64a7f1c002b3 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde from - CoInterpreter VMMaker.oscog-eem.321 uuid: 6134e40b-c38c-41ec-8f31-64a7f1c002b3 + CoInterpreter VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.321 uuid: 6134e40b-c38c-41ec-8f31-64a7f1c002b3 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1986,7 +1986,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.321]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.328]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -11163,7 +11163,7 @@ currentCtx = callerContextOrNil2; assert(isContext(currentCtx)); freeStackPage(GIV(stackPage)); - while (1) { + while (1) { assert(isContext(currentCtx)); if ((((longAt((currentCtx + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) && ((stackPageFor((theFP = frameOfMarriedContext(currentCtx)))) == newPage)) break; @@ -13095,7 +13095,7 @@ if (!(thePage == GIV(stackPage))) { theSP += BytesPerWord; } - while (1) { + while (1) { frameRcvrOffset = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) ? theFP + FoxMFReceiver : theFP + FoxIFReceiver); @@ -22789,7 +22789,7 @@ theIPPtr = theSP; theSP += BytesPerWord; } - while (1) { + while (1) { assert(addressIsInPage(thePage, theFP)); assert(addressIsInPage(thePage, theSP)); assert((theIPPtr == 0) @@ -23405,7 +23405,7 @@ if (action == StartField) { /* begin startField */ VM_LABEL(0startField); - while (1) { + while (1) { child = longAt(field); if (!((child & 1))) break; @@ -38652,7 +38652,7 @@ } else { tempLink = firstLink; - while (1) { + while (1) { if (tempLink == GIV(nilObj)) { /* begin success: */ if (!0) { @@ -41324,7 +41324,7 @@ : theSP1 + BytesPerWord); goto l1; } - while (1) { + while (1) { /* begin frameCallerSP: */ assert(!(isBaseFrame(aFrame))); theSP1 = (aFrame + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(aFrame + FoxMethod)))) < (startOfMemory()) @@ -46569,6 +46569,9 @@ if ((lastPointerOf(lit)) <= ClosureCopiedValuesIndex) { return null; } + if (((((usqInt) (longAt(lit))) >> 8) & 15) == 2) { + return null; + } outerContext = longAt((lit + BaseHeaderSize) + (ClosureOuterContextIndex << ShiftForWord)); if (!(((outerContext & 1) == 0) && (((((usqInt) (longAt(outerContext))) >> 12) & 31) == ClassMethodContextCompactIndex))) { @@ -48480,7 +48483,7 @@ if (!(isFree(thePage))) { theIPPtr = (thePage->headSP); theFP = (thePage->headFP); - while (1) { + while (1) { if ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())) { theMethodField = longAt(theFP + FoxMethod); theFlags = theMethodField & MFMethodFlagsMask; Modified: branches/Cog/src/vm/gcc3x-cointerpmt.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerpmt.c 2013-08-15 18:55:10 UTC (rev 2772) +++ branches/Cog/src/vm/gcc3x-cointerpmt.c 2013-08-17 21:49:08 UTC (rev 2773) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.321 uuid: 6134e40b-c38c-41ec-8f31-64a7f1c002b3 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde from - CoInterpreterMT VMMaker.oscog-eem.321 uuid: 6134e40b-c38c-41ec-8f31-64a7f1c002b3 + CoInterpreterMT VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.321 uuid: 6134e40b-c38c-41ec-8f31-64a7f1c002b3 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2085,7 +2085,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.321]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.328]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -11502,7 +11502,7 @@ currentCtx = callerContextOrNil2; assert(isContext(currentCtx)); freeStackPage(GIV(stackPage)); - while (1) { + while (1) { assert(isContext(currentCtx)); if ((((longAt((currentCtx + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) && ((stackPageFor((theFP = frameOfMarriedContext(currentCtx)))) == newPage)) break; @@ -13447,7 +13447,7 @@ if (!(thePage == GIV(stackPage))) { theSP += BytesPerWord; } - while (1) { + while (1) { frameRcvrOffset = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) ? theFP + FoxMFReceiver : theFP + FoxIFReceiver); @@ -23588,7 +23588,7 @@ theIPPtr = theSP; theSP += BytesPerWord; } - while (1) { + while (1) { assert(addressIsInPage(thePage, theFP)); assert(addressIsInPage(thePage, theSP)); assert((theIPPtr == 0) @@ -24221,7 +24221,7 @@ if (action == StartField) { /* begin startField */ VM_LABEL(0startField); - while (1) { + while (1) { child = longAt(field); if (!((child & 1))) break; @@ -40011,7 +40011,7 @@ } else { tempLink = firstLink; - while (1) { + while (1) { if (tempLink == GIV(nilObj)) { /* begin success: */ if (!0) { @@ -42701,7 +42701,7 @@ : theSP1 + BytesPerWord); goto l1; } - while (1) { + while (1) { /* begin frameCallerSP: */ assert(!(isBaseFrame(aFrame))); theSP1 = (aFrame + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(aFrame + FoxMethod)))) < (startOfMemory()) @@ -48047,6 +48047,9 @@ if ((lastPointerOf(lit)) <= ClosureCopiedValuesIndex) { return null; } + if (((((usqInt) (longAt(lit))) >> 8) & 15) == 2) { + return null; + } outerContext = longAt((lit + BaseHeaderSize) + (ClosureOuterContextIndex << ShiftForWord)); if (!(((outerContext & 1) == 0) && (((((usqInt) (longAt(outerContext))) >> 12) & 31) == ClassMethodContextCompactIndex))) { @@ -50229,7 +50232,7 @@ if (!(isFree(thePage))) { theIPPtr = (thePage->headSP); theFP = (thePage->headFP); - while (1) { + while (1) { if ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())) { theMethodField = longAt(theFP + FoxMethod); theFlags = theMethodField & MFMethodFlagsMask; Modified: branches/Cog/src/vm/interp.h =================================================================== --- branches/Cog/src/vm/interp.h 2013-08-15 18:55:10 UTC (rev 2772) +++ branches/Cog/src/vm/interp.h 2013-08-17 21:49:08 UTC (rev 2773) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.321 uuid: 6134e40b-c38c-41ec-8f31-64a7f1c002b3 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/src/vm/vmCallback.h =================================================================== --- branches/Cog/src/vm/vmCallback.h 2013-08-15 18:55:10 UTC (rev 2772) +++ branches/Cog/src/vm/vmCallback.h 2013-08-17 21:49:08 UTC (rev 2773) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.321 uuid: 6134e40b-c38c-41ec-8f31-64a7f1c002b3 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.328 uuid: d9a4d11d-3a72-437e-b617-92de227ffdde */ #define VM_CALLBACK_INC 1

1 0

VM Maker: VMMaker.oscog-eem.328.mcz
by commits＠source.squeak.org 17 Aug '13

17 Aug '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.328.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.328 Author: eem Time: 17 August 2013, 2:40:07.623 pm UUID: d9a4d11d-3a72-437e-b617-92de227ffdde Ancestors: VMMaker.oscog-eem.327 Reinstate the new framelessness now that the problem is found to be the genPrimitiveClass bug. =============== Diff against VMMaker.oscog-eem.327 =============== Item was changed: ----- Method: StackToRegisterMappingCogit class>>initializeBytecodeTableForNewspeakV3PlusClosures (in category 'class initialization') ----- initializeBytecodeTableForNewspeakV3PlusClosures "StackToRegisterMappingCogit initializeBytecodeTableForNewspeakV3PlusClosures" isPushNilFunction := #v3:Is:Push:Nil:. pushNilSizeFunction := #v3PushNilSize:. NSSendIsPCAnnotated := true. "IsNSSendCall used by PushImplicitReceiver" self flag: 'Special selector send class must be inlined to agree with the interpreter, which inlines class. If class is sent to e.g. a general instance of ProtoObject then unless class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit have identical semantics. We get away with not hardwiring the other special selectors either because in the Cointerpreter they are not inlined or because they are inlined only to instances of classes for which there will always be a method.'. self generatorTableFrom: #( (1 0 15 genPushReceiverVariableBytecode needsFrameNever: 1) + (1 16 31 genPushTemporaryVariableBytecode needsFrameIfMod16GENumArgs: 1) - (1 16 31 genPushTemporaryVariableBytecode) (1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1) (1 64 95 genPushLiteralVariableBytecode needsFrameNever: 1) (1 96 103 genStoreAndPopReceiverVariableBytecode needsFrameNever: -1) "N.B. not frameless if immutability" (1 104 111 genStoreAndPopTemporaryVariableBytecode) (1 112 112 genPushReceiverBytecode needsFrameNever: 1) (1 113 113 genPushConstantTrueBytecode needsFrameNever: 1) (1 114 114 genPushConstantFalseBytecode needsFrameNever: 1) (1 115 115 genPushConstantNilBytecode needsFrameNever: 1) (1 116 119 genPushQuickIntegerConstantBytecode needsFrameNever: 1) "method returns in blocks need a frame because of nonlocalReturn:through:" (1 120 120 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0) (1 121 121 genReturnTrue return needsFrameIfInBlock: isMappedInBlock 0) (1 122 122 genReturnFalse return needsFrameIfInBlock: isMappedInBlock 0) (1 123 123 genReturnNil return needsFrameIfInBlock: isMappedInBlock 0) (1 124 124 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1) (1 125 125 genReturnTopFromBlock return needsFrameNever: -1) (3 126 126 genDynamicSuperSendBytecode isMapped) "Newspeak" (2 127 127 genPushImplicitReceiverBytecode isMapped) "Newspeak" (2 128 128 extendedPushBytecode needsFrameNever: 1) (2 129 129 extendedStoreBytecode) (2 130 130 extendedStoreAndPopBytecode) (2 131 131 genExtendedSendBytecode isMapped) (3 132 132 doubleExtendedDoAnythingBytecode isMapped) (2 133 133 genExtendedSuperBytecode isMapped) (2 134 134 genSecondExtendedSendBytecode isMapped) (1 135 135 genPopStackBytecode needsFrameNever: -1) (1 136 136 duplicateTopBytecode needsFrameNever: 1) (1 137 137 genPushActiveContextBytecode) (2 138 138 genPushNewArrayBytecode) (2 139 139 genPushExplicitOuterSendReceiverBytecode isMapped) "Newspeak" (3 140 140 genPushRemoteTempLongBytecode) (3 141 141 genStoreRemoteTempLongBytecode) (3 142 142 genStoreAndPopRemoteTempLongBytecode) (4 143 143 genPushClosureCopyCopiedValuesBytecode block v3:Block:Code:Size:) (1 144 151 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:) (1 152 159 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (2 160 163 genLongUnconditionalBackwardJump branch isMapped "because of interrupt check" v3:Long:Branch:Distance:) (2 164 167 genLongUnconditionalForwardJump branch v3:Long:Branch:Distance:) (2 168 171 genLongJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v3:LongForward:Branch:Distance:) (2 172 175 genLongJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:LongForward:Branch:Distance:) (1 176 176 genSpecialSelectorArithmetic isMapped AddRR) (1 177 177 genSpecialSelectorArithmetic isMapped SubRR) (1 178 178 genSpecialSelectorComparison isMapped JumpLess) (1 179 179 genSpecialSelectorComparison isMapped JumpGreater) (1 180 180 genSpecialSelectorComparison isMapped JumpLessOrEqual) (1 181 181 genSpecialSelectorComparison isMapped JumpGreaterOrEqual) (1 182 182 genSpecialSelectorComparison isMapped JumpZero) (1 183 183 genSpecialSelectorComparison isMapped JumpNonZero) (1 184 189 genSpecialSelectorSend isMapped) " #* #/ #\\ #@ #bitShift: //" (1 190 190 genSpecialSelectorArithmetic isMapped AndRR) (1 191 191 genSpecialSelectorArithmetic isMapped OrRR) (1 192 197 genSpecialSelectorSend isMapped) "#at: #at:put: #size #next #nextPut: #atEnd" + (1 198 198 genSpecialSelectorEqualsEquals needsFrameIfFollowsSend: notMapped -1) "not mapped because it is directly inlined (for now)" + (1 199 199 genSpecialSelectorClass needsFrameIfFollowsSend: notMapped 0) "not mapped because it is directly inlined (for now)" - (1 198 198 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)" - (1 199 199 genSpecialSelectorClass needsFrameNever: notMapped 0) "not mapped because it is directly inlined (for now)" (1 200 207 genSpecialSelectorSend isMapped) "#blockCopy: #value #value: #do: #new #new: #x #y" (1 208 223 genSendLiteralSelector0ArgsBytecode isMapped) (1 224 239 genSendLiteralSelector1ArgBytecode isMapped) (1 240 255 genSendLiteralSelector2ArgsBytecode isMapped))! Item was changed: ----- Method: StackToRegisterMappingCogit class>>initializeBytecodeTableForNewspeakV4 (in category 'class initialization') ----- initializeBytecodeTableForNewspeakV4 "StackToRegisterMappingCogit initializeBytecodeTableForNewspeakV4" isPushNilFunction := #v4:Is:Push:Nil:. pushNilSizeFunction := #v4PushNilSize:. NSSendIsPCAnnotated := false. "IsNSSendCall used by SendAbsentImplicit" self flag: 'Special selector send class must be inlined to agree with the interpreter, which inlines class. If class is sent to e.g. a general instance of ProtoObject then unless class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit have identical semantics. We get away with not hardwiring the other special selectors either because in the Cointerpreter they are not inlined or because they are inlined only to instances of classes for which there will always be a method.'. self generatorTableFrom: #( "1 byte bytecodes" (1 0 15 genPushReceiverVariableBytecode needsFrameNever: 1) (1 16 31 genPushLiteralVariable16CasesBytecode needsFrameNever: 1) (1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1) + (1 64 75 genPushTemporaryVariableBytecode needsFrameIfMod16GENumArgs: 1) - (1 64 75 genPushTemporaryVariableBytecode) (1 76 76 genPushReceiverBytecode needsFrameNever: 1) (1 77 77 genExtPushPseudoVariableOrOuterBytecode) (1 78 78 genPushConstantZeroBytecode needsFrameNever: 1) (1 79 79 genPushConstantOneBytecode needsFrameNever: 1) (1 80 80 genSpecialSelectorArithmetic isMapped AddRR) (1 81 81 genSpecialSelectorArithmetic isMapped SubRR) (1 82 82 genSpecialSelectorComparison isMapped JumpLess) (1 83 83 genSpecialSelectorComparison isMapped JumpGreater) (1 84 84 genSpecialSelectorComparison isMapped JumpLessOrEqual) (1 85 85 genSpecialSelectorComparison isMapped JumpGreaterOrEqual) (1 86 86 genSpecialSelectorComparison isMapped JumpZero) (1 87 87 genSpecialSelectorComparison isMapped JumpNonZero) (1 88 93 genSpecialSelectorSend isMapped) " #* #/ #\\ #@ #bitShift: //" (1 94 94 genSpecialSelectorArithmetic isMapped AndRR) (1 95 95 genSpecialSelectorArithmetic isMapped OrRR) (1 96 101 genSpecialSelectorSend isMapped) "#at: #at:put: #size #next #nextPut: #atEnd" + (1 102 102 genSpecialSelectorEqualsEquals needsFrameIfFollowsSend: notMapped -1) "not mapped because it is directly inlined (for now)" + (1 103 103 genSpecialSelectorClass needsFrameIfFollowsSend: notMapped 0) "not mapped because it is directly inlined (for now)" - (1 102 102 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)" - (1 103 103 genSpecialSelectorClass needsFrameNever: notMapped 0) "not mapped because it is directly inlined (for now)" (1 104 111 genSpecialSelectorSend isMapped) "#blockCopy: #value #value: #do: #new #new: #x #y" (1 112 127 genSendLiteralSelector0ArgsBytecode isMapped) (1 128 143 genSendLiteralSelector1ArgBytecode isMapped) (1 144 159 genSendLiteralSelector2ArgsBytecode isMapped) (1 160 175 genSendAbsentImplicit0ArgsBytecode isMapped) (1 176 183 genStoreAndPopReceiverVariableBytecode needsFrameNever: -1) "N.B. not frameless if immutability" (1 184 191 genStoreAndPopTemporaryVariableBytecode) (1 192 199 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:) (1 200 207 genShortJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (1 208 215 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (1 216 216 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0) (1 217 217 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1) (1 218 218 genExtReturnTopFromBlock return needsFrameNever: -1) (1 219 219 duplicateTopBytecode needsFrameNever: 1) (1 220 220 genPopStackBytecode needsFrameNever: -1) (1 221 221 genExtNopBytecode needsFrameNever: 0) (1 222 223 unknownBytecode) "2 byte bytecodes" (2 224 224 extABytecode extension needsFrameNever: 0) (2 225 225 extBBytecode extension needsFrameNever: 0) (2 226 226 genExtPushReceiverVariableBytecode) (2 227 227 genExtPushLiteralVariableBytecode needsFrameNever: 1) (2 228 228 genExtPushLiteralBytecode needsFrameNever: 1) (2 229 229 genExtPushIntegerBytecode needsFrameNever: 1) (2 230 230 genLongPushTemporaryVariableBytecode) (2 231 231 genPushNewArrayBytecode) (2 232 232 genExtStoreReceiverVariableBytecode) (2 233 233 genExtStoreLiteralVariableBytecode) (2 234 234 genLongStoreTemporaryVariableBytecode) (2 235 235 genExtStoreAndPopReceiverVariableBytecode) (2 236 236 genExtStoreAndPopLiteralVariableBytecode) (2 237 237 genLongStoreAndPopTemporaryVariableBytecode) (2 238 238 genExtSendBytecode isMapped) (2 239 239 genExtSendSuperBytecode isMapped) (2 240 240 genExtSendAbsentImplicitBytecode isMapped) (2 241 241 genExtSendAbsentDynamicSuperBytecode isMapped) (2 242 242 genExtUnconditionalJump branch isMapped "because of interrupt check" v4:Long:Branch:Distance:) (2 243 243 genExtJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) (2 244 244 genExtJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) (2 245 248 unknownBytecode) "3 byte bytecodes" (3 249 249 callPrimitiveBytecode) (3 250 250 genPushRemoteTempLongBytecode) (3 251 251 genStoreRemoteTempLongBytecode) (3 252 252 genStoreAndPopRemoteTempLongBytecode) (3 253 253 genExtPushClosureBytecode block v4:Block:Code:Size:) (3 254 255 unknownBytecode))! Item was changed: ----- Method: StackToRegisterMappingCogit class>>initializeBytecodeTableForSqueakV3PlusClosures (in category 'class initialization') ----- initializeBytecodeTableForSqueakV3PlusClosures "StackToRegisterMappingCogit initializeBytecodeTableForSqueakV3PlusClosures" isPushNilFunction := #v3:Is:Push:Nil:. pushNilSizeFunction := #v3PushNilSize:. self flag: 'Special selector send class must be inlined to agree with the interpreter, which inlines class. If class is sent to e.g. a general instance of ProtoObject then unless class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit have identical semantics. We get away with not hardwiring the other special selectors either because in the Cointerpreter they are not inlined or because they are inlined only to instances of classes for which there will always be a method.'. self generatorTableFrom: #( (1 0 15 genPushReceiverVariableBytecode needsFrameNever: 1) + (1 16 31 genPushTemporaryVariableBytecode needsFrameIfMod16GENumArgs: 1) - (1 16 31 genPushTemporaryVariableBytecode) (1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1) (1 64 95 genPushLiteralVariableBytecode needsFrameNever: 1) (1 96 103 genStoreAndPopReceiverVariableBytecode needsFrameNever: -1) "N.B. not frameless if immutability" (1 104 111 genStoreAndPopTemporaryVariableBytecode) (1 112 112 genPushReceiverBytecode needsFrameNever: 1) (1 113 113 genPushConstantTrueBytecode needsFrameNever: 1) (1 114 114 genPushConstantFalseBytecode needsFrameNever: 1) (1 115 115 genPushConstantNilBytecode needsFrameNever: 1) (1 116 119 genPushQuickIntegerConstantBytecode needsFrameNever: 1) "method returns in blocks need a frame because of nonlocalReturn:through:" (1 120 120 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0) (1 121 121 genReturnTrue return needsFrameIfInBlock: isMappedInBlock 0) (1 122 122 genReturnFalse return needsFrameIfInBlock: isMappedInBlock 0) (1 123 123 genReturnNil return needsFrameIfInBlock: isMappedInBlock 0) (1 124 124 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1) (1 125 125 genReturnTopFromBlock return needsFrameNever: -1) (1 126 127 unknownBytecode) (2 128 128 extendedPushBytecode needsFrameNever: 1) (2 129 129 extendedStoreBytecode) (2 130 130 extendedStoreAndPopBytecode) (2 131 131 genExtendedSendBytecode isMapped) (3 132 132 doubleExtendedDoAnythingBytecode isMapped) (2 133 133 genExtendedSuperBytecode isMapped) (2 134 134 genSecondExtendedSendBytecode isMapped) (1 135 135 genPopStackBytecode needsFrameNever: -1) (1 136 136 duplicateTopBytecode needsFrameNever: 1) (1 137 137 genPushActiveContextBytecode) (2 138 138 genPushNewArrayBytecode) (1 139 139 unknownBytecode) (3 140 140 genPushRemoteTempLongBytecode) (3 141 141 genStoreRemoteTempLongBytecode) (3 142 142 genStoreAndPopRemoteTempLongBytecode) (4 143 143 genPushClosureCopyCopiedValuesBytecode block v3:Block:Code:Size:) (1 144 151 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:) (1 152 159 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (2 160 163 genLongUnconditionalBackwardJump branch isMapped "because of interrupt check" v3:Long:Branch:Distance:) (2 164 167 genLongUnconditionalForwardJump branch v3:Long:Branch:Distance:) (2 168 171 genLongJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v3:LongForward:Branch:Distance:) (2 172 175 genLongJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:LongForward:Branch:Distance:) (1 176 176 genSpecialSelectorArithmetic isMapped AddRR) (1 177 177 genSpecialSelectorArithmetic isMapped SubRR) (1 178 178 genSpecialSelectorComparison isMapped JumpLess) (1 179 179 genSpecialSelectorComparison isMapped JumpGreater) (1 180 180 genSpecialSelectorComparison isMapped JumpLessOrEqual) (1 181 181 genSpecialSelectorComparison isMapped JumpGreaterOrEqual) (1 182 182 genSpecialSelectorComparison isMapped JumpZero) (1 183 183 genSpecialSelectorComparison isMapped JumpNonZero) (1 184 189 genSpecialSelectorSend isMapped) " #* #/ #\\ #@ #bitShift: //" (1 190 190 genSpecialSelectorArithmetic isMapped AndRR) (1 191 191 genSpecialSelectorArithmetic isMapped OrRR) (1 192 197 genSpecialSelectorSend isMapped) "#at: #at:put: #size #next #nextPut: #atEnd" + (1 198 198 genSpecialSelectorEqualsEquals needsFrameIfFollowsSend: notMapped -1) "not mapped because it is directly inlined (for now)" + (1 199 199 genSpecialSelectorClass needsFrameIfFollowsSend: notMapped 0) "not mapped because it is directly inlined (for now)" - (1 198 198 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)" - (1 199 199 genSpecialSelectorClass needsFrameNever: notMapped 0) "not mapped because it is directly inlined (for now)" (1 200 207 genSpecialSelectorSend isMapped) "#blockCopy: #value #value: #do: #new #new: #x #y" (1 208 223 genSendLiteralSelector0ArgsBytecode isMapped) (1 224 239 genSendLiteralSelector1ArgBytecode isMapped) (1 240 255 genSendLiteralSelector2ArgsBytecode isMapped))!

1 0

VM Maker: VMMaker.oscog-eem.327.mcz
by commits＠source.squeak.org 17 Aug '13

17 Aug '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.327.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.327 Author: eem Time: 17 August 2013, 2:30:43.831 pm UUID: 29b87ba8-cc32-406e-9698-6c022ab7abbd Ancestors: VMMaker.oscog-eem.326 Fix StackToRegisterMappingCogit>>genPrimitiveClass for case where numArgs > 0 (must use other than ReceiverResultReg, e.g. objectClass:). Improve register usage in genSpecialSelectorClass. Save & restore methodOrBlockNumTemps in compileBlockBodies for symmetry with needsFrame & methodOrBlockNumArgs. Fix disassembly of methods with blocks (avoid printing block dispatch twice). Delete CoInterpreter class>>initialize; it breaks the simulator. Fix disassembly of e.g. Character literals when using in-image compilation. Slang: fix formatting of WhileForeverBreakIf loops. =============== Diff against VMMaker.oscog-eem.326 =============== Item was changed: ----- Method: CCodeGenerator>>generateWhileForeverBreakIf:loop:on:indent: (in category 'C translation') ----- generateWhileForeverBreakIf: breakBoolean loop: msgNode on: aStream indent: level "Generate either of while(1) {stmtListA; if(cond) break; stmtListB} while(1) {stmtListA; if(!!(cond)) break; stmtListB}." | testStmt receiverWithoutTest | + aStream peekLast ~~ Character tab ifTrue: + [aStream tab: level - 1]. + aStream nextPutAll: 'while (1) {'; cr. - aStream tab: level - 1; nextPutAll: 'while (1) {'; cr. testStmt := msgNode receiver statements last. receiverWithoutTest := TStmtListNode new setStatements: msgNode receiver statements allButLast. receiverWithoutTest emitCCodeOn: aStream level: level + 1 generator: self. aStream tab: level + 1; nextPutAll: 'if ('. breakBoolean ifFalse: [aStream nextPut: $!!; nextPut: $(]. testStmt emitCCodeOn: aStream level: 0 generator: self. breakBoolean ifFalse: [aStream nextPut: $)]. aStream nextPutAll: ') break;'; cr. msgNode args first emitCCodeOn: aStream level: level + 1 generator: self. aStream tab: level; nextPut: $}! Item was removed: - ----- Method: CoInterpreter class>>initialize (in category 'class initialization') ----- - initialize - "This is for Monticello package loading" - self initializeWithOptions: Dictionary new! Item was changed: ----- Method: Cogit>>codeRangesFor: (in category 'disassembly') ----- codeRangesFor: cogMethod "Answer a sequence of ranges of code for the main method and all of the blocks in a CogMethod. N.B. These are in order of block dispatch, _not_ necessarily address order in the method." <doNotGenerate> | pc end blockEntry starts | cogMethod cmType = CMClosedPIC ifTrue: [end := (self addressOfEndOfCase: cogMethod cPICNumCases - 1 inCPIC: cogMethod) + cPICEndSize. ^{ CogCodeRange from: cogMethod asInteger + (self sizeof: CogMethod) to: end cogMethod: cogMethod startpc: nil }]. end := (self mapEndFor: cogMethod) - 1. cogMethod blockEntryOffset = 0 ifTrue: [^{ CogCodeRange from: cogMethod asInteger + (self sizeof: CogMethod) to: end cogMethod: cogMethod startpc: (coInterpreter startPCOfMethodHeader: cogMethod methodHeader) }]. pc := blockEntry := cogMethod blockEntryOffset + cogMethod asInteger. starts := OrderedCollection with: cogMethod. [pc < end] whileTrue: [| targetpc | targetpc := blockEntry. (backEnd isJumpAt: pc) ifTrue: [targetpc := backEnd jumpTargetPCAt: pc. targetpc < blockEntry ifTrue: [starts add: (self cCoerceSimple: targetpc - (self sizeof: CogBlockMethod) to: #'CogBlockMethod *')]]. pc := pc + (backEnd instructionSizeAt: pc)]. starts := starts asSortedCollection. ^(1 to: starts size + 1) collect: [:i| | cogSubMethod nextpc | i <= starts size ifTrue: [cogSubMethod := starts at: i. + nextpc := i < starts size ifTrue: [(starts at: i + 1) address] ifFalse: [blockEntry]. - nextpc := i < starts size ifTrue: [(starts at: i + 1) address] ifFalse: [end]. CogCodeRange from: cogSubMethod address + (self sizeof: cogSubMethod) to: nextpc - 1 cogMethod: cogSubMethod startpc: (i = 1 ifTrue: [coInterpreter startPCOfMethodHeader: cogMethod methodHeader] ifFalse: [cogSubMethod startpc])] ifFalse: [CogCodeRange from: blockEntry to: end]]! Item was changed: ----- Method: CurrentImageCoInterpreterFacade>>lookupAddress: (in category 'labels') ----- lookupAddress: address + | thing | + thing := objectMap - ^(objectMap - keyAtValue: address - ifAbsent: - [variables keyAtValue: address + ifAbsent: + [variables + keyAtValue: address + ifAbsent: [^nil]]. + ^thing isLiteral + ifTrue: [thing storeString] + ifFalse: [thing asString]! - ifAbsent: [^nil]]) asString! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>compileBlockBodies (in category 'compile abstract instructions') ----- compileBlockBodies "override to maintain counterIndex when recompiling blocks; sigh." <inline: false> + | result compiledBlocksCount blockStart savedNeedsFrame savedNumArgs savedNumTemps - | result compiledBlocksCount blockStart savedNeedsFrame savedNumArgs initialStackPtr initialOpcodeIndex initialAnnotationIndex initialCounterIndex | <var: #blockStart type: #'BlockStart *'> self assert: blockCount > 0. "scanBlock: in compileBlockEntry: sets both of these appropriately for each block." savedNeedsFrame := needsFrame. savedNumArgs := methodOrBlockNumArgs. + savedNumTemps := methodOrBlockNumTemps. inBlock := true. compiledBlocksCount := 0. [compiledBlocksCount < blockCount] whileTrue: [blockStart := self blockStartAt: compiledBlocksCount. self scanBlock: blockStart. initialOpcodeIndex := opcodeIndex. initialAnnotationIndex := annotationIndex. initialCounterIndex := counterIndex. [self compileBlockEntry: blockStart. initialStackPtr := simStackPtr. (result := self compileAbstractInstructionsFrom: blockStart startpc + ((self pushNilSize: methodObj) * blockStart numInitialNils) through: blockStart startpc + blockStart span - 1) < 0 ifTrue: [^result]. "If the final simStackPtr is less than the initial simStackPtr then scanBlock: over- estimated the number of initial nils (because it assumed one or more pushNils to produce an operand were pushNils to initialize temps. This is very rare, so compensate by checking, adjusting numInitialNils and recompiling the block body." initialStackPtr = simStackPtr] whileFalse: [self assert: initialStackPtr > simStackPtr. blockStart numInitialNils: blockStart numInitialNils + simStackPtr - initialStackPtr. blockStart fakeHeader dependent: nil. self reinitializeFixupsFrom: blockStart startpc + blockStart numInitialNils through: blockStart startpc + blockStart span - 1. self reinitializeCountersFrom: initialCounterIndex to: counterIndex - 1. self cCode: 'bzero(abstractOpcodes + initialOpcodeIndex, (opcodeIndex - initialOpcodeIndex) * sizeof(AbstractInstruction))' inSmalltalk: [initialOpcodeIndex to: opcodeIndex - 1 do: [:i| abstractOpcodes at: i put: (processor abstractInstructionCompilerClass for: self)]]. opcodeIndex := initialOpcodeIndex. annotationIndex := initialAnnotationIndex. counterIndex := initialCounterIndex]. compiledBlocksCount := compiledBlocksCount + 1]. needsFrame := savedNeedsFrame. methodOrBlockNumArgs := savedNumArgs. + methodOrBlockNumTemps := savedNumTemps. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>compileBlockBodies (in category 'compile abstract instructions') ----- compileBlockBodies <inline: false> + | result compiledBlocksCount blockStart savedNeedsFrame savedNumArgs savedNumTemps + initialStackPtr initialOpcodeIndex initialAnnotationIndex | - | result compiledBlocksCount blockStart savedNeedsFrame savedNumArgs initialStackPtr initialOpcodeIndex initialAnnotationIndex | <var: #blockStart type: #'BlockStart *'> self assert: blockCount > 0. "scanBlock: in compileBlockEntry: sets both of these appropriately for each block." savedNeedsFrame := needsFrame. savedNumArgs := methodOrBlockNumArgs. + savedNumTemps := methodOrBlockNumTemps. inBlock := true. compiledBlocksCount := 0. [compiledBlocksCount < blockCount] whileTrue: [blockStart := self blockStartAt: compiledBlocksCount. self scanBlock: blockStart. initialOpcodeIndex := opcodeIndex. initialAnnotationIndex := annotationIndex. [self compileBlockEntry: blockStart. initialStackPtr := simStackPtr. (result := self compileAbstractInstructionsFrom: blockStart startpc + ((self pushNilSize: methodObj) * blockStart numInitialNils) through: blockStart startpc + blockStart span - 1) < 0 ifTrue: [^result]. "If the final simStackPtr is less than the initial simStackPtr then scanBlock: over- estimated the number of initial nils (because it assumed one or more pushNils to produce an operand were pushNils to initialize temps. This is very rare, so compensate by checking, adjusting numInitialNils and recompiling the block body." initialStackPtr = simStackPtr] whileFalse: [self assert: initialStackPtr > simStackPtr. blockStart numInitialNils: blockStart numInitialNils + simStackPtr - initialStackPtr. blockStart fakeHeader dependent: nil. self reinitializeFixupsFrom: blockStart startpc + blockStart numInitialNils through: blockStart startpc + blockStart span - 1. self cCode: 'bzero(abstractOpcodes + initialOpcodeIndex, (opcodeIndex - initialOpcodeIndex) * sizeof(AbstractInstruction))' inSmalltalk: [initialOpcodeIndex to: opcodeIndex - 1 do: [:i| abstractOpcodes at: i put: (processor abstractInstructionCompilerClass for: self)]]. opcodeIndex := initialOpcodeIndex. annotationIndex := initialAnnotationIndex]. compiledBlocksCount := compiledBlocksCount + 1]. needsFrame := savedNeedsFrame. methodOrBlockNumArgs := savedNumArgs. + methodOrBlockNumTemps := savedNumTemps. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genPrimitiveClass (in category 'primitive generators') ----- genPrimitiveClass + "Depending on argument count the argument is either + 0 args: ReceiverResultReg + 1 args: Arg0Reg + N args: top of stack (assuming 1 reg arg for now)" + | reg | + methodOrBlockNumArgs = 1 + ifTrue: + [reg := Arg0Reg] + ifFalse: + [methodOrBlockNumArgs > 0 ifTrue: + [self MoveMw: BytesPerWord r: SPReg R: ReceiverResultReg]. + reg := ReceiverResultReg]. objectRepresentation + genGetClassObjectOf: reg - genGetClassObjectOf: ReceiverResultReg into: ReceiverResultReg scratchReg: TempReg. self RetN: 0. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genSpecialSelectorClass (in category 'bytecode generators') ----- genSpecialSelectorClass + | topReg | + topReg := self ssTop registerOrNil. self ssPop: 1. + (topReg isNil or: [topReg = ClassReg]) + ifTrue: [self ssAllocateRequiredReg: (topReg := SendNumArgsReg) and: ClassReg] + ifFalse: [self ssAllocateRequiredReg: ClassReg]. - self ssAllocateRequiredReg: SendNumArgsReg and: ClassReg. self ssPush: 1. + self ssTop popToReg: topReg. + objectRepresentation genGetClassObjectOf: topReg into: ClassReg scratchReg: TempReg. - self ssTop popToReg: SendNumArgsReg. - objectRepresentation genGetClassObjectOf: SendNumArgsReg into: ClassReg scratchReg: TempReg. ^self ssPop: 1; ssPushRegister: ClassReg! Item was added: + ----- Method: VMMaker class>>generateNewSqueakCogVM (in category 'configurations') ----- + generateNewSqueakCogVM + "self generateNewSqueakCogVM" + ^VMMaker + generate: (Smalltalk at: ([:choices| choices at: (UIManager default chooseFrom: choices) ifAbsent: [^self]] + value: #(CoInterpreter CoInterpreterMT))) + and: StackToRegisterMappingCogit + with: #( MULTIPLEBYTECODESETS false + NewspeakVM false + bytecodeTableInitializer newInitializeBytecodeTableForSqueakV3PlusClosures) + to: (FileDirectory default pathFromURI: 'oscogvm/src') + platformDir: (FileDirectory default pathFromURI: 'oscogvm/platforms') + including:#( ADPCMCodecPlugin AsynchFilePlugin BalloonEnginePlugin B3DAcceleratorPlugin + BMPReadWriterPlugin BitBltSimulation BochsIA32Plugin CroquetPlugin DSAPlugin + DeflatePlugin DropPlugin FT2Plugin FFTPlugin FileCopyPlugin FilePlugin FloatArrayPlugin + FloatMathPlugin GeniePlugin HostWindowPlugin IA32ABIPlugin InternetConfigPlugin + JPEGReadWriter2Plugin JPEGReaderPlugin JoystickTabletPlugin KlattSynthesizerPlugin + LargeIntegersPlugin LocalePlugin MIDIPlugin MacMenubarPlugin Matrix2x3Plugin + MiscPrimitivePlugin Mpeg3Plugin QuicktimePlugin RePlugin SecurityPlugin SerialPlugin + SocketPlugin SoundCodecPlugin SoundGenerationPlugin SoundPlugin SqueakSSLPlugin StarSqueakPlugin + ThreadedIA32FFIPlugin UnixAioPlugin UUIDPlugin UnixOSProcessPlugin + Win32OSProcessPlugin VMProfileLinuxSupportPlugin VMProfileMacSupportPlugin)!

1 0

VM Maker: VMMaker.oscog-eem.326.mcz
by commits＠source.squeak.org 16 Aug '13

16 Aug '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.326.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.326 Author: eem Time: 16 August 2013, 1:39:38.865 pm UUID: 0ae2d369-8cd0-4bdf-9f5b-a360e942dad8 Ancestors: VMMaker.oscog-eem.325 Snafu. The experimental initializers need to use needsFrameIfFollowsSend:. =============== Diff against VMMaker.oscog-eem.325 =============== Item was changed: ----- Method: StackToRegisterMappingCogit class>>newInitializeBytecodeTableForNewspeakV3PlusClosures (in category 'class initialization') ----- newInitializeBytecodeTableForNewspeakV3PlusClosures "StackToRegisterMappingCogit newInitializeBytecodeTableForNewspeakV3PlusClosures" isPushNilFunction := #v3:Is:Push:Nil:. pushNilSizeFunction := #v3PushNilSize:. NSSendIsPCAnnotated := true. "IsNSSendCall used by PushImplicitReceiver" self flag: 'Special selector send class must be inlined to agree with the interpreter, which inlines class. If class is sent to e.g. a general instance of ProtoObject then unless class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit have identical semantics. We get away with not hardwiring the other special selectors either because in the Cointerpreter they are not inlined or because they are inlined only to instances of classes for which there will always be a method.'. self generatorTableFrom: #( (1 0 15 genPushReceiverVariableBytecode needsFrameNever: 1) (1 16 31 genPushTemporaryVariableBytecode needsFrameIfMod16GENumArgs: 1) (1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1) (1 64 95 genPushLiteralVariableBytecode needsFrameNever: 1) (1 96 103 genStoreAndPopReceiverVariableBytecode needsFrameNever: -1) "N.B. not frameless if immutability" (1 104 111 genStoreAndPopTemporaryVariableBytecode) (1 112 112 genPushReceiverBytecode needsFrameNever: 1) (1 113 113 genPushConstantTrueBytecode needsFrameNever: 1) (1 114 114 genPushConstantFalseBytecode needsFrameNever: 1) (1 115 115 genPushConstantNilBytecode needsFrameNever: 1) (1 116 119 genPushQuickIntegerConstantBytecode needsFrameNever: 1) "method returns in blocks need a frame because of nonlocalReturn:through:" (1 120 120 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0) (1 121 121 genReturnTrue return needsFrameIfInBlock: isMappedInBlock 0) (1 122 122 genReturnFalse return needsFrameIfInBlock: isMappedInBlock 0) (1 123 123 genReturnNil return needsFrameIfInBlock: isMappedInBlock 0) (1 124 124 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1) (1 125 125 genReturnTopFromBlock return needsFrameNever: -1) (3 126 126 genDynamicSuperSendBytecode isMapped) "Newspeak" (2 127 127 genPushImplicitReceiverBytecode isMapped) "Newspeak" (2 128 128 extendedPushBytecode needsFrameNever: 1) (2 129 129 extendedStoreBytecode) (2 130 130 extendedStoreAndPopBytecode) (2 131 131 genExtendedSendBytecode isMapped) (3 132 132 doubleExtendedDoAnythingBytecode isMapped) (2 133 133 genExtendedSuperBytecode isMapped) (2 134 134 genSecondExtendedSendBytecode isMapped) (1 135 135 genPopStackBytecode needsFrameNever: -1) (1 136 136 duplicateTopBytecode needsFrameNever: 1) (1 137 137 genPushActiveContextBytecode) (2 138 138 genPushNewArrayBytecode) (2 139 139 genPushExplicitOuterSendReceiverBytecode isMapped) "Newspeak" (3 140 140 genPushRemoteTempLongBytecode) (3 141 141 genStoreRemoteTempLongBytecode) (3 142 142 genStoreAndPopRemoteTempLongBytecode) (4 143 143 genPushClosureCopyCopiedValuesBytecode block v3:Block:Code:Size:) (1 144 151 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:) (1 152 159 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (2 160 163 genLongUnconditionalBackwardJump branch isMapped "because of interrupt check" v3:Long:Branch:Distance:) (2 164 167 genLongUnconditionalForwardJump branch v3:Long:Branch:Distance:) (2 168 171 genLongJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v3:LongForward:Branch:Distance:) (2 172 175 genLongJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:LongForward:Branch:Distance:) (1 176 176 genSpecialSelectorArithmetic isMapped AddRR) (1 177 177 genSpecialSelectorArithmetic isMapped SubRR) (1 178 178 genSpecialSelectorComparison isMapped JumpLess) (1 179 179 genSpecialSelectorComparison isMapped JumpGreater) (1 180 180 genSpecialSelectorComparison isMapped JumpLessOrEqual) (1 181 181 genSpecialSelectorComparison isMapped JumpGreaterOrEqual) (1 182 182 genSpecialSelectorComparison isMapped JumpZero) (1 183 183 genSpecialSelectorComparison isMapped JumpNonZero) (1 184 189 genSpecialSelectorSend isMapped) " #* #/ #\\ #@ #bitShift: //" (1 190 190 genSpecialSelectorArithmetic isMapped AndRR) (1 191 191 genSpecialSelectorArithmetic isMapped OrRR) (1 192 197 genSpecialSelectorSend isMapped) "#at: #at:put: #size #next #nextPut: #atEnd" + (1 198 198 genSpecialSelectorEqualsEquals needsFrameIfFollowsSend: notMapped -1) "not mapped because it is directly inlined (for now)" + (1 199 199 genSpecialSelectorClass needsFrameIfFollowsSend: notMapped 0) "not mapped because it is directly inlined (for now)" - (1 198 198 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)" - (1 199 199 genSpecialSelectorClass needsFrameNever: notMapped 0) "not mapped because it is directly inlined (for now)" (1 200 207 genSpecialSelectorSend isMapped) "#blockCopy: #value #value: #do: #new #new: #x #y" (1 208 223 genSendLiteralSelector0ArgsBytecode isMapped) (1 224 239 genSendLiteralSelector1ArgBytecode isMapped) (1 240 255 genSendLiteralSelector2ArgsBytecode isMapped))! Item was changed: ----- Method: StackToRegisterMappingCogit class>>newInitializeBytecodeTableForNewspeakV4 (in category 'class initialization') ----- newInitializeBytecodeTableForNewspeakV4 "StackToRegisterMappingCogit newInitializeBytecodeTableForNewspeakV4" isPushNilFunction := #v4:Is:Push:Nil:. pushNilSizeFunction := #v4PushNilSize:. NSSendIsPCAnnotated := false. "IsNSSendCall used by SendAbsentImplicit" self flag: 'Special selector send class must be inlined to agree with the interpreter, which inlines class. If class is sent to e.g. a general instance of ProtoObject then unless class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit have identical semantics. We get away with not hardwiring the other special selectors either because in the Cointerpreter they are not inlined or because they are inlined only to instances of classes for which there will always be a method.'. self generatorTableFrom: #( "1 byte bytecodes" (1 0 15 genPushReceiverVariableBytecode needsFrameNever: 1) (1 16 31 genPushLiteralVariable16CasesBytecode needsFrameNever: 1) (1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1) (1 64 75 genPushTemporaryVariableBytecode needsFrameIfMod16GENumArgs: 1) (1 76 76 genPushReceiverBytecode needsFrameNever: 1) (1 77 77 genExtPushPseudoVariableOrOuterBytecode) (1 78 78 genPushConstantZeroBytecode needsFrameNever: 1) (1 79 79 genPushConstantOneBytecode needsFrameNever: 1) (1 80 80 genSpecialSelectorArithmetic isMapped AddRR) (1 81 81 genSpecialSelectorArithmetic isMapped SubRR) (1 82 82 genSpecialSelectorComparison isMapped JumpLess) (1 83 83 genSpecialSelectorComparison isMapped JumpGreater) (1 84 84 genSpecialSelectorComparison isMapped JumpLessOrEqual) (1 85 85 genSpecialSelectorComparison isMapped JumpGreaterOrEqual) (1 86 86 genSpecialSelectorComparison isMapped JumpZero) (1 87 87 genSpecialSelectorComparison isMapped JumpNonZero) (1 88 93 genSpecialSelectorSend isMapped) " #* #/ #\\ #@ #bitShift: //" (1 94 94 genSpecialSelectorArithmetic isMapped AndRR) (1 95 95 genSpecialSelectorArithmetic isMapped OrRR) (1 96 101 genSpecialSelectorSend isMapped) "#at: #at:put: #size #next #nextPut: #atEnd" + (1 102 102 genSpecialSelectorEqualsEquals needsFrameIfFollowsSend: notMapped -1) "not mapped because it is directly inlined (for now)" + (1 103 103 genSpecialSelectorClass needsFrameIfFollowsSend: notMapped 0) "not mapped because it is directly inlined (for now)" - (1 102 102 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)" - (1 103 103 genSpecialSelectorClass needsFrameNever: notMapped 0) "not mapped because it is directly inlined (for now)" (1 104 111 genSpecialSelectorSend isMapped) "#blockCopy: #value #value: #do: #new #new: #x #y" (1 112 127 genSendLiteralSelector0ArgsBytecode isMapped) (1 128 143 genSendLiteralSelector1ArgBytecode isMapped) (1 144 159 genSendLiteralSelector2ArgsBytecode isMapped) (1 160 175 genSendAbsentImplicit0ArgsBytecode isMapped) (1 176 183 genStoreAndPopReceiverVariableBytecode needsFrameNever: -1) "N.B. not frameless if immutability" (1 184 191 genStoreAndPopTemporaryVariableBytecode) (1 192 199 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:) (1 200 207 genShortJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (1 208 215 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (1 216 216 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0) (1 217 217 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1) (1 218 218 genExtReturnTopFromBlock return needsFrameNever: -1) (1 219 219 duplicateTopBytecode needsFrameNever: 1) (1 220 220 genPopStackBytecode needsFrameNever: -1) (1 221 221 genExtNopBytecode needsFrameNever: 0) (1 222 223 unknownBytecode) "2 byte bytecodes" (2 224 224 extABytecode extension needsFrameNever: 0) (2 225 225 extBBytecode extension needsFrameNever: 0) (2 226 226 genExtPushReceiverVariableBytecode) (2 227 227 genExtPushLiteralVariableBytecode needsFrameNever: 1) (2 228 228 genExtPushLiteralBytecode needsFrameNever: 1) (2 229 229 genExtPushIntegerBytecode needsFrameNever: 1) (2 230 230 genLongPushTemporaryVariableBytecode) (2 231 231 genPushNewArrayBytecode) (2 232 232 genExtStoreReceiverVariableBytecode) (2 233 233 genExtStoreLiteralVariableBytecode) (2 234 234 genLongStoreTemporaryVariableBytecode) (2 235 235 genExtStoreAndPopReceiverVariableBytecode) (2 236 236 genExtStoreAndPopLiteralVariableBytecode) (2 237 237 genLongStoreAndPopTemporaryVariableBytecode) (2 238 238 genExtSendBytecode isMapped) (2 239 239 genExtSendSuperBytecode isMapped) (2 240 240 genExtSendAbsentImplicitBytecode isMapped) (2 241 241 genExtSendAbsentDynamicSuperBytecode isMapped) (2 242 242 genExtUnconditionalJump branch isMapped "because of interrupt check" v4:Long:Branch:Distance:) (2 243 243 genExtJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) (2 244 244 genExtJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) (2 245 248 unknownBytecode) "3 byte bytecodes" (3 249 249 callPrimitiveBytecode) (3 250 250 genPushRemoteTempLongBytecode) (3 251 251 genStoreRemoteTempLongBytecode) (3 252 252 genStoreAndPopRemoteTempLongBytecode) (3 253 253 genExtPushClosureBytecode block v4:Block:Code:Size:) (3 254 255 unknownBytecode))! Item was changed: ----- Method: StackToRegisterMappingCogit class>>newInitializeBytecodeTableForSqueakV3PlusClosures (in category 'class initialization') ----- newInitializeBytecodeTableForSqueakV3PlusClosures "StackToRegisterMappingCogit newInitializeBytecodeTableForSqueakV3PlusClosures" isPushNilFunction := #v3:Is:Push:Nil:. pushNilSizeFunction := #v3PushNilSize:. self flag: 'Special selector send class must be inlined to agree with the interpreter, which inlines class. If class is sent to e.g. a general instance of ProtoObject then unless class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit have identical semantics. We get away with not hardwiring the other special selectors either because in the Cointerpreter they are not inlined or because they are inlined only to instances of classes for which there will always be a method.'. self generatorTableFrom: #( (1 0 15 genPushReceiverVariableBytecode needsFrameNever: 1) (1 16 31 genPushTemporaryVariableBytecode needsFrameIfMod16GENumArgs: 1) (1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1) (1 64 95 genPushLiteralVariableBytecode needsFrameNever: 1) (1 96 103 genStoreAndPopReceiverVariableBytecode needsFrameNever: -1) "N.B. not frameless if immutability" (1 104 111 genStoreAndPopTemporaryVariableBytecode) (1 112 112 genPushReceiverBytecode needsFrameNever: 1) (1 113 113 genPushConstantTrueBytecode needsFrameNever: 1) (1 114 114 genPushConstantFalseBytecode needsFrameNever: 1) (1 115 115 genPushConstantNilBytecode needsFrameNever: 1) (1 116 119 genPushQuickIntegerConstantBytecode needsFrameNever: 1) "method returns in blocks need a frame because of nonlocalReturn:through:" (1 120 120 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0) (1 121 121 genReturnTrue return needsFrameIfInBlock: isMappedInBlock 0) (1 122 122 genReturnFalse return needsFrameIfInBlock: isMappedInBlock 0) (1 123 123 genReturnNil return needsFrameIfInBlock: isMappedInBlock 0) (1 124 124 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1) (1 125 125 genReturnTopFromBlock return needsFrameNever: -1) (1 126 127 unknownBytecode) (2 128 128 extendedPushBytecode needsFrameNever: 1) (2 129 129 extendedStoreBytecode) (2 130 130 extendedStoreAndPopBytecode) (2 131 131 genExtendedSendBytecode isMapped) (3 132 132 doubleExtendedDoAnythingBytecode isMapped) (2 133 133 genExtendedSuperBytecode isMapped) (2 134 134 genSecondExtendedSendBytecode isMapped) (1 135 135 genPopStackBytecode needsFrameNever: -1) (1 136 136 duplicateTopBytecode needsFrameNever: 1) (1 137 137 genPushActiveContextBytecode) (2 138 138 genPushNewArrayBytecode) (1 139 139 unknownBytecode) (3 140 140 genPushRemoteTempLongBytecode) (3 141 141 genStoreRemoteTempLongBytecode) (3 142 142 genStoreAndPopRemoteTempLongBytecode) (4 143 143 genPushClosureCopyCopiedValuesBytecode block v3:Block:Code:Size:) (1 144 151 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:) (1 152 159 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (2 160 163 genLongUnconditionalBackwardJump branch isMapped "because of interrupt check" v3:Long:Branch:Distance:) (2 164 167 genLongUnconditionalForwardJump branch v3:Long:Branch:Distance:) (2 168 171 genLongJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v3:LongForward:Branch:Distance:) (2 172 175 genLongJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:LongForward:Branch:Distance:) (1 176 176 genSpecialSelectorArithmetic isMapped AddRR) (1 177 177 genSpecialSelectorArithmetic isMapped SubRR) (1 178 178 genSpecialSelectorComparison isMapped JumpLess) (1 179 179 genSpecialSelectorComparison isMapped JumpGreater) (1 180 180 genSpecialSelectorComparison isMapped JumpLessOrEqual) (1 181 181 genSpecialSelectorComparison isMapped JumpGreaterOrEqual) (1 182 182 genSpecialSelectorComparison isMapped JumpZero) (1 183 183 genSpecialSelectorComparison isMapped JumpNonZero) (1 184 189 genSpecialSelectorSend isMapped) " #* #/ #\\ #@ #bitShift: //" (1 190 190 genSpecialSelectorArithmetic isMapped AndRR) (1 191 191 genSpecialSelectorArithmetic isMapped OrRR) (1 192 197 genSpecialSelectorSend isMapped) "#at: #at:put: #size #next #nextPut: #atEnd" + (1 198 198 genSpecialSelectorEqualsEquals needsFrameIfFollowsSend: notMapped -1) "not mapped because it is directly inlined (for now)" + (1 199 199 genSpecialSelectorClass needsFrameIfFollowsSend: notMapped 0) "not mapped because it is directly inlined (for now)" - (1 198 198 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)" - (1 199 199 genSpecialSelectorClass needsFrameNever: notMapped 0) "not mapped because it is directly inlined (for now)" (1 200 207 genSpecialSelectorSend isMapped) "#blockCopy: #value #value: #do: #new #new: #x #y" (1 208 223 genSendLiteralSelector0ArgsBytecode isMapped) (1 224 239 genSendLiteralSelector1ArgBytecode isMapped) (1 240 255 genSendLiteralSelector2ArgsBytecode isMapped))!

1 0

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev August 2013