Squeak-dev August 2021

squeak-dev@lists.squeakfoundation.org

18 participants
221 discussions

FFI: FFI-Kernel-mt.195.mcz
by commits＠source.squeak.org 11 Aug '21

11 Aug '21

Marcel Taeumel uploaded a new version of FFI-Kernel to project FFI: http://source.squeak.org/FFI/FFI-Kernel-mt.195.mcz ==================== Summary ==================== Name: FFI-Kernel-mt.195 Author: mt Time: 11 August 2021, 1:30:23.066115 pm UUID: d9aefbbe-fac7-0145-871f-ac636df7ffe7 Ancestors: FFI-Kernel-mt.194 Fixes bug about "Cannot compute byteAlignment" that occurred when opening an image on one platform that was saved on another. You can now both use #initialize or #resetAllTypes to update all types when atomics changed. The former preserves object identity, the later needs to be used when changing the amount of atomics or when migrating from a rather old FFI installation. =============== Diff against FFI-Kernel-mt.194 =============== Item was changed: ----- Method: ExternalArrayType class>>newTypeForContentType:size: (in category 'instance creation') ----- newTypeForContentType: contentType size: numElements "!!!!!! Be aware that only the pointer type can be used in calls. As of SqueakFFIPrims VMMaker.oscog-eem.2950, there is no actual support for array types in the FFI plugin !!!!!!" | type pointerType headerWord byteSize | self flag: #contentVsContainer; assert: [contentType isTypeAlias or: [contentType isArrayType not]] description: 'No support for direct multi-dimensional containers yet. Use type aliases.'. self assert: [contentType isVoid not] description: 'No array types for void type!!'. self assert: [ (ArrayTypes at: contentType typeName ifPresent: [:sizes | sizes at: numElements ifAbsent: [nil]] ifAbsent: [nil] ) isNil] description: 'Array type already exists. Use #typeNamed: to access it.'. type := ExternalArrayType basicNew. pointerType := ExternalPointerType basicNew. "1) Regular type" byteSize := numElements ifNil: [0] ifNotNil: [numElements * contentType byteSize]. headerWord := contentType headerWord. headerWord := headerWord bitClear: FFIStructSizeMask. headerWord := headerWord bitOr: (byteSize min: FFIStructSizeMask). type setReferencedType: pointerType; compiledSpec: (WordArray with: headerWord); + byteAlignment: contentType byteAlignment; - byteAlignment: (numElements ifNil: [0] ifNotNil: [contentType byteAlignment]); setReferentClass: nil; "Like atomics and pointers-to-atomics, no dedicated class exists." setContentType: contentType; setSize: numElements; setByteSize: byteSize. "2) Pointer type. Reuse the compiledSpec of the content-type's pointer type." pointerType setReferencedType: type; + flag: #pointerToArray; compiledSpec: (WordArray with: (self pointerSpec bitOr: FFIFlagAtomic "HACK!! To deceive the FFI plugin :)")); byteAlignment: self pointerAlignment; setReferentClass: nil. "3) Remember this new array type." (ArrayTypes at: contentType typeName ifAbsentPut: [WeakValueDictionary new]) at: numElements put: type. ^ type! Item was added: + ----- Method: ExternalArrayType>>invalidate (in category 'private') ----- + invalidate + "Preserve size." + + compiledSpec := WordArray with: (self headerWord bitClear: FFIStructSizeMask). + byteAlignment := nil. + byteSize := nil.! Item was added: + ----- Method: ExternalPointerType>>invalidate (in category 'private') ----- + invalidate + "We can directly initialize this type again." + + self asNonPointerType isArrayType + ifTrue: [ + self flag: #pointerToArray. + compiledSpec := (WordArray with: (self class pointerSpec bitOr: FFIFlagAtomic "HACK!! To deceive the FFI plugin :)")). + byteAlignment := self class pointerAlignment + ] + ifFalse: [ + compiledSpec := WordArray with: self class pointerSpec. + byteAlignment := self class pointerAlignment].! Item was changed: ----- Method: ExternalStructure class>>allStructuresInCompilationOrder (in category 'system startup') ----- allStructuresInCompilationOrder "Answers a list of all known structure (and packed structures and unions) in ascending order of field compilation." | unordered ordered | self == ExternalStructure ifFalse: [self error: 'Correct compilation order cannot be guaranteed for a partial list of structure classes.']. unordered := self allSubclasses reject: [:ea | ea isSkipped]. ordered := OrderedCollection new: unordered size. [unordered notEmpty] whileTrue: [ | structClass prevStructClass references | structClass := unordered anyOne. [references := structClass referencedTypeNames. + references := references collect: [:ea | ExternalType parseBasicTypeName: ea]. - references := references collect: [:ea | ea copyWithoutAll: '([0123456789])*']. prevStructClass := unordered detect: [:c | c ~~ structClass and: [references includes: c name]] ifNone: [nil]. prevStructClass isNil] whileFalse: [structClass := prevStructClass]. "we found a structure/alias which does not depend on other structures/aliases" ordered add: (unordered remove: structClass)]. ^ ordered! Item was added: + ----- Method: ExternalStructureType>>invalidate (in category 'private') ----- + invalidate + "Make this type invalid to be re-initialized. This could happen when platform-characteristics change." + + compiledSpec := WordArray with: self class structureSpec. + byteAlignment := nil.! Item was added: + ----- Method: ExternalType class>>basicInitializeAtomicTypes (in category 'class initialization') ----- + basicInitializeAtomicTypes + + AtomicTypes ifNil: [ + AtomicTypes := Dictionary new. "Strong references required because there is no lazy atomic type initialization like there is for struct types and array types." + AtomicTypeNames valuesDo: [:typeName | + self newTypeForAtomicNamed: typeName]].! Item was added: + ----- Method: ExternalType class>>basicInitializeStructureTypes (in category 'class initialization') ----- + basicInitializeStructureTypes + + StructTypes ifNil: [ + StructTypes := WeakValueDictionary new]. + ArrayTypes ifNil: [ + ArrayTypes := Dictionary new].! Item was added: + ----- Method: ExternalType class>>checkTypeIntegrity (in category 'housekeeping') ----- + checkTypeIntegrity + " + self initialize. + self checkTypeIntegrity. + " + #(atomicTypesDo: atomic structTypesDo: struct pointerTypesDo: pointer arrayTypesDo: array typeAliasTypesDo: alias) + groupsDo: [:enumerator :label | + Transcript showln: ('Checking integrity of {1} types ...' format: { label }). + self perform: enumerator with: [:type | + type compiledSpec ifNil: [Transcript showln: '...', type typeName, ' has invalid compiledSpec!!']. + type byteAlignment ifNil: [Transcript showln: '...', type typeName, ' has invalid byteAlignment!!']]].! Item was changed: ----- Method: ExternalType class>>initialize (in category 'class initialization') ----- initialize " ExternalType initialize " self initializeFFIConstants. + + self initializeAtomicTypes. + self initializeAtomicSends. + + self initializeStructureTypes. + - self initializeDefaultTypes. self initializeArrayClasses.! Item was changed: ----- Method: ExternalType class>>initializeAtomicTypes (in category 'class initialization') ----- initializeAtomicTypes + "(Re-)initialize all atomic types. Preserves object identity of all involved types. If the amount of types changed, use #resetAllAtomicTypes instead." + - "Initializes atomic types if not already initialized. NOTE that if you want to reset already initialized atomic types, use #resetAllAtomicTypes instead." - | atomicType byteSize type typeName byteAlignment | self flag: #ffiLongVsInt. "For a discussion about long vs. int see http://forum.world.st/Re-squeak-dev-64-bit-FFI-was-porting-Croquet-to-Squea…." + + self basicInitializeAtomicTypes. + self invalidateAtomicTypes. #( "name atomic id byte size byte alignment" ('void' 0 0 0) "No non-pointer support in calls. Duh. ;-)" ('bool' 1 1 1) "No pointer support in calls." ('byte' 2 1 1) ('sbyte' 3 1 1) ('ushort' 4 2 2) ('short' 5 2 2) "!!!!!!" ('ulong' 6 4 "!!!!!!" 4) "!!!!!!" ('long' 7 4 "!!!!!!" 4) ('ulonglong' 8 8 8) "v.i." ('longlong' 9 8 8) "v.i." ('char' 10 1 1) ('schar' 11 1 1) ('float' 12 4 4) ('double' 13 8 8) "v.i." "TODO: ('longdouble' 14 10 16? 4?)" ) do:[:typeSpec| | compiled | typeName := typeSpec first. atomicType := typeSpec second. byteSize := typeSpec third. byteAlignment := typeSpec fourth. "0) On 32-bits Windows and MacOS, double and long long have an alignment of 8. But on 32-bit Linux, their alignment is 4. But not on a 32-bit Raspberry Pi OS." (FFIPlatformDescription current wordSize = 4 and: [FFIPlatformDescription current isUnix and: [FFIPlatformDescription current isARM not]]) ifTrue: [ (#('double' 'longlong' 'ulonglong') includes: typeName) ifTrue: [ byteAlignment := 4]]. "1) Regular type" type := (AtomicTypes at: typeName). compiled := WordArray with: ((byteSize bitOr: FFIFlagAtomic) bitOr: (atomicType bitShift: FFIAtomicTypeShift)). compiled ~= type compiledSpec "Preserve the identity of #compiledSpec." ifTrue: [type compiledSpec: compiled]. type byteAlignment: byteAlignment. "2) Pointer type" type := type asPointerType. compiled := WordArray with: ((self pointerSpec bitOr: FFIFlagAtomic) bitOr: (atomicType bitShift: FFIAtomicTypeShift)). compiled ~= type compiledSpec "Preserve the identity of #compiledSpec." ifTrue: [type compiledSpec: compiled]. type byteAlignment: self pointerAlignment. ].! Item was removed: - ----- Method: ExternalType class>>initializeDefaultTypes (in category 'class initialization') ----- - initializeDefaultTypes - "Initializes atomic types and structure types. NOTE THAT if you want to reset already initialized types, use #resetAllTypes isntead." - - AtomicTypes ifNil: [ - AtomicTypes := Dictionary new. "Strong references required because there is no lazy atomic type initialization like there is for struct types and array types." - AtomicTypeNames valuesDo: [:typeName | - self newTypeForAtomicNamed: typeName]]. - - self initializeAtomicTypes. - self initializeAtomicSends. - self initializeStructureTypes.! Item was changed: ----- Method: ExternalType class>>initializeStructureTypes (in category 'class initialization') ----- initializeStructureTypes + "(Re-)initialize all structure types and all array types. Preserves object identity of all involved types. If the amount of types changed, use #resetAllStructureTypes instead." - "Reset all non-pointer struct types to zero and their pointer companions to the appropriate pointer size. NOTE THAT if you want to reset already initialized structure types, use #resetAllStructureTypes instead." + self basicInitializeStructureTypes. + self invalidateStructureTypes. - StructTypes ifNil: [ - StructTypes := WeakValueDictionary new]. - ArrayTypes ifNil: [ - ArrayTypes := Dictionary new]. + "1) Initialize all array types that have an atomic-or-pointer type as their content type." + self arrayTypesDo: [:arrayType | + (arrayType contentType isAtomic or: [arrayType contentType isPointerType]) ifTrue: [ + arrayType newContentType: arrayType contentType]]. - self cleanupUnusedTypes. + "2) Trigger #noticeModificationOf: callback to actually initialize all structure types." + ExternalStructure defineAllFields. + + "Finally do some garbage collection." + self cleanupUnusedTypes.! - StructTypes valuesDo:[:structType | - structType "asNonPointerType" - compiledSpec: (WordArray with: self structureSpec); - byteAlignment: nil. - structType asPointerType - compiledSpec: (WordArray with: self pointerSpec); - byteAlignment: nil]. - ArrayTypes valuesDo: [:sizes | sizes do: [:arrayType | - arrayType - compiledSpec: (WordArray with: (arrayType headerWord bitClear: FFIStructSizeMask)); - byteAlignment: nil. - arrayType asPointerType - compiledSpec: (WordArray with: self pointerSpec); - byteAlignment: nil]].! Item was added: + ----- Method: ExternalType class>>invalidateAtomicTypes (in category 'class initialization') ----- + invalidateAtomicTypes + + self atomicTypesDo: [:atomicType | + atomicType "asNonPointerType" invalidate. + atomicType asPointerType invalidate].! Item was added: + ----- Method: ExternalType class>>invalidateStructureTypes (in category 'class initialization') ----- + invalidateStructureTypes + + self structTypesDo:[:structType | + structType "asNonPointerType" invalidate. + structType asPointerType invalidate]. + + self arrayTypesDo: [:arrayType | + arrayType "asNonPointerType" invalidate. + arrayType asPointerType invalidate].! Item was changed: ----- Method: ExternalType class>>noticeModificationOf: (in category 'housekeeping') ----- noticeModificationOf: aClass "A subclass of ExternalStructure has been redefined." aClass withAllSubclassesDo: [:cls | | typeName type | typeName := cls name. (type := StructTypes at: typeName ifAbsent: []) ifNotNil: [ type newReferentClass: cls. type asPointerType newReferentClass: cls. type newTypeAlias]. ArrayTypes at: typeName ifPresent: [:sizes | sizes do: [:arrayType | arrayType ifNotNil: [ arrayType newContentType: type]]]. "Alias-to-array types, which are stored in StructTypes, will not update via #newContentType:. We scan StructTypes for #isArrayType to find such aliases to then call #newContentType:." + self flag: #performance. StructTypes do: [:each | (each notNil and: [each isArrayType and: [each contentType == type]]) ifTrue: [each newContentType: type]]].! Item was added: + ----- Method: ExternalType class>>parseBasicTypeName: (in category 'instance lookup') ----- + parseBasicTypeName: typeName + "Answers the name of the basic type needed to resolve the given typeName." + + | actualTypeName | + actualTypeName := typeName copyWithoutAll: ' '. + + actualTypeName last == $* "e.g. MyStruct*" + ifTrue: [actualTypeName := actualTypeName allButLast]. + actualTypeName last == $) "e.g. (char[])* -- pointer type for array type" + ifTrue: [actualTypeName := (actualTypeName copyFrom: 2 to: actualTypeName size - 1)]. + actualTypeName first == $* "e.g. *DoublePtr" + ifTrue: [actualTypeName := actualTypeName allButFirst]. + + ^ actualTypeName last == $] + ifTrue: [self parseBasicTypeName: (self parseArrayTypeName: actualTypeName) first] + ifFalse: [actualTypeName]! Item was changed: ----- Method: ExternalType class>>platformChangedFrom:to: (in category 'system startup') ----- platformChangedFrom: lastPlatform to: currentPlatform "Byte size or byte alignment for atomic types might be different on the new platform." "1) Update all atomic types for platform-specifc byte size and alignment." self initializeAtomicTypes. "2) Discard all compiled specs for all structure types." self initializeStructureTypes. + "3) Update all critical aliases for atomic types, i.e., intptr_t, uintptr_t. But what about 'c_long' between 64-bit platforms?!!" - "3) Update all type-name mappings for all FFI calls." lastPlatform wordSize ~= currentPlatform wordSize ifTrue: [self recompileAllLibraryFunctions].! Item was added: + ----- Method: ExternalType class>>resetAllArrayClasses (in category 'housekeeping') ----- + resetAllArrayClasses + + ArrayClasses := nil. + self initializeArrayClasses.! Item was changed: ----- Method: ExternalType class>>resetAllAtomicTypes (in category 'housekeeping') ----- resetAllAtomicTypes "Warning: This call is only required if you change the initialization for AtomicTypes." AtomicTypes := nil. + self initializeAtomicTypes. + AtomicSends := nil. + self initializeAtomicSends. - ArrayClasses := nil. + "Now also reset everything that depends on atomic types." - StructTypes := nil. - ArrayTypes := nil. - - self initializeDefaultTypes. - self initializeArrayClasses. self resetAllStructureTypes.! Item was changed: ----- Method: ExternalType class>>resetAllStructureTypes (in category 'housekeeping') ----- resetAllStructureTypes "Warning: This call is only required if you change the container for StructTypes!! Note that (2) and (3) can be swapped but that puts unnecessary pressure on the GC." StructTypes := nil. ArrayTypes := nil. "1) Initialize the container for structure types." self initializeStructureTypes. - - "2) Recompile all FFI calls to create and persist structure types." - self recompileAllLibraryFunctions. + "2) Trigger #noticeModificationOf: callback to actually initialize all structure types." - "3) Update all structure types' spec and alignment." ExternalTypePool reset. + ExternalStructure defineAllFields. "Even if unchanged, we need to fill the type pool." - ExternalStructure defineAllFields. ExternalTypePool cleanUp. + + "3) Recompile all FFI calls to create and persist structure types." + self recompileAllLibraryFunctions. + + "4) Just in case, we also lookup available array classes. Maybe we have one for a specific struct type, right? :-)" + self resetAllArrayClasses. ! Item was changed: ----- Method: ExternalType>>byteAlignment (in category 'accessing') ----- byteAlignment - byteAlignment ifNil: [self computeAlignment]. ^ byteAlignment! Item was changed: + ----- Method: ExternalType>>byteAlignment: (in category 'private') ----- - ----- Method: ExternalType>>byteAlignment: (in category 'accessing') ----- byteAlignment: anInteger byteAlignment := anInteger! Item was removed: - ----- Method: ExternalType>>computeAlignment (in category 'private') ----- - computeAlignment - self isPointerType - ifTrue: - [byteAlignment := ExternalType pointerAlignment] - ifFalse: - [byteAlignment := referentClass - ifNil: [self isAtomic - ifTrue: - [byteAlignment ifNil: [ExternalType initialize]. - byteAlignment] - ifFalse: [self error: 'Cannot compute type alignment']] - ifNotNil: - [referentClass byteAlignment]]! Item was added: + ----- Method: ExternalType>>invalidate (in category 'private') ----- + invalidate + "Make this type invalid to be re-initialized. This could happen when platform-characteristics change." + + compiledSpec := nil. + byteAlignment := nil.! Item was changed: ----- Method: ExternalUnknownType class>>newTypeForUnknownNamed: (in category 'instance creation') ----- newTypeForUnknownNamed: label | typeName type pointerType | typeName := label asSymbol. self assert: [(StructTypes includesKey: typeName) not] description: 'Type already exists. Use #typeNamed: to access it.'. type := ExternalUnknownType basicNew compiledSpec: (WordArray with: self structureSpec); byteAlignment: 0; "dummy until #newReferentClass: is called" setReferentClass: typeName; yourself. self assert: [type isEmpty]. pointerType := ExternalPointerType basicNew compiledSpec: (WordArray with: self pointerSpec); byteAlignment: self pointerAlignment; yourself. self assert: [pointerType isPointerType]. "Connect non-pointer type with pointer type." type setReferencedType: pointerType. pointerType setReferencedType: type. + "Remember this new struct type, even if still unknown." - "Remember this new struct type." StructTypes at: typeName put: type. ^ type! Item was added: + ----- Method: ExternalUnknownType>>invalidate (in category 'private') ----- + invalidate + "We can directly initialize this type again." + + compiledSpec := WordArray with: self structureSpec. + byteAlignment := 0.!

1 0

FFI: FFI-Kernel-mt.194.mcz
by commits＠source.squeak.org 11 Aug '21

11 Aug '21

Marcel Taeumel uploaded a new version of FFI-Kernel to project FFI: http://source.squeak.org/FFI/FFI-Kernel-mt.194.mcz ==================== Summary ==================== Name: FFI-Kernel-mt.194 Author: mt Time: 11 August 2021, 10:32:43.073115 am UUID: dd919d6b-185f-ee40-9061-e47adb6fa72e Ancestors: FFI-Kernel-mt.193 Code clean-up and refactoring: - Rename ...withAccessors: to ...generateAccessors: - Rename policy #generated to #ifGenerated - Rename policy #absent to #ifAbsent - Deprecate #compileFields and #compileFields: in favor if #defineFields and #defineFields: - Add #defineChangedFields(:), which uses #hasFieldLayoutChanged: and thus distinguishes itself from #defineFields(:) - After code loading or class reshaping, call #triggerDefineAllChangedFields instead of #triggerDefineAllFields - Remove obsolete #byteSize from ExternalStructure class; see its instance side Note that this also fixes a regression, that is, let #defineAllFields and #defineAllChangedFields work as expected. Note that #defineFields(:) will always compile the field spec and generate (missing) field accessors #ifGenerated. =============== Diff against FFI-Kernel-mt.193 =============== Item was removed: - ----- Method: ExternalStructure class>>byteSize (in category 'external type') ----- - byteSize - "Return the size in bytes of this structure." - ^self compiledSpec first bitAnd: FFIStructSizeMask! Item was changed: ----- Method: ExternalStructure class>>compileAllFields (in category 'system startup') ----- compileAllFields - " - ExternalStructure compileAllFields - " - | priorAuthorInitials fieldSpec | - priorAuthorInitials := Utilities authorInitialsPerSe. - [Utilities setAuthorInitials: 'FFI'. - - self allStructuresInCompilationOrder do: [:structClass | - fieldSpec := structClass fields. - (structClass hasFieldLayoutChanged: fieldSpec) - ifTrue: [structClass compileFields: fieldSpec]. - structClass organization removeEmptyCategories]. - "Compilation of fields only needs external types temporarily. Non-weak references to external types are only in methods with FFI calls." - ExternalType cleanupUnusedTypes. + self deprecated: 'Use #defineAllFields.'. + self defineAllFields.! - ] ensure: [Utilities setAuthorInitials: priorAuthorInitials]! Item was changed: ----- Method: ExternalStructure class>>compileFields (in category 'field definition') ----- compileFields - "Public. Define all the fields in the receiver. Only re-generate changed field accessors if auto-generated in the first place." + self deprecated: 'Use #defineFields'. + self defineFields.! - self isSkipped ifTrue: [^ nil]. - self compileFields: self fields.! Item was changed: ----- Method: ExternalStructure class>>compileFields: (in category 'field definition') ----- compileFields: fieldSpec + + self deprecated: 'Use #defineFields:'. + self defineFields: fieldSpec.! - "Private. Use #compileFields." - - self compileFields: fieldSpec withAccessors: #generated. - ExternalType noticeModificationOf: self.! Item was added: + ----- Method: ExternalStructure class>>compileFields:generateAccessors: (in category 'field definition - support') ----- + compileFields: specArray generateAccessors: aSymbol + "Private. Use #compileFields or #defineFields. Compile a type specification for the FFI calls. + + Eventually generate the field accessors according to following rules: + - aSymbol = #always always generate the accessors + - aSymbol = #never never generate the accessors + - aSymbol = #ifGenerated only generate the auto-generated accessors + - aSymbol = #ifAbsent only generate the absent accessors" + + (self isTypeAlias: specArray) + ifTrue: [self compileTypeAliasSpec: specArray generateAccessors: aSymbol] + ifFalse: [self compileStructureSpec: specArray generateAccessors: aSymbol]! Item was removed: - ----- Method: ExternalStructure class>>compileFields:withAccessors: (in category 'field definition') ----- - compileFields: specArray withAccessors: aSymbol - "Private. Use #compileFields or #defineFields. Compile a type specification for the FFI calls. - - Eventually generate the field accessors according to following rules: - - aSymbol = #always always generate the accessors - - aSymbol = #never never generate the accessors - - aSymbol = #generated only generate the auto-generated accessors - - aSymbol = #absent only generate the absent accessors" - - (self isTypeAlias: specArray) - ifTrue: [self compileTypeAliasSpec: specArray withAccessors: aSymbol] - ifFalse: [self compileStructureSpec: specArray withAccessors: aSymbol]! Item was removed: - ----- Method: ExternalStructure class>>compileFieldsSafely (in category 'field definition') ----- - compileFieldsSafely - - [self compileFields] - ifError: [:msg | Transcript showln: '[FFI] Field compilation failed: ', msg].! Item was added: + ----- Method: ExternalStructure class>>compileStructureSpec:generateAccessors: (in category 'field definition - support') ----- + compileStructureSpec: specArray generateAccessors: aSymbol + "Compile a type specification for the FFI calls. + Return the newly compiled spec. + + Eventually generate the field accessors according to following rules: + - aSymbol = #always always generate the accessors + - aSymbol = #never never generate the accessors + - aSymbol = #ifGenerated only generate the auto-generated accessors + - aSymbol = #ifAbsent only generate the absent accessors" + + | newByteAlignment byteOffset typeSpec newCompiledSpec | + byteOffset := 0. + newByteAlignment := self minStructureAlignment. + typeSpec := WriteStream on: (WordArray new: 10). + typeSpec nextPut: FFIFlagStructure. + specArray do: [:spec | + | fieldName fieldTypeName externalType typeSize fieldAlignment | + fieldName := spec first. + fieldTypeName := spec second. + externalType := (ExternalType typeNamed: fieldTypeName) + ifNil: [self errorTypeNotFound: spec second]. + typeSize := externalType byteSize. + fieldAlignment := (externalType byteAlignment + max: self minFieldAlignment) + min: self maxFieldAlignment. + byteOffset := byteOffset alignedTo: fieldAlignment. + newByteAlignment := newByteAlignment max: fieldAlignment. + spec size > 2 ifTrue: ["extra size" + spec third < typeSize + ifTrue: [^ self error: 'Explicit type size is less than expected']. + typeSize := spec third. + ]. + (fieldName notNil and: [self shouldGenerateAccessorsFor: fieldName policy: aSymbol]) ifTrue: [ + self generateStructureFieldAccessorsFor: fieldName startingAt: byteOffset + 1 type: externalType. + ]. + typeSpec nextPutAll: (externalType embeddedSpecWithSize: typeSize). + byteOffset := byteOffset + typeSize. + ]. + newByteAlignment := newByteAlignment min: self maxStructureAlignment. + byteOffset := byteOffset alignedTo: newByteAlignment. + newCompiledSpec := typeSpec contents. + newCompiledSpec at: 1 put: (byteOffset bitOr: FFIFlagStructure). + self + setCompiledSpec: newCompiledSpec + byteAlignment: newByteAlignment.! Item was removed: - ----- Method: ExternalStructure class>>compileStructureSpec:withAccessors: (in category 'field definition - support') ----- - compileStructureSpec: specArray withAccessors: aSymbol - "Compile a type specification for the FFI calls. - Return the newly compiled spec. - - Eventually generate the field accessors according to following rules: - - aSymbol = #always always generate the accessors - - aSymbol = #never never generate the accessors - - aSymbol = #generated only generate the auto-generated accessors - - aSymbol = #absent only generate the absent accessors" - - | newByteAlignment byteOffset typeSpec newCompiledSpec | - byteOffset := 0. - newByteAlignment := self minStructureAlignment. - typeSpec := WriteStream on: (WordArray new: 10). - typeSpec nextPut: FFIFlagStructure. - specArray do: [:spec | - | fieldName fieldTypeName externalType typeSize fieldAlignment | - fieldName := spec first. - fieldTypeName := spec second. - externalType := (ExternalType typeNamed: fieldTypeName) - ifNil: [self errorTypeNotFound: spec second]. - typeSize := externalType byteSize. - fieldAlignment := (externalType byteAlignment - max: self minFieldAlignment) - min: self maxFieldAlignment. - byteOffset := byteOffset alignedTo: fieldAlignment. - newByteAlignment := newByteAlignment max: fieldAlignment. - spec size > 2 ifTrue: ["extra size" - spec third < typeSize - ifTrue: [^ self error: 'Explicit type size is less than expected']. - typeSize := spec third. - ]. - (fieldName notNil and: [self shouldGenerate: fieldName policy: aSymbol]) ifTrue: [ - self generateStructureFieldAccessorsFor: fieldName startingAt: byteOffset + 1 type: externalType. - ]. - typeSpec nextPutAll: (externalType embeddedSpecWithSize: typeSize). - byteOffset := byteOffset + typeSize. - ]. - newByteAlignment := newByteAlignment min: self maxStructureAlignment. - byteOffset := byteOffset alignedTo: newByteAlignment. - newCompiledSpec := typeSpec contents. - newCompiledSpec at: 1 put: (byteOffset bitOr: FFIFlagStructure). - self - setCompiledSpec: newCompiledSpec - byteAlignment: newByteAlignment.! Item was added: + ----- Method: ExternalStructure class>>compileTypeAliasSpec:generateAccessors: (in category 'field definition - support') ----- + compileTypeAliasSpec: spec generateAccessors: aSymbol + "Define all the fields in the receiver. + Return the newly compiled spec." + | fieldName fieldTypeName externalType | + fieldName := spec first. + fieldTypeName := spec second. + externalType := (ExternalType typeNamed: fieldTypeName) + ifNil: [self errorTypeNotFound: spec second]. + (fieldName notNil and:[self shouldGenerateAccessorsFor: fieldName policy: aSymbol]) ifTrue:[ + self generateTypeAliasAccessorsFor: fieldName type: externalType]. + externalType isPointerType + ifTrue: ["Special case. Typedef for a pointer type, e.g., typedef char* LPSTR in Win32 API. Mark it as both structure and pointer. Note that #isPointerType will only answer true for the in-image pointer type, not the non-pointer alias for the pointer." + self + setCompiledSpec: (WordArray with: ExternalType pointerAliasSpec) + byteAlignment: ExternalType pointerAliasAlignment] + ifFalse: ["Usual case. Typedef for another struct type or atomic type. Just re-use compiled spec and extras from the aliased type." + self + flag: #isTypeAlias; + setCompiledSpec: externalType compiledSpec + byteAlignment: externalType byteAlignment].! Item was removed: - ----- Method: ExternalStructure class>>compileTypeAliasSpec:withAccessors: (in category 'field definition - support') ----- - compileTypeAliasSpec: spec withAccessors: aSymbol - "Define all the fields in the receiver. - Return the newly compiled spec." - | fieldName fieldTypeName externalType | - fieldName := spec first. - fieldTypeName := spec second. - externalType := (ExternalType typeNamed: fieldTypeName) - ifNil: [self errorTypeNotFound: spec second]. - (fieldName notNil and:[self shouldGenerate: fieldName policy: aSymbol]) ifTrue:[ - self generateTypeAliasAccessorsFor: fieldName type: externalType]. - externalType isPointerType - ifTrue: ["Special case. Typedef for a pointer type, e.g., typedef char* LPSTR in Win32 API. Mark it as both structure and pointer. Note that #isPointerType will only answer true for the in-image pointer type, not the non-pointer alias for the pointer." - self - setCompiledSpec: (WordArray with: ExternalType pointerAliasSpec) - byteAlignment: ExternalType pointerAliasAlignment] - ifFalse: ["Usual case. Typedef for another struct type or atomic type. Just re-use compiled spec and extras from the aliased type." - self - flag: #isTypeAlias; - setCompiledSpec: externalType compiledSpec - byteAlignment: externalType byteAlignment].! Item was added: + ----- Method: ExternalStructure class>>defineAllChangedFields (in category 'system startup') ----- + defineAllChangedFields + " + ExternalStructure defineAllChangedFields + " + self allStructuresInCompilationOrder do: [:structClass | + structClass defineChangedFields. + structClass organization removeEmptyCategories]. + + "Compilation of fields only needs external types temporarily. Non-weak references to external types are only in methods with FFI calls." + ExternalType cleanupUnusedTypes.! Item was changed: ----- Method: ExternalStructure class>>defineAllFields (in category 'system startup') ----- defineAllFields " ExternalStructure defineAllFields " + self allStructuresInCompilationOrder do: [:structClass | + structClass defineFields. + structClass organization removeEmptyCategories]. - | priorAuthorInitials fieldSpec | - priorAuthorInitials := Utilities authorInitialsPerSe. - [Utilities setAuthorInitials: 'FFI'. + "Compilation of fields only needs external types temporarily. Non-weak references to external types are only in methods with FFI calls." + ExternalType cleanupUnusedTypes.! - self allStructuresInCompilationOrder do: [:structClass | - fieldSpec := structClass fields. - (structClass hasFieldLayoutChanged: fieldSpec) - ifTrue: [structClass defineFields: fieldSpec]. - structClass organization removeEmptyCategories]. - "Compilation of fields only needs external types temporarily. Non-weak references to external types are only in methods with FFI calls." - ExternalType cleanupUnusedTypes. - - ] ensure: [Utilities setAuthorInitials: priorAuthorInitials]! Item was added: + ----- Method: ExternalStructure class>>defineChangedFields (in category 'field definition') ----- + defineChangedFields + "Public. Define all the fields in the receiver. Only re-generate changed field accessors if auto-generated in the first place." + + self isSkipped ifTrue: [^ nil]. + self hasFieldLayoutChanged ifTrue: [self defineFields].! Item was added: + ----- Method: ExternalStructure class>>defineChangedFields: (in category 'field definition') ----- + defineChangedFields: fieldSpec + "Public. Define all the fields in the receiver. Only re-generate changed field accessors if auto-generated in the first place." + + self isSkipped ifTrue: [^ nil]. + (self hasFieldLayoutChanged: fieldSpec) ifTrue: [self defineFields: fieldSpec].! Item was changed: ----- Method: ExternalStructure class>>defineFields: (in category 'field definition') ----- defineFields: fieldSpec "Private. Use #defineFields." + self compileFields: fieldSpec generateAccessors: #ifGenerated. - self compileFields: fieldSpec withAccessors: #generated. ExternalType noticeModificationOf: self.! Item was changed: ----- Method: ExternalStructure class>>doneCompiling (in category 'class management') ----- doneCompiling + "Base class changed to something that is an external structure now. This is also the post-load hook for Monticello; see MCMethodDefinition >> #postLoad." - "Base class changed to something that is an external structure now." self isSkipped ifTrue: [^ self]. + ExternalStructure triggerDefineAllChangedFields.! - ExternalStructure triggerDefineAllFields.! Item was changed: + ----- Method: ExternalStructure class>>hasFieldLayoutChanged (in category 'field definition - support') ----- - ----- Method: ExternalStructure class>>hasFieldLayoutChanged (in category 'system startup') ----- hasFieldLayoutChanged "Answers whether all fields should be re-compiled (and hence accessors re-generated)." ^ self hasFieldLayoutChanged: self fields! Item was changed: + ----- Method: ExternalStructure class>>hasFieldLayoutChanged: (in category 'field definition - support') ----- - ----- Method: ExternalStructure class>>hasFieldLayoutChanged: (in category 'system startup') ----- hasFieldLayoutChanged: fieldSpec "Answers whether all fields should be re-compiled (and hence accessors re-generated). This is useful at system startup time if a platform change was detected, which can influence alignment and size of pointers. !!!!!! Note that this method depends on all referenced types to be checked for field-layout changes first !!!!!!" | oldCompiledSpec oldByteAlignment result | (oldCompiledSpec := self compiledSpec) ifNil: [^ true]. (oldByteAlignment := self byteAlignment) ifNil: [^ true]. + self compileFields: fieldSpec generateAccessors: #never. - self compileFields: fieldSpec withAccessors: #never. self flag: #bug. "mt: Changed type aliasing for pointers not noticed unless that alias hides a pointer type." result := self isTypeAlias or: [oldCompiledSpec ~= self compiledSpec]. self setCompiledSpec: oldCompiledSpec byteAlignment: oldByteAlignment. ^ result! Item was changed: ----- Method: ExternalStructure class>>maybeCompileAccessor:withSelector: (in category 'field definition - support') ----- maybeCompileAccessor: newSourceString withSelector: selector + "Only compile if category or source changed. Use generic author initials during compilation." - "Only compile if category or source changed." + | newCategory existingReference priorAuthorInitials | - | newCategory existingReference | newCategory := #'*autogenerated - accessing'. ((existingReference := MethodReference class: self selector: selector) isValid and: [existingReference category = newCategory] and: [existingReference sourceString = newSourceString]) ifTrue: [^ self]. + + priorAuthorInitials := Utilities authorInitialsPerSe. + [Utilities authorInitials: 'FFI'. + self compile: newSourceString classified: newCategory. + ] ensure: [Utilities authorInitials: priorAuthorInitials].! - self compile: newSourceString classified: newCategory.! Item was changed: + ----- Method: ExternalStructure class>>setCompiledSpec:byteAlignment: (in category 'field definition - support') ----- - ----- Method: ExternalStructure class>>setCompiledSpec:byteAlignment: (in category 'external type') ----- setCompiledSpec: spec byteAlignment: alignment + "Private. Store this structure's compiled spec and extras to be used when creating external types for this structure as required. See ExternalType class >> #newTypeNamed: and ExternalType >> #newReferentClass:. Note that this should only be called from the struct compiler; see #compile*Spec:withAccessors:." - "Store this structure's compiled spec and extras to be used when creating external types for this structure as required. See ExternalType class >> #newTypeNamed: and ExternalType >> #newReferentClass:." compiledSpec := spec. byteAlignment := alignment.! Item was removed: - ----- Method: ExternalStructure class>>shouldGenerate:policy: (in category 'field definition - support') ----- - shouldGenerate: fieldname policy: aSymbol - "Answer true if the field accessors must be compiled. - Do so according to the following rules: - - aSymbol = #always always generate the accessors - - aSymbol = #never never generate the accessors - - aSymbol = #generated only re-generate the auto-generated accessors - - aSymbol = #absent only generate the absent accessors" - aSymbol = #never ifTrue: [^ false]. - aSymbol = #always ifTrue: [^ true]. - aSymbol = #absent ifTrue: [^ (self methodDictionary includesKey: fieldname) not]. - aSymbol = #generated "includes #absent rule" - ifTrue: [^ (self methodDictionary includesKey: fieldname) not - or: [(self methodDictionary at: fieldname) hasPragma: #generated]]. - self error: 'unknown generation policy'! Item was added: + ----- Method: ExternalStructure class>>shouldGenerateAccessorsFor:policy: (in category 'field definition - support') ----- + shouldGenerateAccessorsFor: fieldname policy: aSymbol + "Answer true if the field accessors must be compiled. + Do so according to the following rules: + - aSymbol = #always always generate the accessors + - aSymbol = #never never generate the accessors + - aSymbol = #ifGenerated only re-generate the auto-generated accessors + - aSymbol = #ifAbsent only generate the absent accessors" + aSymbol = #never ifTrue: [^ false]. + aSymbol = #always ifTrue: [^ true]. + aSymbol = #ifAbsent ifTrue: [^ (self methodDictionary includesKey: fieldname) not]. + aSymbol = #ifGenerated "includes #ifAbsent rule" + ifTrue: [^ (self methodDictionary includesKey: fieldname) not + or: [(self methodDictionary at: fieldname) hasPragma: #generated]]. + self error: 'unknown generation policy'! Item was added: + ----- Method: ExternalStructure class>>triggerDefineAllChangedFields (in category 'field definition - deferred') ----- + triggerDefineAllChangedFields + + self environment at: #'FFIDeferredTask_DefineAllChangedFields' put: true. + Project current addDeferredUIMessage: [self tryDefineAllChangedFields].! Item was added: + ----- Method: ExternalStructure class>>tryDefineAllChangedFields (in category 'field definition - deferred') ----- + tryDefineAllChangedFields + + (self environment includesKey: #'FFIDeferredTask_DefineAllChangedFields') + ifTrue: [self environment removeKey: #'FFIDeferredTask_DefineAllChangedFields'] + ifFalse: [^ self]. + + self defineAllChangedFields.! Item was added: + ----- Method: ExternalUnion class>>compileStructureSpec:generateAccessors: (in category 'field definition - support') ----- + compileStructureSpec: specArray generateAccessors: aSymbol + "Compile a type specification for the FFI machinery. + Return the newly compiled spec. + Eventually generate the field accessors according to the policy defined in aSymbol." + | byteOffset maxByteSize typeSpec newCompiledSpec newByteAlignment | + byteOffset := 1. + newByteAlignment := 1. + maxByteSize := 0. + typeSpec := WriteStream on: (WordArray new: specArray size + 1). + typeSpec nextPut: FFIFlagStructure. + specArray do: [:spec | + | fieldName fieldTypeName externalType typeSize typeAlignment | + fieldName := spec first. + fieldTypeName := spec second. + externalType := (ExternalType typeNamed: fieldTypeName) + ifNil: [self errorTypeNotFound: spec second]. + typeSize := externalType byteSize. + typeAlignment := externalType byteAlignment. + spec size > 2 ifTrue: ["extra size" + spec third < typeSize + ifTrue: [^ self error: 'Explicit type size is less than expected']. + typeSize := spec third. + ]. + (fieldName notNil and: [self shouldGenerateAccessorsFor: fieldName policy: aSymbol]) ifTrue: [ + self generateStructureFieldAccessorsFor: fieldName startingAt: byteOffset type: externalType. + ]. + typeSpec nextPutAll: (externalType embeddedSpecWithSize: typeSize). + maxByteSize := maxByteSize max: typeSize. + newByteAlignment := newByteAlignment max: typeAlignment + ]. + maxByteSize := maxByteSize alignedTo: newByteAlignment. + newCompiledSpec := typeSpec contents. + newCompiledSpec at: 1 put: (maxByteSize bitOr: FFIFlagStructure). + self + setCompiledSpec: newCompiledSpec + byteAlignment: newByteAlignment.! Item was removed: - ----- Method: ExternalUnion class>>compileStructureSpec:withAccessors: (in category 'field definition - support') ----- - compileStructureSpec: specArray withAccessors: aSymbol - "Compile a type specification for the FFI machinery. - Return the newly compiled spec. - Eventually generate the field accessors according to the policy defined in aSymbol." - | byteOffset maxByteSize typeSpec newCompiledSpec newByteAlignment | - byteOffset := 1. - newByteAlignment := 1. - maxByteSize := 0. - typeSpec := WriteStream on: (WordArray new: specArray size + 1). - typeSpec nextPut: FFIFlagStructure. - specArray do: [:spec | - | fieldName fieldTypeName externalType typeSize typeAlignment | - fieldName := spec first. - fieldTypeName := spec second. - externalType := (ExternalType typeNamed: fieldTypeName) - ifNil: [self errorTypeNotFound: spec second]. - typeSize := externalType byteSize. - typeAlignment := externalType byteAlignment. - spec size > 2 ifTrue: ["extra size" - spec third < typeSize - ifTrue: [^ self error: 'Explicit type size is less than expected']. - typeSize := spec third. - ]. - (fieldName notNil and: [self shouldGenerate: fieldName policy: aSymbol]) ifTrue: [ - self generateStructureFieldAccessorsFor: fieldName startingAt: byteOffset type: externalType. - ]. - typeSpec nextPutAll: (externalType embeddedSpecWithSize: typeSize). - maxByteSize := maxByteSize max: typeSize. - newByteAlignment := newByteAlignment max: typeAlignment - ]. - maxByteSize := maxByteSize alignedTo: newByteAlignment. - newCompiledSpec := typeSpec contents. - newCompiledSpec at: 1 put: (maxByteSize bitOr: FFIFlagStructure). - self - setCompiledSpec: newCompiledSpec - byteAlignment: newByteAlignment.! Item was added: + ----- Method: ExternalUnion class>>compileTypeAliasSpec:generateAccessors: (in category 'field definition - support') ----- + compileTypeAliasSpec: spec generateAccessors: aSymbol + + self error: 'Use ExternalStructure or ExternalTypeAlias to define a type alias, not ExternalUnion'.! Item was removed: - ----- Method: ExternalUnion class>>compileTypeAliasSpec:withAccessors: (in category 'field definition - support') ----- - compileTypeAliasSpec: spec withAccessors: aSymbol - - self error: 'Use ExternalStructure or ExternalTypeAlias to define a type alias, not ExternalUnion'.!

1 0

FFI: FFI-Kernel-mt.193.mcz
by commits＠source.squeak.org 09 Aug '21

09 Aug '21

Marcel Taeumel uploaded a new version of FFI-Kernel to project FFI: http://source.squeak.org/FFI/FFI-Kernel-mt.193.mcz ==================== Summary ==================== Name: FFI-Kernel-mt.193 Author: mt Time: 9 August 2021, 7:13:55.720391 pm UUID: 57c1d500-fd24-7c40-adfb-767cdd35e6da Ancestors: FFI-Kernel-mt.192 Fix bug in compilation order of ExternalStructure fields. =============== Diff against FFI-Kernel-mt.192 =============== Item was changed: ----- Method: ExternalStructure class>>allStructuresInCompilationOrder (in category 'system startup') ----- allStructuresInCompilationOrder "Answers a list of all known structure (and packed structures and unions) in ascending order of field compilation." | unordered ordered | self == ExternalStructure ifFalse: [self error: 'Correct compilation order cannot be guaranteed for a partial list of structure classes.']. unordered := self allSubclasses reject: [:ea | ea isSkipped]. ordered := OrderedCollection new: unordered size. [unordered notEmpty] whileTrue: [ | structClass prevStructClass references | structClass := unordered anyOne. [references := structClass referencedTypeNames. + references := references collect: [:ea | ea copyWithoutAll: '([0123456789])*']. prevStructClass := unordered detect: [:c | c ~~ structClass and: [references includes: c name]] ifNone: [nil]. prevStructClass isNil] whileFalse: [structClass := prevStructClass]. "we found a structure/alias which does not depend on other structures/aliases" ordered add: (unordered remove: structClass)]. ^ ordered!

1 0

FFI: FFI-Kernel-mt.192.mcz
by commits＠source.squeak.org 09 Aug '21

09 Aug '21

Marcel Taeumel uploaded a new version of FFI-Kernel to project FFI: http://source.squeak.org/FFI/FFI-Kernel-mt.192.mcz ==================== Summary ==================== Name: FFI-Kernel-mt.192 Author: mt Time: 9 August 2021, 6:52:50.835391 pm UUID: 8e441056-c6fe-8d44-ad2c-d03174df9cd6 Ancestors: FFI-Kernel-mt.191 Fix typo. Sorry for the noise. =============== Diff against FFI-Kernel-mt.191 =============== Item was changed: ----- Method: ExternalStructure class>>doneCompiling (in category 'class management') ----- doneCompiling "Base class changed to something that is an external structure now." self isSkipped ifTrue: [^ self]. + ExternalStructure triggerDefineAllFields.! - self triggerDefineAllFields.!

1 0

FFI: FFI-Kernel-mt.191.mcz
by commits＠source.squeak.org 09 Aug '21

09 Aug '21

Marcel Taeumel uploaded a new version of FFI-Kernel to project FFI: http://source.squeak.org/FFI/FFI-Kernel-mt.191.mcz ==================== Summary ==================== Name: FFI-Kernel-mt.191 Author: mt Time: 9 August 2021, 6:50:42.395391 pm UUID: 89175a32-7b5e-744d-ae32-06f23674d61d Ancestors: FFI-Kernel-mt.190 Fixes several code-loading bugs around ExternalStructure. #doneCompiling needs to recompile/redefine *all* fields. The entire hierarchy of ExternalStructure. Note that #doneCompiling is also currently the hook for loading the methods #fields or #originalTypeName via Monticello. We cannot know the effects of any changed field spec. Local re-compilation/re-definition will not do it. Therefore, offer a simple way to ensure that re-compilation is only done once for multiple changed field spec. Rely on deferred UI messages. In a CI setting, #tryDefineAllFIelds might need to be called after loading the code. In an interactive setting, this won't be necessary because of the UI process. =============== Diff against FFI-Kernel-mt.190 =============== Item was changed: ----- Method: ExternalStructure class>>compileAllFields (in category 'system startup') ----- compileAllFields " ExternalStructure compileAllFields " | priorAuthorInitials fieldSpec | priorAuthorInitials := Utilities authorInitialsPerSe. [Utilities setAuthorInitials: 'FFI'. self allStructuresInCompilationOrder do: [:structClass | fieldSpec := structClass fields. - self flag: #discuss. "mt: Why do we need that extra layout check? Performance gain is minimal..." (structClass hasFieldLayoutChanged: fieldSpec) + ifTrue: [structClass compileFields: fieldSpec]. - ifTrue: [structClass compileFieldsSilently: fieldSpec]. - structClass externalType "asNonPointerType" - compiledSpec: structClass compiledSpec; - byteAlignment: structClass byteAlignment. structClass organization removeEmptyCategories]. "Compilation of fields only needs external types temporarily. Non-weak references to external types are only in methods with FFI calls." ExternalType cleanupUnusedTypes. ] ensure: [Utilities setAuthorInitials: priorAuthorInitials]! Item was changed: ----- Method: ExternalStructure class>>compileFields: (in category 'field definition') ----- compileFields: fieldSpec "Private. Use #compileFields." + self compileFields: fieldSpec withAccessors: #generated. - self compileFieldsSilently: fieldSpec. ExternalType noticeModificationOf: self.! Item was removed: - ----- Method: ExternalStructure class>>compileFieldsSilently: (in category 'field definition') ----- - compileFieldsSilently: fieldSpec - "Private. Use #compileFields." - - self compileFields: fieldSpec withAccessors: #generated.! Item was changed: ----- Method: ExternalStructure class>>defineAllFields (in category 'system startup') ----- defineAllFields + " - "For convenience. ExternalStructure defineAllFields " + | priorAuthorInitials fieldSpec | + priorAuthorInitials := Utilities authorInitialsPerSe. + [Utilities setAuthorInitials: 'FFI'. + + self allStructuresInCompilationOrder do: [:structClass | + fieldSpec := structClass fields. + (structClass hasFieldLayoutChanged: fieldSpec) + ifTrue: [structClass defineFields: fieldSpec]. + structClass organization removeEmptyCategories]. + "Compilation of fields only needs external types temporarily. Non-weak references to external types are only in methods with FFI calls." + ExternalType cleanupUnusedTypes. + + ] ensure: [Utilities setAuthorInitials: priorAuthorInitials]! - self allStructuresInCompilationOrder - do: [:structClass | - structClass defineFields. - structClass organization removeEmptyCategories].! Item was added: + ----- Method: ExternalStructure class>>defineFieldsSafely (in category 'field definition') ----- + defineFieldsSafely + + [self defineFields] + ifError: [:msg | Transcript showln: '[FFI] Field definition failed: ', msg].! Item was changed: ----- Method: ExternalStructure class>>doneCompiling (in category 'class management') ----- doneCompiling "Base class changed to something that is an external structure now." self isSkipped ifTrue: [^ self]. + self triggerDefineAllFields.! - self compileFieldsSafely. - self externalType becomeKnownTypeSafely.! Item was changed: ----- Method: ExternalStructure class>>hasFieldLayoutChanged: (in category 'system startup') ----- hasFieldLayoutChanged: fieldSpec "Answers whether all fields should be re-compiled (and hence accessors re-generated). This is useful at system startup time if a platform change was detected, which can influence alignment and size of pointers. !!!!!! Note that this method depends on all referenced types to be checked for field-layout changes first !!!!!!" + | oldCompiledSpec oldByteAlignment result | - | oldCompiledSpec oldByteAlignment | (oldCompiledSpec := self compiledSpec) ifNil: [^ true]. (oldByteAlignment := self byteAlignment) ifNil: [^ true]. self compileFields: fieldSpec withAccessors: #never. - self assert: [self isTypeAlias or: [oldCompiledSpec ~~ self compiledSpec]]. - self flag: #bug. "mt: Changed type aliasing for pointers not noticed unless that alias hides a pointer type." + result := self isTypeAlias or: [oldCompiledSpec ~= self compiledSpec]. + + self + setCompiledSpec: oldCompiledSpec + byteAlignment: oldByteAlignment. + + ^ result! - [^ oldCompiledSpec ~= self compiledSpec] - ensure: [ - self - setCompiledSpec: oldCompiledSpec - byteAlignment: oldByteAlignment]! Item was changed: ----- Method: ExternalStructure class>>platformChangedFrom:to: (in category 'system startup') ----- platformChangedFrom: lastPlatform to: currentPlatform + "The system is coming up on a new platform. Compile all field specs and install them in the respective struct types. Also re-generate all struct-field accessors if necessary." - "The system is coming up on a new platform. Compile all field specs and install them in the respective struct types." + self defineAllFields.! - self compileAllFields.! Item was added: + ----- Method: ExternalStructure class>>triggerDefineAllFields (in category 'field definition - deferred') ----- + triggerDefineAllFields + + self environment at: #'FFIDeferredTask_DefineAllFields' put: true. + Project current addDeferredUIMessage: [self tryDefineAllFields].! Item was added: + ----- Method: ExternalStructure class>>tryDefineAllFields (in category 'field definition - deferred') ----- + tryDefineAllFields + + (self environment includesKey: #'FFIDeferredTask_DefineAllFields') + ifTrue: [self environment removeKey: #'FFIDeferredTask_DefineAllFields'] + ifFalse: [^ self]. + + self defineAllFields.!

1 0

FFI: FFI-Kernel-mt.190.mcz
by commits＠source.squeak.org 09 Aug '21

09 Aug '21

Marcel Taeumel uploaded a new version of FFI-Kernel to project FFI: http://source.squeak.org/FFI/FFI-Kernel-mt.190.mcz ==================== Summary ==================== Name: FFI-Kernel-mt.190 Author: mt Time: 9 August 2021, 5:54:44.510391 pm UUID: 6936522e-daaf-404a-86b6-f21a36197f8d Ancestors: FFI-Kernel-mt.189 Improves initialization of type aliases during initial code loading. Note that "self defineFields" is still required after changing/implementing #originalTypeName in the alias' referentClass. =============== Diff against FFI-Kernel-mt.189 =============== Item was changed: + ----- Method: ExternalAtomicType>>newTypeAlias (in category 'private') ----- - ----- Method: ExternalAtomicType>>newTypeAlias (in category 'testing') ----- newTypeAlias + "Only support switching between atomic types for now." + self isTypeAlias ifFalse: [^ self]. + + compiledSpec := referentClass compiledSpec. + byteAlignment := referentClass byteAlignment.! - "self isTypeAlias ifFalse: [^ self]." - "Nothing to do. My referentClass was already upated." - ! Item was changed: ----- Method: ExternalStructureType>>newTypeAlias (in category 'private') ----- newTypeAlias + "Only support switching between struct types for now." + self isTypeAlias ifFalse: [^ self]. + + compiledSpec := referentClass compiledSpec. + byteAlignment := referentClass byteAlignment.! - "self isTypeAlias ifFalse: [^ self]." - "Nothing to do. My referentClass was already upated." - ! Item was changed: ----- Method: ExternalType class>>newTypeNamed: (in category 'instance creation') ----- newTypeNamed: aTypeName "Create a new struct type or array type. Not needed for atomic types; see #initializeDefaultTypes." | structClass arraySpec | self assert: [aTypeName last ~~ $*] description: 'Pointer type will be created automatically'. self assert: [aTypeName first ~~ $*] description: 'Non-pointer type for alias-to-pointer types will be created automatically'. aTypeName last == $] ifTrue: [ "array type, e.g., char[50]" arraySpec := self parseArrayTypeName: aTypeName. arraySpec second ifNil: [arraySpec at: 2 put: (self newTypeNamed: arraySpec first)]. ^ self newTypeForContentType: arraySpec second size: arraySpec third]. structClass := (self environment classNamed: aTypeName) ifNotNil: [:class | (class includesBehavior: ExternalStructure) ifTrue: [class]]. + ^ (structClass isNil or: [structClass isSkipped "i.e., not yet ready, see ExternalTypeAlias"]) + ifTrue: [self newTypeForUnknownNamed: aTypeName] + ifFalse: [self newTypeForStructureClass: structClass]! - ^ structClass - ifNil: [self newTypeForUnknownNamed: aTypeName] - ifNotNil: [self newTypeForStructureClass: structClass]! Item was changed: ----- Method: ExternalTypeAlias class>>isSkipped (in category 'field definition') ----- isSkipped + "Skip this class and all subclasses that have not yet implemented #originalTypeName." + ^ self == ExternalTypeAlias + or: [(self class lookupSelector: #originalTypeName) hasLiteral: #subclassResponsibility]! - ^ self == ExternalTypeAlias! Item was changed: ----- Method: ExternalUnknownType>>newTypeAlias (in category 'construction') ----- newTypeAlias + "A type alias is done compiling and its type can now be initialized completely. See ExternalTypeAlias class >> #originalTypeName and #isSkipped." + self assert: [referentClass isBehavior]. + + referentClass isTypeAlias + ifTrue: [^ self becomeKnownType]. + + self error: '[FFI] Only type aliases can become a known type later on'.! - self shouldNotImplement.!

1 0

FFI: FFI-Pools-mt.32.mcz
by commits＠source.squeak.org 09 Aug '21

09 Aug '21

Marcel Taeumel uploaded a new version of FFI-Pools to project FFI: http://source.squeak.org/FFI/FFI-Pools-mt.32.mcz ==================== Summary ==================== Name: FFI-Pools-mt.32 Author: mt Time: 9 August 2021, 4:09:34.890391 pm UUID: e88ddc3c-116f-c44e-9a38-72b380f8011a Ancestors: FFI-Pools-mt.31 Fix package preamble to declare known class names upfront to avoid unnecessary warnings in the Transcript. =============== Diff against FFI-Pools-mt.31 =============== Item was added: + (PackageInfo named: 'FFI-Pools') preamble: '"To avoid warnings, declare classes that will be loaded from FFI-Kernel, immediately after loading this package." + #(ExternalType ExternalAddress FFIPlatformDescription) + do: [:className | | environment | + environment := Environment default. + (environment declarationOf: className) + ifNil: [environment bind: className to: nil]].'!

1 0

FFI: FFI-Kernel-mt.189.mcz
by commits＠source.squeak.org 09 Aug '21

09 Aug '21

Marcel Taeumel uploaded a new version of FFI-Kernel to project FFI: http://source.squeak.org/FFI/FFI-Kernel-mt.189.mcz ==================== Summary ==================== Name: FFI-Kernel-mt.189 Author: mt Time: 9 August 2021, 3:43:47.361391 pm UUID: 1a3d3ef4-9d88-7d41-950b-33661825b87c Ancestors: FFI-Kernel-mt.188 Fixes a glitch in initial FFI loading. Clean up a instVar shadow. =============== Diff against FFI-Kernel-mt.188 =============== Item was changed: ----- Method: ExternalStructure class>>doneCompiling (in category 'class management') ----- doneCompiling "Base class changed to something that is an external structure now." + self isSkipped ifTrue: [^ self]. self compileFieldsSafely. self externalType becomeKnownTypeSafely.! Item was changed: ----- Method: ExternalStructure class>>maybeCompileAccessor:withSelector: (in category 'field definition - support') ----- + maybeCompileAccessor: newSourceString withSelector: selector - maybeCompileAccessor: aString withSelector: selector "Only compile if category or source changed." + | newCategory existingReference | + newCategory := #'*autogenerated - accessing'. + ((existingReference := MethodReference class: self selector: selector) isValid + and: [existingReference category = newCategory] + and: [existingReference sourceString = newSourceString]) - | category ref | - category := #'*autogenerated - accessing'. - ((ref := MethodReference class: self selector: selector) isValid - and: [ref category = category] - and: [ref sourceString = aString]) ifTrue: [^ self]. + self compile: newSourceString classified: newCategory.! - self compile: aString classified: category.!

1 0

FFI: FFI-Tests-mt.55.mcz
by commits＠source.squeak.org 09 Aug '21

09 Aug '21

Marcel Taeumel uploaded a new version of FFI-Tests to project FFI: http://source.squeak.org/FFI/FFI-Tests-mt.55.mcz ==================== Summary ==================== Name: FFI-Tests-mt.55 Author: mt Time: 9 August 2021, 12:01:19.708535 pm UUID: 869cfb3f-b03d-fc41-a6b0-70ee61eae5ca Ancestors: FFI-Tests-mt.54 Refactor the one test that fails only on macOS to get better error message in CI. =============== Diff against FFI-Tests-mt.54 =============== Item was changed: ----- Method: FFIPluginTests>>testChars (in category 'tests - atomics') ----- testChars | result | result := self invoke: 'ffiTestChars' with: $A with: 65 with: 65.0 with: true. self assert: result isCharacter. + self assert: 130 equals: result asciiValue.! - self assert: result asciiValue = 130.!

1 0

FFI: FFI-Kernel.terf-mt.189.mcz
by commits＠source.squeak.org 09 Aug '21

09 Aug '21

Marcel Taeumel uploaded a new version of FFI-Kernel to project FFI: http://source.squeak.org/FFI/FFI-Kernel.terf-mt.189.mcz ==================== Summary ==================== Name: FFI-Kernel.terf-mt.189 Author: mt Time: 9 August 2021, 9:44:58.47481 am UUID: 721f872c-37f0-3846-b83e-53fcd39b7734 Ancestors: FFI-Kernel.terf-eem.188 Backports the most recent bugfixes from the main branch (i.e., FFI-Kernel-mt.188) to make all tests pass again (instead of crashing the VM). The most important fix seems to be the regression in #zeroMemory: that FFI-Kernel-eem.182 introduced. Note that the following hacks might have to be re-added if really needed for Terf: - ExternalStructure class >> #allocate - ExternalStructureType >> #allocate Note that #initialize* methods on ExternalType class DO NOT migrate existing FFI installations. One MUST use #reset* instead. Also note that this .tern branch is hopefuly only temporary. The FFI architecture continues to evolve on the main branch. Finally, please read the commit message in FFI-Kernel-mt.187 (main branch). =============== Diff against FFI-Kernel.terf-eem.188 =============== Item was changed: ----- Method: ByteArray>>unsignedByteAt:put: (in category '*FFI-Kernel-accessing') ----- unsignedByteAt: byteOffset put: value "Same as #byteAt: but different primitive to support ExternalAddress." + <primitive: #primitiveUnsignedInt8AtPut module: #SqueakFFIPrims error: ec> - ^ self integerAt: byteOffset put: value size: 1 signed: false! Item was changed: ----- Method: ByteArray>>zeroMemory: (in category '*FFI-Kernel-accessing') ----- zeroMemory: numBytes | index size | index := 1. + size := numBytes - 7. - size := self size - 7. [index <= size] whileTrue: [self uint64At: index put: 0. index := index + 8]. + size := size + 4. "7 - 3, i.e. numBytes - 3" - size := size + 4. "7 - 3, i.e. self size - 3" index <= size ifTrue: [self uint32At: index put: 0. index := index + 4]. + size := size + 2. "3 - 1, i.e. numBytes - 1" - size := size + 2. "3 - 1, i.e. self size - 1" index <= size ifTrue: [self uint16At: index put: 0. index := index + 2]. + size := size + 1. + index <= size ifTrue: - index < size ifTrue: [self uint8At: index put: 0]! Item was added: + ----- Method: ByteArrayReadWriter>>int16At: (in category 'read/write atomics') ----- + int16At: oByteOffset + + self checkAt: oByteOffset. + ^ byteArray int16At: oByteOffset + byteOffset! Item was added: + ----- Method: ByteArrayReadWriter>>int16At:put: (in category 'read/write atomics') ----- + int16At: oByteOffset put: value + + self checkAt: oByteOffset. + ^ byteArray int16At: oByteOffset + byteOffset put: value! Item was added: + ----- Method: ByteArrayReadWriter>>int32At: (in category 'read/write atomics') ----- + int32At: oByteOffset + + self checkAt: oByteOffset. + ^ byteArray int32At: oByteOffset + byteOffset! Item was added: + ----- Method: ByteArrayReadWriter>>int32At:put: (in category 'read/write atomics') ----- + int32At: oByteOffset put: value + + self checkAt: oByteOffset. + ^ byteArray int32At: oByteOffset + byteOffset put: value! Item was added: + ----- Method: ByteArrayReadWriter>>int64At: (in category 'read/write atomics') ----- + int64At: oByteOffset + + self checkAt: oByteOffset. + ^ byteArray int64At: oByteOffset + byteOffset! Item was added: + ----- Method: ByteArrayReadWriter>>int64At:put: (in category 'read/write atomics') ----- + int64At: oByteOffset put: value + + self checkAt: oByteOffset. + ^ byteArray int64At: oByteOffset + byteOffset put: value! Item was added: + ----- Method: ByteArrayReadWriter>>int8At: (in category 'read/write atomics') ----- + int8At: oByteOffset + + self checkAt: oByteOffset. + ^ byteArray int8At: oByteOffset + byteOffset! Item was added: + ----- Method: ByteArrayReadWriter>>int8At:put: (in category 'read/write atomics') ----- + int8At: oByteOffset put: value + + self checkAt: oByteOffset. + ^ byteArray int8At: oByteOffset + byteOffset put: value! Item was added: + ----- Method: ByteArrayReadWriter>>perform:with: (in category 'message handling') ----- + perform: aSymbol with: firstObject + "Needed because of AtomicSelectors. See FFIAtomicReadWriteSend >> #handle:at:." + + <primitive: 83> + ^ self perform: aSymbol withArguments: { firstObject }! Item was added: + ----- Method: ByteArrayReadWriter>>perform:with:with: (in category 'message handling') ----- + perform: aSymbol with: firstObject with: secondObject + "Needed because of AtomicSelectors. See FFIAtomicReadWriteSend >> #handle:at:." + + <primitive: 83> + ^ self perform: aSymbol withArguments: { firstObject. secondObject }! Item was added: + ----- Method: ByteArrayReadWriter>>uint16At: (in category 'read/write atomics') ----- + uint16At: oByteOffset + + self checkAt: oByteOffset. + ^ byteArray uint16At: oByteOffset + byteOffset! Item was added: + ----- Method: ByteArrayReadWriter>>uint16At:put: (in category 'read/write atomics') ----- + uint16At: oByteOffset put: value + + self checkAt: oByteOffset. + ^ byteArray uint16At: oByteOffset + byteOffset put: value! Item was added: + ----- Method: ByteArrayReadWriter>>uint32At: (in category 'read/write atomics') ----- + uint32At: oByteOffset + + self checkAt: oByteOffset. + ^ byteArray uint32At: oByteOffset + byteOffset! Item was added: + ----- Method: ByteArrayReadWriter>>uint32At:put: (in category 'read/write atomics') ----- + uint32At: oByteOffset put: value + + self checkAt: oByteOffset. + ^ byteArray uint32At: oByteOffset + byteOffset put: value! Item was added: + ----- Method: ByteArrayReadWriter>>uint64At: (in category 'read/write atomics') ----- + uint64At: oByteOffset + + self checkAt: oByteOffset. + ^ byteArray uint64At: oByteOffset + byteOffset! Item was added: + ----- Method: ByteArrayReadWriter>>uint64At:put: (in category 'read/write atomics') ----- + uint64At: oByteOffset put: value + + self checkAt: oByteOffset. + ^ byteArray uint64At: oByteOffset + byteOffset put: value! Item was added: + ----- Method: ByteArrayReadWriter>>uint8At: (in category 'read/write atomics') ----- + uint8At: oByteOffset + + self checkAt: oByteOffset. + ^ byteArray uint8At: oByteOffset + byteOffset! Item was added: + ----- Method: ByteArrayReadWriter>>uint8At:put: (in category 'read/write atomics') ----- + uint8At: oByteOffset put: value + + self checkAt: oByteOffset. + ^ byteArray uint8At: oByteOffset + byteOffset put: value! Item was added: + ----- Method: ByteString>>uint8At: (in category '*FFI-Kernel-accessing') ----- + uint8At: byteOffset + "Backstop for compatibility with handle-based access. Raw-bits arrays are their own handle. See #getHandle and ExternalType >> #handle:at:." + + ^ self atByteOffset: byteOffset! Item was added: + ----- Method: ByteString>>uint8At:put: (in category '*FFI-Kernel-accessing') ----- + uint8At: byteOffset put: value + "Backstop for compatibility with handle-based access. Raw-bits arrays are their own handle. See #getHandle and ExternalType >> #handle:at:." + + ^ self atByteOffset: byteOffset put: value asCharacter! Item was added: + ----- Method: DoubleByteArray>>uint16At: (in category '*FFI-Kernel-accessing') ----- + uint16At: byteOffset + "Backstop for compatibility with handle-based access. Raw-bits arrays are their own handle. See #getHandle and ExternalType >> #handle:at:." + + ^ self atByteOffset: byteOffset! Item was added: + ----- Method: DoubleByteArray>>uint16At:put: (in category '*FFI-Kernel-accessing') ----- + uint16At: byteOffset put: value + "Backstop for compatibility with handle-based access. Raw-bits arrays are their own handle. See #getHandle and ExternalType >> #handle:at:." + + ^ self atByteOffset: byteOffset put: value! Item was added: + ----- Method: DoubleWordArray>>uint64At: (in category '*FFI-Kernel-accessing') ----- + uint64At: byteOffset + "Backstop for compatibility with handle-based access. Raw-bits arrays are their own handle. See #getHandle and ExternalType >> #handle:at:." + + ^ self atByteOffset: byteOffset! Item was added: + ----- Method: DoubleWordArray>>uint64At:put: (in category '*FFI-Kernel-accessing') ----- + uint64At: byteOffset put: value + "Backstop for compatibility with handle-based access. Raw-bits arrays are their own handle. See #getHandle and ExternalType >> #handle:at:." + + ^ self atByteOffset: byteOffset put: value! Item was added: + ----- Method: ExternalData>>atAllPut: (in category 'accessing') ----- + atAllPut: anObject + + self sizeCheck. + 1 to: self size do: + [:index | self at: index put: anObject].! Item was changed: ----- Method: ExternalStructure class>>allocate (in category 'instance creation') ----- allocate + + ^self externalType allocate! - ^ self fromHandle: (ByteArray new: self byteSize)! Item was added: + ----- Method: ExternalStructure class>>cleanUp: (in category 'initialize-release') ----- + cleanUp: aggressive + + aggressive ifTrue: [externalType := nil].! Item was removed: - ----- Method: ExternalStructureType>>allocate (in category 'external data') ----- - allocate - ^ referentClass fromHandle: (ByteArray new: self byteSize)! Item was changed: ----- Method: ExternalType class>>cleanupUnusedTypes (in category 'housekeeping') ----- cleanupUnusedTypes "In the lookup table for struct types and array types, remove keys to types no longer present.. ExternalType cleanupUnusedTypes " Smalltalk garbageCollect. StructTypes keys do: [:key | (StructTypes at: key) ifNil: [ StructTypes removeKey: key]]. ArrayTypes keys do: [:contentTypeName | | sizes | sizes := ArrayTypes at: contentTypeName. + sizes keys do: [:size | - [sizes keys do: [:size | (sizes at: size) ifNil: [sizes removeKey: size]]. + sizes ifEmpty: [ + ArrayTypes removeKey: contentTypeName]].! - sizes ifEmpty: [ - ArrayTypes removeKey: contentTypeName]] - on: Error - do: [:ex| Transcript print: ex; cr; flush]]! Item was changed: ----- Method: ExternalType class>>initializeAtomicTypes (in category 'class initialization') ----- initializeAtomicTypes + "Initializes atomic types if not already initialized. NOTE that if you want to reset already initialized atomic types, use #resetAllAtomicTypes instead." - "ExternalType initialize" | atomicType byteSize type typeName byteAlignment | self flag: #ffiLongVsInt. "For a discussion about long vs. int see http://forum.world.st/Re-squeak-dev-64-bit-FFI-was-porting-Croquet-to-Squea…." + - AtomicTypes do: - [:anAtomicType| - (anAtomicType class ~~ ExternalAtomicType - and: [anAtomicType class == ExternalType]) ifTrue: - [ExternalAtomicType adoptInstance: anAtomicType]]. #( "name atomic id byte size byte alignment" ('void' 0 0 0) "No non-pointer support in calls. Duh. ;-)" ('bool' 1 1 1) "No pointer support in calls." ('byte' 2 1 1) ('sbyte' 3 1 1) ('ushort' 4 2 2) ('short' 5 2 2) "!!!!!!" ('ulong' 6 4 "!!!!!!" 4) "!!!!!!" ('long' 7 4 "!!!!!!" 4) ('ulonglong' 8 8 8) "v.i." ('longlong' 9 8 8) "v.i." ('char' 10 1 1) ('schar' 11 1 1) ('float' 12 4 4) ('double' 13 8 8) "v.i." "TODO: ('longdouble' 14 10 16? 4?)" ) do:[:typeSpec| | compiled | typeName := typeSpec first. atomicType := typeSpec second. byteSize := typeSpec third. byteAlignment := typeSpec fourth. "0) On 32-bits Windows and MacOS, double and long long have an alignment of 8. But on 32-bit Linux, their alignment is 4. But not on a 32-bit Raspberry Pi OS." (FFIPlatformDescription current wordSize = 4 and: [FFIPlatformDescription current isUnix and: [FFIPlatformDescription current isARM not]]) ifTrue: [ (#('double' 'longlong' 'ulonglong') includes: typeName) ifTrue: [ byteAlignment := 4]]. "1) Regular type" type := (AtomicTypes at: typeName). compiled := WordArray with: ((byteSize bitOr: FFIFlagAtomic) bitOr: (atomicType bitShift: FFIAtomicTypeShift)). compiled ~= type compiledSpec "Preserve the identity of #compiledSpec." ifTrue: [type compiledSpec: compiled]. type byteAlignment: byteAlignment. "2) Pointer type" type := type asPointerType. compiled := WordArray with: ((self pointerSpec bitOr: FFIFlagAtomic) bitOr: (atomicType bitShift: FFIAtomicTypeShift)). compiled ~= type compiledSpec "Preserve the identity of #compiledSpec." ifTrue: [type compiledSpec: compiled]. type byteAlignment: self pointerAlignment. ].! Item was changed: ----- Method: ExternalType class>>resetAllAtomicTypes (in category 'housekeeping') ----- resetAllAtomicTypes "Warning: This call is only required if you change the initialization for AtomicTypes." AtomicTypes := nil. AtomicSends := nil. ArrayClasses := nil. + StructTypes := nil. ExternalStructure withAllSubclassesDo: [:cls | cls cleanUp: true]. - StructTypes := nil. ArrayTypes := nil. self initializeDefaultTypes. self initializeArrayClasses. self resetAllStructureTypes.! Item was changed: ----- Method: ExternalType class>>resetAllStructureTypes (in category 'housekeeping') ----- resetAllStructureTypes "Warning: This call is only required if you change the container for StructTypes!! Note that (2) and (3) can be swapped but that puts unnecessary pressure on the GC." + StructTypes := nil. ExternalStructure withAllSubclassesDo: [:cls | cls cleanUp: true]. - StructTypes := nil. ArrayTypes := nil. "1) Initialize the container for structure types." self initializeStructureTypes. "2) Recompile all FFI calls to create and persist structure types." self recompileAllLibraryFunctions. "3) Update all structure types' spec and alignment." ExternalTypePool reset. ExternalStructure defineAllFields. ExternalTypePool cleanUp. ! Item was changed: ----- Method: ExternalType class>>typeNamed: (in category 'instance lookup') ----- typeNamed: typeName "Supports pointer-type lookup for both atomic and structure types. Examples: 'long', 'long*', 'long *' or 'MyStruct', 'MyStruct*', 'MyStruct *', 'IntPtr', '*IntPtr' " | isPointerType isNonPointerType isArrayType actualTypeName type | + isArrayType := false. isNonPointerType := false. actualTypeName := typeName copyWithoutAll: ' '. (isPointerType := actualTypeName last == $*) "e.g. MyStruct*" ifTrue: [actualTypeName := actualTypeName allButLast]. actualTypeName last == $) "e.g. (char[])* -- pointer type for array type" ifTrue: [actualTypeName := (actualTypeName copyFrom: 2 to: actualTypeName size - 1)]. (isNonPointerType := actualTypeName first == $*) "e.g. *DoublePtr" ifTrue: [actualTypeName := actualTypeName allButFirst]. (isArrayType := actualTypeName last == $]) ifTrue: [ type := self arrayTypeNamed: actualTypeName ] ifFalse: [ (Symbol lookup: actualTypeName) ifNotNil: [:sym | actualTypeName := sym]. type := (self atomicTypeNamed: actualTypeName) ifNil: [self structTypeNamed: actualTypeName]]. + ^ type ifNotNil: [ + isPointerType - ^ type ifNotNil: - [isPointerType ifTrue: [type asPointerType "e.g. int* MyStruct* "] ifFalse: [isNonPointerType ifTrue: [type asNonPointerType "e.g. *IntPtr *MyStructPtr "] ifFalse: [type "e.g. int IntPtr MyStruct MyStructPtr "]]]! Item was changed: ----- Method: ExternalType>>isTypeAlias (in category 'testing') ----- isTypeAlias + self subclassResponsibility.! - ^true ifTrue: [false] ifFalse: [self subclassResponsibility]! Item was removed: - ----- Method: ExternalUnknownType>>readFieldAt: (in category 'external structure') ----- - readFieldAt: anInteger - ^'self error: ''cannot read field at ', anInteger printString, '; field has unknown type'''! Item was removed: - ----- Method: ExternalUnknownType>>writeFieldAt:with: (in category 'external structure') ----- - writeFieldAt: anInteger with: aString - ^'self error: ''cannot read field at ', anInteger printString, ' with name ', aString, '; field has unknown type'''! Item was added: + ----- Method: Float32Array>>floatAt: (in category '*FFI-Kernel-accessing') ----- + floatAt: byteOffset + "Backstop for compatibility with handle-based access. Raw-bits arrays are their own handle. See #getHandle and ExternalType >> #handle:at:." + + ^ self atByteOffset: byteOffset! Item was added: + ----- Method: Float32Array>>floatAt:put: (in category '*FFI-Kernel-accessing') ----- + floatAt: byteOffset put: value + "Backstop for compatibility with handle-based access. Raw-bits arrays are their own handle. See #getHandle and ExternalType >> #handle:at:put:." + + ^ self atByteOffset: byteOffset put: value! Item was added: + ----- Method: Float64Array>>doubleAt: (in category '*FFI-Kernel-accessing') ----- + doubleAt: byteOffset + "Backstop for compatibility with handle-based access. Raw-bits arrays are their own handle. See #getHandle and ExternalType >> #handle:at:." + + ^ self atByteOffset: byteOffset! Item was added: + ----- Method: Float64Array>>doubleAt:put: (in category '*FFI-Kernel-accessing') ----- + doubleAt: byteOffset put: value + "Backstop for compatibility with handle-based access. Raw-bits arrays are their own handle. See #getHandle and ExternalType >> #handle:at:put:." + + ^ self atByteOffset: byteOffset put: value! Item was changed: ----- Method: IntegerReadWriteSend>>isReading (in category 'accessing') ----- isReading + ^ selector numArgs = 3 or: [selector numArgs = 1]! - ^ selector numArgs = 3! Item was added: + ----- Method: SignedByteArray>>int8At: (in category '*FFI-Kernel-accessing') ----- + int8At: byteOffset + "Backstop for compatibility with handle-based access. Raw-bits arrays are their own handle. See #getHandle and ExternalType >> #handle:at:." + + ^ self atByteOffset: byteOffset! Item was added: + ----- Method: SignedByteArray>>int8At:put: (in category '*FFI-Kernel-accessing') ----- + int8At: byteOffset put: value + "Backstop for compatibility with handle-based access. Raw-bits arrays are their own handle. See #getHandle and ExternalType >> #handle:at:." + + ^ self atByteOffset: byteOffset put: value! Item was added: + ----- Method: SignedDoubleByteArray>>int16At: (in category '*FFI-Kernel-accessing') ----- + int16At: byteOffset + "Backstop for compatibility with handle-based access. Raw-bits arrays are their own handle. See #getHandle and ExternalType >> #handle:at:." + + ^ self atByteOffset: byteOffset! Item was added: + ----- Method: SignedDoubleByteArray>>int16At:put: (in category '*FFI-Kernel-accessing') ----- + int16At: byteOffset put: value + "Backstop for compatibility with handle-based access. Raw-bits arrays are their own handle. See #getHandle and ExternalType >> #handle:at:." + + ^ self atByteOffset: byteOffset put: value! Item was added: + ----- Method: SignedDoubleWordArray>>int64At: (in category '*FFI-Kernel-accessing') ----- + int64At: byteOffset + "Backstop for compatibility with handle-based access. Raw-bits arrays are their own handle. See #getHandle and ExternalType >> #handle:at:." + + ^ self atByteOffset: byteOffset! Item was added: + ----- Method: SignedDoubleWordArray>>int64At:put: (in category '*FFI-Kernel-accessing') ----- + int64At: byteOffset put: value + "Backstop for compatibility with handle-based access. Raw-bits arrays are their own handle. See #getHandle and ExternalType >> #handle:at:." + + ^ self atByteOffset: byteOffset put: value! Item was added: + ----- Method: SignedWordArray>>int32At: (in category '*FFI-Kernel-accessing') ----- + int32At: byteOffset + "Backstop for compatibility with handle-based access. Raw-bits arrays are their own handle. See #getHandle and ExternalType >> #handle:at:." + + ^ self atByteOffset: byteOffset! Item was added: + ----- Method: SignedWordArray>>int32At:put: (in category '*FFI-Kernel-accessing') ----- + int32At: byteOffset put: value + "Backstop for compatibility with handle-based access. Raw-bits arrays are their own handle. See #getHandle and ExternalType >> #handle:at:." + + ^ self atByteOffset: byteOffset put: value! Item was added: + ----- Method: WordArray>>uint32At: (in category '*FFI-Kernel-accessing') ----- + uint32At: byteOffset + "Backstop for compatibility with handle-based access. Raw-bits arrays are their own handle. See #getHandle and ExternalType >> #handle:at:." + + ^ self atByteOffset: byteOffset! Item was added: + ----- Method: WordArray>>uint32At:put: (in category '*FFI-Kernel-accessing') ----- + uint32At: byteOffset put: value + "Backstop for compatibility with handle-based access. Raw-bits arrays are their own handle. See #getHandle and ExternalType >> #handle:at:." + + ^ self atByteOffset: byteOffset put: value! Item was changed: (PackageInfo named: 'FFI-Kernel') postscript: '"Reinitialize FFIAtomicReadWriteSend to use the new accessors" + ExternalType resetAllAtomicTypes.'! - ExternalType initializeDefaultTypes'!

1 0

Jump to page: