Vm-dev April 2013

vm-dev@lists.squeakfoundation.org

36 participants
107 discussions

Re: [squeak-dev] Problem with SerialPort and Cog
by Eliot Miranda 07 Apr '13

07 Apr '13

On Fri, Apr 5, 2013 at 2:37 PM, Javier Diaz-Reinoso <javier_diaz_r(a)mac.com>wrote: > On 03/04/2013, at 10:53, Javier Diaz-Reinoso <javier_diaz_r(a)MAC.COM> > wrote: > > > After line: p openPort: '/dev/cu.usbmodem1a21'., p in Cog is: > > SerialPort(closed, 115200 baud, 8 bits, 1 stopbits, no parity) > > is closed because port is nil, in Squeak 4.2.5beta1U is: > > SerialPort(#'/dev/cu.usbmodem1a21', 115200 baud, 8 bits, 1 > stopbits, no parity) > > port is: '/dev/cu.usbmodem1a21'. > > > > I repeated my test with a virgin copy of Squeak4.4-12327 (before I was > using 4.1 and 4.3), also with other macbook pro, the same error. > > > [cut...] > > Well, I download the VM from www.squeakvm.org/svn/squeak/branches/Cog/and find that primitiveSerialPortOpenByName is not defined!. > > In /Tools/Squeak/VMCog/platforms/unix/plugins/SerialPlugin/sqUnixSerial.c > (included in the CoreVM. xcodeproj) the function serialPortOpenByName is > defined, but is not "linked" with primitiveSerialPortOpenByName so the call > (in Squeak) of primOpenPortByName: fail. > Ah, right. That's because there is no support on Mac OS or Windows. So wen I tried adding primitiveSerialPortOpenByName it broke the builds on Windows and Mac. If anyone has support files for those platforms I'll try again. -- best, Eliot

3 5

[commit][2716] Sources as per VMMaker-dtl.315
by commits＠squeakvm.org 07 Apr '13

07 Apr '13

Revision: 2716 Author: lewis Date: 2013-04-07 05:00:29 -0700 (Sun, 07 Apr 2013) Log Message: ----------- Sources as per VMMaker-dtl.315 VMMaker 4.11.5 Remove PixelValuePeekPlugin from defaultUnixSpec. New SlangTest tests for loop limit code generation. >From VMMaker.oscog-eem.279 and VMMaker.oscog-eem.282: Fix translation of to:by:do: loops so that the limit is not re-evaluated on each iteration if it may have side-effects. As part of this change make TMethod locals a Set, and sort only when emitting locals. Alas this causes a number of methods to change. Fix SmartSyntaxPlugin support method affected by the fixes for generating to:by:do: loops in VMMaker.oscog-eem.279. Modified Paths: -------------- trunk/src/ckformat.c trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c trunk/src/plugins/AioPlugin/AioPlugin.c trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c trunk/src/plugins/B2DPlugin/B2DPlugin.c trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c trunk/src/plugins/BitBltPlugin/BitBltPlugin.c trunk/src/plugins/CameraPlugin/CameraPlugin.c trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c trunk/src/plugins/CroquetPlugin/CroquetPlugin.c trunk/src/plugins/DBusPlugin/DBusPlugin.c trunk/src/plugins/DSAPrims/DSAPrims.c trunk/src/plugins/DropPlugin/DropPlugin.c trunk/src/plugins/FFTPlugin/FFTPlugin.c trunk/src/plugins/FT2Plugin/FT2Plugin.c trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c trunk/src/plugins/FilePlugin/FilePlugin.c trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c trunk/src/plugins/GeniePlugin/GeniePlugin.c trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c trunk/src/plugins/Klatt/Klatt.c trunk/src/plugins/LargeIntegers/LargeIntegers.c trunk/src/plugins/LocalePlugin/LocalePlugin.c trunk/src/plugins/MIDIPlugin/MIDIPlugin.c trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c trunk/src/plugins/RePlugin/RePlugin.c trunk/src/plugins/RomePlugin/RomePlugin.c trunk/src/plugins/ScratchPlugin/ScratchPlugin.c trunk/src/plugins/SecurityPlugin/SecurityPlugin.c trunk/src/plugins/SerialPlugin/SerialPlugin.c trunk/src/plugins/SocketPlugin/SocketPlugin.c trunk/src/plugins/SoundCodecPrims/SoundCodecPrims.c trunk/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c trunk/src/plugins/SoundPlugin/SoundPlugin.c trunk/src/plugins/Squeak3D/Squeak3D.c trunk/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c trunk/src/plugins/SqueakSSL/SqueakSSL.c trunk/src/plugins/StarSqueakPlugin/StarSqueakPlugin.c trunk/src/plugins/UUIDPlugin/UUIDPlugin.c trunk/src/plugins/UnicodePlugin/UnicodePlugin.c trunk/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c trunk/src/plugins/WeDoPlugin/WeDoPlugin.c trunk/src/plugins/XDisplayControlPlugin/XDisplayControlPlugin.c trunk/src/plugins/ZipPlugin/ZipPlugin.c trunk/src/vm/interp.c trunk/src/vm/interp.h trunk/src/vm/sqNamedPrims.h Modified: trunk/src/ckformat.c =================================================================== --- trunk/src/ckformat.c 2013-04-04 19:59:06 UTC (rev 2715) +++ trunk/src/ckformat.c 2013-04-07 12:00:29 UTC (rev 2716) @@ -5,7 +5,7 @@ /* Usage: ckformat imageFileName */ /* --- DO NOT EDIT THIS FILE --- */ -/* --- Automatically generated from class ImageFormat 2013-03-25T21:44:02.506-05:00--- */ +/* --- Automatically generated from class ImageFormat 2013-04-06T10:59:51.052-05:00--- */ /* --- Source code is in package ImageFormat in the VMMaker repository --- */ /* --- DO NOT EDIT THIS FILE --- */ Modified: trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c =================================================================== --- trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2013-04-04 19:59:06 UTC (rev 2715) +++ trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2013-04-07 12:00:29 UTC (rev 2716) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.3 with VMMaker 4.11.4 translated as C source on 25 March 2013 9:43:45 pm */ +/* Smalltalk from Squeak4.3 with VMMaker 4.11.5 translated as C source on 6 April 2013 10:59:34 am */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + VMPluginCodeGenerator * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d from - ADPCMCodecPlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + ADPCMCodecPlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d */ -static char __buildInfo[] = "ADPCMCodecPlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; +static char __buildInfo[] = "ADPCMCodecPlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; @@ -70,9 +70,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ADPCMCodecPlugin 25 March 2013 (i)" + "ADPCMCodecPlugin 6 April 2013 (i)" #else - "ADPCMCodecPlugin 25 March 2013 (e)" + "ADPCMCodecPlugin 6 April 2013 (e)" #endif ; @@ -104,8 +104,6 @@ } EXPORT(sqInt) primitiveDecodeMono(void) { - sqInt rcvr; - sqInt count; sqInt bit; sqInt delta; sqInt i; @@ -135,6 +133,8 @@ sqInt bitsPerSample; short int *stepSizeTable; short int *indexTable; + sqInt rcvr; + sqInt count; rcvr = stackValue(1); count = stackIntegerValue(0); @@ -274,8 +274,6 @@ } EXPORT(sqInt) primitiveDecodeStereo(void) { - sqInt rcvr; - sqInt count; sqInt bit; sqInt deltaLeft; sqInt deltaRight; @@ -322,6 +320,8 @@ sqInt bitsPerSample; short int *stepSizeTable; short int *indexTable; + sqInt rcvr; + sqInt count; /* make local copies of decoder state variables */ @@ -562,8 +562,6 @@ } EXPORT(sqInt) primitiveEncodeMono(void) { - sqInt rcvr; - sqInt count; sqInt bit; sqInt delta; sqInt diff; @@ -601,6 +599,8 @@ sqInt bitsPerSample; short int *stepSizeTable; short int *indexTable; + sqInt rcvr; + sqInt count; rcvr = stackValue(1); count = stackIntegerValue(0); Modified: trunk/src/plugins/AioPlugin/AioPlugin.c =================================================================== --- trunk/src/plugins/AioPlugin/AioPlugin.c 2013-04-04 19:59:06 UTC (rev 2715) +++ trunk/src/plugins/AioPlugin/AioPlugin.c 2013-04-07 12:00:29 UTC (rev 2716) @@ -1,6 +1,6 @@ -/* Smalltalk from Squeak4.3 with VMMaker 4.11.4 translated as C source on 25 March 2013 9:44:01 pm */ +/* Smalltalk from Squeak4.3 with VMMaker 4.11.5 translated as C source on 6 April 2013 10:59:50 am */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + VMPluginCodeGenerator * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d from UnixAioPlugin VMConstruction-Plugins-AioPlugin-dtl.14 uuid: 965d54b7-4309-42fd-adb0-64400d3c780b */ @@ -88,9 +88,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AioPlugin 25 March 2013 (i)" + "AioPlugin 6 April 2013 (i)" #else - "AioPlugin 25 March 2013 (e)" + "AioPlugin 6 April 2013 (e)" #endif ; Modified: trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c =================================================================== --- trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2013-04-04 19:59:06 UTC (rev 2715) +++ trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2013-04-07 12:00:29 UTC (rev 2716) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.3 with VMMaker 4.11.4 translated as C source on 25 March 2013 9:43:45 pm */ +/* Smalltalk from Squeak4.3 with VMMaker 4.11.5 translated as C source on 6 April 2013 10:59:34 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d from - AsynchFilePlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + AsynchFilePlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d */ -static char __buildInfo[] = "AsynchFilePlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; +static char __buildInfo[] = "AsynchFilePlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; @@ -67,9 +67,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AsynchFilePlugin 25 March 2013 (i)" + "AsynchFilePlugin 6 April 2013 (i)" #else - "AsynchFilePlugin 25 March 2013 (e)" + "AsynchFilePlugin 6 April 2013 (e)" #endif ; static void * sCOAFfn; Modified: trunk/src/plugins/B2DPlugin/B2DPlugin.c =================================================================== --- trunk/src/plugins/B2DPlugin/B2DPlugin.c 2013-04-04 19:59:06 UTC (rev 2715) +++ trunk/src/plugins/B2DPlugin/B2DPlugin.c 2013-04-07 12:00:29 UTC (rev 2716) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.3 with VMMaker 4.11.4 translated as C source on 25 March 2013 9:43:48 pm */ +/* Smalltalk from Squeak4.3 with VMMaker 4.11.5 translated as C source on 6 April 2013 10:59:36 am */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + VMPluginCodeGenerator * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d from - BalloonEnginePlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + BalloonEnginePlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d */ -static char __buildInfo[] = "BalloonEnginePlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; +static char __buildInfo[] = "BalloonEnginePlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; @@ -421,9 +421,9 @@ static void * loadBBFn; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B2DPlugin 25 March 2013 (i)" + "B2DPlugin 6 April 2013 (i)" #else - "B2DPlugin 25 March 2013 (e)" + "B2DPlugin 6 April 2013 (e)" #endif ; static int* objBuffer; @@ -603,6 +603,7 @@ sqInt dstIndex; sqInt i; sqInt srcIndex; + sqInt iLimiT; /* First allocate nSlots in the AET */ @@ -616,7 +617,7 @@ srcIndex = workBuffer[GWAETUsed]; dstIndex = (workBuffer[GWAETUsed]) + nSlots; - for (i = 1; i <= (workBuffer[GWAETUsed]); i += 1) { + for (i = 1, iLimiT = (workBuffer[GWAETUsed]); i <= iLimiT; i += 1) { aetBuffer[(dstIndex -= 1)] = (aetBuffer[(srcIndex -= 1)]); } } @@ -664,6 +665,7 @@ sqInt dstIndex; sqInt i; sqInt srcIndex; + sqInt iLimiT; /* First allocate nSlots in the GET */ @@ -677,7 +679,7 @@ srcIndex = workBuffer[GWGETUsed]; dstIndex = (workBuffer[GWGETUsed]) + nSlots; - for (i = 1; i <= (workBuffer[GWGETUsed]); i += 1) { + for (i = 1, iLimiT = (workBuffer[GWGETUsed]); i <= iLimiT; i += 1) { getBuffer[(dstIndex -= 1)] = (getBuffer[(srcIndex -= 1)]); } } @@ -3674,12 +3676,13 @@ sqInt formOop; sqInt i; sqInt ppw; + sqInt iLimiT; if (!(interpreterProxy->isArray(arrayOop))) { return 0; } formArray = arrayOop; - for (i = 0; i <= ((interpreterProxy->slotSizeOf(formArray)) - 1); i += 1) { + for (i = 0, iLimiT = ((interpreterProxy->slotSizeOf(formArray)) - 1); i <= iLimiT; i += 1) { formOop = interpreterProxy->fetchPointerofObject(i, formArray); if ((formOop & 1)) { return 0; @@ -5069,6 +5072,7 @@ int * dst; sqInt i; int * src; + sqInt iLimiT; if (!((interpreterProxy->methodArgumentCount()) == 2)) { return interpreterProxy->primitiveFail(); @@ -5090,14 +5094,14 @@ } src = workBuffer; dst = interpreterProxy->firstIndexableField(buf2); - for (i = 0; i <= ((workBuffer[GWBufferTop]) - 1); i += 1) { + for (i = 0, iLimiT = ((workBuffer[GWBufferTop]) - 1); i <= iLimiT; i += 1) { dst[i] = (src[i]); } dst[GWBufferTop] = ((workBuffer[GWBufferTop]) + diff); dst[GWSize] = ((workBuffer[GWSize]) + diff); src += workBuffer[GWBufferTop]; dst = (dst + (workBuffer[GWBufferTop])) + diff; - for (i = 0; i <= (((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - 1); i += 1) { + for (i = 0, iLimiT = (((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - 1); i <= iLimiT; i += 1) { dst[i] = (src[i]); } if (!(loadWorkBufferFrom(buf2))) { Modified: trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c =================================================================== --- trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2013-04-04 19:59:06 UTC (rev 2715) +++ trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2013-04-07 12:00:29 UTC (rev 2716) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.3 with VMMaker 4.11.4 translated as C source on 25 March 2013 9:43:54 pm */ +/* Smalltalk from Squeak4.3 with VMMaker 4.11.5 translated as C source on 6 April 2013 10:59:43 am */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + VMPluginCodeGenerator * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d from - B3DAcceleratorPlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + B3DAcceleratorPlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d */ -static char __buildInfo[] = "B3DAcceleratorPlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; +static char __buildInfo[] = "B3DAcceleratorPlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; @@ -97,9 +97,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B3DAcceleratorPlugin 25 March 2013 (i)" + "B3DAcceleratorPlugin 6 April 2013 (i)" #else - "B3DAcceleratorPlugin 25 March 2013 (e)" + "B3DAcceleratorPlugin 6 April 2013 (e)" #endif ; Modified: trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c =================================================================== --- trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2013-04-04 19:59:06 UTC (rev 2715) +++ trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2013-04-07 12:00:29 UTC (rev 2716) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.3 with VMMaker 4.11.4 translated as C source on 25 March 2013 9:43:46 pm */ +/* Smalltalk from Squeak4.3 with VMMaker 4.11.5 translated as C source on 6 April 2013 10:59:34 am */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + VMPluginCodeGenerator * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d from - BMPReadWriterPlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + BMPReadWriterPlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d */ -static char __buildInfo[] = "BMPReadWriterPlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; +static char __buildInfo[] = "BMPReadWriterPlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; @@ -58,9 +58,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BMPReadWriterPlugin 25 March 2013 (i)" + "BMPReadWriterPlugin 6 April 2013 (i)" #else - "BMPReadWriterPlugin 25 March 2013 (e)" + "BMPReadWriterPlugin 6 April 2013 (e)" #endif ; Modified: trunk/src/plugins/BitBltPlugin/BitBltPlugin.c =================================================================== --- trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2013-04-04 19:59:06 UTC (rev 2715) +++ trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2013-04-07 12:00:29 UTC (rev 2716) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.3 with VMMaker 4.11.4 translated as C source on 25 March 2013 9:43:49 pm */ +/* Smalltalk from Squeak4.3 with VMMaker 4.11.5 translated as C source on 6 April 2013 10:59:37 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d from - BitBltSimulation VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + BitBltSimulation * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d */ -static char __buildInfo[] = "BitBltSimulation VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; +static char __buildInfo[] = "BitBltSimulation * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; @@ -245,9 +245,9 @@ }; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BitBltPlugin 25 March 2013 (i)" + "BitBltPlugin 6 April 2013 (i)" #else - "BitBltPlugin 25 March 2013 (e)" + "BitBltPlugin 6 April 2013 (e)" #endif ; static sqInt nWords; Modified: trunk/src/plugins/CameraPlugin/CameraPlugin.c =================================================================== --- trunk/src/plugins/CameraPlugin/CameraPlugin.c 2013-04-04 19:59:06 UTC (rev 2715) +++ trunk/src/plugins/CameraPlugin/CameraPlugin.c 2013-04-07 12:00:29 UTC (rev 2716) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.3 with VMMaker 4.11.4 translated as C source on 25 March 2013 9:43:55 pm */ +/* Smalltalk from Squeak4.3 with VMMaker 4.11.5 translated as C source on 6 April 2013 10:59:44 am */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + VMPluginCodeGenerator * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d from - CameraPlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + CameraPlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d */ -static char __buildInfo[] = "CameraPlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; +static char __buildInfo[] = "CameraPlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; @@ -64,9 +64,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "CameraPlugin 25 March 2013 (i)" + "CameraPlugin 6 April 2013 (i)" #else - "CameraPlugin 25 March 2013 (e)" + "CameraPlugin 6 April 2013 (e)" #endif ; Modified: trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c =================================================================== --- trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2013-04-04 19:59:06 UTC (rev 2715) +++ trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2013-04-07 12:00:29 UTC (rev 2716) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.3 with VMMaker 4.11.4 translated as C source on 25 March 2013 9:43:55 pm */ +/* Smalltalk from Squeak4.3 with VMMaker 4.11.5 translated as C source on 6 April 2013 10:59:44 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d from - ClipboardExtendedPlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + ClipboardExtendedPlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d */ -static char __buildInfo[] = "ClipboardExtendedPlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; +static char __buildInfo[] = "ClipboardExtendedPlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; @@ -61,9 +61,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ClipboardExtendedPlugin 25 March 2013 (i)" + "ClipboardExtendedPlugin 6 April 2013 (i)" #else - "ClipboardExtendedPlugin 25 March 2013 (e)" + "ClipboardExtendedPlugin 6 April 2013 (e)" #endif ; Modified: trunk/src/plugins/CroquetPlugin/CroquetPlugin.c =================================================================== --- trunk/src/plugins/CroquetPlugin/CroquetPlugin.c 2013-04-04 19:59:06 UTC (rev 2715) +++ trunk/src/plugins/CroquetPlugin/CroquetPlugin.c 2013-04-07 12:00:29 UTC (rev 2716) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.3 with VMMaker 4.11.4 translated as C source on 25 March 2013 9:43:49 pm */ +/* Smalltalk from Squeak4.3 with VMMaker 4.11.5 translated as C source on 6 April 2013 10:59:38 am */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + VMPluginCodeGenerator * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d from - CroquetPlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + CroquetPlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d */ -static char __buildInfo[] = "CroquetPlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; +static char __buildInfo[] = "CroquetPlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; @@ -70,9 +70,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "CroquetPlugin 25 March 2013 (i)" + "CroquetPlugin 6 April 2013 (i)" #else - "CroquetPlugin 25 March 2013 (e)" + "CroquetPlugin 6 April 2013 (e)" #endif ; Modified: trunk/src/plugins/DBusPlugin/DBusPlugin.c =================================================================== --- trunk/src/plugins/DBusPlugin/DBusPlugin.c 2013-04-04 19:59:06 UTC (rev 2715) +++ trunk/src/plugins/DBusPlugin/DBusPlugin.c 2013-04-07 12:00:29 UTC (rev 2716) @@ -1,6 +1,6 @@ -/* Smalltalk from Squeak4.3 with VMMaker 4.11.4 translated as C source on 25 March 2013 9:43:56 pm */ +/* Smalltalk from Squeak4.3 with VMMaker 4.11.5 translated as C source on 6 April 2013 10:59:44 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d from DBusPlugin DBus-Plugin-dtl.35 uuid: 2ae30f08-4793-4acb-876b-c443a5f5e665 */ @@ -143,9 +143,9 @@ static DBusMessageIter messageIter[DBUS_MAXIMUM_TYPE_RECURSION_DEPTH]; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DBusPlugin 25 March 2013 (i)" + "DBusPlugin 6 April 2013 (i)" #else - "DBusPlugin 25 March 2013 (e)" + "DBusPlugin 6 April 2013 (e)" #endif ; static DBusMessage* writeMessage; Modified: trunk/src/plugins/DSAPrims/DSAPrims.c =================================================================== --- trunk/src/plugins/DSAPrims/DSAPrims.c 2013-04-04 19:59:06 UTC (rev 2715) +++ trunk/src/plugins/DSAPrims/DSAPrims.c 2013-04-07 12:00:29 UTC (rev 2716) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.3 with VMMaker 4.11.4 translated as C source on 25 March 2013 9:43:49 pm */ +/* Smalltalk from Squeak4.3 with VMMaker 4.11.5 translated as C source on 6 April 2013 10:59:38 am */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + VMPluginCodeGenerator * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d from - DSAPlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + DSAPlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d */ -static char __buildInfo[] = "DSAPlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; +static char __buildInfo[] = "DSAPlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; @@ -67,9 +67,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DSAPrims 25 March 2013 (i)" + "DSAPrims 6 April 2013 (i)" #else - "DSAPrims 25 March 2013 (e)" + "DSAPrims 6 April 2013 (e)" #endif ; static sqInt remainderDigitCount; Modified: trunk/src/plugins/DropPlugin/DropPlugin.c =================================================================== --- trunk/src/plugins/DropPlugin/DropPlugin.c 2013-04-04 19:59:06 UTC (rev 2715) +++ trunk/src/plugins/DropPlugin/DropPlugin.c 2013-04-07 12:00:29 UTC (rev 2716) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.3 with VMMaker 4.11.4 translated as C source on 25 March 2013 9:43:50 pm */ +/* Smalltalk from Squeak4.3 with VMMaker 4.11.5 translated as C source on 6 April 2013 10:59:38 am */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + VMPluginCodeGenerator * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d from - DropPlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + DropPlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d */ -static char __buildInfo[] = "DropPlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; +static char __buildInfo[] = "DropPlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; @@ -62,9 +62,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DropPlugin 25 March 2013 (i)" + "DropPlugin 6 April 2013 (i)" #else - "DropPlugin 25 March 2013 (e)" + "DropPlugin 6 April 2013 (e)" #endif ; Modified: trunk/src/plugins/FFTPlugin/FFTPlugin.c =================================================================== --- trunk/src/plugins/FFTPlugin/FFTPlugin.c 2013-04-04 19:59:06 UTC (rev 2715) +++ trunk/src/plugins/FFTPlugin/FFTPlugin.c 2013-04-07 12:00:29 UTC (rev 2716) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.3 with VMMaker 4.11.4 translated as C source on 25 March 2013 9:43:50 pm */ +/* Smalltalk from Squeak4.3 with VMMaker 4.11.5 translated as C source on 6 April 2013 10:59:38 am */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + VMPluginCodeGenerator * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d from - FFTPlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + FFTPlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d */ -static char __buildInfo[] = "FFTPlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; +static char __buildInfo[] = "FFTPlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; @@ -68,9 +68,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FFTPlugin 25 March 2013 (i)" + "FFTPlugin 6 April 2013 (i)" #else - "FFTPlugin 25 March 2013 (e)" + "FFTPlugin 6 April 2013 (e)" #endif ; static sqInt nu; Modified: trunk/src/plugins/FT2Plugin/FT2Plugin.c =================================================================== --- trunk/src/plugins/FT2Plugin/FT2Plugin.c 2013-04-04 19:59:06 UTC (rev 2715) +++ trunk/src/plugins/FT2Plugin/FT2Plugin.c 2013-04-07 12:00:29 UTC (rev 2716) @@ -1,4 +1,4 @@ -/* Smalltalk from Squeak4.3 with VMMaker 4.11.4 translated as C source on 25 March 2013 9:43:50 pm */ +/* Smalltalk from Squeak4.3 with VMMaker 4.11.5 translated as C source on 6 April 2013 10:59:39 am */ /* Automatically generated by FT2PluginCodeGenerator * FreeType-tween.435 uuid: 1866706e-ba6b-a742-b2fb-7854932b7596 from @@ -122,9 +122,9 @@ static FT_Library library; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FT2Plugin 25 March 2013 (i)" + "FT2Plugin 6 April 2013 (i)" #else - "FT2Plugin 25 March 2013 (e)" + "FT2Plugin 6 April 2013 (e)" #endif ; Modified: trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c =================================================================== --- trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c 2013-04-04 19:59:06 UTC (rev 2715) +++ trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c 2013-04-07 12:00:29 UTC (rev 2716) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.3 with VMMaker 4.11.4 translated as C source on 25 March 2013 9:43:56 pm */ +/* Smalltalk from Squeak4.3 with VMMaker 4.11.5 translated as C source on 6 April 2013 10:59:45 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d from - FileCopyPlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + FileCopyPlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d */ -static char __buildInfo[] = "FileCopyPlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; +static char __buildInfo[] = "FileCopyPlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; @@ -57,9 +57,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FileCopyPlugin 25 March 2013 (i)" + "FileCopyPlugin 6 April 2013 (i)" #else - "FileCopyPlugin 25 March 2013 (e)" + "FileCopyPlugin 6 April 2013 (e)" #endif ; Modified: trunk/src/plugins/FilePlugin/FilePlugin.c =================================================================== --- trunk/src/plugins/FilePlugin/FilePlugin.c 2013-04-04 19:59:06 UTC (rev 2715) +++ trunk/src/plugins/FilePlugin/FilePlugin.c 2013-04-07 12:00:29 UTC (rev 2716) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.3 with VMMaker 4.11.4 translated as C source on 25 March 2013 9:43:50 pm */ +/* Smalltalk from Squeak4.3 with VMMaker 4.11.5 translated as C source on 6 April 2013 10:59:39 am */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + VMPluginCodeGenerator * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d from - FilePlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + FilePlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d */ -static char __buildInfo[] = "FilePlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; +static char __buildInfo[] = "FilePlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; @@ -94,9 +94,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FilePlugin 25 March 2013 (i)" + "FilePlugin 6 April 2013 (i)" #else - "FilePlugin 25 March 2013 (e)" + "FilePlugin 6 April 2013 (e)" #endif ; static void * sCCPfn; Modified: trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c =================================================================== --- trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2013-04-04 19:59:06 UTC (rev 2715) +++ trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2013-04-07 12:00:29 UTC (rev 2716) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.3 with VMMaker 4.11.4 translated as C source on 25 March 2013 9:43:51 pm */ +/* Smalltalk from Squeak4.3 with VMMaker 4.11.5 translated as C source on 6 April 2013 10:59:39 am */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + VMPluginCodeGenerator * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d from - FloatArrayPlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + FloatArrayPlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d */ -static char __buildInfo[] = "FloatArrayPlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; +static char __buildInfo[] = "FloatArrayPlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; @@ -70,9 +70,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FloatArrayPlugin 25 March 2013 (i)" + "FloatArrayPlugin 6 April 2013 (i)" #else - "FloatArrayPlugin 25 March 2013 (e)" + "FloatArrayPlugin 6 April 2013 (e)" #endif ; Modified: trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c =================================================================== --- trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c 2013-04-04 19:59:06 UTC (rev 2715) +++ trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c 2013-04-07 12:00:29 UTC (rev 2716) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.3 with VMMaker 4.11.4 translated as C source on 25 March 2013 9:43:51 pm */ +/* Smalltalk from Squeak4.3 with VMMaker 4.11.5 translated as C source on 6 April 2013 10:59:39 am */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + VMPluginCodeGenerator * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d from - FloatMathPlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + FloatMathPlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d */ -static char __buildInfo[] = "FloatMathPlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; +static char __buildInfo[] = "FloatMathPlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; @@ -79,9 +79,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FloatMathPlugin 25 March 2013 (i)" + "FloatMathPlugin 6 April 2013 (i)" #else - "FloatMathPlugin 25 March 2013 (e)" + "FloatMathPlugin 6 April 2013 (e)" #endif ; Modified: trunk/src/plugins/GeniePlugin/GeniePlugin.c =================================================================== --- trunk/src/plugins/GeniePlugin/GeniePlugin.c 2013-04-04 19:59:06 UTC (rev 2715) +++ trunk/src/plugins/GeniePlugin/GeniePlugin.c 2013-04-07 12:00:29 UTC (rev 2716) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.3 with VMMaker 4.11.4 translated as C source on 25 March 2013 9:43:51 pm */ +/* Smalltalk from Squeak4.3 with VMMaker 4.11.5 translated as C source on 6 April 2013 10:59:40 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d from - GeniePlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + GeniePlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d */ -static char __buildInfo[] = "GeniePlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; +static char __buildInfo[] = "GeniePlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; @@ -61,9 +61,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "GeniePlugin v2.0 25 March 2013 (i)" + "GeniePlugin v2.0 6 April 2013 (i)" #else - "GeniePlugin v2.0 25 March 2013 (e)" + "GeniePlugin v2.0 6 April 2013 (e)" #endif ; Modified: trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c =================================================================== --- trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c 2013-04-04 19:59:06 UTC (rev 2715) +++ trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c 2013-04-07 12:00:29 UTC (rev 2716) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.3 with VMMaker 4.11.4 translated as C source on 25 March 2013 9:43:57 pm */ +/* Smalltalk from Squeak4.3 with VMMaker 4.11.5 translated as C source on 6 April 2013 10:59:46 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d from - HostWindowPlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + HostWindowPlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d */ -static char __buildInfo[] = "HostWindowPlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; +static char __buildInfo[] = "HostWindowPlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; @@ -66,9 +66,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "HostWindowPlugin 25 March 2013 (i)" + "HostWindowPlugin 6 April 2013 (i)" #else - "HostWindowPlugin 25 March 2013 (e)" + "HostWindowPlugin 6 April 2013 (e)" #endif ; Modified: trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c =================================================================== --- trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2013-04-04 19:59:06 UTC (rev 2715) +++ trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2013-04-07 12:00:29 UTC (rev 2716) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.3 with VMMaker 4.11.4 translated as C source on 25 March 2013 9:43:51 pm */ +/* Smalltalk from Squeak4.3 with VMMaker 4.11.5 translated as C source on 6 April 2013 10:59:40 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d from - JPEGReadWriter2Plugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + JPEGReadWriter2Plugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d */ -static char __buildInfo[] = "JPEGReadWriter2Plugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; +static char __buildInfo[] = "JPEGReadWriter2Plugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; @@ -68,9 +68,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JPEGReadWriter2Plugin 25 March 2013 (i)" + "JPEGReadWriter2Plugin 6 April 2013 (i)" #else - "JPEGReadWriter2Plugin 25 March 2013 (e)" + "JPEGReadWriter2Plugin 6 April 2013 (e)" #endif ; Modified: trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c =================================================================== --- trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2013-04-04 19:59:06 UTC (rev 2715) +++ trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2013-04-07 12:00:29 UTC (rev 2716) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.3 with VMMaker 4.11.4 translated as C source on 25 March 2013 9:43:51 pm */ +/* Smalltalk from Squeak4.3 with VMMaker 4.11.5 translated as C source on 6 April 2013 10:59:40 am */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + VMPluginCodeGenerator * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d from - JPEGReaderPlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + JPEGReaderPlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d */ -static char __buildInfo[] = "JPEGReaderPlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; +static char __buildInfo[] = "JPEGReaderPlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; @@ -136,9 +136,9 @@ static sqInt jsReadLimit; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JPEGReaderPlugin 25 March 2013 (i)" + "JPEGReaderPlugin 6 April 2013 (i)" #else - "JPEGReaderPlugin 25 March 2013 (e)" + "JPEGReaderPlugin 6 April 2013 (e)" #endif ; static int *residuals; Modified: trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c =================================================================== --- trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c 2013-04-04 19:59:06 UTC (rev 2715) +++ trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c 2013-04-07 12:00:29 UTC (rev 2716) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.3 with VMMaker 4.11.4 translated as C source on 25 March 2013 9:43:51 pm */ +/* Smalltalk from Squeak4.3 with VMMaker 4.11.5 translated as C source on 6 April 2013 10:59:40 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d from - JoystickTabletPlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + JoystickTabletPlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d */ -static char __buildInfo[] = "JoystickTabletPlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; +static char __buildInfo[] = "JoystickTabletPlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; @@ -62,9 +62,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JoystickTabletPlugin 25 March 2013 (i)" + "JoystickTabletPlugin 6 April 2013 (i)" #else - "JoystickTabletPlugin 25 March 2013 (e)" + "JoystickTabletPlugin 6 April 2013 (e)" #endif ; Modified: trunk/src/plugins/Klatt/Klatt.c =================================================================== --- trunk/src/plugins/Klatt/Klatt.c 2013-04-04 19:59:06 UTC (rev 2715) +++ trunk/src/plugins/Klatt/Klatt.c 2013-04-07 12:00:29 UTC (rev 2716) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.3 with VMMaker 4.11.4 translated as C source on 25 March 2013 9:43:52 pm */ +/* Smalltalk from Squeak4.3 with VMMaker 4.11.5 translated as C source on 6 April 2013 10:59:40 am */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + VMPluginCodeGenerator * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d from - KlattSynthesizerPlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + KlattSynthesizerPlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d */ -static char __buildInfo[] = "KlattSynthesizerPlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; +static char __buildInfo[] = "KlattSynthesizerPlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; @@ -155,9 +155,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "Klatt 25 March 2013 (i)" + "Klatt 6 April 2013 (i)" #else - "Klatt 25 March 2013 (e)" + "Klatt 6 April 2013 (e)" #endif ; static float nlast; Modified: trunk/src/plugins/LargeIntegers/LargeIntegers.c =================================================================== --- trunk/src/plugins/LargeIntegers/LargeIntegers.c 2013-04-04 19:59:06 UTC (rev 2715) +++ trunk/src/plugins/LargeIntegers/LargeIntegers.c 2013-04-07 12:00:29 UTC (rev 2716) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.3 with VMMaker 4.11.4 translated as C source on 25 March 2013 9:43:52 pm */ +/* Smalltalk from Squeak4.3 with VMMaker 4.11.5 translated as C source on 6 April 2013 10:59:41 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d from - LargeIntegersPlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + LargeIntegersPlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d */ -static char __buildInfo[] = "LargeIntegersPlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; +static char __buildInfo[] = "LargeIntegersPlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; @@ -437,9 +437,10 @@ static sqInt cCopyIntValtoBytes(sqInt val, sqInt bytes) { unsigned char * pByte; sqInt ix; + sqInt ixLimiT; pByte = interpreterProxy->firstIndexableField(bytes); - for (ix = 1; ix <= (cDigitLengthOfCSI(val)); ix += 1) { + for (ix = 1, ixLimiT = (cDigitLengthOfCSI(val)); ix <= ixLimiT; ix += 1) { pByte[ix - 1] = (cDigitOfCSIat(val, ix)); } } Modified: trunk/src/plugins/LocalePlugin/LocalePlugin.c =================================================================== --- trunk/src/plugins/LocalePlugin/LocalePlugin.c 2013-04-04 19:59:06 UTC (rev 2715) +++ trunk/src/plugins/LocalePlugin/LocalePlugin.c 2013-04-07 12:00:29 UTC (rev 2716) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.3 with VMMaker 4.11.4 translated as C source on 25 March 2013 9:43:52 pm */ +/* Smalltalk from Squeak4.3 with VMMaker 4.11.5 translated as C source on 6 April 2013 10:59:41 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d from - LocalePlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + LocalePlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d */ -static char __buildInfo[] = "LocalePlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; +static char __buildInfo[] = "LocalePlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; @@ -71,9 +71,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "LocalePlugin 25 March 2013 (i)" + "LocalePlugin 6 April 2013 (i)" #else - "LocalePlugin 25 March 2013 (e)" + "LocalePlugin 6 April 2013 (e)" #endif ; Modified: trunk/src/plugins/MIDIPlugin/MIDIPlugin.c =================================================================== --- trunk/src/plugins/MIDIPlugin/MIDIPlugin.c 2013-04-04 19:59:06 UTC (rev 2715) +++ trunk/src/plugins/MIDIPlugin/MIDIPlugin.c 2013-04-07 12:00:29 UTC (rev 2716) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.3 with VMMaker 4.11.4 translated as C source on 25 March 2013 9:43:59 pm */ +/* Smalltalk from Squeak4.3 with VMMaker 4.11.5 translated as C source on 6 April 2013 10:59:48 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d from - MIDIPlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + MIDIPlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d */ -static char __buildInfo[] = "MIDIPlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; +static char __buildInfo[] = "MIDIPlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; @@ -70,9 +70,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "MIDIPlugin 25 March 2013 (i)" + "MIDIPlugin 6 April 2013 (i)" #else - "MIDIPlugin 25 March 2013 (e)" + "MIDIPlugin 6 April 2013 (e)" #endif ; Modified: trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c =================================================================== --- trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2013-04-04 19:59:06 UTC (rev 2715) +++ trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2013-04-07 12:00:29 UTC (rev 2716) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.3 with VMMaker 4.11.4 translated as C source on 25 March 2013 9:43:53 pm */ +/* Smalltalk from Squeak4.3 with VMMaker 4.11.5 translated as C source on 6 April 2013 10:59:41 am */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + VMPluginCodeGenerator * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d from - Matrix2x3Plugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + Matrix2x3Plugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d */ -static char __buildInfo[] = "Matrix2x3Plugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; +static char __buildInfo[] = "Matrix2x3Plugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; @@ -74,9 +74,9 @@ static double m23ResultY; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "Matrix2x3Plugin 25 March 2013 (i)" + "Matrix2x3Plugin 6 April 2013 (i)" #else - "Matrix2x3Plugin 25 March 2013 (e)" + "Matrix2x3Plugin 6 April 2013 (e)" #endif ; Modified: trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c =================================================================== --- trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2013-04-04 19:59:06 UTC (rev 2715) +++ trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2013-04-07 12:00:29 UTC (rev 2716) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.3 with VMMaker 4.11.4 translated as C source on 25 March 2013 9:43:53 pm */ +/* Smalltalk from Squeak4.3 with VMMaker 4.11.5 translated as C source on 6 April 2013 10:59:41 am */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + VMPluginCodeGenerator * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d from - MiscPrimitivePlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + MiscPrimitivePlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d */ -static char __buildInfo[] = "MiscPrimitivePlugin VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; +static char __buildInfo[] = "MiscPrimitivePlugin * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d " __DATE__ ; @@ -70,9 +70,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "MiscPrimitivePlugin 25 March 2013 (i)" + "MiscPrimitivePlugin 6 April 2013 (i)" #else - "MiscPrimitivePlugin 25 March 2013 (e)" + "MiscPrimitivePlugin 6 April 2013 (e)" #endif ; @@ -112,15 +112,15 @@ /* Return 1, 2 or 3, if string1 is <, =, or > string2, with the collating order of characters given by the order array. */ EXPORT(sqInt) primitiveCompareString(void) { - sqInt rcvr; - unsigned char *string1; - unsigned char *string2; - unsigned char *order; sqInt c1; sqInt c2; sqInt i; sqInt len1; sqInt len2; + sqInt rcvr; + unsigned char *string1; + unsigned char *string2; + unsigned char *order; rcvr = stackValue(3); if (!(isBytes(stackValue(2)))) { @@ -211,9 +211,6 @@ 255 next 4 bytes */ EXPORT(sqInt) primitiveCompressToByteArray(void) { - sqInt rcvr; - int *bm; - unsigned char *ba; sqInt eqBytes; sqInt i; sqInt j; @@ -229,6 +226,9 @@ sqInt j5; sqInt j6; sqInt j7; + sqInt rcvr; + int *bm; + unsigned char *ba; rcvr = stackValue(2); bm = arrayValueOf(stackValue(1)); @@ -408,12 +408,12 @@ /* Copy the contents of the given array of signed 8-bit samples into the given array of 16-bit signed samples. */ EXPORT(sqInt) primitiveConvert8BitSigned(void) { + sqInt i; + sqInt n; + sqInt s; sqInt rcvr; unsigned char *aByteArray; unsigned short *aSoundBuffer; - sqInt i; - sqInt n; - sqInt s; rcvr = stackValue(2); if (!(isBytes(stackValue(1)))) { @@ -458,10 +458,6 @@ /* NOTE: If fed with garbage, this routine could read past the end of ba, but it should fail before writing past the ned of bm. */ EXPORT(sqInt) primitiveDecompressFromByteArray(void) { - sqInt rcvr; - int *bm; - unsigned char *ba; - sqInt index; sqInt anInt; sqInt code; sqInt data; @@ -472,6 +468,10 @@ sqInt m; sqInt n; sqInt pastEnd; + sqInt rcvr; + int *bm; + unsigned char *ba; + sqInt index; rcvr = stackValue(3); bm = arrayValueOf(stackValue(2)); @@ -574,12 +574,12 @@ } EXPORT(sqInt) primitiveFindFirstInString(void) { + sqInt i; + sqInt stringSize; sqInt rcvr; unsigned char *aString; char *inclusionMap; sqInt start; - sqInt i; - sqInt stringSize; rcvr = stackValue(3); if (!(isBytes(stackValue(2)))) { @@ -631,13 +631,14 @@ The algorithm below is not optimum -- it is intended to be translated to C which will go so fast that it wont matter. */ EXPORT(sqInt) primitiveFindSubstring(void) { + sqInt index; + sqInt startIndex; + sqInt startIndexLimiT; sqInt rcvr; unsigned char *key; unsigned char *body; sqInt start; unsigned char *matchTable; - sqInt index; - sqInt startIndex; rcvr = stackValue(4); if (!(isBytes(stackValue(3)))) { @@ -667,7 +668,7 @@ pushInteger(0); return null; } - for (startIndex = start; startIndex <= (((sizeOfSTArrayFromCPrimitive(body + 1)) - (sizeOfSTArrayFromCPrimitive(key + 1))) + 1); startIndex += 1) { + for (startIndex = start, startIndexLimiT = (((sizeOfSTArrayFromCPrimitive(body + 1)) - (sizeOfSTArrayFromCPrimitive(key + 1))) + 1); startIndex <= startIndexLimiT; startIndex += 1) { index = 1; while ((matchTable[(asciiValue(body[(startIndex + index) - 1])) + 1]) == (matchTable[(asciiValue(key[index])) + 1])) { if (index == (sizeOfSTArrayFromCPrimitive(key + 1))) { @@ -690,12 +691,12 @@ } EXPORT(sqInt) primitiveIndexOfAsciiInString(void) { + sqInt pos; + sqInt stringSize; sqInt rcvr; sqInt anInteger; unsigned char *aString; sqInt start; - sqInt pos; - sqInt stringSize; rcvr = stackValue(3); anInteger = stackIntegerValue(2); @@ -736,13 +737,13 @@ suitable point in the future */ EXPORT(sqInt) primitiveStringHash(void) { - sqInt rcvr; - unsigned char *aByteArray; - sqInt speciesHash; sqInt byteArraySize; sqInt hash; sqInt low; sqInt pos; + sqInt rcvr; + unsigned char *aByteArray; + sqInt speciesHash; rcvr = stackValue(2); if (!(isBytes(stackValue(1)))) { @@ -776,12 +777,12 @@ /* translate the characters in the string by the given table, in place */ EXPORT(sqInt) primitiveTranslateStringWithTable(void) { + sqInt i; sqInt rcvr; unsigned char *aString; sqInt start; sqInt stop; unsigned char *table; - sqInt i; rcvr = stackValue(4); if (!(isBytes(stackValue(3)))) { Modified: trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c =================================================================== --- trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c 2013-04-04 19:59:06 UTC (rev 2715) +++ trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c 2013-04-07 12:00:29 UTC (rev 2716) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.3 with VMMaker 4.11.4 translated as C source on 25 March 2013 9:43:59 pm */ +/* Smalltalk from Squeak4.3 with VMMaker 4.11.5 translated as C source on 6 April 2013 10:59:48 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.314 uuid: 27bc9a3b-01be-47b3-8e3a-b5f5554a389d from @@ Diff output truncated at 50000 characters. @@

1 0

Cog stack VM on ARM?
by Casey Ransberger 07 Apr '13

07 Apr '13

I'm running on a Rasp Pi-B. The interpreter VM currently leaves some stuff to be desired on this device. I know that Tim has been working to improve BitBlt's perf in the interpreter. I'm interested in seeing if I can milk a bit of rocket sauce from the stack orientation and generation scavenging GC while he's doing that. A few questions: - Does the stack VM depend on anything that isn't ARM-happy right now? - Does the Linux limitation around multiple thread prioritization apply to the stack VM? - Where should I get sources for a current stack VM? Sorry if I've asked these questions before! I can be a bit of a scatterbrain sometimes, and I burn way too many cycles on "is this what I should be doing right now?" Sometimes I have to trace the circle a few times to figure out where I am in it. Thanks in advance for any advice that's offered. -- Casey Ransberger

3 2

VM Maker: VMMaker-dtl.315.mcz
by commits＠source.squeak.org 06 Apr '13

06 Apr '13

David T. Lewis uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-dtl.315.mcz ==================== Summary ==================== Name: VMMaker-dtl.315 Author: dtl Time: 6 April 2013, 11:11:30.122 am UUID: 3fbadee2-b872-46a1-9b50-b95d04f7a9a0 Ancestors: VMMaker-dtl.314 VMMaker 4.11.5 Remove PixelValuePeekPlugin from defaultUnixSpec. New SlangTest tests for loop limit code generation. >From VMMaker.oscog-eem.279 and VMMaker.oscog-eem.282: Fix translation of to:by:do: loops so that the limit is not re-evaluated on each iteration if it may have side-effects. As part of this change make TMethod locals a Set, and sort only when emitting locals. Alas this causes a number of methods to change. Fix SmartSyntaxPlugin support method affected by the fixes for generating to:by:do: loops in VMMaker.oscog-eem.279. =============== Diff against VMMaker-dtl.314 =============== Item was changed: ----- Method: CCodeGenerator>>generateToByDo:on:indent: (in category 'C translation') ----- generateToByDo: msgNode on: aStream indent: level "Generate the C code for this message onto the given stream." + "N.B. MessageNode>>asTranslatorNodeIn: adds the limit var as a hidden fourth argument." + | blockExpr iterationVar limitExpr mayHaveSideEffects limitVar step negative | + blockExpr := msgNode args third. + blockExpr args size = 1 ifFalse: + [self error: 'wrong number of block arguments']. + iterationVar := blockExpr args first. + limitExpr := msgNode args first. - - | iterationVar step negative | - (msgNode args last args size = 1) ifFalse: [ - self error: 'wrong number of block arguments'. - ]. - iterationVar := msgNode args last args first. aStream nextPutAll: 'for (', iterationVar, ' = '. self emitCExpression: msgNode receiver on: aStream. + mayHaveSideEffects := msgNode args size = 4. "See TMethod>>prepareMethodIn:" + mayHaveSideEffects ifTrue: + [limitVar := msgNode args last. + aStream nextPutAll: ', ', limitVar name, ' = '. + self emitCExpression: limitExpr on: aStream. + limitExpr := limitVar]. aStream nextPutAll: '; ', iterationVar. negative := ((step := msgNode args at: 2) isConstant and: [step value < 0]) or: [step isSend and: [step selector == #negated and: [step receiver isConstant and: [step receiver value >= 0]]]]. aStream nextPutAll: (negative ifTrue: [' >= '] ifFalse: [' <= ']). + self emitCExpression: limitExpr on: aStream. - self emitCExpression: msgNode args first on: aStream. aStream nextPutAll: '; ', iterationVar, ' += '. self emitCExpression: step on: aStream. aStream nextPutAll: ') {'; cr. + blockExpr emitCCodeOn: aStream level: level + 1 generator: self. + aStream tab: level. + aStream nextPut: $}! - msgNode args last emitCCodeOn: aStream level: level + 1 generator: self. - level timesRepeat: [ aStream tab ]. - aStream nextPutAll: '}'.! Item was changed: ----- Method: MessageNode>>asTranslatorNodeIn: (in category '*VMMaker-C translation') ----- asTranslatorNodeIn: aTMethod "make a CCodeGenerator equivalent of me" "selector is sometimes a Symbol, sometimes a SelectorNode!! On top of this, numArgs is needed due to the (truly grody) use of arguments as a place to store the extra expressions needed to generate code for in-line to:by:do:, etc. see below, where it is used." + | rcvrOrNil sel args | + rcvrOrNil := receiver ifNotNil: [receiver asTranslatorNodeIn: aTMethod]. + (rcvrOrNil notNil + and: [rcvrOrNil isVariable + and: [rcvrOrNil name = 'super']]) ifTrue: + [^aTMethod superExpansionNodeFor: selector key args: arguments]. + sel := selector isSymbol ifTrue: [selector] ifFalse: [selector key]. + ((sel = #cCode:inSmalltalk: "extracting here rather than in translation allows inlining in the block." + or: [sel = #cCode:]) + and: [arguments first isBlockNode]) ifTrue: + [| block | + ^(block := arguments first asTranslatorNodeIn: aTMethod) statements size = 1 + ifTrue: [block statements first] + ifFalse: [block]]. - | sel args | - sel := (selector isSymbol) ifTrue: [selector] ifFalse: [selector key]. args := (1 to: sel numArgs) collect: [:i | (arguments at: i) asTranslatorNodeIn: aTMethod]. + (sel = #to:by:do: and: [arguments size = 7 and: [(arguments at: 7) notNil]]) ifTrue: + ["Restore limit expr that got moved by transformToDo:" + args := {(arguments at: 7) value asTranslatorNodeIn: aTMethod. + args second. + args third. "add the limit var as a hidden extra argument; we may need it later" + TVariableNode new setName: arguments first key}]. + ((sel = #ifFalse: or: [sel = #or:]) + and: [arguments size = 2 and: [(arguments at: 2) notNil]]) ifTrue: + ["Restore argument block that got moved by transformOr: or transformIfFalse:" + args at: 1 put: ((arguments at: 2) asTranslatorNodeIn: aTMethod)]. + ^TSendNode new - (sel = #to:by:do: and: [arguments size = 7 and: [(arguments at: 7) notNil]]) - ifTrue: ["Restore limit expr that got moved by transformToDo:" - args at: 1 put: ((arguments at: 7) value asTranslatorNodeIn: aTMethod)]. - (sel = #or: and: [arguments size = 2 and: [(arguments at: 2) notNil]]) - ifTrue: ["Restore argument block that got moved by transformOr:" - args at: 1 put: ((arguments at: 2) asTranslatorNodeIn: aTMethod)]. - (sel = #ifFalse: and: [arguments size = 2 and: [(arguments at: 2) notNil]]) - ifTrue: ["Restore argument block that got moved by transformIfFalse:" - args at: 1 put: ((arguments at: 2) asTranslatorNodeIn: aTMethod)]. - ^ TSendNode new setSelector: sel + receiver: rcvrOrNil - receiver: (receiver ~~ nil ifTrue: [receiver asTranslatorNodeIn: aTMethod]) arguments: args! Item was added: + ----- Method: SlangTest>>testCallMethodEmbeddedWithSendInLoopLimit (in category 'testing loop limits') ----- + testCallMethodEmbeddedWithSendInLoopLimit + "A loop embedded in a loop with two loop limit variables generated" + + "(SlangTest selector: #testCallMethodEmbeddedWithSendInLoopLimit) debug" + + | m1 sts lines | + sts := SlangTestSupportInterpreter inline: true. + m1 := (sts asCString: #callMethodEmbeddedWithSendInLoopLimit) + copyReplaceAll: 'callMethodEmbeddedWithSendInLoopLimit' + with: 'methodName'. + lines := m1 findTokens: String cr. + self should: (lines select: [:e | '*sqInt *LimiT*' match: e]) size = 2. + self should: (lines select: [:e | 'sqInt iLimiT;' = e withBlanksTrimmed]) size = 1. + self should: (lines select: [:e | 'sqInt kLimiT;' = e withBlanksTrimmed]) size = 1. + + sts := SlangTestSupportPlugin inline: true. + m1 := (sts asCString: #callMethodEmbeddedWithSendInLoopLimit) + copyReplaceAll: 'callMethodEmbeddedWithSendInLoopLimit' + with: 'methodName'. + lines := m1 findTokens: String cr. + self should: (lines select: [:e | '*sqInt *LimiT*' match: e]) size = 2. + self should: (lines select: [:e | 'sqInt iLimiT;' = e withBlanksTrimmed]) size = 1. + self should: (lines select: [:e | 'sqInt kLimiT;' = e withBlanksTrimmed]) size = 1. + + sts := SlangTestSupportSSIP inline: true. + m1 := (sts asCString: #callMethodEmbeddedWithSendInLoopLimit) + copyReplaceAll: 'callMethodEmbeddedWithSendInLoopLimit' + with: 'methodName'. + lines := m1 findTokens: String cr. + self should: (lines select: [:e | '*sqInt *LimiT*' match: e]) size = 2. + self should: (lines select: [:e | 'sqInt iLimiT;' = e withBlanksTrimmed]) size = 1. + self should: (lines select: [:e | 'sqInt kLimiT;' = e withBlanksTrimmed]) size = 1.! Item was added: + ----- Method: SlangTest>>testCallMethodTwiceWithLoopLimitThatMightBeModified (in category 'testing loop limits') ----- + testCallMethodTwiceWithLoopLimitThatMightBeModified + "Two calls to a method with loop that might be modified generates a distinct + loop limit variable for each." + + "(SlangTest selector: #testCallMethodTwiceWithLoopLimitThatMightBeModified) debug" + + | m1 sts lines | + sts := SlangTestSupportInterpreter inline: true. + m1 := (sts asCString: #callMethodTwiceWithLoopLimitThatMightBeModified) + copyReplaceAll: 'callMethodTwiceWithLoopLimitThatMightBeModified' + with: 'methodName'. + lines := m1 findTokens: String cr. + self should: (lines select: [:e | '*sqInt *LimiT*' match: e]) size = 2. + self should: (lines select: [:e | 'sqInt iLimiT;' = e withBlanksTrimmed]) size = 1. + self should: (lines select: [:e | 'sqInt iLimiT1;' = e withBlanksTrimmed]) size = 1. + + sts := SlangTestSupportSSIP inline: true. + m1 := (sts asCString: #callMethodTwiceWithLoopLimitThatMightBeModified) + copyReplaceAll: 'callMethodTwiceWithLoopLimitThatMightBeModified' + with: 'methodName'. + lines := m1 findTokens: String cr. + self should: (lines select: [:e | '*sqInt *LimiT*' match: e]) size = 2. + self should: (lines select: [:e | 'sqInt iLimiT;' = e withBlanksTrimmed]) size = 1. + self should: (lines select: [:e | 'sqInt iLimiT1;' = e withBlanksTrimmed]) size = 1. + ! Item was added: + ----- Method: SlangTest>>testCallMethodTwiceWithSendInLoopLimit (in category 'testing loop limits') ----- + testCallMethodTwiceWithSendInLoopLimit + "Two calls to a method with loop with loop limit that is a method send can + share the same loop limit variable." + + "(SlangTest selector: #testCallMethodTwiceWithSendInLoopLimit) debug" + + | m1 sts lines | + sts := SlangTestSupportInterpreter inline: true. + m1 := (sts asCString: #callMethodTwiceWithSendInLoopLimit) + copyReplaceAll: 'callMethodTwiceWithSendInLoopLimit' + with: 'methodName'. + lines := m1 findTokens: String cr. + self should: (lines select: [:e | '*sqInt *LimiT*' match: e]) size = 1. + self should: (lines select: [:e | 'sqInt iLimiT;' = e withBlanksTrimmed]) size = 1. + + sts := SlangTestSupportPlugin inline: true. + m1 := (sts asCString: #callMethodTwiceWithSendInLoopLimit) + copyReplaceAll: 'callMethodTwiceWithSendInLoopLimit' + with: 'methodName'. + lines := m1 findTokens: String cr. + self should: (lines select: [:e | '*sqInt *LimiT*' match: e]) size = 1. + self should: (lines select: [:e | 'sqInt iLimiT;' = e withBlanksTrimmed]) size = 1. + + sts := SlangTestSupportSSIP inline: true. + m1 := (sts asCString: #callMethodTwiceWithSendInLoopLimit) + copyReplaceAll: 'callMethodTwiceWithSendInLoopLimit' + with: 'methodName'. + lines := m1 findTokens: String cr. + self should: (lines select: [:e | '*sqInt *LimiT*' match: e]) size = 1. + self should: (lines select: [:e | 'sqInt iLimiT;' = e withBlanksTrimmed]) size = 1. + ! Item was added: + ----- Method: SlangTest>>testCallMethodWithLoopLimitThatIsNotModified (in category 'testing loop limits') ----- + testCallMethodWithLoopLimitThatIsNotModified + "A call to a method with loop with a constant loop limit does not require a + loop limit variable." + + "(SlangTest selector: #testCallMethodTwiceWithSendInLoopLimit) debug" + + | m1 sts lines | + sts := SlangTestSupportInterpreter inline: true. + m1 := (sts asCString: #callMethodWithLoopLimitThatIsNotModified) + copyReplaceAll: 'callMethodWithLoopLimitThatIsNotModified' + with: 'methodName'. + lines := m1 findTokens: String cr. + self should: (lines select: [:e | '*sqInt *LimiT*' match: e]) size = 0. + self should: (lines select: [:e | 'for (i = 0; i <= 10; i += 1) {' = e withBlanksTrimmed]) size = 1. + + sts := SlangTestSupportPlugin inline: true. + m1 := (sts asCString: #callMethodWithLoopLimitThatIsNotModified) + copyReplaceAll: 'callMethodWithLoopLimitThatIsNotModified' + with: 'methodName'. + lines := m1 findTokens: String cr. + self should: (lines select: [:e | '*sqInt *LimiT*' match: e]) size = 0. + self should: (lines select: [:e | 'for (i = 0; i <= 10; i += 1) {' = e withBlanksTrimmed]) size = 1. + + sts := SlangTestSupportSSIP inline: true. + m1 := (sts asCString: #callMethodWithLoopLimitThatIsNotModified) + copyReplaceAll: 'callMethodWithLoopLimitThatIsNotModified' + with: 'methodName'. + lines := m1 findTokens: String cr. + self should: (lines select: [:e | '*sqInt *LimiT*' match: e]) size = 0. + self should: (lines select: [:e | 'for (i = 0; i <= 10; i += 1) {' = e withBlanksTrimmed]) size = 1. + ! Item was added: + ----- Method: SlangTest>>testCallMethodWithLoopLimitThatMightBeModified (in category 'testing loop limits') ----- + testCallMethodWithLoopLimitThatMightBeModified + "A call to a method with loop with a loop limit that might be modified by the loop + body requires a loop limit variable." + + "(SlangTest selector: #testCallMethodWithLoopLimitThatMightBeModified) debug" + + | m1 sts lines | + sts := SlangTestSupportInterpreter inline: true. + m1 := (sts asCString: #callMethodWithLoopLimitThatMightBeModified) + copyReplaceAll: 'callMethodWithLoopLimitThatMightBeModified' + with: 'methodName'. + lines := m1 findTokens: String cr. + self should: (lines select: [:e | '*sqInt *LimiT*' match: e]) size = 1. + self should: (lines select: [:e | 'sqInt iLimiT;' = e withBlanksTrimmed]) size = 1. + + sts := SlangTestSupportPlugin inline: true. + m1 := (sts asCString: #callMethodWithLoopLimitThatMightBeModified) + copyReplaceAll: 'callMethodWithLoopLimitThatMightBeModified' + with: 'methodName'. + lines := m1 findTokens: String cr. + self should: (lines select: [:e | '*sqInt *LimiT*' match: e]) size = 1. + self should: (lines select: [:e | 'sqInt iLimiT;' = e withBlanksTrimmed]) size = 1. + + sts := SlangTestSupportSSIP inline: true. + m1 := (sts asCString: #callMethodWithLoopLimitThatMightBeModified) + copyReplaceAll: 'callMethodWithLoopLimitThatMightBeModified' + with: 'methodName'. + lines := m1 findTokens: String cr. + self should: (lines select: [:e | '*sqInt *LimiT*' match: e]) size = 1. + self should: (lines select: [:e | 'sqInt iLimiT;' = e withBlanksTrimmed]) size = 1. + ! Item was added: + ----- Method: SlangTestSupportInterpreter>>callMethodEmbeddedWithSendInLoopLimit (in category 'loop limits') ----- + callMethodEmbeddedWithSendInLoopLimit + + <export: true> + 1 to: self methodWithIntegerResult do: [:i | + 1 to: self methodWithIntegerResult do: [:k | ]]. + ! Item was added: + ----- Method: SlangTestSupportInterpreter>>callMethodTwiceWithLoopLimitThatMightBeModified (in category 'loop limits') ----- + callMethodTwiceWithLoopLimitThatMightBeModified + + <export: true> + | aVar | + aVar := 'foo'. + self methodWithLoopLimitThatMightBeModified: aVar. + self methodWithLoopLimitThatMightBeModified: aVar. + ! Item was added: + ----- Method: SlangTestSupportInterpreter>>callMethodTwiceWithSendInLoopLimit (in category 'loop limits') ----- + callMethodTwiceWithSendInLoopLimit + + <export: true> + 1 to: self methodWithIntegerResult do: [:i | ]. + 1 to: self methodWithIntegerResult do: [:i | ]. + ! Item was added: + ----- Method: SlangTestSupportInterpreter>>callMethodWithLoopLimitThatIsNotModified (in category 'loop limits') ----- + callMethodWithLoopLimitThatIsNotModified + + <export: true> + | aVar | + aVar := 'foo'. + self methodWithLoopLimitThatIsNotModified: aVar. + ! Item was added: + ----- Method: SlangTestSupportInterpreter>>callMethodWithLoopLimitThatMightBeModified (in category 'loop limits') ----- + callMethodWithLoopLimitThatMightBeModified + + <export: true> + | aVar | + aVar := 'foo'. + self methodWithLoopLimitThatMightBeModified: aVar. + ! Item was added: + ----- Method: SlangTestSupportInterpreter>>methodWithIntegerResult (in category 'loop limits') ----- + methodWithIntegerResult + "Translates to nonsense, but use this to illustrate the point" + ^(Random new next * 100) asInteger! Item was added: + ----- Method: SlangTestSupportInterpreter>>methodWithLoopLimitThatIsNotModified: (in category 'loop limits') ----- + methodWithLoopLimitThatIsNotModified: arrayObj + + 0 to: 10 do: [:i | self storePointerUnchecked: i ofObject: arrayObj withValue: nilObj] + ! Item was added: + ----- Method: SlangTestSupportInterpreter>>methodWithLoopLimitThatMightBeModified: (in category 'loop limits') ----- + methodWithLoopLimitThatMightBeModified: arrayObj + + 0 to: (self lengthOf: arrayObj) do: + [:i | self storePointerUnchecked: i ofObject: arrayObj withValue: nilObj] + ! Item was added: + ----- Method: SlangTestSupportPlugin>>callMethodEmbeddedWithSendInLoopLimit (in category 'loop limits') ----- + callMethodEmbeddedWithSendInLoopLimit + + <export: true> + 1 to: self methodWithIntegerResult do: [:i | + 1 to: self methodWithIntegerResult do: [:k | ]]. + ! Item was added: + ----- Method: SlangTestSupportPlugin>>callMethodTwiceWithLoopLimitThatMightBeModified (in category 'loop limits') ----- + callMethodTwiceWithLoopLimitThatMightBeModified + + <export: true> + | aVar | + aVar := 'foo'. + self methodWithLoopLimitThatMightBeModified: aVar. + self methodWithLoopLimitThatMightBeModified: aVar. + ! Item was added: + ----- Method: SlangTestSupportPlugin>>callMethodTwiceWithSendInLoopLimit (in category 'loop limits') ----- + callMethodTwiceWithSendInLoopLimit + + <export: true> + 1 to: self methodWithIntegerResult do: [:i | ]. + 1 to: self methodWithIntegerResult do: [:i | ]. + ! Item was added: + ----- Method: SlangTestSupportPlugin>>callMethodWithLoopLimitThatIsNotModified (in category 'loop limits') ----- + callMethodWithLoopLimitThatIsNotModified + + <export: true> + | aVar | + aVar := 'foo'. + self methodWithLoopLimitThatIsNotModified: aVar. + ! Item was added: + ----- Method: SlangTestSupportPlugin>>callMethodWithLoopLimitThatMightBeModified (in category 'loop limits') ----- + callMethodWithLoopLimitThatMightBeModified + + <export: true> + | aVar | + aVar := 'foo'. + self methodWithLoopLimitThatMightBeModified: aVar. + ! Item was added: + ----- Method: SlangTestSupportPlugin>>methodWithIntegerResult (in category 'loop limits') ----- + methodWithIntegerResult + "Translates to nonsense, but use this to illustrate the point" + ^(Random new next * 100) asInteger! Item was added: + ----- Method: SlangTestSupportPlugin>>methodWithLoopLimitThatIsNotModified: (in category 'loop limits') ----- + methodWithLoopLimitThatIsNotModified: arrayObj + + 0 to: 10 do: [:i | self storePointerUnchecked: i ofObject: arrayObj withValue: nilObj] + ! Item was added: + ----- Method: SlangTestSupportPlugin>>methodWithLoopLimitThatMightBeModified: (in category 'loop limits') ----- + methodWithLoopLimitThatMightBeModified: arrayObj + + 0 to: (self lengthOf: arrayObj) do: + [:i | self storePointerUnchecked: i ofObject: arrayObj withValue: nil] + ! Item was added: + ----- Method: SlangTestSupportSSIP>>callMethodEmbeddedWithSendInLoopLimit (in category 'loop limits') ----- + callMethodEmbeddedWithSendInLoopLimit + + <export: true> + 1 to: self methodWithIntegerResult do: [:i | + 1 to: self methodWithIntegerResult do: [:k | ]]. + ! Item was added: + ----- Method: SlangTestSupportSSIP>>callMethodTwiceWithLoopLimitThatMightBeModified (in category 'loop limits') ----- + callMethodTwiceWithLoopLimitThatMightBeModified + + <export: true> + | aVar | + aVar := 'foo'. + self methodWithLoopLimitThatMightBeModified: aVar. + self methodWithLoopLimitThatMightBeModified: aVar. + ! Item was added: + ----- Method: SlangTestSupportSSIP>>callMethodTwiceWithSendInLoopLimit (in category 'loop limits') ----- + callMethodTwiceWithSendInLoopLimit + + <export: true> + 1 to: self methodWithIntegerResult do: [:i | ]. + 1 to: self methodWithIntegerResult do: [:i | ]. + ! Item was added: + ----- Method: SlangTestSupportSSIP>>callMethodWithLoopLimitThatIsNotModified (in category 'loop limits') ----- + callMethodWithLoopLimitThatIsNotModified + + <export: true> + | aVar | + aVar := 'foo'. + self methodWithLoopLimitThatIsNotModified: aVar. + ! Item was added: + ----- Method: SlangTestSupportSSIP>>callMethodWithLoopLimitThatMightBeModified (in category 'loop limits') ----- + callMethodWithLoopLimitThatMightBeModified + + <export: true> + | aVar | + aVar := 'foo'. + self methodWithLoopLimitThatMightBeModified: aVar. + ! Item was added: + ----- Method: SlangTestSupportSSIP>>methodWithIntegerResult (in category 'loop limits') ----- + methodWithIntegerResult + ^127 + 5! Item was added: + ----- Method: SlangTestSupportSSIP>>methodWithLoopLimitThatIsNotModified: (in category 'loop limits') ----- + methodWithLoopLimitThatIsNotModified: arrayObj + + 0 to: 10 do: [:i | self storePointerUnchecked: i ofObject: arrayObj withValue: nilObj] + ! Item was added: + ----- Method: SlangTestSupportSSIP>>methodWithLoopLimitThatMightBeModified: (in category 'loop limits') ----- + methodWithLoopLimitThatMightBeModified: arrayObj + + 0 to: (self lengthOf: arrayObj) do: + [:i | self storePointerUnchecked: i ofObject: arrayObj withValue: nil] + ! Item was changed: ----- Method: TMethod>>prepareMethodIn: (in category 'transformations') ----- prepareMethodIn: aCodeGen + "Record sends of builtin operators, map sends of the special selector dispatchOn:in: + with case statement nodes, and map sends of caseOf:[otherwise:] to switch statements. + Note: Only replaces top-level sends of dispatchOn:in: et al and caseOf:[otherwise:]. + These must be top-level statements; they cannot appear in expressions. + As a hack also update the types of variables introduced to implement cascades correctly. + This has to be done at teh same time as this is done, so why not piggy back here?" + | replacements |. + cascadeVariableNumber ifNotNil: + [declarations keysAndValuesDo: + [:varName :decl| + decl isBlock ifTrue: + [self assert: ((varName beginsWith: 'cascade') and: [varName last isDigit]). + locals add: varName. + self declarationAt: varName + put: (decl value: self value: aCodeGen), ' ', varName]]]. + replacements := IdentityDictionary new. + aCodeGen + pushScope: declarations + while: + [parseTree nodesDo: + [:node| + node isSend ifTrue: + [(aCodeGen builtin: node selector) + ifTrue: + [node isBuiltinOperator: true. + "If a to:by:do:'s limit has side-effects, declare the limit variable, otherwise delete it from the args" + (node selector = #to:by:do: + and: [node args size = 4]) ifTrue: + [| limitExpr | + limitExpr := node args first. + (limitExpr anySatisfy: + [:subNode| + subNode isSend + and: [(aCodeGen builtin: subNode selector) not + and: [(subNode isStructSend: aCodeGen) not]]]) + ifTrue: [ | limitVar | + limitVar := node args last name. + "n.b. Two loops in the same method may share the same variable + for loop limit, so add the variable declaration only if not already + declared by a previous loop. Assumes that the name of the loop + limit variable (e.g. 'iLimiT') is unlikely to have been used as an actual + instance variable elsewhere." + (locals includes: limitVar) ifFalse: [locals add: limitVar]] + ifFalse: + [node arguments: node args allButLast]]] + ifFalse: + [(CaseStatements includes: node selector) ifTrue: + [replacements at: node put: (self buildCaseStmt: node)]. + (#(caseOf: #caseOf:otherwise:) includes: node selector) ifTrue: + [replacements at: node put: (self buildSwitchStmt: node)]]]. + ((node isAssignment or: [node isReturn]) + and: [node expression isSwitch]) ifTrue: + [replacements at: node put: (self transformSwitchExpression: node)]]]. + replacements isEmpty ifFalse: + [parseTree := parseTree replaceNodesIn: replacements]! - "Record sends of builtin operators and replace sends of the special selector dispatchOn:in: with case statement nodes." - "Note: Only replaces top-level sends of dispatchOn:in:. Case statements must be top-level statements; they cannot appear in expressions." - - | stmts stmt | - parseTree nodesDo: [ :node | - node isSend ifTrue: [ - "record sends of builtin operators" - (aCodeGen builtin: node selector) ifTrue: [ node isBuiltinOperator: true ]. - ]. - node isStmtList ifTrue: [ - "replace dispatchOn:in: with case statement node" - stmts := node statements. - 1 to: stmts size do: [ :i | - stmt := stmts at: i. - (stmt isSend and: [CaseStatements includes: stmt selector]) ifTrue: [ - stmts at: i put: (self buildCaseStmt: stmt). - ]. - ]. - ]. - ].! Item was changed: ----- Method: TMethod>>preparePrimitivePrologue (in category 'primitive compilation') ----- preparePrimitivePrologue "Add a prolog and postlog to a primitive method. The prolog copies any instance variables referenced by this primitive method into local variables. The postlog copies values of assigned-to variables back into the instance. The names of the new locals are added to the local variables list. The declarations dictionary defines the types of any non-integer variables (locals, arguments, or instance variables). In particular, it may specify the types: int * -- an array of 32-bit values (e.g., a BitMap) short * -- an array of 16-bit values (e.g., a SoundBuffer) char * -- an array of unsigned bytes (e.g., a String) double -- a double precision floating point number (e.g., 3.14159) Undeclared variables are taken to be integers and will be converted from Smalltalk to C ints." "Current restrictions: o method must not contain message sends o method must not allocate objects o method must not manipulate raw oops o method cannot access class variables o method can only return an integer" | prolog postlog instVarsUsed varsAssignedTo instVarList primArgCount varName endsWithReturn aClass | + self assert: selector ~~ #setInterpreter:. - selector == #setInterpreter: ifTrue:[self halt]. aClass := definingClass. prolog := OrderedCollection new. postlog := OrderedCollection new. instVarsUsed := self freeVariableReferences asSet. varsAssignedTo := self variablesAssignedTo asSet. instVarList := aClass allInstVarNames. primArgCount := args size. "add receiver fetch and arg conversions to prolog" prolog addAll: self fetchRcvrExpr. 1 to: args size do: [:argIndex | varName := args at: argIndex. prolog addAll: (self argConversionExprFor: varName stackIndex: args size - argIndex)]. "add success check to postlog" postlog addAll: self checkSuccessExpr. "add instance variable fetches to prolog and instance variable stores to postlog" 1 to: instVarList size do: [:varIndex | varName := instVarList at: varIndex. (instVarsUsed includes: varName) ifTrue: [ locals add: varName. prolog addAll: (self instVarGetExprFor: varName offset: varIndex - 1). (varsAssignedTo includes: varName) ifTrue: [ postlog addAll: (self instVarPutExprFor: varName offset: varIndex - 1)]]]. prolog addAll: self checkSuccessExpr. + ((locals includes: 'rcvr') or: [(locals intersection: args) notEmpty]) ifTrue: + [self error: 'local name conflicts with instance variable name']. + locals add: 'rcvr'; addAll: args. - locals addAllFirst: args. - locals addFirst: 'rcvr'. args := args class new. - locals asSet size = locals size - ifFalse: [self error: 'local name conflicts with instance variable name']. endsWithReturn := self endsWithReturn. self fixUpReturns: primArgCount postlog: postlog. endsWithReturn ifTrue: [parseTree setStatements: prolog, parseTree statements] ifFalse: [ postlog addAll: (self popArgsExpr: primArgCount). parseTree setStatements: prolog, parseTree statements, postlog]. ! Item was added: + ----- Method: TParseNode>>anySatisfy: (in category 'enumerating') ----- + anySatisfy: aBlock + self nodesDo: [:n| (aBlock value: n) ifTrue: [^true]]. + ^false! Item was added: + ----- Method: TParseNode>>noneSatisfy: (in category 'enumerating') ----- + noneSatisfy: aBlock + self nodesDo: [:n| (aBlock value: n) ifTrue: [^false]]. + ^true! Item was added: + ----- Method: TSendNode>>arguments: (in category 'private') ----- + arguments: aSequence + arguments := aSequence! Item was changed: + ----- Method: TSendNode>>printOn:level: (in category 'printing') ----- - ----- Method: TSendNode>>printOn:level: (in category 'testing') ----- printOn: aStream level: level + | possiblyParenthesize | + possiblyParenthesize := + [:node :newLevel| + (node isSend + and: [node selector precedence >= 3]) ifTrue: + [aStream nextPut: $(]. + node printOn: aStream level: newLevel. + (node isSend + and: [node selector precedence >= 3]) ifTrue: + [aStream nextPut: $)]]. + possiblyParenthesize value: receiver value: level. + arguments size = 0 ifTrue: + [aStream space; nextPutAll: selector. + ^self]. + selector keywords with: (arguments first: selector numArgs) do: + [:keyword :arg | + aStream space; nextPutAll: keyword; space. + possiblyParenthesize value: arg value: level + 1]! - | keywords | - receiver printOn: aStream level: level. - arguments size = 0 ifTrue: [ - aStream space; nextPutAll: selector. - ^self - ]. - keywords := selector keywords. - 1 to: keywords size do: [ :i | - aStream space. - aStream nextPutAll: (keywords at: i); space. - (arguments at: i) printOn: aStream level: level + 1. - ].! Item was changed: ----- Method: VMMaker class>>versionString (in category 'version testing') ----- versionString "VMMaker versionString" + ^'4.11.5'! - ^'4.11.4'! Item was changed: ----- Method: VMMakerTool class>>defaultUnixSpec (in category 'configurations') ----- defaultUnixSpec "Typical VMMaker spec for a unix/linux target platform" "VMMakerTool defaultUnixSpec" ^#( #( "internal plugins" #ADPCMCodecPlugin #AsynchFilePlugin #BMPReadWriterPlugin #BalloonEnginePlugin #BitBltSimulation #CroquetPlugin #DSAPlugin #DeflatePlugin #DropPlugin #FFTPlugin #FT2Plugin #FilePlugin #FloatArrayPlugin #FloatMathPlugin #GeniePlugin #JPEGReadWriter2Plugin #JPEGReaderPlugin #JoystickTabletPlugin #KlattSynthesizerPlugin #LargeIntegersPlugin #LocalePlugin #MD5Plugin #Matrix2x3Plugin #MiscPrimitivePlugin #RandPlugin #RePlugin #SHA256Plugin #SecurityPlugin #SerialPlugin #SlangTestPlugin #SlangTestSupportPlugin #SocketPlugin #SoundCodecPlugin #SoundGenerationPlugin #SoundPlugin #StarSqueakPlugin #SurfacePlugin ) #( "external plugins" #B3DAcceleratorPlugin #B3DEnginePlugin #ClipboardExtendedPlugin #DBusPlugin #FFIPlugin #FileCopyPlugin #GStreamerPlugin #HostWindowPlugin #KedamaPlugin #KedamaPlugin2 #MIDIPlugin #Mpeg3Plugin #RomePlugin #UUIDPlugin #UnixAioPlugin #UnixOSProcessPlugin #XDisplayControlPlugin #CameraPlugin #ScratchPlugin #UnicodePlugin #WeDoPlugin #SqueakSSLPlugin - #PixelValuePeekPlugin ) true "inline flag" false "forBrowser flag" 'unix' "platform" 'src' "source directory for generated sources" 'platforms' "path to platform sources" 4 "unused, was bytesPerWord which is now a compile time definition" true "unused, was flag for source directtory pathname is relative" true "unused, was flag for platforms directory path is relative" 'Interpreter' "interpreter class name" )!

1 0

CCodeGeneration bug or gcc compiler bug?
by Nicolas Cellier 06 Apr '13

06 Apr '13

Let me think aloud... THE CONTEXT: backport of LargeIntegersPlugin v2.0 (32 bit native word order) to Interpreter VM THE BUG: The Vm crashes with http://smalltalkhub.com/#!/~nice/NiceVMExperiments/versions/VMMaker-nice.315 THE OFFENDING METHOD: InterpreterPrimitives>>magnitude64BitIntegerFor: magnitude neg: isNegative "Return a Large Integer object for the given integer magnitude and sign" | newLargeInteger largeClass lowWord highWord sz isSmall smallVal highWord2 | <var: 'magnitude' type: #usqLong> <var: 'lowWord' type: #usqInt> <var: 'highWord' type: #usqInt> <var: 'highWord2' type: #usqInt> isSmall := isNegative ifTrue: [magnitude <= 16r40000000] ifFalse: [magnitude < 16r40000000]. isSmall ifTrue: [smallVal := self cCoerceSimple: magnitude to: #sqInt. isNegative ifTrue: [smallVal := 0 - smallVal]. ^objectMemory integerObjectOf: smallVal]. largeClass := isNegative ifTrue:[self classLargeNegativeInteger] ifFalse:[self classLargePositiveInteger]. lowWord := magnitude bitAnd: 16rFFFFFFFF. highWord := magnitude >> 32. highWord = 0 ifTrue: [sz := 4] ifFalse: [sz := 5. (highWord2 := highWord >> 8) = 0 ifFalse: [sz := sz + 1]. (highWord2 := highWord2 >> 8) = 0 ifFalse: [sz := sz + 1]. (highWord2 := highWord2 >> 8) = 0 ifFalse: [sz := sz + 1].]. newLargeInteger := objectMemory instantiateClass: largeClass indexableSize: sz. objectMemory storeLong32: 0 ofObject: newLargeInteger withValue: lowWord. sz > 4 ifTrue: [objectMemory storeLong32: 1 ofObject: newLargeInteger withValue: highWord]. ^newLargeInteger THE CORRECTED METHOD: just replace the assignment isNegative ifTrue:[ largeClass := self classLargeNegativeInteger] ifFalse:[ largeClass := self classLargePositiveInteger]. THE OFFENDING GENERATED CODE: in src/vm/interp.c sqInt magnitude64BitIntegerForneg(usqLong magnitude, sqInt isNegative) { register struct foo * foo = &fum; usqInt highWord; usqInt highWord2; sqInt isSmall; sqInt largeClass; usqInt lowWord; sqInt newLargeInteger; sqInt smallVal; sqInt sz; sqInt oop; sqInt oop1; isSmall = (isNegative ? magnitude <= 1073741824 : magnitude < 1073741824); if (isSmall) { smallVal = ((sqInt) magnitude); if (isNegative) { smallVal = 0 - smallVal; } return ((smallVal << 1) | 1); } largeClass = (isNegative ? /* begin fetchPointer:ofObject: */(oop = foo->specialObjectsOop),longAt((oop + (BASE_HEADER_SIZE)) + (ClassLargeNegativeInteger << (SHIFT_FOR_WORD))) : /* begin fetchPointer:ofObject: */(oop1 = foo->specialObjectsOop),longAt((oop1 + (BASE_HEADER_SIZE)) + (ClassLargePositiveInteger << (SHIFT_FOR_WORD)))); lowWord = magnitude & 4294967295U; highWord = magnitude >> 32; if (highWord == 0) { sz = 4; } else { sz = 5; if (!(((highWord2 = ((usqInt) highWord) >> 8)) == 0)) { sz += 1; } if (!(((highWord2 = ((usqInt) highWord2) >> 8)) == 0)) { sz += 1; } if (!(((highWord2 = ((usqInt) highWord2) >> 8)) == 0)) { sz += 1; } } newLargeInteger = instantiateClassindexableSize(largeClass, sz); long32Atput((newLargeInteger + (BASE_HEADER_SIZE)) + (0 << 2), lowWord); if (sz > 4) { long32Atput((newLargeInteger + (BASE_HEADER_SIZE)) + (1 << 2), highWord); } return newLargeInteger; } THE CORRECTED GENERATED CODE: Just change the ()?: assignment: largeClass = (isNegative ? /* begin fetchPointer:ofObject: */(oop = foo->specialObjectsOop),longAt((oop + (BASE_HEADER_SIZE)) + (ClassLargeNegativeInteger << (SHIFT_FOR_WORD))) : /* begin fetchPointer:ofObject: */(oop1 = foo->specialObjectsOop),longAt((oop1 + (BASE_HEADER_SIZE)) + (ClassLargePositiveInteger << (SHIFT_FOR_WORD)))); with an explicit if: if (isNegative) { /* begin fetchPointer:ofObject: */ oop = foo->specialObjectsOop; largeClass = longAt((oop + (BASE_HEADER_SIZE)) + (ClassLargeNegativeInteger << (SHIFT_FOR_WORD))); } else { /* begin fetchPointer:ofObject: */ oop1 = foo->specialObjectsOop; largeClass = longAt((oop1 + (BASE_HEADER_SIZE)) + (ClassLargePositiveInteger << (SHIFT_FOR_WORD))); } THE OFFENDING METHOD JUST WORKS IN COG BUT GENERATED CODE IS DIFFERENT: largeClass = (isNegative ? longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassLargeNegativeInteger << ShiftForWord)) : longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassLargePositiveInteger << ShiftForWord))); THE QUESTION: I just don't understand what is incorrect in the (t)?a,b:c,d; construct... Could it be that it is interpreted: ((t)?a,b:c),d; Ah if so, maybe that would explain the warning about oop1 being potentially used before assigned! (a bulb just enlighten) In this case we have a bug in the generator (probably a known one since we rearely ever use x := test ifTrue: [] ifFalse: [] in Slang)... Nicolas

3 5

Squeakvm.org full?
by tim Rowledge 06 Apr '13

06 Apr '13

I just tried to checkout a copy of the Cog platforms tree and got an SVN E020014 error - "Can't find a temporary directory" which according to Lt.Cdr.Google means "server fucked, out of space". Given that Ian pointed out that squeakvm.org was nearly full a month or so ago I guess that seems plausible. Looks like something has Got To Go. Maybe some old pre-built sources can be compressed & archived? How do you save space on an SVN server? Does it need to be moved to a machine with more room? tim -- tim Rowledge; tim(a)rowledge.org; http://www.rowledge.org/tim Adding manpower to a late software project makes it … hang on a mo', just got to go and sort out these new people over here…..

2 1

Cogmt
by Frank Shearar 05 Apr '13

05 Apr '13

So we have builds running all in-image tests, and the test suites of a bunch of packages, and running these on the latest stable Interpreter VM, and the latest Cog VM. We _don't_ yet run tests on the cogmt VM, mainly because I'm lazy and I don't know anything about cogmt beyond supposing that "mt" means "multithreaded". Should we? Is there a place where I can read up on cogmt? frank

2 1

[commit][2715] Fix installer after changes to resources that add accurate version info to the
by commits＠squeakvm.org 04 Apr '13

04 Apr '13

Revision: 2715 Author: eliot Date: 2013-04-04 12:59:06 -0700 (Thu, 04 Apr 2013) Log Message: ----------- Fix installer after changes to resources that add accurate version info to the Windows exes. Modified Paths: -------------- branches/Cog/nscogbuild/cygwinbuild/installer/Makefile Added Paths: ----------- branches/Cog/nscogbuild/cygwinbuild/installer/nsvm.rc Modified: branches/Cog/nscogbuild/cygwinbuild/installer/Makefile =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/Makefile 2013-04-04 18:39:55 UTC (rev 2714) +++ branches/Cog/nscogbuild/cygwinbuild/installer/Makefile 2013-04-04 19:59:06 UTC (rev 2715) @@ -29,7 +29,7 @@ SED := /usr/bin/sed WINDRES := /usr/bin/windres -icon.o: ../$(VM_BASE_NAME).rc +icon.o: $(VM_BASE_NAME).rc $(WINDRES) --include-dir=.. --define _WIN32 -l 0 -i $< -o $@ $(VM_EXECUTABLE): ../build/vm/$(VM_EXECUTABLE) Added: branches/Cog/nscogbuild/cygwinbuild/installer/nsvm.rc =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/nsvm.rc (rev 0) +++ branches/Cog/nscogbuild/cygwinbuild/installer/nsvm.rc 2013-04-04 19:59:06 UTC (rev 2715) @@ -0,0 +1,5 @@ +#ifdef _WIN32 +1 ICON DISCARDABLE "nsvm.ico" +2 ICON DISCARDABLE "nsvm.ico" +3 ICON DISCARDABLE "nsvm.ico" +#endif

1 0

[commit][2714] Oops! Remember to update the SCCS version.
by commits＠squeakvm.org 04 Apr '13

04 Apr '13

Revision: 2714 Author: eliot Date: 2013-04-04 11:39:55 -0700 (Thu, 04 Apr 2013) Log Message: ----------- Oops! Remember to update the SCCS version. Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Tue Mar 19 09:36:08 PDT 2013 + Thu Apr 4 11:39:26 PDT 2013

1 0

[commit][2713] CogVM source as per VMMaker.oscog-eem.282.
by commits＠squeakvm.org 04 Apr '13

04 Apr '13

Revision: 2713 Author: eliot Date: 2013-04-04 11:39:10 -0700 (Thu, 04 Apr 2013) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.282. Change application name from Croquet to Squeak and change to green Cog Squeak icons. Add the SSLPlugin on mac and linux (won't link on old mingw; need to update). Cogit: Fix *HORRIBLE* yet ancient bug with the CogObjectRep. Both CogObjectRepresentationForSqueakV3>>couldBeObject: & CogObjectRepresentationForSqueakV3>>shouldAnnotateObjectReference: used signed comparisons for oops and so once the heap size pushes oops into the upper half of the address space constant oops in machine code were no longer being updated by the GC. StackInterpreter: rewrite the login for printing methods so that printing the frame of a bad receiver won't seg fault. Add primitivePathToUsing which mimics the PointerFinder and can hence be used to debug or verify it. Remove unnecessary forceInterruptCheck in NewObjectMemory>>become:with:twoWay:copyHash:. (heartbeat does this for us). Fix bug in assert in NewCoObjectMemory>>restoreHeaderOf:to:. Slang: Fix translation of to:by:do: loops so that the limit is not re-evaluated on each iteration if it may have side-effects. Include the correct AioPlugin (UnixAioPlugin) Include SqueakSSLPlugin in the configurations. Cogit: Stop reporting EncounteredUnknownBytecode with an error message. Fix slip in ceSICMiss: that didn't link new PIC if an MNU case. Add pixel peeker prims to BitBltPlugin. Minor signature changes to BitBltPlugin & HostWindowPlugin from SmartSyntaxPluginGenerator bug fix. Modified Paths: -------------- branches/Cog/cygwinbuild/Makefile branches/Cog/cygwinbuild/Squeak.rc branches/Cog/cygwinbuild/mvm branches/Cog/cygwinbuild/plugins.ext branches/Cog/image/Workspace.text branches/Cog/macbuild/CoreMTVM.xcodeproj/project.pbxproj branches/Cog/macbuild/CoreVM.plist branches/Cog/macbuild/CoreVM.xcodeproj/project.pbxproj branches/Cog/macbuild/Template/Template.xcodeproj/project.pbxproj branches/Cog/macbuild/makeclean branches/Cog/macbuild/makevm branches/Cog/macbuild/plugins.ext branches/Cog/nscogbuild/cygwinbuild/Makefile branches/Cog/nscogbuild/cygwinbuild/nsvm.rc branches/Cog/nscogbuild/cygwinbuild/plugins.ext branches/Cog/nscogbuild/macbuild/makevm branches/Cog/nscogbuild/unixbuild/astbld/plugins.ext branches/Cog/nscogbuild/unixbuild/bld/plugins.ext branches/Cog/nscogbuild/unixbuild/dbgbld/plugins.ext branches/Cog/nscogsrc/examplePlugins.ext branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/nscogsrc/plugins/SoundPlugin/SoundPlugin.c branches/Cog/nscogsrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c branches/Cog/nscogsrc/plugins/ZipPlugin/ZipPlugin.c branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/exampleSqNamedPrims.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/scripts/mkvmarchives branches/Cog/scripts/uploadvms branches/Cog/src/examplePlugins.ext branches/Cog/src/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/src/plugins/HostWindowPlugin/HostWindowPlugin.c branches/Cog/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c branches/Cog/src/plugins/SoundPlugin/SoundPlugin.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/src/vm/interp.h branches/Cog/src/vm/vmCallback.h branches/Cog/stackbuild/macbuild/CoreVM.plist branches/Cog/stackbuild/macbuild/CoreVM.xcodeproj/project.pbxproj branches/Cog/stackbuild/macbuild/makeclean branches/Cog/stackbuild/macbuild/makevm branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c branches/Cog/stacksrc/vm/interp.h branches/Cog/stacksrc/vm/vmCallback.h branches/Cog/unixbuild/abld/plugins.ext branches/Cog/unixbuild/bld/plugins.ext branches/Cog/unixbuild/dbld/plugins.ext branches/Cog/unixbuild/mtbld/plugins.ext Added Paths: ----------- branches/Cog/cygwinbuild/GreenCogSqueak.ico branches/Cog/macbuild/SqueakSSL/ branches/Cog/macbuild/SqueakSSL/Info.plist branches/Cog/macbuild/SqueakSSL/SqueakSSL.xcodeproj/ branches/Cog/macbuild/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj branches/Cog/macbuild/SqueakSSL/SqueakSSL_Prefix.pch branches/Cog/macbuild/resources/ProjectBuilder/GreenCogSqueak.icns branches/Cog/nscogbuild/macbuild/SqueakSSL/ branches/Cog/nscogbuild/macbuild/SqueakSSL/Info.plist branches/Cog/nscogbuild/macbuild/SqueakSSL/SqueakSSL.xcodeproj/ branches/Cog/nscogbuild/macbuild/SqueakSSL/SqueakSSL.xcodeproj/eliot.mode1v3 branches/Cog/nscogbuild/macbuild/SqueakSSL/SqueakSSL.xcodeproj/eliot.pbxuser branches/Cog/nscogbuild/macbuild/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj branches/Cog/nscogbuild/macbuild/SqueakSSL/SqueakSSL_Prefix.pch branches/Cog/nscogbuild/macbuild/plugins.ext branches/Cog/platforms/Mac OS/plugins/SqueakSSL/ branches/Cog/platforms/Mac OS/plugins/SqueakSSL/sqMacSSL.c branches/Cog/platforms/unix/plugins/SqueakSSL/ branches/Cog/platforms/unix/plugins/SqueakSSL/sqUnixOpenSSL.c branches/Cog/platforms/win32/misc/GreenCogSqueak.ico branches/Cog/src/plugins/SqueakSSL/ branches/Cog/src/plugins/SqueakSSL/SqueakSSL.c branches/Cog/stackbuild/macbuild/resources/ProjectBuilder/GreenCogSqueak.icns Added: branches/Cog/cygwinbuild/GreenCogSqueak.ico =================================================================== (Binary files differ) Property changes on: branches/Cog/cygwinbuild/GreenCogSqueak.ico ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: branches/Cog/cygwinbuild/Makefile =================================================================== --- branches/Cog/cygwinbuild/Makefile 2013-04-04 05:05:14 UTC (rev 2712) +++ branches/Cog/cygwinbuild/Makefile 2013-04-04 18:39:10 UTC (rev 2713) @@ -12,7 +12,7 @@ THREADING=single # The name of the VM to build -VM:=Croquet +VM:=Squeak VM_NAME?=$(VM) # Is this a Croquet VM (defaults to OGL instead of D3D)? @@ -190,7 +190,8 @@ # Note: RC compiles the .rc files into linkable .o files # RC:= windres -RCFLAGS:= --include-dir $(PLATDIR)/win32/misc -D_WIN32 +SVNREV:= $(shell sed -e "s/^static.*SvnRawRevisionString.*Rev: $[0-9][0-9]*$.*/\\1/p" -e d $(PLATDIR)/Cross/vm/sqSCCSVersion.h) +RCFLAGS:= --include-dir $(PLATDIR)/win32/misc -D_WIN32 -DFILEVERSIONVALUES=4,0,$(SVNREV),0 '-DFILEVERSIONSTRING=\"4.0.$(SVNREV)\\0\"' .SUFFIXES: .SUFFIXES: .ccg .cc .c .o .s .i .rc .res .cg .hg .ccg .cpp @@ -202,6 +203,9 @@ # default: print-settings init $(VMEXE) $(CONSOLEVMEXE) $(DLLS) $(STRIPEXE) $(STRIPCONSOLEEXE) +svnver: + echo $(RC) $(RCFLAGS) + productmt:; $(MAKE) -f $(MAKEFILE_LIST) CONFIGURATION=product THREADING=multi $(@,product=) default Modified: branches/Cog/cygwinbuild/Squeak.rc =================================================================== --- branches/Cog/cygwinbuild/Squeak.rc 2013-04-04 05:05:14 UTC (rev 2712) +++ branches/Cog/cygwinbuild/Squeak.rc 2013-04-04 18:39:10 UTC (rev 2713) @@ -1,11 +1,11 @@ #ifdef _WIN32 -1 ICON DISCARDABLE "squeak.ico" +1 ICON DISCARDABLE "GreenCogSqueak.ico" 2 ICON DISCARDABLE "squeak2.ico" 3 ICON DISCARDABLE "squeak3.ico" 1 VERSIONINFO - FILEVERSION 3,11,3,0 - PRODUCTVERSION 3,11,0,0 + FILEVERSION FILEVERSIONVALUES + PRODUCTVERSION 4,0,0,0 FILEFLAGSMASK 0x3fL FILEFLAGS 0xaL FILEOS 0x10001L @@ -17,11 +17,11 @@ BLOCK "040904E4" // Lang=US English, CharSet=Windows Multilin BEGIN VALUE "CompanyName", "Squeak.org\0" - VALUE "FileDescription", "Squeak Virtual Machine\0" - VALUE "FileVersion", "3.11.3\0" - VALUE "LegalCopyright", "Copyright \251 Squeak.org 1996-2009\0" - VALUE "ProductName", "Squeak\0" - VALUE "ProductVersion", "3.11\0" + VALUE "FileDescription", "Squeak Cog Virtual Machine\0" + VALUE "FileVersion", FILEVERSIONSTRING + VALUE "LegalCopyright", "Copyright \251 Squeak.org 1996-2013\0" + VALUE "ProductName", "Squeak Cog\0" + VALUE "ProductVersion", "4.0\0" END END BLOCK "VarFileInfo" @@ -29,4 +29,4 @@ VALUE "Translation", 0x409, 1252 END END -#endif \ No newline at end of file +#endif Modified: branches/Cog/cygwinbuild/mvm =================================================================== --- branches/Cog/cygwinbuild/mvm 2013-04-04 05:05:14 UTC (rev 2712) +++ branches/Cog/cygwinbuild/mvm 2013-04-04 18:39:10 UTC (rev 2713) @@ -2,4 +2,4 @@ rm -rf build*/vm/Croquet*.exe make debug;make assert;make make THREADING=multi CONFIGURATION=debug;make THREADING=multi CONFIGURATION=assert;make THREADING=multi -ls -rlt build*/vm/Croquet*.exe +ls -rlt build*/vm/Squeak*.exe Modified: branches/Cog/cygwinbuild/plugins.ext =================================================================== --- branches/Cog/cygwinbuild/plugins.ext 2013-04-04 05:05:14 UTC (rev 2712) +++ branches/Cog/cygwinbuild/plugins.ext 2013-04-04 18:39:10 UTC (rev 2713) @@ -1,4 +1,6 @@ # Copied, perhaps edited, from ../src/examplePlugins.ext +# N.B. SqueakSSL is not ready for prime time. Compiles but does not link fully. +# See platforms/win32/plugins/SqueakSSL/Makefile EXTERNAL_PLUGINS = \ BochsIA32Plugin \ SqueakFFIPrims \ Modified: branches/Cog/image/Workspace.text =================================================================== --- branches/Cog/image/Workspace.text 2013-04-04 05:05:14 UTC (rev 2712) +++ branches/Cog/image/Workspace.text 2013-04-04 18:39:10 UTC (rev 2713) @@ -4,7 +4,8 @@ To rebuild this image -- start with a Squeak 4.3 or newer image (this is a Squeak 4.3 trunk image that you can update). + +- start with a Squeak 4.4 or newer image (the Squeak 4.3 All-in-one is fine too, but please update the image). 1. If Alien is not already in the image, load it, e.g. Alien-eem.18 from http://www.squeaksource.com/Alien. 2. If FFI is not already in the image, load FFI-Pools, e.g. FFI-Pools-eem.3, from http://source.squeak.org/FFI (For FFIConstants) [2a. Load FFI if you want to use cog:selector: to compile a method in this image] @@ -12,6 +13,13 @@ 4. Load Balloon-Engine-Pools (e.g. Balloon-Engine-Pools-JB.2) from http://source.squeak.org/VMMaker 5. From http://source.squeak.org/VMMaker -load "VMMaker.oscog" and "Cog" monticello packages. First load the most up-to-dateVMMaker.oscog, e.g. VMMaker.oscog-eem.157, and then the most up-to-date Cog, e.g. Cog-eem.46. +load "VMMaker.oscog" and "Cog" monticello packages. First load the most up-to-dateVMMaker.oscog, e.g. VMMaker.oscog-eem.278, and then the most up-to-date Cog, e.g. Cog-lw.60. N.B. do *not* load VMMaker or VMMaker-oscog. -N.B. VMMaker.oscog packages may be listed with VMMaker packages depending on Monticello version. \ No newline at end of file +N.B. VMMaker.oscog packages may be listed with VMMaker packages depending on Monticello version. +6. Load any additional plugins not in VMMaker. Currently these are: + - SqueakSSLPlugin from e.g. SqueakSSL-Plugin-ar.3 at http://www.squeaksource.com/SqueakSSL + - Win32OSProcessPlugin & UnixOSProcessPlugin from e.g. VMConstruction-Plugins-OSProcessPlugin.oscog-eem.41 at http://www.squeaksource.com/OSProcessPlugin + - FT2Plugin from e.g. Freetype-Plugin-IgorStasenko.57 at http://www.squeaksource.com/FreetypePlugin + - AioPlugin from e.g. VMConstruction-Plugins-AioPlugin-dtl.14 at t http://www.squeaksource.com/AioPlugin + +Read the class comments of StackInterpreterSimulator and CogVMSimulator for running the simulator. Modified: branches/Cog/macbuild/CoreMTVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/macbuild/CoreMTVM.xcodeproj/project.pbxproj 2013-04-04 05:05:14 UTC (rev 2712) +++ branches/Cog/macbuild/CoreMTVM.xcodeproj/project.pbxproj 2013-04-04 18:39:10 UTC (rev 2713) @@ -255,7 +255,7 @@ A2FB6B730CCD723F00A29088 /* LocalePlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = A2FB6B720CCD723F00A29088 /* LocalePlugin.h */; }; DA6061C40AA515470009E25D /* sqMacMain.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEF402EB4E0A0100013C /* sqMacMain.c */; }; DA6061CA0AA5155E0009E25D /* sqNamedPrims.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AFDD02EB4E0A0100013C /* sqNamedPrims.c */; }; - DAFA08940AA64625008DF459 /* Croquet.icns in Resources */ = {isa = PBXBuildFile; fileRef = DAFA08930AA64625008DF459 /* Croquet.icns */; }; + DAFA08940AA64625008DF459 /* GreenCogSqueak.icns in Resources */ = {isa = PBXBuildFile; fileRef = DAFA08930AA64625008DF459 /* GreenCogSqueak.icns */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -301,7 +301,7 @@ 94196AAE09974200005962BF /* sqMacUIEventsUniversal.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacUIEventsUniversal.c; sourceTree = "<group>"; }; 94196AAF09974200005962BF /* sqMacUIMenuBarUniversal.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacUIMenuBarUniversal.c; sourceTree = "<group>"; }; 94196AB009974200005962BF /* sqMacWindowUniversal.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacWindowUniversal.c; sourceTree = "<group>"; }; - 941A3C0C09AA144000C9D25A /* Croquet.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Croquet.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 941A3C0C09AA144000C9D25A /* Squeak.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Squeak.app; sourceTree = BUILT_PRODUCTS_DIR; }; 9426FF0F09F489D200ECEDDC /* chartables.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = chartables.c; sourceTree = "<group>"; }; 9426FF1009F489D200ECEDDC /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; }; 9426FF1109F489D200ECEDDC /* get.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = get.c; sourceTree = "<group>"; }; @@ -396,7 +396,7 @@ A2FB6B580CCD71B000A29088 /* sqMacLocaleCarbon.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqMacLocaleCarbon.h; path = LocalePlugin/sqMacLocaleCarbon.h; sourceTree = "<group>"; }; A2FB6B720CCD723F00A29088 /* LocalePlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = LocalePlugin.h; path = LocalePlugin/LocalePlugin.h; sourceTree = "<group>"; }; DAD40DAF0AA60CE90082521A /* CoreVM.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = CoreVM.plist; sourceTree = "<group>"; }; - DAFA08930AA64625008DF459 /* Croquet.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = Croquet.icns; path = resources/ProjectBuilder/Croquet.icns; sourceTree = "<group>"; }; + DAFA08930AA64625008DF459 /* GreenCogSqueak.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = GreenCogSqueak.icns; path = resources/ProjectBuilder/GreenCogSqueak.icns; sourceTree = "<group>"; }; F5F8AE0F02EB4E090100013C /* sqMacOpenGL.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqMacOpenGL.h; sourceTree = "<group>"; }; F5F8AE3D02EB4E090100013C /* sqMacInternetConfiguration.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacInternetConfiguration.c; sourceTree = "<group>"; }; F5F8AE3F02EB4E090100013C /* sqMacJoystickAndTablet.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacJoystickAndTablet.c; sourceTree = "<group>"; }; @@ -563,7 +563,7 @@ isa = PBXGroup; children = ( 664A73DB0300584000A80109 /* Squeak VM.r */, - DAFA08930AA64625008DF459 /* Croquet.icns */, + DAFA08930AA64625008DF459 /* GreenCogSqueak.icns */, 664A73DC0300584000A80109 /* Squeak.icns */, 664A73DD0300584000A80109 /* SqueakChanges.icns */, 664A73DE0300584000A80109 /* SqueakImage.icns */, @@ -579,7 +579,7 @@ 08773F3000C6A1C4C0A80109 /* Products */ = { isa = PBXGroup; children = ( - 941A3C0C09AA144000C9D25A /* Croquet.app */, + 941A3C0C09AA144000C9D25A /* Squeak.app */, ); name = Products; sourceTree = "<group>"; @@ -1714,9 +1714,9 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 941A3B2B09AA144000C9D25A /* Croquet */ = { + 941A3B2B09AA144000C9D25A /* Squeak */ = { isa = PBXNativeTarget; - buildConfigurationList = 941A3C0709AA144000C9D25A /* Build configuration list for PBXNativeTarget "Croquet" */; + buildConfigurationList = 941A3C0709AA144000C9D25A /* Build configuration list for PBXNativeTarget "Squeak" */; buildPhases = ( 941A3B2C09AA144000C9D25A /* Headers */, 941A3B7109AA144000C9D25A /* Resources */, @@ -1731,10 +1731,10 @@ "; dependencies = ( ); - name = Croquet; + name = Squeak; productInstallPath = "$(USER_APPS_DIR)"; productName = "Squeak VM OPT"; - productReference = 941A3C0C09AA144000C9D25A /* Croquet.app */; + productReference = 941A3C0C09AA144000C9D25A /* Squeak.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -1757,7 +1757,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 941A3B2B09AA144000C9D25A /* Croquet */, + 941A3B2B09AA144000C9D25A /* Squeak */, ); }; /* End PBXProject section */ @@ -1775,7 +1775,7 @@ 941A3B7709AA144000C9D25A /* SqueakGeneric.icns in Resources */, 941A3B7809AA144000C9D25A /* SqueakProject.icns in Resources */, 941A3B7909AA144000C9D25A /* SqueakSources.icns in Resources */, - DAFA08940AA64625008DF459 /* Croquet.icns in Resources */, + DAFA08940AA64625008DF459 /* GreenCogSqueak.icns in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2000,7 +2000,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ""; OTHER_REZFLAGS = ""; - PRODUCT_NAME = Croquet; + PRODUCT_NAME = Squeak; SECTORDER_FLAGS = ""; UNSTRIPPED_PRODUCT = YES; WARNING_CFLAGS = ""; @@ -2078,7 +2078,7 @@ OTHER_LDFLAGS = ""; OTHER_REZFLAGS = ""; PER_ARCH_CFLAGS_i386 = ""; - PRODUCT_NAME = Croquet; + PRODUCT_NAME = Squeak; WARNING_CFLAGS = ""; WRAPPER_EXTENSION = app; ZERO_LINK = NO; @@ -2106,7 +2106,7 @@ HAVE_SYS_TIME_H, ); GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = "$(GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS_QUOTED_FOR_TARGET_1)"; - GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS_QUOTED_FOR_TARGET_1 = "BUILD_VERSION=\"\\\"Croquet Cog OS/X 4.0.0\\\"\""; + GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS_QUOTED_FOR_TARGET_1 = "BUILD_VERSION=\"\\\"Squeak Cog OS/X 4.0.0\\\"\""; GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_UNROLL_LOOPS = YES; GCC_VERSION_i386 = 4.2; @@ -2117,7 +2117,7 @@ $SRCROOT, ); ICC_DATA_NO_ALIAS = NO; - ICC_DEFINES = "ILP32=1 _NONSTD_SOURCE $(GCC_PREPROCESSOR_DEFINITIONS) BUILD_VERSION=\"\\\"Croquet Cog OS/X 4.0.0\\\"\""; + ICC_DEFINES = "ILP32=1 _NONSTD_SOURCE $(GCC_PREPROCESSOR_DEFINITIONS) BUILD_VERSION=\"\\\"Squeak Cog OS/X 4.0.0\\\"\""; ICC_FP_MODEL = src; ICC_LANG_ANSI_OPT = NO; ICC_OPTLEVEL = speedHLO; @@ -2131,7 +2131,7 @@ OTHER_LDFLAGS = ""; OTHER_REZFLAGS = ""; PER_ARCH_CFLAGS_i386 = "-O3 -falign-functions=16 -fno-gcse -mtune=prescott -march=pentium-m -mfpmath=sse -finline-functions -Wall -DUSE_INLINE_MEMORY_ACCESSORS"; - PRODUCT_NAME = Croquet; + PRODUCT_NAME = Squeak; SECTORDER_FLAGS = ""; WARNING_CFLAGS = ""; WRAPPER_EXTENSION = app; @@ -2175,7 +2175,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ""; OTHER_REZFLAGS = ""; - PRODUCT_NAME = Croquet; + PRODUCT_NAME = Squeak; SECTORDER_FLAGS = ""; UNSTRIPPED_PRODUCT = YES; WARNING_CFLAGS = ""; @@ -2260,7 +2260,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 941A3C0709AA144000C9D25A /* Build configuration list for PBXNativeTarget "Croquet" */ = { + 941A3C0709AA144000C9D25A /* Build configuration list for PBXNativeTarget "Squeak" */ = { isa = XCConfigurationList; buildConfigurations = ( 941A3C0809AA144000C9D25A /* Development */, Modified: branches/Cog/macbuild/CoreVM.plist =================================================================== --- branches/Cog/macbuild/CoreVM.plist 2013-04-04 05:05:14 UTC (rev 2712) +++ branches/Cog/macbuild/CoreVM.plist 2013-04-04 18:39:10 UTC (rev 2713) @@ -14,9 +14,9 @@ <string>image</string> </array> <key>CFBundleTypeIconFile</key> - <string>Croquet.icns</string> + <string>SqueakImage.icns</string> <key>CFBundleTypeName</key> - <string>Croquet Image File</string> + <string>Squeak Image File</string> <key>CFBundleTypeOSTypes</key> <array> <string>STim</string> @@ -30,9 +30,9 @@ <string>sources</string> </array> <key>CFBundleTypeIconFile</key> - <string>Croquet.icns</string> + <string>SqueakSources.icns</string> <key>CFBundleTypeName</key> - <string>Croquet Sources File</string> + <string>Squeak Sources File</string> <key>CFBundleTypeOSTypes</key> <array> <string>STso</string> @@ -46,9 +46,9 @@ <string>changes</string> </array> <key>CFBundleTypeIconFile</key> - <string>Croquet.icns</string> + <string>SqueakChanges.icns</string> <key>CFBundleTypeName</key> - <string>Croquet Changes File</string> + <string>Squeak Changes File</string> <key>CFBundleTypeOSTypes</key> <array> <string>STch</string> @@ -366,21 +366,21 @@ </dict> </array> <key>CFBundleExecutable</key> - <string>Croquet</string> + <string>Squeak</string> <key>CFBundleGetInfoString</key> - <string>Croquet Cog 4.0.0 http://www.mirandabanda.org</string> + <string>Squeak Cog 4.0.0 http://www.mirandabanda.org</string> <key>CFBundleShortVersionString</key> - <string>Croquet Cog 4.0.0</string> + <string>Squeak Cog 4.0.0</string> <key>CFBundleVersion</key> <string>4.0.0</string> <key>CFBundleIconFile</key> - <string>Croquet.icns</string> + <string>GreenCogSqueak.icns</string> <key>CFBundleIdentifier</key> <string>com.squeak.Cog</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundleName</key> - <string>Croquet</string> + <string>Squeak</string> <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleSignature</key> @@ -484,7 +484,7 @@ <key>SqueakUIFlushUseHighPercisionClock</key> <true/> <key>SqueakUnTrustedDirectory</key> - <string>~/Library/Preferences/Croquet/Internet/Untrusted/</string> + <string>~/Library/Preferences/Squeak/Internet/Untrusted/</string> <key>SqueakWindowAttribute</key> <data>ggAAHw==</data> <key>SqueakWindowHasTitle</key> Modified: branches/Cog/macbuild/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/macbuild/CoreVM.xcodeproj/project.pbxproj 2013-04-04 05:05:14 UTC (rev 2712) +++ branches/Cog/macbuild/CoreVM.xcodeproj/project.pbxproj 2013-04-04 18:39:10 UTC (rev 2713) @@ -255,7 +255,7 @@ A2FB6B730CCD723F00A29088 /* LocalePlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = A2FB6B720CCD723F00A29088 /* LocalePlugin.h */; }; DA6061C40AA515470009E25D /* sqMacMain.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEF402EB4E0A0100013C /* sqMacMain.c */; }; DA6061CA0AA5155E0009E25D /* sqNamedPrims.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AFDD02EB4E0A0100013C /* sqNamedPrims.c */; }; - DAFA08940AA64625008DF459 /* Croquet.icns in Resources */ = {isa = PBXBuildFile; fileRef = DAFA08930AA64625008DF459 /* Croquet.icns */; }; + DAFA08940AA64625008DF459 /* GreenCogSqueak.icns in Resources */ = {isa = PBXBuildFile; fileRef = DAFA08930AA64625008DF459 /* GreenCogSqueak.icns */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -301,7 +301,7 @@ 94196AAE09974200005962BF /* sqMacUIEventsUniversal.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacUIEventsUniversal.c; sourceTree = "<group>"; }; 94196AAF09974200005962BF /* sqMacUIMenuBarUniversal.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacUIMenuBarUniversal.c; sourceTree = "<group>"; }; 94196AB009974200005962BF /* sqMacWindowUniversal.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacWindowUniversal.c; sourceTree = "<group>"; }; - 941A3C0C09AA144000C9D25A /* Croquet.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Croquet.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 941A3C0C09AA144000C9D25A /* Squeak.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Squeak.app; sourceTree = BUILT_PRODUCTS_DIR; }; 9426FF0F09F489D200ECEDDC /* chartables.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = chartables.c; sourceTree = "<group>"; }; 9426FF1009F489D200ECEDDC /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; }; 9426FF1109F489D200ECEDDC /* get.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = get.c; sourceTree = "<group>"; }; @@ -396,7 +396,7 @@ A2FB6B580CCD71B000A29088 /* sqMacLocaleCarbon.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqMacLocaleCarbon.h; path = LocalePlugin/sqMacLocaleCarbon.h; sourceTree = "<group>"; }; A2FB6B720CCD723F00A29088 /* LocalePlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = LocalePlugin.h; path = LocalePlugin/LocalePlugin.h; sourceTree = "<group>"; }; DAD40DAF0AA60CE90082521A /* CoreVM.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = CoreVM.plist; sourceTree = "<group>"; }; - DAFA08930AA64625008DF459 /* Croquet.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = Croquet.icns; path = resources/ProjectBuilder/Croquet.icns; sourceTree = "<group>"; }; + DAFA08930AA64625008DF459 /* GreenCogSqueak.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = GreenCogSqueak.icns; path = resources/ProjectBuilder/GreenCogSqueak.icns; sourceTree = "<group>"; }; F5F8AE0F02EB4E090100013C /* sqMacOpenGL.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqMacOpenGL.h; sourceTree = "<group>"; }; F5F8AE3D02EB4E090100013C /* sqMacInternetConfiguration.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacInternetConfiguration.c; sourceTree = "<group>"; }; F5F8AE3F02EB4E090100013C /* sqMacJoystickAndTablet.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacJoystickAndTablet.c; sourceTree = "<group>"; }; @@ -563,7 +563,7 @@ isa = PBXGroup; children = ( 664A73DB0300584000A80109 /* Squeak VM.r */, - DAFA08930AA64625008DF459 /* Croquet.icns */, + DAFA08930AA64625008DF459 /* GreenCogSqueak.icns */, 664A73DC0300584000A80109 /* Squeak.icns */, 664A73DD0300584000A80109 /* SqueakChanges.icns */, 664A73DE0300584000A80109 /* SqueakImage.icns */, @@ -579,7 +579,7 @@ 08773F3000C6A1C4C0A80109 /* Products */ = { isa = PBXGroup; children = ( - 941A3C0C09AA144000C9D25A /* Croquet.app */, + 941A3C0C09AA144000C9D25A /* Squeak.app */, ); name = Products; sourceTree = "<group>"; @@ -1714,9 +1714,9 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 941A3B2B09AA144000C9D25A /* Croquet */ = { + 941A3B2B09AA144000C9D25A /* Squeak */ = { isa = PBXNativeTarget; - buildConfigurationList = 941A3C0709AA144000C9D25A /* Build configuration list for PBXNativeTarget "Croquet" */; + buildConfigurationList = 941A3C0709AA144000C9D25A /* Build configuration list for PBXNativeTarget "Squeak" */; buildPhases = ( 941A3B2C09AA144000C9D25A /* Headers */, 941A3B7109AA144000C9D25A /* Resources */, @@ -1731,10 +1731,10 @@ "; dependencies = ( ); - name = Croquet; + name = Squeak; productInstallPath = "$(USER_APPS_DIR)"; productName = "Squeak VM OPT"; - productReference = 941A3C0C09AA144000C9D25A /* Croquet.app */; + productReference = 941A3C0C09AA144000C9D25A /* Squeak.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -1757,7 +1757,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 941A3B2B09AA144000C9D25A /* Croquet */, + 941A3B2B09AA144000C9D25A /* Squeak */, ); }; /* End PBXProject section */ @@ -1775,7 +1775,7 @@ 941A3B7709AA144000C9D25A /* SqueakGeneric.icns in Resources */, 941A3B7809AA144000C9D25A /* SqueakProject.icns in Resources */, 941A3B7909AA144000C9D25A /* SqueakSources.icns in Resources */, - DAFA08940AA64625008DF459 /* Croquet.icns in Resources */, + DAFA08940AA64625008DF459 /* GreenCogSqueak.icns in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2000,7 +2000,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ""; OTHER_REZFLAGS = ""; - PRODUCT_NAME = Croquet; + PRODUCT_NAME = Squeak; SECTORDER_FLAGS = ""; UNSTRIPPED_PRODUCT = YES; WARNING_CFLAGS = ""; @@ -2078,7 +2078,7 @@ OTHER_LDFLAGS = ""; OTHER_REZFLAGS = ""; PER_ARCH_CFLAGS_i386 = ""; - PRODUCT_NAME = Croquet; + PRODUCT_NAME = Squeak; WARNING_CFLAGS = ""; WRAPPER_EXTENSION = app; ZERO_LINK = NO; @@ -2106,7 +2106,7 @@ HAVE_SYS_TIME_H, ); GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = "$(GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS_QUOTED_FOR_TARGET_1)"; - GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS_QUOTED_FOR_TARGET_1 = "BUILD_VERSION=\"\\\"Croquet Cog OS/X 4.0.0\\\"\""; + GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS_QUOTED_FOR_TARGET_1 = "BUILD_VERSION=\"\\\"Squeak Cog OS/X 4.0.0\\\"\""; GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_UNROLL_LOOPS = YES; GCC_VERSION_i386 = 4.2; @@ -2117,7 +2117,7 @@ $SRCROOT, ); ICC_DATA_NO_ALIAS = NO; - ICC_DEFINES = "ILP32=1 _NONSTD_SOURCE $(GCC_PREPROCESSOR_DEFINITIONS) BUILD_VERSION=\"\\\"Croquet Cog OS/X 4.0.0\\\"\""; + ICC_DEFINES = "ILP32=1 _NONSTD_SOURCE $(GCC_PREPROCESSOR_DEFINITIONS) BUILD_VERSION=\"\\\"Squeak Cog OS/X 4.0.0\\\"\""; ICC_FP_MODEL = src; ICC_LANG_ANSI_OPT = NO; ICC_OPTLEVEL = speedHLO; @@ -2131,7 +2131,7 @@ OTHER_LDFLAGS = ""; OTHER_REZFLAGS = ""; PER_ARCH_CFLAGS_i386 = "-O3 -falign-functions=16 -fno-gcse -mtune=prescott -march=pentium-m -mfpmath=sse -finline-functions -Wall -DUSE_INLINE_MEMORY_ACCESSORS"; - PRODUCT_NAME = Croquet; + PRODUCT_NAME = Squeak; SECTORDER_FLAGS = ""; WARNING_CFLAGS = ""; WRAPPER_EXTENSION = app; @@ -2175,7 +2175,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.5; OTHER_LDFLAGS = ""; OTHER_REZFLAGS = ""; - PRODUCT_NAME = Croquet; + PRODUCT_NAME = Squeak; SECTORDER_FLAGS = ""; UNSTRIPPED_PRODUCT = YES; WARNING_CFLAGS = ""; @@ -2260,7 +2260,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 941A3C0709AA144000C9D25A /* Build configuration list for PBXNativeTarget "Croquet" */ = { + 941A3C0709AA144000C9D25A /* Build configuration list for PBXNativeTarget "Squeak" */ = { isa = XCConfigurationList; buildConfigurations = ( 941A3C0809AA144000C9D25A /* Development */, Added: branches/Cog/macbuild/SqueakSSL/Info.plist =================================================================== --- branches/Cog/macbuild/SqueakSSL/Info.plist (rev 0) +++ branches/Cog/macbuild/SqueakSSL/Info.plist 2013-04-04 18:39:10 UTC (rev 2713) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>CFBundleDevelopmentRegion</key> + <string>English</string> + <key>CFBundleExecutable</key> + <string>SquealSSL</string> + <key>CFBundleIconFile</key> + <string></string> + <key>CFBundleIdentifier</key> + <string>org.squeak.Cog.SqueakSSL</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundlePackageType</key> + <string>BNDL</string> + <key>CFBundleSignature</key> + <string>FAST</string> + <key>CFBundleVersion</key> + <string>1.0</string> + <key>CFBundleShortVersionString</key> + <string>1.0</string> + <key>CSResourcesFileMapped</key> + <true/> +</dict> +</plist> Added: branches/Cog/macbuild/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/macbuild/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj (rev 0) +++ branches/Cog/macbuild/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj 2013-04-04 18:39:10 UTC (rev 2713) @@ -0,0 +1,270 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 42; + objects = { + +/* Begin PBXBuildFile section */ + 73027B6B17012E5F0086D8E4 /* SqueakSSL.c in Sources */ = {isa = PBXBuildFile; fileRef = 73027B6A17012E5F0086D8E4 /* SqueakSSL.c */; }; + 732D9F4317012B6E00E25893 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 732D9F4117012B6E00E25893 /* Security.framework */; }; + 732D9F4417012B6E00E25893 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 732D9F4217012B6E00E25893 /* CoreFoundation.framework */; }; + 73D8A6421701272700C66275 /* sqMacSSL.c in Sources */ = {isa = PBXBuildFile; fileRef = 73D8A6411701272700C66275 /* sqMacSSL.c */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 32BAE0B30371A71500C91783 /* SqueakSSL_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SqueakSSL_Prefix.pch; sourceTree = "<group>"; }; + 73027B6A17012E5F0086D8E4 /* SqueakSSL.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SqueakSSL.c; path = ../../src/plugins/SqueakSSL/SqueakSSL.c; sourceTree = SOURCE_ROOT; }; + 732D9F4117012B6E00E25893 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; }; + 732D9F4217012B6E00E25893 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; }; + 73811791170128D400CB30CE /* sq.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sq.h; path = ../../platforms/Cross/vm/sq.h; sourceTree = SOURCE_ROOT; }; + 73D8A62E1701259800C66275 /* SqueakSSL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SqueakSSL.h; path = ../../platforms/Cross/plugins/SqueakSSL/SqueakSSL.h; sourceTree = SOURCE_ROOT; }; + 73D8A6411701272700C66275 /* sqMacSSL.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqMacSSL.c; path = "../../platforms/Mac OS/plugins/SqueakSSL/sqMacSSL.c"; sourceTree = SOURCE_ROOT; }; + 8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; + 8D01CCD20486CAD60068D4B7 /* SqueakSSL.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SqueakSSL.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; + DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../src/vm/interp.h; sourceTree = SOURCE_ROOT; }; + DA3A20F60AA63CDC0050B983 /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; }; + DA3A20F70AA63CDC0050B983 /* sqVirtualMachine.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqVirtualMachine.h; path = ../../platforms/Cross/vm/sqVirtualMachine.h; sourceTree = SOURCE_ROOT; }; + DA3A20F80AA63D000050B983 /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../../platforms/Mac OS/vm/config.h"; sourceTree = SOURCE_ROOT; }; + DA3A20F90AA63D000050B983 /* sqConfig.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqConfig.h; path = "../../platforms/Mac OS/vm/sqConfig.h"; sourceTree = SOURCE_ROOT; }; + DA3A20FA0AA63D000050B983 /* sqPlatformSpecific.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqPlatformSpecific.h; path = "../../platforms/Mac OS/vm/sqPlatformSpecific.h"; sourceTree = SOURCE_ROOT; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 8D01CCCD0486CAD60068D4B7 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 732D9F4317012B6E00E25893 /* Security.framework in Frameworks */, + 732D9F4417012B6E00E25893 /* CoreFoundation.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 089C166AFE841209C02AAC07 /* SqueakSSL */ = { + isa = PBXGroup; + children = ( + 08FB77ADFE841716C02AAC07 /* Source */, + 089C167CFE841241C02AAC07 /* Resources */, + 19C28FB4FE9D528D11CA2CBB /* Products */, + ); + name = SqueakSSL; + sourceTree = "<group>"; + }; + 089C167CFE841241C02AAC07 /* Resources */ = { + isa = PBXGroup; + children = ( + 732D9F4017012B6E00E25893 /* Frameworks */, + 8D01CCD10486CAD60068D4B7 /* Info.plist */, + ); + name = Resources; + sourceTree = "<group>"; + }; + 08FB77ADFE841716C02AAC07 /* Source */ = { + isa = PBXGroup; + children = ( + 73027B6717012E3F0086D8E4 /* SqueakSSL */, + 73D8A63C170125E500C66275 /* SqueakSSL */, + 73D8A636170125C500C66275 /* SqueakSSL */, + DA3A20F80AA63D000050B983 /* config.h */, + DA3A20F90AA63D000050B983 /* sqConfig.h */, + DA3A20FA0AA63D000050B983 /* sqPlatformSpecific.h */, + DA3A20F60AA63CDC0050B983 /* sqMemoryAccess.h */, + DA3A20F70AA63CDC0050B983 /* sqVirtualMachine.h */, + DA3A20F50AA63CBF0050B983 /* interp.h */, + 73811791170128D400CB30CE /* sq.h */, + 32BAE0B30371A71500C91783 /* SqueakSSL_Prefix.pch */, + ); + name = Source; + sourceTree = "<group>"; + }; + 19C28FB4FE9D528D11CA2CBB /* Products */ = { + isa = PBXGroup; + children = ( + 8D01CCD20486CAD60068D4B7 /* SqueakSSL.bundle */, + ); + name = Products; + sourceTree = "<group>"; + }; + 73027B6717012E3F0086D8E4 /* SqueakSSL */ = { + isa = PBXGroup; + children = ( + 73027B6A17012E5F0086D8E4 /* SqueakSSL.c */, + ); + name = SqueakSSL; + sourceTree = "<group>"; + }; + 732D9F4017012B6E00E25893 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 732D9F4117012B6E00E25893 /* Security.framework */, + 732D9F4217012B6E00E25893 /* CoreFoundation.framework */, + ); + name = Frameworks; + sourceTree = "<group>"; + }; + 73D8A636170125C500C66275 /* SqueakSSL */ = { + isa = PBXGroup; + children = ( + 73D8A62E1701259800C66275 /* SqueakSSL.h */, + ); + name = SqueakSSL; + sourceTree = "<group>"; + }; + 73D8A63C170125E500C66275 /* SqueakSSL */ = { + isa = PBXGroup; + children = ( + 73D8A6411701272700C66275 /* sqMacSSL.c */, + ); + name = SqueakSSL; + sourceTree = "<group>"; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 8D01CCC60486CAD60068D4B7 /* SqueakSSL */ = { + isa = PBXNativeTarget; + buildConfigurationList = 4FADC23308B4156C00ABE55E /* Build configuration list for PBXNativeTarget "SqueakSSL" */; + buildPhases = ( + 8D01CCC90486CAD60068D4B7 /* Resources */, + 8D01CCCB0486CAD60068D4B7 /* Sources */, + 8D01CCCD0486CAD60068D4B7 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = SqueakSSL; + productInstallPath = "$(HOME)/Library/Bundles"; + productName = SqueakSSL; + productReference = 8D01CCD20486CAD60068D4B7 /* SqueakSSL.bundle */; + productType = "com.apple.product-type.bundle"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 089C1669FE841209C02AAC07 /* Project object */ = { + isa = PBXProject; + buildConfigurationList = 4FADC23708B4156C00ABE55E /* Build configuration list for PBXProject "SqueakSSL" */; + compatibilityVersion = "Xcode 2.4"; + developmentRegion = English; + hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + ); + mainGroup = 089C166AFE841209C02AAC07 /* SqueakSSL */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 8D01CCC60486CAD60068D4B7 /* SqueakSSL */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 8D01CCC90486CAD60068D4B7 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 8D01CCCB0486CAD60068D4B7 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 73D8A6421701272700C66275 /* sqMacSSL.c in Sources */, + 73027B6B17012E5F0086D8E4 /* SqueakSSL.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 4FADC23408B4156C00ABE55E /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = SqueakSSL_Prefix.pch; + INFOPLIST_FILE = Info.plist; + INSTALL_PATH = "$(HOME)/Library/Bundles"; + PRODUCT_NAME = SqueakSSL; + WRAPPER_EXTENSION = bundle; + ZERO_LINK = YES; + }; + name = Debug; + }; + 4FADC23508B4156C00ABE55E /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = i386; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = SqueakSSL_Prefix.pch; + INFOPLIST_FILE = Info.plist; + INSTALL_PATH = "$(HOME)/Library/Bundles"; + PRODUCT_NAME = SqueakSSL; + WRAPPER_EXTENSION = bundle; + }; + name = Release; + }; + 4FADC23808B4156C00ABE55E /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon; + PREBINDING = NO; + SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; + }; + name = Debug; + }; + 4FADC23908B4156C00ABE55E /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon; + PREBINDING = NO; + SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 4FADC23308B4156C00ABE55E /* Build configuration list for PBXNativeTarget "SqueakSSL" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 4FADC23408B4156C00ABE55E /* Debug */, + 4FADC23508B4156C00ABE55E /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 4FADC23708B4156C00ABE55E /* Build configuration list for PBXProject "SqueakSSL" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 4FADC23808B4156C00ABE55E /* Debug */, + 4FADC23908B4156C00ABE55E /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 089C1669FE841209C02AAC07 /* Project object */; +} Added: branches/Cog/macbuild/SqueakSSL/SqueakSSL_Prefix.pch =================================================================== --- branches/Cog/macbuild/SqueakSSL/SqueakSSL_Prefix.pch (rev 0) +++ branches/Cog/macbuild/SqueakSSL/SqueakSSL_Prefix.pch 2013-04-04 18:39:10 UTC (rev 2713) @@ -0,0 +1,5 @@ +// +// Prefix header for all source files of the 'Template' target in the 'Template' project. +// + +#include <Carbon/Carbon.h> Modified: branches/Cog/macbuild/Template/Template.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/macbuild/Template/Template.xcodeproj/project.pbxproj 2013-04-04 05:05:14 UTC (rev 2712) +++ branches/Cog/macbuild/Template/Template.xcodeproj/project.pbxproj 2013-04-04 18:39:10 UTC (rev 2713) @@ -149,7 +149,6 @@ COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = Template_Prefix.pch; @@ -164,12 +163,8 @@ 4FADC23508B4156C00ABE55E /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); + ARCHS = i386; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = Template_Prefix.pch; INFOPLIST_FILE = Info.plist; @@ -186,7 +181,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon; PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; }; name = Debug; }; @@ -197,7 +192,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon; PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; }; name = Release; }; Modified: branches/Cog/macbuild/makeclean =================================================================== --- branches/Cog/macbuild/makeclean 2013-04-04 05:05:14 UTC (rev 2712) +++ branches/Cog/macbuild/makeclean 2013-04-04 18:39:10 UTC (rev 2713) @@ -1,3 +1,3 @@ #!/bin/bash -rm -r ./build ./*/build ./plugin-projects/*/build ./Fast.app ./Debug.app ./Assert.app ./Croquet.app +rm -r ./build ./*/build ./plugin-projects/*/build ./Fast.app ./Debug.app ./Assert.app ./Croquet.app ./Squeak.app Modified: branches/Cog/macbuild/makevm =================================================================== --- branches/Cog/macbuild/makevm 2013-04-04 05:05:14 UTC (rev 2712) +++ branches/Cog/macbuild/makevm 2013-04-04 18:39:10 UTC (rev 2713) @@ -1,13 +1,14 @@ #!/bin/bash # Build a "complete" Mac VM consisting of CoreVM/CoreMTVM + Plugins. -# By default build the Deployment configuration into Croquet.app. +# By default build the Deployment configuration into $APP (Squeak.app) IFS=' ' BUILD_CONFIGURATION=Deployment NSD_BUILD_CONFIGURATION=Deployment XCD_BUILD_CONFIGURATION=Release +APP=Squeak.app VMAPP=".app" -DEST="Croquet" +DEST="Squeak" VMXCP=CoreVM SFP=SqueakFFIPrims KEEP= @@ -36,7 +37,7 @@ echo ' -d: compile Development configuration in Debug.app for debugging' echo ' -m: compile the multi-threaded version of the target, e.g. FastMT.app instead of Fast.app' echo ' -s: compile DeploymentSymbols configuration in Fast.app for partial debugging' - echo ' -k: keep (do not delete) the existing Croquet.app prior to the build' + echo " -k: keep (do not delete) the existing $APP prior to the build" echo ' -h: display this help' exit 0;; esac @@ -61,9 +62,9 @@ echo $VMXCP xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION if [ -d "$DEST" ]; then - mv build/$BUILD_CONFIGURATION/Croquet.app/* "$DEST" + mv build/$BUILD_CONFIGURATION/$APP/* "$DEST" else - mv build/$BUILD_CONFIGURATION/Croquet.app "$DEST" + mv build/$BUILD_CONFIGURATION/$APP "$DEST" fi ../scripts/versionInfoPlist ../platforms CoreVM.plist "$DEST/Contents/Info.plist" @@ -101,6 +102,13 @@ rm -rf "$DEST/Contents/Resources/SqueakFFIPrims.bundle" cp -R $SFP/build/$NSD_BUILD_CONFIGURATION/SqueakFFIPrims.bundle "$DEST/Contents/Resources" +# Build the SSL plugin (New as of 25 March 2013) +echo +echo SqueakSSL xcodebuild -project SqueakSSL/SqueakSSL.xcodeproj -configuration $XCD_BUILD_CONFIGURATION +xcodebuild -project SqueakSSL/SqueakSSL.xcodeproj -configuration $XCD_BUILD_CONFIGURATION +rm -rf "$DEST/Contents/Resources/SqueakSSL.bundle" +cp -R SqueakSSL/build/$XCD_BUILD_CONFIGURATION/SqueakSSL.bundle "$DEST/Contents/Resources" + # Build the BochsIA32Plugin # N.B. To build the plugin you also have to build the Bochs libraries in # ../processors/IA32/bochs. cd ../processors/IA32/bochs. Run conf.COG & makeem. Modified: branches/Cog/macbuild/plugins.ext =================================================================== --- branches/Cog/macbuild/plugins.ext 2013-04-04 05:05:14 UTC (rev 2712) +++ branches/Cog/macbuild/plugins.ext 2013-04-04 18:39:10 UTC (rev 2713) @@ -3,6 +3,7 @@ BochsIA32Plugin \ CroquetPlugin \ SqueakFFIPrims \ +SqueakSSL \ FloatArrayPlugin \ FloatMathPlugin \ Mpeg3Plugin \ Added: branches/Cog/macbuild/resources/ProjectBuilder/GreenCogSqueak.icns =================================================================== (Binary files differ) Property changes on: branches/Cog/macbuild/resources/ProjectBuilder/GreenCogSqueak.icns ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: branches/Cog/nscogbuild/cygwinbuild/Makefile =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/Makefile 2013-04-04 05:05:14 UTC (rev 2712) +++ branches/Cog/nscogbuild/cygwinbuild/Makefile 2013-04-04 18:39:10 UTC (rev 2713) @@ -165,7 +165,8 @@ # Note: RC compiles the .rc files into linkable .o files # RC:= windres -RCFLAGS:= --include-dir $(PLATDIR)/win32/misc -D_WIN32 +SVNREV:= $(shell sed -e "s/^static.*SvnRawRevisionString.*Rev: $[0-9][0-9]*$.*/\\1/p" -e d $(PLATDIR)/Cross/vm/sqSCCSVersion.h) +RCFLAGS:= --include-dir $(PLATDIR)/win32/misc -D_WIN32 -DFILEVERSIONVALUES=4,0,$(SVNREV),0 '-DFILEVERSIONSTRING=\"4.0.$(SVNREV)\\0\"' .SUFFIXES: .SUFFIXES: .ccg .cc .c .o .s .i .rc .res .cg .hg .ccg .cpp Modified: branches/Cog/nscogbuild/cygwinbuild/nsvm.rc =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/nsvm.rc 2013-04-04 05:05:14 UTC (rev 2712) +++ branches/Cog/nscogbuild/cygwinbuild/nsvm.rc 2013-04-04 18:39:10 UTC (rev 2713) @@ -11,4 +11,30 @@ #endif CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "nsvm.exe.manifest" + +1 VERSIONINFO + FILEVERSION FILEVERSIONVALUES + PRODUCTVERSION 4,0,0,0 + FILEFLAGSMASK 0x3fL + FILEFLAGS 0xaL + FILEOS 0x10001L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904E4" // Lang=US English, CharSet=Windows Multilin + BEGIN + VALUE "CompanyName", "newspeaklanguage.org\0" + VALUE "FileDescription", "Newsqueak Cog Virtual Machine\0" + VALUE "FileVersion", FILEVERSIONSTRING + VALUE "ProductName", "Newsqueak Cog\0" + VALUE "ProductVersion", "4.0\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END #endif Modified: branches/Cog/nscogbuild/cygwinbuild/plugins.ext =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/plugins.ext 2013-04-04 05:05:14 UTC (rev 2712) +++ branches/Cog/nscogbuild/cygwinbuild/plugins.ext 2013-04-04 18:39:10 UTC (rev 2713) @@ -1,2 +1,4 @@ # Copied, perhaps edited, from ../../nscogsrc/examplePlugins.ext +# N.B. SqueakSSL is not ready for prime time. Compiles but does not link fully. +# See platforms/win32/plugins/SqueakSSL/Makefile EXTERNAL_PLUGINS = Added: branches/Cog/nscogbuild/macbuild/SqueakSSL/Info.plist =================================================================== --- branches/Cog/nscogbuild/macbuild/SqueakSSL/Info.plist (rev 0) +++ branches/Cog/nscogbuild/macbuild/SqueakSSL/Info.plist 2013-04-04 18:39:10 UTC (rev 2713) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>CFBundleDevelopmentRegion</key> + <string>English</string> + <key>CFBundleExecutable</key> + <string>SquealSSL</string> + <key>CFBundleIconFile</key> + <string></string> + <key>CFBundleIdentifier</key> + <string>org.squeak.Cog.SqueakSSL</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundlePackageType</key> + <string>BNDL</string> + <key>CFBundleSignature</key> + <string>FAST</string> + <key>CFBundleVersion</key> + <string>1.0</string> + <key>CFBundleShortVersionString</key> + <string>1.0</string> + <key>CSResourcesFileMapped</key> + <true/> +</dict> +</plist> Added: branches/Cog/nscogbuild/macbuild/SqueakSSL/SqueakSSL.xcodeproj/eliot.mode1v3 =================================================================== --- branches/Cog/nscogbuild/macbuild/SqueakSSL/SqueakSSL.xcodeproj/eliot.mode1v3 (rev 0) +++ branches/Cog/nscogbuild/macbuild/SqueakSSL/SqueakSSL.xcodeproj/eliot.mode1v3 2013-04-04 18:39:10 UTC (rev 2713) @@ -0,0 +1,1367 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>ActivePerspectiveName</key> + <string>Project</string> + <key>AllowedModules</key> + <array> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>n</string> + <key>Module</key> + <string>PBXSmartGroupTreeModule</string> + <key>Name</key> + <string>Groups and Files Outline View</string> + </dict> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>n</string> + <key>Module</key> + <string>PBXNavigatorGroup</string> + <key>Name</key> + <string>Editor</string> + </dict> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>n</string> + <key>Module</key> + <string>XCTaskListModule</string> + <key>Name</key> + <string>Task List</string> + </dict> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>n</string> + <key>Module</key> + <string>XCDetailModule</string> + <key>Name</key> + <string>File and Smart Group Detail Viewer</string> + </dict> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>1</string> + <key>Module</key> + <string>PBXBuildResultsModule</string> + <key>Name</key> + <string>Detailed Build Results Viewer</string> + </dict> + <dict> + <key>BundleLoadPath</key> + <string></string> @@ Diff output truncated at 50000 characters. @@

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev April 2013