Vm-dev January 2015

vm-dev@lists.squeakfoundation.org

22 participants
111 discussions

VM Maker: VMMaker.oscog-eem.1033.mcz
by commits＠source.squeak.org 31 Jan '15

31 Jan '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1033.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1033 Author: eem Time: 30 January 2015, 5:49:14.607 pm UUID: a9769e50-4b53-46a8-a760-7cd3d9f79239 Ancestors: VMMaker.oscog-eem.1032 Eliminate more warnings by pruning unused methods in plugins. =============== Diff against VMMaker.oscog-eem.1032 =============== Item was changed: ----- Method: VMPluginCodeGenerator>>doInlining: (in category 'inlining') ----- doInlining: inlineFlag + "do inlining for a plugin" + self doBasicInlining: inlineFlag. + self pruneUnreachableMethods! - "do inlining for a plugin" - ^self doBasicInlining: inlineFlag!

1 0

[commit][3242] Eliminate some 64-bit warnings for the Mpeg3Plugin (i.e.
by commits＠squeakvm.org 31 Jan '15

31 Jan '15

Revision: 3242 Author: eliot Date: 2015-01-30 17:22:54 -0800 (Fri, 30 Jan 2015) Log Message: ----------- Eliminate some 64-bit warnings for the Mpeg3Plugin (i.e. provide a def of memoryAllocate in a place where it is seen). ELiminate an unused var warning in sqOpenGLRenderer.c Modified Paths: -------------- trunk/platforms/Cross/plugins/B3DAcceleratorPlugin/sqOpenGLRenderer.c trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/changesForSqueak.h trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/mpeg3private.h Property Changed: ---------------- trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h Modified: trunk/platforms/Cross/plugins/B3DAcceleratorPlugin/sqOpenGLRenderer.c =================================================================== --- trunk/platforms/Cross/plugins/B3DAcceleratorPlugin/sqOpenGLRenderer.c 2015-01-31 01:17:30 UTC (rev 3241) +++ trunk/platforms/Cross/plugins/B3DAcceleratorPlugin/sqOpenGLRenderer.c 2015-01-31 01:22:54 UTC (rev 3242) @@ -808,7 +808,9 @@ B3DInputFace *facePtr = (B3DInputFace*) idxArray; GLuint tracking; int nVertices = vtxSize; +#ifndef GL_VERSION_1_1 int nFaces = 0; +#endif int i, vtxFlags; struct glRenderer *renderer = glRendererFromHandle(handle); Modified: trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/changesForSqueak.h =================================================================== --- trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/changesForSqueak.h 2015-01-31 01:17:30 UTC (rev 3241) +++ trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/changesForSqueak.h 2015-01-31 01:22:54 UTC (rev 3242) @@ -1,4 +1,2 @@ #include "mpeg3private.h" int mpeg3_generate_toc_for_Squeak(mpeg3_t *file, int timecode_search, int print_streams, char *buffer, int buffer_size); -void * memoryAllocate(int number,unsigned size); -void memoryFree(void *stuff); Modified: trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/mpeg3private.h =================================================================== --- trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/mpeg3private.h 2015-01-31 01:17:30 UTC (rev 3241) +++ trunk/platforms/Cross/plugins/Mpeg3Plugin/libmpeg/mpeg3private.h 2015-01-31 01:22:54 UTC (rev 3242) @@ -1,9 +1,12 @@ - /* Changed Sept 15th by John M McIntosh to support Macintosh & Squeak +/* Changed Sept 15th by John M McIntosh to support Macintosh & Squeak + * Changed 2015/1/30 by Eliot Miranda to include memoryAllocate/memoryFree decls */ #ifndef MPEG3PRIVATE_H #define MPEG3PRIVATE_H +void * memoryAllocate(int number,unsigned size); +void memoryFree(void *stuff); /** configuration **/ #if defined(__MWERKS__) Property changes on: trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Thu Jan 29 14:46:37 PST 2015 + Fri Jan 30 17:22:45 PST 2015

1 0

[commit][3241] CogVM source as per VMMaker.oscog-eem.1032
by commits＠squeakvm.org 31 Jan '15

31 Jan '15

Revision: 3241 Author: eliot Date: 2015-01-30 17:17:30 -0800 (Fri, 30 Jan 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1032 Eliminate some warnings in the B3DAcceleratorPlugin Fix 64-bit warnings in AsynchFilePlugin and in #Array parameters in the SmartSyntaxInterpreterPlugins. Fix a warning in the Alien plgins. Modified Paths: -------------- branches/Cog/nscogsrc/plugins/IA32ABI/IA32ABI.c branches/Cog/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c branches/Cog/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c branches/Cog/src/plugins/IA32ABI/IA32ABI.c branches/Cog/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/plugins/IA32ABI/IA32ABI.c =================================================================== --- branches/Cog/nscogsrc/plugins/IA32ABI/IA32ABI.c 2015-01-30 19:16:19 UTC (rev 3240) +++ branches/Cog/nscogsrc/plugins/IA32ABI/IA32ABI.c 2015-01-31 01:17:30 UTC (rev 3241) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d + VMPluginCodeGenerator VMMaker.oscog-eem.1032 uuid: a3c915e6-d663-4d65-ab41-493c71498549 from - NewsqueakIA32ABIPlugin VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d + NewsqueakIA32ABIPlugin VMMaker.oscog-eem.1032 uuid: a3c915e6-d663-4d65-ab41-493c71498549 */ -static char __buildInfo[] = "NewsqueakIA32ABIPlugin VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d " __DATE__ ; +static char __buildInfo[] = "NewsqueakIA32ABIPlugin VMMaker.oscog-eem.1032 uuid: a3c915e6-d663-4d65-ab41-493c71498549 " __DATE__ ; @@ -223,9 +223,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "IA32ABI VMMaker.oscog-eem.983 (i)" + "IA32ABI VMMaker.oscog-eem.1032 (i)" #else - "IA32ABI VMMaker.oscog-eem.983 (e)" + "IA32ABI VMMaker.oscog-eem.1032 (e)" #endif ; @@ -885,8 +885,8 @@ methodReturnValue((BytesPerWord == 8 - ? positive64BitIntegerFor((&inIOProcessEvents)) - : positive32BitIntegerFor((&inIOProcessEvents)))); + ? positive64BitIntegerFor(((usqInt)((&inIOProcessEvents)))) + : positive32BitIntegerFor(((usqInt)((&inIOProcessEvents)))))); } Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Fri Jan 30 11:16:38 PST 2015 + Fri Jan 30 17:17:40 PST 2015 Modified: branches/Cog/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c =================================================================== --- branches/Cog/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2015-01-30 19:16:19 UTC (rev 3240) +++ branches/Cog/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2015-01-31 01:17:30 UTC (rev 3241) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1032 uuid: a3c915e6-d663-4d65-ab41-493c71498549 from - AsynchFilePlugin VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d + AsynchFilePlugin VMMaker.oscog-eem.1032 uuid: a3c915e6-d663-4d65-ab41-493c71498549 */ -static char __buildInfo[] = "AsynchFilePlugin VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d " __DATE__ ; +static char __buildInfo[] = "AsynchFilePlugin VMMaker.oscog-eem.1032 uuid: a3c915e6-d663-4d65-ab41-493c71498549 " __DATE__ ; @@ -102,9 +102,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AsynchFilePlugin VMMaker.oscog-eem.983 (i)" + "AsynchFilePlugin VMMaker.oscog-eem.1032 (i)" #else - "AsynchFilePlugin VMMaker.oscog-eem.983 (e)" + "AsynchFilePlugin VMMaker.oscog-eem.1032 (e)" #endif ; static void * sCOAFfn; @@ -182,6 +182,9 @@ primitiveFailFor(PrimErrBadArgument); f = null; l1: /* end asyncFileValueOf: */; + if (failed()) { + return null; + } asyncFileClose(f); if (failed()) { return null; @@ -287,13 +290,11 @@ } success((startIndex >= 1) && (((startIndex + count) - 1) <= bufferSize)); - - /* adjust for zero-origin indexing */ - + if (failed()) { + return null; + } bufferPtr = ((((sqInt) (firstIndexableField(buffer)))) + startIndex) - 1; - if (!(failed())) { - r = asyncFileReadResult(f, bufferPtr, count); - } + r = asyncFileReadResult(f, ((void *)bufferPtr), count); _return_value = integerObjectOf(r); if (failed()) { return null; @@ -325,6 +326,9 @@ primitiveFailFor(PrimErrBadArgument); f = null; l1: /* end asyncFileValueOf: */; + if (failed()) { + return null; + } asyncFileReadStart(f, fPosition, count); if (failed()) { return null; @@ -354,7 +358,10 @@ primitiveFailFor(PrimErrBadArgument); f = null; l1: /* end asyncFileValueOf: */; - r = asyncFileWriteResult(f); + if (failed()) { + return null; + } + r = asyncFileWriteResult(f); _return_value = integerObjectOf(r); if (failed()) { return null; @@ -394,9 +401,6 @@ primitiveFailFor(PrimErrBadArgument); f = null; l1: /* end asyncFileValueOf: */; - if (failed()) { - return null; - } count = num; startIndex = start; @@ -413,13 +417,11 @@ } success((startIndex >= 1) && (((startIndex + count) - 1) <= bufferSize)); - - /* adjust for zero-origin indexing */ - + if (failed()) { + return null; + } bufferPtr = ((((sqInt) (firstIndexableField(buffer)))) + startIndex) - 1; - if (!(failed())) { - asyncFileWriteStart(f, fPosition, bufferPtr, count); - } + asyncFileWriteStart(f, fPosition, ((void *)bufferPtr), count); if (failed()) { return null; } Modified: branches/Cog/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c =================================================================== --- branches/Cog/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2015-01-30 19:16:19 UTC (rev 3240) +++ branches/Cog/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2015-01-31 01:17:30 UTC (rev 3241) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d + VMPluginCodeGenerator VMMaker.oscog-eem.1032 uuid: a3c915e6-d663-4d65-ab41-493c71498549 from - B3DAcceleratorPlugin VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d + B3DAcceleratorPlugin VMMaker.oscog-eem.1032 uuid: a3c915e6-d663-4d65-ab41-493c71498549 */ -static char __buildInfo[] = "B3DAcceleratorPlugin VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d " __DATE__ ; +static char __buildInfo[] = "B3DAcceleratorPlugin VMMaker.oscog-eem.1032 uuid: a3c915e6-d663-4d65-ab41-493c71498549 " __DATE__ ; @@ -91,7 +91,6 @@ static void* stackMatrix(sqInt index); static void* stackPrimitiveIndexArrayofSizevalidateforVertexSize(sqInt stackIndex, sqInt nItems, sqInt aBool, sqInt maxIndex); static void* stackPrimitiveVertexArrayofSize(sqInt index, sqInt nItems); -static void* stackPrimitiveVertex(sqInt index); /*** Variables ***/ @@ -156,9 +155,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B3DAcceleratorPlugin VMMaker.oscog-eem.983 (i)" + "B3DAcceleratorPlugin VMMaker.oscog-eem.1032 (i)" #else - "B3DAcceleratorPlugin VMMaker.oscog-eem.983 (e)" + "B3DAcceleratorPlugin VMMaker.oscog-eem.1032 (e)" #endif ; @@ -242,6 +241,7 @@ loadClientStateverticescolorsnormalstexCoords(sqInt handle, sqInt vertices, sqInt colors, sqInt normals, sqInt texCoords) { void *colorPtr; + sqInt nilOop; void *normalPtr; sqInt ok; sqInt sz; @@ -249,10 +249,11 @@ void *vertexPtr; sqInt vtxSize; + colorPtr = (normalPtr = (txPtr = (vertexPtr = null))); /* Verify vertex data */ - colorPtr = (normalPtr = (txPtr = (vertexPtr = null))); + sz = 0; if (!(isWords(vertices))) { return primitiveFail(); } @@ -260,38 +261,39 @@ /* Verify assumptions of color, normal, texCoords data */ vtxSize = (slotSizeOf(vertices)) / 3; - if (!((colors == (nilObject())) + nilOop = nilObject(); + if (!((colors == nilOop) || ((isWords(colors)) && ((slotSizeOf(colors)) == (vtxSize * 4))))) { return primitiveFail(); } - if (!((normals == (nilObject())) + if (!((normals == nilOop) || ((isWords(normals)) && ((slotSizeOf(normals)) == (vtxSize * 3))))) { return primitiveFail(); } - if (!((texCoords == (nilObject())) + if (!((texCoords == nilOop) || (isWords(texCoords)))) { return primitiveFail(); } - if (!(colors == (nilObject()))) { + if (!(colors == nilOop)) { colorPtr = firstIndexableField(colors); } - if (!(normals == (nilObject()))) { + if (!(normals == nilOop)) { normalPtr = firstIndexableField(normals); } - if (!(texCoords == (nilObject()))) { + if (!(texCoords == nilOop)) { sz = (slotSizeOf(texCoords)) / vtxSize; txPtr = firstIndexableField(texCoords); } vertexPtr = firstIndexableField(vertices); - if (failed()) { - return null; + if (!(failed())) { + ok = b3dLoadClientState(handle, vertexPtr, 3, colorPtr, 4, normalPtr, 3, txPtr, sz); + if (!ok) { + primitiveFail(); + } } - ok = b3dLoadClientState(handle, vertexPtr, 3, colorPtr, 4, normalPtr, 3, txPtr, sz); - if (!ok) { - return primitiveFail(); - } + return null; } EXPORT(sqInt) @@ -560,19 +562,16 @@ if ((minIdx < 0) || ((minIdx > maxIdx) || (maxIdx > vtxSize))) { - return primitiveFail(); + primitiveFail(); } } - if (failed()) { - return null; - } - ok = b3dDrawArrays(handle, mode, minIdx, maxIdx); - if (!ok) { - return primitiveFail(); - } if (!(failed())) { - pop(methodArgumentCount()); + ok = b3dDrawArrays(handle, mode, minIdx, maxIdx); + if (ok) { + pop(methodArgumentCount()); + } } + return null; } @@ -643,16 +642,13 @@ } l2: /* end checkBoundsRange:faces:count: */; } - if (failed()) { - return null; - } - ok = b3dDrawElements(handle, mode, faceSize, facePtr); - if (!ok) { - return primitiveFail(); - } if (!(failed())) { - pop(methodArgumentCount()); + ok = b3dDrawElements(handle, mode, faceSize, facePtr); + if (ok) { + pop(methodArgumentCount()); + } } + return null; } @@ -733,19 +729,16 @@ if ((minIdx < 0) || ((minIdx > maxIdx) || (maxIdx > vtxSize))) { - return primitiveFail(); + primitiveFail(); } } - if (failed()) { - return null; - } - ok = b3dDrawRangeElements(handle, mode, minIdx, maxIdx, faceSize, facePtr); - if (!ok) { - return primitiveFail(); - } if (!(failed())) { - pop(methodArgumentCount()); + ok = b3dDrawRangeElements(handle, mode, minIdx, maxIdx, faceSize, facePtr); + if (ok) { + pop(methodArgumentCount()); + } } + return null; } @@ -762,12 +755,12 @@ } if ((methodArgumentCount()) == 1) { enabled = booleanValueOf(stackValue(0)); - if (failed()) { - return null; + if (!(failed())) { + doRangeChecks = enabled; + return pop(1); } - doRangeChecks = enabled; - return pop(1); } + return null; } EXPORT(sqInt) @@ -1592,26 +1585,6 @@ } -/* Load a primitive vertex from the interpreter stack. - Return a pointer to the vertex data if successful, nil otherwise. */ - -static void* -stackPrimitiveVertex(sqInt index) -{ - sqInt oop; - - oop = stackObjectValue(index); - if (oop == null) { - return null; - } - if ((isWords(oop)) - && ((slotSizeOf(oop)) == 16)) { - return firstIndexableField(oop); - } - return null; -} - - #ifdef SQUEAK_BUILTIN_PLUGIN void* B3DAcceleratorPlugin_exports[][3] = { Modified: branches/Cog/src/plugins/IA32ABI/IA32ABI.c =================================================================== --- branches/Cog/src/plugins/IA32ABI/IA32ABI.c 2015-01-30 19:16:19 UTC (rev 3240) +++ branches/Cog/src/plugins/IA32ABI/IA32ABI.c 2015-01-31 01:17:30 UTC (rev 3241) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d + VMPluginCodeGenerator VMMaker.oscog-eem.1032 uuid: a3c915e6-d663-4d65-ab41-493c71498549 from - IA32ABIPlugin VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d + IA32ABIPlugin VMMaker.oscog-eem.1032 uuid: a3c915e6-d663-4d65-ab41-493c71498549 */ -static char __buildInfo[] = "IA32ABIPlugin VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d " __DATE__ ; +static char __buildInfo[] = "IA32ABIPlugin VMMaker.oscog-eem.1032 uuid: a3c915e6-d663-4d65-ab41-493c71498549 " __DATE__ ; @@ -219,9 +219,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "IA32ABI VMMaker.oscog-eem.983 (i)" + "IA32ABI VMMaker.oscog-eem.1032 (i)" #else - "IA32ABI VMMaker.oscog-eem.983 (e)" + "IA32ABI VMMaker.oscog-eem.1032 (e)" #endif ; @@ -863,8 +863,8 @@ methodReturnValue((BytesPerWord == 8 - ? positive64BitIntegerFor((&inIOProcessEvents)) - : positive32BitIntegerFor((&inIOProcessEvents)))); + ? positive64BitIntegerFor(((usqInt)((&inIOProcessEvents)))) + : positive32BitIntegerFor(((usqInt)((&inIOProcessEvents)))))); } Modified: branches/Cog/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c =================================================================== --- branches/Cog/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c 2015-01-30 19:16:19 UTC (rev 3240) +++ branches/Cog/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c 2015-01-31 01:17:30 UTC (rev 3241) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1032 uuid: a3c915e6-d663-4d65-ab41-493c71498549 from - Mpeg3Plugin VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d + Mpeg3Plugin VMMaker.oscog-eem.1032 uuid: a3c915e6-d663-4d65-ab41-493c71498549 */ -static char __buildInfo[] = "Mpeg3Plugin VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d " __DATE__ ; +static char __buildInfo[] = "Mpeg3Plugin VMMaker.oscog-eem.1032 uuid: a3c915e6-d663-4d65-ab41-493c71498549 " __DATE__ ; @@ -137,9 +137,9 @@ static sqInt maximumNumberOfFilesToWatch; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "Mpeg3Plugin VMMaker.oscog-eem.983 (i)" + "Mpeg3Plugin VMMaker.oscog-eem.1032 (i)" #else - "Mpeg3Plugin VMMaker.oscog-eem.983 (e)" + "Mpeg3Plugin VMMaker.oscog-eem.1032 (e)" #endif ; static mpeg3_t *mpegFiles[1024+1]; @@ -889,7 +889,7 @@ fileHandle = stackValue(4); success(isIndexable(stackValue(3))); - anArray = ((int *) (firstIndexableField(stackValue(3)))); + anArray = ((sqInt *) (firstIndexableField(stackValue(3)))); aChannelNumber = stackIntegerValue(2); aSampleNumber = stackIntegerValue(1); aNumber = stackIntegerValue(0); @@ -1120,7 +1120,7 @@ fileHandle = stackValue(4); success(isIndexable(stackValue(3))); - anArray = ((int *) (firstIndexableField(stackValue(3)))); + anArray = ((sqInt *) (firstIndexableField(stackValue(3)))); aChannelNumber = stackIntegerValue(2); aSampleNumber = stackIntegerValue(1); aNumber = stackIntegerValue(0);

1 0

VM Maker: VMMaker.oscog-eem.1032.mcz
by commits＠source.squeak.org 31 Jan '15

31 Jan '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1032.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1032 Author: eem Time: 30 January 2015, 5:10:58.812 pm UUID: a3c915e6-d663-4d65-ab41-493c71498549 Ancestors: VMMaker.oscog-eem.1031 Eliminate some warnings in the B3DAcceleratorPlugin =============== Diff against VMMaker.oscog-eem.1031 =============== Item was changed: ----- Method: B3DAcceleratorPlugin>>loadClientState:vertices:colors:normals:texCoords: (in category 'primitives-qwaq') ----- loadClientState: handle vertices: vertices colors: colors normals: normals texCoords: texCoords "Common method to set up client state for some render ops" + | nilOop vtxSize sz colorPtr normalPtr txPtr vertexPtr ok | - | vtxSize sz colorPtr normalPtr txPtr vertexPtr ok | <var: #colorPtr type: 'void *'> <var: #normalPtr type: 'void *'> <var: #txPtr type: 'void *'> <var: #vertexPtr type: 'void *'> colorPtr := normalPtr := txPtr := vertexPtr := nil. + sz := 0. "Verify vertex data" + (interpreterProxy isWords: vertices) ifFalse: + [^interpreterProxy primitiveFail]. - (interpreterProxy isWords: vertices) - ifFalse:[^interpreterProxy primitiveFail]. vtxSize := (interpreterProxy slotSizeOf: vertices) / 3. "Verify assumptions of color, normal, texCoords data" + nilOop := interpreterProxy nilObject. + (colors = nilOop + or: [(interpreterProxy isWords: colors) + and: [(interpreterProxy slotSizeOf: colors) = (vtxSize * 4)]]) ifFalse: + [^interpreterProxy primitiveFail]. + (normals = nilOop + or: [(interpreterProxy isWords: normals) + and: [(interpreterProxy slotSizeOf: normals) = (vtxSize * 3)]]) ifFalse: + [^interpreterProxy primitiveFail]. - (colors = interpreterProxy nilObject - or:[(interpreterProxy isWords: colors) - and:[(interpreterProxy slotSizeOf: colors) = (vtxSize * 4)]]) - ifFalse:[^interpreterProxy primitiveFail]. - (normals = interpreterProxy nilObject - or:[(interpreterProxy isWords: normals) - and:[(interpreterProxy slotSizeOf: normals) = (vtxSize * 3)]]) - ifFalse:[^interpreterProxy primitiveFail]. "Don't check size for texCoords since they can be 2,3,4 elements" + (texCoords = nilOop + or: [(interpreterProxy isWords: texCoords)]) ifFalse: + [^interpreterProxy primitiveFail]. - (texCoords = interpreterProxy nilObject - or:[(interpreterProxy isWords: texCoords)]) - ifFalse:[^interpreterProxy primitiveFail]. "Finally submit the data to OpenGL" + colors = nilOop ifFalse: + [colorPtr := interpreterProxy firstIndexableField: colors]. + normals = nilOop ifFalse: + [normalPtr := interpreterProxy firstIndexableField: normals]. + texCoords = nilOop ifFalse: + [sz := (interpreterProxy slotSizeOf: texCoords) / vtxSize. + txPtr := interpreterProxy firstIndexableField: texCoords]. - (colors = interpreterProxy nilObject) ifFalse:[ - colorPtr := interpreterProxy firstIndexableField: colors. - ]. - (normals = interpreterProxy nilObject) ifFalse:[ - normalPtr := interpreterProxy firstIndexableField: normals. - ]. - (texCoords = interpreterProxy nilObject) ifFalse:[ - sz := (interpreterProxy slotSizeOf: texCoords) / vtxSize. - txPtr := interpreterProxy firstIndexableField: texCoords. - ]. vertexPtr := interpreterProxy firstIndexableField: vertices. + interpreterProxy failed ifFalse: + [ok := self + cCode:'b3dLoadClientState(handle, vertexPtr, 3, colorPtr, 4, normalPtr, 3, txPtr, sz)' + inSmalltalk: [vertexPtr. colorPtr. normalPtr. txPtr. sz touch]. + ok ifFalse: [interpreterProxy primitiveFail]]. + ^nil "keep compiler quiet" - interpreterProxy failed ifTrue:[^nil]. - ok := self cCode:'b3dLoadClientState(handle, vertexPtr, 3, colorPtr, 4, normalPtr, 3, txPtr, sz)' - inSmalltalk:[vertexPtr. colorPtr. normalPtr. txPtr. sz false]. - ok ifFalse:[^interpreterProxy primitiveFail]. ! Item was changed: ----- Method: B3DAcceleratorPlugin>>primitiveDrawArrays (in category 'primitives-qwaq') ----- primitiveDrawArrays "Primitive. Setup non-VBO client state and call drawRangeElements in one go to avoid garbage collection to move the buffers underneith." | maxIdx minIdx mode texCoords normals colors vertices handle vtxSize ok | <export: true> + interpreterProxy methodArgumentCount = 8 ifFalse: + [^interpreterProxy primitiveFail]. - interpreterProxy methodArgumentCount = 8 - ifFalse:[^interpreterProxy primitiveFail]. maxIdx := interpreterProxy stackIntegerValue: 0. minIdx := interpreterProxy stackIntegerValue: 1. mode := interpreterProxy stackIntegerValue: 2. texCoords := interpreterProxy stackValue: 3. normals := interpreterProxy stackValue: 4. colors := interpreterProxy stackValue: 5. vertices := interpreterProxy stackValue: 6. handle := interpreterProxy stackIntegerValue: 7. self loadClientState: handle vertices: vertices colors: colors normals: normals texCoords: texCoords. interpreterProxy failed ifTrue:[^nil]. + doRangeChecks ifTrue: + ["Verify the vertex data itself" - doRangeChecks ifTrue:[ - "Verify the vertex data itself" self checkVertexData: vertices. "Verify min-max range in bounds for given vertex array" vtxSize := (interpreterProxy slotSizeOf: vertices) / 3. + (minIdx < 0 or:[minIdx > maxIdx or:[maxIdx > vtxSize]]) ifTrue: + [interpreterProxy primitiveFail]]. + interpreterProxy failed ifFalse: + [ok := self cCode: 'b3dDrawArrays(handle, mode, minIdx, maxIdx)' + inSmalltalk:[mode. false]. + ok ifTrue: + [interpreterProxy pop: interpreterProxy methodArgumentCount]]. + ^nil "keep compiler quiet" - (minIdx < 0 or:[minIdx > maxIdx or:[maxIdx > vtxSize]]) - ifTrue:[^interpreterProxy primitiveFail]. - ]. - interpreterProxy failed ifTrue:[^nil]. - ok := self cCode: 'b3dDrawArrays(handle, mode, minIdx, maxIdx)' - inSmalltalk:[mode. false]. - ok ifFalse:[^interpreterProxy primitiveFail]. - interpreterProxy failed - ifFalse:[interpreterProxy pop: interpreterProxy methodArgumentCount]. ! Item was changed: ----- Method: B3DAcceleratorPlugin>>primitiveDrawElements (in category 'primitives-qwaq') ----- primitiveDrawElements "Primitive. Setup non-VBO client state and call drawElements in one go to avoid garbage collection to move the buffers underneith." | faces mode texCoords normals colors vertices handle ok facePtr faceSize | <export: true> <var: #facePtr type: 'unsigned int *'> + interpreterProxy methodArgumentCount = 7 ifFalse: + [^interpreterProxy primitiveFail]. - interpreterProxy methodArgumentCount = 7 - ifFalse:[^interpreterProxy primitiveFail]. faces := interpreterProxy stackValue: 0. + (interpreterProxy isWords: faces) ifFalse: + [^interpreterProxy primitiveFail]. - (interpreterProxy isWords: faces) - ifFalse:[^interpreterProxy primitiveFail]. faceSize := interpreterProxy slotSizeOf: faces. facePtr := interpreterProxy firstIndexableField: faces. mode := interpreterProxy stackIntegerValue: 1. texCoords := interpreterProxy stackValue: 2. normals := interpreterProxy stackValue: 3. colors := interpreterProxy stackValue: 4. vertices := interpreterProxy stackValue: 5. handle := interpreterProxy stackIntegerValue: 6. self loadClientState: handle vertices: vertices colors: colors normals: normals texCoords: texCoords. interpreterProxy failed ifTrue:[^nil]. + doRangeChecks ifTrue: + ["Verify the vertex data itself" - doRangeChecks ifTrue:[ - "Verify the vertex data itself" self checkVertexData: vertices. "Change bounds range to make sure the data is valid" + self checkBoundsRange: vertices faces: facePtr count: faceSize]. - self checkBoundsRange: vertices faces: facePtr count: faceSize. - ]. + interpreterProxy failed ifFalse: + [ok := self cCode: 'b3dDrawElements(handle, mode, faceSize, facePtr)' + inSmalltalk:[mode. facePtr. false]. + ok ifTrue: + [interpreterProxy pop: interpreterProxy methodArgumentCount]]. + ^nil "keep compiler quiet" - interpreterProxy failed ifTrue:[^nil]. - ok := self cCode: 'b3dDrawElements(handle, mode, faceSize, facePtr)' - inSmalltalk:[mode. facePtr. false]. - ok ifFalse:[^interpreterProxy primitiveFail]. - interpreterProxy failed - ifFalse:[interpreterProxy pop: interpreterProxy methodArgumentCount]. ! Item was changed: ----- Method: B3DAcceleratorPlugin>>primitiveDrawRangeElements (in category 'primitives-qwaq') ----- primitiveDrawRangeElements "Primitive. Setup non-VBO client state and call drawRangeElements in one go to avoid garbage collection to move the buffers underneith." | faces maxIdx minIdx mode texCoords normals colors vertices handle vtxSize ok facePtr faceSize | <export: true> <var: #facePtr type: 'unsigned int *'> + interpreterProxy methodArgumentCount = 9 ifFalse: + [^interpreterProxy primitiveFail]. - interpreterProxy methodArgumentCount = 9 - ifFalse:[^interpreterProxy primitiveFail]. faces := interpreterProxy stackValue: 0. + (interpreterProxy isWords: faces) ifFalse: + [^interpreterProxy primitiveFail]. - (interpreterProxy isWords: faces) - ifFalse:[^interpreterProxy primitiveFail]. faceSize := interpreterProxy slotSizeOf: faces. facePtr := interpreterProxy firstIndexableField: faces. maxIdx := interpreterProxy stackIntegerValue: 1. minIdx := interpreterProxy stackIntegerValue: 2. mode := interpreterProxy stackIntegerValue: 3. texCoords := interpreterProxy stackValue: 4. normals := interpreterProxy stackValue: 5. colors := interpreterProxy stackValue: 6. vertices := interpreterProxy stackValue: 7. handle := interpreterProxy stackIntegerValue: 8. self loadClientState: handle vertices: vertices colors: colors normals: normals texCoords: texCoords. interpreterProxy failed ifTrue:[^nil]. + doRangeChecks ifTrue: + ["Verify the vertex data itself" - doRangeChecks ifTrue:[ - "Verify the vertex data itself" self checkVertexData: vertices. "Change bounds range to make sure the data is valid" self checkBoundsRange: vertices faces: facePtr count: faceSize. "Verify min-max range in bounds for given vertex array" vtxSize := (interpreterProxy slotSizeOf: vertices) / 3. + (minIdx < 0 or:[minIdx > maxIdx or:[maxIdx > vtxSize]]) ifTrue: + [interpreterProxy primitiveFail]]. - (minIdx < 0 or:[minIdx > maxIdx or:[maxIdx > vtxSize]]) - ifTrue:[^interpreterProxy primitiveFail]. - ]. + interpreterProxy failed ifFalse: + [ok := self cCode: 'b3dDrawRangeElements(handle, mode, minIdx, maxIdx, faceSize, facePtr)' + inSmalltalk:[mode. facePtr. false]. + ok ifTrue: + [interpreterProxy pop: interpreterProxy methodArgumentCount]]. + ^nil "keep compiler quiet" - interpreterProxy failed ifTrue:[^nil]. - ok := self cCode: 'b3dDrawRangeElements(handle, mode, minIdx, maxIdx, faceSize, facePtr)' - inSmalltalk:[mode. facePtr. false]. - ok ifFalse:[^interpreterProxy primitiveFail]. - interpreterProxy failed - ifFalse:[interpreterProxy pop: interpreterProxy methodArgumentCount]. ! Item was changed: ----- Method: B3DAcceleratorPlugin>>primitiveEnableDrawRangeChecks (in category 'primitives-qwaq') ----- primitiveEnableDrawRangeChecks "Primitive. Enable/disable draw (range) checks" | enabled | <export: true> + interpreterProxy methodArgumentCount = 0 ifTrue: + [interpreterProxy pop: 1. + ^interpreterProxy pushBool: doRangeChecks]. + interpreterProxy methodArgumentCount = 1 ifTrue: + [enabled := interpreterProxy booleanValueOf: (interpreterProxy stackValue: 0). + interpreterProxy failed ifFalse: + [doRangeChecks := enabled. + ^interpreterProxy pop: 1]]. "pop arg; return rcvr" + ^nil "keep compiler quiet"! - interpreterProxy methodArgumentCount = 0 ifTrue:[ - interpreterProxy pop: 1. - ^interpreterProxy pushBool: doRangeChecks. - ]. - interpreterProxy methodArgumentCount = 1 ifTrue:[ - enabled := interpreterProxy booleanValueOf: (interpreterProxy stackValue: 0). - interpreterProxy failed ifTrue:[^nil]. - doRangeChecks := enabled. - ^interpreterProxy pop: 1. "pop arg; return recvr" - ].! Item was removed: - ----- Method: B3DAcceleratorPlugin>>stackPrimitiveVertex: (in category 'primitive support') ----- - stackPrimitiveVertex: index - "Load a primitive vertex from the interpreter stack. - Return a pointer to the vertex data if successful, nil otherwise." - | oop | - <inline: false> - <returnTypeC:'void*'> - oop := interpreterProxy stackObjectValue: index. - oop = nil ifTrue:[^nil]. - ((interpreterProxy isWords: oop) and:[(interpreterProxy slotSizeOf: oop) = 16]) - ifTrue:[^interpreterProxy firstIndexableField: oop]. - ^nil!

1 0

VM Maker: VMMaker.oscog-eem.1031.mcz
by commits＠source.squeak.org 30 Jan '15

30 Jan '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1031.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1031 Author: eem Time: 30 January 2015, 12:45:40.801 pm UUID: dacb0163-3f52-4afa-8c44-eed0ed3d892e Ancestors: VMMaker.oscog-eem.1030 Redo the Asynch changes to avoid ugly code generation =============== Diff against VMMaker.oscog-eem.1030 =============== Item was changed: ----- Method: AsynchFilePlugin>>primitiveAsyncFileClose: (in category 'primitives') ----- primitiveAsyncFileClose: fh | f | <var: #f type: 'AsyncFile *'> self primitive: 'primitiveAsyncFileClose' parameters: #(Oop ). f := self asyncFileValueOf: fh. + interpreterProxy failed ifTrue: [^nil]. + self asyncFileClose: f! - interpreterProxy failed ifFalse: - [self asyncFileClose: f]! Item was changed: ----- Method: AsynchFilePlugin>>primitiveAsyncFileReadResult:intoBuffer:at:count: (in category 'primitives') ----- primitiveAsyncFileReadResult: fhandle intoBuffer: buffer at: start count: num | bufferSize bufferPtr r f count startIndex | <var: #f type: 'AsyncFile *'> self primitive: 'primitiveAsyncFileReadResult' parameters: #(Oop Oop SmallInteger SmallInteger ). f := self asyncFileValueOf: fhandle. count := num. startIndex := start. bufferSize := interpreterProxy slotSizeOf: buffer. "in bytes or words" (interpreterProxy isWords: buffer) ifTrue: "covert word counts to byte counts" [count := count * 4. startIndex := startIndex - 1 * 4 + 1. bufferSize := bufferSize * 4]. interpreterProxy success: (startIndex >= 1 and: [startIndex + count - 1 <= bufferSize]). + interpreterProxy failed ifTrue: [^nil]. + "adjust for zero-origin indexing" + bufferPtr := (self cCoerce: (interpreterProxy firstIndexableField: buffer) to:#sqInt) + startIndex - 1. + r := self asyncFile: f Read: bufferPtr asVoidPointer Result: count. + ^r asOop: SmallInteger! - interpreterProxy failed ifFalse: - ["adjust for zero-origin indexing" - bufferPtr := (self cCoerce: (interpreterProxy firstIndexableField: buffer) to:#sqInt) + startIndex - 1. - r := self asyncFile: f Read: bufferPtr asVoidPointer Result: count]. - ^ r asOop: SmallInteger! Item was changed: ----- Method: AsynchFilePlugin>>primitiveAsyncFileReadStart:fPosition:count: (in category 'primitives') ----- primitiveAsyncFileReadStart: fHandle fPosition: fPosition count: count | f | <var: #f type: 'AsyncFile *'> self primitive: 'primitiveAsyncFileReadStart' parameters: #(Oop SmallInteger SmallInteger). f := self asyncFileValueOf: fHandle. + interpreterProxy failed ifTrue: [^nil]. + self asyncFile: f Read: fPosition Start: count! - interpreterProxy failed ifFalse: - [self asyncFile: f Read: fPosition Start: count] - ! Item was changed: ----- Method: AsynchFilePlugin>>primitiveAsyncFileWriteResult: (in category 'primitives') ----- primitiveAsyncFileWriteResult: fHandle | f r | <var: #f type: 'AsyncFile *'> self primitive: 'primitiveAsyncFileWriteResult' parameters:#(Oop). f := self asyncFileValueOf: fHandle. + interpreterProxy failed ifTrue: [^nil]. + r := self asyncFileWriteResult: f. + ^r asOop: SmallInteger! - interpreterProxy failed ifFalse: - [r := self asyncFileWriteResult: f. - ^r asOop: SmallInteger]! Item was changed: ----- Method: AsynchFilePlugin>>primitiveAsyncFileWriteStart:fPosition:fromBuffer:at:count: (in category 'primitives') ----- primitiveAsyncFileWriteStart: fHandle fPosition: fPosition fromBuffer: buffer at: start count: num | f bufferSize bufferPtr count startIndex | <var: #f type: 'AsyncFile *'> self primitive: 'primitiveAsyncFileWriteStart' parameters: #(Oop SmallInteger Oop SmallInteger SmallInteger ). f := self asyncFileValueOf: fHandle. count := num. startIndex := start. bufferSize := interpreterProxy slotSizeOf: buffer. "in bytes or words" (interpreterProxy isWords: buffer) ifTrue: "covert word counts to byte counts" [count := count * 4. startIndex := startIndex - 1 * 4 + 1. bufferSize := bufferSize * 4]. interpreterProxy success: (startIndex >= 1 and: [startIndex + count - 1 <= bufferSize]). + interpreterProxy failed ifTrue: [^nil]. + "adjust for zero-origin indexing" + bufferPtr := (self cCoerce: (interpreterProxy firstIndexableField: buffer) to: #sqInt) + startIndex - 1. + self async: f File: fPosition Write: bufferPtr asVoidPointer Start: count! - interpreterProxy failed ifFalse: - ["adjust for zero-origin indexing" - bufferPtr := (self cCoerce: (interpreterProxy firstIndexableField: buffer) to: #sqInt) + startIndex - 1. - self async: f File: fPosition Write: bufferPtr asVoidPointer Start: count]!

1 0

VM Maker: VMMaker.oscog-eem.1030.mcz
by commits＠source.squeak.org 30 Jan '15

30 Jan '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1030.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1030 Author: eem Time: 30 January 2015, 12:37:44.348 pm UUID: 714f922a-8349-4094-b2e2-359fd5140db9 Ancestors: VMMaker.oscog-eem.1029 Fix 64-bit warnings in AsynchFilePlugin and in #Array parameters in the SmartSyntaxInterpreterPlugins. Fix a warning in the Alien plgins. =============== Diff against VMMaker.oscog-eem.1029 =============== Item was changed: ----- Method: Array class>>ccg:prolog:expr:index: (in category '*VMMaker-plugin generation') ----- ccg: cg prolog: aBlock expr: aString index: anInteger ^cg ccgLoad: aBlock expr: aString + asOopPtrFrom: anInteger - asIntPtrFrom: anInteger andThen: (cg ccgValBlock: 'isIndexable')! Item was changed: ----- Method: AsynchFilePlugin>>primitiveAsyncFileClose: (in category 'primitives') ----- primitiveAsyncFileClose: fh | f | <var: #f type: 'AsyncFile *'> self primitive: 'primitiveAsyncFileClose' parameters: #(Oop ). f := self asyncFileValueOf: fh. + interpreterProxy failed ifFalse: + [self asyncFileClose: f]! - self asyncFileClose: f! Item was changed: ----- Method: AsynchFilePlugin>>primitiveAsyncFileReadResult:intoBuffer:at:count: (in category 'primitives') ----- primitiveAsyncFileReadResult: fhandle intoBuffer: buffer at: start count: num | bufferSize bufferPtr r f count startIndex | <var: #f type: 'AsyncFile *'> self primitive: 'primitiveAsyncFileReadResult' parameters: #(Oop Oop SmallInteger SmallInteger ). f := self asyncFileValueOf: fhandle. count := num. startIndex := start. bufferSize := interpreterProxy slotSizeOf: buffer. "in bytes or words" + (interpreterProxy isWords: buffer) ifTrue: "covert word counts to byte counts" + [count := count * 4. + startIndex := startIndex - 1 * 4 + 1. + bufferSize := bufferSize * 4]. - (interpreterProxy isWords: buffer) - ifTrue: ["covert word counts to byte counts" - count := count * 4. - startIndex := startIndex - 1 * 4 + 1. - bufferSize := bufferSize * 4]. interpreterProxy success: (startIndex >= 1 and: [startIndex + count - 1 <= bufferSize]). + interpreterProxy failed ifFalse: + ["adjust for zero-origin indexing" + bufferPtr := (self cCoerce: (interpreterProxy firstIndexableField: buffer) to:#sqInt) + startIndex - 1. + r := self asyncFile: f Read: bufferPtr asVoidPointer Result: count]. - bufferPtr := (self cCoerce: (interpreterProxy firstIndexableField: buffer) to:#sqInt) + startIndex - 1. "adjust for zero-origin indexing" - interpreterProxy failed ifFalse: [r := self cCode: 'asyncFileReadResult(f, bufferPtr, count)']. ^ r asOop: SmallInteger! Item was changed: ----- Method: AsynchFilePlugin>>primitiveAsyncFileReadStart:fPosition:count: (in category 'primitives') ----- primitiveAsyncFileReadStart: fHandle fPosition: fPosition count: count | f | <var: #f type: 'AsyncFile *'> self primitive: 'primitiveAsyncFileReadStart' parameters: #(Oop SmallInteger SmallInteger). f := self asyncFileValueOf: fHandle. + interpreterProxy failed ifFalse: + [self asyncFile: f Read: fPosition Start: count] - self cCode: 'asyncFileReadStart(f, fPosition, count)' ! Item was changed: ----- Method: AsynchFilePlugin>>primitiveAsyncFileWriteResult: (in category 'primitives') ----- primitiveAsyncFileWriteResult: fHandle - | f r | <var: #f type: 'AsyncFile *'> self primitive: 'primitiveAsyncFileWriteResult' parameters:#(Oop). f := self asyncFileValueOf: fHandle. + interpreterProxy failed ifFalse: + [r := self asyncFileWriteResult: f. + ^r asOop: SmallInteger]! - r := self cCode:' asyncFileWriteResult(f)'. - ^r asOop: SmallInteger! Item was changed: ----- Method: AsynchFilePlugin>>primitiveAsyncFileWriteStart:fPosition:fromBuffer:at:count: (in category 'primitives') ----- primitiveAsyncFileWriteStart: fHandle fPosition: fPosition fromBuffer: buffer at: start count: num | f bufferSize bufferPtr count startIndex | <var: #f type: 'AsyncFile *'> self primitive: 'primitiveAsyncFileWriteStart' parameters: #(Oop SmallInteger Oop SmallInteger SmallInteger ). f := self asyncFileValueOf: fHandle. - interpreterProxy failed ifTrue: [^ nil]. - count := num. startIndex := start. bufferSize := interpreterProxy slotSizeOf: buffer. "in bytes or words" + (interpreterProxy isWords: buffer) ifTrue: "covert word counts to byte counts" + [count := count * 4. + startIndex := startIndex - 1 * 4 + 1. + bufferSize := bufferSize * 4]. - (interpreterProxy isWords: buffer) - ifTrue: ["covert word counts to byte counts" - count := count * 4. - startIndex := startIndex - 1 * 4 + 1. - bufferSize := bufferSize * 4]. interpreterProxy success: (startIndex >= 1 and: [startIndex + count - 1 <= bufferSize]). + + interpreterProxy failed ifFalse: + ["adjust for zero-origin indexing" + bufferPtr := (self cCoerce: (interpreterProxy firstIndexableField: buffer) to: #sqInt) + startIndex - 1. + self async: f File: fPosition Write: bufferPtr asVoidPointer Start: count]! - bufferPtr := (self cCoerce: (interpreterProxy firstIndexableField: buffer) to: #sqInt) + startIndex - 1. "adjust for zero-origin indexing" - interpreterProxy failed ifFalse: [self cCode: 'asyncFileWriteStart(f, fPosition, bufferPtr, count)']! Item was changed: ----- Method: IA32ABIPlugin>>primInIOProcessEventsFlagAddress (in category 'primitives-Windows-VM-specific') ----- primInIOProcessEventsFlagAddress "Answer the address of the int inIOProcessEvents flag. This can be used to disable invocation of ioProcessEvents and is for backward-compatibility. Please use the core VM primitiveEventProcessingControl in new code." | inIOProcessEvents | <export: true> <var: 'inIOProcessEvents' declareC: 'extern int inIOProcessEvents'> self cCode: '' inSmalltalk: [inIOProcessEvents = 0]. + interpreterProxy methodReturnValue: (self positiveMachineIntegerFor: (self addressOf: inIOProcessEvents) asUnsignedInteger)! - interpreterProxy methodReturnValue: (self positiveMachineIntegerFor: (self addressOf: inIOProcessEvents))! Item was changed: ----- Method: NewsqueakIA32ABIPlugin>>primInIOProcessEventsFlagAddress (in category 'primitives-Windows-VM-specific') ----- primInIOProcessEventsFlagAddress "Answer the address of the int inIOProcessEvents flag. This can be used to disable invocation of ioProcessEvents and is for backward-compatibility. Please use the core VM primitiveEventProcessingControl in new code." | inIOProcessEvents | <export: true> <var: 'inIOProcessEvents' declareC: 'extern int inIOProcessEvents'> self cCode: '' inSmalltalk: [inIOProcessEvents = 0]. + interpreterProxy methodReturnValue: (self positiveMachineIntegerFor: (self addressOf: inIOProcessEvents) asUnsignedInteger)! - interpreterProxy methodReturnValue: (self positiveMachineIntegerFor: (self addressOf: inIOProcessEvents))! Item was added: + ----- Method: SmartSyntaxPluginCodeGenerator>>ccgLoad:expr:asOopPtrFrom: (in category 'coercing') ----- + ccgLoad: aBlock expr: aString asOopPtrFrom: anInteger + "Answer codestring for integer pointer to first indexable field of object (without validating side-effect), as described in comment to ccgLoad:expr:asRawOopFrom:" + + ^aBlock value: (String streamContents: + [:aStream | + aStream + nextPutAll: 'self cCoerce: (interpreterProxy firstIndexableField:'; + crtab: 4; + nextPutAll: '(interpreterProxy stackValue:'; + print: anInteger; + nextPutAll: '))'; + crtab: 3; + nextPutAll: 'to: ''sqInt *'''])! Item was added: + ----- Method: SmartSyntaxPluginCodeGenerator>>ccgLoad:expr:asOopPtrFrom:andThen: (in category 'coercing') ----- + ccgLoad: aBlock expr: aString asOopPtrFrom: anInteger andThen: valBlock + "Answer codestring for integer pointer to first indexable field of object (without validating side-effect unless specified in valBlock), as described in comment to ccgLoad:expr:asRawOopFrom:" + + ^(valBlock value: anInteger), '.', + (aBlock value: (String streamContents: + [:aStream | + aStream + nextPutAll: 'self cCoerce: (interpreterProxy firstIndexableField:'; + crtab: 4; + nextPutAll: '(interpreterProxy stackValue:'; + print: anInteger; + nextPutAll: '))'; + crtab: 3; + nextPutAll: 'to: ''sqInt *''']))!

1 0

[commit][3240] Correct some printf type specs for srcLen in sqUnixOpenSSL.c
by commits＠squeakvm.org 30 Jan '15

30 Jan '15

Revision: 3240 Author: eliot Date: 2015-01-30 11:16:19 -0800 (Fri, 30 Jan 2015) Log Message: ----------- Correct some printf type specs for srcLen in sqUnixOpenSSL.c Modified Paths: -------------- branches/Cog/platforms/unix/plugins/SqueakSSL/sqUnixOpenSSL.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Thu Jan 29 14:34:06 PST 2015 + Fri Jan 30 11:16:38 PST 2015 Modified: branches/Cog/platforms/unix/plugins/SqueakSSL/sqUnixOpenSSL.c =================================================================== --- branches/Cog/platforms/unix/plugins/SqueakSSL/sqUnixOpenSSL.c 2015-01-30 19:03:23 UTC (rev 3239) +++ branches/Cog/platforms/unix/plugins/SqueakSSL/sqUnixOpenSSL.c 2015-01-30 19:16:19 UTC (rev 3240) @@ -174,7 +174,7 @@ SSL_set_connect_state(ssl->ssl); } - if(ssl->loglevel) printf("sqConnectSSL: BIO_write %d bytes\n", srcLen); + if(ssl->loglevel) printf("sqConnectSSL: BIO_write %ld bytes\n", srcLen); n = BIO_write(ssl->bioRead, srcBuf, srcLen); @@ -261,7 +261,7 @@ SSL_set_accept_state(ssl->ssl); } - if(ssl->loglevel) printf("sqAcceptSSL: BIO_write %d bytes\n", srcLen); + if(ssl->loglevel) printf("sqAcceptSSL: BIO_write %ld bytes\n", srcLen); n = BIO_write(ssl->bioRead, srcBuf, srcLen); @@ -331,7 +331,7 @@ if(ssl == NULL || ssl->state != SQSSL_CONNECTED) return SQSSL_INVALID_STATE; - if(ssl->loglevel) printf("sqEncryptSSL: Encrypting %d bytes\n", srcLen); + if(ssl->loglevel) printf("sqEncryptSSL: Encrypting %ld bytes\n", srcLen); nbytes = SSL_write(ssl->ssl, srcBuf, srcLen); if(nbytes != srcLen) return SQSSL_GENERIC_ERROR;

1 0

[commit][3238] Compile for 32 or 64 bit host or image, 4 or 8 byte sqInt, squeakvm or squeakvm64.
by commits＠squeakvm.org 30 Jan '15

30 Jan '15

Revision: 3238 Author: lewis Date: 2015-01-29 16:37:29 -0800 (Thu, 29 Jan 2015) Log Message: ----------- Compile for 32 or 64 bit host or image, 4 or 8 byte sqInt, squeakvm or squeakvm64. Change signature of sqGetIntPropertySSL to match declaration in Cross/plugins/SqueakSSL/SqueakSSL.h For debug printing, cast sqInt to long and print with %ld to prevent warnings when sizeof(sqInt) is 8. Reference Mantis 7751 (http://bugs.squeak.org/view.php?id=7751) Modified Paths: -------------- trunk/platforms/unix/plugins/SqueakSSL/sqUnixOpenSSL.c Modified: trunk/platforms/unix/plugins/SqueakSSL/sqUnixOpenSSL.c =================================================================== --- trunk/platforms/unix/plugins/SqueakSSL/sqUnixOpenSSL.c 2015-01-29 22:46:44 UTC (rev 3237) +++ trunk/platforms/unix/plugins/SqueakSSL/sqUnixOpenSSL.c 2015-01-30 00:37:29 UTC (rev 3238) @@ -36,8 +36,8 @@ sqInt sqCopyBioSSL(sqSSL *ssl, BIO *bio, char *dstBuf, sqInt dstLen) { int nbytes = BIO_ctrl_pending(bio); - if(ssl->loglevel) printf("sqCopyBioSSL: %d bytes pending; buffer size %d\n", - nbytes, dstLen); + if(ssl->loglevel) printf("sqCopyBioSSL: %d bytes pending; buffer size %ld\n", + nbytes, (long)dstLen); if(nbytes > dstLen) return -1; return BIO_read(bio, dstBuf, dstLen); } @@ -156,7 +156,7 @@ X509 *cert; sqSSL *ssl = sslFromHandle(handle); - if(ssl->loglevel) printf("sqConnectSSL: %x\n", (int)ssl); + if(ssl->loglevel) printf("sqConnectSSL: %lx\n", (long)ssl); /* Verify state of session */ if(ssl == NULL || (ssl->state != SQSSL_UNUSED && ssl->state != SQSSL_CONNECTING)) { @@ -172,7 +172,7 @@ SSL_set_connect_state(ssl->ssl); } - if(ssl->loglevel) printf("sqConnectSSL: BIO_write %d bytes\n", srcLen); + if(ssl->loglevel) printf("sqConnectSSL: BIO_write %ld bytes\n", (long)srcLen); n = BIO_write(ssl->bioRead, srcBuf, srcLen); @@ -202,7 +202,7 @@ if(ssl->loglevel) printf("sqConnectSSL: SSL_get_peer_certificate\n"); cert = SSL_get_peer_certificate(ssl->ssl); - if(ssl->loglevel) printf("sqConnectSSL: cert = %x\n", (int)cert); + if(ssl->loglevel) printf("sqConnectSSL: cert = %lx\n", (long)cert); /* Fail if no cert received. */ if(cert) { X509_NAME_get_text_by_NID(X509_get_subject_name(cert), @@ -252,7 +252,7 @@ SSL_set_accept_state(ssl->ssl); } - if(ssl->loglevel) printf("sqAcceptSSL: BIO_write %d bytes\n", srcLen); + if(ssl->loglevel) printf("sqAcceptSSL: BIO_write %ld bytes\n", (long)srcLen); n = BIO_write(ssl->bioRead, srcBuf, srcLen); @@ -286,7 +286,7 @@ if(ssl->loglevel) printf("sqAcceptSSL: SSL_get_peer_certificate\n"); cert = SSL_get_peer_certificate(ssl->ssl); - if(ssl->loglevel) printf("sqAcceptSSL: cert = %x\n", (int)cert); + if(ssl->loglevel) printf("sqAcceptSSL: cert = %lx\n", (long)cert); if(cert) { X509_NAME_get_text_by_NID(X509_get_subject_name(cert), @@ -322,7 +322,7 @@ if(ssl == NULL || ssl->state != SQSSL_CONNECTED) return SQSSL_INVALID_STATE; - if(ssl->loglevel) printf("sqEncryptSSL: Encrypting %d bytes\n", srcLen); + if(ssl->loglevel) printf("sqEncryptSSL: Encrypting %ld bytes\n", (long)srcLen); nbytes = SSL_write(ssl->ssl, srcBuf, srcLen); if(nbytes != srcLen) return SQSSL_GENERIC_ERROR; @@ -414,7 +414,7 @@ propID - the property id to retrieve Returns: The integer value of the property. */ -int sqGetIntPropertySSL(sqInt handle, int propID) { +sqInt sqGetIntPropertySSL(sqInt handle, sqInt propID) { sqSSL *ssl = sslFromHandle(handle); if(ssl == NULL) return 0; @@ -424,7 +424,7 @@ case SQSSL_PROP_VERSION: return 1; case SQSSL_PROP_LOGLEVEL: return ssl->loglevel; default: - if(ssl->loglevel) printf("sqGetIntPropertySSL: Unknown property ID %d\n", propID); + if(ssl->loglevel) printf("sqGetIntPropertySSL: Unknown property ID %ld\n", (long)propID); return 0; } return 0; @@ -444,7 +444,7 @@ switch(propID) { case SQSSL_PROP_LOGLEVEL: ssl->loglevel = propValue; break; default: - if(ssl->loglevel) printf("sqSetIntPropertySSL: Unknown property ID %d\n", propID); + if(ssl->loglevel) printf("sqSetIntPropertySSL: Unknown property ID %ld\n", (long)propID); return 0; } return 1;

4 5

[commit][3239] Remember to upload the itimer heartbeat newspeak linux spur vm.
by commits＠squeakvm.org 30 Jan '15

30 Jan '15

Revision: 3239 Author: eliot Date: 2015-01-30 11:03:23 -0800 (Fri, 30 Jan 2015) Log Message: ----------- Remember to upload the itimer heartbeat newspeak linux spur vm. Modified Paths: -------------- branches/Cog/scripts/uploadvms Modified: branches/Cog/scripts/uploadvms =================================================================== --- branches/Cog/scripts/uploadvms 2015-01-30 00:37:29 UTC (rev 3238) +++ branches/Cog/scripts/uploadvms 2015-01-30 19:03:23 UTC (rev 3239) @@ -124,7 +124,7 @@ test -n "$WTSPUR" && ARCHIVES="$ARCHIVES cogspurmtwin-$TAG.zip" test -n "$LNSCOG" && ARCHIVES="$ARCHIVES nsvmlinux-$TAG.tgz nsvmlinuxht-$TAG.tgz" -test -n "$LNSSPUR" && ARCHIVES="$ARCHIVES nsvmspurlinuxht-$TAG.tgz" +test -n "$LNSSPUR" && ARCHIVES="$ARCHIVES nsvmspurlinux-$TAG.tgz nsvmspurlinuxht-$TAG.tgz" test -n "$MNSCOG" && ARCHIVES="$ARCHIVES Newspeak Virtual Machine-$TAG.dmg Newspeak Virtual Machine.app-$TAG.tgz" test -n "$MNSSPUR" && ARCHIVES="$ARCHIVES Newspeak Spur Virtual Machine-$TAG.dmg Newspeak Spur Virtual Machine.app-$TAG.tgz" test -n "$WNSCOG" && ARCHIVES="$ARCHIVES nsvmwin-$TAG.zip nsvm-$TAG.msi"

1 0

[commit][3237] Make the list of x64 processor names inclusive enough to compile the Alien
by commits＠squeakvm.org 29 Jan '15

29 Jan '15

Revision: 3237 Author: eliot Date: 2015-01-29 14:46:44 -0800 (Thu, 29 Jan 2015) Log Message: ----------- Make the list of x64 processor names inclusive enough to compile the Alien plugin on 64-bit linux. Modified Paths: -------------- trunk/platforms/Cross/plugins/IA32ABI/xabicc.c Property Changed: ---------------- trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h Modified: trunk/platforms/Cross/plugins/IA32ABI/xabicc.c =================================================================== --- trunk/platforms/Cross/plugins/IA32ABI/xabicc.c 2015-01-29 22:35:45 UTC (rev 3236) +++ trunk/platforms/Cross/plugins/IA32ABI/xabicc.c 2015-01-29 22:46:44 UTC (rev 3237) @@ -9,6 +9,6 @@ # include "ia32abicc.c" #elif powerpc|ppc # include "ppcia32abicc.c" -#elif x86_64|x64 -# include "x64ia32abicc.o" +#elif x86_64|x64|__x86_64|__x86_64__ +# include "x64ia32abicc.c" #endif Property changes on: trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Tue Jan 13 10:04:25 PST 2015 + Thu Jan 29 14:46:37 PST 2015

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev January 2015