[commit][2867] Sources per VMMaker-dtl.340 (VMMaker 4.13.2)
Locked
 
|
Revision: 2867 Author: lewis Date: 2014-02-12 16:33:46 -0800 (Wed, 12 Feb 2014) Log Message: ----------- Sources per VMMaker-dtl.340 (VMMaker 4.13.2) Incorporate various oscog code generation improvements, including code generation for sending #value: to a block, and elimination of unnecessary temp vars in inlining, for example, generate this: thisWord = long32At(sourceIndex); instead of this: idx7 = sourceIndex; thisWord = long32At(idx7); For primitiveAllObjects, move the allObjects logic to ObjectMemory. 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 2014-02-07 19:21:40 UTC (rev 2866) +++ trunk/src/ckformat.c 2014-02-13 00:33:46 UTC (rev 2867) @@ -5,7 +5,7 @@ /* Usage: ckformat imageFileName */ /* --- DO NOT EDIT THIS FILE --- */ -/* --- Automatically generated from class ImageFormat 2014-01-27T15:24:21.387+01:00--- */ +/* --- Automatically generated from class ImageFormat 2014-02-12T19:19:51.519+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 2014-02-07 19:21:40 UTC (rev 2866) +++ trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2014-02-13 00:33:46 UTC (rev 2867) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.1 translated as C source on 27 January 2014 3:24:11 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.2 translated as C source on 12 February 2014 7:19:40 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + VMPluginCodeGenerator * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 from - ADPCMCodecPlugin VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + ADPCMCodecPlugin * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 */ -static char __buildInfo[] = "ADPCMCodecPlugin VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 " __DATE__ ; +static char __buildInfo[] = "ADPCMCodecPlugin * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 " __DATE__ ; @@ -70,9 +70,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ADPCMCodecPlugin 27 January 2014 (i)" + "ADPCMCodecPlugin 12 February 2014 (i)" #else - "ADPCMCodecPlugin 27 January 2014 (e)" + "ADPCMCodecPlugin 12 February 2014 (e)" #endif ; Modified: trunk/src/plugins/AioPlugin/AioPlugin.c =================================================================== --- trunk/src/plugins/AioPlugin/AioPlugin.c 2014-02-07 19:21:40 UTC (rev 2866) +++ trunk/src/plugins/AioPlugin/AioPlugin.c 2014-02-13 00:33:46 UTC (rev 2867) @@ -1,6 +1,6 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.1 translated as C source on 27 January 2014 3:24:20 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.2 translated as C source on 12 February 2014 7:19:51 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + VMPluginCodeGenerator * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 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 27 January 2014 (i)" + "AioPlugin 12 February 2014 (i)" #else - "AioPlugin 27 January 2014 (e)" + "AioPlugin 12 February 2014 (e)" #endif ; Modified: trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c =================================================================== --- trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2014-02-07 19:21:40 UTC (rev 2866) +++ trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2014-02-13 00:33:46 UTC (rev 2867) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.1 translated as C source on 27 January 2014 3:24:11 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.2 translated as C source on 12 February 2014 7:19:40 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 from - AsynchFilePlugin VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + AsynchFilePlugin * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 */ -static char __buildInfo[] = "AsynchFilePlugin VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 " __DATE__ ; +static char __buildInfo[] = "AsynchFilePlugin * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 " __DATE__ ; @@ -67,9 +67,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AsynchFilePlugin 27 January 2014 (i)" + "AsynchFilePlugin 12 February 2014 (i)" #else - "AsynchFilePlugin 27 January 2014 (e)" + "AsynchFilePlugin 12 February 2014 (e)" #endif ; static void * sCOAFfn; Modified: trunk/src/plugins/B2DPlugin/B2DPlugin.c =================================================================== --- trunk/src/plugins/B2DPlugin/B2DPlugin.c 2014-02-07 19:21:40 UTC (rev 2866) +++ trunk/src/plugins/B2DPlugin/B2DPlugin.c 2014-02-13 00:33:46 UTC (rev 2867) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.1 translated as C source on 27 January 2014 3:24:12 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.2 translated as C source on 12 February 2014 7:19:41 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + VMPluginCodeGenerator * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 from - BalloonEnginePlugin VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + BalloonEnginePlugin * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 */ -static char __buildInfo[] = "BalloonEnginePlugin VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 " __DATE__ ; +static char __buildInfo[] = "BalloonEnginePlugin * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 " __DATE__ ; @@ -447,9 +447,9 @@ static void * loadBBFn; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B2DPlugin 27 January 2014 (i)" + "B2DPlugin 12 February 2014 (i)" #else - "B2DPlugin 27 January 2014 (e)" + "B2DPlugin 12 February 2014 (e)" #endif ; static int* objBuffer; @@ -2648,7 +2648,6 @@ sqInt stopX; sqInt someIntegerValue; sqInt someIntegerValue1; - sqInt rightX1; sqInt fill1; sqInt startX1; sqInt stopX1; @@ -2776,7 +2775,6 @@ } if (rightX < (workBuffer[GWFillMaxX])) { /* begin fillAllFrom:to: */ - rightX1 = workBuffer[GWFillMaxX]; /* begin topFill */ if (((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) == 0) { fill1 = 0; @@ -2796,7 +2794,7 @@ goto l14; } l14: /* end topRightX */; - while (stopX1 < rightX1) { + while (stopX1 < (workBuffer[GWFillMaxX])) { /* begin makeUnsignedFrom: */ /* begin topFill */ if (((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) == 0) { @@ -2847,7 +2845,7 @@ l15: /* end topFill */; fill1 = someIntegerValue11; if (!(fill1 == 0)) { - fillSpanfromto(fill1, startX1, rightX1); + fillSpanfromto(fill1, startX1, workBuffer[GWFillMaxX]); goto l5; } l5: /* end fillAllFrom:to: */; @@ -7404,7 +7402,6 @@ static sqInt toggleFillsOf(sqInt edge) { sqInt depth; sqInt fillIndex; - sqInt leftX; if (!(needAvailableSpace(3 * 2))) { return null; @@ -7419,11 +7416,10 @@ toggleFilldepthrightX(fillIndex, depth, 999999999); } /* begin quickRemoveInvalidFillsAt: */ - leftX = objBuffer[edge + GEXValue]; if (((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) == 0) { goto l1; } - while ((topRightX()) <= leftX) { + while ((topRightX()) <= (objBuffer[edge + GEXValue])) { hideFilldepth(topFill(), topDepth()); if (((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) == 0) { goto l1; @@ -7439,7 +7435,6 @@ sqInt lineWidth; sqInt rightX; sqInt type; - sqInt leftX; type = ((usqInt) ((objBuffer[edge + GEObjectType]) & GEPrimitiveTypeMask)) >> 1; dispatchedValue = edge; @@ -7489,11 +7484,10 @@ } } /* begin quickRemoveInvalidFillsAt: */ - leftX = objBuffer[edge + GEXValue]; if (((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) == 0) { goto l1; } - while ((topRightX()) <= leftX) { + while ((topRightX()) <= (objBuffer[edge + GEXValue])) { hideFilldepth(topFill(), topDepth()); if (((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) == 0) { goto l1; Modified: trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c =================================================================== --- trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2014-02-07 19:21:40 UTC (rev 2866) +++ trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2014-02-13 00:33:46 UTC (rev 2867) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.1 translated as C source on 27 January 2014 3:24:16 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.2 translated as C source on 12 February 2014 7:19:46 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + VMPluginCodeGenerator * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 from - B3DAcceleratorPlugin VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + B3DAcceleratorPlugin * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 */ -static char __buildInfo[] = "B3DAcceleratorPlugin VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 " __DATE__ ; +static char __buildInfo[] = "B3DAcceleratorPlugin * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 " __DATE__ ; @@ -107,9 +107,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B3DAcceleratorPlugin 27 January 2014 (i)" + "B3DAcceleratorPlugin 12 February 2014 (i)" #else - "B3DAcceleratorPlugin 27 January 2014 (e)" + "B3DAcceleratorPlugin 12 February 2014 (e)" #endif ; Modified: trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c =================================================================== --- trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2014-02-07 19:21:40 UTC (rev 2866) +++ trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2014-02-13 00:33:46 UTC (rev 2867) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.1 translated as C source on 27 January 2014 3:24:11 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.2 translated as C source on 12 February 2014 7:19:40 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + VMPluginCodeGenerator * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 from - BMPReadWriterPlugin VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + BMPReadWriterPlugin * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 */ -static char __buildInfo[] = "BMPReadWriterPlugin VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 " __DATE__ ; +static char __buildInfo[] = "BMPReadWriterPlugin * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 " __DATE__ ; @@ -58,9 +58,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BMPReadWriterPlugin 27 January 2014 (i)" + "BMPReadWriterPlugin 12 February 2014 (i)" #else - "BMPReadWriterPlugin 27 January 2014 (e)" + "BMPReadWriterPlugin 12 February 2014 (e)" #endif ; Modified: trunk/src/plugins/BitBltPlugin/BitBltPlugin.c =================================================================== --- trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2014-02-07 19:21:40 UTC (rev 2866) +++ trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2014-02-13 00:33:46 UTC (rev 2867) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.1 translated as C source on 27 January 2014 3:24:13 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.2 translated as C source on 12 February 2014 7:19:42 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 from - BitBltSimulation VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + BitBltSimulation * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 */ -static char __buildInfo[] = "BitBltSimulation VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 " __DATE__ ; +static char __buildInfo[] = "BitBltSimulation * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 " __DATE__ ; @@ -119,7 +119,6 @@ static sqInt copyLoopPixMap(void); static unsigned int * default8To32Table(void); static sqInt destinationWordwith(sqInt sourceWord, sqInt destinationWord); -static sqInt dstLongAt(sqInt idx); static sqInt fetchIntOrFloatofObject(sqInt fieldIndex, sqInt objectPointer); static sqInt fetchIntOrFloatofObjectifNil(sqInt fieldIndex, sqInt objectPointer, sqInt defaultValue); static sqInt fixAlphawith(sqInt sourceWord, sqInt destinationWord); @@ -257,9 +256,9 @@ }; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BitBltPlugin 27 January 2014 (i)" + "BitBltPlugin 12 February 2014 (i)" #else - "BitBltPlugin 27 January 2014 (e)" + "BitBltPlugin 12 February 2014 (e)" #endif ; static sqInt nWords; @@ -1805,21 +1804,6 @@ sqInt i; sqInt thisWord; sqInt notSkewMask; - sqInt idx; - sqInt idx1; - sqInt idx2; - sqInt idx3; - sqInt idx4; - sqInt idx5; - sqInt idx6; - sqInt idx7; - sqInt idx8; - sqInt idx9; - sqInt idx10; - sqInt idx11; - sqInt idx12; - sqInt idx13; - sqInt idx14; mergeFnwith = ((sqInt (*)(sqInt, sqInt)) (opTable[combinationRule + 1])); mergeFnwith; @@ -1867,31 +1851,26 @@ /* load the 64-bit shifter */ - /* begin srcLongAt: */ - idx = sourceIndex; - prevWord = long32At(idx); + prevWord = long32At(sourceIndex); sourceIndex += hInc; } else { prevWord = 0; } destMask = mask1; - /* begin srcLongAt: */ - idx12 = sourceIndex; - thisWord = long32At(idx12); + + /* pick up next word */ + + thisWord = long32At(sourceIndex); sourceIndex += hInc; /* 32-bit rotate */ skewWord = (((unskew < 0) ? ((usqInt) (prevWord & notSkewMask) >> -unskew) : ((usqInt) (prevWord & notSkewMask) << unskew))) | (((skew < 0) ? ((usqInt) (thisWord & skewMask) >> -skew) : ((usqInt) (thisWord & skewMask) << skew))); prevWord = thisWord; - /* begin dstLongAt: */ - idx13 = destIndex; - destWord = long32At(idx13); + destWord = long32At(destIndex); mergeWord = mergeFnwith(skewWord & halftoneWord, destWord); destWord = (destMask & mergeWord) | (destWord & (~destMask)); - /* begin dstLongAt:put: */ - idx14 = destIndex; - long32Atput(idx14, destWord); + long32Atput(destIndex, destWord); /* This central horizontal loop requires no store masking */ @@ -1907,13 +1886,9 @@ /* Woeful patch: revert to older code for hDir = -1 */ for (word = 2; word <= (nWords - 1); word += 1) { - /* begin srcLongAt: */ - idx1 = sourceIndex; - thisWord = long32At(idx1); + thisWord = long32At(sourceIndex); sourceIndex += hInc; - /* begin dstLongAt:put: */ - idx2 = destIndex; - long32Atput(idx2, thisWord); + long32Atput(destIndex, thisWord); destIndex += hInc; } } else { @@ -1921,13 +1896,9 @@ /* Note loop starts with prevWord loaded (due to preload) */ - /* begin dstLongAt:put: */ - idx3 = destIndex; - long32Atput(idx3, prevWord); + long32Atput(destIndex, prevWord); destIndex += hInc; - /* begin srcLongAt: */ - idx4 = sourceIndex; - prevWord = long32At(idx4); + prevWord = long32At(sourceIndex); sourceIndex += hInc; } } @@ -1936,18 +1907,14 @@ /* Special inner loop for STORE mode -- no need to call merge */ for (word = 2; word <= (nWords - 1); word += 1) { - /* begin srcLongAt: */ - idx5 = sourceIndex; - thisWord = long32At(idx5); + thisWord = long32At(sourceIndex); sourceIndex += hInc; /* 32-bit rotate */ skewWord = (((unskew < 0) ? ((usqInt) (prevWord & notSkewMask) >> -unskew) : ((usqInt) (prevWord & notSkewMask) << unskew))) | (((skew < 0) ? ((usqInt) (thisWord & skewMask) >> -skew) : ((usqInt) (thisWord & skewMask) << skew))); prevWord = thisWord; - /* begin dstLongAt:put: */ - idx6 = destIndex; - long32Atput(idx6, skewWord & halftoneWord); + long32Atput(destIndex, skewWord & halftoneWord); destIndex += hInc; } } @@ -1956,40 +1923,36 @@ /* Normal inner loop does merge: */ - /* begin srcLongAt: */ - idx7 = sourceIndex; - thisWord = long32At(idx7); + + /* pick up next word */ + + thisWord = long32At(sourceIndex); sourceIndex += hInc; /* 32-bit rotate */ skewWord = (((unskew < 0) ? ((usqInt) (prevWord & notSkewMask) >> -unskew) : ((usqInt) (prevWord & notSkewMask) << unskew))) | (((skew < 0) ? ((usqInt) (thisWord & skewMask) >> -skew) : ((usqInt) (thisWord & skewMask) << skew))); prevWord = thisWord; - mergeWord = mergeFnwith(skewWord & halftoneWord, dstLongAt(destIndex)); - /* begin dstLongAt:put: */ - idx8 = destIndex; - long32Atput(idx8, mergeWord); + mergeWord = mergeFnwith(skewWord & halftoneWord, long32At(destIndex)); + long32Atput(destIndex, mergeWord); destIndex += hInc; } } if (nWords > 1) { destMask = mask2; - /* begin srcLongAt: */ - idx9 = sourceIndex; - thisWord = long32At(idx9); + + /* pick up next word */ + + thisWord = long32At(sourceIndex); sourceIndex += hInc; /* 32-bit rotate */ skewWord = (((unskew < 0) ? ((usqInt) (prevWord & notSkewMask) >> -unskew) : ((usqInt) (prevWord & notSkewMask) << unskew))) | (((skew < 0) ? ((usqInt) (thisWord & skewMask) >> -skew) : ((usqInt) (thisWord & skewMask) << skew))); - /* begin dstLongAt: */ - idx10 = destIndex; - destWord = long32At(idx10); + destWord = long32At(destIndex); mergeWord = mergeFnwith(skewWord & halftoneWord, destWord); destWord = (destMask & mergeWord) | (destWord & (~destMask)); - /* begin dstLongAt:put: */ - idx11 = destIndex; - long32Atput(idx11, destWord); + long32Atput(destIndex, destWord); destIndex += hInc; } sourceIndex += sourceDelta; @@ -2008,14 +1971,6 @@ sqInt destWord; sqInt word; sqInt i; - sqInt idx; - sqInt idx1; - sqInt idx2; - sqInt idx3; - sqInt idx4; - sqInt idx5; - sqInt idx6; - sqInt idx7; mergeFnwith = ((sqInt (*)(sqInt, sqInt)) (opTable[combinationRule + 1])); mergeFnwith; @@ -2026,19 +1981,13 @@ if (noHalftone) { halftoneWord = AllOnes; } else { - /* begin halftoneAt: */ - idx = (dy + i) - 1; - halftoneWord = long32At(halftoneBase + ((idx % halftoneHeight) * 4)); + halftoneWord = long32At(halftoneBase + ((((dy + i) - 1) % halftoneHeight) * 4)); } destMask = mask1; - /* begin dstLongAt: */ - idx6 = destIndex; - destWord = long32At(idx6); + destWord = long32At(destIndex); mergeWord = mergeFnwith(halftoneWord, destWord); destWord = (destMask & mergeWord) | (destWord & (~destMask)); - /* begin dstLongAt:put: */ - idx7 = destIndex; - long32Atput(idx7, destWord); + long32Atput(destIndex, destWord); /* This central horizontal loop requires no store masking */ @@ -2050,9 +1999,7 @@ destWord = halftoneWord; for (word = 2; word <= (nWords - 1); word += 1) { - /* begin dstLongAt:put: */ - idx1 = destIndex; - long32Atput(idx1, destWord); + long32Atput(destIndex, destWord); destIndex += 4; } } else { @@ -2063,26 +2010,18 @@ /* Normal inner loop does merge */ - /* begin dstLongAt: */ - idx2 = destIndex; - destWord = long32At(idx2); + destWord = long32At(destIndex); mergeWord = mergeFnwith(halftoneWord, destWord); - /* begin dstLongAt:put: */ - idx3 = destIndex; - long32Atput(idx3, mergeWord); + long32Atput(destIndex, mergeWord); destIndex += 4; } } if (nWords > 1) { destMask = mask2; - /* begin dstLongAt: */ - idx4 = destIndex; - destWord = long32At(idx4); + destWord = long32At(destIndex); mergeWord = mergeFnwith(halftoneWord, destWord); destWord = (destMask & mergeWord) | (destWord & (~destMask)); - /* begin dstLongAt:put: */ - idx5 = destIndex; - long32Atput(idx5, destWord); + long32Atput(destIndex, destWord); destIndex += 4; } destIndex += destDelta; @@ -2123,11 +2062,6 @@ sqInt endBits; sqInt nPix; sqInt scrStartBits; - sqInt idx; - sqInt idx1; - sqInt value; - sqInt idx2; - sqInt idx3; sqInt sourcePix; sqInt srcShift1; sqInt sourceWord; @@ -2135,11 +2069,10 @@ sqInt destPix; sqInt nPix1; sqInt destWord1; + sqInt idx; + sqInt idx1; sqInt pv; - sqInt idx4; sqInt val; - sqInt idx11; - sqInt idx21; mergeFnwith = ((sqInt (*)(sqInt, sqInt)) (opTable[combinationRule + 1])); mergeFnwith; @@ -2185,9 +2118,7 @@ if (noHalftone) { halftoneWord = AllOnes; } else { - /* begin halftoneAt: */ - idx = (dy + i) - 1; - halftoneWord = long32At(halftoneBase + ((idx % halftoneHeight) * 4)); + halftoneWord = long32At(halftoneBase + ((((dy + i) - 1) % halftoneHeight) * 4)); } srcBitShift = srcShift; dstBitShift = dstShift; @@ -2202,9 +2133,7 @@ /* pick up the word */ /* begin pickSourcePixels:flags:srcMask:destMask:srcShiftInc:dstShiftInc: */ - /* begin srcLongAt: */ - idx21 = sourceIndex; - sourceWord = long32At(idx21); + sourceWord = long32At(sourceIndex); destWord1 = 0; srcShift1 = srcBitShift; dstShift1 = dstBitShift; @@ -2222,8 +2151,8 @@ srcShift1 -= 32; } /* begin srcLongAt: */ - idx4 = (sourceIndex += 4); - sourceWord = long32At(idx4); + idx = (sourceIndex += 4); + sourceWord = long32At(idx); } } while(!(((nPix1 -= 1)) == 0)); } else { @@ -2256,8 +2185,8 @@ srcShift1 -= 32; } /* begin srcLongAt: */ - idx11 = (sourceIndex += 4); - sourceWord = long32At(idx11); + idx1 = (sourceIndex += 4); + sourceWord = long32At(idx1); } } while(!(((nPix1 -= 1)) == 0)); } @@ -2268,23 +2197,16 @@ /* avoid read-modify-write */ - mergeWord = mergeFnwith(skewWord & halftoneWord, dstLongAt(destIndex)); - /* begin dstLongAt:put: */ - idx1 = destIndex; - value = destMask & mergeWord; - long32Atput(idx1, value); + mergeWord = mergeFnwith(skewWord & halftoneWord, long32At(destIndex)); + long32Atput(destIndex, destMask & mergeWord); } else { /* General version using dest masking */ - /* begin dstLongAt: */ - idx2 = destIndex; - destWord = long32At(idx2); + destWord = long32At(destIndex); mergeWord = mergeFnwith(skewWord & halftoneWord, destWord & destMask); destWord = (destMask & mergeWord) | (destWord & (~destMask)); - /* begin dstLongAt:put: */ - idx3 = destIndex; - long32Atput(idx3, destWord); + long32Atput(destIndex, destWord); } destIndex += 4; if (words == 2) { @@ -2366,11 +2288,7 @@ return destinationWord; } -static sqInt dstLongAt(sqInt idx) { - return long32At(idx); -} - /* Return the integer value of the given field of the given object. If the field contains a Float, truncate it and return its integral part. Fail if the given field does not contain a small integer or Float, or if the truncated Float is out of the range of small integers. */ static sqInt fetchIntOrFloatofObject(sqInt fieldIndex, sqInt objectPointer) { @@ -2567,8 +2485,6 @@ static sqInt loadBitBltFromwarping(sqInt bbObj, sqInt aBool) { sqInt ok; - sqInt formPointer; - sqInt formPointer1; sqInt destBitsSize; sqInt sourceBitsSize; sqInt oop; @@ -2590,8 +2506,7 @@ } sourceForm = interpreterProxy->fetchPointerofObject(BBSourceFormIndex, bitBltOop); /* begin ignoreSourceOrHalftone: */ - formPointer = sourceForm; - if (formPointer == (interpreterProxy->nilObject())) { + if (sourceForm == (interpreterProxy->nilObject())) { noSource = 1; goto l1; } @@ -2615,8 +2530,7 @@ l1: /* end ignoreSourceOrHalftone: */; halftoneForm = interpreterProxy->fetchPointerofObject(BBHalftoneFormIndex, bitBltOop); /* begin ignoreSourceOrHalftone: */ - formPointer1 = halftoneForm; - if (formPointer1 == (interpreterProxy->nilObject())) { + if (halftoneForm == (interpreterProxy->nilObject())) { noHalftone = 1; goto l2; } @@ -4289,8 +4203,6 @@ static sqInt rgbComponentAlphawith(sqInt sourceWord, sqInt destinationWord) { sqInt alpha; - sqInt nBits; - sqInt nParts; sqInt p2; sqInt result; sqInt p1; @@ -4307,33 +4219,31 @@ return destinationWord; } /* begin partitionedRgbComponentAlpha:dest:nBits:nPartitions: */ - nBits = destDepth; - nParts = destPPW; - mask = maskTable[nBits]; + mask = maskTable[destDepth]; result = 0; - for (i = 1; i <= nParts; i += 1) { - p1 = ((usqInt) (sourceWord & mask)) >> ((i - 1) * nBits); - p2 = ((usqInt) (destinationWord & mask)) >> ((i - 1) * nBits); - if (!(nBits == 32)) { - if (nBits == 16) { + for (i = 1; i <= destPPW; i += 1) { + p1 = ((usqInt) (sourceWord & mask)) >> ((i - 1) * destDepth); + p2 = ((usqInt) (destinationWord & mask)) >> ((i - 1) * destDepth); + if (!(destDepth == 32)) { + if (destDepth == 16) { p1 = ((((p1 & 31) << 3) | ((p1 & 992) << 6)) | ((p1 & 31744) << 9)) | 4278190080U; p2 = ((((p2 & 31) << 3) | ((p2 & 992) << 6)) | ((p2 & 31744) << 9)) | 4278190080U; } else { - p1 = (rgbMapfromto(p1, nBits, 32)) | 4278190080U; - p2 = (rgbMapfromto(p2, nBits, 32)) | 4278190080U; + p1 = (rgbMapfromto(p1, destDepth, 32)) | 4278190080U; + p2 = (rgbMapfromto(p2, destDepth, 32)) | 4278190080U; } } v = rgbComponentAlpha32with(p1, p2); - if (!(nBits == 32)) { + if (!(destDepth == 32)) { /* begin rgbMap:from:to: */ - if (((d = nBits - 32)) > 0) { + if (((d = destDepth - 32)) > 0) { mask3 = (1 << 32) - 1; srcPix = v << d; mask3 = mask3 << d; destPix = srcPix & mask3; - mask3 = mask3 << nBits; + mask3 = mask3 << destDepth; srcPix = srcPix << d; - v = (destPix + (srcPix & mask3)) + ((srcPix << d) & (mask3 << nBits)); + v = (destPix + (srcPix & mask3)) + ((srcPix << d) & (mask3 << destDepth)); goto l1; } else { if (d == 0) { @@ -4352,13 +4262,13 @@ v = v; goto l1; } - d = 32 - nBits; - mask3 = (1 << nBits) - 1; + d = 32 - destDepth; + mask3 = (1 << destDepth) - 1; srcPix = ((usqInt) v) >> d; destPix = srcPix & mask3; - mask3 = mask3 << nBits; + mask3 = mask3 << destDepth; srcPix = ((usqInt) srcPix) >> d; - destPix = (destPix + (srcPix & mask3)) + ((((usqInt) srcPix) >> d) & (mask3 << nBits)); + destPix = (destPix + (srcPix & mask3)) + ((((usqInt) srcPix) >> d) & (mask3 << destDepth)); if (destPix == 0) { v = 1; goto l1; @@ -4368,8 +4278,8 @@ } l1: /* end rgbMap:from:to: */; } - result = result | (v << ((i - 1) * nBits)); - mask = mask << nBits; + result = result | (v << ((i - 1) * destDepth)); + mask = mask << destDepth; } return result; } @@ -4904,11 +4814,6 @@ sqInt nPix; sqInt deltaP12x; sqInt smoothingCount; - sqInt idx; - sqInt idx1; - sqInt value; - sqInt idx2; - sqInt idx3; sqInt i1; sqInt words1; sqInt sourcePix; @@ -4917,16 +4822,12 @@ sqInt dstMask; sqInt destWord1; sqInt pv; - sqInt xx; - sqInt yy; sqInt sourcePix1; sqInt sourceWord; sqInt srcIndex; sqInt x; sqInt y; sqInt val; - sqInt xx1; - sqInt yy1; sqInt sourcePix2; sqInt sourceWord1; sqInt srcIndex1; @@ -5147,9 +5048,7 @@ if (noHalftone) { halftoneWord = AllOnes; } else { - /* begin halftoneAt: */ - idx = (dy + i) - 1; - halftoneWord = long32At(halftoneBase + ((idx % halftoneHeight) * 4)); + halftoneWord = long32At(halftoneBase + ((((dy + i) - 1) % halftoneHeight) * 4)); } destMask = mask1; @@ -5172,9 +5071,7 @@ if (mapperFlags == (ColorMapPresent | ColorMapIndexedPart)) { do { /* begin pickWarpPixelAtX:y: */ - xx = sx; - yy = sy; - if ((xx < 0) || ((yy < 0) || ((((x = ((usqInt) xx) >> BinaryPoint)) >= sourceWidth) || (((y = ((usqInt) yy) >> BinaryPoint)) >= sourceHeight)))) { + if ((sx < 0) || ((sy < 0) || ((((x = ((usqInt) sx) >> BinaryPoint)) >= sourceWidth) || (((y = ((usqInt) sy) >> BinaryPoint)) >= sourceHeight)))) { sourcePix = 0; goto l7; } @@ -5193,9 +5090,7 @@ } else { do { /* begin pickWarpPixelAtX:y: */ - xx1 = sx; - yy1 = sy; - if ((xx1 < 0) || ((yy1 < 0) || ((((x1 = ((usqInt) xx1) >> BinaryPoint)) >= sourceWidth) || (((y1 = ((usqInt) yy1) >> BinaryPoint)) >= sourceHeight)))) { + if ((sx < 0) || ((sy < 0) || ((((x1 = ((usqInt) sx) >> BinaryPoint)) >= sourceWidth) || (((y1 = ((usqInt) sy) >> BinaryPoint)) >= sourceHeight)))) { sourcePix = 0; goto l8; } @@ -5241,23 +5136,16 @@ /* avoid read-modify-write */ - mergeWord = mergeFnwith(skewWord & halftoneWord, dstLongAt(destIndex)); - /* begin dstLongAt:put: */ - idx1 = destIndex; - value = destMask & mergeWord; - long32Atput(idx1, value); + mergeWord = mergeFnwith(skewWord & halftoneWord, long32At(destIndex)); + long32Atput(destIndex, destMask & mergeWord); } else { /* General version using dest masking */ - /* begin dstLongAt: */ - idx2 = destIndex; - destWord = long32At(idx2); + destWord = long32At(destIndex); mergeWord = mergeFnwith(skewWord & halftoneWord, destWord & destMask); destWord = (destMask & mergeWord) | (destWord & (~destMask)); - /* begin dstLongAt:put: */ - idx3 = destIndex; - long32Atput(idx3, destWord); + long32Atput(destIndex, destWord); } destIndex += 4; if (words == 2) { Modified: trunk/src/plugins/CameraPlugin/CameraPlugin.c =================================================================== --- trunk/src/plugins/CameraPlugin/CameraPlugin.c 2014-02-07 19:21:40 UTC (rev 2866) +++ trunk/src/plugins/CameraPlugin/CameraPlugin.c 2014-02-13 00:33:46 UTC (rev 2867) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.1 translated as C source on 27 January 2014 3:24:16 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.2 translated as C source on 12 February 2014 7:19:46 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + VMPluginCodeGenerator * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 from - CameraPlugin VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + CameraPlugin * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 */ -static char __buildInfo[] = "CameraPlugin VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 " __DATE__ ; +static char __buildInfo[] = "CameraPlugin * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 " __DATE__ ; @@ -64,9 +64,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "CameraPlugin 27 January 2014 (i)" + "CameraPlugin 12 February 2014 (i)" #else - "CameraPlugin 27 January 2014 (e)" + "CameraPlugin 12 February 2014 (e)" #endif ; Modified: trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c =================================================================== --- trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2014-02-07 19:21:40 UTC (rev 2866) +++ trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2014-02-13 00:33:46 UTC (rev 2867) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.1 translated as C source on 27 January 2014 3:24:16 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.2 translated as C source on 12 February 2014 7:19:46 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 from - ClipboardExtendedPlugin VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + ClipboardExtendedPlugin * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 */ -static char __buildInfo[] = "ClipboardExtendedPlugin VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 " __DATE__ ; +static char __buildInfo[] = "ClipboardExtendedPlugin * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 " __DATE__ ; @@ -61,9 +61,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ClipboardExtendedPlugin 27 January 2014 (i)" + "ClipboardExtendedPlugin 12 February 2014 (i)" #else - "ClipboardExtendedPlugin 27 January 2014 (e)" + "ClipboardExtendedPlugin 12 February 2014 (e)" #endif ; Modified: trunk/src/plugins/CroquetPlugin/CroquetPlugin.c =================================================================== --- trunk/src/plugins/CroquetPlugin/CroquetPlugin.c 2014-02-07 19:21:40 UTC (rev 2866) +++ trunk/src/plugins/CroquetPlugin/CroquetPlugin.c 2014-02-13 00:33:46 UTC (rev 2867) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.1 translated as C source on 27 January 2014 3:24:13 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.2 translated as C source on 12 February 2014 7:19:43 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + VMPluginCodeGenerator * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 from - CroquetPlugin VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + CroquetPlugin * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 */ -static char __buildInfo[] = "CroquetPlugin VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 " __DATE__ ; +static char __buildInfo[] = "CroquetPlugin * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 " __DATE__ ; @@ -73,9 +73,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "CroquetPlugin 27 January 2014 (i)" + "CroquetPlugin 12 February 2014 (i)" #else - "CroquetPlugin 27 January 2014 (e)" + "CroquetPlugin 12 February 2014 (e)" #endif ; Modified: trunk/src/plugins/DBusPlugin/DBusPlugin.c =================================================================== --- trunk/src/plugins/DBusPlugin/DBusPlugin.c 2014-02-07 19:21:40 UTC (rev 2866) +++ trunk/src/plugins/DBusPlugin/DBusPlugin.c 2014-02-13 00:33:46 UTC (rev 2867) @@ -1,6 +1,6 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.1 translated as C source on 27 January 2014 3:24:17 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.2 translated as C source on 12 February 2014 7:19:46 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 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 27 January 2014 (i)" + "DBusPlugin 12 February 2014 (i)" #else - "DBusPlugin 27 January 2014 (e)" + "DBusPlugin 12 February 2014 (e)" #endif ; static DBusMessage* writeMessage; Modified: trunk/src/plugins/DSAPrims/DSAPrims.c =================================================================== --- trunk/src/plugins/DSAPrims/DSAPrims.c 2014-02-07 19:21:40 UTC (rev 2866) +++ trunk/src/plugins/DSAPrims/DSAPrims.c 2014-02-13 00:33:46 UTC (rev 2867) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.1 translated as C source on 27 January 2014 3:24:13 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.2 translated as C source on 12 February 2014 7:19:43 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + VMPluginCodeGenerator * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 from - DSAPlugin VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + DSAPlugin * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 */ -static char __buildInfo[] = "DSAPlugin VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 " __DATE__ ; +static char __buildInfo[] = "DSAPlugin * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 " __DATE__ ; @@ -67,9 +67,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DSAPrims 27 January 2014 (i)" + "DSAPrims 12 February 2014 (i)" #else - "DSAPrims 27 January 2014 (e)" + "DSAPrims 12 February 2014 (e)" #endif ; static sqInt remainderDigitCount; Modified: trunk/src/plugins/DropPlugin/DropPlugin.c =================================================================== --- trunk/src/plugins/DropPlugin/DropPlugin.c 2014-02-07 19:21:40 UTC (rev 2866) +++ trunk/src/plugins/DropPlugin/DropPlugin.c 2014-02-13 00:33:46 UTC (rev 2867) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.1 translated as C source on 27 January 2014 3:24:13 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.2 translated as C source on 12 February 2014 7:19:43 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + VMPluginCodeGenerator * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 from - DropPlugin VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + DropPlugin * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 */ -static char __buildInfo[] = "DropPlugin VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 " __DATE__ ; +static char __buildInfo[] = "DropPlugin * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 " __DATE__ ; @@ -62,9 +62,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DropPlugin 27 January 2014 (i)" + "DropPlugin 12 February 2014 (i)" #else - "DropPlugin 27 January 2014 (e)" + "DropPlugin 12 February 2014 (e)" #endif ; Modified: trunk/src/plugins/FFTPlugin/FFTPlugin.c =================================================================== --- trunk/src/plugins/FFTPlugin/FFTPlugin.c 2014-02-07 19:21:40 UTC (rev 2866) +++ trunk/src/plugins/FFTPlugin/FFTPlugin.c 2014-02-13 00:33:46 UTC (rev 2867) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.1 translated as C source on 27 January 2014 3:24:13 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.2 translated as C source on 12 February 2014 7:19:43 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + VMPluginCodeGenerator * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 from - FFTPlugin VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + FFTPlugin * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 */ -static char __buildInfo[] = "FFTPlugin VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 " __DATE__ ; +static char __buildInfo[] = "FFTPlugin * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 " __DATE__ ; @@ -68,9 +68,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FFTPlugin 27 January 2014 (i)" + "FFTPlugin 12 February 2014 (i)" #else - "FFTPlugin 27 January 2014 (e)" + "FFTPlugin 12 February 2014 (e)" #endif ; static sqInt nu; Modified: trunk/src/plugins/FT2Plugin/FT2Plugin.c =================================================================== --- trunk/src/plugins/FT2Plugin/FT2Plugin.c 2014-02-07 19:21:40 UTC (rev 2866) +++ trunk/src/plugins/FT2Plugin/FT2Plugin.c 2014-02-13 00:33:46 UTC (rev 2867) @@ -1,4 +1,4 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.1 translated as C source on 27 January 2014 3:24:17 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.2 translated as C source on 12 February 2014 7:19:47 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 27 January 2014 (i)" + "FT2Plugin 12 February 2014 (i)" #else - "FT2Plugin 27 January 2014 (e)" + "FT2Plugin 12 February 2014 (e)" #endif ; Modified: trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c =================================================================== --- trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c 2014-02-07 19:21:40 UTC (rev 2866) +++ trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c 2014-02-13 00:33:46 UTC (rev 2867) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.1 translated as C source on 27 January 2014 3:24:17 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.2 translated as C source on 12 February 2014 7:19:47 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 from - FileCopyPlugin VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + FileCopyPlugin * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 */ -static char __buildInfo[] = "FileCopyPlugin VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 " __DATE__ ; +static char __buildInfo[] = "FileCopyPlugin * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 " __DATE__ ; @@ -57,9 +57,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FileCopyPlugin 27 January 2014 (i)" + "FileCopyPlugin 12 February 2014 (i)" #else - "FileCopyPlugin 27 January 2014 (e)" + "FileCopyPlugin 12 February 2014 (e)" #endif ; Modified: trunk/src/plugins/FilePlugin/FilePlugin.c =================================================================== --- trunk/src/plugins/FilePlugin/FilePlugin.c 2014-02-07 19:21:40 UTC (rev 2866) +++ trunk/src/plugins/FilePlugin/FilePlugin.c 2014-02-13 00:33:46 UTC (rev 2867) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.1 translated as C source on 27 January 2014 3:24:13 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.2 translated as C source on 12 February 2014 7:19:43 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + VMPluginCodeGenerator * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 from - FilePlugin VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + FilePlugin * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 */ -static char __buildInfo[] = "FilePlugin VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 " __DATE__ ; +static char __buildInfo[] = "FilePlugin * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 " __DATE__ ; @@ -100,9 +100,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FilePlugin 27 January 2014 (i)" + "FilePlugin 12 February 2014 (i)" #else - "FilePlugin 27 January 2014 (e)" + "FilePlugin 12 February 2014 (e)" #endif ; static void * sCCPfn; Modified: trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c =================================================================== --- trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2014-02-07 19:21:40 UTC (rev 2866) +++ trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2014-02-13 00:33:46 UTC (rev 2867) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.1 translated as C source on 27 January 2014 3:24:13 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.2 translated as C source on 12 February 2014 7:19:43 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + VMPluginCodeGenerator * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 from - FloatArrayPlugin VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + FloatArrayPlugin * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 */ -static char __buildInfo[] = "FloatArrayPlugin VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 " __DATE__ ; +static char __buildInfo[] = "FloatArrayPlugin * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 " __DATE__ ; @@ -72,9 +72,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FloatArrayPlugin 27 January 2014 (i)" + "FloatArrayPlugin 12 February 2014 (i)" #else - "FloatArrayPlugin 27 January 2014 (e)" + "FloatArrayPlugin 12 February 2014 (e)" #endif ; Modified: trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c =================================================================== --- trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c 2014-02-07 19:21:40 UTC (rev 2866) +++ trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c 2014-02-13 00:33:46 UTC (rev 2867) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.1 translated as C source on 27 January 2014 3:24:14 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.2 translated as C source on 12 February 2014 7:19:43 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + VMPluginCodeGenerator * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 from - FloatMathPlugin VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + FloatMathPlugin * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 */ -static char __buildInfo[] = "FloatMathPlugin VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 " __DATE__ ; +static char __buildInfo[] = "FloatMathPlugin * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 " __DATE__ ; @@ -79,9 +79,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FloatMathPlugin 27 January 2014 (i)" + "FloatMathPlugin 12 February 2014 (i)" #else - "FloatMathPlugin 27 January 2014 (e)" + "FloatMathPlugin 12 February 2014 (e)" #endif ; Modified: trunk/src/plugins/GeniePlugin/GeniePlugin.c =================================================================== --- trunk/src/plugins/GeniePlugin/GeniePlugin.c 2014-02-07 19:21:40 UTC (rev 2866) +++ trunk/src/plugins/GeniePlugin/GeniePlugin.c 2014-02-13 00:33:46 UTC (rev 2867) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.1 translated as C source on 27 January 2014 3:24:14 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.2 translated as C source on 12 February 2014 7:19:43 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 from - GeniePlugin VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + GeniePlugin * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 */ -static char __buildInfo[] = "GeniePlugin VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 " __DATE__ ; +static char __buildInfo[] = "GeniePlugin * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 " __DATE__ ; @@ -61,9 +61,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "GeniePlugin v2.0 27 January 2014 (i)" + "GeniePlugin v2.0 12 February 2014 (i)" #else - "GeniePlugin v2.0 27 January 2014 (e)" + "GeniePlugin v2.0 12 February 2014 (e)" #endif ; Modified: trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c =================================================================== --- trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c 2014-02-07 19:21:40 UTC (rev 2866) +++ trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c 2014-02-13 00:33:46 UTC (rev 2867) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.1 translated as C source on 27 January 2014 3:24:18 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.2 translated as C source on 12 February 2014 7:19:48 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 from - HostWindowPlugin VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + HostWindowPlugin * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 */ -static char __buildInfo[] = "HostWindowPlugin VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 " __DATE__ ; +static char __buildInfo[] = "HostWindowPlugin * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 " __DATE__ ; @@ -66,9 +66,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "HostWindowPlugin 27 January 2014 (i)" + "HostWindowPlugin 12 February 2014 (i)" #else - "HostWindowPlugin 27 January 2014 (e)" + "HostWindowPlugin 12 February 2014 (e)" #endif ; Modified: trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c =================================================================== --- trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2014-02-07 19:21:40 UTC (rev 2866) +++ trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2014-02-13 00:33:46 UTC (rev 2867) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.1 translated as C source on 27 January 2014 3:24:14 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.2 translated as C source on 12 February 2014 7:19:43 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 from - JPEGReadWriter2Plugin VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 + JPEGReadWriter2Plugin * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 */ -static char __buildInfo[] = "JPEGReadWriter2Plugin VMMaker-dtl.339 uuid: e3da01c0-18c5-4297-9fc2-3fc56d5db9d6 " __DATE__ ; +static char __buildInfo[] = "JPEGReadWriter2Plugin * VMMaker-dtl.340 uuid: 640fa600-e4e0-4cdd-ae74-c6cf1b51b763 " __DATE__ ; @@ -68,9 +68,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JPEGReadWriter2Plugin 27 January 2014 (i)" + "JPEGReadWriter2Plugin 12 February 2014 (i)" #else - "JPEGReadWriter2Plugin 27 January 2014 (e)" + "JPEGReadWriter2Plugin 12 February 2014 (e)" #endif ; Modified: trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c =================================================================== --- trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2014-02-07 19:21:40 UTC (rev 2866) +++ trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2014-02-13 00:33:46 UTC (rev 2867) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.1 translated as C source on 27 January 2014 3:24:14 pm */ @@ Diff output truncated at 50000 characters. @@ |
«
Return to Squeak VM
|
1 view|%1 views
| Free forum by Nabble | Edit this page |