Vm-dev December 2013

vm-dev@lists.squeakfoundation.org

27 participants
102 discussions

[ANN] SqueakJS
by Bert Freudenberg 23 Dec '13

23 Dec '13

Hi all, I'm proud to announce SqueakJS, a new Squeak VM that runs on Javascript: http://bertfreudenberg.github.io/SqueakJS/ It was inspired by Dan's JSqueak/Potato VM for Java, and similarly only runs the old Squeak 2.2 mini.image for now. But I developed it inside the Lively Kernel, which allowed me to make a nice UI to look inside the VM (in addition to all the Lively tools): It represents regular Squeak objects as Javascript objects with direct object references. SmallIntegers are represented as Javascript numbers, there is no need for tagging. Instance variables and indexable fields are held in a single array named "pointers". Word and byte binary objects store their data in arrays named "bytes" or "words". CompiledMethod instances have both "pointers" and "bytes". Float instances are not stored as two words as in Squeak, but have a single "float" property that stores the actual number (and the words are generated on-the-fly when needed). For garbage collection, I came up with a hybrid scheme: the bulk of the work is delegated to the Javascript garbage collector. Only in relatively rare circumstances is a "manual" garbage collection needed. This hybrid GC is a semi-space GC with an old space and a new space. Old space is a linked list of objects, but newly allocated objects are not added to the list, yet. Therefore, unreferenced new objects will be automatically garbage-collected by Javascript. This is like Squeak's incremental GC, which only looks at objects in new space. The full GC is a regular mark-and-sweep: it's marking all reachable objects (old and new), then unmarked old objects get removed (a very cheap operation in a linked list), and new objects (identified by their missing link) are added to the old-space list. One nice feature of this scheme is that its implementation does not need weak references, which Javascript currently does not support. This scheme also trivially supports object enumeration (Squeak's nextObject/nextInstance primitives): If the object is old, the next object is just the next link in the list. Otherwise, if there are new objects (newSpaceCount > 0) a GC is performed, which creates the next object link. But if newSpaceCount is 0, then this was the last object, and we're done. The UI for now copies the Squeak display bitmap pixel-by-pixel to a typed array and shows it on the HTML 2D canvas using putImageData(). Clipboard copying injects a synthetic CMD-C keyboard event into the VM, then runs the interpreter until it has executed the clipboard primitive in response, then answers that string. This is because the web browser only allows clipboard access inside the copy/paste event handlers. You can drag an image file from your disk into the browser window to load it. Besides running it on your desktop, you can install it as offline web app on an iPad: On the iPad there is neither right-click nor command keys, but the menu is available on the inside of the flop-out scrollbars. It needs a fairly recent browser, too - it works in iOS 7, but apparently not in older ones. On Android it works in Chrome 31, but not quite as well (for example, the onscreen-keyboard does not come up on an Galaxy Note tablet). The sources are on GitHub, and contributions are very welcome. Have a great Christmas! - Bert -

5 6

Re: [ANN] SqueakJS
by Bert Freudenberg 22 Dec '13

22 Dec '13

> On 22.12.2013, at 19:49, "David T. Lewis" <lewis(a)mail.msen.com> wrote: > >> On Fri, Dec 20, 2013 at 10:31:35PM +0100, Bert Freudenberg wrote: >> Hi all, >> >> I'm proud to announce SqueakJS, a new Squeak VM that runs on Javascript: >> >> http://bertfreudenberg.github.io/SqueakJS/ >> >> It was inspired by Dan's JSqueak/Potato VM for Java, and similarly only runs the old Squeak 2.2 mini.image for now. But I developed it inside the Lively Kernel, which allowed me to make a nice UI to look inside the VM (in addition to all the Lively tools): > > I don't know if anyone commented on the UI, but I love the VM debugger panels > that display and control the running VM while you use the Squeak mini image > running right next to it. > > Dave Thanks :) And there's even some stuff that's not exposed in the UI yet. I use the Lively tools to inspect the VM. Then for example this.breakOnNewMethod = true; will break when the newest CompiledMethod is executed - which is your next doit. Or, use the Chrome debugger to step through the GC: debugger; this.image.fullGC(); It's fun - for our sort of folks, anyway ;) - Bert -

1 0

[commit][2835] VMMaker 4.12.10 VMMaker-dtl.332
by commits＠squeakvm.org 21 Dec '13

21 Dec '13

Revision: 2835 Author: lewis Date: 2013-12-21 09:06:08 -0800 (Sat, 21 Dec 2013) Log Message: ----------- VMMaker 4.12.10 VMMaker-dtl.332 Check for valid bitmap in primitivePixelValueAt aka BitBltSimulation>>primitivePixelValueAtX:y: Fix provided by Nicolas Cellier Reference Mantis 7799 Modified Paths: -------------- trunk/src/ckformat.c trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c trunk/src/plugins/AioPlugin/AioPlugin.c trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c trunk/src/plugins/B2DPlugin/B2DPlugin.c trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c trunk/src/plugins/BitBltPlugin/BitBltPlugin.c trunk/src/plugins/CameraPlugin/CameraPlugin.c trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c trunk/src/plugins/CroquetPlugin/CroquetPlugin.c trunk/src/plugins/DBusPlugin/DBusPlugin.c trunk/src/plugins/DSAPrims/DSAPrims.c trunk/src/plugins/DropPlugin/DropPlugin.c trunk/src/plugins/FFTPlugin/FFTPlugin.c trunk/src/plugins/FT2Plugin/FT2Plugin.c trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c trunk/src/plugins/FilePlugin/FilePlugin.c trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c trunk/src/plugins/GeniePlugin/GeniePlugin.c trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c trunk/src/plugins/Klatt/Klatt.c trunk/src/plugins/LargeIntegers/LargeIntegers.c trunk/src/plugins/LocalePlugin/LocalePlugin.c trunk/src/plugins/MIDIPlugin/MIDIPlugin.c trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c trunk/src/plugins/RePlugin/RePlugin.c trunk/src/plugins/RomePlugin/RomePlugin.c trunk/src/plugins/ScratchPlugin/ScratchPlugin.c trunk/src/plugins/SecurityPlugin/SecurityPlugin.c trunk/src/plugins/SerialPlugin/SerialPlugin.c trunk/src/plugins/SocketPlugin/SocketPlugin.c trunk/src/plugins/SoundCodecPrims/SoundCodecPrims.c trunk/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c trunk/src/plugins/SoundPlugin/SoundPlugin.c trunk/src/plugins/Squeak3D/Squeak3D.c trunk/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c trunk/src/plugins/SqueakSSL/SqueakSSL.c trunk/src/plugins/StarSqueakPlugin/StarSqueakPlugin.c trunk/src/plugins/UUIDPlugin/UUIDPlugin.c trunk/src/plugins/UnicodePlugin/UnicodePlugin.c trunk/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c trunk/src/plugins/WeDoPlugin/WeDoPlugin.c trunk/src/plugins/XDisplayControlPlugin/XDisplayControlPlugin.c trunk/src/plugins/ZipPlugin/ZipPlugin.c trunk/src/vm/interp.c trunk/src/vm/interp.h trunk/src/vm/sqNamedPrims.h Modified: trunk/src/ckformat.c =================================================================== --- trunk/src/ckformat.c 2013-12-20 19:21:10 UTC (rev 2834) +++ trunk/src/ckformat.c 2013-12-21 17:06:08 UTC (rev 2835) @@ -5,7 +5,7 @@ /* Usage: ckformat imageFileName */ /* --- DO NOT EDIT THIS FILE --- */ -/* --- Automatically generated from class ImageFormat 2013-12-11T08:17:06.697+01:00--- */ +/* --- Automatically generated from class ImageFormat 2013-12-21T11:35:09.375+01: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-12-20 19:21:10 UTC (rev 2834) +++ trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2013-12-21 17:06:08 UTC (rev 2835) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.9 translated as C source on 11 December 2013 8:16:36 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:41 am */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + VMPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e from - ADPCMCodecPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + ADPCMCodecPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e */ -static char __buildInfo[] = "ADPCMCodecPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 " __DATE__ ; +static char __buildInfo[] = "ADPCMCodecPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ; @@ -70,9 +70,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ADPCMCodecPlugin 11 December 2013 (i)" + "ADPCMCodecPlugin 21 December 2013 (i)" #else - "ADPCMCodecPlugin 11 December 2013 (e)" + "ADPCMCodecPlugin 21 December 2013 (e)" #endif ; Modified: trunk/src/plugins/AioPlugin/AioPlugin.c =================================================================== --- trunk/src/plugins/AioPlugin/AioPlugin.c 2013-12-20 19:21:10 UTC (rev 2834) +++ trunk/src/plugins/AioPlugin/AioPlugin.c 2013-12-21 17:06:08 UTC (rev 2835) @@ -1,6 +1,6 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.9 translated as C source on 11 December 2013 8:17:04 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:35:07 am */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + VMPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e from UnixAioPlugin VMConstruction-Plugins-AioPlugin-eem.15 uuid: 0029df1c-3720-4b61-8579-4851417d24a7 */ @@ -88,9 +88,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AioPlugin 11 December 2013 (i)" + "AioPlugin 21 December 2013 (i)" #else - "AioPlugin 11 December 2013 (e)" + "AioPlugin 21 December 2013 (e)" #endif ; Modified: trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c =================================================================== --- trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2013-12-20 19:21:10 UTC (rev 2834) +++ trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2013-12-21 17:06:08 UTC (rev 2835) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.9 translated as C source on 11 December 2013 8:16:36 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:42 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + SmartSyntaxPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e from - AsynchFilePlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + AsynchFilePlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e */ -static char __buildInfo[] = "AsynchFilePlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 " __DATE__ ; +static char __buildInfo[] = "AsynchFilePlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ; @@ -67,9 +67,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AsynchFilePlugin 11 December 2013 (i)" + "AsynchFilePlugin 21 December 2013 (i)" #else - "AsynchFilePlugin 11 December 2013 (e)" + "AsynchFilePlugin 21 December 2013 (e)" #endif ; static void * sCOAFfn; Modified: trunk/src/plugins/B2DPlugin/B2DPlugin.c =================================================================== --- trunk/src/plugins/B2DPlugin/B2DPlugin.c 2013-12-20 19:21:10 UTC (rev 2834) +++ trunk/src/plugins/B2DPlugin/B2DPlugin.c 2013-12-21 17:06:08 UTC (rev 2835) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.9 translated as C source on 11 December 2013 8:16:39 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:44 am */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + VMPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e from - BalloonEnginePlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + BalloonEnginePlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e */ -static char __buildInfo[] = "BalloonEnginePlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 " __DATE__ ; +static char __buildInfo[] = "BalloonEnginePlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ; @@ -447,9 +447,9 @@ static void * loadBBFn; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B2DPlugin 11 December 2013 (i)" + "B2DPlugin 21 December 2013 (i)" #else - "B2DPlugin 11 December 2013 (e)" + "B2DPlugin 21 December 2013 (e)" #endif ; static int* objBuffer; Modified: trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c =================================================================== --- trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2013-12-20 19:21:10 UTC (rev 2834) +++ trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2013-12-21 17:06:08 UTC (rev 2835) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.9 translated as C source on 11 December 2013 8:16:53 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:56 am */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + VMPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e from - B3DAcceleratorPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + B3DAcceleratorPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e */ -static char __buildInfo[] = "B3DAcceleratorPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 " __DATE__ ; +static char __buildInfo[] = "B3DAcceleratorPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ; @@ -107,9 +107,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B3DAcceleratorPlugin 11 December 2013 (i)" + "B3DAcceleratorPlugin 21 December 2013 (i)" #else - "B3DAcceleratorPlugin 11 December 2013 (e)" + "B3DAcceleratorPlugin 21 December 2013 (e)" #endif ; Modified: trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c =================================================================== --- trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2013-12-20 19:21:10 UTC (rev 2834) +++ trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2013-12-21 17:06:08 UTC (rev 2835) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.9 translated as C source on 11 December 2013 8:16:36 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:42 am */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + VMPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e from - BMPReadWriterPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + BMPReadWriterPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e */ -static char __buildInfo[] = "BMPReadWriterPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 " __DATE__ ; +static char __buildInfo[] = "BMPReadWriterPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ; @@ -58,9 +58,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BMPReadWriterPlugin 11 December 2013 (i)" + "BMPReadWriterPlugin 21 December 2013 (i)" #else - "BMPReadWriterPlugin 11 December 2013 (e)" + "BMPReadWriterPlugin 21 December 2013 (e)" #endif ; Modified: trunk/src/plugins/BitBltPlugin/BitBltPlugin.c =================================================================== --- trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2013-12-20 19:21:10 UTC (rev 2834) +++ trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2013-12-21 17:06:08 UTC (rev 2835) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.9 translated as C source on 11 December 2013 8:16:41 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:46 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + SmartSyntaxPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e from - BitBltSimulation VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + BitBltSimulation VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e */ -static char __buildInfo[] = "BitBltSimulation VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 " __DATE__ ; +static char __buildInfo[] = "BitBltSimulation VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ; @@ -257,9 +257,9 @@ }; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BitBltPlugin 11 December 2013 (i)" + "BitBltPlugin 21 December 2013 (i)" #else - "BitBltPlugin 11 December 2013 (e)" + "BitBltPlugin 21 December 2013 (e)" #endif ; static sqInt nWords; @@ -3623,6 +3623,7 @@ sqInt ppW; sqInt word; sqInt stride; + sqInt bitsSize; sqInt mask; sqInt xVal; sqInt yVal; @@ -3648,6 +3649,10 @@ return null; } bitmap = interpreterProxy->fetchPointerofObject(FormBitsIndex, rcvr); + if (!(interpreterProxy->isWordsOrBytes(bitmap))) { + interpreterProxy->primitiveFail(); + return null; + } width = interpreterProxy->fetchIntegerofObject(FormWidthIndex, rcvr); height = interpreterProxy->fetchIntegerofObject(FormHeightIndex, rcvr); @@ -3674,10 +3679,18 @@ ppW = 32 / depth; - /* how many words per rox of pixels */ + /* how many words per row of pixels */ stride = (width + (ppW - 1)) / ppW; + bitsSize = interpreterProxy->byteSizeOf(bitmap); + if (!(bitsSize == ((stride * height) * 4))) { + /* bytes per word */ + + interpreterProxy->primitiveFail(); + return null; + } + /* load the word that contains our target */ word = interpreterProxy->fetchLong32ofObject((yVal * stride) + (xVal / ppW), bitmap); Modified: trunk/src/plugins/CameraPlugin/CameraPlugin.c =================================================================== --- trunk/src/plugins/CameraPlugin/CameraPlugin.c 2013-12-20 19:21:10 UTC (rev 2834) +++ trunk/src/plugins/CameraPlugin/CameraPlugin.c 2013-12-21 17:06:08 UTC (rev 2835) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.9 translated as C source on 11 December 2013 8:16:54 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:58 am */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + VMPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e from - CameraPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + CameraPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e */ -static char __buildInfo[] = "CameraPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 " __DATE__ ; +static char __buildInfo[] = "CameraPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ; @@ -64,9 +64,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "CameraPlugin 11 December 2013 (i)" + "CameraPlugin 21 December 2013 (i)" #else - "CameraPlugin 11 December 2013 (e)" + "CameraPlugin 21 December 2013 (e)" #endif ; Modified: trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c =================================================================== --- trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2013-12-20 19:21:10 UTC (rev 2834) +++ trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2013-12-21 17:06:08 UTC (rev 2835) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.9 translated as C source on 11 December 2013 8:16:55 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:58 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + SmartSyntaxPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e from - ClipboardExtendedPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + ClipboardExtendedPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e */ -static char __buildInfo[] = "ClipboardExtendedPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 " __DATE__ ; +static char __buildInfo[] = "ClipboardExtendedPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ; @@ -61,9 +61,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ClipboardExtendedPlugin 11 December 2013 (i)" + "ClipboardExtendedPlugin 21 December 2013 (i)" #else - "ClipboardExtendedPlugin 11 December 2013 (e)" + "ClipboardExtendedPlugin 21 December 2013 (e)" #endif ; Modified: trunk/src/plugins/CroquetPlugin/CroquetPlugin.c =================================================================== --- trunk/src/plugins/CroquetPlugin/CroquetPlugin.c 2013-12-20 19:21:10 UTC (rev 2834) +++ trunk/src/plugins/CroquetPlugin/CroquetPlugin.c 2013-12-21 17:06:08 UTC (rev 2835) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.9 translated as C source on 11 December 2013 8:16:41 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:46 am */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + VMPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e from - CroquetPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + CroquetPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e */ -static char __buildInfo[] = "CroquetPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 " __DATE__ ; +static char __buildInfo[] = "CroquetPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ; @@ -73,9 +73,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "CroquetPlugin 11 December 2013 (i)" + "CroquetPlugin 21 December 2013 (i)" #else - "CroquetPlugin 11 December 2013 (e)" + "CroquetPlugin 21 December 2013 (e)" #endif ; Modified: trunk/src/plugins/DBusPlugin/DBusPlugin.c =================================================================== --- trunk/src/plugins/DBusPlugin/DBusPlugin.c 2013-12-20 19:21:10 UTC (rev 2834) +++ trunk/src/plugins/DBusPlugin/DBusPlugin.c 2013-12-21 17:06:08 UTC (rev 2835) @@ -1,6 +1,6 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.9 translated as C source on 11 December 2013 8:16:55 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:59 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + SmartSyntaxPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e from DBusPlugin DBus-Plugin-dtl.35 uuid: 2ae30f08-4793-4acb-876b-c443a5f5e665 */ @@ -143,9 +143,9 @@ static DBusMessageIter messageIter[DBUS_MAXIMUM_TYPE_RECURSION_DEPTH]; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DBusPlugin 11 December 2013 (i)" + "DBusPlugin 21 December 2013 (i)" #else - "DBusPlugin 11 December 2013 (e)" + "DBusPlugin 21 December 2013 (e)" #endif ; static DBusMessage* writeMessage; Modified: trunk/src/plugins/DSAPrims/DSAPrims.c =================================================================== --- trunk/src/plugins/DSAPrims/DSAPrims.c 2013-12-20 19:21:10 UTC (rev 2834) +++ trunk/src/plugins/DSAPrims/DSAPrims.c 2013-12-21 17:06:08 UTC (rev 2835) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.9 translated as C source on 11 December 2013 8:16:42 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:46 am */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + VMPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e from - DSAPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + DSAPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e */ -static char __buildInfo[] = "DSAPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 " __DATE__ ; +static char __buildInfo[] = "DSAPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ; @@ -67,9 +67,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DSAPrims 11 December 2013 (i)" + "DSAPrims 21 December 2013 (i)" #else - "DSAPrims 11 December 2013 (e)" + "DSAPrims 21 December 2013 (e)" #endif ; static sqInt remainderDigitCount; Modified: trunk/src/plugins/DropPlugin/DropPlugin.c =================================================================== --- trunk/src/plugins/DropPlugin/DropPlugin.c 2013-12-20 19:21:10 UTC (rev 2834) +++ trunk/src/plugins/DropPlugin/DropPlugin.c 2013-12-21 17:06:08 UTC (rev 2835) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.9 translated as C source on 11 December 2013 8:16:43 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:47 am */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + VMPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e from - DropPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + DropPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e */ -static char __buildInfo[] = "DropPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 " __DATE__ ; +static char __buildInfo[] = "DropPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ; @@ -62,9 +62,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DropPlugin 11 December 2013 (i)" + "DropPlugin 21 December 2013 (i)" #else - "DropPlugin 11 December 2013 (e)" + "DropPlugin 21 December 2013 (e)" #endif ; Modified: trunk/src/plugins/FFTPlugin/FFTPlugin.c =================================================================== --- trunk/src/plugins/FFTPlugin/FFTPlugin.c 2013-12-20 19:21:10 UTC (rev 2834) +++ trunk/src/plugins/FFTPlugin/FFTPlugin.c 2013-12-21 17:06:08 UTC (rev 2835) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.9 translated as C source on 11 December 2013 8:16:43 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:47 am */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + VMPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e from - FFTPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + FFTPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e */ -static char __buildInfo[] = "FFTPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 " __DATE__ ; +static char __buildInfo[] = "FFTPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ; @@ -68,9 +68,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FFTPlugin 11 December 2013 (i)" + "FFTPlugin 21 December 2013 (i)" #else - "FFTPlugin 11 December 2013 (e)" + "FFTPlugin 21 December 2013 (e)" #endif ; static sqInt nu; Modified: trunk/src/plugins/FT2Plugin/FT2Plugin.c =================================================================== --- trunk/src/plugins/FT2Plugin/FT2Plugin.c 2013-12-20 19:21:10 UTC (rev 2834) +++ trunk/src/plugins/FT2Plugin/FT2Plugin.c 2013-12-21 17:06:08 UTC (rev 2835) @@ -1,4 +1,4 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.9 translated as C source on 11 December 2013 8:16:44 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:48 am */ /* Automatically generated by FT2PluginCodeGenerator * FreeType-nice.442 uuid: 9895a884-7d42-4783-9fb8-1a71ef244e16 from @@ -121,9 +121,9 @@ static FT_Library library; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FT2Plugin 11 December 2013 (i)" + "FT2Plugin 21 December 2013 (i)" #else - "FT2Plugin 11 December 2013 (e)" + "FT2Plugin 21 December 2013 (e)" #endif ; Modified: trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c =================================================================== --- trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c 2013-12-20 19:21:10 UTC (rev 2834) +++ trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c 2013-12-21 17:06:08 UTC (rev 2835) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.9 translated as C source on 11 December 2013 8:16:56 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:59 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + SmartSyntaxPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e from - FileCopyPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + FileCopyPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e */ -static char __buildInfo[] = "FileCopyPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 " __DATE__ ; +static char __buildInfo[] = "FileCopyPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ; @@ -57,9 +57,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FileCopyPlugin 11 December 2013 (i)" + "FileCopyPlugin 21 December 2013 (i)" #else - "FileCopyPlugin 11 December 2013 (e)" + "FileCopyPlugin 21 December 2013 (e)" #endif ; Modified: trunk/src/plugins/FilePlugin/FilePlugin.c =================================================================== --- trunk/src/plugins/FilePlugin/FilePlugin.c 2013-12-20 19:21:10 UTC (rev 2834) +++ trunk/src/plugins/FilePlugin/FilePlugin.c 2013-12-21 17:06:08 UTC (rev 2835) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.9 translated as C source on 11 December 2013 8:16:44 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:48 am */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + VMPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e from - FilePlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + FilePlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e */ -static char __buildInfo[] = "FilePlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 " __DATE__ ; +static char __buildInfo[] = "FilePlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ; @@ -100,9 +100,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FilePlugin 11 December 2013 (i)" + "FilePlugin 21 December 2013 (i)" #else - "FilePlugin 11 December 2013 (e)" + "FilePlugin 21 December 2013 (e)" #endif ; static void * sCCPfn; Modified: trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c =================================================================== --- trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2013-12-20 19:21:10 UTC (rev 2834) +++ trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2013-12-21 17:06:08 UTC (rev 2835) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.9 translated as C source on 11 December 2013 8:16:44 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:48 am */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + VMPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e from - FloatArrayPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + FloatArrayPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e */ -static char __buildInfo[] = "FloatArrayPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 " __DATE__ ; +static char __buildInfo[] = "FloatArrayPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ; @@ -72,9 +72,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FloatArrayPlugin 11 December 2013 (i)" + "FloatArrayPlugin 21 December 2013 (i)" #else - "FloatArrayPlugin 11 December 2013 (e)" + "FloatArrayPlugin 21 December 2013 (e)" #endif ; Modified: trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c =================================================================== --- trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c 2013-12-20 19:21:10 UTC (rev 2834) +++ trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c 2013-12-21 17:06:08 UTC (rev 2835) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.9 translated as C source on 11 December 2013 8:16:45 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:49 am */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + VMPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e from - FloatMathPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + FloatMathPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e */ -static char __buildInfo[] = "FloatMathPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 " __DATE__ ; +static char __buildInfo[] = "FloatMathPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ; @@ -79,9 +79,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FloatMathPlugin 11 December 2013 (i)" + "FloatMathPlugin 21 December 2013 (i)" #else - "FloatMathPlugin 11 December 2013 (e)" + "FloatMathPlugin 21 December 2013 (e)" #endif ; Modified: trunk/src/plugins/GeniePlugin/GeniePlugin.c =================================================================== --- trunk/src/plugins/GeniePlugin/GeniePlugin.c 2013-12-20 19:21:10 UTC (rev 2834) +++ trunk/src/plugins/GeniePlugin/GeniePlugin.c 2013-12-21 17:06:08 UTC (rev 2835) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.9 translated as C source on 11 December 2013 8:16:45 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:49 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + SmartSyntaxPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e from - GeniePlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + GeniePlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e */ -static char __buildInfo[] = "GeniePlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 " __DATE__ ; +static char __buildInfo[] = "GeniePlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ; @@ -61,9 +61,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "GeniePlugin v2.0 11 December 2013 (i)" + "GeniePlugin v2.0 21 December 2013 (i)" #else - "GeniePlugin v2.0 11 December 2013 (e)" + "GeniePlugin v2.0 21 December 2013 (e)" #endif ; Modified: trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c =================================================================== --- trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c 2013-12-20 19:21:10 UTC (rev 2834) +++ trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c 2013-12-21 17:06:08 UTC (rev 2835) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.9 translated as C source on 11 December 2013 8:16:58 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:35:01 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + SmartSyntaxPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e from - HostWindowPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + HostWindowPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e */ -static char __buildInfo[] = "HostWindowPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 " __DATE__ ; +static char __buildInfo[] = "HostWindowPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ; @@ -66,9 +66,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "HostWindowPlugin 11 December 2013 (i)" + "HostWindowPlugin 21 December 2013 (i)" #else - "HostWindowPlugin 11 December 2013 (e)" + "HostWindowPlugin 21 December 2013 (e)" #endif ; Modified: trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c =================================================================== --- trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2013-12-20 19:21:10 UTC (rev 2834) +++ trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2013-12-21 17:06:08 UTC (rev 2835) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.9 translated as C source on 11 December 2013 8:16:46 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:49 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + SmartSyntaxPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e from - JPEGReadWriter2Plugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + JPEGReadWriter2Plugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e */ -static char __buildInfo[] = "JPEGReadWriter2Plugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 " __DATE__ ; +static char __buildInfo[] = "JPEGReadWriter2Plugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ; @@ -68,9 +68,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JPEGReadWriter2Plugin 11 December 2013 (i)" + "JPEGReadWriter2Plugin 21 December 2013 (i)" #else - "JPEGReadWriter2Plugin 11 December 2013 (e)" + "JPEGReadWriter2Plugin 21 December 2013 (e)" #endif ; Modified: trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c =================================================================== --- trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2013-12-20 19:21:10 UTC (rev 2834) +++ trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2013-12-21 17:06:08 UTC (rev 2835) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.9 translated as C source on 11 December 2013 8:16:46 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:50 am */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + VMPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e from - JPEGReaderPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + JPEGReaderPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e */ -static char __buildInfo[] = "JPEGReaderPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 " __DATE__ ; +static char __buildInfo[] = "JPEGReaderPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ; @@ -136,9 +136,9 @@ static sqInt jsReadLimit; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JPEGReaderPlugin 11 December 2013 (i)" + "JPEGReaderPlugin 21 December 2013 (i)" #else - "JPEGReaderPlugin 11 December 2013 (e)" + "JPEGReaderPlugin 21 December 2013 (e)" #endif ; static int *residuals; Modified: trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c =================================================================== --- trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c 2013-12-20 19:21:10 UTC (rev 2834) +++ trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c 2013-12-21 17:06:08 UTC (rev 2835) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.9 translated as C source on 11 December 2013 8:16:46 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:50 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + SmartSyntaxPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e from - JoystickTabletPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + JoystickTabletPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e */ -static char __buildInfo[] = "JoystickTabletPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 " __DATE__ ; +static char __buildInfo[] = "JoystickTabletPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ; @@ -62,9 +62,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JoystickTabletPlugin 11 December 2013 (i)" + "JoystickTabletPlugin 21 December 2013 (i)" #else - "JoystickTabletPlugin 11 December 2013 (e)" + "JoystickTabletPlugin 21 December 2013 (e)" #endif ; Modified: trunk/src/plugins/Klatt/Klatt.c =================================================================== --- trunk/src/plugins/Klatt/Klatt.c 2013-12-20 19:21:10 UTC (rev 2834) +++ trunk/src/plugins/Klatt/Klatt.c 2013-12-21 17:06:08 UTC (rev 2835) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.9 translated as C source on 11 December 2013 8:16:47 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:51 am */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + VMPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e from - KlattSynthesizerPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + KlattSynthesizerPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e */ -static char __buildInfo[] = "KlattSynthesizerPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 " __DATE__ ; +static char __buildInfo[] = "KlattSynthesizerPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ; @@ -155,9 +155,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "Klatt 11 December 2013 (i)" + "Klatt 21 December 2013 (i)" #else - "Klatt 11 December 2013 (e)" + "Klatt 21 December 2013 (e)" #endif ; static float nlast; Modified: trunk/src/plugins/LargeIntegers/LargeIntegers.c =================================================================== --- trunk/src/plugins/LargeIntegers/LargeIntegers.c 2013-12-20 19:21:10 UTC (rev 2834) +++ trunk/src/plugins/LargeIntegers/LargeIntegers.c 2013-12-21 17:06:08 UTC (rev 2835) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.9 translated as C source on 11 December 2013 8:16:48 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:51 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + SmartSyntaxPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e from - LargeIntegersPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + LargeIntegersPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e */ -static char __buildInfo[] = "LargeIntegersPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 " __DATE__ ; +static char __buildInfo[] = "LargeIntegersPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ; Modified: trunk/src/plugins/LocalePlugin/LocalePlugin.c =================================================================== --- trunk/src/plugins/LocalePlugin/LocalePlugin.c 2013-12-20 19:21:10 UTC (rev 2834) +++ trunk/src/plugins/LocalePlugin/LocalePlugin.c 2013-12-21 17:06:08 UTC (rev 2835) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.9 translated as C source on 11 December 2013 8:16:48 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:52 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + SmartSyntaxPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e from - LocalePlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + LocalePlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e */ -static char __buildInfo[] = "LocalePlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 " __DATE__ ; +static char __buildInfo[] = "LocalePlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ; @@ -71,9 +71,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "LocalePlugin 11 December 2013 (i)" + "LocalePlugin 21 December 2013 (i)" #else - "LocalePlugin 11 December 2013 (e)" + "LocalePlugin 21 December 2013 (e)" #endif ; Modified: trunk/src/plugins/MIDIPlugin/MIDIPlugin.c =================================================================== --- trunk/src/plugins/MIDIPlugin/MIDIPlugin.c 2013-12-20 19:21:10 UTC (rev 2834) +++ trunk/src/plugins/MIDIPlugin/MIDIPlugin.c 2013-12-21 17:06:08 UTC (rev 2835) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.9 translated as C source on 11 December 2013 8:17 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:35:03 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + SmartSyntaxPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e from - MIDIPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + MIDIPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e */ -static char __buildInfo[] = "MIDIPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 " __DATE__ ; +static char __buildInfo[] = "MIDIPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ; @@ -70,9 +70,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "MIDIPlugin 11 December 2013 (i)" + "MIDIPlugin 21 December 2013 (i)" #else - "MIDIPlugin 11 December 2013 (e)" + "MIDIPlugin 21 December 2013 (e)" #endif ; Modified: trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c =================================================================== --- trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2013-12-20 19:21:10 UTC (rev 2834) +++ trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2013-12-21 17:06:08 UTC (rev 2835) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.9 translated as C source on 11 December 2013 8:16:49 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:52 am */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + VMPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e from - Matrix2x3Plugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + Matrix2x3Plugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e */ -static char __buildInfo[] = "Matrix2x3Plugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 " __DATE__ ; +static char __buildInfo[] = "Matrix2x3Plugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ; @@ -74,9 +74,9 @@ static double m23ResultY; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "Matrix2x3Plugin 11 December 2013 (i)" + "Matrix2x3Plugin 21 December 2013 (i)" #else - "Matrix2x3Plugin 11 December 2013 (e)" + "Matrix2x3Plugin 21 December 2013 (e)" #endif ; Modified: trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c =================================================================== --- trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2013-12-20 19:21:10 UTC (rev 2834) +++ trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2013-12-21 17:06:08 UTC (rev 2835) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.9 translated as C source on 11 December 2013 8:16:49 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:53 am */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + VMPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e from - MiscPrimitivePlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + MiscPrimitivePlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e */ -static char __buildInfo[] = "MiscPrimitivePlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 " __DATE__ ; +static char __buildInfo[] = "MiscPrimitivePlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ; @@ -70,9 +70,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "MiscPrimitivePlugin 11 December 2013 (i)" + "MiscPrimitivePlugin 21 December 2013 (i)" #else - "MiscPrimitivePlugin 11 December 2013 (e)" + "MiscPrimitivePlugin 21 December 2013 (e)" #endif ; Modified: trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c =================================================================== --- trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c 2013-12-20 19:21:10 UTC (rev 2834) +++ trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c 2013-12-21 17:06:08 UTC (rev 2835) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.9 translated as C source on 11 December 2013 8:17:01 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:35:04 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + SmartSyntaxPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e from - Mpeg3Plugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + Mpeg3Plugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e */ -static char __buildInfo[] = "Mpeg3Plugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 " __DATE__ ; +static char __buildInfo[] = "Mpeg3Plugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ; @@ -101,9 +101,9 @@ static sqInt maximumNumberOfFilesToWatch; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "Mpeg3Plugin 11 December 2013 (i)" + "Mpeg3Plugin 21 December 2013 (i)" #else - "Mpeg3Plugin 11 December 2013 (e)" + "Mpeg3Plugin 21 December 2013 (e)" #endif ; static mpeg3_t *mpegFiles[1024+1]; Modified: trunk/src/plugins/RePlugin/RePlugin.c =================================================================== --- trunk/src/plugins/RePlugin/RePlugin.c 2013-12-20 19:21:10 UTC (rev 2834) +++ trunk/src/plugins/RePlugin/RePlugin.c 2013-12-21 17:06:08 UTC (rev 2835) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.9 translated as C source on 11 December 2013 8:16:49 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:53 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + SmartSyntaxPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e from - RePlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + RePlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e */ -static char __buildInfo[] = "RePlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 " __DATE__ ; +static char __buildInfo[] = "RePlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ; @@ -79,9 +79,9 @@ static sqInt matchFlags; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "RePlugin 11 December 2013 (i)" + "RePlugin 21 December 2013 (i)" #else - "RePlugin 11 December 2013 (e)" + "RePlugin 21 December 2013 (e)" #endif ; static int netMemory = 0; Modified: trunk/src/plugins/RomePlugin/RomePlugin.c =================================================================== --- trunk/src/plugins/RomePlugin/RomePlugin.c 2013-12-20 19:21:10 UTC (rev 2834) +++ trunk/src/plugins/RomePlugin/RomePlugin.c 2013-12-21 17:06:08 UTC (rev 2835) @@ -1,6 +1,6 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.9 translated as C source on 11 December 2013 8:17:02 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:35:05 am */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + SmartSyntaxPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e from RomePlugin Rome-Plugin-yo.39 uuid: 4bc7d831-189d-43ce-8b6d-7e96cf20a234 */ @@ -199,9 +199,9 @@ static sqInt maxSurfaceID; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "RomePlugin yo.39 11 December 2013 (i)" + "RomePlugin yo.39 21 December 2013 (i)" #else - "RomePlugin yo.39 11 December 2013 (e)" + "RomePlugin yo.39 21 December 2013 (e)" #endif ; static fn_ioRegisterSurface registerSurfaceFn; Modified: trunk/src/plugins/ScratchPlugin/ScratchPlugin.c =================================================================== --- trunk/src/plugins/ScratchPlugin/ScratchPlugin.c 2013-12-20 19:21:10 UTC (rev 2834) +++ trunk/src/plugins/ScratchPlugin/ScratchPlugin.c 2013-12-21 17:06:08 UTC (rev 2835) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.9 translated as C source on 11 December 2013 8:17:03 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:35:06 am */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + VMPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e from - ScratchPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + ScratchPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e */ -static char __buildInfo[] = "ScratchPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 " __DATE__ ; +static char __buildInfo[] = "ScratchPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ; @@ -89,9 +89,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ScratchPlugin 11 December 2013 (i)" + "ScratchPlugin 21 December 2013 (i)" #else - "ScratchPlugin 11 December 2013 (e)" + "ScratchPlugin 21 December 2013 (e)" #endif ; Modified: trunk/src/plugins/SecurityPlugin/SecurityPlugin.c =================================================================== --- trunk/src/plugins/SecurityPlugin/SecurityPlugin.c 2013-12-20 19:21:10 UTC (rev 2834) +++ trunk/src/plugins/SecurityPlugin/SecurityPlugin.c 2013-12-21 17:06:08 UTC (rev 2835) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.9 translated as C source on 11 December 2013 8:16:50 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:53 am */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + VMPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e from - SecurityPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 + SecurityPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e */ -static char __buildInfo[] = "SecurityPlugin VMMaker-dtl.331 uuid: 468f31d3-f1b7-44d6-b67c-25b591adde55 " __DATE__ ; +static char __buildInfo[] = "SecurityPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ; @@ -80,9 +80,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SecurityPlugin 11 December 2013 (i)" + "SecurityPlugin 21 December 2013 (i)" #else - "SecurityPlugin 11 December 2013 (e)" + "SecurityPlugin 21 December 2013 (e)" #endif ; Modified: trunk/src/plugins/SerialPlugin/SerialPlugin.c =================================================================== --- trunk/src/plugins/SerialPlugin/SerialPlugin.c 2013-12-20 19:21:10 UTC (rev 2834) @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-dtl.568.mcz
by commits＠source.squeak.org 21 Dec '13

21 Dec '13

David T. Lewis uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-dtl.568.mcz ==================== Summary ==================== Name: VMMaker.oscog-dtl.568 Author: dtl Time: 21 December 2013, 11:50:53.68 am UUID: 527f0c71-198d-4adf-804c-53c6842e9124 Ancestors: VMMaker.oscog-eem.567 Check for valid bitmap in primitivePixelValueAt aka BitBltSimulation>>primitivePixelValueAtX:y: Fix provided by Nicolas Cellier Reference Mantis 7799 =============== Diff against VMMaker.oscog-eem.567 =============== Item was changed: ----- Method: BitBltSimulation>>primitivePixelValueAtX:y: (in category 'primitives') ----- primitivePixelValueAtX: xVal y: yVal "returns the single pixel at x@y. It does not handle LSB bitmaps right now. If x or y are < 0, return 0 to indicate transparent (cf BitBlt>bitPeekerFromForm: usage). Likewise if x>width or y>depth. Fail if the rcvr doesn't seem to be a Form, or x|y seem wrong" + | rcvr bitmap depth ppW stride bitsSize word mask shift pixel | - | rcvr bitmap depth ppW stride word mask shift pixel | rcvr := self primitive: 'primitivePixelValueAt' parameters: #(SmallInteger SmallInteger) receiver: #Oop. "possible quick exit if x or y is -ve" (xVal < 0 or: [ yVal < 0 ] ) ifTrue:[^interpreterProxy integerObjectOf: 0]. "check that rcvr is plausibly a Form or subclass" rcvr := interpreterProxy stackValue: interpreterProxy methodArgumentCount. ((interpreterProxy isPointers: rcvr) and: [(interpreterProxy slotSizeOf: rcvr) >= 4]) ifFalse: [^interpreterProxy primitiveFail]. "get the bits oop and width/height/depth" bitmap := interpreterProxy fetchPointer: FormBitsIndex ofObject: rcvr. + (interpreterProxy isWordsOrBytes: bitmap) ifFalse: [^interpreterProxy primitiveFail]. width := interpreterProxy fetchInteger: FormWidthIndex ofObject: rcvr. height := interpreterProxy fetchInteger: FormHeightIndex ofObject: rcvr. depth := interpreterProxy fetchInteger: FormDepthIndex ofObject: rcvr. "if width/height/depth are not integer, fail" interpreterProxy failed ifTrue:[^nil]. "possible quick exit if x or y is >= extent of form. This also catches cases where the width/height are < 0" (xVal >= width or: [ yVal >= height ] ) ifTrue:[^interpreterProxy integerObjectOf: 0]. "we don't handle LSB Forms yet" depth < 0 ifTrue:[^interpreterProxy primitiveFail]. "OK so now we know we have a plausible Form, the width/height/depth/x/y are all reasonable and it's time to plunder the bitmap" ppW := 32//depth. "pixels in each word" + stride := (width + (ppW -1)) // ppW. "how many words per row of pixels" + bitsSize := interpreterProxy byteSizeOf: bitmap. + bitsSize = (stride * height * 4 "bytes per word") + ifFalse: [^interpreterProxy primitiveFail]. - stride := (width + (ppW -1)) // ppW. "how many words per rox of pixels" word := interpreterProxy fetchLong32:(yVal * stride) + (xVal//ppW) ofObject: bitmap. "load the word that contains our target" mask := 16rFFFFFFFF >> (32 - depth). "make a mask to isolate the pixel within that word" shift := 32 - (((xVal bitAnd: ppW-1) + 1) * depth). "this is the tricky MSB part - we mask the xVal to find how far into the word we need, then add 1 for the pixel we're looking for, then * depth to get the bit shift" pixel := (word >> shift) bitAnd: mask. "shift, mask and dim the lights" ^ pixel asPositiveIntegerObj "pop the incoming and push our answer" !

1 0

VM Maker: VMMaker-dtl.332.mcz
by commits＠source.squeak.org 21 Dec '13

21 Dec '13

David T. Lewis uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-dtl.332.mcz ==================== Summary ==================== Name: VMMaker-dtl.332 Author: dtl Time: 21 December 2013, 11:34:23.144 am UUID: 78ecdbe9-481f-4ef7-b190-13eba921157e Ancestors: VMMaker-dtl.331 VMMaker 4.12.10 Check for valid bitmap in primitivePixelValueAt aka BitBltSimulation>>primitivePixelValueAtX:y: Fix provided by Nicolas Cellier Reference Mantis 7799 =============== Diff against VMMaker-dtl.331 =============== Item was changed: ----- Method: BitBltSimulation>>primitivePixelValueAtX:y: (in category 'primitives') ----- primitivePixelValueAtX: xVal y: yVal "returns the single pixel at x@y. It does not handle LSB bitmaps right now. If x or y are < 0, return 0 to indicate transparent (cf BitBlt>bitPeekerFromForm: usage). Likewise if x>width or y>depth. Fail if the rcvr doesn't seem to be a Form, or x|y seem wrong" + | rcvr bitmap depth ppW stride bitsSize word mask shift pixel | - | rcvr bitmap depth ppW stride word mask shift pixel | rcvr := self primitive: 'primitivePixelValueAt' parameters: #(SmallInteger SmallInteger) receiver: #Oop. "possible quick exit if x or y is -ve" (xVal < 0 or: [ yVal < 0 ] ) ifTrue:[^interpreterProxy integerObjectOf: 0]. "check that rcvr is plausibly a Form or subclass" rcvr := interpreterProxy stackValue: interpreterProxy methodArgumentCount. ((interpreterProxy isPointers: rcvr) and: [(interpreterProxy slotSizeOf: rcvr) >= 4]) ifFalse: [^interpreterProxy primitiveFail]. "get the bits oop and width/height/depth" bitmap := interpreterProxy fetchPointer: FormBitsIndex ofObject: rcvr. + (interpreterProxy isWordsOrBytes: bitmap) ifFalse: [^interpreterProxy primitiveFail]. width := interpreterProxy fetchInteger: FormWidthIndex ofObject: rcvr. height := interpreterProxy fetchInteger: FormHeightIndex ofObject: rcvr. depth := interpreterProxy fetchInteger: FormDepthIndex ofObject: rcvr. "if width/height/depth are not integer, fail" interpreterProxy failed ifTrue:[^nil]. "possible quick exit if x or y is >= extent of form. This also catches cases where the width/height are < 0" (xVal >= width or: [ yVal >= height ] ) ifTrue:[^interpreterProxy integerObjectOf: 0]. "we don't handle LSB Forms yet" depth < 0 ifTrue:[^interpreterProxy primitiveFail]. "OK so now we know we have a plausible Form, the width/height/depth/x/y are all reasonable and it's time to plunder the bitmap" ppW := 32//depth. "pixels in each word" + stride := (width + (ppW -1)) // ppW. "how many words per row of pixels" + bitsSize := interpreterProxy byteSizeOf: bitmap. + bitsSize = (stride * height * 4 "bytes per word") + ifFalse: [^interpreterProxy primitiveFail]. - stride := (width + (ppW -1)) // ppW. "how many words per rox of pixels" word := interpreterProxy fetchLong32:(yVal * stride) + (xVal//ppW) ofObject: bitmap. "load the word that contains our target" mask := 16rFFFFFFFF >> (32 - depth). "make a mask to isolate the pixel within that word" shift := 32 - (((xVal bitAnd: ppW-1) + 1) * depth). "this is the tricky MSB part - we mask the xVal to find how far into the word we need, then add 1 for the pixel we're looking for, then * depth to get the bit shift" pixel := (word >> shift) bitAnd: mask. "shift, mask and dim the lights" ^ pixel asPositiveIntegerObj "pop the incoming and push our answer" ! Item was changed: ----- Method: VMMaker class>>versionString (in category 'version testing') ----- versionString "VMMaker versionString" + ^'4.12.10'! - ^'4.12.9'!

1 0

VM Maker: VMMaker.oscog-eem.567.mcz
by commits＠source.squeak.org 20 Dec '13

20 Dec '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.567.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.567 Author: eem Time: 20 December 2013, 3:47:15.976 pm UUID: 88799310-3943-4468-b8ee-4c007e7f98e7 Ancestors: VMMaker.oscog-eem.565 Commit the takeaways, which are that a) 4 byte entry-point alignment is as good as 8-byte on Core i7 b) the older backward-branching for immediates entry-point code is significantly faster for non-immediates and because we expect most SmallInteger code to be performed in-line it is better to prefer non-immediate send performance. N.B. None of this would be an issue with 30-bit immediates. =============== Diff against VMMaker.oscog-eem.565 =============== Item was changed: ----- Method: CogObjectRepresentationFor32BitSpur>>getInlineCacheClassTagFrom:into: (in category 'compile abstract instructions') ----- getInlineCacheClassTagFrom: sourceReg into: destReg "Extract the inline cache tag for the object in sourceReg into destReg. The inline cache tag for a given object is the value loaded in inline caches to distinguish objects of different classes. In Spur this is either the tags for immediates, (with 1 & 3 collapsed to 1 for SmallIntegers, and 2 collapsed to 0 for Characters), or the receiver's classIndex. Generate something like this: + Limm: + andl $0x1, rDest + j Lcmp Lentry: movl rSource, rDest andl $0x3, rDest + jnz Limm - jz LnotImm - andl $1, rDest - j Lcmp - LnotImm: movl 0(%edx), rDest andl $0x3fffff, rDest Lcmp: + At least on a 2.2GHz Intel Core i7 the following is slightly faster than the above, + 136m sends/sec vs 130m sends/sec for nfib in tinyBenchmarks - At least on a 2.2GHz Intel Core i7 it is slightly faster, - 136m sends/sec vs 130m sends/sec for nfib in tinyBenchmarks, than - Limm: - andl $0x1, rDest - j Lcmp Lentry: movl rSource, rDest andl $0x3, rDest + jz LnotImm + andl $1, rDest + j Lcmp + LnotImm: - jnz Limm movl 0(%edx), rDest andl $0x3fffff, rDest Lcmp: + But we expect most SMallInteger arithmetic to be performwd in-line and so prefer the + version that is faster for non-immediates (because it branches for immediates only)." - " | immLabel jumpNotImm entryLabel jumpCompare | <var: #immLabel type: #'AbstractInstruction *'> <var: #jumpNotImm type: #'AbstractInstruction *'> <var: #entryLabel type: #'AbstractInstruction *'> <var: #jumpCompare type: #'AbstractInstruction *'> + false - true ifTrue: + [cogit AlignmentNops: BytesPerWord. - [cogit AlignmentNops: (BytesPerWord max: 8). entryLabel := cogit Label. cogit MoveR: sourceReg R: destReg. cogit AndCq: objectMemory tagMask R: destReg. jumpNotImm := cogit JumpZero: 0. cogit AndCq: 1 R: destReg. jumpCompare := cogit Jump: 0. "Get least significant half of header word in destReg" self flag: #endianness. jumpNotImm jmpTarget: (cogit MoveMw: 0 r: sourceReg R: destReg). jumpCompare jmpTarget: (cogit AndCq: objectMemory classIndexMask R: destReg)] ifFalse: [cogit AlignmentNops: BytesPerWord. immLabel := cogit Label. cogit AndCq: 1 R: destReg. jumpCompare := cogit Jump: 0. cogit AlignmentNops: BytesPerWord. entryLabel := cogit Label. cogit MoveR: sourceReg R: destReg. cogit AndCq: objectMemory tagMask R: destReg. cogit JumpNonZero: immLabel. self flag: #endianness. "Get least significant half of header word in destReg" cogit MoveMw: 0 r: sourceReg R: destReg. cogit AndCq: objectMemory classIndexMask R: destReg. jumpCompare jmpTarget: cogit Label]. ^entryLabel!

1 0

VM Maker: VMMaker.oscog-eem.566.mcz
by commits＠source.squeak.org 20 Dec '13

20 Dec '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.566.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.566 Author: eem Time: 20 December 2013, 3:28:56.681 pm UUID: d9776d75-8481-4378-92ff-c099be4b4e97 Ancestors: VMMaker.oscog-eem.565 Check-in experiment with different entry code based on method's methodClass. Idea is to eliminate extra jump if methodClass infers method can't have immediate instances. Experiment looks like it doesn't make enough difference to justify the complexity but the code is worth recordingeven if it'll be discarded later. Changes are: refactor entryCode into CogObjectRepresentation>> entryCodeForMethodClass:sendMissCall: Add AlignmentNopsTo opcode to allow filling with nops up to the no-check entry-point. =============== Diff against VMMaker.oscog-eem.565 =============== Item was added: + ----- Method: CoInterpreter>>methodClassOf: (in category 'message sending') ----- + methodClassOf: methodPointer + <inline: true> + <option: #SpurObjectMemory> + <api> + ^super methodClassOf: methodPointer! Item was added: + ----- Method: CoInterpreter>>superclassOf: (in category 'message sending') ----- + superclassOf: classPointer + <inline: true> + <option: #SpurObjectMemory> + <api> + ^super superclassOf: classPointer! Item was changed: ----- Method: CogIA32Compiler>>computeMaximumSize (in category 'generate machine code') ----- computeMaximumSize "Compute the maximum size for each opcode. This allows jump offsets to be determined, provided that all backward branches are long branches." "N.B. The ^maxSize := N forms are to get around the compiler's long branch limits which are exceeded when each case jumps around the otherwise." opcode caseOf: { "Noops & Pseudo Ops" [Label] -> [^maxSize := 0]. [AlignmentNops] -> [^maxSize := (operands at: 0) - 1]. + [AlignmentNopsTo] -> ["this is a hack but we get away with it because there are no forward branches over the entry code." + ^maxSize := (operands at: 0) - address]. [Fill16] -> [^maxSize := 2]. [Fill32] -> [^maxSize := 4]. [FillFromWord] -> [^maxSize := 4]. [Nop] -> [^maxSize := 1]. "Specific Control/Data Movement" [CDQ] -> [^maxSize := 1]. [IDIVR] -> [^maxSize := 2]. [IMULRR] -> [^maxSize := 3]. [CPUID] -> [^maxSize := 2]. [CMPXCHGAwR] -> [^maxSize := 7]. [CMPXCHGMwrR] -> [^maxSize := 8]. [LFENCE] -> [^maxSize := 3]. [MFENCE] -> [^maxSize := 3]. [SFENCE] -> [^maxSize := 3]. [LOCK] -> [^maxSize := 1]. [XCHGAwR] -> [^maxSize := 6]. [XCHGMwrR] -> [^maxSize := 7]. [XCHGRR] -> [^maxSize := 2]. "Control" [Call] -> [^maxSize := 5]. [JumpR] -> [^maxSize := 2]. [Jump] -> [self resolveJumpTarget. ^maxSize := 5]. [JumpLong] -> [self resolveJumpTarget. ^maxSize := 5]. [JumpZero] -> [self resolveJumpTarget. ^maxSize := 6]. [JumpNonZero] -> [self resolveJumpTarget. ^maxSize := 6]. [JumpNegative] -> [self resolveJumpTarget. ^maxSize := 6]. [JumpNonNegative] -> [self resolveJumpTarget. ^maxSize := 6]. [JumpOverflow] -> [self resolveJumpTarget. ^maxSize := 6]. [JumpNoOverflow] -> [self resolveJumpTarget. ^maxSize := 6]. [JumpCarry] -> [self resolveJumpTarget. ^maxSize := 6]. [JumpNoCarry] -> [self resolveJumpTarget. ^maxSize := 6]. [JumpLess] -> [self resolveJumpTarget. ^maxSize := 6]. [JumpGreaterOrEqual] -> [self resolveJumpTarget. ^maxSize := 6]. [JumpGreater] -> [self resolveJumpTarget. ^maxSize := 6]. [JumpLessOrEqual] -> [self resolveJumpTarget. ^maxSize := 6]. [JumpBelow] -> [self resolveJumpTarget. ^maxSize := 6]. [JumpAboveOrEqual] -> [self resolveJumpTarget. ^maxSize := 6]. [JumpAbove] -> [self resolveJumpTarget. ^maxSize := 6]. [JumpBelowOrEqual] -> [self resolveJumpTarget. ^maxSize := 6]. [JumpLongZero] -> [self resolveJumpTarget. ^maxSize := 6]. [JumpLongNonZero] -> [self resolveJumpTarget. ^maxSize := 6]. [JumpFPEqual] -> [self resolveJumpTarget. ^maxSize := 6]. [JumpFPNotEqual] -> [self resolveJumpTarget. ^maxSize := 6]. [JumpFPLess] -> [self resolveJumpTarget. ^maxSize := 6]. [JumpFPGreaterOrEqual] -> [self resolveJumpTarget. ^maxSize := 6]. [JumpFPGreater] -> [self resolveJumpTarget. ^maxSize := 6]. [JumpFPLessOrEqual] -> [self resolveJumpTarget. ^maxSize := 6]. [JumpFPOrdered] -> [self resolveJumpTarget. ^maxSize := 6]. [JumpFPUnordered] -> [self resolveJumpTarget. ^maxSize := 6]. [RetN] -> [^maxSize := (operands at: 0) = 0 ifTrue: [1] ifFalse: [3]]. "Arithmetic" [AddCqR] -> [^maxSize := (self isQuick: (operands at: 0)) ifTrue: [3] ifFalse: [(self concreteRegister: (operands at: 1)) = EAX ifTrue: [5] ifFalse: [6]]]. [AndCqR] -> [^maxSize := (self isQuick: (operands at: 0)) ifTrue: [3] ifFalse: [(self concreteRegister: (operands at: 1)) = EAX ifTrue: [5] ifFalse: [6]]]. [CmpCqR] -> [^maxSize := (self isQuick: (operands at: 0)) ifTrue: [3] ifFalse: [(self concreteRegister: (operands at: 1)) = EAX ifTrue: [5] ifFalse: [6]]]. [OrCqR] -> [^maxSize := (self isQuick: (operands at: 0)) ifTrue: [3] ifFalse: [(self concreteRegister: (operands at: 1)) = EAX ifTrue: [5] ifFalse: [6]]]. [SubCqR] -> [^maxSize := (self isQuick: (operands at: 0)) ifTrue: [3] ifFalse: [(self concreteRegister: (operands at: 1)) = EAX ifTrue: [5] ifFalse: [6]]]. [AddCwR] -> [^maxSize := (self concreteRegister: (operands at: 1)) = EAX ifTrue: [5] ifFalse: [6]]. [AndCwR] -> [^maxSize := (self concreteRegister: (operands at: 1)) = EAX ifTrue: [5] ifFalse: [6]]. [CmpCwR] -> [^maxSize := (self concreteRegister: (operands at: 1)) = EAX ifTrue: [5] ifFalse: [6]]. [OrCwR] -> [^maxSize := (self concreteRegister: (operands at: 1)) = EAX ifTrue: [5] ifFalse: [6]]. [SubCwR] -> [^maxSize := (self concreteRegister: (operands at: 1)) = EAX ifTrue: [5] ifFalse: [6]]. [XorCwR] -> [^maxSize := (self concreteRegister: (operands at: 1)) = EAX ifTrue: [5] ifFalse: [6]]. [AddRR] -> [^maxSize := 2]. [AndRR] -> [^maxSize := 2]. [CmpRR] -> [^maxSize := 2]. [OrRR] -> [^maxSize := 2]. [XorRR] -> [^maxSize := 2]. [SubRR] -> [^maxSize := 2]. [NegateR] -> [^maxSize := 2]. [LoadEffectiveAddressMwrR] -> [^maxSize := ((self isQuick: (operands at: 0)) ifTrue: [3] ifFalse: [6]) + ((self concreteRegister: (operands at: 1)) = ESP ifTrue: [1] ifFalse: [0])]. [LogicalShiftLeftCqR] -> [^maxSize := (operands at: 0) = 1 ifTrue: [2] ifFalse: [3]]. [LogicalShiftRightCqR] -> [^maxSize := (operands at: 0) = 1 ifTrue: [2] ifFalse: [3]]. [ArithmeticShiftRightCqR] -> [^maxSize := (operands at: 0) = 1 ifTrue: [2] ifFalse: [3]]. [LogicalShiftLeftRR] -> [self computeShiftRRSize]. [LogicalShiftRightRR] -> [self computeShiftRRSize]. [ArithmeticShiftRightRR] -> [self computeShiftRRSize]. [AddRdRd] -> [^maxSize := 4]. [CmpRdRd] -> [^maxSize := 4]. [SubRdRd] -> [^maxSize := 4]. [MulRdRd] -> [^maxSize := 4]. [DivRdRd] -> [^maxSize := 4]. [SqrtRd] -> [^maxSize := 4]. "Data Movement" [MoveCqR] -> [^maxSize := (operands at: 0) = 0 ifTrue: [2] ifFalse: [5]]. [MoveCwR] -> [^maxSize := 5]. [MoveRR] -> [^maxSize := 2]. [MoveRdRd] -> [^maxSize := 4]. [MoveAwR] -> [^maxSize := (self concreteRegister: (operands at: 1)) = EAX ifTrue: [5] ifFalse: [6]]. [MoveRAw] -> [^maxSize := (self concreteRegister: (operands at: 0)) = EAX ifTrue: [5] ifFalse: [6]]. [MoveRMwr] -> [^maxSize := ((self isQuick: (operands at: 1)) ifTrue: [3] ifFalse: [6]) + ((self concreteRegister: (operands at: 2)) = ESP ifTrue: [1] ifFalse: [0])]. [MoveRdM64r] -> [^maxSize := ((self isQuick: (operands at: 1)) ifTrue: [5] ifFalse: [8]) + ((self concreteRegister: (operands at: 2)) = ESP ifTrue: [1] ifFalse: [0])]. [MoveMbrR] -> [^maxSize := ((self isQuick: (operands at: 0)) ifTrue: [3] ifFalse: [6]) + ((self concreteRegister: (operands at: 1)) = ESP ifTrue: [1] ifFalse: [0])]. [MoveRMbr] -> [^maxSize := ((self isQuick: (operands at: 1)) ifTrue: [3] ifFalse: [6]) + ((self concreteRegister: (operands at: 2)) = ESP ifTrue: [1] ifFalse: [0])]. [MoveM16rR] -> [^maxSize := ((self isQuick: (operands at: 0)) ifTrue: [4] ifFalse: [7]) + ((self concreteRegister: (operands at: 1)) = ESP ifTrue: [1] ifFalse: [0])]. [MoveM64rRd] -> [^maxSize := ((self isQuick: (operands at: 0)) ifTrue: [5] ifFalse: [8]) + ((self concreteRegister: (operands at: 1)) = ESP ifTrue: [1] ifFalse: [0])]. [MoveMwrR] -> [^maxSize := ((self isQuick: (operands at: 0)) ifTrue: [3] ifFalse: [6]) + ((self concreteRegister: (operands at: 1)) = ESP ifTrue: [1] ifFalse: [0])]. [MoveXbrRR] -> [self assert: (self concreteRegister: (operands at: 0)) ~= ESP. ^maxSize := (self concreteRegister: (operands at: 1)) = EBP ifTrue: [5] ifFalse: [4]]. [MoveRXbrR] -> [self assert: (self concreteRegister: (operands at: 1)) ~= ESP. ^maxSize := (self concreteRegister: (operands at: 2)) = EBP ifTrue: [4] ifFalse: [3]]. [MoveXwrRR] -> [self assert: (self concreteRegister: (operands at: 0)) ~= ESP. ^maxSize := (self concreteRegister: (operands at: 1)) = EBP ifTrue: [4] ifFalse: [3]]. [MoveRXwrR] -> [self assert: (self concreteRegister: (operands at: 1)) ~= ESP. ^maxSize := (self concreteRegister: (operands at: 2)) = EBP ifTrue: [4] ifFalse: [3]]. [PopR] -> [^maxSize := 1]. [PushR] -> [^maxSize := 1]. [PushCw] -> [^maxSize := 5]. [PrefetchAw] -> [^maxSize := self hasSSEInstructions ifTrue: [7] ifFalse: [0]]. "Conversion" [ConvertRRd] -> [^maxSize := 4] }. ^0 "to keep C compiler quiet"! Item was added: + ----- Method: CogIA32Compiler>>concretizeAlignmentNopsTo (in category 'generate machine code') ----- + concretizeAlignmentNopsTo + <inline: true> + | targetAddress label | + <var: 'label' type: #'AbstractInstruction *'> + label := self cCoerceSimple: (operands at: 1) to: #'AbstractInstruction *'. + targetAddress := label address + (operands at: 0). + self assert: targetAddress >= address. + machineCodeSize := targetAddress - address. + ^self concretizeAlignmentNops! Item was changed: ----- Method: CogIA32Compiler>>dispatchConcretize (in category 'generate machine code') ----- dispatchConcretize "Attempt to generate concrete machine code for the instruction at address. This is the inner dispatch of concretizeAt: actualAddress which exists only to get around the branch size limits in the SqueakV3 (blue book derived) bytecode set." <returnTypeC: #void> opcode caseOf: { "Noops & Pseudo Ops" [Label] -> [^self concretizeLabel]. [AlignmentNops] -> [^self concretizeAlignmentNops]. + [AlignmentNopsTo] -> [^self concretizeAlignmentNopsTo]. [Fill16] -> [^self concretizeFill16]. [Fill32] -> [^self concretizeFill32]. [FillFromWord] -> [^self concretizeFillFromWord]. [Nop] -> [^self concretizeNop]. "Specific Control/Data Movement" [CDQ] -> [^self concretizeCDQ]. [IDIVR] -> [^self concretizeIDIVR]. [IMULRR] -> [^self concretizeMulRR]. [CPUID] -> [^self concretizeCPUID]. [CMPXCHGAwR] -> [^self concretizeCMPXCHGAwR]. [CMPXCHGMwrR] -> [^self concretizeCMPXCHGMwrR]. [LFENCE] -> [^self concretizeFENCE: 5]. [MFENCE] -> [^self concretizeFENCE: 6]. [SFENCE] -> [^self concretizeFENCE: 7]. [LOCK] -> [^self concretizeLOCK]. [XCHGAwR] -> [^self concretizeXCHGAwR]. [XCHGMwrR] -> [^self concretizeXCHGMwrR]. [XCHGRR] -> [^self concretizeXCHGRR]. "Control" [Call] -> [^self concretizeCall]. [JumpR] -> [^self concretizeJumpR]. [JumpLong] -> [^self concretizeJumpLong]. [JumpLongZero] -> [^self concretizeConditionalJumpLong: 16r4]. [JumpLongNonZero] -> [^self concretizeConditionalJumpLong: 16r5]. [Jump] -> [^self concretizeJump]. "Table B-1 Intel® 64 and IA-32 Architectures Software Developer's Manual Volume 1: Basic Architecture" [JumpZero] -> [^self concretizeConditionalJump: 16r4]. [JumpNonZero] -> [^self concretizeConditionalJump: 16r5]. [JumpNegative] -> [^self concretizeConditionalJump: 16r8]. [JumpNonNegative] -> [^self concretizeConditionalJump: 16r9]. [JumpOverflow] -> [^self concretizeConditionalJump: 16r0]. [JumpNoOverflow] -> [^self concretizeConditionalJump: 16r1]. [JumpCarry] -> [^self concretizeConditionalJump: 16r2]. [JumpNoCarry] -> [^self concretizeConditionalJump: 16r3]. [JumpLess] -> [^self concretizeConditionalJump: 16rC]. [JumpGreaterOrEqual] -> [^self concretizeConditionalJump: 16rD]. [JumpGreater] -> [^self concretizeConditionalJump: 16rF]. [JumpLessOrEqual] -> [^self concretizeConditionalJump: 16rE]. [JumpBelow] -> [^self concretizeConditionalJump: 16r2]. [JumpAboveOrEqual] -> [^self concretizeConditionalJump: 16r3]. [JumpAbove] -> [^self concretizeConditionalJump: 16r7]. [JumpBelowOrEqual] -> [^self concretizeConditionalJump: 16r6]. [JumpFPEqual] -> [^self concretizeConditionalJump: 16r4]. [JumpFPNotEqual] -> [^self concretizeConditionalJump: 16r5]. [JumpFPLess] -> [^self concretizeConditionalJump: 16r2]. [JumpFPGreaterOrEqual] -> [^self concretizeConditionalJump: 16r3]. [JumpFPGreater] -> [^self concretizeConditionalJump: 16r7]. [JumpFPLessOrEqual] -> [^self concretizeConditionalJump: 16r6]. [JumpFPOrdered] -> [^self concretizeConditionalJump: 16rB]. [JumpFPUnordered] -> [^self concretizeConditionalJump: 16rA]. [RetN] -> [^self concretizeRetN]. "Arithmetic" [AddCqR] -> [^self concretizeAddCqR]. [AddCwR] -> [^self concretizeAddCwR]. [AddRR] -> [^self concretizeAddRR]. [AddRdRd] -> [^self concretizeSEE2OpRdRd: 16r58]. [AndCqR] -> [^self concretizeAndCqR]. [AndCwR] -> [^self concretizeAndCwR]. [AndRR] -> [^self concretizeAndRR]. [CmpCqR] -> [^self concretizeCmpCqR]. [CmpCwR] -> [^self concretizeCmpCwR]. [CmpRR] -> [^self concretizeCmpRR]. [CmpRdRd] -> [^self concretizeCmpRdRd]. [DivRdRd] -> [^self concretizeSEE2OpRdRd: 16r5E]. [MulRdRd] -> [^self concretizeSEE2OpRdRd: 16r59]. [OrCqR] -> [^self concretizeOrCqR]. [OrCwR] -> [^self concretizeOrCwR]. [OrRR] -> [^self concretizeOrRR]. [SubCqR] -> [^self concretizeSubCqR]. [SubCwR] -> [^self concretizeSubCwR]. [SubRR] -> [^self concretizeSubRR]. [SubRdRd] -> [^self concretizeSEE2OpRdRd: 16r5C]. [SqrtRd] -> [^self concretizeSqrtRd]. [XorCwR] -> [^self concretizeXorCwR]. [XorRR] -> [^self concretizeXorRR]. [NegateR] -> [^self concretizeNegateR]. [LoadEffectiveAddressMwrR] -> [^self concretizeLoadEffectiveAddressMwrR]. [ArithmeticShiftRightCqR] -> [^self concretizeArithmeticShiftRightCqR]. [LogicalShiftRightCqR] -> [^self concretizeLogicalShiftRightCqR]. [LogicalShiftLeftCqR] -> [^self concretizeLogicalShiftLeftCqR]. [ArithmeticShiftRightRR] -> [^self concretizeArithmeticShiftRightRR]. [LogicalShiftLeftRR] -> [^self concretizeLogicalShiftLeftRR]. "Data Movement" [MoveCqR] -> [^self concretizeMoveCqR]. [MoveCwR] -> [^self concretizeMoveCwR]. [MoveRR] -> [^self concretizeMoveRR]. [MoveAwR] -> [^self concretizeMoveAwR]. [MoveRAw] -> [^self concretizeMoveRAw]. [MoveMbrR] -> [^self concretizeMoveMbrR]. [MoveRMbr] -> [^self concretizeMoveRMbr]. [MoveM16rR] -> [^self concretizeMoveM16rR]. [MoveM64rRd] -> [^self concretizeMoveM64rRd]. [MoveMwrR] -> [^self concretizeMoveMwrR]. [MoveXbrRR] -> [^self concretizeMoveXbrRR]. [MoveRXbrR] -> [^self concretizeMoveRXbrR]. [MoveXwrRR] -> [^self concretizeMoveXwrRR]. [MoveRXwrR] -> [^self concretizeMoveRXwrR]. [MoveRMwr] -> [^self concretizeMoveRMwr]. [MoveRdM64r] -> [^self concretizeMoveRdM64r]. [PopR] -> [^self concretizePopR]. [PushR] -> [^self concretizePushR]. [PushCw] -> [^self concretizePushCw]. [PrefetchAw] -> [^self concretizePrefetchAw]. "Conversion" [ConvertRRd] -> [^self concretizeConvertRRd] }! Item was changed: ----- Method: CogIA32Compiler>>machineCodeBytes (in category 'generate machine code') ----- machineCodeBytes "Answer the maximum number of bytes of machine code generated for any abstract instruction. + e.g. lock movsd 0x400(%esp),%xmm4 => f0 f2 0f 10 a4 24 00 04 00 00 + But with the new entry code, AlignmentNopsTo may generate 13 bytes of nops." + ^14 "10"! - e.g. lock movsd 0x400(%esp),%xmm4 => f0 f2 0f 10 a4 24 00 04 00 00" - ^10! Item was added: + ----- Method: CogObjectRepresentation>>entryCodeForMethodClass:sendMissCall: (in category 'in-line cacheing') ----- + entryCodeForMethodClass: methodClassOrNil sendMissCall: theSendMissCall + "Generate the method-entry code. Extract the inline cache tag for the object + in ReceiverResultReg into TempReg and compare it against ClassReg. The inline + cache tag for a given object is the value loaded in inline caches to distinguish + objects of different classes." + <var: #sendMissCall type: #'AbstractInstruction *'> + | entryLabel | + <var: #entryLabel type: #'AbstractInstruction *'> + entryLabel := self getInlineCacheClassTagFrom: ReceiverResultReg into: TempReg. + cogit CmpR: ClassReg R: TempReg. + cogit JumpNonZero: theSendMissCall. + ^entryLabel! Item was added: + ----- Method: CogObjectRepresentationFor32BitSpur>>entryCodeForMethodClass:sendMissCall: (in category 'in-line cacheing') ----- + entryCodeForMethodClass: methodClassOrNil sendMissCall: theSendMissCall + "Generate the method-entry code. Extract the inline cache tag for the object + in ReceiverResultReg into TempReg and compare it against ClassReg. The inline + cache tag for a given object is the value loaded in inline caches to distinguish + objects of different classes. In Spur this is either the tags for immediates, (with + 1 & 3 collapsed to 1 for SmallIntegers, and 2 collapsed to 0 for Characters), or + the receiver's classIndex. Try and special-case sends to immediates and sends + to non-immediates." + <var: #sendMissCall type: #'AbstractInstruction *'> + | entryLabel characterClass smallIntegerClass | + <var: #entryLabel type: #'AbstractInstruction *'> + "special cases" + methodClassOrNil ~= objectMemory nilObject ifTrue: + [characterClass := objectMemory classCharacter. + smallIntegerClass := objectMemory classSmallInteger. + + (methodClassOrNil = characterClass + or: [methodClassOrNil = smallIntegerClass]) ifTrue: + ["methodClass is an immediate class. immediate classes can't + have subclasses so test for the immediate tag directly." + cogit AlignmentNops: (BytesPerWord max: self entryAlignment). + entryLabel := cogit Label. + cogit MoveR: ReceiverResultReg R: TempReg. + cogit AndCq: objectMemory tagMask R: TempReg. + cogit CmpCq: (methodClassOrNil = characterClass + ifTrue: [objectMemory characterTag] + ifFalse: [objectMemory smallIntegerTag]) + R: TempReg. + cogit JumpNonZero: theSendMissCall. + cogit AlignmentNopsTo: cogit noCheckEntryOffset from: cogit methodLabel. + ^entryLabel]. + + (self methodClass: methodClassOrNil isSuperclassOf: characterClass or: smallIntegerClass) ifFalse: + ["methodClass can't have immediate general instances, so fail on immediate." + cogit AlignmentNops: (BytesPerWord max: self entryAlignment). + entryLabel := cogit Label. + cogit MoveR: ReceiverResultReg R: TempReg. + cogit AndCq: objectMemory tagMask R: TempReg. + cogit JumpNonZero: theSendMissCall. + self flag: #endianness. + "Get least significant half of header word in destReg" + cogit MoveMw: 0 r: ReceiverResultReg R: TempReg. + cogit AndCq: objectMemory classIndexMask R: TempReg. + cogit CmpR: ClassReg R: TempReg. + cogit JumpNonZero: theSendMissCall. + cogit AlignmentNopsTo: cogit noCheckEntryOffset from: cogit methodLabel. + ^entryLabel]]. + + "generic case, could be either immediate or non-immediate." + entryLabel := self getInlineCacheClassTagFrom: ReceiverResultReg into: TempReg. + cogit CmpR: ClassReg R: TempReg. + cogit JumpNonZero: theSendMissCall. + ^entryLabel! Item was changed: ----- Method: CogObjectRepresentationFor32BitSpur>>getInlineCacheClassTagFrom:into: (in category 'compile abstract instructions') ----- getInlineCacheClassTagFrom: sourceReg into: destReg "Extract the inline cache tag for the object in sourceReg into destReg. The inline cache tag for a given object is the value loaded in inline caches to distinguish objects of different classes. In Spur this is either the tags for immediates, (with 1 & 3 collapsed to 1 for SmallIntegers, and 2 collapsed to 0 for Characters), or the receiver's classIndex. Generate something like this: Lentry: movl rSource, rDest andl $0x3, rDest jz LnotImm andl $1, rDest j Lcmp LnotImm: movl 0(%edx), rDest andl $0x3fffff, rDest Lcmp: At least on a 2.2GHz Intel Core i7 it is slightly faster, 136m sends/sec vs 130m sends/sec for nfib in tinyBenchmarks, than Limm: andl $0x1, rDest j Lcmp Lentry: movl rSource, rDest andl $0x3, rDest jnz Limm movl 0(%edx), rDest andl $0x3fffff, rDest Lcmp: " | immLabel jumpNotImm entryLabel jumpCompare | <var: #immLabel type: #'AbstractInstruction *'> <var: #jumpNotImm type: #'AbstractInstruction *'> <var: #entryLabel type: #'AbstractInstruction *'> <var: #jumpCompare type: #'AbstractInstruction *'> true ifTrue: + [cogit AlignmentNops: (BytesPerWord max: self entryAlignment). - [cogit AlignmentNops: (BytesPerWord max: 8). entryLabel := cogit Label. cogit MoveR: sourceReg R: destReg. cogit AndCq: objectMemory tagMask R: destReg. jumpNotImm := cogit JumpZero: 0. cogit AndCq: 1 R: destReg. jumpCompare := cogit Jump: 0. "Get least significant half of header word in destReg" self flag: #endianness. jumpNotImm jmpTarget: (cogit MoveMw: 0 r: sourceReg R: destReg). jumpCompare jmpTarget: (cogit AndCq: objectMemory classIndexMask R: destReg)] ifFalse: [cogit AlignmentNops: BytesPerWord. immLabel := cogit Label. cogit AndCq: 1 R: destReg. jumpCompare := cogit Jump: 0. cogit AlignmentNops: BytesPerWord. entryLabel := cogit Label. cogit MoveR: sourceReg R: destReg. cogit AndCq: objectMemory tagMask R: destReg. cogit JumpNonZero: immLabel. self flag: #endianness. "Get least significant half of header word in destReg" cogit MoveMw: 0 r: sourceReg R: destReg. cogit AndCq: objectMemory classIndexMask R: destReg. jumpCompare jmpTarget: cogit Label]. ^entryLabel! Item was added: + ----- Method: CogObjectRepresentationForSpur>>entryAlignment (in category 'in-line cacheing') ----- + entryAlignment + "At least on Core i7, 8 is no better than 4, and 4 gives more compact code." + ^4 "8"! Item was added: + ----- Method: CogObjectRepresentationForSpur>>methodClass:isSuperclassOf:or: (in category 'in-line cacheing') ----- + methodClass: methodClass isSuperclassOf: firstImmediateClass or: secondImmediateClass + | classAOrNil classBOrNil nilObj | + classAOrNil := firstImmediateClass. + classBOrNil := secondImmediateClass. + nilObj := objectMemory nilObject. + [classAOrNil = nilObj + ifTrue: + [classBOrNil = nilObj ifTrue: + [^false]] + ifFalse: + [(classAOrNil := objectMemory superclassOf: classAOrNil) = methodClass ifTrue: + [^true]]. + classBOrNil = nilObj + ifTrue: + [classAOrNil = nilObj ifTrue: + [^false]] + ifFalse: + [(classBOrNil := objectMemory superclassOf: classBOrNil) = methodClass ifTrue: + [^true]]] repeat! Item was changed: SharedPool subclass: #CogRTLOpcodes instanceVariableNames: '' + classVariableNames: 'AddCqR AddCwR AddRR AddRdRd AlignmentNops AlignmentNopsTo AndCqR AndCwR AndRR Arg0Reg Arg1Reg ArithmeticShiftRightCqR ArithmeticShiftRightRR Call ClassReg CmpCqR CmpCwR CmpRR CmpRdRd ConvertRRd DPFPReg0 DPFPReg1 DPFPReg2 DPFPReg3 DPFPReg4 DPFPReg5 DPFPReg6 DPFPReg7 DivRdRd FPReg Fill16 Fill32 Fill8 FillBytesFrom FillFromWord FirstJump FirstShortJump GPRegMax GPRegMin Jump JumpAbove JumpAboveOrEqual JumpBelow JumpBelowOrEqual JumpCarry JumpFPEqual JumpFPGreater JumpFPGreaterOrEqual JumpFPLess JumpFPLessOrEqual JumpFPNotEqual JumpFPOrdered JumpFPUnordered JumpGreater JumpGreaterOrEqual JumpLess JumpLessOrEqual JumpLong JumpLongNonZero JumpLongZero JumpNegative JumpNoCarry JumpNoOverflow JumpNonNegative JumpNonZero JumpOverflow JumpR JumpZero Label LastJump LastRTLCode LinkReg LoadEffectiveAddressMwrR LoadEffectiveAddressXowrR LogicalShiftLeftCqR LogicalShiftLeftRR LogicalShiftRightCqR LogicalShiftRightRR MoveAbR MoveAwR MoveC32R MoveC64R MoveCqR MoveCwR MoveM16rR MoveM32rR MoveM64rRd MoveMbrR MoveMwrR MoveRAw MoveRM16r MoveRM32r MoveRMbr MoveRMwr MoveRR MoveRX16rR MoveRX32rR MoveRXbrR MoveRXowr MoveRXwrR MoveRdM64r MoveRdRd MoveX16rRR MoveX32rRR MoveXbrRR MoveXowrR MoveXwrRR MulCqR MulCwR MulRR MulRdRd NegateR Nop OrCqR OrCwR OrRR PopR PrefetchAw PushCw PushR ReceiverResultReg RetN SPReg SendNumArgsReg SqrtRd SubCqR SubCwR SubRR SubRdRd TempReg XorCqR XorCwR XorRR' - classVariableNames: 'AddCqR AddCwR AddRR AddRdRd AlignmentNops AndCqR AndCwR AndRR Arg0Reg Arg1Reg ArithmeticShiftRightCqR ArithmeticShiftRightRR Call ClassReg CmpCqR CmpCwR CmpRR CmpRdRd ConvertRRd DPFPReg0 DPFPReg1 DPFPReg2 DPFPReg3 DPFPReg4 DPFPReg5 DPFPReg6 DPFPReg7 DivRdRd FPReg Fill16 Fill32 Fill8 FillBytesFrom FillFromWord FirstJump FirstShortJump GPRegMax GPRegMin Jump JumpAbove JumpAboveOrEqual JumpBelow JumpBelowOrEqual JumpCarry JumpFPEqual JumpFPGreater JumpFPGreaterOrEqual JumpFPLess JumpFPLessOrEqual JumpFPNotEqual JumpFPOrdered JumpFPUnordered JumpGreater JumpGreaterOrEqual JumpLess JumpLessOrEqual JumpLong JumpLongNonZero JumpLongZero JumpNegative JumpNoCarry JumpNoOverflow JumpNonNegative JumpNonZero JumpOverflow JumpR JumpZero Label LastJump LastRTLCode LinkReg LoadEffectiveAddressMwrR LogicalShiftLeftCqR LogicalShiftLeftRR LogicalShiftRightCqR LogicalShiftRightRR MoveAbR MoveAwR MoveC32R MoveC64R MoveCqR MoveCwR MoveM16rR MoveM64rRd MoveMbrR MoveMwrR MoveRAw MoveRM16r MoveRMbr MoveRMwr MoveRR MoveRX16rR MoveRXbrR MoveRXowr MoveRXwrR MoveRdM64r MoveRdRd MoveX16rRR MoveXbrRR MoveXowrR MoveXwrRR MulCqR MulCwR MulRR MulRdRd NegateR Nop OrCqR OrCwR OrRR PopR PrefetchAw PushCw PushR ReceiverResultReg RetN SPReg SendNumArgsReg SqrtRd SubCqR SubCwR SubRR SubRdRd TempReg XorCqR XorCwR XorRR' poolDictionaries: '' category: 'VMMaker-JIT'! !CogRTLOpcodes commentStamp: '<historical>' prior: 0! I am a pool for the Register-Transfer-Language to which Cog compiles. I define unique integer values for all RTL opcodes and abstract registers. See CogAbstractInstruction for instances of instructions with the opcodes that I define.! Item was changed: ----- Method: CogRTLOpcodes class>>initialize (in category 'class initialization') ----- initialize "Abstract opcodes are a compound of a one word operation specifier and zero or more operand type specifiers. e.g. MoveRR is the Move opcode with two register operand specifiers and defines a move register to register instruction from operand 0 to operand 1. The word and register size is assumed to be either 32-bits on a 32-bit architecture or 64-bits on a 64-bit architecture. The operand specifiers are R - general purpose register Rd - double-precision floating-point register Cq - a quick constant that can be encoded in the minimum space possible. Cw - a constant with word size where word is the default operand size for the Smalltalk VM, 32-bits for a 32-bit VM, 64-bits for a 64-bit VM. The generated constant must occupy the default number of bits. This allows e.g. a garbage collector to update the value without invalidating the code. C32 - a constant with 32 bit size. The generated constant must occupy 32 bits. C64 - a constant with 64 bit size. The generated constant must occupy 64 bits. + Aw - memory word at an absolute address + Ab - memory byte at an absolute address - Aw - memory word with an absolute address - Ab - memory byte with an absolute address Mwr - memory word whose address is at a constant offset from an address in a register Mbr - memory byte whose address is at a constant offset from an address in a register M16r - memory 16-bit halfword whose address is at a constant offset from an address in a register M32r - memory 32-bit halfword whose address is at a constant offset from an address in a register M64r - memory 64-bit doubleword whose address is at a constant offset from an address in a register XbrR - memory word whose address is r * byte size away from an address in a register X16rR - memory word whose address is r * (2 bytes size) away from an address in a register XwrR - memory word whose address is r * word size away from an address in a register XowrR - memory word whose address is (r * word size) + o away from an address in a register (scaled indexed) An alternative would be to decouple opcodes from operands, e.g. Move := 1. Add := 2. Sub := 3... RegisterOperand := 1. ConstantQuickOperand := 2. ConstantWordOperand := 3... But not all combinations make sense and even fewer are used so we stick with the simple compound approach. The assumption is that comparison and arithmetic instructions set condition codes and that move instructions leave the condition codes unaffected. In particular LoadEffectiveAddressMwrR does not set condition codes although it can be used to do arithmetic. Not all of the definitions in opcodeDefinitions below are implemented. In particular we do not implement the XowrR scaled index addressing mode since it requires 4 operands. Note that there are no generic division instructions defined, but a processor may define some." "CogRTLOpcodes initialize. CogAbstractInstruction allSubclasses do: [:sc| sc initialize]" | opcodeNames refs | FPReg := -1. SPReg := -2. ReceiverResultReg := GPRegMax := -3. TempReg := -4. ClassReg := -5. SendNumArgsReg := -6. Arg0Reg := -7. Arg1Reg := GPRegMin := -8. DPFPReg0 := -9. DPFPReg1 := -10. DPFPReg2 := -11. DPFPReg3 := -12. DPFPReg4 := -13. DPFPReg5 := -14. DPFPReg6 := -15. DPFPReg7 := -16. LinkReg := -17. + opcodeNames := #("No ops & Pseudo Ops" - opcodeNames := #("Noops & Pseudo Ops" Label + AlignmentNops "output nops until a byte aligned on an operand 0 boundary" + AlignmentNopsTo "output nops until just before the address in operand 0 + operand 1" + FillBytesFrom "output operand 0's worth of bytes from the address in operand 1" + Fill8 "output a byte's worth of bytes with operand 0" + Fill16 "output two byte's worth of bytes with operand 0" + Fill32 "output four byte's worth of bytes with operand 0" + FillFromWord "output BytesPerWord's worth of bytes with operand 0 + operand 1" - AlignmentNops - FillBytesFrom "output operand 0's worth of bytes from the address in operand 1" - Fill8 "output a byte's worth of bytes with operand 0" - Fill16 "output two byte's worth of bytes with operand 0" - Fill32 "output four byte's worth of bytes with operand 0" - FillFromWord "output BytesPerWord's worth of bytes with operand 0 + operand 1" Nop "Control" Call RetN JumpR "Not a regular jump, i.e. not pc dependent." "N.B. Jumps are contiguous. Long jumps are contigiuous within them. See FirstJump et al below" JumpLong JumpLongZero "a.k.a. JumpLongEqual" JumpLongNonZero "a.k.a. JumpLongNotEqual" Jump JumpZero "a.k.a. JumpEqual" JumpNonZero "a.k.a. JumpNotEqual" JumpNegative JumpNonNegative JumpOverflow JumpNoOverflow JumpCarry JumpNoCarry JumpLess "signed" JumpGreaterOrEqual JumpGreater JumpLessOrEqual JumpBelow "unsigned" JumpAboveOrEqual JumpAbove JumpBelowOrEqual JumpFPEqual JumpFPNotEqual JumpFPLess JumpFPLessOrEqual JumpFPGreater JumpFPGreaterOrEqual JumpFPOrdered JumpFPUnordered "Data Movement; destination is always last operand" MoveRR MoveAwR MoveRAw MoveAbR MoveMwrR MoveRMwr MoveXwrRR MoveRXwrR MoveXowrR MoveRXowr MoveM16rR MoveRM16r MoveX16rRR MoveRX16rR MoveM32rR MoveRM32r MoveX32rRR MoveRX32rR MoveMbrR MoveRMbr MoveXbrRR MoveRXbrR MoveCqR MoveCwR MoveC32R MoveC64R MoveRdRd MoveM64rRd MoveRdM64r PopR PushR PushCw PrefetchAw "Arithmetic; destination is always last operand except Cmp; CmpXR is SubRX with no update of result" LoadEffectiveAddressMwrR LoadEffectiveAddressXowrR "Variants of add/multiply" NegateR "2's complement negation" ArithmeticShiftRightCqR ArithmeticShiftRightRR LogicalShiftRightCqR LogicalShiftRightRR LogicalShiftLeftCqR LogicalShiftLeftRR CmpRR AddRR SubRR AndRR OrRR XorRR MulRR CmpCqR AddCqR SubCqR AndCqR OrCqR XorCqR MulCqR CmpCwR AddCwR SubCwR AndCwR OrCwR XorCwR MulCwR CmpRdRd AddRdRd SubRdRd MulRdRd DivRdRd SqrtRd "Conversion" ConvertRRd LastRTLCode). "Magic auto declaration. Add to the classPool any new variables and nuke any obsolete ones, and assign values" "Find the variables directly referenced by this method" refs := (thisContext method literals select: [:l| l isVariableBinding and: [classPool includesKey: l key]]) collect: [:ea| ea key]. "Move to Undeclared any opcodes in classPool not in opcodes or this method." (classPool keys reject: [:k| (opcodeNames includes: k) or: [refs includes: k]]) do: [:k| Undeclared declare: k from: classPool]. "Declare as class variables and number elements of opcodeArray above" opcodeNames withIndexDo: [:classVarName :value| self classPool declare: classVarName from: Undeclared; at: classVarName put: value]. "For CogAbstractInstruction>>isJump etc..." FirstJump := JumpLong. LastJump := JumpFPUnordered. FirstShortJump := Jump! Item was added: + ----- Method: Cogit>>AlignmentNopsTo:from: (in category 'abstract instructions') ----- + AlignmentNopsTo: offset from: label + <inline: true> + <returnTypeC: #'AbstractInstruction *'> + ^self gen: AlignmentNopsTo operand: offset operand: label! Item was changed: ----- Method: Cogit>>compileEntry (in category 'compile abstract instructions') ----- compileEntry "The entry code to a method checks that the class of the current receiver matches that in the inline cache. Other non-obvious elements are that its alignment must be different from the alignment of the noCheckEntry so that the method map machinery can distinguish normal and super sends (super sends bind to the noCheckEntry). In Newspeak we also need to distinguish dynSuperSends from normal and super + sends (which is done by their alignment) and so bind the preceeding nop (on x86 + there happens to be one anyway)." - and so bind a the preceeding nop (on x86 there happens to be one anyway)." self cppIf: NewspeakVM ifTrue: [self Nop. "1st nop differentiates dynSuperEntry from no-check entry if using nextMethod" dynSuperEntry := self Nop]. + entry := objectRepresentation + entryCodeForMethodClass: (methodObj + ifNil: [objectMemory nilObject] + ifNotNil: [coInterpreter methodClassOf: methodObj]) + sendMissCall: sendMissCall. - entry := objectRepresentation getInlineCacheClassTagFrom: ReceiverResultReg into: TempReg. - self CmpR: ClassReg R: TempReg. - self JumpNonZero: sendMissCall. noCheckEntry := self Label. self recordSendTrace ifTrue: [self CallRT: ceTraceLinkedSendTrampoline]! Item was added: + ----- Method: Cogit>>methodLabel (in category 'accessing') ----- + methodLabel + <cmacro: '() methodLabel'> + ^methodLabel! Item was added: + ----- Method: Spur32BitCoMemoryManager>>smallIntegerTag (in category 'object access') ----- + smallIntegerTag + <api> + ^1! Item was added: + ----- Method: Spur32BitCoMemoryManager>>superclassOf: (in category 'cogit support') ----- + superclassOf: classPointer + <doNotGenerate> + ^coInterpreter superclassOf: classPointer! Item was changed: ----- Method: SpurMemoryManager>>classCharacter (in category 'plugin support') ----- classCharacter + <api> ^self splObj: ClassCharacter!

1 0

Re: [squeak-dev] [ANN] SqueakJS
by David T. Lewis 20 Dec '13

20 Dec '13

On Fri, Dec 20, 2013 at 10:31:35PM +0100, Bert Freudenberg wrote: > Hi all, > > I'm proud to announce SqueakJS, a new Squeak VM that runs on Javascript: > > http://bertfreudenberg.github.io/SqueakJS/ > > It was inspired by Dan's JSqueak/Potato VM for Java, and similarly only runs the old Squeak 2.2 mini.image for now. But I developed it inside the Lively Kernel, which allowed me to make a nice UI to look inside the VM (in addition to all the Lively tools): > Woohoo! This looks wonderful, thank you for the early Christmas present :-) Dave

1 0

Re: [ANN] SqueakJS
by Bert Freudenberg 20 Dec '13

20 Dec '13

On 20.12.2013, at 23:12, Chris Muller <asqueaker(a)gmail.com> wrote: > On Fri, Dec 20, 2013 at 3:31 PM, Bert Freudenberg <bert(a)freudenbergs.de> wrote: >> http://croquetweak.blogspot.de/2013/12/squeakjs-lively-squeak-vm.html > > Ultra cool, Bert, congratulations! > > I was glad to see several, "for now"'s in your note. Could you possibly give us a clue to your roadmap? > > A practical implementation of this has massive implications for Squeak -- deployment to any JS-enabled device. Obviously this is a fantastic demonstration of wrapping computation, please tell me this is not just an experiment but something for which you have broader plans for..? My personal medium-term goal is running an Etoys image. It will be very slow at first, but there certainly are ways to optimize. But one reason for releasing it at this early stage is to allow people to work on what they think is needed. Like running a current Squeak image - beyond the stuff needed for Etoys it should really just be a handful changes to correctly interpret closures. As for optimizing I think the way to go is a JIT compiler that creates actual Javascript functions from Squeak methods. And to make BitBlt fast, we could probably use WebGL. There's also interesting stuff I probably won't be working on. Like a kind-of FFI that lets you call Javascript libraries directly. Or a plugin that gives you access to the DOM (I do have the mechanism for VM plugins in place already). With that you could write a native HTML UI which would certainly be much faster than BitBlt. Networking would be interesting, too. How about implementing the SocketPlugin via WebSockets? Or file access using the browser's local storage API? Parallelize the VM with WebWorkers? There's a gazillion exciting things to do :) - Bert -

1 0

Re: [squeak-dev] [ANN] SqueakJS
by Bert Freudenberg 20 Dec '13

20 Dec '13

On 20.12.2013, at 22:35, Jeff Gonis <jeff.gonis(a)gmail.com> wrote: > Bert, > > This is fantastic work! I didn't know you were going to announce it so soon, It is still early, yes, just one month into the project, but it is usable and at a point where I think others could contribute. > I was playing around with Dan Ingalls' Alto simulator the other day and stumbled onto your work and I thought it was very cool. Thanks :) > Have you given any thought to continuing the Slang approach and adding a translator to LLJS, a subset of JS designed to emulate C? It was something I had been thinking of toying with because it seemed to offer a lot of leverage with the current Slang approach. There are various ways to go about this, indeed. Using Emscripten to compile the C sources to asm.js should work fairly well, as well as doing a NaCl VM (as Yoshiki demonstrated already). These would give you a higher-performance VM, faster. However, asm.js is only supported on Firefox so far, and NaCl is exclusive to Chrome. I don't expect the browser vendors to agree on a particular technology any time soon. A pure Javascript VM has the potential to work equally well on all browsers with the same code base. Besides, it's more fun to work on ;) The Slang code is not too useful for making a real Javascript VM, because it really is just C with Smalltalk syntax. Had I used the Slang sources, I would have ended up having to change them, and the translator, quite a lot. Instead, I opted for a very different object model and garbage collection scheme that is much better suited to Javascript. The nicest thing about Slang is that you can emulate it in Squeak, so you can use Squeak's debugging tools. However, I used the Lively Kernel for developing SqueakJS, and some of my tools are even nicer than what we have in the simulator. So there really was little incentive for me to try making use of the Slang sources. - Bert -

2 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev December 2013