[Vm-dev] [commit][2798] CogVM source as per VMMaker.oscog-eem.498
commits at squeakvm.org
commits at squeakvm.org
Sat Nov 2 21:15:40 UTC 2013
Revision: 2798
Author: eliot
Date: 2013-11-02 14:15:39 -0700 (Sat, 02 Nov 2013)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.498
Add the compression prims to the Newspeak VM's ZipPlugin.
Regenerate the Newspeak VM plugins after recent Slang changes.
Rescue the translated primitives by adding the missing
removeFinalReturnIn: to statementsFor:varName:
Spur: Work-around Slang limitations with the new shouldBeTenured:;
mark it as <inline: false>.
Modified Paths:
--------------
branches/Cog/nscogsrc/examplePlugins.ext
branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c
branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c
branches/Cog/nscogsrc/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c
branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c
branches/Cog/nscogsrc/plugins/DSAPrims/DSAPrims.c
branches/Cog/nscogsrc/plugins/DropPlugin/DropPlugin.c
branches/Cog/nscogsrc/plugins/FileCopyPlugin/FileCopyPlugin.c
branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c
branches/Cog/nscogsrc/plugins/FloatArrayPlugin/FloatArrayPlugin.c
branches/Cog/nscogsrc/plugins/FloatMathPlugin/FloatMathPlugin.c
branches/Cog/nscogsrc/plugins/IA32ABI/IA32ABI.c
branches/Cog/nscogsrc/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c
branches/Cog/nscogsrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c
branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c
branches/Cog/nscogsrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c
branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c
branches/Cog/nscogsrc/plugins/RePlugin/RePlugin.c
branches/Cog/nscogsrc/plugins/SecurityPlugin/SecurityPlugin.c
branches/Cog/nscogsrc/plugins/SocketPlugin/SocketPlugin.c
branches/Cog/nscogsrc/plugins/SoundPlugin/SoundPlugin.c
branches/Cog/nscogsrc/plugins/SqueakSSL/SqueakSSL.c
branches/Cog/nscogsrc/plugins/UUIDPlugin/UUIDPlugin.c
branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c
branches/Cog/nscogsrc/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c
branches/Cog/nscogsrc/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c
branches/Cog/nscogsrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c
branches/Cog/nscogsrc/plugins/ZipPlugin/ZipPlugin.c
branches/Cog/nscogsrc/vm/exampleSqNamedPrims.h
branches/Cog/spurstacksrc/vm/gcc3x-interp.c
branches/Cog/spurstacksrc/vm/interp.c
branches/Cog/spurstacksrc/vm/interp.h
branches/Cog/spurstacksrc/vm/vmCallback.h
branches/Cog/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c
branches/Cog/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c
branches/Cog/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c
branches/Cog/src/vm/exampleSqNamedPrims.h
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nscogsrc/examplePlugins.ext
===================================================================
--- branches/Cog/nscogsrc/examplePlugins.ext 2013-11-02 19:45:39 UTC (rev 2797)
+++ branches/Cog/nscogsrc/examplePlugins.ext 2013-11-02 21:15:39 UTC (rev 2798)
@@ -5,12 +5,12 @@
B2DPlugin \
BitBltPlugin \
DSAPrims \
+ZipPlugin \
DropPlugin \
FileCopyPlugin \
FilePlugin \
FloatArrayPlugin \
FloatMathPlugin \
-ZipPlugin \
JPEGReadWriter2Plugin \
JPEGReaderPlugin \
LargeIntegers \
Modified: branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2013-11-02 19:45:39 UTC (rev 2797)
+++ branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2013-11-02 21:15:39 UTC (rev 2798)
@@ -1,9 +1,9 @@
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
from
- AsynchFilePlugin VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ AsynchFilePlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
*/
-static char __buildInfo[] = "AsynchFilePlugin VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334 " __DATE__ ;
+static char __buildInfo[] = "AsynchFilePlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ;
@@ -103,9 +103,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "AsynchFilePlugin VMMaker.oscog-eem.496 (i)"
+ "AsynchFilePlugin VMMaker.oscog-eem.497 (i)"
#else
- "AsynchFilePlugin VMMaker.oscog-eem.496 (e)"
+ "AsynchFilePlugin VMMaker.oscog-eem.497 (e)"
#endif
;
static void * sCOAFfn;
Modified: branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c 2013-11-02 19:45:39 UTC (rev 2797)
+++ branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c 2013-11-02 21:15:39 UTC (rev 2798)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
from
- BalloonEnginePlugin VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ BalloonEnginePlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
*/
-static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334 " __DATE__ ;
+static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ;
@@ -840,9 +840,9 @@
static void * loadBBFn;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "B2DPlugin VMMaker.oscog-eem.496 (i)"
+ "B2DPlugin VMMaker.oscog-eem.497 (i)"
#else
- "B2DPlugin VMMaker.oscog-eem.496 (e)"
+ "B2DPlugin VMMaker.oscog-eem.497 (e)"
#endif
;
static int* objBuffer;
Modified: branches/Cog/nscogsrc/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2013-11-02 19:45:39 UTC (rev 2797)
+++ branches/Cog/nscogsrc/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2013-11-02 21:15:39 UTC (rev 2798)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
from
- BMPReadWriterPlugin VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ BMPReadWriterPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
*/
-static char __buildInfo[] = "BMPReadWriterPlugin VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334 " __DATE__ ;
+static char __buildInfo[] = "BMPReadWriterPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ;
@@ -79,9 +79,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "BMPReadWriterPlugin VMMaker.oscog-eem.496 (i)"
+ "BMPReadWriterPlugin VMMaker.oscog-eem.497 (i)"
#else
- "BMPReadWriterPlugin VMMaker.oscog-eem.496 (e)"
+ "BMPReadWriterPlugin VMMaker.oscog-eem.497 (e)"
#endif
;
Modified: branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c 2013-11-02 19:45:39 UTC (rev 2797)
+++ branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c 2013-11-02 21:15:39 UTC (rev 2798)
@@ -1,9 +1,9 @@
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
from
- BitBltSimulation VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ BitBltSimulation VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
*/
-static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334 " __DATE__ ;
+static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ;
@@ -345,9 +345,9 @@
};
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "BitBltPlugin VMMaker.oscog-eem.496 (i)"
+ "BitBltPlugin VMMaker.oscog-eem.497 (i)"
#else
- "BitBltPlugin VMMaker.oscog-eem.496 (e)"
+ "BitBltPlugin VMMaker.oscog-eem.497 (e)"
#endif
;
static sqInt noHalftone;
Modified: branches/Cog/nscogsrc/plugins/DSAPrims/DSAPrims.c
===================================================================
--- branches/Cog/nscogsrc/plugins/DSAPrims/DSAPrims.c 2013-11-02 19:45:39 UTC (rev 2797)
+++ branches/Cog/nscogsrc/plugins/DSAPrims/DSAPrims.c 2013-11-02 21:15:39 UTC (rev 2798)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
from
- DSAPlugin VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ DSAPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
*/
-static char __buildInfo[] = "DSAPlugin VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334 " __DATE__ ;
+static char __buildInfo[] = "DSAPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ;
@@ -95,9 +95,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "DSAPrims VMMaker.oscog-eem.496 (i)"
+ "DSAPrims VMMaker.oscog-eem.497 (i)"
#else
- "DSAPrims VMMaker.oscog-eem.496 (e)"
+ "DSAPrims VMMaker.oscog-eem.497 (e)"
#endif
;
static sqInt remainderDigitCount;
Modified: branches/Cog/nscogsrc/plugins/DropPlugin/DropPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/DropPlugin/DropPlugin.c 2013-11-02 19:45:39 UTC (rev 2797)
+++ branches/Cog/nscogsrc/plugins/DropPlugin/DropPlugin.c 2013-11-02 21:15:39 UTC (rev 2798)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7
+ VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
from
- DropPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7
+ DropPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
*/
-static char __buildInfo[] = "DropPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ;
+static char __buildInfo[] = "DropPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ;
@@ -76,15 +76,14 @@
extern sqInt primitiveFail(void);
extern sqInt push(sqInt object);
extern sqInt stackIntegerValue(sqInt offset);
-
extern
#endif
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "DropPlugin VMMaker.oscog-eem.235 (i)"
+ "DropPlugin VMMaker.oscog-eem.497 (i)"
#else
- "DropPlugin VMMaker.oscog-eem.235 (e)"
+ "DropPlugin VMMaker.oscog-eem.497 (e)"
#endif
;
Modified: branches/Cog/nscogsrc/plugins/FileCopyPlugin/FileCopyPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/FileCopyPlugin/FileCopyPlugin.c 2013-11-02 19:45:39 UTC (rev 2797)
+++ branches/Cog/nscogsrc/plugins/FileCopyPlugin/FileCopyPlugin.c 2013-11-02 21:15:39 UTC (rev 2798)
@@ -1,9 +1,9 @@
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
from
- FileCopyPlugin VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ FileCopyPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
*/
-static char __buildInfo[] = "FileCopyPlugin VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334 " __DATE__ ;
+static char __buildInfo[] = "FileCopyPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ;
@@ -75,9 +75,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "FileCopyPlugin VMMaker.oscog-eem.496 (i)"
+ "FileCopyPlugin VMMaker.oscog-eem.497 (i)"
#else
- "FileCopyPlugin VMMaker.oscog-eem.496 (e)"
+ "FileCopyPlugin VMMaker.oscog-eem.497 (e)"
#endif
;
Modified: branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c 2013-11-02 19:45:39 UTC (rev 2797)
+++ branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c 2013-11-02 21:15:39 UTC (rev 2798)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
from
- FilePlugin VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ FilePlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
*/
-static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334 " __DATE__ ;
+static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ;
@@ -181,9 +181,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "FilePlugin VMMaker.oscog-eem.496 (i)"
+ "FilePlugin VMMaker.oscog-eem.497 (i)"
#else
- "FilePlugin VMMaker.oscog-eem.496 (e)"
+ "FilePlugin VMMaker.oscog-eem.497 (e)"
#endif
;
static void * sCCPfn;
Modified: branches/Cog/nscogsrc/plugins/FloatArrayPlugin/FloatArrayPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2013-11-02 19:45:39 UTC (rev 2797)
+++ branches/Cog/nscogsrc/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2013-11-02 21:15:39 UTC (rev 2798)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
from
- FloatArrayPlugin VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ FloatArrayPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
*/
-static char __buildInfo[] = "FloatArrayPlugin VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334 " __DATE__ ;
+static char __buildInfo[] = "FloatArrayPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ;
@@ -113,9 +113,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "FloatArrayPlugin VMMaker.oscog-eem.496 (i)"
+ "FloatArrayPlugin VMMaker.oscog-eem.497 (i)"
#else
- "FloatArrayPlugin VMMaker.oscog-eem.496 (e)"
+ "FloatArrayPlugin VMMaker.oscog-eem.497 (e)"
#endif
;
Modified: branches/Cog/nscogsrc/plugins/FloatMathPlugin/FloatMathPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/FloatMathPlugin/FloatMathPlugin.c 2013-11-02 19:45:39 UTC (rev 2797)
+++ branches/Cog/nscogsrc/plugins/FloatMathPlugin/FloatMathPlugin.c 2013-11-02 21:15:39 UTC (rev 2798)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7
+ VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
from
- FloatMathPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7
+ FloatMathPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
*/
-static char __buildInfo[] = "FloatMathPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ;
+static char __buildInfo[] = "FloatMathPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ;
@@ -89,15 +89,14 @@
extern sqInt pushFloat(double f);
extern double stackFloatValue(sqInt offset);
extern sqInt stackIntegerValue(sqInt offset);
-
extern
#endif
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "FloatMathPlugin VMMaker.oscog-eem.235 (i)"
+ "FloatMathPlugin VMMaker.oscog-eem.497 (i)"
#else
- "FloatMathPlugin VMMaker.oscog-eem.235 (e)"
+ "FloatMathPlugin VMMaker.oscog-eem.497 (e)"
#endif
;
Modified: branches/Cog/nscogsrc/plugins/IA32ABI/IA32ABI.c
===================================================================
--- branches/Cog/nscogsrc/plugins/IA32ABI/IA32ABI.c 2013-11-02 19:45:39 UTC (rev 2797)
+++ branches/Cog/nscogsrc/plugins/IA32ABI/IA32ABI.c 2013-11-02 21:15:39 UTC (rev 2798)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
from
- NewsqueakIA32ABIPlugin VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ NewsqueakIA32ABIPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
*/
-static char __buildInfo[] = "NewsqueakIA32ABIPlugin VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334 " __DATE__ ;
+static char __buildInfo[] = "NewsqueakIA32ABIPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ;
@@ -223,9 +223,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "IA32ABI VMMaker.oscog-eem.496 (i)"
+ "IA32ABI VMMaker.oscog-eem.497 (i)"
#else
- "IA32ABI VMMaker.oscog-eem.496 (e)"
+ "IA32ABI VMMaker.oscog-eem.497 (e)"
#endif
;
Modified: branches/Cog/nscogsrc/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2013-11-02 19:45:39 UTC (rev 2797)
+++ branches/Cog/nscogsrc/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2013-11-02 21:15:39 UTC (rev 2798)
@@ -1,9 +1,9 @@
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
from
- JPEGReadWriter2Plugin VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ JPEGReadWriter2Plugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
*/
-static char __buildInfo[] = "JPEGReadWriter2Plugin VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334 " __DATE__ ;
+static char __buildInfo[] = "JPEGReadWriter2Plugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ;
@@ -104,9 +104,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "JPEGReadWriter2Plugin VMMaker.oscog-eem.496 (i)"
+ "JPEGReadWriter2Plugin VMMaker.oscog-eem.497 (i)"
#else
- "JPEGReadWriter2Plugin VMMaker.oscog-eem.496 (e)"
+ "JPEGReadWriter2Plugin VMMaker.oscog-eem.497 (e)"
#endif
;
Modified: branches/Cog/nscogsrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2013-11-02 19:45:39 UTC (rev 2797)
+++ branches/Cog/nscogsrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2013-11-02 21:15:39 UTC (rev 2798)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
from
- JPEGReaderPlugin VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ JPEGReaderPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
*/
-static char __buildInfo[] = "JPEGReaderPlugin VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334 " __DATE__ ;
+static char __buildInfo[] = "JPEGReaderPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ;
@@ -181,9 +181,9 @@
static sqInt jsReadLimit;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "JPEGReaderPlugin VMMaker.oscog-eem.496 (i)"
+ "JPEGReaderPlugin VMMaker.oscog-eem.497 (i)"
#else
- "JPEGReaderPlugin VMMaker.oscog-eem.496 (e)"
+ "JPEGReaderPlugin VMMaker.oscog-eem.497 (e)"
#endif
;
static int *residuals;
Modified: branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c
===================================================================
--- branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c 2013-11-02 19:45:39 UTC (rev 2797)
+++ branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c 2013-11-02 21:15:39 UTC (rev 2798)
@@ -1,9 +1,9 @@
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
from
- LargeIntegersPlugin VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ LargeIntegersPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
*/
-static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334 " __DATE__ ;
+static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ;
@@ -173,9 +173,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "LargeIntegers v1.5 VMMaker.oscog-eem.496 (i)"
+ "LargeIntegers v1.5 VMMaker.oscog-eem.497 (i)"
#else
- "LargeIntegers v1.5 VMMaker.oscog-eem.496 (e)"
+ "LargeIntegers v1.5 VMMaker.oscog-eem.497 (e)"
#endif
;
static const int orOpIndex = 1;
Modified: branches/Cog/nscogsrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2013-11-02 19:45:39 UTC (rev 2797)
+++ branches/Cog/nscogsrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2013-11-02 21:15:39 UTC (rev 2798)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
from
- Matrix2x3Plugin VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ Matrix2x3Plugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
*/
-static char __buildInfo[] = "Matrix2x3Plugin VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334 " __DATE__ ;
+static char __buildInfo[] = "Matrix2x3Plugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ;
@@ -118,9 +118,9 @@
static double m23ResultY;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "Matrix2x3Plugin VMMaker.oscog-eem.496 (i)"
+ "Matrix2x3Plugin VMMaker.oscog-eem.497 (i)"
#else
- "Matrix2x3Plugin VMMaker.oscog-eem.496 (e)"
+ "Matrix2x3Plugin VMMaker.oscog-eem.497 (e)"
#endif
;
Modified: branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2013-11-02 19:45:39 UTC (rev 2797)
+++ branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2013-11-02 21:15:39 UTC (rev 2798)
@@ -1,13 +1,13 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
from
- MiscPrimitivePlugin VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ MiscPrimitivePlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
Bitmap * Graphics-ar.142 uuid: 9a11fdac-93ce-8344-877f-55d10866f795
ByteArray * Collections-eem.375 uuid: c9da6558-3bd7-4f0f-b0e5-bc21208275f0
ByteString * Collections-eem.375 uuid: c9da6558-3bd7-4f0f-b0e5-bc21208275f0
SampledSound * Sound-ar.30 uuid: c0c6133c-73b7-7b47-9858-99b64868d35c
*/
-static char __buildInfo[] = "MiscPrimitivePlugin VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334\n\
+static char __buildInfo[] = "MiscPrimitivePlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85\n\
Bitmap * Graphics-ar.142 uuid: 9a11fdac-93ce-8344-877f-55d10866f795\n\
ByteArray * Collections-eem.375 uuid: c9da6558-3bd7-4f0f-b0e5-bc21208275f0\n\
ByteString * Collections-eem.375 uuid: c9da6558-3bd7-4f0f-b0e5-bc21208275f0\n\
@@ -95,9 +95,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "MiscPrimitivePlugin VMMaker.oscog-eem.496 (i)"
+ "MiscPrimitivePlugin VMMaker.oscog-eem.497 (i)"
#else
- "MiscPrimitivePlugin VMMaker.oscog-eem.496 (e)"
+ "MiscPrimitivePlugin VMMaker.oscog-eem.497 (e)"
#endif
;
@@ -220,35 +220,24 @@
unsigned char *string2;
rcvr = stackValue(3);
- return self;
if (!(isBytes(stackValue(2)))) {
return primitiveFail();
}
- return self;
string1 = arrayValueOf(stackValue(2));
- return self;
string1 -= 1;
- return self;
if (!(isBytes(stackValue(1)))) {
return primitiveFail();
}
- return self;
string2 = arrayValueOf(stackValue(1));
- return self;
string2 -= 1;
- return self;
if (!(isBytes(stackValue(0)))) {
return primitiveFail();
}
- return self;
order = arrayValueOf(stackValue(0));
- return self;
order -= 1;
- return self;
if (!successFlag) {
return null;
}
- return self;
len1 = sizeOfSTArrayFromCPrimitive(string1 + 1);
len2 = sizeOfSTArrayFromCPrimitive(string2 + 1);
for (i = 1; i <= (((len1 < len2) ? len1 : len2)); i += 1) {
@@ -259,9 +248,7 @@
if (!successFlag) {
return null;
}
- return self;
pop(4);
- return self;
pushInteger(1);
return null;
}
@@ -269,9 +256,7 @@
if (!successFlag) {
return null;
}
- return self;
pop(4);
- return self;
pushInteger(3);
return null;
}
@@ -281,9 +266,7 @@
if (!successFlag) {
return null;
}
- return self;
pop(4);
- return self;
pushInteger(2);
return null;
}
@@ -291,9 +274,7 @@
if (!successFlag) {
return null;
}
- return self;
pop(4);
- return self;
pushInteger(1);
return null;
}
@@ -301,9 +282,7 @@
if (!successFlag) {
return null;
}
- return self;
pop(4);
- return self;
pushInteger(3);
return null;
}
@@ -349,23 +328,16 @@
sqInt word;
rcvr = stackValue(2);
- return self;
bm = arrayValueOf(stackValue(1));
- return self;
bm -= 1;
- return self;
if (!(isBytes(stackValue(0)))) {
return primitiveFail();
}
- return self;
ba = arrayValueOf(stackValue(0));
- return self;
ba -= 1;
- return self;
if (!successFlag) {
return null;
}
- return self;
size = sizeOfSTArrayFromCPrimitive(bm + 1);
/* begin encodeInt:in:at: */
if (size <= 223) {
@@ -531,9 +503,7 @@
if (!successFlag) {
return null;
}
- return self;
pop(3);
- return self;
pushInteger(i - 1);
return null;
}
@@ -554,23 +524,16 @@
sqInt s;
rcvr = stackValue(2);
- return self;
if (!(isBytes(stackValue(1)))) {
return primitiveFail();
}
- return self;
aByteArray = arrayValueOf(stackValue(1));
- return self;
aByteArray -= 1;
- return self;
aSoundBuffer = arrayValueOf(stackValue(0));
- return self;
aSoundBuffer -= 1;
- return self;
if (!successFlag) {
return null;
}
- return self;
n = sizeOfSTArrayFromCPrimitive(aByteArray + 1);
for (i = 1; i <= n; i += 1) {
s = aByteArray[i];
@@ -584,9 +547,7 @@
if (!successFlag) {
return null;
}
- return self;
pop(2);
- return self;
}
@@ -625,25 +586,17 @@
sqInt rcvr;
rcvr = stackValue(3);
- return self;
bm = arrayValueOf(stackValue(2));
- return self;
bm -= 1;
- return self;
if (!(isBytes(stackValue(1)))) {
return primitiveFail();
}
- return self;
ba = arrayValueOf(stackValue(1));
- return self;
ba -= 1;
- return self;
index = stackIntegerValue(0);
- return self;
if (!successFlag) {
return null;
}
- return self;
/* byteArray read index */
@@ -730,9 +683,7 @@
if (!successFlag) {
return null;
}
- return self;
pop(3);
- return self;
}
EXPORT(sqInt)
@@ -746,36 +697,25 @@
sqInt stringSize;
rcvr = stackValue(3);
- return self;
if (!(isBytes(stackValue(2)))) {
return primitiveFail();
}
- return self;
aString = arrayValueOf(stackValue(2));
- return self;
aString -= 1;
- return self;
if (!(isBytes(stackValue(1)))) {
return primitiveFail();
}
- return self;
inclusionMap = arrayValueOf(stackValue(1));
- return self;
inclusionMap -= 1;
- return self;
start = stackIntegerValue(0);
- return self;
if (!successFlag) {
return null;
}
- return self;
if ((sizeOfSTArrayFromCPrimitive(inclusionMap + 1)) != 256) {
if (!successFlag) {
return null;
}
- return self;
pop(4);
- return self;
pushInteger(0);
return null;
}
@@ -789,18 +729,14 @@
if (!successFlag) {
return null;
}
- return self;
pop(4);
- return self;
pushInteger(0);
return null;
}
if (!successFlag) {
return null;
}
- return self;
pop(4);
- return self;
pushInteger(i);
return null;
}
@@ -828,44 +764,30 @@
sqInt startIndexLimiT;
rcvr = stackValue(4);
- return self;
if (!(isBytes(stackValue(3)))) {
return primitiveFail();
}
- return self;
key = arrayValueOf(stackValue(3));
- return self;
key -= 1;
- return self;
if (!(isBytes(stackValue(2)))) {
return primitiveFail();
}
- return self;
body = arrayValueOf(stackValue(2));
- return self;
body -= 1;
- return self;
start = stackIntegerValue(1);
- return self;
if (!(isBytes(stackValue(0)))) {
return primitiveFail();
}
- return self;
matchTable = arrayValueOf(stackValue(0));
- return self;
matchTable -= 1;
- return self;
if (!successFlag) {
return null;
}
- return self;
if ((sizeOfSTArrayFromCPrimitive(key + 1)) == 0) {
if (!successFlag) {
return null;
}
- return self;
pop(5);
- return self;
pushInteger(0);
return null;
}
@@ -876,9 +798,7 @@
if (!successFlag) {
return null;
}
- return self;
pop(5);
- return self;
pushInteger(startIndex);
return null;
}
@@ -888,9 +808,7 @@
if (!successFlag) {
return null;
}
- return self;
pop(5);
- return self;
pushInteger(0);
return null;
}
@@ -906,32 +824,23 @@
sqInt stringSize;
rcvr = stackValue(3);
- return self;
anInteger = stackIntegerValue(2);
- return self;
if (!(isBytes(stackValue(1)))) {
return primitiveFail();
}
- return self;
aString = arrayValueOf(stackValue(1));
- return self;
aString -= 1;
- return self;
start = stackIntegerValue(0);
- return self;
if (!successFlag) {
return null;
}
- return self;
stringSize = sizeOfSTArrayFromCPrimitive(aString + 1);
for (pos = start; pos <= stringSize; pos += 1) {
if ((asciiValue(aString[pos])) == anInteger) {
if (!successFlag) {
return null;
}
- return self;
pop(4);
- return self;
pushInteger(pos);
return null;
}
@@ -939,9 +848,7 @@
if (!successFlag) {
return null;
}
- return self;
pop(4);
- return self;
pushInteger(0);
return null;
}
@@ -967,21 +874,15 @@
sqInt speciesHash;
rcvr = stackValue(2);
- return self;
if (!(isBytes(stackValue(1)))) {
return primitiveFail();
}
- return self;
aByteArray = arrayValueOf(stackValue(1));
- return self;
aByteArray -= 1;
- return self;
speciesHash = stackIntegerValue(0);
- return self;
if (!successFlag) {
return null;
}
- return self;
byteArraySize = sizeOfSTArrayFromCPrimitive(aByteArray + 1);
hash = speciesHash & 0xFFFFFFF;
for (pos = 1; pos <= byteArraySize; pos += 1) {
@@ -995,9 +896,7 @@
if (!successFlag) {
return null;
}
- return self;
pop(3);
- return self;
pushInteger(hash);
return null;
}
@@ -1016,40 +915,28 @@
unsigned char *table;
rcvr = stackValue(4);
- return self;
if (!(isBytes(stackValue(3)))) {
return primitiveFail();
}
- return self;
aString = arrayValueOf(stackValue(3));
- return self;
aString -= 1;
- return self;
start = stackIntegerValue(2);
- return self;
stop = stackIntegerValue(1);
- return self;
if (!(isBytes(stackValue(0)))) {
return primitiveFail();
}
- return self;
table = arrayValueOf(stackValue(0));
- return self;
table -= 1;
- return self;
if (!successFlag) {
return null;
}
- return self;
for (i = start; i <= stop; i += 1) {
aString[i] = (table[(asciiValue(aString[i])) + 1]);
}
if (!successFlag) {
return null;
}
- return self;
pop(4);
- return self;
}
Modified: branches/Cog/nscogsrc/plugins/RePlugin/RePlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/RePlugin/RePlugin.c 2013-11-02 19:45:39 UTC (rev 2797)
+++ branches/Cog/nscogsrc/plugins/RePlugin/RePlugin.c 2013-11-02 21:15:39 UTC (rev 2798)
@@ -1,9 +1,9 @@
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
from
- RePlugin VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ RePlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
*/
-static char __buildInfo[] = "RePlugin VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334 " __DATE__ ;
+static char __buildInfo[] = "RePlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ;
@@ -127,9 +127,9 @@
static sqInt matchFlags;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "RePlugin VMMaker.oscog-eem.496 (i)"
+ "RePlugin VMMaker.oscog-eem.497 (i)"
#else
- "RePlugin VMMaker.oscog-eem.496 (e)"
+ "RePlugin VMMaker.oscog-eem.497 (e)"
#endif
;
static int netMemory = 0;
Modified: branches/Cog/nscogsrc/plugins/SecurityPlugin/SecurityPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/SecurityPlugin/SecurityPlugin.c 2013-11-02 19:45:39 UTC (rev 2797)
+++ branches/Cog/nscogsrc/plugins/SecurityPlugin/SecurityPlugin.c 2013-11-02 21:15:39 UTC (rev 2798)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7
+ VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
from
- SecurityPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7
+ SecurityPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
*/
-static char __buildInfo[] = "SecurityPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ;
+static char __buildInfo[] = "SecurityPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ;
@@ -92,15 +92,14 @@
extern sqInt popthenPush(sqInt nItems, sqInt oop);
extern sqInt primitiveFail(void);
extern sqInt pushBool(sqInt trueOrFalse);
-
extern
#endif
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "SecurityPlugin VMMaker.oscog-eem.235 (i)"
+ "SecurityPlugin VMMaker.oscog-eem.497 (i)"
#else
- "SecurityPlugin VMMaker.oscog-eem.235 (e)"
+ "SecurityPlugin VMMaker.oscog-eem.497 (e)"
#endif
;
Modified: branches/Cog/nscogsrc/plugins/SocketPlugin/SocketPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/SocketPlugin/SocketPlugin.c 2013-11-02 19:45:39 UTC (rev 2797)
+++ branches/Cog/nscogsrc/plugins/SocketPlugin/SocketPlugin.c 2013-11-02 21:15:39 UTC (rev 2798)
@@ -1,9 +1,9 @@
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
from
- SocketPlugin VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ SocketPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
*/
-static char __buildInfo[] = "SocketPlugin VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334 " __DATE__ ;
+static char __buildInfo[] = "SocketPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ;
@@ -180,9 +180,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "SocketPlugin VMMaker.oscog-eem.496 (i)"
+ "SocketPlugin VMMaker.oscog-eem.497 (i)"
#else
- "SocketPlugin VMMaker.oscog-eem.496 (e)"
+ "SocketPlugin VMMaker.oscog-eem.497 (e)"
#endif
;
static void * sCCLOPfn;
Modified: branches/Cog/nscogsrc/plugins/SoundPlugin/SoundPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/SoundPlugin/SoundPlugin.c 2013-11-02 19:45:39 UTC (rev 2797)
+++ branches/Cog/nscogsrc/plugins/SoundPlugin/SoundPlugin.c 2013-11-02 21:15:39 UTC (rev 2798)
@@ -1,9 +1,9 @@
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
from
- SoundPlugin VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ SoundPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
*/
-static char __buildInfo[] = "SoundPlugin VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334 " __DATE__ ;
+static char __buildInfo[] = "SoundPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ;
@@ -111,9 +111,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "SoundPlugin VMMaker.oscog-eem.496 (i)"
+ "SoundPlugin VMMaker.oscog-eem.497 (i)"
#else
- "SoundPlugin VMMaker.oscog-eem.496 (e)"
+ "SoundPlugin VMMaker.oscog-eem.497 (e)"
#endif
;
Modified: branches/Cog/nscogsrc/plugins/SqueakSSL/SqueakSSL.c
===================================================================
--- branches/Cog/nscogsrc/plugins/SqueakSSL/SqueakSSL.c 2013-11-02 19:45:39 UTC (rev 2797)
+++ branches/Cog/nscogsrc/plugins/SqueakSSL/SqueakSSL.c 2013-11-02 21:15:39 UTC (rev 2798)
@@ -1,5 +1,5 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.276 uuid: 52d03a8f-11ec-4454-9c4a-ea1c383f339a
+ VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
from
SqueakSSLPlugin SqueakSSL-Plugin-ar.3 uuid: b76dbadd-ee96-5e44-abbb-8a0e3e17240a
*/
@@ -97,7 +97,6 @@
extern sqInt stackIntegerValue(sqInt offset);
extern sqInt stackObjectValue(sqInt offset);
extern sqInt stackValue(sqInt offset);
-
extern
#endif
struct VirtualMachine* interpreterProxy;
Modified: branches/Cog/nscogsrc/plugins/UUIDPlugin/UUIDPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/UUIDPlugin/UUIDPlugin.c 2013-11-02 19:45:39 UTC (rev 2797)
+++ branches/Cog/nscogsrc/plugins/UUIDPlugin/UUIDPlugin.c 2013-11-02 21:15:39 UTC (rev 2798)
@@ -1,9 +1,9 @@
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
from
- UUIDPlugin VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ UUIDPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
*/
-static char __buildInfo[] = "UUIDPlugin VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334 " __DATE__ ;
+static char __buildInfo[] = "UUIDPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ;
@@ -76,9 +76,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "UUIDPlugin VMMaker.oscog-eem.496 (i)"
+ "UUIDPlugin VMMaker.oscog-eem.497 (i)"
#else
- "UUIDPlugin VMMaker.oscog-eem.496 (e)"
+ "UUIDPlugin VMMaker.oscog-eem.497 (e)"
#endif
;
Modified: branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2013-11-02 19:45:39 UTC (rev 2797)
+++ branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2013-11-02 21:15:39 UTC (rev 2798)
@@ -1,5 +1,5 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
from
UnixOSProcessPlugin * VMConstruction-Plugins-OSProcessPlugin.oscog-eem.43 uuid: 2fe4270b-d6b6-486d-ac17-86c1adf970a4
*/
Modified: branches/Cog/nscogsrc/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c 2013-11-02 19:45:39 UTC (rev 2797)
+++ branches/Cog/nscogsrc/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c 2013-11-02 21:15:39 UTC (rev 2798)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
from
- VMProfileLinuxSupportPlugin VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ VMProfileLinuxSupportPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
*/
-static char __buildInfo[] = "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334 " __DATE__ ;
+static char __buildInfo[] = "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ;
@@ -104,9 +104,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.496 (i)"
+ "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.497 (i)"
#else
- "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.496 (e)"
+ "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.497 (e)"
#endif
;
static sqInt numModules;
Modified: branches/Cog/nscogsrc/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c 2013-11-02 19:45:39 UTC (rev 2797)
+++ branches/Cog/nscogsrc/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c 2013-11-02 21:15:39 UTC (rev 2798)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7
+ VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
from
- VMProfileMacSupportPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7
+ VMProfileMacSupportPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
*/
-static char __buildInfo[] = "VMProfileMacSupportPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ;
+static char __buildInfo[] = "VMProfileMacSupportPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ;
@@ -98,15 +98,14 @@
extern sqInt stackValue(sqInt offset);
extern sqInt storePointerofObjectwithValue(sqInt index, sqInt oop, sqInt valuePointer);
extern sqInt topRemappableOop(void);
-
extern
#endif
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "VMProfileMacSupportPlugin VMMaker.oscog-eem.235 (i)"
+ "VMProfileMacSupportPlugin VMMaker.oscog-eem.497 (i)"
#else
- "VMProfileMacSupportPlugin VMMaker.oscog-eem.235 (e)"
+ "VMProfileMacSupportPlugin VMMaker.oscog-eem.497 (e)"
#endif
;
Modified: branches/Cog/nscogsrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c 2013-11-02 19:45:39 UTC (rev 2797)
+++ branches/Cog/nscogsrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c 2013-11-02 21:15:39 UTC (rev 2798)
@@ -1,5 +1,5 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85
from
Win32OSProcessPlugin * VMConstruction-Plugins-OSProcessPlugin.oscog-eem.43 uuid: 2fe4270b-d6b6-486d-ac17-86c1adf970a4
*/
Modified: branches/Cog/nscogsrc/plugins/ZipPlugin/ZipPlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/ZipPlugin/ZipPlugin.c 2013-11-02 19:45:39 UTC (rev 2797)
+++ branches/Cog/nscogsrc/plugins/ZipPlugin/ZipPlugin.c 2013-11-02 21:15:39 UTC (rev 2798)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ VMPluginCodeGenerator VMMaker.oscog-eem.498 uuid: 429d3a33-5318-4130-addb-342eaffe0c23
from
- InflatePlugin VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334
+ DeflatePlugin VMMaker.oscog-eem.498 uuid: 429d3a33-5318-4130-addb-342eaffe0c23
*/
-static char __buildInfo[] = "InflatePlugin VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334 " __DATE__ ;
+static char __buildInfo[] = "DeflatePlugin VMMaker.oscog-eem.498 uuid: 429d3a33-5318-4130-addb-342eaffe0c23 " __DATE__ ;
@@ -38,17 +38,45 @@
/*** Constants ***/
#define BytesPerWord 4
+#define DeflateHashMask 0x7FFF
+#define DeflateHashShift 5
+#define DeflateHashTableSize 32768
+#define DeflateMaxDistance 0x8000
+#define DeflateMaxDistanceCodes 30
+#define DeflateMaxLiteralCodes 0x11E
+#define DeflateMaxMatch 258
+#define DeflateMinMatch 3
+#define DeflateWindowMask 0x7FFF
+#define DeflateWindowSize 32768
#define MaxBits 16
#define StateNoMoreData 1
/*** Function Prototypes ***/
+static sqInt comparewithmin(sqInt here, sqInt matchPos, sqInt minLength);
+static sqInt deflateBlockchainLengthgoodMatch(sqInt lastIndex, sqInt chainLength, sqInt goodMatch);
+static sqInt encodeLiteral(sqInt lit);
+static sqInt encodeMatchdistance(sqInt length, sqInt dist);
+static sqInt findMatchlastLengthlastMatchchainLengthgoodMatch(sqInt here, sqInt lastLength, sqInt lastMatch, sqInt maxChainLength, sqInt goodMatch);
static VirtualMachine * getInterpreter(void);
EXPORT(const char*) getModuleName(void);
static sqInt halt(void);
+static sqInt insertStringAt(sqInt here);
+static sqInt loadDeflateStreamFrom(sqInt rcvr);
+static sqInt loadZipEncoderFrom(sqInt rcvr);
static sqInt msg(char *s);
+static sqInt nextZipBitsput(sqInt nBits, sqInt value);
+EXPORT(sqInt) primitiveDeflateBlock(void);
+EXPORT(sqInt) primitiveDeflateUpdateHashTable(void);
EXPORT(sqInt) primitiveInflateDecompressBlock(void);
+EXPORT(sqInt) primitiveUpdateAdler32(void);
+EXPORT(void) primitiveUpdateGZipCrc32(void);
+EXPORT(sqInt) primitiveZipSendBlock(void);
+static sqInt sendBlockwithwithwith(sqInt literalStream, sqInt distanceStream, sqInt litTree, sqInt distTree);
EXPORT(sqInt) setInterpreter(struct VirtualMachine*anInterpreter);
+static sqInt shouldFlush(void);
+static sqInt updateHashAt(sqInt here);
+static sqInt updateHash(sqInt nextValue);
static sqInt zipDecodeValueFromsize(unsigned int *table, sqInt tableSize);
static sqInt zipDecompressBlock(void);
static sqInt zipNextBits(sqInt n);
@@ -63,12 +91,21 @@
static sqInt (*fetchPointerofObject)(sqInt index, sqInt oop);
static void * (*firstIndexableField)(sqInt oop);
static sqInt (*isBytes)(sqInt oop);
+static sqInt (*isIntegerObject)(sqInt objectPointer);
static sqInt (*isPointers)(sqInt oop);
static sqInt (*isWords)(sqInt oop);
static sqInt (*methodArgumentCount)(void);
static sqInt (*pop)(sqInt nItems);
+static sqInt (*popthenPush)(sqInt nItems, sqInt oop);
+static sqInt (*positive32BitIntegerFor)(sqInt integerValue);
+static sqInt (*positive32BitValueOf)(sqInt oop);
static sqInt (*primitiveFail)(void);
+static sqInt (*push)(sqInt object);
+static sqInt (*pushBool)(sqInt trueOrFalse);
+static sqInt (*pushInteger)(sqInt integerValue);
static sqInt (*slotSizeOf)(sqInt oop);
+static sqInt (*stackIntegerValue)(sqInt offset);
+static sqInt (*stackObjectValue)(sqInt offset);
static sqInt (*stackValue)(sqInt offset);
static sqInt (*storeIntegerofObjectwithValue)(sqInt index, sqInt oop, sqInt integer);
#else /* !defined(SQUEAK_BUILTIN_PLUGIN) */
@@ -78,12 +115,21 @@
extern sqInt fetchPointerofObject(sqInt index, sqInt oop);
extern void * firstIndexableField(sqInt oop);
extern sqInt isBytes(sqInt oop);
+extern sqInt isIntegerObject(sqInt objectPointer);
extern sqInt isPointers(sqInt oop);
extern sqInt isWords(sqInt oop);
extern sqInt methodArgumentCount(void);
extern sqInt pop(sqInt nItems);
+extern sqInt popthenPush(sqInt nItems, sqInt oop);
+extern sqInt positive32BitIntegerFor(sqInt integerValue);
+extern sqInt positive32BitValueOf(sqInt oop);
extern sqInt primitiveFail(void);
+extern sqInt push(sqInt object);
+extern sqInt pushBool(sqInt trueOrFalse);
+extern sqInt pushInteger(sqInt integerValue);
extern sqInt slotSizeOf(sqInt oop);
+extern sqInt stackIntegerValue(sqInt offset);
+extern sqInt stackObjectValue(sqInt offset);
extern sqInt stackValue(sqInt offset);
extern sqInt storeIntegerofObjectwithValue(sqInt index, sqInt oop, sqInt integer);
extern
@@ -91,19 +137,110 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "ZipPlugin VMMaker.oscog-eem.496 (i)"
+ "ZipPlugin VMMaker.oscog-eem.498 (i)"
#else
- "ZipPlugin VMMaker.oscog-eem.496 (e)"
+ "ZipPlugin VMMaker.oscog-eem.498 (e)"
#endif
;
+static unsigned int zipBaseDistance[] = {
+0, 1, 2, 3, 4, 6, 8, 12, 16, 24, 32, 48, 64, 96, 128, 192,
+256, 384, 512, 768, 1024, 1536, 2048, 3072, 4096, 6144, 8192, 12288, 16384, 24576};
+static unsigned int zipBaseLength[] = {
+0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28,
+32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 0};
static sqInt zipBitBuf;
static sqInt zipBitPos;
+static sqInt zipBlockPos;
+static sqInt zipBlockStart;
static unsigned char* zipCollection;
static sqInt zipCollectionSize;
+static unsigned int zipCrcTable[] = {
+0, 1996959894, 3993919788U, 2567524794U, 124634137, 1886057615, 3915621685U, 2657392035U, 249268274, 2044508324, 3772115230U, 2547177864U, 162941995, 2125561021, 3887607047U, 2428444049U,
+498536548, 1789927666, 4089016648U, 2227061214U, 450548861, 1843258603, 4107580753U, 2211677639U, 325883990, 1684777152, 4251122042U, 2321926636U, 335633487, 1661365465, 4195302755U, 2366115317U,
+997073096, 1281953886, 3579855332U, 2724688242U, 1006888145, 1258607687, 3524101629U, 2768942443U, 901097722, 1119000684, 3686517206U, 2898065728U, 853044451, 1172266101, 3705015759U, 2882616665U,
+651767980, 1373503546, 3369554304U, 3218104598U, 565507253, 1454621731, 3485111705U, 3099436303U, 671266974, 1594198024, 3322730930U, 2970347812U, 795835527, 1483230225, 3244367275U, 3060149565U,
+1994146192, 31158534, 2563907772U, 4023717930U, 1907459465, 112637215, 2680153253U, 3904427059U, 2013776290, 251722036, 2517215374U, 3775830040U, 2137656763, 141376813, 2439277719U, 3865271297U,
+1802195444, 476864866, 2238001368U, 4066508878U, 1812370925, 453092731, 2181625025U, 4111451223U, 1706088902, 314042704, 2344532202U, 4240017532U, 1658658271, 366619977, 2362670323U, 4224994405U,
+1303535960, 984961486, 2747007092U, 3569037538U, 1256170817, 1037604311, 2765210733U, 3554079995U, 1131014506, 879679996, 2909243462U, 3663771856U, 1141124467, 855842277, 2852801631U, 3708648649U,
+1342533948, 654459306, 3188396048U, 3373015174U, 1466479909, 544179635, 3110523913U, 3462522015U, 1591671054, 702138776, 2966460450U, 3352799412U, 1504918807, 783551873, 3082640443U, 3233442989U,
+3988292384U, 2596254646U, 62317068, 1957810842, 3939845945U, 2647816111U, 81470997, 1943803523, 3814918930U, 2489596804U, 225274430, 2053790376, 3826175755U, 2466906013U, 167816743, 2097651377,
+4027552580U, 2265490386U, 503444072, 1762050814, 4150417245U, 2154129355U, 426522225, 1852507879, 4275313526U, 2312317920U, 282753626, 1742555852, 4189708143U, 2394877945U, 397917763, 1622183637,
+3604390888U, 2714866558U, 953729732, 1340076626, 3518719985U, 2797360999U, 1068828381, 1219638859, 3624741850U, 2936675148U, 906185462, 1090812512, 3747672003U, 2825379669U, 829329135, 1181335161,
+3412177804U, 3160834842U, 628085408, 1382605366, 3423369109U, 3138078467U, 570562233, 1426400815, 3317316542U, 2998733608U, 733239954, 1555261956, 3268935591U, 3050360625U, 752459403, 1541320221,
+2607071920U, 3965973030U, 1969922972, 40735498, 2617837225U, 3943577151U, 1913087877, 83908371, 2512341634U, 3803740692U, 2075208622, 213261112, 2463272603U, 3855990285U, 2094854071, 198958881,
+2262029012U, 4057260610U, 1759359992, 534414190, 2176718541U, 4139329115U, 1873836001, 414664567, 2282248934U, 4279200368U, 1711684554, 285281116, 2405801727U, 4167216745U, 1634467795, 376229701,
@@ Diff output truncated at 50000 characters. @@
More information about the Vm-dev
mailing list