Vm-dev December 2014

vm-dev@lists.squeakfoundation.org

33 participants
160 discussions

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

28 Dec '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1002.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1002 Author: eem Time: 27 December 2014, 5:07:33.563 pm UUID: 6b1f3f75-19bc-4453-be2f-bf7067898bbf Ancestors: VMMaker.oscog-eem.1001 Send cannotReturn for sideways return attemps when there's an unwind-protect. Old code would erroneously answer unwind-protect even if home could not be found. e.g. This should raise cannot return: | b | b := [ ^ 42 ]. [ [b value] ensure: [1] ] fork. Processor yield just as this does: | b | b := [ ^ 42 ]. [ b value ] fork. Processor yield =============== Diff against VMMaker.oscog-eem.1001 =============== Item was changed: ----- Method: StackInterpreter>>findMethodWithPrimitive:FromContext:UpToContext: (in category 'handler search') ----- findMethodWithPrimitive: primitive FromContext: senderContext UpToContext: homeContext "See findUnwindThroughContext:. Alas this is mutually recursive with findMethodWithPrimitive:FromFP:SP:ThroughContext: instead of iterative. We're doing the simplest thing that could possibly work. Niceties can wait." | theContext theMethod | self assert: (senderContext = objectMemory nilObject or: [objectMemory isContext: senderContext]). self assert: (homeContext = objectMemory nilObject or: [objectMemory isContext: homeContext]). theContext := senderContext. [theContext = objectMemory nilObject ifTrue: [^theContext]. self isMarriedOrWidowedContext: theContext] whileFalse: [theContext = homeContext ifTrue: [^0]. + (primitive = 0 + or: [(objectMemory fetchPointer: ClosureIndex ofObject: theContext) ~= objectMemory nilObject]) ifFalse: - (objectMemory fetchPointer: ClosureIndex ofObject: theContext) = objectMemory nilObject ifTrue: [theMethod := objectMemory fetchPointer: MethodIndex ofObject: theContext. + (self primitiveIndexOf: theMethod) = primitive ifTrue: - (self primitiveIndexOf: theMethod) == primitive ifTrue: [^theContext]]. theContext := objectMemory fetchPointer: SenderIndex ofObject: theContext]. (self isWidowedContext: theContext) ifTrue: [^objectMemory nilObject]. ^self findMethodWithPrimitive: primitive FromFP: (self frameOfMarriedContext: theContext) UpToContext: homeContext! Item was changed: ----- Method: StackInterpreter>>findMethodWithPrimitive:FromFP:UpToContext: (in category 'handler search') ----- findMethodWithPrimitive: primitive FromFP: startFP UpToContext: homeContext "See findUnwindThroughContext:. Alas this is mutually recursive with findMethodWithPrimitive:FromContext:ThroughContext: instead of iterative. We're doing the simplest thing that could possibly work. Niceties can wait." | theFP theFPAbove theSP theMethod senderContext | <var: #startFP type: #'char *'> <var: #theFP type: #'char *'> <var: #theFPAbove type: #'char *'> <var: #theSP type: #'char *'> theFP := startFP. theFPAbove := startFP. [((self frameHasContext: theFP) and: [homeContext = (self frameContext: theFP)]) ifTrue: [^0]. + (primitive = 0 + or: [self frameIsBlockActivation: theFP]) ifFalse: - (self frameIsBlockActivation: theFP) ifFalse: [theMethod := self frameMethodObject: theFP. + (self primitiveIndexOf: theMethod) = primitive ifTrue: - (self primitiveIndexOf: theMethod) == primitive ifTrue: [theFP = theFPAbove ifTrue: [theSP := self findSPOf: theFP on: (stackPages stackPageFor: theFP)] ifFalse: [theSP := self frameCallerStackPointer: theFPAbove]. ^self ensureFrameIsMarried: theFP SP: theSP]]. theFPAbove := theFP. theFP := self frameCallerFP: theFP. theFP ~= 0] whileTrue. senderContext := self frameCallerContext: theFPAbove. (objectMemory isContext: senderContext) ifFalse: [^objectMemory nilObject]. ^self findMethodWithPrimitive: primitive FromContext: senderContext UpToContext: homeContext! Item was changed: ----- Method: StackInterpreter>>findUnwindThroughContext: (in category 'return bytecodes') ----- findUnwindThroughContext: homeContext "Search for either an unwind-protect (activation of method with primitive 198) + or homeContext along the sender chain, which ever is found first. Return values: + 0 home context was found on sender chain with no intervening unwind-protects + nilObj home context could not be found => cannotReturn + context the context of an intervening unwind-protect implies home context was found" - or homeContext along the sender chain, which ever is found first. If homeContext - is not found answer nilObj, indicating cannotReturn:. If homeContext is found - answer 0. If homeContext is itself an unwind-protect answer the context, not 0." | ctxtOrNilOrZero theMethod | "Since nothing changes we don't need to internalize." ctxtOrNilOrZero := self findMethodWithPrimitive: 198 FromFP: framePointer UpToContext: homeContext. ctxtOrNilOrZero = 0 ifTrue: [theMethod := objectMemory fetchPointer: MethodIndex ofObject: homeContext. + (self primitiveIndexOf: theMethod) = 198 ifTrue: + [^homeContext]. + ^0]. + ctxtOrNilOrZero = objectMemory nilObject ifFalse: + [(self findMethodWithPrimitive: 0 FromContext: ctxtOrNilOrZero UpToContext: homeContext) + = objectMemory nilObject ifTrue: + [^objectMemory nilObject]]. - (self primitiveIndexOf: theMethod) == 198 ifTrue: - [^homeContext]]. ^ctxtOrNilOrZero!

1 0

[commit][3194] Integrate Marcel Taeumel' s well-written long-filename-support code for win32.
by commits＠squeakvm.org 27 Dec '14

27 Dec '14

Revision: 3194 Author: eliot Date: 2014-12-26 17:29:52 -0800 (Fri, 26 Dec 2014) Log Message: ----------- Integrate Marcel Taeumel's well-written long-filename-support code for win32. Thanks Marcel! Modified Paths: -------------- trunk/platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c Modified: trunk/platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c =================================================================== --- trunk/platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c 2014-12-18 23:10:40 UTC (rev 3193) +++ trunk/platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c 2014-12-27 01:29:52 UTC (rev 3194) @@ -15,8 +15,13 @@ * 2) For using this you'll need to define WIN32_FILE_SUPPORT globally * (e.g., in your compiler's project settings) * +* UPDATES: +* 1) Support for long path names added by using UNC prefix in that case +* (Marcel Taeumel, Hasso Plattner Institute, Postdam, Germany) +* *****************************************************************************/ #include <windows.h> +#include <malloc.h> #include "sq.h" #include "FilePlugin.h" @@ -28,7 +33,7 @@ #define false 0 #define FILE_HANDLE(f) ((HANDLE) (f)->file) -#define FAIL() return interpreterProxy->primitiveFail() +#define FAIL() { return interpreterProxy->primitiveFail(); } /*** The state of a file is kept in the following structure, @@ -64,6 +69,46 @@ /* answers if the file name in question has a case-sensitive duplicate */ int hasCaseSensitiveDuplicate(WCHAR *path); +/** + Converts multi-byte characters to wide characters. Handles paths longer + than 260 characters (including NULL) by prepending "\\?\" to encode UNC + paths as suggested in http://msdn.microsoft.com/en-us/library/windows/ + desktop/aa365247%28v=vs.85%29.aspx#maxpath + "The maximum path of 32,767 characters is approximate, + because the "\\?\" prefix may be expanded to a longer + string by the system at run time, and this expansion + applies to the total length." + + Note that we do not check for the correct path component size, + which should be MAX_PATH in general but can vary between file systems. + Actually, we should perform an additional check with + GetVolumneInformation to acquire lpMaximumComponentLength. + + Note that another possibility would be to use 8.3 aliases + for path components like the Windows Explorer does. However, + this feature also depends on the volume specifications. + + Calling alloca() should be fine because we limit path length to 32k. + Stack size limit is much higher. +**/ +#define ALLOC_WIN32_PATH(out_path, in_name, in_size) { \ + int sz = MultiByteToWideChar(CP_UTF8, 0, in_name, in_size, NULL, 0); \ + if(sz >= 32767) FAIL(); \ + if(sz >= MAX_PATH) { \ + out_path = (WCHAR*)alloca((sz + 4 + 1) * sizeof(WCHAR)); \ + out_path[0] = L'\\'; out_path[1] = L'\\'; \ + out_path[2] = L'?'; out_path[3] = L'\\'; \ + MultiByteToWideChar(CP_UTF8, 0, in_name, in_size, out_path + 4, sz); \ + out_path[sz + 4] = 0; \ + sz += 4; \ + } else { \ + out_path = (WCHAR*)alloca((sz + 1) * sizeof(WCHAR)); \ + MultiByteToWideChar(CP_UTF8, 0, in_name, in_size, out_path, sz); \ + out_path[sz] = 0; \ + } \ +} + + typedef union { struct { DWORD dwLow; @@ -105,18 +150,16 @@ } sqInt sqFileDeleteNameSize(char* fileNameIndex, sqInt fileNameSize) { - WCHAR win32Path[MAX_PATH+1]; - int sz; + WCHAR *win32Path = NULL; + /* convert the file name into a null-terminated C string */ - sz = MultiByteToWideChar(CP_UTF8, 0, fileNameIndex, fileNameSize, NULL, 0); - if(sz > MAX_PATH) - FAIL(); - MultiByteToWideChar(CP_UTF8, 0, fileNameIndex, fileNameSize, win32Path, sz); - win32Path[sz] = 0; + ALLOC_WIN32_PATH(win32Path, fileNameIndex, fileNameSize); + if(hasCaseSensitiveDuplicate(win32Path)) FAIL(); if(!DeleteFileW(win32Path)) FAIL(); + return 1; } @@ -157,15 +200,10 @@ Squeak must take care of any line-end character mapping. */ HANDLE h; - WCHAR win32Path[MAX_PATH+1]; - int sz; + WCHAR *win32Path = NULL; /* convert the file name into a null-terminated C string */ - sz = MultiByteToWideChar(CP_UTF8, 0, fileNameIndex, fileNameSize, NULL, 0); - if(sz > MAX_PATH) - FAIL(); - MultiByteToWideChar(CP_UTF8, 0, fileNameIndex, fileNameSize, win32Path, sz); - win32Path[sz] = 0; + ALLOC_WIN32_PATH(win32Path, fileNameIndex, fileNameSize); if(hasCaseSensitiveDuplicate(win32Path)) { f->sessionID = 0; @@ -254,28 +292,18 @@ sqInt sqFileRenameOldSizeNewSize(char* oldNameIndex, sqInt oldNameSize, char* newNameIndex, sqInt newNameSize) { - WCHAR oldPath[MAX_PATH]; - WCHAR newPath[MAX_PATH]; - int sz; + WCHAR *oldPath = NULL; + WCHAR *newPath = NULL; - /* convert the file name into a null-terminated C string */ - sz = MultiByteToWideChar(CP_UTF8, 0, oldNameIndex, oldNameSize, NULL,0); - if(sz > MAX_PATH) - FAIL(); - MultiByteToWideChar(CP_UTF8, 0, oldNameIndex, oldNameSize, oldPath, sz); - oldPath[sz] = 0; + /* convert the file names into a null-terminated C string */ + ALLOC_WIN32_PATH(oldPath, oldNameIndex, oldNameSize); + ALLOC_WIN32_PATH(newPath, newNameIndex, newNameSize); - /* convert the file name into a null-terminated C string */ - sz = MultiByteToWideChar(CP_UTF8, 0, newNameIndex, newNameSize, NULL,0); - if(sz > MAX_PATH) - FAIL(); - MultiByteToWideChar(CP_UTF8, 0, newNameIndex, newNameSize, newPath, sz); - newPath[sz] = 0; - if(hasCaseSensitiveDuplicate(oldPath)) FAIL(); if(!MoveFileW(oldPath, newPath)) FAIL(); + return 1; } @@ -359,8 +387,8 @@ sqImageFile sqImageFileOpen(char *fileName, char *mode) { char *modePtr; - int sz, writeFlag = 0; - WCHAR win32Path[MAX_PATH]; + int writeFlag = 0; + WCHAR *win32Path = NULL; HANDLE h; if(!mode) return 0; @@ -373,13 +401,11 @@ modePtr++; } /* convert the file name into a null-terminated C string */ - sz = MultiByteToWideChar(CP_UTF8, 0, fileName, -1, NULL,0); - if(sz > MAX_PATH) - FAIL(); - MultiByteToWideChar(CP_UTF8, 0, fileName, -1, win32Path, sz); - win32Path[sz] = 0; + ALLOC_WIN32_PATH(win32Path, fileName, -1); - if(hasCaseSensitiveDuplicate(win32Path)) return 0; + if(hasCaseSensitiveDuplicate(win32Path)) + return 0; + h = CreateFileW(win32Path, writeFlag ? (GENERIC_READ | GENERIC_WRITE) : GENERIC_READ, writeFlag ? FILE_SHARE_READ : (FILE_SHARE_READ | FILE_SHARE_WRITE), @@ -387,7 +413,10 @@ writeFlag ? CREATE_ALWAYS : OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL /* No template */); - if(h == INVALID_HANDLE_VALUE) return 0; + + if(h == INVALID_HANDLE_VALUE) + return 0; + return (DWORD)h+1; }

2 1

[commit][3195] CogVM source as per VMMaker.oscog-eem.1001
by commits＠squeakvm.org 27 Dec '14

27 Dec '14

Revision: 3195 Author: eliot Date: 2014-12-26 17:37:21 -0800 (Fri, 26 Dec 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1001 Mark externalInstVar:ofContext: as not to be inlined (otherwise it is inined into 64-bit primitiveSlotAtPut !!). Remove useless initPrimCalls from primitiveFloatAt[Put] and fix latter for potentially immediate receivers. Spur: Fix argument count slips in three primitives. Check for sufficient memory in two-way become. All: Fix checking of boolean arg in primitiveArrayBecomeOneWayCopyHash. Make primitiveSlotAt[Put] cope with non-pointer objects. Replace primitiveCharacterValue with primitiveImmediateAsInteger which provides SmallFloat64>>identityHash as well as Character>>asInteger. Refactor small float manipulations to introduce smallFloatBitsOf:. Provide printStackReferencesTo:. Fix slip in StackToRegisterMappingCogit>>genBinaryConstOpVarInlinePrimitive: Fix slip in shortPrint:. Change the pixel-touch-pixel prim to allow LPI arguments for the color values Sista: Added inlined primitive code for: byteNumByte pointerAt: byteAt: pointerAt:put: byteAt:put: Modified Paths: -------------- branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c 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/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/plugins/BitBltPlugin/BitBltPlugin.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 Added Paths: ----------- branches/Cog/platforms/Plan9/ branches/Cog/platforms/Plan9/README branches/Cog/platforms/Plan9/mkfile branches/Cog/platforms/Plan9/plugins/ branches/Cog/platforms/Plan9/plugins/FilePlugin/ branches/Cog/platforms/Plan9/plugins/FilePlugin/sqPlan9file.c branches/Cog/platforms/Plan9/plugins/SocketPlugin/ branches/Cog/platforms/Plan9/plugins/SocketPlugin/sqPlan9socket.c branches/Cog/platforms/Plan9/vm/ branches/Cog/platforms/Plan9/vm/config.h branches/Cog/platforms/Plan9/vm/errno.h branches/Cog/platforms/Plan9/vm/libc_wrapper.h branches/Cog/platforms/Plan9/vm/math.h branches/Cog/platforms/Plan9/vm/osExports.c branches/Cog/platforms/Plan9/vm/p9display.c branches/Cog/platforms/Plan9/vm/p9iface.h branches/Cog/platforms/Plan9/vm/setjmp.h branches/Cog/platforms/Plan9/vm/sqConfig.h branches/Cog/platforms/Plan9/vm/sqPlan9ExternalPrims.c branches/Cog/platforms/Plan9/vm/sqPlan9clip.c branches/Cog/platforms/Plan9/vm/sqPlan9io.c branches/Cog/platforms/Plan9/vm/sqPlan9main.c branches/Cog/platforms/Plan9/vm/sqPlan9prof.c branches/Cog/platforms/Plan9/vm/sqPlatformSpecific.h branches/Cog/platforms/Plan9/vm/stdio.h branches/Cog/platforms/Plan9/vm/stdlib.h branches/Cog/platforms/Plan9/vm/string.h branches/Cog/platforms/Plan9/vm/time.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c 2014-12-27 01:29:52 UTC (rev 3194) +++ branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c 2014-12-27 01:37:21 UTC (rev 3195) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.990 uuid: f4a22308-891c-4542-b6a4-10fe174bc82a + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.998 uuid: 20a6acb3-9a01-4219-b650-8966301ffe11 from - BitBltSimulation VMMaker.oscog-eem.990 uuid: f4a22308-891c-4542-b6a4-10fe174bc82a + BitBltSimulation VMMaker.oscog-eem.998 uuid: 20a6acb3-9a01-4219-b650-8966301ffe11 */ -static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-eem.990 uuid: f4a22308-891c-4542-b6a4-10fe174bc82a " __DATE__ ; +static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-eem.998 uuid: 20a6acb3-9a01-4219-b650-8966301ffe11 " __DATE__ ; @@ -290,6 +290,8 @@ static sqInt (*pop)(sqInt nItems); static sqInt (*popthenPush)(sqInt nItems, sqInt oop); static sqInt (*positive32BitIntegerFor)(sqInt integerValue); +static usqInt (*positive32BitValueOf)(sqInt oop); +static usqLong (*positive64BitValueOf)(sqInt oop); static sqInt (*primitiveFail)(void); static sqInt (*pushInteger)(sqInt integerValue); static sqInt (*showDisplayBitsLeftTopRightBottom)(sqInt aForm, sqInt l, sqInt t, sqInt r, sqInt b); @@ -321,6 +323,8 @@ extern sqInt pop(sqInt nItems); extern sqInt popthenPush(sqInt nItems, sqInt oop); extern sqInt positive32BitIntegerFor(sqInt integerValue); +extern usqInt positive32BitValueOf(sqInt oop); +extern usqLong positive64BitValueOf(sqInt oop); extern sqInt primitiveFail(void); extern sqInt pushInteger(sqInt integerValue); extern sqInt showDisplayBitsLeftTopRightBottom(sqInt aForm, sqInt l, sqInt t, sqInt r, sqInt b); @@ -342,9 +346,9 @@ }; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BitBltPlugin VMMaker.oscog-eem.990 (i)" + "BitBltPlugin VMMaker.oscog-eem.998 (i)" #else - "BitBltPlugin VMMaker.oscog-eem.990 (e)" + "BitBltPlugin VMMaker.oscog-eem.998 (e)" #endif ; static sqInt noHalftone; @@ -5022,15 +5026,19 @@ EXPORT(sqInt) primitiveCompareColors(void) { - sqInt colorA; - sqInt colorB; + unsigned long colorA; + unsigned long colorB; sqInt rcvr; sqInt testID; sqInt val; sqInt _return_value; - colorA = stackIntegerValue(2); - colorB = stackIntegerValue(1); + colorA = (BytesPerOop == 4 + ? positive32BitValueOf(stackValue(2)) + : positive64BitValueOf(stackValue(2))); + colorB = (BytesPerOop == 4 + ? positive32BitValueOf(stackValue(1)) + : positive64BitValueOf(stackValue(1))); testID = stackIntegerValue(0); rcvr = stackValue(3); if (failed()) { @@ -6666,6 +6674,8 @@ pop = interpreterProxy->pop; popthenPush = interpreterProxy->popthenPush; positive32BitIntegerFor = interpreterProxy->positive32BitIntegerFor; + positive32BitValueOf = interpreterProxy->positive32BitValueOf; + positive64BitValueOf = interpreterProxy->positive64BitValueOf; primitiveFail = interpreterProxy->primitiveFail; pushInteger = interpreterProxy->pushInteger; showDisplayBitsLeftTopRightBottom = interpreterProxy->showDisplayBitsLeftTopRightBottom; Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2014-12-27 01:29:52 UTC (rev 3194) +++ branches/Cog/nscogsrc/vm/cogit.c 2014-12-27 01:37:21 UTC (rev 3195) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.990 uuid: f4a22308-891c-4542-b6a4-10fe174bc82a + CCodeGenerator VMMaker.oscog-eem.1001 uuid: fef56678-07b1-4fca-8300-17d6afc0c6e4 from - StackToRegisterMappingCogit VMMaker.oscog-eem.990 uuid: f4a22308-891c-4542-b6a4-10fe174bc82a + StackToRegisterMappingCogit VMMaker.oscog-eem.1001 uuid: fef56678-07b1-4fca-8300-17d6afc0c6e4 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.990 uuid: f4a22308-891c-4542-b6a4-10fe174bc82a " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1001 uuid: fef56678-07b1-4fca-8300-17d6afc0c6e4 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2014-12-27 01:29:52 UTC (rev 3194) +++ branches/Cog/nscogsrc/vm/cogit.h 2014-12-27 01:37:21 UTC (rev 3195) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.990 uuid: f4a22308-891c-4542-b6a4-10fe174bc82a + CCodeGenerator VMMaker.oscog-eem.1001 uuid: fef56678-07b1-4fca-8300-17d6afc0c6e4 */ Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-12-27 01:29:52 UTC (rev 3194) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-12-27 01:37:21 UTC (rev 3195) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.992 uuid: bbbe8c5f-97d3-42fe-b068-76c6890a1733 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1001 uuid: fef56678-07b1-4fca-8300-17d6afc0c6e4 from - CoInterpreter VMMaker.oscog-eem.992 uuid: bbbe8c5f-97d3-42fe-b068-76c6890a1733 + CoInterpreter VMMaker.oscog-eem.1001 uuid: fef56678-07b1-4fca-8300-17d6afc0c6e4 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.992 uuid: bbbe8c5f-97d3-42fe-b068-76c6890a1733 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1001 uuid: fef56678-07b1-4fca-8300-17d6afc0c6e4 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -517,7 +517,6 @@ static void printFrameMethodFor(char *theFP) NoDbgRegParms; static void printFrameThingatextraString(char *name, char *address, char *extraStringOrNil) NoDbgRegParms; static void printFrameThingatextra(char *name, char *address, sqInt extraValue) NoDbgRegParms; -sqInt printFrame(char *theFP); void printFrameWithSP(char *theFP, char *theSP); static void printLogEntryAt(sqInt i) NoDbgRegParms; void printMethodCacheFor(sqInt thing); @@ -626,7 +625,6 @@ static void primitiveBytesLeft(void); static void primitiveCalloutToFFI(void); static void primitiveChangeClass(void); -static void primitiveCharacterValue(void); static void primitiveClass(void); static void primitiveClearVMProfile(void); static void primitiveClipboardText(void); @@ -1199,6 +1197,7 @@ EXPORT(void) printFramesOnStackPageListInUse(void); static void printFrameThingandFrameat(char *name, char *theFP, char *address) NoDbgRegParms; static void printFrameThingat(char *name, char *address) NoDbgRegParms; +sqInt printFrame(char *theFP); void printHex(sqInt n); void printLikelyImplementorsOfSelector(sqInt selector); void printMethodCache(void); @@ -1216,6 +1215,7 @@ void printStackPages(void); void printStackPagesInUse(void); static void printStackPage(StackPage *page) NoDbgRegParms; +void printStackReferencesTo(sqInt oop); static void printStringOf(sqInt oop) NoDbgRegParms; void print(char *s); void pushBool(sqInt trueOrFalse); @@ -1266,6 +1266,7 @@ static sqInt stackLimitBytes(void); sqInt stackObjectValue(sqInt offset); static sqInt stackPageByteSize(void); +static sqInt stackPointerForMaybeMarriedContext(sqInt aContext) NoDbgRegParms; static sqInt stackPointerIndexForFrame(char *theFP) NoDbgRegParms; unsigned long stackPositiveMachineIntegerValue(sqInt offset); long stackSignedMachineIntegerValue(sqInt offset); @@ -1503,8 +1504,8 @@ sqInt maxLiteralCountForCompile = MaxLiteralCountForCompile /* 60 */; jmp_buf reenterInterpreter; /* private export */; sqInt checkAllocFiller; +sqInt breakSelectorLength = MinSmallInteger; sqInt inIOProcessEvents; -sqInt breakSelectorLength = MinSmallInteger; sqInt checkForLeaks; sqInt desiredEdenBytes; sqInt desiredNumStackPages; @@ -1693,7 +1694,7 @@ /* 168 */ primitiveCopyObject, /* 169 */ primitiveNotIdentical, /* 170 */ primitiveAsCharacter, - /* 171 */ primitiveCharacterValue, + /* 171 */ (void (*)(void))0, /* 172 */ (void (*)(void))0, /* 173 */ primitiveSlotAt, /* 174 */ primitiveSlotAtPut, @@ -2099,7 +2100,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.992"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1001"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -4843,6 +4844,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); + null; goto l300; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -4860,7 +4862,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - /* return self */ + null; l300: /* end baseFrameReturn */; goto l299; } @@ -7963,7 +7965,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -8023,7 +8025,7 @@ null; goto l108; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -10917,7 +10919,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -10977,7 +10979,7 @@ null; goto l243; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -18634,91 +18636,6 @@ printf("\n"); } -sqInt -printFrame(char *theFP) -{ DECL_MAYBE_SQ_GLOBAL_STRUCT - char *aFrame; - sqInt index; - char *prevFrame; - char *startFrame; - StackPage *thePage; - char *theSP; - - if (theFP == GIV(framePointer)) { - theSP = GIV(stackPointer); - } - else { - /* begin stackPageFor: */ - /* begin stackPageAt: */ - /* begin pageIndexFor: */ - assert((((((char *) theFP)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) theFP)) <= (((char *) GIV(pages)))))); - index = pageIndexForstackBasePlus1bytesPerPage(theFP, GIV(stackBasePlus1), GIV(bytesPerPage)); - thePage = stackPageAtpages(index, GIV(pages)); - if (isFree(thePage)) { - /* begin printHexPtr: */ - printHex(oopForPointer(theFP)); - print(" is on a free page?!"); - /* begin cr */ - printf("\n"); - return null; - } - if ((thePage != GIV(stackPage)) - && (theFP == ((thePage->headFP)))) { - theSP = (thePage->headSP); - } - else { - /* begin findSPOrNilOf:on:startingFrom: */ - startFrame = ((thePage == GIV(stackPage)) - && (((GIV(framePointer) >= ((thePage->realStackLimit))) && (GIV(framePointer) <= ((thePage->baseAddress))))) - ? GIV(framePointer) - : (thePage->headFP)); - assert(!(isFree(thePage))); - if (startFrame == theFP) { - if (((thePage->headSP)) >= startFrame) { - - /* If the SP is invalid return the pointer to the receiver field. */ - - /* begin frameReceiverOffset: */ - theSP = ((((usqInt)(longAt(aFrame + FoxMethod)))) < (startOfMemory()) - ? aFrame + FoxMFReceiver - : aFrame + FoxIFReceiver); - goto l1; - } - theSP = (thePage == GIV(stackPage) - ? (thePage->headSP) - : ((thePage->headSP)) + BytesPerWord); - goto l1; - } - aFrame = startFrame; - while (1) { - prevFrame = aFrame; - /* begin frameCallerFP: */ - aFrame = pointerForOop(longAt(aFrame + FoxSavedFP)); - if (!(aFrame != 0)) break; - if (theFP == aFrame) { - /* begin frameCallerSP: */ - assert(!(isBaseFrame(prevFrame))); - theSP = (prevFrame + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(prevFrame + FoxMethod)))) < (startOfMemory()) - ? ((mframeCogMethod(prevFrame))->cmNumArgs) - : byteAt((prevFrame + FoxIFrameFlags) + 1))))) + BytesPerWord; - goto l1; - } - } - theSP = null; - l1: /* end findSPOrNilOf:on:startingFrom: */; - } - } - if (theSP == null) { - print("could not find sp; using bogus value"); - /* begin cr */ - printf("\n"); - theSP = theFP + (((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) - ? FoxMFReceiver - : FoxIFReceiver)); - } - printFrameWithSP(theFP, theSP); -} - void printFrameWithSP(char *theFP, char *theSP) { DECL_MAYBE_SQ_GLOBAL_STRUCT @@ -23650,44 +23567,34 @@ } -/* Similar to primitiveArrayBecomeOneWay but accepts a third argument whether - to copy - the receiver's identity hash over the argument's identity hash. +/* Similar to primitiveArrayBecomeOneWay but accepts a third argument + deciding whether to + copy the receiver's element's identity hash over the argument's elementy's + identity hash. */ static void primitiveArrayBecomeOneWayCopyHash(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt arg; sqInt copyHashFlag; sqInt ec; - sqInt rcvr; - /* begin booleanValueOf: */ if ((longAt(GIV(stackPointer))) == GIV(trueObj)) { copyHashFlag = 1; - goto l1; } - if ((longAt(GIV(stackPointer))) == GIV(falseObj)) { - copyHashFlag = 0; - goto l1; + else { + if ((longAt(GIV(stackPointer))) == GIV(falseObj)) { + copyHashFlag = 0; + } + else { + GIV(primFailCode) = PrimErrBadArgument; + return; + } } - /* begin success: */ - - /* Don't overwrite an error code that has already been set. */ - - if (!GIV(primFailCode)) { - GIV(primFailCode) = 1; - } - - copyHashFlag = null; -l1: /* end booleanValueOf: */; - arg = longAt(GIV(stackPointer) + (1 * BytesPerWord)); - rcvr = longAt(GIV(stackPointer) + (2 * BytesPerWord)); - ec = becomewithtwoWaycopyHash(rcvr, arg, 0, copyHashFlag); + ec = becomewithtwoWaycopyHash(longAt(GIV(stackPointer) + (2 * BytesPerWord)), longAt(GIV(stackPointer) + (1 * BytesPerWord)), 0, copyHashFlag); if (ec == PrimNoErr) { /* begin pop: */ - GIV(stackPointer) += 2 * BytesPerWord; + GIV(stackPointer) += GIV(argumentCount) * BytesPerWord; null; } else { @@ -24525,7 +24432,7 @@ primitiveBitShift(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -24572,7 +24479,7 @@ } return; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -24891,25 +24798,6 @@ } static void -primitiveCharacterValue(void) -{ DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt characterCode; - sqInt characterObject; - char *sp; - - characterObject = longAt(GIV(stackPointer)); - - /* the Character must be the receiver for safety */ - - characterCode = (CharacterTable == null - ? (((characterValueOf(characterObject)) << 1) | 1) - : longAt((characterObject + BaseHeaderSize) + (CharacterValueIndex << (shiftForWord())))); - /* begin pop:thenPush: */ - longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), characterCode); - GIV(stackPointer) = sp; -} - -static void primitiveClass(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt ccIndex; @@ -26770,8 +26658,6 @@ char *sp; char *sp1; - /* begin initPrimCall */ - GIV(primFailCode) = 0; rcvr = longAt(GIV(stackPointer) + (1 * BytesPerWord)); index = longAt(GIV(stackPointer)); if (index == ConstOne) { @@ -26817,8 +26703,6 @@ char *sp1; usqInt valueToStore; - /* begin initPrimCall */ - GIV(primFailCode) = 0; oopToStore = longAt(GIV(stackPointer)); valueToStore = positive32BitValueOf(oopToStore); if (GIV(primFailCode)) { @@ -26827,6 +26711,7 @@ } rcvr = longAt(GIV(stackPointer) + (2 * BytesPerWord)); index = longAt(GIV(stackPointer) + (1 * BytesPerWord)); + if (index == ConstOne) { /* begin storeLong32:ofObject:withValue: */ fieldIndex = (VMBIGENDIAN @@ -29151,8 +29036,9 @@ static void primitiveIsPinned(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt aValue; sqInt obj; + char *sp; + sqInt trueOrFalse; obj = longAt(GIV(stackPointer)); if (((obj & 1)) @@ -29160,12 +29046,13 @@ (GIV(primFailCode) = PrimErrBadReceiver); return; } - /* begin pop: */ - GIV(stackPointer) += (GIV(argumentCount) - 1) * BytesPerWord; - null; - /* begin stackTopPut: */ - aValue = GIV(falseObj); - longAtPointerput(GIV(stackPointer), aValue); + /* begin pop:thenPushBool: */ + trueOrFalse = 0 + && (GIV(falseObj)); + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (trueOrFalse + ? GIV(trueObj) + : GIV(falseObj))); + GIV(stackPointer) = sp; } @@ -31042,7 +30929,7 @@ } /* begin pop:thenPush: */ - longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) - 1) - 1) * BytesPerWord)), wasPinned); + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), wasPinned); GIV(stackPointer) = sp; } @@ -49753,7 +49640,93 @@ printf("\n"); } +sqInt +printFrame(char *theFP) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + char *aFrame; + sqInt index; + char *prevFrame; + char *startFrame; + StackPage *thePage; + char *theSP; + if (theFP == GIV(framePointer)) { + theSP = GIV(stackPointer); + } + else { + /* begin stackPageFor: */ + /* begin stackPageAt: */ + /* begin pageIndexFor: */ + assert((((((char *) theFP)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) theFP)) <= (((char *) GIV(pages)))))); + index = pageIndexForstackBasePlus1bytesPerPage(theFP, GIV(stackBasePlus1), GIV(bytesPerPage)); + thePage = stackPageAtpages(index, GIV(pages)); + if (isFree(thePage)) { + /* begin printHexPtr: */ + printHex(oopForPointer(theFP)); + print(" is on a free page?!"); + /* begin cr */ + printf("\n"); + return null; + } + if ((thePage != GIV(stackPage)) + && (theFP == ((thePage->headFP)))) { + theSP = (thePage->headSP); + } + else { + /* begin findSPOrNilOf:on:startingFrom: */ + startFrame = ((thePage == GIV(stackPage)) + && (((GIV(framePointer) >= ((thePage->realStackLimit))) && (GIV(framePointer) <= ((thePage->baseAddress))))) + ? GIV(framePointer) + : (thePage->headFP)); + assert(!(isFree(thePage))); + if (startFrame == theFP) { + if (((thePage->headSP)) >= startFrame) { + + /* If the SP is invalid return the pointer to the receiver field. */ + + /* begin frameReceiverOffset: */ + theSP = ((((usqInt)(longAt(aFrame + FoxMethod)))) < (startOfMemory()) + ? aFrame + FoxMFReceiver + : aFrame + FoxIFReceiver); + goto l1; + } + theSP = (thePage == GIV(stackPage) + ? (thePage->headSP) + : ((thePage->headSP)) + BytesPerWord); + goto l1; + } + aFrame = startFrame; + while (1) { + prevFrame = aFrame; + /* begin frameCallerFP: */ + aFrame = pointerForOop(longAt(aFrame + FoxSavedFP)); + if (!(aFrame != 0)) break; + if (theFP == aFrame) { + /* begin frameCallerSP: */ + assert(!(isBaseFrame(prevFrame))); + theSP = (prevFrame + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(prevFrame + FoxMethod)))) < (startOfMemory()) + ? ((mframeCogMethod(prevFrame))->cmNumArgs) + : byteAt((prevFrame + FoxIFrameFlags) + 1))))) + BytesPerWord; + goto l1; + } + } + theSP = null; + l1: /* end findSPOrNilOf:on:startingFrom: */; + } + } + if (!(theSP)) { + print("could not find sp; using bogus value"); + /* begin cr */ + printf("\n"); + /* begin frameReceiverOffset: */ + theSP = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) + ? theFP + FoxMFReceiver + : theFP + FoxIFReceiver); + } + printFrameWithSP(theFP, theSP); +} + + /* Print n in hex, in the form ' 0x1234', padded to a width of 10 characters in 32-bits ('0x' + 8 nibbles) or 18 characters in 64-bits ('0x' + 16 nibbles) */ @@ -50687,6 +50660,86 @@ printf("\n"); } +void +printStackReferencesTo(sqInt oop) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + char *callerFP; + sqInt i; + char *theFP; + StackPage *thePage; + char *theSP; + + for (i = 0; i < GIV(numStackPages); i += 1) { + /* begin stackPageAt: */ + thePage = stackPageAtpages(i, GIV(pages)); + if (!(((thePage->baseFP)) == 0)) { + theSP = (thePage->headSP); + + /* Skip the instruction pointer on top of stack of inactive pages. */ + + theFP = (thePage->headFP); + if (!(thePage == GIV(stackPage))) { + theSP += BytesPerWord; + } + while (1) { + while (theSP <= (frameReceiverOffset(theFP))) { + if (oop == (longAt(theSP))) { + print("FP: "); + /* begin printHexnp: */ + printf("0x%lx", theFP); + print(" @ "); + /* begin printHexnp: */ + printf("0x%lx", theSP); + /* begin cr */ + printf("\n"); + } + theSP += BytesPerWord; + } + if (((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) + ? ((longAt(theFP + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 + : (byteAt((theFP + FoxIFrameFlags) + 2)) != 0)) { + if (oop == (longAt(theFP + FoxThisContext))) { + print("FP: "); + /* begin printHexnp: */ + printf("0x%lx", theFP); + print(" CTXT"); + /* begin cr */ + printf("\n"); + } + } + if (oop == (longAt(theFP + FoxMethod))) { + print("FP: "); + /* begin printHexnp: */ + printf("0x%lx", theFP); + print(" MTHD"); + /* begin cr */ + printf("\n"); + } + if (!(((callerFP = frameCallerFP(theFP))) != 0)) break; + theSP = (theFP + FoxCallerSavedIP) + BytesPerWord; + theFP = callerFP; + } + + /* a.k.a. FoxCallerContext */ + + theSP = theFP + FoxCallerSavedIP; + while (theSP <= ((thePage->baseAddress))) { + if (oop == (longAt(theSP))) { + print("FP: "); + /* begin printHexnp: */ + printf("0x%lx", theFP); + print(" @ "); + /* begin printHexnp: */ + printf("0x%lx", theSP); + /* begin cr */ + printf("\n"); + } + theSP += BytesPerWord; + } + } + } +} + static void printStringOf(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT @@ -52201,6 +52254,30 @@ } +/* Return the stackPointer of a Context or BlockContext. */ + +static sqInt +stackPointerForMaybeMarriedContext(sqInt aContext) +{ + sqInt sp; + sqInt sp1; + + if ((((longAt((aContext + BaseHeaderSize) + (SenderIndex << (shiftForWord())))) & 1)) + && (!(isWidowedContext(aContext)))) { + sp = stackPointerIndexForFrame(frameOfMarriedContext(aContext)); + assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(aContext))); + return sp; + } + /* begin fetchStackPointerOf: */ + sp1 = longAt((aContext + BaseHeaderSize) + (StackPointerIndex << (shiftForWord()))); + if (!((sp1 & 1))) { + return 0; + } + assert((ReceiverIndex + ((sp1 >> 1))) < (lengthOf(aContext))); + return (sp1 >> 1); +} + + /* Return the 0-based index rel to the given frame. (This is what stackPointer used to be before conversion to pointer) */ /* In the StackInterpreter stacks grow down. */ @@ -55538,14 +55615,34 @@ GIV(primFailCode) = PrimErrBadArgument; } + +/* Answer a slot in an object. This numbers all slots from 1, ignoring the + distinction between + named and indexed inst vars. In objects with both named and indexed inst + vars, the named + inst vars preceed the indexed ones. In non-object indexed objects (objects + that contain + bits, not object references) this primitive answers the raw integral value + at each slot. + e.g. for Strings it answers the character code, not the Character object + at each slot. */ + static void primitiveSlotAt(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt fmt; sqInt header; sqInt index; + sqInt numLiveSlots; sqInt numSlots; + sqInt oop; + sqInt oop1; sqInt rcvr; char *sp; + char *sp1; + char *sp2; + char *sp3; + char *sp4; sqInt sz; sqInt value; @@ -55559,8 +55656,9 @@ (GIV(primFailCode) = PrimErrBadReceiver); return; } - index = (index >> 1); - if (((((usqInt) (longAt(rcvr))) >> (instFormatFieldLSB())) & 15) <= 4) { + fmt = (((usqInt) (longAt(rcvr))) >> (instFormatFieldLSB())) & 15; + index = ((index >> 1)) - 1; + if (fmt <= 4) { /* begin numSlotsOf: */ header = longAt(rcvr); sz = ((header & TypeMask) == HeaderTypeSizeAndClass @@ -55569,7 +55667,22 @@ numSlots = ((usqInt) (sz - BaseHeaderSize)) >> (shiftForWord()); if ((asUnsigned(index)) < numSlots) { if (((((usqInt) (longAt(rcvr))) >> (compactClassFieldLSB())) & 0x1F) == ClassMethodContextCompactIndex) { - value = externalInstVarofContext(index, rcvr); + /* begin externalWriteBackHeadFramePointers */ + assert((GIV(framePointer) - GIV(stackPointer)) < (LargeContextSlots * BytesPerOop)); + assert(GIV(stackPage) == (mostRecentlyUsedPage())); + /* begin setHeadFP:andSP:inPage: */ + assert(GIV(stackPointer) < GIV(framePointer)); + assert((GIV(stackPointer) < ((GIV(stackPage)->baseAddress))) + && (GIV(stackPointer) > (((GIV(stackPage)->realStackLimit)) - (LargeContextSlots * BytesPerOop)))); + assert((GIV(framePointer) < ((GIV(stackPage)->baseAddress))) + && (GIV(framePointer) > (((GIV(stackPage)->realStackLimit)) - ((LargeContextSlots * BytesPerOop) / 2)))); + (GIV(stackPage)->headFP = GIV(framePointer)); + (GIV(stackPage)->headSP = GIV(stackPointer)); + assert(pageListIsWellFormed()); + numLiveSlots = (stackPointerForMaybeMarriedContext(rcvr)) + CtxtTempFrameStart; + value = ((asUnsigned(index)) < numLiveSlots + ? externalInstVarofContext(index, rcvr) + : GIV(nilObj)); } else { value = longAt((rcvr + BaseHeaderSize) + (index << (shiftForWord()))); @@ -55582,20 +55695,81 @@ (GIV(primFailCode) = PrimErrBadIndex); return; } + if (fmt >= 8) { + if (fmt >= 12) { + (GIV(primFailCode) = PrimErrUnsupported); + return; + } + numSlots = numBytesOf(rcvr); + if ((asUnsigned(index)) < numSlots) { + /* begin pop:thenPushInteger: */ + longAtput((sp1 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (((byteAt((rcvr + BaseHeaderSize) + index)) << 1) | 1)); + GIV(stackPointer) = sp1; + return; + } + (GIV(primFailCode) = PrimErrBadIndex); + return; + } + + if (fmt == 7) { + numSlots = ((usqInt) (numBytesOf(rcvr))) >> 3; + if ((asUnsigned(index)) < numSlots) { + /* begin pop:thenPush: */ + oop = positive64BitIntegerFor(long64At((rcvr + BaseHeaderSize) + (index << 3))); + longAtput((sp3 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), oop); + GIV(stackPointer) = sp3; + return; + } + (GIV(primFailCode) = PrimErrBadIndex); + return; + } + if (fmt >= 6) { + numSlots = ((usqInt) (numBytesOf(rcvr))) >> 2; + if ((asUnsigned(index)) < numSlots) { + /* begin pop:thenPush: */ + oop1 = positive32BitIntegerFor(long32At((rcvr + BaseHeaderSize) + (index << 2))); + longAtput((sp4 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), oop1); + GIV(stackPointer) = sp4; + return; + } + (GIV(primFailCode) = PrimErrBadIndex); + return; + } (GIV(primFailCode) = PrimErrBadReceiver); return; } + +/* Assign a slot in an object. This numbers all slots from 1, ignoring the + distinction between + named and indexed inst vars. In objects with both named and indexed inst + vars, the named + inst vars preceed the indexed ones. In non-object indexed objects (objects + that contain + bits, not object references) this primitive assigns a raw integral value + at each slot. */ + static void primitiveSlotAtPut(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt bs; + sqInt ccIndex; + sqInt classOop; + sqInt fmt; sqInt header; sqInt index; sqInt newValue; sqInt numSlots; + sqInt ok; sqInt rcvr; char *sp; + char *sp1; + char *sp2; + char *sp3; + char *sp4; sqInt sz; + unsigned long value; + sqInt value1; newValue = longAt(GIV(stackPointer)); index = longAt(GIV(stackPointer) + (1 * BytesPerWord)); @@ -55608,8 +55782,9 @@ (GIV(primFailCode) = PrimErrBadReceiver); return; } - index = (index >> 1); - if (((((usqInt) (longAt(rcvr))) >> (instFormatFieldLSB())) & 15) <= 4) { + fmt = (((usqInt) (longAt(rcvr))) >> (instFormatFieldLSB())) & 15; + index = ((index >> 1)) - 1; + if (fmt <= 4) { /* begin numSlotsOf: */ header = longAt(rcvr); sz = ((header & TypeMask) == HeaderTypeSizeAndClass @@ -55635,6 +55810,89 @@ (GIV(primFailCode) = PrimErrBadIndex); return; } + /* begin positiveMachineIntegerValueOf: */ + if ((newValue & 1)) { + value1 = (newValue >> 1); + if (value1 < 0) { + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } + value = null; + goto l2; + } + value = value1; + goto l2; + } + + /* begin isClassOfNonImm:equalTo:compactClassIndex: */ + classOop = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassLargePositiveInteger << (shiftForWord()))); + assert(!((newValue & 1))); + ccIndex = (((usqInt) (longAt(newValue))) >> (compactClassFieldLSB())) & 0x1F; + if (ccIndex == 0) { + ok = ((longAt(newValue - BaseHeaderSize)) & AllButTypeMask) == classOop; + goto l1; + } + ok = ClassLargePositiveIntegerCompactIndex == ccIndex; + goto l1; + + ok = classOop == (fetchPointerofObject(ccIndex - 1, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord()))))); +l1: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + if (!(ok + && (((bs = numBytesOf(newValue))) <= (sizeof(unsigned long))))) { + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } + value = null; + goto l2; + } + if (((sizeof(unsigned long)) == 8) + && (bs > 4)) { + value = (((((((byteAt((newValue + BaseHeaderSize) + 0)) + ((byteAt((newValue + BaseHeaderSize) + 1)) << 8)) + ((byteAt((newValue + BaseHeaderSize) + 2)) << 16)) + ((byteAt((newValue + BaseHeaderSize) + 3)) << 24)) + ((byteAt((newValue + BaseHeaderSize) + 4)) << 32)) + ((byteAt((newValue + BaseHeaderSize) + 5)) << 40)) + ((byteAt((newValue + BaseHeaderSize) + 6)) << 48)) + ((byteAt((newValue + BaseHeaderSize) + 7)) << 56); + goto l2; + } + value = (((byteAt((newValue + BaseHeaderSize) + 0)) + ((byteAt((newValue + BaseHeaderSize) + 1)) << 8)) + ((byteAt((newValue + BaseHeaderSize) + 2)) << 16)) + ((byteAt((newValue + BaseHeaderSize) + 3)) << 24); +l2: /* end positiveMachineIntegerValueOf: */; + if (GIV(primFailCode)) { + GIV(primFailCode) = PrimErrBadArgument; + return; + } + if (fmt >= 8) { + if (fmt >= 12) { + (GIV(primFailCode) = PrimErrUnsupported); + return; + } + if ((asUnsigned(value)) > 0xFF) { + (GIV(primFailCode) = PrimErrBadArgument); + return; + } + numSlots = numBytesOf(rcvr); + if ((asUnsigned(index)) < numSlots) { + byteAtput((rcvr + BaseHeaderSize) + index, value); + /* begin pop:thenPush: */ + longAtput((sp1 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), newValue); + GIV(stackPointer) = sp1; + return; + } + (GIV(primFailCode) = PrimErrBadIndex); + return; + } + + + if (fmt >= 6) { + ; + numSlots = ((usqInt) (numBytesOf(rcvr))) >> 2; + if ((asUnsigned(index)) < numSlots) { + long32Atput((rcvr + BaseHeaderSize) + (index << 2), value); + /* begin pop:thenPush: */ + longAtput((sp4 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), newValue); + GIV(stackPointer) = sp4; + return; + } + (GIV(primFailCode) = PrimErrBadIndex); + return; + } (GIV(primFailCode) = PrimErrBadReceiver); return; } Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-12-27 01:29:52 UTC (rev 3194) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-12-27 01:37:21 UTC (rev 3195) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.992 uuid: bbbe8c5f-97d3-42fe-b068-76c6890a1733 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1001 uuid: fef56678-07b1-4fca-8300-17d6afc0c6e4 */ @@ -254,6 +254,7 @@ void printProcessStack(sqInt aProcess); sqInt printProcsOnList(sqInt procList); sqInt printStackCallStackOf(sqInt frameOrContext); +void printStackReferencesTo(sqInt oop); void print(char *s); void setBreakMNUSelector(char *aString); void setBreakSelector(char *aString); Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-12-27 01:29:52 UTC (rev 3194) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-12-27 01:37:21 UTC (rev 3195) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.992 uuid: bbbe8c5f-97d3-42fe-b068-76c6890a1733 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1001 uuid: fef56678-07b1-4fca-8300-17d6afc0c6e4 from - CoInterpreter VMMaker.oscog-eem.992 uuid: bbbe8c5f-97d3-42fe-b068-76c6890a1733 + CoInterpreter VMMaker.oscog-eem.1001 uuid: fef56678-07b1-4fca-8300-17d6afc0c6e4 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.992 uuid: bbbe8c5f-97d3-42fe-b068-76c6890a1733 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1001 uuid: fef56678-07b1-4fca-8300-17d6afc0c6e4 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -520,7 +520,6 @@ static void printFrameMethodFor(char *theFP) NoDbgRegParms; static void printFrameThingatextraString(char *name, char *address, char *extraStringOrNil) NoDbgRegParms; static void printFrameThingatextra(char *name, char *address, sqInt extraValue) NoDbgRegParms; -sqInt printFrame(char *theFP); void printFrameWithSP(char *theFP, char *theSP); static void printLogEntryAt(sqInt i) NoDbgRegParms; void printMethodCacheFor(sqInt thing); @@ -629,7 +628,6 @@ static void primitiveBytesLeft(void); static void primitiveCalloutToFFI(void); static void primitiveChangeClass(void); -static void primitiveCharacterValue(void); static void primitiveClass(void); static void primitiveClearVMProfile(void); static void primitiveClipboardText(void); @@ -1202,6 +1200,7 @@ EXPORT(void) printFramesOnStackPageListInUse(void); static void printFrameThingandFrameat(char *name, char *theFP, char *address) NoDbgRegParms; static void printFrameThingat(char *name, char *address) NoDbgRegParms; +sqInt printFrame(char *theFP); void printHex(sqInt n); void printLikelyImplementorsOfSelector(sqInt selector); void printMethodCache(void); @@ -1219,6 +1218,7 @@ void printStackPages(void); void printStackPagesInUse(void); static void printStackPage(StackPage *page) NoDbgRegParms; +void printStackReferencesTo(sqInt oop); static void printStringOf(sqInt oop) NoDbgRegParms; void print(char *s); void pushBool(sqInt trueOrFalse); @@ -1269,6 +1269,7 @@ static sqInt stackLimitBytes(void); sqInt stackObjectValue(sqInt offset); static sqInt stackPageByteSize(void); +static sqInt stackPointerForMaybeMarriedContext(sqInt aContext) NoDbgRegParms; static sqInt stackPointerIndexForFrame(char *theFP) NoDbgRegParms; unsigned long stackPositiveMachineIntegerValue(sqInt offset); long stackSignedMachineIntegerValue(sqInt offset); @@ -1506,8 +1507,8 @@ sqInt maxLiteralCountForCompile = MaxLiteralCountForCompile /* 60 */; jmp_buf reenterInterpreter; /* private export */; sqInt checkAllocFiller; +sqInt breakSelectorLength = MinSmallInteger; sqInt inIOProcessEvents; -sqInt breakSelectorLength = MinSmallInteger; sqInt checkForLeaks; sqInt desiredEdenBytes; sqInt desiredNumStackPages; @@ -1696,7 +1697,7 @@ /* 168 */ primitiveCopyObject, /* 169 */ primitiveNotIdentical, /* 170 */ primitiveAsCharacter, - /* 171 */ primitiveCharacterValue, + /* 171 */ (void (*)(void))0, /* 172 */ (void (*)(void))0, /* 173 */ primitiveSlotAt, /* 174 */ primitiveSlotAtPut, @@ -2102,7 +2103,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.992"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1001"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -4852,6 +4853,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); + null; goto l300; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -4869,7 +4871,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - /* return self */ + null; l300: /* end baseFrameReturn */; goto l299; } @@ -7972,7 +7974,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -8032,7 +8034,7 @@ null; goto l108; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -10926,7 +10928,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -10986,7 +10988,7 @@ null; goto l243; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -18643,91 +18645,6 @@ printf("\n"); } -sqInt -printFrame(char *theFP) -{ DECL_MAYBE_SQ_GLOBAL_STRUCT - char *aFrame; - sqInt index; - char *prevFrame; - char *startFrame; - StackPage *thePage; - char *theSP; - - if (theFP == GIV(framePointer)) { - theSP = GIV(stackPointer); - } - else { - /* begin stackPageFor: */ - /* begin stackPageAt: */ - /* begin pageIndexFor: */ - assert((((((char *) theFP)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) theFP)) <= (((char *) GIV(pages)))))); - index = pageIndexForstackBasePlus1bytesPerPage(theFP, GIV(stackBasePlus1), GIV(bytesPerPage)); - thePage = stackPageAtpages(index, GIV(pages)); - if (isFree(thePage)) { - /* begin printHexPtr: */ - printHex(oopForPointer(theFP)); - print(" is on a free page?!"); - /* begin cr */ - printf("\n"); - return null; - } - if ((thePage != GIV(stackPage)) - && (theFP == ((thePage->headFP)))) { - theSP = (thePage->headSP); - } - else { - /* begin findSPOrNilOf:on:startingFrom: */ - startFrame = ((thePage == GIV(stackPage)) - && (((GIV(framePointer) >= ((thePage->realStackLimit))) && (GIV(framePointer) <= ((thePage->baseAddress))))) - ? GIV(framePointer) - : (thePage->headFP)); - assert(!(isFree(thePage))); - if (startFrame == theFP) { - if (((thePage->headSP)) >= startFrame) { - - /* If the SP is invalid return the pointer to the receiver field. */ - - /* begin frameReceiverOffset: */ - theSP = ((((usqInt)(longAt(aFrame + FoxMethod)))) < (startOfMemory()) - ? aFrame + FoxMFReceiver - : aFrame + FoxIFReceiver); - goto l1; - } - theSP = (thePage == GIV(stackPage) - ? (thePage->headSP) - : ((thePage->headSP)) + BytesPerWord); - goto l1; - } - aFrame = startFrame; - while (1) { - prevFrame = aFrame; - /* begin frameCallerFP: */ - aFrame = pointerForOop(longAt(aFrame + FoxSavedFP)); - if (!(aFrame != 0)) break; - if (theFP == aFrame) { - /* begin frameCallerSP: */ - assert(!(isBaseFrame(prevFrame))); - theSP = (prevFrame + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(prevFrame + FoxMethod)))) < (startOfMemory()) - ? ((mframeCogMethod(prevFrame))->cmNumArgs) - : byteAt((prevFrame + FoxIFrameFlags) + 1))))) + BytesPerWord; - goto l1; - } - } - theSP = null; - l1: /* end findSPOrNilOf:on:startingFrom: */; - } - } - if (theSP == null) { - print("could not find sp; using bogus value"); - /* begin cr */ - printf("\n"); - theSP = theFP + (((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) - ? FoxMFReceiver - : FoxIFReceiver)); - } - printFrameWithSP(theFP, theSP); -} - void printFrameWithSP(char *theFP, char *theSP) { DECL_MAYBE_SQ_GLOBAL_STRUCT @@ -23659,44 +23576,34 @@ } -/* Similar to primitiveArrayBecomeOneWay but accepts a third argument whether - to copy - the receiver's identity hash over the argument's identity hash. +/* Similar to primitiveArrayBecomeOneWay but accepts a third argument + deciding whether to + copy the receiver's element's identity hash over the argument's elementy's + identity hash. */ static void primitiveArrayBecomeOneWayCopyHash(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt arg; sqInt copyHashFlag; sqInt ec; - sqInt rcvr; - /* begin booleanValueOf: */ if ((longAt(GIV(stackPointer))) == GIV(trueObj)) { copyHashFlag = 1; - goto l1; } - if ((longAt(GIV(stackPointer))) == GIV(falseObj)) { - copyHashFlag = 0; - goto l1; + else { + if ((longAt(GIV(stackPointer))) == GIV(falseObj)) { + copyHashFlag = 0; + } + else { + GIV(primFailCode) = PrimErrBadArgument; + return; + } } - /* begin success: */ - - /* Don't overwrite an error code that has already been set. */ - - if (!GIV(primFailCode)) { - GIV(primFailCode) = 1; - } - - copyHashFlag = null; -l1: /* end booleanValueOf: */; - arg = longAt(GIV(stackPointer) + (1 * BytesPerWord)); - rcvr = longAt(GIV(stackPointer) + (2 * BytesPerWord)); - ec = becomewithtwoWaycopyHash(rcvr, arg, 0, copyHashFlag); + ec = becomewithtwoWaycopyHash(longAt(GIV(stackPointer) + (2 * BytesPerWord)), longAt(GIV(stackPointer) + (1 * BytesPerWord)), 0, copyHashFlag); if (ec == PrimNoErr) { /* begin pop: */ - GIV(stackPointer) += 2 * BytesPerWord; + GIV(stackPointer) += GIV(argumentCount) * BytesPerWord; null; } else { @@ -24534,7 +24441,7 @@ primitiveBitShift(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -24581,7 +24488,7 @@ } return; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -24900,25 +24807,6 @@ } static void -primitiveCharacterValue(void) -{ DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt characterCode; - sqInt characterObject; - char *sp; - - characterObject = longAt(GIV(stackPointer)); - - /* the Character must be the receiver for safety */ - - characterCode = (CharacterTable == null - ? (((characterValueOf(characterObject)) << 1) | 1) - : longAt((characterObject + BaseHeaderSize) + (CharacterValueIndex << (shiftForWord())))); - /* begin pop:thenPush: */ - longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), characterCode); - GIV(stackPointer) = sp; -} - -static void primitiveClass(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt ccIndex; @@ -26779,8 +26667,6 @@ char *sp; char *sp1; - /* begin initPrimCall */ - GIV(primFailCode) = 0; rcvr = longAt(GIV(stackPointer) + (1 * BytesPerWord)); index = longAt(GIV(stackPointer)); if (index == ConstOne) { @@ -26826,8 +26712,6 @@ char *sp1; usqInt valueToStore; - /* begin initPrimCall */ - GIV(primFailCode) = 0; oopToStore = longAt(GIV(stackPointer)); valueToStore = positive32BitValueOf(oopToStore); if (GIV(primFailCode)) { @@ -26836,6 +26720,7 @@ } rcvr = longAt(GIV(stackPointer) + (2 * BytesPerWord)); index = longAt(GIV(stackPointer) + (1 * BytesPerWord)); + if (index == ConstOne) { /* begin storeLong32:ofObject:withValue: */ fieldIndex = (VMBIGENDIAN @@ -29160,8 +29045,9 @@ static void primitiveIsPinned(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt aValue; sqInt obj; + char *sp; + sqInt trueOrFalse; obj = longAt(GIV(stackPointer)); if (((obj & 1)) @@ -29169,12 +29055,13 @@ (GIV(primFailCode) = PrimErrBadReceiver); return; } - /* begin pop: */ - GIV(stackPointer) += (GIV(argumentCount) - 1) * BytesPerWord; - null; - /* begin stackTopPut: */ - aValue = GIV(falseObj); - longAtPointerput(GIV(stackPointer), aValue); + /* begin pop:thenPushBool: */ + trueOrFalse = 0 + && (GIV(falseObj)); + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (trueOrFalse + ? GIV(trueObj) + : GIV(falseObj))); + GIV(stackPointer) = sp; } @@ -31051,7 +30938,7 @@ } /* begin pop:thenPush: */ - longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) - 1) - 1) * BytesPerWord)), wasPinned); + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), wasPinned); GIV(stackPointer) = sp; } @@ -49762,7 +49649,93 @@ printf("\n"); } +sqInt +printFrame(char *theFP) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + char *aFrame; + sqInt index; + char *prevFrame; + char *startFrame; + StackPage *thePage; + char *theSP; + if (theFP == GIV(framePointer)) { + theSP = GIV(stackPointer); + } + else { + /* begin stackPageFor: */ + /* begin stackPageAt: */ + /* begin pageIndexFor: */ + assert((((((char *) theFP)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) theFP)) <= (((char *) GIV(pages)))))); + index = pageIndexForstackBasePlus1bytesPerPage(theFP, GIV(stackBasePlus1), GIV(bytesPerPage)); + thePage = stackPageAtpages(index, GIV(pages)); + if (isFree(thePage)) { + /* begin printHexPtr: */ + printHex(oopForPointer(theFP)); + print(" is on a free page?!"); + /* begin cr */ + printf("\n"); + return null; + } + if ((thePage != GIV(stackPage)) + && (theFP == ((thePage->headFP)))) { + theSP = (thePage->headSP); + } + else { + /* begin findSPOrNilOf:on:startingFrom: */ + startFrame = ((thePage == GIV(stackPage)) + && (((GIV(framePointer) >= ((thePage->realStackLimit))) && (GIV(framePointer) <= ((thePage->baseAddress))))) + ? GIV(framePointer) + : (thePage->headFP)); + assert(!(isFree(thePage))); + if (startFrame == theFP) { + if (((thePage->headSP)) >= startFrame) { + + /* If the SP is invalid return the pointer to the receiver field. */ + + /* begin frameReceiverOffset: */ + theSP = ((((usqInt)(longAt(aFrame + FoxMethod)))) < (startOfMemory()) + ? aFrame + FoxMFReceiver + : aFrame + FoxIFReceiver); + goto l1; + } + theSP = (thePage == GIV(stackPage) + ? (thePage->headSP) + : ((thePage->headSP)) + BytesPerWord); + goto l1; + } + aFrame = startFrame; + while (1) { + prevFrame = aFrame; + /* begin frameCallerFP: */ + aFrame = pointerForOop(longAt(aFrame + FoxSavedFP)); + if (!(aFrame != 0)) break; + if (theFP == aFrame) { + /* begin frameCallerSP: */ + assert(!(isBaseFrame(prevFrame))); + theSP = (prevFrame + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(prevFrame + FoxMethod)))) < (startOfMemory()) + ? ((mframeCogMethod(prevFrame))->cmNumArgs) + : byteAt((prevFrame + FoxIFrameFlags) + 1))))) + BytesPerWord; + goto l1; + } + } + theSP = null; + l1: /* end findSPOrNilOf:on:startingFrom: */; + } + } + if (!(theSP)) { + print("could not find sp; using bogus value"); + /* begin cr */ + printf("\n"); + /* begin frameReceiverOffset: */ + theSP = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) + ? theFP + FoxMFReceiver + : theFP + FoxIFReceiver); + } + printFrameWithSP(theFP, theSP); +} + + /* Print n in hex, in the form ' 0x1234', padded to a width of 10 characters in 32-bits ('0x' + 8 nibbles) or 18 characters in 64-bits ('0x' + 16 nibbles) */ @@ -50696,6 +50669,86 @@ printf("\n"); } +void +printStackReferencesTo(sqInt oop) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + char *callerFP; + sqInt i; + char *theFP; + StackPage *thePage; + char *theSP; + + for (i = 0; i < GIV(numStackPages); i += 1) { + /* begin stackPageAt: */ + thePage = stackPageAtpages(i, GIV(pages)); + if (!(((thePage->baseFP)) == 0)) { + theSP = (thePage->headSP); + + /* Skip the instruction pointer on top of stack of inactive pages. */ + + theFP = (thePage->headFP); + if (!(thePage == GIV(stackPage))) { + theSP += BytesPerWord; + } + while (1) { + while (theSP <= (frameReceiverOffset(theFP))) { + if (oop == (longAt(theSP))) { + print("FP: "); + /* begin printHexnp: */ + printf("0x%lx", theFP); + print(" @ "); + /* begin printHexnp: */ + printf("0x%lx", theSP); + /* begin cr */ + printf("\n"); + } + theSP += BytesPerWord; + } + if (((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) + ? ((longAt(theFP + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 + : (byteAt((theFP + FoxIFrameFlags) + 2)) != 0)) { + if (oop == (longAt(theFP + FoxThisContext))) { + print("FP: "); + /* begin printHexnp: */ + printf("0x%lx", theFP); + print(" CTXT"); + /* begin cr */ + printf("\n"); + } + } + if (oop == (longAt(theFP + FoxMethod))) { + print("FP: "); + /* begin printHexnp: */ + printf("0x%lx", theFP); + print(" MTHD"); + /* begin cr */ + printf("\n"); + } + if (!(((callerFP = frameCallerFP(theFP))) != 0)) break; + theSP = (theFP + FoxCallerSavedIP) + BytesPerWord; + theFP = callerFP; + } + + /* a.k.a. FoxCallerContext */ + + theSP = theFP + FoxCallerSavedIP; + while (theSP <= ((thePage->baseAddress))) { + if (oop == (longAt(theSP))) { + print("FP: "); + /* begin printHexnp: */ + printf("0x%lx", theFP); + print(" @ "); + /* begin printHexnp: */ + printf("0x%lx", theSP); + /* begin cr */ + printf("\n"); + } + theSP += BytesPerWord; + } + } + } +} + static void printStringOf(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT @@ -52210,6 +52263,30 @@ } +/* Return the stackPointer of a Context or BlockContext. */ + +static sqInt +stackPointerForMaybeMarriedContext(sqInt aContext) +{ + sqInt sp; + sqInt sp1; + + if ((((longAt((aContext + BaseHeaderSize) + (SenderIndex << (shiftForWord())))) & 1)) + && (!(isWidowedContext(aContext)))) { + sp = stackPointerIndexForFrame(frameOfMarriedContext(aContext)); + assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(aContext))); + return sp; + } + /* begin fetchStackPointerOf: */ + sp1 = longAt((aContext + BaseHeaderSize) + (StackPointerIndex << (shiftForWord()))); + if (!((sp1 & 1))) { + return 0; + } + assert((ReceiverIndex + ((sp1 >> 1))) < (lengthOf(aContext))); + return (sp1 >> 1); +} + + /* Return the 0-based index rel to the given frame. (This is what stackPointer used to be before conversion to pointer) */ /* In the StackInterpreter stacks grow down. */ @@ -55547,14 +55624,34 @@ GIV(primFailCode) = PrimErrBadArgument; } + +/* Answer a slot in an object. This numbers all slots from 1, ignoring the + distinction between + named and indexed inst vars. In objects with both named and indexed inst + vars, the named + inst vars preceed the indexed ones. In non-object indexed objects (objects @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.1001.mcz
by commits＠source.squeak.org 27 Dec '14

27 Dec '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1001.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1001 Author: eem Time: 26 December 2014, 5:11:22.933 pm UUID: fef56678-07b1-4fca-8300-17d6afc0c6e4 Ancestors: VMMaker.oscog-eem.1000 Mark externalInstVar:ofContext: as not to be inlined (otherwise it is inined into 64-bit primitiveSlotAtPut !!). Remove useless initPrimCalls from primitiveFloatAt[Put] and fix latter for potentially immediate receivers. Fix off-by-one slips in primitiveSlotAt[Put] and copy new code down into StackInterpreter, with appropriate handling of context receivers. typos =============== Diff against VMMaker.oscog-eem.1000 =============== Item was changed: ----- Method: CoInterpreter>>externalInstVar:ofContext: (in category 'frame access') ----- externalInstVar: offset ofContext: aContext "Fetch an instance variable from a maybe married context. If the context is still married compute the value of the relevant inst var from the spouse frame's state. If the context is single but has a negative instruction pointer recognise that the instruction pointer is actually into machine code and convert it to the corresponding bytecode pc." + <inline: false> | value | self assert: (objectMemory isContext: aContext). "method, closureOrNil & receiver need no special handling; only sender, pc & stackp have to be computed for married contexts." ((self isReadMediatedContextInstVarIndex: offset) and: [self isMarriedOrWidowedContext: aContext]) ifFalse: [value := objectMemory fetchPointer: offset ofObject: aContext. ^(offset = InstructionPointerIndex and: [(objectMemory isIntegerObject: value) and: [value signedIntFromLong < 0]]) ifTrue: [self mustMapMachineCodePC: (objectMemory integerValueOf: value) context: aContext] ifFalse: [value]]. self externalWriteBackHeadFramePointers. ^(self isStillMarriedContext: aContext) ifTrue: [self fetchPointer: offset ofMarriedContext: aContext] ifFalse: [objectMemory fetchPointer: offset ofObject: aContext]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveFloatAt (in category 'indexing primitives') ----- primitiveFloatAt "Provide platform-independent access to 32-bit words comprising a Float. Map index 1 onto the most significant word and index 2 onto the least significant word." | rcvr index result | <var: #result type: #usqInt> - self initPrimCall. rcvr := self stackValue: 1. index := self stackTop. index = ConstOne ifTrue: [result := self positive32BitIntegerFor: (objectMemory fetchLong32: (VMBIGENDIAN ifTrue: [0] ifFalse: [1]) ofFloatObject: rcvr). ^self pop: 2 thenPush: result]. index = ConstTwo ifTrue: [result := self positive32BitIntegerFor: (objectMemory fetchLong32: (VMBIGENDIAN ifTrue: [1] ifFalse: [0]) ofFloatObject: rcvr). ^self pop: 2 thenPush: result]. self primitiveFailFor: ((objectMemory isIntegerObject: index) ifTrue: [PrimErrBadIndex] ifFalse: [PrimErrBadArgument])! Item was changed: ----- Method: InterpreterPrimitives>>primitiveFloatAtPut (in category 'indexing primitives') ----- primitiveFloatAtPut "Provide platform-independent access to 32-bit words comprising a Float. Map index 1 onto the most significant word and index 2 onto the least significant word." | rcvr index oopToStore valueToStore | <var: #valueToStore type: #usqInt> - self initPrimCall. oopToStore := self stackTop. valueToStore := self positive32BitValueOf: oopToStore. self successful ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. rcvr := self stackValue: 2. index := self stackValue: 1. + (objectMemory isImmediateFloat: rcvr) ifTrue: + [^self primitiveFailFor: PrimErrBadReceiver]. index = ConstOne ifTrue: [objectMemory storeLong32: (VMBIGENDIAN ifTrue: [0] ifFalse: [1]) ofObject: rcvr withValue: valueToStore. ^self pop: 3 thenPush: oopToStore]. index = ConstTwo ifTrue: [objectMemory storeLong32: (VMBIGENDIAN ifTrue: [1] ifFalse: [0]) ofObject: rcvr withValue: valueToStore. ^self pop: 3 thenPush: oopToStore]. self primitiveFailFor: ((objectMemory isIntegerObject: index) ifTrue: [PrimErrBadIndex] ifFalse: [PrimErrBadArgument])! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSlotAt (in category 'object access primitives') ----- primitiveSlotAt "Answer a slot in an object. This numbers all slots from 1, ignoring the distinction between named and indexed inst vars. In objects with both named and indexed inst vars, the named inst vars preceed the indexed ones. In non-object indexed objects (objects that contain bits, not object references) this primitive answers the raw integral value at each slot. e.g. for Strings it answers the character code, not the Character object at each slot." | index rcvr fmt numSlots | index := self stackTop. rcvr := self stackValue: 1. (objectMemory isIntegerObject: index) ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. (objectMemory isImmediate: rcvr) ifTrue: [^self primitiveFailFor: PrimErrBadReceiver]. fmt := objectMemory formatOf: rcvr. + index := (objectMemory integerValueOf: index) - 1. - index := objectMemory integerValueOf: index. fmt <= objectMemory lastPointerFormat ifTrue: [numSlots := objectMemory numSlotsOf: rcvr. (self asUnsigned: index) < numSlots ifTrue: [self pop: argumentCount + 1 thenPush: (objectMemory fetchPointer: index ofObject: rcvr). ^0]. ^self primitiveFailFor: PrimErrBadIndex]. fmt >= objectMemory firstByteFormat ifTrue: [fmt >= objectMemory firstCompiledMethodFormat ifTrue: [^self primitiveFailFor: PrimErrUnsupported]. numSlots := objectMemory numBytesOf: rcvr. (self asUnsigned: index) < numSlots ifTrue: [self pop: argumentCount + 1 thenPushInteger: (objectMemory fetchByte: index ofObject: rcvr). ^0]. ^self primitiveFailFor: PrimErrBadIndex]. (objectMemory hasSpurMemoryManagerAPI and: [fmt >= objectMemory firstShortFormat]) ifTrue: [numSlots := objectMemory num16BitUnitsOf: rcvr. (self asUnsigned: index) < numSlots ifTrue: [self pop: argumentCount + 1 thenPushInteger: (objectMemory fetchShort16: index ofObject: rcvr). ^0]. ^self primitiveFailFor: PrimErrBadIndex]. fmt = objectMemory sixtyFourBitIndexableFormat ifTrue: [numSlots := objectMemory num64BitUnitsOf: rcvr. (self asUnsigned: index) < numSlots ifTrue: [self pop: argumentCount + 1 thenPush: (self positive64BitIntegerFor: (objectMemory fetchLong64: index ofObject: rcvr)). ^0]. ^self primitiveFailFor: PrimErrBadIndex]. fmt >= objectMemory firstLongFormat ifTrue: [numSlots := objectMemory num32BitUnitsOf: rcvr. (self asUnsigned: index) < numSlots ifTrue: [self pop: argumentCount + 1 thenPush: (objectMemory bytesPerOop = 8 ifTrue: [objectMemory integerObjectOf: (objectMemory fetchLong32: index ofObject: rcvr)] ifFalse: [self positive32BitIntegerFor: (objectMemory fetchLong32: index ofObject: rcvr)]). ^0]. ^self primitiveFailFor: PrimErrBadIndex]. ^self primitiveFailFor: PrimErrBadReceiver! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSlotAtPut (in category 'object access primitives') ----- primitiveSlotAtPut "Assign a slot in an object. This numbers all slots from 1, ignoring the distinction between named and indexed inst vars. In objects with both named and indexed inst vars, the named inst vars preceed the indexed ones. In non-object indexed objects (objects that contain bits, not object references) this primitive assigns a raw integral value at each slot." | newValue index rcvr fmt numSlots value | newValue := self stackTop. index := self stackValue: 1. rcvr := self stackValue: 2. (objectMemory isIntegerObject: index) ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. (objectMemory isImmediate: rcvr) ifTrue: [^self primitiveFailFor: PrimErrBadReceiver]. fmt := objectMemory formatOf: rcvr. + index := (objectMemory integerValueOf: index) - 1. - index := objectMemory integerValueOf: index. fmt <= objectMemory lastPointerFormat ifTrue: [numSlots := objectMemory numSlotsOf: rcvr. (self asUnsigned: index) < numSlots ifTrue: [objectMemory storePointer: index ofObject: rcvr withValue: newValue. self pop: argumentCount + 1 thenPush: newValue. ^0]. ^self primitiveFailFor: PrimErrBadIndex]. value := self positiveMachineIntegerValueOf: newValue. self failed ifTrue: [primFailCode := PrimErrBadArgument. ^0]. fmt >= objectMemory firstByteFormat ifTrue: [fmt >= objectMemory firstCompiledMethodFormat ifTrue: [^self primitiveFailFor: PrimErrUnsupported]. (self asUnsigned: value) > 16rFF ifTrue: [^self primitiveFailFor: PrimErrBadArgument]. numSlots := objectMemory numBytesOf: rcvr. (self asUnsigned: index) < numSlots ifTrue: [objectMemory storeByte: index ofObject: rcvr withValue: value. self pop: argumentCount + 1 thenPush: newValue. ^0]. ^self primitiveFailFor: PrimErrBadIndex]. (objectMemory hasSpurMemoryManagerAPI and: [fmt >= objectMemory firstShortFormat]) ifTrue: [(self asUnsigned: value) > 16rFFFF ifTrue: [^self primitiveFailFor: PrimErrBadArgument]. numSlots := objectMemory num16BitUnitsOf: rcvr. (self asUnsigned: index) < numSlots ifTrue: [objectMemory storeShort16: index ofObject: rcvr withValue: value. self pop: argumentCount + 1 thenPush: newValue. ^0]. ^self primitiveFailFor: PrimErrBadIndex]. (objectMemory bytesPerOop = 8 and: [fmt = objectMemory sixtyFourBitIndexableFormat]) ifTrue: [numSlots := objectMemory num64BitUnitsOf: rcvr. (self asUnsigned: index) < numSlots ifTrue: [objectMemory storeLong64: index ofObject: rcvr withValue: value. self pop: argumentCount + 1 thenPush: newValue. ^0]. ^self primitiveFailFor: PrimErrBadIndex]. fmt >= objectMemory firstLongFormat ifTrue: [(objectMemory wordSize > 4 and: [(self asUnsigned: value) > 16rFFFFFFFF]) ifTrue: [^self primitiveFailFor: PrimErrBadArgument]. numSlots := objectMemory num32BitUnitsOf: rcvr. (self asUnsigned: index) < numSlots ifTrue: [objectMemory storeLong32: index ofObject: rcvr withValue: value. self pop: argumentCount + 1 thenPush: newValue. ^0]. ^self primitiveFailFor: PrimErrBadIndex]. ^self primitiveFailFor: PrimErrBadReceiver! Item was changed: ----- Method: Spur32BitCoMemoryManager>>ifAProxy:updateCopy: (in category 'image segment in/out') ----- ifAProxy: objOop updateCopy: copy + "If the object being copied to the segment is weird and has exotic state, - "If the obejct being copied to the segment is weird and has exotic state, i.e. a married context or a jitted method, update the copy with the vanilla state." super ifAProxy: objOop updateCopy: copy. (self isCompiledMethod: objOop) ifTrue: [| methodHeader | methodHeader := coInterpreter rawHeaderOf: objOop. (coInterpreter isCogMethodReference: methodHeader) ifTrue: [self storePointerUnchecked: HeaderIndex ofObject: copy withValue: (coInterpreter cCoerceSimple: methodHeader to: #'CogMethod *') methodHeader]]! Item was changed: ----- Method: Spur64BitCoMemoryManager>>ifAProxy:updateCopy: (in category 'image segment in/out') ----- ifAProxy: objOop updateCopy: copy + "If the object being copied to the segment is weird and has exotic state, - "If the obejct being copied to the segment is weird and has exotic state, i.e. a married context or a jitted method, update the copy with the vanilla state." super ifAProxy: objOop updateCopy: copy. (self isCompiledMethod: objOop) ifTrue: [| methodHeader | methodHeader := coInterpreter rawHeaderOf: objOop. (coInterpreter isCogMethodReference: methodHeader) ifTrue: [self storePointerUnchecked: HeaderIndex ofObject: copy withValue: (coInterpreter cCoerceSimple: methodHeader to: #'CogMethod *') methodHeader]]! Item was changed: ----- Method: SpurMemoryManager>>ifAProxy:updateCopy: (in category 'image segment in/out') ----- ifAProxy: objOop updateCopy: copy + "If the object being copied to the segment is weird and has exotic state, - "If the obejct being copied to the segment is weird and has exotic state, i.e. a married context or a jitted method, update the copy with the vanilla state." ((self isContext: objOop) and: [coInterpreter isMarriedOrWidowedContext: objOop]) ifTrue: [| numMediatedSlots | "Since the context is here via objectsReachableFromRoots: we know it cannot be divorced. I'd like to assert coInterpreter checkIsStillMarriedContext: objOop currentFP: framePointer, here but that requires access to framePointer." numMediatedSlots := coInterpreter numSlotsOfMarriedContext: objOop. 0 to: numMediatedSlots - 1 do: [:i| | oop | oop := coInterpreter fetchPointer: i ofMarriedContext: objOop. self storePointerUnchecked: i ofObject: copy withValue: oop]. "And make sure to nil the slots beyond the top of stack..." numMediatedSlots to: (self numSlotsOf: objOop) - 1 do: [:i| self storePointerUnchecked: i ofObject: copy withValue: nilObj]]! Item was changed: ----- Method: StackInterpreter>>externalInstVar:ofContext: (in category 'frame access') ----- externalInstVar: offset ofContext: aContext "Fetch an instance variable from a maybe married context. If the context is still married compute the value of the relevant inst var from the spouse frame's state." + <inline: false> self assert: (objectMemory isContext: aContext). "method, closureOrNil & receiver need no special handling; only sender, pc & stackp have to be computed for married contexts." ((self isReadMediatedContextInstVarIndex: offset) and: [self isMarriedOrWidowedContext: aContext]) ifFalse: [^objectMemory fetchPointer: offset ofObject: aContext]. self externalWriteBackHeadFramePointers. ^(self isStillMarriedContext: aContext) ifTrue: [self fetchPointer: offset ofMarriedContext: aContext] ifFalse: [objectMemory fetchPointer: offset ofObject: aContext]! Item was changed: ----- Method: StackInterpreterPrimitives>>primitiveSlotAt (in category 'object access primitives') ----- primitiveSlotAt + "Answer a slot in an object. This numbers all slots from 1, ignoring the distinction between + named and indexed inst vars. In objects with both named and indexed inst vars, the named + inst vars preceed the indexed ones. In non-object indexed objects (objects that contain + bits, not object references) this primitive answers the raw integral value at each slot. + e.g. for Strings it answers the character code, not the Character object at each slot." + | index rcvr fmt numSlots | - | index rcvr numSlots value | index := self stackTop. rcvr := self stackValue: 1. (objectMemory isIntegerObject: index) ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. (objectMemory isImmediate: rcvr) ifTrue: [^self primitiveFailFor: PrimErrBadReceiver]. + fmt := objectMemory formatOf: rcvr. + index := (objectMemory integerValueOf: index) - 1. + + fmt <= objectMemory lastPointerFormat ifTrue: - index := objectMemory integerValueOf: index. - (objectMemory isPointersNonImm: rcvr) ifTrue: [numSlots := objectMemory numSlotsOf: rcvr. (self asUnsigned: index) < numSlots ifTrue: + [| value numLiveSlots | + (objectMemory isContextNonImm: rcvr) + ifTrue: + [self externalWriteBackHeadFramePointers. + numLiveSlots := (self stackPointerForMaybeMarriedContext: rcvr) + CtxtTempFrameStart. + value := (self asUnsigned: index) < numLiveSlots + ifTrue: [self externalInstVar: index ofContext: rcvr] + ifFalse: [objectMemory nilObject]] + ifFalse: + [value := objectMemory fetchPointer: index ofObject: rcvr]. - [(objectMemory isContextNonImm: rcvr) - ifTrue: [value := self externalInstVar: index ofContext: rcvr] - ifFalse: [value := objectMemory fetchPointer: index ofObject: rcvr]. self pop: argumentCount + 1 thenPush: value. ^0]. ^self primitiveFailFor: PrimErrBadIndex]. + + fmt >= objectMemory firstByteFormat ifTrue: + [fmt >= objectMemory firstCompiledMethodFormat ifTrue: + [^self primitiveFailFor: PrimErrUnsupported]. + numSlots := objectMemory numBytesOf: rcvr. + (self asUnsigned: index) < numSlots ifTrue: + [self pop: argumentCount + 1 thenPushInteger: (objectMemory fetchByte: index ofObject: rcvr). + ^0]. + ^self primitiveFailFor: PrimErrBadIndex]. + + (objectMemory hasSpurMemoryManagerAPI + and: [fmt >= objectMemory firstShortFormat]) ifTrue: + [numSlots := objectMemory num16BitUnitsOf: rcvr. + (self asUnsigned: index) < numSlots ifTrue: + [self pop: argumentCount + 1 thenPushInteger: (objectMemory fetchShort16: index ofObject: rcvr). + ^0]. + ^self primitiveFailFor: PrimErrBadIndex]. + + fmt = objectMemory sixtyFourBitIndexableFormat ifTrue: + [numSlots := objectMemory num64BitUnitsOf: rcvr. + (self asUnsigned: index) < numSlots ifTrue: + [self pop: argumentCount + 1 + thenPush: (self positive64BitIntegerFor: (objectMemory fetchLong64: index ofObject: rcvr)). + ^0]. + ^self primitiveFailFor: PrimErrBadIndex]. + + fmt >= objectMemory firstLongFormat ifTrue: + [numSlots := objectMemory num32BitUnitsOf: rcvr. + (self asUnsigned: index) < numSlots ifTrue: + [self pop: argumentCount + 1 + thenPush: (objectMemory bytesPerOop = 8 + ifTrue: [objectMemory integerObjectOf: (objectMemory fetchLong32: index ofObject: rcvr)] + ifFalse: [self positive32BitIntegerFor: (objectMemory fetchLong32: index ofObject: rcvr)]). + ^0]. + ^self primitiveFailFor: PrimErrBadIndex]. + - "for now just fail for non-pointer objects; the issue here is should - strings answer characters and if so how do we efficiently identify strings?" ^self primitiveFailFor: PrimErrBadReceiver! Item was changed: ----- Method: StackInterpreterPrimitives>>primitiveSlotAtPut (in category 'object access primitives') ----- primitiveSlotAtPut + "Assign a slot in an object. This numbers all slots from 1, ignoring the distinction between + named and indexed inst vars. In objects with both named and indexed inst vars, the named + inst vars preceed the indexed ones. In non-object indexed objects (objects that contain + bits, not object references) this primitive assigns a raw integral value at each slot." + | newValue index rcvr fmt numSlots value | - | newValue index rcvr numSlots | newValue := self stackTop. index := self stackValue: 1. rcvr := self stackValue: 2. (objectMemory isIntegerObject: index) ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. (objectMemory isImmediate: rcvr) ifTrue: [^self primitiveFailFor: PrimErrBadReceiver]. + fmt := objectMemory formatOf: rcvr. + index := (objectMemory integerValueOf: index) - 1. + + fmt <= objectMemory lastPointerFormat ifTrue: - index := objectMemory integerValueOf: index. - (objectMemory isPointersNonImm: rcvr) ifTrue: [numSlots := objectMemory numSlotsOf: rcvr. (self asUnsigned: index) < numSlots ifTrue: [(objectMemory isContextNonImm: rcvr) ifTrue: [self externalInstVar: index ofContext: rcvr put: newValue] ifFalse: [objectMemory storePointer: index ofObject: rcvr withValue: newValue]. self pop: argumentCount + 1 thenPush: newValue. ^0]. ^self primitiveFailFor: PrimErrBadIndex]. + + value := self positiveMachineIntegerValueOf: newValue. + self failed ifTrue: + [primFailCode := PrimErrBadArgument. + ^0]. + + fmt >= objectMemory firstByteFormat ifTrue: + [fmt >= objectMemory firstCompiledMethodFormat ifTrue: + [^self primitiveFailFor: PrimErrUnsupported]. + (self asUnsigned: value) > 16rFF ifTrue: + [^self primitiveFailFor: PrimErrBadArgument]. + numSlots := objectMemory numBytesOf: rcvr. + (self asUnsigned: index) < numSlots ifTrue: + [objectMemory storeByte: index ofObject: rcvr withValue: value. + self pop: argumentCount + 1 thenPush: newValue. + ^0]. + ^self primitiveFailFor: PrimErrBadIndex]. + + (objectMemory hasSpurMemoryManagerAPI + and: [fmt >= objectMemory firstShortFormat]) ifTrue: + [(self asUnsigned: value) > 16rFFFF ifTrue: + [^self primitiveFailFor: PrimErrBadArgument]. + numSlots := objectMemory num16BitUnitsOf: rcvr. + (self asUnsigned: index) < numSlots ifTrue: + [objectMemory storeShort16: index ofObject: rcvr withValue: value. + self pop: argumentCount + 1 thenPush: newValue. + ^0]. + ^self primitiveFailFor: PrimErrBadIndex]. + + (objectMemory bytesPerOop = 8 + and: [fmt = objectMemory sixtyFourBitIndexableFormat]) ifTrue: + [numSlots := objectMemory num64BitUnitsOf: rcvr. + (self asUnsigned: index) < numSlots ifTrue: + [objectMemory storeLong64: index ofObject: rcvr withValue: value. + self pop: argumentCount + 1 thenPush: newValue. + ^0]. + ^self primitiveFailFor: PrimErrBadIndex]. + + fmt >= objectMemory firstLongFormat ifTrue: + [(objectMemory wordSize > 4 + and: [(self asUnsigned: value) > 16rFFFFFFFF]) ifTrue: + [^self primitiveFailFor: PrimErrBadArgument]. + numSlots := objectMemory num32BitUnitsOf: rcvr. + (self asUnsigned: index) < numSlots ifTrue: + [objectMemory storeLong32: index ofObject: rcvr withValue: value. + self pop: argumentCount + 1 thenPush: newValue. + ^0]. + ^self primitiveFailFor: PrimErrBadIndex]. + - "for now just fail for non-pointer objects; the issue here is should - strings answer characters and if so how do we efficiently identify strings?" ^self primitiveFailFor: PrimErrBadReceiver!

1 0

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

27 Dec '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.234.mcz ==================== Summary ==================== Name: Cog-eem.234 Author: eem Time: 26 December 2014, 5:04:24.947 pm UUID: 2b93cb60-8665-447a-80ae-51f51b1f7750 Ancestors: Cog-eem.233 Spur bootstrap: Add error codes to the forwarding become primitives and correct the comment of elementsForwardIdentityTo:copyHash: =============== Diff against Cog-eem.233 =============== Item was added: + ----- Method: SpurBootstrapPrototypes>>ArrayPROTOTYPEelementsForwardIdentityTo: (in category 'method prototypes') ----- + ArrayPROTOTYPEelementsForwardIdentityTo: otherArray + "This primitive performs a bulk mutation, causing all pointers to the elements of the + receiver to be replaced by pointers to the corresponding elements of otherArray. + The identityHashes remain with the pointers rather than with the objects so that + the objects in this array should still be properly indexed in any existing hashed + structures after the mutation." + <primitive: 72 error: ec> + self primitiveFailed! Item was added: + ----- Method: SpurBootstrapPrototypes>>ArrayPROTOTYPEelementsForwardIdentityTo:copyHash: (in category 'method prototypes') ----- + ArrayPROTOTYPEelementsForwardIdentityTo: otherArray copyHash: copyHash + "This primitive performs a bulk mutation, causing all pointers to the elements of the + receiver to be replaced by pointers to the corresponding elements of otherArray. + If copyHash is true, the identityHashes remain with the pointers rather than with the + objects so that the objects in the receiver should still be properly indexed in any + existing hashed structures after the mutation. If copyHash is false, then the hashes + of the objects in otherArray remain unchanged. If you know what you're doing this + may indeed be what you want." + <primitive: 249 error: ec> + self primitiveFailed!

1 0

VM Maker: CMakeVMMakerSqueak-tty.109.mcz
by commits＠source.squeak.org 26 Dec '14

26 Dec '14

Timothy M uploaded a new version of CMakeVMMakerSqueak to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMakerSqueak-tty.109.mcz ==================== Summary ==================== Name: CMakeVMMakerSqueak-tty.109 Author: tty Time: 26 December 2014, 5:25:15.96 pm UUID: 472e679e-1009-44b7-852f-cdb93a9d8926 Ancestors: CMakeVMMakerSqueak-tty.108 Added some pages to the new configuration help. Added Ubuntu version of Linuxx86_64 with 32 bit compat libs abstract base class. =============== Diff against CMakeVMMakerSqueak-tty.108 =============== Item was changed: ----- Method: CMakePluginVm>>template (in category 'accessing') ----- template |temp sourcesString cflags| cflags:= String streamContents: [:stream | config compilerFlags asStringOn: stream delimiter: ' ' ]. cflags := '"' , cflags , '"'. sourcesString := String streamContents: [:stream | sources asStringOn: stream delimiter: ' ' ]. temp := OrderedCollection new. temp addLast: ((CMakeHeader new) configurationName: config class name ); addLast: ((CMakeProject new)variable: module ); + addLast: ((CMakeMinimumRequired new) version: '2.8.12'); - addLast: ((CMakeMinimumRequired new) version: '3.0.0'); addLast: ((CMakeInclude new) file: ((config buildDir fullName), FileDirectory slash, 'directories.cmake')) ; addLast:((CMakeAddDefinitions new) definitions: config compilerDefinitions asOrderedCollection); addLast:((CMakeAddDefinitions new) definitions: config compilerFlags asOrderedCollection); addLast:((CMakeAddDefinitions new) definitions: definitions); " addLast:((CMakeSet new) variable:'sources' quotedValue: sourcesString);" addLast:((CMakeSet new) variable:'sources' value: sourcesString); addLast:((CMakeAddLibrary new) library: module type: 'SHARED' sources: (OrderedCollection with: '${sources}')); addLast: ((CMakeIncludeDirectories new) dirs: includedirectories); addLast:((CMakeSet new) variable: 'LIBRARY_OUTPUT_PATH' quotedValue: (config outputDir fullName)); " addLast:((CMakeListAppend new) list: 'LINKLIBS' elements: (config externalLibs));" addLast:((CMakeTargetLinkLibraries new) target: module items: (OrderedCollection with: '${LINKLIBS}')); addLast:((CMakeSetTargetProperties new) target: module propertiesandvalues: (OrderedCollection with: 'PREFIX "" ' with: 'SUFFIX "" ' with: 'LINK_FLAGS ' , cflags)) . ^temp! Item was removed: - ----- Method: CMakeVMMakerSqueakStepByStepNewConfigurationHelp class>>choosePlugins (in category 'pages') ----- - choosePlugins - ^HelpTopic - title:'Choose Plugins' - contents: - ' - - '! Item was added: + ----- Method: CMakeVMMakerSqueakStepByStepNewConfigurationHelp class>>compilingLinkingSetup (in category 'pages') ----- + compilingLinkingSetup + ^HelpTopic + title:'Compiling and Linking Setup' + contents: + 'In your concrete configuration''s ''compiling'' protocol contains the methods that you must customize for your Configuration + + cmakeAddDefinitionsBuild + cmakeCFlagsBuild + externalLibsBuild + linkerFlags + + + '! Item was added: + ----- Method: CMakeVMMakerSqueakStepByStepNewConfigurationHelp class>>customizePlugins (in category 'pages') ----- + customizePlugins + ^HelpTopic + title:'customize Plugins' + contents: + 'We can customize which plugins we want on our configuration by overriding our platform''s defaultExternalPlugins and defaultInternalPlugins methods. + + The default set can be further customized according to buildType if desired via the externalPlugins[BuildType] and internalPlugins[BuildType] redirect pattern + + + '! Item was added: + ----- Method: CMakeVMMakerSqueakStepByStepNewConfigurationHelp class>>customizeVMDrivers (in category 'pages') ----- + customizeVMDrivers + ^HelpTopic + title:'Specify VM Drivers' + contents: + 'The SqueakUnixConfig contains the unverisal list of VM Drivers for *nix. + + In our concrete Configuration, we need to specify which ones we want for out build. + + We do this by overloading the SqueakUnixConfig>>customizeVMDrivers method. + + '! Item was changed: ----- Method: CMakeVMMakerSqueakStepByStepNewConfigurationHelp class>>overview (in category 'pages') ----- overview ^HelpTopic title:'Overview' contents: + 'This Help Topic presents the workflow the author used in creating the Squeak, Cog, V3 CMake configuration for a pure 32 bit Slackware 14.1 system. - 'This Help Topic is a running commentary on how I created Squeak, Cog, V3 CMake configuration for a pure 32 bit Slackware 14.1 system. The steps involved should be the same for any platform.'! Item was changed: ----- Method: CMakeVMMakerSqueakStepByStepNewConfigurationHelp class>>pages (in category 'accessing') ----- pages ^#(overview tests identifyPlatform identifyPlatformAbstractBaseClass identifyBuilder createTheConfiguration excludingConfigFromBuilds setAvailableBuildTypes firstCMakeGeneration takingStock + theVMGenerator + reviewMethodRedirectPattern + setOutputDirectory - setOutputPath settingPlugins + compilingLinkingSetup + customizeVMDrivers + customizePlugins aNoteOnFoo )! Item was added: + ----- Method: CMakeVMMakerSqueakStepByStepNewConfigurationHelp class>>reviewMethodRedirectPattern (in category 'pages') ----- + reviewMethodRedirectPattern + ^HelpTopic + title:'Review of Method Redirect Pattern' + contents: + 'Besides the VMGenerator>>generateByTemplate, the system relies heavily on what I call a Method Redirect Pattern. + + If you have not read it yet, its a short read here: + + HelpBrowser openOn: CMakeVMMakerSqueakDesignPatternsHelp + + ' + + ! Item was added: + ----- Method: CMakeVMMakerSqueakStepByStepNewConfigurationHelp class>>setOutputDirectory (in category 'pages') ----- + setOutputDirectory + ^HelpTopic + title:'Set Output Directory' + contents: + 'The output directory is where the finished product is placed when the compilation is successful. + + Typically this is ''oscogvm/cmake.products/foo/ + + The topmost configuration CPlatformConfigForSqueak defines the output directory as such: + + outputDir + "the directory where built binaries will be stored" + ^ outputDir ifNil: [ outputDir := (self topDir / self dirOutput / self dirInstall) ] + + which (on linux) translates to ''oscogvm/cmaike.products/(subclass resposibility))'' + + Its that (subclass responsibility) we have to customize in our new configuration. + + The convention we use is [Language][VM][MemoryModel] + + Since I am building a Squeak Cog V3 configuration, my method should return "squeak.cog.v3" + + If you look at implementors of dirInstall, you will see that they typically return some pre-defined strings that are defined in the ''cmake directory'' protocol of CPlatformConfigForSqueak. + + For my configuration you can see that I return the "^self squeakCogV3" which returns the directory name that matches the [Language][VM][Memory Model] pattern I need. + + + + + '! Item was removed: - ----- Method: CMakeVMMakerSqueakStepByStepNewConfigurationHelp class>>setOutputPath (in category 'pages') ----- - setOutputPath - ^HelpTopic - title:'Set Output Path' - contents: - 'WRITE ME - - '! Item was changed: ----- Method: CMakeVMMakerSqueakStepByStepNewConfigurationHelp class>>takingStock (in category 'pages') ----- takingStock ^HelpTopic title:'Where You Are Now' contents: ' If your Concrete Builder has successfully generate the CMake tree in the correct folder structure then you are almost done. The rest of the process from here on out is tweaking the Concrete Configuration so that it generates valid CMake for your platform and buildTypes. If you have not generated CMake output at this point, go back and try until you can. At this point, please evaluate: HelpBrowser openOn: CMakeVMMakerSqueakDesignPatternsHelp + And read the section on the Method Redirect Pattern before continuing. - And read the secion on the Method Redirect Pattern before continuing. ' ! Item was added: + ----- Method: CMakeVMMakerSqueakStepByStepNewConfigurationHelp class>>theVMGenerator (in category 'pages') ----- + theVMGenerator + ^HelpTopic + title:'The VM Generator' + contents: + 'Before we move onto setting the most common directives and flags in the Concrete Configuration, lets take a quick look at the method that actually generates the CMake files for us. You probably will not need this, but its handy to know of. + + CMakeVMGeneratorForSqueak browse + + Look at the generateByTemplate method and the long cascade that starts with: + + config + setGlobalOptions: self; + cmakePrefixPath; + cmakeIncludePath;..... + + + Here you see the generator extracting CMake data from your Configuration in a straighforward order. + + The names of the methods are a bit of a holdover from the pharo code and do not conceptually match the sections of Ian Piumarta''s CMake template. + + If you generate your CMake files with message tracking enabled as per below + + SqueakLinux32x86Builder + configureA: #Linux32x86SqueakCogV3Config forBuildType:#build; + enableMessageTracking: true; <---message tracking + generateByTemplate. + + + You can see in your CMakeLists.txt which method is responsible for which bits of code. + + Here we see these two lines from the VMGenerator + + config + .... + cmakeIncludeDirectories: self; + preferredIncludes; + .... + + tracked in the CMakeLists.txt + + message( "Linux32x86SqueakCogV3Config includeDirs: aMaker") <---message tracking message + include_directories( ${crossDir}/vm ${srcVMDir} ${targetPlatform}/vm ${buildDir}) <--output of cmakeIncludeDirectories:self + message( "Linux32x86SqueakCogV3Config preferredIncludesBuild") <--message tracking message + include_directories( ${targetPlatform}/plugins/B3DAcceleratorPlugin) <-- output of preferredIncludesBuild + + ' + + ! Item was changed: ----- Method: CPlatformConfigForSqueak>>setGlobalOptionsBuild: (in category 'cmake buildType redirects') ----- setGlobalOptionsBuild: aMaker "These are CMakeLists.txt commands that span all platforms. Extend me as needed. SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptions'" (enabledebugmessages) ifTrue:[ templates addLast: ((CMakeMessage new) message: (self class name), ' setGlobalOptionsBuild: aMaker') ]. templates addLast: ((CMakeHeader new) configurationName: self class name ); addLast: ((CMakeProject new)variable: self executableName ); + addLast: ((CMakeMinimumRequired new) version: '2.8.12'); - addLast: ((CMakeMinimumRequired new) version: '3.0.0'); addLast: ((CMakeSet new) variable: 'CMAKE_CONFIGURATION_TYPES' value: 'Release'). ! Item was changed: ----- Method: CPlatformConfigForSqueak>>setGlobalOptionsBuildDebug: (in category 'cmake buildType redirects') ----- setGlobalOptionsBuildDebug: aMaker "SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptions'" self flag: 'tty'. "study up on CMAKE_CONFIGURATION TYPES" templates addLast: ((CMakeMessage new) message: (self class name), ' setGlobalOptionsBuild: aMaker'); addLast: ((CMakeHeader new) configurationName: self class name ); addLast: ((CMakeProject new)variable: self executableName ); + addLast: ((CMakeMinimumRequired new) version: '2.8.12'); - addLast: ((CMakeMinimumRequired new) version: '3.0.0'); addLast: ((CMakeMessage new) message: 'CMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}'); addLast: ((CMakeSet new) variable: 'CMAKE_CONFIGURATION_TYPES' value: 'Debug'). ! Item was added: + ----- Method: Linux32x86Config>>externalLibraries (in category 'compiling') ----- + externalLibraries + ^#( + '-L/usr/lib' + '-L/usr/lib/X11' + 'uuid' "" + 'ssl' "" + 'crypto' "" + 'm' "C math library" + 'dl' "dynamic linking library" + 'pthread' "POSIX threads library" + 'SM' "session management library for X11" + 'ICE' "ICE is the Inter Client Exchange protocol, part of X11" + 'GL' "libGL implements the GLX interface as well as the main OpenGL API entrypoints" + 'X11' + 'nsl' "network services library" + ) + + + ! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>externalLibraries (in category 'compiling') ----- - externalLibraries - ^#( - '-L/usr/lib' - '-L/usr/lib/X11' - 'uuid' "" - 'ssl' "" - 'crypto' "" - 'm' "C math library" - 'dl' "dynamic linking library" - 'pthread' "POSIX threads library" - 'SM' "session management library for X11" - 'ICE' "ICE is the Inter Client Exchange protocol, part of X11" - 'GL' "libGL implements the GLX interface as well as the main OpenGL API entrypoints" - 'X11' - 'nsl' "network services library" - ) - - - ! Item was removed: - SqueakUnixConfig subclass: #Linux64x86w32BitConfig - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'CMakeVMMakerSqueak-Linux64X86-32BitCompatibility'! - - !Linux64x86w32BitConfig commentStamp: 'tty 12/8/2014 11:23' prior: 0! - A Linux64x86w32BitConfig is an Abstract base class that provides common information for my subclasses. - I am not meant to be built. - - I configure a VM according to my name's form: [Operating System] [WordSize] [Processor Language][VM MemoryManager][BuildType]Conf - - SqueakLinux64x86w32CompatBuilder - configureABuildFor: #ONE OF MY SUBCLASSES NAME HERE withBuildType: #build; - enableMessageTracking: true; - generateByTemplate. - - - - HelpBrowser openOn: CMakeVMMakerSqueakDeveloperHelp - - - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>addVMPluginsBuild: (in category 'cmake buildType redirects') ----- - addVMPluginsBuild: aMaker - |temp o| - self flag:'tty'. "I am writing sub-directory CMakeLists.txt here. Should I also write the config.cmake files?" - enabledebugmessages - ifTrue: [templates "this message will go to the top level CMakeLists.txt file" - addLast: (CMakeMessage new message: self class name , 'addVMPluginsBuild: aMaker')]. - vmplugins do:[ :vmp | - o := String new writeStream. "each VMPlugin gets its own CMakeLists.txt file in its own directory" - temp := OrderedCollection new. - temp - addAllLast:((CMakePluginVm new) "this is the CMakeCompositTemplate" - config: self - definitions: (vmp compilerdefinitions) - module: (vmp module) - sources: (vmp sources) - includedirectories: (vmp includedirectories)). - temp do: [:each | o nextPutAll: (each content); cr]. - ((self buildDir) directoryExists: (vmp module)) - ifFalse:[ (self buildDir) createDirectory: (vmp module)]. - self write: (o contents) toFile: vmp module , FileDirectory slash , aMaker outputFileName. - templates "this will go to the top level CMakeLists.txt file" - addLast: ((CMakeAddSubDirectory new) sourcedir: (vmp module)) - ]. - - - - - - - - - - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>availableBuildTypes (in category 'cmake') ----- - availableBuildTypes - ^SqueakCMakeVMMakerAbstractBuilder default noBuildTypes - " - - subclasses should use - - ^super allBuildTypes copyWithoutAll: #( #assertWithHeartbeatTimer #debugWithHeartbeatTimer debugMultiThreadedFFI.....etc)) " - - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>coreSourcesBuild (in category 'cmake buildType redirects') ----- - coreSourcesBuild - "files to include from src/vm dir" - ^ #( - 'cogit.c' - 'gcc3x-cointerp.c' - )! Item was removed: - ----- Method: Linux64x86w32BitConfig>>coreSourcesBuildMultiThreaded (in category 'cmake buildType redirects') ----- - coreSourcesBuildMultiThreaded - "files to include from src/vm dir" - ^ #( - 'cogit.c' - 'cointerpmt.c' - )! Item was removed: - ----- Method: Linux64x86w32BitConfig>>customizeCMakeVMDisplayNull (in category 'plugins') ----- - customizeCMakeVMDisplayNull - |module| - module := vmplugins detect: [:vmd | #CMakeVMDisplayNull = ((vmd class name) asSymbol)] ifNone:[nil]. "error handling?" - module - sources: #('${targetPlatform}/vm-display-null/sqUnixDisplayNull') ; - compilerdefinitions:(OrderedCollection with: '-fPIC' with: '-DPIC'); - compilerflags: (self compilerFlags); - externallibraries: #(); - linkerflags: (self linkerFlags); - includedirectories:(OrderedCollection - with:'${crossDir}/plugins/FilePlugin' - with: '${targetPlatform}/plugins/B3DAcceleratorPlugin' - with: '${crossDir}/plugins/B3DAcceleratorPlugin'). - self flag:'tty'. "I don't think includedirectories is correct. revisit" - - - - - - - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>customizeCMakeVMDisplayX11 (in category 'plugins') ----- - customizeCMakeVMDisplayX11 - |module| - module := vmplugins detect: [:vmd | #CMakeVMDisplayX11 = ((vmd class name) asSymbol)] ifNone:[nil]. "error handling?" - module - sources: #( '${targetPlatform}/vm-display-X11/sqUnixX11' '${targetPlatform}/vm-display-X11/sqUnixMozilla' ); - compilerdefinitions:(OrderedCollection with: '-fPIC' with: '-DPIC'); - compilerflags: (self compilerFlags); - externallibraries: (self externalLibraries); - linkerflags: (self linkerFlags); - includedirectories:(OrderedCollection - with:'${crossDir}/plugins/FilePlugin' - with: '${targetPlatform}/plugins/B3DAcceleratorPlugin' - with: '${crossDir}/plugins/B3DAcceleratorPlugin'). - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>customizeCMakeVMSoundALSA (in category 'plugins') ----- - customizeCMakeVMSoundALSA - |module| - module := vmplugins detect: [:vmd | #CMakeVMSoundALSA = ((vmd class name) asSymbol)] ifNone:[nil]. "error handling?" - module - sources: #( '${targetPlatform}/vm-sound-ALSA/sqUnixSoundALSA' ); - compilerdefinitions:(OrderedCollection with: '-fPIC' with: '-DPIC'); - compilerflags: (self compilerFlags); - externallibraries: (self externalLibraries); - linkerflags: (self linkerFlags); - includedirectories: #(). - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>customizeCMakeVMSoundNull (in category 'plugins') ----- - customizeCMakeVMSoundNull - |module| - module := vmplugins detect: [:vmd | #CMakeVMSoundNull = ((vmd class name) asSymbol)] ifNone:[nil]. "error handling?" - module - sources: #( '${targetPlatform}/vm-sound-null/sqUnixSoundNull' ); - compilerdefinitions:(OrderedCollection with: '-fPIC' with: '-DPIC'); - compilerflags: (self compilerFlags); - externallibraries: (self externalLibraries); - linkerflags: (self linkerFlags); - includedirectories:#() - - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>customizeVMPlugins (in category 'plugins') ----- - customizeVMPlugins - |mysubset iwantonly| - "trim the vmdrivers ordered collection of CMakeVMDriver subclasses to only those I want. then customize them for use on this OS/platform" - iwantonly := #(#CMakeVMDisplayNull #CMakeVMDisplayX11 #CMakeVMSoundALSA #CMakeVMSoundNull ). - mysubset := vmplugins select: [:vmd | 0 < (iwantonly occurrencesOf: (vmd class name) asSymbol)]. - vmplugins := mysubset. - self - customizeCMakeVMDisplayNull; - customizeCMakeVMDisplayX11; - customizeCMakeVMSoundALSA; - customizeCMakeVMSoundNull. - - - - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>defaultExternalPlugins (in category 'plugins') ----- - defaultExternalPlugins - ^ #( - B3DAcceleratorPlugin - ThreadedIA32FFIPlugin "SqueakFFIPrims" - "UUIDPlugin" - "UnixOSProcessPlugin ?? " - JPEGReaderPlugin - JPEGReadWriter2Plugin - RePlugin - InternetConfigPlugin - ) - - "debug"! Item was removed: - ----- Method: Linux64x86w32BitConfig>>defaultInternalPlugins (in category 'plugins') ----- - defaultInternalPlugins - " took from unixbuild/bld/plugins.int" - ^ #( - ADPCMCodecPlugin - AsynchFilePlugin - BalloonEnginePlugin "B2DPlugin" - BitBltSimulation "BitBltPlugin" - BMPReadWriterPlugin - CroquetPlugin - DeflatePlugin "ZipPlugin" - DropPlugin - DSAPlugin "DSAPrims" - FFTPlugin - FileCopyPlugin - FilePlugin - FloatArrayPlugin - FloatMathPlugin - JoystickTabletPlugin - KlattSynthesizerPlugin "Klatt" - LargeIntegersPlugin "LargeIntegers" - Matrix2x3Plugin - MIDIPlugin - MiscPrimitivePlugin - Mpeg3Plugin - SecurityPlugin - SerialPlugin - SocketPlugin - SoundCodecPlugin "SoundCodecPrims" - SoundGenerationPlugin - SoundPlugin - StarSqueakPlugin - SurfacePlugin - LocalePlugin - )! Item was removed: - ----- Method: Linux64x86w32BitConfig>>dirBuildPlatform (in category 'cmake') ----- - dirBuildPlatform - ^self dirLinux64x86w32BitCompatibility! Item was removed: - ----- Method: Linux64x86w32BitConfig>>excludeFromBuild (in category 'cmake') ----- - excludeFromBuild - "over-ride to exclude yourself from a build or not" - ^true! Item was removed: - ----- Method: Linux64x86w32BitConfig>>executableName (in category 'cmake') ----- - executableName - "AbstractBaseClass configurations are not meant to be executable" - ^ self vmIShouldNotBeHereExecutableName! Item was removed: - ----- Method: Linux64x86w32BitConfig>>externalPluginsBuild (in category 'cmake buildType redirects') ----- - externalPluginsBuild - ^ externalPlugins ifNil: [ externalPlugins := self defaultExternalPlugins ]! Item was removed: - ----- Method: Linux64x86w32BitConfig>>extraPluginSettingsBuild: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuild: aMaker - aMaker isExternal - ifTrue:[aMaker templates addLast:((CMakeSet new) variable:'LIBRARY_OUTPUT_PATH' value:'${outputDir}')]. - aMaker templates addLast:((CMakeSet new) variable:'linkFlags' quotedValue:'${linkFlags} -m32'). - - - " maker isExternal ifTrue: [ - maker set: 'LIBRARY_OUTPUT_PATH' to: '${outputDir}' - ]. - maker set: #linkFlags toString: '${linkFlags} -m32'"! Item was removed: - ----- Method: Linux64x86w32BitConfig>>internalPluginsBuild (in category 'cmake buildType redirects') ----- - internalPluginsBuild - ^ internalPlugins ifNil: [ internalPlugins := self defaultInternalPlugins ]! Item was removed: - ----- Method: Linux64x86w32BitConfig>>postBuildActionsBuild: (in category 'cmake buildType redirects') ----- - postBuildActionsBuild: aMaker - "SystemNavigation default browseMethodsWhoseNamesContain: 'postBuildActionsBuild:'" - (aMaker config enabledebugmessages) - ifTrue:[ - aMaker config templates - addLast: ((CMakeMessage new) message: (self class name), ' postBuildActionsBuild' ) - ]. - aMaker config templates - addLast: ((CMakeMessage new) message: 'postBuildActionsBuild: aMaker' ); - addLast:((CMakeCommand new) command:'include' params:'config.cmake'); "cmake --help-command include " - addLast:((CMakeCommand new) command:'LIST' params:'REMOVE_DUPLICATES config_vars'); "cmake --help-command LIST" - addLast:((CMakeCommand new) command:'FILE' params:'WRITE ${CMAKE_BINARY_DIR}/config.h.in ""'); "cmake --help-command FILE" - addLast:(CMakeAppendConfigHIn new); - addLast:((CMakeCommand new) command:'CONFIGURE_FILE' params:'${CMAKE_BINARY_DIR}/config.h.in ${CMAKE_BINARY_DIR}/config.h'); - addLast:((CMakeCommand new) command:'GET_CMAKE_PROPERTY' params:'tmp VARIABLES'); - addLast:((CMakeCommand new) command:'LIST' params:'REMOVE_ITEM tmp tmp'); - addLast:((CMakeCommand new) command:'LIST' params:'SORT tmp'); - addLast:((CMakeCommand new) command:'FILE' params:'WRITE ${CMAKE_BINARY_DIR}/config.h.status ""'); - addLast:(CMakeAppendConfigStatus new). - - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>preferredIncludesBuild (in category 'cmake buildType redirects') ----- - preferredIncludesBuild - (enabledebugmessages) - ifTrue:[ - templates - addLast: ((CMakeMessage new) message: (self class name), ' preferredIncludesBuild' ) - ]. - templates - addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${targetPlatform}/plugins/B3DAcceleratorPlugin')). - - (enabledebugmessages) - ifTrue:[ - templates - addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_PATH = ${CMAKE_INCLUDE_PATH}' ); - addLast: ((CMakeMessage new) message: 'CMAKE_SYSTEM_INCLUDE_PATH = ${CMAKE_SYSTEM_INCLUDE_PATH}' ); - addLast: ((CMakeMessage new) message: 'CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES = ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}' ); - addLast: ((CMakeMessage new) message: 'CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES = ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}' ); - addLast: ((CMakeMessage new) message: 'CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = ${CMAKE_FIND_ROOT_PATH_MODE_INCLUDE}' ); - addLast: ((CMakeMessage new) message: 'CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = ${CMAKE_INCLUDE_CURRENT_DIR}' ); - addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE = ${CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE}' ); - addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_DIRECTORIES_BEFORE = ${CMAKE_INCLUDE_DIRECTORIES_BEFORE}' ); - addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE = ${CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE}' ) - ].! Item was added: + SqueakUnixConfig subclass: #Linux64x86w32BitConfigUsrLib + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-Linux64X86-32BitCompatibility'! + + !Linux64x86w32BitConfigUsrLib commentStamp: 'tty 12/26/2014 11:42' prior: 0! + A Linux64x86w32BitConfigUsrLib is an Abstract base class that provides common information for my subclasses. + I am not meant to be built. + + I am a configuration for linux64x86 where the 32 bit compatibility libraries reside in /usr/lib (example: Slackware64 14.1) + + Some linux platforms (such as Ubuntu). store their 32 bit compat libs in /usr/lib32. For those, use subclasses of Linux64x86w32BitConfigUsrLib32 + + + I configure a VM according to my name's form: [Operating System] [WordSize] [Processor Language][VM MemoryManager][BuildType]Conf[Foo] + + SqueakLinux64x86w32CompatBuilder + configureABuildFor: #ONE OF MY SUBCLASSES NAME HERE withBuildType: #build; + enableMessageTracking: true; + generateByTemplate. + + + + HelpBrowser openOn: CMakeVMMakerSqueakHelp + + + ! Item was added: + ----- Method: Linux64x86w32BitConfigUsrLib>>addVMPluginsBuild: (in category 'cmake buildType redirects') ----- + addVMPluginsBuild: aMaker + |temp o| + self flag:'tty'. "I am writing sub-directory CMakeLists.txt here. Should I also write the config.cmake files?" + enabledebugmessages + ifTrue: [templates "this message will go to the top level CMakeLists.txt file" + addLast: (CMakeMessage new message: self class name , 'addVMPluginsBuild: aMaker')]. + vmplugins do:[ :vmp | + o := String new writeStream. "each VMPlugin gets its own CMakeLists.txt file in its own directory" + temp := OrderedCollection new. + temp + addAllLast:((CMakePluginVm new) "this is the CMakeCompositTemplate" + config: self + definitions: (vmp compilerdefinitions) + module: (vmp module) + sources: (vmp sources) + includedirectories: (vmp includedirectories)). + temp do: [:each | o nextPutAll: (each content); cr]. + ((self buildDir) directoryExists: (vmp module)) + ifFalse:[ (self buildDir) createDirectory: (vmp module)]. + self write: (o contents) toFile: vmp module , FileDirectory slash , aMaker outputFileName. + templates "this will go to the top level CMakeLists.txt file" + addLast: ((CMakeAddSubDirectory new) sourcedir: (vmp module)) + ]. + + + + + + + + + + ! Item was added: + ----- Method: Linux64x86w32BitConfigUsrLib>>availableBuildTypes (in category 'cmake') ----- + availableBuildTypes + ^SqueakCMakeVMMakerAbstractBuilder default noBuildTypes + " + + subclasses should use + + ^super allBuildTypes copyWithoutAll: #( #assertWithHeartbeatTimer #debugWithHeartbeatTimer debugMultiThreadedFFI.....etc)) " + + ! Item was added: + ----- Method: Linux64x86w32BitConfigUsrLib>>coreSourcesBuild (in category 'cmake buildType redirects') ----- + coreSourcesBuild + "files to include from src/vm dir" + ^ #( + 'cogit.c' + 'gcc3x-cointerp.c' + )! Item was added: + ----- Method: Linux64x86w32BitConfigUsrLib>>coreSourcesBuildMultiThreaded (in category 'cmake buildType redirects') ----- + coreSourcesBuildMultiThreaded + "files to include from src/vm dir" + ^ #( + 'cogit.c' + 'cointerpmt.c' + )! Item was added: + ----- Method: Linux64x86w32BitConfigUsrLib>>customizeCMakeVMDisplayNull (in category 'plugins') ----- + customizeCMakeVMDisplayNull + |module| + module := vmplugins detect: [:vmd | #CMakeVMDisplayNull = ((vmd class name) asSymbol)] ifNone:[nil]. "error handling?" + module + sources: #('${targetPlatform}/vm-display-null/sqUnixDisplayNull') ; + compilerdefinitions:(OrderedCollection with: '-fPIC' with: '-DPIC'); + compilerflags: (self compilerFlags); + externallibraries: #(); + linkerflags: (self linkerFlags); + includedirectories:(OrderedCollection + with:'${crossDir}/plugins/FilePlugin' + with: '${targetPlatform}/plugins/B3DAcceleratorPlugin' + with: '${crossDir}/plugins/B3DAcceleratorPlugin'). + self flag:'tty'. "I don't think includedirectories is correct. revisit" + + + + + + + ! Item was added: + ----- Method: Linux64x86w32BitConfigUsrLib>>customizeCMakeVMDisplayX11 (in category 'plugins') ----- + customizeCMakeVMDisplayX11 + |module| + module := vmplugins detect: [:vmd | #CMakeVMDisplayX11 = ((vmd class name) asSymbol)] ifNone:[nil]. "error handling?" + module + sources: #( '${targetPlatform}/vm-display-X11/sqUnixX11' '${targetPlatform}/vm-display-X11/sqUnixMozilla' ); + compilerdefinitions:(OrderedCollection with: '-fPIC' with: '-DPIC'); + compilerflags: (self compilerFlags); + externallibraries: (self externalLibraries); + linkerflags: (self linkerFlags); + includedirectories:(OrderedCollection + with:'${crossDir}/plugins/FilePlugin' + with: '${targetPlatform}/plugins/B3DAcceleratorPlugin' + with: '${crossDir}/plugins/B3DAcceleratorPlugin'). + ! Item was added: + ----- Method: Linux64x86w32BitConfigUsrLib>>customizeCMakeVMSoundALSA (in category 'plugins') ----- + customizeCMakeVMSoundALSA + |module| + module := vmplugins detect: [:vmd | #CMakeVMSoundALSA = ((vmd class name) asSymbol)] ifNone:[nil]. "error handling?" + module + sources: #( '${targetPlatform}/vm-sound-ALSA/sqUnixSoundALSA' ); + compilerdefinitions:(OrderedCollection with: '-fPIC' with: '-DPIC'); + compilerflags: (self compilerFlags); + externallibraries: (self externalLibraries); + linkerflags: (self linkerFlags); + includedirectories: #(). + ! Item was added: + ----- Method: Linux64x86w32BitConfigUsrLib>>customizeCMakeVMSoundNull (in category 'plugins') ----- + customizeCMakeVMSoundNull + |module| + module := vmplugins detect: [:vmd | #CMakeVMSoundNull = ((vmd class name) asSymbol)] ifNone:[nil]. "error handling?" + module + sources: #( '${targetPlatform}/vm-sound-null/sqUnixSoundNull' ); + compilerdefinitions:(OrderedCollection with: '-fPIC' with: '-DPIC'); + compilerflags: (self compilerFlags); + externallibraries: (self externalLibraries); + linkerflags: (self linkerFlags); + includedirectories:#() + + ! Item was added: + ----- Method: Linux64x86w32BitConfigUsrLib>>customizeVMPlugins (in category 'plugins') ----- + customizeVMPlugins + |mysubset iwantonly| + "trim the vmdrivers ordered collection of CMakeVMDriver subclasses to only those I want. then customize them for use on this OS/platform" + iwantonly := #(#CMakeVMDisplayNull #CMakeVMDisplayX11 #CMakeVMSoundALSA #CMakeVMSoundNull ). + mysubset := vmplugins select: [:vmd | 0 < (iwantonly occurrencesOf: (vmd class name) asSymbol)]. + vmplugins := mysubset. + self + customizeCMakeVMDisplayNull; + customizeCMakeVMDisplayX11; + customizeCMakeVMSoundALSA; + customizeCMakeVMSoundNull. + + + + ! Item was added: + ----- Method: Linux64x86w32BitConfigUsrLib>>defaultExternalPlugins (in category 'plugins') ----- + defaultExternalPlugins + ^ #( + B3DAcceleratorPlugin + ThreadedIA32FFIPlugin "SqueakFFIPrims" + "UUIDPlugin" + "UnixOSProcessPlugin ?? " + JPEGReaderPlugin + JPEGReadWriter2Plugin + RePlugin + InternetConfigPlugin + ) + + "debug"! Item was added: + ----- Method: Linux64x86w32BitConfigUsrLib>>defaultInternalPlugins (in category 'plugins') ----- + defaultInternalPlugins + " took from unixbuild/bld/plugins.int" + ^ #( + ADPCMCodecPlugin + AsynchFilePlugin + BalloonEnginePlugin "B2DPlugin" + BitBltSimulation "BitBltPlugin" + BMPReadWriterPlugin + CroquetPlugin + DeflatePlugin "ZipPlugin" + DropPlugin + DSAPlugin "DSAPrims" + FFTPlugin + FileCopyPlugin + FilePlugin + FloatArrayPlugin + FloatMathPlugin + JoystickTabletPlugin + KlattSynthesizerPlugin "Klatt" + LargeIntegersPlugin "LargeIntegers" + Matrix2x3Plugin + MIDIPlugin + MiscPrimitivePlugin + Mpeg3Plugin + SecurityPlugin + SerialPlugin + SocketPlugin + SoundCodecPlugin "SoundCodecPrims" + SoundGenerationPlugin + SoundPlugin + StarSqueakPlugin + SurfacePlugin + LocalePlugin + )! Item was added: + ----- Method: Linux64x86w32BitConfigUsrLib>>dirBuildPlatform (in category 'cmake') ----- + dirBuildPlatform + ^self dirLinux64x86w32BitCompatibility! Item was added: + ----- Method: Linux64x86w32BitConfigUsrLib>>excludeFromBuild (in category 'cmake') ----- + excludeFromBuild + "over-ride to exclude yourself from a build or not" + ^true! Item was added: + ----- Method: Linux64x86w32BitConfigUsrLib>>executableName (in category 'cmake') ----- + executableName + "AbstractBaseClass configurations are not meant to be executable" + ^ self vmIShouldNotBeHereExecutableName! Item was added: + ----- Method: Linux64x86w32BitConfigUsrLib>>externalLibraries (in category 'compiling') ----- + externalLibraries + ^#( + '-L/usr/lib' + '-L/usr/lib/X11' + 'uuid' "" + 'ssl' "" + 'crypto' "" + 'm' "C math library" + 'dl' "dynamic linking library" + 'pthread' "POSIX threads library" + 'SM' "session management library for X11" + 'ICE' "ICE is the Inter Client Exchange protocol, part of X11" + 'GL' "libGL implements the GLX interface as well as the main OpenGL API entrypoints" + 'X11' + 'nsl' "network services library" + ) + + + ! Item was added: + ----- Method: Linux64x86w32BitConfigUsrLib>>externalPluginsBuild (in category 'cmake buildType redirects') ----- + externalPluginsBuild + ^ externalPlugins ifNil: [ externalPlugins := self defaultExternalPlugins ]! Item was added: + ----- Method: Linux64x86w32BitConfigUsrLib>>extraPluginSettingsBuild: (in category 'cmake buildType redirects') ----- + extraPluginSettingsBuild: aMaker + aMaker isExternal + ifTrue:[aMaker templates addLast:((CMakeSet new) variable:'LIBRARY_OUTPUT_PATH' value:'${outputDir}')]. + aMaker templates addLast:((CMakeSet new) variable:'linkFlags' quotedValue:'${linkFlags} -m32'). + + + " maker isExternal ifTrue: [ + maker set: 'LIBRARY_OUTPUT_PATH' to: '${outputDir}' + ]. + maker set: #linkFlags toString: '${linkFlags} -m32'"! Item was added: + ----- Method: Linux64x86w32BitConfigUsrLib>>internalPluginsBuild (in category 'cmake buildType redirects') ----- + internalPluginsBuild + ^ internalPlugins ifNil: [ internalPlugins := self defaultInternalPlugins ]! Item was added: + ----- Method: Linux64x86w32BitConfigUsrLib>>postBuildActionsBuild: (in category 'cmake buildType redirects') ----- + postBuildActionsBuild: aMaker + "SystemNavigation default browseMethodsWhoseNamesContain: 'postBuildActionsBuild:'" + (aMaker config enabledebugmessages) + ifTrue:[ + aMaker config templates + addLast: ((CMakeMessage new) message: (self class name), ' postBuildActionsBuild' ) + ]. + aMaker config templates + addLast: ((CMakeMessage new) message: 'postBuildActionsBuild: aMaker' ); + addLast:((CMakeCommand new) command:'include' params:'config.cmake'); "cmake --help-command include " + addLast:((CMakeCommand new) command:'LIST' params:'REMOVE_DUPLICATES config_vars'); "cmake --help-command LIST" + addLast:((CMakeCommand new) command:'FILE' params:'WRITE ${CMAKE_BINARY_DIR}/config.h.in ""'); "cmake --help-command FILE" + addLast:(CMakeAppendConfigHIn new); + addLast:((CMakeCommand new) command:'CONFIGURE_FILE' params:'${CMAKE_BINARY_DIR}/config.h.in ${CMAKE_BINARY_DIR}/config.h'); + addLast:((CMakeCommand new) command:'GET_CMAKE_PROPERTY' params:'tmp VARIABLES'); + addLast:((CMakeCommand new) command:'LIST' params:'REMOVE_ITEM tmp tmp'); + addLast:((CMakeCommand new) command:'LIST' params:'SORT tmp'); + addLast:((CMakeCommand new) command:'FILE' params:'WRITE ${CMAKE_BINARY_DIR}/config.h.status ""'); + addLast:(CMakeAppendConfigStatus new). + + ! Item was added: + ----- Method: Linux64x86w32BitConfigUsrLib>>preferredIncludesBuild (in category 'cmake buildType redirects') ----- + preferredIncludesBuild + (enabledebugmessages) + ifTrue:[ + templates + addLast: ((CMakeMessage new) message: (self class name), ' preferredIncludesBuild' ) + ]. + templates + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${targetPlatform}/plugins/B3DAcceleratorPlugin')). + + (enabledebugmessages) + ifTrue:[ + templates + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_PATH = ${CMAKE_INCLUDE_PATH}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_SYSTEM_INCLUDE_PATH = ${CMAKE_SYSTEM_INCLUDE_PATH}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES = ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES = ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = ${CMAKE_FIND_ROOT_PATH_MODE_INCLUDE}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = ${CMAKE_INCLUDE_CURRENT_DIR}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE = ${CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_DIRECTORIES_BEFORE = ${CMAKE_INCLUDE_DIRECTORIES_BEFORE}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE = ${CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE}' ) + ].! Item was added: + SqueakUnixConfig subclass: #Linux64x86w32BitConfigUsrLib32 + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-Linux64X86-32BitCompatibility'! + + !Linux64x86w32BitConfigUsrLib32 commentStamp: 'tty 12/26/2014 11:43' prior: 0! + A Linux64x86w32BitConfigUsrLib32 is an Abstract base class that provides common information for my subclasses. + I am not meant to be built. + + I am a configuration for linux64x86 where the 32 bit compatibility libraries reside in /usr/lib32 (example: Ubuntu) + + Some linux platforms (such as Slackware). store their 32 bit compat libs in /usr/lib For those, use subclasses of Linux64x86w32BitConfigUsrLib + + + + + I configure a VM according to my name's form: [Operating System] [WordSize] [Processor Language][VM MemoryManager][BuildType]Conf[Foo] + + SqueakLinux64x86w32CompatBuilder + configureABuildFor: #ONE OF MY SUBCLASSES NAME HERE withBuildType: #build; + enableMessageTracking: true; + generateByTemplate. + + + + HelpBrowser openOn: CMakeVMMakerSqueakHelp + + + ! Item was added: + ----- Method: Linux64x86w32BitConfigUsrLib32>>addVMPluginsBuild: (in category 'cmake buildType redirects') ----- + addVMPluginsBuild: aMaker + |temp o| + self flag:'tty'. "I am writing sub-directory CMakeLists.txt here. Should I also write the config.cmake files?" + enabledebugmessages + ifTrue: [templates "this message will go to the top level CMakeLists.txt file" + addLast: (CMakeMessage new message: self class name , 'addVMPluginsBuild: aMaker')]. + vmplugins do:[ :vmp | + o := String new writeStream. "each VMPlugin gets its own CMakeLists.txt file in its own directory" + temp := OrderedCollection new. + temp + addAllLast:((CMakePluginVm new) "this is the CMakeCompositTemplate" + config: self + definitions: (vmp compilerdefinitions) + module: (vmp module) + sources: (vmp sources) + includedirectories: (vmp includedirectories)). + temp do: [:each | o nextPutAll: (each content); cr]. + ((self buildDir) directoryExists: (vmp module)) + ifFalse:[ (self buildDir) createDirectory: (vmp module)]. + self write: (o contents) toFile: vmp module , FileDirectory slash , aMaker outputFileName. + templates "this will go to the top level CMakeLists.txt file" + addLast: ((CMakeAddSubDirectory new) sourcedir: (vmp module)) + ]. + + + + + + + + + + ! Item was added: + ----- Method: Linux64x86w32BitConfigUsrLib32>>availableBuildTypes (in category 'cmake') ----- + availableBuildTypes + ^SqueakCMakeVMMakerAbstractBuilder default noBuildTypes + " + + subclasses should use + + ^super allBuildTypes copyWithoutAll: #( #assertWithHeartbeatTimer #debugWithHeartbeatTimer debugMultiThreadedFFI.....etc)) " + + ! Item was added: + ----- Method: Linux64x86w32BitConfigUsrLib32>>coreSourcesBuild (in category 'cmake buildType redirects') ----- + coreSourcesBuild + "files to include from src/vm dir" + ^ #( + 'cogit.c' + 'gcc3x-cointerp.c' + )! Item was added: + ----- Method: Linux64x86w32BitConfigUsrLib32>>coreSourcesBuildMultiThreaded (in category 'cmake buildType redirects') ----- + coreSourcesBuildMultiThreaded + "files to include from src/vm dir" + ^ #( + 'cogit.c' + 'cointerpmt.c' + )! Item was added: + ----- Method: Linux64x86w32BitConfigUsrLib32>>customizeCMakeVMDisplayNull (in category 'plugins') ----- + customizeCMakeVMDisplayNull + |module| + module := vmplugins detect: [:vmd | #CMakeVMDisplayNull = ((vmd class name) asSymbol)] ifNone:[nil]. "error handling?" + module + sources: #('${targetPlatform}/vm-display-null/sqUnixDisplayNull') ; + compilerdefinitions:(OrderedCollection with: '-fPIC' with: '-DPIC'); + compilerflags: (self compilerFlags); + externallibraries: #(); + linkerflags: (self linkerFlags); + includedirectories:(OrderedCollection + with:'${crossDir}/plugins/FilePlugin' + with: '${targetPlatform}/plugins/B3DAcceleratorPlugin' + with: '${crossDir}/plugins/B3DAcceleratorPlugin'). + self flag:'tty'. "I don't think includedirectories is correct. revisit" + + + + + + + ! Item was added: + ----- Method: Linux64x86w32BitConfigUsrLib32>>customizeCMakeVMDisplayX11 (in category 'plugins') ----- + customizeCMakeVMDisplayX11 + |module| + module := vmplugins detect: [:vmd | #CMakeVMDisplayX11 = ((vmd class name) asSymbol)] ifNone:[nil]. "error handling?" + module + sources: #( '${targetPlatform}/vm-display-X11/sqUnixX11' '${targetPlatform}/vm-display-X11/sqUnixMozilla' ); + compilerdefinitions:(OrderedCollection with: '-fPIC' with: '-DPIC'); + compilerflags: (self compilerFlags); + externallibraries: (self externalLibraries); + linkerflags: (self linkerFlags); + includedirectories:(OrderedCollection + with:'${crossDir}/plugins/FilePlugin' + with: '${targetPlatform}/plugins/B3DAcceleratorPlugin' + with: '${crossDir}/plugins/B3DAcceleratorPlugin'). + ! Item was added: + ----- Method: Linux64x86w32BitConfigUsrLib32>>customizeCMakeVMSoundALSA (in category 'plugins') ----- + customizeCMakeVMSoundALSA + |module| + module := vmplugins detect: [:vmd | #CMakeVMSoundALSA = ((vmd class name) asSymbol)] ifNone:[nil]. "error handling?" + module + sources: #( '${targetPlatform}/vm-sound-ALSA/sqUnixSoundALSA' ); + compilerdefinitions:(OrderedCollection with: '-fPIC' with: '-DPIC'); + compilerflags: (self compilerFlags); + externallibraries: (self externalLibraries); + linkerflags: (self linkerFlags); + includedirectories: #(). + ! Item was added: + ----- Method: Linux64x86w32BitConfigUsrLib32>>customizeCMakeVMSoundNull (in category 'plugins') ----- + customizeCMakeVMSoundNull + |module| + module := vmplugins detect: [:vmd | #CMakeVMSoundNull = ((vmd class name) asSymbol)] ifNone:[nil]. "error handling?" + module + sources: #( '${targetPlatform}/vm-sound-null/sqUnixSoundNull' ); + compilerdefinitions:(OrderedCollection with: '-fPIC' with: '-DPIC'); + compilerflags: (self compilerFlags); + externallibraries: (self externalLibraries); + linkerflags: (self linkerFlags); + includedirectories:#() + + ! Item was added: + ----- Method: Linux64x86w32BitConfigUsrLib32>>customizeVMPlugins (in category 'plugins') ----- + customizeVMPlugins + |mysubset iwantonly| + "trim the vmdrivers ordered collection of CMakeVMDriver subclasses to only those I want. then customize them for use on this OS/platform" + iwantonly := #(#CMakeVMDisplayNull #CMakeVMDisplayX11 #CMakeVMSoundALSA #CMakeVMSoundNull ). + mysubset := vmplugins select: [:vmd | 0 < (iwantonly occurrencesOf: (vmd class name) asSymbol)]. + vmplugins := mysubset. + self + customizeCMakeVMDisplayNull; + customizeCMakeVMDisplayX11; + customizeCMakeVMSoundALSA; + customizeCMakeVMSoundNull. + + + + ! Item was added: + ----- Method: Linux64x86w32BitConfigUsrLib32>>defaultExternalPlugins (in category 'plugins') ----- + defaultExternalPlugins + ^ #( + B3DAcceleratorPlugin + ThreadedIA32FFIPlugin "SqueakFFIPrims" + "UUIDPlugin" + "UnixOSProcessPlugin ?? " + JPEGReaderPlugin + JPEGReadWriter2Plugin + RePlugin + InternetConfigPlugin + ) + + "debug"! Item was added: + ----- Method: Linux64x86w32BitConfigUsrLib32>>defaultInternalPlugins (in category 'plugins') ----- + defaultInternalPlugins + " took from unixbuild/bld/plugins.int" + ^ #( + ADPCMCodecPlugin + AsynchFilePlugin + BalloonEnginePlugin "B2DPlugin" + BitBltSimulation "BitBltPlugin" + BMPReadWriterPlugin + CroquetPlugin + DeflatePlugin "ZipPlugin" + DropPlugin + DSAPlugin "DSAPrims" + FFTPlugin + FileCopyPlugin + FilePlugin + FloatArrayPlugin + FloatMathPlugin + JoystickTabletPlugin + KlattSynthesizerPlugin "Klatt" + LargeIntegersPlugin "LargeIntegers" + Matrix2x3Plugin + MIDIPlugin + MiscPrimitivePlugin + Mpeg3Plugin + SecurityPlugin + SerialPlugin + SocketPlugin + SoundCodecPlugin "SoundCodecPrims" + SoundGenerationPlugin + SoundPlugin + StarSqueakPlugin + SurfacePlugin + LocalePlugin + )! Item was added: + ----- Method: Linux64x86w32BitConfigUsrLib32>>dirBuildPlatform (in category 'cmake') ----- + dirBuildPlatform + ^self dirLinux64x86w32BitCompatibility! Item was added: + ----- Method: Linux64x86w32BitConfigUsrLib32>>excludeFromBuild (in category 'cmake') ----- + excludeFromBuild + "over-ride to exclude yourself from a build or not" + ^true! Item was added: + ----- Method: Linux64x86w32BitConfigUsrLib32>>executableName (in category 'cmake') ----- + executableName + "AbstractBaseClass configurations are not meant to be executable" + ^ self vmIShouldNotBeHereExecutableName! Item was added: + ----- Method: Linux64x86w32BitConfigUsrLib32>>externalPluginsBuild (in category 'cmake buildType redirects') ----- + externalPluginsBuild + ^ externalPlugins ifNil: [ externalPlugins := self defaultExternalPlugins ]! Item was added: + ----- Method: Linux64x86w32BitConfigUsrLib32>>extraPluginSettingsBuild: (in category 'cmake buildType redirects') ----- + extraPluginSettingsBuild: aMaker + aMaker isExternal + ifTrue:[aMaker templates addLast:((CMakeSet new) variable:'LIBRARY_OUTPUT_PATH' value:'${outputDir}')]. + aMaker templates addLast:((CMakeSet new) variable:'linkFlags' quotedValue:'${linkFlags} -m32'). + + + " maker isExternal ifTrue: [ + maker set: 'LIBRARY_OUTPUT_PATH' to: '${outputDir}' + ]. + maker set: #linkFlags toString: '${linkFlags} -m32'"! Item was added: + ----- Method: Linux64x86w32BitConfigUsrLib32>>internalPluginsBuild (in category 'cmake buildType redirects') ----- + internalPluginsBuild + ^ internalPlugins ifNil: [ internalPlugins := self defaultInternalPlugins ]! Item was added: + ----- Method: Linux64x86w32BitConfigUsrLib32>>postBuildActionsBuild: (in category 'cmake buildType redirects') ----- + postBuildActionsBuild: aMaker + "SystemNavigation default browseMethodsWhoseNamesContain: 'postBuildActionsBuild:'" + (aMaker config enabledebugmessages) + ifTrue:[ + aMaker config templates + addLast: ((CMakeMessage new) message: (self class name), ' postBuildActionsBuild' ) + ]. + aMaker config templates + addLast: ((CMakeMessage new) message: 'postBuildActionsBuild: aMaker' ); + addLast:((CMakeCommand new) command:'include' params:'config.cmake'); "cmake --help-command include " + addLast:((CMakeCommand new) command:'LIST' params:'REMOVE_DUPLICATES config_vars'); "cmake --help-command LIST" + addLast:((CMakeCommand new) command:'FILE' params:'WRITE ${CMAKE_BINARY_DIR}/config.h.in ""'); "cmake --help-command FILE" + addLast:(CMakeAppendConfigHIn new); + addLast:((CMakeCommand new) command:'CONFIGURE_FILE' params:'${CMAKE_BINARY_DIR}/config.h.in ${CMAKE_BINARY_DIR}/config.h'); + addLast:((CMakeCommand new) command:'GET_CMAKE_PROPERTY' params:'tmp VARIABLES'); + addLast:((CMakeCommand new) command:'LIST' params:'REMOVE_ITEM tmp tmp'); + addLast:((CMakeCommand new) command:'LIST' params:'SORT tmp'); + addLast:((CMakeCommand new) command:'FILE' params:'WRITE ${CMAKE_BINARY_DIR}/config.h.status ""'); + addLast:(CMakeAppendConfigStatus new). + + ! Item was added: + ----- Method: Linux64x86w32BitConfigUsrLib32>>preferredIncludesBuild (in category 'cmake buildType redirects') ----- + preferredIncludesBuild + (enabledebugmessages) + ifTrue:[ + templates + addLast: ((CMakeMessage new) message: (self class name), ' preferredIncludesBuild' ) + ]. + templates + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${targetPlatform}/plugins/B3DAcceleratorPlugin')). + + (enabledebugmessages) + ifTrue:[ + templates + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_PATH = ${CMAKE_INCLUDE_PATH}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_SYSTEM_INCLUDE_PATH = ${CMAKE_SYSTEM_INCLUDE_PATH}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES = ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES = ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = ${CMAKE_FIND_ROOT_PATH_MODE_INCLUDE}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = ${CMAKE_INCLUDE_CURRENT_DIR}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE = ${CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_DIRECTORIES_BEFORE = ${CMAKE_INCLUDE_DIRECTORIES_BEFORE}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE = ${CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE}' ) + ].! Item was changed: + Linux64x86w32BitConfigUsrLib subclass: #Linux64x86w32BitSqueakCogV3Config - Linux64x86w32BitConfig subclass: #Linux64x86w32BitSqueakCogV3Config instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'CMakeVMMakerSqueak-Linux64X86-32BitCompatibility'! !Linux64x86w32BitSqueakCogV3Config commentStamp: 'tty 12/8/2014 11:23' prior: 0! I am a configuration for 64 bit Linux with 32 Bit compatability libraries. I have been tested with Slackware64 14.1 which uses /usr/lib for 32 bit compatability libs and /usr/lib64 for normal libs. If you have a machine which uses /usr/lib for 64 bit libs and /usr/lib32 for 32 bit compat libs then subclass me and modify (at least) the following methods: compilerFlags externalLibraries linkFlagsBuild linkerFlags SqueakLinux64x86w32CompatBuilder configureABuildFor: #Linux64x86w32BitSqueakCogV3Config withBuildType: #build; enableMessageTracking: true; generateByTemplate. HelpBrowser openOn: CMakeVMMakerSqueakDeveloperHelp Getting the UUIDPlugin to compile (not work, unfortunately, but compile) required modifying oscogvm/platforms/unix/plugins/acinclude.m4. to read: (my Slackware system has <uuid> and uuidgen. then setting the # -*- sh -*- AC_MSG_CHECKING([for UUID support]) AC_TRY_COMPILE([#include <sys/uuid.h>],[uuid_generatorxyz;],[ AC_MSG_RESULT(yes) AC_CHECK_LIB(uuid, uuid_generator_xyz,LIB_UUID="-luuid" ) ],[ AC_MSG_RESULT(no) AC_MSG_CHECKING([for UUID support uuid/uuid.h] and uuid_generate) AC_TRY_COMPILE([#include <uuid/uuid.h>],[uuid_generate;],[ AC_MSG_RESULT(yes) AC_CHECK_LIB(uuid, uuid_generate, LIB_UUID="-luuid")],[ AC_MSG_RESULT(no) AC_MSG_CHECKING([for UUID support uuid and uuidgen] ) AC_TRY_COMPILE([#include <uuid.h>],[uuidgen;],[ AC_MSG_RESULT(yes) AC_CHECK_LIB(uuid, uuidgen, LIB_UUID="-luuid" )],[ AC_MSG_RESULT(no) AC_PLUGIN_DISABLE ]) ]) ]) #define HAVE_UUID_H 1 #define HAVE_UUIDGEN 1 fl;ags in my configH method ! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>externalLibraries (in category 'compiling') ----- - externalLibraries - ^#( - '-L/usr/lib' - '-L/usr/lib/X11' - 'uuid' "" - 'ssl' "" - 'crypto' "" - 'm' "C math library" - 'dl' "dynamic linking library" - 'pthread' "POSIX threads library" - 'SM' "session management library for X11" - 'ICE' "ICE is the Inter Client Exchange protocol, part of X11" - 'GL' "libGL implements the GLX interface as well as the main OpenGL API entrypoints" - 'X11' - 'nsl' "network services library" - ) - - - !

1 0

VM Maker: VMMaker.oscog-eem.1000.mcz
by commits＠source.squeak.org 26 Dec '14

26 Dec '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1000.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1000 Author: eem Time: 26 December 2014, 2:01:50.853 pm UUID: 68704c7c-954b-4a1c-bf46-c06bf4a54087 Ancestors: VMMaker.oscog-eem.999 Fix slip in primitiveImmediateAsInteger =============== Diff against VMMaker.oscog-eem.999 =============== Item was changed: ----- Method: InterpreterPrimitives>>primitiveImmediateAsInteger (in category 'arithmetic float primitives') ----- primitiveImmediateAsInteger "For a Smalnteger, answer itself. For a Character, answer its code as an unsigned integer. For a SmallFloat, answer the signed, but unadjusted bit pattern (so as to keep the result a SmallInteger). This is a good value for an immediate's hash." + <option: #SpurObjectMemory> - <option: #Spur64BitMemoryManager> | oop value | oop := self stackTop. (objectMemory isIntegerObject: oop) ifTrue: [value := objectMemory integerValueOf: oop] ifFalse: [(objectMemory isCharacterObject: oop) ifTrue: [value := objectMemory characterValueOf: oop] ifFalse: [(objectMemory isImmediateFloat: oop) ifTrue: [value := objectMemory rotatedFloatBitsOf: oop] ifFalse: [^self primitiveFailFor: PrimErrBadReceiver]]]. self pop: argumentCount + 1 thenPushInteger: value!

1 0

VM Maker: Cog-eem.233.mcz
by commits＠source.squeak.org 26 Dec '14

26 Dec '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.233.mcz ==================== Summary ==================== Name: Cog-eem.233 Author: eem Time: 25 December 2014, 6:05:20.643 pm UUID: b4973571-93ff-4a24-b3ae-eff8bfc7142a Ancestors: Cog-eem.232 Spurify instVarAt:put:. =============== Diff against Cog-eem.232 =============== Item was added: + ----- Method: SpurBootstrapPrototypes>>ObjectPROTOTYPEinstVarAt: (in category 'method prototypes') ----- + ObjectPROTOTYPEinstVarAt: index + "Primitive. Answer a fixed variable in an object. The numbering of the variables + corresponds to the named instance variables, followed by the indexed instance + variables. Fail if the index is not an Integer or is not the index of a fixed variable. + Essential. See Object documentation whatIsAPrimitive." + + <primitive: 173 error: ec> + self primitiveFailed! Item was added: + ----- Method: SpurBootstrapPrototypes>>ObjectPROTOTYPEinstVarAt:put: (in category 'method prototypes') ----- + ObjectPROTOTYPEinstVarAt: index put: anObject + "Primitive. Store a value into a fixed variable in an object. The numbering of the + variables corresponds to the named instance variables, followed by the indexed + instance variables. Fail if the index is not an Integer or is not the index of a fixed + variable. Essential. See Object documentation whatIsAPrimitive." + + <primitive: 174 error: ec> + self primitiveFailed!

1 0

VM Maker: VMMaker.oscog-eem.999.mcz
by commits＠source.squeak.org 26 Dec '14

26 Dec '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.999.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.999 Author: eem Time: 25 December 2014, 5:56:07.016 pm UUID: b0fe8d34-046c-4ef4-8ca5-cdfe166c52fe Ancestors: VMMaker.oscog-eem.998 Spur: Fix argument count slips in three primitives. Check for sufficient memory in two-way become. All: Fix checking of boolean arg in primitiveArrayBecomeOneWayCopyHash. Make primitiveSlotAt[Put] cope with non-pointer objects. Sista: Simplify genGetNumBytesOf:into: =============== Diff against VMMaker.oscog-eem.998 =============== Item was changed: ----- Method: CogObjectRepresentationFor32BitSpur>>genGetNumBytesOf:into: (in category 'compile abstract instructions') ----- genGetNumBytesOf: srcReg into: destReg "Get the size in byte-sized slots of the object in srcReg into destReg. srcReg may equal destReg. + destReg <- numSlots << self shiftForWord - (fmt bitAnd: 3). + Assumes the object in srcReg has a byte format, i.e. 16 to 23 or 24 to 31 " - destReg <- numSlots << self shiftForWord - (fmt bitAnd: 7)." <var: #jmp type: #'AbstractInstruction'> | jmp | self genGetRawSlotSizeOfNonImm: srcReg into: TempReg. cogit CmpCq: objectMemory numSlotsMask R: TempReg. jmp := cogit JumpLess: 0. + cogit MoveMw: objectMemory wordSize negated r: srcReg R: destReg. + jmp jmpTarget: (cogit LogicalShiftLeftCq: objectMemory shiftForWord R: destReg). - cogit MoveMw: objectMemory wordSize negated r: srcReg R: TempReg. - jmp jmpTarget: (cogit LogicalShiftLeftCq: objectMemory shiftForWord R: TempReg). "Now: TempReg = numSlots << shiftForWord" + cogit MoveMw: 0 r: srcReg R: TempReg. + cogit LogicalShiftRightCq: objectMemory formatShift R: TempReg. + cogit AndCq: objectMemory wordSize - 1 R: TempReg. + "Now: fmt bitAnd: 3 in TempReg" - cogit MoveMw: 0 r: srcReg R: destReg. - cogit LogicalShiftRightCq: objectMemory formatShift R: destReg. - cogit AndCq: objectMemory formatMask R: destReg. - cogit AndCq: objectMemory wordSize - 1 R: destReg. - "Now: fmt bitAnd: 7 in destReg" cogit SubR: TempReg R: destReg. ^0! Item was changed: ----- Method: InterpreterPrimitives>>primitiveArrayBecomeOneWayCopyHash (in category 'object access primitives') ----- primitiveArrayBecomeOneWayCopyHash + "Similar to primitiveArrayBecomeOneWay but accepts a third argument deciding whether to + copy the receiver's element's identity hash over the argument's elementy's identity hash." - "Similar to primitiveArrayBecomeOneWay but accepts a third argument whether to copy - the receiver's identity hash over the argument's identity hash." + | copyHashFlag ec | + self stackTop = objectMemory trueObject + ifTrue: [copyHashFlag := true] + ifFalse: + [self stackTop = objectMemory falseObject + ifTrue: [copyHashFlag := false] + ifFalse: + [self primitiveFailFor: PrimErrBadArgument. + ^nil]]. + ec := objectMemory + become: (self stackValue: 2) + with: (self stackValue: 1) + twoWay: false + copyHash: copyHashFlag. - | copyHashFlag arg rcvr ec | - copyHashFlag := self booleanValueOf: (self stackTop). - arg := self stackValue: 1. - rcvr := self stackValue: 2. - ec := objectMemory become: rcvr with: arg twoWay: false copyHash: copyHashFlag. ec = PrimNoErr + ifTrue: [self pop: argumentCount] - ifTrue: [self pop: 2] ifFalse: [self primitiveFailFor: ec]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveImmediateAsInteger (in category 'arithmetic float primitives') ----- primitiveImmediateAsInteger "For a Smalnteger, answer itself. For a Character, answer its code as an unsigned integer. For a SmallFloat, answer the signed, but unadjusted bit pattern (so as to keep the result a SmallInteger). This is a good value for an immediate's hash." <option: #Spur64BitMemoryManager> | oop value | oop := self stackTop. (objectMemory isIntegerObject: oop) ifTrue: [value := objectMemory integerValueOf: oop] ifFalse: [(objectMemory isCharacterObject: oop) ifTrue: [value := objectMemory characterValueOf: oop] ifFalse: [(objectMemory isImmediateFloat: oop) ifTrue: [value := objectMemory rotatedFloatBitsOf: oop] ifFalse: [^self primitiveFailFor: PrimErrBadReceiver]]]. + self pop: argumentCount + 1 thenPushInteger: value! - self pop: argumentCount thenPushInteger: value! Item was changed: ----- Method: InterpreterPrimitives>>primitiveIsPinned (in category 'memory space primitives') ----- primitiveIsPinned "Answer if the receiver is pinned, i.e. immobile." | obj | obj := self stackTop. ((objectMemory isImmediate: obj) or: [objectMemory isForwarded: obj]) ifTrue: [^self primitiveFailFor: PrimErrBadReceiver]. + self pop: argumentCount + 1 + thenPushBool: (objectMemory hasSpurMemoryManagerAPI + and: [objectMemory booleanObjectOf: (objectMemory isPinned: obj)])! - self pop: argumentCount - 1. - self stackTopPut: - (objectMemory hasSpurMemoryManagerAPI - ifTrue: [objectMemory booleanObjectOf: (objectMemory isPinned: obj)] - ifFalse: [objectMemory falseObject])! Item was changed: ----- Method: InterpreterPrimitives>>primitivePin (in category 'memory space primitives') ----- primitivePin "Pin or unpin the receiver, i.e. make it immobile or mobile, based on the argument. Answer whether the object was already pinned. N.B. pinning does *not* prevent an object from being garbage collected." | obj boolean wasPinned | objectMemory hasSpurMemoryManagerAPI ifFalse: [^self primitiveFailFor: PrimErrUnsupported]. obj := self stackValue: 1. ((objectMemory isImmediate: obj) or: [(objectMemory isForwarded: obj) or: [(objectMemory isContext: obj) and: [self isStillMarriedContext: obj]]]) ifTrue: [^self primitiveFailFor: PrimErrBadReceiver]. boolean := self stackTop. (boolean = objectMemory falseObject or: [boolean = objectMemory trueObject]) ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. (objectMemory isPinned: obj) ifTrue: [wasPinned := objectMemory trueObject. objectMemory setIsPinnedOf: obj to: boolean = objectMemory trueObject] ifFalse: [wasPinned := objectMemory falseObject. (boolean = objectMemory trueObject and: [objectMemory pinObject: obj]) = 0 ifTrue: [^self primitiveFailFor: PrimErrNoMemory]]. + self pop: argumentCount + 1 thenPush: wasPinned! - self pop: argumentCount - 1 thenPush: wasPinned! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSlotAt (in category 'object access primitives') ----- primitiveSlotAt + "Answer a slot in an object. This numbers all slots from 1, ignoring the distinction between + named and indexed inst vars. In objects with both named and indexed inst vars, the named + inst vars preceed the indexed ones. In non-object indexed objects (objects that contain + bits, not object references) this primitive answers the raw integral value at each slot. + e.g. for Strings it answers the character code, not the Character object at each slot." + | index rcvr fmt numSlots | - | index rcvr numSlots | index := self stackTop. rcvr := self stackValue: 1. (objectMemory isIntegerObject: index) ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. (objectMemory isImmediate: rcvr) ifTrue: [^self primitiveFailFor: PrimErrBadReceiver]. + fmt := objectMemory formatOf: rcvr. index := objectMemory integerValueOf: index. + + fmt <= objectMemory lastPointerFormat ifTrue: - (objectMemory isPointersNonImm: rcvr) ifTrue: [numSlots := objectMemory numSlotsOf: rcvr. (self asUnsigned: index) < numSlots ifTrue: [self pop: argumentCount + 1 thenPush: (objectMemory fetchPointer: index ofObject: rcvr). ^0]. ^self primitiveFailFor: PrimErrBadIndex]. + + fmt >= objectMemory firstByteFormat ifTrue: + [fmt >= objectMemory firstCompiledMethodFormat ifTrue: + [^self primitiveFailFor: PrimErrUnsupported]. + numSlots := objectMemory numBytesOf: rcvr. + (self asUnsigned: index) < numSlots ifTrue: + [self pop: argumentCount + 1 thenPushInteger: (objectMemory fetchByte: index ofObject: rcvr). + ^0]. + ^self primitiveFailFor: PrimErrBadIndex]. + + (objectMemory hasSpurMemoryManagerAPI + and: [fmt >= objectMemory firstShortFormat]) ifTrue: + [numSlots := objectMemory num16BitUnitsOf: rcvr. + (self asUnsigned: index) < numSlots ifTrue: + [self pop: argumentCount + 1 thenPushInteger: (objectMemory fetchShort16: index ofObject: rcvr). + ^0]. + ^self primitiveFailFor: PrimErrBadIndex]. + + fmt = objectMemory sixtyFourBitIndexableFormat ifTrue: + [numSlots := objectMemory num64BitUnitsOf: rcvr. + (self asUnsigned: index) < numSlots ifTrue: + [self pop: argumentCount + 1 + thenPush: (self positive64BitIntegerFor: (objectMemory fetchLong64: index ofObject: rcvr)). + ^0]. + ^self primitiveFailFor: PrimErrBadIndex]. + + fmt >= objectMemory firstLongFormat ifTrue: + [numSlots := objectMemory num32BitUnitsOf: rcvr. + (self asUnsigned: index) < numSlots ifTrue: + [self pop: argumentCount + 1 + thenPush: (objectMemory bytesPerOop = 8 + ifTrue: [objectMemory integerObjectOf: (objectMemory fetchLong32: index ofObject: rcvr)] + ifFalse: [self positive32BitIntegerFor: (objectMemory fetchLong32: index ofObject: rcvr)]). + ^0]. + ^self primitiveFailFor: PrimErrBadIndex]. + - "for now just fail for non-pointer objects; the issue here is should - strings answer characters and if so how do we efficiently identify strings?" ^self primitiveFailFor: PrimErrBadReceiver! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSlotAtPut (in category 'object access primitives') ----- primitiveSlotAtPut + "Assign a slot in an object. This numbers all slots from 1, ignoring the distinction between + named and indexed inst vars. In objects with both named and indexed inst vars, the named + inst vars preceed the indexed ones. In non-object indexed objects (objects that contain + bits, not object references) this primitive assigns a raw integral value at each slot." + | newValue index rcvr fmt numSlots value | - | newValue index rcvr numSlots | newValue := self stackTop. index := self stackValue: 1. rcvr := self stackValue: 2. (objectMemory isIntegerObject: index) ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. (objectMemory isImmediate: rcvr) ifTrue: [^self primitiveFailFor: PrimErrBadReceiver]. + fmt := objectMemory formatOf: rcvr. index := objectMemory integerValueOf: index. + + fmt <= objectMemory lastPointerFormat ifTrue: - (objectMemory isPointersNonImm: rcvr) ifTrue: [numSlots := objectMemory numSlotsOf: rcvr. (self asUnsigned: index) < numSlots ifTrue: [objectMemory storePointer: index ofObject: rcvr withValue: newValue. self pop: argumentCount + 1 thenPush: newValue. ^0]. ^self primitiveFailFor: PrimErrBadIndex]. + + value := self positiveMachineIntegerValueOf: newValue. + self failed ifTrue: + [primFailCode := PrimErrBadArgument. + ^0]. + + fmt >= objectMemory firstByteFormat ifTrue: + [fmt >= objectMemory firstCompiledMethodFormat ifTrue: + [^self primitiveFailFor: PrimErrUnsupported]. + (self asUnsigned: value) > 16rFF ifTrue: + [^self primitiveFailFor: PrimErrBadArgument]. + numSlots := objectMemory numBytesOf: rcvr. + (self asUnsigned: index) < numSlots ifTrue: + [objectMemory storeByte: index ofObject: rcvr withValue: value. + self pop: argumentCount + 1 thenPush: newValue. + ^0]. + ^self primitiveFailFor: PrimErrBadIndex]. + + (objectMemory hasSpurMemoryManagerAPI + and: [fmt >= objectMemory firstShortFormat]) ifTrue: + [(self asUnsigned: value) > 16rFFFF ifTrue: + [^self primitiveFailFor: PrimErrBadArgument]. + numSlots := objectMemory num16BitUnitsOf: rcvr. + (self asUnsigned: index) < numSlots ifTrue: + [objectMemory storeShort16: index ofObject: rcvr withValue: value. + self pop: argumentCount + 1 thenPush: newValue. + ^0]. + ^self primitiveFailFor: PrimErrBadIndex]. + + (objectMemory bytesPerOop = 8 + and: [fmt = objectMemory sixtyFourBitIndexableFormat]) ifTrue: + [numSlots := objectMemory num64BitUnitsOf: rcvr. + (self asUnsigned: index) < numSlots ifTrue: + [objectMemory storeLong64: index ofObject: rcvr withValue: value. + self pop: argumentCount + 1 thenPush: newValue. + ^0]. + ^self primitiveFailFor: PrimErrBadIndex]. + + fmt >= objectMemory firstLongFormat ifTrue: + [(objectMemory wordSize > 4 + and: [(self asUnsigned: value) > 16rFFFFFFFF]) ifTrue: + [^self primitiveFailFor: PrimErrBadArgument]. + numSlots := objectMemory num32BitUnitsOf: rcvr. + (self asUnsigned: index) < numSlots ifTrue: + [objectMemory storeLong32: index ofObject: rcvr withValue: value. + self pop: argumentCount + 1 thenPush: newValue. + ^0]. + ^self primitiveFailFor: PrimErrBadIndex]. + - "for now just fail for non-pointer objects; the issue here is should - strings answer characters and if so how do we efficiently identify strings?" ^self primitiveFailFor: PrimErrBadReceiver! Item was added: + ----- Method: ObjectMemory>>sixtyFourBitIndexableFormat (in category 'header formats') ----- + sixtyFourBitIndexableFormat + ^7! Item was changed: ----- Method: SpurMemoryManager>>containsOnlyValidBecomeObjects:and: (in category 'become implementation') ----- containsOnlyValidBecomeObjects: array1 and: array2 "Answer 0 if neither array contains only unpinned non-immediates. Otherwise answer an informative error code. Can't become: immediates!! Shouldn't become pinned objects." + | fieldOffset effectsFlags oop size | - | fieldOffset effectsFlags oop | fieldOffset := self lastPointerOf: array1. + effectsFlags := size := 0. - effectsFlags := 0. "same size as array2" [fieldOffset >= self baseHeaderSize] whileTrue: [oop := self longAt: array1 + fieldOffset. (self isOopForwarded: oop) ifTrue: [oop := self followForwarded: oop. self longAt: array1 + fieldOffset put: oop]. (self isImmediate: oop) ifTrue: [^PrimErrInappropriate]. (self isPinned: oop) ifTrue: [^PrimErrObjectIsPinned]. effectsFlags := effectsFlags bitOr: (self becomeEffectFlagsFor: oop). + size := size + (self bytesInObject: oop). oop := self longAt: array2 + fieldOffset. (self isOopForwarded: oop) ifTrue: [oop := self followForwarded: oop. self longAt: array2 + fieldOffset put: oop]. (self isImmediate: oop) ifTrue: [^PrimErrInappropriate]. (self isPinned: oop) ifTrue: [^PrimErrObjectIsPinned]. effectsFlags := effectsFlags bitOr: (self becomeEffectFlagsFor: oop). + size := size + (self bytesInObject: oop). fieldOffset := fieldOffset - self bytesPerOop]. "only set flags after checking all args." becomeEffectsFlags := effectsFlags. + size >= (totalFreeOldSpace + (scavengeThreshold - freeStart)) ifTrue: + [^PrimErrNoMemory]. ^0!

1 0

VM Maker: Cog-eem.232.mcz
by commits＠source.squeak.org 26 Dec '14

26 Dec '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.232.mcz ==================== Summary ==================== Name: Cog-eem.232 Author: eem Time: 25 December 2014, 5:51:47.862 pm UUID: ce06e52a-12eb-48af-85db-79da09ce6e59 Ancestors: Cog-eem.231 Spurify elementsExchangeIdentityWith: =============== Diff against Cog-eem.231 =============== Item was added: + ----- Method: SpurBootstrapPrototypes>>ArrayPROTOTYPEelementsExchangeIdentityWith: (in category 'method prototypes') ----- + ArrayPROTOTYPEelementsExchangeIdentityWith: otherArray + "This primitive performs a bulk mutation, causing all pointers to the elements of the + receiver to be replaced by pointers to the corresponding elements of otherArray. + At the same time, all pointers to the elements of otherArray are replaced by + pointers to the corresponding elements of this array. The identityHashes remain + with the pointers rather than with the objects so that objects in hashed structures + should still be properly indexed after the mutation." + + <primitive: 128 error: ec> + ec == #'bad receiver' ifTrue: + [^self error: 'receiver must be of class Array']. + ec == #'bad argument' ifTrue: + [^self error: (otherArray class == Array + ifTrue: ['arg must be of class Array'] + ifFalse: ['receiver and argument must have the same size'])]. + ec == #'inappropriate operation' ifTrue: + [^self error: 'can''t become immediates such as SmallIntegers or Characters']. + ec == #'no modification' ifTrue: + [^self error: 'can''t become immutable objects']. + ec == #'object is pinned' ifTrue: + [^self error: 'can''t become pinned objects']. + ec == #'insufficient object memory' ifTrue: + [Smalltalk garbageCollect < 1048576 ifTrue: + [Smalltalk growMemoryByAtLeast: 1048576]. + ^self elementsExchangeIdentityWith: otherArray]. + self primitiveFailed!

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 December 2014