Vm-dev February 2016

vm-dev@lists.squeakfoundation.org

27 participants
141 discussions

New Cog VMs available as per VMMaker.oscog-eem.1679/r3602
by Eliot Miranda 20 Feb '16

20 Feb '16

Hi All, first of all, apologies for the long wait for new VMs. I know there are bugs that these VMs address and that it's been 5 months since VMs were last made is something I regret. The wait was due to my developing the 64-bit Spur Cog JIT VM which required surgery not just to the Cogit but also to Slang. I beg your forgiveness. Secondly, the Mac VMs are much changed, using John McIntosh's Cocoa support libraries. The old Carbon UI VMs are history. That means that Cog supports building on contemporary Mac OS releases. These VMs were built on 10.9; I like the 3D look much more than the 10.10 one ;-). The VMs are also signed, so installing them should be easier. Thirdly, these VMs include 64-bit JIT support. There is an updated squeak trunk image at http://www.mirandabanda.org/files/Cog/SpurImages for you to try. As yet the 64-bit Vms do not include an FFI plugin. I hope to rectify this soon. Finally I have included Pharo Mac VMs, not to displace the official Pharo VMs, but to test my build process. I hope that in very few months the svn repository will be moed to githup and that Esteban and I will build official VMs from the same repository. The VMs are here: http://www.mirandabanda.org/files/Cog/VM/VM.r3602 CogVM binaries as per VMMaker.oscog-eem.1679/r3602 Include 64-bit Spur VMs for Mac OS X x64 and Linux x64. N.B. As yet these VMs lack FFI support. Move all Mac OS X VMs to the Cocoa libraries. Minimum supported version should be 10.6.x. The Mac OS X VMs are signed and so should install properly without having to disable the launch security checks. Bug Fixes and Improvements: General: Add vmParameter 20 to answer the utc microseconds at startup. CoInterpreter: Remove the atCache from the CoInterpreter. It's of little benefit given the Cogit. ceSend: et al need to add looked up methods to the method cache, otherwise methods only found through machine code sends will not be jitted. Fix slip in maybeSelectorOfMethod: which will improve back traces including methods containing pragmas (including primitives). Modify secret primtiive 161, primitiveSetIdentityHash so that with 0 args it answers whether an object has an identity hash. This is vacuously true for V3, but is meaningful in Spur. Cogit: Fix /horrible/ bug with primitive error codes and fixups. The adjustment of the initialPC to skip the primitive and error code, if any, was done after generating fixups for backward branches, and hence these branches were bogus. Object>>shallowCopy in Spur is subject to this, but amazingly enough it has not surfaced before now. Fix this by adjusting the initialPC before scanMethod scans for fixups. Fix bug in Spur machine-code at:put: on 32-bit bits objects; method failed to fail for negative values. Fill unused portions of methods with the stop instruction, not nop. Explicitly initialize the code zone with stops. Explicitly clear the reclaimed portion of the method zone after a compaction. Include the reclaimed portion of the method zone in the I-cache flush after a compaction: no point in leaving it in cache since it isn't a valid call/jump target. Spur: Maintain the survivor count on scavenge. Fix start up of images containing >= 16 segments. The old code assumed numSegments < 16 and failed to grow the segment records, resulting in objects in segments greater than 15 to not be swizzled, and a resulting crash. Spur Cogit: Support CompiledMethod indexing in genPrimitiveAt[Put]. Hence fix the regression in at:[put:] whereby in Spur one could access the literals part of a method as bytes. Add a machine-code primitive for objectAt: to provide fast literal and header access on Spur. Add 16-bit indexability to Spur. Generate slimmer code for positive32BitValueOf: on 64-bit Spur. Fix a bug with out-of-place two-way become, which got the hash copy the wrong way round. By default, the hash stays with the reference in two-way become. Fix what appears to be a compiler bug with in-place two-way-become by treating the headers to be swapped so that remembered flags are swapped and hash bits are swapped if required. This fixes a bug with in-place two-way become of objects that are the same size on the heap. One object's contents would not be updated correctly. Implement ephemeron queue primitive. Add an image flag that controls the finalization support (StackInterpreter instVar newFinalization). If unset, finalization is as currently expected; WeakArray finalizes all WeakArrays in its registries on each finalization (which does not scale!). If set, then both fired ephemerons and bereaved weak arrays are added to the finalization queue and the finalization semaphore is signalled. In this regime the image is expected to send mourn to each element of the queue, and weak arrays will send themselves finalize in mourn, side-stepping the finalizeValues steps and rendering WeakArray's FinalizationDependents and WeakRegistry obsolete. The bit is set via Smalltalk vmParameterAt: 48 put: ((Smalltalk vmParameterAt: 48) bitOr: 64). Slang: Fix bad regression in type inference from VMMaker.oscog-eem.1587. returnTypeForSend:in: can only default return types to sqInt for unknown selectors. The rewrite in VMMaker.oscog-eem.1587 inadvertently defaulted the return type of known methods whose return type was yet to be determined to sqInt. The fix is to only default to sqInt if there is no known method for the given selector. This fixes, for instance, the weird flipping of the type of 32-bit Spur's headerWhileForwardingOf:,which should always be #sqLong. Fix bad bug in type inferrence. Avoid computing variable and return types prematurely i.e. don't derive types from as-yet-untyped methods. Fix baaaad bug in node:typeCompatibleWith:inliningInto:in: which was looking up the type of the formal parameter in inlining in the target method, not the method being inlined! Newspeak: Fix bug in MNU for cogged dynamic super sends - should start looking for #doesNotUnderstand: in the superclass not the receiver class. Unify MNU lookup between absent and present receiver sends as a result. Further fix outer send MNU by not confusing lkupClass and lkupClassTag. Push setting lkupClassTag down to clarify it is for new cache entries. Plugins: Fix the FilePlugin's unnecessary fullGC on Spur. Include the file sync prim in the FilePrims plugin. ThreadedFFIPlugin: - ExternalAddress now are taken correctly (nor as ByteArray or Alien, because they are different beasts). - allow pushing of pointers to any type (into a ByteArray, an ExternalAddress or an Alien), to allow passing parameters style int*, float*, etc. - allow reading in memory to allow read chunks of ByteArray Added ThreadedFFIPlugin>>#primitiveLoadSymbolFromModule (copy and adapt from IA32ABIPlugin). Fix coercion problems on FFI plugin (IA32 & ARM) - character were not correctly mapped back - floats were not being well checked - external addressed needs to be treated as aliens for the purpose of coercing them as pointers (bad regression by Eliot) Alien Plugins: Fix missing primitive failure for Alien typeAt: 0 [put:]. Add word accessors to Alien. _,,,^..^,,,_ best, Eliot

3 6

VM Maker: VMMaker.oscog-eem.1685.mcz
by commits＠source.squeak.org 20 Feb '16

20 Feb '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1685.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1685 Author: eem Time: 19 February 2016, 5:07:14.475113 pm UUID: 59633283-8843-4826-a68a-b23ea22d1fa8 Ancestors: VMMaker.oscog-eem.1684 Slang: Emit constants before types to allow constant names to be used when defining types, e.g. for array extents. Threaded FFI plugin: Use above facility for neater declarations. Enable generation of the ThreadedX64Win64FFIPlugin. Declare its number of int and float reg args correctly. =============== Diff against VMMaker.oscog-eem.1684 =============== Item was changed: ----- Method: CCodeGenerator>>emitCCodeOn:doInlining:doAssertions: (in category 'C code generator') ----- emitCCodeOn: aStream doInlining: inlineFlag doAssertions: assertionFlag "Emit C code for all methods in the code base onto the given stream. All inlined method calls should already have been expanded." | verbose methodList | "method preparation" verbose := false. self prepareMethods. verbose ifTrue: [ self printUnboundCallWarnings. self printUnboundVariableReferenceWarnings. logger cr. ]. assertionFlag ifFalse: [ self removeAssertions ]. self doInlining: inlineFlag. "code generation" "If we're outputting the VM put the main interpreter loop first for two reasons. 1, so that the dispdbg.h header included at the bytecode dispatch can define macros that affect all C code in the interpreter, and 2, so that all primitive functions will come after and have relatively high addresses. This provides safety in the use of primitiveFunctionPointer as a function pointer and an index by trying to ensure that primitives have addresses much higher than any indices." methodList := self sortMethods: methods. (methods includesKey: #interpret) ifTrue: [methodList := { methods at: #interpret }, (methodList copyWithout: (methods at: #interpret))]. "clean out no longer valid variable names and then handle any global variable usage in each method" methodList do: [:m | self checkForGlobalUsage: (m removeUnusedTempsAndNilIfRequiredIn: self) in: m]. self localizeGlobalVariables. self emitCHeaderOn: aStream. - self emitCTypesOn: aStream. self emitCConstantsOn: aStream. + self emitCTypesOn: aStream. "Emitting types after constants allows use of constant names, e.g. in declaring arrays." self emitCFunctionPrototypes: methodList on: aStream. self emitCVariablesOn: aStream. self emitCMacros: methodList on: aStream. self emitCMethods: methodList on: aStream. self emitExportsOn: aStream. ! Item was changed: ----- Method: ThreadedFFICalloutState class>>instVarNamesAndTypesForTranslationDo: (in category 'translation') ----- instVarNamesAndTypesForTranslationDo: aBinaryBlock "enumerate aBinaryBlock with the names and C type strings for the inst vars to include in a ThreadedFFICalloutState struct." self instVarNames do: [:ivn| aBinaryBlock value: ivn value: (ivn caseOf: { ['argVector'] -> [#'char *']. ['currentArg'] -> [#'char *']. + ['limit'] -> [#'char *']. - ['limit'] -> [#'char *']. ['ffiArgSpec'] -> [#'void *']. + ['stringArgs'] -> [{#'char *'. '[MaxNumArgs]'}] } - ['stringArgs'] -> [{#'char *'. '[', ThreadedFFIPlugin maxNumArgs printString, ']'}] } otherwise: [#sqInt])]! Item was changed: ----- Method: ThreadedFFICalloutStateForARM class>>instVarNamesAndTypesForTranslationDo: (in category 'translation') ----- instVarNamesAndTypesForTranslationDo: aBinaryBlock + "enumerate aBinaryBlock with the names and C type strings for the inst vars to include in a ThreadedFFICalloutState struct." - "enumerate aBinaryBlock with the names and C type strings for the inst vars to include in a ReentrantFFICalloutState struct." superclass instVarNamesAndTypesForTranslationDo: aBinaryBlock. self instVarNames do: [:ivn| aBinaryBlock value: ivn value: (ivn caseOf: { + ['integerRegisters'] -> [{#sqInt. '[NumIntRegArgs]'}]. + ['floatRegisters'] -> [{#float. '[NumFloatRegArgs]'}] } - ['integerRegisters'] -> [{#sqInt. '[', ThreadedARMFFIPlugin numIntRegArgs printString, ']'}]. - ['floatRegisters'] -> [{#float. '[', ThreadedARMFFIPlugin numFloatRegArgs printString, ']'}] } otherwise: [#sqInt])]! Item was changed: ----- Method: ThreadedFFICalloutStateForPPC class>>instVarNamesAndTypesForTranslationDo: (in category 'translation') ----- instVarNamesAndTypesForTranslationDo: aBinaryBlock + "enumerate aBinaryBlock with the names and C type strings for the inst vars to include in a ThreadedFFICalloutState struct." - "enumerate aBinaryBlock with the names and C type strings for the inst vars to include in a ReentrantFFICalloutState struct." superclass instVarNamesAndTypesForTranslationDo: aBinaryBlock. self instVarNames do: [:ivn| aBinaryBlock value: ivn value: (ivn caseOf: { + ['integerRegisters'] -> [{#sqInt. '[NumIntRegArgs]'}]. + ['floatRegisters'] -> [{#float. '[NumFloatRegArgs]'}] } - ['integerRegisters'] -> [{#sqInt. '[', ThreadedPPCBEFFIPlugin numRegArgs printString, ']'}]. - ['floatRegisters'] -> [{#double. '[', ThreadedPPCBEFFIPlugin numRegArgs printString, ']'}] } otherwise: [#sqInt])]! Item was changed: ----- Method: ThreadedFFICalloutStateForX64 class>>instVarNamesAndTypesForTranslationDo: (in category 'translation') ----- instVarNamesAndTypesForTranslationDo: aBinaryBlock "enumerate aBinaryBlock with the names and C type strings for the inst vars to include in a ThreadedFFICalloutState struct." ThreadedFFICalloutState instVarNamesAndTypesForTranslationDo: aBinaryBlock. + ThreadedFFICalloutStateForX64 instVarNames do: - self instVarNames do: [:ivn| aBinaryBlock value: ivn value: (ivn caseOf: { + ['integerRegisters'] -> [{#sqInt. '[NumIntRegArgs]'}]. + ['floatRegisters'] -> [{#double. '[NumFloatRegArgs]'}] } - ['integerRegisters'] -> [{#sqInt. '[', self pluginClass numRegArgs printString, ']'}]. - ['floatRegisters'] -> [{#double. '[', self pluginClass numFloatRegArgs printString, ']'}] } otherwise: [#sqInt])]! Item was changed: ----- Method: ThreadedFFIPlugin class>>generateCodeStringForPrimitives (in category 'translation') ----- generateCodeStringForPrimitives "Output a skeletal SqueakFFIPrims.c that includes the relevant FooFFIPlugin.c for each subclass based on the identifyingPredefinedMacros the subclass defines." ^String streamContents: [:s| s nextPutAll: '/* Automatically generated by\ ' withCRs. s nextPutAll: (CCodeGenerator monticelloDescriptionFor: self). s cr; nextPutAll: ' */'. s cr; cr; nextPut: $#. + (self allSubclasses sort: [:a :b| a name < b name]) do: - (self subclasses sort: [:a :b| a name < b name]) do: [:class | class identifyingPredefinedMacros ifNotNil: [:predefinedMacros| s nextPutAll: 'if '. class includingPredefinedMacros ifNotNil: [:includingMacros| includingMacros do: [:predefinedMacro| s nextPutAll: 'defined('; nextPutAll: predefinedMacro; nextPutAll: ') && ']. s nextPut: $(]. class excludingPredefinedMacros ifNotNil: [:excludingMacros| excludingMacros do: [:predefinedMacro| s nextPutAll: '!!defined('; nextPutAll: predefinedMacro; nextPutAll: ') && ']. s nextPut: $(]. predefinedMacros do: [:predefinedMacro| s nextPutAll: 'defined('; nextPutAll: predefinedMacro; nextPut: $)] separatedBy: [s nextPutAll: ' || ']. class excludingPredefinedMacros ifNotNil: [s nextPut: $)]. class includingPredefinedMacros ifNotNil: [s nextPut: $)]. s cr; cr; nextPutAll: '# include "'; nextPutAll: class moduleName; nextPutAll: '.c"'. s cr; cr; nextPutAll: '#el']]. s nextPutAll: 'se'. #( 'As yet no FFI implementation appears to exist for your platform.' 'Consider implementing it, starting by adding a subclass of ThreadedFFIPlugin.') do: [:msg| s cr; nextPutAll: '# error '; nextPutAll: msg]. s cr; nextPutAll: '#endif'; cr]! Item was changed: ----- Method: ThreadedX64FFIPlugin class>>calloutStateClass (in category 'translation') ----- calloutStateClass + ^ThreadedFFICalloutStateForX64! - ^ThreadedFFICalloutStateForX64SysV! Item was changed: ----- Method: ThreadedX64FFIPlugin class>>identifyingPredefinedMacros (in category 'translation') ----- identifyingPredefinedMacros "Answer the predefined macros that identify the platforms a subclass handles, if any. + If the subclass isn't yet ready for production (a work in progress) simply answer nil. + Override to filter-out this abstract class." + ^nil! - If the subclass isn't yet ready for production (a work in progress) simply answer nil." - ^#('x86_64' '__amd64' '__x86_64' '__amd64__' '__x86_64__')! Item was removed: - ----- Method: ThreadedX64SysVFFIPlugin class>>calloutStateClass (in category 'translation') ----- - calloutStateClass - ^ThreadedFFICalloutStateForX64SysV! Item was removed: - ----- Method: ThreadedX64Win64FFIPlugin class>>calloutStateClass (in category 'translation') ----- - calloutStateClass - ^ThreadedFFICalloutStateForX64SysV! Item was changed: ----- Method: ThreadedX64Win64FFIPlugin class>>initialize (in category 'class initialization') ----- initialize WordSize := 8. + NumIntRegArgs := 4. + NumFloatRegArgs := 4! - NumIntRegArgs := 6. - NumFloatRegArgs := 8!

1 0

[commit][3616] Fix typo
by commits＠squeakvm.org 20 Feb '16

20 Feb '16

Revision: 3616 Author: eliot Date: 2016-02-19 16:19:08 -0800 (Fri, 19 Feb 2016) Log Message: ----------- Fix typo Modified Paths: -------------- trunk/platforms/Cross/plugins/SqueakFFIPrims/sqManualSurface.c Property Changed: ---------------- trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h Modified: trunk/platforms/Cross/plugins/SqueakFFIPrims/sqManualSurface.c =================================================================== --- trunk/platforms/Cross/plugins/SqueakFFIPrims/sqManualSurface.c 2016-02-19 22:37:27 UTC (rev 3615) +++ trunk/platforms/Cross/plugins/SqueakFFIPrims/sqManualSurface.c 2016-02-20 00:19:08 UTC (rev 3616) @@ -38,7 +38,7 @@ } /* This is the structure that represents a "manual surface". These are - created/destroyed by new primitives in this plugin. During it's life-time, + created/destroyed by new primitives in this plugin. During its life-time, it may be touched directly from Squeak code to set/clear "ptr", and also treated as a generic surface via BitBlt's use of the SurfacePlugin. */ typedef struct { Property changes on: trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Sun Feb 14 14:59:53 PST 2016 + Fri Feb 19 16:18:52 PST 2016

1 0

VM Maker: VMMaker.oscog-eem.1684.mcz
by commits＠source.squeak.org 20 Feb '16

20 Feb '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1684.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1684 Author: eem Time: 19 February 2016, 4:09:29.090179 pm UUID: 001ebe3f-c0df-4d8a-9fdb-ccd6b34ab469 Ancestors: VMMaker.oscog-tfel.1683 Spur: Fix bug in markAndTraceWeaklingsFrom:. Fileds of weaklings may be immediate so must use followOopField:ofObject: not followObjField:ofObject:. FFIPlugin: First cut (untested) of FFI support for x86-64 on System V and WIN64. Simulation: Revert two of Tim's changes that break the VM simulator. =============== Diff against VMMaker.oscog-tfel.1683 =============== Item was changed: ----- Method: BitBltSimulator>>halftoneAt: (in category 'memory access') ----- halftoneAt: idx + ^self + cCode: [(halftoneBase + (idx \\ halftoneHeight * 4)) long32At: 0] + inSmalltalk: [self long32At: halftoneBase + (idx \\ halftoneHeight * 4)]! - ^ (halftoneBase + (idx \\ halftoneHeight * 4)) long32At: 0! Item was changed: ----- Method: SpurMemoryManager>>markAndTraceWeaklingsFrom: (in category 'weakness and ephemerality') ----- markAndTraceWeaklingsFrom: startIndex "Mark weaklings on the weaklingStack, ignoring startIndex number of elements on the bottom of the stack. Answer the size of the stack *before* the enumeration began." ^self objStack: weaklingStack from: startIndex do: [:weakling| self deny: (self isForwarded: weakling). self markAndTraceClassOf: weakling. "N.B. generateToByDoLimitExpression:negative:on: guards against (unsigned)0 - 1 going +ve" 0 to: (self numStrongSlotsOfWeakling: weakling) - 1 do: [:i| | field | + field := self followOopField: i ofObject: weakling. - field := self followObjField: i ofObject: weakling. ((self isImmediate: field) or: [self isMarked: field]) ifFalse: [self markAndTrace: field]]]! 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 oop | <var: #floatRet type: #double> <var: #intRet type: #usqLong> <inline: true> self cCode: '' inSmalltalk: [loadFloatRegs := #used. loadFloatRegs class]. 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)]. atomicType := self atomicTypeOf: calloutState ffiRetHeader. (atomicType >> 1) = (FFITypeSingleFloat > 1) ifTrue: [atomicType = FFITypeSingleFloat ifTrue: [floatRet := self + dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'float (*)(long, long, long, long)') - 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)] ifFalse: "atomicType = FFITypeDoubleFloat" [floatRet := self + dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'double (*)(long, long, long, long)') - 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 (*)(long, long, long, long)') - 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]]. (calloutState ffiRetHeader anyMask: FFIFlagPointer+FFIFlagStructure) ifTrue: ["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: [oop := self ffiReturnPointer: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState] ifFalse: [oop := self ffiReturnStruct: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState]. ^oop]. (atomicType >> 1) = (FFITypeSingleFloat > 1) ifTrue: [oop := interpreterProxy floatObjectOf: floatRet] ifFalse: [oop := self ffiCreateIntegralResultOop: intRet ofAtomicType: atomicType in: calloutState]. ^interpreterProxy methodReturnValue: oop! Item was added: + ThreadedFFICalloutState subclass: #ThreadedFFICalloutStateForX64 + instanceVariableNames: 'registerIndex integerRegisters floatRegisters' + classVariableNames: '' + poolDictionaries: '' + category: 'VMMaker-Plugins'! + + !ThreadedFFICalloutStateForX64 commentStamp: 'eem 2/16/2016 19:13' prior: 0! + A ThreadedFFICalloutStateForX64 is a holder for the callout state maintained while marshalling an FFI call on an X64 (x86-64) system.! Item was added: + ----- Method: ThreadedFFICalloutStateForX64 class>>instVarNamesAndTypesForTranslationDo: (in category 'translation') ----- + instVarNamesAndTypesForTranslationDo: aBinaryBlock + "enumerate aBinaryBlock with the names and C type strings for the inst vars to include in a ThreadedFFICalloutState struct." + + ThreadedFFICalloutState instVarNamesAndTypesForTranslationDo: aBinaryBlock. + self instVarNames do: + [:ivn| + aBinaryBlock + value: ivn + value: (ivn caseOf: { + ['integerRegisters'] -> [{#sqInt. '[', self pluginClass numRegArgs printString, ']'}]. + ['floatRegisters'] -> [{#double. '[', self pluginClass numFloatRegArgs printString, ']'}] } + otherwise: + [#sqInt])]! Item was added: + ----- Method: ThreadedFFICalloutStateForX64 class>>pluginClass (in category 'translation') ----- + pluginClass + ^self subclassResponsibility! Item was added: + ----- Method: ThreadedFFICalloutStateForX64>>floatRegisters (in category 'accessing') ----- + floatRegisters + "Answer the value of floatRegisters" + + ^ floatRegisters! Item was added: + ----- Method: ThreadedFFICalloutStateForX64>>floatRegisters: (in category 'accessing') ----- + floatRegisters: anObject + + ^floatRegisters := anObject! Item was added: + ----- Method: ThreadedFFICalloutStateForX64>>initialize (in category 'initialize-release') ----- + initialize + super initialize. + registerIndex := 0. + integerRegisters := CArrayAccessor on: (Array new: self class pluginClass numRegArgs). + floatRegisters := CArrayAccessor on: (Array new: self class pluginClass numFloatRegArgs)! Item was added: + ----- Method: ThreadedFFICalloutStateForX64>>integerRegisters (in category 'accessing') ----- + integerRegisters + "Answer the value of integerRegisters" + + ^ integerRegisters! Item was added: + ----- Method: ThreadedFFICalloutStateForX64>>integerRegisters: (in category 'accessing') ----- + integerRegisters: anObject + + ^integerRegisters := anObject! Item was added: + ----- Method: ThreadedFFICalloutStateForX64>>registerIndex (in category 'accessing') ----- + registerIndex + + ^ registerIndex! Item was added: + ----- Method: ThreadedFFICalloutStateForX64>>registerIndex: (in category 'accessing') ----- + registerIndex: anObject + + ^registerIndex := anObject! Item was added: + ThreadedFFICalloutStateForX64 subclass: #ThreadedFFICalloutStateForX64SysV + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'VMMaker-Plugins'! Item was added: + ----- Method: ThreadedFFICalloutStateForX64SysV class>>pluginClass (in category 'accessing') ----- + pluginClass + ^ThreadedX64SysVFFIPlugin! Item was added: + ThreadedFFICalloutStateForX64 subclass: #ThreadedFFICalloutStateForX64Win64 + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'VMMaker-Plugins'! Item was added: + ----- Method: ThreadedFFICalloutStateForX64Win64 class>>pluginClass (in category 'accessing') ----- + pluginClass + ^ThreadedX64Win64FFIPlugin! Item was added: + ----- Method: ThreadedFFIPlugin class>>excludingPredefinedMacros (in category 'translation') ----- + excludingPredefinedMacros + "Answer the predefined macros that disqualify the platforms a subclass handles, if any. + These are anded together and with includingPredefinedMacros, whereas + identifyingPredefinedMacros are ored together. + This can be used to differentiate e.g. x64 Sys V from x64 Win64." + ^nil! Item was changed: ----- Method: ThreadedFFIPlugin class>>generateCodeStringForPrimitives (in category 'translation') ----- generateCodeStringForPrimitives "Output a skeletal SqueakFFIPrims.c that includes the relevant FooFFIPlugin.c for each subclass based on the identifyingPredefinedMacros the subclass defines." ^String streamContents: [:s| s nextPutAll: '/* Automatically generated by\ ' withCRs. s nextPutAll: (CCodeGenerator monticelloDescriptionFor: self). s cr; nextPutAll: ' */'. s cr; cr; nextPut: $#. (self subclasses sort: [:a :b| a name < b name]) do: [:class | class identifyingPredefinedMacros ifNotNil: [:predefinedMacros| s nextPutAll: 'if '. + class includingPredefinedMacros ifNotNil: + [:includingMacros| + includingMacros do: + [:predefinedMacro| s nextPutAll: 'defined('; nextPutAll: predefinedMacro; nextPutAll: ') && ']. + s nextPut: $(]. + class excludingPredefinedMacros ifNotNil: + [:excludingMacros| + excludingMacros do: + [:predefinedMacro| s nextPutAll: '!!defined('; nextPutAll: predefinedMacro; nextPutAll: ') && ']. + s nextPut: $(]. predefinedMacros do: [:predefinedMacro| s nextPutAll: 'defined('; nextPutAll: predefinedMacro; nextPut: $)] separatedBy: [s nextPutAll: ' || ']. + class excludingPredefinedMacros ifNotNil: + [s nextPut: $)]. + class includingPredefinedMacros ifNotNil: + [s nextPut: $)]. s cr; cr; nextPutAll: '# include "'; nextPutAll: class moduleName; nextPutAll: '.c"'. s cr; cr; nextPutAll: '#el']]. s nextPutAll: 'se'. #( 'As yet no FFI implementation appears to exist for your platform.' 'Consider implementing it, starting by adding a subclass of ThreadedFFIPlugin.') do: [:msg| s cr; nextPutAll: '# error '; nextPutAll: msg]. s cr; nextPutAll: '#endif'; cr]! Item was changed: ----- Method: ThreadedFFIPlugin class>>identifyingPredefinedMacros (in category 'translation') ----- identifyingPredefinedMacros "Answer the predefined macros that identify the platforms a subclass handles, if any. + These are ored together. If the subclass isn't yet ready for production (a work in progress) simply answer nil." ^nil! Item was added: + ----- Method: ThreadedFFIPlugin class>>includingPredefinedMacros (in category 'translation') ----- + includingPredefinedMacros + "Answer the predefined macros that qualify the platforms a subclass handles, if any. + These are anded together and with excludingPredefinedMacros, whereas + identifyingPredefinedMacros are ored together. + This can be used to differentiate e.g. x64 Sys V from x64 Win64." + ^nil! Item was added: + ----- Method: ThreadedIA32FFIPlugin class>>moduleName (in category 'translation') ----- + moduleName + ^'IA32FFIPlugin'! Item was removed: - ----- Method: ThreadedPPCBEFFIPlugin>>ffiPushUnsignedLong:in: (in category 'marshalling') ----- - ffiPushUnsignedLong: value in: calloutState - <var: #calloutState type: #'CalloutState *'> - <inline: true> - self shouldBeImplemented. - ^0! Item was added: + ThreadedFFIPlugin subclass: #ThreadedX64FFIPlugin + instanceVariableNames: '' + classVariableNames: 'NumFloatRegArgs NumIntRegArgs WordSize' + poolDictionaries: '' + category: 'VMMaker-Plugins'! + + !ThreadedX64FFIPlugin commentStamp: 'eem 2/19/2016 15:03' prior: 0! + This is an abstract superclass for the System V and WIN64 x86-64 ABIs that share a lot of code other than for structure passing.! Item was added: + ----- Method: ThreadedX64FFIPlugin class>>calloutStateClass (in category 'translation') ----- + calloutStateClass + ^ThreadedFFICalloutStateForX64SysV! Item was added: + ----- Method: ThreadedX64FFIPlugin class>>excludingPredefinedMacros (in category 'translation') ----- + excludingPredefinedMacros + "Answer the predefined macros that disqualify the platforms a subclass handles, if any. + This can be used to differentiate e.g. x64 Sys V from x64 Win64." + ^#('WIN64')! Item was added: + ----- Method: ThreadedX64FFIPlugin class>>identifyingPredefinedMacros (in category 'translation') ----- + identifyingPredefinedMacros + "Answer the predefined macros that identify the platforms a subclass handles, if any. + If the subclass isn't yet ready for production (a work in progress) simply answer nil." + ^#('x86_64' '__amd64' '__x86_64' '__amd64__' '__x86_64__')! Item was added: + ----- Method: ThreadedX64FFIPlugin class>>initialize (in category 'class initialization') ----- + initialize + WordSize := 8. + NumIntRegArgs := 6. + NumFloatRegArgs := 8! Item was added: + ----- Method: ThreadedX64FFIPlugin class>>moduleName (in category 'translation') ----- + moduleName + ^'X64SysVFFIPlugin'! Item was added: + ----- Method: ThreadedX64FFIPlugin class>>numFloatRegArgs (in category 'accessing') ----- + numFloatRegArgs + ^NumFloatRegArgs! Item was added: + ----- Method: ThreadedX64FFIPlugin class>>numRegArgs (in category 'accessing') ----- + numRegArgs + ^NumIntRegArgs! Item was added: + ----- Method: ThreadedX64FFIPlugin>>ffiPushDoubleFloat:in: (in category 'marshalling') ----- + ffiPushDoubleFloat: value in: calloutState + <var: #value type: #double> + <var: #calloutState type: #'CalloutState *'> + <inline: true> + + calloutState floatRegisterIndex < NumFloatRegArgs + ifTrue: + [calloutState floatRegisters at: calloutState floatRegisterIndex put: value. + calloutState floatRegisterIndex: calloutState floatRegisterIndex + 1] + ifFalse: + [calloutState currentArg + WordSize > calloutState limit ifTrue: + [^FFIErrorCallFrameTooBig]. + interpreterProxy storeFloatAtPointer: calloutState currentArg from: value. + calloutState currentArg: calloutState currentArg + WordSize]. + ^0! Item was added: + ----- Method: ThreadedX64FFIPlugin>>ffiPushPointer:in: (in category 'marshalling') ----- + ffiPushPointer: pointer in: calloutState + <var: #pointer type: #'void *'> + <var: #calloutState type: #'CalloutState *'> + <inline: true> + calloutState integerRegisterIndex < NumIntRegArgs + ifTrue: + [calloutState integerRegisters at: calloutState integerRegisterIndex put: pointer asInteger. + calloutState integerRegisterIndex: calloutState integerRegisterIndex + 1] + ifFalse: + [calloutState currentArg + WordSize > calloutState limit ifTrue: + [^FFIErrorCallFrameTooBig]. + interpreterProxy longAt: calloutState currentArg put: pointer. + calloutState currentArg: calloutState currentArg + WordSize]. + ^0! Item was added: + ----- Method: ThreadedX64FFIPlugin>>ffiPushSignedByte:in: (in category 'marshalling') ----- + ffiPushSignedByte: value in: calloutState + <var: #calloutState type: #'CalloutState *'> + <inline: true> + calloutState integerRegisterIndex < NumIntRegArgs + ifTrue: + [calloutState integerRegisters at: calloutState integerRegisterIndex put: (self cCoerceSimple: value to: #'signed char'). + calloutState integerRegisterIndex: calloutState integerRegisterIndex + 1] + ifFalse: + [calloutState currentArg + WordSize > calloutState limit ifTrue: + [^FFIErrorCallFrameTooBig]. + interpreterProxy longAt: calloutState currentArg put: (self cCoerceSimple: value to: #'signed char'). + calloutState currentArg: calloutState currentArg + WordSize]. + ^0! Item was added: + ----- Method: ThreadedX64FFIPlugin>>ffiPushSignedChar:in: (in category 'marshalling') ----- + ffiPushSignedChar: value in: calloutState + <var: #calloutState type: #'CalloutState *'> + <inline: true> + calloutState integerRegisterIndex < NumIntRegArgs + ifTrue: + [calloutState integerRegisters at: calloutState integerRegisterIndex put: (self cCoerceSimple: value to: #'signed char'). + calloutState integerRegisterIndex: calloutState integerRegisterIndex + 1] + ifFalse: + [calloutState currentArg + WordSize > calloutState limit ifTrue: + [^FFIErrorCallFrameTooBig]. + interpreterProxy longAt: calloutState currentArg put: (self cCoerceSimple: value to: #'signed char'). + calloutState currentArg: calloutState currentArg + WordSize]. + ^0! Item was added: + ----- Method: ThreadedX64FFIPlugin>>ffiPushSignedInt:in: (in category 'marshalling') ----- + ffiPushSignedInt: value in: calloutState + <var: #calloutState type: #'CalloutState *'> + <inline: true> + calloutState integerRegisterIndex < NumIntRegArgs + ifTrue: + [calloutState integerRegisters at: calloutState integerRegisterIndex put: value. + calloutState integerRegisterIndex: calloutState integerRegisterIndex + 1] + ifFalse: + [calloutState currentArg + WordSize > calloutState limit ifTrue: + [^FFIErrorCallFrameTooBig]. + interpreterProxy longAt: calloutState currentArg put: value. + calloutState currentArg: calloutState currentArg + WordSize]. + ^0 + ! Item was added: + ----- Method: ThreadedX64FFIPlugin>>ffiPushSignedLongLong:in: (in category 'marshalling') ----- + ffiPushSignedLongLong: value in: calloutState + <var: #value type: #sqLong> + <var: #calloutState type: #'CalloutState *'> + <inline: true> + calloutState integerRegisterIndex < NumIntRegArgs + ifTrue: + [calloutState integerRegisters at: calloutState integerRegisterIndex put: (self cCoerceSimple: value to: #usqInt). + calloutState integerRegisterIndex: calloutState integerRegisterIndex + 1] + ifFalse: + [calloutState currentArg + WordSize > calloutState limit ifTrue: [^FFIErrorCallFrameTooBig]. + interpreterProxy longAt: calloutState currentArg put: value. + calloutState currentArg: calloutState currentArg + WordSize]. + ^0! Item was added: + ----- Method: ThreadedX64FFIPlugin>>ffiPushSignedShort:in: (in category 'marshalling') ----- + ffiPushSignedShort: value in: calloutState + <var: #calloutState type: #'CalloutState *'> + <inline: true> + calloutState integerRegisterIndex < NumIntRegArgs + ifTrue: + [calloutState integerRegisters at: calloutState integerRegisterIndex put: (self cCoerceSimple: value to: #'signed short'). + calloutState integerRegisterIndex: calloutState integerRegisterIndex + 1] + ifFalse: + [calloutState currentArg + WordSize > calloutState limit ifTrue: + [^FFIErrorCallFrameTooBig]. + interpreterProxy longAt: calloutState currentArg put: (self cCoerceSimple: value to: #'signed short'). + calloutState currentArg: calloutState currentArg + WordSize]. + ^0! Item was added: + ----- Method: ThreadedX64FFIPlugin>>ffiPushSingleFloat:in: (in category 'marshalling') ----- + ffiPushSingleFloat: value in: calloutState + <var: #value type: #float> + <var: #calloutState type: #'CalloutState *'> + <inline: true> + + calloutState floatRegisterIndex < NumFloatRegArgs + ifTrue: + [calloutState floatRegisters at: calloutState floatRegisterIndex put: value. + calloutState floatRegisterIndex: calloutState floatRegisterIndex + 1] + ifFalse: + [calloutState currentArg + WordSize > calloutState limit ifTrue: + [^FFIErrorCallFrameTooBig]. + interpreterProxy storeFloatAtPointer: calloutState currentArg from: value. + calloutState currentArg: calloutState currentArg + WordSize]. + ^0! Item was added: + ----- Method: ThreadedX64FFIPlugin>>ffiPushStructure:ofSize:typeSpec:ofLength:in: (in category 'marshalling') ----- + ffiPushStructure: pointer ofSize: structSize typeSpec: argSpec ofLength: argSpecSize in: calloutState + <var: #pointer type: #'void *'> + <var: #argSpec type: #'sqInt *'> + <var: #calloutState type: #'CalloutState *'> + <inline: true> + self subclassResponsibility! Item was added: + ----- Method: ThreadedX64FFIPlugin>>ffiPushUnsignedByte:in: (in category 'marshalling') ----- + ffiPushUnsignedByte: value in: calloutState + <var: #calloutState type: #'CalloutState *'> + <inline: true> + calloutState integerRegisterIndex < NumIntRegArgs + ifTrue: + [calloutState integerRegisters at: calloutState integerRegisterIndex put: (self cCoerceSimple: value to: #'unsigned char'). + calloutState integerRegisterIndex: calloutState integerRegisterIndex + 1] + ifFalse: + [calloutState currentArg + WordSize > calloutState limit ifTrue: + [^FFIErrorCallFrameTooBig]. + interpreterProxy longAt: calloutState currentArg put: (self cCoerceSimple: value to: #'unsigned char'). + calloutState currentArg: calloutState currentArg + WordSize]. + ^0 + ! Item was added: + ----- Method: ThreadedX64FFIPlugin>>ffiPushUnsignedChar:in: (in category 'marshalling') ----- + ffiPushUnsignedChar: value in: calloutState + <var: #calloutState type: #'CalloutState *'> + <inline: true> + calloutState integerRegisterIndex < NumIntRegArgs + ifTrue: + [calloutState integerRegisters at: calloutState integerRegisterIndex put: (self cCoerceSimple: value to: #'unsigned char'). + calloutState integerRegisterIndex: calloutState integerRegisterIndex + 1] + ifFalse: + [calloutState currentArg + WordSize > calloutState limit ifTrue: + [^FFIErrorCallFrameTooBig]. + interpreterProxy longAt: calloutState currentArg put: (self cCoerceSimple: value to: #'unsigned char'). + calloutState currentArg: calloutState currentArg + WordSize]. + ^0! Item was added: + ----- Method: ThreadedX64FFIPlugin>>ffiPushUnsignedInt:in: (in category 'marshalling') ----- + ffiPushUnsignedInt: value in: calloutState + <var: #calloutState type: #'CalloutState *'> + <inline: true> + calloutState integerRegisterIndex < NumIntRegArgs + ifTrue: + [calloutState integerRegisters at: calloutState integerRegisterIndex put: value. + calloutState integerRegisterIndex: calloutState integerRegisterIndex + 1] + ifFalse: + [calloutState currentArg + WordSize > calloutState limit ifTrue: + [^FFIErrorCallFrameTooBig]. + interpreterProxy longAt: calloutState currentArg put: value. + calloutState currentArg: calloutState currentArg + WordSize]. + ^0 + + ! Item was added: + ----- Method: ThreadedX64FFIPlugin>>ffiPushUnsignedLongLong:in: (in category 'marshalling') ----- + ffiPushUnsignedLongLong: value in: calloutState + <var: #value type: #usqLong> + <var: #calloutState type: #'CalloutState *'> + <inline: true> + calloutState integerRegisterIndex < NumIntRegArgs + ifTrue: + [calloutState integerRegisters at: calloutState integerRegisterIndex put: value. + calloutState integerRegisterIndex: calloutState integerRegisterIndex + 1] + ifFalse: + [calloutState currentArg + WordSize > calloutState limit ifTrue: [^FFIErrorCallFrameTooBig]. + interpreterProxy longAt: calloutState currentArg put: value. + calloutState currentArg: calloutState currentArg + WordSize]. + ^0! Item was added: + ----- Method: ThreadedX64FFIPlugin>>ffiPushUnsignedShort:in: (in category 'marshalling') ----- + ffiPushUnsignedShort: value in: calloutState + <var: #calloutState type: #'CalloutState *'> + <inline: true> + calloutState integerRegisterIndex < NumIntRegArgs + ifTrue: + [calloutState integerRegisters at: calloutState integerRegisterIndex put: (self cCoerceSimple: value to: #'unsigned short'). + calloutState integerRegisterIndex: calloutState integerRegisterIndex + 1] + ifFalse: + [calloutState currentArg + WordSize > calloutState limit ifTrue: + [^FFIErrorCallFrameTooBig]. + interpreterProxy longAt: calloutState currentArg put: (self cCoerceSimple: value to: #'unsigned short'). + calloutState currentArg: calloutState currentArg + WordSize]. + ^0! Item was added: + ----- Method: ThreadedX64FFIPlugin>>registerArgsSlop (in category 'marshalling') ----- + registerArgsSlop + "Answer any space needed to prevent the alloca'ed outgoing arguments marshalling area from + being overwritten by any register arguments during calls during marshalling. On ARM we + believe this is zero." + ^0! Item was added: + ----- Method: ThreadedX64FFIPlugin>>returnStructInRegisters: (in category 'marshalling') ----- + returnStructInRegisters: returnStructSize + "Answer if a struct result of a given size is returned in memory or not." + self subclassResponsibility! Item was added: + ThreadedX64FFIPlugin subclass: #ThreadedX64SysVFFIPlugin + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'VMMaker-Plugins'! + + !ThreadedX64SysVFFIPlugin commentStamp: 'eem 2/17/2016 20:03' prior: 0! + This subclass is for the System V x86-64 ABI. The System V ABI uses 6 integer registers and 8 double-precision floating-point registers. See http://www.x86-64.org/documentation/abi.pdf. It seems that Mac OS X and linux use draft version 0.90, http://people.freebsd.org/~obrien/amd64-elf-abi.pdf. + + Note that the System V x86-64 ABI decomposes structs of 2 eightbytes or smaller passed by value across available parameter registers. double fields will be passed in an xmm register.! Item was added: + ----- Method: ThreadedX64SysVFFIPlugin class>>calloutStateClass (in category 'translation') ----- + calloutStateClass + ^ThreadedFFICalloutStateForX64SysV! Item was added: + ----- Method: ThreadedX64SysVFFIPlugin class>>excludingPredefinedMacros (in category 'translation') ----- + excludingPredefinedMacros + "Answer the predefined macros that disqualify the platforms a subclass handles, if any. + This can be used to differentiate e.g. x64 Sys V from x64 Win64." + ^#('WIN64')! Item was added: + ----- Method: ThreadedX64SysVFFIPlugin class>>identifyingPredefinedMacros (in category 'translation') ----- + identifyingPredefinedMacros + "Answer the predefined macros that identify the platforms a subclass handles, if any. + If the subclass isn't yet ready for production (a work in progress) simply answer nil." + ^#('x86_64' '__amd64' '__x86_64' '__amd64__' '__x86_64__')! Item was added: + ----- Method: ThreadedX64SysVFFIPlugin class>>initialize (in category 'class initialization') ----- + initialize + WordSize := 8. + NumIntRegArgs := 6. + NumFloatRegArgs := 8! Item was added: + ----- Method: ThreadedX64SysVFFIPlugin class>>moduleName (in category 'translation') ----- + moduleName + ^'X64SysVFFIPlugin'! Item was added: + ----- Method: ThreadedX64SysVFFIPlugin class>>numFloatRegArgs (in category 'accessing') ----- + numFloatRegArgs + ^NumFloatRegArgs! Item was added: + ----- Method: ThreadedX64SysVFFIPlugin class>>numRegArgs (in category 'accessing') ----- + numRegArgs + ^NumIntRegArgs! Item was added: + ----- Method: ThreadedX64SysVFFIPlugin>>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 oop | + <var: #floatRet type: #double> + <var: #intRet type: #usqLong> + <inline: true> + self cCode: '' inSmalltalk: [loadFloatRegs := #used. loadFloatRegs class]. + 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: ((calloutState floatRegisters at: 0) at: 0) + Flo: ((calloutState floatRegisters at: 1) at: 0) + a: ((calloutState floatRegisters at: 2) at: 0) + t: ((calloutState floatRegisters at: 3) at: 0) + R: ((calloutState floatRegisters at: 4) at: 0) + e: ((calloutState floatRegisters at: 5) at: 0) + g: ((calloutState floatRegisters at: 6) at: 0) + s: ((calloutState floatRegisters at: 7) at: 0)]. + + atomicType := self atomicTypeOf: calloutState ffiRetHeader. + (atomicType >> 1) = (FFITypeSingleFloat > 1) + ifTrue: + [atomicType = FFITypeSingleFloat + ifTrue: + [floatRet := self + dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'float (*)(long, long, long, long, long, long)') + with: (calloutState integerRegisters at: 0) + with: (calloutState integerRegisters at: 1) + with: (calloutState integerRegisters at: 2) + with: (calloutState integerRegisters at: 3) + with: (calloutState integerRegisters at: 4) + with: (calloutState integerRegisters at: 5)] + ifFalse: "atomicType = FFITypeDoubleFloat" + [floatRet := self + dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'double (*)(long, long, long, long, long, long)') + with: (calloutState integerRegisters at: 0) + with: (calloutState integerRegisters at: 1) + with: (calloutState integerRegisters at: 2) + with: (calloutState integerRegisters at: 3) + with: (calloutState integerRegisters at: 4) + with: (calloutState integerRegisters at: 5)]] + ifFalse: + [intRet := self + dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'usqLong (*)(long, long, long, long, long, long)') + with: (calloutState integerRegisters at: 0) + with: (calloutState integerRegisters at: 1) + with: (calloutState integerRegisters at: 2) + with: (calloutState integerRegisters at: 3) + with: (calloutState integerRegisters at: 4) + with: (calloutState integerRegisters at: 5)]. + "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]]. + + (calloutState ffiRetHeader anyMask: FFIFlagPointer+FFIFlagStructure) ifTrue: + ["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: + [oop := self ffiReturnPointer: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState] + ifFalse: + [oop := self ffiReturnStruct: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState]. + ^oop]. + + (atomicType >> 1) = (FFITypeSingleFloat > 1) + ifTrue: + [oop := interpreterProxy floatObjectOf: floatRet] + ifFalse: + [oop := self ffiCreateIntegralResultOop: intRet + ofAtomicType: atomicType + in: calloutState]. + ^interpreterProxy methodReturnValue: oop! Item was added: + ----- Method: ThreadedX64SysVFFIPlugin>>ffiPushStructure:ofSize:typeSpec:ofLength:in: (in category 'marshalling') ----- + ffiPushStructure: pointer ofSize: structSize typeSpec: argSpec ofLength: argSpecSize in: calloutState + <var: #pointer type: #'void *'> + <var: #argSpec type: #'sqInt *'> + <var: #calloutState type: #'CalloutState *'> + <inline: true> + | roundedSize doubleType floatType numDoubleRegisters numIntegerRegisters passField0InXmmReg passField1InXmmReg | + structSize <= 16 ifTrue: + ["See sec 3.2.3 of http://people.freebsd.org/~obrien/amd64-elf-abi.pdf. (dravft version 0.90). + All of the folowing are passed in registers: + typedef struct { long a; } s0; + typedef struct { double a; } s1; + typedef struct { long a; double b; } s2; + typedef struct { int a; int b; double c; } s2a; + typedef struct { short a; short b; short c; short d; double e; } s2b; + typedef struct { long a; float b; } s2f; + typedef struct { long a; float b; float c; } s2g; + but not ones like this: + typedef struct { int a; float b; int c; float d; } s2h;" + doubleType := FFITypeDoubleFloat << FFIAtomicTypeShift + FFITypeDoubleFloat. + floatType := FFITypeDoubleFloat << FFIAtomicTypeShift + FFITypeSingleFloat. + passField0InXmmReg := doubleType = ((self cCoerce: argSpec to: #'int *') at: 1) "0th field is struct type and size" + or: [floatType = ((self cCoerce: argSpec to: #'int *') at: 1) + and: [floatType = ((self cCoerce: argSpec to: #'int *') at: 2)]]. + structSize <= 8 + ifTrue: + [numDoubleRegisters := passField0InXmmReg ifTrue: [1] ifFalse: [0]. + numIntegerRegisters := 1 - numDoubleRegisters] + ifFalse: + [passField1InXmmReg := doubleType = ((self cCoerce: argSpec to: #'int *') at: argSpecSize - 1) "Nth field is last field of struct" + or: [floatType = ((self cCoerce: argSpec to: #'int *') at: argSpecSize - 2) + and: [floatType = ((self cCoerce: argSpec to: #'int *') at: argSpecSize - 1)]]. + numDoubleRegisters := (passField0InXmmReg ifTrue: [1] ifFalse: [0]) + (passField1InXmmReg ifTrue: [1] ifFalse: [0]). + numIntegerRegisters := 2 - numDoubleRegisters]. + (calloutState floatRegisterIndex + numDoubleRegisters <= NumFloatRegArgs + and: [calloutState integerRegisterIndex + numIntegerRegisters <= NumIntRegArgs]) ifTrue: + [passField0InXmmReg + ifTrue: [self ffiPushDoubleFloat: ((self cCoerceSimple: pointer to: #'double *') at: 0) in: calloutState] + ifFalse: [self ffiPushSignedLongLong: ((self cCoerceSimple: pointer to: #'long long *') at: 0) in: calloutState]. + structSize > 8 ifTrue: + [passField1InXmmReg + ifTrue: [self ffiPushDoubleFloat: ((self cCoerceSimple: pointer to: #'double *') at: 1) in: calloutState] + ifFalse: [self ffiPushSignedLongLong: ((self cCoerceSimple: pointer to: #'long long *') at: 1) in: calloutState]]. + ^0]. + + roundedSize := structSize + 7 bitClear: 7. + calloutState currentArg + roundedSize > calloutState limit ifTrue: + [^FFIErrorCallFrameTooBig]. + self mem: calloutState currentArg cp: (self cCoerceSimple: pointer to: 'char *') y: structSize. + calloutState currentArg: calloutState currentArg + roundedSize]. + ^0! Item was added: + ----- Method: ThreadedX64SysVFFIPlugin>>returnStructInRegisters: (in category 'marshalling') ----- + returnStructInRegisters: returnStructSize + "Answer if a struct result of a given size is returned in memory or not." + ^returnStructSize <= (WordSize * 2)! Item was added: + ThreadedX64FFIPlugin subclass: #ThreadedX64Win64FFIPlugin + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'VMMaker-Plugins'! + + !ThreadedX64Win64FFIPlugin commentStamp: 'eem 2/16/2016 19:39' prior: 0! + This subclass is for the Win64 x86-64 ABI. The System V ABI uses 4 integer registers and 4 double-precision floating-point registers. See w.g. https://msdn.microsoft.com/en-us/library/ms235286.aspx, or google for "Overview of x64 Calling Conventions - MSDN - Microsoft". + + Note that unlike the System V x86-64 ABI, the Win64 ABI does /not/ decompose structs passed by value across available parameter registers.! Item was added: + ----- Method: ThreadedX64Win64FFIPlugin class>>calloutStateClass (in category 'translation') ----- + calloutStateClass + ^ThreadedFFICalloutStateForX64SysV! Item was added: + ----- Method: ThreadedX64Win64FFIPlugin class>>identifyingPredefinedMacros (in category 'translation') ----- + identifyingPredefinedMacros + "Answer the predefined macros that identify the platforms a subclass handles, if any. + If the subclass isn't yet ready for production (a work in progress) simply answer nil." + ^#('x86_64' '__amd64' '__x86_64' '__amd64__' '__x86_64__' '_M_AMD64' '_M_X64')! Item was added: + ----- Method: ThreadedX64Win64FFIPlugin class>>includingPredefinedMacros (in category 'translation') ----- + includingPredefinedMacros + "Answer the predefined macros that qualify the platforms a subclass handles, if any. + These are anded together and with excludingPredefinedMacros, whereas + identifyingPredefinedMacros are ored together. + This can be used to differentiate e.g. x64 Sys V from x64 Win64." + ^#('WIN64')! Item was added: + ----- Method: ThreadedX64Win64FFIPlugin class>>initialize (in category 'class initialization') ----- + initialize + WordSize := 8. + NumIntRegArgs := 6. + NumFloatRegArgs := 8! Item was added: + ----- Method: ThreadedX64Win64FFIPlugin class>>moduleName (in category 'translation') ----- + moduleName + ^'X64Win64FFIPlugin'! Item was added: + ----- Method: ThreadedX64Win64FFIPlugin class>>numFloatRegArgs (in category 'accessing') ----- + numFloatRegArgs + ^NumFloatRegArgs! Item was added: + ----- Method: ThreadedX64Win64FFIPlugin class>>numRegArgs (in category 'accessing') ----- + numRegArgs + ^NumIntRegArgs! Item was added: + ----- Method: ThreadedX64Win64FFIPlugin>>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)'> + "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 oop | + <var: #floatRet type: #double> + <var: #intRet type: #usqLong> + <inline: true> + self cCode: '' inSmalltalk: [loadFloatRegs := #used. loadFloatRegs class]. + 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: ((calloutState floatRegisters at: 0) at: 0) + Flo: ((calloutState floatRegisters at: 1) at: 0) + at: ((calloutState floatRegisters at: 2) at: 0) + Re: ((calloutState floatRegisters at: 3) at: 0) + gs: ((calloutState floatRegisters at: 4) at: 0)]. + + atomicType := self atomicTypeOf: calloutState ffiRetHeader. + (atomicType >> 1) = (FFITypeSingleFloat > 1) + ifTrue: + [atomicType = FFITypeSingleFloat + ifTrue: + [floatRet := self + dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'float (*)(long, long, long, long)') + with: (calloutState integerRegisters at: 0) + with: (calloutState integerRegisters at: 1) + with: (calloutState integerRegisters at: 2) + with: (calloutState integerRegisters at: 3)] + ifFalse: "atomicType = FFITypeDoubleFloat" + [floatRet := self + dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'double (*)(long, long, long, long)') + 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 (*)(long, long, long, long)') + 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]]. + + (calloutState ffiRetHeader anyMask: FFIFlagPointer+FFIFlagStructure) ifTrue: + ["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: + [oop := self ffiReturnPointer: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState] + ifFalse: + [oop := self ffiReturnStruct: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState]. + ^oop]. + + (atomicType >> 1) = (FFITypeSingleFloat > 1) + ifTrue: + [oop := interpreterProxy floatObjectOf: floatRet] + ifFalse: + [oop := self ffiCreateIntegralResultOop: intRet + ofAtomicType: atomicType + in: calloutState]. + ^interpreterProxy methodReturnValue: oop! Item was added: + ----- Method: ThreadedX64Win64FFIPlugin>>ffiPushStructure:ofSize:typeSpec:ofLength:in: (in category 'marshalling') ----- + ffiPushStructure: pointer ofSize: structSize typeSpec: argSpec ofLength: argSpecSize in: calloutState + <var: #pointer type: #'void *'> + <var: #argSpec type: #'sqInt *'> + <var: #calloutState type: #'CalloutState *'> + <inline: true> + structSize <= 0 ifTrue: + [^FFIErrorStructSize]. + (structSize <= 16 + and: [(structSize bitAnd: structSize - 1) = 0 "a.k.a. structSize isPowerOfTwo"]) ifTrue: + [^self ffiPushUnsignedLongLong: (self cCoerceSimple: pointer to: #usqLong) in: calloutState]. + + "For now just push the pointer; we should copy the struct to the outgoing stack frame!!!!" + self flag: 'quick hack'. + ^self ffiPushPointer: pointer in: calloutState! Item was added: + ----- Method: ThreadedX64Win64FFIPlugin>>returnStructInRegisters: (in category 'marshalling') ----- + returnStructInRegisters: returnStructSize + "Answer if a struct result of a given size is returned in memory or not." + ^returnStructSize <= WordSize! Item was changed: ----- Method: VMClass>>oopForPointer: (in category 'memory access') ----- oopForPointer: pointerOrSurrogate "This gets implemented by Macros in C, where its types will also be checked. oop is the width of a machine word, and pointer is a raw address." <doNotGenerate> + ^pointerOrSurrogate asInteger! - ^pointerOrSurrogate! Item was changed: ----- Method: VMMaker class>>generateVMPlugins (in category 'configurations') ----- generateVMPlugins ^VMMaker generatePluginsTo: (FileDirectory default pathFromURI: self sourceTree, '/src') options: #() platformDir: (FileDirectory default pathFromURI: self sourceTree, '/platforms') including:#( ADPCMCodecPlugin AsynchFilePlugin BalloonEnginePlugin B3DAcceleratorPlugin B3DEnginePlugin BMPReadWriterPlugin BitBltSimulation BochsIA32Plugin BochsX64Plugin CameraPlugin CroquetPlugin DSAPlugin DeflatePlugin DropPlugin "FT2Plugin" FFTPlugin FileCopyPlugin FilePlugin FloatArrayPlugin FloatMathPlugin GeniePlugin GdbARMPlugin 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 ThreadedX64SysVFFIPlugin ThreadedX64Win64FFIPlugin - ThreadedFFIPlugin ThreadedARMFFIPlugin ThreadedIA32FFIPlugin UnicodePlugin UnixAioPlugin UUIDPlugin UnixOSProcessPlugin Win32OSProcessPlugin VMProfileLinuxSupportPlugin VMProfileMacSupportPlugin WeDoPlugin XDisplayControlPlugin)! Item was removed: - ----- Method: VMPluginCodeGenerator>>preDeclareExternFunction:on: (in category 'C code generator') ----- - preDeclareExternFunction: tMethod on: aStream - self withOptionalVerbiageFor: tMethod selector - on: aStream - do: [aStream cr. - tMethod static: false; export: false; emitCFunctionPrototype: aStream generator: self. - aStream nextPut: $;] - ifOptionalDo: - [aStream cr; nextPutAll: '# define '. - (TSendNode new - setSelector: tMethod selector - receiver: (TVariableNode new setName: 'interpreterProxy') - arguments: (tMethod args collect: [:a| TVariableNode new setName: a])) - emitCCodeAsArgumentOn: aStream - level: 0 - generator: self. - aStream nextPutAll: ' 0'] ! Item was removed: - ----- Method: VMPluginCodeGenerator>>preDeclareStaticFunction:on: (in category 'C code generator') ----- - preDeclareStaticFunction: tMethod on: aStream - | functionName | - functionName := self cFunctionNameFor: tMethod selector. - self withOptionalVerbiageFor: tMethod selector - on: aStream - do: - [aStream cr; nextPutAll: - ((String streamContents: - [:s| - tMethod - static: true; - emitCFunctionPrototype: s generator: self]) - copyReplaceAll: functionName - with: '(*', functionName, ')' - tokenish: [:ch| ch = $_ or: [ch isAlphaNumeric]]). - aStream nextPut: $;] - ifOptionalDo: [aStream cr; nextPutAll: '# define '. - (TSendNode new - setSelector: tMethod selector - receiver: (TVariableNode new setName: 'interpreterProxy') - arguments: (tMethod args collect: [:a| TVariableNode new setName: a])) - emitCCodeAsArgumentOn: aStream - level: 0 - generator: self. - aStream nextPutAll: ' 0']. - ! Item was removed: - ----- Method: VMPluginCodeGenerator>>withOptionalVerbiageFor:on:do: (in category 'C translation') ----- - withOptionalVerbiageFor: selector on: aStream do: mainBlock - ^ self - withOptionalVerbiageFor: selector - on: aStream - do: mainBlock - ifOptionalDo: nil !

1 0

[commit][3615] Don't use lrintf to convert from NSPoint fields.
by commits＠squeakvm.org 19 Feb '16

19 Feb '16

Revision: 3615 Author: eliot Date: 2016-02-19 14:37:27 -0800 (Fri, 19 Feb 2016) Log Message: ----------- Don't use lrintf to convert from NSPoint fields. In 64-bits NSPoint's fields are doubles, not floats. Simply use the default C conversion from floating-point to integers provided by assignment. Oversight from previous commit: Eliminate erroneous casts to (int) in assigning to fields of sqInputEvent in the platforms/iOS subsystem; (int) won't work with 64-bits. Modified Paths: -------------- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Fri Feb 19 14:19:29 PST 2016 + Fri Feb 19 14:33:44 PST 2016 Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m =================================================================== --- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m 2016-02-19 22:23:01 UTC (rev 3614) +++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m 2016-02-19 22:37:27 UTC (rev 3615) @@ -262,8 +262,8 @@ NSPoint local_point = [aView convertPoint: [theEvent locationInWindow] fromView:nil]; - evt.x = (sqInt) lrintf(local_point.x); - evt.y = (sqInt) lrintf(local_point.y); + evt.x = local_point.x; + evt.y = local_point.y; int buttonAndModifiers = [self mapMouseAndModifierStateToSqueakBits: theEvent]; evt.buttons = buttonAndModifiers & 0x07; @@ -404,8 +404,8 @@ evt.type= EventTypeDragDropFiles; evt.timeStamp= ioMSecs(); evt.dragType= dragType; - evt.x = (sqInt) lrintf(local_point.x); - evt.y = (sqInt) lrintf(local_point.y); + evt.x = local_point.x; + evt.y = local_point.y; evt.modifiers= (buttonState >> 3); evt.numFiles= numFiles; evt.windowIndex = windowIndex;

1 0

[commit][3614] Have the Mac OS X build install Localizable.strings.
by commits＠squeakvm.org 19 Feb '16

19 Feb '16

Revision: 3614 Author: eliot Date: 2016-02-19 14:23:01 -0800 (Fri, 19 Feb 2016) Log Message: ----------- Have the Mac OS X build install Localizable.strings. Add versions for Newspeak, Pharo and Squeak. Rename the key to SelectImagePanePrompt. Temporarily disable the Serial plugin in the Pharo Mac VM until we can track down the relevant platforms/iOS support for the Pharo extensions. Modify sqSCCSVersion.h's version program to answer all keys when given TAGS as an arg to allow the edits in the Mac makefiles to be done via a loop over the keys. Modified Paths: -------------- branches/Cog/build.macos32x86/common/Makefile.app branches/Cog/build.macos32x86/pharo.cog.spur/Makefile branches/Cog/build.macos32x86/pharo.cog.spur/plugins.int branches/Cog/build.macos64x64/common/Makefile.app branches/Cog/build.macos64x64/pharo.cog.spur/Makefile branches/Cog/platforms/Cross/vm/sq.h branches/Cog/platforms/Cross/vm/sqSCCSVersion.h branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+imageReadWrite.m Added Paths: ----------- branches/Cog/platforms/iOS/vm/Common/English.lproj/Squeak-Localizable.strings Removed Paths: ------------- branches/Cog/platforms/iOS/vm/Common/English.lproj/Localizable.strings Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.macos32x86/common/Makefile.app =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.app 2016-02-18 19:54:22 UTC (rev 3613) +++ branches/Cog/build.macos32x86/common/Makefile.app 2016-02-19 22:23:01 UTC (rev 3614) @@ -53,6 +53,7 @@ OSXICONS:=$(OSXDIR)/$(VM).icns $(wildcard $(OSXDIR)/$(SYSTEM)*.icns) VMICONS:=$(addprefix $(APP)/Contents/Resources/,$(notdir $(OSXICONS))) VMMENUNIB:=$(APP)/Contents/Resources/English.lproj/MainMenu.nib +VMLOCALIZATION:=$(APP)/Contents/Resources/English.lproj/Localizable.strings SOURCES:= ifneq ($(SOURCEFILE),) SOURCES:=./$(SOURCEFILE) @@ -62,7 +63,8 @@ endif -$(APP): cleanbundles $(VMEXE) $(VMBUNDLES) $(VMPLIST) $(VMMENUNIB) $(VMICONS) \ +$(APP): cleanbundles $(VMEXE) $(VMBUNDLES) \ + $(VMPLIST) $(VMLOCALIZATION) $(VMMENUNIB) $(VMICONS) \ $(SOURCES) $(APPPOST) signapp touchapp # Bundles with missing prerequisites won't be built. But we need to force the @@ -74,7 +76,7 @@ -touch $(OBJDIR)/*.ignore $(VMEXE): $(OBJDIR)/$(VM) - mkdir -p $(APP)/Contents/MacOS + @mkdir -p $(APP)/Contents/MacOS cp -p $(OBJDIR)/$(VM) $(APP)/Contents/MacOS $(APP)/Contents/Resources/%.bundle: $(BLDDIR)/vm/%.bundle @@ -88,15 +90,19 @@ fi $(VMPLIST): $(OSXDIR)/$(SYSTEM)-Info.plist getversion - mkdir -p $(APP)/Contents + @mkdir -p $(APP)/Contents sed "s/\$$(VERSION)/`getversion VERSION_TAG`/" $< | \ sed "s/\$$(VERSION_NUMBER)/`getversion VERSION_NUMBER`/" | \ sed "s/\$$(VERSION_TAG)/`getversion VERSION_TAG`/" | \ sed "s/\$$(VIRTUAL_MACHINE_NICKNAME)/`getversion VIRTUAL_MACHINE_NICKNAME`/" | \ sed "s/\$$(VM_NICKNAME)/`getversion VM_NICKNAME`/" > $@ +$(VMLOCALIZATION): $(OSXCOMMONDIR)/English.lproj/$(SYSTEM)-Localizable.strings + @mkdir -p $(dir $@) + cp -p $< $@ + $(VMMENUNIB): $(PLATDIR)/iOS/vm/English.lproj/MainMenu.xib - mkdir -p $(dir $@) + @mkdir -p $(dir $@) $(XCUB)/ibtool --errors --warnings --notices --module $(VM) \ --minimum-deployment-target $(TARGET_VERSION_MIN) \ --auto-activate-custom-fonts --output-format human-readable-text \ @@ -104,7 +110,7 @@ $(PLATDIR)/iOS/vm/English.lproj/MainMenu.xib $(APP)/Contents/Resources/%.icns: $(OSXDIR)/%.icns - mkdir -p $(APP)/Contents/Resources + @mkdir -p $(APP)/Contents/Resources cp -p $< $(APP)/Contents/Resources # To sign the app, set SIGNING_IDENTITY in the environment, e.g. Modified: branches/Cog/build.macos32x86/pharo.cog.spur/Makefile =================================================================== --- branches/Cog/build.macos32x86/pharo.cog.spur/Makefile 2016-02-18 19:54:22 UTC (rev 3613) +++ branches/Cog/build.macos32x86/pharo.cog.spur/Makefile 2016-02-19 22:23:01 UTC (rev 3614) @@ -5,7 +5,7 @@ VMSRCDIR:= ../../spursrc/vm VM:=Pharo -CFLAGS:=-DPharoVM=1 +COGDEFS:=-DPharoVM=1 # Now include the Makefile proper, which is common to all Mac OS builds. # Modified: branches/Cog/build.macos32x86/pharo.cog.spur/plugins.int =================================================================== --- branches/Cog/build.macos32x86/pharo.cog.spur/plugins.int 2016-02-18 19:54:22 UTC (rev 3613) +++ branches/Cog/build.macos32x86/pharo.cog.spur/plugins.int 2016-02-19 22:23:01 UTC (rev 3614) @@ -22,7 +22,6 @@ MiscPrimitivePlugin \ RePlugin \ SecurityPlugin \ -SerialPlugin \ SocketPlugin \ SoundCodecPrims \ SoundGenerationPlugin \ @@ -31,4 +30,5 @@ SurfacePlugin \ UUIDPlugin \ VMProfileMacSupportPlugin \ +# SerialPlugin \ # JoystickTabletPlugin Modified: branches/Cog/build.macos64x64/common/Makefile.app =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.app 2016-02-18 19:54:22 UTC (rev 3613) +++ branches/Cog/build.macos64x64/common/Makefile.app 2016-02-19 22:23:01 UTC (rev 3614) @@ -53,6 +53,7 @@ OSXICONS:=$(OSXDIR)/$(VM).icns $(wildcard $(OSXDIR)/$(SYSTEM)*.icns) VMICONS:=$(addprefix $(APP)/Contents/Resources/,$(notdir $(OSXICONS))) VMMENUNIB:=$(APP)/Contents/Resources/English.lproj/MainMenu.nib +VMLOCALIZATION:=$(APP)/Contents/Resources/English.lproj/Localizable.strings SOURCES:= ifneq ($(SOURCEFILE),) SOURCES:=./$(SOURCEFILE) @@ -62,7 +63,8 @@ endif -$(APP): cleanbundles $(VMEXE) $(VMBUNDLES) $(VMPLIST) $(VMMENUNIB) $(VMICONS) \ +$(APP): cleanbundles $(VMEXE) $(VMBUNDLES) \ + $(VMPLIST) $(VMLOCALIZATION) $(VMMENUNIB) $(VMICONS) \ $(SOURCES) $(APPPOST) signapp touchapp # Bundles with missing prerequisites won't be built. But we need to force the @@ -74,7 +76,7 @@ -touch $(OBJDIR)/*.ignore $(VMEXE): $(OBJDIR)/$(VM) - mkdir -p $(APP)/Contents/MacOS + @mkdir -p $(APP)/Contents/MacOS cp -p $(OBJDIR)/$(VM) $(APP)/Contents/MacOS $(APP)/Contents/Resources/%.bundle: $(BLDDIR)/vm/%.bundle @@ -88,15 +90,19 @@ fi $(VMPLIST): $(OSXDIR)/$(SYSTEM)-Info.plist getversion - mkdir -p $(APP)/Contents + @mkdir -p $(APP)/Contents sed "s/\$$(VERSION)/`getversion VERSION_TAG`/" $< | \ sed "s/\$$(VERSION_NUMBER)/`getversion VERSION_NUMBER`/" | \ sed "s/\$$(VERSION_TAG)/`getversion VERSION_TAG`/" | \ sed "s/\$$(VIRTUAL_MACHINE_NICKNAME)/`getversion VIRTUAL_MACHINE_NICKNAME`/" | \ sed "s/\$$(VM_NICKNAME)/`getversion VM_NICKNAME`/" > $@ +$(VMLOCALIZATION): $(OSXCOMMONDIR)/English.lproj/$(SYSTEM)-Localizable.strings + @mkdir -p $(dir $@) + cp -p $< $@ + $(VMMENUNIB): $(PLATDIR)/iOS/vm/English.lproj/MainMenu.xib - mkdir -p $(dir $@) + @mkdir -p $(dir $@) $(XCUB)/ibtool --errors --warnings --notices --module $(VM) \ --minimum-deployment-target $(TARGET_VERSION_MIN) \ --auto-activate-custom-fonts --output-format human-readable-text \ @@ -104,7 +110,7 @@ $(PLATDIR)/iOS/vm/English.lproj/MainMenu.xib $(APP)/Contents/Resources/%.icns: $(OSXDIR)/%.icns - mkdir -p $(APP)/Contents/Resources + @mkdir -p $(APP)/Contents/Resources cp -p $< $(APP)/Contents/Resources # To sign the app, set SIGNING_IDENTITY in the environment, e.g. Modified: branches/Cog/build.macos64x64/pharo.cog.spur/Makefile =================================================================== --- branches/Cog/build.macos64x64/pharo.cog.spur/Makefile 2016-02-18 19:54:22 UTC (rev 3613) +++ branches/Cog/build.macos64x64/pharo.cog.spur/Makefile 2016-02-19 22:23:01 UTC (rev 3614) @@ -5,7 +5,7 @@ VMSRCDIR:= ../../spur64src/vm VM:=Pharo -CFLAGS:=-DPharoVM=1 +COGDEFS:=-DPharoVM=1 # Now include the Makefile proper, which is common to all Mac OS builds. # Modified: branches/Cog/platforms/Cross/vm/sq.h =================================================================== --- branches/Cog/platforms/Cross/vm/sq.h 2016-02-18 19:54:22 UTC (rev 3613) +++ branches/Cog/platforms/Cross/vm/sq.h 2016-02-19 22:23:01 UTC (rev 3614) @@ -28,6 +28,10 @@ # define IMAGE_DIALECT_NAME "Newspeak" # define DEFAULT_IMAGE_NAME "newspeak.image" # define IMAGE_ENV_NAME "NEWSPEAK_IMAGE" +# elif PharoVM +# define IMAGE_DIALECT_NAME "Pharo" +# define DEFAULT_IMAGE_NAME "Pharo.image" +# define IMAGE_ENV_NAME "PHARO_IMAGE" # else # define IMAGE_DIALECT_NAME "Squeak" # define DEFAULT_IMAGE_NAME "squeak.image" Modified: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h =================================================================== --- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h 2016-02-18 19:54:22 UTC (rev 3613) +++ branches/Cog/platforms/Cross/vm/sqSCCSVersion.h 2016-02-19 22:23:01 UTC (rev 3614) @@ -120,13 +120,19 @@ int argc = 0; char **argv = 0; +int justPrintTags = 0; /* printit allows that with no arguments print all key/value pairs - * and with one argument print the value of a particular key. + * and with one argument print the value of a particular key, or with + * the one argument TAGS to print all keys. */ int printit(const char *what) { + if (justPrintTags) { + printf("%s ", what); + return 0; + } if (argc == 1) { printf("%s: ", what); return 1; @@ -142,6 +148,8 @@ argc = _argc; argv = _argv; + justPrintTags = argc == 2 && !strcmp(argv[1], "TAGS"); + if (printit("VM_NICKNAME")) printf("%s\n", NICKNAME " " OBJMEM " VM"); if (printit("VIRTUAL_MACHINE_NICKNAME")) @@ -160,7 +168,16 @@ printf("%s-%s\n", vm_version, revisionAsString()); if (printit("VERSION_NUMBER")) printf("%s.%s\n", vm_version, revisionAsString()); + if (printit("NICKNAME")) + printf("%s\n", NICKNAME); + if (printit("OBJMEM")) + printf("%s\n", OBJMEM); + if (printit("DEFAULT_IMAGE_NAME")) + printf("%s\n", DEFAULT_IMAGE_NAME); + if (justPrintTags) + printf("\n"); + return 0; } #endif /* VERSION_PROGRAM */ Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Mon Feb 15 21:33:16 PST 2016 + Fri Feb 19 14:19:29 PST 2016 Deleted: branches/Cog/platforms/iOS/vm/Common/English.lproj/Localizable.strings =================================================================== --- branches/Cog/platforms/iOS/vm/Common/English.lproj/Localizable.strings 2016-02-18 19:54:22 UTC (rev 3613) +++ branches/Cog/platforms/iOS/vm/Common/English.lproj/Localizable.strings 2016-02-19 22:23:01 UTC (rev 3614) @@ -1,9 +0,0 @@ -/* - Localizable.strings - SqueakPureObjc - - Created by John M McIntosh on 09-11-24. - Copyright 2009 Corporate Smalltalk Consulting Ltd. All rights reserved. - */ - -"SqueakSelectImagePanePrompt" = "Select a Squeak image file to open"; \ No newline at end of file Copied: branches/Cog/platforms/iOS/vm/Common/English.lproj/Squeak-Localizable.strings (from rev 3604, branches/Cog/platforms/iOS/vm/Common/English.lproj/Localizable.strings) =================================================================== --- branches/Cog/platforms/iOS/vm/Common/English.lproj/Squeak-Localizable.strings (rev 0) +++ branches/Cog/platforms/iOS/vm/Common/English.lproj/Squeak-Localizable.strings 2016-02-19 22:23:01 UTC (rev 3614) @@ -0,0 +1,3 @@ +/* Localized versions of Info.plist keys */ + +"SelectImagePanePrompt" = "Select a Newspeak image file to open"; Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m =================================================================== --- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m 2016-02-18 19:54:22 UTC (rev 3613) +++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m 2016-02-19 22:23:01 UTC (rev 3614) @@ -15,10 +15,10 @@ copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND @@ -27,7 +27,7 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - + The end-user documentation included with the redistribution, if any, must include the following acknowledgment: "This product includes software developed by Corporate Smalltalk Consulting Ltd (http://www.smalltalkconsulting.com) and its contributors", in the same place and form as other third-party acknowledgments. @@ -51,7 +51,7 @@ bits. (The Mac shift and caps lock keys are both mapped to the single Squeak shift bit). This was true for squeak upto 3.0.7. Then in 3.0.8 we decided to not map the cap lock key to shift - + Mac bits: <control><option><caps lock><shift><command> ST bits: <command><option><control><shift> */ @@ -108,7 +108,7 @@ - (void) pumpRunLoopEventSendAndSignal:(BOOL)signal { NSEvent *event; - + while ((event = [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:nil @@ -133,16 +133,16 @@ using the runloop, but if you just run the runloop on the main thread, events won't get processed. You have to explicitly run this in order to get them to be processed. - + Note that using the default runloop mode with this is generally a bad idea. By running in the default mode you allow *everything* else to run, which means that some other code might decide that *it* wants an inner event loop as well. If you then want to quit before that other code has finished, tough cookies. Much better to control things more tightly by using a different runloop mode. - + */ - + } - (void ) processAsOldEventOrComplexEvent: (id) event placeIn: (sqInputEvent *) evt { @@ -166,17 +166,17 @@ NSInteger i; NSRange picker; NSUInteger totaLength; - + evt.type = EventTypeKeyboard; - evt.timeStamp = (int) ioMSecs(); + evt.timeStamp = ioMSecs(); picker.location = 0; picker.length = 1; totaLength = [unicodeString length]; for (i=0;i < totaLength;i++) { - - + + unicode = [unicodeString characterAtIndex: i]; - + if (mainView.lastSeenKeyBoardStrokeDetails) { evt.modifiers = [self translateCocoaModifiersToSqueakModifiers: mainView.lastSeenKeyBoardStrokeDetails.modifierFlags]; evt.charCode = mainView.lastSeenKeyBoardStrokeDetails.keyCode; @@ -184,32 +184,32 @@ evt.modifiers = 0; evt.charCode = 0; } - + if ((evt.modifiers & CommandKeyBit) && (evt.modifiers & ShiftKeyBit)) { /* command and shift */ if ((unicode >= 97) && (unicode <= 122)) { /* convert ascii code of command-shift-letter to upper case */ unicode = unicode - 32; } } - + NSString *lookupString = AUTORELEASEOBJ([[NSString alloc] initWithCharacters: &unicode length: 1]); [lookupString getBytes: &macRomanCharacter maxLength: 1 usedLength: NULL encoding: NSMacOSRomanStringEncoding options: 0 range: picker remainingRange: NULL]; - + evt.pressCode = EventKeyDown; unsigned short keyCodeRemembered = evt.charCode; evt.utf32Code = 0; evt.reserved1 = 0; - evt.windowIndex = (int) mainView.windowLogic.windowIndex; + evt.windowIndex = mainView.windowLogic.windowIndex; [self pushEventToQueue: (sqInputEvent *)&evt]; - + evt.charCode = macRomanCharacter; evt.pressCode = EventKeyChar; evt.modifiers = evt.modifiers; evt.utf32Code = unicode; - + [self pushEventToQueue: (sqInputEvent *) &evt]; - + if (i > 1 || !mainView.lastSeenKeyBoardStrokeDetails) { evt.pressCode = EventKeyUp; evt.charCode = keyCodeRemembered; @@ -217,22 +217,22 @@ [self pushEventToQueue: (sqInputEvent *) &evt]; } } - + interpreterProxy->signalSemaphoreWithIndex(gDelegateApp.squeakApplication.inputSemaphoreIndex); } - (void) recordKeyDownEvent:(NSEvent *)theEvent fromView: (sqSqueakOSXOpenGLView *) aView { sqKeyboardEvent evt; - + evt.type = EventTypeKeyboard; - evt.timeStamp = (int) ioMSecs(); + evt.timeStamp = ioMSecs(); evt.charCode = [theEvent keyCode]; evt.pressCode = EventKeyDown; evt.modifiers = [self translateCocoaModifiersToSqueakModifiers: [theEvent modifierFlags]]; evt.utf32Code = 0; evt.reserved1 = 0; - evt.windowIndex = (int)[[aView windowLogic] windowIndex]; + evt.windowIndex = [[aView windowLogic] windowIndex]; [self pushEventToQueue: (sqInputEvent *) &evt]; interpreterProxy->signalSemaphoreWithIndex(gDelegateApp.squeakApplication.inputSemaphoreIndex); @@ -240,15 +240,15 @@ - (void) recordKeyUpEvent:(NSEvent *)theEvent fromView: (sqSqueakOSXOpenGLView *) aView { sqKeyboardEvent evt; - + evt.type = EventTypeKeyboard; - evt.timeStamp = (int) ioMSecs(); + evt.timeStamp = ioMSecs(); evt.charCode = [theEvent keyCode]; evt.pressCode = EventKeyUp; evt.modifiers = [self translateCocoaModifiersToSqueakModifiers: [theEvent modifierFlags]]; evt.utf32Code = 0; evt.reserved1 = 0; - evt.windowIndex = (int) aView.windowLogic.windowIndex; + evt.windowIndex = aView.windowLogic.windowIndex; [self pushEventToQueue: (sqInputEvent *) &evt]; interpreterProxy->signalSemaphoreWithIndex(gDelegateApp.squeakApplication.inputSemaphoreIndex); @@ -256,15 +256,15 @@ - (void) recordMouseEvent:(NSEvent *)theEvent fromView: (sqSqueakOSXOpenGLView *) aView{ sqMouseEvent evt; - + evt.type = EventTypeMouse; - evt.timeStamp = (int) ioMSecs(); - + evt.timeStamp = ioMSecs(); + NSPoint local_point = [aView convertPoint: [theEvent locationInWindow] fromView:nil]; - - evt.x = (int) lrintf(local_point.x); - evt.y = (int) lrintf(local_point.y); - + + evt.x = (sqInt) lrintf(local_point.x); + evt.y = (sqInt) lrintf(local_point.y); + int buttonAndModifiers = [self mapMouseAndModifierStateToSqueakBits: theEvent]; evt.buttons = buttonAndModifiers & 0x07; evt.modifiers = buttonAndModifiers >> 3; @@ -273,32 +273,32 @@ #else evt.reserved1 = 0; #endif - evt.windowIndex = (int) aView.windowLogic.windowIndex; - + evt.windowIndex = aView.windowLogic.windowIndex; + [self pushEventToQueue:(sqInputEvent *) &evt]; //NSLog(@"mouse hit x %i y %i buttons %i mods %i",evt.x,evt.y,evt.buttons,evt.modifiers); interpreterProxy->signalSemaphoreWithIndex(gDelegateApp.squeakApplication.inputSemaphoreIndex); } - + - (void) recordWheelEvent:(NSEvent *) theEvent fromView: (sqSqueakOSXOpenGLView *) aView{ - + [self recordMouseEvent: theEvent fromView: aView]; CGFloat x = [theEvent deltaX]; CGFloat y = [theEvent deltaY]; if (x != 0.0f) { - [self fakeMouseWheelKeyboardEventsKeyCode: (x < 0 ? 124 : 123) ascii: (x < 0 ? 29 : 28) windowIndex: (int) aView.windowLogic.windowIndex]; + [self fakeMouseWheelKeyboardEventsKeyCode: (x < 0 ? 124 : 123) ascii: (x < 0 ? 29 : 28) windowIndex: aView.windowLogic.windowIndex]; } if (y != 0.0f) { - [self fakeMouseWheelKeyboardEventsKeyCode: (y < 0 ? 125 : 126) ascii: (y < 0 ? 31 : 30) windowIndex: (int) aView.windowLogic.windowIndex]; + [self fakeMouseWheelKeyboardEventsKeyCode: (y < 0 ? 125 : 126) ascii: (y < 0 ? 31 : 30) windowIndex: aView.windowLogic.windowIndex]; } } - -- (void) fakeMouseWheelKeyboardEventsKeyCode: (int) keyCode ascii: (int) ascii windowIndex: (int) windowIndex { + +- (void) fakeMouseWheelKeyboardEventsKeyCode: (int) keyCode ascii: (int) ascii windowIndex: (sqInt) windowIndex { sqKeyboardEvent evt; evt.type = EventTypeKeyboard; - evt.timeStamp = (int) ioMSecs(); + evt.timeStamp = ioMSecs(); evt.pressCode = EventKeyDown; evt.charCode = keyCode; evt.utf32Code = 0; @@ -311,12 +311,12 @@ evt.charCode = ascii; evt.utf32Code = ascii; [self pushEventToQueue:(sqInputEvent *) &evt]; - + evt.pressCode = EventKeyUp; evt.charCode = keyCode; evt.utf32Code = 0; [self pushEventToQueue:(sqInputEvent *) &evt]; - + } - (int) translateCocoaModifiersToSqueakModifiers: (NSUInteger) modifiers { @@ -337,23 +337,23 @@ if (modifiers & NSCommandKeyMask) keyBoardModifiers |= cmdKey; return keyBoardModifiers; - + } - + - (int) mapMouseAndModifierStateToSqueakBits: (NSEvent *) event { /* On a two- or three-button mouse, the left button is normally considered primary and the right button secondary, but left-handed users can reverse these settings as a matter of preference. The middle button on a three-button mouse is always the tertiary button. ' - + But mapping assumes 1,2,3 red, yellow, blue */ - + NSInteger stButtons,modifier,mappedButton; NSInteger mouseButton=0; - + static NSInteger buttonStateBits[4] = {0,0,0,0}; - + stButtons = buttonState; NSUInteger keyBoardCarbonModifiers = [self translateCocoaModifiersToCarbonModifiers: [event modifierFlags]]; NSInteger whatHappened = [event type]; @@ -366,9 +366,9 @@ mouseButton = 2; if (!mouseButton) mouseButton = [event buttonNumber] + 1; //buttonNumber seems to count from 0. - + if (mouseButton > 0 && mouseButton < 4) { - + modifier = 0; if (keyBoardCarbonModifiers & cmdKey ) modifier = 1; @@ -376,7 +376,7 @@ modifier = 2; if (keyBoardCarbonModifiers & controlKey) modifier = 3; - + if (browserActiveAndDrawingContextOkAndNOTInFullScreenMode()) mappedButton = [(sqSqueakOSXInfoPlistInterface *) self.infoPlistInterfaceLogic getSqueakBrowserMouseMappingsAt: modifier by: mouseButton]; else @@ -390,7 +390,7 @@ stButtons |= mappedButton == 3 ? (buttonStateBits[mappedButton] ? BlueButtonBit : 0) : 0; } } - + // button state: low three bits are mouse buttons; next 8 bits are modifier bits buttonState = (int) (modifierMap[((keyBoardCarbonModifiers & 0xFFFF) >> 8)] << 3) | (int) (stButtons & 0x7); return buttonState; @@ -398,27 +398,27 @@ - (void) recordDragEvent:(int)dragType numberOfFiles:(int)numFiles where:(NSPoint)point windowIndex:(sqInt)windowIndex view:(NSView *)aView{ sqDragDropFilesEvent evt; - + NSPoint local_point = [aView convertPoint:point fromView:nil]; - + evt.type= EventTypeDragDropFiles; - evt.timeStamp= (int) ioMSecs(); + evt.timeStamp= ioMSecs(); evt.dragType= dragType; - evt.x = (int) lrintf(local_point.x); - evt.y = (int) lrintf(local_point.y); + evt.x = (sqInt) lrintf(local_point.x); + evt.y = (sqInt) lrintf(local_point.y); evt.modifiers= (buttonState >> 3); evt.numFiles= numFiles; - evt.windowIndex = (int) windowIndex; + evt.windowIndex = windowIndex; [self pushEventToQueue: (sqInputEvent *) &evt]; - + interpreterProxy->signalSemaphoreWithIndex(gDelegateApp.squeakApplication.inputSemaphoreIndex); } - (void) recordWindowEvent: (int) windowType window: (NSWIndow *) window { sqWindowEvent evt; - + evt.type= EventTypeWindow; - evt.timeStamp= (int) ioMSecs(); + evt.timeStamp= ioMSecs(); evt.action= windowType; evt.value1 = 0; evt.value2 = 0; @@ -426,7 +426,7 @@ evt.value4 = 0; evt.windowIndex = windowIndexFromHandle((wHandleType)window); [self pushEventToQueue: (sqInputEvent *) &evt]; - + interpreterProxy->signalSemaphoreWithIndex(gDelegateApp.squeakApplication.inputSemaphoreIndex); } Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+imageReadWrite.m =================================================================== --- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+imageReadWrite.m 2016-02-18 19:54:22 UTC (rev 3613) +++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+imageReadWrite.m 2016-02-19 22:23:01 UTC (rev 3614) @@ -46,7 +46,7 @@ @implementation sqSqueakOSXApplication (imageReadWrite) - (void) attempToOpenImageFromOpenPanel { NSOpenPanel *panel= [NSOpenPanel openPanel]; - [panel setTitle: NSLocalizedString(@"SqueakSelectImagePanePrompt",nil)]; + [panel setTitle: NSLocalizedString(@"SelectImagePanePrompt",nil)]; [panel setFloatingPanel: YES]; [panel setOneShot: YES]; [panel setReleasedWhenClosed: YES];

1 0

why does #resume affect waiting semaphore
by Ben Coman 19 Feb '16

19 Feb '16

Just a curiosity I've had for a while. Intuituvely I would expect the following produce { } since sem is never signalled. log := OrderedCollection new. sem := Semaphore new. p1 := [sem wait. log add: 1] forkAt: 41. p2 := [sem wait. log add: 2] forkAt: 41. p2 resume. log inspect. but it produces {2}. >From digging in the primitives I understand a bit why this happens. What I'm interested in learning is, from an architecture perspective, why is the existing behaviour preferred? cheers -ben

2 1

Process>>isSusended
by Eliot Miranda 19 Feb '16

19 Feb '16

Hi All, we have a serious misunderstanding in current versions of Squeak's and Pharo's Process>>isSuspended. Squeak's version reads isSuspended ^myList isNil Pharo's reads isSuspended ^myList isNil or: [ myList isEmpty ] Process's myList holds the list a process is on when it is not running. There is only one running process at any one time, Processor activeProcess. The active process's myList is always nil, so Squeak's and Pharo's are both wrong for the active process. Processor activeProcess isSuspended => true (!!!) A process may be runnable, but not running (which follows form there being only one running process, the active process, at any one time). If it is runnable but not running its list is one of the runnable process lists in the scheduler, e.g. Processor waitingProcessesAt: Processor activePriority => a LinkedList() Processor waitingProcessesAt: Processor lowestPriority => a LinkedList(a Process in ProcessorScheduler class>>idleProcess) Here's a couple of illustrative examples: [Semaphore new wait] fork suspendingList => a LinkedList(a Process in [] in BlockClosure>>newProcess) ([Semaphore new wait] forkAt: Processor activePriority + 1) suspendingList => a Semaphore(a Process in [] in UndefinedObject>>DoIt) In the first example above the new process isn't running yet. It's runnable but hasn't got a chance to run because the active process that created it is still running. So the process's list is Processor waitingProcessesAt: Processor activePriority. In the second example the process has got to run, because, having higher priority, it has preempted the active process that created it. So it suspends waiting on the semaphore. So in fact, isSuspended should read something like isSuspended | myRunList | myRunList := Processor waitingProcessesAt: priority. ^myList notNil and: [myList ~~ myRunList] except that this isn't atomic. But it isn't the complete nonsense we have at the moment. Here's an atomic version that answers the truth at the point that the question was asked: isSuspended | myPriority | myPriority := priority. ^myList ifNil: [false] ifNotNil: [:list| list ~~ (Processor waitingProcessesAt: myPriority)] We need tests like self deny: Processor activeProcess isSuspended. self deny: ([Semaphore new wait] forkAt: Processor activePriority) isSuspended. self assert: ([Semaphore new wait] forkAt: Processor activePriority + 1) isSuspended. _,,,^..^,,,_ best, Eliot

4 6

FFI related musings
by Ben Coman 19 Feb '16

19 Feb '16

While musing on FFI interfacing issues like C++ name mangling, I found an interesting article "Beautiful Native Libraries" about the other side of the fence of designing a nice library interface. I learnt some things maybe of interest to others - perhaps for pushing upstream into external libraries to ease their use by our FFI. http://lucumr.pocoo.org/2013/8/18/beautiful-native-libraries/ Some of the ideas seem applicable to maybe one day helping the VM be embeddable in other programs. Also, for the occasional idea of in-Image parsing of C include files, a link to a basic algorithm for macro expansion. http://www.spinellis.gr/blog/20060626/ And while I haven't read the following, it was interesting to skim "Calling conventions for different C++ compilers and operating systems" http://www.agner.org/optimize/calling_conventions.pdf cheers -ben

1 0

[commit][3613] Update the VM build instructions for Mac OS X.
by commits＠squeakvm.org 18 Feb '16

18 Feb '16

Revision: 3613 Author: eliot Date: 2016-02-18 11:54:22 -0800 (Thu, 18 Feb 2016) Log Message: ----------- Update the VM build instructions for Mac OS X. Update the Mac OS X makefiles to not fail if the Bochs and GdbARM support libraries are unavailable. Fix a complaint about an empty object file in the RePlugin. Modified Paths: -------------- branches/Cog/README branches/Cog/build.macos32x86/HowToBuild branches/Cog/build.macos32x86/common/Makefile.app branches/Cog/build.macos32x86/common/Makefile.plugin branches/Cog/build.macos32x86/common/Makefile.vm branches/Cog/build.macos64x64/HowToBuild branches/Cog/build.macos64x64/common/Makefile.app branches/Cog/build.macos64x64/common/Makefile.plugin branches/Cog/build.macos64x64/common/Makefile.vm branches/Cog/platforms/iOS/plugins/BochsIA32Plugin/Makefile branches/Cog/platforms/iOS/plugins/BochsX64Plugin/Makefile branches/Cog/platforms/iOS/plugins/GdbARMPlugin/Makefile Added Paths: ----------- branches/Cog/platforms/iOS/plugins/RePlugin/ branches/Cog/platforms/iOS/plugins/RePlugin/Makefile Modified: branches/Cog/README =================================================================== --- branches/Cog/README 2016-02-16 05:35:08 UTC (rev 3612) +++ branches/Cog/README 2016-02-18 19:54:22 UTC (rev 3613) @@ -75,21 +75,17 @@ sistasrc/vm - Smalltalk Sista V3 spursistasrc/vm - Smalltalk Sista Spur spursrc/vm - Smalltalk Cog Spur + spur64src/vm - Smalltalk Cog Spur 64-bit spurstacksrc/vm - Smalltalk Stack Spur + spurstack64src/vm - Smalltalk Stack Spur 64-bit src/vm - Smalltalk Cog V3 stacksrc/vm - Smalltalk Stack V3 -There are two plugin directories - nscogsrc/plugins +All plugins are in the directory src/plugins These contain many, but not all, of the plugins available for the VM. Others can be found in Cog, or in various Monticello packages in various repositories. -The two directories include essentially the same material exept for the -IA32ABI/IA32ABI.c plugin, the core plugin for the Alien FFI on x86 platforms. -In Newspeak this plgin has support for per-object immutability, a feature -as-yet-unimplemented in Cog but that was available on the old context-based -Newspeak interpreter VM. Each vm source directory contains several files, a subset of the following: cogit.c - the JIT; a Cogit cooperates with a CoInterpreter @@ -114,7 +110,8 @@ before the end of 2014. The current "official" buikd directories are of the form build.OS_WordSize_Processor, and include build.linux32x86 - uses autoconf, gcc and make - build.macos32x86 - uses XCode and gcc (currently for 10.6 or earlier) + build.macos32x86 - 32-bit Mac OS X using XCode and clang + build.macos64x64 - 64-bit Mac OS X using XCode and clang build.win32x86 - uses cygwin, gcc and make More can be added as required. In each there is a HowToBuild that describes the necessary steps to produce a VM. @@ -164,7 +161,8 @@ Finally the image directory contains scripts that will build a "VMMaker" image, a Squeak Smalltalk image containing all the packages that comprise the Cog system, suitable for developing the VM and for generating (or updating) the -sources in the vm source directories. +sources in the vm source directories. There is also a script for generating a +64-bit Spur image from a 32-bit Spur image. Eliot Miranda -June 2014 +Frebruary 2016 Modified: branches/Cog/build.macos32x86/HowToBuild =================================================================== --- branches/Cog/build.macos32x86/HowToBuild 2016-02-16 05:35:08 UTC (rev 3612) +++ branches/Cog/build.macos32x86/HowToBuild 2016-02-18 19:54:22 UTC (rev 3613) @@ -1,13 +1,17 @@ How To Build On Mac OS X ---------------------- +------------------------ +This file (build.macos32x86/HowToBuild) describes how to build VMs that run +32-bit images. build.macos64x64/HowToBuild describes how to build VMs that +run 64-bit images. Contents: - Overview - Checking out sources to build out-of-the-box - Building out of the box - - Building the Bochs Support Libraries - - Optimization level and gcc version (please read!) + - The Structure of the Makefiles + - Building the VM Simulator Support Libraries + - Using Different Compilers Overview @@ -30,6 +34,7 @@ Spur, as described on the www.mirandabanda.org blog, is a faster object representation which uses generation scavenging, lazy forwarding for fast become, and a single object header format common to 32 and 64 bit versions. +Newspeak, Squeak 5 and the upcoming release of Pharo all use Spur. Another distinction is between normal single-threaded VMs that schedule "green" Smalltalk processes above a single-threaded VM, and "multi-threaded" VMs that @@ -60,113 +65,120 @@ processor sources and the relevant build directories svn co http://www.squeakvm.org/svn/squeak/branches/Cog/platforms svn co http://www.squeakvm.org/svn/squeak/branches/Cog/processors + svn co http://www.squeakvm.org/svn/squeak/branches/Cog/{spursrc,src} etc + (see section "VM source directories" in the root README) + svn co http://www.squeakvm.org/svn/squeak/branches/Cog/sources + (this is needed only to install Smalltalk source files) svn co http://www.squeakvm.org/svn/squeak/branches/Cog/build.macos32x86 - svn co http://www.squeakvm.org/svn/squeak/branches/Cog/src etc - (see section "VM source directories" in the root README) Building out of the box ----------------------- -0. As of this writing (December 2015) only the squeak.cog.spur builds build -on 10.9 and later, using John McIntosh's Cocoa platform support files. The -rest of the builds build only on 10.6.x (and probably 10.5.x) using the old -Carbon libraries. We are transitioning as fast as possible to Cocoa. -Volunteers welcome. +0. The build system is based on Gnu Make for makefiles, and Xcode.app for +compilers and libraries. You will need a Mac OS X machine running at least +10.7.x (the author is currently using 10.9) and Xcode v6 or later. The system +builds only the new Cocoa based VMs that use the platforms/iOS tree. The old +Carbon-based VMs using platforms/Mac OS are unsupported. -Carbon Builds: -1. Install the tools (Xcode etc); the CoreVM.xcodeproj is set-up to build - using gcc 4.2 but you can optionally install the Intel C++ compiler 11.1 - and change the compilerSpec in CoreVM.xcodeproj/project.pbxproj to get - better performance. +1. Install the tools (Xcode etc). If you want to sign the application make sure +you have installed a suitable certificate via Keychain Access and that the +signing identity is in the SIGNING_IDENTITY environment variable, e.g. in the +author's .profile is the line +export SIGNING_IDENTITY="Developer ID Application: Eliot Miranda" -2. Either disable the building of the Bochs plugin (see each makevm file, -disabling the lines beginning "# Build the BochsIA32Plugin") or build the -Bochs support libraries (see Building the Bochs Support Libraries below). - -3. cd to the VM configuration of your choice and execute +2. cd to the VM configuration of your choice and run the mvm script, e.g. + cd buiild.macos32x86/squeak.cog.spur ./mvm -A -This will build Fast.app, Debug.app and Assert.app applications containing the -three basic VM configurations. If the configuration includes the multi-threaded +This will build CocoaFast.app, CocoaDebug.app and CocoaAssert.app applications +containing the three basic VM configurations. If the configuration includes +the multi-threaded VM you can use mvm -AS to make the single-threaded VMs, mvm -AT to make the multi-threadeds in FastMT.app et al, and mvm -A to make them all. mvm -d will make the Debug.app VM, etc. mvm -? provides the gory details. -Cocoa Builds: -1. Install the tools (Xcode etc); the SqueakCogSpur32x86.xcodeproj is set-up to -build using clang 6.x or clang 7.x. - -2. Either disable the building of the Bochs plugins (see each makeiosvm file, -disabling the lines beginning "# Build the BochsIA32Plugin") or build the -Bochs support libraries (see Building the Bochs Support Libraries below). - -3. cd to the VM configuration of your choice and execute - ./miosvm -A -This will build CocoaFast.app, CocoaDebug.app and CocoaAssert.app applications -containing the three basic VM configurations. If the configuration includes -the multi-threaded VM you can use miosvm -AS to make the single-threaded VMs, -miosvm -AT to make the multi-threadeds in FastMT.app et al, and miosvm -A to make -them all. miosvm -d will make the CocoaDebug.app VM, etc. miosvm -? provides the -gory details. - - - Each build directory contains three files plugins.int plugins.ext -On other platforms editing these and making is all one needs to do to change the -set of plugins. Alas on Xcode one also has to edit the relevant Xcode projects -to add and remove source files. If you're brave enough to contemplate this -you're brave enough to figure out how to do this yourself. +Editing these and making is all one needs to do to change the set of plugins. +But see The Structure of the Makefiles below for "complicated" plugins. -Building the Bochs Support Libraries ------------------------------------- -If you want to get the Cog VM simulator working you'll need to build the -BochsIA32Plugin and/or the BochsX64Plugin to build that you'll need to first -build bochs. First check-out the processor simulator source tree containing -Bochs: - svn co http://www.squeakvm.org/svn/squeak/branches/Cog/processors -Then build the libraries. cd to e.g. build.macos32x86/bochsx86, run +The Structure of the Makefiles +------------------------------ +Each VM build directory contains the mvm script, a root Makefile that selects +the VM source to build, plugins.int to specify the internal plugins to build, +and plugins.ext to specify the external plugins (if any) to build. The root +Makefile then includes a full Makefile from the common directory. For example, +squeak.cog.spur's Makefile (minus commentary) reads + ----8<-----build.macos32x86/squeak.cog.spur/Makefile----8<--------------- + VMSRCDIR:= ../../spursrc/vm + SOURCEFILE:=SqueakV50.sources - $ cd build.macos32x86/bochsx86 - $ ./conf.COG - $ ../../processors/IA32/bochs/makeem + include ../common/Makefile.app.squeak.cog + ----8<-----build.macos32x86/squeak.cog.spur/Makefile----8<--------------- +Some external plugins require spport libraries. In particular, the processor +simulators used by VMMaker.oscog to develop the VM JITs, depend on C or C++ +code that implements a processor simulator. See below. Plugins that require +extra support or special compilation have makefiles under +platforms/iOS/plugins/, for example plugins/iOS/plugins/RePlugin/Makefile. +This Makefile sets some values and then includes common/Makefile.plugin to do +the dirty work. If you add an exotic plugin that requires such source please +read the plugin makefile build.macos32x86/common/Makefile.plugin and the +makefiles under plugins/iOS/plugins for examples of the facilities available. +The files in build.macos32x86/common are + Makefile.app + The top-level makefile for CocoaFast.app et al. + It includes Makefile.vm to build the vm and plugins and then constructs + and optionally signs the .app bundle. It may also install a Smalltalk + source file. + Makefile.app.newspeak + Modifies Makefile.app to rename the executable and install sources + Makefile.app.squeak.cog + Modifies Makefile.app to use the green VM icon that implies Cog + Makefile.flags + Defines the compilation flags and SDK to use in building the VM + Makefile.plugin + Makes either an internal FooPlugin.lib or an external FooPlugin.bundle. + If platforms/iOS/plugins/FooPlugin/Makefile exists Makefile.vm will + use it, and it should include Makefile.plugin to do the dirty work. + Makefile.rules + Defines the rules for compiling c, c++ and objective-c source files, + including maintaining dependency information. + Makefile.vm + Makes the VM executable in the chosen configuration from product, + assert or debug. Decodes plugins.int and plugins.ext and invokes + make with the relevant makefile, either a special one such as + platforms/iOS/plugins/RePlugin/Makefile or Makefile.plugin, for each + internal or external plugin. + mkNamedPrims.sh + This script makes sqNamedPrims.h which defines the exports from the set + of internal plugins that the VM uses to access the primitives in + internal plugins. -Using gcc with Xcode 6.x, Mac OS X > 10.6 ------------------------------------------ -We're in the process of transitioning from a Carbon/Mac OS X 10.6/Xcode -3.1.x build system to a Cocoa/Mac OS X 10.9 or above/Xcode 6.x/7.x build -system. We're still building a VM that should run on 10.6. By default -Xcode uses the clang compiler. -You may want to use a different compiler. For example, to install gcc 5.2 -see http://hamelot.co.uk/programming/add-gcc-compiler-to-xcode-6/ -(Thanks Hammad!). -Essentially -- install brew - ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" -- get all available versions of gcc - brew tap homebrew/versions -- build gcc 5.2 (Eliot: my first attempt failed with some library - incompatibility during the bootstrap, I then installed 4.8 successfully - and retried installing 5.2 and miraculously this time it worked) - brew install gcc5 -- get the GCC 5.2 plugin for Xcode: - git clone https://github.com/hmazhar/xcode-gcc.git -- install the Xcode plugin for the gcc 5.2 compiler - open /Applications/Xcode.app/Contents/PlugIns/Xcode3Core.ideplugin/Contents/SharedSupport/Developer/Library/Xcode/Plug-ins/ - open xcode-gcc - and use the finder to copy the plugin into the Xcode app bundle. -Optimization level and gcc version ----------------------------------- -There are issues with gcc version > 4.2.1. Any of the following flags may break the build at -O2: --ftree-pre --fpartial-inlining --fcaller-saves +Building the VM Simulator Support Libraries +------------------------------------------- +As of this writing there are three processors with three sets of support +libraries. If you want to build these they are in + build.macos32x86/{bochsx86,bochsx64,gdbarm32} +In each directory there is a conf.COG script. Cd to the directory, run the +script, and in the case of the bochs directories also run makeem. e.g. + $ cd build.macos32x86/bochsx86 + $ ./conf.COG + $ ../../processors/IA32/bochs/makeem +Then cd to the VM build directoruy of your choice and build. -They're turned off in the Xcode files provided. +Using Different Compilers +----------------------------------------- +The build system uses Xcode's default compiler, clang by default. +You may want to use a different compiler. Users claim this is possible. +For example, to install gcc 5.2 see + http://hamelot.co.uk/programming/add-gcc-compiler-to-xcode-6/ +(Thanks Hammad!). There are no guarantees that this will work, but that's the +best pointer I've found. + Eliot Miranda -December 2015 +February 2016 Modified: branches/Cog/build.macos32x86/common/Makefile.app =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.app 2016-02-16 05:35:08 UTC (rev 3612) +++ branches/Cog/build.macos32x86/common/Makefile.app 2016-02-18 19:54:22 UTC (rev 3613) @@ -62,16 +62,30 @@ endif -$(APP): $(VMEXE) $(VMBUNDLES) $(VMPLIST) $(VMMENUNIB) $(VMICONS) $(SOURCES) \ - $(APPPOST) signapp touchapp +$(APP): cleanbundles $(VMEXE) $(VMBUNDLES) $(VMPLIST) $(VMMENUNIB) $(VMICONS) \ + $(SOURCES) $(APPPOST) signapp touchapp +# Bundles with missing prerequisites won't be built. But we need to force the +# attempt to make them every time in case the prerequisites /have/ been built. +# to do this we must both delete the bundles and touch any ignore files, upon +# which the bundle build depends. +cleanbundles: + -rm -rf $(APP)/Contents/Resources/*.bundle + -touch $(OBJDIR)/*.ignore + $(VMEXE): $(OBJDIR)/$(VM) mkdir -p $(APP)/Contents/MacOS cp -p $(OBJDIR)/$(VM) $(APP)/Contents/MacOS $(APP)/Contents/Resources/%.bundle: $(BLDDIR)/vm/%.bundle - mkdir -p $(APP)/Contents/Resources - cp -pR $< $(APP)/Contents/Resources + @mkdir -p $(APP)/Contents/Resources + @if [ -f $(basename $<).ignore ]; then \ + echo $(notdir $<) is being ignored; \ + rm -rf $^; \ + else \ + echo cp -pR $< $(APP)/Contents/Resources; \ + cp -pR $< $(APP)/Contents/Resources; \ + fi $(VMPLIST): $(OSXDIR)/$(SYSTEM)-Info.plist getversion mkdir -p $(APP)/Contents Modified: branches/Cog/build.macos32x86/common/Makefile.plugin =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.plugin 2016-02-16 05:35:08 UTC (rev 3612) +++ branches/Cog/build.macos32x86/common/Makefile.plugin 2016-02-18 19:54:22 UTC (rev 3613) @@ -13,6 +13,7 @@ # LIBSRC overrides the set of files to compile (if EXCLUDESRC inconvenient) # LINK_WITH_CPP set to non-empty to link external plugin bundle with c++ runtime # SRCDIRS supplies additional directories containing files to compile. +# PREREQUISITES supplies names of files that must exist to make lib or bundle # VM config flags. ifeq ($(CONFIGURATION),product) @@ -139,6 +140,9 @@ $(VMDIR): mkdir -p $(VMDIR) +# If any prerequisites are declared all must exist to continue +ifeq ($(realpath $(PREREQUISITES)),$(abspath $(PREREQUISITES))) + $(PLUGINLIB): $(VMDIR) $(OBJDIR) $(LIBOBJ) -rm $(PLUGINLIB) ar -rc $(PLUGINLIB) $(LIBOBJ) @@ -169,3 +173,21 @@ mkdir -p $(PLUGINBUNDLE)/Contents sed "s/\$$(VERSION)/`getversion VERSION_TAG`/" $< | \ sed "s/\$(LIBNAME)/$(LIBNAME)/" > $(PLUGINPLIST) + +else # ifeq ($(realpath $(PREREQUISITES)),$(PREREQUISITES)) +# If any prerequisites are missing simply create a .ignore file + +#$(info $$(PREREQUISITES): $(abspath $(PREREQUISITES))) +#$(info $$(realpath $$(PREREQUISITES)): $(realpath $(PREREQUISITES))) + +$(PLUGINLIB): FORCE + $(warning $(PLUGINLIB) has missing prerequisites. Not building.) + echo >$(basename $(PLUGINLIB)).ignore + +$(PLUGINBUNDLE): FORCE + $(warning $(PLUGINBUNDLE) has missing prerequisites. Not building.) + echo >$(basename $(PLUGINBUNDLE)).ignore + +FORCE: + +endif Modified: branches/Cog/build.macos32x86/common/Makefile.vm =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.vm 2016-02-16 05:35:08 UTC (rev 3612) +++ branches/Cog/build.macos32x86/common/Makefile.vm 2016-02-18 19:54:22 UTC (rev 3613) @@ -132,8 +132,8 @@ $(POSTCOMPILE) -include deps/version.d - -product:; + +product: $(MAKE) -f $(MAKEFILE_LIST) CONFIGURATION=product $(@,product=) default assert: @@ -183,12 +183,12 @@ @echo VMOBJ=$(VMOBJ) @echo ----------------------------------------------------- -#vm: $(OBJDIR)/$(VM) +ignore := $(addsuffix .%, $(basename $(wildcard $(BUILD)/vm/*.ignore))) $(OBJDIR)/$(VM): $(OBJDIR) $(VMOBJ) $(LIBS) $(CC) -arch $(TARGET_ARCH) -o $(OBJDIR)/version.o $(CFLAGS) $(INCLUDES) $(DEFS) -c $(OSXCOMMONDIR)/version.c $(CC) -arch $(TARGET_ARCH) -isysroot $(SDK) $(LDFLAGS) $(FRAMEWORKS) \ - -o $(OBJDIR)/$(VM) $(VMOBJ) $(LIBS) + -o $(OBJDIR)/$(VM) $(VMOBJ) $(filter-out $(call ignore), $(LIBS)) $(OBJDIR): @-mkdir -p $(BLDDIR) @@ -205,15 +205,15 @@ # .PHONY: $(OBJDIR)/%.lib $(OBJDIR)/%.bundle -#plugin-makefile = $(shell test -f $(OSXPLUGINSDIR)/$(1)/Makefile && echo $(OSXPLUGINSDIR)/$(1)/Makefile || echo ../common/Makefile.plugin) -plugin-makefile = $(realpath $(OSXPLUGINSDIR)/$(1)/Makefile ../common/Makefile.plugin) +plugin-makefile = $(firstword $(realpath $(OSXPLUGINSDIR)/$(1)/Makefile ../common/Makefile.plugin)) # Internal plugin. Build as lib then link in lib # Check for Makefile in iOS plugins directory otherwise use default Makefile # N.B. PLATDIR *must* be a relative path for this to work -$(OBJDIR)/%.lib: getversion $(call plugin-makefile,$(*F)) +$(OBJDIR)/%.lib: getversion $(call plugin-makefile,$(*F)) $(wildcard $(*F).ignore) @-mkdir -p $(BLDDIR)/$(*F) - test $@ -ot $(call plugin-makefile,$(*F)) && rm $(OBJDIR)/$(*F).lib || true + test $@ -ot $(call plugin-makefile,$(*F)) && rm $(BUILD)/vm/$(*F).lib || true + rm -f $(BUILD)/vm/$(*F).ignore $(MAKE) $(MFLAGS) BUILD=$(BUILD) \ -f $(call plugin-makefile,$(*F)) MAKEFILE=$(call plugin-makefile,$(*F)) \ CONFIGURATION=$(CONFIGURATION) ARCH=$(TARGET_ARCH) \ @@ -228,9 +228,10 @@ # External plugin. Build as bundle and copy to vm dir ($(OBJDIR)). # Check for Makefile in iOS plugins directory otherwise use default Makefile -$(OBJDIR)/%.bundle: getversion $(call plugin-makefile,$(*F)) +$(OBJDIR)/%.bundle: getversion $(call plugin-makefile,$(*F)) $(wildcard $(*F).ignore) @-mkdir -p $(BLDDIR)/$(*F) - test $@ -ot $(call plugin-makefile,$(*F)) && rm $(OBJDIR)/$(*F).lib || true + test $@ -ot $(call plugin-makefile,$(*F)) && rm -rf $(BUILD)/vm/$(*F).bundle || true + rm -f $(BUILD)/vm/$(*F).ignore $(MAKE) $(MFLAGS) BUILD=$(BUILD) \ -f $(call plugin-makefile,$(*F)) MAKEFILE=$(call plugin-makefile,$(*F)) \ CONFIGURATION=$(CONFIGURATION) ARCH=$(TARGET_ARCH) \ Modified: branches/Cog/build.macos64x64/HowToBuild =================================================================== --- branches/Cog/build.macos64x64/HowToBuild 2016-02-16 05:35:08 UTC (rev 3612) +++ branches/Cog/build.macos64x64/HowToBuild 2016-02-18 19:54:22 UTC (rev 3613) @@ -1,13 +1,17 @@ How To Build On Mac OS X ---------------------- +------------------------ +This file (build.macos64x64/HowToBuild) describes how to build VMs that run +64-bit images. build.macos32x86/HowToBuild describes how to build VMs that +run 32-bit images. Contents: - Overview - Checking out sources to build out-of-the-box - Building out of the box - - Building the Bochs Support Libraries - - Optimization level and gcc version (please read!) + - The Structure of the Makefiles + - Building the VM Simulator Support Libraries + - Using Different Compilers Overview @@ -25,10 +29,12 @@ adaptive optimization that does speculative inlining at the bytecode-to-bytecode level. These are targeted for release in 2015. -Another distinction is between 32-bit and 64-bit Spur VMs. While Spur -has a common object header format common to 32 and 64 bit versions, the 32-bit -version uses 32-bit pointers and immediates, whereas the 64-bit version uses -64-bit pointers and immediates and will only run on 64-bit machines. +Another distinction is between "v3" VMs and Spur VMs. "v3" is the original +object representation for Squeak as described in the back-to-the-future paper. +Spur, as described on the www.mirandabanda.org blog, is a faster object +representation which uses generation scavenging, lazy forwarding for fast +become, and a single object header format common to 32 and 64 bit versions. +Newspeak, Squeak 5 and the upcoming release of Pharo all use Spur. Another distinction is between normal single-threaded VMs that schedule "green" Smalltalk processes above a single-threaded VM, and "multi-threaded" VMs that @@ -59,58 +65,120 @@ processor sources and the relevant build directories svn co http://www.squeakvm.org/svn/squeak/branches/Cog/platforms svn co http://www.squeakvm.org/svn/squeak/branches/Cog/processors + svn co http://www.squeakvm.org/svn/squeak/branches/Cog/{spursrc,src} etc + (see section "VM source directories" in the root README) + svn co http://www.squeakvm.org/svn/squeak/branches/Cog/sources + (this is needed only to install Smalltalk source files) svn co http://www.squeakvm.org/svn/squeak/branches/Cog/build.macos64x64 - svn co http://www.squeakvm.org/svn/squeak/branches/Cog/src etc - (see section "VM source directories" in the root README) Building out of the box ----------------------- -0. As of this writing (December 2015) only the squeak.cog.spur builds build -on 10.9 and later, using John McIntosh's Cocoa platform support files. The -rest of the builds don't work yet. We are transitioning as fast as possible -to Cocoa. Volunteers welcome. +0. The build system is based on Gnu Make for makefiles, and Xcode.app for +compilers and libraries. You will need a Mac OS X machine running at least +10.7.x (the author is currently using 10.9) and Xcode v6 or later. The system +builds only the new Cocoa based VMs that use the platforms/iOS tree. The old +Carbon-based VMs using platforms/Mac OS are unsupported. -1. Install the tools (Xcode etc); the SqueakCogSpur32x86.xcodeproj is set-up to -build using clang 6.x or clang 7.x. +1. Install the tools (Xcode etc). If you want to sign the application make sure +you have installed a suitable certificate via Keychain Access and that the +signing identity is in the SIGNING_IDENTITY environment variable, e.g. in the +author's .profile is the line +export SIGNING_IDENTITY="Developer ID Application: Eliot Miranda" -2. Either disable the building of the Bochs plugins (see each makeiosvm file, -disabling the lines beginning "# Build the BochsIA32Plugin") or build the -Bochs support libraries (see Building the Bochs Support Libraries below). - -3. cd to the VM configuration of your choice and execute - ./miosvm -A +2. cd to the VM configuration of your choice and run the mvm script, e.g. + cd buiild.macos64x64/squeak.cog.spur + ./mvm -A This will build CocoaFast.app, CocoaDebug.app and CocoaAssert.app applications containing the three basic VM configurations. If the configuration includes -the multi-threaded VM you can use miosvm -AS to make the single-threaded VMs, -miosvm -AT to make the multi-threadeds in FastMT.app et al, and miosvm -A to make -them all. miosvm -d will make the CocoaDebug.app VM, etc. miosvm -? provides the -gory details. +the multi-threaded +VM you can use mvm -AS to make the single-threaded VMs, mvm -AT to make the +multi-threadeds in FastMT.app et al, and mvm -A to make them all. mvm -d will +make the Debug.app VM, etc. mvm -? provides the gory details. - - Each build directory contains three files plugins.int plugins.ext -On other platforms editing these and making is all one needs to do to change the -set of plugins. Alas on Xcode one also has to edit the relevant Xcode projects -to add and remove source files. If you're brave enough to contemplate this -you're brave enough to figure out how to do this yourself. +Editing these and making is all one needs to do to change the set of plugins. +But see The Structure of the Makefiles below for "complicated" plugins. -Building the Bochs Support Libraries ------------------------------------- -If you want to get the Cog VM simulator working you'll need to build the -BochsIA32Plugin and/or the BochsX64Plugin to build that you'll need to first -build bochs. First check-out the processor simulator source tree containing -Bochs: - svn co http://www.squeakvm.org/svn/squeak/branches/Cog/processors -Then build the libraries. cd to e.g. build.macos32x86/bochsx86, run +The Structure of the Makefiles +------------------------------ +Each VM build directory contains the mvm script, a root Makefile that selects +the VM source to build, plugins.int to specify the internal plugins to build, +and plugins.ext to specify the external plugins (if any) to build. The root +Makefile then includes a full Makefile from the common directory. For example, +squeak.cog.spur's Makefile (minus commentary) reads + ----8<-----build.macos64x64/squeak.cog.spur/Makefile----8<--------------- + VMSRCDIR:= ../../spursrc/vm + SOURCEFILE:=SqueakV50.sources - $ cd build.macos32x86/bochsx86 - $ ./conf.COG - $ ../../processors/IA32/bochs/makeem + include ../common/Makefile.app.squeak.cog + ----8<-----build.macos64x64/squeak.cog.spur/Makefile----8<--------------- +Some external plugins require spport libraries. In particular, the processor +simulators used by VMMaker.oscog to develop the VM JITs, depend on C or C++ +code that implements a processor simulator. See below. Plugins that require +extra support or special compilation have makefiles under +platforms/iOS/plugins/, for example plugins/iOS/plugins/RePlugin/Makefile. +This Makefile sets some values and then includes common/Makefile.plugin to do +the dirty work. If you add an exotic plugin that requires such source please +read the plugin makefile build.macos64x64/common/Makefile.plugin and the +makefiles under plugins/iOS/plugins for examples of the facilities available. +The files in build.macos64x64/common are + Makefile.app + The top-level makefile for CocoaFast.app et al. + It includes Makefile.vm to build the vm and plugins and then constructs + and optionally signs the .app bundle. It may also install a Smalltalk + source file. + Makefile.app.newspeak + Modifies Makefile.app to rename the executable and install sources + Makefile.app.squeak.cog + Modifies Makefile.app to use the green VM icon that implies Cog + Makefile.flags + Defines the compilation flags and SDK to use in building the VM + Makefile.plugin + Makes either an internal FooPlugin.lib or an external FooPlugin.bundle. + If platforms/iOS/plugins/FooPlugin/Makefile exists Makefile.vm will + use it, and it should include Makefile.plugin to do the dirty work. + Makefile.rules + Defines the rules for compiling c, c++ and objective-c source files, + including maintaining dependency information. + Makefile.vm + Makes the VM executable in the chosen configuration from product, + assert or debug. Decodes plugins.int and plugins.ext and invokes + make with the relevant makefile, either a special one such as + platforms/iOS/plugins/RePlugin/Makefile or Makefile.plugin, for each + internal or external plugin. + mkNamedPrims.sh + This script makes sqNamedPrims.h which defines the exports from the set + of internal plugins that the VM uses to access the primitives in + internal plugins. + +Building the VM Simulator Support Libraries +------------------------------------------- +As of this writing there are three processors with three sets of support +libraries. If you want to build these they are in + build.macos64x64/{bochsx86,bochsx64,gdbarm32} +In each directory there is a conf.COG script. Cd to the directory, run the +script, and in the case of the bochs directories also run makeem. e.g. + $ cd build.macos64x64/bochsx86 + $ ./conf.COG + $ ../../processors/IA32/bochs/makeem +Then cd to the VM build directoruy of your choice and build. + + +Using Different Compilers +----------------------------------------- +The build system uses Xcode's default compiler, clang by default. +You may want to use a different compiler. Users claim this is possible. +For example, to install gcc 5.2 see + http://hamelot.co.uk/programming/add-gcc-compiler-to-xcode-6/ +(Thanks Hammad!). There are no guarantees that this will work, but that's the +best pointer I've found. + + Eliot Miranda -December 2015 +February 2016 Modified: branches/Cog/build.macos64x64/common/Makefile.app =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.app 2016-02-16 05:35:08 UTC (rev 3612) +++ branches/Cog/build.macos64x64/common/Makefile.app 2016-02-18 19:54:22 UTC (rev 3613) @@ -62,16 +62,30 @@ endif -$(APP): $(VMEXE) $(VMBUNDLES) $(VMPLIST) $(VMMENUNIB) $(VMICONS) $(SOURCES) \ - $(APPPOST) signapp touchapp +$(APP): cleanbundles $(VMEXE) $(VMBUNDLES) $(VMPLIST) $(VMMENUNIB) $(VMICONS) \ + $(SOURCES) $(APPPOST) signapp touchapp +# Bundles with missing prerequisites won't be built. But we need to force the +# attempt to make them every time in case the prerequisites /have/ been built. +# to do this we must both delete the bundles and touch any ignore files, upon +# which the bundle build depends. +cleanbundles: + -rm -rf $(APP)/Contents/Resources/*.bundle + -touch $(OBJDIR)/*.ignore + $(VMEXE): $(OBJDIR)/$(VM) mkdir -p $(APP)/Contents/MacOS cp -p $(OBJDIR)/$(VM) $(APP)/Contents/MacOS $(APP)/Contents/Resources/%.bundle: $(BLDDIR)/vm/%.bundle - mkdir -p $(APP)/Contents/Resources - cp -pR $< $(APP)/Contents/Resources + @mkdir -p $(APP)/Contents/Resources + @if [ -f $(basename $<).ignore ]; then \ + echo $(notdir $<) is being ignored; \ + rm -rf $^; \ + else \ + echo cp -pR $< $(APP)/Contents/Resources; \ + cp -pR $< $(APP)/Contents/Resources; \ + fi $(VMPLIST): $(OSXDIR)/$(SYSTEM)-Info.plist getversion mkdir -p $(APP)/Contents Modified: branches/Cog/build.macos64x64/common/Makefile.plugin =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.plugin 2016-02-16 05:35:08 UTC (rev 3612) +++ branches/Cog/build.macos64x64/common/Makefile.plugin 2016-02-18 19:54:22 UTC (rev 3613) @@ -13,6 +13,7 @@ # LIBSRC overrides the set of files to compile (if EXCLUDESRC inconvenient) # LINK_WITH_CPP set to non-empty to link external plugin bundle with c++ runtime # SRCDIRS supplies additional directories containing files to compile. +# PREREQUISITES supplies names of files that must exist to make lib or bundle # VM config flags. ifeq ($(CONFIGURATION),product) @@ -139,6 +140,9 @@ $(VMDIR): mkdir -p $(VMDIR) +# If any prerequisites are declared all must exist to continue +ifeq ($(realpath $(PREREQUISITES)),$(abspath $(PREREQUISITES))) + $(PLUGINLIB): $(VMDIR) $(OBJDIR) $(LIBOBJ) -rm $(PLUGINLIB) ar -rc $(PLUGINLIB) $(LIBOBJ) @@ -169,3 +173,21 @@ mkdir -p $(PLUGINBUNDLE)/Contents sed "s/\$$(VERSION)/`getversion VERSION_TAG`/" $< | \ sed "s/\$(LIBNAME)/$(LIBNAME)/" > $(PLUGINPLIST) + +else # ifeq ($(realpath $(PREREQUISITES)),$(PREREQUISITES)) +# If any prerequisites are missing simply create a .ignore file + +#$(info $$(PREREQUISITES): $(abspath $(PREREQUISITES))) +#$(info $$(realpath $$(PREREQUISITES)): $(realpath $(PREREQUISITES))) + +$(PLUGINLIB): FORCE + $(warning $(PLUGINLIB) has missing prerequisites. Not building.) + echo >$(basename $(PLUGINLIB)).ignore + +$(PLUGINBUNDLE): FORCE + $(warning $(PLUGINBUNDLE) has missing prerequisites. Not building.) + echo >$(basename $(PLUGINBUNDLE)).ignore + +FORCE: + +endif Modified: branches/Cog/build.macos64x64/common/Makefile.vm =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.vm 2016-02-16 05:35:08 UTC (rev 3612) +++ branches/Cog/build.macos64x64/common/Makefile.vm 2016-02-18 19:54:22 UTC (rev 3613) @@ -132,8 +132,8 @@ $(POSTCOMPILE) -include deps/version.d - -product:; + +product: $(MAKE) -f $(MAKEFILE_LIST) CONFIGURATION=product $(@,product=) default assert: @@ -183,12 +183,12 @@ @echo VMOBJ=$(VMOBJ) @echo ----------------------------------------------------- -#vm: $(OBJDIR)/$(VM) +ignore := $(addsuffix .%, $(basename $(wildcard $(BUILD)/vm/*.ignore))) $(OBJDIR)/$(VM): $(OBJDIR) $(VMOBJ) $(LIBS) $(CC) -arch $(TARGET_ARCH) -o $(OBJDIR)/version.o $(CFLAGS) $(INCLUDES) $(DEFS) -c $(OSXCOMMONDIR)/version.c $(CC) -arch $(TARGET_ARCH) -isysroot $(SDK) $(LDFLAGS) $(FRAMEWORKS) \ - -o $(OBJDIR)/$(VM) $(VMOBJ) $(LIBS) + -o $(OBJDIR)/$(VM) $(VMOBJ) $(filter-out $(call ignore), $(LIBS)) $(OBJDIR): @-mkdir -p $(BLDDIR) @@ -205,15 +205,15 @@ # .PHONY: $(OBJDIR)/%.lib $(OBJDIR)/%.bundle -#plugin-makefile = $(shell test -f $(OSXPLUGINSDIR)/$(1)/Makefile && echo $(OSXPLUGINSDIR)/$(1)/Makefile || echo ../common/Makefile.plugin) -plugin-makefile = $(realpath $(OSXPLUGINSDIR)/$(1)/Makefile ../common/Makefile.plugin) +plugin-makefile = $(firstword $(realpath $(OSXPLUGINSDIR)/$(1)/Makefile ../common/Makefile.plugin)) # Internal plugin. Build as lib then link in lib # Check for Makefile in iOS plugins directory otherwise use default Makefile # N.B. PLATDIR *must* be a relative path for this to work -$(OBJDIR)/%.lib: getversion $(call plugin-makefile,$(*F)) +$(OBJDIR)/%.lib: getversion $(call plugin-makefile,$(*F)) $(wildcard $(*F).ignore) @-mkdir -p $(BLDDIR)/$(*F) - test $@ -ot $(call plugin-makefile,$(*F)) && rm $(OBJDIR)/$(*F).lib || true + test $@ -ot $(call plugin-makefile,$(*F)) && rm $(BUILD)/vm/$(*F).lib || true + rm -f $(BUILD)/vm/$(*F).ignore $(MAKE) $(MFLAGS) BUILD=$(BUILD) \ -f $(call plugin-makefile,$(*F)) MAKEFILE=$(call plugin-makefile,$(*F)) \ CONFIGURATION=$(CONFIGURATION) ARCH=$(TARGET_ARCH) \ @@ -228,9 +228,10 @@ # External plugin. Build as bundle and copy to vm dir ($(OBJDIR)). # Check for Makefile in iOS plugins directory otherwise use default Makefile -$(OBJDIR)/%.bundle: getversion $(call plugin-makefile,$(*F)) +$(OBJDIR)/%.bundle: getversion $(call plugin-makefile,$(*F)) $(wildcard $(*F).ignore) @-mkdir -p $(BLDDIR)/$(*F) - test $@ -ot $(call plugin-makefile,$(*F)) && rm $(OBJDIR)/$(*F).lib || true + test $@ -ot $(call plugin-makefile,$(*F)) && rm -rf $(BUILD)/vm/$(*F).bundle || true + rm -f $(BUILD)/vm/$(*F).ignore $(MAKE) $(MFLAGS) BUILD=$(BUILD) \ -f $(call plugin-makefile,$(*F)) MAKEFILE=$(call plugin-makefile,$(*F)) \ CONFIGURATION=$(CONFIGURATION) ARCH=$(TARGET_ARCH) \ Modified: branches/Cog/platforms/iOS/plugins/BochsIA32Plugin/Makefile =================================================================== --- branches/Cog/platforms/iOS/plugins/BochsIA32Plugin/Makefile 2016-02-16 05:35:08 UTC (rev 3612) +++ branches/Cog/platforms/iOS/plugins/BochsIA32Plugin/Makefile 2016-02-18 19:54:22 UTC (rev 3613) @@ -1,9 +1,11 @@ +BOX:=../bochsx86 +PREREQUISITES:=$(BOX)/cpu/libcpu.a $(BOX)/disasm/libdisasm.a $(BOX)/fpu/libfpu.a + LINK_WITH_CPP:=1 -INCDIRS:=../bochsx86 \ +INCDIRS:=$(BOX) \ ../../processors/IA32/bochs \ ../../processors/IA32/bochs/instrument/stubs -EXTRALIBS:= -L../bochsx86/cpu -L../bochsx86/fpu -L../bochsx86/disasm \ - -lcpu -lfpu -ldisasm +EXTRALIBS:= -L$(BOX)/cpu -L$(BOX)/fpu -L$(BOX)/disasm -lcpu -lfpu -ldisasm CFLAGS:=-DUSE_BOCHS_CONFIG_H=1 include ../common/Makefile.plugin Modified: branches/Cog/platforms/iOS/plugins/BochsX64Plugin/Makefile =================================================================== --- branches/Cog/platforms/iOS/plugins/BochsX64Plugin/Makefile 2016-02-16 05:35:08 UTC (rev 3612) +++ branches/Cog/platforms/iOS/plugins/BochsX64Plugin/Makefile 2016-02-18 19:54:22 UTC (rev 3613) @@ -1,9 +1,11 @@ +BOX:=../bochsx64 +PREREQUISITES:=$(BOX)/cpu/libcpu.a $(BOX)/disasm/libdisasm.a $(BOX)/fpu/libfpu.a + LINK_WITH_CPP:=1 -INCDIRS:=../bochsx64 \ +INCDIRS:=$(BOX) \ ../../processors/IA32/bochs \ - ../../processors/IA32/bochs/instrument/stubs -EXTRALIBS:= -L../bochsx64/cpu -L../bochsx64/fpu -L../bochsx64/disasm \ - -lcpu -lfpu -ldisasm + ../../processors/IA32/bochs/instrument/stubs +EXTRALIBS:= -L$(BOX)/cpu -L$(BOX)/fpu -L$(BOX)/disasm -lcpu -lfpu -ldisasm CFLAGS:=-DUSE_BOCHS_CONFIG_H=1 include ../common/Makefile.plugin Modified: branches/Cog/platforms/iOS/plugins/GdbARMPlugin/Makefile =================================================================== --- branches/Cog/platforms/iOS/plugins/GdbARMPlugin/Makefile 2016-02-16 05:35:08 UTC (rev 3612) +++ branches/Cog/platforms/iOS/plugins/GdbARMPlugin/Makefile 2016-02-18 19:54:22 UTC (rev 3613) @@ -1,3 +1,9 @@ +PREREQUISITES:= ../gdbarm32/bfd/libbfd.a \ + ../gdbarm32/libiberty/libiberty.a \ + ../gdbarm32/opcodes/libopcodes.a \ + ../gdbarm32/sim/arm/libsim.a \ + ../gdbarm32/zlib/libz.a + INCDIRS:=../../processors/ARM/gdb-7.10/include \ ../../processors/ARM/gdb-7.10/sim/arm \ ../../processors/ARM/gdb-7.10/bfd \ Added: branches/Cog/platforms/iOS/plugins/RePlugin/Makefile =================================================================== --- branches/Cog/platforms/iOS/plugins/RePlugin/Makefile (rev 0) +++ branches/Cog/platforms/iOS/plugins/RePlugin/Makefile 2016-02-18 19:54:22 UTC (rev 3613) @@ -0,0 +1,3 @@ +EXCLUDESRC:=%/chartables.c + +include ../common/Makefile.plugin

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
15
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev February 2016