Revision: 2817 Author: eliot Date: 2013-11-22 16:51:45 -0800 (Fri, 22 Nov 2013) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.517
Move the defines for BaseHeaderSize BytesPerWord BytesPerOop out of interpreter, cogit or plugin source and into interp.h, and fix generateCPtrAsOop:on:indent: to print BaseHeaderSize symbolically so that plugin source can be safely shared.
Include the executable name in the crash.dmp report.
Fix uninitialization of newTargetMethodOrNil & errorSelectorOrNil in ceCPICMiss:receiver:.
Do a better job of dead code removal, accepting constant comparisons.
Lots of changes to Spur, find in Monticello but not relevant here as Spur is not yet ready for general consumption. Add the Cog Spur source to accompany the build dirs (doh!).
Internal: Rewrite markLiteralsAndUnlinkIfUnmarkedSend:pc:method: & markLiteralsAndUnlinkIfUnmarkedSendOrPushImplicit:pc:method: so that markAndTraceLiteral: is only invoked with literal args and cacheTagIsMarked: is only applied to cache tags. This allows Spur to answer true for cacheTagIsMarked:.
Refactor (pop)storeLiteralVariable in the StackInterpreter so that all such bytecodes use storeLiteralVariable:withValue:.
JFK RIP.
Modified Paths: -------------- 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/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/platforms/Mac OS/vm/sqMacMain.c branches/Cog/platforms/unix/vm/sqUnixMain.c branches/Cog/platforms/win32/vm/sqWin32Intel.c 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/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/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/FT2Plugin/FT2Plugin.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/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/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/SqueakFFIPrims/SqueakFFIPrims.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/UnixOSProcessPlugin/UnixOSProcessPlugin.c branches/Cog/src/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c branches/Cog/src/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c branches/Cog/src/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c branches/Cog/src/plugins/ZipPlugin/ZipPlugin.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h 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/src/vm/interp.h branches/Cog/src/vm/vmCallback.h branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c branches/Cog/stacksrc/vm/interp.h branches/Cog/stacksrc/vm/vmCallback.h
Added Paths: ----------- branches/Cog/spursrc/ branches/Cog/spursrc/examplePlugins.ext branches/Cog/spursrc/examplePlugins.int branches/Cog/spursrc/vm/ branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogmethod.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/exampleSqNamedPrims.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/interp.h branches/Cog/spursrc/vm/vmCallback.h
Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - AsynchFilePlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + AsynchFilePlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "AsynchFilePlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "AsynchFilePlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ;
@@ -38,7 +38,6 @@
/*** Constants ***/ -#define BytesPerWord 4
/*** Function Prototypes ***/ @@ -103,9 +102,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AsynchFilePlugin VMMaker.oscog-eem.497 (i)" + "AsynchFilePlugin VMMaker.oscog-eem.517 (i)" #else - "AsynchFilePlugin VMMaker.oscog-eem.497 (e)" + "AsynchFilePlugin VMMaker.oscog-eem.517 (e)" #endif ; static void * sCOAFfn;
Modified: branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + VMPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - BalloonEnginePlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + BalloonEnginePlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ;
@@ -42,7 +42,6 @@ #define BEFormsIndex 3 #define BESpanIndex 1 #define BEWorkBufferIndex 0 -#define BytesPerWord 4 #define ETBalloonEdgeDataSize 6 #define ETIndexIndex 0 #define ETLinesIndex 4 @@ -840,9 +839,9 @@ static void * loadBBFn; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B2DPlugin VMMaker.oscog-eem.497 (i)" + "B2DPlugin VMMaker.oscog-eem.517 (i)" #else - "B2DPlugin VMMaker.oscog-eem.497 (e)" + "B2DPlugin VMMaker.oscog-eem.517 (e)" #endif ; static int* objBuffer;
Modified: branches/Cog/nscogsrc/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + VMPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - BMPReadWriterPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + BMPReadWriterPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "BMPReadWriterPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "BMPReadWriterPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ;
@@ -37,7 +37,6 @@
/*** Constants ***/ -#define BytesPerWord 4
/*** Function Prototypes ***/ @@ -79,9 +78,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BMPReadWriterPlugin VMMaker.oscog-eem.497 (i)" + "BMPReadWriterPlugin VMMaker.oscog-eem.517 (i)" #else - "BMPReadWriterPlugin VMMaker.oscog-eem.497 (e)" + "BMPReadWriterPlugin VMMaker.oscog-eem.517 (e)" #endif ;
Modified: branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - BitBltSimulation VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + BitBltSimulation VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ;
@@ -63,7 +63,6 @@ #define BBWidthIndex 6 #define BinaryPoint 14 #define BlueIndex 2 -#define BytesPerWord 4 #define ColorMapFixedPart 2 #define ColorMapIndexedPart 4 #define ColorMapNewStyle 8 @@ -345,9 +344,9 @@ }; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BitBltPlugin VMMaker.oscog-eem.497 (i)" + "BitBltPlugin VMMaker.oscog-eem.517 (i)" #else - "BitBltPlugin VMMaker.oscog-eem.497 (e)" + "BitBltPlugin VMMaker.oscog-eem.517 (e)" #endif ; static sqInt noHalftone;
Modified: branches/Cog/nscogsrc/plugins/DSAPrims/DSAPrims.c =================================================================== --- branches/Cog/nscogsrc/plugins/DSAPrims/DSAPrims.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/DSAPrims/DSAPrims.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + VMPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - DSAPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + DSAPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "DSAPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "DSAPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ;
@@ -37,7 +37,6 @@
/*** Constants ***/ -#define BytesPerWord 4
/*** Function Prototypes ***/ @@ -95,9 +94,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DSAPrims VMMaker.oscog-eem.497 (i)" + "DSAPrims VMMaker.oscog-eem.517 (i)" #else - "DSAPrims VMMaker.oscog-eem.497 (e)" + "DSAPrims VMMaker.oscog-eem.517 (e)" #endif ; static sqInt remainderDigitCount;
Modified: branches/Cog/nscogsrc/plugins/DropPlugin/DropPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/DropPlugin/DropPlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/DropPlugin/DropPlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + VMPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - DropPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + DropPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "DropPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "DropPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ;
@@ -38,7 +38,6 @@
/*** Constants ***/ -#define BytesPerWord 4
/*** Function Prototypes ***/ @@ -81,9 +80,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DropPlugin VMMaker.oscog-eem.497 (i)" + "DropPlugin VMMaker.oscog-eem.517 (i)" #else - "DropPlugin VMMaker.oscog-eem.497 (e)" + "DropPlugin VMMaker.oscog-eem.517 (e)" #endif ;
Modified: branches/Cog/nscogsrc/plugins/FileCopyPlugin/FileCopyPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/FileCopyPlugin/FileCopyPlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/FileCopyPlugin/FileCopyPlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - FileCopyPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + FileCopyPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "FileCopyPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "FileCopyPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ;
@@ -37,7 +37,6 @@
/*** Constants ***/ -#define BytesPerWord 4
/*** Function Prototypes ***/ @@ -75,9 +74,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FileCopyPlugin VMMaker.oscog-eem.497 (i)" + "FileCopyPlugin VMMaker.oscog-eem.517 (i)" #else - "FileCopyPlugin VMMaker.oscog-eem.497 (e)" + "FileCopyPlugin VMMaker.oscog-eem.517 (e)" #endif ;
@@ -133,8 +132,8 @@ if (failed()) { return null; } - srcSz = slotSizeOf(((sqInt)(long)(srcName) - 4)); - dstSz = slotSizeOf(((sqInt)(long)(dstName) - 4)); + srcSz = slotSizeOf(((sqInt)(long)(srcName) - BaseHeaderSize)); + dstSz = slotSizeOf(((sqInt)(long)(dstName) - BaseHeaderSize)); ok = sqCopyFilesizetosize(srcName, srcSz, dstName, dstSz); if (!ok) { primitiveFail();
Modified: branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + VMPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - FilePlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + FilePlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ;
@@ -38,7 +38,6 @@
/*** Constants ***/ -#define BytesPerWord 4 #define COGMTVM 0 #define DirBadPath 2 #define DirNoMoreEntries 1 @@ -181,9 +180,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FilePlugin VMMaker.oscog-eem.497 (i)" + "FilePlugin VMMaker.oscog-eem.517 (i)" #else - "FilePlugin VMMaker.oscog-eem.497 (e)" + "FilePlugin VMMaker.oscog-eem.517 (e)" #endif ; static void * sCCPfn;
Modified: branches/Cog/nscogsrc/plugins/FloatArrayPlugin/FloatArrayPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + VMPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - FloatArrayPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + FloatArrayPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "FloatArrayPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "FloatArrayPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ;
@@ -37,7 +37,6 @@
/*** Constants ***/ -#define BytesPerWord 4
/*** Function Prototypes ***/ @@ -113,9 +112,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FloatArrayPlugin VMMaker.oscog-eem.497 (i)" + "FloatArrayPlugin VMMaker.oscog-eem.517 (i)" #else - "FloatArrayPlugin VMMaker.oscog-eem.497 (e)" + "FloatArrayPlugin VMMaker.oscog-eem.517 (e)" #endif ;
Modified: branches/Cog/nscogsrc/plugins/FloatMathPlugin/FloatMathPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/FloatMathPlugin/FloatMathPlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/FloatMathPlugin/FloatMathPlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + VMPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - FloatMathPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + FloatMathPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "FloatMathPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "FloatMathPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ;
@@ -38,7 +38,6 @@
/*** Constants ***/ -#define BytesPerWord 4
/*** Function Prototypes ***/ @@ -94,9 +93,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FloatMathPlugin VMMaker.oscog-eem.497 (i)" + "FloatMathPlugin VMMaker.oscog-eem.517 (i)" #else - "FloatMathPlugin VMMaker.oscog-eem.497 (e)" + "FloatMathPlugin VMMaker.oscog-eem.517 (e)" #endif ;
Modified: branches/Cog/nscogsrc/plugins/IA32ABI/IA32ABI.c =================================================================== --- branches/Cog/nscogsrc/plugins/IA32ABI/IA32ABI.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/IA32ABI/IA32ABI.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + VMPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - NewsqueakIA32ABIPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + NewsqueakIA32ABIPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "NewsqueakIA32ABIPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "NewsqueakIA32ABIPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ;
@@ -53,9 +53,6 @@
/*** Constants ***/ -#define BaseHeaderSize 4 -#define BytesPerOop 4 -#define BytesPerWord 4 #define PrimErrBadArgument 3 #define PrimErrBadIndex 4 #define PrimErrBadReceiver 2 @@ -223,9 +220,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "IA32ABI VMMaker.oscog-eem.497 (i)" + "IA32ABI VMMaker.oscog-eem.517 (i)" #else - "IA32ABI VMMaker.oscog-eem.497 (e)" + "IA32ABI VMMaker.oscog-eem.517 (e)" #endif ;
Modified: branches/Cog/nscogsrc/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - JPEGReadWriter2Plugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + JPEGReadWriter2Plugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "JPEGReadWriter2Plugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "JPEGReadWriter2Plugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ;
@@ -38,7 +38,6 @@
/*** Constants ***/ -#define BytesPerWord 4
/*** Function Prototypes ***/ @@ -104,9 +103,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JPEGReadWriter2Plugin VMMaker.oscog-eem.497 (i)" + "JPEGReadWriter2Plugin VMMaker.oscog-eem.517 (i)" #else - "JPEGReadWriter2Plugin VMMaker.oscog-eem.497 (e)" + "JPEGReadWriter2Plugin VMMaker.oscog-eem.517 (e)" #endif ;
Modified: branches/Cog/nscogsrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + VMPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - JPEGReaderPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + JPEGReaderPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "JPEGReaderPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "JPEGReaderPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ;
@@ -39,7 +39,6 @@ /*** Constants ***/ #define BlockWidthIndex 5 #define BlueIndex 2 -#define BytesPerWord 4 #define ConstBits 13 #define CurrentXIndex 0 #define CurrentYIndex 1 @@ -181,9 +180,9 @@ static sqInt jsReadLimit; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JPEGReaderPlugin VMMaker.oscog-eem.497 (i)" + "JPEGReaderPlugin VMMaker.oscog-eem.517 (i)" #else - "JPEGReaderPlugin VMMaker.oscog-eem.497 (e)" + "JPEGReaderPlugin VMMaker.oscog-eem.517 (e)" #endif ; static int *residuals;
Modified: branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c =================================================================== --- branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - LargeIntegersPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + LargeIntegersPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ;
@@ -37,7 +37,6 @@
/*** Constants ***/ -#define BytesPerWord 4
/*** Function Prototypes ***/ @@ -173,9 +172,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "LargeIntegers v1.5 VMMaker.oscog-eem.497 (i)" + "LargeIntegers v1.5 VMMaker.oscog-eem.517 (i)" #else - "LargeIntegers v1.5 VMMaker.oscog-eem.497 (e)" + "LargeIntegers v1.5 VMMaker.oscog-eem.517 (e)" #endif ; static const int orOpIndex = 1;
Modified: branches/Cog/nscogsrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + VMPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - Matrix2x3Plugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + Matrix2x3Plugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "Matrix2x3Plugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "Matrix2x3Plugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ;
@@ -37,7 +37,6 @@
/*** Constants ***/ -#define BytesPerWord 4
/*** Function Prototypes ***/ @@ -118,9 +117,9 @@ static double m23ResultY; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "Matrix2x3Plugin VMMaker.oscog-eem.497 (i)" + "Matrix2x3Plugin VMMaker.oscog-eem.517 (i)" #else - "Matrix2x3Plugin VMMaker.oscog-eem.497 (e)" + "Matrix2x3Plugin VMMaker.oscog-eem.517 (e)" #endif ;
Modified: branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,13 +1,13 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + VMPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - MiscPrimitivePlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + MiscPrimitivePlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 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.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85\n\ +static char __buildInfo[] = "MiscPrimitivePlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35\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\ @@ -84,7 +84,6 @@
/*** Constants ***/ -#define BytesPerWord 4
/*** Variables ***/ @@ -95,9 +94,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "MiscPrimitivePlugin VMMaker.oscog-eem.497 (i)" + "MiscPrimitivePlugin VMMaker.oscog-eem.517 (i)" #else - "MiscPrimitivePlugin VMMaker.oscog-eem.497 (e)" + "MiscPrimitivePlugin VMMaker.oscog-eem.517 (e)" #endif ;
Modified: branches/Cog/nscogsrc/plugins/RePlugin/RePlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/RePlugin/RePlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/RePlugin/RePlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - RePlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + RePlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "RePlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "RePlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ;
@@ -38,7 +38,6 @@
/*** Constants ***/ -#define BytesPerWord 4
/*** Function Prototypes ***/ @@ -127,9 +126,9 @@ static sqInt matchFlags; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "RePlugin VMMaker.oscog-eem.497 (i)" + "RePlugin VMMaker.oscog-eem.517 (i)" #else - "RePlugin VMMaker.oscog-eem.497 (e)" + "RePlugin VMMaker.oscog-eem.517 (e)" #endif ; static int netMemory = 0;
Modified: branches/Cog/nscogsrc/plugins/SecurityPlugin/SecurityPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/SecurityPlugin/SecurityPlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/SecurityPlugin/SecurityPlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + VMPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - SecurityPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + SecurityPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "SecurityPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "SecurityPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ;
@@ -38,7 +38,6 @@
/*** Constants ***/ -#define BytesPerWord 4
/*** Function Prototypes ***/ @@ -97,9 +96,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SecurityPlugin VMMaker.oscog-eem.497 (i)" + "SecurityPlugin VMMaker.oscog-eem.517 (i)" #else - "SecurityPlugin VMMaker.oscog-eem.497 (e)" + "SecurityPlugin VMMaker.oscog-eem.517 (e)" #endif ;
Modified: branches/Cog/nscogsrc/plugins/SocketPlugin/SocketPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/SocketPlugin/SocketPlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/SocketPlugin/SocketPlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - SocketPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + SocketPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "SocketPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "SocketPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ;
@@ -38,7 +38,6 @@
/*** Constants ***/ -#define BytesPerWord 4
/*** Function Prototypes ***/ @@ -180,9 +179,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SocketPlugin VMMaker.oscog-eem.497 (i)" + "SocketPlugin VMMaker.oscog-eem.517 (i)" #else - "SocketPlugin VMMaker.oscog-eem.497 (e)" + "SocketPlugin VMMaker.oscog-eem.517 (e)" #endif ; static void * sCCLOPfn; @@ -284,7 +283,7 @@ { sqInt sz;
- sz = byteSizeOf(((sqInt)(long)(ptrToByteArray) - 4)); + sz = byteSizeOf(((sqInt)(long)(ptrToByteArray) - BaseHeaderSize)); if (!(sz == 4)) { return primitiveFail(); } @@ -402,8 +401,8 @@ return null; } if (!(failed())) { - hostSize = byteSizeOf(((sqInt)(long)(hostName) - 4)); - servSize = byteSizeOf(((sqInt)(long)(servName) - 4)); + hostSize = byteSizeOf(((sqInt)(long)(hostName) - BaseHeaderSize)); + servSize = byteSizeOf(((sqInt)(long)(servName) - BaseHeaderSize)); sqResolverGetAddressInfoHostSizeServiceSizeFlagsFamilyTypeProtocol(hostName, hostSize, servName, servSize, flags, family, type, protocol); } if (failed()) { @@ -485,7 +484,7 @@ return null; } if (!(failed())) { - addrSize = byteSizeOf(((sqInt)(long)(socketAddress) - 4)); + addrSize = byteSizeOf(((sqInt)(long)(socketAddress) - BaseHeaderSize)); sqResolverGetAddressInfoResultSize(socketAddress, addrSize); } if (failed()) { @@ -574,7 +573,7 @@ return null; } if (!(failed())) { - addrSize = byteSizeOf(((sqInt)(long)(socketName) - 4)); + addrSize = byteSizeOf(((sqInt)(long)(socketName) - BaseHeaderSize)); sqResolverGetNameInfoHostResultSize(socketName, addrSize); } if (failed()) { @@ -617,7 +616,7 @@ return null; } if (!(failed())) { - addrSize = byteSizeOf(((sqInt)(long)(socketName) - 4)); + addrSize = byteSizeOf(((sqInt)(long)(socketName) - BaseHeaderSize)); sqResolverGetNameInfoServiceResultSize(socketName, addrSize); } if (failed()) { @@ -660,7 +659,7 @@ return null; } if (!(failed())) { - nameSize = byteSizeOf(((sqInt)(long)(nameString) - 4)); + nameSize = byteSizeOf(((sqInt)(long)(nameString) - BaseHeaderSize)); sqResolverHostNameResultSize(nameString, nameSize); } if (failed()) { @@ -736,7 +735,7 @@ return null; } /* begin netAddressToInt: */ - sz = byteSizeOf(((sqInt)(long)((((unsigned char *) address))) - 4)); + sz = byteSizeOf(((sqInt)(long)((((unsigned char *) address))) - BaseHeaderSize)); if (!(sz == 4)) { addr = primitiveFail(); goto l1; @@ -765,7 +764,7 @@ return null; } if (!(failed())) { - sz = byteSizeOf(((sqInt)(long)(name) - 4)); + sz = byteSizeOf(((sqInt)(long)(name) - BaseHeaderSize)); sqResolverStartNameLookup(name, sz); } if (failed()) { @@ -1009,7 +1008,7 @@ return null; } /* begin netAddressToInt: */ - sz = byteSizeOf(((sqInt)(long)((((unsigned char *) address))) - 4)); + sz = byteSizeOf(((sqInt)(long)((((unsigned char *) address))) - BaseHeaderSize)); if (!(sz == 4)) { addr = primitiveFail(); goto l1; @@ -1138,7 +1137,7 @@ return null; } /* begin netAddressToInt: */ - sz = byteSizeOf(((sqInt)(long)((((unsigned char *) address))) - 4)); + sz = byteSizeOf(((sqInt)(long)((((unsigned char *) address))) - BaseHeaderSize)); if (!(sz == 4)) { addr = primitiveFail(); goto l1; @@ -1520,7 +1519,7 @@ } } /* begin netAddressToInt: */ - sz = byteSizeOf(((sqInt)(long)((((unsigned char *) ifAddr))) - 4)); + sz = byteSizeOf(((sqInt)(long)((((unsigned char *) ifAddr))) - BaseHeaderSize)); if (!(sz == 4)) { addr = primitiveFail(); goto l1; @@ -2096,7 +2095,7 @@ arrayBase = ((char *) (firstIndexableField(array))); bufStart = arrayBase + ((startIndex - 1) * byteSize); /* begin netAddressToInt: */ - sz = byteSizeOf(((sqInt)(long)((((unsigned char *) hostAddress))) - 4)); + sz = byteSizeOf(((sqInt)(long)((((unsigned char *) hostAddress))) - BaseHeaderSize)); if (!(sz == 4)) { address = primitiveFail(); goto l1;
Modified: branches/Cog/nscogsrc/plugins/SoundPlugin/SoundPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/SoundPlugin/SoundPlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/SoundPlugin/SoundPlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - SoundPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + SoundPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "SoundPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "SoundPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ;
@@ -38,7 +38,6 @@
/*** Constants ***/ -#define BytesPerWord 4
/*** Function Prototypes ***/ @@ -111,9 +110,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SoundPlugin VMMaker.oscog-eem.497 (i)" + "SoundPlugin VMMaker.oscog-eem.517 (i)" #else - "SoundPlugin VMMaker.oscog-eem.497 (e)" + "SoundPlugin VMMaker.oscog-eem.517 (e)" #endif ;
@@ -259,7 +258,7 @@ if (failed()) { return null; } - success(frameCount <= (slotSizeOf(((sqInt)(long)(buf) - 4)))); + success(frameCount <= (slotSizeOf(((sqInt)(long)(buf) - BaseHeaderSize)))); if (!(failed())) { framesPlayed = snd_InsertSamplesFromLeadTime(frameCount, (void *)buf, leadTime); success(framesPlayed >= 0); @@ -292,7 +291,7 @@ return null; } success((startIndex >= 1) - && (((startIndex + frameCount) - 1) <= (slotSizeOf(((sqInt)(long)(buf) - 4))))); + && (((startIndex + frameCount) - 1) <= (slotSizeOf(((sqInt)(long)(buf) - BaseHeaderSize))))); if (!(failed())) { framesPlayed = snd_PlaySamplesFromAtLength(frameCount, (void *)buf, startIndex - 1); success(framesPlayed >= 0); @@ -351,7 +350,7 @@ return null; } if (!(failed())) { - bufSizeInBytes = (slotSizeOf(((sqInt)(long)(buf) - 4))) * 4; + bufSizeInBytes = (slotSizeOf(((sqInt)(long)(buf) - BaseHeaderSize))) * 4; success((startWordIndex >= 1) && (((startWordIndex - 1) * 2) < bufSizeInBytes)); }
Modified: branches/Cog/nscogsrc/plugins/SqueakSSL/SqueakSSL.c =================================================================== --- branches/Cog/nscogsrc/plugins/SqueakSSL/SqueakSSL.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/SqueakSSL/SqueakSSL.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,5 +1,5 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + VMPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from SqueakSSLPlugin SqueakSSL-Plugin-ar.3 uuid: b76dbadd-ee96-5e44-abbb-8a0e3e17240a */ @@ -38,7 +38,6 @@
/*** Constants ***/ -#define BytesPerWord 4
/*** Function Prototypes ***/
Modified: branches/Cog/nscogsrc/plugins/UUIDPlugin/UUIDPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/UUIDPlugin/UUIDPlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/UUIDPlugin/UUIDPlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - UUIDPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + UUIDPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "UUIDPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "UUIDPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ;
@@ -38,7 +38,6 @@
/*** Constants ***/ -#define BytesPerWord 4
/*** Function Prototypes ***/ @@ -76,9 +75,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "UUIDPlugin VMMaker.oscog-eem.497 (i)" + "UUIDPlugin VMMaker.oscog-eem.517 (i)" #else - "UUIDPlugin VMMaker.oscog-eem.497 (e)" + "UUIDPlugin VMMaker.oscog-eem.517 (e)" #endif ;
Modified: branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + VMPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - UnixOSProcessPlugin * VMConstruction-Plugins-OSProcessPlugin.oscog-eem.43 uuid: 2fe4270b-d6b6-486d-ac17-86c1adf970a4 + UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.44 uuid: 946fd79a-b249-4f25-8d13-11c6a087296f */ -static char __buildInfo[] = "UnixOSProcessPlugin * VMConstruction-Plugins-OSProcessPlugin.oscog-eem.43 uuid: 2fe4270b-d6b6-486d-ac17-86c1adf970a4 " __DATE__ ; +static char __buildInfo[] = "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.44 uuid: 946fd79a-b249-4f25-8d13-11c6a087296f " __DATE__ ; /* D T Lewis - UnixOSProcessPlugin.c translated from class UnixOSProcessPlugin of OSProcessPlugin version 4.3.3 Cog */
@@ -52,7 +52,6 @@
/*** Constants ***/ -#define BytesPerWord 4 #define FILEHANDLETYPE FILE * /* the type of low level stream to be used in a struct SQFile */ #define PrimErrBadArgument 3 #define PrimErrBadNumArgs 5 @@ -319,9 +318,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "UnixOSProcessPlugin * VMConstruction-Plugins-OSProcessPlugin.oscog-eem.43 (i)" + "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.44 (i)" #else - "UnixOSProcessPlugin * VMConstruction-Plugins-OSProcessPlugin.oscog-eem.43 (e)" + "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.44 (e)" #endif ; static void *originalSigHandlers[NSIG];
Modified: branches/Cog/nscogsrc/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + VMPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - VMProfileLinuxSupportPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + VMProfileLinuxSupportPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ;
@@ -42,7 +42,6 @@
/*** Constants ***/ -#define BytesPerWord 4 #define PrimErrBadArgument 3 #define PrimErrInappropriate 6 #define PrimErrNoMemory 9 @@ -104,9 +103,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.497 (i)" + "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.517 (i)" #else - "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.497 (e)" + "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.517 (e)" #endif ; static sqInt numModules;
Modified: branches/Cog/nscogsrc/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + VMPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - VMProfileMacSupportPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + VMProfileMacSupportPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "VMProfileMacSupportPlugin VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "VMProfileMacSupportPlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ;
@@ -40,7 +40,6 @@
/*** Constants ***/ -#define BytesPerWord 4 #define PrimErrBadArgument 3
@@ -103,9 +102,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "VMProfileMacSupportPlugin VMMaker.oscog-eem.497 (i)" + "VMProfileMacSupportPlugin VMMaker.oscog-eem.517 (i)" #else - "VMProfileMacSupportPlugin VMMaker.oscog-eem.497 (e)" + "VMProfileMacSupportPlugin VMMaker.oscog-eem.517 (e)" #endif ;
Modified: branches/Cog/nscogsrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + VMPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - Win32OSProcessPlugin * VMConstruction-Plugins-OSProcessPlugin.oscog-eem.43 uuid: 2fe4270b-d6b6-486d-ac17-86c1adf970a4 + Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.44 uuid: 946fd79a-b249-4f25-8d13-11c6a087296f */ -static char __buildInfo[] = "Win32OSProcessPlugin * VMConstruction-Plugins-OSProcessPlugin.oscog-eem.43 uuid: 2fe4270b-d6b6-486d-ac17-86c1adf970a4 " __DATE__ ; +static char __buildInfo[] = "Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.44 uuid: 946fd79a-b249-4f25-8d13-11c6a087296f " __DATE__ ; /* D T Lewis - Win32OSProcessPlugin.c translated from class Win32OSProcessPlugin of OSProcessPlugin version 4.3.3 Cog */
@@ -45,7 +45,6 @@
/*** Constants ***/ -#define BytesPerWord 4 #define FILEHANDLETYPE FILE * /* the type of low level stream to be used in a struct SQFile */ #define PrimErrBadArgument 3 #define READCHARARRAYSIZE 512 /* Corresponds to expected max size of external semaphore table */ @@ -226,9 +225,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "Win32OSProcessPlugin * VMConstruction-Plugins-OSProcessPlugin.oscog-eem.43 (i)" + "Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.44 (i)" #else - "Win32OSProcessPlugin * VMConstruction-Plugins-OSProcessPlugin.oscog-eem.43 (e)" + "Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.44 (e)" #endif ; static int osprocessSandboxSecurity;
Modified: branches/Cog/nscogsrc/plugins/ZipPlugin/ZipPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/ZipPlugin/ZipPlugin.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/plugins/ZipPlugin/ZipPlugin.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.498 uuid: 429d3a33-5318-4130-addb-342eaffe0c23 + VMPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - DeflatePlugin VMMaker.oscog-eem.498 uuid: 429d3a33-5318-4130-addb-342eaffe0c23 + DeflatePlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "DeflatePlugin VMMaker.oscog-eem.498 uuid: 429d3a33-5318-4130-addb-342eaffe0c23 " __DATE__ ; +static char __buildInfo[] = "DeflatePlugin VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ;
@@ -37,7 +37,6 @@
/*** Constants ***/ -#define BytesPerWord 4 #define DeflateHashMask 0x7FFF #define DeflateHashShift 5 #define DeflateHashTableSize 32768 @@ -137,9 +136,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ZipPlugin VMMaker.oscog-eem.498 (i)" + "ZipPlugin VMMaker.oscog-eem.517 (i)" #else - "ZipPlugin VMMaker.oscog-eem.498 (e)" + "ZipPlugin VMMaker.oscog-eem.517 (e)" #endif ; static unsigned int zipBaseDistance[] = {
Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2013-11-19 23:53:24 UTC (rev 2816) +++ branches/Cog/nscogsrc/vm/cogit.c 2013-11-23 00:51:45 UTC (rev 2817) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334 + CCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 from - StackToRegisterMappingCogit VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334 + StackToRegisterMappingCogit VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.496 uuid: f0401045-f2f7-470e-9940-3535be9c0334 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ; char *__cogitBuildInfo = __buildInfo;
@@ -129,10 +129,7 @@ #define ArithmeticShiftRightCqR 71 #define ArithmeticShiftRightRR 72 #define BadRegisterSet 1 -#define BaseHeaderSize 4 #define BlockCreationBytecodeSize 4 -#define BytesPerOop 4 -#define BytesPerWord 4 #define Call 9 #define CDQ 105 #define ClassMethodContextCompactIndex 14 @@ -255,7 +252,7 @@ #define MapEnd 0 #define MaxCompiledPrimitiveIndex 222 #define MaxMethodSize 65535 -#define MaxNegativeErrorCode -6 +#define MaxNegativeErrorCode -7 #define MaxNumArgs 15 #define MaxStackAllocSize 1572864 #define MaxStackCheckOffset 0xFFF @@ -338,6 +335,7 @@ #define SubRR 79 #define TempReg -4 #define TypeMask 0x3 +#define UnimplementedPrimitive -7 #define ValueIndex 1 #define XCHGAwR 115 #define XCHGMwrR 116 @@ -828,9 +826,6 @@ static sqInt hasPCDependentInstructions(AbstractInstruction * self_in_hasPCDependentInstructions); static sqInt hasSSE2Instructions(AbstractInstruction * self_in_hasSSE2Instructions); static sqInt hasSSEInstructions(AbstractInstruction * self_in_hasSSEInstructions); -static sqInt implementsNew(void); -static sqInt implementsNewMethod(void); -static sqInt implementsNewWithArg(void); static sqInt incrementUsageOfTargetIfLinkedSendmcpcignored(sqInt annotation, char *mcpc, sqInt superfluity); static sqInt initialClosedPICUsageCount(void); static void initializeBackend(void); @@ -903,8 +898,7 @@ static void mapObjectReferencesInGeneratedRuntime(void); static void mapObjectReferencesInMachineCodeForBecome(void); static void mapObjectReferencesInMachineCodeForFullGC(void); -static void mapObjectReferencesInMachineCodeForIncrementalGC(void); -static void mapObjectReferencesInMachineCodeForScavenge(void); +static void mapObjectReferencesInMachineCodeForYoungGC(void); void mapObjectReferencesInMachineCode(sqInt gcMode); static void markAndTraceLiteralIfYoung(sqInt literal); static void markAndTraceLiteral(sqInt literal); @@ -950,9 +944,6 @@ static sqInt numMethods(void); sqInt numMethodsOfType(sqInt cogMethodType); static sqInt numSmallIntegerBits(void); -static sqInt objectRepresentationImplementsNewMethod(sqInt primIndex); -static sqInt objectRepresentationImplementsNewWithArg(sqInt primIndex); -static sqInt objectRepresentationImplementsNew(sqInt primIndex); static sqInt occurrencesInYoungReferrers(CogMethod *cogMethod); static sqInt oopisGreaterThanOrEqualTo(sqInt anOop, sqInt otherOop); static sqInt oopisGreaterThan(sqInt anOop, sqInt otherOop); @@ -999,7 +990,7 @@ static sqInt relocateMethodsPreCompaction(void); static sqInt remapIfObjectRefpchasYoung(sqInt annotation, char *mcpc, sqInt hasYoungPtr); static sqInt remapNSIfObjectRefpchasYoung(sqInt annotation, char *mcpc, sqInt hasYoungPtr); -static sqInt remapObj(sqInt oop); +static sqInt remapObject(sqInt oop); static sqInt remapOop(sqInt oop); static sqInt removeFromOpenPICList(CogMethod *anOpenPIC); static sqInt removeFromUnpairedMethodList(CogMethod *aCogMethod); @@ -1060,6 +1051,7 @@ sqInt traceLinkedSendOffset(void); static char * trampolineNamenumArgs(char *routinePrefix, sqInt numArgs); static sqInt twoByteInstructionSizeAt(AbstractInstruction * self_in_twoByteInstructionSizeAt, sqInt pc); +static sqInt unimplementedPrimitive(void); static sqInt unknownBytecode(void); void unlinkAllSends(void); static sqInt unlinkIfLinkedSendToFreepcignored(sqInt annotation, char *mcpc, sqInt superfluity); @@ -1800,8 +1792,8 @@ { 0, -1, 0 }, { 0, -1, 0 }, { 0, -1, 0 }, - { genPrimitiveNew, 0, objectRepresentationImplementsNew }, - { genPrimitiveNewWithArg, 1, objectRepresentationImplementsNewWithArg }, + { genPrimitiveNew, 0, 0 }, + { genPrimitiveNewWithArg, 1, 0 }, { 0, -1, 0 }, { 0, -1, 0 }, { 0, -1, 0 }, @@ -1809,7 +1801,7 @@ { 0, -1, 0 }, { 0, -1, 0 }, { 0, -1, 0 }, - { genPrimitiveNewMethod, 2, objectRepresentationImplementsNewMethod }, + { genPrimitiveNewMethod, 2, 0 }, { 0, -1, 0 }, { 0, -1, 0 }, { 0, -1, 0 }, @@ -2385,7 +2377,7 @@ annotateobjRef(AbstractInstruction *abstractInstruction, sqInt anOop) { if (shouldAnnotateObjectReference(anOop)) { - if (isYoung(anOop)) { + if (isYoungObject(anOop)) { hasYoungReferent = 1; } return annotatewith(abstractInstruction, IsObjectReference); @@ -2717,6 +2709,9 @@
l1: /* end lookup:for:methodAndErrorSelectorInto: */; } + else { + newTargetMethodOrNil = (errorSelectorOrNil = null); + } assert(outerReturn == (stackTop())); cacheTag = inlineCacheTagForInstance(receiver); if ((((cPIC->cPICNumCases)) >= numPICCases) @@ -3127,7 +3122,7 @@ ok = 0; } if (!fullGCFlag) { - if (((isYoung((cogMethod->methodObject))) + if (((isYoungObject((cogMethod->methodObject))) || (isYoung((cogMethod->selector))))
@@ Diff output truncated at 50000 characters. @@