[Vm-dev] [commit][3542] CogVM source as per VMMaker.oscog-eem.1602

commits at squeakvm.org commits at squeakvm.org
Thu Dec 17 00:51:29 UTC 2015


Revision: 3542
Author:   eliot
Date:     2015-12-16 16:51:26 -0800 (Wed, 16 Dec 2015)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.1602

Spur: Missing classArray export.

Don't include sqMemoryAccess.h include explicitly since it's pulled in by sq.h anyway.

Fix external declarations for several functions used in the interpreter that were
previously undeclared.

Fix include paths for the (moved) gdb ARM support files.

Modified Paths:
--------------
    branches/Cog/nsspursrc/plugins/AioPlugin/AioPlugin.c
    branches/Cog/nsspursrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c
    branches/Cog/nsspursrc/plugins/B2DPlugin/B2DPlugin.c
    branches/Cog/nsspursrc/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c
    branches/Cog/nsspursrc/plugins/BitBltPlugin/BitBltPlugin.c
    branches/Cog/nsspursrc/plugins/DSAPrims/DSAPrims.c
    branches/Cog/nsspursrc/plugins/DropPlugin/DropPlugin.c
    branches/Cog/nsspursrc/plugins/FileCopyPlugin/FileCopyPlugin.c
    branches/Cog/nsspursrc/plugins/FilePlugin/FilePlugin.c
    branches/Cog/nsspursrc/plugins/FloatArrayPlugin/FloatArrayPlugin.c
    branches/Cog/nsspursrc/plugins/FloatMathPlugin/FloatMathPlugin.c
    branches/Cog/nsspursrc/plugins/IA32ABI/IA32ABI.c
    branches/Cog/nsspursrc/plugins/ImmX11Plugin/ImmX11Plugin.c
    branches/Cog/nsspursrc/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c
    branches/Cog/nsspursrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c
    branches/Cog/nsspursrc/plugins/LargeIntegers/LargeIntegers.c
    branches/Cog/nsspursrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c
    branches/Cog/nsspursrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c
    branches/Cog/nsspursrc/plugins/RePlugin/RePlugin.c
    branches/Cog/nsspursrc/plugins/SecurityPlugin/SecurityPlugin.c
    branches/Cog/nsspursrc/plugins/SocketPlugin/SocketPlugin.c
    branches/Cog/nsspursrc/plugins/SoundPlugin/SoundPlugin.c
    branches/Cog/nsspursrc/plugins/SqueakSSL/SqueakSSL.c
    branches/Cog/nsspursrc/plugins/UUIDPlugin/UUIDPlugin.c
    branches/Cog/nsspursrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c
    branches/Cog/nsspursrc/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c
    branches/Cog/nsspursrc/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c
    branches/Cog/nsspursrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c
    branches/Cog/nsspursrc/plugins/ZipPlugin/ZipPlugin.c
    branches/Cog/nsspursrc/vm/cogit.h
    branches/Cog/nsspursrc/vm/cogitARMv5.c
    branches/Cog/nsspursrc/vm/cogitIA32.c
    branches/Cog/nsspursrc/vm/cointerp.c
    branches/Cog/nsspursrc/vm/cointerp.h
    branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
    branches/Cog/nsspurstack64src/vm/gcc3x-interp.c
    branches/Cog/nsspurstack64src/vm/interp.c
    branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c
    branches/Cog/nsspurstacksrc/vm/interp.c
    branches/Cog/platforms/Cross/vm/sq.h
    branches/Cog/platforms/Cross/vm/sqExternalSemaphores.c
    branches/Cog/platforms/Cross/vm/sqVirtualMachine.c
    branches/Cog/platforms/Mac OS/vm/sqMacTime.c
    branches/Cog/platforms/iOS/vm/Common/Classes/sqMacV2Time.c
    branches/Cog/platforms/iOS/vm/iPhone/sqDummyaio.c
    branches/Cog/platforms/unix/plugins/GdbARMPlugin/Makefile.inc
    branches/Cog/platforms/unix/vm/aio.c
    branches/Cog/platforms/unix/vm/sqUnixHeartbeat.c
    branches/Cog/platforms/unix/vm/sqUnixITimerHeartbeat.c
    branches/Cog/platforms/unix/vm/sqUnixITimerTickerHeartbeat.c
    branches/Cog/platforms/unix/vm/sqaio.h
    branches/Cog/platforms/unix/vm-display-fbdev/Makefile.in
    branches/Cog/platforms/win32/vm/sqWin32Heartbeat.c
    branches/Cog/platforms/win32/vm/sqWin32Time.c
    branches/Cog/spur64src/vm/cogit.h
    branches/Cog/spur64src/vm/cogitX64.c
    branches/Cog/spur64src/vm/cointerp.c
    branches/Cog/spur64src/vm/cointerp.h
    branches/Cog/spur64src/vm/gcc3x-cointerp.c
    branches/Cog/spursistasrc/vm/cogit.h
    branches/Cog/spursistasrc/vm/cogitARMv5.c
    branches/Cog/spursistasrc/vm/cogitIA32.c
    branches/Cog/spursistasrc/vm/cointerp.c
    branches/Cog/spursistasrc/vm/cointerp.h
    branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
    branches/Cog/spursrc/vm/cogit.h
    branches/Cog/spursrc/vm/cogitARMv5.c
    branches/Cog/spursrc/vm/cogitIA32.c
    branches/Cog/spursrc/vm/cointerp.c
    branches/Cog/spursrc/vm/cointerp.h
    branches/Cog/spursrc/vm/gcc3x-cointerp.c
    branches/Cog/spurstack64src/vm/gcc3x-interp.c
    branches/Cog/spurstack64src/vm/interp.c
    branches/Cog/spurstacksrc/vm/gcc3x-interp.c
    branches/Cog/spurstacksrc/vm/interp.c
    branches/Cog/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c
    branches/Cog/src/plugins/AioPlugin/AioPlugin.c
    branches/Cog/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c
    branches/Cog/src/plugins/B2DPlugin/B2DPlugin.c
    branches/Cog/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c
    branches/Cog/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c
    branches/Cog/src/plugins/BitBltPlugin/BitBltPlugin.c
    branches/Cog/src/plugins/BochsIA32Plugin/BochsIA32Plugin.c
    branches/Cog/src/plugins/BochsX64Plugin/BochsX64Plugin.c
    branches/Cog/src/plugins/CameraPlugin/CameraPlugin.c
    branches/Cog/src/plugins/CroquetPlugin/CroquetPlugin.c
    branches/Cog/src/plugins/DSAPrims/DSAPrims.c
    branches/Cog/src/plugins/DropPlugin/DropPlugin.c
    branches/Cog/src/plugins/FFTPlugin/FFTPlugin.c
    branches/Cog/src/plugins/FileCopyPlugin/FileCopyPlugin.c
    branches/Cog/src/plugins/FilePlugin/FilePlugin.c
    branches/Cog/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c
    branches/Cog/src/plugins/FloatMathPlugin/FloatMathPlugin.c
    branches/Cog/src/plugins/GdbARMPlugin/GdbARMPlugin.c
    branches/Cog/src/plugins/GeniePlugin/GeniePlugin.c
    branches/Cog/src/plugins/HostWindowPlugin/HostWindowPlugin.c
    branches/Cog/src/plugins/IA32ABI/IA32ABI.c
    branches/Cog/src/plugins/ImmX11Plugin/ImmX11Plugin.c
    branches/Cog/src/plugins/InternetConfigPlugin/InternetConfigPlugin.c
    branches/Cog/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c
    branches/Cog/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c
    branches/Cog/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c
    branches/Cog/src/plugins/Klatt/Klatt.c
    branches/Cog/src/plugins/LargeIntegers/LargeIntegers.c
    branches/Cog/src/plugins/LocalePlugin/LocalePlugin.c
    branches/Cog/src/plugins/MIDIPlugin/MIDIPlugin.c
    branches/Cog/src/plugins/MacMenubarPlugin/MacMenubarPlugin.c
    branches/Cog/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c
    branches/Cog/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c
    branches/Cog/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c
    branches/Cog/src/plugins/QuicktimePlugin/QuicktimePlugin.c
    branches/Cog/src/plugins/RePlugin/RePlugin.c
    branches/Cog/src/plugins/ScratchPlugin/ScratchPlugin.c
    branches/Cog/src/plugins/SecurityPlugin/SecurityPlugin.c
    branches/Cog/src/plugins/SerialPlugin/SerialPlugin.c
    branches/Cog/src/plugins/SocketPlugin/SocketPlugin.c
    branches/Cog/src/plugins/SoundCodecPrims/SoundCodecPrims.c
    branches/Cog/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c
    branches/Cog/src/plugins/SoundPlugin/SoundPlugin.c
    branches/Cog/src/plugins/Squeak3D/Squeak3D.c
    branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c
    branches/Cog/src/plugins/SqueakFFIPrims/IA32FFIPlugin.c
    branches/Cog/src/plugins/SqueakSSL/SqueakSSL.c
    branches/Cog/src/plugins/StarSqueakPlugin/StarSqueakPlugin.c
    branches/Cog/src/plugins/UUIDPlugin/UUIDPlugin.c
    branches/Cog/src/plugins/UnicodePlugin/UnicodePlugin.c
    branches/Cog/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c
    branches/Cog/src/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c
    branches/Cog/src/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c
    branches/Cog/src/plugins/WeDoPlugin/WeDoPlugin.c
    branches/Cog/src/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c
    branches/Cog/src/plugins/XDisplayControlPlugin/XDisplayControlPlugin.c
    branches/Cog/src/plugins/ZipPlugin/ZipPlugin.c
    branches/Cog/src/vm/cogit.h
    branches/Cog/src/vm/cogitARMv5.c
    branches/Cog/src/vm/cogitIA32.c
    branches/Cog/src/vm/cointerp.c
    branches/Cog/src/vm/cointerp.h
    branches/Cog/src/vm/cointerpmt.c
    branches/Cog/src/vm/cointerpmt.h
    branches/Cog/src/vm/gcc3x-cointerp.c
    branches/Cog/src/vm/gcc3x-cointerpmt.c
    branches/Cog/stacksrc/vm/gcc3x-interp.c
    branches/Cog/stacksrc/vm/interp.c

Property Changed:
----------------
    branches/Cog/platforms/Cross/vm/sqSCCSVersion.h

Modified: branches/Cog/nsspursrc/plugins/AioPlugin/AioPlugin.c
===================================================================
--- branches/Cog/nsspursrc/plugins/AioPlugin/AioPlugin.c	2015-12-16 22:44:04 UTC (rev 3541)
+++ branches/Cog/nsspursrc/plugins/AioPlugin/AioPlugin.c	2015-12-17 00:51:26 UTC (rev 3542)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	VMPluginCodeGenerator VMMaker.oscog-eem.1559 uuid: 52385182-ad6d-4bdc-975a-7328fd81b6da
+	VMPluginCodeGenerator VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
    from
 	UnixAioPlugin VMConstruction-Plugins-AioPlugin-eem.18 uuid: c426ab70-05a2-43a1-a899-e324aaf8f92f
  */
@@ -19,20 +19,16 @@
 #define EXPORT(returnType) returnType
 
 /* Do not include the entire sq.h file but just those parts needed. */
-/*  The virtual machine proxy definition */
-#include "sqVirtualMachine.h"
-/* Configuration options */
-#include "sqConfig.h"
-/* Platform specific definitions */
-#include "sqPlatformSpecific.h"
+#include "sqConfig.h"			/* Configuration options */
+#include "sqVirtualMachine.h"	/*  The virtual machine proxy definition */
+#include "sqPlatformSpecific.h"	/* Platform specific definitions */
 
 #define true 1
 #define false 0
 #define null 0  /* using 'null' because nil is predefined in Think C */
 #ifdef SQUEAK_BUILTIN_PLUGIN
-#undef EXPORT
-// was #undef EXPORT(returnType) but screws NorCroft cc
-#define EXPORT(returnType) static returnType
+# undef EXPORT
+# define EXPORT(returnType) static returnType
 #endif
 
 #include "FilePlugin.h"

Modified: branches/Cog/nsspursrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c
===================================================================
--- branches/Cog/nsspursrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c	2015-12-16 22:44:04 UTC (rev 3541)
+++ branches/Cog/nsspursrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c	2015-12-17 00:51:26 UTC (rev 3542)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1468 uuid: 2b6a8fd8-cddf-447d-bee4-11d53d2ef9bc
+	SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
    from
-	AsynchFilePlugin VMMaker.oscog-eem.1468 uuid: 2b6a8fd8-cddf-447d-bee4-11d53d2ef9bc
+	AsynchFilePlugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
  */
-static char __buildInfo[] = "AsynchFilePlugin VMMaker.oscog-eem.1468 uuid: 2b6a8fd8-cddf-447d-bee4-11d53d2ef9bc " __DATE__ ;
+static char __buildInfo[] = "AsynchFilePlugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef " __DATE__ ;
 
 
 
@@ -17,20 +17,16 @@
 #define EXPORT(returnType) returnType
 
 /* Do not include the entire sq.h file but just those parts needed. */
-/*  The virtual machine proxy definition */
-#include "sqVirtualMachine.h"
-/* Configuration options */
-#include "sqConfig.h"
-/* Platform specific definitions */
-#include "sqPlatformSpecific.h"
+#include "sqConfig.h"			/* Configuration options */
+#include "sqVirtualMachine.h"	/*  The virtual machine proxy definition */
+#include "sqPlatformSpecific.h"	/* Platform specific definitions */
 
 #define true 1
 #define false 0
 #define null 0  /* using 'null' because nil is predefined in Think C */
 #ifdef SQUEAK_BUILTIN_PLUGIN
-#undef EXPORT
-// was #undef EXPORT(returnType) but screws NorCroft cc
-#define EXPORT(returnType) static returnType
+# undef EXPORT
+# define EXPORT(returnType) static returnType
 #endif
 
 #include "AsynchFilePlugin.h"
@@ -102,9 +98,9 @@
 struct VirtualMachine* interpreterProxy;
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"AsynchFilePlugin VMMaker.oscog-eem.1468 (i)"
+	"AsynchFilePlugin VMMaker.oscog-eem.1602 (i)"
 #else
-	"AsynchFilePlugin VMMaker.oscog-eem.1468 (e)"
+	"AsynchFilePlugin VMMaker.oscog-eem.1602 (e)"
 #endif
 ;
 static void * sCOAFfn;
@@ -162,7 +158,6 @@
 	if ((strcmp(aModuleName, "SecurityPlugin")) == 0) {
 
 		/* The security plugin just shut down. How odd. Zero the function pointer we have into it */
-
 		sCOAFfn = 0;
 	}
 }
@@ -220,7 +215,6 @@
 
 	/* If the security plugin can be loaded, use it to check for permission.
 	   If not, assume it's ok */
-
 	fileNameSize = byteSizeOf(((sqInt)((fileName) - BaseHeaderSize)));
 	if (sCOAFfn != 0) {
 		okToOpen = ((sqInt (*) (char *, sqInt, sqInt)) sCOAFfn)(fileName, fileNameSize, writeFlag);
@@ -285,12 +279,10 @@
 	startIndex = start;
 
 	/* in bytes or words */
-
 	bufferSize = slotSizeOf(buffer);
 	if (isWords(buffer)) {
 
 		/* covert word counts to byte counts */
-
 		count = count * 4;
 		startIndex = ((startIndex - 1) * 4) + 1;
 		bufferSize = bufferSize * 4;
@@ -415,12 +407,10 @@
 	startIndex = start;
 
 	/* in bytes or words */
-
 	bufferSize = slotSizeOf(buffer);
 	if (isWords(buffer)) {
 
 		/* covert word counts to byte counts */
-
 		count = count * 4;
 		startIndex = ((startIndex - 1) * 4) + 1;
 		bufferSize = bufferSize * 4;

Modified: branches/Cog/nsspursrc/plugins/B2DPlugin/B2DPlugin.c
===================================================================
--- branches/Cog/nsspursrc/plugins/B2DPlugin/B2DPlugin.c	2015-12-16 22:44:04 UTC (rev 3541)
+++ branches/Cog/nsspursrc/plugins/B2DPlugin/B2DPlugin.c	2015-12-17 00:51:26 UTC (rev 3542)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	VMPluginCodeGenerator VMMaker.oscog-eem.1601 uuid: faa527e8-769c-4c9d-b4c9-8ce48b8edbd5
+	VMPluginCodeGenerator VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
    from
-	BalloonEnginePlugin VMMaker.oscog-eem.1601 uuid: faa527e8-769c-4c9d-b4c9-8ce48b8edbd5
+	BalloonEnginePlugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
  */
-static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.1601 uuid: faa527e8-769c-4c9d-b4c9-8ce48b8edbd5 " __DATE__ ;
+static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef " __DATE__ ;
 
 
 
@@ -17,20 +17,16 @@
 #define EXPORT(returnType) returnType
 
 /* Do not include the entire sq.h file but just those parts needed. */
-/*  The virtual machine proxy definition */
-#include "sqVirtualMachine.h"
-/* Configuration options */
-#include "sqConfig.h"
-/* Platform specific definitions */
-#include "sqPlatformSpecific.h"
+#include "sqConfig.h"			/* Configuration options */
+#include "sqVirtualMachine.h"	/*  The virtual machine proxy definition */
+#include "sqPlatformSpecific.h"	/* Platform specific definitions */
 
 #define true 1
 #define false 0
 #define null 0  /* using 'null' because nil is predefined in Think C */
 #ifdef SQUEAK_BUILTIN_PLUGIN
-#undef EXPORT
-// was #undef EXPORT(returnType) but screws NorCroft cc
-#define EXPORT(returnType) static returnType
+# undef EXPORT
+# define EXPORT(returnType) static returnType
 #endif
 
 #include "sqMemoryAccess.h"
@@ -836,9 +832,9 @@
 static void * loadBBFn;
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"B2DPlugin VMMaker.oscog-eem.1601 (i)"
+	"B2DPlugin VMMaker.oscog-eem.1602 (i)"
 #else
-	"B2DPlugin VMMaker.oscog-eem.1601 (e)"
+	"B2DPlugin VMMaker.oscog-eem.1602 (e)"
 #endif
 ;
 static int* objBuffer;

Modified: branches/Cog/nsspursrc/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c
===================================================================
--- branches/Cog/nsspursrc/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c	2015-12-16 22:44:04 UTC (rev 3541)
+++ branches/Cog/nsspursrc/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c	2015-12-17 00:51:26 UTC (rev 3542)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	VMPluginCodeGenerator VMMaker.oscog-eem.1559 uuid: 52385182-ad6d-4bdc-975a-7328fd81b6da
+	VMPluginCodeGenerator VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
    from
-	BMPReadWriterPlugin VMMaker.oscog-eem.1559 uuid: 52385182-ad6d-4bdc-975a-7328fd81b6da
+	BMPReadWriterPlugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
  */
-static char __buildInfo[] = "BMPReadWriterPlugin VMMaker.oscog-eem.1559 uuid: 52385182-ad6d-4bdc-975a-7328fd81b6da " __DATE__ ;
+static char __buildInfo[] = "BMPReadWriterPlugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef " __DATE__ ;
 
 
 
@@ -17,20 +17,16 @@
 #define EXPORT(returnType) returnType
 
 /* Do not include the entire sq.h file but just those parts needed. */
-/*  The virtual machine proxy definition */
-#include "sqVirtualMachine.h"
-/* Configuration options */
-#include "sqConfig.h"
-/* Platform specific definitions */
-#include "sqPlatformSpecific.h"
+#include "sqConfig.h"			/* Configuration options */
+#include "sqVirtualMachine.h"	/*  The virtual machine proxy definition */
+#include "sqPlatformSpecific.h"	/* Platform specific definitions */
 
 #define true 1
 #define false 0
 #define null 0  /* using 'null' because nil is predefined in Think C */
 #ifdef SQUEAK_BUILTIN_PLUGIN
-#undef EXPORT
-// was #undef EXPORT(returnType) but screws NorCroft cc
-#define EXPORT(returnType) static returnType
+# undef EXPORT
+# define EXPORT(returnType) static returnType
 #endif
 
 #include "sqMemoryAccess.h"
@@ -72,9 +68,9 @@
 struct VirtualMachine* interpreterProxy;
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"BMPReadWriterPlugin VMMaker.oscog-eem.1559 (i)"
+	"BMPReadWriterPlugin VMMaker.oscog-eem.1602 (i)"
 #else
-	"BMPReadWriterPlugin VMMaker.oscog-eem.1559 (e)"
+	"BMPReadWriterPlugin VMMaker.oscog-eem.1602 (e)"
 #endif
 ;
 

Modified: branches/Cog/nsspursrc/plugins/BitBltPlugin/BitBltPlugin.c
===================================================================
--- branches/Cog/nsspursrc/plugins/BitBltPlugin/BitBltPlugin.c	2015-12-16 22:44:04 UTC (rev 3541)
+++ branches/Cog/nsspursrc/plugins/BitBltPlugin/BitBltPlugin.c	2015-12-17 00:51:26 UTC (rev 3542)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1601 uuid: faa527e8-769c-4c9d-b4c9-8ce48b8edbd5
+	SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
    from
-	BitBltSimulation VMMaker.oscog-eem.1601 uuid: faa527e8-769c-4c9d-b4c9-8ce48b8edbd5
+	BitBltSimulation VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
  */
-static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-eem.1601 uuid: faa527e8-769c-4c9d-b4c9-8ce48b8edbd5 " __DATE__ ;
+static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef " __DATE__ ;
 
 
 
@@ -17,20 +17,16 @@
 #define EXPORT(returnType) returnType
 
 /* Do not include the entire sq.h file but just those parts needed. */
-/*  The virtual machine proxy definition */
-#include "sqVirtualMachine.h"
-/* Configuration options */
-#include "sqConfig.h"
-/* Platform specific definitions */
-#include "sqPlatformSpecific.h"
+#include "sqConfig.h"			/* Configuration options */
+#include "sqVirtualMachine.h"	/*  The virtual machine proxy definition */
+#include "sqPlatformSpecific.h"	/* Platform specific definitions */
 
 #define true 1
 #define false 0
 #define null 0  /* using 'null' because nil is predefined in Think C */
 #ifdef SQUEAK_BUILTIN_PLUGIN
-#undef EXPORT
-// was #undef EXPORT(returnType) but screws NorCroft cc
-#define EXPORT(returnType) static returnType
+# undef EXPORT
+# define EXPORT(returnType) static returnType
 #endif
 
 #ifdef ENABLE_FAST_BLT
@@ -344,9 +340,9 @@
 };
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"BitBltPlugin VMMaker.oscog-eem.1601 (i)"
+	"BitBltPlugin VMMaker.oscog-eem.1602 (i)"
 #else
-	"BitBltPlugin VMMaker.oscog-eem.1601 (e)"
+	"BitBltPlugin VMMaker.oscog-eem.1602 (e)"
 #endif
 ;
 static sqInt noHalftone;

Modified: branches/Cog/nsspursrc/plugins/DSAPrims/DSAPrims.c
===================================================================
--- branches/Cog/nsspursrc/plugins/DSAPrims/DSAPrims.c	2015-12-16 22:44:04 UTC (rev 3541)
+++ branches/Cog/nsspursrc/plugins/DSAPrims/DSAPrims.c	2015-12-17 00:51:26 UTC (rev 3542)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	VMPluginCodeGenerator VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8
+	VMPluginCodeGenerator VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
    from
 	DSAPlugin CryptographyPlugins-rww.10 uuid: 8beefa4e-8411-4385-93ed-1c5d66481465
  */
@@ -17,20 +17,16 @@
 #define EXPORT(returnType) returnType
 
 /* Do not include the entire sq.h file but just those parts needed. */
-/*  The virtual machine proxy definition */
-#include "sqVirtualMachine.h"
-/* Configuration options */
-#include "sqConfig.h"
-/* Platform specific definitions */
-#include "sqPlatformSpecific.h"
+#include "sqConfig.h"			/* Configuration options */
+#include "sqVirtualMachine.h"	/*  The virtual machine proxy definition */
+#include "sqPlatformSpecific.h"	/* Platform specific definitions */
 
 #define true 1
 #define false 0
 #define null 0  /* using 'null' because nil is predefined in Think C */
 #ifdef SQUEAK_BUILTIN_PLUGIN
-#undef EXPORT
-// was #undef EXPORT(returnType) but screws NorCroft cc
-#define EXPORT(returnType) static returnType
+# undef EXPORT
+# define EXPORT(returnType) static returnType
 #endif
 
 #include "sqMemoryAccess.h"
@@ -167,12 +163,10 @@
 	for (j = remainderDigitCount; j >= (divisorDigitCount + 1); j += -1) {
 
 		/* extract the top several digits of remainder. */
-
 		firstDigit = dsaRemainder[j];
 		firstTwoDigits = (((usqInt) firstDigit << 8)) + (dsaRemainder[j - 1]);
 
 		/* estimate q, the next digit of the quotient */
-
 		thirdDigit = dsaRemainder[j - 2];
 		if (firstDigit == d1) {
 			q = 0xFF;
@@ -198,7 +192,6 @@
 				if (resultDigit < 0) {
 
 					/* borrow from the next digit */
-
 					resultDigit += 256;
 					borrow += 1;
 				}
@@ -213,7 +206,6 @@
 			if (resultDigit < 0) {
 
 				/* digit was too large (this case is quite rare) */
-
 				dsaRemainder[rIndex1] = (resultDigit + 256);
 				qTooBig = 1;
 				goto l1;
@@ -227,7 +219,6 @@
 			if (qTooBig) {
 
 				/* this case is extremely rare */
-
 				/* begin addBackDivisorDigitShift: */
 				carry = 0;
 				rIndex = digitShift + 1;
@@ -319,7 +310,6 @@
 	divisorDigitCount = stSizeOf(div);
 
 	/* adjust pointers for base-1 indexing */
-
 	remainderDigitCount = stSizeOf(rem);
 	dsaRemainder -= 1;
 	dsaDivisor -= 1;
@@ -330,12 +320,10 @@
 	for (j = remainderDigitCount; j >= (divisorDigitCount + 1); j += -1) {
 
 		/* extract the top several digits of remainder. */
-
 		firstDigit = dsaRemainder[j];
 		firstTwoDigits = (((usqInt) firstDigit << 8)) + (dsaRemainder[j - 1]);
 
 		/* estimate q, the next digit of the quotient */
-
 		thirdDigit = dsaRemainder[j - 2];
 		if (firstDigit == d1) {
 			q = 0xFF;
@@ -361,7 +349,6 @@
 				if (resultDigit < 0) {
 
 					/* borrow from the next digit */
-
 					resultDigit += 256;
 					borrow += 1;
 				}
@@ -376,7 +363,6 @@
 			if (resultDigit < 0) {
 
 				/* digit was too large (this case is quite rare) */
-
 				dsaRemainder[rIndex1] = (resultDigit + 256);
 				qTooBig = 1;
 				goto l1;
@@ -390,7 +376,6 @@
 			if (qTooBig) {
 
 				/* this case is extremely rare */
-
 				/* begin addBackDivisorDigitShift: */
 				carry = 0;
 				rIndex = digitShift + 1;
@@ -464,7 +449,6 @@
 			carry = 0;
 
 			/* Loop invariants: 0 <= carry <= 16rFF, k = i + j - 1 */
-
 			k = i;
 			for (j = 0; j < f2Len; j += 1) {
 				sum = (((f2Ptr[j]) * digit) + (prodPtr[k])) + carry;
@@ -701,7 +685,6 @@
 		if (resultDigit < 0) {
 
 			/* borrow from the next digit */
-
 			resultDigit += 256;
 			borrow += 1;
 		}
@@ -715,7 +698,6 @@
 	if (resultDigit < 0) {
 
 		/* digit was too large (this case is quite rare) */
-
 		dsaRemainder[rIndex] = (resultDigit + 256);
 		return 1;
 	}

Modified: branches/Cog/nsspursrc/plugins/DropPlugin/DropPlugin.c
===================================================================
--- branches/Cog/nsspursrc/plugins/DropPlugin/DropPlugin.c	2015-12-16 22:44:04 UTC (rev 3541)
+++ branches/Cog/nsspursrc/plugins/DropPlugin/DropPlugin.c	2015-12-17 00:51:26 UTC (rev 3542)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	VMPluginCodeGenerator VMMaker.oscog-eem.1559 uuid: 52385182-ad6d-4bdc-975a-7328fd81b6da
+	VMPluginCodeGenerator VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
    from
-	DropPlugin VMMaker.oscog-eem.1559 uuid: 52385182-ad6d-4bdc-975a-7328fd81b6da
+	DropPlugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
  */
-static char __buildInfo[] = "DropPlugin VMMaker.oscog-eem.1559 uuid: 52385182-ad6d-4bdc-975a-7328fd81b6da " __DATE__ ;
+static char __buildInfo[] = "DropPlugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef " __DATE__ ;
 
 
 
@@ -17,20 +17,16 @@
 #define EXPORT(returnType) returnType
 
 /* Do not include the entire sq.h file but just those parts needed. */
-/*  The virtual machine proxy definition */
-#include "sqVirtualMachine.h"
-/* Configuration options */
-#include "sqConfig.h"
-/* Platform specific definitions */
-#include "sqPlatformSpecific.h"
+#include "sqConfig.h"			/* Configuration options */
+#include "sqVirtualMachine.h"	/*  The virtual machine proxy definition */
+#include "sqPlatformSpecific.h"	/* Platform specific definitions */
 
 #define true 1
 #define false 0
 #define null 0  /* using 'null' because nil is predefined in Think C */
 #ifdef SQUEAK_BUILTIN_PLUGIN
-#undef EXPORT
-// was #undef EXPORT(returnType) but screws NorCroft cc
-#define EXPORT(returnType) static returnType
+# undef EXPORT
+# define EXPORT(returnType) static returnType
 #endif
 
 #include "DropPlugin.h"
@@ -74,9 +70,9 @@
 struct VirtualMachine* interpreterProxy;
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"DropPlugin VMMaker.oscog-eem.1559 (i)"
+	"DropPlugin VMMaker.oscog-eem.1602 (i)"
 #else
-	"DropPlugin VMMaker.oscog-eem.1559 (e)"
+	"DropPlugin VMMaker.oscog-eem.1602 (e)"
 #endif
 ;
 
@@ -119,7 +115,6 @@
 	dropIndex = stackIntegerValue(0);
 
 	/* dropRequestFileHandle needs to return the actual oop returned */
-
 	handleOop = dropRequestFileHandle(dropIndex);
 	if (!(failed())) {
 		pop(2);
@@ -149,7 +144,6 @@
 	dropIndex = stackIntegerValue(0);
 
 	/* dropRequestFileName returns name or NULL on error */
-
 	dropName = dropRequestFileName(dropIndex);
 	if (dropName == null) {
 		return primitiveFail();

Modified: branches/Cog/nsspursrc/plugins/FileCopyPlugin/FileCopyPlugin.c
===================================================================
--- branches/Cog/nsspursrc/plugins/FileCopyPlugin/FileCopyPlugin.c	2015-12-16 22:44:04 UTC (rev 3541)
+++ branches/Cog/nsspursrc/plugins/FileCopyPlugin/FileCopyPlugin.c	2015-12-17 00:51:26 UTC (rev 3542)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1559 uuid: 52385182-ad6d-4bdc-975a-7328fd81b6da
+	SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
    from
-	FileCopyPlugin VMMaker.oscog-eem.1559 uuid: 52385182-ad6d-4bdc-975a-7328fd81b6da
+	FileCopyPlugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
  */
-static char __buildInfo[] = "FileCopyPlugin VMMaker.oscog-eem.1559 uuid: 52385182-ad6d-4bdc-975a-7328fd81b6da " __DATE__ ;
+static char __buildInfo[] = "FileCopyPlugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef " __DATE__ ;
 
 
 
@@ -17,20 +17,16 @@
 #define EXPORT(returnType) returnType
 
 /* Do not include the entire sq.h file but just those parts needed. */
-/*  The virtual machine proxy definition */
-#include "sqVirtualMachine.h"
-/* Configuration options */
-#include "sqConfig.h"
-/* Platform specific definitions */
-#include "sqPlatformSpecific.h"
+#include "sqConfig.h"			/* Configuration options */
+#include "sqVirtualMachine.h"	/*  The virtual machine proxy definition */
+#include "sqPlatformSpecific.h"	/* Platform specific definitions */
 
 #define true 1
 #define false 0
 #define null 0  /* using 'null' because nil is predefined in Think C */
 #ifdef SQUEAK_BUILTIN_PLUGIN
-#undef EXPORT
-// was #undef EXPORT(returnType) but screws NorCroft cc
-#define EXPORT(returnType) static returnType
+# undef EXPORT
+# define EXPORT(returnType) static returnType
 #endif
 
 #include "sqMemoryAccess.h"
@@ -68,9 +64,9 @@
 struct VirtualMachine* interpreterProxy;
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"FileCopyPlugin VMMaker.oscog-eem.1559 (i)"
+	"FileCopyPlugin VMMaker.oscog-eem.1602 (i)"
 #else
-	"FileCopyPlugin VMMaker.oscog-eem.1559 (e)"
+	"FileCopyPlugin VMMaker.oscog-eem.1602 (e)"
 #endif
 ;
 

Modified: branches/Cog/nsspursrc/plugins/FilePlugin/FilePlugin.c
===================================================================
--- branches/Cog/nsspursrc/plugins/FilePlugin/FilePlugin.c	2015-12-16 22:44:04 UTC (rev 3541)
+++ branches/Cog/nsspursrc/plugins/FilePlugin/FilePlugin.c	2015-12-17 00:51:26 UTC (rev 3542)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	VMPluginCodeGenerator VMMaker.oscog-eem.1601 uuid: faa527e8-769c-4c9d-b4c9-8ce48b8edbd5
+	VMPluginCodeGenerator VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
    from
-	FilePlugin VMMaker.oscog-eem.1601 uuid: faa527e8-769c-4c9d-b4c9-8ce48b8edbd5
+	FilePlugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
  */
-static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.1601 uuid: faa527e8-769c-4c9d-b4c9-8ce48b8edbd5 " __DATE__ ;
+static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef " __DATE__ ;
 
 
 
@@ -17,20 +17,16 @@
 #define EXPORT(returnType) returnType
 
 /* Do not include the entire sq.h file but just those parts needed. */
-/*  The virtual machine proxy definition */
-#include "sqVirtualMachine.h"
-/* Configuration options */
-#include "sqConfig.h"
-/* Platform specific definitions */
-#include "sqPlatformSpecific.h"
+#include "sqConfig.h"			/* Configuration options */
+#include "sqVirtualMachine.h"	/*  The virtual machine proxy definition */
+#include "sqPlatformSpecific.h"	/* Platform specific definitions */
 
 #define true 1
 #define false 0
 #define null 0  /* using 'null' because nil is predefined in Think C */
 #ifdef SQUEAK_BUILTIN_PLUGIN
-#undef EXPORT
-// was #undef EXPORT(returnType) but screws NorCroft cc
-#define EXPORT(returnType) static returnType
+# undef EXPORT
+# define EXPORT(returnType) static returnType
 #endif
 
 #include "FilePlugin.h"
@@ -181,9 +177,9 @@
 struct VirtualMachine* interpreterProxy;
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"FilePlugin VMMaker.oscog-eem.1601 (i)"
+	"FilePlugin VMMaker.oscog-eem.1602 (i)"
 #else
-	"FilePlugin VMMaker.oscog-eem.1601 (e)"
+	"FilePlugin VMMaker.oscog-eem.1602 (e)"
 #endif
 ;
 static void * sCCPfn;

Modified: branches/Cog/nsspursrc/plugins/FloatArrayPlugin/FloatArrayPlugin.c
===================================================================
--- branches/Cog/nsspursrc/plugins/FloatArrayPlugin/FloatArrayPlugin.c	2015-12-16 22:44:04 UTC (rev 3541)
+++ branches/Cog/nsspursrc/plugins/FloatArrayPlugin/FloatArrayPlugin.c	2015-12-17 00:51:26 UTC (rev 3542)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	VMPluginCodeGenerator VMMaker.oscog-eem.1559 uuid: 52385182-ad6d-4bdc-975a-7328fd81b6da
+	VMPluginCodeGenerator VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
    from
-	FloatArrayPlugin VMMaker.oscog-eem.1559 uuid: 52385182-ad6d-4bdc-975a-7328fd81b6da
+	FloatArrayPlugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
  */
-static char __buildInfo[] = "FloatArrayPlugin VMMaker.oscog-eem.1559 uuid: 52385182-ad6d-4bdc-975a-7328fd81b6da " __DATE__ ;
+static char __buildInfo[] = "FloatArrayPlugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef " __DATE__ ;
 
 
 
@@ -17,20 +17,16 @@
 #define EXPORT(returnType) returnType
 
 /* Do not include the entire sq.h file but just those parts needed. */
-/*  The virtual machine proxy definition */
-#include "sqVirtualMachine.h"
-/* Configuration options */
-#include "sqConfig.h"
-/* Platform specific definitions */
-#include "sqPlatformSpecific.h"
+#include "sqConfig.h"			/* Configuration options */
+#include "sqVirtualMachine.h"	/*  The virtual machine proxy definition */
+#include "sqPlatformSpecific.h"	/* Platform specific definitions */
 
 #define true 1
 #define false 0
 #define null 0  /* using 'null' because nil is predefined in Think C */
 #ifdef SQUEAK_BUILTIN_PLUGIN
-#undef EXPORT
-// was #undef EXPORT(returnType) but screws NorCroft cc
-#define EXPORT(returnType) static returnType
+# undef EXPORT
+# define EXPORT(returnType) static returnType
 #endif
 
 #include "sqMemoryAccess.h"
@@ -106,9 +102,9 @@
 struct VirtualMachine* interpreterProxy;
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"FloatArrayPlugin VMMaker.oscog-eem.1559 (i)"
+	"FloatArrayPlugin VMMaker.oscog-eem.1602 (i)"
 #else
-	"FloatArrayPlugin VMMaker.oscog-eem.1559 (e)"
+	"FloatArrayPlugin VMMaker.oscog-eem.1602 (e)"
 #endif
 ;
 
@@ -290,7 +286,6 @@
 	rcvrPtr = ((float *) (firstIndexableField(rcvr)));
 
 	/* Check if any of the argument's values is zero */
-
 	argPtr = ((float *) (firstIndexableField(arg)));
 	for (i = 0; i < length; i += 1) {
 		if ((intAtPointer(((char*) (argPtr + i)))) == 0) {

Modified: branches/Cog/nsspursrc/plugins/FloatMathPlugin/FloatMathPlugin.c
===================================================================
--- branches/Cog/nsspursrc/plugins/FloatMathPlugin/FloatMathPlugin.c	2015-12-16 22:44:04 UTC (rev 3541)
+++ branches/Cog/nsspursrc/plugins/FloatMathPlugin/FloatMathPlugin.c	2015-12-17 00:51:26 UTC (rev 3542)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	VMPluginCodeGenerator VMMaker.oscog-eem.1559 uuid: 52385182-ad6d-4bdc-975a-7328fd81b6da
+	VMPluginCodeGenerator VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
    from
-	FloatMathPlugin VMMaker.oscog-eem.1559 uuid: 52385182-ad6d-4bdc-975a-7328fd81b6da
+	FloatMathPlugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
  */
-static char __buildInfo[] = "FloatMathPlugin VMMaker.oscog-eem.1559 uuid: 52385182-ad6d-4bdc-975a-7328fd81b6da " __DATE__ ;
+static char __buildInfo[] = "FloatMathPlugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef " __DATE__ ;
 
 
 
@@ -17,20 +17,16 @@
 #define EXPORT(returnType) returnType
 
 /* Do not include the entire sq.h file but just those parts needed. */
-/*  The virtual machine proxy definition */
-#include "sqVirtualMachine.h"
-/* Configuration options */
-#include "sqConfig.h"
-/* Platform specific definitions */
-#include "sqPlatformSpecific.h"
+#include "sqConfig.h"			/* Configuration options */
+#include "sqVirtualMachine.h"	/*  The virtual machine proxy definition */
+#include "sqPlatformSpecific.h"	/* Platform specific definitions */
 
 #define true 1
 #define false 0
 #define null 0  /* using 'null' because nil is predefined in Think C */
 #ifdef SQUEAK_BUILTIN_PLUGIN
-#undef EXPORT
-// was #undef EXPORT(returnType) but screws NorCroft cc
-#define EXPORT(returnType) static returnType
+# undef EXPORT
+# define EXPORT(returnType) static returnType
 #endif
 
 #include "FloatMathPlugin.h"
@@ -93,9 +89,9 @@
 struct VirtualMachine* interpreterProxy;
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"FloatMathPlugin VMMaker.oscog-eem.1559 (i)"
+	"FloatMathPlugin VMMaker.oscog-eem.1602 (i)"
 #else
-	"FloatMathPlugin VMMaker.oscog-eem.1559 (e)"
+	"FloatMathPlugin VMMaker.oscog-eem.1602 (e)"
 #endif
 ;
 
@@ -631,7 +627,6 @@
 	if (BytesPerOop > 4) {
 
 		/* clip arg to at most int range; ldexp's last arg is of type int */
-
 		twiceMaxExponent = 2 * (1 << 11);
 		if (arg < (-twiceMaxExponent)) {
 			arg = -twiceMaxExponent;

Modified: branches/Cog/nsspursrc/plugins/IA32ABI/IA32ABI.c
===================================================================
--- branches/Cog/nsspursrc/plugins/IA32ABI/IA32ABI.c	2015-12-16 22:44:04 UTC (rev 3541)
+++ branches/Cog/nsspursrc/plugins/IA32ABI/IA32ABI.c	2015-12-17 00:51:26 UTC (rev 3542)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	VMPluginCodeGenerator VMMaker.oscog-eem.1601 uuid: faa527e8-769c-4c9d-b4c9-8ce48b8edbd5
+	VMPluginCodeGenerator VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
    from
-	NewsqueakIA32ABIPlugin VMMaker.oscog-eem.1601 uuid: faa527e8-769c-4c9d-b4c9-8ce48b8edbd5
+	NewsqueakIA32ABIPlugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
  */
-static char __buildInfo[] = "NewsqueakIA32ABIPlugin VMMaker.oscog-eem.1601 uuid: faa527e8-769c-4c9d-b4c9-8ce48b8edbd5 " __DATE__ ;
+static char __buildInfo[] = "NewsqueakIA32ABIPlugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef " __DATE__ ;
 
 
 
@@ -18,20 +18,16 @@
 #define EXPORT(returnType) returnType
 
 /* Do not include the entire sq.h file but just those parts needed. */
-/*  The virtual machine proxy definition */
-#include "sqVirtualMachine.h"
-/* Configuration options */
-#include "sqConfig.h"
-/* Platform specific definitions */
-#include "sqPlatformSpecific.h"
+#include "sqConfig.h"			/* Configuration options */
+#include "sqVirtualMachine.h"	/*  The virtual machine proxy definition */
+#include "sqPlatformSpecific.h"	/* Platform specific definitions */
 
 #define true 1
 #define false 0
 #define null 0  /* using 'null' because nil is predefined in Think C */
 #ifdef SQUEAK_BUILTIN_PLUGIN
-#undef EXPORT
-// was #undef EXPORT(returnType) but screws NorCroft cc
-#define EXPORT(returnType) static returnType
+# undef EXPORT
+# define EXPORT(returnType) static returnType
 #endif
 
 #include "vmCallback.h"
@@ -227,9 +223,9 @@
 struct VirtualMachine* interpreterProxy;
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"IA32ABI VMMaker.oscog-eem.1601 (i)"
+	"IA32ABI VMMaker.oscog-eem.1602 (i)"
 #else
-	"IA32ABI VMMaker.oscog-eem.1601 (e)"
+	"IA32ABI VMMaker.oscog-eem.1602 (e)"
 #endif
 ;
 

Modified: branches/Cog/nsspursrc/plugins/ImmX11Plugin/ImmX11Plugin.c
===================================================================
--- branches/Cog/nsspursrc/plugins/ImmX11Plugin/ImmX11Plugin.c	2015-12-16 22:44:04 UTC (rev 3541)
+++ branches/Cog/nsspursrc/plugins/ImmX11Plugin/ImmX11Plugin.c	2015-12-17 00:51:26 UTC (rev 3542)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1559 uuid: 52385182-ad6d-4bdc-975a-7328fd81b6da
+	SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
    from
-	ImmX11Plugin VMMaker.oscog-eem.1559 uuid: 52385182-ad6d-4bdc-975a-7328fd81b6da
+	ImmX11Plugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
  */
-static char __buildInfo[] = "ImmX11Plugin VMMaker.oscog-eem.1559 uuid: 52385182-ad6d-4bdc-975a-7328fd81b6da " __DATE__ ;
+static char __buildInfo[] = "ImmX11Plugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef " __DATE__ ;
 
 
 
@@ -18,20 +18,16 @@
 #define EXPORT(returnType) returnType
 
 /* Do not include the entire sq.h file but just those parts needed. */
-/*  The virtual machine proxy definition */
-#include "sqVirtualMachine.h"
-/* Configuration options */
-#include "sqConfig.h"
-/* Platform specific definitions */
-#include "sqPlatformSpecific.h"
+#include "sqConfig.h"			/* Configuration options */
+#include "sqVirtualMachine.h"	/*  The virtual machine proxy definition */
+#include "sqPlatformSpecific.h"	/* Platform specific definitions */
 
 #define true 1
 #define false 0
 #define null 0  /* using 'null' because nil is predefined in Think C */
 #ifdef SQUEAK_BUILTIN_PLUGIN
-#undef EXPORT
-// was #undef EXPORT(returnType) but screws NorCroft cc
-#define EXPORT(returnType) static returnType
+# undef EXPORT
+# define EXPORT(returnType) static returnType
 #endif
 
 #include "sqUnixMain.h"
@@ -107,9 +103,9 @@
 struct VirtualMachine* interpreterProxy;
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"ImmX11Plugin VMMaker.oscog-eem.1559 (i)"
+	"ImmX11Plugin VMMaker.oscog-eem.1602 (i)"
 #else
-	"ImmX11Plugin VMMaker.oscog-eem.1559 (e)"
+	"ImmX11Plugin VMMaker.oscog-eem.1602 (e)"
 #endif
 ;
 

Modified: branches/Cog/nsspursrc/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c
===================================================================
--- branches/Cog/nsspursrc/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c	2015-12-16 22:44:04 UTC (rev 3541)
+++ branches/Cog/nsspursrc/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c	2015-12-17 00:51:26 UTC (rev 3542)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1601 uuid: faa527e8-769c-4c9d-b4c9-8ce48b8edbd5
+	SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
    from
-	JPEGReadWriter2Plugin VMMaker.oscog-eem.1601 uuid: faa527e8-769c-4c9d-b4c9-8ce48b8edbd5
+	JPEGReadWriter2Plugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
  */
-static char __buildInfo[] = "JPEGReadWriter2Plugin VMMaker.oscog-eem.1601 uuid: faa527e8-769c-4c9d-b4c9-8ce48b8edbd5 " __DATE__ ;
+static char __buildInfo[] = "JPEGReadWriter2Plugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef " __DATE__ ;
 
 
 
@@ -17,20 +17,16 @@
 #define EXPORT(returnType) returnType
 
 /* Do not include the entire sq.h file but just those parts needed. */
-/*  The virtual machine proxy definition */
-#include "sqVirtualMachine.h"
-/* Configuration options */
-#include "sqConfig.h"
-/* Platform specific definitions */
-#include "sqPlatformSpecific.h"
+#include "sqConfig.h"			/* Configuration options */
+#include "sqVirtualMachine.h"	/*  The virtual machine proxy definition */
+#include "sqPlatformSpecific.h"	/* Platform specific definitions */
 
 #define true 1
 #define false 0
 #define null 0  /* using 'null' because nil is predefined in Think C */
 #ifdef SQUEAK_BUILTIN_PLUGIN
-#undef EXPORT
-// was #undef EXPORT(returnType) but screws NorCroft cc
-#define EXPORT(returnType) static returnType
+# undef EXPORT
+# define EXPORT(returnType) static returnType
 #endif
 
 #include "JPEGReadWriter2Plugin.h"
@@ -97,9 +93,9 @@
 struct VirtualMachine* interpreterProxy;
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"JPEGReadWriter2Plugin VMMaker.oscog-eem.1601 (i)"
+	"JPEGReadWriter2Plugin VMMaker.oscog-eem.1602 (i)"
 #else
-	"JPEGReadWriter2Plugin VMMaker.oscog-eem.1601 (e)"
+	"JPEGReadWriter2Plugin VMMaker.oscog-eem.1602 (e)"
 #endif
 ;
 

Modified: branches/Cog/nsspursrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c
===================================================================
--- branches/Cog/nsspursrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c	2015-12-16 22:44:04 UTC (rev 3541)
+++ branches/Cog/nsspursrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c	2015-12-17 00:51:26 UTC (rev 3542)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	VMPluginCodeGenerator VMMaker.oscog-eem.1601 uuid: faa527e8-769c-4c9d-b4c9-8ce48b8edbd5
+	VMPluginCodeGenerator VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
    from
-	JPEGReaderPlugin VMMaker.oscog-eem.1601 uuid: faa527e8-769c-4c9d-b4c9-8ce48b8edbd5
+	JPEGReaderPlugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
  */
-static char __buildInfo[] = "JPEGReaderPlugin VMMaker.oscog-eem.1601 uuid: faa527e8-769c-4c9d-b4c9-8ce48b8edbd5 " __DATE__ ;
+static char __buildInfo[] = "JPEGReaderPlugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef " __DATE__ ;
 
 
 
@@ -17,20 +17,16 @@
 #define EXPORT(returnType) returnType
 
 /* Do not include the entire sq.h file but just those parts needed. */
-/*  The virtual machine proxy definition */
-#include "sqVirtualMachine.h"
-/* Configuration options */
-#include "sqConfig.h"
-/* Platform specific definitions */
-#include "sqPlatformSpecific.h"
+#include "sqConfig.h"			/* Configuration options */
+#include "sqVirtualMachine.h"	/*  The virtual machine proxy definition */
+#include "sqPlatformSpecific.h"	/* Platform specific definitions */
 
 #define true 1
 #define false 0
 #define null 0  /* using 'null' because nil is predefined in Think C */
 #ifdef SQUEAK_BUILTIN_PLUGIN
-#undef EXPORT
-// was #undef EXPORT(returnType) but screws NorCroft cc
-#define EXPORT(returnType) static returnType
+# undef EXPORT
+# define EXPORT(returnType) static returnType
 #endif
 
 #include "sqMemoryAccess.h"
@@ -175,9 +171,9 @@
 static sqInt jsReadLimit;
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"JPEGReaderPlugin VMMaker.oscog-eem.1601 (i)"
+	"JPEGReaderPlugin VMMaker.oscog-eem.1602 (i)"
 #else
-	"JPEGReaderPlugin VMMaker.oscog-eem.1601 (e)"
+	"JPEGReaderPlugin VMMaker.oscog-eem.1602 (e)"
 #endif
 ;
 static int *residuals;

Modified: branches/Cog/nsspursrc/plugins/LargeIntegers/LargeIntegers.c
===================================================================
--- branches/Cog/nsspursrc/plugins/LargeIntegers/LargeIntegers.c	2015-12-16 22:44:04 UTC (rev 3541)
+++ branches/Cog/nsspursrc/plugins/LargeIntegers/LargeIntegers.c	2015-12-17 00:51:26 UTC (rev 3542)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1601 uuid: faa527e8-769c-4c9d-b4c9-8ce48b8edbd5
+	SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
    from
-	LargeIntegersPlugin VMMaker.oscog-eem.1601 uuid: faa527e8-769c-4c9d-b4c9-8ce48b8edbd5
+	LargeIntegersPlugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
  */
-static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.1601 uuid: faa527e8-769c-4c9d-b4c9-8ce48b8edbd5 " __DATE__ ;
+static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef " __DATE__ ;
 
 
 
@@ -17,20 +17,16 @@
 #define EXPORT(returnType) returnType
 
 /* Do not include the entire sq.h file but just those parts needed. */
-/*  The virtual machine proxy definition */
-#include "sqVirtualMachine.h"
-/* Configuration options */
-#include "sqConfig.h"
-/* Platform specific definitions */
-#include "sqPlatformSpecific.h"
+#include "sqConfig.h"			/* Configuration options */
+#include "sqVirtualMachine.h"	/*  The virtual machine proxy definition */
+#include "sqPlatformSpecific.h"	/* Platform specific definitions */
 
 #define true 1
 #define false 0
 #define null 0  /* using 'null' because nil is predefined in Think C */
 #ifdef SQUEAK_BUILTIN_PLUGIN
-#undef EXPORT
-// was #undef EXPORT(returnType) but screws NorCroft cc
-#define EXPORT(returnType) static returnType
+# undef EXPORT
+# define EXPORT(returnType) static returnType
 #endif
 
 #include "sqMemoryAccess.h"
@@ -174,9 +170,9 @@
 struct VirtualMachine* interpreterProxy;
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"LargeIntegers v1.5 VMMaker.oscog-eem.1601 (i)"
+	"LargeIntegers v1.5 VMMaker.oscog-eem.1602 (i)"
 #else
-	"LargeIntegers v1.5 VMMaker.oscog-eem.1601 (e)"
+	"LargeIntegers v1.5 VMMaker.oscog-eem.1602 (e)"
 #endif
 ;
 static const int  orOpIndex = 1;

Modified: branches/Cog/nsspursrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c
===================================================================
--- branches/Cog/nsspursrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c	2015-12-16 22:44:04 UTC (rev 3541)
+++ branches/Cog/nsspursrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c	2015-12-17 00:51:26 UTC (rev 3542)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	VMPluginCodeGenerator VMMaker.oscog-eem.1601 uuid: faa527e8-769c-4c9d-b4c9-8ce48b8edbd5
+	VMPluginCodeGenerator VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
    from
-	Matrix2x3Plugin VMMaker.oscog-eem.1601 uuid: faa527e8-769c-4c9d-b4c9-8ce48b8edbd5
+	Matrix2x3Plugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
  */
-static char __buildInfo[] = "Matrix2x3Plugin VMMaker.oscog-eem.1601 uuid: faa527e8-769c-4c9d-b4c9-8ce48b8edbd5 " __DATE__ ;
+static char __buildInfo[] = "Matrix2x3Plugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef " __DATE__ ;
 
 
 
@@ -17,20 +17,16 @@
 #define EXPORT(returnType) returnType
 
 /* Do not include the entire sq.h file but just those parts needed. */
-/*  The virtual machine proxy definition */
-#include "sqVirtualMachine.h"
-/* Configuration options */
-#include "sqConfig.h"
-/* Platform specific definitions */
-#include "sqPlatformSpecific.h"
+#include "sqConfig.h"			/* Configuration options */
+#include "sqVirtualMachine.h"	/*  The virtual machine proxy definition */
+#include "sqPlatformSpecific.h"	/* Platform specific definitions */
 
 #define true 1
 #define false 0
 #define null 0  /* using 'null' because nil is predefined in Think C */
 #ifdef SQUEAK_BUILTIN_PLUGIN
-#undef EXPORT
-// was #undef EXPORT(returnType) but screws NorCroft cc
-#define EXPORT(returnType) static returnType
+# undef EXPORT
+# define EXPORT(returnType) static returnType
 #endif
 
 #include "sqMemoryAccess.h"
@@ -111,9 +107,9 @@
 static double m23ResultY;
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"Matrix2x3Plugin VMMaker.oscog-eem.1601 (i)"
+	"Matrix2x3Plugin VMMaker.oscog-eem.1602 (i)"
 #else
-	"Matrix2x3Plugin VMMaker.oscog-eem.1601 (e)"
+	"Matrix2x3Plugin VMMaker.oscog-eem.1602 (e)"
 #endif
 ;
 

Modified: branches/Cog/nsspursrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c
===================================================================
--- branches/Cog/nsspursrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c	2015-12-16 22:44:04 UTC (rev 3541)
+++ branches/Cog/nsspursrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c	2015-12-17 00:51:26 UTC (rev 3542)
@@ -1,13 +1,13 @@
 /* Automatically generated by
-	VMPluginCodeGenerator VMMaker.oscog-eem.1601 uuid: faa527e8-769c-4c9d-b4c9-8ce48b8edbd5
+	VMPluginCodeGenerator VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
    from
-	MiscPrimitivePlugin VMMaker.oscog-eem.1601 uuid: faa527e8-769c-4c9d-b4c9-8ce48b8edbd5
+	MiscPrimitivePlugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
 	Bitmap * Graphics-tpr.319 uuid: ea659db8-1afb-4241-9600-37ed16edd7b6
 	ByteArray * Collections-eem.672 uuid: 9b35923c-464e-4b66-8541-2e307f79186b
 	ByteString * Collections-eem.672 uuid: 9b35923c-464e-4b66-8541-2e307f79186b
 	SampledSound Sound-nice.46 uuid: b477c1a5-5650-43b0-8105-1867382b077c
  */
-static char __buildInfo[] = "MiscPrimitivePlugin VMMaker.oscog-eem.1601 uuid: faa527e8-769c-4c9d-b4c9-8ce48b8edbd5\n\
+static char __buildInfo[] = "MiscPrimitivePlugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef\n\
 Bitmap * Graphics-tpr.319 uuid: ea659db8-1afb-4241-9600-37ed16edd7b6\n\
 ByteArray * Collections-eem.672 uuid: 9b35923c-464e-4b66-8541-2e307f79186b\n\
 ByteString * Collections-eem.672 uuid: 9b35923c-464e-4b66-8541-2e307f79186b\n\
@@ -25,20 +25,16 @@
 #define EXPORT(returnType) returnType
 
 /* Do not include the entire sq.h file but just those parts needed. */
-/*  The virtual machine proxy definition */
-#include "sqVirtualMachine.h"
-/* Configuration options */
-#include "sqConfig.h"
-/* Platform specific definitions */
-#include "sqPlatformSpecific.h"
+#include "sqConfig.h"			/* Configuration options */
+#include "sqVirtualMachine.h"	/*  The virtual machine proxy definition */
+#include "sqPlatformSpecific.h"	/* Platform specific definitions */
 
 #define true 1
 #define false 0
 #define null 0  /* using 'null' because nil is predefined in Think C */
 #ifdef SQUEAK_BUILTIN_PLUGIN
-#undef EXPORT
-// was #undef EXPORT(returnType) but screws NorCroft cc
-#define EXPORT(returnType) static returnType
+# undef EXPORT
+# define EXPORT(returnType) static returnType
 #endif
 
 #include "sqMemoryAccess.h"
@@ -87,9 +83,9 @@
 struct VirtualMachine* interpreterProxy;
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"MiscPrimitivePlugin VMMaker.oscog-eem.1601 (i)"
+	"MiscPrimitivePlugin VMMaker.oscog-eem.1602 (i)"
 #else
-	"MiscPrimitivePlugin VMMaker.oscog-eem.1601 (e)"
+	"MiscPrimitivePlugin VMMaker.oscog-eem.1602 (e)"
 #endif
 ;
 

Modified: branches/Cog/nsspursrc/plugins/RePlugin/RePlugin.c
===================================================================
--- branches/Cog/nsspursrc/plugins/RePlugin/RePlugin.c	2015-12-16 22:44:04 UTC (rev 3541)
+++ branches/Cog/nsspursrc/plugins/RePlugin/RePlugin.c	2015-12-17 00:51:26 UTC (rev 3542)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1601 uuid: faa527e8-769c-4c9d-b4c9-8ce48b8edbd5
+	SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
    from
-	RePlugin VMMaker.oscog-eem.1601 uuid: faa527e8-769c-4c9d-b4c9-8ce48b8edbd5
+	RePlugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
  */
-static char __buildInfo[] = "RePlugin VMMaker.oscog-eem.1601 uuid: faa527e8-769c-4c9d-b4c9-8ce48b8edbd5 " __DATE__ ;
+static char __buildInfo[] = "RePlugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef " __DATE__ ;
 
 
 
@@ -17,20 +17,16 @@
 #define EXPORT(returnType) returnType
 
 /* Do not include the entire sq.h file but just those parts needed. */
-/*  The virtual machine proxy definition */
-#include "sqVirtualMachine.h"
-/* Configuration options */
-#include "sqConfig.h"
-/* Platform specific definitions */
-#include "sqPlatformSpecific.h"
+#include "sqConfig.h"			/* Configuration options */
+#include "sqVirtualMachine.h"	/*  The virtual machine proxy definition */
+#include "sqPlatformSpecific.h"	/* Platform specific definitions */
 
 #define true 1
 #define false 0
 #define null 0  /* using 'null' because nil is predefined in Think C */
 #ifdef SQUEAK_BUILTIN_PLUGIN
-#undef EXPORT
-// was #undef EXPORT(returnType) but screws NorCroft cc
-#define EXPORT(returnType) static returnType
+# undef EXPORT
+# define EXPORT(returnType) static returnType
 #endif
 
 #include "rePlugin.h"
@@ -120,9 +116,9 @@
 static sqInt matchFlags;
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"RePlugin VMMaker.oscog-eem.1601 (i)"
+	"RePlugin VMMaker.oscog-eem.1602 (i)"
 #else
-	"RePlugin VMMaker.oscog-eem.1601 (e)"
+	"RePlugin VMMaker.oscog-eem.1602 (e)"
 #endif
 ;
 static int netMemory = 0;

Modified: branches/Cog/nsspursrc/plugins/SecurityPlugin/SecurityPlugin.c
===================================================================
--- branches/Cog/nsspursrc/plugins/SecurityPlugin/SecurityPlugin.c	2015-12-16 22:44:04 UTC (rev 3541)
+++ branches/Cog/nsspursrc/plugins/SecurityPlugin/SecurityPlugin.c	2015-12-17 00:51:26 UTC (rev 3542)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	VMPluginCodeGenerator VMMaker.oscog-eem.1559 uuid: 52385182-ad6d-4bdc-975a-7328fd81b6da
+	VMPluginCodeGenerator VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
    from
-	SecurityPlugin VMMaker.oscog-eem.1559 uuid: 52385182-ad6d-4bdc-975a-7328fd81b6da
+	SecurityPlugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
  */
-static char __buildInfo[] = "SecurityPlugin VMMaker.oscog-eem.1559 uuid: 52385182-ad6d-4bdc-975a-7328fd81b6da " __DATE__ ;
+static char __buildInfo[] = "SecurityPlugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef " __DATE__ ;
 
 
 
@@ -17,20 +17,16 @@
 #define EXPORT(returnType) returnType
 
 /* Do not include the entire sq.h file but just those parts needed. */
-/*  The virtual machine proxy definition */
-#include "sqVirtualMachine.h"
-/* Configuration options */
-#include "sqConfig.h"
-/* Platform specific definitions */
-#include "sqPlatformSpecific.h"
+#include "sqConfig.h"			/* Configuration options */
+#include "sqVirtualMachine.h"	/*  The virtual machine proxy definition */
+#include "sqPlatformSpecific.h"	/* Platform specific definitions */
 
 #define true 1
 #define false 0
 #define null 0  /* using 'null' because nil is predefined in Think C */
 #ifdef SQUEAK_BUILTIN_PLUGIN
-#undef EXPORT
-// was #undef EXPORT(returnType) but screws NorCroft cc
-#define EXPORT(returnType) static returnType
+# undef EXPORT
+# define EXPORT(returnType) static returnType
 #endif
 
 #include "SecurityPlugin.h"
@@ -90,9 +86,9 @@
 struct VirtualMachine* interpreterProxy;
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"SecurityPlugin VMMaker.oscog-eem.1559 (i)"
+	"SecurityPlugin VMMaker.oscog-eem.1602 (i)"
 #else
-	"SecurityPlugin VMMaker.oscog-eem.1559 (e)"
+	"SecurityPlugin VMMaker.oscog-eem.1602 (e)"
 #endif
 ;
 

Modified: branches/Cog/nsspursrc/plugins/SocketPlugin/SocketPlugin.c
===================================================================
--- branches/Cog/nsspursrc/plugins/SocketPlugin/SocketPlugin.c	2015-12-16 22:44:04 UTC (rev 3541)
+++ branches/Cog/nsspursrc/plugins/SocketPlugin/SocketPlugin.c	2015-12-17 00:51:26 UTC (rev 3542)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1559 uuid: 52385182-ad6d-4bdc-975a-7328fd81b6da
+	SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
    from
-	SocketPlugin VMMaker.oscog-eem.1559 uuid: 52385182-ad6d-4bdc-975a-7328fd81b6da
+	SocketPlugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef
  */
-static char __buildInfo[] = "SocketPlugin VMMaker.oscog-eem.1559 uuid: 52385182-ad6d-4bdc-975a-7328fd81b6da " __DATE__ ;
+static char __buildInfo[] = "SocketPlugin VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef " __DATE__ ;
 
 
 
@@ -17,20 +17,16 @@
 #define EXPORT(returnType) returnType
 
 /* Do not include the entire sq.h file but just those parts needed. */
-/*  The virtual machine proxy definition */
-#include "sqVirtualMachine.h"
-/* Configuration options */
-#include "sqConfig.h"
-/* Platform specific definitions */
-#include "sqPlatformSpecific.h"
+#include "sqConfig.h"			/* Configuration options */
+#include "sqVirtualMachine.h"	/*  The virtual machine proxy definition */
+#include "sqPlatformSpecific.h"	/* Platform specific definitions */
 
 #define true 1
 #define false 0
 #define null 0  /* using 'null' because nil is predefined in Think C */
 #ifdef SQUEAK_BUILTIN_PLUGIN
-#undef EXPORT
-// was #undef EXPORT(returnType) but screws NorCroft cc
-#define EXPORT(returnType) static returnType
+# undef EXPORT
+# define EXPORT(returnType) static returnType
 #endif
 
 #include "SocketPlugin.h"
@@ -173,9 +169,9 @@
 struct VirtualMachine* interpreterProxy;
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"SocketPlugin VMMaker.oscog-eem.1559 (i)"
+	"SocketPlugin VMMaker.oscog-eem.1602 (i)"
 #else
-	"SocketPlugin VMMaker.oscog-eem.1559 (e)"
+	"SocketPlugin VMMaker.oscog-eem.1602 (e)"
 #endif
 ;
 static void * sCCLOPfn;
@@ -242,7 +238,6 @@
 	if ((strcmp(aModuleName, "SecurityPlugin")) == 0) {
 
 		/* The security plugin just shut down. How odd. */
-
 		sDSAfn = (sHSAfn = (sCCTPfn = (sCCLOPfn = (sCCSOTfn = 0))));
 	}
 }
@@ -288,7 +283,6 @@
 
 	/* If the security plugin can be loaded, use it to check .
 	   If not, assume it's ok */
-
 	hasAccess = (sHSAfn == 0)
 	 || ( ((int (*) (void)) sHSAfn)());
 	pop(1);
@@ -1797,7 +1791,6 @@
 	if (!(failed())) {
 
 		/* Note: adjust bufStart for zero-origin indexing */
-
 		arrayBase = ((char *) (firstIndexableField(array)));
 		bufStart = arrayBase + ((startIndex - 1) * byteSize);
 		bytesReceived = sqSocketReceiveDataBufCount(s, bufStart, count * byteSize);
@@ -1855,7 +1848,6 @@
 	if (!(failed())) {
 
 		/* Note: adjust bufStart for zero-origin indexing */
-

@@ Diff output truncated at 50000 characters. @@


More information about the Vm-dev mailing list