Vm-dev December 2014

vm-dev@lists.squeakfoundation.org

33 participants
160 discussions

[commit][3171] As per VMMaker.oscog-eem.975xi, fFix 64-bit issues in BitBlt Drop MIDI and RE plugins.
by commits＠squeakvm.org 11 Dec '14

11 Dec '14

Revision: 3171 Author: eliot Date: 2014-12-10 16:32:48 -0800 (Wed, 10 Dec 2014) Log Message: ----------- As per VMMaker.oscog-eem.975xi, fFix 64-bit issues in BitBlt Drop MIDI and RE plugins. Modified Paths: -------------- trunk/platforms/Cross/plugins/AsynchFilePlugin/AsynchFilePlugin.h trunk/platforms/Cross/plugins/FilePlugin/FilePlugin.h Property Changed: ---------------- trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h Modified: trunk/platforms/Cross/plugins/AsynchFilePlugin/AsynchFilePlugin.h =================================================================== --- trunk/platforms/Cross/plugins/AsynchFilePlugin/AsynchFilePlugin.h 2014-12-11 00:32:13 UTC (rev 3170) +++ trunk/platforms/Cross/plugins/AsynchFilePlugin/AsynchFilePlugin.h 2014-12-11 00:32:48 UTC (rev 3171) @@ -10,9 +10,9 @@ } AsyncFile; int asyncFileClose(AsyncFile *f); -int asyncFileOpen(AsyncFile *f, int fileNamePtr, int fileNameSize, int writeFlag, int semaIndex); +int asyncFileOpen(AsyncFile *f, long fileNamePtr, int fileNameSize, int writeFlag, int semaIndex); int asyncFileRecordSize(); -int asyncFileReadResult(AsyncFile *f, int bufferPtr, int bufferSize); +int asyncFileReadResult(AsyncFile *f, long bufferPtr, int bufferSize); int asyncFileReadStart(AsyncFile *f, int fPosition, int count); int asyncFileWriteResult(AsyncFile *f); -int asyncFileWriteStart(AsyncFile *f, int fPosition, int bufferPtr, int bufferSize); +int asyncFileWriteStart(AsyncFile *f, int fPosition, long bufferPtr, int bufferSize); Modified: trunk/platforms/Cross/plugins/FilePlugin/FilePlugin.h =================================================================== --- trunk/platforms/Cross/plugins/FilePlugin/FilePlugin.h 2014-12-11 00:32:13 UTC (rev 3170) +++ trunk/platforms/Cross/plugins/FilePlugin/FilePlugin.h 2014-12-11 00:32:48 UTC (rev 3171) @@ -68,3 +68,6 @@ sqInt dir_PathToWorkingDir(char *pathName, sqInt pathNameMax); sqInt dir_SetMacFileTypeAndCreator(char *filename, sqInt filenameSize, char *fType, char *fCreator); sqInt dir_GetMacFileTypeAndCreator(char *filename, sqInt filenameSize, char *fType, char *fCreator); + +/* Plugin export */ +SQFile *fileValueOf(sqInt obj); Property changes on: trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Dec 10 13:04:05 PST 2014 + Wed Dec 10 16:33:09 PST 2014

1 0

[commit][3170] CogVM source as per VMMaker.oscog-eem.975
by commits＠squeakvm.org 11 Dec '14

11 Dec '14

Revision: 3170 Author: eliot Date: 2014-12-10 16:32:13 -0800 (Wed, 10 Dec 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.975 Fix 64-bit issues in BitBlt Drop MIDI and RE plugins. Modified Paths: -------------- branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/nscogsrc/plugins/DropPlugin/DropPlugin.c branches/Cog/nscogsrc/plugins/RePlugin/RePlugin.c branches/Cog/platforms/unix/plugins/DropPlugin/sqUnixDragDrop.c branches/Cog/platforms/unix/plugins/FileCopyPlugin/sqUnixFileCopyPlugin.c branches/Cog/platforms/win32/vm/sqWin32PluginSupport.c branches/Cog/src/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/src/plugins/DropPlugin/DropPlugin.c branches/Cog/src/plugins/MIDIPlugin/MIDIPlugin.c branches/Cog/src/plugins/RePlugin/RePlugin.c 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-10 23:25:38 UTC (rev 3169) +++ branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c 2014-12-11 00:32:13 UTC (rev 3170) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-tpr.949 uuid: f88be574-4771-44fb-a08e-f1312faaec73 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 from - BitBltSimulation VMMaker.oscog-tpr.949 uuid: f88be574-4771-44fb-a08e-f1312faaec73 + BitBltSimulation VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 */ -static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-tpr.949 uuid: f88be574-4771-44fb-a08e-f1312faaec73 " __DATE__ ; +static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 " __DATE__ ; @@ -345,9 +345,9 @@ }; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BitBltPlugin VMMaker.oscog-tpr.949 (i)" + "BitBltPlugin VMMaker.oscog-eem.975 (i)" #else - "BitBltPlugin VMMaker.oscog-tpr.949 (e)" + "BitBltPlugin VMMaker.oscog-eem.975 (e)" #endif ; static sqInt noHalftone; @@ -5881,14 +5881,14 @@ static sqInt rgbComponentAlpha32(void) { - register int deltaX; + register long deltaX; sqInt deltaY; sqInt destWord; - register int dstIndex; + register long dstIndex; sqInt dstY; - register int sourceWord; + register long sourceWord; sqInt srcAlpha; - register int srcIndex; + register long srcIndex; sqInt srcY; Modified: branches/Cog/nscogsrc/plugins/DropPlugin/DropPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/DropPlugin/DropPlugin.c 2014-12-10 23:25:38 UTC (rev 3169) +++ branches/Cog/nscogsrc/plugins/DropPlugin/DropPlugin.c 2014-12-11 00:32:13 UTC (rev 3170) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.580 uuid: 751b08d4-d92e-440a-b3f6-cb2c76f52514 + VMPluginCodeGenerator VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 from - DropPlugin VMMaker.oscog-eem.580 uuid: 751b08d4-d92e-440a-b3f6-cb2c76f52514 + DropPlugin VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 */ -static char __buildInfo[] = "DropPlugin VMMaker.oscog-eem.580 uuid: 751b08d4-d92e-440a-b3f6-cb2c76f52514 " __DATE__ ; +static char __buildInfo[] = "DropPlugin VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 " __DATE__ ; @@ -48,7 +48,7 @@ static sqInt msg(char *s); EXPORT(sqInt) primitiveDropRequestFileHandle(void); EXPORT(sqInt) primitiveDropRequestFileName(void); -EXPORT(sqInt) setFileAccessCallback(int address); +EXPORT(sqInt) setFileAccessCallback(sqInt address); EXPORT(sqInt) setInterpreter(struct VirtualMachine*anInterpreter); EXPORT(sqInt) shutdownModule(void); @@ -80,9 +80,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DropPlugin VMMaker.oscog-eem.580 (i)" + "DropPlugin VMMaker.oscog-eem.975 (i)" #else - "DropPlugin VMMaker.oscog-eem.580 (e)" + "DropPlugin VMMaker.oscog-eem.975 (e)" #endif ; @@ -190,9 +190,9 @@ } EXPORT(sqInt) -setFileAccessCallback(int address) +setFileAccessCallback(sqInt address) { - return sqSecFileAccessCallback((void *) address); + return sqSecFileAccessCallback(((void *)address)); } Modified: branches/Cog/nscogsrc/plugins/RePlugin/RePlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/RePlugin/RePlugin.c 2014-12-10 23:25:38 UTC (rev 3169) +++ branches/Cog/nscogsrc/plugins/RePlugin/RePlugin.c 2014-12-11 00:32:13 UTC (rev 3170) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 from - RePlugin VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211 + RePlugin VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 */ -static char __buildInfo[] = "RePlugin VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211 " __DATE__ ; +static char __buildInfo[] = "RePlugin VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 " __DATE__ ; @@ -126,9 +126,9 @@ static sqInt matchFlags; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "RePlugin VMMaker.oscog-eem.787 (i)" + "RePlugin VMMaker.oscog-eem.975 (i)" #else - "RePlugin VMMaker.oscog-eem.787 (e)" + "RePlugin VMMaker.oscog-eem.975 (e)" #endif ; static int netMemory = 0; @@ -301,22 +301,21 @@ if (failed()) { return null; } - pcrePtr = (int) pcre_compile(patternStrPtr, compileFlags, - &errorStrBuffer, &errorOffset, NULL); + pcrePtr = (sqInt) pcre_compile(patternStrPtr, compileFlags, &errorStrBuffer, &errorOffset, NULL); if (pcrePtr) { allocateByteArrayAndSetRcvrPCREPtrFromPCRE(pcrePtr); - extraPtr = (int) pcre_study((pcre *)pcrePtr, compileFlags, &errorStrBuffer); + extraPtr = (sqInt) pcre_study((pcre *)pcrePtr, compileFlags, &errorStrBuffer); allocateByteArrayAndSetRcvrExtraPtrFrom(extraPtr); /* begin rePluginFree: */ numFrees += 1; - if ((((void *) pcrePtr)) != null) { - free(((void *) pcrePtr)); + if ((((void *)pcrePtr)) != null) { + free(((void *)pcrePtr)); } if (extraPtr) { /* begin rePluginFree: */ numFrees += 1; - if ((((void *) extraPtr)) != null) { - free(((void *) extraPtr)); + if ((((void *)extraPtr)) != null) { + free(((void *)extraPtr)); } } if (failed()) { @@ -365,10 +364,10 @@ length = byteSizeOf(searchObject); /* begin loadRcvrFromStackAt: */ rcvr = stackObjectValue(1); - pcrePtr = ((int) (fetchArrayofObject(2, rcvr))); + pcrePtr = ((sqInt) (fetchArrayofObject(2, rcvr))); /* begin rcvrExtraPtr */ extraObj = fetchPointerofObject(3, rcvr); - extraPtr = ((int) ((!(extraObj == (nilObject())) + extraPtr = ((sqInt) ((!(extraObj == (nilObject())) ? arrayValueOf(extraObj) : 0))); matchFlags = fetchIntegerofObject(6, rcvr); @@ -436,10 +435,10 @@ /* Load Instance Variables */ searchBuffer += fromInteger; - pcrePtr = ((int) (fetchArrayofObject(2, rcvr))); + pcrePtr = ((sqInt) (fetchArrayofObject(2, rcvr))); /* begin rcvrExtraPtr */ extraObj = fetchPointerofObject(3, rcvr); - extraPtr = ((int) ((!(extraObj == (nilObject())) + extraPtr = ((sqInt) ((!(extraObj == (nilObject())) ? arrayValueOf(extraObj) : 0))); matchFlags = fetchIntegerofObject(6, rcvr); @@ -475,7 +474,7 @@ /* begin loadRcvrFromStackAt: */ rcvr = stackObjectValue(0); - pcrePtr = ((int) (fetchArrayofObject(2, rcvr))); + pcrePtr = ((sqInt) (fetchArrayofObject(2, rcvr))); pcre_fullinfo((const pcre *)pcrePtr, NULL, PCRE_INFO_CAPTURECOUNT, &ncap); pop(1); pushInteger(ncap); @@ -505,7 +504,7 @@ sqInt extraObj; extraObj = fetchPointerofObject(3, rcvr); - return ((int) ((!(extraObj == (nilObject())) + return ((sqInt) ((!(extraObj == (nilObject())) ? arrayValueOf(extraObj) : 0))); } @@ -549,7 +548,7 @@ static sqInt rcvrPCREBufferPtr(void) { - return ((int) (fetchArrayofObject(2, rcvr))); + return ((sqInt) (fetchArrayofObject(2, rcvr))); } Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Dec 10 15:24:58 PST 2014 + Wed Dec 10 16:32:25 PST 2014 Modified: branches/Cog/platforms/unix/plugins/DropPlugin/sqUnixDragDrop.c =================================================================== --- branches/Cog/platforms/unix/plugins/DropPlugin/sqUnixDragDrop.c 2014-12-10 23:25:38 UTC (rev 3169) +++ branches/Cog/platforms/unix/plugins/DropPlugin/sqUnixDragDrop.c 2014-12-11 00:32:13 UTC (rev 3170) @@ -68,7 +68,7 @@ if (path) { // you cannot be serious? sqInt handle = instantiateClassindexableSize(classByteArray(), fileRecordSize()); - sqFileOpen((SQFile *)fileValueOf(handle), (int)path, strlen(path), 0); + sqFileOpen(fileValueOf(handle), path, strlen(path), 0); return handle; } return interpreterProxy->nilObject(); Modified: branches/Cog/platforms/unix/plugins/FileCopyPlugin/sqUnixFileCopyPlugin.c =================================================================== --- branches/Cog/platforms/unix/plugins/FileCopyPlugin/sqUnixFileCopyPlugin.c 2014-12-10 23:25:38 UTC (rev 3169) +++ branches/Cog/platforms/unix/plugins/FileCopyPlugin/sqUnixFileCopyPlugin.c 2014-12-11 00:32:13 UTC (rev 3170) @@ -122,7 +122,7 @@ int status= 0; char *from= (char *)alloca(srcNameSize + 1); char *to= (char *)alloca(dstNameSize + 1); - sqFilenameFromString(from, (int)srcName, srcNameSize); - sqFilenameFromString(to, (int)dstName, dstNameSize); + sqFilenameFromString(from, (sqInt)srcName, srcNameSize); + sqFilenameFromString(to, (sqInt)dstName, dstNameSize); return copy(from, to); } Modified: branches/Cog/platforms/win32/vm/sqWin32PluginSupport.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32PluginSupport.c 2014-12-10 23:25:38 UTC (rev 3169) +++ branches/Cog/platforms/win32/vm/sqWin32PluginSupport.c 2014-12-11 00:32:13 UTC (rev 3170) @@ -19,22 +19,22 @@ DWORD g_WM_CLIENT_PIPE = 0; /* Client pipe */ -int stackObjectValue(int); -int stackIntegerValue(int); -int isBytes(int); -int byteSizeOf(int); -void *firstIndexableField(int); -int push(int); -int pop(int); -int positive32BitIntegerFor(int); -int nilObject(void); -int instantiateClassindexableSize(int, int); -int classByteArray(void); -int fileRecordSize(void); -SQFile *fileValueOf(int); -int failed(void); -int pushBool(int); -int getFullScreenFlag(void); +sqInt stackObjectValue(sqInt); +sqInt stacksqIntegerValue(sqInt); +sqInt isBytes(sqInt); +sqInt byteSizeOf(sqInt); +void *firstIndexableField(sqInt); +sqInt push(sqInt); +sqInt pop(sqInt); +sqInt positive32BitsqIntegerFor(sqInt); +sqInt nilObject(void); +sqInt instantiateClassindexableSize(sqInt, sqInt); +sqInt classByteArray(void); +sqInt fileRecordSize(void); +SQFile *fileValueOf(sqsqInt); +sqInt failed(void); +sqInt pushBool(sqInt); +sqInt getFullScreenFlag(void); void pluginGetURLRequest(int id, void* urlIndex, int urlSize, void* targetIndex, int targetSize); Modified: branches/Cog/src/plugins/BitBltPlugin/BitBltPlugin.c =================================================================== --- branches/Cog/src/plugins/BitBltPlugin/BitBltPlugin.c 2014-12-10 23:25:38 UTC (rev 3169) +++ branches/Cog/src/plugins/BitBltPlugin/BitBltPlugin.c 2014-12-11 00:32:13 UTC (rev 3170) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-tpr.949 uuid: f88be574-4771-44fb-a08e-f1312faaec73 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 from - BitBltSimulation VMMaker.oscog-tpr.949 uuid: f88be574-4771-44fb-a08e-f1312faaec73 + BitBltSimulation VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 */ -static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-tpr.949 uuid: f88be574-4771-44fb-a08e-f1312faaec73 " __DATE__ ; +static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 " __DATE__ ; @@ -345,9 +345,9 @@ }; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BitBltPlugin VMMaker.oscog-tpr.949 (i)" + "BitBltPlugin VMMaker.oscog-eem.975 (i)" #else - "BitBltPlugin VMMaker.oscog-tpr.949 (e)" + "BitBltPlugin VMMaker.oscog-eem.975 (e)" #endif ; static sqInt noHalftone; @@ -5881,14 +5881,14 @@ static sqInt rgbComponentAlpha32(void) { - register int deltaX; + register long deltaX; sqInt deltaY; sqInt destWord; - register int dstIndex; + register long dstIndex; sqInt dstY; - register int sourceWord; + register long sourceWord; sqInt srcAlpha; - register int srcIndex; + register long srcIndex; sqInt srcY; Modified: branches/Cog/src/plugins/DropPlugin/DropPlugin.c =================================================================== --- branches/Cog/src/plugins/DropPlugin/DropPlugin.c 2014-12-10 23:25:38 UTC (rev 3169) +++ branches/Cog/src/plugins/DropPlugin/DropPlugin.c 2014-12-11 00:32:13 UTC (rev 3170) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.580 uuid: 751b08d4-d92e-440a-b3f6-cb2c76f52514 + VMPluginCodeGenerator VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 from - DropPlugin VMMaker.oscog-eem.580 uuid: 751b08d4-d92e-440a-b3f6-cb2c76f52514 + DropPlugin VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 */ -static char __buildInfo[] = "DropPlugin VMMaker.oscog-eem.580 uuid: 751b08d4-d92e-440a-b3f6-cb2c76f52514 " __DATE__ ; +static char __buildInfo[] = "DropPlugin VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 " __DATE__ ; @@ -48,7 +48,7 @@ static sqInt msg(char *s); EXPORT(sqInt) primitiveDropRequestFileHandle(void); EXPORT(sqInt) primitiveDropRequestFileName(void); -EXPORT(sqInt) setFileAccessCallback(int address); +EXPORT(sqInt) setFileAccessCallback(sqInt address); EXPORT(sqInt) setInterpreter(struct VirtualMachine*anInterpreter); EXPORT(sqInt) shutdownModule(void); @@ -80,9 +80,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DropPlugin VMMaker.oscog-eem.580 (i)" + "DropPlugin VMMaker.oscog-eem.975 (i)" #else - "DropPlugin VMMaker.oscog-eem.580 (e)" + "DropPlugin VMMaker.oscog-eem.975 (e)" #endif ; @@ -190,9 +190,9 @@ } EXPORT(sqInt) -setFileAccessCallback(int address) +setFileAccessCallback(sqInt address) { - return sqSecFileAccessCallback((void *) address); + return sqSecFileAccessCallback(((void *)address)); } Modified: branches/Cog/src/plugins/MIDIPlugin/MIDIPlugin.c =================================================================== --- branches/Cog/src/plugins/MIDIPlugin/MIDIPlugin.c 2014-12-10 23:25:38 UTC (rev 3169) +++ branches/Cog/src/plugins/MIDIPlugin/MIDIPlugin.c 2014-12-11 00:32:13 UTC (rev 3170) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.580 uuid: 751b08d4-d92e-440a-b3f6-cb2c76f52514 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 from - MIDIPlugin VMMaker.oscog-eem.580 uuid: 751b08d4-d92e-440a-b3f6-cb2c76f52514 + MIDIPlugin VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 */ -static char __buildInfo[] = "MIDIPlugin VMMaker.oscog-eem.580 uuid: 751b08d4-d92e-440a-b3f6-cb2c76f52514 " __DATE__ ; +static char __buildInfo[] = "MIDIPlugin VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 " __DATE__ ; @@ -97,9 +97,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "MIDIPlugin VMMaker.oscog-eem.580 (i)" + "MIDIPlugin VMMaker.oscog-eem.975 (i)" #else - "MIDIPlugin VMMaker.oscog-eem.580 (e)" + "MIDIPlugin VMMaker.oscog-eem.975 (e)" #endif ; @@ -223,7 +223,6 @@ primitiveMIDIGetPortName(void) { sqInt nameObj; - char * namePtr; char portName[256]; sqInt portNum; sqInt sz; @@ -232,13 +231,12 @@ if (failed()) { return null; } - sz = sqMIDIGetPortName(portNum, (int) &portName, 255); + sz = sqMIDIGetPortName(portNum, portName, 0xFF); nameObj = instantiateClassindexableSize(classString(), sz); if (failed()) { return null; } - namePtr = ((char *)firstIndexableField(nameObj)); - memcpy(namePtr, portName, sz); + memcpy(((char *)firstIndexableField(nameObj)), portName, sz); if (failed()) { return null; } Modified: branches/Cog/src/plugins/RePlugin/RePlugin.c =================================================================== --- branches/Cog/src/plugins/RePlugin/RePlugin.c 2014-12-10 23:25:38 UTC (rev 3169) +++ branches/Cog/src/plugins/RePlugin/RePlugin.c 2014-12-11 00:32:13 UTC (rev 3170) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 from - RePlugin VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211 + RePlugin VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 */ -static char __buildInfo[] = "RePlugin VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211 " __DATE__ ; +static char __buildInfo[] = "RePlugin VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 " __DATE__ ; @@ -126,9 +126,9 @@ static sqInt matchFlags; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "RePlugin VMMaker.oscog-eem.787 (i)" + "RePlugin VMMaker.oscog-eem.975 (i)" #else - "RePlugin VMMaker.oscog-eem.787 (e)" + "RePlugin VMMaker.oscog-eem.975 (e)" #endif ; static int netMemory = 0; @@ -301,22 +301,21 @@ if (failed()) { return null; } - pcrePtr = (int) pcre_compile(patternStrPtr, compileFlags, - &errorStrBuffer, &errorOffset, NULL); + pcrePtr = (sqInt) pcre_compile(patternStrPtr, compileFlags, &errorStrBuffer, &errorOffset, NULL); if (pcrePtr) { allocateByteArrayAndSetRcvrPCREPtrFromPCRE(pcrePtr); - extraPtr = (int) pcre_study((pcre *)pcrePtr, compileFlags, &errorStrBuffer); + extraPtr = (sqInt) pcre_study((pcre *)pcrePtr, compileFlags, &errorStrBuffer); allocateByteArrayAndSetRcvrExtraPtrFrom(extraPtr); /* begin rePluginFree: */ numFrees += 1; - if ((((void *) pcrePtr)) != null) { - free(((void *) pcrePtr)); + if ((((void *)pcrePtr)) != null) { + free(((void *)pcrePtr)); } if (extraPtr) { /* begin rePluginFree: */ numFrees += 1; - if ((((void *) extraPtr)) != null) { - free(((void *) extraPtr)); + if ((((void *)extraPtr)) != null) { + free(((void *)extraPtr)); } } if (failed()) { @@ -365,10 +364,10 @@ length = byteSizeOf(searchObject); /* begin loadRcvrFromStackAt: */ rcvr = stackObjectValue(1); - pcrePtr = ((int) (fetchArrayofObject(2, rcvr))); + pcrePtr = ((sqInt) (fetchArrayofObject(2, rcvr))); /* begin rcvrExtraPtr */ extraObj = fetchPointerofObject(3, rcvr); - extraPtr = ((int) ((!(extraObj == (nilObject())) + extraPtr = ((sqInt) ((!(extraObj == (nilObject())) ? arrayValueOf(extraObj) : 0))); matchFlags = fetchIntegerofObject(6, rcvr); @@ -436,10 +435,10 @@ /* Load Instance Variables */ searchBuffer += fromInteger; - pcrePtr = ((int) (fetchArrayofObject(2, rcvr))); + pcrePtr = ((sqInt) (fetchArrayofObject(2, rcvr))); /* begin rcvrExtraPtr */ extraObj = fetchPointerofObject(3, rcvr); - extraPtr = ((int) ((!(extraObj == (nilObject())) + extraPtr = ((sqInt) ((!(extraObj == (nilObject())) ? arrayValueOf(extraObj) : 0))); matchFlags = fetchIntegerofObject(6, rcvr); @@ -475,7 +474,7 @@ /* begin loadRcvrFromStackAt: */ rcvr = stackObjectValue(0); - pcrePtr = ((int) (fetchArrayofObject(2, rcvr))); + pcrePtr = ((sqInt) (fetchArrayofObject(2, rcvr))); pcre_fullinfo((const pcre *)pcrePtr, NULL, PCRE_INFO_CAPTURECOUNT, &ncap); pop(1); pushInteger(ncap); @@ -505,7 +504,7 @@ sqInt extraObj; extraObj = fetchPointerofObject(3, rcvr); - return ((int) ((!(extraObj == (nilObject())) + return ((sqInt) ((!(extraObj == (nilObject())) ? arrayValueOf(extraObj) : 0))); } @@ -549,7 +548,7 @@ static sqInt rcvrPCREBufferPtr(void) { - return ((int) (fetchArrayofObject(2, rcvr))); + return ((sqInt) (fetchArrayofObject(2, rcvr))); }

1 0

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

11 Dec '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.975.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.975 Author: eem Time: 10 December 2014, 4:08:40.068 pm UUID: de22d941-0268-4e60-a8be-89a3a88aa567 Ancestors: VMMaker.oscog-eem.974 Fix 64-bit issues i BitBlt Drop MIDI and RE plugins. =============== Diff against VMMaker.oscog-eem.974 =============== Item was changed: ----- Method: BitBltSimulation>>rgbComponentAlpha32 (in category 'combination rules') ----- rgbComponentAlpha32 "This version assumes combinationRule = 41 sourcePixSize = destPixSize = 32 sourceForm ~= destForm. Note: The inner loop has been optimized for dealing with the special case of aR = aG = aB = 0 " | srcIndex dstIndex sourceWord srcAlpha destWord deltaX deltaY srcY dstY | <inline: false> "This particular method should be optimized in itself" "Give the compile a couple of hints" + <var: #sourceWord type: 'register long'> + <var: #deltaX type: 'register long'> - <var: #sourceWord declareC:'register int sourceWord'> - <var: #deltaX declareC:'register int deltaX'> "The following should be declared as pointers so the compiler will notice that they're used for accessing memory locations (good to know on an Intel architecture) but then the increments would be different between ST code and C code so must hope the compiler notices what happens (MS Visual C does)" + <var: #srcIndex type: 'register long'> + <var: #dstIndex type: 'register long'> - <var: #srcIndex declareC:'register int srcIndex'> - <var: #dstIndex declareC:'register int dstIndex'> deltaY := bbH + 1. "So we can pre-decrement" srcY := sy. dstY := dy. "This is the outer loop" [(deltaY := deltaY - 1) ~= 0] whileTrue:[ srcIndex := sourceBits + (srcY * sourcePitch) + (sx * 4). dstIndex := destBits + (dstY * destPitch) + (dx * 4). deltaX := bbW + 1. "So we can pre-decrement" "This is the inner loop" [(deltaX := deltaX - 1) ~= 0] whileTrue:[ sourceWord := self srcLongAt: srcIndex. srcAlpha := sourceWord bitAnd:16rFFFFFF. srcAlpha = 0 ifTrue:[ srcIndex := srcIndex + 4. dstIndex := dstIndex + 4. "Now skip as many words as possible," [(deltaX := deltaX - 1) ~= 0 and:[ ((sourceWord := self srcLongAt: srcIndex) bitAnd:16rFFFFFF) = 0]] whileTrue:[ srcIndex := srcIndex + 4. dstIndex := dstIndex + 4. ]. "Adjust deltaX" deltaX := deltaX + 1. ] ifFalse:[ "0 < srcAlpha" "If we have to mix colors then just copy a single word" destWord := self dstLongAt: dstIndex. destWord := self rgbComponentAlpha32: sourceWord with: destWord. self dstLongAt: dstIndex put: destWord. srcIndex := srcIndex + 4. dstIndex := dstIndex + 4. ]. ]. srcY := srcY + 1. dstY := dstY + 1. ].! Item was changed: ----- Method: DropPlugin>>setFileAccessCallback: (in category 'primitives') ----- setFileAccessCallback: address <export: true> + ^self sqSecFileAccessCallback: address asVoidPointer! - <var: #address type: 'int'> - ^self cCode: 'sqSecFileAccessCallback((void *) address)'.! Item was changed: ----- Method: MIDIPlugin>>primitiveMIDIGetPortName: (in category 'primitives') ----- primitiveMIDIGetPortName: portNum + | portName sz nameObj | - - | portName sz nameObj namePtr | <var: #portName declareC: 'char portName[256]'> + self primitive: 'primitiveMIDIGetPortName' parameters: #(SmallInteger). - <var: #namePtr type: 'char * '> - self primitive: 'primitiveMIDIGetPortName' - parameters: #(SmallInteger). + sz := self sqMIDIGet: portNum Port: portName Name: 255. - sz := self cCode: 'sqMIDIGetPortName(portNum, (int) &portName, 255)'. nameObj := interpreterProxy instantiateClass: interpreterProxy classString indexableSize: sz. + interpreterProxy failed ifTrue: [^nil]. + self mem: (nameObj asValue: String) cp: portName y: sz. - interpreterProxy failed ifTrue:[^nil]. - namePtr := nameObj asValue: String . - self cCode: 'memcpy(namePtr, portName, sz)'. ^nameObj! Item was changed: ----- Method: RePlugin>>primPCRECompile (in category 're primitives') ----- primPCRECompile "<rcvr primPCRECompile>, where rcvr is an object with instance variables: 'patternStr compileFlags pcrePtr extraPtr errorStr errorOffset matchFlags' Compile the regular expression in patternStr, and if the compilation is successful, attempt to optimize the compiled expression. Store the results in <pcrePtr> and <extratr>, or fill errorStr with a meaningful errorString and errorOffset with an indicator where the error was found, applying compileFlags throughout. Answer nil with a clean compile (regardless of whether an optimization is possible, and answer with the string otherwise." <export: true> self loadRcvrFromStackAt: 0. patternStrPtr := self rcvrPatternStrPtr. compileFlags := self rcvrCompileFlags. interpreterProxy failed ifTrue:[^ nil]. + pcrePtr := self cCode: '(sqInt) pcre_compile(patternStrPtr, compileFlags, &errorStrBuffer, &errorOffset, NULL)'. - pcrePtr := self cCode: '(int) pcre_compile(patternStrPtr, compileFlags, - &errorStrBuffer, &errorOffset, NULL)'. pcrePtr ifTrue: [ self allocateByteArrayAndSetRcvrPCREPtrFromPCRE: pcrePtr. + extraPtr := self cCode: '(sqInt) pcre_study((pcre *)pcrePtr, compileFlags, &errorStrBuffer)'. - extraPtr := self cCode: '(int) pcre_study((pcre *)pcrePtr, compileFlags, &errorStrBuffer)'. self allocateByteArrayAndSetRcvrExtraPtrFrom: extraPtr. + self rePluginFree: pcrePtr asVoidPointer. + extraPtr ifTrue: [self rePluginFree: extraPtr asVoidPointer]. - self rePluginFree: (self cCoerce: pcrePtr to: 'void *'). - extraPtr ifTrue: [self rePluginFree: (self cCoerce: extraPtr to: 'void *')]. interpreterProxy failed ifTrue:[^ nil]. interpreterProxy pop: 1 thenPush: interpreterProxy nilObject] ifFalse: [ errorStr := self allocateStringAndSetRcvrErrorStrFromCStr: errorStrBuffer. self rcvrErrorOffsetFrom: errorOffset. interpreterProxy failed ifTrue:[^ nil]. interpreterProxy pop: 1 thenPush: errorStr].! Item was changed: ----- Method: RePlugin>>rcvrExtraPtr (in category 'rcvr linkage') ----- rcvrExtraPtr |extraObj| <inline: true> extraObj := interpreterProxy fetchPointer: 3 ofObject: rcvr. ^self cCoerce: (extraObj = interpreterProxy nilObject ifTrue: [nil] ifFalse: [interpreterProxy arrayValueOf: extraObj]) + to: #sqInt! - to: 'int'! Item was changed: ----- Method: RePlugin>>rcvrPCREBufferPtr (in category 'rcvr linkage') ----- rcvrPCREBufferPtr - <inline: true> ^self cCoerce: (interpreterProxy fetchArray: 2 ofObject: rcvr) + to: #sqInt! - to: 'int'.!

1 0

[commit][3169] CogVM source as per VMMaker.oscog-eem.974
by commits＠squeakvm.org 11 Dec '14

11 Dec '14

Revision: 3169 Author: eliot Date: 2014-12-10 15:25:38 -0800 (Wed, 10 Dec 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.974 Fix 64-bit issues in the AsynchFilePlugin. Fix 64-bit issues with sqUnixMain.c, sqMemoryFence.h & sqVirtualMachine.c. Modified Paths: -------------- branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c branches/Cog/platforms/Cross/vm/sqMemoryFence.h branches/Cog/platforms/Cross/vm/sqVirtualMachine.c branches/Cog/platforms/Mac OS/plugins/AsynchFilePlugin/sqMacAsyncFilePrims.c branches/Cog/platforms/unix/plugins/AsynchFilePlugin/sqUnixAsynchFile.c branches/Cog/platforms/unix/plugins/DropPlugin/sqUnixDragDrop.c branches/Cog/platforms/unix/vm/sqUnixMain.c branches/Cog/platforms/unix/vm/sqUnixMain.h branches/Cog/platforms/win32/vm/sqWin32Stubs.c branches/Cog/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2014-12-10 23:23:27 UTC (rev 3168) +++ branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2014-12-10 23:25:38 UTC (rev 3169) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.963 uuid: 9df56221-18fd-4dcd-b93f-ae000bef62e5 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.974 uuid: 7ca9044b-c2d1-4605-b2b6-2b8ffc66c096 from - AsynchFilePlugin VMMaker.oscog-eem.963 uuid: 9df56221-18fd-4dcd-b93f-ae000bef62e5 + AsynchFilePlugin VMMaker.oscog-eem.974 uuid: 7ca9044b-c2d1-4605-b2b6-2b8ffc66c096 */ -static char __buildInfo[] = "AsynchFilePlugin VMMaker.oscog-eem.963 uuid: 9df56221-18fd-4dcd-b93f-ae000bef62e5 " __DATE__ ; +static char __buildInfo[] = "AsynchFilePlugin VMMaker.oscog-eem.974 uuid: 7ca9044b-c2d1-4605-b2b6-2b8ffc66c096 " __DATE__ ; @@ -38,6 +38,7 @@ /*** Constants ***/ +#define PrimErrBadArgument 3 /*** Function Prototypes ***/ @@ -63,6 +64,7 @@ #if !defined(SQUEAK_BUILTIN_PLUGIN) static sqInt (*booleanValueOf)(sqInt obj); +static sqInt (*byteSizeOf)(sqInt oop); static sqInt (*classByteArray)(void); static sqInt (*failed)(void); static void * (*firstIndexableField)(sqInt oop); @@ -74,12 +76,14 @@ static sqInt (*pop)(sqInt nItems); static sqInt (*popthenPush)(sqInt nItems, sqInt oop); static sqInt (*primitiveFail)(void); +static sqInt (*primitiveFailFor)(sqInt reasonCode); static sqInt (*slotSizeOf)(sqInt oop); static sqInt (*stackIntegerValue)(sqInt offset); static sqInt (*stackValue)(sqInt offset); static sqInt (*success)(sqInt aBoolean); #else /* !defined(SQUEAK_BUILTIN_PLUGIN) */ extern sqInt booleanValueOf(sqInt obj); +extern sqInt byteSizeOf(sqInt oop); extern sqInt classByteArray(void); extern sqInt failed(void); extern void * firstIndexableField(sqInt oop); @@ -91,6 +95,7 @@ extern sqInt pop(sqInt nItems); extern sqInt popthenPush(sqInt nItems, sqInt oop); extern sqInt primitiveFail(void); +extern sqInt primitiveFailFor(sqInt reasonCode); extern sqInt slotSizeOf(sqInt oop); extern sqInt stackIntegerValue(sqInt offset); extern sqInt stackValue(sqInt offset); @@ -100,9 +105,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AsynchFilePlugin VMMaker.oscog-eem.963 (i)" + "AsynchFilePlugin VMMaker.oscog-eem.974 (i)" #else - "AsynchFilePlugin VMMaker.oscog-eem.963 (e)" + "AsynchFilePlugin VMMaker.oscog-eem.974 (e)" #endif ; static void * sCOAFfn; @@ -110,17 +115,18 @@ /* Answer a pointer to the first byte of the async file record within the - given Smalltalk bytes object, or nil if oop is not an async file record. - */ + given Smalltalk bytes object, or fail and answer nil if oop is not an + async file record. */ static AsyncFile * asyncFileValueOf(sqInt oop) { - success((isBytes(oop)) - && ((slotSizeOf(oop)) == (sizeof(AsyncFile)))); - return (!(failed()) - ? ((AsyncFile *) (firstIndexableField(oop))) - : 0); + if ((isBytes(oop)) + && ((byteSizeOf(oop)) == (sizeof(AsyncFile)))) { + return ((AsyncFile *) (firstIndexableField(oop))); + } + primitiveFailFor(PrimErrBadArgument); + return null; } @@ -193,7 +199,15 @@ if (failed()) { return null; } - f = asyncFileValueOf(fh); + /* begin asyncFileValueOf: */ + if ((isBytes(fh)) + && ((byteSizeOf(fh)) == (sizeof(AsyncFile)))) { + f = ((AsyncFile *) (firstIndexableField(fh))); + goto l1; + } + primitiveFailFor(PrimErrBadArgument); + f = null; +l1: /* end asyncFileValueOf: */; asyncFileClose(f); if (failed()) { return null; @@ -224,18 +238,26 @@ /* If the security plugin can be loaded, use it to check for permission. If not, assume it's ok */ - fileNameSize = slotSizeOf(((sqInt)((fileName) - BaseHeaderSize))); + fileNameSize = byteSizeOf(((sqInt)((fileName) - BaseHeaderSize))); if (sCOAFfn != 0) { - okToOpen = ((sqInt (*) (char *, sqInt, sqInt)) sCOAFfn)(fileName, fileNameSize, writeFlag); + okToOpen = ((sqInt (*) (char *, sqInt, sqInt)) sCOAFfn)(fileName, fileNameSize, writeFlag); if (!okToOpen) { primitiveFail(); return null; } } fOop = instantiateClassindexableSize(classByteArray(), sizeof(AsyncFile)); - f = asyncFileValueOf(fOop); + /* begin asyncFileValueOf: */ + if ((isBytes(fOop)) + && ((byteSizeOf(fOop)) == (sizeof(AsyncFile)))) { + f = ((AsyncFile *) (firstIndexableField(fOop))); + goto l1; + } + primitiveFailFor(PrimErrBadArgument); + f = null; +l1: /* end asyncFileValueOf: */; if (!(failed())) { - asyncFileOpen(f, (int)fileName, fileNameSize, writeFlag, semaIndex); + asyncFileOpen(f, fileName, fileNameSize, writeFlag, semaIndex); } if (failed()) { return null; @@ -266,7 +288,15 @@ if (failed()) { return null; } - f = asyncFileValueOf(fhandle); + /* begin asyncFileValueOf: */ + if ((isBytes(fhandle)) + && ((byteSizeOf(fhandle)) == (sizeof(AsyncFile)))) { + f = ((AsyncFile *) (firstIndexableField(fhandle))); + goto l1; + } + primitiveFailFor(PrimErrBadArgument); + f = null; +l1: /* end asyncFileValueOf: */; count = num; startIndex = start; @@ -286,7 +316,7 @@ /* adjust for zero-origin indexing */ - bufferPtr = ((((int) (firstIndexableField(buffer)))) + startIndex) - 1; + bufferPtr = ((((sqInt) (firstIndexableField(buffer)))) + startIndex) - 1; if (!(failed())) { r = asyncFileReadResult(f, bufferPtr, count); } @@ -312,7 +342,15 @@ if (failed()) { return null; } - f = asyncFileValueOf(fHandle); + /* begin asyncFileValueOf: */ + if ((isBytes(fHandle)) + && ((byteSizeOf(fHandle)) == (sizeof(AsyncFile)))) { + f = ((AsyncFile *) (firstIndexableField(fHandle))); + goto l1; + } + primitiveFailFor(PrimErrBadArgument); + f = null; +l1: /* end asyncFileValueOf: */; asyncFileReadStart(f, fPosition, count); if (failed()) { return null; @@ -333,7 +371,15 @@ if (failed()) { return null; } - f = asyncFileValueOf(fHandle); + /* begin asyncFileValueOf: */ + if ((isBytes(fHandle)) + && ((byteSizeOf(fHandle)) == (sizeof(AsyncFile)))) { + f = ((AsyncFile *) (firstIndexableField(fHandle))); + goto l1; + } + primitiveFailFor(PrimErrBadArgument); + f = null; +l1: /* end asyncFileValueOf: */; r = asyncFileWriteResult(f); _return_value = integerObjectOf(r); if (failed()) { @@ -365,7 +411,15 @@ if (failed()) { return null; } - f = asyncFileValueOf(fHandle); + /* begin asyncFileValueOf: */ + if ((isBytes(fHandle)) + && ((byteSizeOf(fHandle)) == (sizeof(AsyncFile)))) { + f = ((AsyncFile *) (firstIndexableField(fHandle))); + goto l1; + } + primitiveFailFor(PrimErrBadArgument); + f = null; +l1: /* end asyncFileValueOf: */; if (failed()) { return null; } @@ -388,7 +442,7 @@ /* adjust for zero-origin indexing */ - bufferPtr = ((((int) (firstIndexableField(buffer)))) + startIndex) - 1; + bufferPtr = ((((sqInt) (firstIndexableField(buffer)))) + startIndex) - 1; if (!(failed())) { asyncFileWriteStart(f, fPosition, bufferPtr, count); } @@ -414,6 +468,7 @@ #if !defined(SQUEAK_BUILTIN_PLUGIN) booleanValueOf = interpreterProxy->booleanValueOf; + byteSizeOf = interpreterProxy->byteSizeOf; classByteArray = interpreterProxy->classByteArray; failed = interpreterProxy->failed; firstIndexableField = interpreterProxy->firstIndexableField; @@ -425,6 +480,7 @@ pop = interpreterProxy->pop; popthenPush = interpreterProxy->popthenPush; primitiveFail = interpreterProxy->primitiveFail; + primitiveFailFor = interpreterProxy->primitiveFailFor; slotSizeOf = interpreterProxy->slotSizeOf; stackIntegerValue = interpreterProxy->stackIntegerValue; stackValue = interpreterProxy->stackValue; @@ -456,11 +512,11 @@ {"AsynchFilePlugin", "getModuleName", (void*)getModuleName}, {"AsynchFilePlugin", "initialiseModule", (void*)initialiseModule}, {"AsynchFilePlugin", "moduleUnloaded", (void*)moduleUnloaded}, - {"AsynchFilePlugin", "primitiveAsyncFileClose\000\001", (void*)primitiveAsyncFileClose}, + {"AsynchFilePlugin", "primitiveAsyncFileClose\000\000", (void*)primitiveAsyncFileClose}, {"AsynchFilePlugin", "primitiveAsyncFileOpen\000\000", (void*)primitiveAsyncFileOpen}, {"AsynchFilePlugin", "primitiveAsyncFileReadResult\000\001", (void*)primitiveAsyncFileReadResult}, - {"AsynchFilePlugin", "primitiveAsyncFileReadStart\000\001", (void*)primitiveAsyncFileReadStart}, - {"AsynchFilePlugin", "primitiveAsyncFileWriteResult\000\001", (void*)primitiveAsyncFileWriteResult}, + {"AsynchFilePlugin", "primitiveAsyncFileReadStart\000\000", (void*)primitiveAsyncFileReadStart}, + {"AsynchFilePlugin", "primitiveAsyncFileWriteResult\000\000", (void*)primitiveAsyncFileWriteResult}, {"AsynchFilePlugin", "primitiveAsyncFileWriteStart\000\001", (void*)primitiveAsyncFileWriteStart}, {"AsynchFilePlugin", "setInterpreter", (void*)setInterpreter}, {"AsynchFilePlugin", "shutdownModule\000\377", (void*)shutdownModule}, @@ -469,11 +525,11 @@ #else /* ifdef SQ_BUILTIN_PLUGIN */ -signed char primitiveAsyncFileCloseAccessorDepth = 1; +signed char primitiveAsyncFileCloseAccessorDepth = 0; signed char primitiveAsyncFileOpenAccessorDepth = 0; signed char primitiveAsyncFileReadResultAccessorDepth = 1; -signed char primitiveAsyncFileReadStartAccessorDepth = 1; -signed char primitiveAsyncFileWriteResultAccessorDepth = 1; +signed char primitiveAsyncFileReadStartAccessorDepth = 0; +signed char primitiveAsyncFileWriteResultAccessorDepth = 0; signed char primitiveAsyncFileWriteStartAccessorDepth = 1; #endif /* ifdef SQ_BUILTIN_PLUGIN */ Modified: branches/Cog/platforms/Cross/vm/sqMemoryFence.h =================================================================== --- branches/Cog/platforms/Cross/vm/sqMemoryFence.h 2014-12-10 23:23:27 UTC (rev 3168) +++ branches/Cog/platforms/Cross/vm/sqMemoryFence.h 2014-12-10 23:25:38 UTC (rev 3169) @@ -32,24 +32,28 @@ * by other threads before a fence will be visible to the calling thread, and * vice versa. Writers follow a write with a fence. Readers use a fence before * reading. See e.g. http://en.wikipedia.org/wiki/Memory_barrier - * - * The only implementation directly uses mfence on x86. - * Please add implementations for other ISAs as required. */ -#if defined(__GNUC__) && (defined(i386) || defined(__i386) || defined(__i386__) || defined(_X86_)) -# if defined(__MINGW32__) && !__SSE2__ +#if defined(__GNUC__) +# define GCC_HAS_BUILTIN_SYNC \ + (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) +# define GCC_HAS_BUILTIN_ATOMIC \ + (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) +#endif + +#if defined(__GNUC__) || defined(__clang__) +# if GCC_HAS_BUILTIN_SYNC || defined(__clang__) +# define sqLowLevelMFence() __sync_synchronize() +# elif defined(i386) || defined(__i386) || defined(__i386__) || defined(_X86_) +# if defined(__MINGW32__) && !__SSE2__ /* Andreas is fond of the gcc 2.95 MINGW but it lacks sse2 support */ -# define sqLowLevelMFence() asm volatile (".byte 0x0f;.byte 0xae;.byte 0xf0") -# elif defined(TARGET_OS_IS_IPHONE) -# define sqLowLevelMFence() __sync_synchronize() -# else -# define sqLowLevelMFence() asm volatile ("mfence") +# define sqLowLevelMFence() asm volatile (".byte 0x0f;.byte 0xae;.byte 0xf0") +# else +# define sqLowLevelMFence() asm volatile ("mfence") +# endif # endif -#else -# if defined(TARGET_OS_IS_IPHONE) || (defined(__arm__) && (defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_7A__))) -# define sqLowLevelMFence() __sync_synchronize() -# elif !defined(sqLowLevelMFence) +#endif + +#if !defined(sqLowLevelMFence) extern void sqLowLevelMFence(void); -# endif #endif Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Dec 10 12:20:46 PST 2014 + Wed Dec 10 15:24:58 PST 2014 Modified: branches/Cog/platforms/Cross/vm/sqVirtualMachine.c =================================================================== --- branches/Cog/platforms/Cross/vm/sqVirtualMachine.c 2014-12-10 23:23:27 UTC (rev 3168) +++ branches/Cog/platforms/Cross/vm/sqVirtualMachine.c 2014-12-10 23:25:38 UTC (rev 3169) @@ -556,7 +556,7 @@ fprintf(stderr,"output file stack is full.\n"); return; } - switch ((unsigned)filenameOrStdioIndex) { + switch ((unsigned long)filenameOrStdioIndex) { case STDOUT_FILENO: output = stdout; break; case STDERR_FILENO: output = stderr; break; default: Modified: branches/Cog/platforms/Mac OS/plugins/AsynchFilePlugin/sqMacAsyncFilePrims.c =================================================================== --- branches/Cog/platforms/Mac OS/plugins/AsynchFilePlugin/sqMacAsyncFilePrims.c 2014-12-10 23:23:27 UTC (rev 3168) +++ branches/Cog/platforms/Mac OS/plugins/AsynchFilePlugin/sqMacAsyncFilePrims.c 2014-12-10 23:25:38 UTC (rev 3169) @@ -85,12 +85,12 @@ /*** Exported Functions ***/ int asyncFileClose(AsyncFile *f); -int asyncFileOpen(AsyncFile *f, int fileNamePtr, int fileNameSize, int writeFlag, int semaIndex); +int asyncFileOpen(AsyncFile *f, long fileNamePtr, int fileNameSize, int writeFlag, int semaIndex); int asyncFileRecordSize(); -int asyncFileReadResult(AsyncFile *f, int bufferPtr, int bufferSize); +int asyncFileReadResult(AsyncFile *f, long bufferPtr, int bufferSize); int asyncFileReadStart(AsyncFile *f, int fPosition, int count); int asyncFileWriteResult(AsyncFile *f); -int asyncFileWriteStart(AsyncFile *f, int fPosition, int bufferPtr, int bufferSize); +int asyncFileWriteStart(AsyncFile *f, int fPosition, long bufferPtr, int bufferSize); /*** Local Functions ***/ void asyncFileAllocateBuffer(AsyncFileState *state, int byteCount); @@ -203,7 +203,7 @@ return 0; } -int asyncFileOpen(AsyncFile *f, int fileNamePtr, int fileNameSize, int writeFlag, int semaIndex) { +int asyncFileOpen(AsyncFile *f, long fileNamePtr, int fileNameSize, int writeFlag, int semaIndex) { /* Opens the given file using the supplied AsyncFile structure to record its state. Fails with no side effects if f is already open. Files are always opened in binary mode. */ @@ -270,7 +270,7 @@ return 0; } -int asyncFileReadResult(AsyncFile *f, int bufferPtr, int bufferSize) { +int asyncFileReadResult(AsyncFile *f, long bufferPtr, int bufferSize) { /* Copy up to bufferSize bytes from the buffer of the last read operation into the given Squeak buffer, and return the number of bytes copied. Negative values indicate: @@ -340,7 +340,7 @@ return state->bytesTransferred; } -int asyncFileWriteStart(AsyncFile *f, int fPosition, int bufferPtr, int bufferSize) { +int asyncFileWriteStart(AsyncFile *f, int fPosition, long bufferPtr, int bufferSize) { /* Start an asynchronous operation to write bufferSize bytes to the given file starting at the given file position. The file's semaphore will be signalled when the operation is complete. The client may then use asyncFileWriteResult() to Modified: branches/Cog/platforms/unix/plugins/AsynchFilePlugin/sqUnixAsynchFile.c =================================================================== --- branches/Cog/platforms/unix/plugins/AsynchFilePlugin/sqUnixAsynchFile.c 2014-12-10 23:23:27 UTC (rev 3168) +++ branches/Cog/platforms/unix/plugins/AsynchFilePlugin/sqUnixAsynchFile.c 2014-12-10 23:25:38 UTC (rev 3169) @@ -182,7 +182,7 @@ /*** public functions ***/ -int asyncFileOpen(AsyncFile *f, int fileNamePtr, int fileNameSize, +int asyncFileOpen(AsyncFile *f, long fileNamePtr, int fileNameSize, int writeFlag, int semaIndex) { int fd= 0; @@ -237,7 +237,7 @@ } -int asyncFileReadResult(AsyncFile *f, int bufferPtr, int bufferSize) +int asyncFileReadResult(AsyncFile *f, long bufferPtr, int bufferSize) { FilePtr fp= 0; int n= 0; @@ -331,7 +331,7 @@ } -int asyncFileWriteStart(AsyncFile *f, int fPosition, int bufferPtr, int count) +int asyncFileWriteStart(AsyncFile *f, int fPosition, long bufferPtr, int count) { FilePtr fp= 0; validate(f); Modified: branches/Cog/platforms/unix/plugins/DropPlugin/sqUnixDragDrop.c =================================================================== --- branches/Cog/platforms/unix/plugins/DropPlugin/sqUnixDragDrop.c 2014-12-10 23:23:27 UTC (rev 3168) +++ branches/Cog/platforms/unix/plugins/DropPlugin/sqUnixDragDrop.c 2014-12-10 23:25:38 UTC (rev 3169) @@ -36,7 +36,6 @@ * truth is very definitely not beauty today. Sigh... */ - #include "sq.h" #include "sqVirtualMachine.h" #include "FilePlugin.h" @@ -50,33 +49,31 @@ extern char **uxDropFileNames; -int dropInit(void) { return 1; } -int dropShutdown(void) { return 1; } +sqInt dropInit(void) { return 1; } +sqInt dropShutdown(void) { return 1; } -char *dropRequestFileName(int dropIndex) // in st coordinates +char *dropRequestFileName(sqInt dropIndex) // in st coordinates { - if ((dropIndex > 0) && (dropIndex <= uxDropFileCount)) - { - assert(uxDropFileNames); - dndReceived(uxDropFileNames[dropIndex - 1]); - return uxDropFileNames[dropIndex - 1]; - } - return 0; + if ((dropIndex > 0) && (dropIndex <= uxDropFileCount)) { + assert(uxDropFileNames); + dndReceived(uxDropFileNames[dropIndex - 1]); + return uxDropFileNames[dropIndex - 1]; + } + return 0; } -int dropRequestFileHandle(int dropIndex) +sqInt dropRequestFileHandle(sqInt dropIndex) { - char *path= dropRequestFileName(dropIndex); - if (path) - { - // you cannot be serious? - int handle= instantiateClassindexableSize(classByteArray(), fileRecordSize()); - sqFileOpen((SQFile *)fileValueOf(handle), (int)path, strlen(path), 0); - return handle; - } - return interpreterProxy->nilObject(); + char *path= dropRequestFileName(dropIndex); + if (path) { + // you cannot be serious? + sqInt handle = instantiateClassindexableSize(classByteArray(), fileRecordSize()); + sqFileOpen((SQFile *)fileValueOf(handle), (int)path, strlen(path), 0); + return handle; + } + return interpreterProxy->nilObject(); } -int sqSecFileAccessCallback(void *callback) { return 0; } -void sqSetNumberOfDropFiles(int numberOfFiles) { } -void sqSetFileInformation(int dropIndex, void *dropFile) { } +sqInt sqSecFileAccessCallback(void *callback) { return 0; } +void sqSetNumberOfDropFiles(sqInt numberOfFiles) { } +void sqSetFileInformation(sqInt dropIndex, void *dropFile) { } Modified: branches/Cog/platforms/unix/vm/sqUnixMain.c =================================================================== --- branches/Cog/platforms/unix/vm/sqUnixMain.c 2014-12-10 23:23:27 UTC (rev 3168) +++ branches/Cog/platforms/unix/vm/sqUnixMain.c 2014-12-10 23:25:38 UTC (rev 3169) @@ -1957,7 +1957,7 @@ return 0; } -int ioExit(void) { return ioExitWithErrorCode(0); } +sqInt ioExit(void) { return ioExitWithErrorCode(0); } sqInt ioExitWithErrorCode(int ec) Modified: branches/Cog/platforms/unix/vm/sqUnixMain.h =================================================================== --- branches/Cog/platforms/unix/vm/sqUnixMain.h 2014-12-10 23:23:27 UTC (rev 3168) +++ branches/Cog/platforms/unix/vm/sqUnixMain.h 2014-12-10 23:25:38 UTC (rev 3169) @@ -3,7 +3,7 @@ extern char imageName[]; extern char shortImageName[]; -extern int inputEventSemaIndex; +extern sqInt inputEventSemaIndex; extern char vmPath[]; extern char *exeName; extern char **argVec; Modified: branches/Cog/platforms/win32/vm/sqWin32Stubs.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Stubs.c 2014-12-10 23:23:27 UTC (rev 3168) +++ branches/Cog/platforms/win32/vm/sqWin32Stubs.c 2014-12-10 23:25:38 UTC (rev 3169) @@ -94,7 +94,7 @@ #ifdef NO_ASYNC_FILES int asyncFileClose(AsyncFile *f) { return success(false); } -int asyncFileOpen(AsyncFile *f, int fileNamePtr, int fileNameSize, int writeFlag, int semaIndex) { return success(false); } +int asyncFileOpen(AsyncFile *f, long fileNamePtr, int fileNameSize, int writeFlag, int semaIndex) { return success(false); } int asyncFileRecordSize() { return success(false); } int asyncFileReadResult(AsyncFile *f, int bufferPtr, int bufferSize) { return success(false); } int asyncFileReadStart(AsyncFile *f, int fPosition, int count) { return success(false); } Modified: branches/Cog/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c =================================================================== --- branches/Cog/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2014-12-10 23:23:27 UTC (rev 3168) +++ branches/Cog/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2014-12-10 23:25:38 UTC (rev 3169) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.963 uuid: 9df56221-18fd-4dcd-b93f-ae000bef62e5 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.974 uuid: 7ca9044b-c2d1-4605-b2b6-2b8ffc66c096 from - AsynchFilePlugin VMMaker.oscog-eem.963 uuid: 9df56221-18fd-4dcd-b93f-ae000bef62e5 + AsynchFilePlugin VMMaker.oscog-eem.974 uuid: 7ca9044b-c2d1-4605-b2b6-2b8ffc66c096 */ -static char __buildInfo[] = "AsynchFilePlugin VMMaker.oscog-eem.963 uuid: 9df56221-18fd-4dcd-b93f-ae000bef62e5 " __DATE__ ; +static char __buildInfo[] = "AsynchFilePlugin VMMaker.oscog-eem.974 uuid: 7ca9044b-c2d1-4605-b2b6-2b8ffc66c096 " __DATE__ ; @@ -38,6 +38,7 @@ /*** Constants ***/ +#define PrimErrBadArgument 3 /*** Function Prototypes ***/ @@ -63,6 +64,7 @@ #if !defined(SQUEAK_BUILTIN_PLUGIN) static sqInt (*booleanValueOf)(sqInt obj); +static sqInt (*byteSizeOf)(sqInt oop); static sqInt (*classByteArray)(void); static sqInt (*failed)(void); static void * (*firstIndexableField)(sqInt oop); @@ -74,12 +76,14 @@ static sqInt (*pop)(sqInt nItems); static sqInt (*popthenPush)(sqInt nItems, sqInt oop); static sqInt (*primitiveFail)(void); +static sqInt (*primitiveFailFor)(sqInt reasonCode); static sqInt (*slotSizeOf)(sqInt oop); static sqInt (*stackIntegerValue)(sqInt offset); static sqInt (*stackValue)(sqInt offset); static sqInt (*success)(sqInt aBoolean); #else /* !defined(SQUEAK_BUILTIN_PLUGIN) */ extern sqInt booleanValueOf(sqInt obj); +extern sqInt byteSizeOf(sqInt oop); extern sqInt classByteArray(void); extern sqInt failed(void); extern void * firstIndexableField(sqInt oop); @@ -91,6 +95,7 @@ extern sqInt pop(sqInt nItems); extern sqInt popthenPush(sqInt nItems, sqInt oop); extern sqInt primitiveFail(void); +extern sqInt primitiveFailFor(sqInt reasonCode); extern sqInt slotSizeOf(sqInt oop); extern sqInt stackIntegerValue(sqInt offset); extern sqInt stackValue(sqInt offset); @@ -100,9 +105,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AsynchFilePlugin VMMaker.oscog-eem.963 (i)" + "AsynchFilePlugin VMMaker.oscog-eem.974 (i)" #else - "AsynchFilePlugin VMMaker.oscog-eem.963 (e)" + "AsynchFilePlugin VMMaker.oscog-eem.974 (e)" #endif ; static void * sCOAFfn; @@ -110,17 +115,18 @@ /* Answer a pointer to the first byte of the async file record within the - given Smalltalk bytes object, or nil if oop is not an async file record. - */ + given Smalltalk bytes object, or fail and answer nil if oop is not an + async file record. */ static AsyncFile * asyncFileValueOf(sqInt oop) { - success((isBytes(oop)) - && ((slotSizeOf(oop)) == (sizeof(AsyncFile)))); - return (!(failed()) - ? ((AsyncFile *) (firstIndexableField(oop))) - : 0); + if ((isBytes(oop)) + && ((byteSizeOf(oop)) == (sizeof(AsyncFile)))) { + return ((AsyncFile *) (firstIndexableField(oop))); + } + primitiveFailFor(PrimErrBadArgument); + return null; } @@ -193,7 +199,15 @@ if (failed()) { return null; } - f = asyncFileValueOf(fh); + /* begin asyncFileValueOf: */ + if ((isBytes(fh)) + && ((byteSizeOf(fh)) == (sizeof(AsyncFile)))) { + f = ((AsyncFile *) (firstIndexableField(fh))); + goto l1; + } + primitiveFailFor(PrimErrBadArgument); + f = null; +l1: /* end asyncFileValueOf: */; asyncFileClose(f); if (failed()) { return null; @@ -224,18 +238,26 @@ /* If the security plugin can be loaded, use it to check for permission. If not, assume it's ok */ - fileNameSize = slotSizeOf(((sqInt)((fileName) - BaseHeaderSize))); + fileNameSize = byteSizeOf(((sqInt)((fileName) - BaseHeaderSize))); if (sCOAFfn != 0) { - okToOpen = ((sqInt (*) (char *, sqInt, sqInt)) sCOAFfn)(fileName, fileNameSize, writeFlag); + okToOpen = ((sqInt (*) (char *, sqInt, sqInt)) sCOAFfn)(fileName, fileNameSize, writeFlag); if (!okToOpen) { primitiveFail(); return null; } } fOop = instantiateClassindexableSize(classByteArray(), sizeof(AsyncFile)); - f = asyncFileValueOf(fOop); + /* begin asyncFileValueOf: */ + if ((isBytes(fOop)) + && ((byteSizeOf(fOop)) == (sizeof(AsyncFile)))) { + f = ((AsyncFile *) (firstIndexableField(fOop))); + goto l1; + } + primitiveFailFor(PrimErrBadArgument); + f = null; +l1: /* end asyncFileValueOf: */; if (!(failed())) { - asyncFileOpen(f, (int)fileName, fileNameSize, writeFlag, semaIndex); + asyncFileOpen(f, fileName, fileNameSize, writeFlag, semaIndex); } if (failed()) { return null; @@ -266,7 +288,15 @@ if (failed()) { return null; } - f = asyncFileValueOf(fhandle); + /* begin asyncFileValueOf: */ + if ((isBytes(fhandle)) + && ((byteSizeOf(fhandle)) == (sizeof(AsyncFile)))) { + f = ((AsyncFile *) (firstIndexableField(fhandle))); + goto l1; + } + primitiveFailFor(PrimErrBadArgument); + f = null; +l1: /* end asyncFileValueOf: */; count = num; startIndex = start; @@ -286,7 +316,7 @@ /* adjust for zero-origin indexing */ - bufferPtr = ((((int) (firstIndexableField(buffer)))) + startIndex) - 1; + bufferPtr = ((((sqInt) (firstIndexableField(buffer)))) + startIndex) - 1; if (!(failed())) { r = asyncFileReadResult(f, bufferPtr, count); } @@ -312,7 +342,15 @@ if (failed()) { return null; } - f = asyncFileValueOf(fHandle); + /* begin asyncFileValueOf: */ + if ((isBytes(fHandle)) + && ((byteSizeOf(fHandle)) == (sizeof(AsyncFile)))) { + f = ((AsyncFile *) (firstIndexableField(fHandle))); + goto l1; + } + primitiveFailFor(PrimErrBadArgument); + f = null; +l1: /* end asyncFileValueOf: */; asyncFileReadStart(f, fPosition, count); if (failed()) { return null; @@ -333,7 +371,15 @@ if (failed()) { return null; } - f = asyncFileValueOf(fHandle); + /* begin asyncFileValueOf: */ + if ((isBytes(fHandle)) + && ((byteSizeOf(fHandle)) == (sizeof(AsyncFile)))) { + f = ((AsyncFile *) (firstIndexableField(fHandle))); + goto l1; + } + primitiveFailFor(PrimErrBadArgument); + f = null; +l1: /* end asyncFileValueOf: */; r = asyncFileWriteResult(f); _return_value = integerObjectOf(r); if (failed()) { @@ -365,7 +411,15 @@ if (failed()) { return null; } - f = asyncFileValueOf(fHandle); + /* begin asyncFileValueOf: */ + if ((isBytes(fHandle)) + && ((byteSizeOf(fHandle)) == (sizeof(AsyncFile)))) { + f = ((AsyncFile *) (firstIndexableField(fHandle))); + goto l1; + } + primitiveFailFor(PrimErrBadArgument); + f = null; +l1: /* end asyncFileValueOf: */; if (failed()) { return null; } @@ -388,7 +442,7 @@ /* adjust for zero-origin indexing */ - bufferPtr = ((((int) (firstIndexableField(buffer)))) + startIndex) - 1; + bufferPtr = ((((sqInt) (firstIndexableField(buffer)))) + startIndex) - 1; if (!(failed())) { asyncFileWriteStart(f, fPosition, bufferPtr, count); } @@ -414,6 +468,7 @@ #if !defined(SQUEAK_BUILTIN_PLUGIN) booleanValueOf = interpreterProxy->booleanValueOf; + byteSizeOf = interpreterProxy->byteSizeOf; classByteArray = interpreterProxy->classByteArray; failed = interpreterProxy->failed; firstIndexableField = interpreterProxy->firstIndexableField; @@ -425,6 +480,7 @@ pop = interpreterProxy->pop; popthenPush = interpreterProxy->popthenPush; primitiveFail = interpreterProxy->primitiveFail; + primitiveFailFor = interpreterProxy->primitiveFailFor; slotSizeOf = interpreterProxy->slotSizeOf; stackIntegerValue = interpreterProxy->stackIntegerValue; stackValue = interpreterProxy->stackValue; @@ -456,11 +512,11 @@ {"AsynchFilePlugin", "getModuleName", (void*)getModuleName}, {"AsynchFilePlugin", "initialiseModule", (void*)initialiseModule}, {"AsynchFilePlugin", "moduleUnloaded", (void*)moduleUnloaded}, - {"AsynchFilePlugin", "primitiveAsyncFileClose\000\001", (void*)primitiveAsyncFileClose}, + {"AsynchFilePlugin", "primitiveAsyncFileClose\000\000", (void*)primitiveAsyncFileClose}, {"AsynchFilePlugin", "primitiveAsyncFileOpen\000\000", (void*)primitiveAsyncFileOpen}, {"AsynchFilePlugin", "primitiveAsyncFileReadResult\000\001", (void*)primitiveAsyncFileReadResult}, - {"AsynchFilePlugin", "primitiveAsyncFileReadStart\000\001", (void*)primitiveAsyncFileReadStart}, - {"AsynchFilePlugin", "primitiveAsyncFileWriteResult\000\001", (void*)primitiveAsyncFileWriteResult}, + {"AsynchFilePlugin", "primitiveAsyncFileReadStart\000\000", (void*)primitiveAsyncFileReadStart}, + {"AsynchFilePlugin", "primitiveAsyncFileWriteResult\000\000", (void*)primitiveAsyncFileWriteResult}, {"AsynchFilePlugin", "primitiveAsyncFileWriteStart\000\001", (void*)primitiveAsyncFileWriteStart}, {"AsynchFilePlugin", "setInterpreter", (void*)setInterpreter}, {"AsynchFilePlugin", "shutdownModule\000\377", (void*)shutdownModule}, @@ -469,11 +525,11 @@ #else /* ifdef SQ_BUILTIN_PLUGIN */ -signed char primitiveAsyncFileCloseAccessorDepth = 1; +signed char primitiveAsyncFileCloseAccessorDepth = 0; signed char primitiveAsyncFileOpenAccessorDepth = 0; signed char primitiveAsyncFileReadResultAccessorDepth = 1; -signed char primitiveAsyncFileReadStartAccessorDepth = 1; -signed char primitiveAsyncFileWriteResultAccessorDepth = 1; +signed char primitiveAsyncFileReadStartAccessorDepth = 0; +signed char primitiveAsyncFileWriteResultAccessorDepth = 0; signed char primitiveAsyncFileWriteStartAccessorDepth = 1; #endif /* ifdef SQ_BUILTIN_PLUGIN */

1 0

[commit][3168] As per VMMaker.oscog-eem.974, fix 64-bit issues in the AsynchFilePlugin.
by commits＠squeakvm.org 11 Dec '14

11 Dec '14

Revision: 3168 Author: eliot Date: 2014-12-10 15:23:27 -0800 (Wed, 10 Dec 2014) Log Message: ----------- As per VMMaker.oscog-eem.974, fix 64-bit issues in the AsynchFilePlugin. Modified Paths: -------------- trunk/platforms/win32/plugins/AsynchFilePlugin/sqWin32AsyncFilePrims.c Modified: trunk/platforms/win32/plugins/AsynchFilePlugin/sqWin32AsyncFilePrims.c =================================================================== --- trunk/platforms/win32/plugins/AsynchFilePlugin/sqWin32AsyncFilePrims.c 2014-12-10 21:04:05 UTC (rev 3167) +++ trunk/platforms/win32/plugins/AsynchFilePlugin/sqWin32AsyncFilePrims.c 2014-12-10 23:23:27 UTC (rev 3168) @@ -87,12 +87,12 @@ /*** Exported Functions ***/ int asyncFileClose(AsyncFile *f); -int asyncFileOpen(AsyncFile *f, int fileNamePtr, int fileNameSize, int writeFlag, int semaIndex); +int asyncFileOpen(AsyncFile *f, long fileNamePtr, int fileNameSize, int writeFlag, int semaIndex); int asyncFileRecordSize(); -int asyncFileReadResult(AsyncFile *f, int bufferPtr, int bufferSize); +int asyncFileReadResult(AsyncFile *f, long bufferPtr, int bufferSize); int asyncFileReadStart(AsyncFile *f, int fPosition, int count); int asyncFileWriteResult(AsyncFile *f); -int asyncFileWriteStart(AsyncFile *f, int fPosition, int bufferPtr, int bufferSize); +int asyncFileWriteStart(AsyncFile *f, int fPosition, long bufferPtr, int bufferSize); /***************************************************************************** @@ -205,7 +205,7 @@ return 1; } -int asyncFileOpen(AsyncFile *f, int fileNamePtr, int fileNameSize, +int asyncFileOpen(AsyncFile *f, long fileNamePtr, int fileNameSize, int writeFlag, int semaIndex) { /* Opens the given file using the supplied AsyncFile structure to record its state. Fails with no side effects if f is already open. Files are @@ -278,7 +278,7 @@ return 1; } -int asyncFileReadResult(AsyncFile *f, int bufferPtr, int bufferSize) { +int asyncFileReadResult(AsyncFile *f, long bufferPtr, int bufferSize) { /* Copy up to bufferSize bytes from the buffer of the last read operation into the given Squeak buffer, and return the number of bytes copied. Negative values indicate: @@ -341,7 +341,7 @@ return state->bytesTransferred; } -int asyncFileWriteStart(AsyncFile *f, int fPosition, int bufferPtr, int bufferSize) { +int asyncFileWriteStart(AsyncFile *f, int fPosition, long bufferPtr, int bufferSize) { /* Start an asynchronous operation to write bufferSize bytes to the given file starting at the given file position. The file''s semaphore will be signalled when the operation is complete. The client may then use asyncFileWriteResult() to

1 0

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

11 Dec '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.974.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.974 Author: eem Time: 10 December 2014, 3:15:09.286 pm UUID: 7ca9044b-c2d1-4605-b2b6-2b8ffc66c096 Ancestors: VMMaker.oscog-eem.973 Fix 64-bit issues in the AsynchFilePlugin. =============== Diff against VMMaker.oscog-eem.973 =============== Item was changed: ----- Method: AsynchFilePlugin>>asyncFileValueOf: (in category 'primitives') ----- asyncFileValueOf: oop + "Answer a pointer to the first byte of the async file record within the given + Smalltalk bytes object, or fail and answer nil if oop is not an async file record." - "Answer a pointer to the first byte of the async file record within the given Smalltalk bytes object, or nil if oop is not an async file record." <returnTypeC: 'AsyncFile *'> + ((interpreterProxy isBytes: oop) + and: [(interpreterProxy byteSizeOf: oop) = (self sizeof: #AsyncFile)]) ifTrue: + [^self cCoerceSimple: (interpreterProxy firstIndexableField: oop) to: 'AsyncFile *']. + interpreterProxy primitiveFailFor: PrimErrBadArgument. + ^nil! - interpreterProxy success: - ((interpreterProxy isBytes: oop) - and: [(interpreterProxy slotSizeOf: oop) = (self cCode: 'sizeof(AsyncFile)')]). - ^interpreterProxy failed - ifTrue: [nil] - ifFalse: [self cCoerceSimple: (interpreterProxy firstIndexableField: oop) to: 'AsyncFile *']! Item was changed: ----- Method: AsynchFilePlugin>>primitiveAsyncFileOpen:forWrite:semaIndex: (in category 'primitives') ----- primitiveAsyncFileOpen: fileName forWrite: writeFlag semaIndex: semaIndex | fileNameSize fOop f okToOpen | <var: #f type: 'AsyncFile *'> self primitive: 'primitiveAsyncFileOpen' parameters: #(#String #Boolean #SmallInteger ). + fileNameSize := interpreterProxy byteSizeOf: (fileName asOop: String). - fileNameSize := interpreterProxy slotSizeOf: (fileName asOop: String). "If the security plugin can be loaded, use it to check for permission. If not, assume it's ok" + sCOAFfn ~= 0 ifTrue: + [okToOpen := self cCode: '((sqInt (*) (char *, sqInt, sqInt)) sCOAFfn)(fileName, fileNameSize, writeFlag)' + inSmalltalk: [true]. + okToOpen ifFalse: + [^interpreterProxy primitiveFail]]. + fOop := interpreterProxy + instantiateClass: interpreterProxy classByteArray + indexableSize: (self sizeof: #AsyncFile). - sCOAFfn ~= 0 - ifTrue: [okToOpen := self cCode: ' ((sqInt (*) (char *, sqInt, sqInt)) sCOAFfn)(fileName, fileNameSize, writeFlag)'. - okToOpen ifFalse: [^ interpreterProxy primitiveFail]]. - fOop := interpreterProxy instantiateClass: interpreterProxy classByteArray indexableSize: (self cCode: 'sizeof(AsyncFile)'). f := self asyncFileValueOf: fOop. + interpreterProxy failed ifFalse: + [self cCode: 'asyncFileOpen(f, fileName, fileNameSize, writeFlag, semaIndex)']. + ^fOop! - interpreterProxy failed ifFalse: [self cCode: 'asyncFileOpen(f, (int)fileName, fileNameSize, writeFlag, semaIndex)']. - ^ fOop! Item was changed: ----- Method: AsynchFilePlugin>>primitiveAsyncFileReadResult:intoBuffer:at:count: (in category 'primitives') ----- primitiveAsyncFileReadResult: fhandle intoBuffer: buffer at: start count: num | bufferSize bufferPtr r f count startIndex | <var: #f type: 'AsyncFile *'> self primitive: 'primitiveAsyncFileReadResult' parameters: #(Oop Oop SmallInteger SmallInteger ). f := self asyncFileValueOf: fhandle. count := num. startIndex := start. bufferSize := interpreterProxy slotSizeOf: buffer. "in bytes or words" (interpreterProxy isWords: buffer) ifTrue: ["covert word counts to byte counts" count := count * 4. startIndex := startIndex - 1 * 4 + 1. bufferSize := bufferSize * 4]. interpreterProxy success: (startIndex >= 1 and: [startIndex + count - 1 <= bufferSize]). + bufferPtr := (self cCoerce: (interpreterProxy firstIndexableField: buffer) to:#sqInt) + startIndex - 1. "adjust for zero-origin indexing" - bufferPtr := (self cCoerce: (interpreterProxy firstIndexableField: buffer) to: 'int') + startIndex - 1. "adjust for zero-origin indexing" interpreterProxy failed ifFalse: [r := self cCode: 'asyncFileReadResult(f, bufferPtr, count)']. ^ r asOop: SmallInteger! Item was changed: ----- Method: AsynchFilePlugin>>primitiveAsyncFileWriteStart:fPosition:fromBuffer:at:count: (in category 'primitives') ----- primitiveAsyncFileWriteStart: fHandle fPosition: fPosition fromBuffer: buffer at: start count: num | f bufferSize bufferPtr count startIndex | <var: #f type: 'AsyncFile *'> self primitive: 'primitiveAsyncFileWriteStart' parameters: #(Oop SmallInteger Oop SmallInteger SmallInteger ). f := self asyncFileValueOf: fHandle. interpreterProxy failed ifTrue: [^ nil]. count := num. startIndex := start. bufferSize := interpreterProxy slotSizeOf: buffer. "in bytes or words" (interpreterProxy isWords: buffer) ifTrue: ["covert word counts to byte counts" count := count * 4. startIndex := startIndex - 1 * 4 + 1. bufferSize := bufferSize * 4]. interpreterProxy success: (startIndex >= 1 and: [startIndex + count - 1 <= bufferSize]). + bufferPtr := (self cCoerce: (interpreterProxy firstIndexableField: buffer) to: #sqInt) + startIndex - 1. "adjust for zero-origin indexing" - bufferPtr := (self cCoerce: (interpreterProxy firstIndexableField: buffer) to: 'int') + startIndex - 1. "adjust for zero-origin indexing" interpreterProxy failed ifFalse: [self cCode: 'asyncFileWriteStart(f, fPosition, bufferPtr, count)']! Item was added: + ----- Method: AsynchFilePlugin>>sizeof: (in category 'simulation') ----- + sizeof: objectSymbolOrClass + <doNotGenerate> + objectSymbolOrClass isInteger ifTrue: + [^interpreterProxy wordSize]. + objectSymbolOrClass == #AsyncFile ifTrue: + [^interpreterProxy wordSize * 2]. + ^super sizeof: objectSymbolOrClass!

1 0

sqOldSoundPrims.c
by Eliot Miranda 10 Dec '14

10 Dec '14

Hi All, I would like to delete platforms/Cross/plugins/SoundGenerationPlugin/sqOldSoundPrims.c and remove the relevant prims from SoundGenerationPlugin.h. Any objections? If there are, I'll put a #if !_LP64 guard aruond them. -- best, Eliot

2 2

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

10 Dec '14

Timothy M uploaded a new version of CMakeVMMakerSqueak to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMakerSqueak-tty.104.mcz ==================== Summary ==================== Name: CMakeVMMakerSqueak-tty.104 Author: tty Time: 9 December 2014, 9:04:00.092 pm UUID: 11491936-7605-416e-9cbf-61f691632ddf Ancestors: CMakeVMMakerSqueak-tty.103 Started organizing CMakeVMMakerSqueakDeveloperHelp according to topic. Added some Help classes for the various topics. Filed some existing scratch notes into various pages. =============== Diff against CMakeVMMakerSqueak-tty.103 =============== Item was added: + ----- Method: CMakeVMMakerSqueakBuildersHelp class>>key (in category 'accessing') ----- + key + ^'CMakeVMMakerSqueakBuildersHelp'! Item was added: + CMakeVMMakerSqueakDeveloperHelp subclass: #CMakeVMMakerSqueakConfigurationsHelp + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-Help'! + + !CMakeVMMakerSqueakConfigurationsHelp commentStamp: '<historical>' prior: 0! + A CMakeVMMakerSqueakNewConfigurationStepByStepHelp itemizes the steps needed to create a new build configuration. + + HelpBrowser openOn: CMakeVMMakerSqueakNewConfigurationStepByStepHelp! Item was added: + ----- Method: CMakeVMMakerSqueakConfigurationsHelp class>>bookName (in category 'accessing') ----- + bookName + ^'Configurations'! Item was added: + ----- Method: CMakeVMMakerSqueakConfigurationsHelp class>>key (in category 'accessing') ----- + key + ^'CMakeVMMakerSqueakConfigurationsHelp'! Item was added: + ----- Method: CMakeVMMakerSqueakConfigurationsHelp class>>overview (in category 'pages') ----- + overview + ^HelpTopic + title:'Overview' + contents: + ' CMakeVMMakerSqueak Configurations. encapsulate CMake output. + + The CMake encapsulation is eased by storing CMakeTemplates--small wrapper classes that encapsulate CMake constructs. + + Configurations Are organized by Platform in specific Class Categories. Example: CMakeVMMakerSqueak-MacOSPowerPC contains all the configurations for that platform. + + Configurations should adhere to a naming convention that mirror Eliot Miranda''s Autotools build system layout: + [Platform][Language][VM][Memory Model][Foo]Config. + + Examples: + Plan9NewspeakSistaSpurConfig + MacOSXSqueakCogSpurConfig + Windows32SqueakStackV2JoesPersonalTotallyAweseomeConfig + + Configurations can support the available build types: #build, #buildDebug, #buildAssert...etc. + Configurations can exclude themselves from being built by Builders. + Configurations can exclude themselves from supporting particular buildTypes. + + For each buildType, a Configuration encapsulates CMake configuration parameters for that buildType.. + + + + + '! Item was added: + ----- Method: CMakeVMMakerSqueakConfigurationsHelp class>>pages (in category 'accessing') ----- + pages + ^#(overview CMakeVMMakerSqueakStepByStepNewConfigurationHelp CMakeVMMakerSqueakStepByStepNewPlatformHelp)! Item was removed: - ----- Method: CMakeVMMakerSqueakDeveloperHelp class>>buildersAndConfigs (in category 'pages') ----- - buildersAndConfigs - ^HelpTopic - title:'Organization' - contents: - ' - The CMakeVMMakerSqueak Builders and Configurations are organized to mirror Eliot''s GNU build system organization. - - The intent is to reduce brain cycles translating from the computer''s directory layout to what you see in CMakeVMMakerSqueak by providing a (nearly) one-to-one correspondence. - - Eliot has named build directories in Cog/ svn (oscogvm directory in this system) by the convention - build.[OperatingSystem].[VMWordSize].[Processor Architecture]. For example: build.macosx32x86 - - Under each build.[OperatingSystem].[VMWordSize].[Processor Architecture] directory are subdirectories for each - [Language][VM][MemoryManager]. example newspeak.sista.spur. - - The permutations of [Language][VM][MemoryManager] currently are: - - [newspeak | squeak]. [cog | sista | stack]. [spur | v3] or 2!! x 3!! x 2!! which is between 12 and eleventy billion permutations - - Similarly, in CMakeVMMakerSqueak, Categories containing Configurations are organized by CMakeVMMakerSqueak-[OperatingSystem][VMWordSize][Processor][etc] - - Configuration classes within a CMakeVMMakerSqueak-[OperatingSystem][VMWordSize][Processor][etc] are Named: - [[Squeak] | [] ][Language][VM][MemoryManager][etc]Config and correspond with the 12 permutations - - When CMakeVMMakerSqueak generates build or products , it prefaces Eliot''s naming convention with a ''cmake.'' - - for example builds take place in: cmake.build.linux.32.x66/squeak.cog.spur - and output is placed in cmake.products. for example: oscogvm/cmake.products/squeak.cog.v3.noGL/ - - Builders manage Configurations and Builds for a particular [Language][VM][MemoryManager] category. - THERE IS A ONE-TO-ONE CORRESPONEDENCE between aConcreteBuilder>configurationsCategory and the Smalltalk Category name. - If you change one, you must change the other in order for the Builder to manage that configuration. - - example: SqueakMacOSX32x86Builder configurationsCategory - - - - '! Item was removed: - ----- Method: CMakeVMMakerSqueakDeveloperHelp class>>igorStasenkoDesign (in category 'pages') ----- - igorStasenkoDesign - ^HelpTopic - title:'Design Patterns' - contents: - 'CMakeVMMakerSqueak extends Igor Stasenko''s pharo work in CMMakeVMMaker. - - The system employs the Visitor design pattern in two places. - - 1. When a CPlatformConfigForSqueak subclass invokes CMakeVMGeneratorForSqueak>>generate passing itself as the visitor. - 2. In SqueakCMakeVMMakerAbstractBuilder when Configuration information is cached in a CMakeVMakerConfigurationInfo. - - The CPlatformConfigForSqueak makes heavy use of a Template pattern. This pattern is used extensively in the protocol ''cmake buildType redirects''. - This is used to force correct implementation of configurations. It also extends the pharo system to support the build types required for the - - Fairly extensive Tests are written to ensure correct implementation of Configurations. - - '! Item was added: + ----- Method: CMakeVMMakerSqueakDeveloperHelp class>>key (in category 'accessing') ----- + key + ^'CMakeVMMakerSqueakDeveloperHelp'! Item was added: + ----- Method: CMakeVMMakerSqueakDeveloperHelp class>>looseEnds (in category 'pages') ----- + looseEnds + ^HelpTopic + title:'Loose Ends' + contents: + 'As of 2014.12.09 there are the inevitable loose ends. Some are: + + CMake provides a Packaging infrastructure that should be imported here. + + Importing and compiling 3''rd party libraries has not been ported or tested. + + The Builder facades lacks some query functionality. + + The Builder facades may prove to be useless--we may want to throw them away. + + Tests needed for testing Plugins + + Templates should probably be organized by + cmake --help-command-list + cmake --help-module-list + cmake --help-property-list + cmake --help-variable-list etc. + + '! Item was removed: - ----- Method: CMakeVMMakerSqueakDeveloperHelp class>>overview (in category 'pages') ----- - overview - ^HelpTopic - title:'Overview' - contents: - ' - The heart of the package is CMakeGeneratorForSqueak and its two subclasses CMakeVMGeneratorForSqueak and CMakePluginGeneratorForSqueak. - - - CMakeVMGeneratorForSqueak collects information from subclasses of CPlatformConfigForSqueak, CMThirdpartyLibrary and InterpreterPlugins and writes it out to CMake files and associated directories. - - From there, the user invokes cmake and make using a generated build.sh script. - - The programmer directs the flow of the generator by coding a subclass of CPlatformConf, setting it up correctly and asking it to generate itself. - - The configuration then invokes the CMakeGeneratorForSqueak passing itself as an argument. - - The VMGeneratator extracts the information and utilizes VMPluginGenerator to generate plugin stuff, the CPlatformConf to generate other stuff and CMThirdPartyLibrary''s to generate other stuff. - - The end result is a CMake evironment that is set up to correctly build a VM - - Concrete implementations of SqueakCMakeVMMakerAbstractBuilder provide an invokation facade and configuration query capabilities. - - - '! Item was changed: ----- Method: CMakeVMMakerSqueakDeveloperHelp class>>pages (in category 'pages') ----- pages + ^#(CMakeVMMakerSqueakHistoryHelp CMakeVMMakerSqueakOverviewHelp CMakeVMMakerSqueakConfigurationsHelp CMakeVMMakerSqueakTemplatesHelp CMakeVMMakerSqueakGeneratorsHelp CMakeVMMakerSqueakBuildersHelp configDotCmake looseEnds plugins pthreads templates tests )! - ^#(overview prerequisites terms igorStasenkoDesign tests buildersAndConfigs plugins pthreads configDotCmake templates vmplugins CMakeVMMakerSqueakBuildersHelp CMakeVMMakerSqueakHowToCreateNewConfigurationHelp)! Item was removed: - ----- Method: CMakeVMMakerSqueakDeveloperHelp class>>prerequisites (in category 'pages') ----- - prerequisites - ^HelpTopic - title:'Prerequisites' - contents: - 'The CMakeVMMakerSqueak depends on CMakeVMMaker (a pharo implementation) - - CMake from http://www.cmake.org/ is required to process the output of this package. - - This package was written using cmake version 2.8.12 - '! Item was removed: - ----- Method: CMakeVMMakerSqueakDeveloperHelp class>>terms (in category 'pages') ----- - terms - ^HelpTopic - title:'Terms' - contents: - ' - AbstractBaseClass: - Typically the topmost class in a [OS][VMWordSize][Processor][ETC] class category. Example: CPlatformConfigForSqueak. Most of the configuration action happens at this level and lower. - - Builder: - A concrete subclass of SqueakCMakeVMMakerAbstractBuilder. Builders act as a facade for invoking the configurations.They also provide query tools for the configurations that a builder manages. There is a one-to-one correspondence between a Builder''s configurationsCategory and the configurations it manages. example: SqueakBSDx86Builder configurationsCategory - - buildType: - One of SqueakCMakeVMMakerAbstractBuilder allBuildTypes - - - CMakeLists.txt: - The instructions that CMake uses to build build systems. One output of a configuration - - Configuration: - CPlatformConfigForSqueak and its subclasses. These maintain the definitions that are rendered into CMakeLists.txt files - - - Generator: - CMakeGeneratorForSqueak and its subclasses - - - Redirect Methods: - Given a method X, it is a redirect method if a call to it redirects to xBuildType based on the state of the configurations buildType buildType variable. See CPlatformConfigForSqueak protocol ''cmake buildType redirects'' - - - - - '! Item was removed: - ----- Method: CMakeVMMakerSqueakDeveloperHelp class>>vmplugins (in category 'pages') ----- - vmplugins - ^HelpTopic - title:'VMPlugins' - contents:' - - TODO CMakeVMMakerSqueak-VMPlugin purpose, configuration and use'! Item was added: + CMakeVMMakerSqueakGeneratorsHelp subclass: #CMakeVMMakerSqueakDistroGeneratorHelp + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-Help'! Item was added: + ----- Method: CMakeVMMakerSqueakDistroGeneratorHelp class>>bookName (in category 'accessing') ----- + bookName + ^'Distro Generator'! Item was added: + ----- Method: CMakeVMMakerSqueakDistroGeneratorHelp class>>key (in category 'accessing') ----- + key + ^'CMakeVMMakerSqueakDistroGeneratorHelp'! Item was added: + ----- Method: CMakeVMMakerSqueakDistroGeneratorHelp class>>overview (in category 'pages') ----- + overview + ^HelpTopic + title: 'Overview' + contents: + 'Write me'! Item was added: + ----- Method: CMakeVMMakerSqueakDistroGeneratorHelp class>>pages (in category 'accessing') ----- + pages + ^#(overview)! Item was added: + CMakeVMMakerSqueakDeveloperHelp subclass: #CMakeVMMakerSqueakGeneratorsHelp + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-Help'! Item was added: + ----- Method: CMakeVMMakerSqueakGeneratorsHelp class>>bookName (in category 'accessing') ----- + bookName + ^'Generators'! Item was added: + ----- Method: CMakeVMMakerSqueakGeneratorsHelp class>>key (in category 'accessing') ----- + key + ^'CMakeVMMakerSqueakGeneratorsHelp'! Item was added: + ----- Method: CMakeVMMakerSqueakGeneratorsHelp class>>overview (in category 'pages') ----- + overview + ^HelpTopic + title: 'Overview' + contents: + 'Generators Generate.'! Item was added: + ----- Method: CMakeVMMakerSqueakGeneratorsHelp class>>pages (in category 'accessing') ----- + pages + ^#(overview CMakeVMMakerSqueakVMGeneratorHelp CMakeVMMakerSqueakPluginGeneratorHelp CMakeVMMakerSqueakDistroGeneratorHelp)! Item was changed: ----- Method: CMakeVMMakerSqueakHelp class>>pages (in category 'accessing') ----- pages + ^#( CMakeVMMakerSqueakStartHereHelp CMakeVMMakerSqueakDeveloperHelp )! - ^#(CMakeVMMakerSqueakStartHereHelp CMakeVMMakerSqueakDeveloperHelp )! Item was added: + CMakeVMMakerSqueakDeveloperHelp subclass: #CMakeVMMakerSqueakHistoryHelp + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-Help'! Item was added: + ----- Method: CMakeVMMakerSqueakHistoryHelp class>>bookName (in category 'accessing') ----- + bookName + ^'History'! Item was added: + ----- Method: CMakeVMMakerSqueakHistoryHelp class>>cmakeVMMakerSqueak (in category 'pages') ----- + cmakeVMMakerSqueak + ^HelpTopic + title: 'Summary' + contents: + 'CMakeVMMakerSqueak .... + + The original version subclassed the various Generators, Configs and Builders of Igor''s version while providing a small pharo/squeak compatibility layer where required. This philosophy was in place for CMakeVMMakerSqueak-tty.1 to CMakeVMMakerSqueak-tty.26 + + This approach was abandoned when Eliot Miranda adopted his [Platform][Language][VM][MemoryManager][BuildType] organization on the basis of simple math. + + The build system must support + [N Platforms: Windows Linux Mac BSD Plan9...][2 Languages: Newspeak and Squeak.] x [3. Virtual Machines: Cog, Sista and Stack.] x [2 Memory Managers: V3 and Spur.] x [9 build types build build.assert.itimerheartbeat build.debug.itimerheartbeat build.multithreaded build.multithreaded.debug build.assert build.debug build.itimerheartbeat build.multithreaded.assert ] = N x [2 x 3 x 2 x 9]= Nx 108 distinct Configurations. + + + Development started along these lines at CMakeVMMakerSqueak-tty.27. During this next stretch, I attempted to make CMakeVMMaker and CMakeVMMakerSqueak functionaly equivalent--meaning a pharo user could use the squeak system using pharo idioms. This required some ridiculous contortions exemplified by what I believe is the largest Trait ever attempted. You can see this at CMakeVMMakerSqueak-tty.32 where I write + + ''Removed old Traits from first port from Pharo and added a new Trait. Installed this trait at the topmost class of the Squeak heirarchy which is inter-twined with the existing pharo hierarchy. Ugly, but not too ugly and supports decision not to fork existing work. This lets me enforce a pseudo-abstract class discipline. + + Probably two more days coding to get this to production." + + heh. + + The Trait grew, and grew and grew. as I attempted to bolt on Eliot''s requirements onto the side of the Pharo code using a Trait. The result was like that scene in Aliens where the baby Alien attaches itself to the face of the astronaut... + + At CMakeVMMakerSqueak-tty.63 I noticed that the Trait would not do. The functionality was OK, but the Package could not be loaded into a Squeak image from the Monticello Repository. This killed that approach. + + At CMakeVMMakerSqueak-tty.64 I started over and decided to implement a ''parallel'' system to the pharo code that relied on Igor''s generators to produce the CMake files. + + At CMakeVMMakerSqueak-tty.82 Eliot noticed a major problem with the Pharo approach. The config.h file was hard coded. We needed CMake to generate that. At this point I turned to Ian''s code for instruction. + + I studied his code and noted the use of templates and the overall flow of processing. Igor''s processing flow is very close to Ian''s so the processing Architecture of CMakeVMaker was kept in place. I did start the process of using CMake Templates at this point as I found it much easier. + + This process continues until CMakeVMMakerSqueak-tty.99. + + At CMakeVMMakerSqueak-tty.99 I ditched the CMakeVMmaker generate methods and went generateByTemplate for all Generators. + + + In Summary, the programmatic flow of the system and most design patterns are Igor''s. The emphasises on CMake generation and the use of Templates are Ian''s. + + + + + + + + + + + + + + + + + + + + '! Item was added: + ----- Method: CMakeVMMakerSqueakHistoryHelp class>>key (in category 'accessing') ----- + key + ^'CMakeVMMakerSqueakHistoryHelp'! Item was added: + ----- Method: CMakeVMMakerSqueakHistoryHelp class>>overview (in category 'pages') ----- + overview + ^HelpTopic + title: 'CMakeVMMakerSqueak' + contents: + 'CMakeVMMaker Squeak is a product of Igor Stasenko''s CMakeVMaker for pharo and Ian Piumurta''s custom CMake configuration files he wrote for the Stack Interpreter on Linux. + + Here I present an overview of the design of each historical system and end with a summary of their contributions to this system. + '! Item was added: + ----- Method: CMakeVMMakerSqueakHistoryHelp class>>pages (in category 'pages') ----- + pages + ^#( CMakeVMMakerSqueakHistoryIgorStasenkoHelp CMakeVMMakerSqueakHistoryIanPiumartaHelp cmakeVMMakerSqueak)! Item was added: + CMakeVMMakerSqueakHistoryHelp subclass: #CMakeVMMakerSqueakHistoryIanPiumartaHelp + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-Help'! Item was added: + ----- Method: CMakeVMMakerSqueakHistoryIanPiumartaHelp class>>bookName (in category 'accessing') ----- + bookName + ^'Ian Piumarta''s CMake'! Item was added: + ----- Method: CMakeVMMakerSqueakHistoryIanPiumartaHelp class>>ianPiumarta (in category 'pages') ----- + ianPiumarta + ^HelpTopic + title:'Ian Piumurta''s CMake System' + contents: + 'Ian Piumurta wrote a hand-crafted CMake System for the Standard Interpreter. + + You can download it here. + + It makes heavy use of templates and macros + + It is responsible for the switch to CMake Templates from the pharo string concatenation based approach. + + Its structure is: + + I am confident that the development of this system will/should proceed towards the CMake model Ian created. Specifically in the simplification + and refactoring of the generateByTemplate method in xyz + + + '! Item was added: + ----- Method: CMakeVMMakerSqueakHistoryIanPiumartaHelp class>>key (in category 'accessing') ----- + key + ^'CMakeVMMakerSqueakHistoryIanPiumartaHelp'! Item was added: + ----- Method: CMakeVMMakerSqueakHistoryIanPiumartaHelp class>>overview (in category 'pages') ----- + overview + ^HelpTopic + title:'Overview' + contents: + 'Ian Piumurta wrote a hand-crafted CMake System for the Standard Interpreter. + + You can download it here. + + It makes heavy use of templates and macros + + It is responsible for the switch to CMake Templates from the pharo string concatenation based approach. + + Its structure is: + + I am confident that the development of this system will/should proceed towards the CMake model Ian created. Specifically in the simplification + and refactoring of the generateByTemplate method in xyz + + + '! Item was added: + ----- Method: CMakeVMMakerSqueakHistoryIanPiumartaHelp class>>pages (in category 'pages') ----- + pages + ^#( overview)! Item was added: + CMakeVMMakerSqueakHistoryHelp subclass: #CMakeVMMakerSqueakHistoryIgorStasenkoHelp + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-Help'! Item was added: + ----- Method: CMakeVMMakerSqueakHistoryIgorStasenkoHelp class>>bookName (in category 'accessing') ----- + bookName + ^'Igor Sasenko''s CMake'! Item was added: + ----- Method: CMakeVMMakerSqueakHistoryIgorStasenkoHelp class>>key (in category 'accessing') ----- + key + ^'CMakeVMMakerSqueakHistoryIgorStasenkoHelp'! Item was added: + ----- Method: CMakeVMMakerSqueakHistoryIgorStasenkoHelp class>>overview (in category 'pages') ----- + overview + ^HelpTopic + title:'Overview' + contents: + 'CMakeVMMakerSqueak extends Igor Stasenko''s pharo work in CMMakeVMMaker. + + The system employs the Visitor design pattern in two places. + + 1. When a CPlatformConfigForSqueak subclass invokes CMakeVMGeneratorForSqueak>>generate passing itself as the visitor. + 2. In SqueakCMakeVMMakerAbstractBuilder when Configuration information is cached in a CMakeVMakerConfigurationInfo. + + The CPlatformConfigForSqueak makes heavy use of a Template pattern. This pattern is used extensively in the protocol ''cmake buildType redirects''. + This is used to force correct implementation of configurations. It also extends the pharo system to support the build types required for the + + Fairly extensive Tests are written to ensure correct implementation of Configurations. + '! Item was added: + ----- Method: CMakeVMMakerSqueakHistoryIgorStasenkoHelp class>>pages (in category 'pages') ----- + pages + ^#( overview)! Item was removed: - CMakeVMMakerSqueakDeveloperHelp subclass: #CMakeVMMakerSqueakHowToCreateNewConfigurationHelp - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'CMakeVMMakerSqueak-Help'! - - !CMakeVMMakerSqueakHowToCreateNewConfigurationHelp commentStamp: 'tty 6/16/2014 12:19' prior: 0! - A CMakeVMMakerSqueakNewConfigurationStepByStepHelp itemizes the steps needed to create a new build configuration. - - HelpBrowser openOn: CMakeVMMakerSqueakNewConfigurationStepByStepHelp! Item was removed: - ----- Method: CMakeVMMakerSqueakHowToCreateNewConfigurationHelp class>>bookName (in category 'accessing') ----- - bookName - ^'Setting up a Configuration. Step By Step.'! Item was removed: - ----- Method: CMakeVMMakerSqueakHowToCreateNewConfigurationHelp class>>pages (in category 'accessing') ----- - pages - ^#(step1 - step2 - step3 - step4 - step4a - step4b - step4c - step4d - step4e - step4f - step4g - step4h - step4i - step4j - step4k - step4l - step4m - step5 - )! Item was removed: - ----- Method: CMakeVMMakerSqueakHowToCreateNewConfigurationHelp class>>step1 (in category 'pages') ----- - step1 - ^HelpTopic - title:'Step 1. Choose Your Category' - contents: - ' CMakeVMMakerSqueak configurations are placed in a Smalltalk category with the naming convention [OS][VMWordSize][Processor] - - You start by choosing the correct Smalltalk Category in which to place your new Configuration. - - Example; If you need a new configuration for Linux for a 32 bit VM on the x86 platform--[Linux][32][x86]--Choose the CMakeVMMakerSqueak-Linux32x86 category. - - A Reminder: Consistent Naming Conventions Are Our Friends!! - - '! Item was removed: - ----- Method: CMakeVMMakerSqueakHowToCreateNewConfigurationHelp class>>step2 (in category 'pages') ----- - step2 - ^HelpTopic - title:'Step 2. Copy Existing Concrete Configuration' - contents: - 'Now that you have selected your category to place your new Configuration, you need to create your configuration. - - Like Categories, Configurations adhere to a naming convention. It is [language][VM][MemoryManager][etc]Config - example: squeak.cog.v3.tty is a configuration for compiling Squeak with a Cog VM with the old V3 memory manager and this is a special configuration for tty. - - The easiest way to create the config is to subclass an existing configuration. In this case I would subclass squeak.cog.v3. - - IMPORTANT: Do not copy a configuration (usually the top one in a category) that has the " uses: TCPlatformConfigForSqueak" - line in its definition. While there are technical reasons for this warning, the important one is that it makes coding a pain-in-the-butt. - - - A Reminder: Consistent Naming Conventions Are Our Friends!! - '! Item was removed: - ----- Method: CMakeVMMakerSqueakHowToCreateNewConfigurationHelp class>>step3 (in category 'pages') ----- - step3 - ^HelpTopic - title:'Step 4. Customize the "cmake" protocol' - contents: - 'TODO - dirInstall - "the directory of the finished product.. the place where ''make install'' puts stuff. - SystemNavigation default browseMethodsWhoseNamesContain: ''dirInstall'' - " - ^self squeakCogV3 , ''.noGL'' - - - excludeFromBuild - ^false "build this configuration" - " ^true" - - executableName - ^ self vmCogExecutableName - A Reminder: Consistent Naming Conventions Are Our Friends!! - '! Item was removed: - ----- Method: CMakeVMMakerSqueakHowToCreateNewConfigurationHelp class>>step4 (in category 'pages') ----- - step4 - ^HelpTopic - title:'Step 4. Customize the "cmake build type config" protocol' - contents: - 'When we invoke a Builder with a command like: - - SqueakLinux64x86w32CompatBuilder - configureA: #Linux64x86w32BitSqueakCogV3SlackwareNoGLConfig forBuildType: #buildDebugITimerHeartbeat; - generateSources; - generate. - - We are telling the Builder to select a Configuration and have that Configuration configure itself to produce CMake output for the buildType: #buildDebugITimerHeartbeat; - - On your configuration the entry point for your configuration is one of: - - configureBuild - configureBuildAssert - configureBuildAssertITimerHeartbeat - configureBuildDebug - configureBuildDebugITimerHeartbeat <----this one is selected by buildType: #buildDebugITimerHeartbeat; - configureBuildITimerHeartbeat - configureBuildMultiThreaded - configureBuildMultiThreadedAssert - configureBuildMultiThreadedDebug - - Within this method, system state is set up and customizable for many methods in CMakeVMaker CPlatformConfig. - - "setGlobalOptions: aMaker" - "setGlobalOptionsAfterDetermineSystem: aMaker" - setupDirectories - preferredIncludes - standardIncludes - compilerFlags - "extraVMSettings: aMaker" - internalPlugins - externalPlugins - thirdpartyLibs - "setExtraTargetProperties: aMaker" - "postBuildActions: aMaker" - configH - - The methods above that take the : aMaker argument are handled on-the-fly later in the process and are only presented here for informational purposes. - - - - A Reminder: Consistent Naming Conventions Are Our Friends!! - - '! Item was removed: - ----- Method: CMakeVMMakerSqueakHowToCreateNewConfigurationHelp class>>step4a (in category 'pages') ----- - step4a - ^HelpTopic - title:'Step 4a. setGlobalOptions' - contents: - 'TODO: summarize this - - - - A Reminder: Consistent Naming Conventions Are Our Friends!! - - '! Item was removed: - ----- Method: CMakeVMMakerSqueakHowToCreateNewConfigurationHelp class>>step4b (in category 'pages') ----- - step4b - ^HelpTopic - title:'Step 4b. setGlobalOptionsAfterDetermineSystem' - contents: - 'TODO: summarize this - - - - - A Reminder: Consistent Naming Conventions Are Our Friends!! - - '! Item was removed: - ----- Method: CMakeVMMakerSqueakHowToCreateNewConfigurationHelp class>>step4c (in category 'pages') ----- - step4c - ^HelpTopic - title:'Step 4c. setupDirectories' - contents: - 'TODO: summarize this - - - - A Reminder: Consistent Naming Conventions Are Our Friends!! - - '! Item was removed: - ----- Method: CMakeVMMakerSqueakHowToCreateNewConfigurationHelp class>>step4d (in category 'pages') ----- - step4d - ^HelpTopic - title:'Step 4d. preferredIncludes' - contents: - 'This is handy when ''make'' cannot find a header. - - For example, when compiling - - I got error: - Scanning dependencies of target UnixOSProcessPlugin - /..../oscogvm/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c:48:26: fatal error: SocketPlugin.h: No such file or directory - - From my topDir (oscogvm) I did a search and found SocketPlugin.h exits in ./platforms/Cross/plugins/SocketPlugin/SocketPlugin.h - - in my root config class for my category, I had... - - ''${targetPlatform}/plugins/SocketPlugin'' - - I changed it to - - ''${crossDir}/plugins/SocketPlugin'' - - deleted my files in my build directory, re-ran the generate and... - - - - SystemNavigation default browseMethodsWhoseNamesContain: ''preferredIncludes'' - - - A Reminder: Consistent Naming Conventions Are Our Friends!! - - '! Item was removed: - ----- Method: CMakeVMMakerSqueakHowToCreateNewConfigurationHelp class>>step4e (in category 'pages') ----- - step4e - ^HelpTopic - title:'Step 4e. standardIncludes' - contents: - 'TODO: summarize this - - - - A Reminder: Consistent Naming Conventions Are Our Friends!! - - '! Item was removed: - ----- Method: CMakeVMMakerSqueakHowToCreateNewConfigurationHelp class>>step4f (in category 'pages') ----- - step4f - ^HelpTopic - title:'Step 4f. compilerFlags' - contents: - 'TODO: summarize this - - - - A Reminder: Consistent Naming Conventions Are Our Friends!! - - '! Item was removed: - ----- Method: CMakeVMMakerSqueakHowToCreateNewConfigurationHelp class>>step4g (in category 'pages') ----- - step4g - ^HelpTopic - title:'Step 4g. extraVMSettings' - contents: - 'TODO: summarize this - - - - A Reminder: Consistent Naming Conventions Are Our Friends!! - - '! Item was removed: - ----- Method: CMakeVMMakerSqueakHowToCreateNewConfigurationHelp class>>step4h (in category 'pages') ----- - step4h - ^HelpTopic - title:'Step4h internalPlugins' - contents: - 'TODO: summarize this - - - - A Reminder: Consistent Naming Conventions Are Our Friends!! - '! Item was removed: - ----- Method: CMakeVMMakerSqueakHowToCreateNewConfigurationHelp class>>step4i (in category 'pages') ----- - step4i - ^HelpTopic - title:'Step4i externalPlugins' - contents: - 'TODO: summarize this - - - - - A Reminder: Consistent Naming Conventions Are Our Friends!! - - '! Item was removed: - ----- Method: CMakeVMMakerSqueakHowToCreateNewConfigurationHelp class>>step4j (in category 'pages') ----- - step4j - ^HelpTopic - title:'Step4j thirdpartyLibs' - contents: - 'TODO: summarize this - - - A Reminder: Consistent Naming Conventions Are Our Friends!! - - - '! Item was removed: - ----- Method: CMakeVMMakerSqueakHowToCreateNewConfigurationHelp class>>step4k (in category 'pages') ----- - step4k - ^HelpTopic - title:'Step4k setExtraTargetProperties:aMaker' - contents: - 'TODO: summarize this - - - - A Reminder: Consistent Naming Conventions Are Our Friends!! - - '! Item was removed: - ----- Method: CMakeVMMakerSqueakHowToCreateNewConfigurationHelp class>>step4l (in category 'pages') ----- - step4l - ^HelpTopic - title:'Step4k postBuildActions: aMaker' - contents: - 'TODO: summarize this - - - - A Reminder: Consistent Naming Conventions Are Our Friends!! - - '! Item was removed: - ----- Method: CMakeVMMakerSqueakHowToCreateNewConfigurationHelp class>>step4m (in category 'pages') ----- - step4m - ^HelpTopic - title:'Step4m configH' - contents: - ' This is the contents of a config.h file in the build directory. - It is used only in Unix builds in CMakeVMMaker. - - - It is called from the method ''extraVMSettings'' of CogUnixConfig in CMakeVMMaker when CogUnixConfig sends the message: self generateConfigH. - - To provide a custom config.h CMakeVMakerSqueak subclasses that message ''self generateConfigH'' and routes the call - to ''generateConfigH: aBuildType'' - - From there, a block is evaluated appropriate for the build type that invokes a ''configHBuildXYZ'' method which can be overridden by you to - return a custom config.h. The default is to return the base configH. - - - A Reminder: Consistent Naming Conventions Are Our Friends!! - - '! Item was removed: - ----- Method: CMakeVMMakerSqueakHowToCreateNewConfigurationHelp class>>step5 (in category 'pages') ----- - step5 - ^HelpTopic - title:'Step5 set up ''cmake directory'' protocol' - contents: - 'The cmake directories protocol contains directory names for your platform, build directory - - See the chapter titled: ''An Explanation of Protocols in TCPaltformConfigForSqueak'' in - HelpBrowser openOn:CMakeVMMakerSqueakDeveloperHelp - - The ones that your Configuration must implement are: - - dirBuildPlatform - dirBuildLanguageVMMM - - - Basically, we are building a directory like this: - oscogvm/cmake.build.linux32.x86/squeak.cog.v3/build.assert - - which, when expressed as message names reduces to: - - topDir/dirLinux32x86/squeakCogV3/dirBuildAssert - - which are further reduced to - - topDir/dirBuildPlatform/dirBuildLanguageVMMM/dirBuildAssert - - It is the two in the middle that you must customize. (dirBuildAssert is dynamically set by a Builder in a script, to be covered later) - To see how, take a look at the implementors of the two. its quite intuitive once you see it as it is based off our standard naming conventions. - - SystemNavigation default browseMethodsWhoseNamesContain: ''dirBuildPlatform'' - SystemNavigation default browseMethodsWhoseNamesContain: ''dirBuildLanguageVMMM'' - - For our purposes in this example, we want: - - - dirBuildPlatform - ^self dirLinux32x86 - and - - dirBuildLanguageVMMM - ^self squeakCogV3 - - - A Reminder: Consistent Naming Conventions Are Our Friends!! - - '! Item was added: + CMakeVMMakerSqueakDeveloperHelp subclass: #CMakeVMMakerSqueakOverviewHelp + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-Help'! Item was added: + ----- Method: CMakeVMMakerSqueakOverviewHelp class>>bookName (in category 'accessing') ----- + bookName + ^'Overview'! Item was added: + ----- Method: CMakeVMMakerSqueakOverviewHelp class>>buildersAndConfigs (in category 'pages') ----- + buildersAndConfigs + ^HelpTopic + title:'Organization' + contents: + ' + The CMakeVMMakerSqueak Builders and Configurations are organized to mirror Eliot''s GNU build system organization. + + The intent is to reduce brain cycles translating from the computer''s directory layout to what you see in CMakeVMMakerSqueak by providing a (nearly) one-to-one correspondence. + + Eliot has named build directories in Cog/ svn (oscogvm directory in this system) by the convention + build.[OperatingSystem].[VMWordSize].[Processor Architecture]. For example: build.macosx32x86 + + Under each build.[OperatingSystem].[VMWordSize].[Processor Architecture] directory are subdirectories for each + [Language][VM][MemoryManager]. example newspeak.sista.spur. + + The permutations of [Language][VM][MemoryManager] currently are: + + [newspeak | squeak]. [cog | sista | stack]. [spur | v3] or 2!! x 3!! x 2!! which is between 12 and eleventy billion permutations + + Similarly, in CMakeVMMakerSqueak, Categories containing Configurations are organized by CMakeVMMakerSqueak-[OperatingSystem][VMWordSize][Processor][etc] + + Configuration classes within a CMakeVMMakerSqueak-[OperatingSystem][VMWordSize][Processor][etc] are Named: + [[Squeak] | [] ][Language][VM][MemoryManager][etc]Config and correspond with the 12 permutations + + When CMakeVMMakerSqueak generates build or products , it prefaces Eliot''s naming convention with a ''cmake.'' + + for example builds take place in: cmake.build.linux.32.x66/squeak.cog.spur + and output is placed in cmake.products. for example: oscogvm/cmake.products/squeak.cog.v3.noGL/ + + Builders manage Configurations and Builds for a particular [Language][VM][MemoryManager] category. + THERE IS A ONE-TO-ONE CORRESPONEDENCE between aConcreteBuilder>configurationsCategory and the Smalltalk Category name. + If you change one, you must change the other in order for the Builder to manage that configuration. + + example: SqueakMacOSX32x86Builder configurationsCategory + + + + '! Item was added: + ----- Method: CMakeVMMakerSqueakOverviewHelp class>>configDotCmake (in category 'pages') ----- + configDotCmake + ^HelpTopic + title:'config.cmake' + contents: + 'The config.cmake file is included in CMakeLists.txt. + + It contains CMake code to generate a config.h file on unix systems. + + You can view a Configurations config.cmake with this code: + + Transcript clear. + Transcript show: ((Linux64x86w32BitSqueakCogV3Config new) configureForBuildType: #build) contentForVmConfigCmake + + or print it in place with: + + ((Linux64x86w32BitSqueakCogV3Config new) configureForBuildType: #build) contentForVmConfigCmake + + The config.cmake file is generated with the usual Builder expressions. + + SqueakLinux64x86w32CompatBuilder + configureA: #Linux64x86w32BitSqueakCogV3Config forBuildType:#build; + generate. + + + A config.cmake is created from CMake Templates (wrappers) in the CmakeVMMakerSqueak-CMakeTemplates and CmakeVMMakerSqueak-CMakeCustomTemplates categories. + + + '! Item was added: + ----- Method: CMakeVMMakerSqueakOverviewHelp class>>igorStasenkoDesign (in category 'pages') ----- + igorStasenkoDesign + ^HelpTopic + title:'Design Patterns' + contents: + 'CMakeVMMakerSqueak extends Igor Stasenko''s pharo work in CMMakeVMMaker. + + The system employs the Visitor design pattern in two places. + + 1. When a CPlatformConfigForSqueak subclass invokes CMakeVMGeneratorForSqueak>>generate passing itself as the visitor. + 2. In SqueakCMakeVMMakerAbstractBuilder when Configuration information is cached in a CMakeVMakerConfigurationInfo. + + The CPlatformConfigForSqueak makes heavy use of a Template pattern. This pattern is used extensively in the protocol ''cmake buildType redirects''. + This is used to force correct implementation of configurations. It also extends the pharo system to support the build types required for the + + Fairly extensive Tests are written to ensure correct implementation of Configurations. + + '! Item was added: + ----- Method: CMakeVMMakerSqueakOverviewHelp class>>key (in category 'accessing') ----- + key + ^'CMakeVMMakerSqueakOverviewHelp'! Item was added: + ----- Method: CMakeVMMakerSqueakOverviewHelp class>>looseEnds (in category 'pages') ----- + looseEnds + ^HelpTopic + title:'Loose Ends' + contents: + 'As of 2014.12.09 there are the inevitable loose ends. Some are: + + Importing and compiling 3''rd party libraries has not been ported or tested. + The Builder facades lacks some query functionality. + The Builder facades may prove to be useless--we may want to throw them away. + + '! Item was added: + ----- Method: CMakeVMMakerSqueakOverviewHelp class>>overview (in category 'pages') ----- + overview + ^HelpTopic + title:'Overview' + contents: + 'Repeat after me: "CMAKE DRIVES THE PROCESS." + + Keeping the above statement in mind is the key to this package. + + What we are looking for is a CMake system that correctly builds a virtual machine on a given platform. + We then encapsulate that CMake system state in CMakeVMMakerSqueak Configurations. The end user can then reproduce that CMake system on their platform. + + Hopefully this package makes the above process predictable and somewhat sane. + + Towards that end, this system does the following : + + Stores CMake configuration in concrete subclasses of CPlatformConfigForSqueak in a predicatable manner. + Provides methods for extracting the CMake configuration from those classes. + Provides a (hopefully) newbie friendly Facade for extracting the CMake configuration via Builders (Concrete subclasses of SqueakCMakeVMMakerAbstractBuilder) + Provides (for the configuration developer) CMake command wrapper code in subclasses of CMakeTemplate. + Proves to be scriptable such that generating the CMake output can be automated (or extracted from a Seaside website). + + As the SqueakVM community gains experience with CMake, I expect the quality of the generated CMake output to improve considerably. CMake is a BIG system with LOTS of stuff in it. Storing the knowledge we gain in our Squeak classes should make things a lot easier on us. + + + + + + + + + + + The heart of the package is CMakeGeneratorForSqueak and its two subclasses CMakeVMGeneratorForSqueak and CMakePluginGeneratorForSqueak. + + + CMakeVMGeneratorForSqueak collects information from subclasses of CPlatformConfigForSqueak, CMThirdpartyLibrary and InterpreterPlugins and writes it out to CMake files and associated directories. + + From there, the user invokes cmake and make using a generated build.sh script. + + The programmer directs the flow of the generator by coding a subclass of CPlatformConf, setting it up correctly and asking it to generate itself. + + The configuration then invokes the CMakeGeneratorForSqueak passing itself as an argument. + + The VMGeneratator extracts the information and utilizes VMPluginGenerator to generate plugin stuff, the CPlatformConf to generate other stuff and CMThirdPartyLibrary''s to generate other stuff. + + The end result is a CMake evironment that is set up to correctly build a VM + + Concrete implementations of SqueakCMakeVMMakerAbstractBuilder provide an invokation facade and configuration query capabilities. + + + '! Item was added: + ----- Method: CMakeVMMakerSqueakOverviewHelp class>>pages (in category 'pages') ----- + pages + ^#(overview prerequisites terms igorStasenkoDesign buildersAndConfigs vmplugins )! Item was added: + ----- Method: CMakeVMMakerSqueakOverviewHelp class>>plugins (in category 'pages') ----- + plugins + ^HelpTopic + title:'Plugins' + contents:' + + TODO explain the design and methodology of the ''plugin extra rules'' protocol in + + Explain CMakePluginGeneratorSqueak containing the config.cmake files + + + provide example of mapping from plugins.int to defaultInternalPlugins + + |s| + Transcript clear. + s:=SortedCollection new. + InterpreterPlugin allSubclassesDo:[:p| + p moduleName = ''B2DPlugin'' + ifTrue:[Transcript show:p name]. + s add: (p moduleName)]. + + Transcript show: s. + + SqueakUnixConfig browse + '! Item was added: + ----- Method: CMakeVMMakerSqueakOverviewHelp class>>prerequisites (in category 'pages') ----- + prerequisites + ^HelpTopic + title:'Prerequisites' + contents: + 'The CMakeVMMakerSqueak depends on CMakeVMMaker (a pharo implementation) + + CMake from http://www.cmake.org/ is required to process the output of this package. + + This package was written using cmake version 2.8.12 + '! Item was added: + ----- Method: CMakeVMMakerSqueakOverviewHelp class>>pthreads (in category 'pages') ----- + pthreads + ^HelpTopic + title:'PThreads' + contents:' + + http://www.mirandabanda.org/files/Cog/VM/VM.r3006/README.3006 + + N.B. For Squeak/Pharo/Croquet please use the archives whose names begin with + Cog or cog. The archives whose names begin with nsvm or Newspeak are + for Newspeak and are missing plugins required by Squeak/Pharo/Croquet. + VMs with "mt" or "MT" in the name are multi-threaded VMs which support + non-blocking FFI calls. The archives containing "Spur" or "spur" are + VMs using the new Spur object representation and garbage collector and + should be used with Spur-format Squeak/Pharo/Croquet or Newspeak images. + + There are two variants of the Linux VMs; those ending in "ht" have a + heartbeat thread, while those that don''t, use an interval timer for the + heartbeat (the Windows and Mac VMs have a threaded heartbeat). The + threaded heartbeat is better (for example, signals from the interval timer + interfere with system calls, etc), but to use it one must have a kernel + later than 2.6.12 and configure linux to allow the VM to use multiple + thread priorities. To do so, create a file called VM.conf where VM is + the name of the vm executable ("squeak" for the Squeak vm, "nsvm" for + the Newspeak vm) in /etc/security/limits.d/ with contents: + * hard rtprio 2 + * soft rtprio 2 + + e.g. + sudo cat >/etc/security/limits.d/squeak.conf <<END + * hard rtprio 2 + * soft rtprio 2 + END + sudo cp /etc/security/limits.d/squeak.conf /etc/security/limits.d/nsvm.conf + Then log out and log back in for the limits to take effect. + + + On Slackware linux 14.0 + bash$ man limits + + From the man page, the O (oh) option is: O: max real time priority + + create a file /etc/limits file and add an entry + + tty O100 + + where tty is the login name, and the O option is set to 100. + + Logout and re-login. + + + '! Item was added: + ----- Method: CMakeVMMakerSqueakOverviewHelp class>>templates (in category 'pages') ----- + templates + ^HelpTopic + title:'CPlatformConfigForSqueak class templates' + contents: + 'CMakeVMMakerSqueak utilizes wrapper classes on CMake commands to generate CMake output files like CMakeLists.txt. + + Currently the 3 class categories produce output as such: + + 1. CMakeVMMakerSqueak-CMakeCompositeTemplates output large CMake structures. The essentially wrap both custom and standard CMake templates. + + 2. CMakeVMMakerSqueak-CMakeCustomTemplates typically wrap CMake logic constructs like IF(DEFINED foo; + + 3. CMakeVMMakerSqueak-CMakeTemplates are wrappers for specific CMake Commands, properties and variables. + cmake --help + cmake --help-command-list + cmake --help-property-list + cmake --help-variable-list + + will give you an idea of what is wrapped. As new templates are introduced, they can be re-used easily, minimizing errors. + + '! Item was added: + ----- Method: CMakeVMMakerSqueakOverviewHelp class>>terms (in category 'pages') ----- + terms + ^HelpTopic + title:'Terms' + contents: + ' + AbstractBaseClass: + Typically the topmost class in a [OS][VMWordSize][Processor][ETC] class category. Example: CPlatformConfigForSqueak. Most of the configuration action happens at this level and lower. + + Builder: + A concrete subclass of SqueakCMakeVMMakerAbstractBuilder. Builders act as a facade for invoking the configurations.They also provide query tools for the configurations that a builder manages. There is a one-to-one correspondence between a Builder''s configurationsCategory and the configurations it manages. example: SqueakBSDx86Builder configurationsCategory + + buildType: + One of SqueakCMakeVMMakerAbstractBuilder allBuildTypes + + + CMakeLists.txt: + The instructions that CMake uses to build build systems. One output of a configuration + + Configuration: + CPlatformConfigForSqueak and its subclasses. These maintain the definitions that are rendered into CMakeLists.txt files + + + Generator: + CMakeGeneratorForSqueak and its subclasses + + + Redirect Methods: + Given a method X, it is a redirect method if a call to it redirects to xBuildType based on the state of the configurations buildType buildType variable. See CPlatformConfigForSqueak protocol ''cmake buildType redirects'' + + + + + '! Item was added: + ----- Method: CMakeVMMakerSqueakOverviewHelp class>>tests (in category 'pages') ----- + tests + ^HelpTopic + title:'Tests' + contents: + ' + When all tests pass. This does not mean the classes are configured correctly for source,output and build directories. + + It does mean nothing structural is preventing that from being implemented. + + '! Item was added: + ----- Method: CMakeVMMakerSqueakOverviewHelp class>>vmplugins (in category 'pages') ----- + vmplugins + ^HelpTopic + title:'VMPlugins' + contents:' + + TODO CMakeVMMakerSqueak-VMPlugin purpose, configuration and use'! Item was added: + CMakeVMMakerSqueakGeneratorsHelp subclass: #CMakeVMMakerSqueakPluginGeneratorHelp + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-Help'! Item was added: + ----- Method: CMakeVMMakerSqueakPluginGeneratorHelp class>>bookName (in category 'accessing') ----- + bookName + ^'Plugin Generator'! Item was added: + ----- Method: CMakeVMMakerSqueakPluginGeneratorHelp class>>key (in category 'accessing') ----- + key + ^'CMakeVMMakerSqueakPluginGeneratorHelp'! Item was added: + ----- Method: CMakeVMMakerSqueakPluginGeneratorHelp class>>overview (in category 'pages') ----- + overview + ^HelpTopic + title: 'Overview' + contents: + 'Write me'! Item was added: + ----- Method: CMakeVMMakerSqueakPluginGeneratorHelp class>>pages (in category 'accessing') ----- + pages + ^#(overview)! Item was changed: + CMakeVMMakerSqueakHelp subclass: #CMakeVMMakerSqueakStartHereHelp - CMakeVMMakerSqueakDeveloperHelp subclass: #CMakeVMMakerSqueakStartHereHelp instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'CMakeVMMakerSqueak-Help'! !CMakeVMMakerSqueakStartHereHelp commentStamp: 'tty 11/28/2014 10:27' prior: 0! A CMakeVMMakerSqueakStartHereHelp provides examples of usage for newbies. ! Item was added: + CMakeVMMakerSqueakConfigurationsHelp subclass: #CMakeVMMakerSqueakStepByStepNewConfigurationHelp + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-Help'! + + !CMakeVMMakerSqueakStepByStepNewConfigurationHelp commentStamp: 'tty 6/16/2014 12:19' prior: 0! + A CMakeVMMakerSqueakNewConfigurationStepByStepHelp itemizes the steps needed to create a new build configuration. + + HelpBrowser openOn: CMakeVMMakerSqueakNewConfigurationStepByStepHelp! Item was added: + ----- Method: CMakeVMMakerSqueakStepByStepNewConfigurationHelp class>>bookName (in category 'accessing') ----- + bookName + ^'Step By Step: New Configurations'! Item was added: + ----- Method: CMakeVMMakerSqueakStepByStepNewConfigurationHelp class>>key (in category 'accessing') ----- + key + ^'CMakeVMMakerSqueakStepByStepNewConfigurationHelp'! Item was added: + ----- Method: CMakeVMMakerSqueakStepByStepNewConfigurationHelp class>>pages (in category 'accessing') ----- + pages + ^#(step1 + step2 + step3 + step4 + step4a + step4b + step4c + step4d + step4e + step4f + step4g + step4h + step4i + step4j + step4k + step4l + step4m + step5 + )! Item was added: + ----- Method: CMakeVMMakerSqueakStepByStepNewConfigurationHelp class>>step1 (in category 'pages') ----- + step1 + ^HelpTopic + title:'Step 1. Choose Your Category' + contents: + ' CMakeVMMakerSqueak configurations are placed in a Smalltalk category with the naming convention [OS][VMWordSize][Processor] + + You start by choosing the correct Smalltalk Category in which to place your new Configuration. + + Example; If you need a new configuration for Linux for a 32 bit VM on the x86 platform--[Linux][32][x86]--Choose the CMakeVMMakerSqueak-Linux32x86 category. + + A Reminder: Consistent Naming Conventions Are Our Friends!! + + '! Item was added: + ----- Method: CMakeVMMakerSqueakStepByStepNewConfigurationHelp class>>step2 (in category 'pages') ----- + step2 + ^HelpTopic + title:'Step 2. Copy Existing Concrete Configuration' + contents: + 'Now that you have selected your category to place your new Configuration, you need to create your configuration. + + Like Categories, Configurations adhere to a naming convention. It is [language][VM][MemoryManager][etc]Config + example: squeak.cog.v3.tty is a configuration for compiling Squeak with a Cog VM with the old V3 memory manager and this is a special configuration for tty. + + The easiest way to create the config is to subclass an existing configuration. In this case I would subclass squeak.cog.v3. + + IMPORTANT: Do not copy a configuration (usually the top one in a category) that has the " uses: TCPlatformConfigForSqueak" + line in its definition. While there are technical reasons for this warning, the important one is that it makes coding a pain-in-the-butt. + + + A Reminder: Consistent Naming Conventions Are Our Friends!! + '! Item was added: + ----- Method: CMakeVMMakerSqueakStepByStepNewConfigurationHelp class>>step3 (in category 'pages') ----- + step3 + ^HelpTopic + title:'Step 4. Customize the "cmake" protocol' + contents: + 'TODO + dirInstall + "the directory of the finished product.. the place where ''make install'' puts stuff. + SystemNavigation default browseMethodsWhoseNamesContain: ''dirInstall'' + " + ^self squeakCogV3 , ''.noGL'' + + + excludeFromBuild + ^false "build this configuration" + " ^true" + + executableName + ^ self vmCogExecutableName + A Reminder: Consistent Naming Conventions Are Our Friends!! + '! Item was added: + ----- Method: CMakeVMMakerSqueakStepByStepNewConfigurationHelp class>>step4 (in category 'pages') ----- + step4 + ^HelpTopic + title:'Step 4. Customize the "cmake build type config" protocol' + contents: + 'When we invoke a Builder with a command like: + + SqueakLinux64x86w32CompatBuilder + configureA: #Linux64x86w32BitSqueakCogV3SlackwareNoGLConfig forBuildType: #buildDebugITimerHeartbeat; + generateSources; + generate. + + We are telling the Builder to select a Configuration and have that Configuration configure itself to produce CMake output for the buildType: #buildDebugITimerHeartbeat; + + On your configuration the entry point for your configuration is one of: + + configureBuild + configureBuildAssert + configureBuildAssertITimerHeartbeat + configureBuildDebug + configureBuildDebugITimerHeartbeat <----this one is selected by buildType: #buildDebugITimerHeartbeat; + configureBuildITimerHeartbeat + configureBuildMultiThreaded + configureBuildMultiThreadedAssert + configureBuildMultiThreadedDebug + + Within this method, system state is set up and customizable for many methods in CMakeVMaker CPlatformConfig. + + "setGlobalOptions: aMaker" + "setGlobalOptionsAfterDetermineSystem: aMaker" + setupDirectories + preferredIncludes + standardIncludes + compilerFlags + "extraVMSettings: aMaker" + internalPlugins + externalPlugins + thirdpartyLibs + "setExtraTargetProperties: aMaker" + "postBuildActions: aMaker" + configH + + The methods above that take the : aMaker argument are handled on-the-fly later in the process and are only presented here for informational purposes. + + + + A Reminder: Consistent Naming Conventions Are Our Friends!! + + '! Item was added: + ----- Method: CMakeVMMakerSqueakStepByStepNewConfigurationHelp class>>step4a (in category 'pages') ----- + step4a + ^HelpTopic + title:'Step 4a. setGlobalOptions' + contents: + 'TODO: summarize this + + + + A Reminder: Consistent Naming Conventions Are Our Friends!! + + '! Item was added: + ----- Method: CMakeVMMakerSqueakStepByStepNewConfigurationHelp class>>step4b (in category 'pages') ----- + step4b + ^HelpTopic + title:'Step 4b. setGlobalOptionsAfterDetermineSystem' + contents: + 'TODO: summarize this + + + + + A Reminder: Consistent Naming Conventions Are Our Friends!! + + '! Item was added: + ----- Method: CMakeVMMakerSqueakStepByStepNewConfigurationHelp class>>step4c (in category 'pages') ----- + step4c + ^HelpTopic + title:'Step 4c. setupDirectories' + contents: + 'TODO: summarize this + + + + A Reminder: Consistent Naming Conventions Are Our Friends!! + + '! Item was added: + ----- Method: CMakeVMMakerSqueakStepByStepNewConfigurationHelp class>>step4d (in category 'pages') ----- + step4d + ^HelpTopic + title:'Step 4d. preferredIncludes' + contents: + 'This is handy when ''make'' cannot find a header. + + For example, when compiling + + I got error: + Scanning dependencies of target UnixOSProcessPlugin + /..../oscogvm/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c:48:26: fatal error: SocketPlugin.h: No such file or directory + + From my topDir (oscogvm) I did a search and found SocketPlugin.h exits in ./platforms/Cross/plugins/SocketPlugin/SocketPlugin.h + + in my root config class for my category, I had... + + ''${targetPlatform}/plugins/SocketPlugin'' + + I changed it to + + ''${crossDir}/plugins/SocketPlugin'' + + deleted my files in my build directory, re-ran the generate and... + + + + SystemNavigation default browseMethodsWhoseNamesContain: ''preferredIncludes'' + + + A Reminder: Consistent Naming Conventions Are Our Friends!! + + '! Item was added: + ----- Method: CMakeVMMakerSqueakStepByStepNewConfigurationHelp class>>step4e (in category 'pages') ----- + step4e + ^HelpTopic + title:'Step 4e. standardIncludes' + contents: + 'TODO: summarize this + + + + A Reminder: Consistent Naming Conventions Are Our Friends!! + + '! Item was added: + ----- Method: CMakeVMMakerSqueakStepByStepNewConfigurationHelp class>>step4f (in category 'pages') ----- + step4f + ^HelpTopic + title:'Step 4f. compilerFlags' + contents: + 'TODO: summarize this + + + + A Reminder: Consistent Naming Conventions Are Our Friends!! + + '! Item was added: + ----- Method: CMakeVMMakerSqueakStepByStepNewConfigurationHelp class>>step4g (in category 'pages') ----- + step4g + ^HelpTopic + title:'Step 4g. extraVMSettings' + contents: + 'TODO: summarize this + + + + A Reminder: Consistent Naming Conventions Are Our Friends!! + + '! Item was added: + ----- Method: CMakeVMMakerSqueakStepByStepNewConfigurationHelp class>>step4h (in category 'pages') ----- + step4h + ^HelpTopic + title:'Step4h internalPlugins' + contents: + 'TODO: summarize this + + + + A Reminder: Consistent Naming Conventions Are Our Friends!! + '! Item was added: + ----- Method: CMakeVMMakerSqueakStepByStepNewConfigurationHelp class>>step4i (in category 'pages') ----- + step4i + ^HelpTopic + title:'Step4i externalPlugins' + contents: + 'TODO: summarize this + + + + + A Reminder: Consistent Naming Conventions Are Our Friends!! + + '! Item was added: + ----- Method: CMakeVMMakerSqueakStepByStepNewConfigurationHelp class>>step4j (in category 'pages') ----- + step4j + ^HelpTopic + title:'Step4j thirdpartyLibs' + contents: + 'TODO: summarize this + + + A Reminder: Consistent Naming Conventions Are Our Friends!! + + + '! Item was added: + ----- Method: CMakeVMMakerSqueakStepByStepNewConfigurationHelp class>>step4k (in category 'pages') ----- + step4k + ^HelpTopic + title:'Step4k setExtraTargetProperties:aMaker' + contents: + 'TODO: summarize this + + + + A Reminder: Consistent Naming Conventions Are Our Friends!! + + '! Item was added: + ----- Method: CMakeVMMakerSqueakStepByStepNewConfigurationHelp class>>step4l (in category 'pages') ----- + step4l + ^HelpTopic + title:'Step4k postBuildActions: aMaker' + contents: + 'TODO: summarize this + + + + A Reminder: Consistent Naming Conventions Are Our Friends!! + + '! Item was added: + ----- Method: CMakeVMMakerSqueakStepByStepNewConfigurationHelp class>>step4m (in category 'pages') ----- + step4m + ^HelpTopic + title:'Step4m configH' + contents: + ' This is the contents of a config.h file in the build directory. + It is used only in Unix builds in CMakeVMMaker. + + + It is called from the method ''extraVMSettings'' of CogUnixConfig in CMakeVMMaker when CogUnixConfig sends the message: self generateConfigH. + + To provide a custom config.h CMakeVMakerSqueak subclasses that message ''self generateConfigH'' and routes the call + to ''generateConfigH: aBuildType'' + + From there, a block is evaluated appropriate for the build type that invokes a ''configHBuildXYZ'' method which can be overridden by you to + return a custom config.h. The default is to return the base configH. + + + A Reminder: Consistent Naming Conventions Are Our Friends!! + + '! Item was added: + ----- Method: CMakeVMMakerSqueakStepByStepNewConfigurationHelp class>>step5 (in category 'pages') ----- + step5 + ^HelpTopic + title:'Step5 set up ''cmake directory'' protocol' + contents: + 'The cmake directories protocol contains directory names for your platform, build directory + + See the chapter titled: ''An Explanation of Protocols in TCPaltformConfigForSqueak'' in + HelpBrowser openOn:CMakeVMMakerSqueakDeveloperHelp + + The ones that your Configuration must implement are: + + dirBuildPlatform + dirBuildLanguageVMMM + + + Basically, we are building a directory like this: + oscogvm/cmake.build.linux32.x86/squeak.cog.v3/build.assert + + which, when expressed as message names reduces to: + + topDir/dirLinux32x86/squeakCogV3/dirBuildAssert + + which are further reduced to + + topDir/dirBuildPlatform/dirBuildLanguageVMMM/dirBuildAssert + + It is the two in the middle that you must customize. (dirBuildAssert is dynamically set by a Builder in a script, to be covered later) + To see how, take a look at the implementors of the two. its quite intuitive once you see it as it is based off our standard naming conventions. + + SystemNavigation default browseMethodsWhoseNamesContain: ''dirBuildPlatform'' + SystemNavigation default browseMethodsWhoseNamesContain: ''dirBuildLanguageVMMM'' + + For our purposes in this example, we want: + + + dirBuildPlatform + ^self dirLinux32x86 + and + + dirBuildLanguageVMMM + ^self squeakCogV3 + + + A Reminder: Consistent Naming Conventions Are Our Friends!! + + '! Item was added: + CMakeVMMakerSqueakConfigurationsHelp subclass: #CMakeVMMakerSqueakStepByStepNewPlatformHelp + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-Help'! + + !CMakeVMMakerSqueakStepByStepNewPlatformHelp commentStamp: '<historical>' prior: 0! + A CMakeVMMakerSqueakNewConfigurationStepByStepHelp itemizes the steps needed to create a new build configuration. + + HelpBrowser openOn: CMakeVMMakerSqueakNewConfigurationStepByStepHelp! Item was added: + ----- Method: CMakeVMMakerSqueakStepByStepNewPlatformHelp class>>bookName (in category 'accessing') ----- + bookName + ^'Step By Step: New Platform'! Item was added: + ----- Method: CMakeVMMakerSqueakStepByStepNewPlatformHelp class>>key (in category 'accessing') ----- + key + ^'CMakeVMMakerSqueakStepByStepNewPlatformHelp'! Item was added: + ----- Method: CMakeVMMakerSqueakStepByStepNewPlatformHelp class>>overview (in category 'pages') ----- + overview + ^HelpTopic + title:'Overview' + contents: + ' + '! Item was added: + ----- Method: CMakeVMMakerSqueakStepByStepNewPlatformHelp class>>pages (in category 'accessing') ----- + pages + ^#(overview step1)! Item was added: + ----- Method: CMakeVMMakerSqueakStepByStepNewPlatformHelp class>>step1 (in category 'pages') ----- + step1 + ^HelpTopic + title:'Step 1. ' + contents: + ' + '! Item was added: + CMakeVMMakerSqueakDeveloperHelp subclass: #CMakeVMMakerSqueakTemplatesHelp + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-Help'! Item was added: + ----- Method: CMakeVMMakerSqueakTemplatesHelp class>>bookName (in category 'accessing') ----- + bookName + ^'CMake Templates'! Item was added: + ----- Method: CMakeVMMakerSqueakTemplatesHelp class>>key (in category 'accessing') ----- + key + ^'CMakeVMMakerSqueakTemplatesHelp'! Item was added: + ----- Method: CMakeVMMakerSqueakTemplatesHelp class>>overview (in category 'pages') ----- + overview + ^HelpTopic + title: 'Overview' + contents: + 'CMake Templates wrap CMake constructs + + Motivation: Ian Piumarta''s template approach is compelling. and the string concatenation approach of CMakeVMMaker was too hard on my feeble mind. + + Most are subclasses of CMakeTemplate. + Custom Templates are handy groupings of basic templates. + Composite Templates encapsulate odd or large blocks of CMake constructs. + + + The templates allow us to think in CMake while coding in Smalltalk. + + They are easy to implement as needed. + + They are re-usable + + CMake constructs can be viewed by invoking ''cmake --help''. + + + + So far the most important constructs are: + + cmake --help-command-list + cmake --help-module-list + cmake --help-property-list + cmake --help-variable-list + + + We will probably have to fine tune the organization as we add to the library of templates. + + '! Item was added: + ----- Method: CMakeVMMakerSqueakTemplatesHelp class>>pages (in category 'accessing') ----- + pages + ^#(overview)! Item was added: + CMakeVMMakerSqueakGeneratorsHelp subclass: #CMakeVMMakerSqueakVMGeneratorHelp + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-Help'! Item was added: + ----- Method: CMakeVMMakerSqueakVMGeneratorHelp class>>bookName (in category 'accessing') ----- + bookName + ^'VM Generator'! Item was added: + ----- Method: CMakeVMMakerSqueakVMGeneratorHelp class>>key (in category 'accessing') ----- + key + ^'CMakeVMMakerSqueakVMGeneratorHelp'! Item was added: + ----- Method: CMakeVMMakerSqueakVMGeneratorHelp class>>overview (in category 'pages') ----- + overview + ^HelpTopic + title: 'Overview' + contents: + 'Write me'! Item was added: + ----- Method: CMakeVMMakerSqueakVMGeneratorHelp class>>pages (in category 'accessing') ----- + pages + ^#(overview)!

1 0

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

09 Dec '14

Timothy M uploaded a new version of CMakeVMMakerSqueak to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMakerSqueak-tty.103.mcz ==================== Summary ==================== Name: CMakeVMMakerSqueak-tty.103 Author: tty Time: 9 December 2014, 2:42:22.857 pm UUID: 81759a43-7ae8-4ae3-b3e2-ee7ca4467bb6 Ancestors: CMakeVMMakerSqueak-tty.102 CMakeVMMakerSqueakStartHereHelp book fleshed out, proof-read and tested. Next up: 1. In tandem build the CMakeVMMakerSqueakDeveloperHelp by creating a new configuration for a pure 32 bit linux system and documenting/testing the steps. 2. Try to avoid the 'if u cn rd ths u may b a prgrmr' default documentatin style. =============== Diff against CMakeVMMakerSqueak-tty.102 =============== Item was changed: + CMakeVMMakerSqueakDeveloperHelp subclass: #CMakeVMMakerSqueakBuildersHelp - CMakeVMMakerSqueakHelp subclass: #CMakeVMMakerSqueakBuildersHelp instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'CMakeVMMakerSqueak-Help'! Item was changed: + ----- Method: CMakeVMMakerSqueakBuildersHelp class>>bookName (in category 'accessing') ----- - ----- Method: CMakeVMMakerSqueakBuildersHelp class>>bookName (in category 'as yet unclassified') ----- bookName ^'Builders'! Item was changed: + ----- Method: CMakeVMMakerSqueakBuildersHelp class>>buildTypes (in category 'pages') ----- - ----- Method: CMakeVMMakerSqueakBuildersHelp class>>buildTypes (in category 'as yet unclassified') ----- buildTypes ^HelpTopic + title:'Build types' - title:'build types' contents: + 'N.B. This query is dependent on the developer taking the time to maintain his Configuration correctly. If they do not, then invalid information will be conveyed. + For example, at the time of this writing, tty has completely dropped the ball on this. (: - 'The purpose of this method is to present the end user with the avaiable buildTypes for a configuration category. when they invoke a Builder like so: + Configurations are built over time. There is a possibility that a particulare build type is not available for a given Configuration. - SqueakLinux32X86Builder availableBuildTypesFor: #Linux32x86SqueakStackV3Config + For example, at the time of this writing, Linux64x86w32BitSqueakCogV3Config only has buildType #build available. + Since builds are sometimes not available and/or under development a developer may wish to restrict what build types are avaiable for a configurations Builder by modifying the configuration''s "availableBuilds" method. + The purpose of this method is to present the end user with the avaiable buildTypes for a configuration category. when they invoke a Builder like so: + + SqueakLinux64x86w32CompatBuilder availableBuildTypesFor: #Linux64x86w32BitSqueakCogV3Config + The default is all buildTypes: ^SqueakCMakeVMMakerAbstractBuilder default allBuildConfigurations You can display no buildTypes with: ^SqueakCMakeVMMakerAbstractBuilder default noBuildConfigurations. or you can customize it like so: ^(SqueakCMakeVMMakerAbstractBuilder default allBuildConfigurations copyWithoutAll: #( #assertWithHeartbeatTimer #debugWithHeartbeatTimer debugMultiThreadedFFI.....etc)) '! Item was changed: + ----- Method: CMakeVMMakerSqueakBuildersHelp class>>builders (in category 'pages') ----- - ----- Method: CMakeVMMakerSqueakBuildersHelp class>>builders (in category 'as yet unclassified') ----- builders ^HelpTopic title: 'Builders' contents: ' CMakeVMakerSqueak Builders provide a facade to CMakeVMmakerSqueak Configurations. A Builder is both a ''query'' tool and a ''build'' tool. With a Builder, you can query its configurationsCategory''s Configurations invoke a Configuration to generate CMake files or invoke a Configuration to generateSources which invokes VMMaker.oscog to generate source Builders are concrete instances of the Abstract Base Class:SqueakCMakeVMMakerAbstractBuilder View SqueakCMakeVMMakerAbstractBuilder''s class comments for an overview of this tool. SqueakCMakeVMMakerAbstractBuilder browseHierarchy. Information on creating your own is available via HelpBrowser openOn: CMakeVMMakerSqueakDeveloperHelp '! Item was added: + ----- Method: CMakeVMMakerSqueakBuildersHelp class>>generatingCMakeBuilds (in category 'pages') ----- + generatingCMakeBuilds + ^HelpTopic + title: 'Generating CMake Builds' + contents: + ' + SqueakLinux64x86w32CompatBuilder configurationsCategory + SqueakLinux64x86w32CompatBuilder buildDirectory + SqueakLinux64x86w32CompatBuilder availableBuilds + SqueakLinux64x86w32CompatBuilder availableBuildTypesFor:(SqueakLinux64x86w32CompatBuilder availableBuilds at:1) + SqueakLinux64x86w32CompatBuilder sourceDirectoryFor:(SqueakLinux64x86w32CompatBuilder availableBuilds at:1) + + '! Item was changed: + ----- Method: CMakeVMMakerSqueakBuildersHelp class>>pages (in category 'accessing') ----- - ----- Method: CMakeVMMakerSqueakBuildersHelp class>>pages (in category 'as yet unclassified') ----- pages + ^#(builders queryingBuilders buildTypes generatingCMakeBuilds scratch)! - ^#(builders queryingBuilders buildTypes scratch)! Item was changed: + ----- Method: CMakeVMMakerSqueakBuildersHelp class>>queryingBuilders (in category 'pages') ----- - ----- Method: CMakeVMMakerSqueakBuildersHelp class>>queryingBuilders (in category 'as yet unclassified') ----- queryingBuilders ^HelpTopic title: 'Querying Builders' contents: ' + You query Builders for Configuration information for a specifi platform. - Below are some queries avaiable via various Builders in the CMakeVMMakerSqueak package: - SqueakCMakeVMMakerAbstractBuilder reset "reset internal state of the Abstract Builder" - SqueakCMakeVMMakerAbstractBuilder showExcludeFromBuild:false "buildable configurations" - SqueakCMakeVMMakerAbstractBuilder showExcludeFromBuild:true. "edit that configs ''excludeFromBuild'' method to change" - SqueakCMakeVMMakerAbstractBuilder availableBuildTypes - SqueakCMakeVMMakerAbstractBuilder reset "reset internal state of the Abstract Builder" - - - SqueakAndroidBuilder configurationsCategory - SqueakAndroidBuilder buildDirectory - SqueakAndroidBuilder availableBuilds - SqueakAndroidBuilder availableBuildTypesFor:(SqueakAndroidBuilder availableBuilds at:1) - SqueakAndroidBuilder sourceDirectoryFor:(SqueakAndroidBuilder availableBuilds at:1) - - SqueakBSDx86Builder configurationsCategory - SqueakBSDx86Builder buildDirectory - SqueakBSDx86Builder availableBuilds - SqueakBSDx86Builder availableBuildTypesFor:(SqueakBSDx86Builder availableBuilds at:1) - SqueakBSDx86Builder sourceDirectoryFor:(SqueakBSDx86Builder availableBuilds at:1) - - SqueakIA32BochsBuilder configurationsCategory - SqueakIA32BochsBuilder buildDirectory - SqueakIA32BochsBuilder availableBuilds - SqueakIA32BochsBuilder availableBuildTypesFor:(SqueakIA32BochsBuilder availableBuilds at:1) - SqueakIA32BochsBuilder sourceDirectoryFor:(SqueakIA32BochsBuilder availableBuilds at:1) - - SqueakIOSBuilder configurationsCategory - SqueakIOSBuilder buildDirectory - SqueakIOSBuilder availableBuilds - SqueakIOSBuilder availableBuildTypesFor:(SqueakIOSBuilder availableBuilds at:1) - SqueakIOSBuilder sourceDirectoryFor:(SqueakIOSBuilder availableBuilds at:1) - - SqueakLinux32ARMv6Builder configurationsCategory - SqueakLinux32ARMv6Builder buildDirectory - SqueakLinux32ARMv6Builder availableBuilds - SqueakLinux32ARMv6Builder availableBuildTypesFor:(SqueakLinux32ARMv6Builder availableBuilds at:1) - SqueakLinux32ARMv6Builder sourceDirectoryFor:(SqueakLinux32ARMv6Builder availableBuilds at:1) - - - SqueakLinux32x86Builder configurationsCategory - SqueakLinux32x86Builder buildDirectory - SqueakLinux32x86Builder availableBuilds - SqueakLinux32x86Builder availableBuildTypesFor:(SqueakLinux32x86Builder availableBuilds at:1) - SqueakLinux32x86Builder sourceDirectoryFor:(SqueakLinux32x86Builder availableBuilds at:1) - - SqueakLinux32x86_64Builder configurationsCategory - SqueakLinux32x86_64Builder SqueakLinux32x86_64Builder - SqueakLinux32x86_64Builder SqueakLinux32x86_64Builder - SqueakLinux32x86_64Builder availableBuildTypesFor:(SqueakLinux32x86_64Builder availableBuilds at:1) - SqueakLinux32x86_64Builder sourceDirectoryFor:(SqueakLinux32x86_64Builder availableBuilds at:1) - SqueakLinux64x86w32CompatBuilder configurationsCategory SqueakLinux64x86w32CompatBuilder buildDirectory SqueakLinux64x86w32CompatBuilder availableBuilds SqueakLinux64x86w32CompatBuilder availableBuildTypesFor:(SqueakLinux64x86w32CompatBuilder availableBuilds at:1) SqueakLinux64x86w32CompatBuilder sourceDirectoryFor:(SqueakLinux64x86w32CompatBuilder availableBuilds at:1) - SqueakMacOSBuilder configurationsCategory - SqueakMacOSBuilder buildDirectory - SqueakMacOSBuilder availableBuilds - SqueakMacOSBuilder availableBuildTypesFor:(SqueakMacOSBuilder availableBuilds at:1) - SqueakMacOSBuilder sourceDirectoryFor:(SqueakMacOSBuilder availableBuilds at:1) - - SqueakMacOSPowerPCBuilder configurationsCategory - SqueakMacOSPowerPCBuilder buildDirectory - SqueakMacOSPowerPCBuilder availableBuilds - SqueakMacOSPowerPCBuilder availableBuildTypesFor:(SqueakMacOSPowerPCBuilder availableBuilds at:1) - SqueakMacOSPowerPCBuilder sourceDirectoryFor:(SqueakMacOSPowerPCBuilder availableBuilds at:1) - - SqueakMacOSX32x86Builder configurationsCategory - SqueakMacOSX32x86Builder buildDirectory - SqueakMacOSX32x86Builder availableBuilds - SqueakMacOSX32x86Builder availableBuildTypesFor:(SqueakMacOSX32x86Builder availableBuilds at:1) - SqueakMacOSX32x86Builder sourceDirectoryFor:(SqueakMacOSX32x86Builder availableBuilds at:1) - - SqueakSunOS32x86Builder configurationsCategory - SqueakSunOS32x86Builder buildDirectory - SqueakSunOS32x86Builder availableBuilds - SqueakSunOS32x86Builder availableBuildTypesFor:(SqueakSunOS32x86Builder availableBuilds at:1) - SqueakSunOS32x86Builder sourceDirectoryFor:(SqueakSunOS32x86Builder availableBuilds at:1) - - SqueakWin32x86Builder configurationsCategory - SqueakWin32x86Builder buildDirectory - SqueakWin32x86Builder availableBuilds - SqueakWin32x86Builder availableBuildTypesFor:(SqueakWin32x86Builder availableBuilds at:1) - SqueakWin32x86Builder sourceDirectoryFor:(SqueakWin32x86Builder availableBuilds at:1) - - '! Item was changed: + ----- Method: CMakeVMMakerSqueakBuildersHelp class>>scratch (in category 'pages') ----- - ----- Method: CMakeVMMakerSqueakBuildersHelp class>>scratch (in category 'as yet unclassified') ----- scratch ^HelpTopic title: 'Scratch Notes To Be Organized' contents: ' HEADS UP!! You can ''print it'' in the examples below -------------------------Using CMakeVMMakerSqueak------------------------- These instructions are duplicated in SqueakCMakeVMMakerAbstractBuilder class comments. The easiest way to use this tool is to utilize one of the concrete Builders in category CMakeVMMakerSqueak-Builder. With a builder, you can query it for information and then invoke it to generate configurations and or source. Printing or inspecting the following lines will give you a flavor of a typical work-flow. -------------Buildable/non-buildable configurations--------- SqueakCMakeVMMakerAbstractBuilder showExcludeFromBuild:false "buildable configurations" SqueakCMakeVMMakerAbstractBuilder showExcludeFromBuild:true. "edit that configs ''excludeFromBuild'' method to change" SqueakCMakeVMMakerAbstractBuilder availableBuildTypes -------------------------Querying Builders--------------- SqueakLinux32X86Builder configurationsCategory SqueakLinux32X86Builder buildDirectory SqueakLinux32X86Builder availableBuilds SqueakLinux32X86Builder availableBuildTypesFor:(SqueakLinux32X86Builder availableBuilds at:1) SqueakLinux32X86Builder availableBuildTypesFor: #Linux32x86SqueakStackSpurConfig SqueakLinux32X86Builder availableBuildTypesFor: #Linux32x86SqueakStackV3Config SqueakLinux32X86Builder sourceDirectoryFor:(SqueakLinux32X86Builder availableBuilds at:1) -------------------------Invoking Builders------------------------- SqueakCMakeVMMakerAbstractBuilder reset SqueakCMakeVMMakerAbstractBuilder availableBuildTypes a SortedCollection(#build #buildAssert #buildAssertITimerHeartbeat #buildDebug #buildDebugITimerHeartbeat #buildDebugMultiThreaded #buildITimerHeartbeat #buildMultiThreaded #buildMultiThreadedAssert #buildMultiThreadedDebug) [SqueakCMakeVMMakerAbstractBuilder availableBuildTypes do: [:type | SqueakLinux32X86Builder configureABuildFor: #Linux32x86SqueakCogV3Config withBuildType: type; generate ]] on: ProvideAnswerNotification do: [:ex | ex resume:true] "generate only CMake config files" SqueakLinux32X86Builder configureABuildFor: #Linux32x86SqueakCogV3Config withBuildType: #buildAssertITimerHeartbeat; generate "generate configurations and invoke VMMaker to generate source code" SqueakLinux32X86Builder configureABuildFor: #Linux32x86SqueakCogV3Config withBuildType: #buildAssertITimerHeartbeat; generateSources ; generate. -------------------------Compiling Instructions------------------------- open a terminal and go to the configurations build directory for that configuration. (SqueakLinux32X86Builder buildDirectory) change into the build type subdirectory (build, build.assert, build.debug...etc) source build.sh will run ''cmake. make'' executable is placed in /products folder. (SqueakLinux32X86Builder ouputDirectory) ----------------------Editing/Constructing Configurations-------------- Configurations are organized by category: OperatingSystem, VM Word Size, Processor . (i.e MacOSX32x86 configurations reside in CMakeVMMakerSqueak-MacOSX32x86a) For a OperatingSystem,VM Word Size, Processor, configurations are then organized by Language.VM.MemoryManafger (newswpeak.stack.v3, squeak.sista.spur. squeak.cog.spur, etc) IF an existing configuratin exists, you may edit or subclass it. For a Builder to see it, it must remain in the category. The flag excludeFromBuild determines wether the builder will build it or not. This flag is set to exclude configurations that are just placeholders. If you have a special case for an existing [OS][WordSize][Processor].[lang][vm][mm] configuration just subclass it and provide customizations. TODO: Provide typical customizations and how to implement them internal/external plugins? compiler flags? includes? ----------------------Improvements needed------------------------- The CMakeVMMakerSqueak package has some design hacks because it extends the pharo CMakeVMMaker package without modifying that code base. Therefore, things that should have been done by introducing squeak sub-classes in the pharo source tree could not be done. The biggest design ''quirk'' is the use of the Trait TCPlatformConfigForSqueak to enforce a pseudo abstract base class mechanism. The other design ''quirk'' are the overrides of methods in CPlatformConfig in pharo''s package of incompatible methods. (see protocol squeak-compatibility) Because of the existing inheritance tree, the overrides could not happen in one squeak compatibility class, but are implemented in several subclasses of CPlatformConfig. The Squeak Builders implementation also differs significantly from the pharo implementation. The pharo code''s ''configForDebug/configForReleaase'' has been expanded to support the squeak build needs. '! Item was changed: ----- Method: CMakeVMMakerSqueakDeveloperHelp class>>pages (in category 'pages') ----- pages + ^#(overview prerequisites terms igorStasenkoDesign tests buildersAndConfigs plugins pthreads configDotCmake templates vmplugins CMakeVMMakerSqueakBuildersHelp CMakeVMMakerSqueakHowToCreateNewConfigurationHelp)! - ^#(overview prerequisites terms igorStasenkoDesign tests buildersAndConfigs plugins pthreads configDotCmake templates vmplugins)! Item was changed: ----- Method: CMakeVMMakerSqueakHelp class>>bookName (in category 'accessing') ----- bookName + ^'CMakeVMMakerSqueak'! - ^'CMakeVMMaker on Squeak'! Item was changed: ----- Method: CMakeVMMakerSqueakHelp class>>pages (in category 'accessing') ----- pages + ^#(CMakeVMMakerSqueakStartHereHelp CMakeVMMakerSqueakDeveloperHelp )! - ^#(CMakeVMMakerSqueakStartHereHelp CMakeVMMakerSqueakDeveloperHelp CMakeVMMakerSqueakBuildersHelp CMakeVMMakerSqueakHowToCreateNewConfigurationHelp)! Item was changed: + CMakeVMMakerSqueakDeveloperHelp subclass: #CMakeVMMakerSqueakHowToCreateNewConfigurationHelp - CMakeVMMakerSqueakHelp subclass: #CMakeVMMakerSqueakHowToCreateNewConfigurationHelp instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'CMakeVMMakerSqueak-Help'! !CMakeVMMakerSqueakHowToCreateNewConfigurationHelp commentStamp: 'tty 6/16/2014 12:19' prior: 0! A CMakeVMMakerSqueakNewConfigurationStepByStepHelp itemizes the steps needed to create a new build configuration. HelpBrowser openOn: CMakeVMMakerSqueakNewConfigurationStepByStepHelp! Item was changed: + CMakeVMMakerSqueakDeveloperHelp subclass: #CMakeVMMakerSqueakStartHereHelp - CMakeVMMakerSqueakHelp subclass: #CMakeVMMakerSqueakStartHereHelp instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'CMakeVMMakerSqueak-Help'! !CMakeVMMakerSqueakStartHereHelp commentStamp: 'tty 11/28/2014 10:27' prior: 0! A CMakeVMMakerSqueakStartHereHelp provides examples of usage for newbies. ! Item was added: + ----- Method: CMakeVMMakerSqueakStartHereHelp class>>exampleWorkFlow (in category 'pages') ----- + exampleWorkFlow + ^HelpTopic + title: 'Example Workflow' + contents: + 'I want to build a Cog VM for Squeak with the V3 memory model. on a SlackwareLinux64 with 32 bit Compatability libs platform. + + To do this, I ... + + 1. Choose the Builder for my platform. + 2. Choose the Configuration I need for my [Platform][Language][VM][Memory Model] + 3. Choose a Build Type for the Configuration. + 4. Write the CMake output. + + So, here we go. + + I choose the appropriate Builder from the CMakeVMMakerSqueak-Builder category for my platform; in my case it is the SqueakLinux64x86w32CompatBuilder. + SqueakLinux64x86w32CompatBuilder browse. + + I can query the Builder for available Configurations and BuildTypes for that Configuration and where it will put its output by sending the following messages: (presented here with output from my system below the message send) + + SqueakLinux64x86w32CompatBuilder availableBuildConfigurations. + --> a SortedCollection(#Linux64x86w32BitSqueakCogV3Config) + + SqueakLinux64x86w32CompatBuilder allBuildTypes. + --> an OrderedCollection(#build #buildAssert #buildAssertITimerHeartbeat #buildDebug #buildDebugITimerHeartbeat #buildITimerHeartbeat #buildMultiThreaded #buildMultiThreadedAssert #buildMultiThreadedDebug #buildNone) + + SqueakLinux64x86w32CompatBuilder availableBuildTypesFor:(SqueakLinux64x86w32CompatBuilder availableBuildConfigurations at:1). + --> an OrderedCollection(#build) + + SqueakLinux64x86w32CompatBuilder buildDirectory + --> ''cmake.build.linux32_64x86'' + + The availableBuildConfigurations message shows I have a Linux64x86w32BitSqueakCogV3Config available. (As additional Configurations and their buildTypes are added to the system they will show up in these queries). + + + The allBuildTypes message shows the universe of possible build types: + --> an OrderedCollection(#build #buildAssert #buildAssertITimerHeartbeat #buildDebug #buildDebugITimerHeartbeat #buildITimerHeartbeat #buildMultiThreaded #buildMultiThreadedAssert #buildMultiThreadedDebug #buildNone) + + Out of the universe of allBuildTypes, The availableBuildTypes message shows me that (at the time of this writing) the Linux64x86w32BitSqueakCogV3Config only supports one build type: + --> an OrderedCollection(#build) + + Now that I know what is possible, I instruct the Builder to ask the Linux64x86w32BitSqueakCogV3Config Configuration to configure itself for the buildType: #build , enable trace messages in the CMake files to make troubleshooting easier and generate the CMake build tree: + + SqueakLinux64x86w32CompatBuilder + configureA: #Linux32x86SqueakCogV3Config forBuildType: #build; + enableMessageTracking: true; + generateByTemplate. + + (FYI the above provides no user feedback) + + The Linux32x86SqueakCogV3Config writes itself to a directory that matches its [cmake.Platform]/[Language].[VM].[MemoryModel]/[BuildType] + + On my system that is: + + /home/tty/usr/src/smalltalk/CMake.oscog/cogVMMaker/oscogvm/cmake.[Platform]/[Language].[VM].[MemoryModel]/build + i.e. + /home/tty/usr/src/smalltalk/CMake.oscog/cogVMMaker/oscogvm/cmake.build.linux32_64x86/squeak.cog.v3/build + + I open a terminal and navigate to that directory: + + cd /home/tty/usr/src/smalltalk/CMake.oscog/cogVMMaker/oscogvm/cmake.build.linux32_64x86/squeak.cog.v3/build + + I run the commands in the generated ''build.sh'' file. (I have had some wierd issues with running it directly, so I just run the commands therein) + bash-4.2$ cat build.sh + #!!/usr/bin/env bash + export CC=gcc + export CXX=g++ + cmake . + make + + If things work, you will have a working VM in the products directory on my system I see: + + bash-4.2$ ls /home/tty/usr/src/smalltalk/CMake.oscog/cogVMMaker/oscogvm/cmake.products/squeak.cog.v3/ + cog vm-display-X11 vm-display-null vm-sound-ALSA vm-sound-null + + I test the VM + + bash-4.2$ cd /home/tty/usr/src/smalltalk/CMake.oscog/cogVMMaker/oscogvm/cmake.products/squeak.cog.v3/ + + bash-4.2$ ./cog -version + . #1 Tue Dec 9 13:17:50 EST 2014 gcc 4.8.2 [Production VM] + CoInterpreter VMMaker.oscog-eem.973 uuid: 1c182b73-874c-48f7-a4f4-61255efdc565 Dec 9 2014 + StackToRegisterMappingCogit VMMaker.oscog-eem.972 uuid: 741005af-763d-4a93-918d-014972c404ef Dec 9 2014 + VM: r3164 http://www.squeakvm.org/svn/squeak/branches/Cog Date: 2014-12-06 20:38:11 -0500 + Plugins: r3131 http://squeakvm.org/svn/squeak/trunk/platforms/Cross/plugins + Linux flipper 3.10.17 #2 SMP Wed Oct 23 16:34:38 CDT 2013 x86_64 AMD Phenom(tm) II X4 965 Processor AuthenticAMD GNU/Linux + plugin path: /home/tty/usr/src/smalltalk/CMake.oscog/cogVMMaker/oscogvm/cmake.products/squeak.cog.v3/ [default: /home/tty/usr/src/smalltalk/CMake.oscog/cogVMMaker/oscogvm/cmake.products/squeak.cog.v3/] + + And, that''s about it.'! Item was added: + ----- Method: CMakeVMMakerSqueakStartHereHelp class>>overview (in category 'pages') ----- + overview + ^HelpTopic + title: 'Overview' + contents: + 'CMakeVMMakerSqueak is a collection of tools for generating CMake files. The high-level workflow is: + + 1. Instruct CMakeVMMakerSqueak to generate CMake build directories and CMake configuration files. + + 2. Invoke the ''cmake'' command at the top level of the generated cmake build tree + + 3. CMake configures and outputs the build system files for that platform. + + 4. The user invokes the native build system. + + 5. A VM is produced under a ~/...../''cmake.platforms'' subdirectory. + + The ''Example Workflow'' page in this Help book provides an example of the above workflow with minimal explanation. + + In-depth explanations of the system(s), tools and how to use them, see the ''CMakeVMMaker Developer Guide'''! Item was changed: ----- Method: CMakeVMMakerSqueakStartHereHelp class>>pages (in category 'accessing') ----- pages + ^#(overview requirements exampleWorkFlow)! - ^#(scratch shortVersionLinuxBuild)! Item was added: + ----- Method: CMakeVMMakerSqueakStartHereHelp class>>requirements (in category 'pages') ----- + requirements + ^HelpTopic + title: 'Requirements' + contents: + 'CMakeVMakerSqueak (as of 2014.12.09) depends on the Pharo package CMakeVMMaker. A (possibly out-of-sync) Monticello version is available at: + + MCHttpRepository + location: ''http://source.squeak.org/VMMaker'' + user: '''' + password: '''' + + CMakeVMMakerSqueak is available at: + + MCHttpRepository + location: ''http://source.squeak.org/VMMaker'' + user: '''' + password: '''' + + CMake is available from http://www.cmake.org. The version of CMake used as of 2014.12.09 is 2.8.12 + + CMake provides a cmake_minimum_required(..) command, so newer versions should be ok. + + The Example Workflow is presented on a GNU Linux system with the standard development tools. Macintosh and Windows dev tools will differ.'! Item was removed: - ----- Method: CMakeVMMakerSqueakStartHereHelp class>>scratch (in category 'pages') ----- - scratch - ^HelpTopic - title: 'Start Here Scratch' - contents: - 'Goal is that a complete newbie can open this and get up and running. - - '! Item was removed: - ----- Method: CMakeVMMakerSqueakStartHereHelp class>>shortVersionLinuxBuild (in category 'pages') ----- - shortVersionLinuxBuild - ^HelpTopic - title: 'Short Version Linux Build' - contents: - '1. ---Query the Builder for available configurations and build types--- - SqueakLinux32x86Builder configurationsCategory. - SqueakLinux32x86Builder availableBuildConfigurations. - SqueakLinux32x86Builder availableBuildTypesFor:(SqueakLinux32x86Builder availableBuildConfigurations at:1). "Replace at:1 as neccessary" - - - 2.---Direct the Builder to invoke a Configuration for a specific build type--- - SqueakLinux32x86Builder - configureA: #Linux32x86SqueakCogV3Config forBuildType:#build; - enableMessageTracking: false; - generateByTemplate. - - 3.---Direct the Builder to ask the configuration for where it puts its build files--- - SqueakLinux32x86Builder buildDirectory - - 4.---Open an X-terminal and cd to the above directory and kick off the cmake-build--- - cd (some directory)/Contents/Resources/oscogvm/cmake.build.linux32.x86/squeak.cog.v3/build/ - ./build.sh - - 5.---view your build--- - cd (some directory)/Contents/Resources/oscogvm/products/(FIX ME TTY) - '! Item was changed: ----- Method: Linux64x86w32BitConfig>>availableBuildTypes (in category 'cmake') ----- availableBuildTypes + ^SqueakCMakeVMMakerAbstractBuilder default noBuildTypes + " - ^SqueakCMakeVMMakerAbstractBuilder default allBuildTypes - " subclasses should use + subclasses should use + + ^super allBuildTypes copyWithoutAll: #( #assertWithHeartbeatTimer #debugWithHeartbeatTimer debugMultiThreadedFFI.....etc)) " - ^super availableBuildTypes copyWithoutAll: #( #assertWithHeartbeatTimer #debugWithHeartbeatTimer debugMultiThreadedFFI.....etc)) " ! Item was added: + ----- Method: Linux64x86w32BitSqueakCogV3Config>>availableBuildTypes (in category 'as yet unclassified') ----- + availableBuildTypes + "2.14.12.09 only buildType implemented is #build so I remove #build from the below OrderedCollection." + ^SqueakCMakeVMMakerAbstractBuilder default allBuildTypes copyWithoutAll: #( #buildAssert #buildAssertITimerHeartbeat #buildDebug #buildDebugITimerHeartbeat #buildITimerHeartbeat #buildMultiThreaded #buildMultiThreadedAssert #buildMultiThreadedDebug #buildNone)! Item was changed: SqueakCMakeVMMakerAbstractBuilder subclass: #SqueakBSDx86Builder instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'CMakeVMMakerSqueak-Builder'! + !SqueakBSDx86Builder commentStamp: 'tty 12/9/2014 12:42' prior: 0! - !SqueakBSDx86Builder commentStamp: 'tty 12/8/2014 11:26' prior: 0! I am a facade. I query, and invoke CMakeVMMakerSqueak configurations. + HelpBrowser openOn: CMakeVMMakerSqueakHelp. - HelpBrowser openOn: CMakeVMMakerSqueakBuildersHelp. - HelpBrowser openOn: CMakeVMMakerSqueakDeveloperHelp. - HelpBrowser openOn: CMakeVMMakerSqueakStartHereHelp. ! Item was changed: Object subclass: #SqueakCMakeVMMakerAbstractBuilder instanceVariableNames: 'buildTypeAndDirectoryInfo config' classVariableNames: '' poolDictionaries: '' category: 'CMakeVMMakerSqueak-Builder'! SqueakCMakeVMMakerAbstractBuilder class instanceVariableNames: 'default'! + !SqueakCMakeVMMakerAbstractBuilder commentStamp: 'tty 12/9/2014 12:41' prior: 0! - !SqueakCMakeVMMakerAbstractBuilder commentStamp: 'tty 12/8/2014 10:42' prior: 0! I am an abstract base class for various CMakeVMMakerSqueak builders. I am a singleton. I am a facade to the various Squeak[Platform][WordSize][VM][MemoryManager]Config classes I provide facilities to query my configurations. I use the Visitor pattern in collecting information about my configurations. + HelpBrowser openOn: CMakeVMMakerSqueakHelp. - HelpBrowser openOn: CMakeVMMakerSqueakBuildersHelp. - HelpBrowser openOn: CMakeVMMakerSqueakDeveloperHelp. - HelpBrowser openOn: CMakeVMMakerSqueakStartHereHelp. - ! SqueakCMakeVMMakerAbstractBuilder class instanceVariableNames: 'default'! Item was changed: ----- Method: SqueakCMakeVMMakerAbstractBuilder>>configureA:forBuildType: (in category 'building') ----- configureA: configSymbol forBuildType: typeSymbol | i | self flag:'tty'. "excludeFromBuild returning True does not exit gracefully" "Do some sanity checks, then set the internal state of a Configuration for a particular build type. " [ ((Smalltalk at: configSymbol) category) = (self configurationsCategory) "verify the class is handled by this concrete builder" ifTrue:[ config := (Smalltalk at: configSymbol) new. "verify this config can handle this build type." config excludeFromBuild "has a developer excluded this build manually?" ifTrue:[^self userErrorConfigMarkedAsExcludeFromBuild: configSymbol]. i:=config availableBuildTypes indexOf:typeSymbol ifAbsent:[^self userErrorInvalidBuildType: typeSymbol "this config does not support this build type" forConfiguration: configSymbol hasTypes: config availableBuildTypes]. (config configureForBuildType: typeSymbol) value. "config configure yourself" ^self] ifFalse:[^self userErrorInvalidTarget: configSymbol] ] ifError:[^'error configureABuildFor: ''', configSymbol]. ^nil. ! Item was changed: SqueakCMakeVMMakerAbstractBuilder subclass: #SqueakIA32BochsBuilder instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'CMakeVMMakerSqueak-Builder'! + !SqueakIA32BochsBuilder commentStamp: 'tty 12/9/2014 12:42' prior: 0! - !SqueakIA32BochsBuilder commentStamp: 'tty 12/8/2014 11:26' prior: 0! I am a facade. I query, and invoke CMakeVMMakerSqueak configurations. + HelpBrowser openOn: CMakeVMMakerSqueakHelp.! - HelpBrowser openOn: CMakeVMMakerSqueakBuildersHelp. - HelpBrowser openOn: CMakeVMMakerSqueakDeveloperHelp. - HelpBrowser openOn: CMakeVMMakerSqueakStartHereHelp. - ! Item was changed: SqueakCMakeVMMakerAbstractBuilder subclass: #SqueakIOSBuilder instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'CMakeVMMakerSqueak-Builder'! + !SqueakIOSBuilder commentStamp: 'tty 12/9/2014 12:42' prior: 0! - !SqueakIOSBuilder commentStamp: 'tty 12/8/2014 11:26' prior: 0! I am a facade. I query, and invoke CMakeVMMakerSqueak configurations. + HelpBrowser openOn: CMakeVMMakerSqueakHelp. - HelpBrowser openOn: CMakeVMMakerSqueakBuildersHelp. - HelpBrowser openOn: CMakeVMMakerSqueakDeveloperHelp. - HelpBrowser openOn: CMakeVMMakerSqueakStartHereHelp. ! Item was changed: SqueakCMakeVMMakerAbstractBuilder subclass: #SqueakLinux32ARMv6Builder instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'CMakeVMMakerSqueak-Builder'! + !SqueakLinux32ARMv6Builder commentStamp: 'tty 12/9/2014 12:42' prior: 0! - !SqueakLinux32ARMv6Builder commentStamp: 'tty 12/8/2014 11:26' prior: 0! I am a facade. I query, and invoke CMakeVMMakerSqueak configurations. + HelpBrowser openOn: CMakeVMMakerSqueakHelp. - HelpBrowser openOn: CMakeVMMakerSqueakBuildersHelp. - HelpBrowser openOn: CMakeVMMakerSqueakDeveloperHelp. - HelpBrowser openOn: CMakeVMMakerSqueakStartHereHelp. ! Item was changed: SqueakCMakeVMMakerAbstractBuilder subclass: #SqueakLinux32x86Builder instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'CMakeVMMakerSqueak-Builder'! + !SqueakLinux32x86Builder commentStamp: 'tty 12/9/2014 12:42' prior: 0! - !SqueakLinux32x86Builder commentStamp: 'tty 12/8/2014 11:26' prior: 0! I am a facade. I query, and invoke CMakeVMMakerSqueak configurations. + HelpBrowser openOn: CMakeVMMakerSqueakHelp.! - HelpBrowser openOn: CMakeVMMakerSqueakBuildersHelp. - HelpBrowser openOn: CMakeVMMakerSqueakDeveloperHelp. - HelpBrowser openOn: CMakeVMMakerSqueakStartHereHelp. - ! Item was removed: - SqueakCMakeVMMakerAbstractBuilder subclass: #SqueakLinux32x86_64Builder - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'CMakeVMMakerSqueak-Builder'! - - !SqueakLinux32x86_64Builder commentStamp: 'tty 12/8/2014 11:26' prior: 0! - I am a facade. - - I query, and invoke CMakeVMMakerSqueak configurations. - - HelpBrowser openOn: CMakeVMMakerSqueakBuildersHelp. - HelpBrowser openOn: CMakeVMMakerSqueakDeveloperHelp. - HelpBrowser openOn: CMakeVMMakerSqueakStartHereHelp. - ! Item was removed: - ----- Method: SqueakLinux32x86_64Builder>>configurationsCategory (in category 'queries') ----- - configurationsCategory - ^'CMakeVMMakerSqueak-LinuxX86-64'! Item was changed: SqueakCMakeVMMakerAbstractBuilder subclass: #SqueakLinux64x86w32CompatBuilder instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'CMakeVMMakerSqueak-Builder'! + !SqueakLinux64x86w32CompatBuilder commentStamp: 'tty 12/9/2014 12:42' prior: 0! - !SqueakLinux64x86w32CompatBuilder commentStamp: 'tty 12/8/2014 11:27' prior: 0! I am a facade. I query, and invoke CMakeVMMakerSqueak configurations. + HelpBrowser openOn: CMakeVMMakerSqueakHelp. - HelpBrowser openOn: CMakeVMMakerSqueakBuildersHelp. - HelpBrowser openOn: CMakeVMMakerSqueakDeveloperHelp. - HelpBrowser openOn: CMakeVMMakerSqueakStartHereHelp. ! Item was added: + SqueakCMakeVMMakerAbstractBuilder subclass: #SqueakLinuxX86_64Builder + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-Builder'! + + !SqueakLinuxX86_64Builder commentStamp: 'tty 12/9/2014 12:41' prior: 0! + I am a facade. + + I query, and invoke CMakeVMMakerSqueak configurations. + + HelpBrowser openOn: CMakeVMMakerSqueakHelp. + ! Item was added: + ----- Method: SqueakLinuxX86_64Builder>>configurationsCategory (in category 'queries') ----- + configurationsCategory + ^'CMakeVMMakerSqueak-LinuxX86-64'! Item was changed: SqueakCMakeVMMakerAbstractBuilder subclass: #SqueakMacOSPowerPCBuilder instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'CMakeVMMakerSqueak-Builder'! + !SqueakMacOSPowerPCBuilder commentStamp: 'tty 12/9/2014 12:42' prior: 0! - !SqueakMacOSPowerPCBuilder commentStamp: 'tty 12/8/2014 11:27' prior: 0! I am a facade. I query, and invoke CMakeVMMakerSqueak configurations. + HelpBrowser openOn: CMakeVMMakerSqueakHelp.! - HelpBrowser openOn: CMakeVMMakerSqueakBuildersHelp. - HelpBrowser openOn: CMakeVMMakerSqueakDeveloperHelp. - HelpBrowser openOn: CMakeVMMakerSqueakStartHereHelp. - ! Item was changed: SqueakCMakeVMMakerAbstractBuilder subclass: #SqueakMacOSX32x86Builder instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'CMakeVMMakerSqueak-Builder'! + !SqueakMacOSX32x86Builder commentStamp: 'tty 12/9/2014 12:42' prior: 0! - !SqueakMacOSX32x86Builder commentStamp: 'tty 12/8/2014 11:27' prior: 0! I am a facade. I query, and invoke CMakeVMMakerSqueak configurations. + HelpBrowser openOn: CMakeVMMakerSqueakHelp. - HelpBrowser openOn: CMakeVMMakerSqueakBuildersHelp. - HelpBrowser openOn: CMakeVMMakerSqueakDeveloperHelp. - HelpBrowser openOn: CMakeVMMakerSqueakStartHereHelp. ! Item was changed: SqueakCMakeVMMakerAbstractBuilder subclass: #SqueakSunOS32x86Builder instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'CMakeVMMakerSqueak-Builder'! + !SqueakSunOS32x86Builder commentStamp: 'tty 12/9/2014 12:42' prior: 0! - !SqueakSunOS32x86Builder commentStamp: 'tty 12/8/2014 11:27' prior: 0! I am a facade. I query, and invoke CMakeVMMakerSqueak configurations. + HelpBrowser openOn: CMakeVMMakerSqueakHelp. - HelpBrowser openOn: CMakeVMMakerSqueakBuildersHelp. - HelpBrowser openOn: CMakeVMMakerSqueakDeveloperHelp. - HelpBrowser openOn: CMakeVMMakerSqueakStartHereHelp. ! Item was changed: SqueakCMakeVMMakerAbstractBuilder subclass: #SqueakWin32x86Builder instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'CMakeVMMakerSqueak-Builder'! + !SqueakWin32x86Builder commentStamp: 'tty 12/9/2014 12:42' prior: 0! - !SqueakWin32x86Builder commentStamp: 'tty 12/8/2014 11:27' prior: 0! I am a facade. I query, and invoke CMakeVMMakerSqueak configurations. + HelpBrowser openOn: CMakeVMMakerSqueakHelp. - HelpBrowser openOn: CMakeVMMakerSqueakBuildersHelp. - HelpBrowser openOn: CMakeVMMakerSqueakDeveloperHelp. - HelpBrowser openOn: CMakeVMMakerSqueakStartHereHelp. !

1 0

ConfigurationOfCommandShell
by Stephan Eggermont 09 Dec '14

09 Dec '14

I'm not sure what is happening in the baseline of ConfigurationOfCommandShell. The core group looks Pharo specific. It is nice that the menu entry for Pharo got a new name. The window title then no longer corresponds with the menu entry though. Stephan

3 2

← Newer
1
...
8
9
10
11
12
13
14
15
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev December 2014