Vm-dev November 2014

vm-dev@lists.squeakfoundation.org

36 participants
165 discussions

X11 window title setting prim
by tim Rowledge 28 Nov '14

28 Nov '14

There’s a sensible looking prim in the Cog vm code to change the window title. The prim calls sqUnixMain.c>>ioSetWindowLabelOfSize() which in turns ends up at sqUnixX11.c>>display_hostWindowSetTitle(). static int display_hostWindowSetTitle(int windowIndex, char *newTitle, int sizeOfTitle) { if (windowIndex != 1 && windowIndex != stWindow) return -1; XChangeProperty(stDisplay, stParent, XInternAtom(stDisplay, "_NET_WM_NAME", False), XInternAtom(stDisplay, "UTF8_STRING", False), 8, PropModeReplace, newTitle, sizeOfTitle); return 0; } Doesn’t work, at least not on my Pi. Running though GDB it fails because windowIndex is neither 1 nor stWindow. What is *is* is stParent, because that is what display_ioGetWindowHandle() says it is. I dunno - stParent, stWindow? Which should it be? X11 stuff is encrypted ancient greek to me. tim -- tim Rowledge; tim(a)rowledge.org; http://www.rowledge.org/tim Nice computers don't go down.

1 1

New Cog VMs available
by Eliot Miranda 28 Nov '14

28 Nov '14

...at http://www.mirandabanda.org/files/Cog/VM/VM.r3154/. Things should settle down now. This should be the last regression from the recent 64-bit changes. CogVM binaries as per VMMaker.oscog-eem.957/r3154 Fix regression in magnitude64BitIntegerFor:neg: Spur: Make instantiateClass:indexableSize: check for Float instantiation, failing for other than 2 words. Make printStackCallStackOf: accept contexts. -- best, Eliot

1 0

Float hierarchy for 64-bit Spur
by Eliot Miranda 28 Nov '14

28 Nov '14

Hi All, 64-bit Spur can usefully provide an immediate float, a 61-bit subset of the ieee double precision float. The scheme steals bits from the mantissa to use for the immediate's 3-bit tag pattern. So values have the same precision as ieee doubles, but can only represent the subset with exponents between 10^-38 and 10^38, the single-precision range. The issue here is how to organize the class hierarchy. The approach that looks best to me is to modify class Float to be an abstract class, and add two subclasses, BoxedFloat and SmallFloat, such that existing boxed instances of Float outside the SmallFloat range will become instances of BoxedFloat and instances within that range will be replaced by references to the relevant SmallFloat. With this approach ... - Float pi etc can still be used, even though they will answer instances of SmallFloat. But tests such as "self assert: result class == Float." will need to be rewritten to e.g. "self assert: result isFloat". - BoxedFloat and SmallFloat will not be mentioned much at all since floats print themselves literally, and so the fact that the classes have changed won't be obvious. - the boxed Float primitives (receiver is a boxed float) live in BoxedFloat and the immediate ones live in SmallFloat. Making SmallFloat a subclass of Float poses problems for all the primitives that do a super send to retry, since the boxed Float prims will be above the unboxed ones and so the boxed ones would have to test for an immediate receiver. An alternative, that VW took (because it has both Float and Double) is to add a superclass, e.g. LimitedPrecisionReal, move most of the methods into it, and keep Float as Float, and add SmallFloat as a subclass of LimitedPrecisionReal. Then while class-side methods such as pi would likely be implemented in LimitedPrecisionReal class, sends to Float to access them find them via inheritance. An automatic reorganization which moves only primitives out of LimitedPrecisionReal is easy to write. Thoughts? -- best, Eliot

9 20

[commit][3154] CogVM source as per VMMaker.oscog-eem.957
by commits＠squeakvm.org 28 Nov '14

28 Nov '14

Revision: 3154 Author: eliot Date: 2014-11-27 16:08:50 -0800 (Thu, 27 Nov 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.957 Fix regression in magnitude64BitIntegerFor:neg: Move dispdbg.h above cointerp.h & cogit.h in cogit.c otherwise NoDbgRegParms gets screwed up. Use asInteger instead of asUnsignedInteger in followForwardingPointersInStackZone: so simulation of Stack VM doesn't trigger the assert in asUnsignedInteger. Spur: Make instantiateClass:indexableSize: check for Float instantiation, failing for other than 2 words. Rewrite 32-bit coalesce:and: to use the raw slot accessors. Implement 64-bit coalesce:and:. Make printStackCallStackOf: accept contexts. Fix compilation warnings in SqueakFFIPrims. Nuke obsolete AddSmallFloat.st Modified Paths: -------------- branches/Cog/image/buildspurtrunkimage.sh branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/IA32FFIPlugin.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.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/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Removed Paths: ------------- branches/Cog/image/AddSmallFloat.st Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Deleted: branches/Cog/image/AddSmallFloat.st =================================================================== --- branches/Cog/image/AddSmallFloat.st 2014-11-26 22:45:03 UTC (rev 3153) +++ branches/Cog/image/AddSmallFloat.st 2014-11-28 00:08:50 UTC (rev 3154) @@ -1,55 +0,0 @@ -Number subclass: #LimitedPrecisionReal - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'Kernel-Numbers'. - -LimitedPrecisionReal immediateSubclass: #SmallFloat - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'Kernel-Numbers'. - -Float superclass: LimitedPrecisionReal. -Float class superclass: LimitedPrecisionReal class. -Number removeSubclass: Float. -Number class removeSubclass: Float class. -LimitedPrecisionReal addSubclass: Float. -LimitedPrecisionReal class addSubclass: Float class. - -LimitedPrecisionReal ensureClassPool. -Float classPool keys do: - [:key| - LimitedPrecisionReal classPool declare: key from: Float classPool]. - -Float selectors do: - [:s| | m | - m := Float >> s. - (((#(0 38 39) includes: m primitive) or: [m isQuick]) - and: [m protocol ~~ #copying]) ifTrue: - [LimitedPrecisionReal methodDict at: s put: m. - Float methodDict removeKey: s. - m methodClassAssociation: LimitedPrecisionReal binding]]. - -SystemChangeNotifier uniqueInstance doSilently: - [LimitedPrecisionReal organization changeFromString: Float organization printString. - LimitedPrecisionReal selectors do: - [:s| - LimitedPrecisionReal organization classify: s under: (Float organization categoryOfElement: s). - Float organization removeElement: s]. - LimitedPrecisionReal organization removeEmptyCategories. - Float organization removeEmptyCategories]. - -Float selectors do: - [:s| | m src | - m := Float >> s. - m primitive > 0 ifTrue: - [src := (Float sourceCodeAt: s) asString. - src := src copyReplaceAll: '<primitive: ' with: '<primitive: 5'. - SmallFloat compile: src classified: m protocol]]. - -(SmallInteger organization listAtCategoryNamed: #copying) do: - [:s| - SmallFloat compile: (SmallInteger sourceCodeAt: s) asString classified: #copying]. - -Smalltalk snapshot: true andQuit: true Modified: branches/Cog/image/buildspurtrunkimage.sh =================================================================== --- branches/Cog/image/buildspurtrunkimage.sh 2014-11-26 22:45:03 UTC (rev 3153) +++ branches/Cog/image/buildspurtrunkimage.sh 2014-11-28 00:08:50 UTC (rev 3154) @@ -21,7 +21,7 @@ IMAGE="" GOTIMAGE="" while true; do - for f in *VMMaker*spur.image; do + for f in *VMMaker*spur.image SpurVMMaker.image; do if test -f "$f"; then IMAGE="$f" . ./getGoodSpurVM.sh Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2014-11-26 22:45:03 UTC (rev 3153) +++ branches/Cog/nscogsrc/vm/cogit.c 2014-11-28 00:08:50 UTC (rev 3154) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.933 uuid: 5a37067c-b76b-4ada-9399-1de11632acd8 + CCodeGenerator VMMaker.oscog-eem.957 uuid: ac5f8308-02e5-4277-b28c-595b7a4cf34a from - StackToRegisterMappingCogit VMMaker.oscog-eem.933 uuid: 5a37067c-b76b-4ada-9399-1de11632acd8 + StackToRegisterMappingCogit VMMaker.oscog-eem.957 uuid: ac5f8308-02e5-4277-b28c-595b7a4cf34a */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.933 uuid: 5a37067c-b76b-4ada-9399-1de11632acd8 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.957 uuid: ac5f8308-02e5-4277-b28c-595b7a4cf34a " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -11,6 +11,7 @@ #include <stddef.h> #include "sq.h" #include "sqCogStackAlignment.h" +#include "dispdbg.h" #include "cogmethod.h" #if COGMTVM #include "cointerpmt.h" @@ -18,7 +19,6 @@ #include "cointerp.h" #endif #include "cogit.h" -#include "dispdbg.h" typedef struct _AbstractInstruction { char opcode; Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2014-11-26 22:45:03 UTC (rev 3153) +++ branches/Cog/nscogsrc/vm/cogit.h 2014-11-28 00:08:50 UTC (rev 3154) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.933 uuid: 5a37067c-b76b-4ada-9399-1de11632acd8 + CCodeGenerator VMMaker.oscog-eem.957 uuid: ac5f8308-02e5-4277-b28c-595b7a4cf34a */ Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-11-26 22:45:03 UTC (rev 3153) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-11-28 00:08:50 UTC (rev 3154) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.956 uuid: c2eb8c1e-ed43-4316-80b4-781c57cf3f1e + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.957 uuid: ac5f8308-02e5-4277-b28c-595b7a4cf34a from - CoInterpreter VMMaker.oscog-eem.956 uuid: c2eb8c1e-ed43-4316-80b4-781c57cf3f1e + CoInterpreter VMMaker.oscog-eem.957 uuid: ac5f8308-02e5-4277-b28c-595b7a4cf34a */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.956 uuid: c2eb8c1e-ed43-4316-80b4-781c57cf3f1e " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.957 uuid: ac5f8308-02e5-4277-b28c-595b7a4cf34a " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1205,7 +1205,7 @@ void printOop(sqInt oop); void printProcessStack(sqInt aProcess); sqInt printProcsOnList(sqInt procList); -sqInt printStackCallStackOf(char *aFramePointer); +sqInt printStackCallStackOf(sqInt frameOrContext); void printStackPageList(void); void printStackPageListInUse(void); void printStackPages(void); @@ -2093,7 +2093,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.956"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.957"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -19149,13 +19149,13 @@ sqInt classArrayClass; sqInt classArrayObj; size_t dataSize; - long firstSegSize; + sqInt firstSegSize; sqInt hdrCogCodeSize; sqInt hdrEdenBytes; sqInt hdrMaxExtSemTabSize; sqInt hdrNumStackPages; sqInt header; - long headerFlags; + sqInt headerFlags; sqInt headerSize; squeakFileOffsetType headerStart; usqInt heapSize; @@ -19172,7 +19172,7 @@ sqInt memEnd; sqInt memLimit; usqInt minimumMemory; - long oldBaseAddr; + sqInt oldBaseAddr; sqInt oop; sqInt swapBytes; sqInt sz; @@ -19212,9 +19212,9 @@ /* begin getLongFromFile:swap: */ w1 = 0; sqImageFileRead((&w1), sizeof(long), 1, f); - dataSize = ((long) ((swapBytes - ? byteSwapped(w1) - : w1))); + dataSize = (swapBytes + ? byteSwapped(w1) + : w1); /* begin getLongFromFile:swap: */ w2 = 0; sqImageFileRead((&w2), sizeof(long), 1, f); @@ -19225,24 +19225,24 @@ /* begin getLongFromFile:swap: */ w11 = 0; sqImageFileRead((&w11), sizeof(long), 1, f); - anObject = ((long) ((swapBytes - ? byteSwapped(w11) - : w11))); + anObject = (swapBytes + ? byteSwapped(w11) + : w11); GIV(specialObjectsOop) = anObject; /* begin lastHash: */ /* begin getLongFromFile:swap: */ w12 = 0; sqImageFileRead((&w12), sizeof(long), 1, f); - aValue = ((long) ((swapBytes - ? byteSwapped(w12) - : w12))); + aValue = (swapBytes + ? byteSwapped(w12) + : w12); lastHash = aValue; /* begin getLongFromFile:swap: */ w3 = 0; sqImageFileRead((&w3), sizeof(long), 1, f); - GIV(savedWindowSize) = ((long) ((swapBytes - ? byteSwapped(w3) - : w3))); + GIV(savedWindowSize) = (swapBytes + ? byteSwapped(w3) + : w3); /* begin getLongFromFile:swap: */ w4 = 0; sqImageFileRead((&w4), sizeof(long), 1, f); @@ -23012,8 +23012,8 @@ sqInt sz; isSmall = (isNegative - ? magnitude < (MaxSmallInteger) - : magnitude < ((MaxSmallInteger) + 1)); + ? magnitude <= ((MaxSmallInteger) + 1) + : magnitude <= (MaxSmallInteger)); if (isSmall) { smallVal = ((sqInt) magnitude); if (isNegative) { @@ -50249,12 +50249,23 @@ } sqInt -printStackCallStackOf(char *aFramePointer) -{ +printStackCallStackOf(sqInt frameOrContext) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt context; char *theFP; - theFP = aFramePointer; + if (((frameOrContext & 3) == 0) + && (((((usqInt)frameOrContext)) >= (startOfMemory())) + && (((((usqInt)frameOrContext)) < GIV(freeStart)) + && (((longAt(frameOrContext)) & TypeMask) != HeaderTypeGC)))) { + if ((((frameOrContext & 1) == 0) + && (((((usqInt) (longAt(frameOrContext))) >> (compactClassFieldLSB())) & 0x1F) == ClassMethodContextCompactIndex)) + && (checkIsStillMarriedContextcurrentFP(frameOrContext, null))) { + return printStackCallStackOf(frameOfMarriedContext(frameOrContext)); + } + return null; + } + theFP = ((void *)frameOrContext); while(1) { context = shortReversePrintFrameAndCallers(theFP); if (!((((longAt((context + BaseHeaderSize) + (SenderIndex << (shiftForWord())))) & 1)) Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-11-26 22:45:03 UTC (rev 3153) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-11-28 00:08:50 UTC (rev 3154) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.956 uuid: c2eb8c1e-ed43-4316-80b4-781c57cf3f1e + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.957 uuid: ac5f8308-02e5-4277-b28c-595b7a4cf34a */ @@ -251,7 +251,7 @@ void printMethodDictionary(sqInt dictionary); void printProcessStack(sqInt aProcess); sqInt printProcsOnList(sqInt procList); -sqInt printStackCallStackOf(char *aFramePointer); +sqInt printStackCallStackOf(sqInt frameOrContext); void print(char *s); void setBreakSelector(char *aString); void setNextWakeupUsecs(usqLong value); Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-11-26 22:45:03 UTC (rev 3153) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-11-28 00:08:50 UTC (rev 3154) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.956 uuid: c2eb8c1e-ed43-4316-80b4-781c57cf3f1e + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.957 uuid: ac5f8308-02e5-4277-b28c-595b7a4cf34a from - CoInterpreter VMMaker.oscog-eem.956 uuid: c2eb8c1e-ed43-4316-80b4-781c57cf3f1e + CoInterpreter VMMaker.oscog-eem.957 uuid: ac5f8308-02e5-4277-b28c-595b7a4cf34a */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.956 uuid: c2eb8c1e-ed43-4316-80b4-781c57cf3f1e " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.957 uuid: ac5f8308-02e5-4277-b28c-595b7a4cf34a " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1208,7 +1208,7 @@ void printOop(sqInt oop); void printProcessStack(sqInt aProcess); sqInt printProcsOnList(sqInt procList); -sqInt printStackCallStackOf(char *aFramePointer); +sqInt printStackCallStackOf(sqInt frameOrContext); void printStackPageList(void); void printStackPageListInUse(void); void printStackPages(void); @@ -2096,7 +2096,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.956"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.957"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -19158,13 +19158,13 @@ sqInt classArrayClass; sqInt classArrayObj; size_t dataSize; - long firstSegSize; + sqInt firstSegSize; sqInt hdrCogCodeSize; sqInt hdrEdenBytes; sqInt hdrMaxExtSemTabSize; sqInt hdrNumStackPages; sqInt header; - long headerFlags; + sqInt headerFlags; sqInt headerSize; squeakFileOffsetType headerStart; usqInt heapSize; @@ -19181,7 +19181,7 @@ sqInt memEnd; sqInt memLimit; usqInt minimumMemory; - long oldBaseAddr; + sqInt oldBaseAddr; sqInt oop; sqInt swapBytes; sqInt sz; @@ -19221,9 +19221,9 @@ /* begin getLongFromFile:swap: */ w1 = 0; sqImageFileRead((&w1), sizeof(long), 1, f); - dataSize = ((long) ((swapBytes - ? byteSwapped(w1) - : w1))); + dataSize = (swapBytes + ? byteSwapped(w1) + : w1); /* begin getLongFromFile:swap: */ w2 = 0; sqImageFileRead((&w2), sizeof(long), 1, f); @@ -19234,24 +19234,24 @@ /* begin getLongFromFile:swap: */ w11 = 0; sqImageFileRead((&w11), sizeof(long), 1, f); - anObject = ((long) ((swapBytes - ? byteSwapped(w11) - : w11))); + anObject = (swapBytes + ? byteSwapped(w11) + : w11); GIV(specialObjectsOop) = anObject; /* begin lastHash: */ /* begin getLongFromFile:swap: */ w12 = 0; sqImageFileRead((&w12), sizeof(long), 1, f); - aValue = ((long) ((swapBytes - ? byteSwapped(w12) - : w12))); + aValue = (swapBytes + ? byteSwapped(w12) + : w12); lastHash = aValue; /* begin getLongFromFile:swap: */ w3 = 0; sqImageFileRead((&w3), sizeof(long), 1, f); - GIV(savedWindowSize) = ((long) ((swapBytes - ? byteSwapped(w3) - : w3))); + GIV(savedWindowSize) = (swapBytes + ? byteSwapped(w3) + : w3); /* begin getLongFromFile:swap: */ w4 = 0; sqImageFileRead((&w4), sizeof(long), 1, f); @@ -23021,8 +23021,8 @@ sqInt sz; isSmall = (isNegative - ? magnitude < (MaxSmallInteger) - : magnitude < ((MaxSmallInteger) + 1)); + ? magnitude <= ((MaxSmallInteger) + 1) + : magnitude <= (MaxSmallInteger)); if (isSmall) { smallVal = ((sqInt) magnitude); if (isNegative) { @@ -50258,12 +50258,23 @@ } sqInt -printStackCallStackOf(char *aFramePointer) -{ +printStackCallStackOf(sqInt frameOrContext) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt context; char *theFP; - theFP = aFramePointer; + if (((frameOrContext & 3) == 0) + && (((((usqInt)frameOrContext)) >= (startOfMemory())) + && (((((usqInt)frameOrContext)) < GIV(freeStart)) + && (((longAt(frameOrContext)) & TypeMask) != HeaderTypeGC)))) { + if ((((frameOrContext & 1) == 0) + && (((((usqInt) (longAt(frameOrContext))) >> (compactClassFieldLSB())) & 0x1F) == ClassMethodContextCompactIndex)) + && (checkIsStillMarriedContextcurrentFP(frameOrContext, null))) { + return printStackCallStackOf(frameOfMarriedContext(frameOrContext)); + } + return null; + } + theFP = ((void *)frameOrContext); while(1) { context = shortReversePrintFrameAndCallers(theFP); if (!((((longAt((context + BaseHeaderSize) + (SenderIndex << (shiftForWord())))) & 1)) Modified: branches/Cog/nsspursrc/vm/cogit.c =================================================================== --- branches/Cog/nsspursrc/vm/cogit.c 2014-11-26 22:45:03 UTC (rev 3153) +++ branches/Cog/nsspursrc/vm/cogit.c 2014-11-28 00:08:50 UTC (rev 3154) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.935 uuid: e1096b9f-e01b-4709-b369-18563b884832 + CCodeGenerator VMMaker.oscog-eem.957 uuid: ac5f8308-02e5-4277-b28c-595b7a4cf34a from - StackToRegisterMappingCogit VMMaker.oscog-eem.935 uuid: e1096b9f-e01b-4709-b369-18563b884832 + StackToRegisterMappingCogit VMMaker.oscog-eem.957 uuid: ac5f8308-02e5-4277-b28c-595b7a4cf34a */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.935 uuid: e1096b9f-e01b-4709-b369-18563b884832 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.957 uuid: ac5f8308-02e5-4277-b28c-595b7a4cf34a " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -11,6 +11,7 @@ #include <stddef.h> #include "sq.h" #include "sqCogStackAlignment.h" +#include "dispdbg.h" #include "cogmethod.h" #if COGMTVM #include "cointerpmt.h" @@ -18,7 +19,6 @@ #include "cointerp.h" #endif #include "cogit.h" -#include "dispdbg.h" typedef struct _AbstractInstruction { char opcode; Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2014-11-26 22:45:03 UTC (rev 3153) +++ branches/Cog/nsspursrc/vm/cogit.h 2014-11-28 00:08:50 UTC (rev 3154) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.935 uuid: e1096b9f-e01b-4709-b369-18563b884832 + CCodeGenerator VMMaker.oscog-eem.957 uuid: ac5f8308-02e5-4277-b28c-595b7a4cf34a */ Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-11-26 22:45:03 UTC (rev 3153) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-11-28 00:08:50 UTC (rev 3154) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.956 uuid: c2eb8c1e-ed43-4316-80b4-781c57cf3f1e + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.957 uuid: ac5f8308-02e5-4277-b28c-595b7a4cf34a from - CoInterpreter VMMaker.oscog-eem.956 uuid: c2eb8c1e-ed43-4316-80b4-781c57cf3f1e + CoInterpreter VMMaker.oscog-eem.957 uuid: ac5f8308-02e5-4277-b28c-595b7a4cf34a */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.956 uuid: c2eb8c1e-ed43-4316-80b4-781c57cf3f1e " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.957 uuid: ac5f8308-02e5-4277-b28c-595b7a4cf34a " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -139,7 +139,6 @@ #define BecameActiveClassFlag 8 #define BecameCompiledMethodFlag 2 #define BecamePointerObjectFlag 1 -#define BitsPerByte 8 #define Byte0Mask 0xFF #define Byte1Mask 0xFF00 #define Byte1Shift 8 @@ -1393,7 +1392,7 @@ void printOop(sqInt oop); void printProcessStack(sqInt aProcess); sqInt printProcsOnList(sqInt procList); -sqInt printStackCallStackOf(char *aFramePointer); +sqInt printStackCallStackOf(sqInt frameOrContext); void printStackPageList(void); void printStackPageListInUse(void); void printStackPages(void); @@ -2343,7 +2342,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.956"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.957"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -23476,12 +23475,12 @@ sqInt classTablePage; size_t dataSize; sqInt edenBytes; - long firstSegSize; + sqInt firstSegSize; sqInt hdrCogCodeSize; sqInt hdrEdenBytes; sqInt hdrMaxExtSemTabSize; sqInt hdrNumStackPages; - long headerFlags; + sqInt headerFlags; sqInt headerSize; squeakFileOffsetType headerStart; usqInt heapSize; @@ -23500,7 +23499,7 @@ usqInt minimumMemory; usqInt numSlots; sqInt objOop; - long oldBaseAddr; + sqInt oldBaseAddr; sqInt oldStart; sqInt oop; sqInt p; @@ -23543,9 +23542,9 @@ /* begin getLongFromFile:swap: */ w1 = 0; sqImageFileRead((&w1), sizeof(long), 1, f); - dataSize = ((long) ((swapBytes - ? ((((((usqInt) w1 >> 24)) & Byte0Mask) + ((((usqInt) w1 >> 8)) & Byte1Mask)) + ((((usqInt) w1 << 8)) & Byte2Mask)) + ((((usqInt) w1 << 24)) & Byte3Mask) - : w1))); + dataSize = (swapBytes + ? ((((((usqInt) w1 >> 24)) & Byte0Mask) + ((((usqInt) w1 >> 8)) & Byte1Mask)) + ((((usqInt) w1 << 8)) & Byte2Mask)) + ((((usqInt) w1 << 24)) & Byte3Mask) + : w1); /* begin getLongFromFile:swap: */ w2 = 0; sqImageFileRead((&w2), sizeof(long), 1, f); @@ -23556,24 +23555,24 @@ /* begin getLongFromFile:swap: */ w3 = 0; sqImageFileRead((&w3), sizeof(long), 1, f); - anObject = ((long) ((swapBytes - ? ((((((usqInt) w3 >> 24)) & Byte0Mask) + ((((usqInt) w3 >> 8)) & Byte1Mask)) + ((((usqInt) w3 << 8)) & Byte2Mask)) + ((((usqInt) w3 << 24)) & Byte3Mask) - : w3))); + anObject = (swapBytes + ? ((((((usqInt) w3 >> 24)) & Byte0Mask) + ((((usqInt) w3 >> 8)) & Byte1Mask)) + ((((usqInt) w3 << 8)) & Byte2Mask)) + ((((usqInt) w3 << 24)) & Byte3Mask) + : w3); GIV(specialObjectsOop) = anObject; /* begin lastHash: */ /* begin getLongFromFile:swap: */ w4 = 0; sqImageFileRead((&w4), sizeof(long), 1, f); - seed = ((long) ((swapBytes - ? ((((((usqInt) w4 >> 24)) & Byte0Mask) + ((((usqInt) w4 >> 8)) & Byte1Mask)) + ((((usqInt) w4 << 8)) & Byte2Mask)) + ((((usqInt) w4 << 24)) & Byte3Mask) - : w4))); + seed = (swapBytes + ? ((((((usqInt) w4 >> 24)) & Byte0Mask) + ((((usqInt) w4 >> 8)) & Byte1Mask)) + ((((usqInt) w4 << 8)) & Byte2Mask)) + ((((usqInt) w4 << 24)) & Byte3Mask) + : w4); GIV(lastHash) = seed; /* begin getLongFromFile:swap: */ w5 = 0; sqImageFileRead((&w5), sizeof(long), 1, f); - GIV(savedWindowSize) = ((long) ((swapBytes - ? ((((((usqInt) w5 >> 24)) & Byte0Mask) + ((((usqInt) w5 >> 8)) & Byte1Mask)) + ((((usqInt) w5 << 8)) & Byte2Mask)) + ((((usqInt) w5 << 24)) & Byte3Mask) - : w5))); + GIV(savedWindowSize) = (swapBytes + ? ((((((usqInt) w5 >> 24)) & Byte0Mask) + ((((usqInt) w5 >> 8)) & Byte1Mask)) + ((((usqInt) w5 << 8)) & Byte2Mask)) + ((((usqInt) w5 << 24)) & Byte3Mask) + : w5); /* begin getLongFromFile:swap: */ w6 = 0; sqImageFileRead((&w6), sizeof(long), 1, f); @@ -27804,8 +27803,8 @@ sqInt sz; isSmall = (isNegative - ? magnitude < (MaxSmallInteger) - : magnitude < ((MaxSmallInteger) + 1)); + ? magnitude <= ((MaxSmallInteger) + 1) + : magnitude <= (MaxSmallInteger)); if (isSmall) { smallVal = ((sqInt) magnitude); if (isNegative) { @@ -40817,48 +40816,40 @@ classFormat = ((longAt((classObj + BaseHeaderSize) + (InstanceSpecificationIndex << (shiftForWord())))) >> 1); instSpec = (((usqInt) classFormat) >> 16) & 0x1F; + classIndex = (long32At(classObj + 4)) & 0x3FFFFF; fillValue = 0; switch (instSpec) { case 2: - if (nElements > (((512 * 1024) * 1024) - 1)) { - return null; - } numSlots = nElements; fillValue = GIV(nilObj); break; case 3: case 4: - if (nElements > ((((512 * 1024) * 1024) - 1) - (classFormat & ((1 << 16) - 1)))) { - return null; - } numSlots = (classFormat & ((1 << 16) - 1)) + nElements; fillValue = GIV(nilObj); break; case 9: if (nElements > ((((512 * 1024) * 1024) - 1) / 2)) { + GIV(primFailCode) = PrimErrUnsupported; return null; } numSlots = nElements * 2; break; case 10: - if (nElements > (((512 * 1024) * 1024) - 1)) { + if ((classIndex == ClassFloatCompactIndex) + && (nElements != 2)) { + GIV(primFailCode) = PrimErrBadReceiver; return null; } numSlots = nElements; break; case 12: numSlots = (nElements + 1) / 2; - if (numSlots > (((512 * 1024) * 1024) - 1)) { - return null; - } instSpec += nElements & 1; break; case 16: numSlots = (nElements + 3) / 4; - if (numSlots > (((512 * 1024) * 1024) - 1)) { - return null; - } instSpec += (4 - nElements) & 3; break; default: @@ -40874,23 +40865,29 @@ numSlots = classFormat & ((1 << 16) - 1); } - /* begin ensureBehaviorHash: */ - assert(addressCouldBeClassObj(classObj)); - if (((newHash = (long32At(classObj + 4)) & 0x3FFFFF)) == 0) { - if (((err = enterIntoClassTable(classObj))) != 0) { - classIndex = -err; - goto l2; + if (classIndex == 0) { + /* begin ensureBehaviorHash: */ + assert(addressCouldBeClassObj(classObj)); + if (((newHash = (long32At(classObj + 4)) & 0x3FFFFF)) == 0) { + if (((err = enterIntoClassTable(classObj))) != 0) { + classIndex = -err; + goto l1; + } + newHash = (long32At(classObj + 4)) & 0x3FFFFF; + assert((classAtIndex(newHash)) == classObj); } - newHash = (long32At(classObj + 4)) & 0x3FFFFF; - assert((classAtIndex(newHash)) == classObj); + classIndex = newHash; + l1: /* end ensureBehaviorHash: */; + if (classIndex < 0) { + GIV(primFailCode) = -classIndex; + return null; + } } - classIndex = newHash; -l2: /* end ensureBehaviorHash: */; - if (classIndex < 0) { - GIV(primFailCode) = -classIndex; - return null; - } if (numSlots > ((1 << 16) - 1)) { + if (numSlots > (((512 * 1024) * 1024) - 1)) { + GIV(primFailCode) = PrimErrUnsupported; + return null; + } newObj = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, ((numSlots == 0 ? 8 : (numSlots + (numSlots & 1)) << (shiftForWord()))) + ((numSlots >= 0xFF @@ -40916,7 +40913,7 @@ forceInterruptCheck(); } newObj = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex); - goto l1; + goto l2; } if (numSlots >= 0xFF) { @@ -40934,7 +40931,7 @@ assert((newObj1 % (allocationUnit())) == 0); GIV(freeStart) += numBytes; newObj = newObj1; - l1: /* end allocateSlots:format:classIndex: */; + l2: /* end allocateSlots:format:classIndex: */; } if (!(newObj == null)) { /* begin fillObj:numSlots:with: */ @@ -48486,7 +48483,7 @@ newNumSlots = obj2slots + header1NumSlots; if (newNumSlots < 0xFF) { - byteAtput(here1 + (56 / BitsPerByte), newNumSlots); + byteAtput(here1 + 7, newNumSlots); here1 = here1; goto l2; } @@ -70596,12 +70593,20 @@ } sqInt -printStackCallStackOf(char *aFramePointer) +printStackCallStackOf(sqInt frameOrContext) { sqInt context; char *theFP; - theFP = aFramePointer; + if (addressCouldBeObj(frameOrContext)) { + if ((((frameOrContext & 3) == 0) + && (((longAt(frameOrContext)) & 0x3FFFFF) == ClassMethodContextCompactIndex)) + && (checkIsStillMarriedContextcurrentFP(frameOrContext, null))) { + return printStackCallStackOf(frameOfMarriedContext(frameOrContext)); + } + return null; + } + theFP = ((void *)frameOrContext); while(1) { context = shortReversePrintFrameAndCallers(theFP); if (!((((longAt((context + BaseHeaderSize) + (SenderIndex << (shiftForWord())))) & 1)) Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2014-11-26 22:45:03 UTC (rev 3153) +++ branches/Cog/nsspursrc/vm/cointerp.h 2014-11-28 00:08:50 UTC (rev 3154) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.956 uuid: c2eb8c1e-ed43-4316-80b4-781c57cf3f1e + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.957 uuid: ac5f8308-02e5-4277-b28c-595b7a4cf34a */ @@ -299,7 +299,7 @@ void printMethodDictionary(sqInt dictionary); void printProcessStack(sqInt aProcess); sqInt printProcsOnList(sqInt procList); -sqInt printStackCallStackOf(char *aFramePointer); +sqInt printStackCallStackOf(sqInt frameOrContext); void print(char *s); void setBreakSelector(char *aString); void setNextWakeupUsecs(usqLong value); Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-11-26 22:45:03 UTC (rev 3153) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-11-28 00:08:50 UTC (rev 3154) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.956 uuid: c2eb8c1e-ed43-4316-80b4-781c57cf3f1e + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.957 uuid: ac5f8308-02e5-4277-b28c-595b7a4cf34a from - CoInterpreter VMMaker.oscog-eem.956 uuid: c2eb8c1e-ed43-4316-80b4-781c57cf3f1e + CoInterpreter VMMaker.oscog-eem.957 uuid: ac5f8308-02e5-4277-b28c-595b7a4cf34a */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.956 uuid: c2eb8c1e-ed43-4316-80b4-781c57cf3f1e " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.957 uuid: ac5f8308-02e5-4277-b28c-595b7a4cf34a " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -142,7 +142,6 @@ #define BecameActiveClassFlag 8 #define BecameCompiledMethodFlag 2 #define BecamePointerObjectFlag 1 -#define BitsPerByte 8 #define Byte0Mask 0xFF #define Byte1Mask 0xFF00 #define Byte1Shift 8 @@ -1396,7 +1395,7 @@ void printOop(sqInt oop); void printProcessStack(sqInt aProcess); sqInt printProcsOnList(sqInt procList); -sqInt printStackCallStackOf(char *aFramePointer); +sqInt printStackCallStackOf(sqInt frameOrContext); void printStackPageList(void); void printStackPageListInUse(void); void printStackPages(void); @@ -2346,7 +2345,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.956"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.957"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -23485,12 +23484,12 @@ sqInt classTablePage; size_t dataSize; sqInt edenBytes; - long firstSegSize; + sqInt firstSegSize; sqInt hdrCogCodeSize; sqInt hdrEdenBytes; sqInt hdrMaxExtSemTabSize; sqInt hdrNumStackPages; - long headerFlags; + sqInt headerFlags; sqInt headerSize; squeakFileOffsetType headerStart; usqInt heapSize; @@ -23509,7 +23508,7 @@ usqInt minimumMemory; usqInt numSlots; sqInt objOop; - long oldBaseAddr; + sqInt oldBaseAddr; sqInt oldStart; sqInt oop; sqInt p; @@ -23552,9 +23551,9 @@ /* begin getLongFromFile:swap: */ w1 = 0; sqImageFileRead((&w1), sizeof(long), 1, f); - dataSize = ((long) ((swapBytes - ? ((((((usqInt) w1 >> 24)) & Byte0Mask) + ((((usqInt) w1 >> 8)) & Byte1Mask)) + ((((usqInt) w1 << 8)) & Byte2Mask)) + ((((usqInt) w1 << 24)) & Byte3Mask) - : w1))); + dataSize = (swapBytes + ? ((((((usqInt) w1 >> 24)) & Byte0Mask) + ((((usqInt) w1 >> 8)) & Byte1Mask)) + ((((usqInt) w1 << 8)) & Byte2Mask)) + ((((usqInt) w1 << 24)) & Byte3Mask) + : w1); /* begin getLongFromFile:swap: */ w2 = 0; sqImageFileRead((&w2), sizeof(long), 1, f); @@ -23565,24 +23564,24 @@ /* begin getLongFromFile:swap: */ w3 = 0; sqImageFileRead((&w3), sizeof(long), 1, f); - anObject = ((long) ((swapBytes - ? ((((((usqInt) w3 >> 24)) & Byte0Mask) + ((((usqInt) w3 >> 8)) & Byte1Mask)) + ((((usqInt) w3 << 8)) & Byte2Mask)) + ((((usqInt) w3 << 24)) & Byte3Mask) - : w3))); + anObject = (swapBytes + ? ((((((usqInt) w3 >> 24)) & Byte0Mask) + ((((usqInt) w3 >> 8)) & Byte1Mask)) + ((((usqInt) w3 << 8)) & Byte2Mask)) + ((((usqInt) w3 << 24)) & Byte3Mask) + : w3); GIV(specialObjectsOop) = anObject; /* begin lastHash: */ /* begin getLongFromFile:swap: */ w4 = 0; sqImageFileRead((&w4), sizeof(long), 1, f); - seed = ((long) ((swapBytes - ? ((((((usqInt) w4 >> 24)) & Byte0Mask) + ((((usqInt) w4 >> 8)) & Byte1Mask)) + ((((usqInt) w4 << 8)) & Byte2Mask)) + ((((usqInt) w4 << 24)) & Byte3Mask) - : w4))); + seed = (swapBytes + ? ((((((usqInt) w4 >> 24)) & Byte0Mask) + ((((usqInt) w4 >> 8)) & Byte1Mask)) + ((((usqInt) w4 << 8)) & Byte2Mask)) + ((((usqInt) w4 << 24)) & Byte3Mask) + : w4); GIV(lastHash) = seed; /* begin getLongFromFile:swap: */ w5 = 0; sqImageFileRead((&w5), sizeof(long), 1, f); - GIV(savedWindowSize) = ((long) ((swapBytes - ? ((((((usqInt) w5 >> 24)) & Byte0Mask) + ((((usqInt) w5 >> 8)) & Byte1Mask)) + ((((usqInt) w5 << 8)) & Byte2Mask)) + ((((usqInt) w5 << 24)) & Byte3Mask) - : w5))); + GIV(savedWindowSize) = (swapBytes + ? ((((((usqInt) w5 >> 24)) & Byte0Mask) + ((((usqInt) w5 >> 8)) & Byte1Mask)) + ((((usqInt) w5 << 8)) & Byte2Mask)) + ((((usqInt) w5 << 24)) & Byte3Mask) + : w5); /* begin getLongFromFile:swap: */ w6 = 0; sqImageFileRead((&w6), sizeof(long), 1, f); @@ -27813,8 +27812,8 @@ sqInt sz; isSmall = (isNegative - ? magnitude < (MaxSmallInteger) - : magnitude < ((MaxSmallInteger) + 1)); + ? magnitude <= ((MaxSmallInteger) + 1) + : magnitude <= (MaxSmallInteger)); if (isSmall) { smallVal = ((sqInt) magnitude); if (isNegative) { @@ -40826,48 +40825,40 @@ classFormat = ((longAt((classObj + BaseHeaderSize) + (InstanceSpecificationIndex << (shiftForWord())))) >> 1); instSpec = (((usqInt) classFormat) >> 16) & 0x1F; + classIndex = (long32At(classObj + 4)) & 0x3FFFFF; fillValue = 0; switch (instSpec) { case 2: - if (nElements > (((512 * 1024) * 1024) - 1)) { - return null; - } numSlots = nElements; fillValue = GIV(nilObj); break; case 3: case 4: - if (nElements > ((((512 * 1024) * 1024) - 1) - (classFormat & ((1 << 16) - 1)))) { - return null; - } numSlots = (classFormat & ((1 << 16) - 1)) + nElements; fillValue = GIV(nilObj); break; case 9: if (nElements > ((((512 * 1024) * 1024) - 1) / 2)) { + GIV(primFailCode) = PrimErrUnsupported; return null; } numSlots = nElements * 2; break; case 10: - if (nElements > (((512 * 1024) * 1024) - 1)) { + if ((classIndex == ClassFloatCompactIndex) + && (nElements != 2)) { + GIV(primFailCode) = PrimErrBadReceiver; return null; } numSlots = nElements; break; case 12: numSlots = (nElements + 1) / 2; - if (numSlots > (((512 * 1024) * 1024) - 1)) { - return null; - } instSpec += nElements & 1; break; case 16: numSlots = (nElements + 3) / 4; - if (numSlots > (((512 * 1024) * 1024) - 1)) { - return null; - } instSpec += (4 - nElements) & 3; break; default: @@ -40883,23 +40874,29 @@ numSlots = classFormat & ((1 << 16) - 1); } - /* begin ensureBehaviorHash: */ - assert(addressCouldBeClassObj(classObj)); - if (((newHash = (long32At(classObj + 4)) & 0x3FFFFF)) == 0) { - if (((err = enterIntoClassTable(classObj))) != 0) { - classIndex = -err; - goto l2; + if (classIndex == 0) { + /* begin ensureBehaviorHash: */ + assert(addressCouldBeClassObj(classObj)); + if (((newHash = (long32At(classObj + 4)) & 0x3FFFFF)) == 0) { + if (((err = enterIntoClassTable(classObj))) != 0) { + classIndex = -err; + goto l1; + } + newHash = (long32At(classObj + 4)) & 0x3FFFFF; + assert((classAtIndex(newHash)) == classObj); } - newHash = (long32At(classObj + 4)) & 0x3FFFFF; - assert((classAtIndex(newHash)) == classObj); + classIndex = newHash; + l1: /* end ensureBehaviorHash: */; + if (classIndex < 0) { + GIV(primFailCode) = -classIndex; + return null; + } } - classIndex = newHash; -l2: /* end ensureBehaviorHash: */; - if (classIndex < 0) { - GIV(primFailCode) = -classIndex; - return null; - } if (numSlots > ((1 << 16) - 1)) { + if (numSlots > (((512 * 1024) * 1024) - 1)) { + GIV(primFailCode) = PrimErrUnsupported; + return null; + } newObj = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, ((numSlots == 0 ? 8 : (numSlots + (numSlots & 1)) << (shiftForWord()))) + ((numSlots >= 0xFF @@ -40925,7 +40922,7 @@ forceInterruptCheck(); } newObj = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex); - goto l1; + goto l2; } if (numSlots >= 0xFF) { @@ -40943,7 +40940,7 @@ assert((newObj1 % (allocationUnit())) == 0); GIV(freeStart) += numBytes; newObj = newObj1; - l1: /* end allocateSlots:format:classIndex: */; + l2: /* end allocateSlots:format:classIndex: */; } if (!(newObj == null)) { /* begin fillObj:numSlots:with: */ @@ -48495,7 +48492,7 @@ newNumSlots = obj2slots + header1NumSlots; if (newNumSlots < 0xFF) { - byteAtput(here1 + (56 / BitsPerByte), newNumSlots); + byteAtput(here1 + 7, newNumSlots); here1 = here1; goto l2; } @@ -70605,12 +70602,20 @@ } sqInt -printStackCallStackOf(char *aFramePointer) +printStackCallStackOf(sqInt frameOrContext) { sqInt context; char *theFP; - theFP = aFramePointer; + if (addressCouldBeObj(frameOrContext)) { + if ((((frameOrContext & 3) == 0) + && (((longAt(frameOrContext)) & 0x3FFFFF) == ClassMethodContextCompactIndex)) + && (checkIsStillMarriedContextcurrentFP(frameOrContext, null))) { + return printStackCallStackOf(frameOfMarriedContext(frameOrContext)); + } + return null; + } + theFP = ((void *)frameOrContext); while(1) { context = shortReversePrintFrameAndCallers(theFP); if (!((((longAt((context + BaseHeaderSize) + (SenderIndex << (shiftForWord())))) & 1)) Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-11-26 22:45:03 UTC (rev 3153) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-11-28 00:08:50 UTC (rev 3154) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.956 uuid: c2eb8c1e-ed43-4316-80b4-781c57cf3f1e + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.957 uuid: ac5f8308-02e5-4277-b28c-595b7a4cf34a from - StackInterpreter VMMaker.oscog-eem.956 uuid: c2eb8c1e-ed43-4316-80b4-781c57cf3f1e + StackInterpreter VMMaker.oscog-eem.957 uuid: ac5f8308-02e5-4277-b28c-595b7a4cf34a */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.956 uuid: c2eb8c1e-ed43-4316-80b4-781c57cf3f1e " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.957 uuid: ac5f8308-02e5-4277-b28c-595b7a4cf34a " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -138,7 +138,6 @@ #define BecameActiveClassFlag 8 #define BecameCompiledMethodFlag 2 #define BecamePointerObjectFlag 1 -#define BitsPerByte 8 #define Byte0Mask 0xFF #define Byte1Mask 0xFF00 #define Byte1Shift 8 @@ -1170,7 +1169,7 @@ void printOop(sqInt oop); void printProcessStack(sqInt aProcess); sqInt printProcsOnList(sqInt procList); -sqInt printStackCallStackOf(char *aFramePointer); +sqInt printStackCallStackOf(sqInt frameOrContext); void printStackPageList(void); void printStackPageListInUse(void); void printStackPages(void); @@ -2093,7 +2092,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.956"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.957"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -13625,8 +13624,8 @@ sqInt sz; isSmall = (isNegative - ? magnitude < (MaxSmallInteger) - : magnitude < ((MaxSmallInteger) + 1)); + ? magnitude <= ((MaxSmallInteger) + 1) + : magnitude <= (MaxSmallInteger)); if (isSmall) { smallVal = ((sqInt) magnitude); if (isNegative) { @@ -26868,48 +26867,40 @@ classFormat = ((longAt((classObj + BaseHeaderSize) + (InstanceSpecificationIndex << (shiftForWord())))) >> 1); instSpec = (((usqInt) classFormat) >> 16) & 0x1F; + classIndex = (long32At(classObj + 4)) & 0x3FFFFF; fillValue = 0; switch (instSpec) { case 2: - if (nElements > (((512 * 1024) * 1024) - 1)) { - return null; - } numSlots = nElements; fillValue = GIV(nilObj); break; case 3: case 4: - if (nElements > ((((512 * 1024) * 1024) - 1) - (classFormat & ((1 << 16) - 1)))) { - return null; - } numSlots = (classFormat & ((1 << 16) - 1)) + nElements; fillValue = GIV(nilObj); break; case 9: if (nElements > ((((512 * 1024) * 1024) - 1) / 2)) { + GIV(primFailCode) = PrimErrUnsupported; return null; } numSlots = nElements * 2; break; case 10: - if (nElements > (((512 * 1024) * 1024) - 1)) { + if ((classIndex == ClassFloatCompactIndex) + && (nElements != 2)) { + GIV(primFailCode) = PrimErrBadReceiver; return null; } numSlots = nElements; break; case 12: numSlots = (nElements + 1) / 2; - if (numSlots > (((512 * 1024) * 1024) - 1)) { - return null; - } instSpec += nElements & 1; break; case 16: numSlots = (nElements + 3) / 4; - if (numSlots > (((512 * 1024) * 1024) - 1)) { - return null; - } instSpec += (4 - nElements) & 3; break; default: @@ -26925,23 +26916,29 @@ numSlots = classFormat & ((1 << 16) - 1); } - /* begin ensureBehaviorHash: */ - assert(addressCouldBeClassObj(classObj)); - if (((newHash = (long32At(classObj + 4)) & 0x3FFFFF)) == 0) { - if (((err = enterIntoClassTable(classObj))) != 0) { - classIndex = -err; - goto l2; + if (classIndex == 0) { + /* begin ensureBehaviorHash: */ + assert(addressCouldBeClassObj(classObj)); + if (((newHash = (long32At(classObj + 4)) & 0x3FFFFF)) == 0) { + if (((err = enterIntoClassTable(classObj))) != 0) { + classIndex = -err; + goto l1; + } + newHash = (long32At(classObj + 4)) & 0x3FFFFF; + assert((classAtIndex(newHash)) == classObj); } - newHash = (long32At(classObj + 4)) & 0x3FFFFF; - assert((classAtIndex(newHash)) == classObj); + classIndex = newHash; + l1: /* end ensureBehaviorHash: */; + if (classIndex < 0) { + GIV(primFailCode) = -classIndex; + return null; + } } - classIndex = newHash; -l2: /* end ensureBehaviorHash: */; - if (classIndex < 0) { - GIV(primFailCode) = -classIndex; - return null; - } if (numSlots > ((1 << 16) - 1)) { + if (numSlots > (((512 * 1024) * 1024) - 1)) { + GIV(primFailCode) = PrimErrUnsupported; + return null; + } newObj = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, ((numSlots == 0 ? 8 : (numSlots + (numSlots & 1)) << (shiftForWord()))) + ((numSlots >= 0xFF @@ -26967,7 +26964,7 @@ forceInterruptCheck(); } newObj = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex); - goto l1; + goto l2; } if (numSlots >= 0xFF) { @@ -26985,7 +26982,7 @@ assert((newObj1 % (allocationUnit())) == 0); GIV(freeStart) += numBytes; newObj = newObj1; - l1: /* end allocateSlots:format:classIndex: */; + l2: /* end allocateSlots:format:classIndex: */; } if (!(newObj == null)) { /* begin fillObj:numSlots:with: */ @@ -34554,7 +34551,7 @@ newNumSlots = obj2slots + header1NumSlots; if (newNumSlots < 0xFF) { - byteAtput(here1 + (56 / BitsPerByte), newNumSlots); + byteAtput(here1 + 7, newNumSlots); here1 = here1; goto l2; } @@ -51716,7 +51713,7 @@ sqInt referent1; sqInt referent2; char *theFP; - usqInt theIP; + sqInt theIP; usqInt theIPPtr; StackPage *thePage; char *theSP; @@ -51774,7 +51771,7 @@ /* reuse theIP; its just an offset here */ - theIP = ((usqInt)(theFP + ((FoxCallerSavedIP + BytesPerWord) + ((byteAt((theFP + FoxFrameFlags) + 1)) << (shiftForWord()))))); + theIP = ((sqInt)(theFP + ((FoxCallerSavedIP + BytesPerWord) + ((byteAt((theFP + FoxFrameFlags) + 1)) << (shiftForWord()))))); oop = longAt(theIP); if (((oop & 3) == 0) && (((longAt(oop)) & 0x3FFFFF) == 8)) { @@ -51802,7 +51799,7 @@ longAtput(theFP + FoxMethod, (oop = newOop)); } if (!(((callerFP = frameCallerFP(theFP))) != 0)) break; - theIPPtr = ((usqInt)(theFP + FoxCallerSavedIP)); + theIPPtr = ((sqInt)(theFP + FoxCallerSavedIP)); theFP = callerFP; } } @@ -59199,12 +59196,20 @@ } sqInt -printStackCallStackOf(char *aFramePointer) +printStackCallStackOf(sqInt frameOrContext) { sqInt context; char *theFP; - theFP = aFramePointer; + if (addressCouldBeObj(frameOrContext)) { + if ((((frameOrContext & 3) == 0) + && (((longAt(frameOrContext)) & 0x3FFFFF) == ClassMethodContextCompactIndex)) + && (checkIsStillMarriedContextcurrentFP(frameOrContext, null))) { + return printStackCallStackOf(frameOfMarriedContext(frameOrContext)); + } + return null; + } + theFP = ((void *)frameOrContext); while(1) { context = shortReversePrintFrameAndCallers(theFP); if (!((((longAt((context + BaseHeaderSize) + (SenderIndex << (shiftForWord())))) & 1)) Modified: branches/Cog/nsspurstacksrc/vm/interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/interp.c 2014-11-26 22:45:03 UTC (rev 3153) +++ branches/Cog/nsspurstacksrc/vm/interp.c 2014-11-28 00:08:50 UTC (rev 3154) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.956 uuid: c2eb8c1e-ed43-4316-80b4-781c57cf3f1e + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.957 uuid: ac5f8308-02e5-4277-b28c-595b7a4cf34a from - StackInterpreter VMMaker.oscog-eem.956 uuid: c2eb8c1e-ed43-4316-80b4-781c57cf3f1e + StackInterpreter VMMaker.oscog-eem.957 uuid: ac5f8308-02e5-4277-b28c-595b7a4cf34a */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.956 uuid: c2eb8c1e-ed43-4316-80b4-781c57cf3f1e " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.957 uuid: ac5f8308-02e5-4277-b28c-595b7a4cf34a " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -135,7 +135,6 @@ #define BecameActiveClassFlag 8 #define BecameCompiledMethodFlag 2 #define BecamePointerObjectFlag 1 -#define BitsPerByte 8 #define Byte0Mask 0xFF #define Byte1Mask 0xFF00 #define Byte1Shift 8 @@ -1167,7 +1166,7 @@ void printOop(sqInt oop); void printProcessStack(sqInt aProcess); sqInt printProcsOnList(sqInt procList); -sqInt printStackCallStackOf(char *aFramePointer); +sqInt printStackCallStackOf(sqInt frameOrContext); void printStackPageList(void); void printStackPageListInUse(void); void printStackPages(void); @@ -2090,7 +2089,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.956"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.957"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -13616,8 +13615,8 @@ sqInt sz; isSmall = (isNegative - ? magnitude < (MaxSmallInteger) - : magnitude < ((MaxSmallInteger) + 1)); + ? magnitude <= ((MaxSmallInteger) + 1) + : magnitude <= (MaxSmallInteger)); if (isSmall) { smallVal = ((sqInt) magnitude); if (isNegative) { @@ -26859,48 +26858,40 @@ classFormat = ((longAt((classObj + BaseHeaderSize) + (InstanceSpecificationIndex << (shiftForWord())))) >> 1); instSpec = (((usqInt) classFormat) >> 16) & 0x1F; + classIndex = (long32At(classObj + 4)) & 0x3FFFFF; fillValue = 0; switch (instSpec) { case 2: - if (nElements > (((512 * 1024) * 1024) - 1)) { - return null; - } numSlots = nElements; fillValue = GIV(nilObj); break; case 3: case 4: - if (nElements > ((((512 * 1024) * 1024) - 1) - (classFormat & ((1 << 16) - 1)))) { - return null; - } numSlots = (classFormat & ((1 << 16) - 1)) + nElements; fillValue = GIV(nilObj); break; case 9: if (nElements > ((((512 * 1024) * 1024) - 1) / 2)) { + GIV(primFailCode) = PrimErrUnsupported; return null; } numSlots = nElements * 2; break; case 10: - if (nElements > (((512 * 1024) * 1024) - 1)) { + if ((classIndex == ClassFloatCompactIndex) + && (nElements != 2)) { + GIV(primFailCode) = PrimErrBadReceiver; return null; } numSlots = nElements; break; case 12: numSlots = (nElements + 1) / 2; - if (numSlots > (((512 * 1024) * 1024) - 1)) { - return null; - } instSpec += nElements & 1; break; case 16: numSlots = (nElements + 3) / 4; - if (numSlots > (((512 * 1024) * 1024) - 1)) { - return null; - } instSpec += (4 - nElements) & 3; break; default: @@ -26916,23 +26907,29 @@ numSlots = classFormat & ((1 << 16) - 1); } - /* begin ensureBehaviorHash: */ - assert(addressCouldBeClassObj(classObj)); - if (((newHash = (long32At(classObj + 4)) & 0x3FFFFF)) == 0) { - if (((err = enterIntoClassTable(classObj))) != 0) { - classIndex = -err; - goto l2; + if (classIndex == 0) { + /* begin ensureBehaviorHash: */ + assert(addressCouldBeClassObj(classObj)); + if (((newHash = (long32At(classObj + 4)) & 0x3FFFFF)) == 0) { + if (((err = enterIntoClassTable(classObj))) != 0) { + classIndex = -err; + goto l1; + } + newHash = (long32At(classObj + 4)) & 0x3FFFFF; + assert((classAtIndex(newHash)) == classObj); } - newHash = (long32At(classObj + 4)) & 0x3FFFFF; - assert((classAtIndex(newHash)) == classObj); + classIndex = newHash; + l1: /* end ensureBehaviorHash: */; + if (classIndex < 0) { + GIV(primFailCode) = -classIndex; + return null; + } } - classIndex = newHash; -l2: /* end ensureBehaviorHash: */; - if (classIndex < 0) { - GIV(primFailCode) = -classIndex; - return null; - } if (numSlots > ((1 << 16) - 1)) { + if (numSlots > (((512 * 1024) * 1024) - 1)) { + GIV(primFailCode) = PrimErrUnsupported; + return null; + } newObj = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, ((numSlots == 0 ? 8 : (numSlots + (numSlots & 1)) << (shiftForWord()))) + ((numSlots >= 0xFF @@ -26958,7 +26955,7 @@ forceInterruptCheck(); } newObj = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex); - goto l1; + goto l2; } if (numSlots >= 0xFF) { @@ -26976,7 +26973,7 @@ assert((newObj1 % (allocationUnit())) == 0); GIV(freeStart) += numBytes; newObj = newObj1; - l1: /* end allocateSlots:format:classIndex: */; + l2: /* end allocateSlots:format:classIndex: */; } if (!(newObj == null)) { /* begin fillObj:numSlots:with: */ @@ -34545,7 +34542,7 @@ newNumSlots = obj2slots + header1NumSlots; if (newNumSlots < 0xFF) { - byteAtput(here1 + (56 / BitsPerByte), newNumSlots); + byteAtput(here1 + 7, newNumSlots); here1 = here1; goto l2; } @@ -51707,7 +51704,7 @@ sqInt referent1; sqInt referent2; char *theFP; - usqInt theIP; + sqInt theIP; usqInt theIPPtr; StackPage *thePage; char *theSP; @@ -51765,7 +51762,7 @@ /* reuse theIP; its just an offset here */ - theIP = ((usqInt)(theFP + ((FoxCallerSavedIP + BytesPerWord) + ((byteAt((theFP + FoxFrameFlags) + 1)) << (shiftForWord()))))); + theIP = ((sqInt)(theFP + ((FoxCallerSavedIP + BytesPerWord) + ((byteAt((theFP + FoxFrameFlags) + 1)) << (shiftForWord()))))); oop = longAt(theIP); if (((oop & 3) == 0) && (((longAt(oop)) & 0x3FFFFF) == 8)) { @@ -51793,7 +51790,7 @@ longAtput(theFP + FoxMethod, (oop = newOop)); } if (!(((callerFP = frameCallerFP(theFP))) != 0)) break; - theIPPtr = ((usqInt)(theFP + FoxCallerSavedIP)); + theIPPtr = ((sqInt)(theFP + FoxCallerSavedIP)); theFP = callerFP; } } @@ -59190,12 +59187,20 @@ } sqInt -printStackCallStackOf(char *aFramePointer) +printStackCallStackOf(sqInt frameOrContext) { sqInt context; char *theFP; - theFP = aFramePointer; + if (addressCouldBeObj(frameOrContext)) { + if ((((frameOrContext & 3) == 0) + && (((longAt(frameOrContext)) & 0x3FFFFF) == ClassMethodContextCompactIndex)) + && (checkIsStillMarriedContextcurrentFP(frameOrContext, null))) { + return printStackCallStackOf(frameOfMarriedContext(frameOrContext)); + } + return null; + } + theFP = ((void *)frameOrContext); while(1) { context = shortReversePrintFrameAndCallers(theFP); if (!((((longAt((context + BaseHeaderSize) + (SenderIndex << (shiftForWord())))) & 1)) Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Mon Nov 24 12:21:21 PST 2014 + Thu Nov 27 16:06:45 PST 2014 Modified: branches/Cog/sistasrc/vm/cogit.c @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.957.mcz
by commits＠source.squeak.org 28 Nov '14

28 Nov '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.957.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.957 Author: eem Time: 27 November 2014, 3:39:41.61 pm UUID: ac5f8308-02e5-4277-b28c-595b7a4cf34a Ancestors: VMMaker.oscog-eem.956 Fix regression in magnitude64BitIntegerFor:neg: Move dispdbg.h above cointerp.h & cogit.h in cogit.c otherwise NoDbgRegParms gets screwed up. Use asInteger instead of asUnsignedInteger in followForwardingPointersInStackZone: so simulation of Stack VM doesn't trigger the assert in asUnsignedInteger. Spur: Make instantiateClass:indexableSize: check for Float instantiation, failing for other than 2 words. Rewrite 32-bit coalesce:and: to use the raw slot accessors. Implement 64-bit coalesce:and:. Simulator: Make printStackCallStackOf: accept contexts. =============== Diff against VMMaker.oscog-eem.956 =============== Item was changed: ----- Method: Cogit class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator #( 'coInterpreter' 'objectMemory' 'methodZone' 'objectRepresentation' 'cogBlockMethodSurrogateClass' 'cogMethodSurrogateClass' 'threadManager' 'processor' 'lastNInstructions' 'simulatedAddresses' 'simulatedTrampolines' 'simulatedVariableGetters' 'simulatedVariableSetters' 'printRegisters' 'printInstructions' 'clickConfirm' 'singleStep') do: [:simulationVariableNotNeededForRealVM| aCCodeGenerator removeVariable: simulationVariableNotNeededForRealVM]. NewspeakVM ifFalse: [#( 'dynSuperEntry' 'dynSuperEntryAlignment' 'dynamicSuperSendTrampolines' 'ceImplicitReceiverTrampoline' 'ceEnclosingObjectTrampoline' 'cmDynSuperEntryOffset' 'numIRCs' 'indexOfIRC' 'theIRCs') do: [:variableNotNeededInNormalVM| aCCodeGenerator removeVariable: variableNotNeededInNormalVM]]. aCCodeGenerator removeConstant: #COGMTVM. "this should be defined at compile time" aCCodeGenerator addHeaderFile:'<stddef.h>'; "for e.g. offsetof" addHeaderFile:'"sqCogStackAlignment.h"'; + addHeaderFile:'"dispdbg.h"'; "must preceed cointerp.h & cogit.h otherwise NoDbgRegParms gets screwed up" addHeaderFile:'"cogmethod.h"'; addHeaderFile:'#if COGMTVM'; addHeaderFile:'"cointerpmt.h"'; addHeaderFile:'#else'; addHeaderFile:'"cointerp.h"'; addHeaderFile:'#endif'; + addHeaderFile:'"cogit.h"'. - addHeaderFile:'"cogit.h"'; - addHeaderFile:'"dispdbg.h"'. aCCodeGenerator var: #ceGetSP declareC: 'unsigned long (*ceGetSP)(void)'; var: #ceCaptureCStackPointers declareC: 'void (*ceCaptureCStackPointers)(void)'; var: #ceEnterCogCodePopReceiverReg declareC: 'void (*ceEnterCogCodePopReceiverReg)(void)'; var: #realCEEnterCogCodePopReceiverReg declareC: 'void (*realCEEnterCogCodePopReceiverReg)(void)'; var: #ceCallCogCodePopReceiverReg declareC: 'void (*ceCallCogCodePopReceiverReg)(void)'; var: #realCECallCogCodePopReceiverReg declareC: 'void (*realCECallCogCodePopReceiverReg)(void)'; var: #ceCallCogCodePopReceiverAndClassRegs declareC: 'void (*ceCallCogCodePopReceiverAndClassRegs)(void)'; var: #realCECallCogCodePopReceiverAndClassRegs declareC: 'void (*realCECallCogCodePopReceiverAndClassRegs)(void)'; var: #ceFlushICache declareC: 'static void (*ceFlushICache)(unsigned long from, unsigned long to)'; var: #ceCheckFeaturesFunction declareC: 'static unsigned long (*ceCheckFeaturesFunction)(void)'; var: #ceTryLockVMOwner declareC: 'unsigned long (*ceTryLockVMOwner)(void)'; var: #ceUnlockVMOwner declareC: 'void (*ceUnlockVMOwner)(void)'; var: #postCompileHook declareC: 'void (*postCompileHook)(CogMethod *, void *)'; var: #openPICList declareC: 'CogMethod *openPICList = 0'; var: #maxMethodBefore type: #'CogBlockMethod *'. aCCodeGenerator declareVar: 'aMethodLabel' type: #'AbstractInstruction'; "Has to come lexicographically before backEnd & methodLabel" var: #backEnd declareC: 'AbstractInstruction * const backEnd = &aMethodLabel'; var: #methodLabel declareC: 'AbstractInstruction * const methodLabel = &aMethodLabel'; var: #primInvokeLabel type: #'AbstractInstruction *'. self declareC: #(abstractOpcodes stackCheckLabel blockEntryLabel blockEntryNoContextSwitch stackOverflowCall sendMiss sendMissCall entry noCheckEntry dynSuperEntry mnuCall interpretCall interpretLabel endCPICCase0 endCPICCase1) as: #'AbstractInstruction *' in: aCCodeGenerator. aCCodeGenerator declareVar: #annotations type: #'InstructionAnnotation *'; declareVar: #blockStarts type: #'BlockStart *'; declareVar: #fixups type: #'BytecodeFixup *'. aCCodeGenerator var: #sendTrampolines declareC: 'sqInt sendTrampolines[NumSendTrampolines]'; var: #superSendTrampolines declareC: 'sqInt superSendTrampolines[NumSendTrampolines]'; var: #dynamicSuperSendTrampolines declareC: 'sqInt dynamicSuperSendTrampolines[NumSendTrampolines]'; var: #trampolineAddresses declareC: 'static char *trampolineAddresses[NumTrampolines*2]'; var: #objectReferencesInRuntime declareC: 'static sqInt objectReferencesInRuntime[NumObjRefsInRuntime]'; var: #labelCounter type: #int; var: #traceFlags declareC: 'int traceFlags = 8 /* prim trace log on by default */'; var: #cStackAlignment declareC: 'const int cStackAlignment = STACK_ALIGN_BYTES'. aCCodeGenerator declareVar: #CFramePointer type: #'void *'; declareVar: #CStackPointer type: #'void *'; declareVar: #minValidCallAddress type: #'unsigned long'; declareVar: #debugPrimCallStackOffset type: #'unsigned long'. aCCodeGenerator vmClass generatorTable ifNotNil: [:bytecodeGenTable| aCCodeGenerator var: #generatorTable declareC: 'static BytecodeDescriptor generatorTable[', bytecodeGenTable size, ']', (self tableInitializerFor: bytecodeGenTable in: aCCodeGenerator); var: #primitiveGeneratorTable declareC: 'static PrimitiveDescriptor primitiveGeneratorTable[MaxCompiledPrimitiveIndex+1]', (self tableInitializerFor: aCCodeGenerator vmClass primitiveTable in: aCCodeGenerator)]. "In C the abstract opcode names clash with the Smalltak generator syntactic sugar. Most of the syntactic sugar is inlined, but alas some remains. Rename the syntactic sugar to avoid the clash." (self organization listAtCategoryNamed: #'abstract instructions') do: [:s| aCCodeGenerator addSelectorTranslation: s to: 'g', (aCCodeGenerator cFunctionNameFor: s)]. aCCodeGenerator addSelectorTranslation: #halt: to: 'haltmsg'! Item was changed: ----- Method: InterpreterPrimitives>>magnitude64BitIntegerFor:neg: (in category 'primitive support') ----- magnitude64BitIntegerFor: magnitude neg: isNegative "Return a Large Integer object for the given integer magnitude and sign" | newLargeInteger largeClass intValue highWord sz isSmall smallVal | <var: 'magnitude' type: #usqLong> <var: 'highWord' type: #usqInt> isSmall := isNegative + ifTrue: [magnitude <= (objectMemory maxSmallInteger + 1)] + ifFalse: [magnitude <= objectMemory maxSmallInteger]. - ifTrue: [magnitude < objectMemory maxSmallInteger] - ifFalse: [magnitude < (objectMemory maxSmallInteger + 1)]. isSmall ifTrue: [smallVal := self cCoerceSimple: magnitude to: #sqInt. isNegative ifTrue: [smallVal := 0 - smallVal]. ^objectMemory integerObjectOf: smallVal]. largeClass := isNegative ifTrue: [objectMemory classLargeNegativeInteger] ifFalse: [objectMemory classLargePositiveInteger]. objectMemory wordSize = 8 ifTrue: [sz := 8] ifFalse: [(highWord := magnitude >> 32) = 0 ifTrue: [sz := 4] ifFalse: [sz := 5. (highWord := highWord >> 8) = 0 ifFalse: [sz := sz + 1. (highWord := highWord >> 8) = 0 ifFalse: [sz := sz + 1. (highWord := highWord >> 8) = 0 ifFalse: [sz := sz + 1]]]]]. newLargeInteger := objectMemory instantiateClass: largeClass indexableSize: sz. 0 to: sz-1 do: [:i | intValue := (magnitude >> (i * 8)) bitAnd: 255. objectMemory storeByte: i ofObject: newLargeInteger withValue: intValue]. ^newLargeInteger! Item was changed: ----- Method: Spur32BitMemoryManager>>coalesce:and: (in category 'gc - global') ----- coalesce: obj1 and: obj2 | header1NumSlots header2NumSlots obj2slots newNumSlots | header1NumSlots := self rawNumSlotsOf: obj1. header2NumSlots := self rawNumSlotsOf: obj2. "compute total number of slots in obj2, including header" obj2slots := header2NumSlots = self numSlotsMask + ifTrue: [(self rawOverflowSlotsOf: obj2) + (2 * self baseHeaderSize / self wordSize)] - ifTrue: [(self longAt: obj2 - self baseHeaderSize) + (2 * self baseHeaderSize / self wordSize)] ifFalse: [(header2NumSlots = 0 ifTrue: [1] ifFalse: [header2NumSlots]) + (self baseHeaderSize / self wordSize)]. obj2slots := obj2slots + (obj2slots bitAnd: 1). self assert: obj2slots * self wordSize = (self bytesInObject: obj2). "if obj1 already has a double header things are simple..." header1NumSlots = self numSlotsMask ifTrue: + [self rawOverflowSlotsOf: obj1 put: obj2slots + (self rawOverflowSlotsOf: obj1). - [self longAt: obj1 - self baseHeaderSize put: obj2slots + (self longAt: obj1 - self baseHeaderSize). ^obj1]. "compute total number of slots in obj1, excluding header" header1NumSlots := header1NumSlots = 0 ifTrue: [2] ifFalse: [header1NumSlots + (header1NumSlots bitAnd: 1)]. self assert: header1NumSlots * self wordSize + self baseHeaderSize = (self bytesInObject: obj1). newNumSlots := obj2slots + header1NumSlots. "if obj1 still only requires a single header things are simple..." newNumSlots < self numSlotsMask ifTrue: + [self rawNumSlotsOf: obj1 put: newNumSlots. - [self byteAt: obj1 + (self numSlotsFullShift / BitsPerByte) - put: newNumSlots. ^obj1]. "convert from single to double header..." newNumSlots := newNumSlots - (self baseHeaderSize / self wordSize). self longAt: obj1 + self baseHeaderSize put: (self longAt: obj1); longAt: obj1 + 4 + self baseHeaderSize put: ((self longAt: obj1 + 4) bitOr: self numSlotsMask << self numSlotsHalfShift). self longAt: obj1 put: newNumSlots. self longAt: obj1 + 4 put: self numSlotsMask << self numSlotsHalfShift. ^obj1 + self baseHeaderSize! Item was changed: ----- Method: Spur32BitMemoryManager>>instantiateClass:indexableSize: (in category 'instantiation') ----- instantiateClass: classObj indexableSize: nElements <var: #nElements type: #usqInt> "Allocate an instance of a variable class, excepting CompiledMethod." | instSpec classFormat numSlots classIndex newObj fillValue | classFormat := self formatOfClass: classObj. instSpec := self instSpecOfClassFormat: classFormat. + classIndex := self rawHashBitsOf: classObj. fillValue := 0. instSpec caseOf: { [self arrayFormat] -> + [numSlots := nElements. - [nElements > self maxSlotsForAlloc ifTrue: - [^nil]. - numSlots := nElements. fillValue := nilObj]. [self indexablePointersFormat] -> + [numSlots := (self fixedFieldsOfClassFormat: classFormat) + nElements. - [nElements > (self maxSlotsForAlloc - (self fixedFieldsOfClassFormat: classFormat)) ifTrue: - [^nil]. - numSlots := (self fixedFieldsOfClassFormat: classFormat) + nElements. fillValue := nilObj]. [self weakArrayFormat] -> + [numSlots := (self fixedFieldsOfClassFormat: classFormat) + nElements. - [nElements > (self maxSlotsForAlloc - (self fixedFieldsOfClassFormat: classFormat)) ifTrue: - [^nil]. - numSlots := (self fixedFieldsOfClassFormat: classFormat) + nElements. fillValue := nilObj]. [self sixtyFourBitIndexableFormat] -> [nElements > (self maxSlotsForAlloc / 2) ifTrue: + [coInterpreter primitiveFailFor: PrimErrUnsupported. + ^nil]. - [^nil]. numSlots := nElements * 2]. [self firstLongFormat] -> + [(classIndex = ClassFloatCompactIndex and: [nElements ~= 2]) ifTrue: + [coInterpreter primitiveFailFor: PrimErrBadReceiver. + ^nil]. - [nElements > self maxSlotsForAlloc ifTrue: - [^nil]. numSlots := nElements]. [self firstShortFormat] -> [numSlots := nElements + 1 // 2. - numSlots > self maxSlotsForAlloc ifTrue: - [^nil]. instSpec := instSpec + (nElements bitAnd: 1)]. [self firstByteFormat] -> [numSlots := nElements + 3 // 4. - numSlots > self maxSlotsForAlloc ifTrue: - [^nil]. instSpec := instSpec + (4 - nElements bitAnd: 3)] } otherwise: ["some Squeak images include funky fixed subclasses of abstract variable superclasses. e.g. DirectoryEntry as a subclass of ArrayedCollection. Allow fixed classes to be instantiated here iff nElements = 0." (nElements ~= 0 or: [instSpec > self lastPointerFormat]) ifTrue: [^nil]. numSlots := self fixedFieldsOfClassFormat: classFormat]. "non-indexable" + classIndex = 0 ifTrue: + [classIndex := self ensureBehaviorHash: classObj. + classIndex < 0 ifTrue: + [coInterpreter primitiveFailFor: classIndex negated. + ^nil]]. - classIndex := self ensureBehaviorHash: classObj. - classIndex < 0 ifTrue: - [coInterpreter primitiveFailFor: classIndex negated. - ^nil]. numSlots > self maxSlotsForNewSpaceAlloc + ifTrue: + [numSlots > self maxSlotsForAlloc ifTrue: + [coInterpreter primitiveFailFor: PrimErrUnsupported. + ^nil]. + newObj := self allocateSlotsInOldSpace: numSlots format: instSpec classIndex: classIndex] + ifFalse: + [newObj := self allocateSlots: numSlots format: instSpec classIndex: classIndex]. - ifTrue: [newObj := self allocateSlotsInOldSpace: numSlots format: instSpec classIndex: classIndex] - ifFalse: [newObj := self allocateSlots: numSlots format: instSpec classIndex: classIndex]. newObj ifNotNil: [self fillObj: newObj numSlots: numSlots with: fillValue]. ^newObj! Item was added: + ----- Method: Spur64BitMemoryManager>>coalesce:and: (in category 'gc - global') ----- + coalesce: obj1 and: obj2 + | header1NumSlots header2NumSlots obj2slots newNumSlots | + header1NumSlots := self rawNumSlotsOf: obj1. + header2NumSlots := self rawNumSlotsOf: obj2. + + "compute total number of slots in obj2, including header" + obj2slots := header2NumSlots = self numSlotsMask + ifTrue: [(self rawOverflowSlotsOf: obj2) + (2 * self baseHeaderSize / self wordSize)] + ifFalse: [(header2NumSlots = 0 ifTrue: [1] ifFalse: [header2NumSlots]) + (self baseHeaderSize / self wordSize)]. + self assert: obj2slots * self wordSize = (self bytesInObject: obj2). + + "if obj1 already has a double header things are simple..." + header1NumSlots = self numSlotsMask ifTrue: + [self rawOverflowSlotsOf: obj1 put: obj2slots + (self rawOverflowSlotsOf: obj1). + ^obj1]. + + "compute total number of slots in obj1, excluding header" + header1NumSlots := header1NumSlots = 0 ifTrue: [1] ifFalse: [header1NumSlots]. + self assert: header1NumSlots * self wordSize + self baseHeaderSize = (self bytesInObject: obj1). + newNumSlots := obj2slots + header1NumSlots. + + "if obj1 still only requires a single header things are simple..." + newNumSlots < self numSlotsMask ifTrue: + [self rawNumSlotsOf: obj1 put: newNumSlots. + ^obj1]. + + "convert from single to double header..." + newNumSlots := newNumSlots - (self baseHeaderSize / self wordSize). + self + setRawNumSlotsOf: obj1 + self baseHeaderSize to: self numSlotsMask; + setOverflowNumSlotsOf: obj1 + self baseHeaderSize to: newNumSlots. + ^obj1 + self baseHeaderSize! Item was changed: ----- Method: Spur64BitMemoryManager>>instantiateClass:indexableSize: (in category 'instantiation') ----- instantiateClass: classObj indexableSize: nElements <var: #nElements type: #usqInt> "Allocate an instance of a variable class, excepting CompiledMethod." | instSpec classFormat numSlots classIndex newObj fillValue | classFormat := self formatOfClass: classObj. instSpec := self instSpecOfClassFormat: classFormat. + classIndex := self rawHashBitsOf: classObj. fillValue := 0. instSpec caseOf: { [self arrayFormat] -> [numSlots := nElements. fillValue := nilObj]. [self indexablePointersFormat] -> [numSlots := (self fixedFieldsOfClassFormat: classFormat) + nElements. fillValue := nilObj]. [self weakArrayFormat] -> [numSlots := (self fixedFieldsOfClassFormat: classFormat) + nElements. fillValue := nilObj]. [self sixtyFourBitIndexableFormat] -> [numSlots := nElements]. [self firstLongFormat] -> + [(classIndex = ClassFloatCompactIndex and: [nElements ~= 2]) ifTrue: + [coInterpreter primitiveFailFor: PrimErrBadReceiver. + ^nil]. + numSlots := nElements + 1 // 2. - [numSlots := nElements + 1 // 2. instSpec := instSpec + (nElements bitAnd: 1)]. [self firstShortFormat] -> [numSlots := nElements + 3 // 4. instSpec := instSpec + (4 - nElements bitAnd: 3)]. [self firstByteFormat] -> [numSlots := nElements + 7 // 8. instSpec := instSpec + (8 - nElements bitAnd: 7)] } otherwise: ["some Squeak images include funky fixed subclasses of abstract variable superclasses. e.g. DirectoryEntry as a subclass of ArrayedCollection. Allow fixed classes to be instantiated here iff nElements = 0." (nElements ~= 0 or: [instSpec > self lastPointerFormat]) ifTrue: [^nil]. numSlots := self fixedFieldsOfClassFormat: classFormat]. "non-indexable" + classIndex = 0 ifTrue: + [classIndex := self ensureBehaviorHash: classObj. + classIndex < 0 ifTrue: + [coInterpreter primitiveFailFor: classIndex negated. + ^nil]]. - classIndex := self ensureBehaviorHash: classObj. - classIndex < 0 ifTrue: - [coInterpreter primitiveFailFor: classIndex negated. - ^nil]. numSlots > self maxSlotsForNewSpaceAlloc ifTrue: [numSlots > self maxSlotsForAlloc ifTrue: + [coInterpreter primitiveFailFor: PrimErrUnsupported. + ^nil]. - [^nil]. newObj := self allocateSlotsInOldSpace: numSlots format: instSpec classIndex: classIndex] ifFalse: [newObj := self allocateSlots: numSlots format: instSpec classIndex: classIndex]. newObj ifNotNil: [self fillObj: newObj numSlots: numSlots with: fillValue]. ^newObj! Item was changed: ----- Method: Spur64BitMemoryManager>>rawOverflowSlotsOf:put: (in category 'object access') ----- rawOverflowSlotsOf: objOop put: numSlots <returnTypeC: #usqLong> <inline: true> self flag: #endianness. + self longAt: objOop - self baseHeaderSize put: self numSlotsMask << 56 + numSlots. - self longAt: objOop - self baseHeaderSize - put: (self byteAt: objOop - 1) << 56 + numSlots. ^numSlots! Item was changed: ----- Method: StackInterpreter>>followForwardingPointersInStackZone: (in category 'object memory support') ----- followForwardingPointersInStackZone: theBecomeEffectsFlags "Spur's become: is lazy, turning the becommed object into a forwarding object to the other. The read-barrier is minimised by arranging that forwarding pointers will fail a method cache probe, since notionally objects' internals are accessed only via sending messages to them, the exception is primitives that access the internals of the non-receiver argument(s). To avoid a read barrier on bytecode, literal and inst var fetch we scan the receivers and methods in the stack zone and follow any forwarded ones. This is of course way cheaper than scanning all of memory as in the old become." | theIPPtr | <inline: false> <var: #thePage type: #'StackPage *'> <var: #theSP type: #'char *'> <var: #theFP type: #'char *'> <var: #callerFP type: #'char *'> <var: #theIPPtr type: #usqInt> (theBecomeEffectsFlags anyMask: BecameCompiledMethodFlag) ifTrue: [(objectMemory isForwarded: method) ifTrue: [theIPPtr := instructionPointer - method. method := objectMemory followForwarded: method. instructionPointer := method + theIPPtr]. (objectMemory isForwarded: newMethod) ifTrue: [newMethod := objectMemory followForwarded: newMethod]]. self assert: stackPage ~= 0. 0 to: numStackPages - 1 do: [:i| | thePage theSP theFP callerFP theIP oop | thePage := stackPages stackPageAt: i. thePage isFree ifFalse: [theSP := thePage headSP. theFP := thePage headFP. "Skip the instruction pointer on top of stack of inactive pages." thePage = stackPage ifTrue: [theIPPtr := 0] ifFalse: [theIPPtr := theSP asUnsignedInteger. theSP := theSP + objectMemory wordSize]. [self assert: (thePage addressIsInPage: theFP). self assert: (theIPPtr = 0 or: [thePage addressIsInPage: theIPPtr asVoidPointer]). oop := stackPages longAt: theFP + FoxReceiver. (objectMemory isOopForwarded: oop) ifTrue: [stackPages longAt: theFP + FoxReceiver put: (objectMemory followForwarded: oop)]. + theIP := (theFP + (self frameStackedReceiverOffset: theFP)) asInteger. "reuse theIP; its just an offset here" - theIP := (theFP + (self frameStackedReceiverOffset: theFP)) asUnsignedInteger. "reuse theIP; its just an offset here" oop := stackPages longAt: theIP. (objectMemory isOopForwarded: oop) ifTrue: [stackPages longAt: theIP put: (objectMemory followForwarded: oop)]. ((self frameHasContext: theFP) and: [(objectMemory isForwarded: (self frameContext: theFP))]) ifTrue: [stackPages longAt: theFP + FoxThisContext put: (objectMemory followForwarded: (self frameContext: theFP))]. oop := self frameMethod: theFP. (objectMemory isForwarded: oop) ifTrue: [| newOop delta | newOop := objectMemory followForwarded: oop. theIPPtr ~= 0 ifTrue: [self assert: (stackPages longAt: theIPPtr) > (self frameMethod: theFP). delta := newOop - oop. stackPages longAt: theIPPtr put: (stackPages longAt: theIPPtr) + delta]. stackPages longAt: theFP + FoxMethod put: (oop := newOop)]. (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: + [theIPPtr := (theFP + FoxCallerSavedIP) asInteger. - [theIPPtr := (theFP + FoxCallerSavedIP) asUnsignedInteger. theFP := callerFP]]]! Item was changed: ----- Method: StackInterpreter>>printStackCallStackOf: (in category 'debug printing') ----- + printStackCallStackOf: frameOrContext - printStackCallStackOf: aFramePointer - <var: #aFramePointer type: #'char *'> <api> | theFP context | <var: #theFP type: #'char *'> + (objectMemory addressCouldBeObj: frameOrContext) ifTrue: + [((objectMemory isContext: frameOrContext) + and: [self checkIsStillMarriedContext: frameOrContext currentFP: nil]) ifTrue: + [^self printStackCallStackOf: (self frameOfMarriedContext: frameOrContext)]. + ^nil]. + + theFP := frameOrContext asVoidPointer. - theFP := aFramePointer. [context := self shortReversePrintFrameAndCallers: theFP. ((self isMarriedOrWidowedContext: context) and: [theFP := self frameOfMarriedContext: context. self checkIsStillMarriedContext: context currentFP: theFP]) ifFalse: [^nil]] repeat! Item was changed: ----- Method: ThreadedFFIPlugin>>ffiLoadCalloutAddressFrom: (in category 'symbol loading') ----- ffiLoadCalloutAddressFrom: oop "Load the function address for a call out to an external function" + | module moduleHandle functionName address | - | module moduleHandle functionName functionLength address | <inline: false> "First find and load the module" module := interpreterProxy fetchPointer: externalFunctionInstSize + 1 ofObject: oop. moduleHandle := self ffiLoadCalloutModule: module. interpreterProxy failed ifTrue: [^0]. "failed" "fetch the function name" functionName := interpreterProxy fetchPointer: externalFunctionInstSize ofObject: oop. (interpreterProxy isBytes: functionName) ifFalse: [^self ffiFail: FFIErrorBadExternalFunction]. + address := (interpreterProxy + ioLoadSymbol: (interpreterProxy firstIndexableField: functionName) asInteger + OfLength: (interpreterProxy byteSizeOf: functionName) + FromModule: moduleHandle) asInteger. - functionLength := interpreterProxy byteSizeOf: functionName. - address := interpreterProxy - ioLoadSymbol: (self cCoerce: (interpreterProxy firstIndexableField: functionName) to: #int) - OfLength: functionLength - FromModule: moduleHandle. (interpreterProxy failed or: [address = 0]) ifTrue: [^self ffiFail: FFIErrorAddressNotFound]. ^address!

1 0

VM Maker: Cog-eem.225.mcz
by commits＠source.squeak.org 28 Nov '14

28 Nov '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.225.mcz ==================== Summary ==================== Name: Cog-eem.225 Author: eem Time: 27 November 2014, 2:10:31.056 pm UUID: d914fb1c-dc37-4dd4-ad8b-fe37e90ff1c0 Ancestors: Cog-eem.224 Spur Bootstrap: Update the prototypes and package patching for the Float => Float,BoxedFloat64/SmallFloat64 refactoring. Use collect:as: to simplify allMethodPrototypes. =============== Diff against Cog-eem.224 =============== Item was changed: ----- Method: InstructionStream>>InstructionStreamPROTOTYPEskipCallPrimitive (in category '*Cog-method prototypes') ----- InstructionStreamPROTOTYPEskipCallPrimitive "If the receiver's method starts with a callPrimitive: bytecode, skip it." | method encoderClass callPrimitiveCode | method := self method. + encoderClass := method encoderClass. - encoderClass := method encoderClass. callPrimitiveCode := encoderClass callPrimitiveCode. (method byteAt: pc) = callPrimitiveCode ifTrue: [pc := pc + (encoderClass bytecodeSize: callPrimitiveCode)]! Item was changed: ----- Method: SpurBootstrap class>>categoryForClass:meta:selector: (in category 'method prototype categorization') ----- categoryForClass: className meta: isMeta selector: selector ^(isMeta ifTrue: [{ className. #class. selector }] ifFalse: [{ className. selector }]) caseOf: { [#(Behavior allInstancesOrNil)] -> [#enumerating]. [#(Behavior byteSizeOfInstance)] -> [#'accessing instances and variables']. [#(Behavior byteSizeOfInstanceOfSize:)] -> [#'accessing instances and variables']. [#(Behavior elementSize)] -> [#'accessing instances and variables']. [#(Behavior handleFailingBasicNew)] -> [#private]. [#(Behavior handleFailingBasicNew:)] -> [#private]. [#(Behavior handleFailingFailingBasicNew)] -> [#private]. [#(Behavior handleFailingFailingBasicNew:)] -> [#private]. [#(Behavior identityHash)] -> [#comparing]. [#(Behavior isEphemeronClass)] -> [#testing]. [#(Behavior isImmediateClass)] -> [#testing]. + [#(BoxedFloat64 class basicNew)] -> [#'instance creation']. + [#(BoxedFloat64 class basicNew:)] -> [#'instance creation']. [#(Character identityHash)] -> [#comparing]. [#(Character setValue:)] -> [#accessing]. [#(Class immediateSubclass:instanceVariableNames:classVariableNames:poolDictionaries:category:)] -> [#'subclass creation']. [#(ClassBuilder superclass:immediateSubclass:instanceVariableNames:classVariableNames:poolDictionaries:category:)] -> [#public]. [#(CompiledMethod bytecodeSetName)] -> [#accessing]. [#(CompiledMethod class handleFailingFailingNewMethod:header:)] -> [#private]. [#(CompiledMethod class handleFailingNewMethod:header:)] -> [#private]. [#(CompiledMethod class headerFlagForEncoder:)] -> [#'method encoding']. [#(CompiledMethod class installPrimaryBytecodeSet:)] -> [#'class initialization']. [#(CompiledMethod class installSecondaryBytecodeSet:)] -> [#'class initialization']. [#(Context class allInstances)] -> [#enumerating]. [#(Context class allInstancesDo:)] -> [#enumerating]. [#(Context failPrimitiveWith:)] -> [#'system simulation']. [#(Context isPrimFailToken:)] -> [#private]. [#(Context send:to:with:lookupIn:)] -> [#controlling]. [#(ContextPart isPrimFailToken:)] -> [#private]. [#(ContextPart send:to:with:lookupIn:)] -> [#controlling]. [#(EncoderForV3 computeMethodHeaderForNumArgs:numTemps:numLits:primitive:)] -> [#'method encoding']. [#(EncoderForV3PlusClosures genCallPrimitive:)] -> [#'bytecode generation']. [#(EncoderForV3PlusClosures class callPrimitiveCode)] -> [#'bytecode decoding']. [#(MethodContext failPrimitiveWith:)] -> [#'system simulation']. [#(MethodContext class allInstances)] -> [#enumerating]. [#(MethodContext class allInstancesDo:)] -> [#enumerating]. + [#(SmallFloat64 class basicNew)] -> [#'instance creation']. + [#(SmallFloat64 class basicNew:)] -> [#'instance creation']. + [#(SmallFloat64 copy)] -> [#copying]. + [#(SmallFloat64 deepCopy)] -> [#copying]. + [#(SmallFloat64 shallowCopy)] -> [#copying]. + [#(SmallFloat64 veryDeepCopyWith:)] -> [#copying]. [#(SmallInteger asCharacter)] -> [#converting]. [#(SmalltalkImage growMemoryByAtLeast:)] -> [#'memory space']. [#(SmalltalkImage maxIdentityHash)] -> [#'system attributes']. [#(SystemDictionary growMemoryByAtLeast:)] -> [#'memory space']. [#(SystemDictionary maxIdentityHash)] -> [#'system attributes']. [#(SystemDictionary setGCParameters)] -> [#'snapshot and quit']. [#(SystemNavigation allObjects)] -> [#query]. [#(SystemNavigation allObjectsOrNil)] -> [#query]. } otherwise: [Transcript nextPutAll: className. isMeta ifTrue: [Transcript nextPutAll: ' class']. Transcript nextPutAll: '>>'; store: selector; nextPutAll: ' is unclassified'; cr; flush. ^Categorizer default]! Item was added: + ----- Method: SpurBootstrapMonticelloPackagePatcher>>classDefinitionFor:type:from:comment:stamp: (in category 'private-accessing') ----- + classDefinitionFor: className type: typeSymbol from: definitions comment: commentString stamp: stampString + | classDef | + classDef := definitions + detect: [:d| d isClassDefinition and: [d className = className]] + ifNone: + [self assert: (#(BoxedFloat64 SmallFloat64) includes: className). + MCClassDefinition + name: className + superclassName: #Float + traitComposition: '{}' + classTraitComposition: '{}' + category: 'Kernel-Numbers' + instVarNames: #() + classVarNames: #() + poolDictionaryNames: #() + classInstVarNames: #() + type: typeSymbol + comment: commentString asString + commentStamp: stampString]. + className == #Character ifTrue: + [classDef variables removeAllSuchThat: + [:varDef| + varDef isInstanceVariable and: [varDef name = 'value']]]. + classDef instVarNamed: 'type' put: typeSymbol. + commentString ifNotNil: + [classDef + instVarNamed: 'comment' put: commentString; + instVarNamed: 'commentStamp' put: stampString]. + ^MCAddition of: classDef! Item was added: + ----- Method: SpurBootstrapMonticelloPackagePatcher>>filteredDefinitionsAsPatches:patches: (in category 'private-accessing') ----- + filteredDefinitionsAsPatches: modifiedDefinitions patches: existingPatches + ^modifiedDefinitions + select: + [:def| + existingPatches noneSatisfy: + [:addition| + def isMethodDefinition + and: [addition definition isMethodDefinition + and: [addition definition selector = def selector + and: [addition definition className = def className + and: [addition definition classIsMeta = def classIsMeta]]]]]] + thenCollect: + [:def| + ((def source includesSubString: 'DELETEME') + ifTrue: [MCRemoval] + ifFalse: [MCAddition]) of: def]! Item was removed: - ----- Method: SpurBootstrapMonticelloPackagePatcher>>immediateClassDefinitionFor:from:comment:stamp: (in category 'private-accessing') ----- - immediateClassDefinitionFor: className from: definitions comment: commentString stamp: stampString - | classDef | - classDef := definitions detect: [:d| d isClassDefinition and: [d className = className]]. - classDef variables removeAllSuchThat: - [:varDef| - varDef isInstanceVariable and: [varDef name = 'value']]. - classDef - instVarNamed: 'type' put: #immediate; - instVarNamed: 'comment' put: commentString; - instVarNamed: 'commentStamp' put: stampString. - ^MCAddition of: classDef! Item was added: + ----- Method: SpurBootstrapMonticelloPackagePatcher>>modifiedFloatDefinitionsIn: (in category 'private-accessing') ----- + modifiedFloatDefinitionsIn: definitions + "Delete the non-accessing primitives in Float (prims 41 through 59), + and copy them to BoxedFloat64, + and create corresponding ones in SmallFloat64 with primtiive numbers + 500." + | floatPrims | + floatPrims := definitions select: + [:d| | index | + d isMethodDefinition + and: [d fullClassName = #Float + and: [(index := d source indexOfSubCollection: '<primitive: ') > 0 + and: [(Integer readFrom: (ReadStream on: d source from: index + '<primitive: ' size to: index + '<primitive: ' size + 4)) + between: 41 + and: 59]]]]. + ^(floatPrims collect: + [:d| + MCMethodDefinition + className: d className + classIsMeta: false + selector: d selector + category: d category + timeStamp: d timeStamp + source: d source, 'DELETEME']), + (floatPrims collect: + [:d| + MCMethodDefinition + className: #BoxedFloat64 + classIsMeta: false + selector: d selector + category: d category + timeStamp: d timeStamp + source: d source]), + (floatPrims collect: + [:d| + MCMethodDefinition + className: #SmallFloat64 + classIsMeta: false + selector: d selector + category: d category + timeStamp: 'eem 11/25/2014 07:54' + source: (d source copyReplaceAll: '<primitive: ' with: '<primitive: 5')])! Item was added: + ----- Method: SpurBootstrapMonticelloPackagePatcher>>packageForMissingClassNamed: (in category 'accessing') ----- + packageForMissingClassNamed: className + (className = #BoxedFloat64 + or: [className = #SmallFloat64]) ifTrue: + [^PackageInfo named: 'Kernel']. + self error: 'unknown missing class'! Item was changed: ----- Method: SpurBootstrapMonticelloPackagePatcher>>packagesAndPatches (in category 'private-accessing') ----- packagesAndPatches "SpurBootstrapMonticelloPackagePatcher new packagesAndPatches" | spurBootstrap | packagesAndPatches ifNotNil: [^packagesAndPatches]. packagesAndPatches := Dictionary new. spurBootstrap := SpurBootstrap new. imageTypes ifNotNil: [spurBootstrap imageTypes: imageTypes]. spurBootstrap prototypeClassNameMetaSelectorMethodDo: + [:className :isMeta :selector :method| | package category source definition | + (Smalltalk classNamed: className) + ifNil: [package := self packageForMissingClassNamed: className] + ifNotNil: + [:behavior| | class methodReference | + class := isMeta ifTrue: [behavior class] ifFalse: [behavior]. + (class includesSelector: selector) ifTrue: + [methodReference := (class >> selector) methodReference. + category := methodReference category]. + package := (methodReference isNil + or: [methodReference category = Categorizer default]) + ifTrue: [PackageOrganizer default packageOfClass: class] + ifFalse: [PackageOrganizer default packageOfMethod: methodReference]]. - [:className :isMeta :selector :method| | class methodReference source definition | - class := Smalltalk classNamed: className. - isMeta ifTrue: - [class := class class]. - methodReference := (class includesSelector: selector) ifTrue: - [(class >> selector) methodReference]. - (methodReference notNil - and: [methodReference category = Categorizer default]) ifTrue: - [methodReference := nil]. source := method getSourceFromFile asString allButFirst: method selector size - selector size. source first ~= selector first ifTrue: [source replaceFrom: 1 to: selector size with: selector startingAt: 1]. definition := MCAddition of: (MCMethodDefinition className: className classIsMeta: isMeta selector: selector + category: (category ifNil: [SpurBootstrap + categoryForClass: className + meta: isMeta + selector: selector]) - category: (methodReference - ifNotNil: [methodReference category] - ifNil: [SpurBootstrap - categoryForClass: className - meta: isMeta - selector: selector]) timeStamp: method timeStamp source: source). (method pragmaAt: #remove) ifNotNil: [definition := definition inverse]. + (packagesAndPatches at: package ifAbsentPut: [OrderedCollection new]) - (packagesAndPatches - at: (methodReference - ifNotNil: [PackageOrganizer default packageOfMethod: methodReference] - ifNil: [PackageOrganizer default packageOfClass: class]) - ifAbsentPut: [OrderedCollection new]) add: definition]. ^packagesAndPatches! Item was changed: ----- Method: SpurBootstrapMonticelloPackagePatcher>>patch (in category 'patching') ----- patch "(SpurBootstrapMonticelloPackagePatcher new + from: 'trunkpackages' + to: 'spurpackages') + patch" + "(SpurBootstrapMonticelloPackagePatcher new from: '/Users/eliot/Squeak/Squeak4.5-spur/squeakv3-package-cache' to: '/Users/eliot/Squeak/Squeak4.5-spur/package-cache') patch" "(SpurBootstrapMonticelloPackagePatcher new from: '/Users/eliot/Glue/repositories/nsboot/Squeak4.3/squeak-package-cache' to: '/Users/eliot/Glue/repositories/nsboot/Squeak4.3/package-cache') patch" sourceDir exists ifFalse: [self error: 'source directory doest not exist']. destDir assureExistence. self packagesAndPatches keysAndValuesDo: [:package :patches| (self filesForPackage: package in: sourceDir) do: [:packageFile| self patchPackage: packageFile with: patches for: package]]! Item was changed: ----- Method: SpurBootstrapMonticelloPackagePatcher>>patchForPackage:withPatches:snapshot: (in category 'patching') ----- patchForPackage: package withPatches: patches snapshot: snapshot (package includesClass: Character) ifTrue: [patches + addAll: (self filteredDefinitionsAsPatches: (self modifiedCharacterDefinitionsIn: snapshot definitions) + patches: patches); + add: (self + classDefinitionFor: #Character + type: #immediate - addAll: ((self modifiedCharacterDefinitionsIn: snapshot definitions) - select: - [:def| - patches noneSatisfy: - [:addition| - def isMethodDefinition - and: [addition definition isMethodDefinition - and: [addition definition selector = def selector - and: [addition definition className = def className - and: [addition definition classIsMeta = def classIsMeta]]]]]] - thenCollect: - [:def| - ((def source includesSubString: 'DELETEME') - ifTrue: [MCRemoval] - ifFalse: [MCAddition]) of: def]); - add: (self immediateClassDefinitionFor: #Character from: snapshot definitions comment: 'I represent a character by storing its associated Unicode as an unsigned 30-bit value. Characters are created uniquely, so that all instances of a particular Unicode are identical. My instances are encoded in tagged pointers in the VM, so called immediates, and therefore are pure immutable values. The code point is based on Unicode. Since Unicode is 21-bit wide character set, we have several bits available for other information. As the Unicode Standard states, a Unicode code point doesn''t carry the language information. This is going to be a problem with the languages so called CJK (Chinese, Japanese, Korean. Or often CJKV including Vietnamese). Since the characters of those languages are unified and given the same code point, it is impossible to display a bare Unicode code point in an inspector or such tools. To utilize the extra available bits, we use them for identifying the languages. Since the old implementation uses the bits to identify the character encoding, the bits are sometimes called "encoding tag" or neutrally "leading char", but the bits rigidly denotes the concept of languages. The other languages can have the language tag if you like. This will help to break the large default font (font set) into separately loadable chunk of fonts. However, it is open to the each native speakers and writers to decide how to define the character equality, since the same Unicode code point may have different language tag thus simple #= comparison may return false.' stamp: 'eem 8/12/2014 14:53')]. (package includesClass: SmallInteger) ifTrue: [patches add: (self + classDefinitionFor: #SmallInteger + type: #immediate - immediateClassDefinitionFor: #SmallInteger from: snapshot definitions comment: 'My instances are at least 31-bit numbers, stored in twos complement form. The allowable range in 32-bits is approximately +- 10^9 (+- 1billion). In 64-bits my instances are 61-bit numbers, stored in twos complement form. The allowable range is approximately +- 10^18 (+- 1 quintillion). The actual values are computed at start-up. See SmallInteger class startUp:, minVal, maxVal.' stamp: 'eem 11/20/2014 08:41')]. + (package includesClass: Float) ifTrue: + [patches + add: (self + classDefinitionFor: #Float + type: #normal + from: snapshot definitions + comment: nil + stamp: nil); + add: (self + classDefinitionFor: #BoxedFloat64 + type: #words + from: snapshot definitions + comment: 'My instances hold 64-bit Floats in heap objects. This is the only representation on 32-bit systems. But on 64-bit systems SmallFloat64 holds a subset of the full 64-bit double-precision range in immediate objects.' + stamp: 'eem 11/25/2014 07:54'); + add: (self + classDefinitionFor: #SmallFloat64 + type: #immediate + from: snapshot definitions + comment: 'My instances represent 64-bit Floats whose exponent fits in 8 bits as immediate objects. This representation is only available on 64-bit systems, not 32-bit systems.' + stamp: 'eem 11/25/2014 07:54'); + addAll: (self filteredDefinitionsAsPatches: (self modifiedFloatDefinitionsIn: snapshot definitions) + patches: patches)]. (package includesClass: CompiledMethod) ifTrue: [patches + add: self compiledMethodClassDefinition]. - add: (self compiledMethodClassDefinition)]. ^MCPatch operations: patches! Item was changed: ----- Method: SpurBootstrapPrototypes class>>allMethodPrototypes (in category 'accessing method dictionary') ----- allMethodPrototypes ^(self canUnderstand: #allMethods) ifTrue: "Pharo" [self allMethods select: [:each| each category = 'method prototypes']] + ifFalse: "Squeak" "%$#@*!! collect: on IdentitySet answers a *Set*, not an IdentitySet %$#@*!!" + [(self allSelectors collect: [:s| self lookupSelector: s] as: IdentitySet) + select: [:m| m protocol = 'method prototypes']]! - ifFalse: "Squeak" - [false - ifTrue: "%$#@*!! collect: on IdentitySet answers a *Set*, not an IdentitySet %$#@*!!" - [self allSelectors - collect: [:s| self lookupSelector: s] - thenSelect: [:m| m protocol = 'method prototypes']] - ifFalse: "...hence: " - [self allSelectors - inject: IdentitySet new - into: [:methods :sel| | method | - method := self lookupSelector: sel. - method protocol = 'method prototypes' ifTrue: - [methods add: method]. - methods]]]! Item was added: + ----- Method: SpurBootstrapPrototypes>>BoxedFloat64classPROTOTYPEbasicNew (in category 'method prototypes') ----- + BoxedFloat64classPROTOTYPEbasicNew + ^self basicNew: 2! Item was added: + ----- Method: SpurBootstrapPrototypes>>BoxedFloat64classPROTOTYPEbasicNew: (in category 'method prototypes') ----- + BoxedFloat64classPROTOTYPEbasicNew: sizeRequested + "Primitive. Answer an instance of this class with the number + of indexable variables specified by the argument, sizeRequested. + Fail if this class is not indexable or if the argument is not a + positive Integer, or if there is not enough memory available. + Essential. See Object documentation whatIsAPrimitive." + + <primitive: 71> + sizeRequested isInteger ifTrue: + [^sizeRequested = 2 + ifTrue: "arg okay; space must be low." + [OutOfMemory signal. + self basicNew: sizeRequested] "retry if user proceeds" + ifFalse: + [self error: 'a Float shall always have two slots']]. + self primitiveFailed! Item was added: + ----- Method: SpurBootstrapPrototypes>>FloatclassPROTOTYPEbasicNew (in category 'method prototypes') ----- + FloatclassPROTOTYPEbasicNew + ^BoxedFloat64 basicNew: 2! Item was added: + ----- Method: SpurBootstrapPrototypes>>FloatclassPROTOTYPEbasicNew: (in category 'method prototypes') ----- + FloatclassPROTOTYPEbasicNew: anInteger + ^BoxedFloat64 basicNew: 2! Item was added: + ----- Method: SpurBootstrapPrototypes>>SmallFloat64PROTOTYPEcopy (in category 'method prototypes') ----- + SmallFloat64PROTOTYPEcopy + "Answer the receiver, because SmallFloat64s are unique." + ^self! Item was added: + ----- Method: SpurBootstrapPrototypes>>SmallFloat64PROTOTYPEdeepCopy (in category 'method prototypes') ----- + SmallFloat64PROTOTYPEdeepCopy + "Answer the receiver, because SmallFloat64s are unique." + ^self! Item was added: + ----- Method: SpurBootstrapPrototypes>>SmallFloat64PROTOTYPEshallowCopy (in category 'method prototypes') ----- + SmallFloat64PROTOTYPEshallowCopy + "Answer the receiver, because SmallFloat64s are unique." + ^self! Item was added: + ----- Method: SpurBootstrapPrototypes>>SmallFloat64PROTOTYPEveryDeepCopyWith: (in category 'method prototypes') ----- + SmallFloat64PROTOTYPEveryDeepCopyWith: deepCopier + "Answer the receiver, because SmallFloat64s are unique." + ^self! Item was added: + ----- Method: SpurBootstrapPrototypes>>SmallFloat64classPROTOTYPEbasicNew (in category 'method prototypes') ----- + SmallFloat64classPROTOTYPEbasicNew + self error: 'SmallFloat64s can only be created by performing arithmetic'! Item was added: + ----- Method: SpurBootstrapPrototypes>>SmallFloat64classPROTOTYPEbasicNew: (in category 'method prototypes') ----- + SmallFloat64classPROTOTYPEbasicNew: anInteger + ^self basicNew!

1 0

VM Maker: Cog-eem.224.mcz
by commits＠source.squeak.org 28 Nov '14

28 Nov '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.224.mcz ==================== Summary ==================== Name: Cog-eem.224 Author: eem Time: 26 November 2014, 10:48:13.13 am UUID: f6019ed0-a399-4ad7-9d02-db0e691b39f3 Ancestors: Cog-eem.223 Fix SpurBootstrap>>allMethodPrototypes given Esteban's reorganization. Make fillInPointerObjectWithPC:from: tolerate a nil method (for the MethodContext prototype). 64-bit-ize the bootstrap, which involves: Fix findRequiredGlobals for the potentially Undeclared BoxedFloat64. Fix installableMethodFor:selector:className:isMeta: for up-to 64-bit Integer literals. Map SmallFloat64 to an immediateSubclass:. Make the prototype for fromIEEE32Bit: multiply by 1.0 to reduce result to a SmallFloat64 if possible. Make recreateSpecialObjectsArray install BoxedFloat64 in place of Float. =============== Diff against Cog-eem.223 =============== Item was changed: ----- Method: SpurBootstrap>>allMethodPrototypes (in category 'method prototypes') ----- allMethodPrototypes "Answer all prototype selectors, including those marked <remove>" ^(imageTypes + inject: (IdentitySet withAll: SpurBootstrapPrototypes allMethodPrototypes) - inject: (IdentitySet withAll: SpurBootstrapPrototypes new allMethodPrototypes) into: [:allPrototypes :type | | prototypes | + prototypes := (SpurBootstrapPrototypes prototypeClassFor: type) allMethodPrototypes. - prototypes := (SpurBootstrapPrototypes prototypesFor: type) allMethodPrototypes. allPrototypes removeAllSuchThat: [:existing| prototypes anySatisfy: [:new| existing selector == new selector]]; addAll: prototypes; yourself]) asArray sort: [:ma :mb| ma selector <= mb selector]! Item was changed: ----- Method: SpurBootstrap>>fillInPointerObjectWithPC:from: (in category 'bootstrap image') ----- fillInPointerObjectWithPC: newObj from: oldObj "Fill-in a newObj with appropriately mapped contents from oldObj. If the object has a pc and its method has a primitive, increment the pc by the size of the callPrimitive: bytecode." | method | self fillInPointerObject: newObj from: oldObj. (newHeap classIndexOf: newObj) = classBlockClosureIndex ifTrue: [method := oldHeap fetchPointer: MethodIndex ofObject: (oldHeap fetchPointer: ClosureOuterContextIndex ofObject: oldObj). (oldInterpreter primitiveIndexOf: method) > 0 ifTrue: [self incrementPCField: ClosureStartPCIndex ofObject: newObj by: 3]]. (newHeap classIndexOf: newObj) = classMethodContextIndex ifTrue: [method := oldHeap fetchPointer: MethodIndex ofObject: oldObj. + (method ~= oldHeap nilObject + and: [(oldInterpreter primitiveIndexOf: method) > 0]) ifTrue: - (oldInterpreter primitiveIndexOf: method) > 0 ifTrue: [self incrementPCField: InstructionPointerIndex ofObject: newObj by: 3]].! Item was changed: ----- Method: SpurBootstrap>>findRequiredGlobals (in category 'bootstrap image') ----- findRequiredGlobals "Look for the necessary gobal bindings in the prototype methods in the old image. This has to be done early by sending bindingOf: to Smalltalk. Collect the class hierarchy of all prototypes that access inst vars (non-local prototypes) to check their shapes. Also find out Metaclass, needed for identifying classes." | globals ourMethodClasses classVars bindingOfSym | globals := Set new. ourMethodClasses := Set new. classVars := Dictionary new. self prototypeClassNameMetaSelectorMethodDo: [:c :m :s :method| | allNonMetaSupers | (Smalltalk classNamed: c) ifNotNil: [:nonMetaClass| allNonMetaSupers := nonMetaClass withAllSuperclasses. (method methodClass includesBehavior: SpurBootstrapPrototypes) ifFalse: [ourMethodClasses addAll: allNonMetaSupers. globals addAll: (allNonMetaSupers collect: [:sc| sc binding])]. method literals do: [:l| (l isVariableBinding and: [l key isSymbol and: [SpurBootstrapPrototypes withAllSubclasses noneSatisfy: [:sbpc| sbpc name == l key]]]) ifTrue: + [((Smalltalk bindingOf: l key) == l + or: [(Undeclared bindingOf: l key) == l]) - [(Smalltalk bindingOf: l key) == l ifTrue: [globals add: l] ifFalse: [self assert: (nonMetaClass bindingOf: l key) == l. classVars at: l put: nonMetaClass]]]]]. globals add: Compiler binding. "For potential reshaping in checkReshapeOf:" bindingOfSym := self findSymbol: #bindingOf:. self withExecutableInterpreter: oldInterpreter do: [| toBeAdded | globals do: [:global| | bindingOop | (self findSymbol: global key) ifNotNil: [:symbolOop| bindingOop := self interpreter: oldInterpreter object: (oldHeap splObj: 8) "Smalltalk" perform: bindingOfSym withArguments: {self findSymbol: global key}. bindingOop ~= oldHeap nilObject ifTrue: [literalMap at: global put: bindingOop]]]. toBeAdded := Dictionary new. classVars keysAndValuesDo: [:var :class| | val | (self findSymbol: var key) "New class inst vars may not yet be interned." ifNil: [toBeAdded at: var put: class] ifNotNil: [:varName| val := self interpreter: oldInterpreter object: (self oldClassOopFor: class) perform: bindingOfSym withArguments: {varName}. val ~= oldHeap nilObject ifTrue: [literalMap at: var put: val] ifFalse: [toBeAdded at: var put: class]]]. "May have to redefine to add missing inst vars and/or add any missing class vars." self checkReshapeOf: ourMethodClasses. self addMissingClassVars: toBeAdded]! Item was changed: ----- Method: SpurBootstrap>>installableMethodFor:selector:className:isMeta: (in category 'bootstrap methods') ----- installableMethodFor: aCompiledMethod selector: selector className: className isMeta: isMeta "Create a sourceless method to install in the bootstrapped image. It will allow the bootstrap to limp along until the relevant transformed Monticello package is loaded." | compiledMethodClass methodClassBinding methodClass sourcelessMethod bytes newMethod delta initialPC | compiledMethodClass := self findClassNamed: (self findSymbol: #CompiledMethod). methodClassBinding := self methodClassBindingForClassName: className isMeta: isMeta. methodClass := oldHeap fetchPointer: ValueIndex ofObject: methodClassBinding. "the prototypes have source pointers. the Character methods to be replaced don't." sourcelessMethod := aCompiledMethod trailer hasSourcePointer ifTrue: [aCompiledMethod copyWithTempsFromMethodNode: aCompiledMethod methodNode] ifFalse: [aCompiledMethod]. initialPC := sourcelessMethod initialPC. bytes := sourcelessMethod size - initialPC + 1. "Ugh, this is complicated. We could be running on Spur with the new method format or on non-Spur with the old format. Make both work." delta := (sourcelessMethod primitive > 0 and: [(sourcelessMethod at: initialPC) = sourcelessMethod encoderClass callPrimitiveCode]) ifTrue: [3] ifFalse: [0]. newMethod := self interpreter: oldInterpreter object: compiledMethodClass perform: (self findSymbol: #newMethod:header:) withArguments: { oldHeap integerObjectOf: bytes - delta. oldHeap integerObjectOf: (self oldFormatHeaderFor: sourcelessMethod) }. 1 to: sourcelessMethod numLiterals - 2 do: [:i| | literal oop | literal := sourcelessMethod literalAt: i. oop := (literal isLiteral or: [literal isVariableBinding]) ifTrue: [literal isInteger + ifTrue: [oldInterpreter signed64BitIntegerFor: literal] - ifTrue: [oldHeap integerObjectOf: literal] ifFalse: [literalMap at: literal ifAbsent: [self findLiteral: literal inClass: methodClass]]] ifFalse: "should be a VMObjectProxy" [literal oop]. oldHeap storePointer: i ofObject: newMethod withValue: oop]. oldHeap storePointer: sourcelessMethod numLiterals - 1 ofObject: newMethod withValue: (selector isSymbol ifTrue: [self findSymbol: selector] ifFalse: [selector oop]); storePointer: sourcelessMethod numLiterals ofObject: newMethod withValue: methodClassBinding. initialPC to: sourcelessMethod size - delta do: [:i| oldHeap storeByte: i - 1 ofObject: newMethod withValue: (sourcelessMethod byteAt: i + delta)]. installedMethodOops add: newMethod. ^newMethod! Item was changed: ----- Method: SpurBootstrap>>newClassFormatFor: (in category 'bootstrap image') ----- newClassFormatFor: oldClassObj "OLD: <2 bits=instSize//64><5 bits=cClass><4 bits=instSpec><6 bits=instSize\\64><1 bit=0> NEW: <5 bits inst spec><16 bits inst size>" | oldFormat instSize newInstSpec | ((oldInterpreter classNameOf: oldClassObj Is: 'SmallInteger') + or: [(oldInterpreter classNameOf: oldClassObj Is: 'Character') + or: [oldInterpreter classNameOf: oldClassObj Is: 'SmallFloat64']]) ifTrue: - or: [oldInterpreter classNameOf: oldClassObj Is: 'Character']) ifTrue: [^newHeap integerObjectOf: newHeap instSpecForImmediateClasses << 16]. oldFormat := oldHeap formatOfClass: oldClassObj. "N.B. SmallInteger with tag bit cleared" oldFormat := oldFormat >> 1. instSize := ((oldFormat bitShift: -10) bitAnd: 16rC0) + ((oldFormat bitShift: -1) bitAnd: 16r3F) - 1. newInstSpec := #(0 1 2 3 4 nil 10 9 16 16 16 16 24 24 24 24) at: ((oldFormat bitShift: -7) bitAnd: 16rF) + 1. ^newHeap integerObjectOf: newInstSpec << 16 + instSize! Item was added: + ----- Method: SpurBootstrapPrototypes class>>allMethodPrototypes (in category 'accessing method dictionary') ----- + allMethodPrototypes + ^(self canUnderstand: #allMethods) + ifTrue: "Pharo" + [self allMethods select: + [:each| each category = 'method prototypes']] + ifFalse: "Squeak" + [false + ifTrue: "%$#@*!! collect: on IdentitySet answers a *Set*, not an IdentitySet %$#@*!!" + [self allSelectors + collect: [:s| self lookupSelector: s] + thenSelect: [:m| m protocol = 'method prototypes']] + ifFalse: "...hence: " + [self allSelectors + inject: IdentitySet new + into: [:methods :sel| | method | + method := self lookupSelector: sel. + method protocol = 'method prototypes' ifTrue: + [methods add: method]. + methods]]]! Item was added: + ----- Method: SpurBootstrapPrototypes class>>prototypeClassFor: (in category 'instance creation') ----- + prototypeClassFor: type + | deepest | + deepest := nil. + self allSubclassesDo: + [:aClass | aClass imageType = type ifTrue: [deepest := aClass]]. + ^deepest! Item was removed: - ----- Method: SpurBootstrapPrototypes class>>prototypesFor: (in category 'instance creation') ----- - prototypesFor: type - ^ (self allSubclasses - detect: [ :aClass | aClass imageType = type ]) - new - ! Item was added: + ----- Method: SpurBootstrapPrototypes>>FloatclassPROTOTYPEfromIEEE32Bit: (in category 'method prototypes') ----- + FloatclassPROTOTYPEfromIEEE32Bit: word + "Convert the given 32 bit word (which is supposed to be a positive 32-bit value) from + a 32 bit IEEE floating point representation into an actual Squeak float object (being + 64 bits wide). Should only be used for conversion in FloatArrays or likewise objects." + + | sign mantissa exponent delta | + word <= 0 ifTrue: + [^word negative + ifTrue: [self error: 'Cannot deal with negative numbers'] + ifFalse: [self zero]]. + sign := word bitAnd: 16r80000000. + word = sign ifTrue: + [^self negativeZero]. + + exponent := ((word bitShift: -23) bitAnd: 16rFF) - 127. + mantissa := word bitAnd: 16r7FFFFF. + + exponent = 128 ifTrue: "Either NAN or INF" + [^mantissa = 0 + ifTrue: + [sign = 0 + ifTrue: [self infinity] + ifFalse: [self negativeInfinity]] + ifFalse: [self nan]]. + + exponent = -127 ifTrue: + "gradual underflow (denormalized number) + Remove first bit of mantissa and adjust exponent" + [delta := mantissa highBit. + mantissa := (mantissa bitShift: 1) bitAnd: (1 bitShift: delta) - 1. + exponent := exponent + delta - 23]. + + "Create new float" + ^(self basicNew: 2) + basicAt: 1 put: ((sign bitOr: (1023 + exponent bitShift: 20)) bitOr: (mantissa bitShift: -3)); + basicAt: 2 put: ((mantissa bitAnd: 7) bitShift: 29); + * 1.0 "reduce to SmallFloat64 if possible"! Item was removed: - ----- Method: SpurBootstrapPrototypes>>allMethodPrototypes (in category 'accessing') ----- - allMethodPrototypes - ^[self class allMethods "Pharo" - select: [ :each | each category = 'method prototypes' ]] - on: MessageNotUnderstood - do: [:ex| - ex message selector == #allMethods - ifTrue: - [self class selectors "Squeak" - collect: [:s| self class >> s] - thenSelect: [:m| m protocol = 'method prototypes']] - ifFalse: - [ex pass]]! Item was added: + ----- Method: SpurBootstrapSqueakFamilyPrototypes class>>imageType (in category 'accessing') ----- + imageType + ^'squeak'! Item was changed: ----- Method: SpurBootstrapSqueakPrototypes>>SmalltalkImagePROTOTYPErecreateSpecialObjectsArray (in category 'method prototypes') ----- SmalltalkImagePROTOTYPErecreateSpecialObjectsArray "Smalltalk recreateSpecialObjectsArray" "To external package developers: **** DO NOT OVERRIDE THIS METHOD. ***** If you are writing a plugin and need additional special object(s) for your own use, use addGCRoot() function and use own, separate special objects registry " "The Special Objects Array is an array of objects used by the Squeak virtual machine. Its contents are critical and accesses to it by the VM are unchecked, so don't even think of playing here unless you know what you are doing." | newArray | newArray := Array new: 60. "Nil false and true get used throughout the interpreter" newArray at: 1 put: nil. newArray at: 2 put: false. newArray at: 3 put: true. "This association holds the active process (a ProcessScheduler)" newArray at: 4 put: (self specialObjectsArray at: 4) "(self bindingOf: #Processor) but it answers an Alias". "Numerous classes below used for type checking and instantiation" newArray at: 5 put: Bitmap. newArray at: 6 put: SmallInteger. newArray at: 7 put: ByteString. newArray at: 8 put: Array. newArray at: 9 put: Smalltalk. + newArray at: 10 put: BoxedFloat64. - newArray at: 10 put: Float. newArray at: 11 put: (self globals at: #MethodContext ifAbsent: [self globals at: #Context]). newArray at: 12 put: nil. "was BlockContext." newArray at: 13 put: Point. newArray at: 14 put: LargePositiveInteger. newArray at: 15 put: Display. newArray at: 16 put: Message. newArray at: 17 put: CompiledMethod. newArray at: 18 put: ((self specialObjectsArray at: 18) ifNil: [Semaphore new]). "low space Semaphore" newArray at: 19 put: Semaphore. newArray at: 20 put: Character. newArray at: 21 put: #doesNotUnderstand:. newArray at: 22 put: #cannotReturn:. newArray at: 23 put: nil. "This is the process signalling low space." "An array of the 32 selectors that are compiled as special bytecodes, paired alternately with the number of arguments each takes." newArray at: 24 put: #( #+ 1 #- 1 #< 1 #> 1 #<= 1 #>= 1 #= 1 #~= 1 #* 1 #/ 1 #\\ 1 #@ 1 #bitShift: 1 #// 1 #bitAnd: 1 #bitOr: 1 #at: 1 #at:put: 2 #size 0 #next 0 #nextPut: 1 #atEnd 0 #== 1 #class 0 #blockCopy: 1 #value 0 #value: 1 #do: 1 #new 0 #new: 1 #x 0 #y 0 ). "An array of the 255 Characters in ascii order. Cog inlines table into machine code at: prim so do not regenerate it. This is nil in Spur, which has immediate Characters." newArray at: 25 put: (self specialObjectsArray at: 25). newArray at: 26 put: #mustBeBoolean. newArray at: 27 put: ByteArray. newArray at: 28 put: Process. "An array of up to 31 classes whose instances will have compact headers; an empty array in Spur" newArray at: 29 put: self compactClassesArray. newArray at: 30 put: ((self specialObjectsArray at: 30) ifNil: [Semaphore new]). "delay Semaphore" newArray at: 31 put: ((self specialObjectsArray at: 31) ifNil: [Semaphore new]). "user interrupt Semaphore" "Entries 32 - 34 unreferenced. Previously these contained prototype instances to be copied for fast initialization" newArray at: 32 put: nil. "was the prototype Float" newArray at: 33 put: nil. "was the prototype 4-byte LargePositiveInteger" newArray at: 34 put: nil. "was the prototype Point" newArray at: 35 put: #cannotInterpret:. newArray at: 36 put: nil. "was the prototype MethodContext" newArray at: 37 put: BlockClosure. newArray at: 38 put: nil. "was the prototype BlockContext" "array of objects referred to by external code" newArray at: 39 put: (self specialObjectsArray at: 39). "external semaphores" newArray at: 40 put: nil. "Reserved for Mutex in Cog VMs" newArray at: 41 put: ((self specialObjectsArray at: 41) ifNil: [LinkedList new]). "Reserved for a LinkedList instance for overlapped calls in CogMT" newArray at: 42 put: ((self specialObjectsArray at: 42) ifNil: [Semaphore new]). "finalization Semaphore" newArray at: 43 put: LargeNegativeInteger. "External objects for callout. Note: Written so that one can actually completely remove the FFI." newArray at: 44 put: (self at: #ExternalAddress ifAbsent: []). newArray at: 45 put: (self at: #ExternalStructure ifAbsent: []). newArray at: 46 put: (self at: #ExternalData ifAbsent: []). newArray at: 47 put: (self at: #ExternalFunction ifAbsent: []). newArray at: 48 put: (self at: #ExternalLibrary ifAbsent: []). newArray at: 49 put: #aboutToReturn:through:. newArray at: 50 put: #run:with:in:. "51 reserved for immutability message" newArray at: 51 put: #attemptToAssign:withIndex:. newArray at: 52 put: #(nil "nil => generic error" #'bad receiver' #'bad argument' #'bad index' #'bad number of arguments' #'inappropriate operation' #'unsupported operation' #'no modification' #'insufficient object memory' #'insufficient C memory' #'not found' #'bad method' #'internal error in named primitive machinery' #'object may move' #'resource limit exceeded' #'object is pinned' #'primitive write beyond end of object'). "53 to 55 are for Alien" newArray at: 53 put: (self at: #Alien ifAbsent: []). newArray at: 54 put: #invokeCallbackContext:. "use invokeCallback:stack:registers:jmpbuf: for old Alien callbacks." newArray at: 55 put: (self at: #UnsafeAlien ifAbsent: []). "Used to be WeakFinalizationList for WeakFinalizationList hasNewFinalization, obsoleted by ephemeron support." newArray at: 56 put: nil. "reserved for foreign callback process" newArray at: 57 put: (self specialObjectsArray at: 57 ifAbsent: []). newArray at: 58 put: #unusedBytecode. "59 reserved for Sista counter tripped message" newArray at: 59 put: #conditionalBranchCounterTrippedOn:. "60 reserved for Sista class trap message" newArray at: 60 put: #classTrapFor:. "Now replace the interpreter's reference in one atomic operation" self specialObjectsArray becomeForward: newArray!

1 0

VM Maker: Cog-eem.225.mcz
by commits＠source.squeak.org 27 Nov '14

27 Nov '14

1 0

Raspbian build problem with libGL & X11
by tim Rowledge 27 Nov '14

27 Nov '14

I’ve been having ‘fun’ for the last week or so building VMs for Raspbian (the Debian derived default SO for Raspberry Pi) relating to openGL & X11. I’m very confused about what the blazes is going on. Even explainign the problem is difficult! For the last year or thereabouts I’ve been building the stack vm on my Pi and aside from the occasional screwup in our code it’s been no particular problem. The autoblech stuff regularly drives us nuts, of course, but that’s why tty is working on a CMake replacement. Recently though I had to give a colleague in Cambridge instructions on building the VM so he could integrate some new bitblt improvements for ARM machines and at that point all hell broke loose. He simply couldn’t get a finished vm that would just run - the X11 display driver wouldn’t admit to being abel to do its job. Eventually we were able to show that doing a `LD_PRELOAD=/usr/lib/arm-linux-gnueabihf/libGL.so.1` before running the vm would get past that. We also worked out that building *without* the mesa-common-dev package installed on the pi would make a vm with no such issue. That was extremely weird since I’ve had that package on my Pi pretty much forever. I noted eventually that the load-these-package list the Doug has been using did not include mesa-common-dev and made up an SD card with a fresh Raspbian and his list - no problem, except without the opengl stuff there is no B3D plugin made. Add the mesa-common package and BOOM, non-working vm. And in fact it turned out no B3D in my older builds either, which lead to much trawling through the config.logs etc. It looks as though the make/config wasn’t finding the GL/gl.h header, which was (so far as I can tell from a clueless reading of the log) then leaving all that part out and thus making a working X11 driver. This morning I’ve updated the mesa-common-dev package on my main PI and now it makes a non-working-X11 vm, just as Ben was getting. For extra fun, the log now shows that it finds GL/gl.h ok but not the damn library - which seems to be what leads to the faulty X11 driver and probably explains whey manually preloading the library (which is, of course right where it should be or I couldn’t load it) makes things ok. The relevant lookig part of the log is- configure:26931: checking GL/gl.h presence configure:26941: gcc -E conftest.c configure:26947: $? = 0 configure:26967: result: yes configure:27002: checking for GL/gl.h configure:27009: result: yes configure:27024: checking for glIsEnabled in -lGL configure:27054: gcc -o conftest -g -O3 -DNDEBUG -DDEBUGVM=0 -DNO_VM_PROFILE=1 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS -DLSB_FIRST=1 -Wl,-z,now conftest.c -lGL -lXext -lSM -lICE -ldl -lpthread -lm -lnsl -lpthread -luuid -lX11 >&5 /usr/bin/ld: cannot find -lGL collect2: ld returned 1 exit status configure:27060: $? = 1 And as a further check I removed mesa-common-dev and the vm runs without complaint about X11. THe log reports configure:26886: checking GL/gl.h usability configure:26898: gcc -c -g -O3 -DNDEBUG -DDEBUGVM=0 -DNO_VM_PROFILE=1 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS -DLSB_FIRST=1 conftest.c >&5 conftest.c:108:19: fatal error: GL/gl.h: No such file or directory I’d be interested to know if other unix builds have a similar problem, or ideas on how to fix the problem or whatever. The lack of B3D plugins on the Pi si not a big issue right now but it would be nice to know what is actually going wrong. tim -- tim Rowledge; tim(a)rowledge.org; http://www.rowledge.org/tim Strange OpCodes: DST: Deadlock System Tables

1 0

VM Maker: CMakeVMMakerSqueak-tty.93.mcz
by commits＠source.squeak.org 27 Nov '14

27 Nov '14

Timothy M uploaded a new version of CMakeVMMakerSqueak to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMakerSqueak-tty.93.mcz ==================== Summary ==================== Name: CMakeVMMakerSqueak-tty.93 Author: tty Time: 27 November 2014, 10:27:39.203 am UUID: 5e3bd702-302a-41c3-880e-bc784a9d7e4c Ancestors: CMakeVMMakerSqueak-tty.92 Added a stub START HERE help class after returning to the project after several months and realizing I had forgotten everything and there was no documentation on things a newbie would need to get familiarized with creating builds. =============== Diff against CMakeVMMakerSqueak-tty.92 =============== Item was changed: ----- Method: CMakeVMGeneratorForSqueak>>generateByTemplate (in category 'code generation') ----- generateByTemplate "attempt to move way from string based writing to template based. Think Seaside renderOn composition" | extPlugins intPlugins | self flag: 'tty'. "refactor so that the cascade reflects CMake terminilogy" output := String new writeStream. config templates: OrderedCollection new. + self break. config setGlobalOptions: self; cmakePrefixPath; cmakeIncludePath; cmakeLibraryPath; cmakeIncludeModules; cmakeCFlags; cmakeAddDefinitions; + cmakeWriteDirectoriesDotCmake: self; + cmakeIncludeDirectories: self; "<---" + preferredIncludes; "<---why 3 of em?" + standardIncludes; "<---" setGlobalOptionsAfterDetermineSystem: self; + extraVMSettings: self; "<--catch-all method. os/platform specific" - setDirectories: self; - cmakeIncludeDirectories: self; - preferredIncludes; - standardIncludes; - extraVMSettings: self; setCoreSources: self; setPlatformSources: self; setCrossSources: self; setExtraSources; cmakeSetSourceFilesProperties; cmakeListAppend:'LINKLIBS' elements: (config externalLibs); cmakeAddExecutableNameOptionSource: self; setExecutableOutputPath; addVMPlugins: self. config templates do: [:each | self puts: each content]. extPlugins := self generatePluginConfigs: config internalPlugins internal: true. intPlugins := self generatePluginConfigs: config externalPlugins internal: false. self processThirdpartyLibraries. self processPlugins: intPlugins, extPlugins. self cmd: 'target_link_libraries' params: self moduleName , ' ${LINKLIBS}'. config postBuildActions: self.. self saveFile. self generateBuildScript! Item was changed: ----- Method: CMakeVMMakerSqueakDeveloperHelp class>>pages (in category 'pages') ----- pages + ^#(overview prerequisites terms igorStasenkoDesign tests buildersAndConfigs plugins pthreads configDotCmake templates vmplugins)! - ^#(overview prerequisites terms igorStasenkoDesign buildersAndConfigs plugins pthreads configDotCmake templates vmdrivers)! Item was added: + ----- Method: CMakeVMMakerSqueakDeveloperHelp class>>tests (in category 'pages') ----- + tests + ^HelpTopic + title:'Tests' + contents: + ' + When all tests pass. This does not mean the classes are configured correctly for source,output and build directories. + + It does mean nothing structural is preventing that from being implemented. + + '! Item was removed: - ----- Method: CMakeVMMakerSqueakDeveloperHelp class>>vmdrivers (in category 'pages') ----- - vmdrivers - ^HelpTopic - title:'VMDrivers' - contents:' - - TODO CMakeVMMakerSqueak-VMDriver purpose, configuration and use'! Item was added: + ----- Method: CMakeVMMakerSqueakDeveloperHelp class>>vmplugins (in category 'pages') ----- + vmplugins + ^HelpTopic + title:'VMPlugins' + contents:' + + TODO CMakeVMMakerSqueak-VMPlugin purpose, configuration and use'! Item was added: + ----- Method: CMakeVMMakerSqueakHelp class>>key (in category 'accessing') ----- + key + ^'CMakeVMMakerSqueakHelp'! Item was changed: ----- Method: CMakeVMMakerSqueakHelp class>>pages (in category 'accessing') ----- pages + ^#(CMakeVMMakerSqueakStartHereHelp CMakeVMMakerSqueakDeveloperHelp CMakeVMMakerSqueakBuildersHelp CMakeVMMakerSqueakHowToCreateNewConfigurationHelp)! - ^#(CMakeVMMakerSqueakDeveloperHelp CMakeVMMakerSqueakBuildersHelp CMakeVMMakerSqueakHowToCreateNewConfigurationHelp)! Item was added: + CMakeVMMakerSqueakHelp subclass: #CMakeVMMakerSqueakStartHereHelp + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-Help'! Item was added: + ----- Method: CMakeVMMakerSqueakStartHereHelp class>>bookName (in category 'accessing') ----- + bookName + ^'CMakeVMMaker Start Here'! Item was added: + ----- Method: CMakeVMMakerSqueakStartHereHelp class>>pages (in category 'accessing') ----- + pages + ^#(scratch shortVersionLinuxBuild)! Item was added: + ----- Method: CMakeVMMakerSqueakStartHereHelp class>>scratch (in category 'pages') ----- + scratch + ^HelpTopic + title: 'Start Here Scratch' + contents: + 'Goal is that a complete newbie can open this and get up and running. + + '! Item was added: + ----- Method: CMakeVMMakerSqueakStartHereHelp class>>shortVersionLinuxBuild (in category 'pages') ----- + shortVersionLinuxBuild + ^HelpTopic + title: 'Short Version Linux Build' + contents: + 'These steps will familiarize you with the CMakeVMMaker system from a user perspective. At the end of this Help Topic you should have a working system for Linux. + Each step is an action followed by an explanation of what you are looking at. + + 1. (SqueakLinux64x86w32CompatBuilder default) browseHierarchy + + CMakeVmMakerSqueak uses Builders to build builds. + The author''s system is a 64 bit architecture with 32 bit compatability libraries installed, so he uses the SqueakLinux64x86w32CompatBuilder. + Builder. + + 2. (SqueakLinux64x86w32CompatBuilder default) browse + The Classes in the CMakeVMMakerSqueak-Builder Class Category are named with the convention "Squeak[Operating System][Architecture][Miscelaneous]Builder". + + If you are compiling on a pure 32 bit linux box, use the (SqueakLinux32x86Builder default) builder + + A pure 64 bit linux build would require the (SqueakLinux32x86_64Builder default) builder. + + The same convention holds for other operating systems (mac, windows, etc) + + 2. (SqueakLinux64x86w32CompatBuilder default) configurationsCategory inspect + + In CmakeVMMakerSqueak, Builders utilize "Configurations" to generate "builds". + Configurations are classes and are stored in specific class categories . + Open a browser and look in the "CMakeVMMakerSqueak-Linux64X86-32BitCompatibility" category and you will see the Configuration classes available for that builder. + + + + 3. (SqueakLinux64x86w32CompatBuilder default) allAvailableBuildTypes + + + do c + + '! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeWriteDirectoriesDotCmake: (in category 'cmake') ----- + cmakeWriteDirectoriesDotCmake: aMaker + "SystemNavigation default browseMethodsWhoseNamesContain: 'setupDirectories:'" + self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>vmdrivers (in category 'accessing') ----- - vmdrivers - ^vmdrivers! Item was added: + ----- Method: CPlatformConfigForSqueak>>vmplugins (in category 'accessing') ----- + vmplugins + ^vmplugins! Item was removed: - ----- Method: Linux64x86w32BitConfig>>zaddVMDriversBuild: (in category 'cmake buildType redirects') ----- - zaddVMDriversBuild: aMaker - |temp o| - "We could put these inline, but other components include the directories.cmake file. So, we continue that convention" - o := String new writeStream. - temp := OrderedCollection new. - (enabledebugmessages) - ifTrue:[ templates - addLast:((CMakeMessage new) message: (self class name) , 'addVMDriversBuild:') - ] . - temp - " cmakeGen printHeader; - project: name; - include: '../directories.cmake';" - addLast: ((CMakeHeader new) configurationName: self class name ); - addLast: ((CMakeProject new)variable: self executableName ); - addLast: ((CMakeInclude new) file: ((self buildDirName), FileDirectory slash, 'directories.cmake')); "??" - addLast:((CMakeAddDefinitions new) definitions: self compilerFlags asOrderedCollection); - addLast:((CMakeAddDefinitions new) definitions: (OrderedCollection with:'-fPIC' with:'-DPIC' )); - addLast:((CMakeSet new) variable:'sources' quotedValue: '${targetPlatform}/vm-display-null/sqUnixDisplayNull'); - addLast:((CMakeAddLibrary new) - library: 'vm-display-null' - type: 'SHARED' - sources: #('${targetPlatform}/vm-display-null/sqUnixDisplayNull')); - addLast: ((CMakeIncludeDirectories new) - dirs: (OrderedCollection - with: #('${crossDir}/plugins/FilePlugin' '${targetPlatform}/plugins/B3DAcceleratorPlugin' '${crossDir}/plugins/B3DAcceleratorPlugin'))); - addLast:((CMakeSet new) variable: 'LIBRARY_OUTPUT_PATH' quotedValue:'self outputDir fullName'); - addLast:((CMakeListAppend new) list: 'LINKLIBS' elements: (self externalLibs)); - addLast:((CMakeTargetLinkLibraries new) target: 'vm-display-null' items: (OrderedCollection with: '${LINKLIBS}')); - addLast:((CMakeSetTargetProperties new) - target: 'vm-display-null' - propertiesandvalues: (OrderedCollection with: 'PREFIX "" ' with: 'SUFFIX "" ' with: 'LINK_FLAGS ' , (self compilerFlags))). - - temp do: [:each | o nextPutAll: (each content); cr]. - self write: (o contents) toFile: 'directories.cmake'. - (enabledebugmessages) - ifTrue:[ - templates - addLast:((CMakeMessage new) message: (self class name), ' setDirectories: aMaker' ) - ]. - templates addLast: ((CMakeInclude new) file: 'directories.cmake'). - - - aMaker message: 'addVMDrivers: aMaker'. - self - addDriver: 'vm-display-null' - sources: #( - '${targetPlatform}/vm-display-null/sqUnixDisplayNull' ) - generator: aMaker - externalLibs: #(); - - addDriver: 'vm-display-X11' - sources: #( - '${targetPlatform}/vm-display-X11/sqUnixX11' - '${targetPlatform}/vm-display-X11/sqUnixMozilla' ) - generator: aMaker - externalLibs: (self externalLibs); "#( SM ICE GL X11 nsl dl); " - - addDriver: 'vm-sound-ALSA' - sources: #( - '${targetPlatform}/vm-sound-ALSA/sqUnixSoundALSA' ) - generator: aMaker - externalLibs: #(); - - addDriver: 'vm-sound-null' - sources: #( - '${targetPlatform}/vm-sound-null/sqUnixSoundNull' ) - generator: aMaker - externalLibs: #(). - ! Item was added: + ----- Method: SqueakMacintoshConfig>>cmakeWriteDirectoriesDotCmake: (in category 'cmake') ----- + cmakeWriteDirectoriesDotCmake: aMaker + |temp o| + "We could put these inline, but other components include the directories.cmake file. So, we continue that convention" + o := String new writeStream. + temp := OrderedCollection new. + temp + addLast: ((CMakeSet new) variable: 'topDir' quotedValue: (self topDir fullName)); + addLast: ((CMakeSet new) variable: 'buildDir' quotedValue: (self buildDir ifNil: ['${topDir}/build'] ifNotNil: [self buildDir fullName])); + addLast: ((CMakeSet new) variable: 'thirdpartyDir' quotedValue: '${buildDir}/thirdParty'); + addLast: ((CMakeSet new) variable: 'platformsDir' quotedValue: (self platformsDir)); + addLast: ((CMakeSet new) variable: 'srcDir' quotedValue: (self srcDir pathName)); + addLast: ((CMakeSet new) variable: 'srcPluginsDir' quotedValue: (pluginsDir ifNil: [ '${srcDir}/plugins' ])); + addLast: ((CMakeSet new) variable: 'srcVMDir' quotedValue: '${srcDir}/vm'); + addLast: ((CMakeSet new) variable: 'platformName' quotedValue: (self platformName)); + addLast: ((CMakeSet new) variable: 'targetPlatform' quotedValue: '${platformsDir}/${platformName}'); + addLast: ((CMakeSet new) variable: 'crossDir' quotedValue: '${platformsDir}/Cross'); + addLast: ((CMakeSet new) variable: 'platformVMDir' quotedValue: '${targetPlatform}/vm}'); + addLast: ((CMakeSet new) variable: 'outputDir' quotedValue: (self outputDir fullName)); + addLast: ((CMakeSet new) variable: 'externalModulesDir' quotedValue: (self externalModulesDir)). + temp do: [:each | o nextPutAll: (each content); cr]. + self write: (o contents) toFile: 'directories.cmake'. + (enabledebugmessages) + ifTrue:[ + templates + addLast:((CMakeMessage new) message: (self class name), ' setDirectories: aMaker' ) + ]. + templates addLast: ((CMakeInclude new) file: 'directories.cmake'). + + ! Item was removed: - ----- Method: SqueakMacintoshConfig>>setDirectories: (in category 'cmake') ----- - setDirectories: aMaker - |temp o| - "We could put these inline, but other components include the directories.cmake file. So, we continue that convention" - o := String new writeStream. - temp := OrderedCollection new. - temp - addLast: ((CMakeSet new) variable: 'topDir' quotedValue: (self topDir fullName)); - addLast: ((CMakeSet new) variable: 'buildDir' quotedValue: (self buildDir ifNil: ['${topDir}/build'] ifNotNil: [self buildDir fullName])); - addLast: ((CMakeSet new) variable: 'thirdpartyDir' quotedValue: '${buildDir}/thirdParty'); - addLast: ((CMakeSet new) variable: 'platformsDir' quotedValue: (self platformsDir)); - addLast: ((CMakeSet new) variable: 'srcDir' quotedValue: (self srcDir pathName)); - addLast: ((CMakeSet new) variable: 'srcPluginsDir' quotedValue: (pluginsDir ifNil: [ '${srcDir}/plugins' ])); - addLast: ((CMakeSet new) variable: 'srcVMDir' quotedValue: '${srcDir}/vm'); - addLast: ((CMakeSet new) variable: 'platformName' quotedValue: (self platformName)); - addLast: ((CMakeSet new) variable: 'targetPlatform' quotedValue: '${platformsDir}/${platformName}'); - addLast: ((CMakeSet new) variable: 'crossDir' quotedValue: '${platformsDir}/Cross'); - addLast: ((CMakeSet new) variable: 'platformVMDir' quotedValue: '${targetPlatform}/vm}'); - addLast: ((CMakeSet new) variable: 'outputDir' quotedValue: (self outputDir fullName)); - addLast: ((CMakeSet new) variable: 'externalModulesDir' quotedValue: (self externalModulesDir)). - temp do: [:each | o nextPutAll: (each content); cr]. - self write: (o contents) toFile: 'directories.cmake'. - (enabledebugmessages) - ifTrue:[ - templates - addLast:((CMakeMessage new) message: (self class name), ' setDirectories: aMaker' ) - ]. - templates addLast: ((CMakeInclude new) file: 'directories.cmake'). - - ! Item was added: + ----- Method: SqueakUnixConfig>>cmakeWriteDirectoriesDotCmake: (in category 'cmake') ----- + cmakeWriteDirectoriesDotCmake: aMaker + |temp o| + "We could put these inline, but other components include the directories.cmake file. So, we continue that convention" + o := String new writeStream. + temp := OrderedCollection new. + temp + addLast: ((CMakeSet new) variable: 'topDir' quotedValue: (self topDir fullName)); + addLast: ((CMakeSet new) variable: 'buildDir' quotedValue: (self buildDir ifNil: ['${topDir}/build'] ifNotNil: [self buildDir fullName])); + addLast: ((CMakeSet new) variable: 'thirdpartyDir' quotedValue: '${buildDir}/thirdParty'); + addLast: ((CMakeSet new) variable: 'platformsDir' quotedValue: (self platformsDir)); + addLast: ((CMakeSet new) variable: 'srcDir' quotedValue: (self srcDir pathName)); + addLast: ((CMakeSet new) variable: 'srcPluginsDir' quotedValue: (pluginsDir ifNil: [ '${srcDir}/plugins' ])); + addLast: ((CMakeSet new) variable: 'srcVMDir' quotedValue: '${srcDir}/vm'); + addLast: ((CMakeSet new) variable: 'platformName' quotedValue: (self platformName)); + addLast: ((CMakeSet new) variable: 'targetPlatform' quotedValue: '${platformsDir}/${platformName}'); + addLast: ((CMakeSet new) variable: 'crossDir' quotedValue: '${platformsDir}/Cross'); + addLast: ((CMakeSet new) variable: 'platformVMDir' quotedValue: '${targetPlatform}/vm}'); + addLast: ((CMakeSet new) variable: 'outputDir' quotedValue: (self outputDir fullName)); + addLast: ((CMakeSet new) variable: 'externalModulesDir' quotedValue: (self externalModulesDir)). + temp do: [:each | o nextPutAll: (each content); cr]. + self write: (o contents) toFile: 'directories.cmake'. + (enabledebugmessages) + ifTrue:[ + templates + addLast:((CMakeMessage new) message: (self class name), ' setDirectories: aMaker' ) + ]. + templates addLast: ((CMakeInclude new) file: 'directories.cmake'). + + ! Item was removed: - ----- Method: SqueakUnixConfig>>setDirectories: (in category 'cmake') ----- - setDirectories: aMaker - |temp o| - "We could put these inline, but other components include the directories.cmake file. So, we continue that convention" - o := String new writeStream. - temp := OrderedCollection new. - temp - addLast: ((CMakeSet new) variable: 'topDir' quotedValue: (self topDir fullName)); - addLast: ((CMakeSet new) variable: 'buildDir' quotedValue: (self buildDir ifNil: ['${topDir}/build'] ifNotNil: [self buildDir fullName])); - addLast: ((CMakeSet new) variable: 'thirdpartyDir' quotedValue: '${buildDir}/thirdParty'); - addLast: ((CMakeSet new) variable: 'platformsDir' quotedValue: (self platformsDir)); - addLast: ((CMakeSet new) variable: 'srcDir' quotedValue: (self srcDir pathName)); - addLast: ((CMakeSet new) variable: 'srcPluginsDir' quotedValue: (pluginsDir ifNil: [ '${srcDir}/plugins' ])); - addLast: ((CMakeSet new) variable: 'srcVMDir' quotedValue: '${srcDir}/vm'); - addLast: ((CMakeSet new) variable: 'platformName' quotedValue: (self platformName)); - addLast: ((CMakeSet new) variable: 'targetPlatform' quotedValue: '${platformsDir}/${platformName}'); - addLast: ((CMakeSet new) variable: 'crossDir' quotedValue: '${platformsDir}/Cross'); - addLast: ((CMakeSet new) variable: 'platformVMDir' quotedValue: '${targetPlatform}/vm}'); - addLast: ((CMakeSet new) variable: 'outputDir' quotedValue: (self outputDir fullName)); - addLast: ((CMakeSet new) variable: 'externalModulesDir' quotedValue: (self externalModulesDir)). - temp do: [:each | o nextPutAll: (each content); cr]. - self write: (o contents) toFile: 'directories.cmake'. - (enabledebugmessages) - ifTrue:[ - templates - addLast:((CMakeMessage new) message: (self class name), ' setDirectories: aMaker' ) - ]. - templates addLast: ((CMakeInclude new) file: 'directories.cmake'). - - ! Item was added: + ----- Method: SqueakWindowsConfig>>cmakeWriteDirectoriesDotCmake: (in category 'cmake') ----- + cmakeWriteDirectoriesDotCmake: aMaker + |temp o| + "We could put these inline, but other components include the directories.cmake file. So, we continue that convention" + o := String new writeStream. + temp := OrderedCollection new. + temp + addLast: ((CMakeSet new) variable: 'topDir' quotedValue: (self topDir fullName)); + addLast: ((CMakeSet new) variable: 'buildDir' quotedValue: (self buildDir ifNil: ['${topDir}/build'] ifNotNil: [self buildDir fullName])); + addLast: ((CMakeSet new) variable: 'thirdpartyDir' quotedValue: '${buildDir}/thirdParty'); + addLast: ((CMakeSet new) variable: 'platformsDir' quotedValue: (self platformsDir)); + addLast: ((CMakeSet new) variable: 'srcDir' quotedValue: (self srcDir pathName)); + addLast: ((CMakeSet new) variable: 'srcPluginsDir' quotedValue: (pluginsDir ifNil: [ '${srcDir}/plugins' ])); + addLast: ((CMakeSet new) variable: 'srcVMDir' quotedValue: '${srcDir}/vm'); + addLast: ((CMakeSet new) variable: 'platformName' quotedValue: (self platformName)); + addLast: ((CMakeSet new) variable: 'targetPlatform' quotedValue: '${platformsDir}/${platformName}'); + addLast: ((CMakeSet new) variable: 'crossDir' quotedValue: '${platformsDir}/Cross'); + addLast: ((CMakeSet new) variable: 'platformVMDir' quotedValue: '${targetPlatform}/vm}'); + addLast: ((CMakeSet new) variable: 'outputDir' quotedValue: (self outputDir fullName)); + addLast: ((CMakeSet new) variable: 'externalModulesDir' quotedValue: (self externalModulesDir)). + temp do: [:each | o nextPutAll: (each content); cr]. + self write: (o contents) toFile: 'directories.cmake'. + (enabledebugmessages) + ifTrue:[ + templates + addLast:((CMakeMessage new) message: (self class name), ' setDirectories: aMaker' ) + ]. + templates addLast: ((CMakeInclude new) file: 'directories.cmake'). + + ! Item was removed: - ----- Method: SqueakWindowsConfig>>setDirectories: (in category 'cmake') ----- - setDirectories: aMaker - |temp o| - "We could put these inline, but other components include the directories.cmake file. So, we continue that convention" - o := String new writeStream. - temp := OrderedCollection new. - temp - addLast: ((CMakeSet new) variable: 'topDir' quotedValue: (self topDir fullName)); - addLast: ((CMakeSet new) variable: 'buildDir' quotedValue: (self buildDir ifNil: ['${topDir}/build'] ifNotNil: [self buildDir fullName])); - addLast: ((CMakeSet new) variable: 'thirdpartyDir' quotedValue: '${buildDir}/thirdParty'); - addLast: ((CMakeSet new) variable: 'platformsDir' quotedValue: (self platformsDir)); - addLast: ((CMakeSet new) variable: 'srcDir' quotedValue: (self srcDir pathName)); - addLast: ((CMakeSet new) variable: 'srcPluginsDir' quotedValue: (pluginsDir ifNil: [ '${srcDir}/plugins' ])); - addLast: ((CMakeSet new) variable: 'srcVMDir' quotedValue: '${srcDir}/vm'); - addLast: ((CMakeSet new) variable: 'platformName' quotedValue: (self platformName)); - addLast: ((CMakeSet new) variable: 'targetPlatform' quotedValue: '${platformsDir}/${platformName}'); - addLast: ((CMakeSet new) variable: 'crossDir' quotedValue: '${platformsDir}/Cross'); - addLast: ((CMakeSet new) variable: 'platformVMDir' quotedValue: '${targetPlatform}/vm}'); - addLast: ((CMakeSet new) variable: 'outputDir' quotedValue: (self outputDir fullName)); - addLast: ((CMakeSet new) variable: 'externalModulesDir' quotedValue: (self externalModulesDir)). - temp do: [:each | o nextPutAll: (each content); cr]. - self write: (o contents) toFile: 'directories.cmake'. - (enabledebugmessages) - ifTrue:[ - templates - addLast:((CMakeMessage new) message: (self class name), ' setDirectories: aMaker' ) - ]. - templates addLast: ((CMakeInclude new) file: 'directories.cmake'). - - !

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev November 2014