[Vm-dev] [commit][2838] VMMaker 4.12.11 sources as per
VMMaker-dtl.333
commits at squeakvm.org
commits at squeakvm.org
Mon Dec 30 18:28:09 UTC 2013
Revision: 2838
Author: lewis
Date: 2013-12-30 10:28:08 -0800 (Mon, 30 Dec 2013)
Log Message:
-----------
VMMaker 4.12.11 sources as per VMMaker-dtl.333
Nicolas Cellier bitblt speedups:
Mantis 7802: Fast-up BitBlt rgbAdd rule
Mantis 7803: Fast-up BitBlt alpha blending rules
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-25 05:01:29 UTC (rev 2837)
+++ trunk/src/ckformat.c 2013-12-30 18:28:08 UTC (rev 2838)
@@ -5,7 +5,7 @@
/* Usage: ckformat imageFileName */
/* --- DO NOT EDIT THIS FILE --- */
-/* --- Automatically generated from class ImageFormat 2013-12-21T11:35:09.375+01:00--- */
+/* --- Automatically generated from class ImageFormat 2013-12-30T13:12:01.886+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-25 05:01:29 UTC (rev 2837)
+++ trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2013-12-30 18:28:08 UTC (rev 2838)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:41 am */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:34 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ VMPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
from
- ADPCMCodecPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ ADPCMCodecPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
*/
-static char __buildInfo[] = "ADPCMCodecPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ;
+static char __buildInfo[] = "ADPCMCodecPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916 " __DATE__ ;
@@ -70,9 +70,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "ADPCMCodecPlugin 21 December 2013 (i)"
+ "ADPCMCodecPlugin 30 December 2013 (i)"
#else
- "ADPCMCodecPlugin 21 December 2013 (e)"
+ "ADPCMCodecPlugin 30 December 2013 (e)"
#endif
;
Modified: trunk/src/plugins/AioPlugin/AioPlugin.c
===================================================================
--- trunk/src/plugins/AioPlugin/AioPlugin.c 2013-12-25 05:01:29 UTC (rev 2837)
+++ trunk/src/plugins/AioPlugin/AioPlugin.c 2013-12-30 18:28:08 UTC (rev 2838)
@@ -1,6 +1,6 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:35:07 am */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:12 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ VMPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
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 21 December 2013 (i)"
+ "AioPlugin 30 December 2013 (i)"
#else
- "AioPlugin 21 December 2013 (e)"
+ "AioPlugin 30 December 2013 (e)"
#endif
;
Modified: trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c
===================================================================
--- trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2013-12-25 05:01:29 UTC (rev 2837)
+++ trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2013-12-30 18:28:08 UTC (rev 2838)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:42 am */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:35 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
from
- AsynchFilePlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ AsynchFilePlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
*/
-static char __buildInfo[] = "AsynchFilePlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ;
+static char __buildInfo[] = "AsynchFilePlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916 " __DATE__ ;
@@ -67,9 +67,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "AsynchFilePlugin 21 December 2013 (i)"
+ "AsynchFilePlugin 30 December 2013 (i)"
#else
- "AsynchFilePlugin 21 December 2013 (e)"
+ "AsynchFilePlugin 30 December 2013 (e)"
#endif
;
static void * sCOAFfn;
Modified: trunk/src/plugins/B2DPlugin/B2DPlugin.c
===================================================================
--- trunk/src/plugins/B2DPlugin/B2DPlugin.c 2013-12-25 05:01:29 UTC (rev 2837)
+++ trunk/src/plugins/B2DPlugin/B2DPlugin.c 2013-12-30 18:28:08 UTC (rev 2838)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:44 am */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:38 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ VMPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
from
- BalloonEnginePlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ BalloonEnginePlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
*/
-static char __buildInfo[] = "BalloonEnginePlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ;
+static char __buildInfo[] = "BalloonEnginePlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916 " __DATE__ ;
@@ -447,9 +447,9 @@
static void * loadBBFn;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "B2DPlugin 21 December 2013 (i)"
+ "B2DPlugin 30 December 2013 (i)"
#else
- "B2DPlugin 21 December 2013 (e)"
+ "B2DPlugin 30 December 2013 (e)"
#endif
;
static int* objBuffer;
Modified: trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c
===================================================================
--- trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2013-12-25 05:01:29 UTC (rev 2837)
+++ trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2013-12-30 18:28:08 UTC (rev 2838)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:56 am */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:49 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ VMPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
from
- B3DAcceleratorPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ B3DAcceleratorPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
*/
-static char __buildInfo[] = "B3DAcceleratorPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ;
+static char __buildInfo[] = "B3DAcceleratorPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916 " __DATE__ ;
@@ -107,9 +107,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "B3DAcceleratorPlugin 21 December 2013 (i)"
+ "B3DAcceleratorPlugin 30 December 2013 (i)"
#else
- "B3DAcceleratorPlugin 21 December 2013 (e)"
+ "B3DAcceleratorPlugin 30 December 2013 (e)"
#endif
;
Modified: trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c
===================================================================
--- trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2013-12-25 05:01:29 UTC (rev 2837)
+++ trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2013-12-30 18:28:08 UTC (rev 2838)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:42 am */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:35 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ VMPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
from
- BMPReadWriterPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ BMPReadWriterPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
*/
-static char __buildInfo[] = "BMPReadWriterPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ;
+static char __buildInfo[] = "BMPReadWriterPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916 " __DATE__ ;
@@ -58,9 +58,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "BMPReadWriterPlugin 21 December 2013 (i)"
+ "BMPReadWriterPlugin 30 December 2013 (i)"
#else
- "BMPReadWriterPlugin 21 December 2013 (e)"
+ "BMPReadWriterPlugin 30 December 2013 (e)"
#endif
;
Modified: trunk/src/plugins/BitBltPlugin/BitBltPlugin.c
===================================================================
--- trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2013-12-25 05:01:29 UTC (rev 2837)
+++ trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2013-12-30 18:28:08 UTC (rev 2838)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:46 am */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:39 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
from
- BitBltSimulation VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ BitBltSimulation VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
*/
-static char __buildInfo[] = "BitBltSimulation VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ;
+static char __buildInfo[] = "BitBltSimulation VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916 " __DATE__ ;
@@ -82,10 +82,10 @@
static sqInt OLDrgbDiffwith(sqInt sourceWord, sqInt destinationWord);
static sqInt OLDtallyIntoMapwith(sqInt sourceWord, sqInt destinationWord);
static sqInt addWordwith(sqInt sourceWord, sqInt destinationWord);
-static sqInt alphaBlendwith(sqInt sourceWord, sqInt destinationWord);
+static sqInt alphaBlendwith(unsigned int sourceWord, unsigned int destinationWord);
static sqInt alphaBlendConstwith(sqInt sourceWord, sqInt destinationWord);
-static sqInt alphaBlendConstwithpaintMode(sqInt sourceWord, sqInt destinationWord, sqInt paintMode);
-static sqInt alphaBlendScaledwith(sqInt sourceWord, sqInt destinationWord);
+static sqInt alphaBlendConstwithpaintMode(unsigned int sourceWord, unsigned int destinationWord, sqInt paintMode);
+static sqInt alphaBlendScaledwith(unsigned int sourceWord, unsigned int destinationWord);
static sqInt alphaPaintConstwith(sqInt sourceWord, sqInt destinationWord);
static sqInt alphaSourceBlendBits16(void);
static sqInt alphaSourceBlendBits32(void);
@@ -143,7 +143,7 @@
EXPORT(sqInt) moduleUnloaded(char *aModuleName);
#pragma export off
static sqInt partitionedANDtonBitsnPartitions(sqInt word1, sqInt word2, sqInt nBits, sqInt nParts);
-static sqInt partitionedAddtonBitsnPartitions(unsigned int word1, unsigned int word2, sqInt nBits, sqInt nParts);
+static sqInt partitionedAddtonBitscomponentMaskcarryOverflowMask(unsigned int word1, unsigned int word2, sqInt nBits, unsigned int componentMask, unsigned int carryOverflowMask);
static sqInt partitionedMaxwithnBitsnPartitions(unsigned int word1, unsigned int word2, sqInt nBits, sqInt nParts);
static sqInt partitionedMinwithnBitsnPartitions(unsigned int word1, unsigned int word2, sqInt nBits, sqInt nParts);
static sqInt partitionedMulwithnBitsnPartitions(sqInt word1, sqInt word2, sqInt nBits, sqInt nParts);
@@ -161,7 +161,7 @@
#pragma export off
static sqInt queryDestSurface(sqInt handle);
static sqInt querySourceSurface(sqInt handle);
-static sqInt rgbAddwith(sqInt sourceWord, sqInt destinationWord);
+static sqInt rgbAddwith(unsigned int sourceWord, unsigned int destinationWord);
static sqInt rgbComponentAlpha16(void);
static sqInt rgbComponentAlpha32(void);
static sqInt rgbComponentAlpha32with(sqInt sourceWord, sqInt destinationWord);
@@ -257,9 +257,9 @@
};
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "BitBltPlugin 21 December 2013 (i)"
+ "BitBltPlugin 30 December 2013 (i)"
#else
- "BitBltPlugin 21 December 2013 (e)"
+ "BitBltPlugin 30 December 2013 (e)"
#endif
;
static sqInt nWords;
@@ -531,13 +531,12 @@
the computation being performed independently on each color
component. The high byte of the result will be 0. */
-static sqInt alphaBlendwith(sqInt sourceWord, sqInt destinationWord) {
- sqInt unAlpha;
- sqInt colorMask;
- sqInt blend;
- sqInt result;
- sqInt shift;
- sqInt alpha;
+static sqInt alphaBlendwith(unsigned int sourceWord, unsigned int destinationWord) {
+ unsigned int unAlpha;
+ unsigned int blendRB;
+ unsigned int blendAG;
+ unsigned int result;
+ unsigned int alpha;
/* High 8 bits of source pixel */
@@ -550,32 +549,20 @@
return sourceWord;
}
unAlpha = 255 - alpha;
- colorMask = 255;
- /* red */
+ /* blend red and blue */
- result = 0;
- shift = 0;
- blend = ((((((((usqInt) sourceWord) >> shift) & colorMask) * alpha) + (((((usqInt) destinationWord) >> shift) & colorMask) * unAlpha)) + 254) / 255) & colorMask;
+ blendRB = (((sourceWord & 16711935) * alpha) + ((destinationWord & 16711935) * unAlpha)) + 16711935;
- /* green */
+ /* blend alpha and green */
- result = result | (blend << shift);
- shift = 8;
- blend = ((((((((usqInt) sourceWord) >> shift) & colorMask) * alpha) + (((((usqInt) destinationWord) >> shift) & colorMask) * unAlpha)) + 254) / 255) & colorMask;
+ blendAG = (((((((usqInt) sourceWord) >> 8) | 16711680) & 16711935) * alpha) + (((((usqInt) destinationWord) >> 8) & 16711935) * unAlpha)) + 16711935;
- /* blue */
+ /* divide by 255 */
- result = result | (blend << shift);
- shift = 16;
- blend = ((((((((usqInt) sourceWord) >> shift) & colorMask) * alpha) + (((((usqInt) destinationWord) >> shift) & colorMask) * unAlpha)) + 254) / 255) & colorMask;
-
- /* alpha (pre-multiplied) */
-
- result = result | (blend << shift);
- shift = 24;
- blend = ((((alpha * 255) + (((((usqInt) destinationWord) >> shift) & colorMask) * unAlpha)) + 254) / 255) & colorMask;
- result = result | (blend << shift);
+ blendRB = (((usqInt) (blendRB + ((((usqInt) (blendRB - 65537)) >> 8) & 16711935))) >> 8) & 16711935;
+ blendAG = (((usqInt) (blendAG + ((((usqInt) (blendAG - 65537)) >> 8) & 16711935))) >> 8) & 16711935;
+ result = blendRB | (blendAG << 8);
return result;
}
@@ -597,37 +584,29 @@
To allow storing into any depth will require subsequent addition of two other
colormaps, as is the case with WarpBlt. */
-static sqInt alphaBlendConstwithpaintMode(sqInt sourceWord, sqInt destinationWord, sqInt paintMode) {
- sqInt sourcePixVal;
+static sqInt alphaBlendConstwithpaintMode(unsigned int sourceWord, unsigned int destinationWord, sqInt paintMode) {
+ sqInt rgbMask;
+ sqInt pixMask;
+ sqInt pixBlend;
sqInt j;
- sqInt bitsPerColor;
- sqInt unAlpha;
sqInt sourceShifted;
- sqInt pixMask;
- sqInt blend;
- sqInt rgbMask;
- sqInt result;
+ unsigned int result;
sqInt shift;
- sqInt destShifted;
- sqInt maskShifted;
+ sqInt sourcePixVal;
sqInt i;
+ unsigned int unAlpha;
sqInt destPixVal;
- sqInt pixBlend;
+ unsigned int blendRB;
+ unsigned int blendAG;
+ sqInt bitsPerColor;
+ sqInt blend;
+ sqInt destShifted;
+ sqInt maskShifted;
if (destDepth < 16) {
return destinationWord;
}
unAlpha = 255 - sourceAlpha;
- pixMask = maskTable[destDepth];
- if (destDepth == 16) {
- bitsPerColor = 5;
- } else {
- bitsPerColor = 8;
- }
- rgbMask = (1 << bitsPerColor) - 1;
- maskShifted = destMask;
- destShifted = destinationWord;
- sourceShifted = sourceWord;
result = destinationWord;
if (destPPW == 1) {
@@ -637,14 +616,28 @@
/* painting a transparent pixel */
- result = 0;
- for (i = 1; i <= 4; i += 1) {
- shift = (i - 1) * 8;
- blend = ((((((((usqInt) sourceWord) >> shift) & rgbMask) * sourceAlpha) + (((((usqInt) destinationWord) >> shift) & rgbMask) * unAlpha)) + 254) / 255) & rgbMask;
- result = result | (blend << shift);
- }
+
+ /* blendRB red and blue */
+
+ blendRB = (((sourceWord & 16711935) * sourceAlpha) + ((destinationWord & 16711935) * unAlpha)) + 16711935;
+
+ /* blendRB alpha and green */
+
+ blendAG = ((((((usqInt) sourceWord) >> 8) & 16711935) * sourceAlpha) + (((((usqInt) destinationWord) >> 8) & 16711935) * unAlpha)) + 16711935;
+
+ /* divide by 255 */
+
+ blendRB = (((usqInt) (blendRB + ((((usqInt) (blendRB - 65537)) >> 8) & 16711935))) >> 8) & 16711935;
+ blendAG = (((usqInt) (blendAG + ((((usqInt) (blendAG - 65537)) >> 8) & 16711935))) >> 8) & 16711935;
+ result = blendRB | (blendAG << 8);
}
} else {
+ pixMask = maskTable[destDepth];
+ bitsPerColor = 5;
+ rgbMask = 31;
+ maskShifted = destMask;
+ destShifted = destinationWord;
+ sourceShifted = sourceWord;
for (j = 1; j <= destPPW; j += 1) {
sourcePixVal = sourceShifted & pixMask;
if (!(((maskShifted & pixMask) == 0) || (paintMode && (sourcePixVal == 0)))) {
@@ -655,11 +648,7 @@
blend = ((((((((usqInt) sourcePixVal) >> shift) & rgbMask) * sourceAlpha) + (((((usqInt) destPixVal) >> shift) & rgbMask) * unAlpha)) + 254) / 255) & rgbMask;
pixBlend = pixBlend | (blend << shift);
}
- if (destDepth == 16) {
- result = (result & (~(pixMask << ((j - 1) * 16)))) | (pixBlend << ((j - 1) * 16));
- } else {
- result = pixBlend;
- }
+ result = (result & (~(pixMask << ((j - 1) * 16)))) | (pixBlend << ((j - 1) * 16));
}
maskShifted = ((usqInt) maskShifted) >> destDepth;
sourceShifted = ((usqInt) sourceShifted) >> destDepth;
@@ -678,47 +667,35 @@
e.g., it is assumed that the source color is already scaled. */
-static sqInt alphaBlendScaledwith(sqInt sourceWord, sqInt destinationWord) {
- sqInt unAlpha;
- sqInt g;
- sqInt srcMask;
- sqInt a;
- sqInt dstMask;
- sqInt r;
- sqInt b;
+static sqInt alphaBlendScaledwith(unsigned int sourceWord, unsigned int destinationWord) {
+ unsigned int unAlpha;
+ unsigned int rb;
+ unsigned int ag;
/* Do NOT inline this into optimized loops */
- /* High 8 bits of source pixel */
+ /* High 8 bits of source pixel is source opacity (ARGB format) */
unAlpha = 255 - (((usqInt) sourceWord) >> 24);
- dstMask = destinationWord;
- srcMask = sourceWord;
- b = (((usqInt) ((dstMask & 255) * unAlpha)) >> 8) + (srcMask & 255);
- if (b > 255) {
- b = 255;
- }
- dstMask = ((usqInt) dstMask) >> 8;
- srcMask = ((usqInt) srcMask) >> 8;
- g = (((usqInt) ((dstMask & 255) * unAlpha)) >> 8) + (srcMask & 255);
- if (g > 255) {
- g = 255;
- }
- dstMask = ((usqInt) dstMask) >> 8;
- srcMask = ((usqInt) srcMask) >> 8;
- r = (((usqInt) ((dstMask & 255) * unAlpha)) >> 8) + (srcMask & 255);
- if (r > 255) {
- r = 255;
- }
- dstMask = ((usqInt) dstMask) >> 8;
- srcMask = ((usqInt) srcMask) >> 8;
- a = (((usqInt) ((dstMask & 255) * unAlpha)) >> 8) + (srcMask & 255);
- if (a > 255) {
- a = 255;
- }
- return (((((a << 8) + r) << 8) + g) << 8) + b;
+
+ /* blend red and blue components */
+
+ rb = ((((usqInt) ((destinationWord & 16711935) * unAlpha)) >> 8) & 16711935) + (sourceWord & 16711935);
+
+ /* blend alpha and green components */
+
+ ag = ((((usqInt) (((((usqInt) destinationWord) >> 8) & 16711935) * unAlpha)) >> 8) & 16711935) + ((((usqInt) sourceWord) >> 8) & 16711935);
+
+ /* saturate red and blue components if there is a carry */
+
+ rb = (rb & 16711935) | (((usqInt) ((rb & 16777472) * 255)) >> 8);
+
+ /* saturate alpha and green components if there is a carry */
+
+ ag = ((ag & 16711935) << 8) | ((ag & 16777472) * 255);
+ return ag | rb;
}
static sqInt alphaPaintConstwith(sqInt sourceWord, sqInt destinationWord) {
@@ -3076,39 +3053,28 @@
/* Add word1 to word2 as nParts partitions of nBits each.
This is useful for packed pixels, or packed colors */
-/* In C, most arithmetic operations answer the same bit pattern regardless of the operands being signed or unsigned ints
- (this is due to the way 2's complement numbers work). However, comparisions might fail. Add the proper declaration of
- words as unsigned int in those cases where comparisions are done (jmv) */
+/* Use unsigned int everywhere because it has a well known arithmetic model without undefined behavior w.r.t. overflow and shifts */
-static sqInt partitionedAddtonBitsnPartitions(unsigned int word1, unsigned int word2, sqInt nBits, sqInt nParts) {
- unsigned int result;
+static sqInt partitionedAddtonBitscomponentMaskcarryOverflowMask(unsigned int word1, unsigned int word2, sqInt nBits, unsigned int componentMask, unsigned int carryOverflowMask) {
+ unsigned int w2;
+ unsigned int carryOverflow;
unsigned int sum;
- unsigned int maskedWord1;
- sqInt i;
- unsigned int mask;
+ unsigned int w1;
- /* partition mask starts at the right */
+ /* mask to remove high bit of each component */
- mask = maskTable[nBits];
- result = 0;
- for (i = 1; i <= nParts; i += 1) {
- maskedWord1 = word1 & mask;
- sum = maskedWord1 + (word2 & mask);
- if ((sum <= mask) && (sum >= maskedWord1)) {
+ w1 = word1 & carryOverflowMask;
+ w2 = word2 & carryOverflowMask;
- /* This is needed because in C, integer arithmetic overflows silently! (jmv) */
+ /* sum without high bit to avoid overflowing over next component */
- result = result | sum;
- } else {
- result = result | mask;
- }
+ sum = (word1 ^ w1) + (word2 ^ w2);
- /* slide left to next partition */
+ /* detect overflow condition for saturating */
- mask = mask << nBits;
- }
- return result;
+ carryOverflow = (w1 & w2) | ((w1 | w2) & sum);
+ return ((sum ^ w1) ^ w2) | ((((usqInt) carryOverflow) >> (nBits - 1)) * componentMask);
}
@@ -3829,23 +3795,32 @@
(handle, &sourceWidth, &sourceHeight, &sourceDepth, &sourceMSB);
}
-static sqInt rgbAddwith(sqInt sourceWord, sqInt destinationWord) {
+static sqInt rgbAddwith(unsigned int sourceWord, unsigned int destinationWord) {
+ unsigned int carryOverflowMask;
+ unsigned int componentMask;
+
if (destDepth < 16) {
/* Add each pixel separately */
- return partitionedAddtonBitsnPartitions(sourceWord, destinationWord, destDepth, destPPW);
+ componentMask = (1 << destDepth) - 1;
+ carryOverflowMask = (4294967295U / componentMask) << (destDepth - 1);
+ return partitionedAddtonBitscomponentMaskcarryOverflowMask(sourceWord, destinationWord, destDepth, componentMask, carryOverflowMask);
}
if (destDepth == 16) {
/* Add RGB components of each pixel separately */
- return (partitionedAddtonBitsnPartitions(sourceWord, destinationWord, 5, 3)) + ((partitionedAddtonBitsnPartitions(((usqInt) sourceWord) >> 16, ((usqInt) destinationWord) >> 16, 5, 3)) << 16);
+ componentMask = 31;
+ carryOverflowMask = 1108361744;
+ return partitionedAddtonBitscomponentMaskcarryOverflowMask(sourceWord & 2147450879, destinationWord & 2147450879, 5, componentMask, carryOverflowMask);
} else {
/* Add RGBA components of the pixel separately */
- return partitionedAddtonBitsnPartitions(sourceWord, destinationWord, 8, 4);
+ componentMask = 255;
+ carryOverflowMask = 2155905152U;
+ return partitionedAddtonBitscomponentMaskcarryOverflowMask(sourceWord, destinationWord, 8, componentMask, carryOverflowMask);
}
}
Modified: trunk/src/plugins/CameraPlugin/CameraPlugin.c
===================================================================
--- trunk/src/plugins/CameraPlugin/CameraPlugin.c 2013-12-25 05:01:29 UTC (rev 2837)
+++ trunk/src/plugins/CameraPlugin/CameraPlugin.c 2013-12-30 18:28:08 UTC (rev 2838)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:58 am */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:51 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ VMPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
from
- CameraPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ CameraPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
*/
-static char __buildInfo[] = "CameraPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ;
+static char __buildInfo[] = "CameraPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916 " __DATE__ ;
@@ -64,9 +64,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "CameraPlugin 21 December 2013 (i)"
+ "CameraPlugin 30 December 2013 (i)"
#else
- "CameraPlugin 21 December 2013 (e)"
+ "CameraPlugin 30 December 2013 (e)"
#endif
;
Modified: trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c
===================================================================
--- trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2013-12-25 05:01:29 UTC (rev 2837)
+++ trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2013-12-30 18:28:08 UTC (rev 2838)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:58 am */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:51 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
from
- ClipboardExtendedPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ ClipboardExtendedPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
*/
-static char __buildInfo[] = "ClipboardExtendedPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ;
+static char __buildInfo[] = "ClipboardExtendedPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916 " __DATE__ ;
@@ -61,9 +61,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "ClipboardExtendedPlugin 21 December 2013 (i)"
+ "ClipboardExtendedPlugin 30 December 2013 (i)"
#else
- "ClipboardExtendedPlugin 21 December 2013 (e)"
+ "ClipboardExtendedPlugin 30 December 2013 (e)"
#endif
;
Modified: trunk/src/plugins/CroquetPlugin/CroquetPlugin.c
===================================================================
--- trunk/src/plugins/CroquetPlugin/CroquetPlugin.c 2013-12-25 05:01:29 UTC (rev 2837)
+++ trunk/src/plugins/CroquetPlugin/CroquetPlugin.c 2013-12-30 18:28:08 UTC (rev 2838)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:46 am */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:39 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ VMPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
from
- CroquetPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ CroquetPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
*/
-static char __buildInfo[] = "CroquetPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ;
+static char __buildInfo[] = "CroquetPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916 " __DATE__ ;
@@ -73,9 +73,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "CroquetPlugin 21 December 2013 (i)"
+ "CroquetPlugin 30 December 2013 (i)"
#else
- "CroquetPlugin 21 December 2013 (e)"
+ "CroquetPlugin 30 December 2013 (e)"
#endif
;
Modified: trunk/src/plugins/DBusPlugin/DBusPlugin.c
===================================================================
--- trunk/src/plugins/DBusPlugin/DBusPlugin.c 2013-12-25 05:01:29 UTC (rev 2837)
+++ trunk/src/plugins/DBusPlugin/DBusPlugin.c 2013-12-30 18:28:08 UTC (rev 2838)
@@ -1,6 +1,6 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:59 am */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:51 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
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 21 December 2013 (i)"
+ "DBusPlugin 30 December 2013 (i)"
#else
- "DBusPlugin 21 December 2013 (e)"
+ "DBusPlugin 30 December 2013 (e)"
#endif
;
static DBusMessage* writeMessage;
Modified: trunk/src/plugins/DSAPrims/DSAPrims.c
===================================================================
--- trunk/src/plugins/DSAPrims/DSAPrims.c 2013-12-25 05:01:29 UTC (rev 2837)
+++ trunk/src/plugins/DSAPrims/DSAPrims.c 2013-12-30 18:28:08 UTC (rev 2838)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:46 am */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:40 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ VMPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
from
- DSAPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ DSAPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
*/
-static char __buildInfo[] = "DSAPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ;
+static char __buildInfo[] = "DSAPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916 " __DATE__ ;
@@ -67,9 +67,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "DSAPrims 21 December 2013 (i)"
+ "DSAPrims 30 December 2013 (i)"
#else
- "DSAPrims 21 December 2013 (e)"
+ "DSAPrims 30 December 2013 (e)"
#endif
;
static sqInt remainderDigitCount;
Modified: trunk/src/plugins/DropPlugin/DropPlugin.c
===================================================================
--- trunk/src/plugins/DropPlugin/DropPlugin.c 2013-12-25 05:01:29 UTC (rev 2837)
+++ trunk/src/plugins/DropPlugin/DropPlugin.c 2013-12-30 18:28:08 UTC (rev 2838)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:47 am */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:40 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ VMPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
from
- DropPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ DropPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
*/
-static char __buildInfo[] = "DropPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ;
+static char __buildInfo[] = "DropPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916 " __DATE__ ;
@@ -62,9 +62,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "DropPlugin 21 December 2013 (i)"
+ "DropPlugin 30 December 2013 (i)"
#else
- "DropPlugin 21 December 2013 (e)"
+ "DropPlugin 30 December 2013 (e)"
#endif
;
Modified: trunk/src/plugins/FFTPlugin/FFTPlugin.c
===================================================================
--- trunk/src/plugins/FFTPlugin/FFTPlugin.c 2013-12-25 05:01:29 UTC (rev 2837)
+++ trunk/src/plugins/FFTPlugin/FFTPlugin.c 2013-12-30 18:28:08 UTC (rev 2838)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:47 am */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:41 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ VMPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
from
- FFTPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ FFTPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
*/
-static char __buildInfo[] = "FFTPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ;
+static char __buildInfo[] = "FFTPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916 " __DATE__ ;
@@ -68,9 +68,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "FFTPlugin 21 December 2013 (i)"
+ "FFTPlugin 30 December 2013 (i)"
#else
- "FFTPlugin 21 December 2013 (e)"
+ "FFTPlugin 30 December 2013 (e)"
#endif
;
static sqInt nu;
Modified: trunk/src/plugins/FT2Plugin/FT2Plugin.c
===================================================================
--- trunk/src/plugins/FT2Plugin/FT2Plugin.c 2013-12-25 05:01:29 UTC (rev 2837)
+++ trunk/src/plugins/FT2Plugin/FT2Plugin.c 2013-12-30 18:28:08 UTC (rev 2838)
@@ -1,4 +1,4 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:48 am */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:41 pm */
/* 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 21 December 2013 (i)"
+ "FT2Plugin 30 December 2013 (i)"
#else
- "FT2Plugin 21 December 2013 (e)"
+ "FT2Plugin 30 December 2013 (e)"
#endif
;
Modified: trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c
===================================================================
--- trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c 2013-12-25 05:01:29 UTC (rev 2837)
+++ trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c 2013-12-30 18:28:08 UTC (rev 2838)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:59 am */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:53 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
from
- FileCopyPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ FileCopyPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
*/
-static char __buildInfo[] = "FileCopyPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ;
+static char __buildInfo[] = "FileCopyPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916 " __DATE__ ;
@@ -57,9 +57,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "FileCopyPlugin 21 December 2013 (i)"
+ "FileCopyPlugin 30 December 2013 (i)"
#else
- "FileCopyPlugin 21 December 2013 (e)"
+ "FileCopyPlugin 30 December 2013 (e)"
#endif
;
Modified: trunk/src/plugins/FilePlugin/FilePlugin.c
===================================================================
--- trunk/src/plugins/FilePlugin/FilePlugin.c 2013-12-25 05:01:29 UTC (rev 2837)
+++ trunk/src/plugins/FilePlugin/FilePlugin.c 2013-12-30 18:28:08 UTC (rev 2838)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:48 am */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:42 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ VMPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
from
- FilePlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ FilePlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
*/
-static char __buildInfo[] = "FilePlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ;
+static char __buildInfo[] = "FilePlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916 " __DATE__ ;
@@ -100,9 +100,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "FilePlugin 21 December 2013 (i)"
+ "FilePlugin 30 December 2013 (i)"
#else
- "FilePlugin 21 December 2013 (e)"
+ "FilePlugin 30 December 2013 (e)"
#endif
;
static void * sCCPfn;
Modified: trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c
===================================================================
--- trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2013-12-25 05:01:29 UTC (rev 2837)
+++ trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2013-12-30 18:28:08 UTC (rev 2838)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:48 am */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:42 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ VMPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
from
- FloatArrayPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ FloatArrayPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
*/
-static char __buildInfo[] = "FloatArrayPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ;
+static char __buildInfo[] = "FloatArrayPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916 " __DATE__ ;
@@ -72,9 +72,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "FloatArrayPlugin 21 December 2013 (i)"
+ "FloatArrayPlugin 30 December 2013 (i)"
#else
- "FloatArrayPlugin 21 December 2013 (e)"
+ "FloatArrayPlugin 30 December 2013 (e)"
#endif
;
Modified: trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c
===================================================================
--- trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c 2013-12-25 05:01:29 UTC (rev 2837)
+++ trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c 2013-12-30 18:28:08 UTC (rev 2838)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:49 am */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:42 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ VMPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
from
- FloatMathPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ FloatMathPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
*/
-static char __buildInfo[] = "FloatMathPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ;
+static char __buildInfo[] = "FloatMathPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916 " __DATE__ ;
@@ -79,9 +79,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "FloatMathPlugin 21 December 2013 (i)"
+ "FloatMathPlugin 30 December 2013 (i)"
#else
- "FloatMathPlugin 21 December 2013 (e)"
+ "FloatMathPlugin 30 December 2013 (e)"
#endif
;
Modified: trunk/src/plugins/GeniePlugin/GeniePlugin.c
===================================================================
--- trunk/src/plugins/GeniePlugin/GeniePlugin.c 2013-12-25 05:01:29 UTC (rev 2837)
+++ trunk/src/plugins/GeniePlugin/GeniePlugin.c 2013-12-30 18:28:08 UTC (rev 2838)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:49 am */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:43 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
from
- GeniePlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ GeniePlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
*/
-static char __buildInfo[] = "GeniePlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ;
+static char __buildInfo[] = "GeniePlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916 " __DATE__ ;
@@ -61,9 +61,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "GeniePlugin v2.0 21 December 2013 (i)"
+ "GeniePlugin v2.0 30 December 2013 (i)"
#else
- "GeniePlugin v2.0 21 December 2013 (e)"
+ "GeniePlugin v2.0 30 December 2013 (e)"
#endif
;
Modified: trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c
===================================================================
--- trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c 2013-12-25 05:01:29 UTC (rev 2837)
+++ trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c 2013-12-30 18:28:08 UTC (rev 2838)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:35:01 am */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:54 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
from
- HostWindowPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ HostWindowPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
*/
-static char __buildInfo[] = "HostWindowPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ;
+static char __buildInfo[] = "HostWindowPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916 " __DATE__ ;
@@ -66,9 +66,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "HostWindowPlugin 21 December 2013 (i)"
+ "HostWindowPlugin 30 December 2013 (i)"
#else
- "HostWindowPlugin 21 December 2013 (e)"
+ "HostWindowPlugin 30 December 2013 (e)"
#endif
;
Modified: trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c
===================================================================
--- trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2013-12-25 05:01:29 UTC (rev 2837)
+++ trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2013-12-30 18:28:08 UTC (rev 2838)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:49 am */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:43 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
from
- JPEGReadWriter2Plugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ JPEGReadWriter2Plugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
*/
-static char __buildInfo[] = "JPEGReadWriter2Plugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ;
+static char __buildInfo[] = "JPEGReadWriter2Plugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916 " __DATE__ ;
@@ -68,9 +68,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "JPEGReadWriter2Plugin 21 December 2013 (i)"
+ "JPEGReadWriter2Plugin 30 December 2013 (i)"
#else
- "JPEGReadWriter2Plugin 21 December 2013 (e)"
+ "JPEGReadWriter2Plugin 30 December 2013 (e)"
#endif
;
Modified: trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c
===================================================================
--- trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2013-12-25 05:01:29 UTC (rev 2837)
+++ trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2013-12-30 18:28:08 UTC (rev 2838)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:50 am */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:43 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ VMPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
from
- JPEGReaderPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ JPEGReaderPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
*/
-static char __buildInfo[] = "JPEGReaderPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ;
+static char __buildInfo[] = "JPEGReaderPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916 " __DATE__ ;
@@ -136,9 +136,9 @@
static sqInt jsReadLimit;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "JPEGReaderPlugin 21 December 2013 (i)"
+ "JPEGReaderPlugin 30 December 2013 (i)"
#else
- "JPEGReaderPlugin 21 December 2013 (e)"
+ "JPEGReaderPlugin 30 December 2013 (e)"
#endif
;
static int *residuals;
Modified: trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c
===================================================================
--- trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c 2013-12-25 05:01:29 UTC (rev 2837)
+++ trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c 2013-12-30 18:28:08 UTC (rev 2838)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:50 am */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:44 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
from
- JoystickTabletPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ JoystickTabletPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
*/
-static char __buildInfo[] = "JoystickTabletPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ;
+static char __buildInfo[] = "JoystickTabletPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916 " __DATE__ ;
@@ -62,9 +62,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "JoystickTabletPlugin 21 December 2013 (i)"
+ "JoystickTabletPlugin 30 December 2013 (i)"
#else
- "JoystickTabletPlugin 21 December 2013 (e)"
+ "JoystickTabletPlugin 30 December 2013 (e)"
#endif
;
Modified: trunk/src/plugins/Klatt/Klatt.c
===================================================================
--- trunk/src/plugins/Klatt/Klatt.c 2013-12-25 05:01:29 UTC (rev 2837)
+++ trunk/src/plugins/Klatt/Klatt.c 2013-12-30 18:28:08 UTC (rev 2838)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:51 am */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:44 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ VMPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
from
- KlattSynthesizerPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ KlattSynthesizerPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
*/
-static char __buildInfo[] = "KlattSynthesizerPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ;
+static char __buildInfo[] = "KlattSynthesizerPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916 " __DATE__ ;
@@ -155,9 +155,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "Klatt 21 December 2013 (i)"
+ "Klatt 30 December 2013 (i)"
#else
- "Klatt 21 December 2013 (e)"
+ "Klatt 30 December 2013 (e)"
#endif
;
static float nlast;
Modified: trunk/src/plugins/LargeIntegers/LargeIntegers.c
===================================================================
--- trunk/src/plugins/LargeIntegers/LargeIntegers.c 2013-12-25 05:01:29 UTC (rev 2837)
+++ trunk/src/plugins/LargeIntegers/LargeIntegers.c 2013-12-30 18:28:08 UTC (rev 2838)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:51 am */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:45 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
from
- LargeIntegersPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
+ LargeIntegersPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
*/
-static char __buildInfo[] = "LargeIntegersPlugin VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e " __DATE__ ;
+static char __buildInfo[] = "LargeIntegersPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916 " __DATE__ ;
Modified: trunk/src/plugins/LocalePlugin/LocalePlugin.c
===================================================================
--- trunk/src/plugins/LocalePlugin/LocalePlugin.c 2013-12-25 05:01:29 UTC (rev 2837)
+++ trunk/src/plugins/LocalePlugin/LocalePlugin.c 2013-12-30 18:28:08 UTC (rev 2838)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.10 translated as C source on 21 December 2013 11:34:52 am */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:45 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.332 uuid: 78ecdbe9-481f-4ef7-b190-13eba921157e
@@ Diff output truncated at 50000 characters. @@
More information about the Vm-dev
mailing list