Vm-dev December 2014

vm-dev@lists.squeakfoundation.org

33 participants
160 discussions

Need help to make a small RomePlugin update
by David T. Lewis 31 Dec '14

31 Dec '14

I need to make a small update to RomePlugin to address a bug that I found while incorporating Alex Franchuk's Plan9 changes. The repository for the plugin is at http://www.squeaksource.com/Rome, but I don't have write access. Bert, could you please apply the attached change, or give me developer access to the Rome repository? The change is in method category '*Rome-Plugin' in class TSendNode, and ensures that the selector name is a symbol rather than string. TSendNode>>replaceCairoCalls ((selector beginsWith: 'cairo') or: [selector beginsWith: 'pango']) ifTrue: [ selector := (RomePlugin camelToUnderscore: selector) asSymbol] Thanks! Dave

2 3

[commit][3200] VMMaker 4.13.10
by commits＠squeakvm.org 31 Dec '14

31 Dec '14

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. @@

1 0

VM Maker: VMMaker-dtl.357.mcz
by commits＠source.squeak.org 31 Dec '14

31 Dec '14

David T. Lewis uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-dtl.357.mcz ==================== Summary ==================== Name: VMMaker-dtl.357 Author: dtl Time: 30 December 2014, 6:32:30.531 pm UUID: 96d483fb-0958-4bbe-b781-24d9787a20ad Ancestors: VMMaker-dtl.356 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 Summary of changes: - Add inlineReturnTypes to CCodeGenerator. Use this in TSendNode to provide type casts where necessary to avoid compiler complaints. - In TMethod, add a return null to void methods that do not contain an explicit return. - In TAssigmentNode, generated an explicit type cast if needed. - Variable declaration fixes for callExternalPrimitive:, ioUTCMicroseconds, primitiveLocalMicrosecondClock, primitiveUTCMicrosecondClock. Miscellaneous - Do not initialize inlineList to an empty Array or Dictionary because it is actually a Set that is initialized elsewhere in collectInlineList. - Eliminate redundant calls to #initialize in VMMaker and subclasses. - Clean up redundant initializations in ObjectMemory class>>initialize. Note: RomePlugin (not in VMMaker package) now requires an update to ensure that #replaceCairoCalls produces selectors that are symbols, not strings. =============== Diff against VMMaker-dtl.356 =============== Item was changed: Object subclass: #CCodeGenerator + instanceVariableNames: 'translationDict inlineList constants variables variableDeclarations scopeStack methods macros preparedMethodList variablesSetCache headerFiles globalVariableUsage useSymbolicConstants generateDeadCode doNotRemoveMethodList asArgumentTranslationDict receiverDict vmClass currentMethod logger declareMethodsStatic permitMethodPruning pools abstractDeclarations uncheckedAbstractMethods selectorTranslations breakSrcInlineSelector breakDestInlineSelector inlineReturnTypes' - instanceVariableNames: 'translationDict inlineList constants variables variableDeclarations scopeStack methods macros preparedMethodList variablesSetCache headerFiles globalVariableUsage useSymbolicConstants generateDeadCode doNotRemoveMethodList asArgumentTranslationDict receiverDict vmClass currentMethod logger declareMethodsStatic permitMethodPruning pools abstractDeclarations uncheckedAbstractMethods selectorTranslations breakSrcInlineSelector breakDestInlineSelector' classVariableNames: 'UseRightShiftForDivide' poolDictionaries: '' category: 'VMMaker-Translation to C'! !CCodeGenerator commentStamp: 'tpr 5/2/2003 14:30' prior: 0! This class oversees the translation of a subset of Smalltalk to C, allowing the comforts of Smalltalk during development and the efficiency and portability of C for the resulting interpreter. See VMMaker for more useful info! Item was changed: ----- Method: CCodeGenerator>>collectInlineList (in category 'inlining') ----- collectInlineList "Make a list of methods that should be inlined." "Details: The method must not include any inline C, since the translator cannot currently map variable names in inlined C code. The #inline: directive may be used to override this for cases in which the C code or declarations are harmless. Methods to be inlined must be small or called from only one place." | methodsNotToInline callsOf inlineIt hasCCode nodeCount senderCount + sel returnTypesOf | - sel | methodsNotToInline := Set new: methods size. "build dictionary to record the number of calls to each method" callsOf := Dictionary new: methods size * 2. + returnTypesOf := Dictionary new: methods size. methods keys do: [ :s | callsOf at: s put: 0 ]. + methods do: [ :m | returnTypesOf at: m selector put: m returnType ]. "For each method, scan its parse tree once to: 1. determine if the method contains C code or declarations 2. determine how many nodes it has 3. increment the sender counts of the methods it calls 4. determine if it includes any C declarations or code" inlineList := Set new: methods size * 2. + inlineReturnTypes := Dictionary new: methods size. methods do: [ :m | inlineIt := #dontCare. (translationDict includesKey: m selector) ifTrue: [ hasCCode := true. ] ifFalse: [ hasCCode := m declarations size > 0. nodeCount := 0. m parseTree nodesDo: [ :node | node isSend ifTrue: [ sel := node selector. (sel = #cCode: or: [sel = #cCode:inSmalltalk:]) ifTrue: [ hasCCode := true ]. senderCount := callsOf at: sel ifAbsent: [ nil ]. nil = senderCount ifFalse: [ callsOf at: sel put: senderCount + 1. ]. ]. nodeCount := nodeCount + 1. ]. inlineIt := m extractInlineDirective. "may be true, false, or #dontCare" ]. (inlineIt ~= true and: [hasCCode or: [inlineIt = false]]) ifTrue: [ "Don't inline if method has C code or if it contains a negative inline directive. If it contains a positive inline directive, permit inlining even if C code is present." methodsNotToInline add: m selector. ] ifFalse: [ ((nodeCount < 40) or: [inlineIt = true]) ifTrue: [ "inline if method has no C code and is either small or contains inline directive" inlineList add: m selector. + inlineReturnTypes at: sel put: m returnType. ]. ]. ]. callsOf associationsDo: [ :assoc | ((assoc value = 1) and: [(methodsNotToInline includes: assoc key) not]) ifTrue: [ inlineList add: assoc key. ]. ].! Item was added: + ----- Method: CCodeGenerator>>declToType: (in category 'public') ----- + declToType: decl + "Extracts the type from a C declaration string" + + | strs r | + decl isNil ifFalse: [ + (decl indexOf: $=) > 0 ifTrue: + [ strs := (decl copyFrom: 1 to: ((decl indexOf: $=) - 1)) ] + ifFalse: [ strs := decl ]. + strs := (strs withoutTrailingBlanks) subStrings: ' '. + strs size == 1 ifTrue: [ ^ strs first ] + ifFalse: + [ + | asterisks | + r := ''. + strs allButLastDo: [ :s | r := r,s,' ' ]. + "Bit of a hack to get 'type *'" + asterisks := (strs last copyFrom: 1 to: (strs last lastIndexOf: $*)). + asterisks size > 0 ifTrue: [ r := r,' ',asterisks ]. + r := r withoutTrailingBlanks. + (((r indexOf: $() > 0) or: ((r indexOf: $)) > 0)) ifTrue: [ ^nil ]. + ^r withoutTrailingBlanks + ]. + ] ifTrue: [ ^nil ].! Item was changed: ----- Method: CCodeGenerator>>initialize (in category 'public') ----- initialize translationDict := Dictionary new. - inlineList := Array new. constants := Dictionary new: 100. variables := OrderedCollection new: 100. variableDeclarations := Dictionary new: 100. methods := Dictionary new: 500. macros := Dictionary new. self initializeCTranslationDictionary. receiverDict := Dictionary new. headerFiles := OrderedCollection new. globalVariableUsage := Dictionary new. useSymbolicConstants := true. generateDeadCode := true. scopeStack := OrderedCollection new. logger := (ProvideAnswerNotification new tag: #logger; signal) ifNil: [Transcript]. pools := IdentitySet new. abstractDeclarations := IdentitySet new. uncheckedAbstractMethods := OrderedCollection new. selectorTranslations := IdentityDictionary new.! Item was added: + ----- Method: CCodeGenerator>>inlineReturnType: (in category 'inlining') ----- + inlineReturnType: selector + "gets the return type of a given inline selector" + + ^inlineReturnTypes at: selector ifAbsent: nil! Item was changed: ----- Method: CrossPlatformVMMaker>>createCodeGenerator (in category 'initialize') ----- createCodeGenerator "Set up a CCodeGenerator for this VMMaker - A cross platform tree leaves it up to the makefiles to decide whether to use the global struct or not." + ^CCodeGeneratorGlobalStructure new - ^CCodeGeneratorGlobalStructure new initialize; globalStructDefined: true; structDefDefine: 'USE_GLOBAL_STRUCT'; logger: logger; yourself! Item was changed: ----- Method: Interpreter>>callExternalPrimitive: (in category 'plugin primitive support') ----- callExternalPrimitive: functionID "Call the external plugin function identified. In the VM this is an address, see InterpreterSimulator for it's version. " + <var: #functionID declareC: 'void (*functionID)(void)'> - <var: #functionID declareC: 'void *functionID(void)'> self dispatchFunctionPointer: functionID! Item was changed: ----- Method: InterpreterPrimitives>>ioUTCMicroseconds (in category 'FIXME') ----- ioUTCMicroseconds "Answer the UTC microseconds since the Smalltalk epoch. The value is derived from the Posix epoch (see primitiveUTCMicrosecondClock) with a constant offset corresponding to elapsed microseconds between the two epochs according to RFC 868." "Added to Cross/vm/sqVirtualMachine but incompatible with existing timer support in Cross. Implemented here to provide the function not present in the support code. See also primitiveUTCMicrosecondClock." | clock offset epochDelta uSecs | <export: true> <returnTypeC: 'usqLong'> + <var: #clock type: 'sqLong'> - <var: #clock type: 'usqLong'> <var: #offset type: 'int'> <var: #epochDelta declareC: 'static usqLong epochDelta= 2177452800000000ULL'> self flag: #FIXME. "remove this method when platform sources are reconciled" (self cCode: 'ioUtcWithOffset(&clock, &offset)' inSmalltalk: [-1]) = -1 ifTrue: [^ self primitiveFail]. clock := clock + epochDelta. uSecs := self positive64BitIntegerFor: clock. ^uSecs. ! Item was changed: ----- Method: InterpreterPrimitives>>primitiveLocalMicrosecondClock (in category 'system control primitives') ----- primitiveLocalMicrosecondClock "Answer the local microseconds since the Smalltalk epoch. The value is derived from the Posix epoch (see primitiveUTCMicrosecondClock) with a constant offset corresponding to elapsed microseconds between the two epochs according to RFC 868, and with an offset duration corresponding to the current offset of local time from UTC." | clock offset offsetMillis epochDelta uSecs | <export: true> + <var: #clock type: 'sqLong'> - <var: #clock type: 'usqLong'> <var: #offset type: 'int'> <var: #offsetMillis type: 'usqLong'> <var: #epochDelta declareC: 'static usqLong epochDelta= 2177452800000000ULL'> (self cCode: 'ioUtcWithOffset(&clock, &offset)' inSmalltalk: [-1]) = -1 ifTrue: [^ self primitiveFail]. clock := clock + epochDelta. "adjust for nominal Smalltalk epoch" offsetMillis := offset. offsetMillis := offsetMillis * 1000000. clock := clock + offsetMillis. "adjust for local time offset" uSecs := self positive64BitIntegerFor: clock. self pop: 1 thenPush: uSecs. ! Item was changed: ----- Method: InterpreterPrimitives>>primitiveUTCMicrosecondClock (in category 'system control primitives') ----- primitiveUTCMicrosecondClock "Answer the UTC microseconds since the Smalltalk epoch. The value is derived from the Posix epoch (see primitiveUTCMicrosecondClock) with a constant offset corresponding to elapsed microseconds between the two epochs according to RFC 868." | clock offset epochDelta uSecs | <export: true> + <var: #clock type: 'sqLong'> - <var: #clock type: 'usqLong'> <var: #offset type: 'int'> <var: #epochDelta declareC: 'static usqLong epochDelta= 2177452800000000ULL'> (self cCode: 'ioUtcWithOffset(&clock, &offset)' inSmalltalk: [-1]) = -1 ifTrue: [^ self primitiveFail]. clock := clock + epochDelta. uSecs := self positive64BitIntegerFor: clock. self pop: 1 thenPush: uSecs. ! Item was changed: ----- Method: MacOSPowerPCOS9VMMaker>>createCodeGenerator (in category 'initialize') ----- createCodeGenerator "set up a CCodeGenerator for this VMMaker - Mac OS uses the global struct and local def of the structure" + ^CCodeGeneratorGlobalStructure new + globalStructDefined: true! - ^CCodeGeneratorGlobalStructure new initialize; globalStructDefined: true! Item was changed: ----- Method: ObjectMemory class>>initialize (in category 'initialization') ----- initialize "ObjectMemory initialize" self initializeConstants. self initializePrimitiveErrorCodes. self initializeCompactClassIndices. - self initializeObjectHeaderConstants. - self initializeObjectWordConstants. self initializePrimitiveErrorCodes. self initializeSmallIntegers. + ! - self initializeSpecialObjectIndices! Item was changed: ----- Method: RiscOSVMMaker>>createCodeGenerator (in category 'initialize') ----- createCodeGenerator "set up a CCodeGenerator for this VMMaker - RiscOS uses the global struct and no local def of the structure because of the global register trickery" + ^CCodeGeneratorGlobalStructure new + globalStructDefined: false! - ^CCodeGeneratorGlobalStructure new initialize; globalStructDefined: false! Item was changed: ----- Method: TAssignmentNode>>emitCCodeOn:level:generator: (in category 'C code generation') ----- emitCCodeOn: aStream level: level generator: aCodeGen expression isSwitch ifTrue: [^expression emitCCodeOn: aStream addToEndOfCases: self level: level generator: aCodeGen]. variable emitCCodeOn: aStream level: level generator: aCodeGen. self isVariableUpdatingAssignment ifTrue: [aStream space; nextPutAll: expression selector; "+ or -" nextPut: $=; space. expression args first emitCCodeAsArgumentOn: aStream level: level generator: aCodeGen] ifFalse: + [| vartype | + aStream space; nextPut: $=; space. + "Add an appropriate cast if we need to do so" + vartype := aCodeGen typeOfVariable: variable name. + vartype := aCodeGen declToType: vartype. + ((expression isMemberOf: TSendNode) and: [vartype ~= nil]) + ifTrue: + [| fntype expselector | + vartype := vartype asSymbol. + expselector := expression selector. + fntype := (aCodeGen methodNamed: expselector). + fntype notNil ifTrue: [ fntype := fntype returnType ]. + "The expression may have been inlined" + fntype isNil ifTrue: [ fntype := aCodeGen inlineReturnType: expselector ]. + (fntype notNil and: [ fntype ~= vartype ] and: [ vartype ~= #void ]) ifTrue: + [aStream nextPut: $(; nextPutAll: vartype asString; nextPut: $)]. + ]. - [aStream space; nextPut: $=; space. expression emitCCodeAsArgumentOn: aStream level: level generator: aCodeGen]! Item was added: + ----- Method: TMethod>>argTypes (in category 'accessing') ----- + argTypes + "Get the types of the parameters of this method" + + ^args collect: [ :a | self declarationAt: a ]! Item was changed: ----- Method: TMethod>>emitCCodeOn:generator: (in category 'C code generation') ----- emitCCodeOn: aStream generator: aCodeGen "Emit C code for this method onto the given stream. All calls to inlined methods should already have been expanded." aCodeGen currentMethod: self. self emitCCommentOn: aStream. "place method comment before function" self emitCHeaderOn: aStream generator: aCodeGen. parseTree emitCCodeOn: aStream level: 1 generator: aCodeGen. + "Ensure code is POSIX compliant" + (self returnType = #void or: [self endsWithReturn]) ifFalse: [aStream tab: 1; nextPutAll: 'return null;'; cr]. aStream nextPutAll: '}'; cr.! Item was changed: ----- Method: TSendNode>>emitCCodeAsFunctionCallOn:level:generator: (in category 'C code generation') ----- emitCCodeAsFunctionCallOn: aStream level: level generator: aCodeGen "Translate this message send into a C function call" "Special case for pluggable modules. Replace messages to interpreterProxy by interpreterProxy->message(..) if the message is not builtin" + | fn fnargtypes | (aCodeGen isGeneratingPluginCode and: [receiver isVariable and: ['interpreterProxy' = receiver name and: [self isBuiltinOperator not]]]) ifTrue: [aStream nextPutAll:'interpreterProxy->']. "Translate this message send into a C function call." aStream nextPutAll: (aCodeGen cFunctionNameFor: selector); nextPut: $(. "Only include the receiver as the first argument in certain cases. The receiver is always included if it is an expression. If it is a variable: If the vmClass says it is an implicit variable, don't include it. If the variable is 'self' and the method being called is not in the method set (i.e. it is some external code), don't include it." (self shouldIncludeReceiverAsFirstArgument: aCodeGen) ifTrue: [receiver emitCCodeOn: aStream level: level generator: aCodeGen. arguments isEmpty ifFalse: [aStream nextPutAll: ', ']]. + fn := aCodeGen methodNamed: self selector. + fn notNil ifTrue: [ fnargtypes := fn argTypes ]. + fnargtypes notNil ifTrue: [ fnargtypes size = arguments size ifFalse: [ fnargtypes := nil ] ]. + fnargtypes notNil ifTrue: [ fnargtypes := fnargtypes collect: [ :a | aCodeGen declToType: a ]]. + arguments withIndexDo: + [ :arg :i | | argtype fnargtype | + i = 1 ifFalse: [aStream nextPut: $,; space]. + argtype := nil. + fnargtype := nil. + (arg name notNil) ifTrue: [ argtype := aCodeGen declToType: (aCodeGen typeOfVariable: arg name) ]. + fnargtypes notNil ifTrue: [ fnargtype := fnargtypes at: i ]. + "Insert cast of function argument type if necessary" + (argtype notNil and: fnargtype notNil and: [ argtype ~= fnargtype ]) ifTrue: [ aStream nextPutAll: '(',fnargtype,')' ]. + arg emitCCodeAsArgumentOn: aStream level: level generator: aCodeGen]. - arguments do: - [ :arg| arg emitCCodeAsArgumentOn: aStream level: level generator: aCodeGen] - separatedBy: [aStream nextPut: $,; space]. aStream nextPut: $)! Item was changed: ----- Method: TStmtListNode>>endsWithReturn (in category 'testing') ----- endsWithReturn "Answer true if the last statement of this lock is a return." + ^ statements isEmpty not + and: [statements last isReturn + or: [statements last isReturningIf]]! - ^statements last isReturn or: [statements last isReturningIf]! Item was changed: ----- Method: UnixVMMaker>>createCodeGenerator (in category 'initialisation') ----- createCodeGenerator ^CCodeGeneratorGlobalStructure new - initialize; globalStructDefined: true! Item was changed: ----- Method: VMMaker class>>versionString (in category 'version testing') ----- versionString "VMMaker versionString" + ^'4.13.10'! - ^'4.13.9'! Item was changed: ----- Method: VMMaker>>createCodeGenerator (in category 'initialize') ----- createCodeGenerator "set up a CCodeGenerator for this VMMaker" + ^CCodeGenerator new! - ^CCodeGenerator new initialize!

1 0

[commit][3199] Correct the volatile decls.
by commits＠squeakvm.org 30 Dec '14

30 Dec '14

Revision: 3199 Author: eliot Date: 2014-12-30 12:24:52 -0800 (Tue, 30 Dec 2014) Log Message: ----------- Correct the volatile decls. C makes the rules, not me. Modified Paths: -------------- branches/Cog/platforms/Mac OS/plugins/SqueakFFIPrims/x86-sysv-MacIntel.c branches/Cog/platforms/Mac OS/vm/sqMacMain.c branches/Cog/platforms/unix/vm/sqUnixMain.c branches/Cog/platforms/win32/vm/sqWin32Main.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Tue Dec 30 11:42:09 PST 2014 + Tue Dec 30 12:23:14 PST 2014 Modified: branches/Cog/platforms/Mac OS/plugins/SqueakFFIPrims/x86-sysv-MacIntel.c =================================================================== --- branches/Cog/platforms/Mac OS/plugins/SqueakFFIPrims/x86-sysv-MacIntel.c 2014-12-30 20:22:03 UTC (rev 3198) +++ branches/Cog/platforms/Mac OS/plugins/SqueakFFIPrims/x86-sysv-MacIntel.c 2014-12-30 20:24:52 UTC (rev 3199) @@ -77,7 +77,7 @@ volatile int ffiIntReturnValue; volatile int ffiLongReturnValue; volatile double ffiFloatReturnValue; -volatile int *ffiStructReturnValue; +int * volatile ffiStructReturnValue; extern int ffiCallAddressOf(void *addr, void *stack, int size); Modified: branches/Cog/platforms/Mac OS/vm/sqMacMain.c =================================================================== --- branches/Cog/platforms/Mac OS/vm/sqMacMain.c 2014-12-30 20:22:03 UTC (rev 3198) +++ branches/Cog/platforms/Mac OS/vm/sqMacMain.c 2014-12-30 20:24:52 UTC (rev 3199) @@ -1133,7 +1133,7 @@ #if !defined(min) # define min(x,y) (((x)>(y))?(y):(x)) #endif -static volatile char *p = 0; +static char * volatile p = 0; static void sighandler(int sig) { p = (char *)&sig; } Modified: branches/Cog/platforms/unix/vm/sqUnixMain.c =================================================================== --- branches/Cog/platforms/unix/vm/sqUnixMain.c 2014-12-30 20:22:03 UTC (rev 3198) +++ branches/Cog/platforms/unix/vm/sqUnixMain.c 2014-12-30 20:24:52 UTC (rev 3199) @@ -2113,7 +2113,7 @@ #if !defined(min) # define min(x,y) (((x)>(y))?(y):(x)) #endif -static volatile char *p = 0; +static char * volatile p = 0; static void sighandler(int sig) { p = (char *)&sig; } Modified: branches/Cog/platforms/win32/vm/sqWin32Main.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Main.c 2014-12-30 20:22:03 UTC (rev 3198) +++ branches/Cog/platforms/win32/vm/sqWin32Main.c 2014-12-30 20:24:52 UTC (rev 3199) @@ -1986,7 +1986,7 @@ #if !defined(min) # define min(x,y) (((x)>(y))?(y):(x)) #endif -static volatile char *p = 0; +static char * volatile p = 0; static void sighandler(int sig) { p = (char *)&sig; }

3 2

[commit][3198] Nuke obsolete RCS info
by commits＠squeakvm.org 30 Dec '14

30 Dec '14

Revision: 3198 Author: eliot Date: 2014-12-30 12:22:03 -0800 (Tue, 30 Dec 2014) Log Message: ----------- Nuke obsolete RCS info Modified Paths: -------------- trunk/platforms/win32/plugins/AsynchFilePlugin/sqWin32AsyncFilePrims.c trunk/platforms/win32/plugins/B3DAcceleratorPlugin/sqWin32D3D.c trunk/platforms/win32/plugins/B3DAcceleratorPlugin/sqWin32OpenGL.c trunk/platforms/win32/plugins/DropPlugin/sqWin32Drop.c trunk/platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c trunk/platforms/win32/plugins/JoystickTabletPlugin/sqWin32Joystick.c trunk/platforms/win32/plugins/MIDIPlugin/sqWin32MIDI.c trunk/platforms/win32/plugins/SecurityPlugin/sqWin32Security.c trunk/platforms/win32/plugins/SerialPlugin/sqWin32SerialPort.c trunk/platforms/win32/plugins/SocketPlugin/sqWin32NewNet.c trunk/platforms/win32/plugins/SoundPlugin/sqWin32Sound.c trunk/platforms/win32/plugins/SqueakFFIPrims/sqWin32FFI.c trunk/platforms/win32/plugins/UUIDPlugin/sqWin32UUID.c Modified: trunk/platforms/win32/plugins/AsynchFilePlugin/sqWin32AsyncFilePrims.c =================================================================== --- trunk/platforms/win32/plugins/AsynchFilePlugin/sqWin32AsyncFilePrims.c 2014-12-30 19:42:22 UTC (rev 3197) +++ trunk/platforms/win32/plugins/AsynchFilePlugin/sqWin32AsyncFilePrims.c 2014-12-30 20:22:03 UTC (rev 3198) @@ -6,7 +6,6 @@ * AUTHOR: Andreas Raab (ar) * ADDRESS: University of Magdeburg, Germany * EMAIL: raab(a)isg.cs.uni-magdeburg.de -* RCSID: $Id$ * * NOTES: * 1) Instead of the async io functions (e.g., ReadFileEx/WriteFileEx) Modified: trunk/platforms/win32/plugins/B3DAcceleratorPlugin/sqWin32D3D.c =================================================================== --- trunk/platforms/win32/plugins/B3DAcceleratorPlugin/sqWin32D3D.c 2014-12-30 19:42:22 UTC (rev 3197) +++ trunk/platforms/win32/plugins/B3DAcceleratorPlugin/sqWin32D3D.c 2014-12-30 20:22:03 UTC (rev 3198) @@ -6,10 +6,7 @@ * AUTHOR: Andreas Raab (ar) * ADDRESS: Walt Disney Imagineering, Glendale, CA * EMAIL: Andreas.Raab(a)disney.com -* RCSID: $Id$ * -* NOTES: -* *****************************************************************************/ #define DIRECTDRAW_VERSION 0x700 /* restrict to DX7 */ #include <windows.h> Modified: trunk/platforms/win32/plugins/B3DAcceleratorPlugin/sqWin32OpenGL.c =================================================================== --- trunk/platforms/win32/plugins/B3DAcceleratorPlugin/sqWin32OpenGL.c 2014-12-30 19:42:22 UTC (rev 3197) +++ trunk/platforms/win32/plugins/B3DAcceleratorPlugin/sqWin32OpenGL.c 2014-12-30 20:22:03 UTC (rev 3198) @@ -5,10 +5,7 @@ * AUTHOR: Andreas Raab (ar) * ADDRESS: Walt Disney Imagineering, Glendale, CA * EMAIL: Andreas.Raab(a)disney.com -* RCSID: $Id$ * -* NOTES: -* *****************************************************************************/ #include <windows.h> #include <stdio.h> Modified: trunk/platforms/win32/plugins/DropPlugin/sqWin32Drop.c =================================================================== --- trunk/platforms/win32/plugins/DropPlugin/sqWin32Drop.c 2014-12-30 19:42:22 UTC (rev 3197) +++ trunk/platforms/win32/plugins/DropPlugin/sqWin32Drop.c 2014-12-30 20:22:03 UTC (rev 3198) @@ -6,9 +6,7 @@ * AUTHOR: Andreas Raab (ar) * ADDRESS: Walt Disney Imagineering, Glendale, CA * EMAIL: Andreas.Raab(a)disney.com -* RCSID: $Id$ * -* NOTES: *****************************************************************************/ #include <windows.h> #include <ole2.h> Modified: trunk/platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c =================================================================== --- trunk/platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c 2014-12-30 19:42:22 UTC (rev 3197) +++ trunk/platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c 2014-12-30 20:22:03 UTC (rev 3198) @@ -6,7 +6,6 @@ * AUTHOR: Andreas Raab (ar) * ADDRESS: University of Magdeburg, Germany * EMAIL: raab(a)isg.cs.uni-magdeburg.de -* RCSID: $Id$ * * NOTES: * 1) This is a bare windows implementation *not* using any stdio stuff. Modified: trunk/platforms/win32/plugins/JoystickTabletPlugin/sqWin32Joystick.c =================================================================== --- trunk/platforms/win32/plugins/JoystickTabletPlugin/sqWin32Joystick.c 2014-12-30 19:42:22 UTC (rev 3197) +++ trunk/platforms/win32/plugins/JoystickTabletPlugin/sqWin32Joystick.c 2014-12-30 20:22:03 UTC (rev 3198) @@ -6,7 +6,6 @@ * AUTHOR: Andreas Raab (ar) * ADDRESS: University of Magdeburg, Germany * EMAIL: raab(a)isg.cs.uni-magdeburg.de -* RCSID: $Id: sqWin32Joystick.c,v 1.2 2002/05/04 23:20:28 andreasraab Exp $ * * NOTES: * 1) Only buttons 1-4 are supported @@ -18,10 +17,6 @@ #ifndef NO_JOYSTICK -#ifndef NO_RCSID - static char RCSID[]="$Id: sqWin32Joystick.c,v 1.2 2002/05/04 23:20:28 andreasraab Exp $"; -#endif - int numJoySticks=0; JOYCAPS *joySticks = NULL; Modified: trunk/platforms/win32/plugins/MIDIPlugin/sqWin32MIDI.c =================================================================== --- trunk/platforms/win32/plugins/MIDIPlugin/sqWin32MIDI.c 2014-12-30 19:42:22 UTC (rev 3197) +++ trunk/platforms/win32/plugins/MIDIPlugin/sqWin32MIDI.c 2014-12-30 20:22:03 UTC (rev 3198) @@ -6,7 +6,6 @@ * AUTHOR: Andreas Raab (ar) * ADDRESS: University of Magdeburg, Germany * EMAIL: raab(a)isg.cs.uni-magdeburg.de -* RCSID: $Id$ * * NOTES: * 1) For MIDI output the MIDI mapper is reported as first device @@ -25,10 +24,6 @@ # define STACK_SIZE_PARAM_IS_A_RESERVATION 0x00010000 #endif -#ifndef NO_RCSID - static char RCSID[] = "$Id$"; -#endif - /*** MIDI Parameters (used with sqMIDIParameter function) ***/ #define sqMIDIInstalled 1 Modified: trunk/platforms/win32/plugins/SecurityPlugin/sqWin32Security.c =================================================================== --- trunk/platforms/win32/plugins/SecurityPlugin/sqWin32Security.c 2014-12-30 19:42:22 UTC (rev 3197) +++ trunk/platforms/win32/plugins/SecurityPlugin/sqWin32Security.c 2014-12-30 20:22:03 UTC (rev 3198) @@ -26,7 +26,7 @@ /* imported from sqWin32Prefs.c */ extern TCHAR squeakIniName[MAX_PATH]; -/* imported from sqWin32Intel.c */ +/* imported from sqWin32Main.c */ extern BOOL fLowRights; /* started as low integrity process, need to use alternate untrustedUserDirectory */ Modified: trunk/platforms/win32/plugins/SerialPlugin/sqWin32SerialPort.c =================================================================== --- trunk/platforms/win32/plugins/SerialPlugin/sqWin32SerialPort.c 2014-12-30 19:42:22 UTC (rev 3197) +++ trunk/platforms/win32/plugins/SerialPlugin/sqWin32SerialPort.c 2014-12-30 20:22:03 UTC (rev 3198) @@ -6,20 +6,13 @@ * AUTHOR: Andreas Raab (ar) * ADDRESS: University of Magdeburg, Germany * EMAIL: raab(a)isg.cs.uni-magdeburg.de -* RCSID: $Id$ * -* NOTES: -* *****************************************************************************/ #include <windows.h> #include "sq.h" #ifndef NO_SERIAL_PORT -#ifndef NO_RCSID - static char RCSID[] = "$Id$"; -#endif - /* Maximum number of serial ports supported */ #define MAX_SERIAL_PORTS 256 Modified: trunk/platforms/win32/plugins/SocketPlugin/sqWin32NewNet.c =================================================================== --- trunk/platforms/win32/plugins/SocketPlugin/sqWin32NewNet.c 2014-12-30 19:42:22 UTC (rev 3197) +++ trunk/platforms/win32/plugins/SocketPlugin/sqWin32NewNet.c 2014-12-30 20:22:03 UTC (rev 3198) @@ -6,7 +6,6 @@ * AUTHOR: Andreas Raab (ar) * ADDRESS: University of Magdeburg, Germany * EMAIL: raab(a)isg.cs.uni-magdeburg.de -* RCSID: $Id$ * * NOTES: * 1) TCP & UDP are now fully supported. @@ -38,10 +37,6 @@ # define STACK_SIZE_PARAM_IS_A_RESERVATION 0x00010000 #endif -#ifndef NO_RCSID - static char RCSID[]="$Id$"; -#endif - #ifndef NDEBUG #define DBG(s,c) debugCheckWatcherThreads(PSP(s),c) #else Modified: trunk/platforms/win32/plugins/SoundPlugin/sqWin32Sound.c =================================================================== --- trunk/platforms/win32/plugins/SoundPlugin/sqWin32Sound.c 2014-12-30 19:42:22 UTC (rev 3197) +++ trunk/platforms/win32/plugins/SoundPlugin/sqWin32Sound.c 2014-12-30 20:22:03 UTC (rev 3198) @@ -6,7 +6,6 @@ * AUTHOR: Andreas Raab (ar) * ADDRESS: University of Magdeburg, Germany * EMAIL: raab(a)isg.cs.uni-magdeburg.de -* RCSID: $Id$ * * NOTES: For now we're supporting both, the DirectSound and the win32 * based interface. In the future we'll switch to DSound exclusively. @@ -26,10 +25,6 @@ #ifndef NO_SOUND -#ifndef NO_RCSID - static char RCSID[]="$Id$"; -#endif - #define _LPCWAVEFORMATEX_DEFINED #undef WINNT #define DIRECTSOUND_VERSION 0x0600 /* use DirectSound 6.0 */ Modified: trunk/platforms/win32/plugins/SqueakFFIPrims/sqWin32FFI.c =================================================================== --- trunk/platforms/win32/plugins/SqueakFFIPrims/sqWin32FFI.c 2014-12-30 19:42:22 UTC (rev 3197) +++ trunk/platforms/win32/plugins/SqueakFFIPrims/sqWin32FFI.c 2014-12-30 20:22:03 UTC (rev 3198) @@ -6,10 +6,7 @@ * AUTHOR: Andreas Raab (ar) * ADDRESS: Walt Disney Imagineering, Glendale, CA * EMAIL: andreasr(a)wdi.disney.com -* RCSID: $Id$ * -* NOTES: -* *****************************************************************************/ #include <windows.h> #include "sq.h" Modified: trunk/platforms/win32/plugins/UUIDPlugin/sqWin32UUID.c =================================================================== --- trunk/platforms/win32/plugins/UUIDPlugin/sqWin32UUID.c 2014-12-30 19:42:22 UTC (rev 3197) +++ trunk/platforms/win32/plugins/UUIDPlugin/sqWin32UUID.c 2014-12-30 20:22:03 UTC (rev 3198) @@ -6,9 +6,7 @@ * AUTHOR: Andreas Raab (ar) * ADDRESS: * EMAIL: Andreas.Raab(a)gmx.de -* RCSID: $Id: sqWin32UUID.c,v 1.1 2002/05/04 23:20:28 andreasraab Exp $ * -* NOTES: *****************************************************************************/ #include <windows.h> #include <ole2.h>

1 0

[commit][3197] Nuke obsolete RCS vrsion info
by commits＠squeakvm.org 30 Dec '14

30 Dec '14

Revision: 3197 Author: eliot Date: 2014-12-30 11:42:22 -0800 (Tue, 30 Dec 2014) Log Message: ----------- Nuke obsolete RCS vrsion info Modified Paths: -------------- branches/Cog/platforms/win32/vm/sqWin32.h branches/Cog/platforms/win32/vm/sqWin32Alloc.c branches/Cog/platforms/win32/vm/sqWin32DirectInput.c branches/Cog/platforms/win32/vm/sqWin32Directory.c branches/Cog/platforms/win32/vm/sqWin32ExternalPrims.c branches/Cog/platforms/win32/vm/sqWin32HandleTable.h branches/Cog/platforms/win32/vm/sqWin32Heartbeat.c branches/Cog/platforms/win32/vm/sqWin32Prefs.c branches/Cog/platforms/win32/vm/sqWin32Service.c branches/Cog/platforms/win32/vm/sqWin32Stubs.c branches/Cog/platforms/win32/vm/sqWin32Threads.c branches/Cog/platforms/win32/vm/sqWin32Utils.c branches/Cog/platforms/win32/vm/sqWin32VMProfile.c branches/Cog/platforms/win32/vm/sqWin32Window.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Tue Dec 30 11:00:13 PST 2014 + Tue Dec 30 11:42:09 PST 2014 Modified: branches/Cog/platforms/win32/vm/sqWin32.h =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32.h 2014-12-30 19:02:32 UTC (rev 3196) +++ branches/Cog/platforms/win32/vm/sqWin32.h 2014-12-30 19:42:22 UTC (rev 3197) @@ -149,7 +149,6 @@ /* Do not rely on stdio functions but rather pure Win32 stuff */ #define WIN32_FILE_SUPPORT /* Take out the static strings */ - #define NO_RCSID #define NO_WARNINGS #if 0 /* Finally, override the warning functions containing static strings */ Modified: branches/Cog/platforms/win32/vm/sqWin32Alloc.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Alloc.c 2014-12-30 19:02:32 UTC (rev 3196) +++ branches/Cog/platforms/win32/vm/sqWin32Alloc.c 2014-12-30 19:42:22 UTC (rev 3197) @@ -6,9 +6,7 @@ * AUTHOR: Andreas Raab (ar) * ADDRESS: University of Magdeburg, Germany * EMAIL: raab(a)isg.cs.uni-magdeburg.de -* RCSID: $Id: sqWin32Alloc.c 1394 2006-03-29 02:19:47Z andreas $ * -* *****************************************************************************/ #include <windows.h> #include "sq.h" @@ -24,10 +22,6 @@ #define DO_NOT_SHRINK -#ifndef NO_RCSID - static char RCSID[]="$Id: sqWin32Alloc.c 1394 2006-03-29 02:19:47Z andreas $"; -#endif - static LPSTR pageBase; /* base address of allocated memory */ static DWORD pageMask; /* bit mask for the start of a memory page */ static DWORD pageSize; /* size of a memory page */ Modified: branches/Cog/platforms/win32/vm/sqWin32DirectInput.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32DirectInput.c 2014-12-30 19:02:32 UTC (rev 3196) +++ branches/Cog/platforms/win32/vm/sqWin32DirectInput.c 2014-12-30 19:42:22 UTC (rev 3197) @@ -6,7 +6,6 @@ * AUTHOR: Andreas Raab (ar) * ADDRESS: Impara GmbH, Magdeburg, Germany * EMAIL: Andreas.Raab(a)impara.de -* RCSID: $Id: sqWin32DirectInput.c 789 2003-11-12 22:36:55Z andreasraab $ * * NOTES: * The function enclosed here provide direct support to the Modified: branches/Cog/platforms/win32/vm/sqWin32Directory.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Directory.c 2014-12-30 19:02:32 UTC (rev 3196) +++ branches/Cog/platforms/win32/vm/sqWin32Directory.c 2014-12-30 19:42:22 UTC (rev 3197) @@ -6,20 +6,13 @@ * AUTHOR: Andreas Raab (ar) * ADDRESS: University of Magdeburg, Germany * EMAIL: raab(a)isg.cs.uni-magdeburg.de -* RCSID: $Id: sqWin32Directory.c 1696 2007-06-03 18:13:07Z andreas $ * -* NOTES: -* *****************************************************************************/ #include <windows.h> #include "sq.h" extern struct VirtualMachine *interpreterProxy; -#ifndef NO_RCSID - static char RCSID[]="$Id: sqWin32Directory.c 1696 2007-06-03 18:13:07Z andreas $"; -#endif - /*** The interface to the directory primitive is path based. That is, the client supplies a Squeak string describing Modified: branches/Cog/platforms/win32/vm/sqWin32ExternalPrims.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32ExternalPrims.c 2014-12-30 19:02:32 UTC (rev 3196) +++ branches/Cog/platforms/win32/vm/sqWin32ExternalPrims.c 2014-12-30 19:42:22 UTC (rev 3197) @@ -6,7 +6,6 @@ * AUTHOR: Andreas Raab (ar) * ADDRESS: University of Magdeburg, Germany * EMAIL: raab(a)isg.cs.uni-magdeburg.de -* RCSID: $Id: sqWin32ExternalPrims.c 1224 2005-06-22 07:31:28Z bernd $ * * NOTES: * 1) Currently, we're looking for DLLs named either sample.dll or sample32.dll Modified: branches/Cog/platforms/win32/vm/sqWin32HandleTable.h =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32HandleTable.h 2014-12-30 19:02:32 UTC (rev 3196) +++ branches/Cog/platforms/win32/vm/sqWin32HandleTable.h 2014-12-30 19:42:22 UTC (rev 3197) @@ -6,7 +6,6 @@ * AUTHOR: Andreas Raab (ar) * ADDRESS: * EMAIL: andreas.raab(a)gmx.de -* RCSID: $Id$ * * NOTES: * 1) This is a simple handle table which can be used to verify whether Modified: branches/Cog/platforms/win32/vm/sqWin32Heartbeat.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Heartbeat.c 2014-12-30 19:02:32 UTC (rev 3196) +++ branches/Cog/platforms/win32/vm/sqWin32Heartbeat.c 2014-12-30 19:42:22 UTC (rev 3197) @@ -1,12 +1,9 @@ /**************************************************************************** -* PROJECT: Win32 time functions and heartbeat logic for Stack VM +* PROJECT: Squeak port for Win32 (NT / Win95) * FILE: sqWin32Heartbeat.c -* CONTENT: +* CONTENT: Win32 time functions and heartbeat logic for Stack VM * * AUTHOR: Eliot Miranda -* ADDRESS: -* EMAIL: eliot(a)teleplace.com -* RCSID: $Id$ * * NOTES: * August 3rd, 2008, EEM added heart-beat thread. Modified: branches/Cog/platforms/win32/vm/sqWin32Prefs.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Prefs.c 2014-12-30 19:02:32 UTC (rev 3196) +++ branches/Cog/platforms/win32/vm/sqWin32Prefs.c 2014-12-30 19:42:22 UTC (rev 3197) @@ -6,7 +6,6 @@ * AUTHOR: Andreas Raab (ar) * ADDRESS: Walt Disney Imagineering, Glendale, CA * EMAIL: Andreas.Raab(a)disney.com -* RCSID: $Id: sqWin32Prefs.c 1509 2006-05-11 20:02:03Z andreas $ * * NOTES: *****************************************************************************/ Modified: branches/Cog/platforms/win32/vm/sqWin32Service.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Service.c 2014-12-30 19:02:32 UTC (rev 3196) +++ branches/Cog/platforms/win32/vm/sqWin32Service.c 2014-12-30 19:42:22 UTC (rev 3197) @@ -6,9 +6,7 @@ * AUTHOR: Andreas Raab (ar) * ADDRESS: University of Magdeburg, Germany * EMAIL: raab(a)isg.cs.uni-magdeburg.de -* RCSID: $Id: sqWin32Service.c 342 2002-05-04 23:20:28Z andreasraab $ * -* * NOTES: On Win95 the two "magic" entries in the registry are * * HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\\Run @@ -20,10 +18,6 @@ #ifndef NO_SERVICE -#ifndef NO_RCSID - static char RCSID[] = "$Id: sqWin32Service.c 342 2002-05-04 23:20:28Z andreasraab $"; -#endif - /****************************************************************/ /* Imports from sqWin32Main.c */ /****************************************************************/ Modified: branches/Cog/platforms/win32/vm/sqWin32Stubs.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Stubs.c 2014-12-30 19:02:32 UTC (rev 3196) +++ branches/Cog/platforms/win32/vm/sqWin32Stubs.c 2014-12-30 19:42:22 UTC (rev 3197) @@ -6,9 +6,7 @@ * AUTHOR: Andreas Raab (ar) * ADDRESS: University of Magdeburg, Germany * EMAIL: raab(a)isg.cs.uni-magdeburg.de -* RCSID: $Id: sqWin32Stubs.c 2 2001-10-24 23:11:49Z rowledge $ * -* NOTES: *****************************************************************************/ #include "sq.h" Modified: branches/Cog/platforms/win32/vm/sqWin32Threads.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Threads.c 2014-12-30 19:02:32 UTC (rev 3196) +++ branches/Cog/platforms/win32/vm/sqWin32Threads.c 2014-12-30 19:42:22 UTC (rev 3197) @@ -1,12 +1,9 @@ /**************************************************************************** -* PROJECT: Win32 thread support code for Cog & Stack VMs +* PROJECT: Squeak port for Win32 (NT / Win95) * FILE: sqWin32Threads.c -* CONTENT: +* CONTENT: Win32 thread support code for Cog & Stack VMs * * AUTHOR: Eliot Miranda -* ADDRESS: -* EMAIL: eliot(a)teleplace.com -* RCSID: $Id$ * * NOTES: See the comment of CogThreadManager in the VMMaker package for * overall design documentation. Modified: branches/Cog/platforms/win32/vm/sqWin32Utils.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Utils.c 2014-12-30 19:02:32 UTC (rev 3196) +++ branches/Cog/platforms/win32/vm/sqWin32Utils.c 2014-12-30 19:42:22 UTC (rev 3197) @@ -6,9 +6,7 @@ * AUTHOR: Andreas Raab (ar) * ADDRESS: University of Magdeburg, Germany * EMAIL: raab(a)isg.cs.uni-magdeburg.de -* RCSID: $Id: sqWin32Utils.c 1394 2006-03-29 02:19:47Z andreas $ * -* NOTES: *****************************************************************************/ #include <windows.h> #include "sq.h" Modified: branches/Cog/platforms/win32/vm/sqWin32VMProfile.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32VMProfile.c 2014-12-30 19:02:32 UTC (rev 3196) +++ branches/Cog/platforms/win32/vm/sqWin32VMProfile.c 2014-12-30 19:42:22 UTC (rev 3197) @@ -1,13 +1,10 @@ /**************************************************************************** -* PROJECT: Win32 (CreateThread/WaitSingleObject/SetThreadAffinityMask) -* profiling logic for statistical profiling of the VM +* PROJECT: Squeak port for Win32 (NT / Win95) * FILE: sqWin32VMProfile.c -* CONTENT: +* CONTENT: Win32 (CreateThread/WaitSingleObject/SetThreadAffinityMask) +* profiling logic for statistical profiling of the VM * * AUTHOR: Eliot Miranda -* ADDRESS: -* EMAIL: eliot(a)teleplace.com -* RCSID: $Id$ * * NOTES: * August 15th, 2008, EEM wrote pc sampling code Modified: branches/Cog/platforms/win32/vm/sqWin32Window.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Window.c 2014-12-30 19:02:32 UTC (rev 3196) +++ branches/Cog/platforms/win32/vm/sqWin32Window.c 2014-12-30 19:42:22 UTC (rev 3197) @@ -6,7 +6,6 @@ * AUTHOR: Andreas Raab (ar) * ADDRESS: University of Magdeburg, Germany * EMAIL: raab(a)isg.cs.uni-magdeburg.de -* RCSID: $Id: sqWin32Window.c 1693 2007-06-03 02:09:21Z andreas $ * * NOTES: * 1) Currently supported Squeak color depths include 1,4,8,16,32 bits @@ -39,10 +38,6 @@ #include "sqWin32Prefs.h" #include "sqSCCSVersion.h" -#ifndef NO_RCSID -static TCHAR RCSID[]= TEXT("$Id: sqWin32Window.c 1693 2007-06-03 02:09:21Z andreas $"); -#endif - /****************************************************************************/ /* General Squeak declarations and definitions */ /****************************************************************************/

1 0

[commit][3196] Qualify the pointer used to determine the redzone size as volatile, otherwise
by commits＠squeakvm.org 30 Dec '14

30 Dec '14

Revision: 3196 Author: eliot Date: 2014-12-30 11:02:32 -0800 (Tue, 30 Dec 2014) Log Message: ----------- Qualify the pointer used to determine the redzone size as volatile, otherwise newer gccs optimise it away (thanks Ryan). Rename sqWin32Intel.c to sqWin32Main.c to match the other platforms, and hence be e.g. grep-friendly. Fix warning about missing newline at end of generated win32 sqNamedPrims.h. Modified Paths: -------------- branches/Cog/platforms/Mac OS/vm/sqMacMain.c branches/Cog/platforms/unix/vm/sqUnixMain.c branches/Cog/platforms/win32/misc/Squeak.dsp branches/Cog/platforms/win32/util/mkNamedPrims.c branches/Cog/platforms/win32/vm/sqWin32PluginSupport.c branches/Cog/platforms/win32/vm/sqWin32Service.c branches/Cog/platforms/win32/vm/sqWin32SpurAlloc.c Added Paths: ----------- branches/Cog/platforms/win32/vm/sqWin32Main.c Removed Paths: ------------- branches/Cog/platforms/win32/vm/sqWin32Intel.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Fri Dec 26 17:33:54 PST 2014 + Tue Dec 30 11:00:13 PST 2014 Modified: branches/Cog/platforms/Mac OS/vm/sqMacMain.c =================================================================== --- branches/Cog/platforms/Mac OS/vm/sqMacMain.c 2014-12-27 01:37:21 UTC (rev 3195) +++ branches/Cog/platforms/Mac OS/vm/sqMacMain.c 2014-12-30 19:02:32 UTC (rev 3196) @@ -1133,7 +1133,7 @@ #if !defined(min) # define min(x,y) (((x)>(y))?(y):(x)) #endif -static char *p = 0; +static volatile char *p = 0; static void sighandler(int sig) { p = (char *)&sig; } Modified: branches/Cog/platforms/unix/vm/sqUnixMain.c =================================================================== --- branches/Cog/platforms/unix/vm/sqUnixMain.c 2014-12-27 01:37:21 UTC (rev 3195) +++ branches/Cog/platforms/unix/vm/sqUnixMain.c 2014-12-30 19:02:32 UTC (rev 3196) @@ -2113,7 +2113,7 @@ #if !defined(min) # define min(x,y) (((x)>(y))?(y):(x)) #endif -static char *p = 0; +static volatile char *p = 0; static void sighandler(int sig) { p = (char *)&sig; } Modified: branches/Cog/platforms/win32/misc/Squeak.dsp =================================================================== --- branches/Cog/platforms/win32/misc/Squeak.dsp 2014-12-27 01:37:21 UTC (rev 3195) +++ branches/Cog/platforms/win32/misc/Squeak.dsp 2014-12-30 19:02:32 UTC (rev 3196) @@ -141,7 +141,7 @@ # End Source File # Begin Source File -SOURCE=..\vm\sqWin32Intel.c +SOURCE=..\vm\sqWin32Main.c # SUBTRACT CPP /D "SQUEAK_BUILTIN_PLUGIN" # End Source File # Begin Source File Modified: branches/Cog/platforms/win32/util/mkNamedPrims.c =================================================================== --- branches/Cog/platforms/win32/util/mkNamedPrims.c 2014-12-27 01:37:21 UTC (rev 3195) +++ branches/Cog/platforms/win32/util/mkNamedPrims.c 2014-12-30 19:02:32 UTC (rev 3196) @@ -21,6 +21,6 @@ printf("\t%s_exports,\n", argv[i]); } printf("\tNULL\n"); - printf("};"); + printf("};\n"); return 0; } Deleted: branches/Cog/platforms/win32/vm/sqWin32Intel.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Intel.c 2014-12-27 01:37:21 UTC (rev 3195) +++ branches/Cog/platforms/win32/vm/sqWin32Intel.c 2014-12-30 19:02:32 UTC (rev 3196) @@ -1,2032 +0,0 @@ -/**************************************************************************** -* PROJECT: Squeak port for Win32 (NT / Win95) -* FILE: sqWin32Intel.c -* CONTENT: Special support stuff only for Win95/WinNT on x86 -* -* AUTHOR: Andreas Raab (ar) -* ADDRESS: University of Magdeburg, Germany -* EMAIL: raab(a)isg.cs.uni-magdeburg.de -* RCSID: $Id: sqWin32Intel.c 1435 2006-04-11 00:17:05Z andreas $ -* -* NOTES: (I think this comment of Andreas' is obsolete; eem 6/2013) -* 1) When using this module the virtual machine MUST NOT be compiled -* with Unicode support. -*****************************************************************************/ -#include <windows.h> -#include <stdio.h> -#include <string.h> -#include <fcntl.h> /* _O_BINARY */ -#include <float.h> -#include <ole2.h> -#include "sq.h" -#include "sqAssert.h" -#include "sqWin32Backtrace.h" -#include "sqSCCSVersion.h" -#if COGVM -# include "cogmethod.h" -# if COGMTVM -# include "cointerpmt.h" -# else -# include "cointerp.h" -# endif -#endif - -/* Windows Vista support - * AUTHOR: Korakurider (kr) - * CHANGE NOTES: - * 1) new command line option "-lowRights" was introduced - * to support IE7/protected mode. - */ -#define VISTA_SECURITY 1 /* IE7/Vista protected mode support */ - -/*** Crash debug -- Imported from Virtual Machine ***/ -int getFullScreenFlag(void); -int methodPrimitiveIndex(void); -int getCurrentBytecode(void); - -extern TCHAR squeakIniName[]; -extern void printPhaseTime(int); - -/* Import from sqWin32Alloc.c */ -LONG CALLBACK sqExceptionFilter(LPEXCEPTION_POINTERS exp); - -/* forwarded declaration */ -static void printCrashDebugInformation(LPEXCEPTION_POINTERS exp); - -/*** Variables -- command line */ -static char *initialCmdLine; -static int numOptionsVM = 0; -static char **vmOptions; -static int numOptionsImage = 0; -static char **imageOptions; -static int clargc; /* the Unix-style command line, saved for GetImageOption */ -static char **clargv; - -/* console buffer */ -BOOL fIsConsole = 0; -TCHAR consoleBuffer[4096]; - -/* stderr and stdout names */ -char stderrName[MAX_PATH+1]; -char stdoutName[MAX_PATH+1]; - -static char vmLogDirA[MAX_PATH]; -static WCHAR vmLogDirW[MAX_PATH]; - -TCHAR *logName = TEXT(""); /* full path and name to log file */ - -#ifdef VISTA_SECURITY -BOOL fLowRights = 0; /* started as low integiry process, - need to use alternate untrustedUserDirectory */ -#endif /* VISTA_SECURITY */ - -/* Service stuff */ -TCHAR serviceName[MAX_PATH+1]; /* The name of the NT service */ -TCHAR *installServiceName = NULL; /* the name under which the service is to install */ -BOOL fBroadcastService95 = 0; /* Do we need a broadcast when a user has logged on? */ -UINT WM_BROADCAST_SERVICE = 0; /* The broadcast message we send */ -TCHAR *msgBroadcastService = TEXT("SQUEAK_SERVICE_BROADCAST_MESSAGE"); /* The name of the broadcast message */ - -UINT SQ_LAUNCH_DROP = 0; /* Message sent when second instance launches */ - -/* Embedded images */ -static sqImageFile imageFile = 0; -static int imageSize = 0; - -void SetSystemTrayIcon(BOOL on); - -/* default fpu control word: - _RC_NEAR: round to nearest - _PC_53 : double precision arithmetic (instead of extended) - _EM_XXX: silent operations (no signals please) -*/ -#define FPU_DEFAULT (_RC_NEAR + _PC_53 + _EM_INVALID + _EM_ZERODIVIDE + _EM_OVERFLOW + _EM_UNDERFLOW + _EM_INEXACT + _EM_DENORMAL) - -/****************************************************************************/ -/* Exception handling */ -/****************************************************************************/ -/* The following installs us a global exception filter for *all* exceptions */ -/* in Squeak. This is necessary since the C support of Mingw32 for SEH is */ -/* not as sophisticated as MSVC's support. However, with this new handling */ -/* scheme the entire thing becomes actually a lot simpler... */ -/****************************************************************************/ -static LPTOP_LEVEL_EXCEPTION_FILTER TopLevelFilter = NULL; - -static LONG CALLBACK -squeakExceptionHandler(LPEXCEPTION_POINTERS exp) -{ - DWORD result; - - /* #1: Try to handle exception in the regular (memory access) - exception filter if virtual memory support is enabled */ -#ifndef NO_VIRTUAL_MEMORY - result = sqExceptionFilter(exp); -#else - result = EXCEPTION_CONTINUE_SEARCH; -#endif - - /* #2: If that didn't work, try to handle any FP problems */ - if(result != EXCEPTION_CONTINUE_EXECUTION) { - DWORD code = exp->ExceptionRecord->ExceptionCode; - if((code >= EXCEPTION_FLT_DENORMAL_OPERAND) && (code <= EXCEPTION_FLT_UNDERFLOW)) { - /* turn on the default masking of exceptions in the FPU and proceed */ - _control87(FPU_DEFAULT, _MCW_EM | _MCW_RC | _MCW_PC | _MCW_IC); - result = EXCEPTION_CONTINUE_EXECUTION; - } - } - - /* #3: If that didn't work either try passing it on to the old - top-level filter */ - if(result != EXCEPTION_CONTINUE_EXECUTION) { - if(TopLevelFilter) { - result = TopLevelFilter(exp); - } - } -#ifdef NDEBUG - /* #4: If that didn't work either give up and print a crash debug information */ - if(result != EXCEPTION_CONTINUE_EXECUTION) { - printCrashDebugInformation(exp); - result = EXCEPTION_EXECUTE_HANDLER; - } -#endif - return result; -} - -void InstallExceptionHandler(void) -{ - TopLevelFilter = SetUnhandledExceptionFilter(squeakExceptionHandler); -} - -void UninstallExceptionHandler(void) -{ - SetUnhandledExceptionFilter(TopLevelFilter); - TopLevelFilter = NULL; -} - -/* N.B. As of cygwin 1.5.25 fopen("crash.dmp","a") DOES NOT WORK! crash.dmp - * contains garbled output as if the file pointer gets set to the start of the - * file, not the end. So we synthesize our own append mode. - */ -#if __MINGW32__ -# include <io.h> -static FILE * -fopen_for_append(char *filename) -{ - FILE *f = !access(filename, F_OK) /* access is bass ackwards */ - ? fopen(filename,"r+") - : fopen(filename,"w+"); - if (f) - fseek(f,0,SEEK_END); - return f; -} -#else -# define fopen_for_append(filename) fopen(filename,"a+t") -#endif - -/****************************************************************************/ -/* Console Window functions */ -/****************************************************************************/ -static int -OutputLogMessage(char *string) -{ FILE *fp; - - if(!*logName) return 1; - fp = fopen_for_append(logName); - if(!fp) return 1; - fprintf(fp, "%s", string); - fflush(fp); - fclose(fp); - return 1; -} - -static int -OutputConsoleString(char *string) -{ - int pos; - - if(fDynamicConsole && !fShowConsole) { - /* show console window */ - ShowWindow(consoleWindow, SW_SHOW); - fShowConsole = TRUE; -#ifndef NO_PREFERENCES - CheckMenuItem(vmPrefsMenu, 0x0030, MF_BYCOMMAND | MF_CHECKED); -#endif - OutputConsoleString( - "# Debug console\n" - "# To close: F2 -> 'debug options' -> 'show output console'\n" - "# To disable: F2 -> 'debug options' -> 'show console on errors'\n" - ); - } - pos = SendMessage(consoleWindow,WM_GETTEXTLENGTH, 0,0); - SendMessage(consoleWindow, EM_SETSEL, pos, pos); - while(*string) - { - SendMessage( consoleWindow, WM_CHAR, *string, 1); - string++; - } - return 1; -} - -// recommend using DPRINTF ifdef'ing to DPRINTF for debug output -int __cdecl DPRINTF(const char *fmt, ...) -{ va_list al; - - va_start(al, fmt); - if (!fIsConsole) { - wvsprintf(consoleBuffer, fmt, al); - OutputDebugString(consoleBuffer); - } - vfprintf(stdout, fmt, al); - va_end(al); - return 1; -} - -#if !defined(_MSC_VER) && !defined(NODBGPRINT) - -// redefining printf doesn't seem like a good idea to me... - -int __cdecl -printf(const char *fmt, ...) -{ va_list al; - int result; - - va_start(al, fmt); - if (!fIsConsole) { - wvsprintf(consoleBuffer, fmt, al); - OutputLogMessage(consoleBuffer); - if(IsWindow(stWindow)) /* not running as service? */ - OutputConsoleString(consoleBuffer); - } - result = vfprintf(stdout, fmt, al); - va_end(al); - return result; -} - -int __cdecl -fprintf(FILE *fp, const char *fmt, ...) -{ va_list al; - int result; - - va_start(al, fmt); - if(!fIsConsole && (fp == stdout || fp == stderr)) - { - wvsprintf(consoleBuffer, fmt, al); - OutputLogMessage(consoleBuffer); - if(IsWindow(stWindow)) /* not running as service? */ - OutputConsoleString(consoleBuffer); - } - result = vfprintf(fp, fmt, al); - va_end(al); - return result; -} - - -int __cdecl -putchar(int c) { return printf("%c",c); } - -#endif /* !defined(_MSC_VER) && !defined(NODBGPRINT) */ - -/****************************************************************************/ -/* Message Processing */ -/****************************************************************************/ - -static messageHook nextMessageHook = NULL; - -int ServiceMessageHook(void * hwnd, unsigned int message, unsigned int wParam, long lParam) -{ - if(fRunService && fWindows95 && message == WM_BROADCAST_SERVICE && hwnd == stWindow) - { - /* broadcast notification - install the running Win95 service in the system tray */ - SetSystemTrayIcon(1); - return 1; - } - if(message == WM_USERCHANGED) - { - SetSystemTrayIcon(1); - return 1; - } - if(nextMessageHook) - return(*nextMessageHook)(hwnd, message,wParam, lParam); - else - return 0; -} - - -/****************************************************************************/ -/* Window Setup */ -/****************************************************************************/ -/* SetSystemTrayIcon(): Set the icon in the system tray */ -void SetSystemTrayIcon(BOOL on) -{ - BOOL (WINAPI *ShellNotifyIcon)(DWORD,NOTIFYICONDATA*); - static HMODULE hShell = NULL; - NOTIFYICONDATA nid; - - /* NOTE: There is explicitly no unload of the shell32.dll in here. - Win95 has _serious_ problems with the module counter and - may just unload the shell32.dll even if it is referenced - by other processes */ - if(!hShell) hShell = LoadLibrary(TEXT("shell32.dll")); - if(!hShell) return; /* should not happen */ - /* On WinNT 3.* the following will just return NULL */ - ShellNotifyIcon = (FARPROC)GetProcAddress(hShell, "Shell_NotifyIconA"); - - if(!ShellNotifyIcon) return; /* ok, we don't have it */ - nid.cbSize = sizeof(nid); - nid.hWnd = stWindow; - nid.uID = (UINT)hInstance; - nid.uFlags = NIF_MESSAGE | NIF_TIP | NIF_ICON; - nid.uCallbackMessage = WM_USER+42; - nid.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(1)); - strcpy(nid.szTip, VM_NAME "!"); - if(on) - (*ShellNotifyIcon)(NIM_ADD, &nid); - else - (*ShellNotifyIcon)(NIM_DELETE, &nid); -} - -void SetupService95() -{ -#ifndef NO_SERVICE -#ifndef RSP_SIMPLE_SERVICE -#define RSP_SIMPLE_SERVICE 1 -#endif - BOOL (WINAPI *RegisterServiceProcess)(DWORD,DWORD); - static HMODULE hKernel32 = NULL; - - /* Inform Windows95 that we're running as a service process */ - if(!fRunService || !fWindows95) return; - hKernel32 = LoadLibrary(TEXT("kernel32.dll")); - if(!hKernel32) - { - printLastError(TEXT("Unable to load kernel32.dll")); - return; - } - (FARPROC) RegisterServiceProcess = GetProcAddress(hKernel32, "RegisterServiceProcess"); - if(!RegisterServiceProcess) - { - printLastError(TEXT("Unable to find RegisterServiceProcess")); - return; - } - if( !(*RegisterServiceProcess)(GetCurrentProcessId(), RSP_SIMPLE_SERVICE ) ) - printLastError(TEXT("RegisterServiceProcess failed")); -#endif /* NO_SERVICE */ -} - -/****************************************************************************/ -/* System Attributes */ -/****************************************************************************/ - -char *GetVMOption(int id) -{ - if(id < numOptionsVM) - return vmOptions[id]; - else - return NULL; -} - -char *GetImageOption(int id) -{ - if(id < numOptionsImage) - return imageOptions[id]; - else - return NULL; -} - -char *ioGetLogDirectory(void) { - return vmLogDirA; -} - -sqInt ioSetLogDirectoryOfSize(void* lblIndex, sqInt sz) { - if(sz >= MAX_PATH) return 0; - strncpy(vmLogDirA, lblIndex, sz); - vmLogDirA[sz] = 0; - MultiByteToWideChar(CP_UTF8, 0, vmLogDirA, -1, vmLogDirW, MAX_PATH); - return 1; -} - -/* New MinGW defines this, as does MSVC - so who still needs it? */ -#if !defined(VerifyVersionInfo) -typedef struct _OSVERSIONINFOEX { - DWORD dwOSVersionInfoSize; - DWORD dwMajorVersion; - DWORD dwMinorVersion; - DWORD dwBuildNumber; - DWORD dwPlatformId; - TCHAR szCSDVersion[128]; - WORD wServicePackMajor; - WORD wServicePackMinor; - WORD wSuiteMask; - BYTE wProductType; - BYTE wReserved; -} OSVERSIONINFOEX; -#endif /* !defined(VerifyVersionInfo) */ - -/* New MinGW defines this, as does MSVC - so who still needs it? */ -#if !defined(EnumDisplayDevices) -typedef struct _DISPLAY_DEVICE { - DWORD cb; - TCHAR DeviceName[32]; - TCHAR DeviceString[128]; - DWORD StateFlags; - TCHAR DeviceID[128]; - TCHAR DeviceKey[128]; -} DISPLAY_DEVICE, *PDISPLAY_DEVICE; -#endif /* !defined(EnumDisplayDevices) */ - -typedef BOOL (CALLBACK *pfnEnumDisplayDevices)( - LPCTSTR lpDevice, // device name - DWORD iDevNum, // display device - PDISPLAY_DEVICE lpDisplayDevice, // device information - DWORD dwFlags // reserved -); -char *osInfoString = ""; -char *hwInfoString = ""; -char *gdInfoString = ""; -char *win32VersionName = ""; - -void gatherSystemInfo(void) { - OSVERSIONINFOEX osInfo; - MEMORYSTATUS memStat; - SYSTEM_INFO sysInfo; - DISPLAY_DEVICE gDev; - int proc, screenX, screenY; - char tmpString[2048]; - - char keyName[256]; - DWORD ok, dwSize; - HKEY hk; - - /* Retrieve version info for crash logs */ - ZeroMemory(&osInfo, sizeof(osInfo)); - osInfo.dwOSVersionInfoSize = sizeof(osInfo); - GetVersionEx((OSVERSIONINFO*)&osInfo); - GetSystemInfo(&sysInfo); - - /* Set up the win32VersionName */ - sprintf(tmpString, "%d.%d", osInfo.dwMajorVersion, osInfo.dwMinorVersion); - win32VersionName = _strdup(tmpString); - - ZeroMemory(&memStat, sizeof(memStat)); - memStat.dwLength = sizeof(memStat); - GlobalMemoryStatus(&memStat); - - screenX = GetSystemMetrics(SM_CXSCREEN); - screenY = GetSystemMetrics(SM_CYSCREEN); - - - { - HANDLE hUser = LoadLibrary( "user32.dll" ); - pfnEnumDisplayDevices pEnumDisplayDevices = (pfnEnumDisplayDevices) - GetProcAddress(hUser, "EnumDisplayDevicesA"); - ZeroMemory(&gDev, sizeof(gDev)); - gDev.cb = sizeof(gDev); - if(pEnumDisplayDevices) pEnumDisplayDevices(NULL, 0, &gDev, 0); - } - - { /* Figure out make and model from OEMINFO.ini */ - char iniName[256]; - char manufacturer[256]; - char model[256]; - - GetSystemDirectory(iniName, 256); - strcat(iniName,"\\OEMINFO.INI"); - - GetPrivateProfileString("General", "Manufacturer", "Unknown", - manufacturer, 256, iniName); - - GetPrivateProfileString("General", "Model", "Unknown", - model, 256, iniName); - - sprintf(tmpString, - "Hardware information: \n" - "\tManufacturer: %s\n" - "\tModel: %s\n" - "\tNumber of processors: %d\n" - "\tPage size: %d\n" - "\nMemory Information (upon launch):\n" - "\tPhysical Memory Size: %d kbytes\n" - "\tPhysical Memory Free: %d kbytes\n" - "\tPage File Size: %d kbytes\n" - "\tPage File Free: %d kbytes\n" - "\tVirtual Memory Size: %d kbytes\n" - "\tVirtual Memory Free: %d kbytes\n" - "\tMemory Load: %d percent\n", - manufacturer, model, - sysInfo.dwNumberOfProcessors, - sysInfo.dwPageSize, - memStat.dwTotalPhys / 1024, - memStat.dwAvailPhys / 1024, - memStat.dwTotalPageFile / 1024, - memStat.dwAvailPageFile / 1024, - memStat.dwTotalVirtual / 1024, - memStat.dwAvailVirtual / 1024, - memStat.dwMemoryLoad, - 0); - } - - /* find more information about each processor */ - for(proc=0; proc < sysInfo.dwNumberOfProcessors; proc++) { - - char *tmp = tmpString + strlen(tmpString); - - strcpy(keyName, "HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0"); - keyName[strlen(keyName)-1] = 48+proc; /* 0, 1, 2 etc. */ - - ok = RegOpenKey(HKEY_LOCAL_MACHINE, keyName, &hk); - if(ok == 0) { - char nameString[256]; - char identifier[256]; - DWORD mhz; - - dwSize = 256; - ok = RegQueryValueEx(hk, "ProcessorNameString", NULL, NULL, - (LPBYTE)nameString, &dwSize); - if(ok != 0) strcpy(nameString, "???"); - - dwSize = 256; - ok = RegQueryValueEx(hk, "Identifier", NULL, NULL, - (LPBYTE)identifier, &dwSize); - if(ok != 0) strcpy(identifier, "???"); - - dwSize = sizeof(DWORD); - ok = RegQueryValueEx(hk, "~MHz", NULL, NULL, - (LPBYTE)&mhz, &dwSize); - if(ok != 0) mhz = -1; - sprintf(tmp, - "\nProcessor %d: %s\n" - "\tIdentifier: %s\n" - "\t~MHZ: %d\n", - proc, nameString, identifier, mhz); - RegCloseKey(hk); - } - } - - hwInfoString = _strdup(tmpString); - - { - char owner[256]; - char company[256]; - char product[256]; - char productid[256]; - - if(osInfo.dwPlatformId == VER_PLATFORM_WIN32_NT) { - strcpy(keyName, "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"); - } else { - strcpy(keyName, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion"); - } - ok = RegOpenKey(HKEY_LOCAL_MACHINE, keyName, &hk); - if(ok == 0) { - dwSize = 256; - if(RegQueryValueEx(hk, "RegisteredOwner", NULL, NULL, - (LPBYTE)owner, &dwSize)) strcpy(owner, "???"); - dwSize = 256; - if(RegQueryValueEx(hk, "RegisteredOrganization", NULL, NULL, - (LPBYTE)company, &dwSize)) strcpy(company, "???"); - dwSize = 256; - if(RegQueryValueEx(hk, "ProductName", NULL, NULL, - (LPBYTE)product, &dwSize)) strcpy(product, "???"); - RegCloseKey(hk); - } - - sprintf(tmpString, - "Operating System: %s (Build %d %s)\n" - "\tRegistered Owner: %s\n" - "\tRegistered Company: %s\n" - "\tSP major version: %d\n" - "\tSP minor version: %d\n" - "\tSuite mask: %lx\n" - "\tProduct type: %lx\n", - product, - osInfo.dwBuildNumber, osInfo.szCSDVersion, - owner, company, - osInfo.wServicePackMajor, osInfo.wServicePackMinor, -#if defined(_MSC_VER) && _MSC_VER < 1300 -# define wSuiteMask wReserved[0] -# define wProductType wReserved[1] & 0xFF -#endif - osInfo.wSuiteMask, osInfo.wProductType); - osInfoString = _strdup(tmpString); - } - - sprintf(tmpString, - "Display Information: \n" - "\tGraphics adapter name: %s\n" - "\tPrimary monitor resolution: %d x %d\n", - gDev.DeviceString, - screenX, screenY); - - /* Find the driver key in the registry */ - keyName[0] = 0; - ok = RegOpenKey(HKEY_LOCAL_MACHINE, - "HARDWARE\\DEVICEMAP\\VIDEO", - &hk); - if(ok == 0) { - dwSize = 256; - RegQueryValueEx(hk,"\\Device\\Video0", NULL, NULL, - (LPBYTE)keyName, &dwSize); - RegCloseKey(hk); - } - if(*keyName) { - /* Got the key name; open it and get the info out of there */ - char *tmp = tmpString + strlen(tmpString); - char deviceDesc[256]; - char adapterString[256]; - char biosString[256]; - char chipType[256]; - char dacType[256]; - char version[256]; - char *drivers, *drv; - WCHAR buffer[256]; - DWORD memSize; - - /* Argh. It seems that the registry key regularly starts - with \Registry\Machine\ which doesn't work with RegOpenKey below. - I have no idea why but for now I'll just truncate that part if - we recognize it... */ - if(_strnicmp(keyName, "\\registry\\machine\\", 18) == 0) { - memcpy(keyName, keyName+18, strlen(keyName)-17); - } - - ok = RegOpenKey(HKEY_LOCAL_MACHINE, keyName, &hk); - if(ok != 0) MessageBox(0, keyName, "Cannot open:", MB_OK); - if(ok == 0) { - dwSize = 256; - ok = RegQueryValueEx(hk,"Device Description", NULL, NULL, - (LPBYTE)deviceDesc, &dwSize); - if(ok != 0) strcpy(deviceDesc, "???"); - - dwSize = 256*sizeof(WCHAR); - ok = RegQueryValueEx(hk,"HardwareInformation.AdapterString", NULL, NULL, - (LPBYTE)buffer, &dwSize); - if(ok == 0) { - WideCharToMultiByte(CP_UTF8,0,buffer,-1,adapterString,256,NULL,NULL); - } else strcpy(adapterString, "???"); - - dwSize = 256*sizeof(WCHAR); - ok = RegQueryValueEx(hk,"HardwareInformation.BiosString", NULL, NULL, - (LPBYTE)buffer, &dwSize); - if(ok == 0) { - WideCharToMultiByte(CP_UTF8,0,buffer,-1,biosString,256,NULL,NULL); - } else strcpy(biosString, "???"); - - dwSize = 256*sizeof(WCHAR); - ok = RegQueryValueEx(hk,"HardwareInformation.ChipType", NULL, NULL, - (LPBYTE)buffer, &dwSize); - if(ok == 0) { - WideCharToMultiByte(CP_UTF8,0,buffer,-1,chipType,256,NULL,NULL); - } else strcpy(chipType, "???"); - - dwSize = 256*sizeof(WCHAR); - ok = RegQueryValueEx(hk,"HardwareInformation.DacType", NULL, NULL, - (LPBYTE)buffer, &dwSize); - if(ok == 0) { - WideCharToMultiByte(CP_UTF8,0,buffer,-1,dacType,256,NULL,NULL); - } else strcpy(dacType, "???"); - - dwSize = sizeof(DWORD); - ok = RegQueryValueEx(hk,"HardwareInformation.MemorySize", NULL, NULL, - (LPBYTE)&memSize, &dwSize); - if(ok != 0) memSize = -1; - - sprintf(tmp, - "\nDevice: %s\n" - "\tAdapter String: %s\n" - "\tBios String: %s\n" - "\tChip Type: %s\n" - "\tDAC Type: %s\n" - "\tMemory Size: 0x%.8X\n", - deviceDesc, - adapterString, - biosString, - chipType, - dacType, - memSize); - - /* Now process the installed drivers */ - ok = RegQueryValueEx(hk,"InstalledDisplayDrivers", - NULL, NULL, NULL, &dwSize); - if(ok == 0) { - drivers = malloc(dwSize); - ok = RegQueryValueEx(hk,"InstalledDisplayDrivers", - NULL, NULL, drivers, &dwSize); - } - if(ok == 0) { - strcat(tmpString,"\nDriver Versions:"); - /* InstalledDrivers is REG_MULTI_SZ (extra terminating zero) */ - for(drv = drivers; drv[0]; drv +=strlen(drv)) { - DWORD verSize, hh; - UINT vLen; - LPVOID verInfo = NULL, vInfo; - - /* Concat driver name */ - strcat(tmpString,"\n\t"); - strcat(tmpString, drv); - strcat(tmpString,": "); - - verSize = GetFileVersionInfoSize(drv, &hh); - if(!verSize) goto done; - - verInfo = malloc(verSize); - if(!GetFileVersionInfo(drv, 0, verSize, verInfo)) goto done; - - /* Try Unicode first */ - if(VerQueryValue(verInfo,"\\StringFileInfo\\040904B0\\FileVersion", - &vInfo, &vLen)) { - strcat(tmpString, vInfo); - goto done; - } - - /* Try US/English next */ - if(VerQueryValue(verInfo,"\\StringFileInfo\\040904E4\\FileVersion", - &vInfo, &vLen)) { - strcat(tmpString, vInfo); - goto done; - } - - strcat(tmpString, "???"); - - done: - if(verInfo) { - free(verInfo); - verInfo = NULL; - } - } - strcat(tmpString,"\n"); - } - RegCloseKey(hk); - } - } - gdInfoString = _strdup(tmpString); -} - -char * -getVersionInfo(int verbose) -{ -#if STACKVM - extern char *__interpBuildInfo; -# define INTERP_BUILD __interpBuildInfo -# if COGVM - extern char *__cogitBuildInfo; -# endif -#else -# define INTERP_BUILD interpreterVersion -#endif - char *info= (char *)malloc(4096); - info[0]= '\0'; - -#if SPURVM -# if BytesPerOop == 8 -# define ObjectMemory " Spur 64-bit" -# else -# define ObjectMemory " Spur" -# endif -#else -# define ObjectMemory -#endif -#if defined(NDEBUG) -# define BuildVariant "Production" ObjectMemory -#elif DEBUGVM -# define BuildVariant "Debug" ObjectMemory -# else -# define BuildVariant "Assert" ObjectMemory -#endif - - sprintf(info+strlen(info), "%s [" BuildVariant " VM]\n", vmBuildString); - if (verbose) - sprintf(info+strlen(info), "Built from: "); - sprintf(info+strlen(info), "%s\n", INTERP_BUILD); -#if COGVM - if (verbose) - sprintf(info+strlen(info), "With: "); - sprintf(info+strlen(info), "%s\n", GetAttributeString(1008)); /* __cogitBuildInfo */ -#endif - if (verbose) - sprintf(info+strlen(info), "Revision: "); - sprintf(info+strlen(info), "%s\n", sourceVersionString('\n')); - return info; -} - -/* Calling exit(ec) apparently does NOT provide the correct exit code for the - * terminating process (MinGW bug?). So instead call the shutdown sequence via - * _cexit() and then terminate explicitly. - */ -#define exit(ec) do { _cexit(ec); ExitProcess(ec); } while (0) - -static void -versionInfo(void) -{ -#if 0 - /* we could create a console but to version the non-consoel VM it is - * sufficient to do e.g. Squeak.exe >foo; cat foo. But feel free to - * add the code if you have the energy ;) - */ - DWORD mode; - HANDLE stdouth = GetStdHandle(STD_OUTPUT_HANDLE); - - if (GetConsoleMode(stdouth, &mode) != 0) { - char *vi = getVersionInfo(0); - WriteConsole(stdouth, vi, strlen(vi), 0, 0); - } - else -#endif - printf("%s", getVersionInfo(0)); - exit(0); -} - -/****************************************************************************/ -/* Error handling */ -/****************************************************************************/ -void SetupStderr() -{ TCHAR tmpName[MAX_PATH+1]; - - *stderrName = *stdoutName = 0; - /* re-open stdout && stderr */ - GetTempPath(MAX_PATH,tmpName); - if(GetStdHandle(STD_ERROR_HANDLE) == INVALID_HANDLE_VALUE) - { - GetTempFileName(tmpName,TEXT("sq"),0,stderrName); - freopen(stderrName,"w+t",stderr); - } - else *stderrName = 0; - - if(GetStdHandle(STD_OUTPUT_HANDLE) == INVALID_HANDLE_VALUE) - { - GetTempFileName(tmpName,TEXT("sq"),0,stdoutName); - freopen(stdoutName,"w+t",stdout); - } - else *stdoutName = 0; -} - -/****************************************************************************/ -/* Release */ -/****************************************************************************/ - -static void -dumpStackIfInMainThread(FILE *optionalFile) -{ - extern int printCallStack(void); - - if (!optionalFile) { - if (ioOSThreadsEqual(ioCurrentOSThread(),getVMOSThread())) { - printf("\n\nSmalltalk stack dump:\n"); - printCallStack(); - } - else - printf("\nCan't dump Smalltalk stack. Not in VM thread\n"); - return; - } - if (ioOSThreadsEqual(ioCurrentOSThread(),getVMOSThread())) { - FILE tmpStdout = *stdout; - fprintf(optionalFile, "\n\nSmalltalk stack dump:\n"); - *stdout = *optionalFile; - printCallStack(); - *optionalFile = *stdout; - *stdout = tmpStdout; - fprintf(optionalFile,"\n"); - } - else - fprintf(optionalFile,"\nCan't dump Smalltalk stack. Not in VM thread\n"); -} - -#if STACKVM -static void -dumpPrimTrace(FILE *optionalFile) -{ - extern void dumpPrimTraceLog(void); - - if (optionalFile) { - FILE tmpStdout = *stdout; - *stdout = *optionalFile; - dumpPrimTrace(0); - *optionalFile = *stdout; - *stdout = tmpStdout; - } - else { - printf("\nPrimitive trace:\n"); - dumpPrimTraceLog(); - printf("\n"); - } -} -#else -# define dumpPrimTrace(f) 0 -#endif - -void -printCommonCrashDumpInfo(FILE *f) { -#if STACKVM -extern char *__interpBuildInfo; -# if COGVM -extern char *__cogitBuildInfo; -# endif -#endif - - fprintf(f,"\n\n%s", hwInfoString); - fprintf(f,"\n%s", osInfoString); - fprintf(f,"\n%s", gdInfoString); - - /* print VM version information */ - fprintf(f,"\nVM Version: %s\n", VM_VERSION); -#if STACKVM - fprintf(f,"Interpreter Build: %s\n", __interpBuildInfo); -# if COGVM - fprintf(f,"Cogit Build: %s\n", __cogitBuildInfo); -# endif -#endif - fprintf(f,"Source Version: %s\n", sourceVersionString('\n')); - fflush(f); - fprintf(f,"\n" - "Current byte code: %d\n" - "Primitive index: %d\n", - getCurrentBytecode(), - methodPrimitiveIndex()); - fflush(f); - /* print loaded plugins */ - fprintf(f,"\nLoaded plugins:\n"); - { - int index = 1; - char *pluginName; - while( (pluginName = ioListLoadedModule(index)) != NULL) { - fprintf(f,"\t%s\n", pluginName); - fflush(f); - index++; - } - } - - printModuleInfo(f); - fflush(f); -} - -#define MAXFRAMES 64 - -/* Print an error message, possibly Smalltalk and C stack traces, and exit. */ -/* Disable Intel compiler inlining of error which is used for breakpoints */ -#pragma auto_inline off -static int inError = 0; - -void -error(char *msg) { - FILE *f; - TCHAR crashInfo[1024]; - void *callstack[MAXFRAMES]; - symbolic_pc symbolic_pcs[MAXFRAMES]; - int i, nframes; - int inVMThread = ioOSThreadsEqual(ioCurrentOSThread(),getVMOSThread()); - - if (inError) - exit(-2); - - inError = 1; - nframes = backtrace(callstack, MAXFRAMES); - symbolic_backtrace(++nframes, callstack, symbolic_pcs); - - wsprintf(crashInfo, - TEXT("Sorry but the VM has crashed.\n\n") - TEXT("Reason: %s\n\n") - TEXT("Current byte code: %d\n") - TEXT("Primitive index: %d\n\n") - TEXT("This information will be stored in the file\n") - TEXT("%s\\%s\n") - TEXT("with a complete stack dump"), - msg, - getCurrentBytecode(), - methodPrimitiveIndex(), - vmLogDirA, - TEXT("crash.dmp")); - if(!fHeadlessImage) - MessageBox(stWindow,crashInfo,TEXT("Fatal VM error"), - MB_OK | MB_APPLMODAL | MB_ICONSTOP); - -#if !NewspeakVM - SetCurrentDirectoryW(vmLogDirW); -#endif - /* print the above information */ - f = fopen_for_append("crash.dmp"); - if(f){ - time_t crashTime = time(NULL); - fprintf(f,"---------------------------------------------------------------------\n"); - fprintf(f,"%s %s\n\n", ctime(&crashTime), GetAttributeString(0)); - - fprintf(f, - "Error in %s thread\nReason: %s\n\n", - inVMThread ? "the VM" : "some other", - msg); - printCommonCrashDumpInfo(f); - dumpPrimTrace(f); - fflush(f); - print_backtrace(f, nframes, MAXFRAMES, callstack, symbolic_pcs); - fflush(f); - dumpStackIfInMainThread(f); - fflush(f); - fclose(f); - } - printf("Error in %s thread\nReason: %s\n\n", - inVMThread ? "the VM" : "some other", - msg); - dumpPrimTrace(0); - print_backtrace(stdout, nframes, MAXFRAMES, callstack, symbolic_pcs); - /* /Don't/ print the caller's stack to stdout here; Cleanup will do so. */ - /* dumpStackIfInMainThread(0); */ - exit(-1); -} - -static int inCleanExit = 0; /* to suppress stack trace in Cleanup */ - -int ioExit(void) { return ioExitWithErrorCode(0); } - -sqInt -ioExitWithErrorCode(int ec) -{ -#if COGVM -extern sqInt reportStackHeadroom; - if (reportStackHeadroom) - reportMinimumUnusedHeadroom(); -#endif - printPhaseTime(3); - inCleanExit = 1; - exit(ec); - return ec; -} - -#pragma auto_inline on - -static void -printCrashDebugInformation(LPEXCEPTION_POINTERS exp) -{ - void *callstack[MAXFRAMES]; - symbolic_pc symbolic_pcs[MAXFRAMES]; - int i, nframes, inVMThread; - TCHAR crashInfo[1024]; - FILE *f; - int byteCode = -2; - - UninstallExceptionHandler(); - - if ((inVMThread = ioOSThreadsEqual(ioCurrentOSThread(),getVMOSThread()))) - /* Retrieve current byte code. - If this fails the IP is probably wrong */ - TRY { - byteCode = getCurrentBytecode(); - } EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - byteCode = -1; - } - - - TRY { - if (inVMThread) - ifValidWriteBackStackPointersSaveTo((void *)exp->ContextRecord->Ebp, - (void *)exp->ContextRecord->Esp, - 0, - 0); - callstack[0] = (void *)exp->ContextRecord->Eip; - nframes = backtrace_from_fp((void*)exp->ContextRecord->Ebp, - callstack+1, - MAXFRAMES-1); - symbolic_backtrace(++nframes, callstack, symbolic_pcs); - wsprintf(crashInfo, - TEXT("Sorry but the VM has crashed.\n\n") - TEXT("Exception code: %08X\n") - TEXT("Exception address: %08X\n") - TEXT("Current byte code: %d\n") - TEXT("Primitive index: %d\n\n") - TEXT("Crashed in %s thread\n\n") - TEXT("This information will be stored in the file\n") - TEXT("%s\\%s\n") - TEXT("with a complete stack dump"), - exp->ExceptionRecord->ExceptionCode, - exp->ExceptionRecord->ExceptionAddress, - byteCode, - methodPrimitiveIndex(), - inVMThread ? "the VM" : "some other", - vmLogDirA, - TEXT("crash.dmp")); - if(!fHeadlessImage) - MessageBox(stWindow,crashInfo,TEXT("Fatal VM error"), - MB_OK | MB_APPLMODAL | MB_ICONSTOP); - -#if !NewspeakVM - SetCurrentDirectoryW(vmLogDirW); -#endif - /* print the above information */ - f = fopen_for_append("crash.dmp"); - if(f){ - time_t crashTime = time(NULL); - fprintf(f,"---------------------------------------------------------------------\n"); - fprintf(f,"%s\n", ctime(&crashTime)); - /* Print the exception code */ - fprintf(f,"Exception code: %08X\nException addr: %08X\n", - exp->ExceptionRecord->ExceptionCode, - exp->ExceptionRecord->ExceptionAddress); - if(exp->ExceptionRecord->ExceptionCode == EXCEPTION_ACCESS_VIOLATION) { - /* For access violations print what actually happened */ - fprintf(f,"Access violation (%s) at %08X\n", - (exp->ExceptionRecord->ExceptionInformation[0] ? "write access" : "read access"), - exp->ExceptionRecord->ExceptionInformation[1]); - } - fprintf(f,"EAX:%08X\tEBX:%08X\tECX:%08X\tEDX:%08X\n", - exp->ContextRecord->Eax, - exp->ContextRecord->Ebx, - exp->ContextRecord->Ecx, - exp->ContextRecord->Edx); - fprintf(f,"ESI:%08X\tEDI:%08X\tEBP:%08X\tESP:%08X\n", - exp->ContextRecord->Esi, - exp->ContextRecord->Edi, - exp->ContextRecord->Ebp, - exp->ContextRecord->Esp); - fprintf(f,"EIP:%08X\tEFL:%08X\n", - exp->ContextRecord->Eip, - exp->ContextRecord->EFlags); - fprintf(f,"FP Control: %08X\nFP Status: %08X\nFP Tag: %08X\n", - exp->ContextRecord->FloatSave.ControlWord, - exp->ContextRecord->FloatSave.StatusWord, - exp->ContextRecord->FloatSave.TagWord); - - fprintf(f, "\n\nCrashed in %s thread\n\n", - inVMThread ? "the VM" : "some other"); - - printCommonCrashDumpInfo(f); - dumpPrimTrace(f); - print_backtrace(f, nframes, MAXFRAMES, callstack, symbolic_pcs); - dumpStackIfInMainThread(f); - fclose(f); - } - - /* print recently called prims to stdout */ - dumpPrimTrace(0); - /* print C stack to stdout */ - print_backtrace(stdout, nframes, MAXFRAMES, callstack, symbolic_pcs); - /* print the caller's stack to stdout */ - dumpStackIfInMainThread(0); -#if COGVM - reportMinimumUnusedHeadroom(); -#endif - - } EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* that's too bad ... */ - if(!fHeadlessImage) - MessageBox(0,TEXT("The VM has crashed. Sorry."),TEXT("Fatal error:"), - MB_OK | MB_APPLMODAL | MB_ICONSTOP); - else - abortMessage(TEXT("The VM has crashed. Sorry.")); - } -} - -void __cdecl Cleanup(void) -{ /* not all of these are essential, but they're polite... */ - - if (!inCleanExit) { - dumpStackIfInMainThread(0); - } - ioShutdownAllModules(); -#ifndef NO_PLUGIN_SUPPORT - pluginExit(); -#endif - ioReleaseTime(); - /* tricky ... we have no systray icon when running - headfull or when running as service on NT */ - if(fHeadlessImage && (!fRunService || fWindows95)) - SetSystemTrayIcon(0); - if(palette) DeleteObject(palette); - PROFILE_SHOW(ticksForReversal); - PROFILE_SHOW(ticksForBlitting); - if(*stderrName) - { - fclose(stderr); - remove(stderrName); - } - if(*stdoutName) - { - fclose(stdout); - remove(stdoutName); - } - OleUninitialize(); -} - - -/****************************************************************************/ -/* Embedded Images */ -/****************************************************************************/ -#if 0 -/* SQ_IMAGE_MAGIC - the magic number for embedded images "SQIM" */ -#define SQ_IMAGE_MAGIC 0x83817377 - -int sqImageFile findEmbeddedImage(void) { - sqImageFile f; - int endMarker; - int magic; - int start; - int length; - - f = sqImageFileOpen(vmName, "rb"); - if(!f) { - MessageBox(0,"Error opening VM",VM_NAME,MB_OK); - return 0; - } - endMarker = sqImageFileSize(f) - 8; - magic = start = 0; - sqImageFileSeek(f, endMarker); - sqImageFileRead(&magic, 1, 4, f); - sqImageFileRead(&start, 1, 4, f); - sqMessageBox(MB_OK, "Magic number", "Expected:\t%x\nFound:\t\t%x", SQ_IMAGE_MAGIC, magic); - /* Magic number must be okay and start must be within executable boundaries */ - if(magic != SQ_IMAGE_MAGIC || start < 0 || start >= endMarker) { - /* nope */ - sqImageFileClose(f); - return 0; - } - /* Might have an embedded image; seek back and double check */ - sqImageFileSeek(f,start); - sqImageFileRead(&magic, 1, 4, f); - sqMessageBox(MB_OK, "Magic number", "Expected:\t%x\nFound:\t\t%x", SQ_IMAGE_MAGIC, magic); - if(magic != SQ_IMAGE_MAGIC) { - /* nope */ - sqImageFileClose(f); - return 0; - } - /* now triple check for image format */ - sqImageFileRead(&magic, 1, 4, f); - if(!readableFormat(magic) && !readableFormat(byteSwapped(magic)) { - /* nope */ - sqImageFileClose(f); - return 0; - } - /* Gotcha! */ - sqImageFileSeek(f, sqImageFilePosition(f) - 4); - strcpy(imageName, name); - imageSize = endMarker - sqImageFilePosition(f); - return f; -} -#else -int findEmbeddedImage(void) { return 0; } -#endif - - -/****************************************************************************/ -/* sqMain */ -/****************************************************************************/ -#if (STACKVM || NewspeakVM) && !COGVM -extern sqInt sendTrace; -#endif -#if STACKVM || NewspeakVM -extern sqInt checkForLeaks; -#endif /* STACKVM || NewspeakVM */ -#if STACKVM -extern sqInt desiredNumStackPages; -extern sqInt desiredEdenBytes; -extern sqInt suppressHeartbeatFlag; -#endif /* STACKVM */ -#if COGVM -extern sqInt desiredCogCodeSize; -extern int traceFlags; -extern sqInt traceStores; -extern unsigned long debugPrimCallStackOffset; -extern sqInt maxLiteralCountForCompile; -extern sqInt minBackwardJumpCountForCompile; -#endif /* COGVM */ - - -/* sqMain: - This is common entry point regardless of whether we're running as a normal - app or as a service. Note that a number of things may have been set up - before coming here. In particular, - * fRunService - to determine whether we're running as NT service - However, the command line must always contain all parameters necessary. - In other words, even though the logName may have been set before, - the command line has to include the -log switch. -*/ -static int parseArguments(int argc, char *argv[]); - -int -sqMain(int argc, char *argv[]) -{ - int virtualMemory; - int sz; - - /* set default fpu control word */ - _control87(FPU_DEFAULT, _MCW_EM | _MCW_RC | _MCW_PC | _MCW_IC); - - LoadPreferences(); - - /* If running as single app, find the previous instance */ - if(fRunSingleApp) { - HWND win = GetTopWindow(0); - while (win != NULL) { - char buf[MAX_PATH]; - GetClassName(win, buf, 80); - if(strcmp(windowClassName, buf) == 0) break; - win = GetNextWindow(win, GW_HWNDNEXT); - } - - if(win) { - WCHAR *cmdLineW = GetCommandLineW(); - /* An instance is running already. Inform it about the app. */ - int bytes = (wcslen(cmdLineW)+1) * sizeof(WCHAR); - HANDLE h = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, bytes); - WCHAR *string = GlobalLock(h); - memcpy(string, cmdLineW, bytes); - GlobalUnlock(h); - - OpenClipboard(NULL); - EmptyClipboard(); - SetClipboardData(CF_UNICODETEXT, h); - CloseClipboard(); - - if(IsIconic(win)) ShowWindow(win, SW_RESTORE); - SetForegroundWindow(win); - SetActiveWindow(win); - return PostMessage(win, SQ_LAUNCH_DROP, 0, 0); - } - } - - /* parse command line args */ - if(!parseArguments(argc, argv)) - return printUsage(1); - - /* a quick check if we have any argument at all */ - if(!fRunService && (*imageName == 0)) { - /* Check if the image is embedded */ - imageFile = findEmbeddedImage(); - if(!imageFile) { - /* Search the current directory if there's a single image file */ - if(!findImageFile()) { - /* Nope. Give the user a chance to open an image interactively */ - if(!openImageFile()) return -1; /* User cancelled file open */ - } - } - } - -#ifdef NO_SERVICE - fRunService = 0; -#endif - - /* look for a few things easy to handle */ - if(fWindows95 && fBroadcastService95) { - PostMessage(HWND_BROADCAST, WM_BROADCAST_SERVICE, 0, 0); - return 0; - } - - /* set time zone accordingly */ - _tzset(); - - - /* Initialize OLE library so we don't have to do it from other places */ - OleInitialize(NULL); - - /* Give us some log information when running as service */ - if(fRunService) { - time_t svcStart; - - svcStart = time(NULL); - OutputLogMessage("\n\n"); - OutputLogMessage(ctime(&svcStart)); - if(fWindows95) /* don't have a service name */ - OutputLogMessage("The service"); - else - OutputLogMessage(serviceName); - OutputLogMessage(" started with the following command line\n"); - OutputLogMessage(initialCmdLine); - OutputLogMessage("\n"); - } - - SetupFilesAndPath(); - ioSetLogDirectoryOfSize(vmPath, strlen(vmPath)); - - /* release resources on exit */ - atexit(Cleanup); - -#ifndef NO_SERVICE - /* if service installing is requested, do so */ - if(installServiceName && *installServiceName) { - strcpy(serviceName, installServiceName); - sqServiceInstall(); - /* When installing was successful we won't come - to this point. Otherwise ... */ - exit(-1); /* this will show any printfs during install */ - } -#endif - - /* initialisation */ - SetupKeymap(); - SetupWindows(); - SetupPixmaps(); - SetupService95(); - { extern void ioInitTime(void); - extern void ioInitThreads(void); - ioInitTime(); - ioInitThreads(); -# if !COGMTVM - /* Set the current VM thread. If the main thread isn't the VM thread then - * when that thread is spawned it can reassign ioVMThread. - */ - ioVMThread = ioCurrentOSThread(); -# endif - } - - /* check the interpreter's size assumptions for basic data types */ - if (sizeof(int) != 4) error("This C compiler's integers are not 32 bits."); - if (sizeof(double) != 8) error("This C compiler's floats are not 64 bits."); - if (sizeof(time_t) != 4) error("This C compiler's time_t's are not 32 bits."); - - - if(!imageFile) { - imageSize = SqueakImageLength(toUnicode(imageName)); - if(imageSize == 0) printUsage(2); - } - - /* allocate this before anything is going to happen */ - vmWakeUpEvent = CreateEvent(NULL, 1, 0, NULL); - -#ifdef NO_VIRTUAL_MEMORY - if(!dwMemorySize) { - dwMemorySize = 4; - virtualMemory = (int)imageSize + max(imageSize, dwMemorySize * 0x00100000); - } else { - virtualMemory = (int)dwMemorySize * 0x00100000; - } -#else - /* initial commit size = imageSize + 4MB */ - virtualMemory = imageSize + 0x00400000; -#endif - -#if !NO_FIRST_LEVEL_EXCEPTION_HANDLER -# ifndef _MSC_VER - /* Install our top-level exception handler */ - InstallExceptionHandler(); -# else - __try { -# endif -#endif /* !NO_FIRST_LEVEL_EXCEPTION_HANDLER */ - -#if !NewspeakVM - /* set the CWD to the image location */ - if(*imageName) { - char path[MAX_PATH+1], *ptr; - strcpy(path,imageName); - ptr = strrchr(path, '\\'); - if(ptr) { - *ptr = 0; - SetCurrentDirectory(path); - } - } -#endif /* !NewspeakVM */ - - /* display the splash screen */ - ShowSplashScreen(); - - /* if headless running is requested, try to to create an icon - in the Win95/NT system tray */ - if(fHeadlessImage && (!fRunService || fWindows95)) - SetSystemTrayIcon(1); - - /* read the image file */ - if(!imageFile) { - imageFile = sqImageFileOpen(imageName,"rb"); - readImageFromFileHeapSizeStartingAt(imageFile, virtualMemory, 0); - } else { - readImageFromFileHeapSizeStartingAt(imageFile, virtualMemory, sqImageFilePosition(imageFile)); - } - sqImageFileClose(imageFile); - - if(fHeadlessImage) HideSplashScreen(); /* need to do it manually */ - SetWindowSize(); - ioSetFullScreen(getFullScreenFlag()); - - /* run Squeak */ - ioInitSecurity(); - printPhaseTime(2); - interpret(); -#if !NO_FIRST_LEVEL_EXCEPTION_HANDLER -# ifdef _MSC_VER - } __except(squeakExceptionHandler(GetExceptionInformation())) { - /* Do nothing */ - } -# else - /* remove the top-level exception handler */ - UninstallExceptionHandler(); -# endif -#endif /* !NO_FIRST_LEVEL_EXCEPTION_HANDLER */ - return 1; -} - -/****************************************************************************/ -/* WinMain */ -/****************************************************************************/ - -int WINAPI -WinMain(HINSTANCE hInst, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) -{ - DWORD mode; - - /* a few things which need to be done first */ - gatherSystemInfo(); - - /* check if we're running NT or 95 */ - fWindows95 = (GetVersion() & 0x80000000) != 0; - /* Determine if we're running as a console application We can't report - * allocation failures unless running as a console app because doing so - * via a MessageBox will make the system unusable. - */ - fIsConsole = GetConsoleMode(GetStdHandle(STD_OUTPUT_HANDLE), &mode); - - /* fetch us a copy of the command line */ - initialCmdLine = _strdup(lpCmdLine); - - /* fetch us the name of the executable */ - { - WCHAR vmNameW[MAX_PATH]; - GetModuleFileNameW(hInst, vmNameW, MAX_PATH); - WideCharToMultiByte(CP_UTF8, 0, vmNameW, -1, vmName, MAX_PATH, NULL, NULL); - } - /* parse the command line into the unix-style argc, argv, converting to - * UTF-8 on the way. */ - { LPWSTR *argList = CommandLineToArgvW(GetCommandLineW(), &clargc); - int i; - - clargv = calloc(clargc + 1, sizeof(char *)); - vmOptions = calloc(clargc + 1, sizeof(char *)); - imageOptions = calloc(clargc + 1, sizeof(char *)); - if (!clargv || !vmOptions || !imageOptions) { - fprintf(stderr,"out of memory for command line?!\n"); - return 1; - } - for (i = 0; i < clargc; i++) { - int n = WideCharToMultiByte(CP_UTF8, 0, argList[i], -1, 0, 0, 0, 0); - if (!(clargv[i] = malloc(n))) { - fprintf(stderr,"out of memory for command line?!\n"); - return 1; - } - WideCharToMultiByte(CP_UTF8, 0, argList[i], -1, clargv[i], n, 0, 0); - } - LocalFree(argList); - } - - /* open all streams in binary mode */ - _fmode = _O_BINARY; - - /* get us the instance handle */ - hInstance = hInst; - -#ifndef NO_PLUGIN_SUPPORT - pluginInit(); -#endif -#ifndef NO_SERVICE - /* Find out if we're running from a service. - That's a bit tricky since there is no difference between - usual startup and service startup. We do two assumptions here: - 1) If we're NOT running on NT we can't be service - 2) If there is a command line we can't be service - Still, there is a chance that a user just double clicks on - the Squeak executable in NT. Therefore we _try_ to connect - to the service control manager in the sqServiceMain function. - If this fails, we try the usual startup. It might take a bit - longer than the normal startup but this only happens if there - is no image name given - and that's not our fault. Anyways, - if somebody out there knows how to find out when we're starting - as a service - LET ME KNOW! - */ - if(!fWindows95) /* 1) running NT */ - if(!*lpCmdLine) /* 2) No command line */ - if(sqServiceMain()) /* try starting the service */ - return 0; /* service was run - exit */ - -#endif - - SQ_LAUNCH_DROP = RegisterWindowMessage("SQUEAK_LAUNCH_DROP"); - - /* Special startup stuff for windows 95 */ - if(fWindows95) { - /* The message we use for notifying services of user logon */ - WM_BROADCAST_SERVICE = RegisterWindowMessage(msgBroadcastService); - } - - /* start the non-service version */ - sqMain(clargc, clargv); - return 0; -} - -static int -strtobkm(const char *str) -{ - char *suffix; - int value = strtol(str, &suffix, 10); - switch (*suffix) { - case 'k': case 'K': value *= 1024; break; - case 'm': case 'M': value *= 1024*1024; break; - } - return value; -} - -static int -parseVMArgument(int argc, char *argv[]) -{ - /* flags */ - if (!strcmp(argv[0], "-help")) { - printUsage(1); - return 1; - } - else if (!strcmp(argv[0], "-version")) { versionInfo(); return 1; } - else if (!strcmp(argv[0], "-headless")) { fHeadlessImage = true; return 1; } - else if (!strcmp(argv[0], "-headfull")) { fHeadlessImage = false; return 1;} @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-cb.1003.mcz
by commits＠source.squeak.org 30 Dec '14

30 Dec '14

ClementBera uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-cb.1003.mcz ==================== Summary ==================== Name: VMMaker.oscog-cb.1003 Author: cb Time: 30 December 2014, 1:41:14.778 pm UUID: 012766da-2988-46a8-8f32-f8849b1e5324 Ancestors: VMMaker.oscog-eem.1002 Added code for inline primitive comparison. I now need to test them from the image. =============== Diff against VMMaker.oscog-eem.1002 =============== Item was changed: ----- Method: StackToRegisterMappingCogit>>genBinaryConstOpVarInlinePrimitive: (in category 'inline primitive generators') ----- genBinaryConstOpVarInlinePrimitive: prim "Const op var version of binary inline primitives." "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. See EncoderForSistaV1's class comment and StackInterpreter>>#binaryInlinePrimitive:" | ra val untaggedVal | (ra := backEnd availableRegisterOrNilFor: self liveRegisters) ifNil: [self ssAllocateRequiredReg: (ra := optStatus isReceiverResultRegLive ifTrue: [Arg0Reg] ifFalse: [ReceiverResultReg])]. ra = ReceiverResultReg ifTrue: [optStatus isReceiverResultRegLive: false]. self ssTop popToReg: ra. self ssPop: 1. val := self ssTop constant. self ssPop: 1. untaggedVal := val - objectMemory smallIntegerTag. prim caseOf: { "0 through 6, +, -, *, /, //, \\, quo:, SmallInteger op SmallInteger => SmallInteger, no overflow" [0] -> [self AddCq: untaggedVal R: ra]. [1] -> [self MoveCq: val R: TempReg. self SubR: ra R: TempReg. objectRepresentation genAddSmallIntegerTagsTo: TempReg. self MoveR: TempReg R: ra]. [2] -> [objectRepresentation genRemoveSmallIntegerTagsInScratchReg: ra. self MoveCq: (objectMemory integerValueOf: val) R: TempReg. self MulR: TempReg R: ra. objectRepresentation genAddSmallIntegerTagsTo: ra]. "2016 through 2019, bitAnd:, bitOr:, bitXor, bitShift:, SmallInteger op SmallInteger => SmallInteger, no overflow" "2032 through 2037, >, <, >=, <=. =, ~=, SmallInteger op SmallInteger => Boolean (flags?? then in jump bytecodes if ssTop is a flags value, just generate the instruction!!!!)" + [32] -> [ self CmpCq: val R: ra. + self genBinaryInlineComparison: JumpGreater opFalse: JumpLess destReg: ra ]. + [33] -> [ self CmpCq: val R: ra. + self genBinaryInlineComparison: JumpLess opFalse: JumpGreater destReg: ra ]. + [34] -> [ self CmpCq: val R: ra. + self genBinaryInlineComparison: JumpGreaterOrEqual opFalse: JumpLessOrEqual destReg: ra ]. + [35] -> [ self CmpCq: val R: ra. + self genBinaryInlineComparison: JumpLessOrEqual opFalse: JumpGreaterOrEqual destReg: ra ]. + [36] -> [ self CmpCq: val R: ra. + self genBinaryInlineComparison: JumpZero opFalse: JumpNonZero destReg: ra ]. + [37] -> [ self CmpCq: val R: ra. + self genBinaryInlineComparison: JumpNonZero opFalse: JumpZero destReg: ra ]. "2064 through 2068, Pointer Object>>at:, Byte Object>>at:, Short16 Word Object>>at: LongWord32 Object>>at: Quad64Word Object>>at:. obj op 0-rel SmallInteger => oop" [64] -> [self genConvertSmallIntegerToIntegerInReg: ra. self MoveCq: val R: TempReg. self MoveXwr: ra R: TempReg R: ra]. [65] -> [self genConvertSmallIntegerToIntegerInReg: ra. self MoveCq: val R: TempReg. self MoveXbr: ra R: TempReg R: ra] } otherwise: [^EncounteredUnknownBytecode]. self ssPushRegister: ra. ^0! Item was added: + ----- Method: StackToRegisterMappingCogit>>genBinaryInlineComparison:opFalse:destReg: (in category 'inline primitive generators') ----- + genBinaryInlineComparison: opTrue opFalse: opFalse destReg: destReg + "Inlined comparison. opTrue = jump for true and opFalse = jump for false" + | nextPC branchDescriptor nExts | + nextPC := bytecodePC + 3. + [branchDescriptor := self generatorAt: (objectMemory fetchByte: nextPC ofObject: methodObj) + (byte0 bitAnd: 256). + nExts := 0. + branchDescriptor isExtension] whileTrue: + [nExts := nExts + 1. + nextPC := nextPC + branchDescriptor numBytes]. + (branchDescriptor isBranchTrue or: [branchDescriptor isBranchFalse]) + ifTrue: [ + "This is the path where the inlined comparison is followed immediatly by a branch" + | targetBytecodePC postBranchPC | + targetBytecodePC := nextPC + + branchDescriptor numBytes + + (self spanFor: branchDescriptor at: nextPC exts: nExts in: methodObj). + postBranchPC := nextPC + branchDescriptor numBytes. + self ssPushConstant: objectMemory trueObject. "dummy object" + self gen: (branchDescriptor isBranchTrue ifTrue: [opTrue] ifFalse: [opFalse]) + operand: (self ensureNonMergeFixupAt: targetBytecodePC - initialPC) asUnsignedInteger. + self Jump: (self ensureNonMergeFixupAt: postBranchPC - initialPC). + ] + ifFalse: [ + "This is the path where the inlined comparison is *not* followed immediatly by a branch" + | condJump jump | + condJump := self gen: opTrue operand: 0. + self + annotate: (self MoveCw: objectMemory falseObject R: destReg) + objRef: objectMemory falseObject. + jump := self Jump: 0. + condJump jmpTarget: (self + annotate: (self MoveCw: objectMemory trueObject R: destReg) + objRef: objectMemory trueObject). + jump jmpTarget: self Label ]. + ^ 0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genBinaryVarOpConstInlinePrimitive: (in category 'inline primitive generators') ----- genBinaryVarOpConstInlinePrimitive: prim "Var op const version of inline binary inline primitives." "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. See EncoderForSistaV1's class comment and StackInterpreter>>#binaryInlinePrimitive:" | rr val untaggedVal | (rr := backEnd availableRegisterOrNilFor: self liveRegisters) ifNil: [self ssAllocateRequiredReg: (rr := optStatus isReceiverResultRegLive ifTrue: [Arg0Reg] ifFalse: [ReceiverResultReg])]. rr = ReceiverResultReg ifTrue: [optStatus isReceiverResultRegLive: false]. val := self ssTop constant. self ssPop: 1. self ssTop popToReg: rr. self ssPop: 1. untaggedVal := val - objectMemory smallIntegerTag. prim caseOf: { "0 through 6, +, -, *, /, //, \\, quo:, SmallInteger op SmallInteger => SmallInteger, no overflow" [0] -> [self AddCq: untaggedVal R: rr]. [1] -> [self SubCq: untaggedVal R: rr ]. [2] -> [self flag: 'could use MulCq:R'. objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: rr. self MoveCq: (objectMemory integerValueOf: val) R: TempReg. self MulR: TempReg R: rr. objectRepresentation genAddSmallIntegerTagsTo: rr]. "2016 through 2019, bitAnd:, bitOr:, bitXor, bitShift:, SmallInteger op SmallInteger => SmallInteger, no overflow" + "2032 through 2037, >, <, >=, <=. =, ~=, SmallInteger op SmallInteger => Boolean (flags?? then in jump bytecodes if ssTop is a flags value, just generate the instruction!!!!) + Here the comparison is reversed (cst on the left, reg on the right) so I inverted opTrue and opFalse" + [32] -> [ self CmpCq: val R: rr. + self genBinaryInlineComparison: JumpLess opFalse: JumpGreater destReg: rr ]. + [33] -> [ self CmpCq: val R: rr. + self genBinaryInlineComparison: JumpGreater opFalse: JumpLess destReg: rr ]. + [34] -> [ self CmpCq: val R: rr. + self genBinaryInlineComparison: JumpLessOrEqual opFalse: JumpGreaterOrEqual destReg: rr ]. + [35] -> [ self CmpCq: val R: rr. + self genBinaryInlineComparison: JumpGreaterOrEqual opFalse: JumpLessOrEqual destReg: rr ]. + [36] -> [ self CmpCq: val R: rr. + self genBinaryInlineComparison: JumpNonZero opFalse: JumpZero destReg: rr ]. + [37] -> [ self CmpCq: val R: rr. + self genBinaryInlineComparison: JumpZero opFalse: JumpNonZero destReg: rr ]. - "2032 through 2037, >, <, >=, <=. =, ~=, SmallInteger op SmallInteger => Boolean (flags?? then in jump bytecodes if ssTop is a flags value, just generate the instruction!!!!)" "2064 through 2068, Pointer Object>>at:, Byte Object>>at:, Short16 Word Object>>at: LongWord32 Object>>at: Quad64Word Object>>at:. obj op 0-rel SmallInteger => oop" [64] -> [self genConvertSmallIntegerToIntegerInReg: rr. self MoveCq: val >> 1 R: TempReg. self MoveXwr: TempReg R: rr R: rr ]. [65] -> [self genConvertSmallIntegerToIntegerInReg: rr. self MoveCq: val >> 1 R: TempReg. self MoveXbr: TempReg R: rr R: rr ] } otherwise: [^EncounteredUnknownBytecode]. self ssPushRegister: rr. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genBinaryVarOpVarInlinePrimitive: (in category 'inline primitive generators') ----- genBinaryVarOpVarInlinePrimitive: prim "Var op var version of binary inline primitives." "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. See EncoderForSistaV1's class comment and StackInterpreter>>#binaryInlinePrimitive:" | ra rr | (rr := backEnd availableRegisterOrNilFor: self liveRegisters) ifNil: [self ssAllocateRequiredReg: (rr := optStatus isReceiverResultRegLive ifTrue: [Arg0Reg] ifFalse: [ReceiverResultReg])]. (ra := backEnd availableRegisterOrNilFor: (self liveRegisters bitOr: (self registerMaskFor: rr))) ifNil: [self ssAllocateRequiredReg: (ra := Arg1Reg)]. (rr = ReceiverResultReg or: [ra = ReceiverResultReg]) ifTrue: [optStatus isReceiverResultRegLive: false]. self ssTop popToReg: ra. self ssPop: 1. self ssTop popToReg: rr. self ssPop: 1. prim caseOf: { "0 through 6, +, -, *, /, //, \\, quo:, SmallInteger op SmallInteger => SmallInteger, no overflow" [0] -> [objectRepresentation genRemoveSmallIntegerTagsInScratchReg: ra. self AddR: ra R: rr]. [1] -> [self SubR: ra R: rr. objectRepresentation genAddSmallIntegerTagsTo: rr]. [2] -> [objectRepresentation genRemoveSmallIntegerTagsInScratchReg: rr. objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: ra. self MulR: ra R: rr. objectRepresentation genAddSmallIntegerTagsTo: rr]. "2016 through 2019, bitAnd:, bitOr:, bitXor, bitShift:, SmallInteger op SmallInteger => SmallInteger, no overflow" "2032 through 2037, >, <, >=, <=. =, ~=, SmallInteger op SmallInteger => Boolean (flags?? then in jump bytecodes if ssTop is a flags value, just generate the instruction!!!!)" + [32] -> [ self CmpR: rr R: ra. + self genBinaryInlineComparison: JumpGreater opFalse: JumpLess destReg: rr ]. + [33] -> [ self CmpR: rr R: ra. + self genBinaryInlineComparison: JumpLess opFalse: JumpGreater destReg: rr ]. + [34] -> [ self CmpR: rr R: ra. + self genBinaryInlineComparison: JumpGreaterOrEqual opFalse: JumpLessOrEqual destReg: rr ]. + [35] -> [ self CmpR: rr R: ra. + self genBinaryInlineComparison: JumpLessOrEqual opFalse: JumpGreaterOrEqual destReg: rr ]. + [36] -> [ self CmpR: rr R: ra. + self genBinaryInlineComparison: JumpZero opFalse: JumpNonZero destReg: rr ]. + [37] -> [ self CmpR: rr R: ra. + self genBinaryInlineComparison: JumpNonZero opFalse: JumpZero destReg: rr ]. "2064 through 2068, Pointer Object>>at:, Byte Object>>at:, Short16 Word Object>>at: LongWord32 Object>>at: Quad64Word Object>>at:. obj op 0-rel SmallInteger => oop" [64] -> [self genConvertSmallIntegerToIntegerInReg: ra. self MoveXwr: ra R: rr R: rr ]. [65] -> [self genConvertSmallIntegerToIntegerInReg: ra. self MoveXbr: ra R: rr R: rr ] } otherwise: [^EncounteredUnknownBytecode]. self ssPushRegister: rr. ^0!

1 0

Building and running Cog VM in "good old" athlon-xp without SSE2 support still fails
by oslsachem 30 Dec '14

30 Dec '14

I have successfully built the Cog VM for debugging (make debug) using the standalone (without Cygwin) MinGW/MSYS environment. This has been for an athlon-xp using revision 3164. I have attached a patch with the modifications I have had to make to the makefiles just for reference (MinGWTuning.patch). However, the VM fails when loading the image, prompting a system error. I have used the GNU debugger (gdb) to isolate the problematic function call ( which apparently contains an instruction not supported by the hardware). [...] (gdb) updateMicrosecondClock () at ../../platforms/win32/vm/sqWin32Heartbeat.c:202 202 if (!asserta(newUtcMicrosecondClock >= utcMicrosecondClock)) { (gdb) 206 newLocalMicrosecondClock = newUtcMicrosecondClock + vmGMTOffset; (gdb) 208 set64(utcMicrosecondClock,newUtcMicrosecondClock); (gdb) Program received signal SIGILL, Illegal instruction. 0x00474dee in updateMicrosecondClock () at ../../platforms/win32/vm/sqWin32Heartbeat.c:208 208 set64(utcMicrosecondClock,newUtcMicrosecondClock); [...] I have attached the log of the build of the VM for debugging (LOGD) and the debugging session (logGDB). On the other hand, using explicitly the -mno-sse2 or -march=native switches makes the build fail around the same piece of code: [...] ../../platforms/win32/vm/sqWin32Heartbeat.c: In function 'updateMicrosecondClock':../../platforms/win32/vm/sqWin32Heartbeat.c:208:2: error: can't find a register in class 'GENERAL_REGS' while reloading 'asm'../../platforms/win32/vm/sqWin32Heartbeat.c:209:2: error: can't find a register in class 'GENERAL_REGS' while reloading 'asm'../../platforms/win32/vm/sqWin32Heartbeat.c:208:2: error: 'asm' operand has impossible constraints../../platforms/win32/vm/sqWin32Heartbeat.c:209:2: error: 'asm' operand has impossible constraintsmake[1]: *** [builddbg/vm/sqWin32Heartbeat.o] Error 1 make[1]: Leaving directory `/c/Documents and Settings/Usuario/Mis documentos/cog/build.win32x86/squeak.cog.v3' make: *** [debug] Error 2 [...] Greetings, Osl

1 0

"make debug" target for building Cog VM fails in Windows using latest Cygwin
by oslsachem 30 Dec '14

30 Dec '14

I have tried to build the Cog VM in an athlon-xp using revision 3164. I have used the latest release of Cygwin to build the Cog VM as indicated in: http://www.squeakvm.org/svn/squeak/branches/Cog/build.win32x86/HowToBuild This requires adjustments to the switches in the makefiles (removal of -mno-cygwin) and specifying the paths to use the MinGW toolchain binaries to avoid the dependency of the resulting binaries on Cygwin dlls (cygwin1.dll, cyggcc_s-1.dll). This is because seemingly, GCC 4.7.0 and later have finally removed the deprecated -mno-cygwin option: "gcc: error: unrecognized command line option '-mno-cygwin'" Besides, I have had to downgrade the default binutils version to binutils-2.21.1 because windres apparently has a bug: "i686-pc-mingw32-windres: unexpected version string length 68 != 32 + 8" I have attached a patch with the modifications I have had to make to the makefiles just for reference (CygwinTuning.patch). The (./mvm) script or more specifically (make debug) doesn't run successfully in Cygwin: [...] ../../src/vm/gcc3x-cointerp.c:9081:1: error: conflicting types for 'cmHomeMethod' ../../src/vm/gcc3x-cointerp.c:386:20: note: previous declaration of 'cmHomeMethod' was here ../../src/vm/gcc3x-cointerp.c:9092:1: error: conflicting types for 'activateCoggedNewMethod' ../../src/vm/gcc3x-cointerp.c:387:13: note: previous declaration of 'activateCoggedNewMethod' was here ../../src/vm/gcc3x-cointerp.c:9330:1: error: conflicting types for 'addNewMethodToCache' ../../src/vm/gcc3x-cointerp.c:389:13: note: previous declaration of 'addNewMethodToCache' was here [...] This is probably due to the appearance of the problem with NoDbgRegParms that is mentioned at: http://lists.squeakfoundation.org/pipermail/vm-dev/2014-November/016948.html I have attached the log of the failed build of the VM for debugging (LOGD). On the other hand, (make product) builds successfully. And using a standalone MinGW/MSYS environment (without Cygwin) avoids this problem altogether. Greetings, Osl

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev December 2014