Vm-dev April 2014

vm-dev@lists.squeakfoundation.org

39 participants
112 discussions

[commit][2908] CogVM source as per VMMaker.oscog-djm.688
by commits＠squeakvm.org 29 Apr '14

29 Apr '14

Revision: 2908 Author: eliot Date: 2014-04-29 13:37:34 -0700 (Tue, 29 Apr 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-djm.688 ARM32FFIPlugin: Change dummyFloatFunction to loadFloatRegs since it is a better name. Define this function elsewhere (platforms/Cross/plugins/SqueakFFIPrims/sqFFIPlugin.c) so that the C optimizer cannot optimize it away. This fixes a problem when calling out to functions taking float parameters when compiling with optimization level > 0. VMMaker image: Add an expression to the workspace to generate plugins. Modified Paths: -------------- branches/Cog/image/Workspace.text branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/image/Workspace.text =================================================================== --- branches/Cog/image/Workspace.text 2014-04-28 23:40:49 UTC (rev 2907) +++ branches/Cog/image/Workspace.text 2014-04-29 20:37:34 UTC (rev 2908) @@ -9,3 +9,11 @@ To rebuild this image run buildsqueak45image.sh. Read the class comments of StackInterpreterSimulator and CogVMSimulator for running the simulator, and/or look at the examples in the VM Simulation Workspace. + +This is useful for generating a set of plugins to the default directory: +(VMMaker + makerFor: StackInterpreter + and: nil with: #() + to: VMMaker sourceTree, '/src' + platformDir: VMMaker sourceTree, '/platforms' + including: #(ThreadedARMFFIPlugin)) generateExternalPlugins \ No newline at end of file Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Mon Apr 28 16:37:33 PDT 2014 + Tue Apr 29 13:35:14 PDT 2014 Modified: branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c =================================================================== --- branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c 2014-04-28 23:40:49 UTC (rev 2907) +++ branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c 2014-04-29 20:37:34 UTC (rev 2908) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.686 uuid: ac4e60d6-a8f2-4bf4-bb5d-e21f243310fa + VMPluginCodeGenerator VMMaker.oscog-djm.688 uuid: 39f5e8fc-f8f0-43cc-89f4-eb61de29c7fb from - ThreadedARMFFIPlugin VMMaker.oscog-eem.686 uuid: ac4e60d6-a8f2-4bf4-bb5d-e21f243310fa + ThreadedARMFFIPlugin VMMaker.oscog-djm.688 uuid: 39f5e8fc-f8f0-43cc-89f4-eb61de29c7fb */ -static char __buildInfo[] = "ThreadedARMFFIPlugin VMMaker.oscog-eem.686 uuid: ac4e60d6-a8f2-4bf4-bb5d-e21f243310fa " __DATE__ ; +static char __buildInfo[] = "ThreadedARMFFIPlugin VMMaker.oscog-djm.688 uuid: 39f5e8fc-f8f0-43cc-89f4-eb61de29c7fb " __DATE__ ; @@ -208,7 +208,6 @@ /*** Function Prototypes ***/ static sqInt atomicTypeOf(sqInt typeSpec); static void cleanupCalloutState(CalloutState *calloutState); -static void dummyFloatFunctionwithwithwithwithwithwithwith(double d1, double d2, double d3, double d4, double d5, double d6, double d7, double d8); static sqInt externalFunctionHasStackSizeSlot(void); static sqInt ffiAddressOfstartingAtsize(sqInt rcvr, sqInt byteOffset, sqInt byteSize); static sqInt ffiArgByValuein(sqInt oop, CalloutState *calloutState); @@ -452,9 +451,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ARM32FFIPlugin VMMaker.oscog-eem.686 (i)" + "ARM32FFIPlugin VMMaker.oscog-djm.688 (i)" #else - "ARM32FFIPlugin VMMaker.oscog-eem.686 (e)" + "ARM32FFIPlugin VMMaker.oscog-djm.688 (e)" #endif ; @@ -486,11 +485,6 @@ } } -static void -dummyFloatFunctionwithwithwithwithwithwithwith(double d1, double d2, double d3, double d4, double d5, double d6, double d7, double d8) -{ -} - static sqInt externalFunctionHasStackSizeSlot(void) { @@ -1555,6 +1549,7 @@ double floatRet; sqInt i; usqLong intRet; + extern void loadFloatRegs(double, double, double, double, double, double, double, double); sqInt myThreadIndex; sqInt oop; sqInt oop1; @@ -1584,7 +1579,7 @@ setsp((calloutState->argVector)); } if (((calloutState->floatRegisterIndex)) > 0) { - dummyFloatFunctionwithwithwithwithwithwithwith((((double *) ((&(((calloutState->floatRegisters))[0])))))[0], (((double *) ((&(((calloutState->floatRegisters))[2])))))[0], (((double *) ((&(((calloutState->floatRegisters))[4])))))[0], (((double *) ((&(((calloutState->floatRegisters))[6])))))[0], (((double *) ((&(((calloutState->floatRegisters))[8])))))[0], (((double *) ((&(((calloutState->floatRegisters))[10])))))[0], (((double *) ((&(((calloutState->floatRegisters))[12])))))[0], (((double *) ((&(((calloutState->floatRegisters))[14])))))[0]); + loadFloatRegs((((double *) ((&(((calloutState->floatRegisters))[0])))))[0], (((double *) ((&(((calloutState->floatRegisters))[2])))))[0], (((double *) ((&(((calloutState->floatRegisters))[4])))))[0], (((double *) ((&(((calloutState->floatRegisters))[6])))))[0], (((double *) ((&(((calloutState->floatRegisters))[8])))))[0], (((double *) ((&(((calloutState->floatRegisters))[10])))))[0], (((double *) ((&(((calloutState->floatRegisters))[12])))))[0], (((double *) ((&(((calloutState->floatRegisters))[14])))))[0]); } /* begin atomicTypeOf: */ typeSpec = (calloutState->ffiRetHeader); @@ -1744,6 +1739,7 @@ sqInt i; sqInt i1; usqLong intRet; + extern void loadFloatRegs(double, double, double, double, double, double, double, double); sqInt myThreadIndex; sqInt oop; sqInt oop1; @@ -1961,7 +1957,7 @@ setsp((calloutState->argVector)); } if (((calloutState->floatRegisterIndex)) > 0) { - dummyFloatFunctionwithwithwithwithwithwithwith((((double *) ((&(((calloutState->floatRegisters))[0])))))[0], (((double *) ((&(((calloutState->floatRegisters))[2])))))[0], (((double *) ((&(((calloutState->floatRegisters))[4])))))[0], (((double *) ((&(((calloutState->floatRegisters))[6])))))[0], (((double *) ((&(((calloutState->floatRegisters))[8])))))[0], (((double *) ((&(((calloutState->floatRegisters))[10])))))[0], (((double *) ((&(((calloutState->floatRegisters))[12])))))[0], (((double *) ((&(((calloutState->floatRegisters))[14])))))[0]); + loadFloatRegs((((double *) ((&(((calloutState->floatRegisters))[0])))))[0], (((double *) ((&(((calloutState->floatRegisters))[2])))))[0], (((double *) ((&(((calloutState->floatRegisters))[4])))))[0], (((double *) ((&(((calloutState->floatRegisters))[6])))))[0], (((double *) ((&(((calloutState->floatRegisters))[8])))))[0], (((double *) ((&(((calloutState->floatRegisters))[10])))))[0], (((double *) ((&(((calloutState->floatRegisters))[12])))))[0], (((double *) ((&(((calloutState->floatRegisters))[14])))))[0]); } /* begin atomicTypeOf: */ typeSpec = (calloutState->ffiRetHeader); @@ -3528,6 +3524,8 @@ sqInt i3; usqLong intRet; usqLong intRet1; + extern void loadFloatRegs(double, double, double, double, double, double, double, double); + extern void loadFloatRegs1(double, double, double, double, double, double, double, double); sqInt meth; sqInt myThreadIndex; sqInt myThreadIndex1; @@ -3797,7 +3795,7 @@ setsp((calloutState->argVector)); } if (((calloutState->floatRegisterIndex)) > 0) { - dummyFloatFunctionwithwithwithwithwithwithwith((((double *) ((&(((calloutState->floatRegisters))[0])))))[0], (((double *) ((&(((calloutState->floatRegisters))[2])))))[0], (((double *) ((&(((calloutState->floatRegisters))[4])))))[0], (((double *) ((&(((calloutState->floatRegisters))[6])))))[0], (((double *) ((&(((calloutState->floatRegisters))[8])))))[0], (((double *) ((&(((calloutState->floatRegisters))[10])))))[0], (((double *) ((&(((calloutState->floatRegisters))[12])))))[0], (((double *) ((&(((calloutState->floatRegisters))[14])))))[0]); + loadFloatRegs((((double *) ((&(((calloutState->floatRegisters))[0])))))[0], (((double *) ((&(((calloutState->floatRegisters))[2])))))[0], (((double *) ((&(((calloutState->floatRegisters))[4])))))[0], (((double *) ((&(((calloutState->floatRegisters))[6])))))[0], (((double *) ((&(((calloutState->floatRegisters))[8])))))[0], (((double *) ((&(((calloutState->floatRegisters))[10])))))[0], (((double *) ((&(((calloutState->floatRegisters))[12])))))[0], (((double *) ((&(((calloutState->floatRegisters))[14])))))[0]); } /* begin atomicTypeOf: */ typeSpec = (calloutState->ffiRetHeader); @@ -4149,7 +4147,7 @@ setsp((calloutState1->argVector)); } if (((calloutState1->floatRegisterIndex)) > 0) { - dummyFloatFunctionwithwithwithwithwithwithwith((((double *) ((&(((calloutState1->floatRegisters))[0])))))[0], (((double *) ((&(((calloutState1->floatRegisters))[2])))))[0], (((double *) ((&(((calloutState1->floatRegisters))[4])))))[0], (((double *) ((&(((calloutState1->floatRegisters))[6])))))[0], (((double *) ((&(((calloutState1->floatRegisters))[8])))))[0], (((double *) ((&(((calloutState1->floatRegisters))[10])))))[0], (((double *) ((&(((calloutState1->floatRegisters))[12])))))[0], (((double *) ((&(((calloutState1->floatRegisters))[14])))))[0]); + loadFloatRegs((((double *) ((&(((calloutState1->floatRegisters))[0])))))[0], (((double *) ((&(((calloutState1->floatRegisters))[2])))))[0], (((double *) ((&(((calloutState1->floatRegisters))[4])))))[0], (((double *) ((&(((calloutState1->floatRegisters))[6])))))[0], (((double *) ((&(((calloutState1->floatRegisters))[8])))))[0], (((double *) ((&(((calloutState1->floatRegisters))[10])))))[0], (((double *) ((&(((calloutState1->floatRegisters))[12])))))[0], (((double *) ((&(((calloutState1->floatRegisters))[14])))))[0]); } /* begin atomicTypeOf: */ typeSpec2 = (calloutState1->ffiRetHeader); @@ -4349,6 +4347,8 @@ sqInt i3; usqLong intRet; usqLong intRet1; + extern void loadFloatRegs(double, double, double, double, double, double, double, double); + extern void loadFloatRegs1(double, double, double, double, double, double, double, double); sqInt myThreadIndex; sqInt myThreadIndex1; sqInt nArgs; @@ -4620,7 +4620,7 @@ setsp((calloutState->argVector)); } if (((calloutState->floatRegisterIndex)) > 0) { - dummyFloatFunctionwithwithwithwithwithwithwith((((double *) ((&(((calloutState->floatRegisters))[0])))))[0], (((double *) ((&(((calloutState->floatRegisters))[2])))))[0], (((double *) ((&(((calloutState->floatRegisters))[4])))))[0], (((double *) ((&(((calloutState->floatRegisters))[6])))))[0], (((double *) ((&(((calloutState->floatRegisters))[8])))))[0], (((double *) ((&(((calloutState->floatRegisters))[10])))))[0], (((double *) ((&(((calloutState->floatRegisters))[12])))))[0], (((double *) ((&(((calloutState->floatRegisters))[14])))))[0]); + loadFloatRegs((((double *) ((&(((calloutState->floatRegisters))[0])))))[0], (((double *) ((&(((calloutState->floatRegisters))[2])))))[0], (((double *) ((&(((calloutState->floatRegisters))[4])))))[0], (((double *) ((&(((calloutState->floatRegisters))[6])))))[0], (((double *) ((&(((calloutState->floatRegisters))[8])))))[0], (((double *) ((&(((calloutState->floatRegisters))[10])))))[0], (((double *) ((&(((calloutState->floatRegisters))[12])))))[0], (((double *) ((&(((calloutState->floatRegisters))[14])))))[0]); } /* begin atomicTypeOf: */ typeSpec = (calloutState->ffiRetHeader); @@ -4978,7 +4978,7 @@ setsp((calloutState1->argVector)); } if (((calloutState1->floatRegisterIndex)) > 0) { - dummyFloatFunctionwithwithwithwithwithwithwith((((double *) ((&(((calloutState1->floatRegisters))[0])))))[0], (((double *) ((&(((calloutState1->floatRegisters))[2])))))[0], (((double *) ((&(((calloutState1->floatRegisters))[4])))))[0], (((double *) ((&(((calloutState1->floatRegisters))[6])))))[0], (((double *) ((&(((calloutState1->floatRegisters))[8])))))[0], (((double *) ((&(((calloutState1->floatRegisters))[10])))))[0], (((double *) ((&(((calloutState1->floatRegisters))[12])))))[0], (((double *) ((&(((calloutState1->floatRegisters))[14])))))[0]); + loadFloatRegs((((double *) ((&(((calloutState1->floatRegisters))[0])))))[0], (((double *) ((&(((calloutState1->floatRegisters))[2])))))[0], (((double *) ((&(((calloutState1->floatRegisters))[4])))))[0], (((double *) ((&(((calloutState1->floatRegisters))[6])))))[0], (((double *) ((&(((calloutState1->floatRegisters))[8])))))[0], (((double *) ((&(((calloutState1->floatRegisters))[10])))))[0], (((double *) ((&(((calloutState1->floatRegisters))[12])))))[0], (((double *) ((&(((calloutState1->floatRegisters))[14])))))[0]); } /* begin atomicTypeOf: */ typeSpec2 = (calloutState1->ffiRetHeader);

1 0

VM Maker: VMMaker.oscog-djm.688.mcz
by commits＠source.squeak.org 29 Apr '14

29 Apr '14

Douglas McPherson uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-djm.688.mcz ==================== Summary ==================== Name: VMMaker.oscog-djm.688 Author: djm Time: 29 April 2014, 8:17:09.816 am UUID: 39f5e8fc-f8f0-43cc-89f4-eb61de29c7fb Ancestors: VMMaker.oscog-eem.687 Change dummyFloatFunction to loadFloatRegs since it is a better name. Define this function in a different C file (platforms/Cross/plugins/SqueakFFIPrims/sqFFIPlugin.c) so that C optimizer cannot optimize it away. This fixes a problem when calling out to functions taking float or double parameters when compiling with optimization level >0. =============== Diff against VMMaker.oscog-eem.687 =============== Item was removed: - ----- Method: ThreadedARMFFIPlugin>>dummyFloatFunction:with:with:with:with:with:with:with: (in category 'callout support') ----- - dummyFloatFunction: d1 with: d2 with: d3 with: d4 with: d5 with: d6 with: d7 with: d8 - <var: #d1 type: #'double'> - <var: #d2 type: #'double'> - <var: #d3 type: #'double'> - <var: #d4 type: #'double'> - <var: #d5 type: #'double'> - <var: #d6 type: #'double'> - <var: #d7 type: #'double'> - <var: #d8 type: #'double'> - <returnTypeC: 'void'> - <inline: false> - - ! Item was changed: ----- Method: ThreadedARMFFIPlugin>>ffiCalloutTo:SpecOnStack:in: (in category 'callout support') ----- ffiCalloutTo: procAddr SpecOnStack: specOnStack in: calloutState <var: #procAddr type: #'void *'> <var: #calloutState type: #'CalloutState *'> + <var: #loadFloatRegs declareC: 'extern void loadFloatRegs(double, double, double, double, double, double, double, double)'> "Go out, call this guy and create the return value. This *must* be inlined because of the alloca of the outgoing stack frame in ffiCall:WithFlags:NumArgs:Args:AndTypes:" + | myThreadIndex atomicType floatRet intRet loadFloatRegs | - | myThreadIndex atomicType floatRet intRet | <var: #floatRet type: #double> <var: #intRet type: #usqLong> <inline: true> self cppIf: COGMTVM ifTrue: [(calloutState callFlags anyMask: FFICallFlagThreaded) ifTrue: [myThreadIndex := interpreterProxy disownVM: 0]]. self registerArgsSlop + self cStackAlignment > 0 ifTrue: [self setsp: calloutState argVector]. calloutState floatRegisterIndex > 0 ifTrue: [self + load: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 0)) to: 'double *') at: 0) + Flo: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 2)) to: 'double *') at: 0) + a: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 4)) to: 'double *') at: 0) + t: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 6)) to: 'double *') at: 0) + R: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 8)) to: 'double *') at: 0) + e: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 10)) to: 'double *') at: 0) + g: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 12)) to: 'double *') at: 0) + s: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 14)) to: 'double *') at: 0) - dummyFloatFunction: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 0)) to: 'double *') at: 0) - with: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 2)) to: 'double *') at: 0) - with: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 4)) to: 'double *') at: 0) - with: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 6)) to: 'double *') at: 0) - with: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 8)) to: 'double *') at: 0) - with: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 10)) to: 'double *') at: 0) - with: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 12)) to: 'double *') at: 0) - with: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 14)) to: 'double *') at: 0) ]. atomicType := self atomicTypeOf: calloutState ffiRetHeader. atomicType = FFITypeSingleFloat ifTrue: [floatRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'float (*)(int, int, int, int)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3)]. atomicType = FFITypeDoubleFloat ifTrue: [floatRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'double (*)(int, int, int, int)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3)] ifFalse: [intRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'usqLong (*)(int, int, int, int)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3)]. "undo any callee argument pops because it may confuse stack management with the alloca." (self isCalleePopsConvention: calloutState callFlags) ifTrue: [self setsp: calloutState argVector]. self cppIf: COGMTVM ifTrue: [(calloutState callFlags anyMask: FFICallFlagThreaded) ifTrue: [interpreterProxy ownVM: myThreadIndex]]. "Note: Order is important here since FFIFlagPointer + FFIFlagStructure is used to represent 'typedef void* VoidPointer' and VoidPointer must be returned as pointer *not* as struct." (calloutState ffiRetHeader anyMask: FFIFlagPointer) ifTrue: [^self ffiReturnPointer: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState]. (calloutState ffiRetHeader anyMask: FFIFlagStructure) ifTrue: [^self ffiReturnStruct: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState]. (atomicType = FFITypeSingleFloat or: [atomicType = FFITypeDoubleFloat]) ifTrue: [^interpreterProxy methodReturnValue: (interpreterProxy floatObjectOf: floatRet)]. ^interpreterProxy methodReturnValue: (self ffiCreateIntegralResultOop: intRet ofAtomicType: atomicType in: calloutState)!

1 0

Re: [Vm-dev] FT2Plugin for Freetype: Freetype-Plugin-eem.70.mcz
by David T. Lewis 29 Apr '14

29 Apr '14

On Mon, Apr 28, 2014 at 10:51:17PM +0000, squeak-dev-noreply(a)lists.squeakfoundation.org wrote: > > Eliot Miranda uploaded a new version of Freetype-Plugin to project FT2Plugin for Freetype: > http://www.squeaksource.com/FreetypePlugin/Freetype-Plugin-eem.70.mcz > > ==================== Summary ==================== > > Name: Freetype-Plugin-eem.70 > Author: eem > Time: 28 April 2014, 2:50:46.158 pm > UUID: 99cf7736-f540-4e37-9afd-301215ea96b5 > Ancestors: Freetype-Plugin-eem.69 > > Several uses of the results of arrayValueOf: were *before* the interpreterProxy failed check of that result, potentially causing null pointer defererences on failure. > > Eliminated bogus uses of baseHeaderSize in favour of firstIndexableField:. > > Simplified ftHandleValueFromReceiver: and rely on calling primitiveFail in clients (as all but two cases already did). > > Simplified a few ip success: errorCode == 0. ip failed ifTrue: [^nil]'s. Eliot, This change breaks the trunk, see below. FT2Plugin has been working in both trunk and oscog for quite a while, so this is something new. Reverting to the prior version (Freetype-Plugin-dtl.66) resolves the problem. Dave Building C object FT2Plugin/CMakeFiles/FT2Plugin.dir/home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c.o /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c: In function ‘primitiveEmboldenFaceGlyphSlotOutline’: /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:534:40: warning: dereferencing ‘void *’ pointer [enabled by default] errorCode = FT_Outline_Embolden( &face->glyph->outline, strength ); ^ /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:534:40: error: request for member ‘glyph’ in something not a structure or union /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c: In function ‘primitiveGetFaceCharMap’: /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:674:16: warning: dereferencing ‘void *’ pointer [enabled by default] charmap = face->charmap; ^ /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:674:16: error: request for member ‘charmap’ in something not a structure or union /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c: In function ‘primitiveGetFaceCharMapsIntoArray’: /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:730:20: warning: dereferencing ‘void *’ pointer [enabled by default] numCharmaps = face->num_charmaps; ^ /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:730:20: error: request for member ‘num_charmaps’ in something not a structure or union /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:736:16: warning: dereferencing ‘void *’ pointer [enabled by default] charmap = face->charmaps; ^ /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:736:16: error: request for member ‘charmaps’ in something not a structure or union /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c: In function ‘primitiveGetPostscriptName’: /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:888:9: warning: assignment discards ‘const’ qualifier from pointer target type [enabled by default] buffer = FT_Get_Postscript_Name(face); ^ In file included from /usr/include/freetype2/freetype/tttables.h:25:0, from /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:38: /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c: In function ‘primitiveHasKerning’: /usr/include/freetype2/freetype/freetype.h:1134:17: warning: dereferencing ‘void *’ pointer [enabled by default] ( face->face_flags & FT_FACE_FLAG_KERNING ) ^ /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:991:21: note: in expansion of macro ‘FT_HAS_KERNING’ _return_value = (((FT_HAS_KERNING( face )) << 1) | 1); ^ /usr/include/freetype2/freetype/freetype.h:1134:17: error: request for member ‘face_flags’ in something not a structure or union ( face->face_flags & FT_FACE_FLAG_KERNING ) ^ /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:991:21: note: in expansion of macro ‘FT_HAS_KERNING’ _return_value = (((FT_HAS_KERNING( face )) << 1) | 1); ^ /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c: In function ‘primitiveLoadFaceBbox’: /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1112:12: warning: dereferencing ‘void *’ pointer [enabled by default] if (!(face->face_flags & FT_FACE_FLAG_SCALABLE)) { ^ /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1112:12: error: request for member ‘face_flags’ in something not a structure or union /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1119:61: warning: dereferencing ‘void *’ pointer [enabled by default] pointOop = interpreterProxy->makePointwithxValueyValue(face->bbox.xMin, face->bbox.yMin); ^ /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1119:61: error: request for member ‘bbox’ in something not a structure or union /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1119:78: warning: dereferencing ‘void *’ pointer [enabled by default] pointOop = interpreterProxy->makePointwithxValueyValue(face->bbox.xMin, face->bbox.yMin); ^ /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1119:78: error: request for member ‘bbox’ in something not a structure or union /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1123:61: warning: dereferencing ‘void *’ pointer [enabled by default] pointOop = interpreterProxy->makePointwithxValueyValue(face->bbox.xMax, face->bbox.yMax); ^ /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1123:61: error: request for member ‘bbox’ in something not a structure or union /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1123:78: warning: dereferencing ‘void *’ pointer [enabled by default] pointOop = interpreterProxy->makePointwithxValueyValue(face->bbox.xMax, face->bbox.yMax); ^ /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1123:78: error: request for member ‘bbox’ in something not a structure or union /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c: In function ‘primitiveLoadFaceFields’: /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1167:63: warning: dereferencing ‘void *’ pointer [enabled by default] interpreterProxy->storeIntegerofObjectwithValue(1, rcvr, face->num_faces); ^ /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1167:63: error: request for member ‘num_faces’ in something not a structure or union /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1168:63: warning: dereferencing ‘void *’ pointer [enabled by default] interpreterProxy->storeIntegerofObjectwithValue(2, rcvr, face->face_index); ^ /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1168:63: error: request for member ‘face_index’ in something not a structure or union /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1169:63: warning: dereferencing ‘void *’ pointer [enabled by default] interpreterProxy->storeIntegerofObjectwithValue(3, rcvr, face->face_flags); ^ /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1169:63: error: request for member ‘face_flags’ in something not a structure or union /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1170:63: warning: dereferencing ‘void *’ pointer [enabled by default] interpreterProxy->storeIntegerofObjectwithValue(4, rcvr, face->style_flags); ^ /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1170:63: error: request for member ‘style_flags’ in something not a structure or union /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1171:63: warning: dereferencing ‘void *’ pointer [enabled by default] interpreterProxy->storeIntegerofObjectwithValue(5, rcvr, face->num_glyphs); ^ /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1171:63: error: request for member ‘num_glyphs’ in something not a structure or union /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1173:42: warning: dereferencing ‘void *’ pointer [enabled by default] strOop = ftAllocateStringForPointer(face->family_name); ^ /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1173:42: error: request for member ‘family_name’ in something not a structure or union /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1177:42: warning: dereferencing ‘void *’ pointer [enabled by default] strOop = ftAllocateStringForPointer(face->style_name); ^ /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1177:42: error: request for member ‘style_name’ in something not a structure or union /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1180:63: warning: dereferencing ‘void *’ pointer [enabled by default] interpreterProxy->storeIntegerofObjectwithValue(8, rcvr, face->num_fixed_sizes); ^ /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1180:63: error: request for member ‘num_fixed_sizes’ in something not a structure or union /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1181:64: warning: dereferencing ‘void *’ pointer [enabled by default] interpreterProxy->storeIntegerofObjectwithValue(10, rcvr, face->num_charmaps); ^ /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1181:64: error: request for member ‘num_charmaps’ in something not a structure or union /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1182:10: warning: dereferencing ‘void *’ pointer [enabled by default] if (face->face_flags & FT_FACE_FLAG_SCALABLE) { ^ /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1182:10: error: request for member ‘face_flags’ in something not a structure or union /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1187:65: warning: dereferencing ‘void *’ pointer [enabled by default] interpreterProxy->storeIntegerofObjectwithValue(13, rcvr, face->units_per_EM); ^ /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1187:65: error: request for member ‘units_per_EM’ in something not a structure or union /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1188:65: warning: dereferencing ‘void *’ pointer [enabled by default] interpreterProxy->storeIntegerofObjectwithValue(14, rcvr, face->ascender); ^ /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1188:65: error: request for member ‘ascender’ in something not a structure or union /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1189:65: warning: dereferencing ‘void *’ pointer [enabled by default] interpreterProxy->storeIntegerofObjectwithValue(15, rcvr, face->descender); ^ /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1189:65: error: request for member ‘descender’ in something not a structure or union /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1190:65: warning: dereferencing ‘void *’ pointer [enabled by default] interpreterProxy->storeIntegerofObjectwithValue(16, rcvr, face->height); ^ /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1190:65: error: request for member ‘height’ in something not a structure or union /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1191:65: warning: dereferencing ‘void *’ pointer [enabled by default] interpreterProxy->storeIntegerofObjectwithValue(17, rcvr, face->max_advance_width); ^ /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1191:65: error: request for member ‘max_advance_width’ in something not a structure or union /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1192:65: warning: dereferencing ‘void *’ pointer [enabled by default] interpreterProxy->storeIntegerofObjectwithValue(18, rcvr, face->max_advance_height); ^ /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1192:65: error: request for member ‘max_advance_height’ in something not a structure or union /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1193:65: warning: dereferencing ‘void *’ pointer [enabled by default] interpreterProxy->storeIntegerofObjectwithValue(19, rcvr, face->underline_position); ^ /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1193:65: error: request for member ‘underline_position’ in something not a structure or union /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1194:65: warning: dereferencing ‘void *’ pointer [enabled by default] interpreterProxy->storeIntegerofObjectwithValue(20, rcvr, face->underline_thickness); ^ /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1194:65: error: request for member ‘underline_thickness’ in something not a structure or union /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c: In function ‘primitiveLoadGlyphSlotFromFace’: /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1285:11: warning: dereferencing ‘void *’ pointer [enabled by default] gs = face->glyph; ^ /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1285:11: error: request for member ‘glyph’ in something not a structure or union /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c: In function ‘primitiveLoadOutlineArraysFromFace’: /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1376:11: warning: dereferencing ‘void *’ pointer [enabled by default] gs = face->glyph; ^ /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1376:11: error: request for member ‘glyph’ in something not a structure or union /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c: In function ‘primitiveLoadOutlineSizesFromFace’: /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1474:11: warning: dereferencing ‘void *’ pointer [enabled by default] gs = face->glyph; ^ /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1474:11: error: request for member ‘glyph’ in something not a structure or union /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c: In function ‘primitiveNewMemoryFaceFromExternalMemoryAndIndex’: /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1594:54: error: expected expression before ‘return’ ifNil(memPointer, interpreterProxy->primitiveFail(),return null); ^ /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c: In function ‘primitiveNumberOfOutlineCountours’: /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1651:11: warning: dereferencing ‘void *’ pointer [enabled by default] gs = face->glyph; ^ /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1651:11: error: request for member ‘glyph’ in something not a structure or union /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c: In function ‘primitiveRenderGlyphIntoForm’: /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1708:50: warning: dereferencing ‘void *’ pointer [enabled by default] errorCode = FT_Outline_Get_Bitmap(library, &face->glyph->outline, &bitmap); ^ /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1708:50: error: request for member ‘glyph’ in something not a structure or union /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c: In function ‘primitiveRenderGlyphIntoFormWithRenderMode’: /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1761:50: warning: dereferencing ‘void *’ pointer [enabled by default] errorCode = FT_Outline_Get_Bitmap(library, &face->glyph->outline, &bitmap); ^ /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1761:50: error: request for member ‘glyph’ in something not a structure or union /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c: In function ‘primitiveTransformFaceGlyphSlotOutline’: /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1957:30: warning: dereferencing ‘void *’ pointer [enabled by default] FT_Outline_Transform( &face->glyph->outline, &matrix ); ^ /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:1957:30: error: request for member ‘glyph’ in something not a structure or union /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c: In function ‘primitiveTranslateFaceGlyphSlotOutline’: /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:2001:30: warning: dereferencing ‘void *’ pointer [enabled by default] FT_Outline_Translate( &face->glyph->outline, delta.x, delta.y ); ^ /home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c:2001:30: error: request for member ‘glyph’ in something not a structure or union make[2]: *** [FT2Plugin/CMakeFiles/FT2Plugin.dir/home/lewis/squeak/VM/src/plugins/FT2Plugin/FT2Plugin.c.o] Error 1 make[1]: *** [FT2Plugin/CMakeFiles/FT2Plugin.dir/all] Error 2 make: *** [all] Error 2

1 0

[commit][2907] [ppc32|ia32]abicc.c: Don' t define BytesPerOop or BaseHeaderSize.
by commits＠squeakvm.org 28 Apr '14

28 Apr '14

Revision: 2907 Author: eliot Date: 2014-04-28 16:40:49 -0700 (Mon, 28 Apr 2014) Log Message: ----------- [ppc32|ia32]abicc.c: Don't define BytesPerOop or BaseHeaderSize. These should be taken from interp.h. Modified Paths: -------------- trunk/platforms/Cross/plugins/IA32ABI/ia32abicc.c trunk/platforms/Cross/plugins/IA32ABI/ppc32abicc.c Modified: trunk/platforms/Cross/plugins/IA32ABI/ia32abicc.c =================================================================== --- trunk/platforms/Cross/plugins/IA32ABI/ia32abicc.c 2014-04-28 23:39:31 UTC (rev 2906) +++ trunk/platforms/Cross/plugins/IA32ABI/ia32abicc.c 2014-04-28 23:40:49 UTC (rev 2907) @@ -44,18 +44,6 @@ #endif struct VirtualMachine* interpreterProxy; -#if defined(SQ_IMAGE32) -# define BytesPerOop 4 -#elif defined(SQ_IMAGE64) -# define BytesPerOop 8 -#else -# error cannot determine image word size/object header size -#endif - -#if !defined(BaseHeaderSize) -# define BaseHeaderSize BytesPerOop -#endif - #ifdef _MSC_VER # define alloca _alloca #endif Modified: trunk/platforms/Cross/plugins/IA32ABI/ppc32abicc.c =================================================================== --- trunk/platforms/Cross/plugins/IA32ABI/ppc32abicc.c 2014-04-28 23:39:31 UTC (rev 2906) +++ trunk/platforms/Cross/plugins/IA32ABI/ppc32abicc.c 2014-04-28 23:40:49 UTC (rev 2907) @@ -85,16 +85,6 @@ #endif struct VirtualMachine* interpreterProxy; -#if defined(SQ_IMAGE32) -# define BytesPerOop 4 -#elif defined(SQ_IMAGE64) -# define BytesPerOop 8 -#else -# error cannot determine image word size/object header size -#endif - -#define BaseHeaderSize BytesPerOop - #ifdef _MSC_VER # define alloca _alloca #endif @@ -331,4 +321,4 @@ #endif return mem; } -#endif \ No newline at end of file +#endif

1 0

[commit][2906] sqUnixX11.c:
by commits＠squeakvm.org 28 Apr '14

28 Apr '14

Revision: 2906 Author: eliot Date: 2014-04-28 16:39:31 -0700 (Mon, 28 Apr 2014) Log Message: ----------- sqUnixX11.c: Include the right X11 include file to pull in the def for XK_equal (keysym.h vs keysymdef.h). Don't define BytesPerOop or BaseHeaderSize; these should be taken from interp.h. Add the XDisplayControlPlugin to the plugins loaded by the image build script. Modified Paths: -------------- branches/Cog/image/BuildSqueak45Image.st branches/Cog/platforms/unix/vm-display-X11/sqUnixX11.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/image/BuildSqueak45Image.st =================================================================== --- branches/Cog/image/BuildSqueak45Image.st 2014-04-28 19:25:13 UTC (rev 2905) +++ branches/Cog/image/BuildSqueak45Image.st 2014-04-28 23:39:31 UTC (rev 2906) @@ -9,7 +9,8 @@ ('http://www.squeaksource.com/OSProcess' 4 ('OSProcess')) ('http://www.squeaksource.com/OSProcessPlugin' 9 ('VMConstruction-Plugins-OSProcessPlugin.oscog')) ('http://www.squeaksource.com/rb' 5 ('AST-Core' 'AST-Semantic' 'AST-Tests-Core' 'AST-Tests-Semantic' 'Refactoring-Changes' 'Refactoring-Core' 'Refactoring-Environment' 'Refactoring-Tests-Changes' 'Refactoring-Tests-Core' 'Refactoring-Tests-Environment')) - ('http://www.squeaksource.com/Speech' 2 ('SharedPool-Speech' ))). + ('http://www.squeaksource.com/Speech' 2 ('SharedPool-Speech' )) + ('http://www.squeaksource.com/XDCP' 9 ('VMConstruction-Plugins-XDisplayControlPlugin' ))). load := (manifest collect: [:tuple| Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Mon Apr 28 12:20:13 PDT 2014 + Mon Apr 28 16:37:33 PDT 2014 Modified: branches/Cog/platforms/unix/vm-display-X11/sqUnixX11.c =================================================================== --- branches/Cog/platforms/unix/vm-display-X11/sqUnixX11.c 2014-04-28 19:25:13 UTC (rev 2905) +++ branches/Cog/platforms/unix/vm-display-X11/sqUnixX11.c 2014-04-28 23:39:31 UTC (rev 2906) @@ -113,7 +113,7 @@ #include <X11/Xatom.h> #define XK_MISCELLANY #define XK_XKB_KEYS -#include <X11/keysymdef.h> +#include <X11/keysym.h> /* /not/ keysymdef.h */ #if defined(SUGAR) # include <X11/XF86keysym.h> #endif @@ -138,16 +138,6 @@ #define isAligned(T, V) (((V) % sizeof(T)) == 0) #define align(T, V) (((V) / sizeof(T)) * sizeof(T)) -#if defined(SQ_IMAGE32) -# define BytesPerOop 4 -#elif defined(SQ_IMAGE64) -# define BytesPerOop 8 -#else -# error cannot determine image word size -#endif - -#define BaseHeaderSize BytesPerOop - /*** Variables -- Imported from Virtual Machine ***/ /*** Variables -- X11 Related ***/

1 0

VM Maker: VMMaker.oscog-eem.687.mcz
by commits＠source.squeak.org 28 Apr '14

28 Apr '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.687.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.687 Author: eem Time: 28 April 2014, 2:56:03.445 pm UUID: 501501b0-dad7-4305-b25e-96ed74c92fd2 Ancestors: VMMaker.oscog-eem.686 Fix source paths in the Squeak VM config. Exclude the FT2Plugin; it's not robust enough to load and generate yet. =============== Diff against VMMaker.oscog-eem.686 =============== Item was changed: ----- Method: VMMaker class>>generateSqueakCogVMWithInterpreterClass: (in category 'confs-support') ----- generateSqueakCogVMWithInterpreterClass: interpreterClass ^VMMaker generate: interpreterClass and: StackToRegisterMappingCogit + to: (FileDirectory default pathFromURI: self sourceTree, '/src') + platformDir: (FileDirectory default pathFromURI: self sourceTree, '/platforms') - to: (FileDirectory default pathFromURI: 'oscogvm/src') - platformDir: (FileDirectory default pathFromURI: 'oscogvm/platforms') including:#( ADPCMCodecPlugin AsynchFilePlugin BalloonEnginePlugin B3DAcceleratorPlugin BMPReadWriterPlugin BitBltSimulation BochsIA32Plugin CameraPlugin CroquetPlugin DSAPlugin DeflatePlugin DropPlugin + "FT2Plugin" FFTPlugin FileCopyPlugin FilePlugin FloatArrayPlugin FloatMathPlugin - FT2Plugin FFTPlugin FileCopyPlugin FilePlugin FloatArrayPlugin FloatMathPlugin GeniePlugin HostWindowPlugin IA32ABIPlugin ImmX11Plugin InternetConfigPlugin JPEGReadWriter2Plugin JPEGReaderPlugin JoystickTabletPlugin KlattSynthesizerPlugin LargeIntegersPlugin LocalePlugin MIDIPlugin MacMenubarPlugin Matrix2x3Plugin MiscPrimitivePlugin Mpeg3Plugin QuicktimePlugin RePlugin ScratchPlugin SecurityPlugin SerialPlugin SocketPlugin SoundCodecPlugin SoundGenerationPlugin SoundPlugin SqueakSSLPlugin StarSqueakPlugin ThreadedFFIPlugin ThreadedARMFFIPlugin ThreadedIA32FFIPlugin UnicodePlugin UnixAioPlugin UUIDPlugin UnixOSProcessPlugin Win32OSProcessPlugin VMProfileLinuxSupportPlugin VMProfileMacSupportPlugin WeDoPlugin) !

1 0

FT2Plugin for Freetype: Freetype-Plugin-eem.70.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 28 Apr '14

28 Apr '14

Eliot Miranda uploaded a new version of Freetype-Plugin to project FT2Plugin for Freetype: http://www.squeaksource.com/FreetypePlugin/Freetype-Plugin-eem.70.mcz ==================== Summary ==================== Name: Freetype-Plugin-eem.70 Author: eem Time: 28 April 2014, 2:50:46.158 pm UUID: 99cf7736-f540-4e37-9afd-301215ea96b5 Ancestors: Freetype-Plugin-eem.69 Several uses of the results of arrayValueOf: were *before* the interpreterProxy failed check of that result, potentially causing null pointer defererences on failure. Eliminated bogus uses of baseHeaderSize in favour of firstIndexableField:. Simplified ftHandleValueFromReceiver: and rely on calling primitiveFail in clients (as all but two cases already did). Simplified a few ip success: errorCode == 0. ip failed ifTrue: [^nil]'s.

1 0

[commit][2905] CogVM source as per VMMaker.oscog-eem.686.
by commits＠squeakvm.org 28 Apr '14

28 Apr '14

Revision: 2905 Author: eliot Date: 2014-04-28 12:25:13 -0700 (Mon, 28 Apr 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.686. Fix the module name in ThreadedFFIPlugin. It needs to answer the generic name (SqueakFFIPrims), not the specific platform name (e.g. IA32FFIPlugin) under which each plugin is generated. Modified Paths: -------------- branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/IA32FFIPlugin.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Thu Apr 24 14:27:32 PDT 2014 + Mon Apr 28 12:20:13 PDT 2014 Modified: branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c =================================================================== --- branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c 2014-04-24 21:29:08 UTC (rev 2904) +++ branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c 2014-04-28 19:25:13 UTC (rev 2905) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.685 uuid: 07bc1e83-6566-4de0-af79-d6c7874ffcdd + VMPluginCodeGenerator VMMaker.oscog-eem.686 uuid: ac4e60d6-a8f2-4bf4-bb5d-e21f243310fa from - ThreadedARMFFIPlugin VMMaker.oscog-eem.685 uuid: 07bc1e83-6566-4de0-af79-d6c7874ffcdd + ThreadedARMFFIPlugin VMMaker.oscog-eem.686 uuid: ac4e60d6-a8f2-4bf4-bb5d-e21f243310fa */ -static char __buildInfo[] = "ThreadedARMFFIPlugin VMMaker.oscog-eem.685 uuid: 07bc1e83-6566-4de0-af79-d6c7874ffcdd " __DATE__ ; +static char __buildInfo[] = "ThreadedARMFFIPlugin VMMaker.oscog-eem.686 uuid: ac4e60d6-a8f2-4bf4-bb5d-e21f243310fa " __DATE__ ; @@ -255,7 +255,7 @@ static sqInt ffiSupportsCallingConvention(sqInt aCallingConvention); static sqInt ffiValidateExternalDataAtomicType(sqInt oop, sqInt atomicType); static VirtualMachine * getInterpreter(void); -EXPORT(const char*) getModuleName(void); +EXPORT(const char *) getModuleName(void); static sqInt halt(void); EXPORT(sqInt) initialiseModule(void); static sqInt isAlien(sqInt anOop); @@ -452,9 +452,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ARM32FFIPlugin VMMaker.oscog-eem.685 (i)" + "ARM32FFIPlugin VMMaker.oscog-eem.686 (i)" #else - "ARM32FFIPlugin VMMaker.oscog-eem.685 (e)" + "ARM32FFIPlugin VMMaker.oscog-eem.686 (e)" #endif ; @@ -3405,10 +3405,10 @@ it is loaded to check if it does really contain the module we're thinking it contains. This is important! */ -EXPORT(const char*) +EXPORT(const char *) getModuleName(void) { - return moduleName; + return "SqueakFFIPrims"; } static sqInt @@ -3456,7 +3456,7 @@ static sqInt msg(char *s) { - fprintf(stderr, "\n%s: %s", moduleName, s); + fprintf(stderr, "\n%s: %s", getModuleName(), s); return 0; } Modified: branches/Cog/src/plugins/SqueakFFIPrims/IA32FFIPlugin.c =================================================================== --- branches/Cog/src/plugins/SqueakFFIPrims/IA32FFIPlugin.c 2014-04-24 21:29:08 UTC (rev 2904) +++ branches/Cog/src/plugins/SqueakFFIPrims/IA32FFIPlugin.c 2014-04-28 19:25:13 UTC (rev 2905) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.685 uuid: 07bc1e83-6566-4de0-af79-d6c7874ffcdd + VMPluginCodeGenerator VMMaker.oscog-eem.686 uuid: ac4e60d6-a8f2-4bf4-bb5d-e21f243310fa from - ThreadedIA32FFIPlugin VMMaker.oscog-eem.685 uuid: 07bc1e83-6566-4de0-af79-d6c7874ffcdd + ThreadedIA32FFIPlugin VMMaker.oscog-eem.686 uuid: ac4e60d6-a8f2-4bf4-bb5d-e21f243310fa */ -static char __buildInfo[] = "ThreadedIA32FFIPlugin VMMaker.oscog-eem.685 uuid: 07bc1e83-6566-4de0-af79-d6c7874ffcdd " __DATE__ ; +static char __buildInfo[] = "ThreadedIA32FFIPlugin VMMaker.oscog-eem.686 uuid: ac4e60d6-a8f2-4bf4-bb5d-e21f243310fa " __DATE__ ; @@ -247,7 +247,7 @@ static sqInt ffiSupportsCallingConvention(sqInt aCallingConvention); static sqInt ffiValidateExternalDataAtomicType(sqInt oop, sqInt atomicType); static VirtualMachine * getInterpreter(void); -EXPORT(const char*) getModuleName(void); +EXPORT(const char *) getModuleName(void); static sqInt halt(void); EXPORT(sqInt) initialiseModule(void); static sqInt isAlien(sqInt anOop); @@ -443,9 +443,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "IA32FFIPlugin VMMaker.oscog-eem.685 (i)" + "IA32FFIPlugin VMMaker.oscog-eem.686 (i)" #else - "IA32FFIPlugin VMMaker.oscog-eem.685 (e)" + "IA32FFIPlugin VMMaker.oscog-eem.686 (e)" #endif ; @@ -3006,10 +3006,10 @@ it is loaded to check if it does really contain the module we're thinking it contains. This is important! */ -EXPORT(const char*) +EXPORT(const char *) getModuleName(void) { - return moduleName; + return "SqueakFFIPrims"; } static sqInt @@ -3057,7 +3057,7 @@ static sqInt msg(char *s) { - fprintf(stderr, "\n%s: %s", moduleName, s); + fprintf(stderr, "\n%s: %s", getModuleName(), s); return 0; }

1 0

VM Maker: VMMaker.oscog-eem.686.mcz
by commits＠source.squeak.org 28 Apr '14

28 Apr '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.686.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.686 Author: eem Time: 28 April 2014, 10:18:14.827 am UUID: ac4e60d6-a8f2-4bf4-bb5d-e21f243310fa Ancestors: VMMaker.oscog-eem.685 Fix the module name in ThreadedFFIPlugin. It needs to answer the generic name (SqueakFFIPrims), not the specific platform name (e.g. IA32FFIPlugin) under which each plugin is generated. =============== Diff against VMMaker.oscog-eem.685 =============== Item was changed: ----- Method: ThreadedFFIPlugin class>>moduleName (in category 'translation') ----- moduleName "IMPORTANT: IF YOU CHANGE THE NAME OF THIS PLUGIN YOU MUST CHANGE + Interpreter>>primitiveCalloutToFFI *and* ThreadedFFIPlugin>>getModuleName - Interpreter>>primitiveCalloutToFFI TO REFLECT THE CHANGE." ^#('SqueakFFIPrims' 'FFIPlugin') first! Item was changed: ----- Method: ThreadedFFIPlugin class>>prepareToBeAddedToCodeGenerator: (in category 'translation') ----- prepareToBeAddedToCodeGenerator: aCodeGen + "Remove the methods of ThreadedFFIPlugin any concrete subclass overrides, + and the methods of InterpreterPlugin that ThreadedFFIPlugin overrides." + self selectors do: + [:sel| + (superclass includesSelector: sel) ifTrue: + [aCodeGen removeMethodForSelector: sel]]! - "Remove the methods of ThreadedFFIPlugin any concrete subclass overrides." - self class ~~ thisContext methodClass ifTrue: - [self selectors do: - [:sel| - (superclass includesSelector: sel) ifTrue: - [aCodeGen removeMethodForSelector: sel]]]! Item was added: + ----- Method: ThreadedFFIPlugin>>getModuleName (in category 'initialize') ----- + getModuleName + "Note: This is hardcoded so it can be run from Squeak. + The module name is used for validating a module *after* + it is loaded to check if it does really contain the module + we're thinking it contains. This is important!!" + <returnTypeC: 'const char *'> + <export: true> + ^'SqueakFFIPrims'! Item was added: + ----- Method: ThreadedFFIPlugin>>msg: (in category 'debugging') ----- + msg: s + <var: #s type: 'char *'> + self cCode: 'fprintf(stderr, "\n%s: %s", getModuleName(), s)' + inSmalltalk: [super msg: s]. + ^0!

1 0

[Vm-dev] XDisplayControlPlugin: VMConstruction-Plugins-XDisplayControlPlugin-dtl.10.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 27 Apr '14

27 Apr '14

Dave Lewis uploaded a new version of VMConstruction-Plugins-XDisplayControlPlugin to project XDisplayControlPlugin: http://www.squeaksource.com/XDCP/VMConstruction-Plugins-XDisplayControlPlug… ==================== Summary ==================== Name: VMConstruction-Plugins-XDisplayControlPlugin-dtl.10 Author: dtl Time: 27 April 2014, 11:59:23.445 am UUID: 2fadcdb8-69b6-4af0-bd02-fc59400ebd07 Ancestors: VMConstruction-Plugins-XDisplayControlPlugin-dtl.9 Remove an unreferenced variable declaration. No effect on generated code.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev April 2014