[commit][3751] VMMaker 4.15.9
Locked
 
|
Revision: 3751 Author: lewis Date: 2016-11-08 14:36:58 -0800 (Tue, 08 Nov 2016) Log Message: ----------- VMMaker 4.15.9 Various refactorings for stack/context interpreters. VMMaker tool allow selection of context or stack interpreter (stack is not yet functional, requires struct code generation). Add some FilePlugin updates from oscog, excluding those with platforms code dependencies (primitiveDirectoryEntry, primitiveDirectoryDelimitor). Retire some old primitives in Interpreter class>>initializePrimitiveTable to align with oscog. 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/DESPlugin/DESPlugin.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/ImmX11Plugin/ImmX11Plugin.c trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c trunk/src/plugins/KedamaPlugin2/KedamaPlugin2.c trunk/src/plugins/Klatt/Klatt.c trunk/src/plugins/LargeIntegers/LargeIntegers.c trunk/src/plugins/LocalePlugin/LocalePlugin.c trunk/src/plugins/MD5Plugin/MD5Plugin.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/SHA256Plugin/SHA256Plugin.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 2016-10-02 22:29:17 UTC (rev 3750) +++ trunk/src/ckformat.c 2016-11-08 22:36:58 UTC (rev 3751) @@ -5,7 +5,7 @@ /* Usage: ckformat imageFileName */ /* --- DO NOT EDIT THIS FILE --- */ -/* --- Automatically generated from class ImageFormat 2016-07-09T12:04:31.596+01:00--- */ +/* --- Automatically generated from class ImageFormat 2016-11-08T17:28:37.639+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 2016-10-02 22:29:17 UTC (rev 3750) +++ trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2016-11-08 22:36:58 UTC (rev 3751) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.7 translated as C source on 9 July 2016 12:04:19 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.9 translated as C source on 8 November 2016 5:28:24 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + VMPluginCodeGenerator VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc from - ADPCMCodecPlugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + ADPCMCodecPlugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc */ -static char __buildInfo[] = "ADPCMCodecPlugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b " __DATE__ ; +static char __buildInfo[] = "ADPCMCodecPlugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc " __DATE__ ; @@ -70,9 +70,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ADPCMCodecPlugin 9 July 2016 (i)" + "ADPCMCodecPlugin 8 November 2016 (i)" #else - "ADPCMCodecPlugin 9 July 2016 (e)" + "ADPCMCodecPlugin 8 November 2016 (e)" #endif ; Modified: trunk/src/plugins/AioPlugin/AioPlugin.c =================================================================== --- trunk/src/plugins/AioPlugin/AioPlugin.c 2016-10-02 22:29:17 UTC (rev 3750) +++ trunk/src/plugins/AioPlugin/AioPlugin.c 2016-11-08 22:36:58 UTC (rev 3751) @@ -1,6 +1,6 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.7 translated as C source on 9 July 2016 12:04:31 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.9 translated as C source on 8 November 2016 5:28:37 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + VMPluginCodeGenerator VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc from UnixAioPlugin * uuid: nil */ @@ -86,9 +86,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AioPlugin 9 July 2016 (i)" + "AioPlugin 8 November 2016 (i)" #else - "AioPlugin 9 July 2016 (e)" + "AioPlugin 8 November 2016 (e)" #endif ; Modified: trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c =================================================================== --- trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2016-10-02 22:29:17 UTC (rev 3750) +++ trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2016-11-08 22:36:58 UTC (rev 3751) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.7 translated as C source on 9 July 2016 12:04:19 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.9 translated as C source on 8 November 2016 5:28:24 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + SmartSyntaxPluginCodeGenerator VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc from - AsynchFilePlugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + AsynchFilePlugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc */ -static char __buildInfo[] = "AsynchFilePlugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b " __DATE__ ; +static char __buildInfo[] = "AsynchFilePlugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc " __DATE__ ; @@ -67,9 +67,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AsynchFilePlugin 9 July 2016 (i)" + "AsynchFilePlugin 8 November 2016 (i)" #else - "AsynchFilePlugin 9 July 2016 (e)" + "AsynchFilePlugin 8 November 2016 (e)" #endif ; static void * sCOAFfn; Modified: trunk/src/plugins/B2DPlugin/B2DPlugin.c =================================================================== --- trunk/src/plugins/B2DPlugin/B2DPlugin.c 2016-10-02 22:29:17 UTC (rev 3750) +++ trunk/src/plugins/B2DPlugin/B2DPlugin.c 2016-11-08 22:36:58 UTC (rev 3751) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.7 translated as C source on 9 July 2016 12:04:21 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.9 translated as C source on 8 November 2016 5:28:26 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + VMPluginCodeGenerator VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc from - BalloonEnginePlugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + BalloonEnginePlugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc */ -static char __buildInfo[] = "BalloonEnginePlugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b " __DATE__ ; +static char __buildInfo[] = "BalloonEnginePlugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc " __DATE__ ; @@ -447,9 +447,9 @@ static void * loadBBFn; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B2DPlugin 9 July 2016 (i)" + "B2DPlugin 8 November 2016 (i)" #else - "B2DPlugin 9 July 2016 (e)" + "B2DPlugin 8 November 2016 (e)" #endif ; static int* objBuffer; Modified: trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c =================================================================== --- trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2016-10-02 22:29:17 UTC (rev 3750) +++ trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2016-11-08 22:36:58 UTC (rev 3751) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.7 translated as C source on 9 July 2016 12:04:26 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.9 translated as C source on 8 November 2016 5:28:31 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + VMPluginCodeGenerator VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc from - B3DAcceleratorPlugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + B3DAcceleratorPlugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc */ -static char __buildInfo[] = "B3DAcceleratorPlugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b " __DATE__ ; +static char __buildInfo[] = "B3DAcceleratorPlugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc " __DATE__ ; @@ -107,9 +107,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B3DAcceleratorPlugin 9 July 2016 (i)" + "B3DAcceleratorPlugin 8 November 2016 (i)" #else - "B3DAcceleratorPlugin 9 July 2016 (e)" + "B3DAcceleratorPlugin 8 November 2016 (e)" #endif ; Modified: trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c =================================================================== --- trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2016-10-02 22:29:17 UTC (rev 3750) +++ trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2016-11-08 22:36:58 UTC (rev 3751) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.7 translated as C source on 9 July 2016 12:04:19 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.9 translated as C source on 8 November 2016 5:28:24 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + VMPluginCodeGenerator VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc from - BMPReadWriterPlugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + BMPReadWriterPlugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc */ -static char __buildInfo[] = "BMPReadWriterPlugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b " __DATE__ ; +static char __buildInfo[] = "BMPReadWriterPlugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc " __DATE__ ; @@ -58,9 +58,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BMPReadWriterPlugin 9 July 2016 (i)" + "BMPReadWriterPlugin 8 November 2016 (i)" #else - "BMPReadWriterPlugin 9 July 2016 (e)" + "BMPReadWriterPlugin 8 November 2016 (e)" #endif ; Modified: trunk/src/plugins/BitBltPlugin/BitBltPlugin.c =================================================================== --- trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2016-10-02 22:29:17 UTC (rev 3750) +++ trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2016-11-08 22:36:58 UTC (rev 3751) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.7 translated as C source on 9 July 2016 12:04:22 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.9 translated as C source on 8 November 2016 5:28:27 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + SmartSyntaxPluginCodeGenerator VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc from - BitBltSimulation VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + BitBltSimulation VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc */ -static char __buildInfo[] = "BitBltSimulation VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b " __DATE__ ; +static char __buildInfo[] = "BitBltSimulation VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc " __DATE__ ; @@ -256,9 +256,9 @@ }; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BitBltPlugin 9 July 2016 (i)" + "BitBltPlugin 8 November 2016 (i)" #else - "BitBltPlugin 9 July 2016 (e)" + "BitBltPlugin 8 November 2016 (e)" #endif ; static sqInt nWords; Modified: trunk/src/plugins/CameraPlugin/CameraPlugin.c =================================================================== --- trunk/src/plugins/CameraPlugin/CameraPlugin.c 2016-10-02 22:29:17 UTC (rev 3750) +++ trunk/src/plugins/CameraPlugin/CameraPlugin.c 2016-11-08 22:36:58 UTC (rev 3751) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.7 translated as C source on 9 July 2016 12:04:26 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.9 translated as C source on 8 November 2016 5:28:32 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + VMPluginCodeGenerator VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc from - CameraPlugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + CameraPlugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc */ -static char __buildInfo[] = "CameraPlugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b " __DATE__ ; +static char __buildInfo[] = "CameraPlugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc " __DATE__ ; @@ -64,9 +64,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "CameraPlugin 9 July 2016 (i)" + "CameraPlugin 8 November 2016 (i)" #else - "CameraPlugin 9 July 2016 (e)" + "CameraPlugin 8 November 2016 (e)" #endif ; Modified: trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c =================================================================== --- trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2016-10-02 22:29:17 UTC (rev 3750) +++ trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2016-11-08 22:36:58 UTC (rev 3751) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.7 translated as C source on 9 July 2016 12:04:26 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.9 translated as C source on 8 November 2016 5:28:32 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + SmartSyntaxPluginCodeGenerator VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc from - ClipboardExtendedPlugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + ClipboardExtendedPlugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc */ -static char __buildInfo[] = "ClipboardExtendedPlugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b " __DATE__ ; +static char __buildInfo[] = "ClipboardExtendedPlugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc " __DATE__ ; @@ -61,9 +61,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ClipboardExtendedPlugin 9 July 2016 (i)" + "ClipboardExtendedPlugin 8 November 2016 (i)" #else - "ClipboardExtendedPlugin 9 July 2016 (e)" + "ClipboardExtendedPlugin 8 November 2016 (e)" #endif ; static sqInt simulator; Modified: trunk/src/plugins/CroquetPlugin/CroquetPlugin.c =================================================================== --- trunk/src/plugins/CroquetPlugin/CroquetPlugin.c 2016-10-02 22:29:17 UTC (rev 3750) +++ trunk/src/plugins/CroquetPlugin/CroquetPlugin.c 2016-11-08 22:36:58 UTC (rev 3751) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.7 translated as C source on 9 July 2016 12:04:22 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.9 translated as C source on 8 November 2016 5:28:27 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + VMPluginCodeGenerator VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc from - CroquetPlugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + CroquetPlugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc */ -static char __buildInfo[] = "CroquetPlugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b " __DATE__ ; +static char __buildInfo[] = "CroquetPlugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc " __DATE__ ; @@ -73,9 +73,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "CroquetPlugin 9 July 2016 (i)" + "CroquetPlugin 8 November 2016 (i)" #else - "CroquetPlugin 9 July 2016 (e)" + "CroquetPlugin 8 November 2016 (e)" #endif ; Modified: trunk/src/plugins/DBusPlugin/DBusPlugin.c =================================================================== --- trunk/src/plugins/DBusPlugin/DBusPlugin.c 2016-10-02 22:29:17 UTC (rev 3750) +++ trunk/src/plugins/DBusPlugin/DBusPlugin.c 2016-11-08 22:36:58 UTC (rev 3751) @@ -1,6 +1,6 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.7 translated as C source on 9 July 2016 12:04:27 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.9 translated as C source on 8 November 2016 5:28:32 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + SmartSyntaxPluginCodeGenerator VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc 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 9 July 2016 (i)" + "DBusPlugin 8 November 2016 (i)" #else - "DBusPlugin 9 July 2016 (e)" + "DBusPlugin 8 November 2016 (e)" #endif ; static sqInt simulator; Modified: trunk/src/plugins/DESPlugin/DESPlugin.c =================================================================== --- trunk/src/plugins/DESPlugin/DESPlugin.c 2016-10-02 22:29:17 UTC (rev 3750) +++ trunk/src/plugins/DESPlugin/DESPlugin.c 2016-11-08 22:36:58 UTC (rev 3751) @@ -1,6 +1,6 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.7 translated as C source on 9 July 2016 12:04:22 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.9 translated as C source on 8 November 2016 5:28:27 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + VMPluginCodeGenerator VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc from DESPlugin * CryptographyPlugins-rww.10 uuid: 8beefa4e-8411-4385-93ed-1c5d66481465 */ @@ -69,9 +69,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DESPlugin 9 July 2016 (i)" + "DESPlugin 8 November 2016 (i)" #else - "DESPlugin 9 July 2016 (e)" + "DESPlugin 8 November 2016 (e)" #endif ; static unsigned char pc1[56] = { Modified: trunk/src/plugins/DSAPrims/DSAPrims.c =================================================================== --- trunk/src/plugins/DSAPrims/DSAPrims.c 2016-10-02 22:29:17 UTC (rev 3750) +++ trunk/src/plugins/DSAPrims/DSAPrims.c 2016-11-08 22:36:58 UTC (rev 3751) @@ -1,6 +1,6 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.7 translated as C source on 9 July 2016 12:04:22 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.9 translated as C source on 8 November 2016 5:28:27 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + VMPluginCodeGenerator VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc from DSAPlugin * CryptographyPlugins-rww.10 uuid: 8beefa4e-8411-4385-93ed-1c5d66481465 */ @@ -67,9 +67,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DSAPrims 9 July 2016 (i)" + "DSAPrims 8 November 2016 (i)" #else - "DSAPrims 9 July 2016 (e)" + "DSAPrims 8 November 2016 (e)" #endif ; static sqInt remainderDigitCount; Modified: trunk/src/plugins/DropPlugin/DropPlugin.c =================================================================== --- trunk/src/plugins/DropPlugin/DropPlugin.c 2016-10-02 22:29:17 UTC (rev 3750) +++ trunk/src/plugins/DropPlugin/DropPlugin.c 2016-11-08 22:36:58 UTC (rev 3751) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.7 translated as C source on 9 July 2016 12:04:22 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.9 translated as C source on 8 November 2016 5:28:28 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + VMPluginCodeGenerator VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc from - DropPlugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + DropPlugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc */ -static char __buildInfo[] = "DropPlugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b " __DATE__ ; +static char __buildInfo[] = "DropPlugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc " __DATE__ ; @@ -62,9 +62,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DropPlugin 9 July 2016 (i)" + "DropPlugin 8 November 2016 (i)" #else - "DropPlugin 9 July 2016 (e)" + "DropPlugin 8 November 2016 (e)" #endif ; Modified: trunk/src/plugins/FFTPlugin/FFTPlugin.c =================================================================== --- trunk/src/plugins/FFTPlugin/FFTPlugin.c 2016-10-02 22:29:17 UTC (rev 3750) +++ trunk/src/plugins/FFTPlugin/FFTPlugin.c 2016-11-08 22:36:58 UTC (rev 3751) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.7 translated as C source on 9 July 2016 12:04:22 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.9 translated as C source on 8 November 2016 5:28:28 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + VMPluginCodeGenerator VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc from - FFTPlugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + FFTPlugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc */ -static char __buildInfo[] = "FFTPlugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b " __DATE__ ; +static char __buildInfo[] = "FFTPlugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc " __DATE__ ; @@ -68,9 +68,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FFTPlugin 9 July 2016 (i)" + "FFTPlugin 8 November 2016 (i)" #else - "FFTPlugin 9 July 2016 (e)" + "FFTPlugin 8 November 2016 (e)" #endif ; static sqInt nu; Modified: trunk/src/plugins/FT2Plugin/FT2Plugin.c =================================================================== --- trunk/src/plugins/FT2Plugin/FT2Plugin.c 2016-10-02 22:29:17 UTC (rev 3750) +++ trunk/src/plugins/FT2Plugin/FT2Plugin.c 2016-11-08 22:36:58 UTC (rev 3751) @@ -1,4 +1,4 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.7 translated as C source on 9 July 2016 12:04:27 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.9 translated as C source on 8 November 2016 5:28:33 pm */ /* Automatically generated by FT2PluginCodeGenerator * FreeType-nice.443 uuid: d8120335-a67f-4a64-94ea-90145046f7dc from @@ -121,9 +121,9 @@ static FT_Library library; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FT2Plugin 9 July 2016 (i)" + "FT2Plugin 8 November 2016 (i)" #else - "FT2Plugin 9 July 2016 (e)" + "FT2Plugin 8 November 2016 (e)" #endif ; static sqInt simulator; Modified: trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c =================================================================== --- trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c 2016-10-02 22:29:17 UTC (rev 3750) +++ trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c 2016-11-08 22:36:58 UTC (rev 3751) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.7 translated as C source on 9 July 2016 12:04:27 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.9 translated as C source on 8 November 2016 5:28:33 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + SmartSyntaxPluginCodeGenerator VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc from - FileCopyPlugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + FileCopyPlugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc */ -static char __buildInfo[] = "FileCopyPlugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b " __DATE__ ; +static char __buildInfo[] = "FileCopyPlugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc " __DATE__ ; @@ -57,9 +57,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FileCopyPlugin 9 July 2016 (i)" + "FileCopyPlugin 8 November 2016 (i)" #else - "FileCopyPlugin 9 July 2016 (e)" + "FileCopyPlugin 8 November 2016 (e)" #endif ; static sqInt simulator; Modified: trunk/src/plugins/FilePlugin/FilePlugin.c =================================================================== --- trunk/src/plugins/FilePlugin/FilePlugin.c 2016-10-02 22:29:17 UTC (rev 3750) +++ trunk/src/plugins/FilePlugin/FilePlugin.c 2016-11-08 22:36:58 UTC (rev 3751) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.7 translated as C source on 9 July 2016 12:04:23 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.9 translated as C source on 8 November 2016 5:28:28 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + VMPluginCodeGenerator VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc from - FilePlugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + FilePlugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc */ -static char __buildInfo[] = "FilePlugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b " __DATE__ ; +static char __buildInfo[] = "FilePlugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc " __DATE__ ; @@ -65,6 +65,7 @@ EXPORT(sqInt) initialiseModule(void); #pragma export off static sqInt makeDirEntryNamesizecreateDatemodDateisDirfileSize(char *entryName, sqInt entryNameSize, sqInt createDate, sqInt modifiedDate, sqInt dirFlag, squeakFileOffsetType fileSize); +static sqInt makeDirEntryNamesizecreateDatemodDateisDirfileSizeposixPermissionsisSymlink(char *entryName, sqInt entryNameSize, sqInt createDate, sqInt modifiedDate, sqInt dirFlag, squeakFileOffsetType fileSize, sqInt posixPermissions, sqInt symlinkFlag); #pragma export on EXPORT(sqInt) moduleUnloaded(char *aModuleName); EXPORT(sqInt) primitiveDirectoryCreate(void); @@ -101,9 +102,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FilePlugin 9 July 2016 (i)" + "FilePlugin 8 November 2016 (i)" #else - "FilePlugin 9 July 2016 (e)" + "FilePlugin 8 November 2016 (e)" #endif ; static void * sCCPfn; @@ -119,6 +120,8 @@ static sqInt asciiDirectoryDelimiter(void) { + sqInt fileSystem; + return dir_Delimitor(); } @@ -255,7 +258,58 @@ return results; } +static sqInt makeDirEntryNamesizecreateDatemodDateisDirfileSizeposixPermissionsisSymlink(char *entryName, sqInt entryNameSize, sqInt createDate, sqInt modifiedDate, sqInt dirFlag, squeakFileOffsetType fileSize, sqInt posixPermissions, sqInt symlinkFlag) { + sqInt createDateOop; + sqInt fileSizeOop; + sqInt i; + sqInt modDateOop; + sqInt nameString; + sqInt posixPermissionsOop; + sqInt results; + char *stringPtr; + + /* allocate storage for results, remapping newly allocated + oops in case GC happens during allocation */ + + interpreterProxy->pushRemappableOop(interpreterProxy->instantiateClassindexableSize(interpreterProxy->classArray(), 7)); + interpreterProxy->pushRemappableOop(interpreterProxy->instantiateClassindexableSize(interpreterProxy->classString(), entryNameSize)); + interpreterProxy->pushRemappableOop(interpreterProxy->positive32BitIntegerFor(createDate)); + interpreterProxy->pushRemappableOop(interpreterProxy->positive32BitIntegerFor(modifiedDate)); + interpreterProxy->pushRemappableOop(interpreterProxy->positive64BitIntegerFor(fileSize)); + interpreterProxy->pushRemappableOop(interpreterProxy->positive32BitIntegerFor(posixPermissions)); + posixPermissionsOop = interpreterProxy->popRemappableOop(); + fileSizeOop = interpreterProxy->popRemappableOop(); + modDateOop = interpreterProxy->popRemappableOop(); + createDateOop = interpreterProxy->popRemappableOop(); + nameString = interpreterProxy->popRemappableOop(); + + /* copy name into Smalltalk string */ + + results = interpreterProxy->popRemappableOop(); + stringPtr = interpreterProxy->firstIndexableField(nameString); + for (i = 0; i <= (entryNameSize - 1); i += 1) { + stringPtr[i] = (entryName[i]); + } + interpreterProxy->storePointerofObjectwithValue(0, results, nameString); + interpreterProxy->storePointerofObjectwithValue(1, results, createDateOop); + interpreterProxy->storePointerofObjectwithValue(2, results, modDateOop); + if (dirFlag) { + interpreterProxy->storePointerofObjectwithValue(3, results, interpreterProxy->trueObject()); + } else { + interpreterProxy->storePointerofObjectwithValue(3, results, interpreterProxy->falseObject()); + } + interpreterProxy->storePointerofObjectwithValue(4, results, fileSizeOop); + interpreterProxy->storePointerofObjectwithValue(5, results, posixPermissionsOop); + if (symlinkFlag) { + interpreterProxy->storePointerofObjectwithValue(6, results, interpreterProxy->trueObject()); + } else { + interpreterProxy->storePointerofObjectwithValue(6, results, interpreterProxy->falseObject()); + } + return results; +} + + /* The module with the given name was just unloaded. Make sure we have no dangling references. */ @@ -393,7 +447,9 @@ sqInt pathName; char *pathNameIndex; sqInt pathNameSize; + sqInt posixPermissions; sqInt status; + sqInt symlinkFlag; index = interpreterProxy->stackIntegerValue(0); pathName = interpreterProxy->stackValue(1); @@ -412,9 +468,18 @@ okToList = 1; } if (okToList) { + +# ifdef PharoVM // platform support code diverged for pharo status = dir_Lookup(pathNameIndex, pathNameSize, index, entryName, &entryNameSize, &createDate, + &modifiedDate, &dirFlag, &fileSize, + &posixPermissions, &symlinkFlag); +# else + status = dir_Lookup(pathNameIndex, pathNameSize, index, + entryName, &entryNameSize, &createDate, &modifiedDate, &dirFlag, &fileSize); +# endif // PharoVM + } else { status = DirNoMoreEntries; } @@ -431,7 +496,13 @@ if (status == DirBadPath) { return interpreterProxy->primitiveFail(); } + +# ifdef PharoVM // platform support code diverged for pharo + interpreterProxy->popthenPush(3, makeDirEntryNamesizecreateDatemodDateisDirfileSizeposixPermissionsisSymlink(entryName, entryNameSize, createDate, modifiedDate, dirFlag, fileSize, posixPermissions, symlinkFlag)); +# else interpreterProxy->popthenPush(3, makeDirEntryNamesizecreateDatemodDateisDirfileSize(entryName, entryNameSize, createDate, modifiedDate, dirFlag, fileSize)); +# endif // PharoVM + return null; } @@ -448,15 +519,9 @@ creatorString = interpreterProxy->stackValue(0); typeString = interpreterProxy->stackValue(1); fileName = interpreterProxy->stackValue(2); - if (!((interpreterProxy->isBytes(creatorString)) && ((interpreterProxy->byteSizeOf(creatorString)) == 4))) { + if (!((interpreterProxy->isBytes(creatorString)) && ((interpreterProxy->isBytes(typeString)) && ((interpreterProxy->isBytes(fileName)) && (((interpreterProxy->byteSizeOf(creatorString)) == 4) && ((interpreterProxy->byteSizeOf(typeString)) == 4)))))) { return interpreterProxy->primitiveFail(); } - if (!((interpreterProxy->isBytes(typeString)) && ((interpreterProxy->byteSizeOf(typeString)) == 4))) { - return interpreterProxy->primitiveFail(); - } - if (!(interpreterProxy->isBytes(fileName))) { - return interpreterProxy->primitiveFail(); - } creatorStringIndex = interpreterProxy->firstIndexableField(creatorString); typeStringIndex = interpreterProxy->firstIndexableField(typeString); fileNameIndex = interpreterProxy->firstIndexableField(fileName); @@ -466,12 +531,12 @@ fileNameSize = interpreterProxy->byteSizeOf(fileName); if (sCSFTfn != 0) { - okToSet = ((sqInt (*)(char *, sqInt))sCSFTfn)(fileNameIndex, fileNameSize); + okToSet = ((sqInt (*)(char *, sqInt))sCSFTfn)(fileNameIndex, fileNameSize); if (!(okToSet)) { return interpreterProxy->primitiveFail(); } } - if (!(dir_SetMacFileTypeAndCreator(fileNameIndex, fileNameSize,typeStringIndex, creatorStringIndex))) { + if (!(dir_SetMacFileTypeAndCreator(fileNameIndex, fileNameSize, typeStringIndex, creatorStringIndex))) { return interpreterProxy->primitiveFail(); } interpreterProxy->pop(3); @@ -630,6 +695,9 @@ return null; } + +/* self cppIf: SPURVM */ + EXPORT(sqInt) primitiveFileRead(void) { sqInt array; sqInt bytesRead; @@ -638,39 +706,92 @@ SQFile * file; sqInt retryCount; size_t startIndex; + sqInt array1; + sqInt bytesRead1; + size_t count1; + size_t elementSize1; + SQFile * file1; + size_t startIndex1; + sqInt array2; + sqInt bytesRead2; + size_t count2; + size_t elementSize2; + SQFile * file2; + sqInt retryCount1; + size_t startIndex2; sqInt objectPointer; + sqInt objectPointer1; + sqInt objectPointer2; - retryCount = 0; - count = interpreterProxy->positive32BitValueOf(interpreterProxy->stackValue(0)); - startIndex = interpreterProxy->positive32BitValueOf(interpreterProxy->stackValue(1)); + +# ifdef SPURVM // use primitiveFileReadWithPinning for SPUR + /* begin primitiveFileReadWithPinning */ + count1 = interpreterProxy->positive32BitValueOf(interpreterProxy->stackValue(0)); + startIndex1 = interpreterProxy->positive32BitValueOf(interpreterProxy->stackValue(1)); + array1 = interpreterProxy->stackValue(2); + /* begin fileValueOf: */ + objectPointer1 = interpreterProxy->stackValue(3); + if (!((interpreterProxy->isBytes(objectPointer1)) && ((interpreterProxy->byteSizeOf(objectPointer1)) == (sizeof(SQFile))))) { + interpreterProxy->primitiveFail(); + file1 = null; + goto l5; + } + file1 = interpreterProxy->firstIndexableField(objectPointer1); +l5: /* end fileValueOf: */; + if ((interpreterProxy->failed()) || (!(interpreterProxy->isWordsOrBytes(array1)))) { + interpreterProxy->primitiveFailFor(PrimErrBadArgument); + goto l2; + } + elementSize1 = (interpreterProxy->isWords(array1) + ? 4 + : 1); + if (!((startIndex1 >= 1) && (((startIndex1 + count1) - 1) <= (interpreterProxy->slotSizeOf(array1))))) { + interpreterProxy->primitiveFailFor(PrimErrBadIndex); + goto l2; + } + bytesRead1 = sqFileReadIntoAt(file1, count1 * elementSize1, ((char *) (interpreterProxy->firstIndexableField(array1))), (startIndex1 - 1) * elementSize1); + if (!(interpreterProxy->failed())) { + interpreterProxy->popthenPush(5, (((bytesRead1 / elementSize1) << 1) | 1)); + } +l2: /* end primitiveFileReadWithPinning */; +# else + /* begin primitiveFileReadWithoutPinning */ + retryCount1 = 0; + count2 = interpreterProxy->positive32BitValueOf(interpreterProxy->stackValue(0)); + startIndex2 = interpreterProxy->positive32BitValueOf(interpreterProxy->stackValue(1)); while (1) { - array = interpreterProxy->stackValue(2); + array2 = interpreterProxy->stackValue(2); /* begin fileValueOf: */ - objectPointer = interpreterProxy->stackValue(3); - if (!((interpreterProxy->isBytes(objectPointer)) && ((interpreterProxy->byteSizeOf(objectPointer)) == (sizeof(SQFile))))) { + objectPointer2 = interpreterProxy->stackValue(3); + if (!((interpreterProxy->isBytes(objectPointer2)) && ((interpreterProxy->byteSizeOf(objectPointer2)) == (sizeof(SQFile))))) { interpreterProxy->primitiveFail(); - file = null; - goto l1; + file2 = null; + goto l6; } - file = interpreterProxy->firstIndexableField(objectPointer); - l1: /* end fileValueOf: */; - if ((interpreterProxy->failed()) || (!(interpreterProxy->isWordsOrBytes(array)))) { - return interpreterProxy->primitiveFailFor(PrimErrBadArgument); + file2 = interpreterProxy->firstIndexableField(objectPointer2); + l6: /* end fileValueOf: */; + if ((interpreterProxy->failed()) || (!(interpreterProxy->isWordsOrBytes(array2)))) { + interpreterProxy->primitiveFailFor(PrimErrBadArgument); + goto l3; } - elementSize = (interpreterProxy->isWords(array) + elementSize2 = (interpreterProxy->isWords(array2) ? 4 : 1); - if (!((startIndex >= 1) && (((startIndex + count) - 1) <= (interpreterProxy->slotSizeOf(array))))) { - return interpreterProxy->primitiveFailFor(PrimErrBadIndex); + if (!((startIndex2 >= 1) && (((startIndex2 + count2) - 1) <= (interpreterProxy->slotSizeOf(array2))))) { + interpreterProxy->primitiveFailFor(PrimErrBadIndex); + goto l3; } - bytesRead = sqFileReadIntoAt(file, count * elementSize, ((char *) (interpreterProxy->firstIndexableField(array))), (startIndex - 1) * elementSize); - if (!(((interpreterProxy->primitiveFailureCode()) == PrimErrObjectMayMove) && (((retryCount += 1)) <= 2))) break; + bytesRead2 = sqFileReadIntoAt(file2, count2 * elementSize2, ((char *) (interpreterProxy->firstIndexableField(array2))), (startIndex2 - 1) * elementSize2); + if (!(((interpreterProxy->primitiveFailureCode()) == PrimErrObjectMayMove) && (((retryCount1 += 1)) <= 2))) break; interpreterProxy->tenuringIncrementalGC(); interpreterProxy->primitiveFailFor(PrimNoErr); } if (!(interpreterProxy->failed())) { - interpreterProxy->popthenPush(5, (((bytesRead / elementSize) << 1) | 1)); + interpreterProxy->popthenPush(5, (((bytesRead2 / elementSize2) << 1) | 1)); } +l3: /* end primitiveFileReadWithoutPinning */; +# endif // SPURVM + return null; } @@ -712,14 +833,10 @@ EXPORT(sqInt) primitiveFileSetPosition(void) { SQFile * file; squeakFileOffsetType newPosition; - sqInt sz; sqInt objectPointer; - if (!(((interpreterProxy->stackValue(0)) & 1))) { - sz = sizeof(squeakFileOffsetType); - if ((interpreterProxy->byteSizeOf(interpreterProxy->stackValue(0))) > sz) { - return interpreterProxy->primitiveFail(); - } + if ((interpreterProxy->byteSizeOf(interpreterProxy->stackValue(0))) > (sizeof(squeakFileOffsetType))) { + return interpreterProxy->primitiveFail(); } newPosition = interpreterProxy->positive64BitValueOf(interpreterProxy->stackValue(0)); /* begin fileValueOf: */ @@ -803,7 +920,13 @@ } # ifdef COGMTVM // In the threaded VM ensure the handles are old, so that sqFileReadIntoAt is unaffected by incremental GCs. See platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c. + +# ifdef SPURVM // The Spur VM uses pinning, so it does not need the GC. + 1; +# else interpreterProxy->fullGC(); +# endif // SPURVM + # endif // COGMTVM result = interpreterProxy->popRemappableOop(); @@ -838,13 +961,11 @@ EXPORT(sqInt) primitiveFileTruncate(void) { SQFile * file; - sqInt sz; squeakFileOffsetType truncatePosition; sqInt objectPointer; if (!(((interpreterProxy->stackValue(0)) & 1))) { - sz = sizeof(squeakFileOffsetType); - if ((interpreterProxy->byteSizeOf(interpreterProxy->stackValue(0))) > sz) { + if ((interpreterProxy->byteSizeOf(interpreterProxy->stackValue(0))) > (sizeof(squeakFileOffsetType))) { return interpreterProxy->primitiveFail(); } } @@ -869,10 +990,9 @@ EXPORT(sqInt) primitiveFileWrite(void) { sqInt array; - char *arrayIndex; - size_t byteSize; sqInt bytesWritten; size_t count; + size_t elementSize; SQFile * file; size_t startIndex; sqInt objectPointer; @@ -889,27 +1009,19 @@ } file = interpreterProxy->firstIndexableField(objectPointer); l1: /* end fileValueOf: */; - if (!(interpreterProxy->isWordsOrBytes(array))) { - return interpreterProxy->primitiveFail(); + if ((interpreterProxy->failed()) || (!(interpreterProxy->isWordsOrBytes(array)))) { + return interpreterProxy->primitiveFailFor(PrimErrBadArgument); } - if (interpreterProxy->isWords(array)) { - byteSize = 4; - } else { - byteSize = 1; - } + elementSize = (interpreterProxy->isWords(array) + ? 4 + : 1); if (!((startIndex >= 1) && (((startIndex + count) - 1) <= (interpreterProxy->slotSizeOf(array))))) { - return interpreterProxy->primitiveFail(); + return interpreterProxy->primitiveFailFor(PrimErrBadIndex); } + bytesWritten = sqFileWriteFromAt(file, count * elementSize, ((char *) (interpreterProxy->firstIndexableField(array))), (startIndex - 1) * elementSize); if (!(interpreterProxy->failed())) { - - /* Note: adjust startIndex for zero-origin indexing */ - - arrayIndex = interpreterProxy->firstIndexableField(array); - bytesWritten = sqFileWriteFromAt(file, count * byteSize, arrayIndex, (startIndex - 1) * byteSize); + interpreterProxy->popthenPush(5, (((bytesWritten / elementSize) << 1) | 1)); } - if (!(interpreterProxy->failed())) { - interpreterProxy->popthenPush(5, (((bytesWritten / byteSize) << 1) | 1)); - } return null; } Modified: trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c =================================================================== --- trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2016-10-02 22:29:17 UTC (rev 3750) +++ trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2016-11-08 22:36:58 UTC (rev 3751) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.7 translated as C source on 9 July 2016 12:04:23 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.9 translated as C source on 8 November 2016 5:28:28 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + VMPluginCodeGenerator VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc from - FloatArrayPlugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + FloatArrayPlugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc */ -static char __buildInfo[] = "FloatArrayPlugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b " __DATE__ ; +static char __buildInfo[] = "FloatArrayPlugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc " __DATE__ ; @@ -72,9 +72,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FloatArrayPlugin 9 July 2016 (i)" + "FloatArrayPlugin 8 November 2016 (i)" #else - "FloatArrayPlugin 9 July 2016 (e)" + "FloatArrayPlugin 8 November 2016 (e)" #endif ; Modified: trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c =================================================================== --- trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c 2016-10-02 22:29:17 UTC (rev 3750) +++ trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c 2016-11-08 22:36:58 UTC (rev 3751) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.7 translated as C source on 9 July 2016 12:04:23 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.9 translated as C source on 8 November 2016 5:28:28 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + VMPluginCodeGenerator VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc from - FloatMathPlugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + FloatMathPlugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc */ -static char __buildInfo[] = "FloatMathPlugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b " __DATE__ ; +static char __buildInfo[] = "FloatMathPlugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc " __DATE__ ; @@ -79,9 +79,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FloatMathPlugin 9 July 2016 (i)" + "FloatMathPlugin 8 November 2016 (i)" #else - "FloatMathPlugin 9 July 2016 (e)" + "FloatMathPlugin 8 November 2016 (e)" #endif ; Modified: trunk/src/plugins/GeniePlugin/GeniePlugin.c =================================================================== --- trunk/src/plugins/GeniePlugin/GeniePlugin.c 2016-10-02 22:29:17 UTC (rev 3750) +++ trunk/src/plugins/GeniePlugin/GeniePlugin.c 2016-11-08 22:36:58 UTC (rev 3751) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.7 translated as C source on 9 July 2016 12:04:23 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.9 translated as C source on 8 November 2016 5:28:28 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + SmartSyntaxPluginCodeGenerator VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc from - GeniePlugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + GeniePlugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc */ -static char __buildInfo[] = "GeniePlugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b " __DATE__ ; +static char __buildInfo[] = "GeniePlugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc " __DATE__ ; @@ -61,9 +61,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "GeniePlugin v2.0 9 July 2016 (i)" + "GeniePlugin v2.0 8 November 2016 (i)" #else - "GeniePlugin v2.0 9 July 2016 (e)" + "GeniePlugin v2.0 8 November 2016 (e)" #endif ; static sqInt simulator; Modified: trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c =================================================================== --- trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c 2016-10-02 22:29:17 UTC (rev 3750) +++ trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c 2016-11-08 22:36:58 UTC (rev 3751) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.7 translated as C source on 9 July 2016 12:04:28 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.9 translated as C source on 8 November 2016 5:28:34 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + SmartSyntaxPluginCodeGenerator VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc from - HostWindowPlugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + HostWindowPlugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc */ -static char __buildInfo[] = "HostWindowPlugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b " __DATE__ ; +static char __buildInfo[] = "HostWindowPlugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc " __DATE__ ; @@ -66,9 +66,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "HostWindowPlugin 9 July 2016 (i)" + "HostWindowPlugin 8 November 2016 (i)" #else - "HostWindowPlugin 9 July 2016 (e)" + "HostWindowPlugin 8 November 2016 (e)" #endif ; static sqInt simulator; Modified: trunk/src/plugins/ImmX11Plugin/ImmX11Plugin.c =================================================================== --- trunk/src/plugins/ImmX11Plugin/ImmX11Plugin.c 2016-10-02 22:29:17 UTC (rev 3750) +++ trunk/src/plugins/ImmX11Plugin/ImmX11Plugin.c 2016-11-08 22:36:58 UTC (rev 3751) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.7 translated as C source on 9 July 2016 12:04:28 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.9 translated as C source on 8 November 2016 5:28:34 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + SmartSyntaxPluginCodeGenerator VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc from - ImmX11Plugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + ImmX11Plugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc */ -static char __buildInfo[] = "ImmX11Plugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b " __DATE__ ; +static char __buildInfo[] = "ImmX11Plugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc " __DATE__ ; @@ -84,9 +84,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ImmX11Plugin 9 July 2016 (i)" + "ImmX11Plugin 8 November 2016 (i)" #else - "ImmX11Plugin 9 July 2016 (e)" + "ImmX11Plugin 8 November 2016 (e)" #endif ; static sqInt simulator; Modified: trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c =================================================================== --- trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2016-10-02 22:29:17 UTC (rev 3750) +++ trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2016-11-08 22:36:58 UTC (rev 3751) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.7 translated as C source on 9 July 2016 12:04:23 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.9 translated as C source on 8 November 2016 5:28:28 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + SmartSyntaxPluginCodeGenerator VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc from - JPEGReadWriter2Plugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + JPEGReadWriter2Plugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc */ -static char __buildInfo[] = "JPEGReadWriter2Plugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b " __DATE__ ; +static char __buildInfo[] = "JPEGReadWriter2Plugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc " __DATE__ ; @@ -70,9 +70,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JPEGReadWriter2Plugin 9 July 2016 (i)" + "JPEGReadWriter2Plugin 8 November 2016 (i)" #else - "JPEGReadWriter2Plugin 9 July 2016 (e)" + "JPEGReadWriter2Plugin 8 November 2016 (e)" #endif ; static sqInt simulator; Modified: trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c =================================================================== --- trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2016-10-02 22:29:17 UTC (rev 3750) +++ trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2016-11-08 22:36:58 UTC (rev 3751) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.7 translated as C source on 9 July 2016 12:04:23 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.9 translated as C source on 8 November 2016 5:28:29 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + VMPluginCodeGenerator VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc from - JPEGReaderPlugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + JPEGReaderPlugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc */ -static char __buildInfo[] = "JPEGReaderPlugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b " __DATE__ ; +static char __buildInfo[] = "JPEGReaderPlugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc " __DATE__ ; @@ -136,9 +136,9 @@ static sqInt jsReadLimit; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JPEGReaderPlugin 9 July 2016 (i)" + "JPEGReaderPlugin 8 November 2016 (i)" #else - "JPEGReaderPlugin 9 July 2016 (e)" + "JPEGReaderPlugin 8 November 2016 (e)" #endif ; static int *residuals; Modified: trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c =================================================================== --- trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c 2016-10-02 22:29:17 UTC (rev 3750) +++ trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c 2016-11-08 22:36:58 UTC (rev 3751) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.15.7 translated as C source on 9 July 2016 12:04:23 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.15.9 translated as C source on 8 November 2016 5:28:29 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + SmartSyntaxPluginCodeGenerator VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc from - JoystickTabletPlugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b + JoystickTabletPlugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc */ -static char __buildInfo[] = "JoystickTabletPlugin VMMaker-dtl.384 uuid: 53635f21-7aaa-454b-bbfc-9fc2b67fb70b " __DATE__ ; +static char __buildInfo[] = "JoystickTabletPlugin VMMaker-dtl.387 uuid: ef7038c9-f871-4632-b087-ba2f03a89ebc " __DATE__ ; @@ -62,9 +62,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN @@ Diff output truncated at 50000 characters. @@ |
«
Return to Squeak VM
|
1 view|%1 views
| Free forum by Nabble | Edit this page |