Vm-dev February 2013

vm-dev@lists.squeakfoundation.org

34 participants
108 discussions

Intermittent failures on InterpreterVM build
by Frank Shearar 16 Feb '13

16 Feb '13

http://build.squeak.org/job/InterpreterVM/200/console shows a successful build of r2688 http://build.squeak.org/job/InterpreterVM/201/console shows a failed build of r2688 The failure was because the watchdog timer killed the build. I don't know the ins and outs of either the script driving it (I've glanced at it, but haven't taken the time to understand it) nor of VMMaker, but when I've had builds hang it's normally for the extremely unhelpful reason of a dialog popping up on a screen noone will see, either notifying of an error or asking the user a question. frank

2 2

Issue 121 in cog: cannot download image from ci.lille.inria.fr
by cog＠googlecode.com 16 Feb '13

16 Feb '13

Status: New Owner: ---- Labels: Type-Defect Priority-Medium New issue 121 by renaud.d...(a)gmail.com: cannot download image from ci.lille.inria.fr http://code.google.com/p/cog/issues/detail?id=121 What steps will reproduce the problem? 1. checkout cog vm source from gitorious 2. run ./cogVM/image/newImage.sh The following output happen: $ ./cogVM/image/newImage.sh LOADING PREBUILT IMAGE https://ci.lille.inria.fr/pharo/job/Cog%20Git%20Tracker/lastSuccessfulBuild… --2013-02-15 18:35:55-- https://ci.lille.inria.fr/pharo/job/Cog%20Git%20Tracker/lastSuccessfulBuild… Resolving ci.lille.inria.fr (ci.lille.inria.fr)... 193.49.213.180 Connecting to ci.lille.inria.fr (ci.lille.inria.fr)|193.49.213.180|:443... connected. HTTP request sent, awaiting response... 404 Not Found 2013-02-15 18:35:56 ERROR 404: Not Found. FETCHING FRESH IMAGE https://ci.lille.inria.fr/pharo/job/Pharo%201.4/lastSuccessfulBuild/artifac… --2013-02-15 18:35:56-- https://ci.lille.inria.fr/pharo/job/Pharo%201.4/lastSuccessfulBuild/artifac… Resolving ci.lille.inria.fr (ci.lille.inria.fr)... 193.49.213.180 Connecting to ci.lille.inria.fr (ci.lille.inria.fr)|193.49.213.180|:443... connected. HTTP request sent, awaiting response... 404 Not Found 2013-02-15 18:35:58 ERROR 404: Not Found. UNZIPPING /home/gnome/source/image.zip Archive: image.zip End-of-central-directory signature not found. Either this file is not a zipfile, or it constitutes one disk of a multi-part archive. In the latter case the central directory and zipfile comment will be found on the last disk(s) of this archive. unzip: cannot find zipfile directory in one of image.zip or image.zip.zip, and cannot find image.zip.ZIP, period. What is the expected output? What do you see instead? I don't expect error 404 for downloading the image. The last version of the image should be downloaded What version of the product are you using? On what operating system? Linux fedora 18 64bits. -- You received this message because this project is configured to send all issue notifications to this address. You may adjust your notification preferences at: https://code.google.com/hosting/settings

2 2

Re: [Vm-dev] VM Maker: VMMaker-tpr.300.mcz
by David T. Lewis 16 Feb '13

16 Feb '13

On Fri, Feb 15, 2013 at 11:27:15PM +0000, commits(a)source.squeak.org wrote: > > tim Rowledge uploaded a new version of VMMaker to project VM Maker: > http://source.squeak.org/VMMaker/VMMaker-tpr.300.mcz > Yay! Welcome back tpr. I updated the generated sources in SVN trunk/src accordingly. Dave

1 1

[commit][2688] update makefile & add obey file to run it in TaskWindow
by commits＠squeakvm.org 16 Feb '13

16 Feb '13

Revision: 2688 Author: rowledge Date: 2013-02-15 17:30:41 -0800 (Fri, 15 Feb 2013) Log Message: ----------- update makefile & add obey file to run it in TaskWindow Modified Paths: -------------- trunk/platforms/RiscOS/misc/ToCopy/MakeFile Added Paths: ----------- trunk/platforms/RiscOS/misc/ToCopy/Obeyfile Modified: trunk/platforms/RiscOS/misc/ToCopy/MakeFile =================================================================== --- trunk/platforms/RiscOS/misc/ToCopy/MakeFile 2013-02-16 01:25:45 UTC (rev 2687) +++ trunk/platforms/RiscOS/misc/ToCopy/MakeFile 2013-02-16 01:30:41 UTC (rev 2688) @@ -1,6 +1,5 @@ -# Project: sq38plugin -# Make the pluginised VM for v3.8 -# Reworked to use VMMaker non-copying of platform & cross files +# Project: squeak vm 4.4 +# Make the pluginised VM for v4.4 # Add check for Squeak3D dir to optionally compile the Squeak3D plugin # Ditto for HostWindow and LocalePlugin @@ -37,8 +36,9 @@ HWTestFile= $(SPlug).HostWindowPlugin.dsc.HostWindowPlugin LocaleTestFile= $(Plug).LocalePlugin.dsc.LocalePlugin -pluginList= ADPCMCodecPlugin B2DPlugin BitBltPlugin BMPReadWriterPlugin DSAPrims FFTPlugin FilePlugin FileCopyPlugin FloatArrayPlugin GeniePlugin JPEGReaderPlugin JPEGReadWriter2Plugin LargeIntegers Matrix2x3Plugin MiscPrimitivePlugin RePlugin ScratchPlugin SecurityPlugin SocketPlugin SoundCodecPrims SoundGenerationPlugin SoundPlugin StarSqueakPlugin SurfacePlugin ZipPlugin +pluginList= ADPCMCodecPlugin B2DPlugin BitBltPlugin BMPReadWriterPlugin DSAPrims FFTPlugin FilePlugin FileCopyPlugin FloatArrayPlugin GeniePlugin JPEGReaderPlugin JPEGReadWriter2Plugin LargeIntegers Matrix2x3Plugin MiscPrimitivePlugin SecurityPlugin SoundCodecPrims SoundGenerationPlugin SoundPlugin StarSqueakPlugin SurfacePlugin ZipPlugin +notYetList=SocketPlugin ScratchPlugin RePlugin # Final targets: all: plugins vm @@ -844,7 +844,7 @@ -a $(SPlug).SoundGenerationPlugin.o.SoundGenerationPlugin $(SPlug).SoundGenerationPlugin.o.SoundGenerationPlugin: $(SPlug).SoundGenerationPlugin.c.SoundGenerationPlugin $(PlHdr) - cc $(ccflags) -o $@ $*.c + cc $(ccflags) -I$(CPlug).SoundGenerationPlugin -o $@ $*.c Added: trunk/platforms/RiscOS/misc/ToCopy/Obeyfile =================================================================== --- trunk/platforms/RiscOS/misc/ToCopy/Obeyfile (rev 0) +++ trunk/platforms/RiscOS/misc/ToCopy/Obeyfile 2013-02-16 01:30:41 UTC (rev 2688) @@ -0,0 +1,2 @@ +Dir <Obey$dir> +amu -v all THROWBACK=-throwback \ No newline at end of file Property changes on: trunk/platforms/RiscOS/misc/ToCopy/Obeyfile ___________________________________________________________________ Added: svn:riscosfiletype + fd7

1 0

[commit][2686] add stub sqFileStdioHandlesInto function
by commits＠squeakvm.org 16 Feb '13

16 Feb '13

Revision: 2686 Author: rowledge Date: 2013-02-15 17:24:14 -0800 (Fri, 15 Feb 2013) Log Message: ----------- add stub sqFileStdioHandlesInto function Modified Paths: -------------- trunk/platforms/RiscOS/plugins/FilePlugin/sqFilePluginBasicPrims.c Modified: trunk/platforms/RiscOS/plugins/FilePlugin/sqFilePluginBasicPrims.c =================================================================== --- trunk/platforms/RiscOS/plugins/FilePlugin/sqFilePluginBasicPrims.c 2013-02-16 01:23:05 UTC (rev 2685) +++ trunk/platforms/RiscOS/plugins/FilePlugin/sqFilePluginBasicPrims.c 2013-02-16 01:24:14 UTC (rev 2686) @@ -403,6 +403,10 @@ return true; } +sqInt sqFileStdioHandlesInto(SQFile files[3]) { + return 0; +} + size_t sqFileReadIntoAt(SQFile *f, size_t count, char* byteArrayIndex, size_t startIndex) { /* Read count bytes from the given file into byteArray starting at * startIndex. byteArray is the address of the first byte of a

1 0

[commit][2685] update all int to sqInt etc
by commits＠squeakvm.org 16 Feb '13

16 Feb '13

Revision: 2685 Author: rowledge Date: 2013-02-15 17:23:05 -0800 (Fri, 15 Feb 2013) Log Message: ----------- update all int to sqInt etc Modified Paths: -------------- trunk/platforms/RiscOS/plugins/SoundPlugin/sqRPCSound.c Modified: trunk/platforms/RiscOS/plugins/SoundPlugin/sqRPCSound.c =================================================================== --- trunk/platforms/RiscOS/plugins/SoundPlugin/sqRPCSound.c 2013-02-16 01:22:12 UTC (rev 2684) +++ trunk/platforms/RiscOS/plugins/SoundPlugin/sqRPCSound.c 2013-02-16 01:23:05 UTC (rev 2685) @@ -228,7 +228,7 @@ /* module initialization/shutdown */ /**********************************/ -int soundInit(void) { +sqInt soundInit(void) { // make sure all state variables are setup ok sound_initialised = false; sound_handle = 0; @@ -241,7 +241,7 @@ return true; } -int soundShutdown(void) { +sqInt soundShutdown(void) { // close down the streams etc PRINTF(("soundShutdown\n")); @@ -257,7 +257,7 @@ /* sound output */ /****************/ -int snd_AvailableSpace(void) { +sqInt snd_AvailableSpace(void) { // Returns the number of bytes of available sound output buffer space. // This should be (frames*4) if the device is in stereo mode, @@ -271,7 +271,7 @@ return (sound_buffersize - sm_bufferstats(sound_stream)); } -int snd_InsertSamplesFromLeadTime(int frameCount, int srcBufPtr, int samplesOfLeadTime) { +sqInt snd_InsertSamplesFromLeadTime(sqInt frameCount, void *srcBufPtr, sqInt samplesOfLeadTime) { /* Insert a buffer's worth of sound samples into the currently playing buffer. Used to make a sound start playing as quickly as possible. The @@ -285,7 +285,7 @@ return 0; } -int snd_PlaySamplesFromAtLength(int frameCount, int arrayIndex, int startIndex) { +sqInt snd_PlaySamplesFromAtLength(sqInt frameCount, void *arrayIndex, sqInt startIndex) { // Output a frameCount sound samplesfrom the passed in array, starting from startIndex. // return the number actually 'played'; though no one uses it if (!sound_initialised) { @@ -294,12 +294,12 @@ return false; } PRINTF(("snd_PlaySamplesFrom: %d At: %d Length: %d", arrayIndex, startIndex, frameCount)); - sm_addblock(sound_stream, (unsigned char *)(arrayIndex + startIndex), BYTESFROMSAMPLES(frameCount)); + sm_addblock(sound_stream, (unsigned char *)((int)arrayIndex + startIndex), BYTESFROMSAMPLES(frameCount)); ssb_pause(sound_handle, false); return frameCount; } -int snd_PlaySilence(void) { +sqInt snd_PlaySilence(void) { /* Output a buffer's worth of silence. Returns the number of sample frames played. */ // What? Doesn't appear to be used, has no readily apparent purpose PRINTF(("snd_PlaySilence\n")); @@ -307,7 +307,7 @@ return 42; } -int snd_Start(int frameCount, int samplesPerSec, int stereo, int semaIndex) { +sqInt snd_Start(sqInt frameCount, sqInt samplesPerSec, sqInt stereo, sqInt semaIndex) { // Start the buffered sound output with the given buffer size, sample rate, stereo flag and semaphore index. extern char sqTaskName[]; @@ -349,7 +349,7 @@ return true; } -int snd_Stop(void) { +sqInt snd_Stop(void) { PRINTF(("snd_Stop\n")); // cancel any further signalling // setupSoundSignalling(NULL, NULL, NULL); @@ -395,15 +395,15 @@ /***************/ -int snd_SetRecordLevel(int level) { - return null; +void snd_SetRecordLevel(sqInt level) { + return; } -int snd_StartRecording(int desiredSamplesPerSec, int stereo, int semaIndex) { +sqInt snd_StartRecording(sqInt desiredSamplesPerSec, sqInt stereo, sqInt semaIndex) { return null; } -int snd_StopRecording(void) { +sqInt snd_StopRecording(void) { return null; } @@ -411,6 +411,6 @@ return (double)1.0; } -int snd_RecordSamplesIntoAtLength(int buf, int startSliceIndex, int bufferSizeInBytes) { +sqInt snd_RecordSamplesIntoAtLength(void *buf, sqInt startSliceIndex, sqInt bufferSizeInBytes) { return null; }

1 0

[commit][2684] header file name changed
by commits＠squeakvm.org 16 Feb '13

16 Feb '13

Revision: 2684 Author: rowledge Date: 2013-02-15 17:22:12 -0800 (Fri, 15 Feb 2013) Log Message: ----------- header file name changed Modified Paths: -------------- trunk/platforms/RiscOS/plugins/ScratchPlugin/sqRPCScratchOps.c Modified: trunk/platforms/RiscOS/plugins/ScratchPlugin/sqRPCScratchOps.c =================================================================== --- trunk/platforms/RiscOS/plugins/ScratchPlugin/sqRPCScratchOps.c 2013-02-16 01:00:46 UTC (rev 2683) +++ trunk/platforms/RiscOS/plugins/ScratchPlugin/sqRPCScratchOps.c 2013-02-16 01:22:12 UTC (rev 2684) @@ -23,7 +23,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -#include "scratchOps.h" +#include "ScratchPlugin.h" #include <stdlib.h> #include <string.h> #include <stdio.h>

1 0

[commit][2683] Sources as per VMMaker-tpr.300
by commits＠squeakvm.org 16 Feb '13

16 Feb '13

Revision: 2683 Author: lewis Date: 2013-02-15 17:00:46 -0800 (Fri, 15 Feb 2013) Log Message: ----------- Sources as per VMMaker-tpr.300 Many small changes to correct C type clashes. Primtives now declared as void foo() instead of sqInt foo(). PrimitiveTable corrected to suit and all prim calling & lookup matched. isBytes() added to VMPluginCodeGenerator>emithCHeaderForPrimitivesOn: to support changed MiscPrimitivesPlugin 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/SlangTestSupportPlugin/SlangTestSupportPlugin.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/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-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/ckformat.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -5,7 +5,7 @@ /* Usage: ckformat imageFileName */ /* --- DO NOT EDIT THIS FILE --- */ -/* --- Automatically generated from class ImageFormat 2013-01-04T00:29:08.108-05:00--- */ +/* --- Automatically generated from class ImageFormat 2013-02-15T19:50:54.446-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-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:46 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -43,6 +43,7 @@ #define fetchFloatofObject(idx,oop) (interpreterProxy->fetchFloatofObject(idx,oop)) #define fetchIntegerofObject(idx,oop) (interpreterProxy->fetchIntegerofObject(idx,oop)) #define floatValueOf(oop) (interpreterProxy->floatValueOf(oop)) +#define isBytes(oop) (interpreterProxy->isBytes(oop)) #define pop(n) (interpreterProxy->pop(n)) #define pushInteger(n) (interpreterProxy->pushInteger(n)) #define sizeOfSTArrayFromCPrimitive(cPtr) (interpreterProxy->sizeOfSTArrayFromCPrimitive(cPtr)) @@ -62,9 +63,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ADPCMCodecPlugin 4 January 2013 (i)" + "ADPCMCodecPlugin 15 February 2013 (i)" #else - "ADPCMCodecPlugin 4 January 2013 (e)" + "ADPCMCodecPlugin 15 February 2013 (e)" #endif ; Modified: trunk/src/plugins/AioPlugin/AioPlugin.c =================================================================== --- trunk/src/plugins/AioPlugin/AioPlugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/AioPlugin/AioPlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:07 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:54 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -81,9 +81,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AioPlugin 4 January 2013 (i)" + "AioPlugin 15 February 2013 (i)" #else - "AioPlugin 4 January 2013 (e)" + "AioPlugin 15 February 2013 (e)" #endif ; Modified: trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c =================================================================== --- trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:46 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -60,9 +60,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AsynchFilePlugin 4 January 2013 (i)" + "AsynchFilePlugin 15 February 2013 (i)" #else - "AsynchFilePlugin 4 January 2013 (e)" + "AsynchFilePlugin 15 February 2013 (e)" #endif ; static void * sCOAFfn; Modified: trunk/src/plugins/B2DPlugin/B2DPlugin.c =================================================================== --- trunk/src/plugins/B2DPlugin/B2DPlugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/B2DPlugin/B2DPlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:01 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:47 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -414,9 +414,9 @@ static void * loadBBFn; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B2DPlugin 4 January 2013 (i)" + "B2DPlugin 15 February 2013 (i)" #else - "B2DPlugin 4 January 2013 (e)" + "B2DPlugin 15 February 2013 (e)" #endif ; static int* objBuffer; Modified: trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c =================================================================== --- trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:04 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:51 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -90,9 +90,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B3DAcceleratorPlugin 4 January 2013 (i)" + "B3DAcceleratorPlugin 15 February 2013 (i)" #else - "B3DAcceleratorPlugin 4 January 2013 (e)" + "B3DAcceleratorPlugin 15 February 2013 (e)" #endif ; Modified: trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c =================================================================== --- trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:46 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -51,9 +51,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BMPReadWriterPlugin 4 January 2013 (i)" + "BMPReadWriterPlugin 15 February 2013 (i)" #else - "BMPReadWriterPlugin 4 January 2013 (e)" + "BMPReadWriterPlugin 15 February 2013 (e)" #endif ; Modified: trunk/src/plugins/BitBltPlugin/BitBltPlugin.c =================================================================== --- trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:01 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:48 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -237,9 +237,9 @@ }; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BitBltPlugin 4 January 2013 (i)" + "BitBltPlugin 15 February 2013 (i)" #else - "BitBltPlugin 4 January 2013 (e)" + "BitBltPlugin 15 February 2013 (e)" #endif ; static sqInt nWords; Modified: trunk/src/plugins/CameraPlugin/CameraPlugin.c =================================================================== --- trunk/src/plugins/CameraPlugin/CameraPlugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/CameraPlugin/CameraPlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:05 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:51 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -57,9 +57,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "CameraPlugin 4 January 2013 (i)" + "CameraPlugin 15 February 2013 (i)" #else - "CameraPlugin 4 January 2013 (e)" + "CameraPlugin 15 February 2013 (e)" #endif ; Modified: trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c =================================================================== --- trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:05 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:51 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -54,9 +54,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ClipboardExtendedPlugin 4 January 2013 (i)" + "ClipboardExtendedPlugin 15 February 2013 (i)" #else - "ClipboardExtendedPlugin 4 January 2013 (e)" + "ClipboardExtendedPlugin 15 February 2013 (e)" #endif ; Modified: trunk/src/plugins/CroquetPlugin/CroquetPlugin.c =================================================================== --- trunk/src/plugins/CroquetPlugin/CroquetPlugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/CroquetPlugin/CroquetPlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:01 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:48 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -63,9 +63,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "CroquetPlugin 4 January 2013 (i)" + "CroquetPlugin 15 February 2013 (i)" #else - "CroquetPlugin 4 January 2013 (e)" + "CroquetPlugin 15 February 2013 (e)" #endif ; Modified: trunk/src/plugins/DBusPlugin/DBusPlugin.c =================================================================== --- trunk/src/plugins/DBusPlugin/DBusPlugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/DBusPlugin/DBusPlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:05 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:51 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -136,9 +136,9 @@ static DBusMessageIter messageIter[DBUS_MAXIMUM_TYPE_RECURSION_DEPTH]; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DBusPlugin 4 January 2013 (i)" + "DBusPlugin 15 February 2013 (i)" #else - "DBusPlugin 4 January 2013 (e)" + "DBusPlugin 15 February 2013 (e)" #endif ; static DBusMessage* writeMessage; Modified: trunk/src/plugins/DSAPrims/DSAPrims.c =================================================================== --- trunk/src/plugins/DSAPrims/DSAPrims.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/DSAPrims/DSAPrims.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:01 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:48 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -60,9 +60,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DSAPrims 4 January 2013 (i)" + "DSAPrims 15 February 2013 (i)" #else - "DSAPrims 4 January 2013 (e)" + "DSAPrims 15 February 2013 (e)" #endif ; static sqInt remainderDigitCount; Modified: trunk/src/plugins/DropPlugin/DropPlugin.c =================================================================== --- trunk/src/plugins/DropPlugin/DropPlugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/DropPlugin/DropPlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:02 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:48 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -55,9 +55,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DropPlugin 4 January 2013 (i)" + "DropPlugin 15 February 2013 (i)" #else - "DropPlugin 4 January 2013 (e)" + "DropPlugin 15 February 2013 (e)" #endif ; Modified: trunk/src/plugins/FFTPlugin/FFTPlugin.c =================================================================== --- trunk/src/plugins/FFTPlugin/FFTPlugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/FFTPlugin/FFTPlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:02 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:48 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -61,9 +61,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FFTPlugin 4 January 2013 (i)" + "FFTPlugin 15 February 2013 (i)" #else - "FFTPlugin 4 January 2013 (e)" + "FFTPlugin 15 February 2013 (e)" #endif ; static sqInt nu; Modified: trunk/src/plugins/FT2Plugin/FT2Plugin.c =================================================================== --- trunk/src/plugins/FT2Plugin/FT2Plugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/FT2Plugin/FT2Plugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:02 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:48 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -115,9 +115,9 @@ static FT_Library library; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FT2Plugin 4 January 2013 (i)" + "FT2Plugin 15 February 2013 (i)" #else - "FT2Plugin 4 January 2013 (e)" + "FT2Plugin 15 February 2013 (e)" #endif ; Modified: trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c =================================================================== --- trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:05 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:51 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -50,9 +50,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FileCopyPlugin 4 January 2013 (i)" + "FileCopyPlugin 15 February 2013 (i)" #else - "FileCopyPlugin 4 January 2013 (e)" + "FileCopyPlugin 15 February 2013 (e)" #endif ; Modified: trunk/src/plugins/FilePlugin/FilePlugin.c =================================================================== --- trunk/src/plugins/FilePlugin/FilePlugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/FilePlugin/FilePlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:02 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:48 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -87,9 +87,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FilePlugin 4 January 2013 (i)" + "FilePlugin 15 February 2013 (i)" #else - "FilePlugin 4 January 2013 (e)" + "FilePlugin 15 February 2013 (e)" #endif ; static void * sCCPfn; @@ -748,7 +748,7 @@ return interpreterProxy->primitiveFail(); } } - validMask = sqFileStdioHandlesInto((&fileRecords)); + validMask = sqFileStdioHandlesInto(fileRecords); if (validMask == 0) { return interpreterProxy->primitiveFail(); } Modified: trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c =================================================================== --- trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:02 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:49 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -63,9 +63,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FloatArrayPlugin 4 January 2013 (i)" + "FloatArrayPlugin 15 February 2013 (i)" #else - "FloatArrayPlugin 4 January 2013 (e)" + "FloatArrayPlugin 15 February 2013 (e)" #endif ; Modified: trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c =================================================================== --- trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:02 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:49 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -72,9 +72,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FloatMathPlugin 4 January 2013 (i)" + "FloatMathPlugin 15 February 2013 (i)" #else - "FloatMathPlugin 4 January 2013 (e)" + "FloatMathPlugin 15 February 2013 (e)" #endif ; Modified: trunk/src/plugins/GeniePlugin/GeniePlugin.c =================================================================== --- trunk/src/plugins/GeniePlugin/GeniePlugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/GeniePlugin/GeniePlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:02 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:49 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -54,9 +54,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "GeniePlugin v2.0 4 January 2013 (i)" + "GeniePlugin v2.0 15 February 2013 (i)" #else - "GeniePlugin v2.0 4 January 2013 (e)" + "GeniePlugin v2.0 15 February 2013 (e)" #endif ; Modified: trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c =================================================================== --- trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:06 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:52 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -59,9 +59,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "HostWindowPlugin 4 January 2013 (i)" + "HostWindowPlugin 15 February 2013 (i)" #else - "HostWindowPlugin 4 January 2013 (e)" + "HostWindowPlugin 15 February 2013 (e)" #endif ; Modified: trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c =================================================================== --- trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:02 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:49 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -61,9 +61,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JPEGReadWriter2Plugin 4 January 2013 (i)" + "JPEGReadWriter2Plugin 15 February 2013 (i)" #else - "JPEGReadWriter2Plugin 4 January 2013 (e)" + "JPEGReadWriter2Plugin 15 February 2013 (e)" #endif ; Modified: trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c =================================================================== --- trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:02 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:49 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -129,9 +129,9 @@ static sqInt jsReadLimit; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JPEGReaderPlugin 4 January 2013 (i)" + "JPEGReaderPlugin 15 February 2013 (i)" #else - "JPEGReaderPlugin 4 January 2013 (e)" + "JPEGReaderPlugin 15 February 2013 (e)" #endif ; static int *residuals; Modified: trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c =================================================================== --- trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:03 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:49 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -55,9 +55,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JoystickTabletPlugin 4 January 2013 (i)" + "JoystickTabletPlugin 15 February 2013 (i)" #else - "JoystickTabletPlugin 4 January 2013 (e)" + "JoystickTabletPlugin 15 February 2013 (e)" #endif ; Modified: trunk/src/plugins/Klatt/Klatt.c =================================================================== --- trunk/src/plugins/Klatt/Klatt.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/Klatt/Klatt.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:03 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:49 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -148,9 +148,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "Klatt 4 January 2013 (i)" + "Klatt 15 February 2013 (i)" #else - "Klatt 4 January 2013 (e)" + "Klatt 15 February 2013 (e)" #endif ; static float nlast; Modified: trunk/src/plugins/LargeIntegers/LargeIntegers.c =================================================================== --- trunk/src/plugins/LargeIntegers/LargeIntegers.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/LargeIntegers/LargeIntegers.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:03 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:49 pm + by VMMaker 4.10.12 */ #include <math.h> Modified: trunk/src/plugins/LocalePlugin/LocalePlugin.c =================================================================== --- trunk/src/plugins/LocalePlugin/LocalePlugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/LocalePlugin/LocalePlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:03 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:49 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -64,9 +64,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "LocalePlugin 4 January 2013 (i)" + "LocalePlugin 15 February 2013 (i)" #else - "LocalePlugin 4 January 2013 (e)" + "LocalePlugin 15 February 2013 (e)" #endif ; Modified: trunk/src/plugins/MIDIPlugin/MIDIPlugin.c =================================================================== --- trunk/src/plugins/MIDIPlugin/MIDIPlugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/MIDIPlugin/MIDIPlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:06 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:53 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -63,9 +63,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "MIDIPlugin 4 January 2013 (i)" + "MIDIPlugin 15 February 2013 (i)" #else - "MIDIPlugin 4 January 2013 (e)" + "MIDIPlugin 15 February 2013 (e)" #endif ; Modified: trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c =================================================================== --- trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:03 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:50 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -67,9 +67,9 @@ static double m23ResultY; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "Matrix2x3Plugin 4 January 2013 (i)" + "Matrix2x3Plugin 15 February 2013 (i)" #else - "Matrix2x3Plugin 4 January 2013 (e)" + "Matrix2x3Plugin 15 February 2013 (e)" #endif ; Modified: trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c =================================================================== --- trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:03 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:50 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -43,6 +43,7 @@ #define fetchFloatofObject(idx,oop) (interpreterProxy->fetchFloatofObject(idx,oop)) #define fetchIntegerofObject(idx,oop) (interpreterProxy->fetchIntegerofObject(idx,oop)) #define floatValueOf(oop) (interpreterProxy->floatValueOf(oop)) +#define isBytes(oop) (interpreterProxy->isBytes(oop)) #define pop(n) (interpreterProxy->pop(n)) #define pushInteger(n) (interpreterProxy->pushInteger(n)) #define sizeOfSTArrayFromCPrimitive(cPtr) (interpreterProxy->sizeOfSTArrayFromCPrimitive(cPtr)) @@ -62,9 +63,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "MiscPrimitivePlugin 4 January 2013 (i)" + "MiscPrimitivePlugin 15 February 2013 (i)" #else - "MiscPrimitivePlugin 4 January 2013 (e)" + "MiscPrimitivePlugin 15 February 2013 (e)" #endif ; Modified: trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c =================================================================== --- trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:06 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:53 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -94,9 +94,9 @@ static sqInt maximumNumberOfFilesToWatch; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "Mpeg3Plugin 4 January 2013 (i)" + "Mpeg3Plugin 15 February 2013 (i)" #else - "Mpeg3Plugin 4 January 2013 (e)" + "Mpeg3Plugin 15 February 2013 (e)" #endif ; static mpeg3_t *mpegFiles[1024+1]; Modified: trunk/src/plugins/RePlugin/RePlugin.c =================================================================== --- trunk/src/plugins/RePlugin/RePlugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/RePlugin/RePlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:03 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:50 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -72,9 +72,9 @@ static sqInt matchFlags; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "RePlugin 4 January 2013 (i)" + "RePlugin 15 February 2013 (i)" #else - "RePlugin 4 January 2013 (e)" + "RePlugin 15 February 2013 (e)" #endif ; static int netMemory = 0; Modified: trunk/src/plugins/RomePlugin/RomePlugin.c =================================================================== --- trunk/src/plugins/RomePlugin/RomePlugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/RomePlugin/RomePlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:07 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:53 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -192,9 +192,9 @@ static sqInt maxSurfaceID; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "RomePlugin yo.39 4 January 2013 (i)" + "RomePlugin yo.39 15 February 2013 (i)" #else - "RomePlugin yo.39 4 January 2013 (e)" + "RomePlugin yo.39 15 February 2013 (e)" #endif ; static fn_ioRegisterSurface registerSurfaceFn; Modified: trunk/src/plugins/ScratchPlugin/ScratchPlugin.c =================================================================== --- trunk/src/plugins/ScratchPlugin/ScratchPlugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/ScratchPlugin/ScratchPlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:07 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:53 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -82,9 +82,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ScratchPlugin 4 January 2013 (i)" + "ScratchPlugin 15 February 2013 (i)" #else - "ScratchPlugin 4 January 2013 (e)" + "ScratchPlugin 15 February 2013 (e)" #endif ; Modified: trunk/src/plugins/SecurityPlugin/SecurityPlugin.c =================================================================== --- trunk/src/plugins/SecurityPlugin/SecurityPlugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/SecurityPlugin/SecurityPlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:03 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:50 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -73,9 +73,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SecurityPlugin 4 January 2013 (i)" + "SecurityPlugin 15 February 2013 (i)" #else - "SecurityPlugin 4 January 2013 (e)" + "SecurityPlugin 15 February 2013 (e)" #endif ; Modified: trunk/src/plugins/SerialPlugin/SerialPlugin.c =================================================================== --- trunk/src/plugins/SerialPlugin/SerialPlugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/SerialPlugin/SerialPlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:03 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:50 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -60,9 +60,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SerialPlugin 4 January 2013 (i)" + "SerialPlugin 15 February 2013 (i)" #else - "SerialPlugin 4 January 2013 (e)" + "SerialPlugin 15 February 2013 (e)" #endif ; Modified: trunk/src/plugins/SlangTestSupportPlugin/SlangTestSupportPlugin.c =================================================================== --- trunk/src/plugins/SlangTestSupportPlugin/SlangTestSupportPlugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/SlangTestSupportPlugin/SlangTestSupportPlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:04 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:50 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -70,9 +70,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SlangTestSupportPlugin 4 January 2013 (i)" + "SlangTestSupportPlugin 15 February 2013 (i)" #else - "SlangTestSupportPlugin 4 January 2013 (e)" + "SlangTestSupportPlugin 15 February 2013 (e)" #endif ; Modified: trunk/src/plugins/SocketPlugin/SocketPlugin.c =================================================================== --- trunk/src/plugins/SocketPlugin/SocketPlugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/SocketPlugin/SocketPlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:04 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:50 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -122,9 +122,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SocketPlugin 4 January 2013 (i)" + "SocketPlugin 15 February 2013 (i)" #else - "SocketPlugin 4 January 2013 (e)" + "SocketPlugin 15 February 2013 (e)" #endif ; static void * sCCLOPfn; Modified: trunk/src/plugins/SoundCodecPrims/SoundCodecPrims.c =================================================================== --- trunk/src/plugins/SoundCodecPrims/SoundCodecPrims.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/SoundCodecPrims/SoundCodecPrims.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:04 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:50 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -53,9 +53,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SoundCodecPrims 4 January 2013 (i)" + "SoundCodecPrims 15 February 2013 (i)" #else - "SoundCodecPrims 4 January 2013 (e)" + "SoundCodecPrims 15 February 2013 (e)" #endif ; Modified: trunk/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c =================================================================== --- trunk/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:04 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:50 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -44,6 +44,7 @@ #define fetchFloatofObject(idx,oop) (interpreterProxy->fetchFloatofObject(idx,oop)) #define fetchIntegerofObject(idx,oop) (interpreterProxy->fetchIntegerofObject(idx,oop)) #define floatValueOf(oop) (interpreterProxy->floatValueOf(oop)) +#define isBytes(oop) (interpreterProxy->isBytes(oop)) #define pop(n) (interpreterProxy->pop(n)) #define pushInteger(n) (interpreterProxy->pushInteger(n)) #define sizeOfSTArrayFromCPrimitive(cPtr) (interpreterProxy->sizeOfSTArrayFromCPrimitive(cPtr)) @@ -68,9 +69,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SoundGenerationPlugin 4 January 2013 (i)" + "SoundGenerationPlugin 15 February 2013 (i)" #else - "SoundGenerationPlugin 4 January 2013 (e)" + "SoundGenerationPlugin 15 February 2013 (e)" #endif ; Modified: trunk/src/plugins/SoundPlugin/SoundPlugin.c =================================================================== --- trunk/src/plugins/SoundPlugin/SoundPlugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/SoundPlugin/SoundPlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:04 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:50 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -66,9 +66,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SoundPlugin 4 January 2013 (i)" + "SoundPlugin 15 February 2013 (i)" #else - "SoundPlugin 4 January 2013 (e)" + "SoundPlugin 15 February 2013 (e)" #endif ; Modified: trunk/src/plugins/Squeak3D/Squeak3D.c =================================================================== --- trunk/src/plugins/Squeak3D/Squeak3D.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/Squeak3D/Squeak3D.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:04 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:51 pm + by VMMaker 4.10.12 */ #include <math.h> Modified: trunk/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c =================================================================== --- trunk/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:05 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:51 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -125,9 +125,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SqueakFFIPrims 4 January 2013 (i)" + "SqueakFFIPrims 15 February 2013 (i)" #else - "SqueakFFIPrims 4 January 2013 (e)" + "SqueakFFIPrims 15 February 2013 (e)" #endif ; Modified: trunk/src/plugins/StarSqueakPlugin/StarSqueakPlugin.c =================================================================== --- trunk/src/plugins/StarSqueakPlugin/StarSqueakPlugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/StarSqueakPlugin/StarSqueakPlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:04 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:50 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -52,9 +52,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "StarSqueakPlugin 4 January 2013 (i)" + "StarSqueakPlugin 15 February 2013 (i)" #else - "StarSqueakPlugin 4 January 2013 (e)" + "StarSqueakPlugin 15 February 2013 (e)" #endif ; Modified: trunk/src/plugins/UUIDPlugin/UUIDPlugin.c =================================================================== --- trunk/src/plugins/UUIDPlugin/UUIDPlugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/UUIDPlugin/UUIDPlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:07 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:53 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -53,9 +53,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "UUIDPlugin 4 January 2013 (i)" + "UUIDPlugin 15 February 2013 (i)" #else - "UUIDPlugin 4 January 2013 (e)" + "UUIDPlugin 15 February 2013 (e)" #endif ; Modified: trunk/src/plugins/UnicodePlugin/UnicodePlugin.c =================================================================== --- trunk/src/plugins/UnicodePlugin/UnicodePlugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/UnicodePlugin/UnicodePlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:07 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:53 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -62,9 +62,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "UnicodePlugin 4 January 2013 (i)" + "UnicodePlugin 15 February 2013 (i)" #else - "UnicodePlugin 4 January 2013 (e)" + "UnicodePlugin 15 February 2013 (e)" #endif ; Modified: trunk/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c =================================================================== --- trunk/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:07 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:54 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -218,9 +218,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "UnixOSProcessPlugin 4 January 2013 (i)" + "UnixOSProcessPlugin 15 February 2013 (i)" #else - "UnixOSProcessPlugin 4 January 2013 (e)" + "UnixOSProcessPlugin 15 February 2013 (e)" #endif ; static void *originalSigHandlers[NSIG]; Modified: trunk/src/plugins/WeDoPlugin/WeDoPlugin.c =================================================================== --- trunk/src/plugins/WeDoPlugin/WeDoPlugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/WeDoPlugin/WeDoPlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:08 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:54 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -54,9 +54,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "WeDoPlugin 4 January 2013 (i)" + "WeDoPlugin 15 February 2013 (i)" #else - "WeDoPlugin 4 January 2013 (e)" + "WeDoPlugin 15 February 2013 (e)" #endif ; Modified: trunk/src/plugins/XDisplayControlPlugin/XDisplayControlPlugin.c =================================================================== --- trunk/src/plugins/XDisplayControlPlugin/XDisplayControlPlugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/XDisplayControlPlugin/XDisplayControlPlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:08 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:54 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -70,9 +70,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "XDisplayControlPlugin 4 January 2013 (i)" + "XDisplayControlPlugin 15 February 2013 (i)" #else - "XDisplayControlPlugin 4 January 2013 (e)" + "XDisplayControlPlugin 15 February 2013 (e)" #endif ; static int osprocessSandboxSecurity; Modified: trunk/src/plugins/ZipPlugin/ZipPlugin.c =================================================================== --- trunk/src/plugins/ZipPlugin/ZipPlugin.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/plugins/ZipPlugin/ZipPlugin.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 4 January 2013 12:29:02 am - by VMMaker 4.10.8 +/* Automatically generated from Squeak on 15 February 2013 7:50:48 pm + by VMMaker 4.10.12 */ #include <math.h> @@ -78,9 +78,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ZipPlugin 4 January 2013 (i)" + "ZipPlugin 15 February 2013 (i)" #else - "ZipPlugin 4 January 2013 (e)" + "ZipPlugin 15 February 2013 (e)" #endif ; static unsigned int zipBaseDistance[] = { Modified: trunk/src/vm/interp.c =================================================================== --- trunk/src/vm/interp.c 2013-02-14 06:15:00 UTC (rev 2682) +++ trunk/src/vm/interp.c 2013-02-16 01:00:46 UTC (rev 2683) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 13 February 2013 8:00:24 am - by VMMaker 4.10.11 +/* Automatically generated from Squeak on 15 February 2013 7:50:45 pm + by VMMaker 4.10.12 */ #if 1 # define SQ_USE_GLOBAL_STRUCT 1 @@ -158,7 +158,7 @@ #define InitialIPIndex 4 #define InstanceSpecificationIndex 2 #define InstructionPointerIndex 1 -#define InterpreterSourceVersion "4.10.11" +#define InterpreterSourceVersion "4.10.12" #define InvokeCallbackSelector 53 #define LargeContextBit 262144 #define LastLinkIndex 1 @@ -233,7 +233,7 @@ EXPORT(sqInt) addGCRoot(sqInt *varLoc); #pragma export off sqInt addNewMethodToCache(void); -sqInt addToExternalPrimitiveTable(void *functionAddress); +sqInt addToExternalPrimitiveTable(void (*functionAddress)(void)); sqInt adjustAllOopsBy(sqInt bytesToShift); sqInt allYoungand(sqInt array1, sqInt array2); sqInt allocateChunk(sqInt byteSize); @@ -251,7 +251,7 @@ sqInt byteSizeOf(sqInt oop); sqInt byteSwapByteObjectsFromto(sqInt startOop, sqInt stopAddr); sqInt byteSwapped(sqInt w); -sqInt callExternalPrimitive(void *functionID); +sqInt callExternalPrimitive(void *functionID(void)); #pragma export on EXPORT(sqInt) callInterpreter(void); EXPORT(sqInt) callbackEnter(sqInt *callbackID); @@ -305,8 +305,8 @@ sqInt copyBitsFromtoat(sqInt x0, sqInt x1, sqInt y); sqInt copyObjtoSegmentaddrstopAtsaveOopAtheaderAt(sqInt oop, sqInt segmentWordArray, sqInt lastSeg, sqInt stopAddr, sqInt oopPtr, sqInt hdrPtr); sqInt createActualMessageTo(sqInt aClass); -sqInt dispatchFunctionPointer(void *aFunctionPointer); -sqInt dispatchFunctionPointerOnin(sqInt primIdx, void *primTable[]); +sqInt dispatchFunctionPointer(void (*aFunctionPointer)(void)); +sqInt dispatchFunctionPointerOnin(sqInt primIdx, void (*primTable[])(void)); sqInt displayBitsOfLeftTopRightBottom(sqInt aForm, sqInt l, sqInt t, sqInt r, sqInt b); sqInt displayObject(void); sqInt doPrimitiveDivby(sqInt rcvr, sqInt arg); @@ -460,7 +460,7 @@ sqInt primitiveArrayBecomeOneWay(void); sqInt primitiveArrayBecomeOneWayCopyHash(void); sqInt primitiveAsFloat(void); -sqInt primitiveAsOop(void); +void primitiveAsOop(void); sqInt primitiveAt(void); sqInt primitiveAtPut(void); sqInt primitiveBeCursor(void); @@ -483,7 +483,7 @@ #pragma export on EXPORT(sqInt) primitiveBitXorLargeIntegers(void); #pragma export off -sqInt primitiveBlockCopy(void); +void primitiveBlockCopy(void); sqInt primitiveBytesLeft(void); sqInt primitiveCalloutToFFI(void); sqInt primitiveChangeClass(void); @@ -492,14 +492,14 @@ #pragma export off sqInt primitiveClass(void); sqInt primitiveClipboardText(void); -sqInt primitiveClone(void); -sqInt primitiveClosureCopyWithCopiedValues(void); -sqInt primitiveClosureValue(void); -sqInt primitiveClosureValueNoContextSwitch(void); -sqInt primitiveClosureValueWithArgs(void); +void primitiveClone(void); +void primitiveClosureCopyWithCopiedValues(void); +void primitiveClosureValue(void); +void primitiveClosureValueNoContextSwitch(void); +void primitiveClosureValueWithArgs(void); sqInt primitiveConstantFill(void); -sqInt primitiveCopyObject(void); -sqInt primitiveDeferDisplayUpdates(void); +void primitiveCopyObject(void); +void primitiveDeferDisplayUpdates(void); #pragma export on EXPORT(sqInt) primitiveDisablePowerManager(void); #pragma export off @@ -511,25 +511,25 @@ #pragma export on EXPORT(sqInt) primitiveDivideLargeIntegers(void); #pragma export off -sqInt primitiveDoPrimitiveWithArgs(void); +void primitiveDoPrimitiveWithArgs(void); sqInt primitiveEqual(void); #pragma export on EXPORT(sqInt) primitiveEqualLargeIntegers(void); #pragma export off -sqInt primitiveExecuteMethod(void); -sqInt primitiveExecuteMethodArgsArray(void); +void primitiveExecuteMethod(void); +void primitiveExecuteMethodArgsArray(void); sqInt primitiveExitToDebugger(void); sqInt primitiveExp(void); sqInt primitiveExponent(void); -sqInt primitiveExternalCall(void); +void primitiveExternalCall(void); sqInt primitiveFail(void); sqInt primitiveFailFor(sqInt reasonCode); sqInt primitiveFindHandlerContext(void); sqInt primitiveFindNextUnwindContext(void); sqInt primitiveFloatAdd(void); sqInt primitiveFloatAddtoArg(sqInt rcvrOop, sqInt argOop); -sqInt primitiveFloatAt(void); -sqInt primitiveFloatAtPut(void); +void primitiveFloatAt(void); +void primitiveFloatAtPut(void); sqInt primitiveFloatDivide(void); sqInt primitiveFloatDividebyArg(sqInt rcvrOop, sqInt argOop); sqInt primitiveFloatEqual(void); @@ -548,8 +548,8 @@ sqInt primitiveFloatSubtract(void); sqInt primitiveFloatSubtractfromArg(sqInt rcvrOop, sqInt argOop); sqInt primitiveFlushCache(void); -sqInt primitiveFlushCacheByMethod(void); -sqInt primitiveFlushCacheSelective(void); +void primitiveFlushCacheByMethod(void); +void primitiveFlushCacheSelective(void); sqInt primitiveFlushExternalPrimitives(void); sqInt primitiveForceDisplayUpdate(void); #pragma export on @@ -585,7 +585,7 @@ EXPORT(sqInt) primitiveInterpreterSourceVersion(void); #pragma export off sqInt primitiveInterruptSemaphore(void); -sqInt primitiveInvokeObjectAsMethod(void); +void primitiveInvokeObjectAsMethod(void); #pragma export on EXPORT(sqInt) primitiveIsRoot(void); EXPORT(sqInt) primitiveIsYoung(void); @@ -603,7 +603,7 @@ sqInt primitiveListBuiltinModule(void); sqInt primitiveListExternalModule(void); sqInt primitiveLoadImageSegment(void); -sqInt primitiveLoadInstVar(void); +void primitiveLoadInstVar(void); #pragma export on EXPORT(sqInt) primitiveLocalMicrosecondClock(void); #pragma export off @@ -645,21 +645,21 @@ sqInt primitiveObjectAt(void); sqInt primitiveObjectAtPut(void); sqInt primitiveObjectPointsTo(void); -sqInt primitivePerform(void); +void primitivePerform(void); sqInt primitivePerformAt(sqInt lookupClass); -sqInt primitivePerformInSuperclass(void); -sqInt primitivePerformWithArgs(void); +void primitivePerformInSuperclass(void); +void primitivePerformWithArgs(void); #pragma export on EXPORT(sqInt) primitivePlatformSourceVersion(void); #pragma export off -sqInt primitivePushFalse(void); -sqInt primitivePushMinusOne(void); -sqInt primitivePushNil(void); -sqInt primitivePushOne(void); -sqInt primitivePushSelf(void); -sqInt primitivePushTrue(void); -sqInt primitivePushTwo(void); -sqInt primitivePushZero(void); +void primitivePushFalse(void); +void primitivePushMinusOne(void); +void primitivePushNil(void); +void primitivePushOne(void); +void primitivePushSelf(void); +void primitivePushTrue(void); +void primitivePushTwo(void); +void primitivePushZero(void); sqInt primitiveQuit(void); sqInt primitiveQuo(void); #pragma export on @@ -670,7 +670,7 @@ EXPORT(sqInt) primitiveRemLargeIntegers(void); #pragma export off sqInt primitiveResponse(void); -sqInt primitiveResume(void); +void primitiveResume(void); #pragma export on EXPORT(sqInt) primitiveRootTable(void); EXPORT(sqInt) primitiveRootTableAt(void); @@ -695,7 +695,7 @@ sqInt primitiveShowDisplayRect(void); sqInt primitiveSignal(void); sqInt primitiveSignalAtBytesLeft(void); -sqInt primitiveSignalAtMilliseconds(void); +void primitiveSignalAtMilliseconds(void); sqInt primitiveSine(void); sqInt primitiveSize(void); sqInt primitiveSnapshot(void); @@ -705,7 +705,7 @@ sqInt primitiveSpecialObjectsOop(void); sqInt primitiveSquareRoot(void); sqInt primitiveStoreImageSegment(void); -sqInt primitiveStoreStackp(void); +void primitiveStoreStackp(void); sqInt primitiveStringAt(void); @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker-tpr.300.mcz
by commits＠source.squeak.org 16 Feb '13

16 Feb '13

tim Rowledge uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-tpr.300.mcz ==================== Summary ==================== Name: VMMaker-tpr.300 Author: tpr Time: 15 February 2013, 3:26:56.447 pm UUID: 2d4c7ece-80c7-4ed6-b819-638fbe64a983 Ancestors: VMMaker-dtl.298 Many small changes to correct C type clashes. Primtives now declared as void foo() instead of sqInt foo(). PrimitiveTable corrected to suit and all prim calling & lookup matched. isBytes() added to VMPluginCodeGenerator>emithCHeaderForPrimitivesOn: to support changed MiscPrimitivesPlugin =============== Diff against VMMaker-dtl.298 =============== Item was changed: ----- Method: FilePlugin>>primitiveFileStdioHandles (in category 'file primitives') ----- primitiveFileStdioHandles "Answer an Array of file handles for standard in, standard out and standard error, with nil in entries that are unvailable, e.g. because the platform does not provide standard error, etc. Fail if there are no standard i/o facilities on the platform or if the security plugin denies access or if memory runs out." | fileRecords result validMask | <export: true> <var: 'fileRecords' declareC: 'SQFile fileRecords[3]'> sHFAfn ~= 0 ifTrue: [(self cCode: ' ((sqInt (*)(void))sHFAfn)()' inSmalltalk: [true]) ifFalse: [^interpreterProxy primitiveFail]]. + validMask := self sqFileStdioHandlesInto: (fileRecords). - validMask := self sqFileStdioHandlesInto: (self addressOf: fileRecords). validMask = 0 ifTrue: [^interpreterProxy primitiveFail]. result := interpreterProxy instantiateClass: interpreterProxy classArray indexableSize: 3. result = nil ifTrue: [^interpreterProxy primitiveFail]. interpreterProxy pushRemappableOop: result. 0 to: 2 do: [:index| | r | (validMask bitAnd: (1 << index)) ~= 0 ifTrue: [result := interpreterProxy instantiateClass: interpreterProxy classByteArray indexableSize: self fileRecordSize. result = nil ifTrue: [interpreterProxy popRemappableOop. ^interpreterProxy primitiveFail]. r := interpreterProxy popRemappableOop. interpreterProxy storePointer: index ofObject: r withValue: result. interpreterProxy pushRemappableOop: r. self mem: (interpreterProxy firstIndexableField: result) cp: (self addressOf: (fileRecords at: index)) y: self fileRecordSize]]. result := interpreterProxy popRemappableOop. interpreterProxy pop: 1 thenPush: result! Item was changed: ----- Method: Interpreter class>>declareCVarsIn: (in category 'translation') ----- + declareCVarsIn: aCCodeGenerator + aCCodeGenerator addHeaderFile: '<setjmp.h>'. + aCCodeGenerator var: #interpreterProxy type: #'struct VirtualMachine*'. + aCCodeGenerator var: #primitiveTable declareC: 'void (*primitiveTable[' , (MaxPrimitiveIndex + 2) printString , '] )(void)= ' , self primitiveTableString. + "declare primitiveTable as an array of pointers to a function returning void, taking no arguments" + aCCodeGenerator var: #primitiveFunctionPointer declareC: 'void (*primitiveFunctionPointer)(void)'. + "keep this matching the declaration for primitiveTable" + self primitiveTable do: + [:symbolOrNot| + (symbolOrNot isSymbol + and: [symbolOrNot ~~ #primitiveFail]) ifTrue: + [(aCCodeGenerator methodNamed: symbolOrNot) ifNotNil: + [:tMethod| tMethod returnType: #void]]]. + "make sure al the primitves are declared returning void" + aCCodeGenerator var: #methodCache declareC: 'long methodCache[' , (MethodCacheSize + 1) printString , ']'. + aCCodeGenerator var: #atCache declareC: 'sqInt atCache[' , (AtCacheTotalSize + 1) printString , ']'. + aCCodeGenerator var: #statGCTime type: #sqLong. + aCCodeGenerator var: #statFullGCMSecs type: #sqLong. + aCCodeGenerator var: #statIGCDeltaTime type: #sqLong. + aCCodeGenerator var: #statIncrGCMSecs type: #sqLong. - declareCVarsIn: aCCodeGenerator - aCCodeGenerator addHeaderFile:'<setjmp.h>'. - aCCodeGenerator - var: #interpreterProxy - type: #'struct VirtualMachine*'. - aCCodeGenerator - var: #primitiveTable - declareC: 'void *primitiveTable[', (MaxPrimitiveIndex +2) printString, '] = ', self primitiveTableString. - aCCodeGenerator - var: #primitiveFunctionPointer - declareC: 'void (*primitiveFunctionPointer)()'. - aCCodeGenerator - var: #methodCache - declareC: 'long methodCache[', (MethodCacheSize + 1) printString, ']'. - aCCodeGenerator - var: #atCache - declareC: 'sqInt atCache[', (AtCacheTotalSize + 1) printString, ']'. - aCCodeGenerator var: #statGCTime type: #'sqLong'. - aCCodeGenerator var: #statFullGCMSecs type: #'sqLong'. - aCCodeGenerator var: #statIGCDeltaTime type: #'sqLong'. - aCCodeGenerator var: #statIncrGCMSecs type: #'sqLong'. aCCodeGenerator var: #localIP type: #'char*'. aCCodeGenerator var: #localSP type: #'char*'. aCCodeGenerator var: #showSurfaceFn type: #'void*'. + aCCodeGenerator var: 'semaphoresToSignalA' declareC: 'sqInt semaphoresToSignalA[' , (SemaphoresToSignalSize + 1) printString , ']'. + aCCodeGenerator var: 'semaphoresToSignalB' declareC: 'sqInt semaphoresToSignalB[' , (SemaphoresToSignalSize + 1) printString , ']'. + aCCodeGenerator var: #compilerHooks declareC: 'sqInt (*compilerHooks[' , (CompilerHooksSize + 1) printString , '])()'. + aCCodeGenerator var: #interpreterVersion declareC: 'const char *interpreterVersion = "' , SmalltalkImage current datedVersion , ' [' , SmalltalkImage current lastUpdateString , ']"'. + aCCodeGenerator var: #externalPrimitiveTable declareC: 'void (*externalPrimitiveTable[' , (MaxExternalPrimitiveTableSize + 1) printString , '])(void)'. + self declareCAsOop: {#instructionPointer. #method. #newMethod. #activeContext. #theHomeContext. #stackPointer} in: aCCodeGenerator. + aCCodeGenerator var: #jmpBuf declareC: 'jmp_buf jmpBuf[' , (MaxJumpBuf + 1) printString , ']'. + aCCodeGenerator var: #suspendedCallbacks declareC: 'sqInt suspendedCallbacks[' , (MaxJumpBuf + 1) printString , ']'. + aCCodeGenerator var: #suspendedMethods declareC: 'sqInt suspendedMethods[' , (MaxJumpBuf + 1) printString , ']'. - aCCodeGenerator var: 'semaphoresToSignalA' - declareC: 'sqInt semaphoresToSignalA[', (SemaphoresToSignalSize + 1) printString, ']'. - aCCodeGenerator var: 'semaphoresToSignalB' - declareC: 'sqInt semaphoresToSignalB[', (SemaphoresToSignalSize + 1) printString, ']'. - aCCodeGenerator - var: #compilerHooks - declareC: 'sqInt (*compilerHooks[', (CompilerHooksSize + 1) printString, '])()'. - aCCodeGenerator - var: #interpreterVersion - declareC: 'const char *interpreterVersion = "', SmalltalkImage current datedVersion, ' [', SmalltalkImage current lastUpdateString,']"'. - aCCodeGenerator - var: #externalPrimitiveTable - declareC: 'void *externalPrimitiveTable[', (MaxExternalPrimitiveTableSize + 1) printString, ']'. - - self declareCAsOop: { - #instructionPointer . - #method . - #newMethod . - #activeContext . - #theHomeContext . - #stackPointer } - in: aCCodeGenerator. - - aCCodeGenerator - var: #jmpBuf - declareC: 'jmp_buf jmpBuf[', (MaxJumpBuf + 1) printString, ']'. - aCCodeGenerator - var: #suspendedCallbacks - declareC: 'sqInt suspendedCallbacks[', (MaxJumpBuf + 1) printString, ']'. - aCCodeGenerator - var: #suspendedMethods - declareC: 'sqInt suspendedMethods[', (MaxJumpBuf + 1) printString, ']'. - "Reinitialized at interpreter entry by #initializeImageFormatVersion" + aCCodeGenerator var: #imageFormatVersionNumber declareC: 'sqInt imageFormatVersionNumber = 0'. + "Declared here to prevent inclusion in foo struct by + CCodeGeneratorGlobalStructure" + aCCodeGenerator var: #imageFormatInitialVersion declareC: 'sqInt imageFormatInitialVersion = 0'! - aCCodeGenerator - var: #imageFormatVersionNumber - declareC: 'sqInt imageFormatVersionNumber = 0'. - "Declared here to prevent inclusion in foo struct by CCodeGeneratorGlobalStructure" - aCCodeGenerator - var: #imageFormatInitialVersion - declareC: 'sqInt imageFormatInitialVersion = 0' - ! Item was changed: ----- Method: Interpreter class>>primitiveTableString (in category 'initialization') ----- primitiveTableString "Interpreter initializePrimitiveTable primitiveTableString" | table | table := self primitiveTable. ^ String streamContents: [:s | s nextPut: ${. table withIndexDo: [:primSpec :index | s cr; tab; nextPutAll: '/* '; nextPutAll: (index - 1) printString; nextPutAll: '*/ '; + nextPutAll: '(void (*)(void))'; "keep this matching the declaration of primitiveTable in Interpreter class>declareCVarsIn:" - nextPutAll: '(void *)'; nextPutAll: primSpec; nextPut: $,]. s cr; nextPutAll: ' 0 }']! Item was changed: ----- Method: Interpreter>>addToExternalPrimitiveTable: (in category 'plugin support') ----- addToExternalPrimitiveTable: functionAddress "Add the given function address to the external primitive table and return the index where it's stored. This function doesn't need to be fast since it is only called when an external primitive has been looked up (which takes quite a bit of time itself). So there's nothing specifically complicated here. Note: Return index will be one-based (ST convention)" + <var: #functionAddress declareC: 'void (*functionAddress)(void)'> - <var: #functionAddress declareC: 'void *functionAddress'> 0 to: MaxExternalPrimitiveTableSize-1 do: [ :i | (externalPrimitiveTable at: i) = 0 ifTrue: [ externalPrimitiveTable at: i put: functionAddress. ^i+1]]. "if no space left, return zero so it'll looked up again" ^0! Item was changed: ----- Method: Interpreter>>callExternalPrimitive: (in category 'plugin primitive support') ----- callExternalPrimitive: functionID "Call the external plugin function identified. In the VM this is an address, see InterpreterSimulator for it's version. " + <var: #functionID declareC: 'void *functionID(void)'> - <var: #functionID type: 'void *'> self dispatchFunctionPointer: functionID! Item was changed: ----- Method: Interpreter>>dispatchFunctionPointer: (in category 'message sending') ----- + dispatchFunctionPointer: aFunctionPointer + <var: #aFunctionPointer declareC: 'void (*aFunctionPointer)(void)'> + self + cCode: '(aFunctionPointer)()' + inSmalltalk: [self error: 'my simulator should simulate me']! - dispatchFunctionPointer: aFunctionPointer - - <var: #aFunctionPointer type: 'void *'> - self cCode: '((void (*)(void))aFunctionPointer)()' - inSmalltalk: [self error: 'my simulator should simulate me']! Item was changed: ----- Method: Interpreter>>dispatchFunctionPointerOn:in: (in category 'message sending') ----- dispatchFunctionPointerOn: primIdx in: primTable "Call the primitive at index primIdx in the primitiveTable." + <var: #primTable declareC: 'void (*primTable[])(void)'> - <var: #primTable declareC: 'void *primTable[]'> ^self dispatchFunctionPointer: (primTable at: primIdx)! Item was changed: ----- Method: Interpreter>>lookupInMethodCacheSel:class: (in category 'method lookup cache') ----- lookupInMethodCacheSel: selector class: class "This method implements a simple method lookup cache. If an entry for the given selector and class is found in the cache, set the values of 'newMethod' and 'primitiveIndex' and return true. Otherwise, return false." "About the re-probe scheme: The hash is the low bits of the XOR of two large addresses, minus their useless lowest two bits. If a probe doesn't get a hit, the hash is shifted right one bit to compute the next probe, introducing a new randomish bit. The cache is probed CacheProbeMax times before giving up." "WARNING: Since the hash computation is based on the object addresses of the class and selector, we must rehash or flush when compacting storage. We've chosen to flush, since that also saves the trouble of updating the addresses of the objects in the cache." | hash probe | <inline: true> hash := selector bitXor: class. "shift drops two low-order zeros from addresses" probe := hash bitAnd: MethodCacheMask. "first probe" (((methodCache at: probe + MethodCacheSelector) = selector) and: [(methodCache at: probe + MethodCacheClass) = class]) ifTrue: [newMethod := methodCache at: probe + MethodCacheMethod. primitiveIndex := methodCache at: probe + MethodCachePrim. newNativeMethod := methodCache at: probe + MethodCacheNative. + primitiveFunctionPointer := self cCoerce: (methodCache at: probe + MethodCachePrimFunction) to: 'void (*)(void)'. - primitiveFunctionPointer := self cCoerce: (methodCache at: probe + MethodCachePrimFunction) to: 'void *'. ^ true "found entry in cache; done"]. probe := (hash >> 1) bitAnd: MethodCacheMask. "second probe" (((methodCache at: probe + MethodCacheSelector) = selector) and: [(methodCache at: probe + MethodCacheClass) = class]) ifTrue: [newMethod := methodCache at: probe + MethodCacheMethod. primitiveIndex := methodCache at: probe + MethodCachePrim. newNativeMethod := methodCache at: probe + MethodCacheNative. + primitiveFunctionPointer := self cCoerce: (methodCache at: probe + MethodCachePrimFunction) to: 'void (*)(void)'. - primitiveFunctionPointer := self cCoerce: (methodCache at: probe + MethodCachePrimFunction) to: 'void *'. ^ true "found entry in cache; done"]. probe := (hash >> 2) bitAnd: MethodCacheMask. (((methodCache at: probe + MethodCacheSelector) = selector) and: [(methodCache at: probe + MethodCacheClass) = class]) ifTrue: [newMethod := methodCache at: probe + MethodCacheMethod. primitiveIndex := methodCache at: probe + MethodCachePrim. newNativeMethod := methodCache at: probe + MethodCacheNative. + primitiveFunctionPointer := self cCoerce: (methodCache at: probe + MethodCachePrimFunction) to: 'void (*)(void)'. - primitiveFunctionPointer := self cCoerce: (methodCache at: probe + MethodCachePrimFunction) to: 'void *'. ^ true "found entry in cache; done"]. ^ false ! Item was changed: ----- Method: Interpreter>>primitiveExternalCall (in category 'plugin primitives') ----- primitiveExternalCall "Call an external primitive. The external primitive methods contain as first literal an array consisting of: * The module name (String | Symbol) * The function name (String | Symbol) * The session ID (SmallInteger) [OBSOLETE] * The function index (Integer) in the externalPrimitiveTable For fast failures the primitive index of any method where the external prim is not found is rewritten in the method cache with zero. This allows for ultra fast responses as long as the method stays in the cache. The fast failure response relies on lkupClass being properly set. This is done in #addToMethodCacheSel:class:method:primIndex: to compensate for execution of methods that are looked up in a superclass (such as in primitivePerformAt). With the latest modifications (e.g., actually flushing the function addresses from the VM), the session ID is obsolete. But for backward compatibility it is still kept around. Also, a failed lookup is reported specially. If a method has been looked up and not been found, the function address is stored as -1 (e.g., the SmallInteger -1 to distinguish from 16rFFFFFFFF which may be returned from the lookup). It is absolutely okay to remove the rewrite if we run into any problems later on. It has an approximate speed difference of 30% per failed primitive call which may be noticable but if, for any reasons, we run into problems (like with J3) we can always remove the rewrite. " + | lit extFnAddr moduleName functionName moduleLength functionLength index | + <var: #extFnAddr declareC: 'void (*extFnAddr)(void)'> - | lit addr moduleName functionName moduleLength functionLength index | - <var: #addr type: 'void *'> "Fetch the first literal of the method" self success: (self literalCountOf: newMethod) > 0. "@@: Could this be omitted for speed?!!" self successful ifFalse: [^ nil]. lit := self literal: 0 ofMethod: newMethod. "Check if it's an array of length 4" self success: ((objectMemory isArray: lit) and: [(self lengthOf: lit) = 4]). self successful ifFalse: [^ nil]. "Look at the function index in case it has been loaded before" index := objectMemory fetchPointer: 3 ofObject: lit. index := self checkedIntegerValueOf: index. self successful ifFalse: [^ nil]. "Check if we have already looked up the function and failed." index < 0 ifTrue: ["Function address was not found in this session, Rewrite the mcache entry with a zero primitive index." self rewriteMethodCacheSel: messageSelector class: lkupClass primIndex: 0. ^ self success: false]. "Try to call the function directly" (index > 0 and: [index <= MaxExternalPrimitiveTableSize]) + ifTrue: [extFnAddr := externalPrimitiveTable at: index - 1. + extFnAddr ~= 0 + ifTrue: [self rewriteMethodCacheSel: messageSelector class: lkupClass primIndex: (1000 + index) primFunction: extFnAddr. + self callExternalPrimitive: extFnAddr. - ifTrue: [addr := externalPrimitiveTable at: index - 1. - addr ~= 0 - ifTrue: [self rewriteMethodCacheSel: messageSelector class: lkupClass primIndex: (1000 + index) primFunction: addr. - self callExternalPrimitive: addr. ^ nil]. "if we get here, then an index to the external prim was kept on the ST side although the underlying prim table was already flushed" ^ self primitiveFail]. "Clean up session id and external primitive index" objectMemory storePointerUnchecked: 2 ofObject: lit withValue: ConstZero. objectMemory storePointerUnchecked: 3 ofObject: lit withValue: ConstZero. "The function has not been loaded yet. Fetch module and function name." moduleName := objectMemory fetchPointer: 0 ofObject: lit. moduleName = objectMemory nilObj ifTrue: [moduleLength := 0] ifFalse: [self success: (objectMemory isBytes: moduleName). moduleLength := self lengthOf: moduleName. self cCode: '' inSmalltalk: [ (#('FloatArrayPlugin' 'Matrix2x3Plugin') includes: (self stringOf: moduleName)) ifTrue: [moduleLength := 0 "Cause all of these to fail"]]]. functionName := objectMemory fetchPointer: 1 ofObject: lit. self success: (objectMemory isBytes: functionName). functionLength := self lengthOf: functionName. self successful ifFalse: [^ nil]. + extFnAddr := self cCoerce: (self ioLoadExternalFunction: functionName + objectMemory baseHeaderSize - addr := self ioLoadExternalFunction: functionName + objectMemory baseHeaderSize OfLength: functionLength FromModule: moduleName + objectMemory baseHeaderSize + OfLength: moduleLength) to: 'void (*)(void)'. + extFnAddr = 0 - OfLength: moduleLength. - addr = 0 ifTrue: [index := -1] ifFalse: ["add the function to the external primitive table" + index := self addToExternalPrimitiveTable: extFnAddr]. - index := self addToExternalPrimitiveTable: addr]. self success: index >= 0. "Store the index (or -1 if failure) back in the literal" objectMemory storePointerUnchecked: 3 ofObject: lit withValue: (objectMemory integerObjectOf: index). "If the function has been successfully loaded process it" + (self successful and: [extFnAddr ~= 0]) + ifTrue: [self rewriteMethodCacheSel: messageSelector class: lkupClass primIndex: (1000 + index) primFunction: extFnAddr. + self callExternalPrimitive: extFnAddr] - (self successful and: [addr ~= 0]) - ifTrue: [self rewriteMethodCacheSel: messageSelector class: lkupClass primIndex: (1000 + index) primFunction: addr. - self callExternalPrimitive: addr] ifFalse: ["Otherwise rewrite the primitive index" self rewriteMethodCacheSel: messageSelector class: lkupClass primIndex: 0]! Item was changed: ----- Method: Interpreter>>rewriteMethodCacheSel:class:primIndex: (in category 'method lookup cache') ----- rewriteMethodCacheSel: selector class: class primIndex: localPrimIndex "Rewrite the cache entry with the given primitive index and matching function pointer" | primPtr | + <var: #primPtr declareC: 'void (*primPtr)(void)'> - <var: #primPtr type: 'void *'> <inline: false> localPrimIndex = 0 ifTrue: [primPtr := 0] ifFalse: [primPtr := primitiveTable at: localPrimIndex]. self rewriteMethodCacheSel: selector class: class primIndex: localPrimIndex primFunction: primPtr! Item was changed: ----- Method: Interpreter>>rewriteMethodCacheSel:class:primIndex:primFunction: (in category 'method lookup cache') ----- rewriteMethodCacheSel: selector class: class primIndex: localPrimIndex primFunction: localPrimAddress "Rewrite an existing entry in the method cache with a new primitive index & function address. Used by primExternalCall to make direct jumps to found external prims" | probe hash | <inline: false> + <var: #localPrimAddress declareC: 'void (*localPrimAddress)(void)'> - <var: #localPrimAddress type: 'void *'> hash := selector bitXor: class. 0 to: CacheProbeMax - 1 do: [:p | probe := hash >> p bitAnd: MethodCacheMask. ((methodCache at: probe + MethodCacheSelector) = selector and: [(methodCache at: probe + MethodCacheClass) = class]) ifTrue: [methodCache at: probe + MethodCachePrim put: localPrimIndex. methodCache at: probe + MethodCachePrimFunction put: (self cCoerce: localPrimAddress to: 'long'). ^ nil]]! Item was changed: ----- Method: VMMaker class>>versionString (in category 'version testing') ----- versionString "VMMaker versionString" + ^'4.10.12'! - ^'4.10.11'! Item was changed: ----- Method: VMPluginCodeGenerator>>emitCHeaderForPrimitivesOn: (in category 'C code generator') ----- emitCHeaderForPrimitivesOn: aStream "Write a C file header for compiled primitives onto the given stream." self emitCHeaderOn: aStream. aStream nextPutAll: ' /*** Proxy Functions ***/ #define stackValue(i) (interpreterProxy->stackValue(i)) #define stackIntegerValue(i) (interpreterProxy->stackIntegerValue(i)) #define successFlag (!!interpreterProxy->failed()) #define success(bool) (interpreterProxy->success(bool)) #define arrayValueOf(oop) (interpreterProxy->arrayValueOf(oop)) #define checkedIntegerValueOf(oop) (interpreterProxy->checkedIntegerValueOf(oop)) #define fetchArrayofObject(idx,oop) (interpreterProxy->fetchArrayofObject(idx,oop)) #define fetchFloatofObject(idx,oop) (interpreterProxy->fetchFloatofObject(idx,oop)) #define fetchIntegerofObject(idx,oop) (interpreterProxy->fetchIntegerofObject(idx,oop)) #define floatValueOf(oop) (interpreterProxy->floatValueOf(oop)) + #define isBytes(oop) (interpreterProxy->isBytes(oop)) #define pop(n) (interpreterProxy->pop(n)) #define pushInteger(n) (interpreterProxy->pushInteger(n)) #define sizeOfSTArrayFromCPrimitive(cPtr) (interpreterProxy->sizeOfSTArrayFromCPrimitive(cPtr)) #define storeIntegerofObjectwithValue(idx,oop,value) (interpreterProxy->storeIntegerofObjectwithValue(idx,oop,value)) #define primitiveFail() interpreterProxy->primitiveFail() /* allows accessing Strings in both C and Smalltalk */ #define asciiValue(c) c '. aStream cr.!

1 0

VM Maker: CMakeVMMaker-EstebanLorenzano.192.mcz
by commits＠source.squeak.org 15 Feb '13

15 Feb '13

Esteban Lorenzano uploaded a new version of CMakeVMMaker to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMaker-EstebanLorenzano.192.mcz ==================== Summary ==================== Name: CMakeVMMaker-EstebanLorenzano.192 Author: EstebanLorenzano Time: 15 February 2013, 5:43:34.616 pm UUID: 7e008166-acbf-40b5-b067-3282ac28fc6f Ancestors: CMakeVMMaker-EstebanLorenzano.191 - added setGlobalOptionsAfterDetermineSystem: to improve the control of cmake files generation - some minor refactors =============== Diff against CMakeVMMaker-EstebanLorenzano.191 =============== Item was changed: ----- Method: CMakeVMGenerator>>generate (in category 'code generation') ----- generate | intPlugins extPlugins | output := String new writeStream. config setGlobalOptions: self. self printHeader; project: config executableName. + config setGlobalOptionsAfterDetermineSystem: self. + config setupDirectories: self. self message: '${CMAKE_MODULE_PATH}'. self set: 'CMAKE_CONFIGURATION_TYPES' to: 'Release'. config preferredIncludes do: [ :each | self includeDirectories: each ]. self includeDirectories: self includeDirs. config standardIncludes do: [:each | self includeDirectories: each ]. self addDefinitions: config compilerFlags. config extraVMSettings: self. self puts: 'add_executable(' , config executableName, ' ', config executableType, ' ' , self sources , ')'. intPlugins := self generatePluginConfigs: config internalPlugins internal: true. extPlugins := self generatePluginConfigs: config externalPlugins internal: false. self processThirdpartyLibraries. self processPlugins: intPlugins, extPlugins. config setExtraTargetProperties: self. self cmd: 'target_link_libraries' params: self moduleName , ' ${LINKLIBS}'. config postBuildActions: self. self saveFile. self generateBuildScript.! Item was added: + ----- Method: CPlatformConfig>>setGlobalOptionsAfterDetermineSystem: (in category 'utils') ----- + setGlobalOptionsAfterDetermineSystem: maker + + "set any CMake global options, right after declare project and determine running system. + This is sometimes necesary to override cmake settings" + ! Item was changed: ----- Method: CocoaIOSConfig>>commonCompilerFlags (in category 'accessing') ----- commonCompilerFlags "Common compiler flags" + ^#('-arch i386' '-mmacosx-version-min=10.5' '-DHAVE_UUID_GENERATE')! - ^#('-arch i386' '-mmacosx-version-min=10.6' '-DHAVE_UUID_GENERATE')! Item was changed: ----- Method: CogCocoaIOSConfig>>commonCompilerFlags (in category 'settings') ----- commonCompilerFlags + ^super commonCompilerFlags, #('-DCOGVM')! - ^super commonCompilerFlags, #('-DCOGVM' '-fwrapv')! Item was changed: ----- Method: CogFamilyCocoaIOSConfig>>commonCompilerFlags (in category 'settings') ----- commonCompilerFlags ^super commonCompilerFlags, { '-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX', self sdkVersion, '.sdk'. '-funroll-loops'. '-fasm-blocks'. '-finline-functions'. '-mfpmath=sse'. '-march=pentium-m'. '-mtune=prescott'. '-falign-functions=16'. '-fno-gcse'. '-fno-cse-follow-jumps'. '-std=gnu99'. '-DBUILD_FOR_OSX'. "'-DUSE_INLINE_MEMORY_ACCESSORS=1' " '-DLSB_FIRST'. '-DHAVE_SYS_TIME_H'. '-DHAVE_NANOSLEEP'. '-DCOGMTVM=0'. '-DUSE_GLOBAL_STRUCT=0'. + '-DBASE_HEADER_SIZE=4'. + '-fwrapv' }! - '-DBASE_HEADER_SIZE=4' }! Item was changed: ----- Method: CogFamilyCocoaIOSConfig>>compilerFlagsRelease (in category 'settings') ----- compilerFlagsRelease ^#('-g0' '-O3' '-fomit-frame-pointer' '-DNDEBUG' '-DDEBUGVM=0')! Item was changed: ----- Method: CogFamilyCocoaIOSConfig>>setGlobalOptions: (in category 'settings') ----- setGlobalOptions: maker "set any CMake global options, before declaring a project in cmake file" maker set: 'CMAKE_C_COMPILER' to: '/usr/bin/gcc'. + maker set: 'CMAKE_CXX_COMPILER' to: '/usr/bin/g++'.! - maker set: 'CMAKE_CXX_COMPILER' to: '/usr/bin/g++'. - maker set: 'CMAKE_OSX_ARCHITECTURES' to: 'i386'. - maker set: 'CMAKE_OSX_DEPLOYMENT_TARGET' to: '10.6'. - - "maker set: 'CMAKE_OSX_SYSROOT' to: '/'." - maker - set: 'CMAKE_OSX_SYSROOT' - to: '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX', self sdkVersion, '.sdk'! Item was added: + ----- Method: CogFamilyCocoaIOSConfig>>setGlobalOptionsAfterDetermineSystem: (in category 'as yet unclassified') ----- + setGlobalOptionsAfterDetermineSystem: maker + + maker set: 'CMAKE_OSX_DEPLOYMENT_TARGET' to: '10.5'. + maker + set: 'CMAKE_OSX_SYSROOT' + to: '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX', self sdkVersion, '.sdk'! Item was changed: ----- Method: CogUnixConfig>>compilerFlagsRelease (in category 'compiler flags') ----- compilerFlagsRelease " + THIS FLAGS ARE CRASHING COMPILER - THIS FLAGS ARE CREASHING COMPILER - -fschedule-insns2 -fschedule-insns THIS FLAGS ARE CRASHING VM -ftree-pre THIS FLAGS ARE WORKING -O1 -fthread-jumps -falign-functions -falign-jumps -falign-loops -falign-labels -fcrossjumping -fcse-follow-jumps -fcse-skip-blocks -fdelete-null-pointer-checks -fdevirtualize -fexpensive-optimizations -fgcse -fgcse-lm -finline-small-functions -findirect-inlining -fipa-sra -foptimize-sibling-calls -fpartial-inlining -fpeephole2 -fregmove -freorder-blocks -frerun-cse-after-loop -fcaller-saves -freorder-functions -fsched-interblock -fsched-spec -fstrict-aliasing -fstrict-overflow -ftree-switch-conversion -ftree-vrp THIS IS LIKE: -O2 -fno-tree-pre " ^ '-g0 -O2 -fno-tree-pre -msse2 -D_GNU_SOURCE -DNDEBUG -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DDEBUGVM=0'! Item was added: + ----- Method: StackCocoaIOSConfig>>commonCompilerFlags (in category 'settings') ----- + commonCompilerFlags + ^super commonCompilerFlags, #('-DSTACKVM')! Item was removed: - ----- Method: StackCocoaIOSConfig>>compilerFlagsRelease (in category 'settings') ----- - compilerFlagsRelease - ^super compilerFlagsRelease, #('-DSTACKVM')!

1 0

← Newer
1
...
5
6
7
8
9
10
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev February 2013