Vm-dev November 2012

vm-dev@lists.squeakfoundation.org

24 participants
73 discussions

codeGenerator vs cogitCodeGenerator
by Guillermo Polito 27 Nov '12

27 Nov '12

Hi all!! I was looking at the VMMaker sources and noticed that by default when generating my vm, the interpreter and cogit files are generated with different CodeGenerators: CrossPlatformVMMaker>>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 initialize; globalStructDefined: true; structDefDefine: 'USE_GLOBAL_STRUCT'; logger: logger; yourself VMMaker>>createCogitCodeGenerator ^CCodeGenerator new initialize logger: logger; yourself Why should they use different code generators? Shouldn't they by default use the same? Tx, Guille

2 1

[commit][2620] VM:
by commits＠squeakvm.org 27 Nov '12

27 Nov '12

Revision: 2620 Author: eliot Date: 2012-11-26 17:13:23 -0800 (Mon, 26 Nov 2012) Log Message: ----------- VM: Complete multiple bytecode set support plus NewsqueakV4 bytecode set. Affects only the Newspeak VMs. Make instantiation primitives pop arguments, not assume arg count, for Newspeak. Make them answer error codes, and streamline, avoiding using self success. Integrate primitiveUtcWithOffset. Rename traceLinkedSends to more general traceFlags. Add better help for these. Plugins: Regenerate most plugins, to eliminate some warnings and to use isIntegerObjectrather than explicit bit test. ThreadedFFIPlugin: Fix bug with not attempting to run GC enough times for COGMTVM to freeze arguments. Fix bug in ffiCall:ArgArrayOrNil:NumArgs: not checking for an error case. Modified Paths: -------------- branches/Cog/nscogbuild/macbuild/CoreVM.xcodeproj/project.pbxproj branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c branches/Cog/nscogsrc/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/nscogsrc/plugins/DSAPrims/DSAPrims.c branches/Cog/nscogsrc/plugins/DropPlugin/DropPlugin.c branches/Cog/nscogsrc/plugins/FileCopyPlugin/FileCopyPlugin.c branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c branches/Cog/nscogsrc/plugins/FloatArrayPlugin/FloatArrayPlugin.c branches/Cog/nscogsrc/plugins/FloatMathPlugin/FloatMathPlugin.c branches/Cog/nscogsrc/plugins/IA32ABI/IA32ABI.c branches/Cog/nscogsrc/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c branches/Cog/nscogsrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c branches/Cog/nscogsrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c branches/Cog/nscogsrc/plugins/RePlugin/RePlugin.c branches/Cog/nscogsrc/plugins/SecurityPlugin/SecurityPlugin.c branches/Cog/nscogsrc/plugins/SocketPlugin/SocketPlugin.c branches/Cog/nscogsrc/plugins/SoundPlugin/SoundPlugin.c branches/Cog/nscogsrc/plugins/UUIDPlugin/UUIDPlugin.c branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c branches/Cog/nscogsrc/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c branches/Cog/nscogsrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c branches/Cog/nscogsrc/plugins/ZipPlugin/ZipPlugin.c branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/platforms/Cross/vm/dispdbg.h branches/Cog/platforms/Mac OS/vm/sqMacMain.c branches/Cog/platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c branches/Cog/platforms/unix/vm/sqUnixMain.c branches/Cog/platforms/unix/vm-display-X11/sqUnixX11.c branches/Cog/platforms/unix/vm-display-null/sqUnixDisplayNull.c branches/Cog/platforms/win32/vm/sqWin32Intel.c branches/Cog/platforms/win32/vm/sqWin32Window.c branches/Cog/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c branches/Cog/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c branches/Cog/src/plugins/B2DPlugin/B2DPlugin.c branches/Cog/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c branches/Cog/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c branches/Cog/src/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/src/plugins/BochsIA32Plugin/BochsIA32Plugin.c branches/Cog/src/plugins/CroquetPlugin/CroquetPlugin.c branches/Cog/src/plugins/DSAPrims/DSAPrims.c branches/Cog/src/plugins/DropPlugin/DropPlugin.c branches/Cog/src/plugins/FFTPlugin/FFTPlugin.c branches/Cog/src/plugins/FT2Plugin/FT2Plugin.c branches/Cog/src/plugins/FileCopyPlugin/FileCopyPlugin.c branches/Cog/src/plugins/FilePlugin/FilePlugin.c branches/Cog/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c branches/Cog/src/plugins/FloatMathPlugin/FloatMathPlugin.c branches/Cog/src/plugins/GeniePlugin/GeniePlugin.c branches/Cog/src/plugins/IA32ABI/IA32ABI.c branches/Cog/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c branches/Cog/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c branches/Cog/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c branches/Cog/src/plugins/Klatt/Klatt.c branches/Cog/src/plugins/LargeIntegers/LargeIntegers.c branches/Cog/src/plugins/LocalePlugin/LocalePlugin.c branches/Cog/src/plugins/MIDIPlugin/MIDIPlugin.c branches/Cog/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c branches/Cog/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c branches/Cog/src/plugins/QuicktimePlugin/QuicktimePlugin.c branches/Cog/src/plugins/RePlugin/RePlugin.c branches/Cog/src/plugins/SecurityPlugin/SecurityPlugin.c branches/Cog/src/plugins/SerialPlugin/SerialPlugin.c branches/Cog/src/plugins/SocketPlugin/SocketPlugin.c branches/Cog/src/plugins/SoundCodecPrims/SoundCodecPrims.c branches/Cog/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c branches/Cog/src/plugins/StarSqueakPlugin/StarSqueakPlugin.c branches/Cog/src/plugins/UUIDPlugin/UUIDPlugin.c branches/Cog/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c branches/Cog/src/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c branches/Cog/src/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c branches/Cog/src/plugins/ZipPlugin/ZipPlugin.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/src/vm/interp.h branches/Cog/src/vm/vmCallback.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogbuild/macbuild/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/nscogbuild/macbuild/CoreVM.xcodeproj/project.pbxproj 2012-09-22 16:56:31 UTC (rev 2619) +++ branches/Cog/nscogbuild/macbuild/CoreVM.xcodeproj/project.pbxproj 2012-11-27 01:13:23 UTC (rev 2620) @@ -1710,6 +1710,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "MULTIPLEBYTECODESETS=1", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1749,6 +1750,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "MULTIPLEBYTECODESETS=1", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1780,6 +1782,7 @@ "DEBUGVM=1", "VM_LABEL(foo)=0", "USE_GLOBAL_STRUCT=0", + "MULTIPLEBYTECODESETS=1", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1832,6 +1835,7 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "MULTIPLEBYTECODESETS=1", TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, HAVE_SYS_TIME_H, @@ -1882,6 +1886,7 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "MULTIPLEBYTECODESETS=1", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1921,6 +1926,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "MULTIPLEBYTECODESETS=1", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1944,6 +1950,7 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "MULTIPLEBYTECODESETS=1", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1971,6 +1978,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "NDEBUG=1", "USE_GLOBAL_STRUCT=0", + "MULTIPLEBYTECODESETS=1", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, Modified: branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2012-09-22 16:56:31 UTC (rev 2619) +++ branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2012-11-27 01:13:23 UTC (rev 2620) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.105 uuid: 79234f80-ee6a-404c-9e5c-2134e3b76463 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.222 uuid: 9255d122-7216-4700-8ead-493416ce0cf6 from - AsynchFilePlugin VMMaker.oscog-eem.105 uuid: 79234f80-ee6a-404c-9e5c-2134e3b76463 + AsynchFilePlugin VMMaker.oscog-eem.222 uuid: 9255d122-7216-4700-8ead-493416ce0cf6 */ -static char __buildInfo[] = "AsynchFilePlugin VMMaker.oscog-eem.105 uuid: 79234f80-ee6a-404c-9e5c-2134e3b76463 " __DATE__ ; +static char __buildInfo[] = "AsynchFilePlugin VMMaker.oscog-eem.222 uuid: 9255d122-7216-4700-8ead-493416ce0cf6 " __DATE__ ; @@ -38,6 +38,7 @@ /*** Constants ***/ +#define BytesPerWord 4 /*** Function Prototypes ***/ @@ -67,9 +68,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AsynchFilePlugin VMMaker.oscog-eem.105 (i)" + "AsynchFilePlugin VMMaker.oscog-eem.222 (i)" #else - "AsynchFilePlugin VMMaker.oscog-eem.105 (e)" + "AsynchFilePlugin VMMaker.oscog-eem.222 (e)" #endif ; static void * sCOAFfn; @@ -83,7 +84,7 @@ static AsyncFile * asyncFileValueOf(sqInt oop) { - interpreterProxy->success((!((oop & 1))) + interpreterProxy->success((!(interpreterProxy->isIntegerObject(oop))) && ((interpreterProxy->isBytes(oop)) && ((interpreterProxy->slotSizeOf(oop)) == (sizeof(AsyncFile))))); if (interpreterProxy->failed()) { @@ -191,12 +192,12 @@ } /* If the security plugin can be loaded, use it to check for permission. - If not, assume it's ok */ + If not, assume it's ok */ fileNameSize = interpreterProxy->slotSizeOf(((int) fileName) - 4); if (sCOAFfn != 0) { okToOpen = ((sqInt (*) (char *, sqInt, sqInt)) sCOAFfn)(fileName, fileNameSize, writeFlag); - if (!(okToOpen)) { + if (!okToOpen) { interpreterProxy->primitiveFail(); return null; } Modified: branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c 2012-09-22 16:56:31 UTC (rev 2619) +++ branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c 2012-11-27 01:13:23 UTC (rev 2620) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.105 uuid: 79234f80-ee6a-404c-9e5c-2134e3b76463 + VMPluginCodeGenerator VMMaker.oscog-eem.222 uuid: 9255d122-7216-4700-8ead-493416ce0cf6 from - BalloonEnginePlugin VMMaker.oscog-eem.105 uuid: 79234f80-ee6a-404c-9e5c-2134e3b76463 + BalloonEnginePlugin VMMaker.oscog-eem.222 uuid: 9255d122-7216-4700-8ead-493416ce0cf6 */ -static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.105 uuid: 79234f80-ee6a-404c-9e5c-2134e3b76463 " __DATE__ ; +static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.222 uuid: 9255d122-7216-4700-8ead-493416ce0cf6 " __DATE__ ; @@ -42,6 +42,7 @@ #define BEFormsIndex 3 #define BESpanIndex 1 #define BEWorkBufferIndex 0 +#define BytesPerWord 4 #define ETBalloonEdgeDataSize 6 #define ETIndexIndex 0 #define ETLinesIndex 4 @@ -752,9 +753,9 @@ static void * loadBBFn; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B2DPlugin VMMaker.oscog-eem.105 (i)" + "B2DPlugin VMMaker.oscog-eem.222 (i)" #else - "B2DPlugin VMMaker.oscog-eem.105 (e)" + "B2DPlugin VMMaker.oscog-eem.222 (e)" #endif ; static int* objBuffer; @@ -1116,9 +1117,11 @@ { /* begin wbStackPush: */ if (!(needAvailableSpace(6))) { + 0; goto l1; } workBuffer[GWBufferTop] = ((workBuffer[GWBufferTop]) - 6); + 1; l1: /* end wbStackPush: */; return (workBuffer[GWSize]) - (workBuffer[GWBufferTop]); } @@ -1166,6 +1169,9 @@ sqInt i; sqInt srcIndex; + + /* First allocate nSlots in the AET */ + if (!(needAvailableSpace(nSlots))) { return 0; } @@ -1247,6 +1253,9 @@ sqInt i; sqInt srcIndex; + + /* First allocate nSlots in the GET */ + if (!(allocateGETEntry(nSlots))) { return 0; } @@ -1528,10 +1537,10 @@ rShift = (32 - bmDepth) - ((xp & ((1 << rShift) - 1)) * bmDepth); value = (((usqInt) value) >> rShift) & cMask; if (bmDepth == 16) { - if (!(value == 0)) { - /* Must convert by expanding bits */ + /* Must convert by expanding bits */ + if (!(value == 0)) { b = (value & 31) << 3; b += ((usqInt) b) >> 5; g = ((((usqInt) value) >> 5) & 31) << 3; @@ -1543,10 +1552,10 @@ } } else { - if ((objBuffer[bmFill + GBColormapSize]) == 0) { - /* Must convert by using color map */ + /* Must convert by using color map */ + if ((objBuffer[bmFill + GBColormapSize]) == 0) { value = 0; } else { @@ -1681,6 +1690,9 @@ sqInt i; sqInt length; + + /* First check if the oops have the right format */ + if (!(interpreterProxy->isWords(indexList))) { return 0; } @@ -1733,9 +1745,9 @@ } /* The points must be either in PointArray format or ShortPointArray format. - Also, we currently handle only quadratic segments (e.g., 3 points each) and thus either - pSize = nSegments * 3, for ShortPointArrays or, - pSize = nSegments * 6, for PointArrays */ + Also, we currently handle only quadratic segments (e.g., 3 points each) and thus either + pSize = nSegments * 3, for ShortPointArrays or, + pSize = nSegments * 6, for PointArrays */ pSize = interpreterProxy->slotSizeOf(points); if (!((pSize == (nSegments * 3)) @@ -2048,9 +2060,11 @@ /* begin allocateBezierStackEntry */ /* begin wbStackPush: */ if (!(needAvailableSpace(6))) { + 0; goto l1; } workBuffer[GWBufferTop] = ((workBuffer[GWBufferTop]) - 6); + 1; l1: /* end wbStackPush: */; newIndex = (workBuffer[GWSize]) - (workBuffer[GWBufferTop]); if (engineStopped) { @@ -2183,9 +2197,11 @@ /* begin allocateBezierStackEntry */ /* begin wbStackPush: */ if (!(needAvailableSpace(6))) { + 0; goto l3; } workBuffer[GWBufferTop] = ((workBuffer[GWBufferTop]) - 6); + 1; l3: /* end wbStackPush: */; newIndex = (workBuffer[GWSize]) - (workBuffer[GWBufferTop]); if (engineStopped) { @@ -2246,6 +2262,9 @@ copyBitsFromtoat(sqInt x0, sqInt x1, sqInt yValue) { if (copyBitsFn == 0) { + + /* We need copyBits here so try to load it implicitly */ + if (!(initialiseModule())) { return 0; } @@ -2267,7 +2286,13 @@ object = 0; end = objUsed; while (object < end) { + + /* Note: addEdgeToGET: may fail on insufficient space but that's not a problem here */ + if (isEdge(object)) { + + /* Check if the edge starts below fillMaxY. */ + if (!((objBuffer[object + GEYValue]) >= (workBuffer[GWFillMaxY]))) { /* begin checkedAddEdgeToGET: */ if ((((objBuffer[object + GEObjectType]) & GEPrimitiveTypeMask) & GEPrimitiveWideMask) == GEPrimitiveLine) { @@ -2279,13 +2304,16 @@ lineWidth1 = 0; } if (((objBuffer[object + GLEndY]) + lineWidth1) < (workBuffer[GWFillMinY])) { + 0; goto l1; } if ((((objBuffer[object + GEXValue]) - lineWidth1) >= (workBuffer[GWFillMaxX])) && (((objBuffer[object + GLEndX]) - lineWidth1) >= (workBuffer[GWFillMaxX]))) { + 0; goto l1; } addEdgeToGET(object); + null; goto l1; } if ((((objBuffer[object + GEObjectType]) & GEPrimitiveTypeMask) & GEPrimitiveWideMask) == GEPrimitiveBezier) { @@ -2297,13 +2325,16 @@ lineWidth = 0; } if (((objBuffer[object + GBEndY]) + lineWidth) < (workBuffer[GWFillMinY])) { + 0; goto l1; } if ((((objBuffer[object + GEXValue]) - lineWidth) >= (workBuffer[GWFillMaxX])) && (((objBuffer[object + GBEndX]) - lineWidth) >= (workBuffer[GWFillMaxX]))) { + 0; goto l1; } addEdgeToGET(object); + null; goto l1; } addEdgeToGET(object); @@ -2638,11 +2669,13 @@ } /* begin quickRemoveInvalidFillsAt: */ if (((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) == 0) { + null; goto l1; } while ((topRightX()) <= stopX) { hideFilldepth(topFill(), topDepth()); if (((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) == 0) { + null; goto l1; } } @@ -2798,7 +2831,7 @@ } xp = ((sqInt) ds >> 16); yp = ((sqInt) dt >> 16); - if (!(tileFlag)) { + if (!tileFlag) { /* begin clampValue:max: */ if (xp < 0) { xp = 0; @@ -2860,10 +2893,10 @@ rShift = (32 - bmDepth) - ((xp & ((1 << rShift) - 1)) * bmDepth); value = (((usqInt) value) >> rShift) & cMask1; if (bmDepth == 16) { - if (!(value == 0)) { - /* Must convert by expanding bits */ + /* Must convert by expanding bits */ + if (!(value == 0)) { b = (value & 31) << 3; b += ((usqInt) b) >> 5; g = ((((usqInt) value) >> 5) & 31) << 3; @@ -2875,10 +2908,10 @@ } } else { - if ((objBuffer[bmFill + GBColormapSize]) == 0) { - /* Must convert by using color map */ + /* Must convert by using color map */ + if ((objBuffer[bmFill + GBColormapSize]) == 0) { value = 0; } else { @@ -2922,7 +2955,7 @@ } xp = ((sqInt) ds >> 16); yp = ((sqInt) dt >> 16); - if (!(tileFlag)) { + if (!tileFlag) { /* begin clampValue:max: */ if (xp < 0) { xp = 0; @@ -2984,10 +3017,10 @@ rShift1 = (32 - bmDepth1) - ((xp & ((1 << rShift1) - 1)) * bmDepth1); value1 = (((usqInt) value1) >> rShift1) & cMask2; if (bmDepth1 == 16) { - if (!(value1 == 0)) { - /* Must convert by expanding bits */ + /* Must convert by expanding bits */ + if (!(value1 == 0)) { b1 = (value1 & 31) << 3; b1 += ((usqInt) b1) >> 5; g1 = ((((usqInt) value1) >> 5) & 31) << 3; @@ -2999,10 +3032,10 @@ } } else { - if ((objBuffer[bmFill + GBColormapSize]) == 0) { - /* Must convert by using color map */ + /* Must convert by using color map */ + if ((objBuffer[bmFill + GBColormapSize]) == 0) { value1 = 0; } else { @@ -3046,7 +3079,7 @@ } xp = ((sqInt) ds >> 16); yp = ((sqInt) dt >> 16); - if (!(tileFlag)) { + if (!tileFlag) { /* begin clampValue:max: */ if (xp < 0) { xp = 0; @@ -3108,10 +3141,10 @@ rShift2 = (32 - bmDepth2) - ((xp & ((1 << rShift2) - 1)) * bmDepth2); value2 = (((usqInt) value2) >> rShift2) & cMask3; if (bmDepth2 == 16) { - if (!(value2 == 0)) { - /* Must convert by expanding bits */ + /* Must convert by expanding bits */ + if (!(value2 == 0)) { b2 = (value2 & 31) << 3; b2 += ((usqInt) b2) >> 5; g2 = ((((usqInt) value2) >> 5) & 31) << 3; @@ -3123,10 +3156,10 @@ } } else { - if ((objBuffer[bmFill + GBColormapSize]) == 0) { - /* Must convert by using color map */ + /* Must convert by using color map */ + if ((objBuffer[bmFill + GBColormapSize]) == 0) { value2 = 0; } else { @@ -3174,6 +3207,9 @@ bitX = -1; if ((workBuffer[GWAALevel]) == 1) { + + /* Speedy version for no anti-aliasing */ + while (x0 < x1) { fillValue = (((int *) bits))[(bitX += 1)]; spanBuffer[x0] = fillValue; @@ -3275,7 +3311,7 @@ } xp = ((sqInt) ds >> 16); yp = ((sqInt) dt >> 16); - if (!(tileFlag)) { + if (!tileFlag) { /* begin clampValue:max: */ if (xp < 0) { xp = 0; @@ -3337,10 +3373,10 @@ rShift = (32 - bmDepth) - ((xp & ((1 << rShift) - 1)) * bmDepth); value = (((usqInt) value) >> rShift) & cMask; if (bmDepth == 16) { - if (!(value == 0)) { - /* Must convert by expanding bits */ + /* Must convert by expanding bits */ + if (!(value == 0)) { b = (value & 31) << 3; b += ((usqInt) b) >> 5; g = ((((usqInt) value) >> 5) & 31) << 3; @@ -3352,10 +3388,10 @@ } } else { - if ((objBuffer[bmFill + GBColormapSize]) == 0) { - /* Must convert by using color map */ + /* Must convert by using color map */ + if ((objBuffer[bmFill + GBColormapSize]) == 0) { value = 0; } else { @@ -3394,6 +3430,10 @@ sqInt pv32; sqInt x; + + /* Not now -- maybe later */ + /* Compute the pixel boundaries. */ + /* begin aaFirstPixelFrom:to: */ firstPixel1 = ((leftX + (workBuffer[GWAALevel])) - 1) & (~((workBuffer[GWAALevel]) - 1)); if (firstPixel1 > rightX) { @@ -3450,6 +3490,9 @@ sqInt x0; sqInt x1; + + /* Use a unrolled version for anti-aliased fills... */ + if (!((workBuffer[GWAALevel]) == 1)) { return fillColorSpanAAx0x1(pixelValue32, leftX, rightX); } @@ -3669,6 +3712,9 @@ l1: /* end fillColorSpan:from:to: */; } if ((workBuffer[GWAALevel]) == 1) { + + /* Fast version w/o anti-aliasing */ + while (((((rampIndex = ((sqInt) ds >> 16))) < rampSize) && (rampIndex >= 0)) && (x < x1)) { @@ -3887,6 +3933,9 @@ rampValue = (((int *) ramp))[rampIndex]; rampValue = ((usqInt) (rampValue & colorMask)) >> colorShift; while (x < firstPixel) { + + /* Try to copy the current value more than just once */ + while ((x < firstPixel) && ((((((sqInt) ds >> 16)) * (((sqInt) ds >> 16))) + ((((sqInt) dt >> 16)) * (((sqInt) dt >> 16)))) >= length2)) { index = ((usqInt) x) >> baseShift; @@ -3910,6 +3959,9 @@ rampValue = (((int *) ramp))[rampIndex]; rampValue = ((usqInt) (rampValue & colorMask)) >> colorShift; while (x < lastPixel) { + + /* Try to copy the current value more than just once */ + while ((x < lastPixel) && ((((((sqInt) ds >> 16)) * (((sqInt) ds >> 16))) + ((((sqInt) dt >> 16)) * (((sqInt) dt >> 16)))) >= length2)) { index = ((usqInt) x) >> baseShift; @@ -3933,6 +3985,9 @@ rampValue = (((int *) ramp))[rampIndex]; rampValue = ((usqInt) (rampValue & colorMask)) >> colorShift; while (x < x1) { + + /* Try to copy the current value more than just once */ + while ((x < x1) && ((((((sqInt) ds >> 16)) * (((sqInt) ds >> 16))) + ((((sqInt) dt >> 16)) * (((sqInt) dt >> 16)))) >= length2)) { index = ((usqInt) x) >> baseShift; @@ -3981,6 +4036,9 @@ x1 = objBuffer[fill + GFOriginX]; } while (x < x1) { + + /* Try to copy the current value more than just once */ + while ((x < x1) && ((((((sqInt) ds >> 16)) * (((sqInt) ds >> 16))) + ((((sqInt) dt >> 16)) * (((sqInt) dt >> 16)))) >= length2)) { spanBuffer[x] = rampValue; @@ -4101,6 +4159,9 @@ deltaST[0] = ds; deltaST[1] = dt; if (x < (objBuffer[fill + GFOriginX])) { + + /* Draw the decreasing part */ + if ((workBuffer[GWAALevel]) == 1) { /* begin fillRadialDecreasing:ramp:deltaST:dsX:dtX:from:to: */ ds1 = (((int*) deltaST))[0]; @@ -4114,6 +4175,9 @@ x12 = objBuffer[fill + GFOriginX]; } while (x2 < x12) { + + /* Try to copy the current value more than just once */ + while ((x2 < x12) && ((((((sqInt) ds1 >> 16)) * (((sqInt) ds1 >> 16))) + ((((sqInt) dt1 >> 16)) * (((sqInt) dt1 >> 16)))) >= length21)) { spanBuffer[x2] = rampValue; @@ -4137,6 +4201,9 @@ } } if (x < x1) { + + /* Draw the increasing part */ + if ((workBuffer[GWAALevel]) == 1) { /* begin fillRadialIncreasing:ramp:deltaST:dsX:dtX:from:to: */ ds2 = (((int*) deltaST))[0]; @@ -4154,6 +4221,9 @@ x14 = x1; while ((x3 < x14) && (lastLength < length22)) { + + /* Try to copy the current value more than once */ + while ((x3 < x14) && ((((((sqInt) ds2 >> 16)) * (((sqInt) ds2 >> 16))) + ((((sqInt) dt2 >> 16)) * (((sqInt) dt2 >> 16)))) <= nextLength1)) { spanBuffer[x3] = rampValue1; @@ -4262,6 +4332,9 @@ rampValue = ((usqInt) (rampValue & colorMask)) >> colorShift; while ((x < firstPixel) && (lastLength < length2)) { + + /* Try to copy the current value more than once */ + while ((x < firstPixel) && ((((((sqInt) ds >> 16)) * (((sqInt) ds >> 16))) + ((((sqInt) dt >> 16)) * (((sqInt) dt >> 16)))) <= nextLength)) { index = ((usqInt) x) >> baseShift; @@ -4287,6 +4360,9 @@ rampValue = ((usqInt) (rampValue & colorMask)) >> colorShift; while ((x < lastPixel) && (lastLength < length2)) { + + /* Try to copy the current value more than once */ + while ((x < lastPixel) && ((((((sqInt) ds >> 16)) * (((sqInt) ds >> 16))) + ((((sqInt) dt >> 16)) * (((sqInt) dt >> 16)))) <= nextLength)) { index = ((usqInt) x) >> baseShift; @@ -4312,6 +4388,9 @@ rampValue = ((usqInt) (rampValue & colorMask)) >> colorShift; while ((x < rightX) && (lastLength < length2)) { + + /* Try to copy the current value more than once */ + while ((x < rightX) && ((((((sqInt) ds >> 16)) * (((sqInt) ds >> 16))) + ((((sqInt) dt >> 16)) * (((sqInt) dt >> 16)))) <= nextLength)) { index = ((usqInt) x) >> baseShift; @@ -4366,6 +4445,9 @@ x1 = rightX; while ((x < x1) && (lastLength < length2)) { + + /* Try to copy the current value more than once */ + while ((x < x1) && ((((((sqInt) ds >> 16)) * (((sqInt) ds >> 16))) + ((((sqInt) dt >> 16)) * (((sqInt) dt >> 16)))) <= nextLength)) { spanBuffer[x] = rampValue; @@ -4475,6 +4557,9 @@ l1: /* end fillColorSpan:from:to: */; } else { + + /* Store the values for the dispatch */ + workBuffer[GWLastExportedFill] = fill; workBuffer[GWLastExportedLeftX] = x0; workBuffer[GWLastExportedRightX] = x1; @@ -4613,10 +4698,10 @@ leftX = (rightX = workBuffer[GWFillMaxX]); while ((workBuffer[GWAETStart]) < (workBuffer[GWAETUsed])) { - /* TODO: We should check if leftX from last operation - is greater than leftX from next edge. - Currently, we rely here on spanEndAA - from the span buffer fill. */ + /* TODO: We should check if leftX from last operation + is greater than leftX from next edge. + Currently, we rely here on spanEndAA + from the span buffer fill. */ leftEdge = (rightEdge = aetBuffer[workBuffer[GWAETStart]]); leftX = (rightX = objBuffer[leftEdge + GEXValue]); @@ -4625,11 +4710,13 @@ } /* begin quickRemoveInvalidFillsAt: */ if (((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) == 0) { + null; goto l3; } while ((topRightX()) <= leftX) { hideFilldepth(topFill(), topDepth()); if (((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) == 0) { + null; goto l3; } } @@ -4648,6 +4735,9 @@ rightEdge = aetBuffer[workBuffer[GWAETStart]]; rightX = objBuffer[rightEdge + GEXValue]; if (rightX >= (workBuffer[GWFillMinX])) { + + /* This is the visible portion */ + /* begin fillAllFrom:to: */ /* begin topFill */ if (((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) == 0) { @@ -4685,16 +4775,19 @@ fill = someIntegerValue; if (!(fill == 0)) { if (fillSpanfromto(fill, startX, stopX)) { + 1; goto l2; } } /* begin quickRemoveInvalidFillsAt: */ if (((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) == 0) { + null; goto l1; } while ((topRightX()) <= stopX) { hideFilldepth(topFill(), topDepth()); if (((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) == 0) { + null; goto l1; } } @@ -4727,6 +4820,7 @@ fillSpanfromto(fill, startX, rightX); goto l2; } + 0; l2: /* end fillAllFrom:to: */; } } @@ -4769,16 +4863,19 @@ fill1 = someIntegerValue2; if (!(fill1 == 0)) { if (fillSpanfromto(fill1, startX1, stopX1)) { + 1; goto l5; } } /* begin quickRemoveInvalidFillsAt: */ if (((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) == 0) { + null; goto l4; } while ((topRightX()) <= stopX1) { hideFilldepth(topFill(), topDepth()); if (((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) == 0) { + null; goto l4; } } @@ -4811,6 +4908,7 @@ fillSpanfromto(fill1, startX1, workBuffer[GWFillMaxX]); goto l5; } + 0; l5: /* end fillAllFrom:to: */; } return 0; @@ -4834,9 +4932,15 @@ edge = aetBuffer[workBuffer[GWAETStart]]; count = (objBuffer[edge + GENumLines]) - 1; if (count == 0) { + + /* Edge at end -- remove it */ + removeFirstAETEntry(); } else { + + /* Store remaining lines back */ + objBuffer[edge + GENumLines] = count; type = (objBuffer[edge + GEObjectType]) & GEPrimitiveTypeMask; if ((type & GEPrimitiveWideMask) == GEPrimitiveEdge) { @@ -5206,6 +5310,9 @@ return null; } if ((workBuffer[GWGETUsed]) == 0) { + + /* Nothing to do */ + workBuffer[GWCurrentY] = (workBuffer[GWFillMaxY]); return 0; } @@ -5233,6 +5340,9 @@ { sqInt index; + + /* Check for the number of lines remaining */ + if ((objBuffer[edge + GENumLines]) <= 0) { return null; } @@ -5251,6 +5361,9 @@ { sqInt i; + + /* Make sure we have space in the AET */ + if (!(needAvailableSpace(1))) { return null; } @@ -5518,9 +5631,11 @@ /* begin allocateBezierStackEntry */ /* begin wbStackPush: */ if (!(needAvailableSpace(6))) { + 0; goto l1; } workBuffer[GWBufferTop] = ((workBuffer[GWBufferTop]) - 6); + 1; l1: /* end wbStackPush: */; bz1 = (workBuffer[GWSize]) - (workBuffer[GWBufferTop]); if (engineStopped) { @@ -5593,6 +5708,9 @@ /* begin point1Get */ point = ((int *) (workBuffer + GWPoint1)); if ((workBuffer[GWHasEdgeTransform]) != 0) { + + /* Note: AA adjustment is done in #transformPoint: for higher accuracy */ + /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ /* begin edgeTransform */ @@ -5603,6 +5721,9 @@ (((int *) point))[1] = y; } else { + + /* Multiply each component by aaLevel and add a half pixel */ + point[0] = (((point[0]) + (workBuffer[GWDestOffsetX])) * (workBuffer[GWAALevel])); point[1] = (((point[1]) + (workBuffer[GWDestOffsetY])) * (workBuffer[GWAALevel])); } @@ -5612,6 +5733,9 @@ /* begin point2Get */ point1 = ((int *) (workBuffer + GWPoint2)); if ((workBuffer[GWHasEdgeTransform]) != 0) { + + /* Note: AA adjustment is done in #transformPoint: for higher accuracy */ + /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ /* begin edgeTransform */ @@ -5622,6 +5746,9 @@ (((int *) point1))[1] = y2; } else { + + /* Multiply each component by aaLevel and add a half pixel */ + point1[0] = (((point1[0]) + (workBuffer[GWDestOffsetX])) * (workBuffer[GWAALevel])); point1[1] = (((point1[1]) + (workBuffer[GWDestOffsetY])) * (workBuffer[GWAALevel])); } @@ -5631,6 +5758,9 @@ /* begin point3Get */ point2 = ((int *) (workBuffer + GWPoint3)); if ((workBuffer[GWHasEdgeTransform]) != 0) { + + /* Note: AA adjustment is done in #transformPoint: for higher accuracy */ + /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ /* begin edgeTransform */ @@ -5641,6 +5771,9 @@ (((int *) point2))[1] = y3; } else { + + /* Multiply each component by aaLevel and add a half pixel */ + point2[0] = (((point2[0]) + (workBuffer[GWDestOffsetX])) * (workBuffer[GWAALevel])); point2[1] = (((point2[1]) + (workBuffer[GWDestOffsetY])) * (workBuffer[GWAALevel])); } @@ -5650,6 +5783,9 @@ /* begin point4Get */ point3 = ((int *) (workBuffer + GWPoint4)); if ((workBuffer[GWHasEdgeTransform]) != 0) { + + /* Note: AA adjustment is done in #transformPoint: for higher accuracy */ + /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ /* begin edgeTransform */ @@ -5660,6 +5796,9 @@ (((int *) point3))[1] = y4; } else { + + /* Multiply each component by aaLevel and add a half pixel */ + point3[0] = (((point3[0]) + (workBuffer[GWDestOffsetX])) * (workBuffer[GWAALevel])); point3[1] = (((point3[1]) + (workBuffer[GWDestOffsetY])) * (workBuffer[GWAALevel])); } @@ -5718,6 +5857,9 @@ /* begin point1Get */ point = ((int *) (workBuffer + GWPoint1)); if ((workBuffer[GWHasEdgeTransform]) != 0) { + + /* Note: AA adjustment is done in #transformPoint: for higher accuracy */ + /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ /* begin edgeTransform */ @@ -5728,6 +5870,9 @@ (((int *) point))[1] = y; } else { + + /* Multiply each component by aaLevel and add a half pixel */ + point[0] = (((point[0]) + (workBuffer[GWDestOffsetX])) * (workBuffer[GWAALevel])); point[1] = (((point[1]) + (workBuffer[GWDestOffsetY])) * (workBuffer[GWAALevel])); } @@ -5737,6 +5882,9 @@ /* begin point2Get */ point1 = ((int *) (workBuffer + GWPoint2)); if ((workBuffer[GWHasEdgeTransform]) != 0) { + + /* Note: AA adjustment is done in #transformPoint: for higher accuracy */ + /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ /* begin edgeTransform */ @@ -5747,6 +5895,9 @@ (((int *) point1))[1] = y3; } else { + + /* Multiply each component by aaLevel and add a half pixel */ + point1[0] = (((point1[0]) + (workBuffer[GWDestOffsetX])) * (workBuffer[GWAALevel])); point1[1] = (((point1[1]) + (workBuffer[GWDestOffsetY])) * (workBuffer[GWAALevel])); } @@ -5756,6 +5907,9 @@ /* begin point3Get */ point2 = ((int *) (workBuffer + GWPoint3)); if ((workBuffer[GWHasEdgeTransform]) != 0) { + + /* Note: AA adjustment is done in #transformPoint: for higher accuracy */ + /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ /* begin edgeTransform */ @@ -5766,6 +5920,9 @@ (((int *) point2))[1] = y4; } else { + + /* Multiply each component by aaLevel and add a half pixel */ + point2[0] = (((point2[0]) + (workBuffer[GWDestOffsetX])) * (workBuffer[GWAALevel])); point2[1] = (((point2[1]) + (workBuffer[GWDestOffsetY])) * (workBuffer[GWAALevel])); } @@ -5775,6 +5932,9 @@ /* begin point4Get */ point3 = ((int *) (workBuffer + GWPoint4)); if ((workBuffer[GWHasEdgeTransform]) != 0) { + + /* Note: AA adjustment is done in #transformPoint: for higher accuracy */ + /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ /* begin edgeTransform */ @@ -5785,6 +5945,9 @@ (((int *) point3))[1] = y5; } else { + + /* Multiply each component by aaLevel and add a half pixel */ + point3[0] = (((point3[0]) + (workBuffer[GWDestOffsetX])) * (workBuffer[GWAALevel])); point3[1] = (((point3[1]) + (workBuffer[GWDestOffsetY])) * (workBuffer[GWAALevel])); } @@ -5805,6 +5968,9 @@ loadWideLinefromtolineFillleftFillrightFill(lineWidth, point1Get(), point3Get(), lineFill, fillIndex, 0); } else { + + /* Need bezier */ + segs = loadAndSubdivideBezierFromviatoisWide(point1Get(), point2Get(), point3Get(), (lineWidth != 0) && (lineFill != 0)); if (engineStopped) { @@ -5829,12 +5995,12 @@ for (i = 0; i <= (n - 1); i += 1) { value = interpreterProxy->fetchPointerofObject(i, transformOop); - if (!(((value & 1)) + if (!((interpreterProxy->isIntegerObject(value)) || (interpreterProxy->isFloatObject(value)))) { return interpreterProxy->primitiveFail(); } - if ((value & 1)) { - destPtr[i] = (((float) (((double) ((value >> 1)) )))); + if (interpreterProxy->isIntegerObject(value)) { + destPtr[i] = (((float) (((double) (interpreterProxy->integerValueOf(value)) )))); } else { destPtr[i] = (((float) (interpreterProxy->floatValueOf(value)))); @@ -5849,6 +6015,9 @@ loadBeziersegmentleftFillrightFilloffset(sqInt bezier, sqInt index, sqInt leftFillIndex, sqInt rightFillIndex, sqInt yOffset) { if ((workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 5)]) >= (workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 1)])) { + + /* Top to bottom */ + objBuffer[bezier + GEXValue] = (workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 0)]); objBuffer[bezier + GEYValue] = ((workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 1)]) - yOffset); objBuffer[bezier + GBViaX] = (workBuffer[(workBuffer[GWBufferTop]) + ((((workBuffer[GWSize]) - (workBuffer[GWBufferTop])) - index) + 2)]); @@ -5873,6 +6042,9 @@ loadBitBltFrom(sqInt bbObj) { if (loadBBFn == 0) { + + /* We need copyBits here so try to load it implicitly */ + if (!(initialiseModule())) { return 0; } @@ -5912,7 +6084,7 @@ cmSize = interpreterProxy->slotSizeOf(cmOop); cmBits = interpreterProxy->firstIndexableField(cmOop); } - if ((formOop & 1)) { + if (interpreterProxy->isIntegerObject(formOop)) { return interpreterProxy->primitiveFail(); } if (!(interpreterProxy->isPointers(formOop))) { @@ -6026,7 +6198,7 @@ transform = ((float *) (workBuffer + GWColorTransform)); workBuffer[GWHasColorTransform] = 0; okay = loadTransformFromintolength(transformOop, transform, 8); - if (!(okay)) { + if (!okay) { return 0; } workBuffer[GWHasColorTransform] = 1; @@ -6084,6 +6256,9 @@ sqInt y8; sqInt y9; + + /* Check if have anything to do at all */ + if ((leftFill == rightFill) && ((lineWidth == 0) || (lineFill == 0))) { @@ -6094,6 +6269,9 @@ index = segmentIndex * 6; if (pointsShort) { + + /* Load short points */ + /* begin loadPointShortAt:from: */ x0 = ((short) ((((short *) points))[index + 0])); /* begin loadPointShortAt:from: */ @@ -6119,6 +6297,9 @@ && (y0 == y1)) || ((x1 == x2) && (y1 == y2))) { + + /* We can use a line from x0/y0 to x2/y2 */ + if ((x0 == x2) && (y0 == y2)) { return null; @@ -6133,6 +6314,9 @@ /* begin point1Get */ point = ((int *) (workBuffer + GWPoint1)); if ((workBuffer[GWHasEdgeTransform]) != 0) { + + /* Note: AA adjustment is done in #transformPoint: for higher accuracy */ + /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ /* begin edgeTransform */ @@ -6143,6 +6327,9 @@ (((int *) point))[1] = y; } else { + + /* Multiply each component by aaLevel and add a half pixel */ + point[0] = (((point[0]) + (workBuffer[GWDestOffsetX])) * (workBuffer[GWAALevel])); point[1] = (((point[1]) + (workBuffer[GWDestOffsetY])) * (workBuffer[GWAALevel])); } @@ -6152,6 +6339,9 @@ /* begin point2Get */ point1 = ((int *) (workBuffer + GWPoint2)); if ((workBuffer[GWHasEdgeTransform]) != 0) { + + /* Note: AA adjustment is done in #transformPoint: for higher accuracy */ + /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ /* begin edgeTransform */ @@ -6162,6 +6352,9 @@ (((int *) point1))[1] = y3; } else { + + /* Multiply each component by aaLevel and add a half pixel */ + point1[0] = (((point1[0]) + (workBuffer[GWDestOffsetX])) * (workBuffer[GWAALevel])); point1[1] = (((point1[1]) + (workBuffer[GWDestOffsetY])) * (workBuffer[GWAALevel])); } @@ -6171,6 +6364,9 @@ /* begin point3Get */ point2 = ((int *) (workBuffer + GWPoint3)); if ((workBuffer[GWHasEdgeTransform]) != 0) { + + /* Note: AA adjustment is done in #transformPoint: for higher accuracy */ + /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ /* begin edgeTransform */ @@ -6181,6 +6377,9 @@ (((int *) point2))[1] = y4; } else { + + /* Multiply each component by aaLevel and add a half pixel */ + point2[0] = (((point2[0]) + (workBuffer[GWDestOffsetX])) * (workBuffer[GWAALevel])); point2[1] = (((point2[1]) + (workBuffer[GWDestOffsetY])) * (workBuffer[GWAALevel])); } @@ -6190,6 +6389,9 @@ /* begin point4Get */ point3 = ((int *) (workBuffer + GWPoint4)); if ((workBuffer[GWHasEdgeTransform]) != 0) { + + /* Note: AA adjustment is done in #transformPoint: for higher accuracy */ + /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ /* begin edgeTransform */ @@ -6200,6 +6402,9 @@ (((int *) point3))[1] = y5; } else { + + /* Multiply each component by aaLevel and add a half pixel */ + point3[0] = (((point3[0]) + (workBuffer[GWDestOffsetX])) * (workBuffer[GWAALevel])); point3[1] = (((point3[1]) + (workBuffer[GWDestOffsetY])) * (workBuffer[GWAALevel])); } @@ -6218,6 +6423,9 @@ /* begin point1Get */ point4 = ((int *) (workBuffer + GWPoint1)); if ((workBuffer[GWHasEdgeTransform]) != 0) { + + /* Note: AA adjustment is done in #transformPoint: for higher accuracy */ + /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ /* begin edgeTransform */ @@ -6228,6 +6436,9 @@ (((int *) point4))[1] = y6; } else { + + /* Multiply each component by aaLevel and add a half pixel */ + point4[0] = (((point4[0]) + (workBuffer[GWDestOffsetX])) * (workBuffer[GWAALevel])); point4[1] = (((point4[1]) + (workBuffer[GWDestOffsetY])) * (workBuffer[GWAALevel])); } @@ -6237,6 +6448,9 @@ /* begin point2Get */ point5 = ((int *) (workBuffer + GWPoint2)); if ((workBuffer[GWHasEdgeTransform]) != 0) { + + /* Note: AA adjustment is done in #transformPoint: for higher accuracy */ + /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ /* begin edgeTransform */ @@ -6247,6 +6461,9 @@ (((int *) point5))[1] = y7; } else { + + /* Multiply each component by aaLevel and add a half pixel */ + point5[0] = (((point5[0]) + (workBuffer[GWDestOffsetX])) * (workBuffer[GWAALevel])); point5[1] = (((point5[1]) + (workBuffer[GWDestOffsetY])) * (workBuffer[GWAALevel])); } @@ -6256,6 +6473,9 @@ /* begin point3Get */ point6 = ((int *) (workBuffer + GWPoint3)); if ((workBuffer[GWHasEdgeTransform]) != 0) { + + /* Note: AA adjustment is done in #transformPoint: for higher accuracy */ + /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ /* begin edgeTransform */ @@ -6266,6 +6486,9 @@ (((int *) point6))[1] = y8; } else { + + /* Multiply each component by aaLevel and add a half pixel */ + point6[0] = (((point6[0]) + (workBuffer[GWDestOffsetX])) * (workBuffer[GWAALevel])); point6[1] = (((point6[1]) + (workBuffer[GWDestOffsetY])) * (workBuffer[GWAALevel])); } @@ -6275,6 +6498,9 @@ /* begin point4Get */ point7 = ((int *) (workBuffer + GWPoint4)); if ((workBuffer[GWHasEdgeTransform]) != 0) { + + /* Note: AA adjustment is done in #transformPoint: for higher accuracy */ + /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ /* begin edgeTransform */ @@ -6285,6 +6511,9 @@ (((int *) point7))[1] = y9; } else { + + /* Multiply each component by aaLevel and add a half pixel */ + point7[0] = (((point7[0]) + (workBuffer[GWDestOffsetX])) * (workBuffer[GWAALevel])); point7[1] = (((point7[1]) + (workBuffer[GWDestOffsetY])) * (workBuffer[GWAALevel])); } @@ -6366,10 +6595,10 @@ leftLength = (rightLength = (widthLength = (lineFillLength = 1))); leftValue = (rightValue = (widthValue = (lineFillValue = 0))); for (i = 1; i <= nSegments; i += 1) { - if (((leftLength -= 1)) <= 0) { - /* Decrement current run length and load new stuff */ + /* Decrement current run length and load new stuff */ + if (((leftLength -= 1)) <= 0) { leftRun += 1; leftLength = ((usqInt) ((((int *) leftFills))[leftRun]) >> 16); leftValue = ((((int *) leftFills))[leftRun]) & 65535; @@ -6410,6 +6639,7 @@ if ((leftValue == rightValue) && ((widthValue == 0) || (lineFillValue == 0))) { + null; goto l1; } @@ -6417,6 +6647,9 @@ index = (i - 1) * 6; if (pointsShort) { + + /* Load short points */ + /* begin loadPointShortAt:from: */ x0 = ((short) ((((short *) points))[index + 0])); /* begin loadPointShortAt:from: */ @@ -6442,8 +6675,12 @@ && (y0 == y1)) || ((x1 == x2) && (y1 == y2))) { + + /* We can use a line from x0/y0 to x2/y2 */ + if ((x0 == x2) && (y0 == y2)) { + null; goto l1; } (point1Get())[0] = x0; @@ -6456,6 +6693,9 @@ /* begin point1Get */ point = ((int *) (workBuffer + GWPoint1)); if ((workBuffer[GWHasEdgeTransform]) != 0) { + + /* Note: AA adjustment is done in #transformPoint: for higher accuracy */ + /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ /* begin edgeTransform */ @@ -6466,6 +6706,9 @@ (((int *) point))[1] = y; } else { + + /* Multiply each component by aaLevel and add a half pixel */ + point[0] = (((point[0]) + (workBuffer[GWDestOffsetX])) * (workBuffer[GWAALevel])); point[1] = (((point[1]) + (workBuffer[GWDestOffsetY])) * (workBuffer[GWAALevel])); } @@ -6475,6 +6718,9 @@ /* begin point2Get */ point1 = ((int *) (workBuffer + GWPoint2)); if ((workBuffer[GWHasEdgeTransform]) != 0) { + + /* Note: AA adjustment is done in #transformPoint: for higher accuracy */ + /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ /* begin edgeTransform */ @@ -6485,6 +6731,9 @@ (((int *) point1))[1] = y3; } else { + + /* Multiply each component by aaLevel and add a half pixel */ + point1[0] = (((point1[0]) + (workBuffer[GWDestOffsetX])) * (workBuffer[GWAALevel])); point1[1] = (((point1[1]) + (workBuffer[GWDestOffsetY])) * (workBuffer[GWAALevel])); } @@ -6494,6 +6743,9 @@ /* begin point3Get */ point2 = ((int *) (workBuffer + GWPoint3)); if ((workBuffer[GWHasEdgeTransform]) != 0) { + + /* Note: AA adjustment is done in #transformPoint: for higher accuracy */ + /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ /* begin edgeTransform */ @@ -6504,6 +6756,9 @@ (((int *) point2))[1] = y4; } else { + + /* Multiply each component by aaLevel and add a half pixel */ + point2[0] = (((point2[0]) + (workBuffer[GWDestOffsetX])) * (workBuffer[GWAALevel])); point2[1] = (((point2[1]) + (workBuffer[GWDestOffsetY])) * (workBuffer[GWAALevel])); } @@ -6513,6 +6768,9 @@ /* begin point4Get */ point3 = ((int *) (workBuffer + GWPoint4)); if ((workBuffer[GWHasEdgeTransform]) != 0) { + + /* Note: AA adjustment is done in #transformPoint: for higher accuracy */ + /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ /* begin edgeTransform */ @@ -6523,6 +6781,9 @@ (((int *) point3))[1] = y5; } else { + + /* Multiply each component by aaLevel and add a half pixel */ + point3[0] = (((point3[0]) + (workBuffer[GWDestOffsetX])) * (workBuffer[GWAALevel])); point3[1] = (((point3[1]) + (workBuffer[GWDestOffsetY])) * (workBuffer[GWAALevel])); } @@ -6542,6 +6803,9 @@ /* begin point1Get */ point4 = ((int *) (workBuffer + GWPoint1)); if ((workBuffer[GWHasEdgeTransform]) != 0) { + + /* Note: AA adjustment is done in #transformPoint: for higher accuracy */ + /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ /* begin edgeTransform */ @@ -6552,6 +6816,9 @@ (((int *) point4))[1] = y6; } else { + + /* Multiply each component by aaLevel and add a half pixel */ + point4[0] = (((point4[0]) + (workBuffer[GWDestOffsetX])) * (workBuffer[GWAALevel])); point4[1] = (((point4[1]) + (workBuffer[GWDestOffsetY])) * (workBuffer[GWAALevel])); } @@ -6561,6 +6828,9 @@ /* begin point2Get */ point5 = ((int *) (workBuffer + GWPoint2)); if ((workBuffer[GWHasEdgeTransform]) != 0) { + + /* Note: AA adjustment is done in #transformPoint: for higher accuracy */ + /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ /* begin edgeTransform */ @@ -6571,6 +6841,9 @@ (((int *) point5))[1] = y7; } else { + + /* Multiply each component by aaLevel and add a half pixel */ + point5[0] = (((point5[0]) + (workBuffer[GWDestOffsetX])) * (workBuffer[GWAALevel])); point5[1] = (((point5[1]) + (workBuffer[GWDestOffsetY])) * (workBuffer[GWAALevel])); } @@ -6580,6 +6853,9 @@ /* begin point3Get */ point6 = ((int *) (workBuffer + GWPoint3)); if ((workBuffer[GWHasEdgeTransform]) != 0) { + + /* Note: AA adjustment is done in #transformPoint: for higher accuracy */ + /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ /* begin edgeTransform */ @@ -6590,6 +6866,9 @@ (((int *) point6))[1] = y8; } else { + + /* Multiply each component by aaLevel and add a half pixel */ + point6[0] = (((point6[0]) + (workBuffer[GWDestOffsetX])) * (workBuffer[GWAALevel])); point6[1] = (((point6[1]) + (workBuffer[GWDestOffsetY])) * (workBuffer[GWAALevel])); } @@ -6599,6 +6878,9 @@ /* begin point4Get */ point7 = ((int *) (workBuffer + GWPoint4)); if ((workBuffer[GWHasEdgeTransform]) != 0) { + + /* Note: AA adjustment is done in #transformPoint: for higher accuracy */ + /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ /* begin edgeTransform */ @@ -6609,6 +6891,9 @@ (((int *) point7))[1] = y9; } else { + + /* Multiply each component by aaLevel and add a half pixel */ + point7[0] = (((point7[0]) + (workBuffer[GWDestOffsetX])) * (workBuffer[GWAALevel])); point7[1] = (((point7[1]) + (workBuffer[GWDestOffsetY])) * (workBuffer[GWAALevel])); } @@ -6616,6 +6901,7 @@ segs = loadAndSubdivideBezierFromviatoisWide(point1Get(), point2Get(), point3Get(), (widthValue != 0) && (lineFillValue != 0)); if (engineStopped) { + null; goto l1; } loadWideBezierlineFillleftFillrightFilln(widthValue, lineFillValue, leftValue, rightValue, segs); @@ -6671,7 +6957,7 @@ if (interpreterProxy->failed()) { return null; } - if (!(okay)) { + if (!okay) { return 0; } workBuffer[GWHasEdgeTransform] = 1; @@ -6712,6 +6998,9 @@ point3[1] = ((point3[1]) + (point1[1])); /* begin transformPoint: */ if ((workBuffer[GWHasEdgeTransform]) != 0) { + + /* Note: AA adjustment is done in #transformPoint: for higher accuracy */ + /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ /* begin edgeTransform */ @@ -6722,11 +7011,17 @@ (((int *) point1))[1] = y; } else { + + /* Multiply each component by aaLevel and add a half pixel */ + point1[0] = (((point1[0]) + (workBuffer[GWDestOffsetX])) * (workBuffer[GWAALevel])); point1[1] = (((point1[1]) + (workBuffer[GWDestOffsetY])) * (workBuffer[GWAALevel])); } /* begin transformPoint: */ if ((workBuffer[GWHasEdgeTransform]) != 0) { + + /* Note: AA adjustment is done in #transformPoint: for higher accuracy */ + /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ /* begin edgeTransform */ @@ -6737,11 +7032,17 @@ (((int *) point2))[1] = y1; } else { + + /* Multiply each component by aaLevel and add a half pixel */ + point2[0] = (((point2[0]) + (workBuffer[GWDestOffsetX])) * (workBuffer[GWAALevel])); point2[1] = (((point2[1]) + (workBuffer[GWDestOffsetY])) * (workBuffer[GWAALevel])); } /* begin transformPoint: */ if ((workBuffer[GWHasEdgeTransform]) != 0) { + + /* Note: AA adjustment is done in #transformPoint: for higher accuracy */ + /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ /* begin edgeTransform */ @@ -6752,6 +7053,9 @@ (((int *) point3))[1] = y2; } else { + + /* Multiply each component by aaLevel and add a half pixel */ + point3[0] = (((point3[0]) + (workBuffer[GWDestOffsetX])) * (workBuffer[GWAALevel])); point3[1] = (((point3[1]) + (workBuffer[GWDestOffsetY])) * (workBuffer[GWAALevel])); } @@ -6810,7 +7114,7 @@ formArray = arrayOop; for (i = 0; i <= ((interpreterProxy->slotSizeOf(formArray)) - 1); i += 1) { formOop = interpreterProxy->fetchPointerofObject(i, formArray); - if ((formOop & 1)) { + if (interpreterProxy->isIntegerObject(formOop)) { return 0; } if (!(interpreterProxy->isPointers(formOop))) { @@ -6954,7 +7258,7 @@ x1 = ((sqInt)((((circleCosTable())[(seg * 2) + 1]) * (((double) w ))) + cx)); /* NOTE: The intermediate point is the point ON the curve - and not yet the control point (which is OFF the curve) */ + and not yet the control point (which is OFF the curve) */ y1 = ((sqInt)((((circleSinTable())[(seg * 2) + 1]) * (((double) h ))) + cy)); x1 = (x1 * 2) - (((sqInt) (x0 + x2) >> 1)); @@ -7004,6 +7308,9 @@ /* begin point1Get */ point = ((int *) (workBuffer + GWPoint1)); if ((workBuffer[GWHasEdgeTransform]) != 0) { + + /* Note: AA adjustment is done in #transformPoint: for higher accuracy */ + /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ /* begin edgeTransform */ @@ -7014,6 +7321,9 @@ (((int *) point))[1] = y; } else { + + /* Multiply each component by aaLevel and add a half pixel */ + point[0] = (((point[0]) + (workBuffer[GWDestOffsetX])) * (workBuffer[GWAALevel])); point[1] = (((point[1]) + (workBuffer[GWDestOffsetY])) * (workBuffer[GWAALevel])); } @@ -7023,6 +7333,9 @@ /* begin point2Get */ point1 = ((int *) (workBuffer + GWPoint2)); if ((workBuffer[GWHasEdgeTransform]) != 0) { + + /* Note: AA adjustment is done in #transformPoint: for higher accuracy */ + /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ /* begin edgeTransform */ @@ -7033,6 +7346,9 @@ (((int *) point1))[1] = y1; } else { + + /* Multiply each component by aaLevel and add a half pixel */ + point1[0] = (((point1[0]) + (workBuffer[GWDestOffsetX])) * (workBuffer[GWAALevel])); point1[1] = (((point1[1]) + (workBuffer[GWDestOffsetY])) * (workBuffer[GWAALevel])); } @@ -7042,6 +7358,9 @@ /* begin point3Get */ point2 = ((int *) (workBuffer + GWPoint3)); if ((workBuffer[GWHasEdgeTransform]) != 0) { + + /* Note: AA adjustment is done in #transformPoint: for higher accuracy */ + /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ /* begin edgeTransform */ @@ -7052,6 +7371,9 @@ (((int *) point2))[1] = y2; } else { + + /* Multiply each component by aaLevel and add a half pixel */ + point2[0] = (((point2[0]) + (workBuffer[GWDestOffsetX])) * (workBuffer[GWAALevel])); point2[1] = (((point2[1]) + (workBuffer[GWDestOffsetY])) * (workBuffer[GWAALevel])); } @@ -7061,6 +7383,9 @@ /* begin point4Get */ point3 = ((int *) (workBuffer + GWPoint4)); if ((workBuffer[GWHasEdgeTransform]) != 0) { + + /* Note: AA adjustment is done in #transformPoint: for higher accuracy */ + /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ /* begin edgeTransform */ @@ -7071,6 +7396,9 @@ (((int *) point3))[1] = y3; } else { + + /* Multiply each component by aaLevel and add a half pixel */ + point3[0] = (((point3[0]) + (workBuffer[GWDestOffsetX])) * (workBuffer[GWAALevel])); point3[1] = (((point3[1]) + (workBuffer[GWDestOffsetY])) * (workBuffer[GWAALevel])); } @@ -7117,23 +7445,23 @@ return interpreterProxy->primitiveFail(); } value = interpreterProxy->fetchPointerofObject(0, pointOop); - if (!(((value & 1)) + if (!((interpreterProxy->isIntegerObject(value)) || (interpreterProxy->isFloatObject(value)))) { return interpreterProxy->primitiveFail(); } - if ((value & 1)) { - pointArray[0] = ((value >> 1)); + if (interpreterProxy->isIntegerObject(value)) { + pointArray[0] = (interpreterProxy->integerValueOf(value)); } else { pointArray[0] = (((sqInt)(interpreterProxy->floatValueOf(value)))); } value = interpreterProxy->fetchPointerofObject(1, pointOop); - if (!(((value & 1)) + if (!((interpreterProxy->isIntegerObject(value)) || (interpreterProxy->isFloatObject(value)))) { return interpreterProxy->primitiveFail(); } - if ((value & 1)) { - pointArray[1] = ((value >> 1)); + if (interpreterProxy->isIntegerObject(value)) { + pointArray[1] = (interpreterProxy->integerValueOf(value)); } else { pointArray[1] = (((sqInt)(interpreterProxy->floatValueOf(value)))); @@ -7196,6 +7524,9 @@ /* begin point1Get */ point = ((int *) (workBuffer + GWPoint1)); if ((workBuffer[GWHasEdgeTransform]) != 0) { + + /* Note: AA adjustment is done in #transformPoint: for higher accuracy */ + /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ /* begin edgeTransform */ @@ -7206,6 +7537,9 @@ (((int *) point))[1] = y; } else { + + /* Multiply each component by aaLevel and add a half pixel */ + point[0] = (((point[0]) + (workBuffer[GWDestOffsetX])) * (workBuffer[GWAALevel])); point[1] = (((point[1]) + (workBuffer[GWDestOffsetY])) * (workBuffer[GWAALevel])); } @@ -7215,6 +7549,9 @@ /* begin point2Get */ point1 = ((int *) (workBuffer + GWPoint2)); if ((workBuffer[GWHasEdgeTransform]) != 0) { + + /* Note: AA adjustment is done in #transformPoint: for higher accuracy */ + /* begin transformPoint:into: */ /* begin transformPointX:y:into: */ /* begin edgeTransform */ @@ -7225,6 +7562,9 @@ (((int *) point1))[1] = y2; } else { + + /* Multiply each component by aaLevel and add a half pixel */ + point1[0] = (((point1[0]) + (workBuffer[GWDestOffsetX])) * (workBuffer[GWAALevel])); @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.223.mcz
by commits＠source.squeak.org 27 Nov '12

27 Nov '12

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.223.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.223 Author: eem Time: 26 November 2012, 5:07:25.123 pm UUID: 62151b21-ad34-403a-b5a0-63d83c023cdd Ancestors: VMMaker.oscog-eem.222 Make sure primitiveIndexOfMethod:header: is inlined as was the older primitiveIndexOfMethodHeader:. Add more info to logging and remove ceCheckForInterrupts's false dependency on interpreter vars. =============== Diff against VMMaker.oscog-eem.222 =============== Item was changed: ----- Method: CoInterpreter>>ceCheckForInterrupts (in category 'trampolines') ----- ceCheckForInterrupts <api> | switched | + self cCode: [] inSmalltalk: - self cCode: '' inSmalltalk: [self maybeCheckStackDepth: 0 sp: stackPointer pc: instructionPointer]. switched := self checkForEventsMayContextSwitch: true. self returnToExecutive: false postContextSwitch: switched! Item was changed: ----- Method: StackInterpreter>>primitiveIndexOfMethod:header: (in category 'compiled methods') ----- primitiveIndexOfMethod: theMethod header: methodHeader "Note: With the Squeak V0 format we now have 10 bits of primitive index, but they are in two places for temporary backward compatibility. The time to unpack is negligible, since the derived primitive function pointer is stored in the method cache. With the new format we assume a 3-byte CallPrimitive with a little-endian 16-bit primitive index." <api> + <inline: true> ^self cppIf: MULTIPLEBYTECODESETS ifTrue: [(self headerIndicatesAlternateBytecodeSet: methodHeader) ifTrue: [(self alternateHeaderHasPrimitiveFlag: methodHeader) ifTrue: [| firstBytecode | firstBytecode := self firstBytecodeOfAlternateHeader: methodHeader method: theMethod. (objectMemory byteAt: firstBytecode + 1) + ((objectMemory byteAt: firstBytecode + 2) << 8)] ifFalse: [0]] ifFalse: [| primBits | primBits := methodHeader >> 1. (primBits bitAnd: 16r1FF) + (primBits >> 19 bitAnd: 16r200)]] ifFalse: [| primBits | primBits := methodHeader >> 1. (primBits bitAnd: 16r1FF) + (primBits >> 19 bitAnd: 16r200)]! Item was changed: ----- Method: VMMaker>>generateEntire (in category 'generate sources') ----- generateEntire "Generate the interp, internal plugins and exports as well as the external plugins. If this comes from a generator, log it for convenience." (thisContext findContextSuchThat: [:ctxt| ctxt selector == #generateConfiguration]) ifNotNil: [:root| (thisContext findContextSuchThat: [:ctxt| ctxt sender == root]) ifNotNil: [:generator| + logger nextPutAll: (generator selector copyReplaceAll: 'generate' with: ''). + interpreterClassName ifNotNil: [logger space; nextPutAll: interpreterClassName]. + logger cr; flush]]. - logger - nextPutAll: (generator selector copyReplaceAll: 'generate' with: ''); - cr; - flush]]. self generateMainVM. self generateExternalPlugins!

1 0

[Vm-dev] OSProcessPlugin: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.36.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 27 Nov '12

27 Nov '12

Eliot Miranda uploaded a new version of VMConstruction-Plugins-OSProcessPlugin to project OSProcessPlugin: http://www.squeaksource.com/OSProcessPlugin/VMConstruction-Plugins-OSProces… ==================== Summary ==================== Name: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.36 Author: eem Time: 26 November 2012, 3:43:21 am UUID: 8e94cb6a-a225-49da-ba8a-2a71cc790da7 Ancestors: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.35 Fix some inlining by replacing cCode: uses.

1 0

VM Maker: VMMaker.oscog-eem.222.mcz
by commits＠source.squeak.org 27 Nov '12

27 Nov '12

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.222.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.222 Author: eem Time: 26 November 2012, 4:04:40.806 pm UUID: 9255d122-7216-4700-8ead-493416ce0cf6 Ancestors: VMMaker.oscog-eem.221 <blush>oops</blush> =============== Diff against VMMaker.oscog-eem.221 =============== Item was changed: ----- Method: VMMaker>>generateEntire (in category 'generate sources') ----- generateEntire "Generate the interp, internal plugins and exports as well as the external plugins. If this comes from a generator, log it for convenience." (thisContext findContextSuchThat: [:ctxt| ctxt selector == #generateConfiguration]) ifNotNil: [:root| (thisContext findContextSuchThat: [:ctxt| ctxt sender == root]) ifNotNil: [:generator| logger nextPutAll: (generator selector copyReplaceAll: 'generate' with: ''); + cr; flush]]. self generateMainVM. self generateExternalPlugins!

1 0

VM Maker: VMMaker.oscog-eem.221.mcz
by commits＠source.squeak.org 27 Nov '12

27 Nov '12

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.221.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.221 Author: eem Time: 26 November 2012, 4:02:55.678 pm UUID: 6154db02-9e04-4941-88ca-8201d7713110 Ancestors: VMMaker.oscog-eem.220 Slang: Write the generator to the transcript to help remember what's been done. =============== Diff against VMMaker.oscog-eem.220 =============== Item was changed: ----- Method: VMMaker>>generateEntire (in category 'generate sources') ----- generateEntire + "Generate the interp, internal plugins and exports as well as the external plugins. + If this comes from a generator, log it for convenience." + (thisContext findContextSuchThat: [:ctxt| ctxt selector == #generateConfiguration]) ifNotNil: + [:root| + (thisContext findContextSuchThat: [:ctxt| ctxt sender == root]) ifNotNil: + [:generator| + logger + nextPutAll: (generator selector copyReplaceAll: 'generate' with: ''); + flush]]. - "generate the interp, internal plugins and exports as well as the external plugins" - self generateMainVM. + self generateExternalPlugins! - self generateExternalPlugins. - !

1 0

VM Maker: Cog-eem.56.mcz
by commits＠source.squeak.org 27 Nov '12

27 Nov '12

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.56.mcz ==================== Summary ==================== Name: Cog-eem.56 Author: eem Time: 26 November 2012, 3:44:48.674 pm UUID: 8beb4f67-65f8-48a3-89f8-dcfb5311613c Ancestors: Cog-lw.55 Update Eliot's Type Checker to use willPushNil. Premature, but I'll forget otherwise and this code is essentially dormant. =============== Diff against Cog-lw.55 =============== Item was changed: ----- Method: ETC>>pushClosureCopyNumCopiedValues:numArgs:blockSize: (in category 'instruction decoding') ----- pushClosureCopyNumCopiedValues: numCopied numArgs: numArgs blockSize: blockSize "Push Closure bytecode. Either compute the end of the block if this is the block we're analysing, or skip it, adjusting the stack as appropriate." | blockClosure j | blockEndStack addLast: blockEnd. blockEnd := scanner pc + blockSize. contextStack addLast: currentContext. currentContext pc: scanner pc; pushClosureCopyNumCopiedValues: numCopied numArgs: numArgs blockSize: blockSize. blockClosure := currentContext top. currentContext := blockClosure asContext. 1 to: numArgs do: [:i| currentContext push: 'blkarg', i printString]. 1 to: numCopied do: [:i| currentContext push: (blockClosure at: i)]. j := numArgs + numCopied. + [scanner willPushNil] whileTrue: - [scanner nextByte = ParseNode pushNilCode] whileTrue: [scanner interpretNextInstructionFor: self. currentContext at: currentContext stackPtr put: 'blktmp', (j := j + 1) printString] "ETC sendsForMethod: (ETC compiledMethodAt: #pushClosureCopyNumCopiedValues:numArgs:blockSize:)"!

1 0

VM Maker: VMMaker.oscog-eem.220.mcz
by commits＠source.squeak.org 27 Nov '12

27 Nov '12

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.220.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.220 Author: eem Time: 26 November 2012, 3:30:47.084 pm UUID: 47ddca03-a770-4fe1-8ac8-ca9ecff907d3 Ancestors: VMMaker.oscog-eem.219 Slang: Deal with ^self's when inlining e.g. ADPCMCodec>>nextBits:put:. Don't coerce results if return type is void. Make CCodeGenerator>>addMethodsForPrimitives: use compileToTMethodSelector:in: for creating TMethods. Fix a bug in shift generation when casting a type that doesn't include a variable name. Add support for asUnsignedLong cast (longs being guaranteed to be large enough to contain a pointer). Make external plugin generation log only when pliugin is generated. Do not elide final ^self if it is explicit. Plugins: Fix some warnings. Cogit: Rename jumpTargetAt: to the more accurate jumpTargetPCAt:. =============== Diff against VMMaker.oscog-eem.219 =============== Item was changed: ----- Method: CCodeGenerator>>addMethodsForPrimitives: (in category 'public') ----- addMethodsForPrimitives: classAndSelectorList | verbose | + verbose := false. + classAndSelectorList do: + [:classAndSelector | | aClass selector meth | + aClass := Smalltalk at: classAndSelector first. + selector := classAndSelector last. - classAndSelectorList do: - [:classAndSelector | | aClass sel meth source | - aClass := Smalltalk at: (classAndSelector at: 1). self addAllClassVarsFor: aClass. "TPR - should pool vars also be added here?" + "compile the method source and convert to a suitable translation method. + find the method in either the class or the metaclass" + meth := self + compileToTMethodSelector: selector + in: ((aClass includesSelector: selector) + ifTrue: [aClass] + ifFalse: [aClass class]). - "find the method in either the class or the metaclass" - sel := classAndSelector at: 2. - source := (aClass includesSelector: sel) - ifTrue: [aClass sourceCodeAt: sel] - ifFalse: [aClass class sourceCodeAt: sel]. - - "compile the method source and convert to a suitable translation - method " - meth := (Compiler new - parse: source - in: aClass - notifying: nil) - asTranslationMethodOfClass: self translationMethodClass. - - (aClass includesSelector: sel) - ifTrue: [meth definingClass: aClass] - ifFalse: [meth definingClass: aClass class]. meth primitive > 0 ifTrue:[meth preparePrimitiveName]. "for old-style array accessing: meth covertToZeroBasedArrayReferences." meth replaceSizeMessages. self addMethod: meth]. - "method preparation" - verbose := false. self prepareMethods. verbose ifTrue: [self printUnboundCallWarnings. self printUnboundVariableReferenceWarnings. logger cr]. "code generation" self doInlining: true. methods do:[:m| "if this method is supposed to be a primitive (rather than a helper routine), add assorted prolog and epilog items" m primitive > 0 ifTrue: [m preparePrimitivePrologue]].! Item was changed: ----- Method: CCodeGenerator>>emitCConstantsOn: (in category 'C code generator') ----- emitCConstantsOn: aStream "Store the global variable declarations on the given stream." | unused constList | unused := constants keys asSet. + "Don't generate any defines for the externally defined constants, + STACKVM, COGVM, COGMTVM et al, unless they're actuaslly used." + (VMClass class>>#initializeMiscConstantsWith:) literalsDo: + [:lit| + (lit isVariableBinding and: [lit key isString]) ifTrue: + [unused add: lit key]]. methods do: [:meth| meth parseTree nodesDo: [:n| n isConstant ifTrue: [unused remove: n name ifAbsent: []]]]. unused copy do: [:const| (variableDeclarations anySatisfy: [:value| value includesSubString: const]) ifTrue: [unused remove: const ifAbsent: []]]. - "Don't generate any defines for the externally defined constants, STACKVM, COGVM, COGMTVM et al." - (VMClass class>>#initializeMiscConstantsWith:) literalsDo: - [:lit| - lit isVariableBinding ifTrue: - [unused add: lit key]]. unused remove: #BytesPerWord ifAbsent: []. "force inclusion of BytesPerWord declaration" + constList := constants keys reject: [:any| unused includes: any]. - constList := constants keys reject:[:any| unused includes: any]. aStream cr; nextPutAll: '/*** Constants ***/'; cr. (self sortStrings: constList) do: [:varName| | node default value | node := constants at: varName. node name isEmpty ifFalse: ["Allow the class to provide an alternative definition, either of just the value or the whole shebang" default := self cLiteralFor: node value name: varName. value := vmClass ifNotNil: [(vmClass specialValueForConstant: node name default: default) ifNotNil: [:specialDef| specialDef] ifNil: [default]] ifNil: [default]. value first ~= $# ifTrue: [aStream nextPutAll: '#define '; nextPutAll: node name; space]. aStream nextPutAll: value; cr]]. aStream cr! Item was added: + ----- Method: CCodeGenerator>>generateAsUnsignedLong:on:indent: (in category 'C translation') ----- + generateAsUnsignedLong: msgNode on: aStream indent: level + "Generate the C code for this message onto the given stream." + + aStream nextPutAll:'((unsigned long)'. + self emitCExpression: msgNode receiver on: aStream. + aStream nextPut: $)! Item was changed: ----- Method: CCodeGenerator>>generateShiftRight:on:indent: (in category 'C translation') ----- generateShiftRight: msgNode on: aStream indent: level "Generate the C code for this message onto the given stream." | decl | "If the variable is a 64-bit type then don't cast it to usqInt (typically a 32-bit type)" (msgNode receiver isVariable and: [(decl := self typeOfVariable: msgNode receiver name) notNil and: [#('usqLong' 'sqLong' 'unsigned long long' 'long long' 'unsigned __int64' '__int64') anySatisfy: [:type| decl beginsWith: type]]]) ifTrue: ["If not unsigned cast it to unsigned." (decl first = $u) ifFalse: [aStream nextPutAll: '((unsigned '; + nextPutAll: ((decl endsWith: msgNode receiver name) + ifTrue: [decl allButLast: msgNode receiver name size] + ifFalse: [decl]); - nextPutAll: (decl allButLast: msgNode receiver name size); nextPut: $)]. self emitCExpression: msgNode receiver on: aStream. (decl first = $u) ifFalse: [aStream nextPut: $)]] ifFalse: [aStream nextPutAll: '((usqInt) '. self emitCExpression: msgNode receiver on: aStream. aStream nextPut: $)]. aStream nextPutAll: ' >> '. self emitCExpression: msgNode args first on: aStream! Item was changed: ----- Method: CCodeGenerator>>initializeCTranslationDictionary (in category 'C translation') ----- initializeCTranslationDictionary "Initialize the dictionary mapping message names to actions for C code generation." | pairs | translationDict := Dictionary new: 200. pairs := #( #& #generateAnd:on:indent: #| #generateOr:on:indent: #and: #generateSequentialAnd:on:indent: #or: #generateSequentialOr:on:indent: #not #generateNot:on:indent: #+ #generatePlus:on:indent: #- #generateMinus:on:indent: #negated #generateNegated:on:indent: #* #generateTimes:on:indent: #/ #generateDivide:on:indent: #// #generateDivide:on:indent: #\\ #generateModulo:on:indent: #<< #generateShiftLeft:on:indent: #>> #generateShiftRight:on:indent: #min: #generateMin:on:indent: #max: #generateMax:on:indent: #between:and: #generateBetweenAnd:on:indent: #bitAnd: #generateBitAnd:on:indent: #bitOr: #generateBitOr:on:indent: #bitXor: #generateBitXor:on:indent: #bitShift: #generateBitShift:on:indent: #signedBitShift: #generateSignedBitShift:on:indent: #bitInvert32 #generateBitInvert32:on:indent: #bitClear: #generateBitClear:on:indent: #< #generateLessThan:on:indent: #<= #generateLessThanOrEqual:on:indent: #= #generateEqual:on:indent: #> #generateGreaterThan:on:indent: #>= #generateGreaterThanOrEqual:on:indent: #~= #generateNotEqual:on:indent: #== #generateEqual:on:indent: #~~ #generateNotEqual:on:indent: #isNil #generateIsNil:on:indent: #notNil #generateNotNil:on:indent: #whileTrue: #generateWhileTrue:on:indent: #whileFalse: #generateWhileFalse:on:indent: #whileTrue #generateDoWhileTrue:on:indent: #whileFalse #generateDoWhileFalse:on:indent: #to:do: #generateToDo:on:indent: #to:by:do: #generateToByDo:on:indent: #repeat #generateRepeat:on:indent: #ifTrue: #generateIfTrue:on:indent: #ifFalse: #generateIfFalse:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalse:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrue:on:indent: #ifNotNil: #generateIfNotNil:on:indent: #ifNil: #generateIfNil:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNil:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNil:on:indent: #at: #generateAt:on:indent: #at:put: #generateAtPut:on:indent: #basicAt: #generateAt:on:indent: #basicAt:put: #generateAtPut:on:indent: #integerValueOf: #generateIntegerValueOf:on:indent: #integerObjectOf: #generateIntegerObjectOf:on:indent: #isIntegerObject: #generateIsIntegerObject:on:indent: #cCode: #generateInlineCCode:on:indent: #cCode:inSmalltalk: #generateInlineCCode:on:indent: #cPreprocessorDirective: #generateInlineCPreprocessorDirective:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElse:on:indent: #cppIf:ifTrue: #generateInlineCppIfElse:on:indent: #cCoerce:to: #generateCCoercion:on:indent: #cCoerceSimple:to: #generateCCoercion:on:indent: #addressOf: #generateAddressOf:on:indent: #signedIntFromLong #generateSignedIntFromLong:on:indent: #signedIntToLong #generateSignedIntToLong:on:indent: #signedIntFromShort #generateSignedIntFromShort:on:indent: #signedIntToShort #generateSignedIntToShort:on:indent: #preIncrement #generatePreIncrement:on:indent: #preDecrement #generatePreDecrement:on:indent: #inline: #generateInlineDirective:on:indent: #asFloat #generateAsFloat:on:indent: #asInteger #generateAsInteger:on:indent: #asUnsignedInteger #generateAsUnsignedInteger:on:indent: + #asUnsignedLong #generateAsUnsignedLong:on:indent: #asSymbol #generateAsSymbol:on:indent: #anyMask: #generateBitAnd:on:indent: #raisedTo: #generateRaisedTo:on:indent: #touch: #generateTouch:on:indent: #bytesPerWord #generateBytesPerWord:on:indent: #baseHeaderSize #generateBaseHeaderSize:on:indent: #sharedCodeNamed:inCase: #generateSharedCodeDirective:on:indent: #perform: #generatePerform:on:indent: #perform:with: #generatePerform:on:indent: #perform:with:with: #generatePerform:on:indent: #perform:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with:with: #generatePerform:on:indent: #value #generateValue:on:indent: #value: #generateValue:on:indent: #value:value: #generateValue:on:indent: #shouldNotImplement #generateSmalltalkMetaError:on:indent: #shouldBeImplemented #generateSmalltalkMetaError:on:indent: ). 1 to: pairs size by: 2 do: [:i | translationDict at: (pairs at: i) put: (pairs at: i + 1)]. pairs := #( #ifTrue: #generateIfTrueAsArgument:on:indent: #ifFalse: #generateIfFalseAsArgument:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalseAsArgument:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrueAsArgument:on:indent: #ifNotNil: #generateIfNotNilAsArgument:on:indent: #ifNil: #generateIfNilAsArgument:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNilAsArgument:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNilAsArgument:on:indent: #cCode: #generateInlineCCodeAsArgument:on:indent: #cCode:inSmalltalk: #generateInlineCCodeAsArgument:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElseAsArgument:on:indent: #cppIf:ifTrue: #generateInlineCppIfElseAsArgument:on:indent: ). asArgumentTranslationDict := Dictionary new: 8. 1 to: pairs size by: 2 do: [:i | asArgumentTranslationDict at: (pairs at: i) put: (pairs at: i + 1)]. ! Item was removed: - ----- Method: CogIA32Compiler>>jumpTargetAt: (in category 'disassembly') ----- - jumpTargetAt: pc - | size byte offset | - size := self instructionSizeAt: pc. - size = 2 - ifTrue: - [byte := objectMemory byteAt: pc + 1. - offset := (byte bitAnd: 16r80) = 0 ifTrue: [byte] ifFalse: [byte - 256]] - ifFalse: - [byte := objectMemory byteAt: pc + size - 1. - offset := (byte bitAnd: 16r80) = 0 ifTrue: [byte] ifFalse: [byte - 256]. - offset := offset << 8 + (objectMemory byteAt: pc + size - 2). - offset := offset << 8 + (objectMemory byteAt: pc + size - 3). - offset := offset << 8 + (objectMemory byteAt: pc + size - 4)]. - ^pc + size + offset! Item was added: + ----- Method: CogIA32Compiler>>jumpTargetPCAt: (in category 'disassembly') ----- + jumpTargetPCAt: pc + <returnTypeC: #sqInt> + | size byte offset | + size := self instructionSizeAt: pc. + size = 2 + ifTrue: + [byte := objectMemory byteAt: pc + 1. + offset := (byte bitAnd: 16r80) = 0 ifTrue: [byte] ifFalse: [byte - 256]] + ifFalse: + [byte := objectMemory byteAt: pc + size - 1. + offset := (byte bitAnd: 16r80) = 0 ifTrue: [byte] ifFalse: [byte - 256]. + offset := offset << 8 + (objectMemory byteAt: pc + size - 2). + offset := offset << 8 + (objectMemory byteAt: pc + size - 3). + offset := offset << 8 + (objectMemory byteAt: pc + size - 4)]. + ^pc + size + offset! Item was changed: ----- Method: Cogit>>blockDispatchFor:perform:arg: (in category 'disassembly') ----- blockDispatchFor: cogMethod perform: quaternaryFunction arg: arg "Evaluate quaternaryFunction with the block start mcpc, prev pc in block dispatch, current pc in block dispatch and the supplied arg for each entry in the block dispatch. If the function answers non-zero answer the value it answered. Used for disassembling blockDispatch." <doNotGenerate> | pc prevpc blockEntry end targetpc result | cogMethod blockEntryOffset = 0 ifTrue: [^nil]. blockEntry := cogMethod blockEntryOffset + cogMethod asInteger. prevpc := pc := blockEntry. end := (self mapEndFor: cogMethod) - 1. [pc < end] whileTrue: [(backEnd isJumpAt: pc) ifTrue: + [targetpc := backEnd jumpTargetPCAt: pc. - [targetpc := backEnd jumpTargetAt: pc. pc := pc + (backEnd instructionSizeAt: pc). targetpc < blockEntry ifTrue: [result := self perform: quaternaryFunction with: targetpc with: prevpc with: pc with: arg. result ~= 0 ifTrue: [^result]. prevpc := pc]] ifFalse: [pc := pc + (backEnd instructionSizeAt: pc)]]. ^0! Item was changed: ----- Method: Cogit>>blockDispatchTargetsFor:perform:arg: (in category 'method map') ----- blockDispatchTargetsFor: cogMethod perform: binaryFunction arg: arg "Evaluate binaryFunction with the block start mcpc and supplied arg for each entry in the block dispatch. If the function answers non-zero answer the value it answered. Used to update back-references to the home method in compaction." <var: #cogMethod type: #'CogMethod *'> <var: #binaryFunction declareC: 'usqInt (*binaryFunction)(sqInt mcpc, sqInt arg)'> | pc blockEntry end targetpc result | cogMethod blockEntryOffset = 0 ifTrue: [^nil]. blockEntry := cogMethod blockEntryOffset + cogMethod asInteger. pc := blockEntry. end := (self mapEndFor: cogMethod) - 1. [pc < end] whileTrue: [(backEnd isJumpAt: pc) ifTrue: + [targetpc := backEnd jumpTargetPCAt: pc. - [targetpc := backEnd jumpTargetAt: pc. targetpc < blockEntry ifTrue: [result := self perform: binaryFunction with: targetpc with: arg. result ~= 0 ifTrue: [^result]]]. pc := pc + (backEnd instructionSizeAt: pc)]. ^0! Item was changed: ----- Method: Cogit>>codeRangesFor: (in category 'disassembly') ----- codeRangesFor: cogMethod "Answer a sequence of ranges of code for the main method and all of the blocks in a CogMethod. N.B. These are in order of block dispatch, _not_ necessarily address order in the method." <doNotGenerate> | pc end blockEntry starts | cogMethod cmType = CMClosedPIC ifTrue: [end := (self addressOfEndOfCase: cogMethod cPICNumCases - 1 inCPIC: cogMethod) + cPICEndSize. ^{ CogCodeRange from: cogMethod asInteger + (self sizeof: CogMethod) to: end cogMethod: cogMethod startpc: nil }]. end := (self mapEndFor: cogMethod) - 1. cogMethod blockEntryOffset = 0 ifTrue: [^{ CogCodeRange from: cogMethod asInteger + (self sizeof: CogMethod) to: end cogMethod: cogMethod startpc: (coInterpreter startPCOfMethodHeader: cogMethod methodHeader) }]. pc := blockEntry := cogMethod blockEntryOffset + cogMethod asInteger. starts := OrderedCollection with: cogMethod. [pc < end] whileTrue: [| targetpc | targetpc := blockEntry. (backEnd isJumpAt: pc) ifTrue: + [targetpc := backEnd jumpTargetPCAt: pc. - [targetpc := backEnd jumpTargetAt: pc. targetpc < blockEntry ifTrue: [starts add: (self cCoerceSimple: targetpc - (self sizeof: CogBlockMethod) to: #'CogBlockMethod *')]]. pc := pc + (backEnd instructionSizeAt: pc)]. starts := starts asSortedCollection. ^(1 to: starts size + 1) collect: [:i| | cogSubMethod nextpc | i <= starts size ifTrue: [cogSubMethod := starts at: i. nextpc := i < starts size ifTrue: [(starts at: i + 1) address] ifFalse: [end]. CogCodeRange from: cogSubMethod address + (self sizeof: cogSubMethod) to: nextpc - 1 cogMethod: cogSubMethod startpc: (i = 1 ifTrue: [coInterpreter startPCOfMethodHeader: cogMethod methodHeader] ifFalse: [cogSubMethod startpc])] ifFalse: [CogCodeRange from: blockEntry to: end]]! Item was changed: ----- Method: FilePlugin>>primitiveFileStdioHandles (in category 'file primitives') ----- primitiveFileStdioHandles "Answer an Array of file handles for standard in, standard out and standard error, with nil in entries that are unvailable, e.g. because the platform does not provide standard error, etc. Fail if there are no standard i/o facilities on the platform or if the security plugin denies access or if memory runs out." | fileRecords result validMask | <export: true> <var: 'fileRecords' declareC: 'SQFile fileRecords[3]'> sHFAfn ~= 0 ifTrue: [(self cCode: ' ((sqInt (*)(void))sHFAfn)()' inSmalltalk: [true]) ifFalse: [^interpreterProxy primitiveFailFor: PrimErrUnsupported]]. self cCode: '' inSmalltalk: [fileRecords := Array new: 3]. + validMask := self sqFileStdioHandlesInto: fileRecords. - validMask := self sqFileStdioHandlesInto: (self addressOf: fileRecords). validMask = 0 ifTrue: [^interpreterProxy primitiveFailFor: PrimErrUnsupported]. result := interpreterProxy instantiateClass: interpreterProxy classArray indexableSize: 3. result = nil ifTrue: [^interpreterProxy primitiveFailFor: PrimErrNoMemory]. interpreterProxy pushRemappableOop: result. 0 to: 2 do: [:index| (validMask bitAnd: (1 << index)) ~= 0 ifTrue: [result := interpreterProxy instantiateClass: interpreterProxy classByteArray indexableSize: self fileRecordSize. result = nil ifTrue: [interpreterProxy popRemappableOop. ^interpreterProxy primitiveFailFor: PrimErrNoMemory]. interpreterProxy storePointer: index ofObject: interpreterProxy topRemappableOop withValue: result. self cCode: [self mem: (interpreterProxy firstIndexableField: result) cp: (self addressOf: (fileRecords at: index)) y: self fileRecordSize] inSmalltalk: [(interpreterProxy firstIndexableField: result) unitSize: BytesPerWord; at: 0 put: (fileRecords at: index + 1)]]]. "In the threaded VM ensure the handles are old, so that sqFileReadIntoAt is unaffected by incremental GCs. See platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c." self cppIf: COGMTVM ifTrue: [interpreterProxy fullGC]. result := interpreterProxy popRemappableOop. interpreterProxy pop: 1 thenPush: result! Item was changed: ----- Method: TMethod>>exitVar:label: (in category 'inlining') ----- exitVar: exitVar label: exitLabel "Replace each return statement in this method with an assignment to the exit variable followed by either a return or a goto to the given label. Answer if a goto was generated." "Optimization: If exitVar is nil, the return value of the inlined method is not being used, so don't add the assignment statement." + | labelUsed map eliminateReturnSelfs | - | labelUsed map | labelUsed := false. map := Dictionary new. + "Conceivably one might ^self from a struct class and mean it. In most cases though + ^self means `get me outta here, fast'. So unless this method is from a VMStruct class, + elide any ^self's" + eliminateReturnSelfs := ((definingClass inheritsFrom: VMClass) and: [definingClass isStructClass]) not + and: [returnType = #void or: [returnType = #sqInt]]. parseTree nodesDo: [:node | | replacement | node isReturn ifTrue: + [replacement := (node expression isVariable "Eliminate ^self's" + and: [node expression name = 'self' + and: [eliminateReturnSelfs]]) + ifTrue: [nil] + ifFalse: + [exitVar + ifNil: [node expression] + ifNotNil: [TAssignmentNode new + setVariable: (TVariableNode new setName: exitVar) + expression: node expression]]. - [replacement := exitVar - ifNil: [node expression] - ifNotNil: [TAssignmentNode new - setVariable: (TVariableNode new setName: exitVar) - expression: node expression]. node ~~ parseTree statements last ifTrue: + [replacement := replacement + ifNil: [TGoToNode new setLabel: exitLabel; yourself] + ifNotNil: + [TStmtListNode new + setArguments: #() + statements: {replacement. + TGoToNode new setLabel: exitLabel; yourself}; + yourself]. - [replacement := TStmtListNode new - setArguments: #() - statements: {replacement. - TGoToNode new setLabel: exitLabel; yourself}; - yourself. labelUsed := true]. + map + at: node + put: (replacement ifNil: + [TLabeledCommentNode new setComment: 'return ', node expression printString])]]. - map at: node put: replacement]]. parseTree replaceNodesIn: map. "Now flatten any new statement lists..." parseTree nodesDo: [:node| | list | (node isStmtList and: [node statements last isStmtList]) ifTrue: [list := node statements last statements. node statements removeLast; addAllLast: list]]. ^labelUsed! Item was changed: ----- Method: TMethod>>propagateReturnIn: (in category 'inlining support') ----- propagateReturnIn: aCodeGen "Propagate the return type to all return nodes" + | map coercionType | + returnType = #void ifTrue: + [^self]. + "The following is necessary for functions returning functions, which have problematic syntax" + coercionType := aCodeGen + extractTypeFor: (aCodeGen cFunctionNameFor: self selector) + fromDeclaration: returnType. - | map | map := IdentityDictionary new. parseTree nodesDo:[:node| node isReturn ifTrue:[ map at: node expression put: (TSendNode new setSelector: #cCoerce:to: receiver: (TVariableNode new setName: 'self') arguments: {node expression. + TConstantNode new setValue: coercionType})]]. - TConstantNode new "The following is necessary for functions returning functions, which have problematic syntax" - setValue: (aCodeGen - extractTypeFor: (aCodeGen cFunctionNameFor: self selector) - fromDeclaration: returnType) })]]. self replaceNodesIn: map! Item was changed: ----- Method: TMethod>>removeFinalSelfReturn (in category 'transformations') ----- removeFinalSelfReturn "The Smalltalk parser automatically adds the statement '^self' to the end of methods + without explicit returns. This method removes such statements, since in most VMMaker + classes (except struct classes) the generated code has no notion of 'self' anyway. + If the statement is removed and no return type has yet been specified asnd the class + specifies a default return type (e.g. #void) for methods that don't return, then set the + return type accordingly." - without explicit returns. This method removes such statements, since the generated - code has no notion of 'self' anyway. THis is a hack because it doesn't distinguish - methods with an explicit return self." + | lastStmt | + ((lastStmt := parseTree statements last) isReturn - | stmtList lastStmt | - stmtList := parseTree statements asOrderedCollection. - lastStmt := stmtList last. - - (lastStmt isReturn and: [lastStmt expression isVariable and: ['self' = lastStmt expression name]]) ifTrue: + [| tokens | + tokens := Scanner new scanTokens: (definingClass sourceCodeAt: selector ifAbsent: ['']). + (tokens size < 2 + or: [(tokens last: 2) ~= #(#^ 'self')]) ifTrue: + [parseTree setStatements: parseTree statements allButLast. + returnType = #sqInt ifTrue: + [([definingClass implicitReturnTypeFor: selector] + on: MessageNotUnderstood + do: [:ex| nil]) ifNotNil: + [:defaultReturnType| + returnType := defaultReturnType]]]]! - [stmtList removeLast. - parseTree setStatements: stmtList. - returnType = #sqInt ifTrue: - [([definingClass implicitReturnTypeFor: selector] - on: MessageNotUnderstood - do: [:ex| nil]) ifNotNil: - [:defaultReturnType| - returnType := defaultReturnType]]]! Item was added: + ----- Method: VMClass class>>isStructClass (in category 'translation') ----- + isStructClass + "The various VMStructType classes override this." + ^false! Item was changed: ----- Method: VMMaker>>generateExternalPlugin: (in category 'generate sources') ----- generateExternalPlugin: pluginName "generate the named external plugin" | exports plugin | "Refuse to translate this plugin if it requires platform specific files and they are not present." + [plugin := self validateExternalPlugin: pluginName] + on: VMMakerException + do: [:ex| + logger show: 'external plugin ' , plugin name , ' failed to validate: ' , ex messageText; cr. + ^self]. - [plugin := self validateExternalPlugin: pluginName] on: VMMakerException do:[^self]. [exports := plugin + translateInDirectory: (self externalPluginsDirectoryFor: plugin) + doInlining: inline] - translateInDirectory: (self externalPluginsDirectoryFor: plugin) - doInlining: inline] on: ProvideAnswerNotification do: [:ex| ex tag == #logger ifTrue: [ex resume: logger] ifFalse: [ex pass]]. + exports ifNotNil: "if exp is nil we skip this since the plugin was already up to date" + [logger show: 'external plugin ' , plugin name , ' generated as ' , plugin moduleName; cr. + self export: exports forExternalPlugin: plugin. + self processFilesForExternalPlugin: plugin]! - logger show: 'external plugin ' , plugin name , ' generated as ' , plugin moduleName; cr. - exports ifNotNil: ["if exp is nil we skip this since the plugin was already up to date" - self export: exports forExternalPlugin: plugin]. - self processFilesForExternalPlugin: plugin! Item was changed: ----- Method: VMProfileMacSupportPlugin>>primitiveDLSym (in category 'primitives') ----- primitiveDLSym "Answer the address of the argument in the current process or nil if none." | nameObj name namePtr sz addr | <export: true> <var: #name type: #'char *'> <var: #namePtr type: #'char *'> <var: #addr type: #'void *'> nameObj := interpreterProxy stackValue: 0. (interpreterProxy isBytes: nameObj) ifFalse: [^interpreterProxy primitiveFailFor: PrimErrBadArgument]. sz := interpreterProxy byteSizeOf: nameObj. name := self malloc: sz+1. namePtr := interpreterProxy firstIndexableField: nameObj. 0 to: sz-1 do:[:i| name at: i put: (namePtr at: i)]. name at: sz put: 0. addr := self cCode: 'dlsym(RTLD_SELF,name)' inSmalltalk: [0]. self free: name. ^interpreterProxy methodReturnValue: (addr = 0 ifTrue: [interpreterProxy nilObject] + ifFalse: [interpreterProxy positive32BitIntegerFor: addr asUnsignedLong])! - ifFalse: [interpreterProxy positive32BitIntegerFor: addr])! Item was added: + ----- Method: VMStructType class>>isStructClass (in category 'translation') ----- + isStructClass + ^true!

1 0

source.squeak.org down - update
by Chris Cunnington 26 Nov '12

26 Nov '12

Well, a couple of things. The last time source.squeak.org was down was May. At the time Ken accessed the Hetzner robot to reboot the server. I have an email saying he got access from Marcus. I ssh'd into box2 and the squeakso process (seen with top -d 3) is now <defunct>. I think this means it is now a zombie having no parent process and that the problem can only be solved with a reboot. Somebody needs to go to the Hetzner robot and flip the "reboot" switch. I would also point out that is is Thanksgiving in the USA, but not in France. I think Ken will be out of the picture for days. If somebody could contact Marcus (he's cc'd above) to flip the switch, perhaps that would be a solution. Chris

3 3

[Q] Linux VM(Framebuffer) Segmentation Fault at fb_setCursor
by Sungjin Chun 26 Nov '12

26 Nov '12

With latest Squeak unix vm(Squeak-4.10.2.2614-src) and MVC only image I've using, I tried to run squeak with framebuffer display in Linux. Though I can open my image file, the VM crashed with segmentation fault at fb_setCursor function(static one) if I move my mouse at the border line of SystemView(window). It seems that when start, the normal cursor is displayed without problem, but the resize cursors like "Cursor bottomLeft" and others does make problem. Can anyone help me on this problem?

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev November 2012