Vm-dev December 2012

vm-dev@lists.squeakfoundation.org

22 participants
93 discussions

Re: Issue 44 in cog: Ephemerons integration
by cog＠googlecode.com 08 Aug '13

08 Aug '13

Comment #5 on issue 44 by siguc...(a)gmail.com: Ephemerons integration http://code.google.com/p/cog/issues/detail?id=44 Eliot proposed to change implementation to use separate object format for Ephemerons.

1 2

Re: Issue 92 in cog: 3 LargeInteger arithmetic primitive bugs with minimum signed 64 bit value
by cog＠googlecode.com 12 Mar '13

12 Mar '13

Comment #6 on issue 92 by nicolas....(a)gmail.com: 3 LargeInteger arithmetic primitive bugs with minimum signed 64 bit value http://code.google.com/p/cog/issues/detail?id=92 As long as SmallInteger minVal negated (2^30) fits on 32 bits, there would be no such problem in SmallInteger primitives. AFAICT, 0 - INT_MIN like problem was only in LargeInt primitives, and those are not jitted. However, JIT is clever and for example in genPrimitiveAdd avoid shifting the SmallInteger tag (genShiftAwaySmallIntegerTagsInScratchReg:), and just remove it from one of operands (genRemoveSmallIntegerTagsInScratchReg:) so as to directly produce a tagged integer. Thus, testing if the result fits in 31 bit SmallInteger, become as simple as testing for 32 bit overflow... Testing for overflow is much simpler than in C, see senders of #JumpOverflow: Note that genPrimitiveDivide use another strategy for testing overflow case of (SmallInteger minVal/-1).

1 1

Issue 109 in cog: CogVM crashes with simple code
by cog＠googlecode.com 12 Mar '13

12 Mar '13

Status: New Owner: ---- Labels: Type-Defect Priority-Medium New issue 109 by jonkande...(a)gmail.com: CogVM crashes with simple code http://code.google.com/p/cog/issues/detail?id=109 Below are a few lines of code that crashes the CogVM on both Linux and Windows. File-in the Smalltalk code below, then evaluate [nil crashCogVM]. The code uses [1-1] but it could use [1+1] or [56+98]. I put the code on nil, but that is not important either. I think the important thing is that the primitive (+ or -) is evaluated but the result is not assigned into any variable. Also important is that the code is put into a loop that I assume has been JIT optimized. The image I used is Pharo 1.4 one-click with latest update #14459. This code does not crash StackVM. !UndefinedObject methodsFor: 'crash' stamp: 'JonKAnderson 11/29/2012 17:26'! crashCogVM " Evaluate [ nil crashCogVM ]" | i | i := 20. 1 to: i do: [:d | 1-1 ] ! !

2 4

Re: Issue 110 in cog: ConfigurationOfFFI hangs VM
by cog＠googlecode.com 23 Feb '13

23 Feb '13

Comment #8 on issue 110 by marcus.d...(a)gmail.com: ConfigurationOfFFI hangs VM http://code.google.com/p/cog/issues/detail?id=110 Moved to: Issue cog:110

1 2

bitShift: and runtime sign discussion
by Nicolas Cellier 03 Jan '13

03 Jan '13

As you may know, the CCodeGenerator is clever enough to #generateBitShift:on:indent: with proper direction << or >> when the shift is literal. When the shift in (expr bitShift: shift) is a variable or another expression, it will produce a runtime test (shift <0) ? expr>>shift : expr <<shift; This is good for an arbitrary shift, but more than often we know the sign and direction of the shift in advance, and this runtime test is void. We must be aware that aggressive inlining will spread these useless code all around. Well, we might ignore impact on performance but we shall better not ignore warnings generated by C compiler (or XCode analyzer) if we want the code to be portable to other compilers (including future versions of gcc). ...and the eventual warnings will be spreaded too Maybe we could arrange for CCodeGenerator to recognize more cases when the shift is unsigned, but 1) the CCodeGenerator is yet unable to infer expression type (except some hack for declared variable) 2) we almost never use unsigned declaration in vm source anyway. In the mean time, I suggest we use << and >> directlty in smalltalk code (slang) when we know the direction in advance. Find a few examples attached Nicolas

3 5

[commit][2644] test updating filetype
by commits＠squeakvm.org 31 Dec '12

31 Dec '12

Revision: 2644 Author: rowledge Date: 2012-12-31 11:16:16 -0800 (Mon, 31 Dec 2012) Log Message: ----------- test updating filetype Property Changed: ---------------- trunk/platforms/RiscOS/misc/ToCopy/KillOfiles Property changes on: trunk/platforms/RiscOS/misc/ToCopy/KillOfiles ___________________________________________________________________ Added: svn:risosfiletype + ffd

2 1

[commit][2643]
by commits＠squeakvm.org 30 Dec '12

30 Dec '12

Revision: 2643 Author: lewis Date: 2012-12-29 17:02:50 -0800 (Sat, 29 Dec 2012) Log Message: ----------- Sources as per VMMaker 4.10.7 Includes various bitshift optimizations, and divideByZero protection in JPEGReaderPlugin, by Nicolas Cellier. Modified Paths: -------------- trunk/src/ckformat.c trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c trunk/src/plugins/AioPlugin/AioPlugin.c trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c trunk/src/plugins/B2DPlugin/B2DPlugin.c trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c trunk/src/plugins/BitBltPlugin/BitBltPlugin.c trunk/src/plugins/CameraPlugin/CameraPlugin.c trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c trunk/src/plugins/CroquetPlugin/CroquetPlugin.c trunk/src/plugins/DBusPlugin/DBusPlugin.c trunk/src/plugins/DSAPrims/DSAPrims.c trunk/src/plugins/DropPlugin/DropPlugin.c trunk/src/plugins/FFTPlugin/FFTPlugin.c trunk/src/plugins/FT2Plugin/FT2Plugin.c trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c trunk/src/plugins/FilePlugin/FilePlugin.c trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c trunk/src/plugins/GeniePlugin/GeniePlugin.c trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c trunk/src/plugins/Klatt/Klatt.c trunk/src/plugins/LargeIntegers/LargeIntegers.c trunk/src/plugins/LocalePlugin/LocalePlugin.c trunk/src/plugins/MIDIPlugin/MIDIPlugin.c trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c trunk/src/plugins/RePlugin/RePlugin.c trunk/src/plugins/RomePlugin/RomePlugin.c trunk/src/plugins/ScratchPlugin/ScratchPlugin.c trunk/src/plugins/SecurityPlugin/SecurityPlugin.c trunk/src/plugins/SerialPlugin/SerialPlugin.c trunk/src/plugins/SlangTestSupportPlugin/SlangTestSupportPlugin.c trunk/src/plugins/SocketPlugin/SocketPlugin.c trunk/src/plugins/SoundCodecPrims/SoundCodecPrims.c trunk/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c trunk/src/plugins/SoundPlugin/SoundPlugin.c trunk/src/plugins/Squeak3D/Squeak3D.c trunk/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c trunk/src/plugins/StarSqueakPlugin/StarSqueakPlugin.c trunk/src/plugins/UUIDPlugin/UUIDPlugin.c trunk/src/plugins/UnicodePlugin/UnicodePlugin.c trunk/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c trunk/src/plugins/WeDoPlugin/WeDoPlugin.c trunk/src/plugins/XDisplayControlPlugin/XDisplayControlPlugin.c trunk/src/plugins/ZipPlugin/ZipPlugin.c trunk/src/vm/interp.c trunk/src/vm/interp.h trunk/src/vm/sqNamedPrims.h Modified: trunk/src/ckformat.c =================================================================== --- trunk/src/ckformat.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/ckformat.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -5,7 +5,7 @@ /* Usage: ckformat imageFileName */ /* --- DO NOT EDIT THIS FILE --- */ -/* --- Automatically generated from class ImageFormat 2012-12-22T16:28:38.261-05:00--- */ +/* --- Automatically generated from class ImageFormat 2012-12-29T19:53:02.822-05:00--- */ /* --- Source code is in package ImageFormat in the VMMaker repository --- */ /* --- DO NOT EDIT THIS FILE --- */ Modified: trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c =================================================================== --- trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:30 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:36 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -62,9 +62,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ADPCMCodecPlugin 22 December 2012 (i)" + "ADPCMCodecPlugin 29 December 2012 (i)" #else - "ADPCMCodecPlugin 22 December 2012 (e)" + "ADPCMCodecPlugin 29 December 2012 (e)" #endif ; Modified: trunk/src/plugins/AioPlugin/AioPlugin.c =================================================================== --- trunk/src/plugins/AioPlugin/AioPlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/AioPlugin/AioPlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:37 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:53:01 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -81,9 +81,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AioPlugin 22 December 2012 (i)" + "AioPlugin 29 December 2012 (i)" #else - "AioPlugin 22 December 2012 (e)" + "AioPlugin 29 December 2012 (e)" #endif ; Modified: trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c =================================================================== --- trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:30 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:36 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -60,9 +60,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AsynchFilePlugin 22 December 2012 (i)" + "AsynchFilePlugin 29 December 2012 (i)" #else - "AsynchFilePlugin 22 December 2012 (e)" + "AsynchFilePlugin 29 December 2012 (e)" #endif ; static void * sCOAFfn; Modified: trunk/src/plugins/B2DPlugin/B2DPlugin.c =================================================================== --- trunk/src/plugins/B2DPlugin/B2DPlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/B2DPlugin/B2DPlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:31 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:39 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -414,9 +414,9 @@ static void * loadBBFn; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B2DPlugin 22 December 2012 (i)" + "B2DPlugin 29 December 2012 (i)" #else - "B2DPlugin 22 December 2012 (e)" + "B2DPlugin 29 December 2012 (e)" #endif ; static int* objBuffer; Modified: trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c =================================================================== --- trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:34 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:50 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -90,9 +90,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B3DAcceleratorPlugin 22 December 2012 (i)" + "B3DAcceleratorPlugin 29 December 2012 (i)" #else - "B3DAcceleratorPlugin 22 December 2012 (e)" + "B3DAcceleratorPlugin 29 December 2012 (e)" #endif ; Modified: trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c =================================================================== --- trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:30 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:37 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -51,9 +51,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BMPReadWriterPlugin 22 December 2012 (i)" + "BMPReadWriterPlugin 29 December 2012 (i)" #else - "BMPReadWriterPlugin 22 December 2012 (e)" + "BMPReadWriterPlugin 29 December 2012 (e)" #endif ; Modified: trunk/src/plugins/BitBltPlugin/BitBltPlugin.c =================================================================== --- trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:32 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:40 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -237,9 +237,9 @@ }; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BitBltPlugin 22 December 2012 (i)" + "BitBltPlugin 29 December 2012 (i)" #else - "BitBltPlugin 22 December 2012 (e)" + "BitBltPlugin 29 December 2012 (e)" #endif ; static sqInt nWords; Modified: trunk/src/plugins/CameraPlugin/CameraPlugin.c =================================================================== --- trunk/src/plugins/CameraPlugin/CameraPlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/CameraPlugin/CameraPlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:35 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:52 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -57,9 +57,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "CameraPlugin 22 December 2012 (i)" + "CameraPlugin 29 December 2012 (i)" #else - "CameraPlugin 22 December 2012 (e)" + "CameraPlugin 29 December 2012 (e)" #endif ; Modified: trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c =================================================================== --- trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:35 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:52 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -54,9 +54,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ClipboardExtendedPlugin 22 December 2012 (i)" + "ClipboardExtendedPlugin 29 December 2012 (i)" #else - "ClipboardExtendedPlugin 22 December 2012 (e)" + "ClipboardExtendedPlugin 29 December 2012 (e)" #endif ; Modified: trunk/src/plugins/CroquetPlugin/CroquetPlugin.c =================================================================== --- trunk/src/plugins/CroquetPlugin/CroquetPlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/CroquetPlugin/CroquetPlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:32 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:41 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -63,9 +63,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "CroquetPlugin 22 December 2012 (i)" + "CroquetPlugin 29 December 2012 (i)" #else - "CroquetPlugin 22 December 2012 (e)" + "CroquetPlugin 29 December 2012 (e)" #endif ; Modified: trunk/src/plugins/DBusPlugin/DBusPlugin.c =================================================================== --- trunk/src/plugins/DBusPlugin/DBusPlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/DBusPlugin/DBusPlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:35 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:53 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -136,9 +136,9 @@ static DBusMessageIter messageIter[DBUS_MAXIMUM_TYPE_RECURSION_DEPTH]; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DBusPlugin 22 December 2012 (i)" + "DBusPlugin 29 December 2012 (i)" #else - "DBusPlugin 22 December 2012 (e)" + "DBusPlugin 29 December 2012 (e)" #endif ; static DBusMessage* writeMessage; Modified: trunk/src/plugins/DSAPrims/DSAPrims.c =================================================================== --- trunk/src/plugins/DSAPrims/DSAPrims.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/DSAPrims/DSAPrims.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:32 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:41 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -60,9 +60,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DSAPrims 22 December 2012 (i)" + "DSAPrims 29 December 2012 (i)" #else - "DSAPrims 22 December 2012 (e)" + "DSAPrims 29 December 2012 (e)" #endif ; static sqInt remainderDigitCount; Modified: trunk/src/plugins/DropPlugin/DropPlugin.c =================================================================== --- trunk/src/plugins/DropPlugin/DropPlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/DropPlugin/DropPlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:32 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:41 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -55,9 +55,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DropPlugin 22 December 2012 (i)" + "DropPlugin 29 December 2012 (i)" #else - "DropPlugin 22 December 2012 (e)" + "DropPlugin 29 December 2012 (e)" #endif ; Modified: trunk/src/plugins/FFTPlugin/FFTPlugin.c =================================================================== --- trunk/src/plugins/FFTPlugin/FFTPlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/FFTPlugin/FFTPlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:32 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:42 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -61,9 +61,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FFTPlugin 22 December 2012 (i)" + "FFTPlugin 29 December 2012 (i)" #else - "FFTPlugin 22 December 2012 (e)" + "FFTPlugin 29 December 2012 (e)" #endif ; static sqInt nu; @@ -262,7 +262,7 @@ fftSize2 = ((sqInt) fftSize >> 1); fftSize4 = ((sqInt) fftSize >> 2); for (level = 1; level <= nu; level += 1) { - lev = ((level < 0) ? ((usqInt) 1 >> -level) : ((usqInt) 1 << level)); + lev = 1 << level; lev1 = ((sqInt) lev >> 1); fftScale = fftSize / lev; for (j = 1; j <= lev1; j += 1) { Modified: trunk/src/plugins/FT2Plugin/FT2Plugin.c =================================================================== --- trunk/src/plugins/FT2Plugin/FT2Plugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/FT2Plugin/FT2Plugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:32 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:42 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -115,9 +115,9 @@ static FT_Library library; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FT2Plugin 22 December 2012 (i)" + "FT2Plugin 29 December 2012 (i)" #else - "FT2Plugin 22 December 2012 (e)" + "FT2Plugin 29 December 2012 (e)" #endif ; Modified: trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c =================================================================== --- trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:35 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:54 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -50,9 +50,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FileCopyPlugin 22 December 2012 (i)" + "FileCopyPlugin 29 December 2012 (i)" #else - "FileCopyPlugin 22 December 2012 (e)" + "FileCopyPlugin 29 December 2012 (e)" #endif ; Modified: trunk/src/plugins/FilePlugin/FilePlugin.c =================================================================== --- trunk/src/plugins/FilePlugin/FilePlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/FilePlugin/FilePlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:32 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:43 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -87,9 +87,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FilePlugin 22 December 2012 (i)" + "FilePlugin 29 December 2012 (i)" #else - "FilePlugin 22 December 2012 (e)" + "FilePlugin 29 December 2012 (e)" #endif ; static void * sCCPfn; Modified: trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c =================================================================== --- trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:32 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:43 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -63,9 +63,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FloatArrayPlugin 22 December 2012 (i)" + "FloatArrayPlugin 29 December 2012 (i)" #else - "FloatArrayPlugin 22 December 2012 (e)" + "FloatArrayPlugin 29 December 2012 (e)" #endif ; Modified: trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c =================================================================== --- trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:32 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:43 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -72,9 +72,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FloatMathPlugin 22 December 2012 (i)" + "FloatMathPlugin 29 December 2012 (i)" #else - "FloatMathPlugin 22 December 2012 (e)" + "FloatMathPlugin 29 December 2012 (e)" #endif ; Modified: trunk/src/plugins/GeniePlugin/GeniePlugin.c =================================================================== --- trunk/src/plugins/GeniePlugin/GeniePlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/GeniePlugin/GeniePlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:33 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:44 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -54,9 +54,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "GeniePlugin v2.0 22 December 2012 (i)" + "GeniePlugin v2.0 29 December 2012 (i)" #else - "GeniePlugin v2.0 22 December 2012 (e)" + "GeniePlugin v2.0 29 December 2012 (e)" #endif ; Modified: trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c =================================================================== --- trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:36 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:55 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -59,9 +59,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "HostWindowPlugin 22 December 2012 (i)" + "HostWindowPlugin 29 December 2012 (i)" #else - "HostWindowPlugin 22 December 2012 (e)" + "HostWindowPlugin 29 December 2012 (e)" #endif ; Modified: trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c =================================================================== --- trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:33 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:44 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -61,9 +61,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JPEGReadWriter2Plugin 22 December 2012 (i)" + "JPEGReadWriter2Plugin 29 December 2012 (i)" #else - "JPEGReadWriter2Plugin 22 December 2012 (e)" + "JPEGReadWriter2Plugin 29 December 2012 (e)" #endif ; Modified: trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c =================================================================== --- trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:33 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:44 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -77,7 +77,6 @@ static sqInt colorComponentBlocksfrom(int **blocks, sqInt oop); static sqInt crColorComponentFrom(sqInt oop); static sqInt decodeBlockIntocomponent(int *anArray, int *aColorComponent); -static sqInt getBits(sqInt requestedBits); #pragma export on EXPORT(const char*) getModuleName(void); #pragma export off @@ -130,9 +129,9 @@ static sqInt jsReadLimit; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JPEGReaderPlugin 22 December 2012 (i)" + "JPEGReaderPlugin 29 December 2012 (i)" #else - "JPEGReaderPlugin 22 December 2012 (e)" + "JPEGReaderPlugin 29 December 2012 (e)" #endif ; static int *residuals; @@ -217,16 +216,49 @@ sqInt i; sqInt index; sqInt zeroCount; + sqInt value; + sqInt byte1; + sqInt value1; + sqInt byte2; byte = jpegDecodeValueFromsize(dcTable, dcTableSize); if (byte < 0) { return interpreterProxy->primitiveFail(); } if (byte != 0) { - bits = getBits(byte); + /* begin getBits: */ + if (byte > jsBitCount) { + /* begin fillBuffer */ + while (jsBitCount <= 16) { + if (!(jsPosition < jsReadLimit)) { + goto l3; + } + byte1 = jsCollection[jsPosition]; + jsPosition += 1; + if (byte1 == 255) { + if (!((jsPosition < jsReadLimit) && ((jsCollection[jsPosition]) == 0))) { + jsPosition -= 1; + goto l3; + } + jsPosition += 1; + } + jsBitBuffer = (((usqInt) jsBitBuffer << 8)) | byte1; + jsBitCount += 8; + } + l3: /* end fillBuffer */; + if (byte > jsBitCount) { + bits = -1; + goto l4; + } + } + jsBitCount -= byte; + value = ((usqInt) jsBitBuffer) >> jsBitCount; + jsBitBuffer = jsBitBuffer & ((1 << jsBitCount) - 1); + bits = value; + l4: /* end getBits: */; /* begin scaleAndSignExtend:inFieldWidth: */ - if (bits < ((((byte - 1) < 0) ? ((usqInt) 1 >> -(byte - 1)) : ((usqInt) 1 << (byte - 1))))) { - byte = (bits - (((byte < 0) ? ((usqInt) 1 >> -byte) : ((usqInt) 1 << byte)))) + 1; + if (bits < (1 << (byte - 1))) { + byte = (bits - (1 << byte)) + 1; goto l1; } else { byte = bits; @@ -249,10 +281,39 @@ byte = byte & 15; if (byte != 0) { index += zeroCount; - bits = getBits(byte); + /* begin getBits: */ + if (byte > jsBitCount) { + /* begin fillBuffer */ + while (jsBitCount <= 16) { + if (!(jsPosition < jsReadLimit)) { + goto l5; + } + byte2 = jsCollection[jsPosition]; + jsPosition += 1; + if (byte2 == 255) { + if (!((jsPosition < jsReadLimit) && ((jsCollection[jsPosition]) == 0))) { + jsPosition -= 1; + goto l5; + } + jsPosition += 1; + } + jsBitBuffer = (((usqInt) jsBitBuffer << 8)) | byte2; + jsBitCount += 8; + } + l5: /* end fillBuffer */; + if (byte > jsBitCount) { + bits = -1; + goto l6; + } + } + jsBitCount -= byte; + value1 = ((usqInt) jsBitBuffer) >> jsBitCount; + jsBitBuffer = jsBitBuffer & ((1 << jsBitCount) - 1); + bits = value1; + l6: /* end getBits: */; /* begin scaleAndSignExtend:inFieldWidth: */ - if (bits < ((((byte - 1) < 0) ? ((usqInt) 1 >> -(byte - 1)) : ((usqInt) 1 << (byte - 1))))) { - byte = (bits - (((byte < 0) ? ((usqInt) 1 >> -byte) : ((usqInt) 1 << byte)))) + 1; + if (bits < (1 << (byte - 1))) { + byte = (bits - (1 << byte)) + 1; goto l2; } else { byte = bits; @@ -274,40 +335,7 @@ } } -static sqInt getBits(sqInt requestedBits) { - sqInt value; - sqInt byte; - if (requestedBits > jsBitCount) { - /* begin fillBuffer */ - while (jsBitCount <= 16) { - if (!(jsPosition < jsReadLimit)) { - goto l1; - } - byte = jsCollection[jsPosition]; - jsPosition += 1; - if (byte == 255) { - if (!((jsPosition < jsReadLimit) && ((jsCollection[jsPosition]) == 0))) { - jsPosition -= 1; - goto l1; - } - jsPosition += 1; - } - jsBitBuffer = (((usqInt) jsBitBuffer << 8)) | byte; - jsBitCount += 8; - } - l1: /* end fillBuffer */; - if (requestedBits > jsBitCount) { - return -1; - } - } - value = (((requestedBits - jsBitCount) < 0) ? ((usqInt) jsBitBuffer >> -(requestedBits - jsBitCount)) : ((usqInt) jsBitBuffer << (requestedBits - jsBitCount))); - jsBitBuffer = jsBitBuffer & (((((jsBitCount - requestedBits) < 0) ? ((usqInt) 1 >> -(jsBitCount - requestedBits)) : ((usqInt) 1 << (jsBitCount - requestedBits)))) - 1); - jsBitCount -= requestedBits; - return value; -} - - /* Note: This is hardcoded so it can be run from Squeak. The module name is used for validating a module *after* it is loaded to check if it does really contain the module @@ -354,7 +382,7 @@ } } if (anACTerm == -1) { - dcval = ((usqInt) ((anArray[i]) * (qt[0])) << 2); + dcval = ((anArray[i]) * (qt[0])) << Pass1Bits; for (j = 0; j <= (DCTSize - 1); j += 1) { ws[(j * DCTSize) + i] = dcval; } @@ -366,8 +394,8 @@ t3 = z1 + (z2 * FIXn0n765366865); z2 = (anArray[i]) * (qt[i]); z3 = (anArray[(DCTSize * 4) + i]) * (qt[(DCTSize * 4) + i]); - t0 = ((usqInt) (z2 + z3) << 13); - t1 = ((usqInt) (z2 - z3) << 13); + t0 = (z2 + z3) << ConstBits; + t1 = (z2 - z3) << ConstBits; t10 = t0 + t3; t13 = t0 - t3; t11 = t1 + t2; @@ -411,8 +439,8 @@ z1 = (z2 + z3) * FIXn0n541196100; t2 = z1 + (z3 * (0 - FIXn1n847759065)); t3 = z1 + (z2 * FIXn0n765366865); - t0 = ((usqInt) ((ws[i]) + (ws[i + 4])) << 13); - t1 = ((usqInt) ((ws[i]) - (ws[i + 4])) << 13); + t0 = ((ws[i]) + (ws[i + 4])) << ConstBits; + t1 = ((ws[i]) - (ws[i + 4])) << ConstBits; t10 = t0 + t3; t13 = t0 - t3; t11 = t1 + t2; @@ -484,6 +512,8 @@ sqInt index; sqInt tableIndex; sqInt value; + sqInt value1; + sqInt byte; /* Initial bits needed */ @@ -497,10 +527,36 @@ tableIndex = 2; while (1) { - - /* Get bits */ - - bits = getBits(bitsNeeded); + /* begin getBits: */ + if (bitsNeeded > jsBitCount) { + /* begin fillBuffer */ + while (jsBitCount <= 16) { + if (!(jsPosition < jsReadLimit)) { + goto l1; + } + byte = jsCollection[jsPosition]; + jsPosition += 1; + if (byte == 255) { + if (!((jsPosition < jsReadLimit) && ((jsCollection[jsPosition]) == 0))) { + jsPosition -= 1; + goto l1; + } + jsPosition += 1; + } + jsBitBuffer = (((usqInt) jsBitBuffer << 8)) | byte; + jsBitCount += 8; + } + l1: /* end fillBuffer */; + if (bitsNeeded > jsBitCount) { + bits = -1; + goto l2; + } + } + jsBitCount -= bitsNeeded; + value1 = ((usqInt) jsBitBuffer) >> jsBitCount; + jsBitBuffer = jsBitBuffer & ((1 << jsBitCount) - 1); + bits = value1; + l2: /* end getBits: */; if (bits < 0) { return -1; } @@ -624,7 +680,7 @@ dy = yComponent[CurrentYIndex]; sx = yComponent[HScaleIndex]; sy = yComponent[VScaleIndex]; - if (!((sx == 0) && (sy == 0))) { + if ((sx != 0) && (sy != 0)) { dx = dx / sx; dy = dy / sy; } @@ -742,7 +798,7 @@ dy = yComponent[CurrentYIndex]; sx = yComponent[HScaleIndex]; sy = yComponent[VScaleIndex]; - if (!((sx == 0) && (sy == 0))) { + if ((sx != 0) && (sy != 0)) { dx = dx / sx; dy = dy / sy; } @@ -762,7 +818,7 @@ dy1 = cbComponent[CurrentYIndex]; sx1 = cbComponent[HScaleIndex]; sy1 = cbComponent[VScaleIndex]; - if (!((sx1 == 0) && (sy1 == 0))) { + if ((sx1 != 0) && (sy1 != 0)) { dx1 = dx1 / sx1; dy1 = dy1 / sy1; } @@ -783,7 +839,7 @@ dy2 = crComponent[CurrentYIndex]; sx2 = crComponent[HScaleIndex]; sy2 = crComponent[VScaleIndex]; - if (!((sx2 == 0) && (sy2 == 0))) { + if ((sx2 != 0) && (sy2 != 0)) { dx2 = dx2 / sx2; dy2 = dy2 / sy2; } Modified: trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c =================================================================== --- trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:33 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:45 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -55,9 +55,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JoystickTabletPlugin 22 December 2012 (i)" + "JoystickTabletPlugin 29 December 2012 (i)" #else - "JoystickTabletPlugin 22 December 2012 (e)" + "JoystickTabletPlugin 29 December 2012 (e)" #endif ; Modified: trunk/src/plugins/Klatt/Klatt.c =================================================================== --- trunk/src/plugins/Klatt/Klatt.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/Klatt/Klatt.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:33 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:45 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -148,9 +148,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "Klatt 22 December 2012 (i)" + "Klatt 29 December 2012 (i)" #else - "Klatt 22 December 2012 (e)" + "Klatt 29 December 2012 (e)" #endif ; static float nlast; Modified: trunk/src/plugins/LargeIntegers/LargeIntegers.c =================================================================== --- trunk/src/plugins/LargeIntegers/LargeIntegers.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/LargeIntegers/LargeIntegers.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:33 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:46 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -146,10 +146,10 @@ } firstByteIx = (((sqInt) (start - 1) >> 3)) + 1; lastByteIx = (((sqInt) (stop - 1) >> 3)) + 1; - rightShift = 0 - ((start - 1) % 8); + rightShift = (start - 1) % 8; leftShift = 7 - ((stop - 1) % 8); if (firstByteIx == lastByteIx) { - mask = ((((0 - rightShift) < 0) ? ((usqInt) 255 >> -(0 - rightShift)) : ((usqInt) 255 << (0 - rightShift)))) & ((((0 - leftShift) < 0) ? ((usqInt) 255 >> -(0 - leftShift)) : ((usqInt) 255 << (0 - leftShift)))); + mask = (255 << rightShift) & (((usqInt) 255) >> leftShift); /* begin digitOfBytes:at: */ if (firstByteIx > (interpreterProxy->slotSizeOf(magnitude))) { digit = 0; @@ -161,7 +161,7 @@ l1: /* end digitOfBytes:at: */; return (digit & mask) != 0; } - if ((((rightShift < 0) ? ((usqInt) (digitOfBytesat(magnitude, firstByteIx)) >> -rightShift) : ((usqInt) (digitOfBytesat(magnitude, firstByteIx)) << rightShift))) != 0) { + if ((((usqInt) (digitOfBytesat(magnitude, firstByteIx))) >> rightShift) != 0) { return 1; } for (ix = (firstByteIx + 1); ix <= (lastByteIx - 1); ix += 1) { @@ -169,7 +169,7 @@ return 1; } } - if (((((leftShift < 0) ? ((usqInt) (digitOfBytesat(magnitude, lastByteIx)) >> -leftShift) : ((usqInt) (digitOfBytesat(magnitude, lastByteIx)) << leftShift))) & 255) != 0) { + if ((((digitOfBytesat(magnitude, lastByteIx)) << leftShift) & 255) != 0) { return 1; } return 0; @@ -685,7 +685,7 @@ /* ST indexed! */ static sqInt cDigitOfCSIat(sqInt csi, sqInt ix) { - if (ix < 0) { + if (ix < 1) { interpreterProxy->primitiveFail(); } if (ix > 4) { @@ -693,9 +693,9 @@ } if (csi < 0) { ; - return (((((1 - ix) * 8) < 0) ? ((usqInt) (0 - csi) >> -((1 - ix) * 8)) : ((usqInt) (0 - csi) << ((1 - ix) * 8)))) & 255; + return (((usqInt) (0 - csi)) >> ((ix - 1) * 8)) & 255; } else { - return (((((1 - ix) * 8) < 0) ? ((usqInt) csi >> -((1 - ix) * 8)) : ((usqInt) csi << ((1 - ix) * 8)))) & 255; + return (((usqInt) csi) >> ((ix - 1) * 8)) & 255; } } Modified: trunk/src/plugins/LocalePlugin/LocalePlugin.c =================================================================== --- trunk/src/plugins/LocalePlugin/LocalePlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/LocalePlugin/LocalePlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:33 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:46 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -64,9 +64,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "LocalePlugin 22 December 2012 (i)" + "LocalePlugin 29 December 2012 (i)" #else - "LocalePlugin 22 December 2012 (e)" + "LocalePlugin 29 December 2012 (e)" #endif ; Modified: trunk/src/plugins/MIDIPlugin/MIDIPlugin.c =================================================================== --- trunk/src/plugins/MIDIPlugin/MIDIPlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/MIDIPlugin/MIDIPlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:36 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:58 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -63,9 +63,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "MIDIPlugin 22 December 2012 (i)" + "MIDIPlugin 29 December 2012 (i)" #else - "MIDIPlugin 22 December 2012 (e)" + "MIDIPlugin 29 December 2012 (e)" #endif ; Modified: trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c =================================================================== --- trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:33 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:47 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -67,9 +67,9 @@ static double m23ResultY; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "Matrix2x3Plugin 22 December 2012 (i)" + "Matrix2x3Plugin 29 December 2012 (i)" #else - "Matrix2x3Plugin 22 December 2012 (e)" + "Matrix2x3Plugin 29 December 2012 (e)" #endif ; Modified: trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c =================================================================== --- trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:34 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:47 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -62,9 +62,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "MiscPrimitivePlugin 22 December 2012 (i)" + "MiscPrimitivePlugin 29 December 2012 (i)" #else - "MiscPrimitivePlugin 22 December 2012 (e)" + "MiscPrimitivePlugin 29 December 2012 (e)" #endif ; Modified: trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c =================================================================== --- trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:37 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:58 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -94,9 +94,9 @@ static sqInt maximumNumberOfFilesToWatch; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "Mpeg3Plugin 22 December 2012 (i)" + "Mpeg3Plugin 29 December 2012 (i)" #else - "Mpeg3Plugin 22 December 2012 (e)" + "Mpeg3Plugin 29 December 2012 (e)" #endif ; static mpeg3_t *mpegFiles[1024+1]; Modified: trunk/src/plugins/RePlugin/RePlugin.c =================================================================== --- trunk/src/plugins/RePlugin/RePlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/RePlugin/RePlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:34 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:47 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -72,9 +72,9 @@ static sqInt matchFlags; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "RePlugin 22 December 2012 (i)" + "RePlugin 29 December 2012 (i)" #else - "RePlugin 22 December 2012 (e)" + "RePlugin 29 December 2012 (e)" #endif ; static int netMemory = 0; Modified: trunk/src/plugins/RomePlugin/RomePlugin.c =================================================================== --- trunk/src/plugins/RomePlugin/RomePlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/RomePlugin/RomePlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:37 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:59 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -192,9 +192,9 @@ static sqInt maxSurfaceID; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "RomePlugin yo.39 22 December 2012 (i)" + "RomePlugin yo.39 29 December 2012 (i)" #else - "RomePlugin yo.39 22 December 2012 (e)" + "RomePlugin yo.39 29 December 2012 (e)" #endif ; static fn_ioRegisterSurface registerSurfaceFn; Modified: trunk/src/plugins/ScratchPlugin/ScratchPlugin.c =================================================================== --- trunk/src/plugins/ScratchPlugin/ScratchPlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/ScratchPlugin/ScratchPlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:37 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:53 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -82,9 +82,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ScratchPlugin 22 December 2012 (i)" + "ScratchPlugin 29 December 2012 (i)" #else - "ScratchPlugin 22 December 2012 (e)" + "ScratchPlugin 29 December 2012 (e)" #endif ; Modified: trunk/src/plugins/SecurityPlugin/SecurityPlugin.c =================================================================== --- trunk/src/plugins/SecurityPlugin/SecurityPlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/SecurityPlugin/SecurityPlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:34 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:47 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -73,9 +73,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SecurityPlugin 22 December 2012 (i)" + "SecurityPlugin 29 December 2012 (i)" #else - "SecurityPlugin 22 December 2012 (e)" + "SecurityPlugin 29 December 2012 (e)" #endif ; Modified: trunk/src/plugins/SerialPlugin/SerialPlugin.c =================================================================== --- trunk/src/plugins/SerialPlugin/SerialPlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/SerialPlugin/SerialPlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:34 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:48 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -60,9 +60,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SerialPlugin 22 December 2012 (i)" + "SerialPlugin 29 December 2012 (i)" #else - "SerialPlugin 22 December 2012 (e)" + "SerialPlugin 29 December 2012 (e)" #endif ; Modified: trunk/src/plugins/SlangTestSupportPlugin/SlangTestSupportPlugin.c =================================================================== --- trunk/src/plugins/SlangTestSupportPlugin/SlangTestSupportPlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/SlangTestSupportPlugin/SlangTestSupportPlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:34 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:48 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -70,9 +70,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SlangTestSupportPlugin 22 December 2012 (i)" + "SlangTestSupportPlugin 29 December 2012 (i)" #else - "SlangTestSupportPlugin 22 December 2012 (e)" + "SlangTestSupportPlugin 29 December 2012 (e)" #endif ; Modified: trunk/src/plugins/SocketPlugin/SocketPlugin.c =================================================================== --- trunk/src/plugins/SocketPlugin/SocketPlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/SocketPlugin/SocketPlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:34 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:48 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -122,9 +122,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SocketPlugin 22 December 2012 (i)" + "SocketPlugin 29 December 2012 (i)" #else - "SocketPlugin 22 December 2012 (e)" + "SocketPlugin 29 December 2012 (e)" #endif ; static void * sCCLOPfn; Modified: trunk/src/plugins/SoundCodecPrims/SoundCodecPrims.c =================================================================== --- trunk/src/plugins/SoundCodecPrims/SoundCodecPrims.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/SoundCodecPrims/SoundCodecPrims.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:34 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:49 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -53,9 +53,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SoundCodecPrims 22 December 2012 (i)" + "SoundCodecPrims 29 December 2012 (i)" #else - "SoundCodecPrims 22 December 2012 (e)" + "SoundCodecPrims 29 December 2012 (e)" #endif ; Modified: trunk/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c =================================================================== --- trunk/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:34 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:49 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -68,9 +68,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SoundGenerationPlugin 22 December 2012 (i)" + "SoundGenerationPlugin 29 December 2012 (i)" #else - "SoundGenerationPlugin 22 December 2012 (e)" + "SoundGenerationPlugin 29 December 2012 (e)" #endif ; Modified: trunk/src/plugins/SoundPlugin/SoundPlugin.c =================================================================== --- trunk/src/plugins/SoundPlugin/SoundPlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/SoundPlugin/SoundPlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:34 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:50 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -66,9 +66,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SoundPlugin 22 December 2012 (i)" + "SoundPlugin 29 December 2012 (i)" #else - "SoundPlugin 22 December 2012 (e)" + "SoundPlugin 29 December 2012 (e)" #endif ; Modified: trunk/src/plugins/Squeak3D/Squeak3D.c =================================================================== --- trunk/src/plugins/Squeak3D/Squeak3D.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/Squeak3D/Squeak3D.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:35 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:51 pm + by VMMaker 4.10.7 */ #include <math.h> Modified: trunk/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c =================================================================== --- trunk/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:35 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:53 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -125,9 +125,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SqueakFFIPrims 22 December 2012 (i)" + "SqueakFFIPrims 29 December 2012 (i)" #else - "SqueakFFIPrims 22 December 2012 (e)" + "SqueakFFIPrims 29 December 2012 (e)" #endif ; Modified: trunk/src/plugins/StarSqueakPlugin/StarSqueakPlugin.c =================================================================== --- trunk/src/plugins/StarSqueakPlugin/StarSqueakPlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/StarSqueakPlugin/StarSqueakPlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:34 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:50 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -52,9 +52,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "StarSqueakPlugin 22 December 2012 (i)" + "StarSqueakPlugin 29 December 2012 (i)" #else - "StarSqueakPlugin 22 December 2012 (e)" + "StarSqueakPlugin 29 December 2012 (e)" #endif ; Modified: trunk/src/plugins/UUIDPlugin/UUIDPlugin.c =================================================================== --- trunk/src/plugins/UUIDPlugin/UUIDPlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/UUIDPlugin/UUIDPlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:37 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:53:01 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -53,9 +53,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "UUIDPlugin 22 December 2012 (i)" + "UUIDPlugin 29 December 2012 (i)" #else - "UUIDPlugin 22 December 2012 (e)" + "UUIDPlugin 29 December 2012 (e)" #endif ; Modified: trunk/src/plugins/UnicodePlugin/UnicodePlugin.c =================================================================== --- trunk/src/plugins/UnicodePlugin/UnicodePlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/UnicodePlugin/UnicodePlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:37 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:53:01 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -62,9 +62,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "UnicodePlugin 22 December 2012 (i)" + "UnicodePlugin 29 December 2012 (i)" #else - "UnicodePlugin 22 December 2012 (e)" + "UnicodePlugin 29 December 2012 (e)" #endif ; Modified: trunk/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c =================================================================== --- trunk/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:38 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:53:02 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -218,9 +218,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "UnixOSProcessPlugin 22 December 2012 (i)" + "UnixOSProcessPlugin 29 December 2012 (i)" #else - "UnixOSProcessPlugin 22 December 2012 (e)" + "UnixOSProcessPlugin 29 December 2012 (e)" #endif ; static void *originalSigHandlers[NSIG]; Modified: trunk/src/plugins/WeDoPlugin/WeDoPlugin.c =================================================================== --- trunk/src/plugins/WeDoPlugin/WeDoPlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/WeDoPlugin/WeDoPlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:38 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:53:02 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -54,9 +54,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "WeDoPlugin 22 December 2012 (i)" + "WeDoPlugin 29 December 2012 (i)" #else - "WeDoPlugin 22 December 2012 (e)" + "WeDoPlugin 29 December 2012 (e)" #endif ; Modified: trunk/src/plugins/XDisplayControlPlugin/XDisplayControlPlugin.c =================================================================== --- trunk/src/plugins/XDisplayControlPlugin/XDisplayControlPlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/XDisplayControlPlugin/XDisplayControlPlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:38 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:53:02 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -70,9 +70,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "XDisplayControlPlugin 22 December 2012 (i)" + "XDisplayControlPlugin 29 December 2012 (i)" #else - "XDisplayControlPlugin 22 December 2012 (e)" + "XDisplayControlPlugin 29 December 2012 (e)" #endif ; static int osprocessSandboxSecurity; Modified: trunk/src/plugins/ZipPlugin/ZipPlugin.c =================================================================== --- trunk/src/plugins/ZipPlugin/ZipPlugin.c 2012-12-22 21:45:17 UTC (rev 2642) +++ trunk/src/plugins/ZipPlugin/ZipPlugin.c 2012-12-30 01:02:50 UTC (rev 2643) @@ -1,5 +1,5 @@ -/* Automatically generated from Squeak on 22 December 2012 4:28:32 pm - by VMMaker 4.10.5 +/* Automatically generated from Squeak on 29 December 2012 7:52:41 pm + by VMMaker 4.10.7 */ #include <math.h> @@ -78,9 +78,9 @@ @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker-dtl.293.mcz
by commits＠source.squeak.org 30 Dec '12

30 Dec '12

David T. Lewis uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-dtl.293.mcz ==================== Summary ==================== Name: VMMaker-dtl.293 Author: dtl Time: 29 December 2012, 7:48:13.152 pm UUID: 9849f935-60c7-49f4-9aac-ce84daab399f Ancestors: VMMaker-dtl.292 VMMaker 4.10.7 Bitshift optimizations by Nicolas Cellier. Use #>> or #<< operator rather than #bitShift: in cases where shift direction is known in order to eliminate runtime check for shift direction. Discussion thread: http://lists.squeakfoundation.org/pipermail/vm-dev/2012-December/011688.html Change sets: http://code.google.com/p/cog/issues/detail?id=111 Follow up required: Nicolas' changes for the sound primitives should also be adopted. These are methods in package Sound that are translated from the image into primitives for ADPCMCodecPlugin. Add these to Squeak trunk after the next release (Squeak 4.4). =============== Diff against VMMaker-dtl.292 =============== Item was changed: ----- Method: DeflatePlugin>>nextZipBits:put: (in category 'encoding') ----- nextZipBits: nBits put: value "Require: zipCollection, zipCollectionSize, zipPosition, zipBitBuf, zipBitPos. " <inline: true> (value >= 0 and:[(1 << nBits) > value]) ifFalse:[^interpreterProxy primitiveFail]. + zipBitBuf := zipBitBuf bitOr: value << zipBitPos. - zipBitBuf := zipBitBuf bitOr: (value bitShift: zipBitPos). zipBitPos := zipBitPos + nBits. [zipBitPos >= 8 and:[zipPosition < zipCollectionSize]] whileTrue:[ zipCollection at: zipPosition put: (zipBitBuf bitAnd: 255). zipPosition := zipPosition + 1. zipBitBuf := zipBitBuf >> 8. zipBitPos := zipBitPos - 8]. ! Item was changed: ----- Method: DeflatePlugin>>updateHash: (in category 'deflating') ----- updateHash: nextValue "Update the running hash value based on the next input byte. Return the new updated hash value." + ^((zipHashValue << DeflateHashShift) bitXor: nextValue) bitAnd: DeflateHashMask.! - ^((zipHashValue bitShift: DeflateHashShift) bitXor: nextValue) bitAnd: DeflateHashMask.! Item was changed: ----- Method: FFTPlugin>>transformForward: (in category 'transforming') ----- transformForward: forward | lev lev1 ip theta realU imagU realT imagT i fftSize2 fftSize4 fftScale ii | + <var: #realU type:'float '> + <var: #realT type:'float '> + <var: #imagU type:'float '> + <var: #imagT type:'float '> - <var: #realU type: 'float '> - <var: #realT type: 'float '> - <var: #imagU type: 'float '> - <var: #imagT type: 'float '> fftSize2 := fftSize // 2. fftSize4 := fftSize // 4. 1 to: nu do: [:level | + lev := 1 << level. - lev := 1 bitShift: level. lev1 := lev // 2. fftScale := fftSize // lev. 1 to: lev1 do: [:j | theta := j-1 * fftScale. "pi * (j-1) / lev1 mapped onto 0..n/2" theta < fftSize4 "Compute U, the complex multiplier for each level" ifTrue: [realU := sinTable at: sinTableSize - theta - 1. imagU := sinTable at: theta] ifFalse: [realU := 0.0 - (sinTable at: theta - fftSize4). imagU := sinTable at: fftSize2 - theta]. forward ifFalse: [imagU := 0.0 - imagU]. " Here is the inner loop... j to: n by: lev do: [:i | hand-transformed to whileTrue... " i := j. [i <= fftSize] whileTrue: [ip := i + lev1 - 1. ii := i-1. realT := ((realData at: ip) * realU) - ((imagData at: ip) * imagU). imagT := ((realData at: ip) * imagU) + ((imagData at: ip) * realU). realData at: ip put: (realData at: ii) - realT. imagData at: ip put: (imagData at: ii) - imagT. realData at: ii put: (realData at: ii) + realT. imagData at: ii put: (imagData at: ii) + imagT. i := i + lev]]].! Item was changed: ----- Method: InterpreterPrimitives>>primitiveBitShift (in category 'arithmetic integer primitives') ----- primitiveBitShift | integerReceiver integerArgument shifted | integerArgument := self popInteger. integerReceiver := self popPos32BitInteger. self successful ifTrue: [ integerArgument >= 0 ifTrue: [ "Left shift -- must fail if we lose bits beyond 32" self success: integerArgument <= 31. shifted := integerReceiver << integerArgument. self success: (shifted >> integerArgument) = integerReceiver. ] ifFalse: [ "Right shift -- OK to lose bits" self success: integerArgument >= -31. + shifted := integerReceiver >> (0 - integerArgument). - shifted := integerReceiver bitShift: integerArgument. ]. ]. self successful ifTrue: [self push: (self positive32BitIntegerFor: shifted)] ifFalse: [self unPop: 2]! Item was changed: ----- Method: JPEGReaderPlugin>>getBits: (in category 'stream support') ----- getBits: requestedBits | value | requestedBits > jsBitCount ifTrue:[ self fillBuffer. requestedBits > jsBitCount ifTrue:[^-1]]. - value := jsBitBuffer bitShift: (requestedBits - jsBitCount). - jsBitBuffer := jsBitBuffer bitAnd: (1 bitShift: (jsBitCount - requestedBits)) -1. jsBitCount := jsBitCount - requestedBits. + value := jsBitBuffer >> jsBitCount. + jsBitBuffer := jsBitBuffer bitAnd: (1 << jsBitCount) -1. ^ value! Item was changed: ----- Method: JPEGReaderPlugin>>idctBlockInt:qt: (in category 'decoding') ----- idctBlockInt: anArray qt: qt | ws anACTerm dcval z2 z3 z1 t2 t3 t0 t1 t10 t13 t11 t12 z4 z5 v | <var: #anArray type: 'int *'> <var: #qt type: 'int *'> <var: #ws declareC: 'int ws[64]'> self cCode:'' inSmalltalk:[ws := CArrayAccessor on: (IntegerArray new: 64)]. "Pass 1: process columns from anArray, store into work array" 0 to: DCTSize-1 do:[:i | anACTerm := -1. 1 to: DCTSize-1 do:[:row| anACTerm = -1 ifTrue:[ (anArray at: row * DCTSize + i) = 0 ifFalse:[anACTerm := row]]]. anACTerm = -1 ifTrue:[ + dcval := (anArray at: i) * (qt at: 0) << Pass1Bits. - dcval := (anArray at: i) * (qt at: 0) bitShift: Pass1Bits. 0 to: DCTSize-1 do: [:j | ws at: (j * DCTSize + i) put: dcval] ] ifFalse:[ z2 := (anArray at: (DCTSize * 2 + i)) * (qt at: (DCTSize * 2 + i)). z3 := (anArray at: (DCTSize * 6 + i)) * (qt at: (DCTSize * 6 + i)). z1 := (z2 + z3) * FIXn0n541196100. t2 := z1 + (z3 * (0 - FIXn1n847759065)). t3 := z1 + (z2 * FIXn0n765366865). z2 := (anArray at: i) * (qt at: i). z3 := (anArray at: (DCTSize * 4 + i)) * (qt at: (DCTSize * 4 + i)). + t0 := (z2 + z3) << ConstBits. + t1 := (z2 - z3) << ConstBits. - t0 := (z2 + z3) bitShift: ConstBits. - t1 := (z2 - z3) bitShift: ConstBits. t10 := t0 + t3. t13 := t0 - t3. t11 := t1 + t2. t12 := t1 - t2. t0 := (anArray at: (DCTSize * 7 + i)) * (qt at: (DCTSize * 7 + i)). t1 := (anArray at: (DCTSize * 5 + i)) * (qt at: (DCTSize * 5 + i)). t2 := (anArray at: (DCTSize * 3 + i)) * (qt at: (DCTSize * 3 + i)). t3 := (anArray at: (DCTSize + i)) * (qt at: (DCTSize + i)). z1 := t0 + t3. z2 := t1 + t2. z3 := t0 + t2. z4 := t1 + t3. z5 := (z3 + z4) * FIXn1n175875602. t0 := t0 * FIXn0n298631336. t1 := t1 * FIXn2n053119869. t2 := t2 * FIXn3n072711026. t3 := t3 * FIXn1n501321110. z1 := z1 * (0 - FIXn0n899976223). z2 := z2 * (0 - FIXn2n562915447). z3 := z3 * (0 - FIXn1n961570560). z4 := z4 * (0 - FIXn0n390180644). z3 := z3 + z5. z4 := z4 + z5. t0 := t0 + z1 + z3. t1 := t1 +z2 +z4. t2 := t2 + z2 + z3. t3 := t3 + z1 + z4. ws at: i put: (t10 + t3) // Pass1Div. ws at: (DCTSize * 7 + i) put: (t10 - t3) // Pass1Div. ws at: (DCTSize * 1 + i) put: (t11 + t2) // Pass1Div. ws at: (DCTSize * 6 + i) put: (t11 - t2) // Pass1Div. ws at: (DCTSize * 2 + i) put: (t12 + t1) // Pass1Div. ws at: (DCTSize * 5 + i) put: (t12 - t1) // Pass1Div. ws at: (DCTSize * 3 + i) put: (t13 + t0) // Pass1Div. ws at: (DCTSize * 4 + i) put: (t13 - t0) // Pass1Div]]. "Pass 2: process rows from work array, store back into anArray" 0 to: DCTSize2-DCTSize by: DCTSize do:[:i | z2 := ws at: i + 2. z3 := ws at: i + 6. z1 := (z2 + z3) * FIXn0n541196100. t2 := z1 + (z3 * (0-FIXn1n847759065)). t3 := z1 + (z2 * FIXn0n765366865). + t0 := (ws at: i) + (ws at: (i + 4)) << ConstBits. + t1 := (ws at: i) - (ws at: (i + 4)) << ConstBits. - t0 := (ws at: i) + (ws at: (i + 4)) bitShift: ConstBits. - t1 := (ws at: i) - (ws at: (i + 4)) bitShift: ConstBits. t10 := t0 + t3. t13 := t0 - t3. t11 := t1 + t2. t12 := t1 -t2. t0 := ws at: (i + 7). t1 := ws at: (i + 5). t2 := ws at: (i + 3). t3 := ws at: (i + 1). z1 := t0 + t3. z2 := t1 + t2. z3 := t0 + t2. z4 := t1 + t3. z5 := (z3 + z4) * FIXn1n175875602. t0 := t0 * FIXn0n298631336. t1 := t1 * FIXn2n053119869. t2 := t2 * FIXn3n072711026. t3 := t3 * FIXn1n501321110. z1 := z1 * (0-FIXn0n899976223). z2 := z2 * (0-FIXn2n562915447). z3 := z3 * (0-FIXn1n961570560). z4 := z4 * (0-FIXn0n390180644). z3 := z3 + z5. z4 := z4 + z5. t0 := t0 + z1 + z3. t1 := t1 + z2 + z4. t2 := t2 + z2 + z3. t3 := t3 + z1 + z4. v := (t10 + t3) // Pass2Div + SampleOffset. v := v min: MaxSample. v := v max: 0. anArray at: i put: v. v := (t10 - t3) // Pass2Div + SampleOffset. v := v min: MaxSample. v := v max: 0. anArray at: (i + 7) put: v. v := (t11 + t2) // Pass2Div + SampleOffset. v := v min: MaxSample. v := v max: 0. anArray at: (i + 1) put: v. v := (t11 - t2) // Pass2Div + SampleOffset. v := v min: MaxSample. v := v max: 0. anArray at: (i + 6) put: v. v := (t12 + t1) // Pass2Div + SampleOffset. v := v min: MaxSample. v := v max: 0. anArray at: (i + 2) put: v. v := (t12 - t1) // Pass2Div + SampleOffset. v := v min: MaxSample. v := v max: 0. anArray at: (i + 5) put: v. v := (t13 + t0) // Pass2Div + SampleOffset. v := v min: MaxSample. v := v max: 0. anArray at: (i + 3) put: v. v := (t13 - t0) // Pass2Div + SampleOffset. v := v min: MaxSample. v := v max: 0. anArray at: (i + 4) put: v].! Item was changed: ----- Method: JPEGReaderPlugin>>scaleAndSignExtend:inFieldWidth: (in category 'decoding') ----- scaleAndSignExtend: aNumber inFieldWidth: w <inline: true> + aNumber < (1 << (w - 1)) + ifTrue: [^aNumber - (1 << w) + 1] - aNumber < (1 bitShift: (w - 1)) - ifTrue: [^aNumber - (1 bitShift: w) + 1] ifFalse: [^aNumber]! Item was changed: ----- Method: LargeIntegersPlugin>>anyBitOfBytes:from:to: (in category 'util') ----- anyBitOfBytes: aBytesOop from: start to: stopArg "Argument has to be aBytesOop!!" "Tests for any magnitude bits in the interval from start to stopArg." | magnitude rightShift leftShift stop firstByteIx lastByteIx | self debugCode: [self msg: 'anyBitOfBytes: aBytesOop from: start to: stopArg']. start < 1 | (stopArg < 1) ifTrue: [^ interpreterProxy primitiveFail]. magnitude := aBytesOop. stop := stopArg min: (self highBitOfBytes: magnitude). start > stop ifTrue: [^ false]. firstByteIx := start - 1 // 8 + 1. lastByteIx := stop - 1 // 8 + 1. + rightShift := (start - 1 \\ 8). - rightShift := 0 - (start - 1 \\ 8). leftShift := 7 - (stop - 1 \\ 8). firstByteIx = lastByteIx ifTrue: [| digit mask | + mask := (255 << rightShift) bitAnd: (255 >> leftShift). - mask := (255 bitShift: 0 - rightShift) - bitAnd: (255 bitShift: 0 - leftShift). digit := self digitOfBytes: magnitude at: firstByteIx. ^ (digit bitAnd: mask) ~= 0]. ((self digitOfBytes: magnitude at: firstByteIx) + >> rightShift) - bitShift: rightShift) ~= 0 ifTrue: [^ true]. firstByteIx + 1 to: lastByteIx - 1 do: [:ix | (self digitOfBytes: magnitude at: ix) ~= 0 ifTrue: [^ true]]. (((self digitOfBytes: magnitude at: lastByteIx) + << leftShift) - bitShift: leftShift) bitAnd: 255) ~= 0 ifTrue: [^ true]. ^ false! Item was changed: ----- Method: LargeIntegersPlugin>>cDigitOfCSI:at: (in category 'C core util') ----- cDigitOfCSI: csi at: ix "Answer the value of an indexable field in the receiver. LargePositiveInteger uses bytes of base two number, and each is a 'digit' base 256." "ST indexed!!" + ix < 1 ifTrue: [interpreterProxy primitiveFail]. - ix < 0 ifTrue: [interpreterProxy primitiveFail]. ix > 4 ifTrue: [^ 0]. csi < 0 ifTrue: [self cCode: '' inSmalltalk: [csi = -1073741824 ifTrue: ["SmallInteger minVal" "Can't negate minVal -- treat specially" ^ #(0 0 0 64 ) at: ix]]. + ^ (0 - csi) >> (ix - 1 * 8) - ^ (0 - csi bitShift: 1 - ix * 8) bitAnd: 255] + ifFalse: [^ csi >> (ix - 1 * 8) - ifFalse: [^ (csi bitShift: 1 - ix * 8) bitAnd: 255]! Item was changed: ----- Method: StackInterpreter>>stackPageByteSize (in category 'stack pages') ----- stackPageByteSize "Room for 512 bytes of frames gives around 40 frames a page which is a good compromise between overflow rate and latency in divorcing a page." <inline: false> + ^1 << (512 + self stackLimitOffset + self stackPageHeadroom - 1) highBit! - ^1 bitShift: (512 + self stackLimitOffset + self stackPageHeadroom - 1) highBit! Item was changed: ----- Method: VMMaker class>>versionString (in category 'version testing') ----- versionString "VMMaker versionString" + ^'4.10.7'! - ^'4.10.6'!

1 0

[unix] Build error on BSD
by Bert Freudenberg 29 Dec '12

29 Dec '12

Looks like we need to disable CameraPlugin on non-Linux platforms: squeak-vm-4.10.2.2614/unix/plugins/CameraPlugin/sqCamera-linux.c:48:47: fatal error: asm/types.h: No such file or directory compilation terminated. (full log at link below) - Bert - Begin forwarded message: > From: Debian buildds <noreply(a)buildd.debian.org> > Subject: failed kfreebsd-i386 build of squeak-vm 1:4.10.2.2614-1 > Date: 25. Dezember 2012 19:00:04 MEZ > To: squeak-vm(a)packages.qa.debian.org > > * Source package: squeak-vm > * Version: 1:4.10.2.2614-1 > * Architecture: kfreebsd-i386 > * State: failed > * Suite: sid > * Builder: fils.debian.org > * Build log: https://buildd.debian.org/fetch.cgi?pkg=squeak-vm&arch=kfreebsd-i386&ver=1%… > > Please note that these notifications do not necessarily mean bug reports > in your package but could also be caused by other packages, temporary > uninstallabilities and arch-specific breakages. A look at the build log > despite this disclaimer would be appreciated however. >

1 0

Accelerating LargeInteger Plugin
by Nicolas Cellier 29 Dec '12

29 Dec '12

See http://smallissimo.blogspot.fr/2012/12/accelerating-largeinteger-in-squeak.… This simple experiment is interesting but is not ready to use. If we change LargeIntegersPlugin to use 32bits words rather than bytes, we are introducing one more clever hack in the system (two for handling MSB efficiently). If we want to make LargeInteger a word array, then we have a transition problem. I thought of a few more or less evil solutions, but I fail to see how to not break the smooth trunk update - perform the operation on a stripped image not requiring LargeIntegers... - remove the LargeIntegerPlugin, redefine digitAt: digitAt:put: and digitLength as a hack answering proper byte for both a Byte and WordArray, then redefine LargePositiveInteger as word Array on such VM, then add the new plugin... - use an image tracer Thoughts? Nicolas

3 3

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev December 2012