[Vm-dev] [commit][3200] VMMaker 4.13.10

Revision: 3200 Author: lewis Date: 2014-12-30 15:44:16 -0800 (Tue, 30 Dec 2014) Log Message: ----------- VMMaker 4.13.10 Incorporate Plan9 compatibility changes by Alex Franchuk . Reference Mantis 7821: Make generated interpreter code compatible with Plan9's POSIX C compiler

Modified Paths: -------------- trunk/src/ckformat.c trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c trunk/src/plugins/AioPlugin/AioPlugin.c trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c trunk/src/plugins/B2DPlugin/B2DPlugin.c trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c trunk/src/plugins/BitBltPlugin/BitBltPlugin.c trunk/src/plugins/CameraPlugin/CameraPlugin.c trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c trunk/src/plugins/CroquetPlugin/CroquetPlugin.c trunk/src/plugins/DBusPlugin/DBusPlugin.c trunk/src/plugins/DSAPrims/DSAPrims.c trunk/src/plugins/DropPlugin/DropPlugin.c trunk/src/plugins/FFTPlugin/FFTPlugin.c trunk/src/plugins/FT2Plugin/FT2Plugin.c trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c trunk/src/plugins/FilePlugin/FilePlugin.c trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c trunk/src/plugins/GeniePlugin/GeniePlugin.c trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c trunk/src/plugins/KedamaPlugin2/KedamaPlugin2.c trunk/src/plugins/Klatt/Klatt.c trunk/src/plugins/LargeIntegers/LargeIntegers.c trunk/src/plugins/LocalePlugin/LocalePlugin.c trunk/src/plugins/MIDIPlugin/MIDIPlugin.c trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c trunk/src/plugins/RePlugin/RePlugin.c trunk/src/plugins/RomePlugin/RomePlugin.c trunk/src/plugins/ScratchPlugin/ScratchPlugin.c trunk/src/plugins/SecurityPlugin/SecurityPlugin.c trunk/src/plugins/SerialPlugin/SerialPlugin.c trunk/src/plugins/SocketPlugin/SocketPlugin.c trunk/src/plugins/SoundCodecPrims/SoundCodecPrims.c trunk/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c trunk/src/plugins/SoundPlugin/SoundPlugin.c trunk/src/plugins/Squeak3D/Squeak3D.c trunk/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c trunk/src/plugins/SqueakSSL/SqueakSSL.c trunk/src/plugins/StarSqueakPlugin/StarSqueakPlugin.c trunk/src/plugins/UUIDPlugin/UUIDPlugin.c trunk/src/plugins/UnicodePlugin/UnicodePlugin.c trunk/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c trunk/src/plugins/WeDoPlugin/WeDoPlugin.c trunk/src/plugins/XDisplayControlPlugin/XDisplayControlPlugin.c trunk/src/vm/interp.c trunk/src/vm/interp.h trunk/src/vm/sqNamedPrims.h

Modified: trunk/src/ckformat.c =================================================================== --- trunk/src/ckformat.c 2014-12-30 20:24:52 UTC (rev 3199) +++ trunk/src/ckformat.c 2014-12-30 23:44:16 UTC (rev 3200) @@ -5,7 +5,7 @@ /* Usage: ckformat imageFileName */

/* --- DO NOT EDIT THIS FILE --- */ -/* --- Automatically generated from class ImageFormat 2014-12-16T21:28:19.798+01:00--- */ +/* --- Automatically generated from class ImageFormat 2014-12-30T18:33:46.158+01:00--- */ /* --- Source code is in package ImageFormat in the VMMaker repository --- */ /* --- DO NOT EDIT THIS FILE --- */

Modified: trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c =================================================================== --- trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2014-12-30 20:24:52 UTC (rev 3199) +++ trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2014-12-30 23:44:16 UTC (rev 3200) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.9 translated as C source on 16 December 2014 9:28:08 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:35 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.356 uuid: b4a4af04-ab24-45ac-9c5e-7fb83c764a85 + VMPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad from - ADPCMCodecPlugin VMMaker-dtl.356 uuid: b4a4af04-ab24-45ac-9c5e-7fb83c764a85 + ADPCMCodecPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad */ -static char __buildInfo[] = "ADPCMCodecPlugin VMMaker-dtl.356 uuid: b4a4af04-ab24-45ac-9c5e-7fb83c764a85 " __DATE__ ; +static char __buildInfo[] = "ADPCMCodecPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad " __DATE__ ;

@@ -70,9 +70,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ADPCMCodecPlugin 16 December 2014 (i)" + "ADPCMCodecPlugin 30 December 2014 (i)" #else - "ADPCMCodecPlugin 16 December 2014 (e)" + "ADPCMCodecPlugin 30 December 2014 (e)" #endif ;

@@ -101,6 +101,7 @@

static sqInt halt(void) { ; + return null; }

EXPORT(sqInt) primitiveDecodeMono(void) { @@ -271,6 +272,7 @@ storeIntegerofObjectwithValue(8, rcvr, byteIndex); storeIntegerofObjectwithValue(12, rcvr, sampleIndex); pop(1); + return null; }

EXPORT(sqInt) primitiveDecodeStereo(void) { @@ -559,6 +561,7 @@ storeIntegerofObjectwithValue(8, rcvr, byteIndex); storeIntegerofObjectwithValue(12, rcvr, sampleIndex); pop(1); + return null; }

EXPORT(sqInt) primitiveEncodeMono(void) { @@ -776,6 +779,7 @@ storeIntegerofObjectwithValue(8, rcvr, byteIndex); storeIntegerofObjectwithValue(12, rcvr, sampleIndex); pop(1); + return null; }

@@ -795,6 +799,7 @@ return null; } pop(1); + return null; }

Modified: trunk/src/plugins/AioPlugin/AioPlugin.c =================================================================== --- trunk/src/plugins/AioPlugin/AioPlugin.c 2014-12-30 20:24:52 UTC (rev 3199) +++ trunk/src/plugins/AioPlugin/AioPlugin.c 2014-12-30 23:44:16 UTC (rev 3200) @@ -1,6 +1,6 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.9 translated as C source on 16 December 2014 9:28:19 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:45 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.356 uuid: b4a4af04-ab24-45ac-9c5e-7fb83c764a85 + VMPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad from UnixAioPlugin VMConstruction-Plugins-AioPlugin-eem.17 uuid: a2b39cb2-e681-4bc3-a777-f03b2e3f2de0 */ @@ -87,9 +87,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AioPlugin 16 December 2014 (i)" + "AioPlugin 30 December 2014 (i)" #else - "AioPlugin 16 December 2014 (e)" + "AioPlugin 30 December 2014 (e)" #endif ;

@@ -131,6 +131,7 @@

static sqInt halt(void) { ; + return null; }

EXPORT(sqInt) initialiseModule(void) { @@ -178,6 +179,7 @@ Make sure we have no dangling references. */

EXPORT(sqInt) moduleUnloaded(char *aModuleName) { + return null; }

@@ -197,6 +199,7 @@ aioDisable(fd); interpreterProxy->pop(2); interpreterProxy->pushInteger(fd); + return null; }

@@ -231,6 +234,7 @@ aioEnable(fd, &(eventSemaphoreIndices[semaIndex]), flags); interpreterProxy->pop(4); interpreterProxy->pushInteger(semaIndex); + return null; }

@@ -273,6 +277,7 @@ aioHandle(fd, aioForwardwithDataandFlags, flags); interpreterProxy->pop(5); interpreterProxy->pushInteger(flags); + return null; }

@@ -315,6 +320,7 @@ aioSuspend(fd, flags); interpreterProxy->pop(5); interpreterProxy->pushInteger(flags); + return null; }

@@ -322,6 +328,7 @@

EXPORT(sqInt) primitiveModuleName(void) { interpreterProxy->popthenPush(1, stringFromCString(moduleName)); + return null; }

@@ -344,6 +351,7 @@ l1: /* end fileDescriptorFrom: */; interpreterProxy->pop(2); interpreterProxy->pushInteger(fileNo); + return null; }

@@ -363,6 +371,7 @@ } interpreterProxy->pop(2); interpreterProxy->pushInteger(fileNo); + return null; }

@@ -370,6 +379,7 @@

EXPORT(sqInt) primitiveVersionString(void) { interpreterProxy->popthenPush(1, stringFromCString(versionString())); + return null; }

@@ -397,6 +407,7 @@ }

EXPORT(sqInt) shutdownModule(void) { + return null; }

Modified: trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c =================================================================== --- trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2014-12-30 20:24:52 UTC (rev 3199) +++ trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2014-12-30 23:44:16 UTC (rev 3200) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.9 translated as C source on 16 December 2014 9:28:08 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:35 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.356 uuid: b4a4af04-ab24-45ac-9c5e-7fb83c764a85 + SmartSyntaxPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad from - AsynchFilePlugin VMMaker-dtl.356 uuid: b4a4af04-ab24-45ac-9c5e-7fb83c764a85 + AsynchFilePlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad */ -static char __buildInfo[] = "AsynchFilePlugin VMMaker-dtl.356 uuid: b4a4af04-ab24-45ac-9c5e-7fb83c764a85 " __DATE__ ; +static char __buildInfo[] = "AsynchFilePlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad " __DATE__ ;

@@ -67,9 +67,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AsynchFilePlugin 16 December 2014 (i)" + "AsynchFilePlugin 30 December 2014 (i)" #else - "AsynchFilePlugin 16 December 2014 (e)" + "AsynchFilePlugin 30 December 2014 (e)" #endif ; static void * sCOAFfn; @@ -98,6 +98,7 @@

static sqInt halt(void) { ; + return null; }

@@ -119,6 +120,7 @@

sCOAFfn = 0; } + return null; }

EXPORT(sqInt) primitiveAsyncFileClose(void) {

Modified: trunk/src/plugins/B2DPlugin/B2DPlugin.c =================================================================== --- trunk/src/plugins/B2DPlugin/B2DPlugin.c 2014-12-30 20:24:52 UTC (rev 3199) +++ trunk/src/plugins/B2DPlugin/B2DPlugin.c 2014-12-30 23:44:16 UTC (rev 3200) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.9 translated as C source on 16 December 2014 9:28:10 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:37 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.356 uuid: b4a4af04-ab24-45ac-9c5e-7fb83c764a85 + VMPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad from - BalloonEnginePlugin VMMaker-dtl.356 uuid: b4a4af04-ab24-45ac-9c5e-7fb83c764a85 + BalloonEnginePlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad */ -static char __buildInfo[] = "BalloonEnginePlugin VMMaker-dtl.356 uuid: b4a4af04-ab24-45ac-9c5e-7fb83c764a85 " __DATE__ ; +static char __buildInfo[] = "BalloonEnginePlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad " __DATE__ ;

@@ -447,9 +447,9 @@ static void * loadBBFn; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B2DPlugin 16 December 2014 (i)" + "B2DPlugin 30 December 2014 (i)" #else - "B2DPlugin 16 December 2014 (e)" + "B2DPlugin 30 December 2014 (e)" #endif ; static int* objBuffer; @@ -494,6 +494,7 @@ } getBuffer[workBuffer[GWGETUsed]] = edge; workBuffer[GWGETUsed] = ((workBuffer[GWGETUsed]) + 1); + return null; }

@@ -509,6 +510,7 @@ lastY = ((objBuffer + bezier) + GBWideUpdateData)[GBUpdateY]; ((objBuffer + bezier) + GBWideUpdateData)[GBUpdateY] = (lastY + (lineWidth * 256)); objBuffer[bezier + GBFinalX] = (endX - lineOffset); + return null; }

@@ -527,6 +529,7 @@ lastY = ((objBuffer + bezier) + GBWideUpdateData)[GBUpdateY]; ((objBuffer + bezier) + GBWideUpdateData)[GBUpdateY] = (lastY + (lineWidth * 256)); objBuffer[bezier + GBFinalX] = ((endX - lineOffset) + lineWidth); + return null; }

@@ -591,6 +594,7 @@ } } objBuffer[line + GLWideWidth] = lineWidth; + return null; }

static sqInt allocateBitmapFillcolormap(sqInt cmSize, int *cmBits) { @@ -890,6 +894,7 @@ } workBuffer[GWSpanStart] = (workBuffer[GWSpanSize]); workBuffer[GWSpanEnd] = 0; + return null; }

@@ -1087,6 +1092,7 @@ } else { objBuffer[bezier + GBWideWidth] = lineWidth; } + return null; }

static sqInt copyBitsFromtoat(sqInt x0, sqInt x1, sqInt yValue) { @@ -1160,6 +1166,7 @@ } object += objBuffer[object + GEObjectLength]; } + return null; }

@@ -1186,6 +1193,7 @@ return 0; } copyBitsFromtoat(targetX0, targetX1, targetY); + return null; }

@@ -1194,6 +1202,7 @@

static sqInt errorWrongIndex(void) { ; + return null; }

@@ -1246,6 +1255,7 @@ if (x1 > (workBuffer[GWSpanEndAA])) { workBuffer[GWSpanEndAA] = x1; } + return null; }

static sqInt fillBitmapSpanfromtoat(sqInt bmFill, sqInt leftX, sqInt rightX, sqInt yValue) { @@ -1390,6 +1400,7 @@ dt += dtX; x += 1; } + return null; }

static sqInt fillBitmapSpanAAfromtoat(sqInt bmFill, sqInt leftX, sqInt rightX, sqInt yValue) { @@ -1776,6 +1787,7 @@ dt += dtX; x += 1; } + return null; }

@@ -1842,6 +1854,7 @@ x += 1; } } + return null; }

@@ -1941,6 +1954,7 @@ } l2: /* end fillColorSpan:from:to: */; } + return null; }

@@ -2339,6 +2353,7 @@ } l2: /* end fillColorSpan:from:to: */; } + return null; }

@@ -2918,6 +2933,7 @@ } else { return index; } + return null; }

@@ -2949,6 +2965,7 @@

static sqInt halt(void) { ; + return null; }

@@ -3034,6 +3051,7 @@ transform[6] = (((float) 1.0)); transform[7] = (((float) 0.0)); workBuffer[GWHasColorTransform] = 0; + return null; }

static sqInt initEdgeTransform(void) { @@ -3047,6 +3065,7 @@ transform[4] = (((float) 1.0)); transform[5] = (((float) 0.0)); workBuffer[GWHasEdgeTransform] = 0; + return null; }

EXPORT(sqInt) initialiseModule(void) { @@ -3073,11 +3092,11 @@ workBuffer[GWFillMaxY] = ((workBuffer[GWClipMaxY]) << (workBuffer[GWAAShift])); workBuffer[GWGETUsed] = 0; workBuffer[GWAETUsed] = 0; - getBuffer = objBuffer + objUsed; + getBuffer = (int*)objBuffer + objUsed;

/* Create the global edge table */

- aetBuffer = objBuffer + objUsed; + aetBuffer = (int*)objBuffer + objUsed; createGlobalEdgeTable(); if (engineStopped) { return null; @@ -3090,7 +3109,7 @@ return 0; } /* begin sortGlobalEdgeTable */ - quickSortGlobalEdgeTablefromto(getBuffer, 0, (workBuffer[GWGETUsed]) - 1); + quickSortGlobalEdgeTablefromto((int *)getBuffer, 0, (workBuffer[GWGETUsed]) - 1); workBuffer[GWCurrentY] = (objBuffer[(getBuffer[0]) + GEYValue]); if ((workBuffer[GWCurrentY]) < (workBuffer[GWFillMinY])) { workBuffer[GWCurrentY] = (workBuffer[GWFillMinY]); @@ -3098,6 +3117,7 @@ workBuffer[GWSpanStart] = 0; workBuffer[GWSpanEnd] = (((workBuffer[GWSpanSize]) << (workBuffer[GWAAShift])) - 1); clearSpanBuffer(); + return null; }

@@ -3119,6 +3139,7 @@

index = indexForInsertingIntoAET(edge); insertToAETbeforeIndex(edge, index); + return null; }

@@ -3140,6 +3161,7 @@ } aetBuffer[index] = edge; workBuffer[GWAETUsed] = ((workBuffer[GWAETUsed]) + 1); + return null; }

static sqInt isEdge(sqInt edge) { @@ -3256,6 +3278,7 @@ return null; } } + return null; }

@@ -3276,6 +3299,7 @@ destPtr[i] = (((float) (interpreterProxy->floatValueOf(value)))); } } + return null; }

@@ -3303,6 +3327,7 @@ objBuffer[bezier + GEZValue] = (workBuffer[GWCurrentZ]); objBuffer[bezier + GEFillIndexLeft] = leftFillIndex; objBuffer[bezier + GEFillIndexRight] = rightFillIndex; + return null; }

static sqInt loadBitBltFrom(sqInt bbObj) { @@ -3583,6 +3608,7 @@ return null; } } + return null; }

static sqInt loadEdgeStateFrom(sqInt edgeOop) { @@ -3685,6 +3711,7 @@ objBuffer[fill + GFDirectionY] = dsY; objBuffer[fill + GFNormalX] = dtX; objBuffer[fill + GFNormalY] = dtY; + return null; }

@@ -3784,6 +3811,7 @@ objBuffer[line + GLEndX] = (p2[0]); objBuffer[line + GLEndY] = ((p2[1]) - yOffset); objBuffer[line + GLYDirection] = yDir; + return null; }

@@ -3825,6 +3853,7 @@ return null; } } + return null; }

static sqInt loadOvalSegmentwhcxcy(sqInt seg, sqInt w, sqInt h, sqInt cx, sqInt cy) { @@ -3856,6 +3885,7 @@ y1 = (y1 * 2) - (((sqInt) (y0 + y2) >> 1)); (((int *) (workBuffer + GWPoint2)))[0] = x1; (((int *) (workBuffer + GWPoint2)))[1] = y1; + return null; }

@@ -3885,6 +3915,7 @@ } else { pointArray[1] = (((sqInt)(interpreterProxy->floatValueOf(value)))); } + return null; }

static sqInt loadPolygonnPointsfilllineWidthlineFillpointsShort(int *points, sqInt nPoints, sqInt fillIndex, sqInt lineWidth, sqInt lineFill, sqInt isShort) { @@ -3933,6 +3964,7 @@ x0 = x1; y0 = y1; } + return null; }

@@ -4063,6 +4095,7 @@ return null; } } + return null; }

@@ -4078,7 +4111,7 @@

/* Leave last entry unused to avoid complications */

- spanBuffer = interpreterProxy->firstIndexableField(spanOop); + spanBuffer = (unsigned int*)interpreterProxy->firstIndexableField(spanOop); /* begin spanSizePut: */ value = (interpreterProxy->slotSizeOf(spanOop)) - 1; workBuffer[GWSpanSize] = value; @@ -4168,6 +4201,7 @@ } /* begin wbStackClear */ workBuffer[GWBufferTop] = (workBuffer[GWSize]); + return null; }

@@ -4217,6 +4251,7 @@ objBuffer[line + GLWideWidth] = lineWidth; objBuffer[line + GLWideExtent] = lineWidth; } + return null; }

@@ -4230,6 +4265,7 @@ for (i = 0; i <= (n - 1); i += 1) { destPtr[i] = (srcPtr[i]); } + return null; }

@@ -4246,7 +4282,7 @@ return GEFWorkBufferTooSmall; } /* begin workBufferPut: */ - workBuffer = interpreterProxy->firstIndexableField(wbOop); + workBuffer = (int*)interpreterProxy->firstIndexableField(wbOop); if (!((workBuffer[GWMagicIndex]) == GWMagicNumber)) { return GEFWorkBufferBadMagic; } @@ -4256,12 +4292,12 @@ if (!((workBuffer[GWObjStart]) == GWHeaderSize)) { return GEFWorkBufferStartWrong; } - objBuffer = workBuffer + (workBuffer[GWObjStart]); - getBuffer = objBuffer + (workBuffer[GWObjUsed]); + objBuffer = (int*)workBuffer + (workBuffer[GWObjStart]); + getBuffer = (int*)objBuffer + (workBuffer[GWObjUsed]);

/* Make sure we don't exceed the work buffer */

- aetBuffer = getBuffer + (workBuffer[GWGETUsed]); + aetBuffer = (int*)getBuffer + (workBuffer[GWGETUsed]); if ((((GWHeaderSize + (workBuffer[GWObjUsed])) + (workBuffer[GWGETUsed])) + (workBuffer[GWAETUsed])) > (workBuffer[GWSize])) { return GEFWorkTooBig; } @@ -4280,6 +4316,7 @@ loadBBFn = 0; copyBitsFn = 0; } + return null; }

@@ -4295,6 +4332,7 @@ newIndex -= 1; } aetBuffer[newIndex] = edge; + return null; }

@@ -4329,6 +4367,7 @@

workBuffer[GWState] = GEStateCompleted; } + return null; }

EXPORT(sqInt) primitiveAbortProcessing(void) { @@ -4343,6 +4382,7 @@ workBuffer[GWState] = GEStateCompleted; /* begin storeEngineStateInto: */ workBuffer[GWObjUsed] = objUsed; + return null; }

@@ -4390,6 +4430,7 @@ value = (interpreterProxy->ioMicroMSecs()) - geProfileTime; workBuffer[GWTimeAddAETEntry] = ((workBuffer[GWTimeAddAETEntry]) + value); } + return null; }

EXPORT(sqInt) primitiveAddBezier(void) { @@ -4473,6 +4514,7 @@ /* begin storeEngineStateInto: */ workBuffer[GWObjUsed] = objUsed; interpreterProxy->pop(5); + return null; }

EXPORT(sqInt) primitiveAddBezierShape(void) { @@ -4564,6 +4606,7 @@ /* begin storeEngineStateInto: */ workBuffer[GWObjUsed] = objUsed; interpreterProxy->pop(5); + return null; }

EXPORT(sqInt) primitiveAddBitmapFill(void) { @@ -4620,6 +4663,7 @@ /* begin storeEngineStateInto: */ workBuffer[GWObjUsed] = objUsed; interpreterProxy->popthenPush(8, interpreterProxy->positive32BitIntegerFor(fill)); + return null; }

EXPORT(sqInt) primitiveAddCompressedShape(void) { @@ -4673,6 +4717,7 @@ /* begin storeEngineStateInto: */ workBuffer[GWObjUsed] = objUsed; interpreterProxy->pop(7); + return null; }

EXPORT(sqInt) primitiveAddGradientFill(void) { @@ -4720,6 +4765,7 @@ /* begin storeEngineStateInto: */ workBuffer[GWObjUsed] = objUsed; interpreterProxy->popthenPush(6, interpreterProxy->positive32BitIntegerFor(fill)); + return null; }

EXPORT(sqInt) primitiveAddLine(void) { @@ -4781,6 +4827,7 @@ /* begin storeEngineStateInto: */ workBuffer[GWObjUsed] = objUsed; interpreterProxy->pop(4); + return null; }

EXPORT(sqInt) primitiveAddOval(void) { @@ -4845,6 +4892,7 @@ /* begin storeEngineStateInto: */ workBuffer[GWObjUsed] = objUsed; interpreterProxy->pop(5); + return null; }

EXPORT(sqInt) primitiveAddPolygon(void) { @@ -4976,6 +5024,7 @@ /* begin storeEngineStateInto: */ workBuffer[GWObjUsed] = objUsed; interpreterProxy->pop(5); + return null; }

EXPORT(sqInt) primitiveAddRect(void) { @@ -5056,6 +5105,7 @@ /* begin storeEngineStateInto: */ workBuffer[GWObjUsed] = objUsed; interpreterProxy->pop(5); + return null; }

@@ -5100,6 +5150,7 @@ value = (interpreterProxy->ioMicroMSecs()) - geProfileTime; workBuffer[GWTimeChangeAETEntry] = ((workBuffer[GWTimeChangeAETEntry]) + value); } + return null; }

EXPORT(sqInt) primitiveCopyBuffer(void) { @@ -5146,6 +5197,7 @@ return interpreterProxy->primitiveFailFor(failCode); } interpreterProxy->pop(2); + return null; }

@@ -5187,6 +5239,7 @@ value = (interpreterProxy->ioMicroMSecs()) - geProfileTime; workBuffer[GWTimeDisplaySpan] = ((workBuffer[GWTimeDisplaySpan]) + value); } + return null; }

@@ -5204,6 +5257,7 @@ interpreterProxy->pop(2); interpreterProxy->pushBool(oldValue); } + return null; }

EXPORT(sqInt) primitiveFinishedProcessing(void) { @@ -5231,6 +5285,7 @@ value = (interpreterProxy->ioMicroMSecs()) - geProfileTime; workBuffer[GWTimeFinishTest] = ((workBuffer[GWTimeFinishTest]) + value); } + return null; }

EXPORT(sqInt) primitiveGetAALevel(void) { @@ -5244,6 +5299,7 @@ } interpreterProxy->pop(1); interpreterProxy->pushInteger(workBuffer[GWAALevel]); + return null; }

EXPORT(sqInt) primitiveGetBezierStats(void) { @@ -5267,6 +5323,7 @@ stats[2] = ((stats[2]) + (workBuffer[GWBezierOverflowSubdivisions])); stats[3] = ((stats[3]) + (workBuffer[GWBezierLineConversions])); interpreterProxy->pop(1); + return null; }

EXPORT(sqInt) primitiveGetClipRect(void) { @@ -5291,6 +5348,7 @@ rectOop = interpreterProxy->popRemappableOop(); interpreterProxy->storePointerofObjectwithValue(1, rectOop, pointOop); interpreterProxy->popthenPush(2, rectOop); + return null; }

EXPORT(sqInt) primitiveGetCounts(void) { @@ -5319,6 +5377,7 @@ stats[7] = ((stats[7]) + (workBuffer[GWCountNextAETEntry])); stats[8] = ((stats[8]) + (workBuffer[GWCountChangeAETEntry])); interpreterProxy->pop(1); + return null; }

EXPORT(sqInt) primitiveGetDepth(void) { @@ -5332,6 +5391,7 @@ } interpreterProxy->pop(1); interpreterProxy->pushInteger(workBuffer[GWCurrentZ]); + return null; }

@@ -5361,6 +5421,7 @@ } interpreterProxy->pop(1); interpreterProxy->pushInteger(workBuffer[GWStopReason]); + return null; }

EXPORT(sqInt) primitiveGetOffset(void) { @@ -5375,6 +5436,7 @@ } pointOop = interpreterProxy->makePointwithxValueyValue(workBuffer[GWDestOffsetX], workBuffer[GWDestOffsetY]); interpreterProxy->popthenPush(1, pointOop); + return null; }

EXPORT(sqInt) primitiveGetTimes(void) { @@ -5403,6 +5465,7 @@ stats[7] = ((stats[7]) + (workBuffer[GWTimeNextAETEntry])); stats[8] = ((stats[8]) + (workBuffer[GWTimeChangeAETEntry])); interpreterProxy->pop(1); + return null; }

EXPORT(sqInt) primitiveInitializeBuffer(void) { @@ -5423,8 +5486,8 @@ return interpreterProxy->primitiveFail(); } /* begin workBufferPut: */ - workBuffer = interpreterProxy->firstIndexableField(wbOop); - objBuffer = workBuffer + GWHeaderSize; + workBuffer = (int*)interpreterProxy->firstIndexableField(wbOop); + objBuffer = (int*)workBuffer + GWHeaderSize; workBuffer[GWMagicIndex] = GWMagicNumber; workBuffer[GWSize] = size; workBuffer[GWBufferTop] = size; @@ -5450,6 +5513,7 @@ initColorTransform(); interpreterProxy->pop(2); interpreterProxy->push(wbOop); + return null; }

@@ -5486,6 +5550,7 @@ value = (interpreterProxy->ioMicroMSecs()) - geProfileTime; workBuffer[GWTimeInitializing] = ((workBuffer[GWTimeInitializing]) + value); } + return null; }

@@ -5550,6 +5615,7 @@ value1 = (interpreterProxy->ioMicroMSecs()) - geProfileTime; workBuffer[GWTimeMergeFill] = ((workBuffer[GWTimeMergeFill]) + value1); } + return null; }

EXPORT(sqInt) primitiveNeedsFlush(void) { @@ -5567,6 +5633,7 @@ workBuffer[GWObjUsed] = objUsed; interpreterProxy->pop(1); interpreterProxy->pushBool(needFlush); + return null; }

EXPORT(sqInt) primitiveNeedsFlushPut(void) { @@ -5591,6 +5658,7 @@ /* begin storeEngineStateInto: */ workBuffer[GWObjUsed] = objUsed; interpreterProxy->pop(1); + return null; }

@@ -5640,6 +5708,7 @@ value = (interpreterProxy->ioMicroMSecs()) - geProfileTime; workBuffer[GWTimeNextAETEntry] = ((workBuffer[GWTimeNextAETEntry]) + value); } + return null; }

@@ -5701,6 +5770,7 @@ value = (interpreterProxy->ioMicroMSecs()) - geProfileTime; workBuffer[GWTimeNextFillEntry] = ((workBuffer[GWTimeNextFillEntry]) + value); } + return null; }

@@ -5754,6 +5824,7 @@ value = (interpreterProxy->ioMicroMSecs()) - geProfileTime; workBuffer[GWTimeNextGETEntry] = ((workBuffer[GWTimeNextGETEntry]) + value); } + return null; }

EXPORT(sqInt) primitiveRegisterExternalEdge(void) { @@ -5814,6 +5885,7 @@ workBuffer[GWObjUsed] = objUsed; interpreterProxy->pop(6); } + return null; }

EXPORT(sqInt) primitiveRegisterExternalFill(void) { @@ -5851,6 +5923,7 @@ interpreterProxy->pop(2); interpreterProxy->pushInteger(fill); } + return null; }

@@ -5868,6 +5941,7 @@ } proceedRenderingImage(); storeRenderingState(); + return null; }

@@ -5881,6 +5955,7 @@ } proceedRenderingScanline(); storeRenderingState(); + return null; }

EXPORT(sqInt) primitiveSetAALevel(void) { @@ -5901,6 +5976,7 @@ /* begin storeEngineStateInto: */ workBuffer[GWObjUsed] = objUsed; interpreterProxy->pop(1); + return null; }

@@ -5945,6 +6021,7 @@ } } interpreterProxy->pop(1); + return null; }

EXPORT(sqInt) primitiveSetClipRect(void) { @@ -5973,6 +6050,7 @@ /* begin storeEngineStateInto: */ workBuffer[GWObjUsed] = objUsed; interpreterProxy->pop(1); + return null; }

EXPORT(sqInt) primitiveSetColorTransform(void) { @@ -5996,6 +6074,7 @@ /* begin storeEngineStateInto: */ workBuffer[GWObjUsed] = objUsed; interpreterProxy->pop(1); + return null; }

EXPORT(sqInt) primitiveSetDepth(void) { @@ -6016,6 +6095,7 @@ /* begin storeEngineStateInto: */ workBuffer[GWObjUsed] = objUsed; interpreterProxy->pop(1); + return null; }

EXPORT(sqInt) primitiveSetEdgeTransform(void) { @@ -6039,6 +6119,7 @@ /* begin storeEngineStateInto: */ workBuffer[GWObjUsed] = objUsed; interpreterProxy->pop(1); + return null; }

EXPORT(sqInt) primitiveSetOffset(void) { @@ -6064,6 +6145,7 @@ /* begin storeEngineStateInto: */ workBuffer[GWObjUsed] = objUsed; interpreterProxy->pop(1); + return null; }

@@ -6170,6 +6252,7 @@ return null; } } + return null; }

@@ -6297,6 +6380,7 @@ } workBuffer[GWState] = GEStateAddingFromGET; } + return null; }

@@ -6467,6 +6551,7 @@ } quickSortGlobalEdgeTablefromto(array, i, l); quickSortGlobalEdgeTablefromto(array, k, j); + return null; }

static int * rShiftTable(void) { @@ -6485,6 +6570,7 @@ aetBuffer[index] = (aetBuffer[index + 1]); index += 1; } + return null; }

static sqInt resetGraphicsEngineStats(void) { @@ -6510,6 +6596,7 @@ workBuffer[GWBezierHeightSubdivisions] = 0; workBuffer[GWBezierOverflowSubdivisions] = 0; workBuffer[GWBezierLineConversions] = 0; + return null; }

static sqInt resortFirstAETEntry(void) { @@ -6527,6 +6614,7 @@ return null; } moveAETEntryFromedgex(workBuffer[GWAETStart], edge, xValue); + return null; }

@@ -6566,6 +6654,7 @@ } workBuffer[GWAAColorShift] = ((workBuffer[GWAAShift]) * 2); workBuffer[GWAAHalfPixel] = (workBuffer[GWAAShift]); + return null; }

@@ -6604,6 +6693,7 @@ workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - 3) + 1)] = depth; workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - 3) + 2)] = rightX; } + return null; }

static int * smallSqrtTable(void) { @@ -6718,6 +6808,7 @@ objBuffer[bezier + GEXValue] = xValue; objBuffer[bezier + GENumLines] = (deltaY - (yValue - startY)); } + return null; }

@@ -6801,6 +6892,7 @@ } objBuffer[line + GENumLines] = (deltaY - (yValue - startY)); } + return null; }

@@ -6878,6 +6970,7 @@ } objBuffer[bezier + GENumLines] = ((objBuffer[bezier + GENumLines]) - (yValue - startY)); } + return null; }

@@ -6973,6 +7066,7 @@ } objBuffer[line + GENumLines] = ((objBuffer[line + GENumLines]) - (yValue - startY)); } + return null; }

@@ -7004,6 +7098,7 @@ ((objBuffer + bezier) + GBUpdateData)[GBUpdateDY] = fwDy; xValue = ((sqInt) lastX >> 8); objBuffer[bezier + GEXValue] = xValue; + return null; }

@@ -7021,6 +7116,7 @@ } objBuffer[line + GLError] = err; objBuffer[line + GEXValue] = x; + return null; }

@@ -7028,6 +7124,7 @@

static sqInt stepToNextWideBezier(void) { stepToNextWideBezierInat(aetBuffer[workBuffer[GWAETStart]], workBuffer[GWCurrentY]); + return null; }

@@ -7106,6 +7203,7 @@ ((objBuffer + bezier) + GBWideUpdateData)[GBUpdateDY] = fwDy1; ((sqInt) lastX1 >> 8); computeFinalWideBezierValueswidth(bezier, lineWidth); + return null; }

@@ -7156,6 +7254,7 @@

adjustWideLineafterSteppingFromto(line, lastX, nextX); } + return null; }

static sqInt storeEdgeStateFrominto(sqInt edge, sqInt edgeOop) { @@ -7168,6 +7267,7 @@ interpreterProxy->storeIntegerofObjectwithValue(ETZValueIndex, edgeOop, objBuffer[edge + GEZValue]); interpreterProxy->storeIntegerofObjectwithValue(ETLinesIndex, edgeOop, objBuffer[edge + GENumLines]); workBuffer[GWLastExportedEdge] = edge; + return null; }

static sqInt storeFillStateInto(sqInt fillOop) { @@ -7185,6 +7285,7 @@ interpreterProxy->storeIntegerofObjectwithValue(FTMinXIndex, fillOop, leftX); interpreterProxy->storeIntegerofObjectwithValue(FTMaxXIndex, fillOop, rightX); interpreterProxy->storeIntegerofObjectwithValue(FTYValueIndex, fillOop, workBuffer[GWCurrentY]); + return null; }

static sqInt storeRenderingState(void) { @@ -7221,6 +7322,7 @@ workBuffer[GWObjUsed] = objUsed; interpreterProxy->pop(3); interpreterProxy->pushInteger(workBuffer[GWStopReason]); + return null; }

@@ -7397,6 +7499,7 @@ showFilldepthrightX(fillIndex, depth, rightX); } } + return null; }

static sqInt toggleFillsOf(sqInt edge) { @@ -7426,6 +7529,7 @@ } } l1: /* end quickRemoveInvalidFillsAt: */; + return null; }

static sqInt toggleWideFillOf(sqInt edge) { @@ -7494,6 +7598,7 @@ } } l1: /* end quickRemoveInvalidFillsAt: */; + return null; }

static sqInt topDepth(void) { @@ -7502,6 +7607,7 @@ } else { return workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - 3) + 1)]; } + return null; }

static sqInt topFill(void) { @@ -7510,6 +7616,7 @@ } else { return workBuffer[(workBuffer[GWBufferTop]) + (((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - 3)]; } + return null; }

static sqInt topRightX(void) { @@ -7518,6 +7625,7 @@ } else { return workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - 3) + 2)]; } + return null; }

static sqInt transformColor(sqInt fillIndex) { @@ -7588,6 +7696,7 @@ point[0] = (((point[0]) + (workBuffer[GWDestOffsetX])) * (workBuffer[GWAALevel])); point[1] = (((point[1]) + (workBuffer[GWDestOffsetY])) * (workBuffer[GWAALevel])); } + return null; }

@@ -7635,6 +7744,7 @@ } else { return dstWidth; } + return null; }

static sqInt uncheckedTransformColor(sqInt fillIndex) {

Modified: trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c =================================================================== --- trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2014-12-30 20:24:52 UTC (rev 3199) +++ trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2014-12-30 23:44:16 UTC (rev 3200) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.9 translated as C source on 16 December 2014 9:28:14 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:41 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.356 uuid: b4a4af04-ab24-45ac-9c5e-7fb83c764a85 + VMPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad from - B3DAcceleratorPlugin VMMaker-dtl.356 uuid: b4a4af04-ab24-45ac-9c5e-7fb83c764a85 + B3DAcceleratorPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad */ -static char __buildInfo[] = "B3DAcceleratorPlugin VMMaker-dtl.356 uuid: b4a4af04-ab24-45ac-9c5e-7fb83c764a85 " __DATE__ ; +static char __buildInfo[] = "B3DAcceleratorPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad " __DATE__ ;

@@ -107,9 +107,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B3DAcceleratorPlugin 16 December 2014 (i)" + "B3DAcceleratorPlugin 30 December 2014 (i)" #else - "B3DAcceleratorPlugin 16 December 2014 (e)" + "B3DAcceleratorPlugin 30 December 2014 (e)" #endif ;

@@ -127,6 +127,7 @@ return interpreterProxy->primitiveFail(); } } + return null; }

@@ -146,6 +147,7 @@ return interpreterProxy->primitiveFail(); } } + return null; }

@@ -160,6 +162,7 @@

static sqInt halt(void) { ; + return null; }

EXPORT(sqInt) initialiseModule(void) { @@ -217,6 +220,7 @@ if (!(ok)) { return interpreterProxy->primitiveFail(); } + return null; }

EXPORT(sqInt) primitiveAllocateTexture(void) { @@ -462,6 +466,7 @@ if (!(interpreterProxy->failed())) { interpreterProxy->pop(interpreterProxy->methodArgumentCount()); } + return null; }

@@ -516,6 +521,7 @@ if (!(interpreterProxy->failed())) { interpreterProxy->pop(interpreterProxy->methodArgumentCount()); } + return null; }

@@ -579,6 +585,7 @@ if (!(interpreterProxy->failed())) { interpreterProxy->pop(interpreterProxy->methodArgumentCount()); } + return null; }

@@ -599,6 +606,7 @@ doRangeChecks = enabled; return interpreterProxy->pop(1); } + return null; }

EXPORT(sqInt) primitiveFinishRenderer(void) {

Modified: trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c =================================================================== --- trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2014-12-30 20:24:52 UTC (rev 3199) +++ trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2014-12-30 23:44:16 UTC (rev 3200) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.9 translated as C source on 16 December 2014 9:28:08 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:35 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.356 uuid: b4a4af04-ab24-45ac-9c5e-7fb83c764a85 + VMPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad from - BMPReadWriterPlugin VMMaker-dtl.356 uuid: b4a4af04-ab24-45ac-9c5e-7fb83c764a85 + BMPReadWriterPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad */ -static char __buildInfo[] = "BMPReadWriterPlugin VMMaker-dtl.356 uuid: b4a4af04-ab24-45ac-9c5e-7fb83c764a85 " __DATE__ ; +static char __buildInfo[] = "BMPReadWriterPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad " __DATE__ ;

@@ -58,9 +58,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BMPReadWriterPlugin 16 December 2014 (i)" + "BMPReadWriterPlugin 30 December 2014 (i)" #else - "BMPReadWriterPlugin 16 December 2014 (e)" + "BMPReadWriterPlugin 30 December 2014 (e)" #endif ;

@@ -77,6 +77,7 @@

static sqInt halt(void) { ; + return null; }

EXPORT(sqInt) primitiveRead24BmpLine(void) { @@ -127,6 +128,7 @@ } ; interpreterProxy->pop(4); + return null; }

EXPORT(sqInt) primitiveWrite24BmpLine(void) { @@ -178,6 +180,7 @@

; interpreterProxy->pop(4); + return null; }

Modified: trunk/src/plugins/BitBltPlugin/BitBltPlugin.c =================================================================== --- trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2014-12-30 20:24:52 UTC (rev 3199) +++ trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2014-12-30 23:44:16 UTC (rev 3200) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.9 translated as C source on 16 December 2014 9:28:11 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:37 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.356 uuid: b4a4af04-ab24-45ac-9c5e-7fb83c764a85 + SmartSyntaxPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad from - BitBltSimulation VMMaker-dtl.356 uuid: b4a4af04-ab24-45ac-9c5e-7fb83c764a85 + BitBltSimulation VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad */ -static char __buildInfo[] = "BitBltSimulation VMMaker-dtl.356 uuid: b4a4af04-ab24-45ac-9c5e-7fb83c764a85 " __DATE__ ; +static char __buildInfo[] = "BitBltSimulation VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad " __DATE__ ;

@@ -256,9 +256,9 @@ }; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BitBltPlugin 16 December 2014 (i)" + "BitBltPlugin 30 December 2014 (i)" #else - "BitBltPlugin 16 December 2014 (e)" + "BitBltPlugin 30 December 2014 (e)" #endif ; static sqInt nWords; @@ -845,6 +845,7 @@ srcY += 1; dstY += 1; } + return null; }

@@ -940,6 +941,7 @@ srcY += 1; dstY += 1; } + return null; }

@@ -1074,6 +1076,7 @@ srcY += 1; dstY += 1; } + return null; }

static sqInt bitAndwith(sqInt sourceWord, sqInt destinationWord) { @@ -1176,6 +1179,7 @@ if ((sy + bbH) > sourceHeight) { bbH -= (sy + bbH) - sourceHeight; } + return null; }

@@ -1201,6 +1205,7 @@ # endif // ENABLE_FAST_BLT unlockSurfaces(); + return null; }

@@ -1509,6 +1514,7 @@ copyBitsDispatch(&op); # endif // ENABLE_FAST_BLT + return null; }

@@ -1522,6 +1528,7 @@ copyBits(); /* begin showDisplayBits */ interpreterProxy->showDisplayBitsLeftTopRightBottom(destForm, affectedL, affectedT, affectedR, affectedB); + return null; }

@@ -1737,6 +1744,7 @@ affectedT = (dy - bbH) + 1; affectedB = dy + 1; } + return null; }

@@ -1766,11 +1774,11 @@ if ((interpreterProxy->methodArgumentCount()) == 4) { gammaLookupTableOop = interpreterProxy->stackObjectValue(1); if (interpreterProxy->isBytes(gammaLookupTableOop)) { - gammaLookupTable = interpreterProxy->firstIndexableField(gammaLookupTableOop); + gammaLookupTable = (unsigned char *)interpreterProxy->firstIndexableField(gammaLookupTableOop); } ungammaLookupTableOop = interpreterProxy->stackObjectValue(0); if (interpreterProxy->isBytes(ungammaLookupTableOop)) { - ungammaLookupTable = interpreterProxy->firstIndexableField(ungammaLookupTableOop); + ungammaLookupTable = (unsigned char *)interpreterProxy->firstIndexableField(ungammaLookupTableOop); } } } else { @@ -1784,6 +1792,7 @@ } } } + return null; }

@@ -1958,6 +1967,7 @@ sourceIndex += sourceDelta; destIndex += destDelta; } + return null; }

@@ -2026,6 +2036,7 @@ } destIndex += destDelta; } + return null; }

@@ -2227,6 +2238,7 @@ sourceIndex += sourceDelta; destIndex += destDelta; } + return null; }

@@ -2357,6 +2369,7 @@

static sqInt halt(void) { ; + return null; }

static sqInt initBBOpTable(void) { @@ -2402,6 +2415,7 @@ opTable[39+1] = (void *)pixClearwith; opTable[40+1] = (void *)fixAlphawith; opTable[41+1] = (void *)rgbComponentAlphawith; + return null; }

static sqInt initDither8Lookup(void) { @@ -2444,6 +2458,7 @@ dither8Lookup[(t << 8) + b] = value; } } + return null; }

EXPORT(sqInt) initialiseModule(void) { @@ -2653,7 +2668,7 @@ oldStyle = 0; if (interpreterProxy->isWords(cmOop)) { cmSize = interpreterProxy->slotSizeOf(cmOop); - cmLookupTable = interpreterProxy->firstIndexableField(cmOop); + cmLookupTable = (unsigned int *)interpreterProxy->firstIndexableField(cmOop); oldStyle = 1; ; } else { @@ -2677,7 +2692,7 @@ cmShiftTable = null; goto l7; } - cmShiftTable = interpreterProxy->firstIndexableField(mapOop); + cmShiftTable = (int *)interpreterProxy->firstIndexableField(mapOop); l7: /* end loadColorMapShiftOrMaskFrom: */; /* begin loadColorMapShiftOrMaskFrom: */ mapOop1 = interpreterProxy->fetchPointerofObject(1, cmOop); @@ -2695,7 +2710,7 @@ cmMaskTable = null; goto l8; } - cmMaskTable = interpreterProxy->firstIndexableField(mapOop1); + cmMaskTable = (unsigned int *)interpreterProxy->firstIndexableField(mapOop1); l8: /* end loadColorMapShiftOrMaskFrom: */; oop = interpreterProxy->fetchPointerofObject(2, cmOop); if (oop == (interpreterProxy->nilObject())) { @@ -2706,7 +2721,7 @@ goto l5; } cmSize = interpreterProxy->slotSizeOf(oop); - cmLookupTable = interpreterProxy->firstIndexableField(oop); + cmLookupTable = (unsigned int *)interpreterProxy->firstIndexableField(oop); } cmFlags = cmFlags | ColorMapNewStyle; ; @@ -2735,7 +2750,7 @@ if (oldStyle) { setupColorMasks(); } - if (isIdentityMapwith(cmShiftTable, cmMaskTable)) { + if (isIdentityMapwith((int *)cmShiftTable, (unsigned int *)cmMaskTable)) { cmMaskTable = null; cmShiftTable = null; } else { @@ -2935,6 +2950,7 @@

querySurfaceFn = (lockSurfaceFn = (unlockSurfaceFn = 0)); } + return null; }

@@ -3243,6 +3259,7 @@ interpreterProxy->pop(1); return interpreterProxy->pushInteger(bitCount); } + return null; }

EXPORT(sqInt) primitiveDisplayString(void) { @@ -3359,6 +3376,7 @@ interpreterProxy->showDisplayBitsLeftTopRightBottom(destForm, affectedL, affectedT, affectedR, affectedB); interpreterProxy->storeIntegerofObjectwithValue(BBDestXIndex, bbObj, destX); interpreterProxy->pop(6); + return null; }

@@ -3485,6 +3503,7 @@ if (!(interpreterProxy->failed())) { interpreterProxy->pop(2); } + return null; }

@@ -3671,6 +3690,7 @@ return null; } interpreterProxy->pop(interpreterProxy->methodArgumentCount()); + return null; }

@@ -3736,6 +3756,7 @@ carryOverflowMask = 2155905152U; return partitionedAddtonBitscomponentMaskcarryOverflowMask(sourceWord, destinationWord, 8, componentMask, carryOverflowMask); } + return null; }

@@ -3853,6 +3874,7 @@ srcY += 1; dstY += 1; } + return null; }

@@ -3930,6 +3952,7 @@ srcY += 1; dstY += 1; } + return null; }

@@ -4182,6 +4205,7 @@ srcY += 1; dstY += 1; } + return null; }

@@ -4400,6 +4424,7 @@ } return destPix; } + return null; }

static sqInt rgbMaxwith(sqInt sourceWord, sqInt destinationWord) { @@ -4420,6 +4445,7 @@

return partitionedMaxwithnBitsnPartitions(sourceWord, destinationWord, 8, 4); } + return null; }

static sqInt rgbMinwith(sqInt sourceWord, sqInt destinationWord) { @@ -4440,6 +4466,7 @@

return partitionedMinwithnBitsnPartitions(sourceWord, destinationWord, 8, 4); } + return null; }

static sqInt rgbMinInvertwith(sqInt wordToInvert, sqInt destinationWord) { @@ -4463,6 +4490,7 @@

return partitionedMinwithnBitsnPartitions(sourceWord, destinationWord, 8, 4); } + return null; }

static sqInt rgbMulwith(sqInt sourceWord, sqInt destinationWord) { @@ -4483,6 +4511,7 @@

return partitionedMulwithnBitsnPartitions(sourceWord, destinationWord, 8, 4); } + return null; }

static sqInt rgbSubwith(sqInt sourceWord, sqInt destinationWord) { @@ -4503,6 +4532,7 @@

return partitionedSubfromnBitsnPartitions(sourceWord, destinationWord, 8, 4); } + return null; }

@@ -4554,6 +4584,7 @@ targetBits = cmBitsPerColor; } setupColorMasksFromto(bits, targetBits); + return null; }

@@ -4595,6 +4626,7 @@ cmShiftTable = shifts; cmMaskTable = masks; cmFlags = cmFlags | (ColorMapPresent | ColorMapFixedPart); + return null; }

static sqInt sourceWordwith(sqInt sourceWord, sqInt destinationWord) { @@ -4781,6 +4813,7 @@ } hasSurfaceLock = 0; } + return null; }

@@ -5169,6 +5202,7 @@ pBy += deltaP43y; destIndex += destDelta; } + return null; }

Modified: trunk/src/plugins/CameraPlugin/CameraPlugin.c =================================================================== --- trunk/src/plugins/CameraPlugin/CameraPlugin.c 2014-12-30 20:24:52 UTC (rev 3199) +++ trunk/src/plugins/CameraPlugin/CameraPlugin.c 2014-12-30 23:44:16 UTC (rev 3200) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.9 translated as C source on 16 December 2014 9:28:15 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:41 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.356 uuid: b4a4af04-ab24-45ac-9c5e-7fb83c764a85 + VMPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad from - CameraPlugin VMMaker-dtl.356 uuid: b4a4af04-ab24-45ac-9c5e-7fb83c764a85 + CameraPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad */ -static char __buildInfo[] = "CameraPlugin VMMaker-dtl.356 uuid: b4a4af04-ab24-45ac-9c5e-7fb83c764a85 " __DATE__ ; +static char __buildInfo[] = "CameraPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad " __DATE__ ;

@@ -64,9 +64,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "CameraPlugin 16 December 2014 (i)" + "CameraPlugin 30 December 2014 (i)" #else - "CameraPlugin 16 December 2014 (e)" + "CameraPlugin 30 December 2014 (e)" #endif ;

@@ -83,6 +83,7 @@

static sqInt halt(void) { ; + return null; }

Modified: trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c =================================================================== --- trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2014-12-30 20:24:52 UTC (rev 3199) +++ trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2014-12-30 23:44:16 UTC (rev 3200) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.9 translated as C source on 16 December 2014 9:28:15 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:41 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.356 uuid: b4a4af04-ab24-45ac-9c5e-7fb83c764a85 + SmartSyntaxPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad from - ClipboardExtendedPlugin VMMaker-dtl.356 uuid: b4a4af04-ab24-45ac-9c5e-7fb83c764a85 + ClipboardExtendedPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad */ -static char __buildInfo[] = "ClipboardExtendedPlugin VMMaker-dtl.356 uuid: b4a4af04-ab24-45ac-9c5e-7fb83c764a85 " __DATE__ ; +static char __buildInfo[] = "ClipboardExtendedPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad " __DATE__ ;

@@ -61,9 +61,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ClipboardExtendedPlugin 16 December 2014 (i)" + "ClipboardExtendedPlugin 30 December 2014 (i)" #else - "ClipboardExtendedPlugin 16 December 2014 (e)" + "ClipboardExtendedPlugin 30 December 2014 (e)" #endif ;

@@ -80,6 +80,7 @@

static sqInt halt(void) { ; + return null; }

EXPORT(sqInt) ioAddClipboardData(void) {

Modified: trunk/src/plugins/CroquetPlugin/CroquetPlugin.c =================================================================== --- trunk/src/plugins/CroquetPlugin/CroquetPlugin.c 2014-12-30 20:24:52 UTC (rev 3199) +++ trunk/src/plugins/CroquetPlugin/CroquetPlugin.c 2014-12-30 23:44:16 UTC (rev 3200) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.9 translated as C source on 16 December 2014 9:28:11 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:38 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.356 uuid: b4a4af04-ab24-45ac-9c5e-7fb83c764a85 + VMPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad from - CroquetPlugin VMMaker-dtl.356 uuid: b4a4af04-ab24-45ac-9c5e-7fb83c764a85 + CroquetPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad */ -static char __buildInfo[] = "CroquetPlugin VMMaker-dtl.356 uuid: b4a4af04-ab24-45ac-9c5e-7fb83c764a85 " __DATE__ ; +static char __buildInfo[] = "CroquetPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad " __DATE__ ;

@@ -73,9 +73,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "CroquetPlugin 16 December 2014 (i)" + "CroquetPlugin 30 December 2014 (i)" #else - "CroquetPlugin 16 December 2014 (e)" + "CroquetPlugin 30 December 2014 (e)" #endif ;

@@ -92,6 +92,7 @@

static sqInt halt(void) { ; + return null; }

Modified: trunk/src/plugins/DBusPlugin/DBusPlugin.c =================================================================== --- trunk/src/plugins/DBusPlugin/DBusPlugin.c 2014-12-30 20:24:52 UTC (rev 3199) +++ trunk/src/plugins/DBusPlugin/DBusPlugin.c 2014-12-30 23:44:16 UTC (rev 3200) @@ -1,6 +1,6 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.9 translated as C source on 16 December 2014 9:28:15 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:41 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.356 uuid: b4a4af04-ab24-45ac-9c5e-7fb83c764a85 + SmartSyntaxPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad from DBusPlugin DBus-Plugin-dtl.35 uuid: 2ae30f08-4793-4acb-876b-c443a5f5e665 */ @@ -143,9 +143,9 @@ static DBusMessageIter messageIter[DBUS_MAXIMUM_TYPE_RECURSION_DEPTH]; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DBusPlugin 16 December 2014 (i)" + "DBusPlugin 30 December 2014 (i)" #else - "DBusPlugin 16 December 2014 (e)" + "DBusPlugin 30 December 2014 (e)" #endif ; static DBusMessage* writeMessage; @@ -163,6 +163,7 @@ msg("Can not add Boolean argument."); return interpreterProxy->primitiveFail(); } + return null; }

static sqInt argumentsAddBytetoIter(sqInt oop, DBusMessageIter*iter) { @@ -177,6 +178,7 @@ msg("Can not add Byte argument."); return interpreterProxy->primitiveFail(); } + return null; }

static sqInt argumentsAddDoubletoIter(sqInt oop, DBusMessageIter*iter) { @@ -190,6 +192,7 @@ msg("Can not add Double argument."); return interpreterProxy->primitiveFail(); } + return null; }

static sqInt argumentsAddInt16toIter(sqInt oop, DBusMessageIter*iter) { @@ -204,6 +207,7 @@ msg("Can not add Int16 argument."); return interpreterProxy->primitiveFail(); } + return null; }

static sqInt argumentsAddInt32toIter(sqInt oop, DBusMessageIter*iter) { @@ -218,6 +222,7 @@ msg("Can not add Int32 argument."); return interpreterProxy->primitiveFail(); } + return null; }

static sqInt argumentsAddInt64toIter(sqInt oop, DBusMessageIter*iter) { @@ -232,6 +237,7 @@ msg("Can not add Int64 argument."); return interpreterProxy->primitiveFail(); } + return null; }

static sqInt argumentsAddObjectPathtoIter(sqInt oop, DBusMessageIter*iter) { @@ -244,6 +250,7 @@ } free(arg); } + return null; }

static sqInt argumentsAddSignaturetoIter(sqInt oop, DBusMessageIter*iter) { @@ -256,6 +263,7 @@ } free(arg); } + return null; }

static sqInt argumentsAddStringtoIter(sqInt oop, DBusMessageIter*iter) { @@ -268,6 +276,7 @@ } free(arg); } + return null; }

static sqInt argumentsAddUInt16toIter(sqInt oop, DBusMessageIter*iter) { @@ -282,6 +291,7 @@ msg("Can not add UInt16 argument."); return interpreterProxy->primitiveFail(); } + return null; }

static sqInt argumentsAddUInt32toIter(sqInt oop, DBusMessageIter*iter) { @@ -296,6 +306,7 @@ msg("Can not add UInt32 argument."); return interpreterProxy->primitiveFail(); } + return null; }

static sqInt argumentsAddUInt64toIter(sqInt oop, DBusMessageIter*iter) { @@ -310,6 +321,7 @@ msg("Can not add UInt64 argument."); return interpreterProxy->primitiveFail(); } + return null; }

@@ -411,6 +423,7 @@ return interpreterProxy->primitiveFail(); } dbus_message_iter_get_basic(&messageIter[curIter], val ); + return null; }

@@ -481,10 +494,12 @@

static sqInt halt(void) { ; + return null; }

static sqInt handleflag(int fd, int flag) { aioHandle(fd, handleReadForFDwithDataandFlag , flag); + return null; }

@@ -497,6 +512,7 @@ handleflag(fd, flag); semaphore = data->semaphore; interpreterProxy->signalSemaphoreWithIndex(semaphore); + return null; }

EXPORT(sqInt) initialiseModule(void) { @@ -526,6 +542,7 @@

static sqInt msg(char *s) { fprintf(stderr, "\n%s: %s", moduleName, s); + return null; }

Modified: trunk/src/plugins/DSAPrims/DSAPrims.c =================================================================== --- trunk/src/plugins/DSAPrims/DSAPrims.c 2014-12-30 20:24:52 UTC (rev 3199) +++ trunk/src/plugins/DSAPrims/DSAPrims.c 2014-12-30 23:44:16 UTC (rev 3200) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.9 translated as C source on 16 December 2014 9:28:11 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.10 translated as C source on 30 December 2014 6:33:38 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.356 uuid: b4a4af04-ab24-45ac-9c5e-7fb83c764a85 + VMPluginCodeGenerator VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad from - DSAPlugin VMMaker-dtl.356 uuid: b4a4af04-ab24-45ac-9c5e-7fb83c764a85 + DSAPlugin VMMaker-dtl.357 uuid: 96d483fb-0958-4bbe-b781-24d9787a20ad */ -static char __buildInfo[] = "DSAPlugin VMMaker-dtl.356 uuid: b4a4af04-ab24-45ac-9c5e-7fb83c764a85 " __DATE__ ;

@@ Diff output truncated at 50000 characters. @@