Squeak-dev August 2021

squeak-dev@lists.squeakfoundation.org

18 participants
222 discussions

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

18 Aug '21

Marcel Taeumel uploaded a new version of FFI-Tests to project FFI: http://source.squeak.org/FFI/FFI-Tests-mt.62.mcz ==================== Summary ==================== Name: FFI-Tests-mt.62 Author: mt Time: 18 August 2021, 11:56:50.753133 am UUID: 3ed16468-cd62-8146-afe1-0403171c62b6 Ancestors: FFI-Tests-mt.61 Move image tests to new test case. Add manual checks for type integrity. =============== Diff against FFI-Tests-mt.61 =============== Item was removed: - ----- Method: ExternalTypeTests>>testAllArrayTypes (in category 'tests - image') ----- - testAllArrayTypes - - ExternalType allArrayTypes do: [:type | - self - deny: type isAtomic; - deny: type isPointerType; - deny: type isStructureType; - assert: type isArrayType].! Item was removed: - ----- Method: ExternalTypeTests>>testAllAtomicTypes (in category 'tests - image') ----- - testAllAtomicTypes - - ExternalType allAtomicTypes do: [:type | - self - assert: type isAtomic; - deny: type isPointerType; - deny: type isStructureType; - deny: type isArrayType].! Item was removed: - ----- Method: ExternalTypeTests>>testAllPointerTypes (in category 'tests - image') ----- - testAllPointerTypes - - ExternalType allPointerTypes do: [:type | - self - deny: type isAtomic; - assert: type isPointerType; - deny: type isStructureType; - deny: type isArrayType].! Item was removed: - ----- Method: ExternalTypeTests>>testAllStructureTypes (in category 'tests - image') ----- - testAllStructureTypes - - ExternalType allStructTypes do: [:type | - self - deny: type isAtomic; - deny: type isPointerType; - assert: type isStructureType; - deny: type isArrayType].! Item was added: + TestCase subclass: #FFIImageTests + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'FFI-Tests'! Item was added: + ----- Method: FFIImageTests class>>checkPlatformChange (in category 'manual checks') ----- + checkPlatformChange + " + self checkPlatformChange. + " + | old new bench | + old := FFIPlatformDescription newCurrent name: 'TEST'. + new := FFIPlatformDescription newCurrent. + + self assert: [old ~= new]. + bench := [ExternalType platformChangedFrom: old to: new] bench. + Transcript showln: bench. + self debug: #test05TypeIntegrity. + ! Item was added: + ----- Method: FFIImageTests class>>checkTypeIntegrity (in category 'manual checks') ----- + checkTypeIntegrity + " + self checkTypeIntegrity. + " + ExternalType initializeFast. + self debug: #test05TypeIntegrity. + + ExternalType initialize. + self debug: #test05TypeIntegrity. + + ExternalType resetAllTypes. + self debug: #test05TypeIntegrity.! Item was added: + ----- Method: FFIImageTests>>test01AllAtomicTypes (in category 'tests') ----- + test01AllAtomicTypes + + ExternalType allAtomicTypes do: [:type | + self + assert: type isAtomic; + deny: type isPointerType; + deny: type isStructureType; + deny: type isArrayType].! Item was added: + ----- Method: FFIImageTests>>test02AllStructureTypes (in category 'tests') ----- + test02AllStructureTypes + + ExternalType allStructTypes do: [:type | + self + deny: type isAtomic; + deny: type isPointerType; + assert: type isStructureType; + deny: type isArrayType].! Item was added: + ----- Method: FFIImageTests>>test03AllPointerTypes (in category 'tests') ----- + test03AllPointerTypes + + ExternalType allPointerTypes do: [:type | + self + deny: type isAtomic; + assert: type isPointerType; + deny: type isStructureType; + deny: type isArrayType].! Item was added: + ----- Method: FFIImageTests>>test04AllArrayTypes (in category 'tests') ----- + test04AllArrayTypes + + ExternalType allArrayTypes do: [:type | + self + deny: type isAtomic; + deny: type isPointerType; + deny: type isStructureType; + assert: type isArrayType].! Item was added: + ----- Method: FFIImageTests>>test05TypeIntegrity (in category 'tests') ----- + test05TypeIntegrity + + "ExternalType initialize." + + #(atomicTypesDo: structTypesDo: pointerTypesDo: arrayTypesDo: typeAliasTypesDo:) + do: [:enumerator | + ExternalType perform: enumerator with: [:type | + self assert: type compiledSpec notNil. + self assert: type byteAlignment notNil. + self assert: type asPointerType notNil. + self assert: type asNonPointerType notNil.]].!

1 0

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

18 Aug '21

Marcel Taeumel uploaded a new version of FFI-Kernel to project FFI: http://source.squeak.org/FFI/FFI-Kernel-mt.211.mcz ==================== Summary ==================== Name: FFI-Kernel-mt.211 Author: mt Time: 18 August 2021, 10:23:48.749508 am UUID: ddaad2aa-6b86-a344-8a2f-0f06f5ab6489 Ancestors: FFI-Kernel-mt.210 Fixes another migration issue. Keep #atomicTypeName as quick-return; migrate older instances in #basicInitializeAtomicTypes instead. =============== Diff against FFI-Kernel-mt.210 =============== Item was changed: ----- Method: ExternalType class>>basicInitializeAtomicTypes (in category 'class initialization') ----- basicInitializeAtomicTypes "Strong references required because there is no lazy initialization like there is for struct types and array types." AtomicTypes ifNil: [AtomicTypes := Dictionary new]. "Add new atomic types using the current configuration of AtomicTypeCodes." AtomicTypeCodes keysDo: [:typeName | (AtomicTypes includesKey: typeName) ifFalse: [ self newTypeForAtomicNamed: typeName]]. "Remove discarded types." AtomicTypes keys do: [:typeName | (AtomicTypeCodes includesKey: typeName) ifFalse: [ + AtomicTypes removeKey: typeName]]. + + "Migrate older instances." + AtomicTypes keysAndValuesDo: [:typeName :type | + type setAtomicTypeName: typeName]! - AtomicTypes removeKey: typeName]].!

1 0

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

18 Aug '21

Marcel Taeumel uploaded a new version of FFI-Kernel to project FFI: http://source.squeak.org/FFI/FFI-Kernel-mt.210.mcz ==================== Summary ==================== Name: FFI-Kernel-mt.210 Author: mt Time: 18 August 2021, 10:08:19.325508 am UUID: 694f587f-daa5-8e40-9b51-b8b7037f72e5 Ancestors: FFI-Kernel-mt.209 Fixes a regresion with type invalidation, which is an issue when updating existing FFI setup. More robust re-initialization of existing atomic types. Now supports renaming and add/remove using the AtomicTypeCodes table. =============== Diff against FFI-Kernel-mt.209 =============== Item was changed: ----- Method: ExternalType class>>basicInitializeAtomicTypes (in category 'class initialization') ----- basicInitializeAtomicTypes + "Strong references required because there is no lazy initialization like there is for struct types and array types." + AtomicTypes ifNil: [AtomicTypes := Dictionary new]. + + "Add new atomic types using the current configuration of AtomicTypeCodes." + AtomicTypeCodes keysDo: [:typeName | + (AtomicTypes includesKey: typeName) ifFalse: [ + self newTypeForAtomicNamed: typeName]]. + + "Remove discarded types." + AtomicTypes keys do: [:typeName | + (AtomicTypeCodes includesKey: typeName) ifFalse: [ + AtomicTypes removeKey: typeName]].! - 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." - self atomicTypeNames do: [:typeName | - self newTypeForAtomicNamed: typeName]].! Item was changed: ----- Method: ExternalType class>>initializeAtomicTypeCodes (in category 'class initialization') ----- initializeAtomicTypeCodes "ExternalType initializeAtomicTypeCodes" AtomicTypeCodes := OrderedDictionary newFrom: { #'void' -> FFITypeVoid. #'bool' -> FFITypeBool. #'uint8_t' -> FFITypeUnsignedInt8. #'int8_t' -> FFITypeSignedInt8. #'uint16_t' -> FFITypeUnsignedInt16. #'int16_t' -> FFITypeSignedInt16. #'uint32_t' -> FFITypeUnsignedInt32. #'int32_t' -> FFITypeSignedInt32. #'uint64_t' -> FFITypeUnsignedInt64. #'int64_t' -> FFITypeSignedInt64. #'uchar8_t' -> FFITypeUnsignedChar8. #'char8_t' -> FFITypeSignedChar8. #'uchar16_t' -> FFITypeUnsignedChar16. #'char16_t' -> FFITypeSignedChar16. #'uchar32_t' -> FFITypeUnsignedChar32. #'char32_t' -> FFITypeSignedChar32. #'float' -> FFITypeSingleFloat. #'double' -> FFITypeDoubleFloat}. + "We must now update the names of all known atomic types." + AtomicTypes ifNotNil: [ + AtomicTypes keys do: [:oldName | + | type newName | + type := AtomicTypes at: oldName. + newName := AtomicTypeCodes keyAtValue: type atomicType. + (AtomicTypes includesKey: newName) ifFalse: [ + "Only store new names. Do not support name swap." + AtomicTypes removeKey: oldName. + AtomicTypes at: newName put: type. + type setAtomicTypeName: newName]]].! - "We must now reset all atomic types because their names might have changed." - AtomicTypes := nil.! 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." self basicInitializeStructureTypes. self invalidateStructureTypes. "1) Initialize all array types that have an atomic-or-pointer type as their content type." + self allArrayTypesDo: [:arrayType | - self arrayTypesDo: [:arrayType | (arrayType contentType isAtomic or: [arrayType contentType isPointerType]) ifTrue: [ arrayType newContentType: arrayType contentType]]. "2) Trigger #noticeModificationOf: callback to actually initialize all structure types." ExternalStructure defineAllFields. "Finally do some garbage collection." self cleanupUnusedTypes.! Item was changed: ----- Method: ExternalType class>>invalidateStructureTypes (in category 'class initialization') ----- invalidateStructureTypes + self allStructTypesDo:[:structType | - self structTypesDo:[:structType | structType "asNonPointerType" invalidate. structType asPointerType invalidate]. + self allArrayTypesDo: [:arrayType | - self arrayTypesDo: [:arrayType | arrayType "asNonPointerType" invalidate. arrayType asPointerType invalidate].!

1 0

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

18 Aug '21

Marcel Taeumel uploaded a new version of FFI-Pools to project FFI: http://source.squeak.org/FFI/FFI-Pools-mt.35.mcz ==================== Summary ==================== Name: FFI-Pools-mt.35 Author: mt Time: 18 August 2021, 9:11:12.928508 am UUID: 1b731622-da56-494b-830c-74b78669ab4f Ancestors: FFI-Pools-mt.34 Make sure to initialize the renamed type-code constants correctly when updating from a prior FFI version. =============== Diff against FFI-Pools-mt.34 =============== Item was changed: + (PackageInfo named: 'FFI-Pools') postscript: 'Smalltalk removeFromStartUpList: ExternalPool. + FFIConstants initializeTypeConstants. "Renamed."'! - (PackageInfo named: 'FFI-Pools') postscript: 'Smalltalk removeFromStartUpList: ExternalPool.'!

1 0

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

18 Aug '21

Marcel Taeumel uploaded a new version of FFI-Kernel to project FFI: http://source.squeak.org/FFI/FFI-Kernel-mt.209.mcz ==================== Summary ==================== Name: FFI-Kernel-mt.209 Author: mt Time: 18 August 2021, 8:53:45.010508 am UUID: d7ef9c5c-b86d-4f49-8e54-9d94b0a47564 Ancestors: FFI-Kernel-mt.208 Fixes recent regression about updating FFI from before FFI-Kernel-mt.208. =============== Diff against FFI-Kernel-mt.208 =============== Item was changed: ----- Method: ExternalType class>>initializeAtomicTypeCodes (in category 'class initialization') ----- initializeAtomicTypeCodes "ExternalType initializeAtomicTypeCodes" AtomicTypeCodes := OrderedDictionary newFrom: { #'void' -> FFITypeVoid. #'bool' -> FFITypeBool. #'uint8_t' -> FFITypeUnsignedInt8. #'int8_t' -> FFITypeSignedInt8. #'uint16_t' -> FFITypeUnsignedInt16. #'int16_t' -> FFITypeSignedInt16. #'uint32_t' -> FFITypeUnsignedInt32. #'int32_t' -> FFITypeSignedInt32. #'uint64_t' -> FFITypeUnsignedInt64. #'int64_t' -> FFITypeSignedInt64. #'uchar8_t' -> FFITypeUnsignedChar8. #'char8_t' -> FFITypeSignedChar8. #'uchar16_t' -> FFITypeUnsignedChar16. #'char16_t' -> FFITypeSignedChar16. #'uchar32_t' -> FFITypeUnsignedChar32. #'char32_t' -> FFITypeSignedChar32. #'float' -> FFITypeSingleFloat. + #'double' -> FFITypeDoubleFloat}. + + "We must now reset all atomic types because their names might have changed." + AtomicTypes := nil.! - #'double' -> FFITypeDoubleFloat - }.!

1 0

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

17 Aug '21

Marcel Taeumel uploaded a new version of FFI-Tests to project FFI: http://source.squeak.org/FFI/FFI-Tests-mt.61.mcz ==================== Summary ==================== Name: FFI-Tests-mt.61 Author: mt Time: 17 August 2021, 12:30:22.330505 pm UUID: d92ebf12-e21a-1646-b151-10aa59cfc878 Ancestors: FFI-Tests-mt.60 Complements FFI-Kernel-mt.208 =============== Diff against FFI-Tests-mt.60 =============== Item was changed: ----- Method: ExternalTypeTests>>testAllArrayTypes (in category 'tests - image') ----- testAllArrayTypes + ExternalType allArrayTypes do: [:type | - ExternalType arrayTypes do: [:type | self deny: type isAtomic; deny: type isPointerType; deny: type isStructureType; assert: type isArrayType].! Item was changed: ----- Method: ExternalTypeTests>>testAllAtomicTypes (in category 'tests - image') ----- testAllAtomicTypes + ExternalType allAtomicTypes do: [:type | - ExternalType atomicTypes do: [:type | self assert: type isAtomic; deny: type isPointerType; deny: type isStructureType; + deny: type isArrayType].! - deny: type isArrayType; - deny: type isTypeAlias].! Item was changed: ----- Method: ExternalTypeTests>>testAllPointerTypes (in category 'tests - image') ----- testAllPointerTypes + ExternalType allPointerTypes do: [:type | - ExternalType pointerTypes do: [:type | self deny: type isAtomic; assert: type isPointerType; deny: type isStructureType; deny: type isArrayType].! Item was changed: ----- Method: ExternalTypeTests>>testAllStructureTypes (in category 'tests - image') ----- testAllStructureTypes + ExternalType allStructTypes do: [:type | - ExternalType structTypes do: [:type | self deny: type isAtomic; deny: type isPointerType; assert: type isStructureType; deny: type isArrayType].! Item was changed: ----- Method: ExternalTypeTests>>testAtomicTypeRange (in category 'tests - atomic types') ----- testAtomicTypeRange "Tests the range of non-integer and non-float types. Includes char types because those look different in Smalltalk." self should: [ExternalType void minVal] raise: Error. self should: [ExternalType void maxVal] raise: Error. self should: [ExternalType bool minVal] raise: Error. self should: [ExternalType bool maxVal] raise: Error. + self should: [ExternalType char8_t minVal] raise: Error. + self should: [ExternalType char8_t maxVal] raise: Error. - self should: [ExternalType char "unsignedChar" minVal] raise: Error. - self should: [ExternalType char "unsignedChar" maxVal] raise: Error. + self should: [ExternalType uchar8_t minVal] raise: Error. + self should: [ExternalType uchar8_t maxVal] raise: Error. - self should: [ExternalType signedChar "schar" minVal] raise: Error. - self should: [ExternalType signedChar "schar" maxVal] raise: Error. ! Item was changed: ----- Method: ExternalTypeTests>>testFloatTypes (in category 'tests - atomic float types') ----- testFloatTypes #( float 4 double 8 ) pairsDo: [:typeName :byteSize | | type | type := ExternalType typeNamed: typeName. self assert: type isFloatType; + assert: byteSize equals: type byteSize; + assert: type companionType notNil; + assert: type companionType isFloatType].! - assert: byteSize equals: type byteSize].! Item was changed: ----- Method: ExternalTypeTests>>testIntegerTypes (in category 'tests - atomic integer types') ----- testIntegerTypes #( uint8_t 1 int8_t 1 uint16_t 2 int16_t 2 uint32_t 4 int32_t 4 uint64_t 8 int64_t 8 ) pairsDo: [:typeName :byteSize | | type | type := ExternalType typeNamed: typeName. self assert: type isIntegerType; + assert: byteSize equals: type byteSize; + assert: type companionType notNil; + assert: type companionType isIntegerType].! - assert: byteSize equals: type byteSize].! Item was added: + ----- Method: ExternalTypeTests>>testIntegerTypesAsCharTypes (in category 'tests - atomic integer types') ----- + testIntegerTypesAsCharTypes + + #( int8_t int16_t int32_t ) do: [:typeName | + | integerType | + integerType := ExternalType typeNamed: typeName. + self + assert: integerType isSigned; + assert: integerType asCharType isCharType; + assert: integerType byteSize equals: integerType asCharType byteSize; + assert: integerType isSigned equals: integerType asCharType isSigned; + + assert: integerType asUnsigned isUnsigned; + assert: integerType asUnsigned asCharType isCharType; + assert: integerType asUnsigned byteSize equals: integerType asUnsigned asCharType byteSize; + assert: integerType asUnsigned isUnsigned equals: integerType asUnsigned asCharType isUnsigned].! Item was changed: ----- Method: ExternalTypeTests>>testPointerToPointerVsArrayOfPointers (in category 'tests - pointer types') ----- testPointerToPointerVsArrayOfPointers "For visual clarity, the pointer type of an array-of-pointers type will look different from the pointer type of an array-of-atomics/structs. Also see #testPointerToPointer." | arrayType | + arrayType := ExternalType typeNamed: 'int32_t[]'. - arrayType := ExternalType typeNamed: 'char[]'. self + assert: '(int32_t[])*' - assert: '(char[])*' equals: arrayType asPointerType typeName. + arrayType := ExternalType typeNamed: 'int32_t*[]'. - arrayType := ExternalType typeNamed: 'char*[]'. self + assert: '(int32_t*[])*' - assert: '(char*[])*' equals: arrayType asPointerType typeName.! Item was changed: ----- Method: FFIAllocateTests>>test10ArrayClasses (in category 'tests - array') ----- test10ArrayClasses "For integer and float types, allocate arrays and check for specific array classes. Then construct a conventional byte array for an external data structure. A copy should also convert into a specific array class with the same contents." ExternalType useArrayClassesDuring: [ ExternalType atomicTypes do: [:contentType | (contentType isIntegerType or: [contentType isFloatType] + or: [contentType isCharType and: [contentType byteSize ~= 2 "No array class for 16-bit characters yet"]]) ifTrue: [ - or: [contentType isCharType]) ifTrue: [ | array arrayType data copy | array := self allocate: contentType size: 5. arrayType := array externalType. self assert: array isFFIArray. self assert: 5 equals: array size. self assert: array byteSize equals: arrayType byteSize. + contentType isCharType ifFalse: [ - contentType = ExternalType signedChar ifFalse: [ self flag: #discuss. "mt: What is signedChar even for?" self assert: contentType equals: array contentType]. self deny: array isNull. self deny: (array isKindOf: ExternalData). self assert: array equals: array getHandle. self shouldnt: [array at: 1 put: contentType allocate first] raise: Error. self shouldnt: [array zeroMemory] raise: Error. self should: [array setContentType: ExternalType byte] raise: Error. self should: [array setSize: 42] raise: Error. data := ExternalData fromHandle: (ByteArray new: arrayType byteSize) type: arrayType. copy := data copy. "From external data into raw-bits array." self deny: array equals: data. self assert: array equals: copy. ]]].!

1 0

FFI: FFI-Tools-mt.38.mcz
by commits＠source.squeak.org 17 Aug '21

17 Aug '21

Marcel Taeumel uploaded a new version of FFI-Tools to project FFI: http://source.squeak.org/FFI/FFI-Tools-mt.38.mcz ==================== Summary ==================== Name: FFI-Tools-mt.38 Author: mt Time: 17 August 2021, 12:29:49.891505 pm UUID: e69d0fbb-3d6a-1744-afe9-3ec385e7f45b Ancestors: FFI-Tools-mt.37 Complements FFI-Kernel-mt.208 =============== Diff against FFI-Tools-mt.37 =============== Item was changed: ----- Method: ExternalType>>explorerContents (in category '*FFI-Tools') ----- explorerContents | basicExplorerFields | basicExplorerFields := super explorerContents. basicExplorerFields do: [:explorerField | explorerField itemName = 'compiledSpec' ifTrue: [ explorerField changeClassTo: CompiledSpecWrapper]]. (self isTypeAlias or: [self isTypeAliasReferenced]) ifTrue: [ basicExplorerFields := {ObjectExplorerWrapper with: self originalType name: '~>' + model: self}, basicExplorerFields]. - model: self}, basicExplorerFields] - ifFalse: [self isAtomic ifTrue: [ - basicExplorerFields := basicExplorerFields, - {ObjectExplorerWrapper - with: (AtomicSends at: self atomicType + 1) first - name: '_reader' - model: self. - ObjectExplorerWrapper - with: (AtomicSends at: self atomicType + 1) second - name: '_writer' - model: self}]]. ^ basicExplorerFields! Item was changed: ----- Method: ExternalType>>printAtomicType:on: (in category '*FFI-Tools-printing') ----- printAtomicType: spec on: aStream + | atomicType | + atomicType := ExternalAtomicType code: ((spec bitAnd: FFIAtomicTypeMask) bitShift: FFIAtomicTypeShift negated). + - | atomicTypeName atomicType | - atomicTypeName := AtomicTypeNames at: ((spec bitAnd: FFIAtomicTypeMask) bitShift: FFIAtomicTypeShift negated). - atomicType := AtomicTypes at: atomicTypeName. (spec anyMask: FFIFlagPointer) ifTrue: [atomicType := atomicType asPointerType]. aStream nextPutAll: (ExternalPoolReadWriter cTypeNameFor: atomicType). atomicType isPointerType ifFalse: [aStream space].!

1 0

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

17 Aug '21

Marcel Taeumel uploaded a new version of FFI-Kernel to project FFI: http://source.squeak.org/FFI/FFI-Kernel-mt.208.mcz ==================== Summary ==================== Name: FFI-Kernel-mt.208 Author: mt Time: 17 August 2021, 12:29:18.868505 pm UUID: ffad33cd-cc4f-0946-b8c6-6eea0f527dee Ancestors: FFI-Kernel-mt.207 Complements FFI-Pools-mt34. Adds atomic types for 16-bit and 32-bit characters. Note both types are currently just a sketch to further think about how the FFI plugin can help with string encoding à la TextConverter. We might even want to change both types again and find others. In any case, this design sketch is accompanied by other changes that make the evolution of atomic types easier. Here is what changes - Adds char8_t, uchar8_t, char16_t, uchar16_t, char32_t, and uchar32_t to mirror int8_t etc. - The existing 'char' is an alias for 'uchar8_t', which means it is still an unsigned 8-bit char type, as before - Replace #asciiValue with #asInteger in read/write sends for char types - Revamp type initialization; see ExternalType class >> #initialize - Adds #companionType to atomic types to not rely on type codes when switching between signed/unsigned; see #initializeAtomicTypeCompanions - As array classes, use ByteString for uchar8_t and char8_t as well as WideString for uchar32_t and char32_t - Move the rest of the FFI compatibility extensions from ByteString up to String Note that we do not have an array class for 16-bit strings. Whatever this means outside the notion of encoding. =============== Diff against FFI-Kernel-mt.207 =============== Item was changed: ----- Method: ByteArray>>signedCharAt: (in category '*FFI-Kernel-examples') ----- signedCharAt: byteOffset "For documentation and convenient exploration only. Type-safe access to byte arrays or external addresses SHOULD happen via external objects that have a type set such as instances of ExternalStructure and ExternalData." + ^ ExternalType char8_t handle: self at: byteOffset! - ^ ExternalType signedChar handle: self at: byteOffset! Item was changed: ----- Method: ByteArray>>signedCharAt:put: (in category '*FFI-Kernel-examples') ----- signedCharAt: byteOffset put: aCharacter + ^ ExternalType char8_t handle: self at: byteOffset put: aCharacter! - ^ ExternalType signedChar handle: self at: byteOffset put: aCharacter! Item was changed: ----- Method: ByteArray>>unsignedCharAt: (in category '*FFI-Kernel-examples') ----- unsignedCharAt: byteOffset "For documentation and convenient exploration only. Type-safe access to byte arrays or external addresses SHOULD happen via external objects that have a type set such as instances of ExternalStructure and ExternalData." + ^ ExternalType uchar8_t handle: self at: byteOffset! - ^ ExternalType unsignedChar handle: self at: byteOffset! Item was changed: ----- Method: ByteArray>>unsignedCharAt:put: (in category '*FFI-Kernel-examples') ----- unsignedCharAt: byteOffset put: aCharacter "For documentation and convenient exploration only. Type-safe access to byte arrays or external addresses SHOULD happen via external objects that have a type set such as instances of ExternalStructure and ExternalData." + ^ ExternalType uchar8_t handle: self at: byteOffset put: aCharacter! - ^ ExternalType unsignedChar handle: self at: byteOffset put: aCharacter! Item was removed: - ----- Method: ByteString class>>externalType (in category '*FFI-Kernel') ----- - externalType - - ^ self new contentType asArrayType: nil! Item was removed: - ----- Method: ByteString>>atByteOffset: (in category '*FFI-Kernel-accessing') ----- - atByteOffset: byteOffset - - | index | - index := ((byteOffset-1) / self contentType byteSize) + 1. - ^ self at: index! Item was removed: - ----- Method: ByteString>>atByteOffset:put: (in category '*FFI-Kernel-accessing') ----- - atByteOffset: byteOffset put: value - - | index | - index := ((byteOffset-1) / self contentType byteSize) + 1. - ^ self at: index put: value! Item was changed: ----- Method: ByteString>>contentType (in category '*FFI-Kernel-external data') ----- contentType + ^ ExternalType uchar8_t! - ^ ExternalType char! Item was removed: - ----- Method: ByteString>>externalType (in category '*FFI-Kernel-external data') ----- - externalType - - ^ self contentType asArrayType: self size! Item was removed: - ----- Method: ByteString>>free (in category '*FFI-Kernel-external data') ----- - free - - self shouldNotImplement.! Item was removed: - ----- Method: ByteString>>from: (in category '*FFI-Kernel-external data') ----- - from: firstIndex - "See ExternalData" - - ^ self copyFrom: firstIndex to: self size! Item was removed: - ----- Method: ByteString>>from:to: (in category '*FFI-Kernel-external data') ----- - from: firstIndex to: lastIndex - "See ExternalData" - - ^ self copyFrom: firstIndex to: lastIndex! Item was removed: - ----- Method: ByteString>>getHandle (in category '*FFI-Kernel-external data') ----- - getHandle - "I am my own handle." - - ^ self! Item was removed: - ----- Method: ByteString>>integerAt:put:size:signed: (in category '*FFI-Kernel-accessing') ----- - integerAt: byteOffset put: value size: nBytes signed: aBoolean - "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 asCharacter.! Item was removed: - ----- Method: ByteString>>integerAt:size:signed: (in category '*FFI-Kernel-accessing') ----- - integerAt: byteOffset size: nBytes signed: aBoolean - "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 removed: - ----- Method: ByteString>>isFFIArray (in category '*FFI-Kernel-external data') ----- - isFFIArray - - ^ true! Item was removed: - ----- Method: ByteString>>isNull (in category '*FFI-Kernel-external data') ----- - isNull - - ^ false! Item was removed: - ----- Method: ByteString>>reader (in category '*FFI-Kernel-external data') ----- - reader - - ^ self! Item was removed: - ----- Method: ByteString>>setContentType: (in category '*FFI-Kernel-external data') ----- - setContentType: type - "See ExternalData." - - self shouldNotImplement.! Item was removed: - ----- Method: ByteString>>setSize: (in category '*FFI-Kernel-external data') ----- - setSize: size - "See ExternalData." - - self shouldNotImplement.! Item was removed: - ----- Method: ByteString>>writer (in category '*FFI-Kernel-external data') ----- - writer - - ^ self! Item was removed: - ----- Method: ByteString>>zeroMemory (in category '*FFI-Kernel-external data') ----- - zeroMemory - - 1 to: self size do: [:index | - self at: index put: Character null].! Item was changed: ----- Method: CharacterReadWriteSend>>handle:at:put: (in category 'evaluating') ----- handle: handle at: byteOffset put: aCharacter super handle: handle at: byteOffset + put: aCharacter asInteger. - put: aCharacter asciiValue. ^ aCharacter! Item was changed: ----- Method: CharacterReadWriteSend>>template (in category 'compiling') ----- template ^ self isReading ifTrue: ['(', super template, ') asCharacter'] + ifFalse: [super template copyReplaceAll: '{3}' with: '{3} asInteger']! - ifFalse: [super template copyReplaceAll: '{3}' with: '{3} asciiValue']! Item was changed: ExternalType subclass: #ExternalAtomicType + instanceVariableNames: 'readSend writeSend atomicTypeName companionType' - instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'FFI-Kernel'! Item was added: + ----- Method: ExternalAtomicType class>>code: (in category 'instance lookup') ----- + code: typeCode + + ^ AtomicTypes at: (AtomicTypeCodes keyAtValue: typeCode)! Item was added: + ----- Method: ExternalAtomicType class>>initializeAtomicTypeCompanions (in category 'class initialization') ----- + initializeAtomicTypeCompanions + + #( + "name companion" + (#'void' nil) + (#'bool' nil) + + (#'uint8_t' #'int8_t') + (#'int8_t' #'uint8_t') + (#'uint16_t' #'int16_t') + (#'int16_t' #'uint16_t') + (#'uint32_t' #'int32_t') + (#'int32_t' #'uint32_t') + (#'uint64_t' #'int64_t') + (#'int64_t' #'uint64_t') + + (#'uchar8_t' #'char8_t') + (#'char8_t' #'uchar8_t') + (#'uchar16_t' #'char16_t') + (#'char16_t' #'uchar16_t') + (#'uchar32_t' #'char32_t') + (#'char32_t' #'uchar32_t') + + (#'float' #'double') + (#'double' #'float') + + ) do:[:spec| | type companion | + type := ExternalType typeNamed: spec first. + companion := spec second ifNotNil: [ExternalType typeNamed: spec second]. + type setCompanionType: companion. + companion ifNotNil: [companion setCompanionType: type]].! Item was added: + ----- Method: ExternalAtomicType class>>initializeAtomicTypes (in category 'class initialization') ----- + initializeAtomicTypes + "Fill all known instances of the receiver with the correct state. See super implementation to learn about the entire initialization process." + + | atomicType byteSize type typeName byteAlignment | + self assert: [AtomicTypes notNil]. + self assert: [AtomicTypes notEmpty]. + + #( + "name byte size byte alignment" + (#'void' 0 0) "No non-pointer support in calls. Duh. ;-)" + (#'bool' 1 1) "No pointer support in calls." + + (#'uint8_t' 1 1) + (#'int8_t' 1 1) + (#'uint16_t' 2 2) + (#'int16_t' 2 2) + (#'uint32_t' 4 4) + (#'int32_t' 4 4) + (#'uint64_t' 8 8) + (#'int64_t' 8 8) + + (#'uchar8_t' 1 1) + (#'char8_t' 1 1) + (#'uchar16_t' 2 2) + (#'char16_t' 2 2) + (#'uchar32_t' 4 4) + (#'char32_t' 4 4) + + (#'float' 4 4) + (#'double' 8 8) + "TODO: ('longdouble' 10 16? 4?)" + ) do:[:typeSpec| | compiled | + typeName := typeSpec first. + byteSize := typeSpec second. + byteAlignment := typeSpec third. + + "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' 'int64_t' 'uint64_t') includes: typeName) ifTrue: [ + byteAlignment := 4]]. + + "1) Regular type; put type code into headerWord" + type := AtomicTypes at: typeName. + atomicType := AtomicTypeCodes 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; put type code into headerWord, too" + 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: ExternalAtomicType class>>newTypeForAtomicNamed: (in category 'instance creation') ----- newTypeForAtomicNamed: atomicTypeName | type pointerType | type := ExternalAtomicType basicNew. pointerType := ExternalPointerType basicNew. type setReferencedType: pointerType. pointerType setReferencedType: type. + type setAtomicTypeName: atomicTypeName. AtomicTypes at: atomicTypeName put: type. ^ type! Item was added: + ----- Method: ExternalAtomicType>>atomicTypeName (in category 'accessing') ----- + atomicTypeName + + ^ atomicTypeName! Item was added: + ----- Method: ExternalAtomicType>>companionType (in category 'accessing') ----- + companionType + "Answer the receivers companion type, which is either the signed or unsigned version of it." + + ^ companionType! Item was changed: ----- Method: ExternalAtomicType>>handle:at: (in category 'external data') ----- handle: handle at: byteOffset ^ referentClass ifNil: [ "Genuine atomics" + readSend - (AtomicSends at: self atomicType + 1) first handle: handle at: byteOffset] ifNotNil: [ "Alias to atomics" referentClass fromHandle: (handle structAt: byteOffset length: self byteSize)]! Item was changed: ----- Method: ExternalAtomicType>>handle:at:put: (in category 'external data') ----- handle: handle at: byteOffset put: value ^ referentClass ifNil: ["genuine atomic" + writeSend - (AtomicSends at: self atomicType + 1) second handle: handle at: byteOffset put: value] ifNotNil: ["type alias" handle structAt: byteOffset put: value getHandle length: self byteSize]! Item was changed: ----- Method: ExternalAtomicType>>handle:atIndex: (in category 'external data') ----- handle: handle atIndex: index "Overwritten to use cached byteSize in atomic sends for performance." referentClass == nil ifTrue: [ + ^ readSend - ^ (AtomicSends at: self atomicType + 1) first handle: handle atIndex: index]. ^ super handle: handle atIndex: index! Item was changed: ----- Method: ExternalAtomicType>>handle:atIndex:put: (in category 'external data') ----- handle: handle atIndex: index put: value "Overwritten to use cached byteSize in atomic sends for performance." referentClass == nil ifTrue: [ + ^ writeSend - ^ (AtomicSends at: self atomicType + 1) second handle: handle atIndex: index put: value]. ^ super handle: handle atIndex: index put: value! Item was added: + ----- Method: ExternalAtomicType>>invalidate (in category 'private') ----- + invalidate + "Do not invalidate my typeName but read/write sends." + + super invalidate. + readSend := nil. + writeSend := nil.! Item was changed: ----- Method: ExternalAtomicType>>newTypeAlias (in category 'private') ----- newTypeAlias - "Only support switching between atomic types for now." self isTypeAlias ifFalse: [^ self]. + self becomeUnknownType becomeKnownType. + " + Might be faster: compiledSpec := referentClass compiledSpec. + byteAlignment := referentClass byteAlignment. + typeName := referentClass name. + readSend := referentClass originalType readSend. + writeSend := referentClass originalType writeSend. + + "! - byteAlignment := referentClass byteAlignment.! Item was changed: ----- Method: ExternalAtomicType>>readFieldAt: (in category 'external structure') ----- readFieldAt: byteOffset ^ referentClass ifNil: [ "Genuine atomics" + '^ ', readSend template - '^ ', (AtomicSends at: self atomicType + 1) first template format: { 'handle'. byteOffset}] ifNotNil: [ "Type alias" '^ {1} fromHandle: (handle structAt: {2} length: {3})' format: { referentClass name. byteOffset. self byteSize}]! Item was added: + ----- Method: ExternalAtomicType>>readSend (in category 'accessing') ----- + readSend + + ^ readSend! Item was added: + ----- Method: ExternalAtomicType>>setAtomicTypeName: (in category 'private') ----- + setAtomicTypeName: aString + + atomicTypeName := aString.! Item was added: + ----- Method: ExternalAtomicType>>setCompanionType: (in category 'private') ----- + setCompanionType: atomicTypeOrNil + + self assert: [atomicTypeOrNil isNil or: [atomicTypeOrNil isAtomic]]. + companionType := atomicTypeOrNil.! Item was added: + ----- Method: ExternalAtomicType>>setReadWriteSends: (in category 'private') ----- + setReadWriteSends: atomicReadWriteSends + + readSend := atomicReadWriteSends first. + writeSend := atomicReadWriteSends second.! Item was changed: ----- Method: ExternalAtomicType>>writeFieldArgName (in category 'external structure') ----- writeFieldArgName + self isTypeAlias ifTrue: [^ super writeFieldArgName]. + + self isBoolType ifTrue: [^ 'aBoolean']. + self isIntegerType ifTrue: [^ 'anInteger']. + self isCharType ifTrue: [^ 'aCharacter']. + self isFloatType ifTrue: [^ 'aFloat']. - self isTypeAlias ifTrue: [ - ^ super writeFieldArgName]. + self error: 'Unknown atomic type'.! - self isIntegerType ifTrue: [ - ^ 'anInteger']. - - ^ self atomicTypeName caseOf: { - ['bool'] -> ['aBoolean']. - ['char'] -> ['aCharacter']. - ['schar'] -> ['aCharacter']. - ['float'] -> ['aFloat']. - ['double'] -> ['aFloat'] }! Item was changed: ----- Method: ExternalAtomicType>>writeFieldAt:with: (in category 'external structure') ----- writeFieldAt: byteOffset with: valueName ^ referentClass ifNil: ["genuine atomics" + writeSend template, '.' - (AtomicSends at: self atomicType + 1) second template, '.' format: { 'handle'. byteOffset. valueName}] ifNotNil: ["type alias" 'handle structAt: {1} put: {2} getHandle length: {3}.' format: { byteOffset. valueName. self byteSize}]! Item was added: + ----- Method: ExternalAtomicType>>writeSend (in category 'accessing') ----- + writeSend + + ^ writeSend! Item was added: + ----- Method: ExternalPointerType>>atomicTypeName (in category 'accessing - atomic') ----- + atomicTypeName + "Implemented because the receiver might be a pointer-to-atomic type." + + ^ self asNonPointerType atomicTypeName! Item was changed: Object subclass: #ExternalType instanceVariableNames: 'compiledSpec referentClass referencedType byteAlignment' + classVariableNames: 'ArrayClasses ArrayTypes AtomicTypeCodes AtomicTypes ExtraTypeChecks StructTypes UseArrayClasses UseTypePool' - classVariableNames: 'ArrayClasses ArrayTypes AtomicSends AtomicTypeNames AtomicTypes ExtraTypeChecks StructTypes UseArrayClasses UseTypePool' poolDictionaries: 'FFIConstants' category: 'FFI-Kernel'! !ExternalType commentStamp: 'mt 6/5/2020 18:25' prior: 0! An external type represents the type of external objects. Instance variables: compiledSpec <WordArray> Compiled specification of the external type referentClass <Behavior | nil> Class type of argument required referencedType <ExternalType> Associated (non)pointer type with the receiver byteAlignment <Integer | nil> The desired alignment for a field of the external type within a structure. If nil it has yet to be computed. Compiled Spec: The compiled spec defines the type in terms which are understood by the VM. Each word is defined as: bits 0...15 - byte size of the entity bit 16 - structure flag (FFIFlagStructure) This flag is set if the following words define a structure bit 17 - pointer flag (FFIFlagPointer) This flag is set if the entity represents a pointer to another object bit 18 - atomic flag (FFIFlagAtomic) This flag is set if the entity represents an atomic type. If the flag is set the atomic type bits are valid. bits 19...23 - unused bits 24...27 - atomic type (FFITypeVoid ... FFITypeDoubleFloat) bits 28...31 - unused Note that all combinations of the flags FFIFlagPointer, FFIFlagAtomic, and FFIFlagStructure are invalid, EXCEPT from the following: FFIFlagPointer + FFIFlagAtomic: This defines a pointer to an atomic type (e.g., 'char*', 'int*'). The actual atomic type is represented in the atomic type bits. FFIFlagPointer + FFIFlagStructure: This defines a structure which is a typedef of a pointer type as in typedef void* VoidPointer; typedef Pixmap* PixmapPtr; It requires a byte size of four or eight (e.g. a 32-bit or 64-bit pointer) to work correctly. [Note: Other combinations may be allowed in the future] ! Item was changed: ----- Method: ExternalType class>>atomicTypeNames (in category 'instance list') ----- atomicTypeNames "Answers the names of the currently known atomic types." + ^ AtomicTypeCodes keysInOrder! - ^ AtomicTypeNames asArray! Item was changed: ----- Method: ExternalType class>>atomicTypesDo: (in category 'instance list') ----- atomicTypesDo: block + "Enumerate all atomic types. No alias-to-atomic types." + self atomicTypeNames do: [:typeName | - AtomicTypeNames do: [:typeName | block value: (AtomicTypes at: typeName)]! Item was changed: ----- 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." + self atomicTypeNames do: [:typeName | - AtomicTypeNames valuesDo: [:typeName | self newTypeForAtomicNamed: typeName]].! Item was changed: ----- Method: ExternalType class>>char (in category 'type constants') ----- char + "For convenience. Defaults to unsigned 8-bit character type." - "char defaults to unsigned char" self flag: #discuss. "mt: Shouldn't this rather be signed 8-bit character type?" + ^self uchar8_t! - ^self unsignedChar! Item was added: + ----- Method: ExternalType class>>char16_t (in category 'type constants - stdint.h') ----- + char16_t + + ^ AtomicTypes at: 'char16_t'! Item was added: + ----- Method: ExternalType class>>char32_t (in category 'type constants - stdint.h') ----- + char32_t + + ^ AtomicTypes at: 'char32_t'! Item was added: + ----- Method: ExternalType class>>char8_t (in category 'type constants - stdint.h') ----- + char8_t + + ^ AtomicTypes at: 'char8_t'! Item was changed: ----- Method: ExternalType class>>initialize (in category 'class initialization') ----- initialize " ExternalType initialize " + self initializeAtomicTypeCodes. - self initializeAtomicTypeNames. - self initializeAtomicTypes. - self initializeAtomicSends. self initializeStructureTypes. self initializeArrayClasses.! Item was changed: ----- Method: ExternalType class>>initializeArrayClasses (in category 'class initialization') ----- initializeArrayClasses " ExternalType initializeArrayClasses. " ArrayClasses ifNil: [ ArrayClasses := IdentityDictionary new]. RawBitsArray allSubclasses collect: [:arrayClass | [ArrayClasses at: arrayClass new contentType ifAbsentPut: arrayClass] on: Error do: [ "Ignore." ]]. + String allSubclasses collect: [:stringClass | | contentType | + [ contentType := stringClass new contentType. + ArrayClasses at: contentType asUnsigned ifAbsentPut: stringClass. + ArrayClasses at: contentType asSigned ifAbsentPut: stringClass ] + on: Error do: [ "Ignore."]].! - ArrayClasses at: ExternalType unsignedChar put: ByteString. - ArrayClasses at: ExternalType signedChar put: ByteString. ! Item was changed: ----- Method: ExternalType class>>initializeAtomicSends (in category 'class initialization') ----- initializeAtomicSends " ExternalType initializeAtomicSends. " + self atomicTypesDo: [:type | + type setReadWriteSends: (FFIAtomicReadWriteSend fromType: type)].! - AtomicSends ifNil: [ - AtomicSends := Array new: AtomicTypeNames size]. - - self atomicTypes withIndexDo: [:type :index | - AtomicSends at: index put: (FFIAtomicReadWriteSend fromType: type)].! Item was added: + ----- Method: ExternalType class>>initializeAtomicTypeCodes (in category 'class initialization') ----- + initializeAtomicTypeCodes + "ExternalType initializeAtomicTypeCodes" + + AtomicTypeCodes := OrderedDictionary newFrom: { + #'void' -> FFITypeVoid. + #'bool' -> FFITypeBool. + + #'uint8_t' -> FFITypeUnsignedInt8. + #'int8_t' -> FFITypeSignedInt8. + #'uint16_t' -> FFITypeUnsignedInt16. + #'int16_t' -> FFITypeSignedInt16. + #'uint32_t' -> FFITypeUnsignedInt32. + #'int32_t' -> FFITypeSignedInt32. + #'uint64_t' -> FFITypeUnsignedInt64. + #'int64_t' -> FFITypeSignedInt64. + + #'uchar8_t' -> FFITypeUnsignedChar8. + #'char8_t' -> FFITypeSignedChar8. + #'uchar16_t' -> FFITypeUnsignedChar16. + #'char16_t' -> FFITypeSignedChar16. + #'uchar32_t' -> FFITypeUnsignedChar32. + #'char32_t' -> FFITypeSignedChar32. + + #'float' -> FFITypeSingleFloat. + #'double' -> FFITypeDoubleFloat + }.! Item was removed: - ----- Method: ExternalType class>>initializeAtomicTypeNames (in category 'class initialization') ----- - initializeAtomicTypeNames - "ExternalType initialize" - - AtomicTypeNames := IdentityDictionary newFrom: { - FFITypeVoid -> #'void'. - FFITypeBool -> #'bool'. - - FFITypeUnsignedInt8 -> #'uint8_t'. - FFITypeSignedInt8 -> #'int8_t'. - FFITypeUnsignedInt16 -> #'uint16_t'. - FFITypeSignedInt16 -> #'int16_t'. - FFITypeUnsignedInt32 -> #'uint32_t'. - FFITypeSignedInt32 -> #'int32_t'. - FFITypeUnsignedInt64 -> #'uint64_t'. - FFITypeSignedInt64 -> #'int64_t'. - - FFITypeUnsignedChar -> #'char'. - FFITypeSignedChar -> #'schar'. - - FFITypeSingleFloat -> #'float'. - FFITypeDoubleFloat -> #'double' - }.! 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. Needs atomic-type codes to be initialized already." + + self assert: [AtomicTypeCodes notNil]. + self assert: [AtomicTypeCodes notEmpty]. - "(Re-)initialize all atomic types. Preserves object identity of all involved types. If the amount of types changed, use #resetAllAtomicTypes instead." - | atomicType byteSize type typeName byteAlignment | self basicInitializeAtomicTypes. self invalidateAtomicTypes. + ExternalAtomicType initializeAtomicTypes. + ExternalAtomicType initializeAtomicTypeCompanions. + + self initializeAtomicSends.! - #( - "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." - (#'uint8_t' 2 1 1) - (#'int8_t' 3 1 1) - (#'uint16_t' 4 2 2) - (#'int16_t' 5 2 2) - (#'uint32_t' 6 4 4) - (#'int32_t' 7 4 4) - (#'uint64_t' 8 8 8) "v.i." - (#'int64_t' 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. - self assert: [(AtomicTypeNames keyAtValue: typeName) = atomicType]. - - 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' 'int64_t' 'uint64_t') 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>>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." + "0) For a different FFI plugin version, type-codes might have changed." + lastPlatform pluginVersion ~= currentPlatform pluginVersion ifTrue: [ + FFIConstants initialize. + self initializeAtomicTypeCodes]. + "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?!!" lastPlatform wordSize ~= currentPlatform wordSize ifTrue: [self recompileAllLibraryFunctions].! Item was changed: ----- Method: ExternalType class>>resetAllAtomicTypes (in category 'housekeeping') ----- resetAllAtomicTypes "Warning: This call is only required if you change the initialization for AtomicTypes." + AtomicTypeCodes := nil. + self initializeAtomicTypeCodes. - AtomicTypeNames := nil. - self initializeAtomicTypeNames. AtomicTypes := nil. self initializeAtomicTypes. - - AtomicSends := nil. - self initializeAtomicSends. "Now also reset everything that depends on atomic types." self resetAllStructureTypes.! Item was changed: ----- Method: ExternalType class>>schar (in category 'type constants') ----- schar + + self flag: #deprecated. + ^ self char8_t! - ^self signedChar! Item was changed: ----- Method: ExternalType class>>signedChar (in category 'type constants') ----- signedChar + + self flag: #deprecated. + ^ self char8_t! - ^AtomicTypes at: 'schar'! Item was changed: ----- Method: ExternalType class>>structTypesDo: (in category 'instance list') ----- structTypesDo: block "Enumerate all struct types. Includes types for packed structs and unions." + StructTypes do: [:each | (each notNil and: [each isStructureType and: [each isTypeAlias not]]) - StructTypes do: [:each | (each notNil and: [each isStructureType]) ifTrue: [block value: each]]! Item was added: + ----- Method: ExternalType class>>uchar16_t (in category 'type constants - stdint.h') ----- + uchar16_t + + ^ AtomicTypes at: 'uchar16_t'! Item was added: + ----- Method: ExternalType class>>uchar32_t (in category 'type constants - stdint.h') ----- + uchar32_t + + ^ AtomicTypes at: 'uchar32_t'! Item was added: + ----- Method: ExternalType class>>uchar8_t (in category 'type constants - stdint.h') ----- + uchar8_t + + ^ AtomicTypes at: 'uchar8_t'! Item was changed: ----- Method: ExternalType class>>unsignedChar (in category 'type constants') ----- unsignedChar + + self flag: #deprecated. + ^self uchar8_t! - ^AtomicTypes at: 'char'! Item was added: + ----- Method: ExternalType class>>wchar_t (in category 'type constants - extra') ----- + wchar_t + "Type for wide characters. Name originates from wchar.h" + + ^ self uchar32_t! Item was added: + ----- Method: ExternalType>>asCharType (in category 'converting - integer / char') ----- + asCharType + "When the receiver is an integer type, answer the corresponding character type." + + self isCharType ifTrue: [^ self]. + self isIntegerType ifFalse: [^ self error: 'Cannot convert non-integer type to char type']. + + self byteSize = 1 ifTrue: [^ self isSigned ifTrue: [self class char8_t] ifFalse: [self class uchar8_t]]. + self byteSize = 2 ifTrue: [^ self isSigned ifTrue: [self class char16_t] ifFalse: [self class uchar16_t]]. + self byteSize = 4 ifTrue: [^ self isSigned ifTrue: [self class char32_t] ifFalse: [self class uchar32_t]]. + + self error: 'Cannot convert integer to char type; unsupported byteSize'.! Item was changed: + ----- Method: ExternalType>>asDoublePrecision (in category 'converting - float') ----- - ----- Method: ExternalType>>asDoublePrecision (in category 'converting - integer') ----- asDoublePrecision + ^ self isDoublePrecision + ifTrue: [self] + ifFalse: [self companionType]! - self isDoublePrecision ifTrue: [^ self]. - ^ AtomicTypes at: (AtomicTypeNames at: self atomicType + 1)! Item was added: + ----- Method: ExternalType>>asIntegerType (in category 'converting - integer / char') ----- + asIntegerType + "When the receiver is a character type, answer the corresponding integer type." + + self isIntegerType ifTrue: [^ self]. + self isCharType ifFalse: [^ self error: 'Cannot convert non-char type to integer type']. + + self byteSize = 1 ifTrue: [^ self isSigned ifTrue: [self class int8_t] ifFalse: [self class uint8_t]]. + self byteSize = 2 ifTrue: [^ self isSigned ifTrue: [self class int16_t] ifFalse: [self class uint16_t]]. + self byteSize = 4 ifTrue: [^ self isSigned ifTrue: [self class int32_t] ifFalse: [self class uint32_t]]. + + self error: 'Cannot convert char to integer type; unsupported byteSize'.! Item was changed: + ----- Method: ExternalType>>asSigned (in category 'converting - integer / char') ----- - ----- Method: ExternalType>>asSigned (in category 'converting - integer') ----- asSigned + ^ self isSigned + ifTrue: [self] + ifFalse: [self companionType]! - self isSigned ifTrue: [^ self]. - ^ AtomicTypes at: (AtomicTypeNames at: self atomicType + 1)! Item was changed: + ----- Method: ExternalType>>asSinglePrecision (in category 'converting - float') ----- - ----- Method: ExternalType>>asSinglePrecision (in category 'converting - integer') ----- asSinglePrecision + ^ self isSinglePrecision + ifTrue: [self] + ifFalse: [self companionType]! - self isSinglePrecision ifTrue: [^ self]. - ^ AtomicTypes at: (AtomicTypeNames at: self atomicType - 1)! Item was changed: + ----- Method: ExternalType>>asUnsigned (in category 'converting - integer / char') ----- - ----- Method: ExternalType>>asUnsigned (in category 'converting - integer') ----- asUnsigned + ^ self isUnsigned + ifTrue: [self] + ifFalse: [self companionType]! - self isUnsigned ifTrue: [^ self]. - ^ AtomicTypes at: (AtomicTypeNames at: self atomicType - 1)! Item was changed: + ----- Method: ExternalType>>atomicType (in category 'accessing - atomic') ----- - ----- Method: ExternalType>>atomicType (in category 'accessing') ----- atomicType + "Type code for atomic types is stored in the headerWord. See AtomicTypeCodes for another lookup table." + ^(self headerWord bitAnd: FFIAtomicTypeMask) >> FFIAtomicTypeShift! Item was changed: + ----- Method: ExternalType>>atomicTypeName (in category 'accessing - atomic') ----- - ----- Method: ExternalType>>atomicTypeName (in category 'accessing') ----- atomicTypeName + + self subclassResponsibility.! - - ^ AtomicTypeNames at: self atomicType! Item was changed: ----- Method: ExternalType>>checkIntegerType (in category 'private') ----- checkIntegerType + (self isIntegerType or: [self isCharType]) - self isIntegerType ifFalse: [self error: 'Test is only defined on integer types!!'].! Item was added: + ----- Method: ExternalType>>companionType (in category 'accessing - atomic') ----- + companionType + + self subclassResponsibility.! Item was changed: + ----- Method: ExternalType>>isCharType (in category 'testing - integer / char') ----- - ----- Method: ExternalType>>isCharType (in category 'testing - special') ----- isCharType | type | type := self atomicType. + ^ type >= FFITypeUnsignedChar8 and: [type <= FFITypeSignedChar32]! - ^ type = FFITypeUnsignedChar or: [type = FFITypeSignedChar]! Item was changed: + ----- Method: ExternalType>>isIntegerType (in category 'testing - integer / char') ----- - ----- Method: ExternalType>>isIntegerType (in category 'testing - integer') ----- isIntegerType "Return true if the receiver is a built-in integer type" | type | type := self atomicType. ^type >= FFITypeUnsignedInt8 and:[type <= FFITypeSignedInt64]! Item was changed: + ----- Method: ExternalType>>isSigned (in category 'testing - integer / char') ----- - ----- Method: ExternalType>>isSigned (in category 'testing - integer') ----- isSigned "Return true if the receiver is a signed integer type." self checkIntegerType. ^self atomicType anyMask: 1! Item was changed: ----- Method: ExternalType>>isStringType (in category 'testing - special') ----- isStringType + ^ self isCharType and: [self isPointerType]! - | type | - type := self atomicType. - ^ type = FFITypeUnsignedChar and: [self isPointerType]! Item was changed: + ----- Method: ExternalType>>isUnsigned (in category 'testing - integer / char') ----- - ----- Method: ExternalType>>isUnsigned (in category 'testing - integer') ----- isUnsigned "Return true if the receiver is an unsigned integer type." ^ self isSigned not! Item was changed: + ----- Method: ExternalType>>maxVal (in category 'accessing - atomic') ----- - ----- Method: ExternalType>>maxVal (in category 'accessing') ----- maxVal "Force ByteArray. Do not use #allocate:." | data bytes | bytes := ByteArray new: self byteSize. data := ExternalData fromHandle: bytes type: self size: 1. self isIntegerType ifTrue: [ self isSigned ifTrue: [ bytes atAllPut: 16rFF. FFIPlatformDescription current endianness = #little ifTrue: [bytes at: bytes size put: 16r7F] ifFalse: [bytes at: 1 put: 16r7F]. ^ data value]. self isUnsigned ifTrue: [ bytes atAllPut: 16rFF. ^ data value]]. self isFloatType ifTrue: [ bytes atAllPut: 16rFF. self isSinglePrecision ifTrue: [ FFIPlatformDescription current endianness = #little ifTrue: [ bytes at: bytes size put: 16r7F. bytes at: bytes size - 1 put: 16r7F] ifFalse: [ bytes at: 1 put: 16r7F. bytes at: 2 put: 16r7F]. ^ data value]. self isDoublePrecision ifTrue: [ FFIPlatformDescription current endianness = #little ifTrue: [ bytes at: bytes size put: 16r7F. bytes at: bytes size - 1 put: 16rEF] ifFalse: [ bytes at: 1 put: 16r7F. bytes at: 2 put: 16rEF]. ^ data value]]. self error: 'maxVal not defined for this type'.! Item was changed: + ----- Method: ExternalType>>minVal (in category 'accessing - atomic') ----- - ----- Method: ExternalType>>minVal (in category 'accessing') ----- minVal "Force ByteArray. Do not use #allocate:." | data bytes | bytes := ByteArray new: self byteSize. data := ExternalData fromHandle: bytes type: self size: 1. self isIntegerType ifTrue: [ self isSigned ifTrue: [ FFIPlatformDescription current endianness = #little ifTrue: [bytes at: bytes size put: 1 << 7] ifFalse: [bytes at: 1 put: 1 << 7]. ^ data value]. self isUnsigned ifTrue: [ ^ data value]]. self isFloatType ifTrue: [ bytes atAllPut: 16rFF. self isSinglePrecision ifTrue: [ FFIPlatformDescription current endianness = #little ifTrue: [bytes at: bytes size - 1 put: 16r7F] ifFalse: [bytes at: 2 put: 16r7F]. ^ data value]. self isDoublePrecision ifTrue: [ FFIPlatformDescription current endianness = #little ifTrue: [bytes at: bytes size - 1 put: 16rEF] ifFalse: [bytes at: 2 put: 16rEF]. ^ data value]]. self error: 'minVal not defined for this type'.! Item was changed: ----- Method: ExternalUnknownType>>becomeAtomicType (in category 'construction') ----- becomeAtomicType + ^ self + becomeKnownTypeClass: ExternalAtomicType + with: [:atomicType | + atomicType + setAtomicTypeName: referentClass originalType atomicTypeName; + setReadWriteSends: { referentClass originalType readSend. referentClass originalType writeSend }]! - self changeClassTo: ExternalAtomicType.! Item was changed: ----- Method: GenericCharacterReadWriteSend class>>fromType: (in category 'instance creation') ----- + fromType: charType - fromType: type + ^ super fromType: charType asIntegerType! - ^ super fromType: ExternalType byte! Item was changed: ----- Method: GenericCharacterReadWriteSend>>handle:at:put: (in category 'evaluating') ----- handle: handle at: byteOffset put: aCharacter super handle: handle at: byteOffset + put: aCharacter asInteger. - put: aCharacter asciiValue. ^ aCharacter! Item was changed: ----- Method: GenericCharacterReadWriteSend>>template (in category 'compiling') ----- template ^ self isReading ifTrue: ['(', super template, ') asCharacter'] + ifFalse: [super template copyReplaceAll: '{3}' with: '{3} asInteger']! - ifFalse: [super template copyReplaceAll: '{3}' with: '{3} asciiValue']! Item was added: + ----- Method: String class>>externalType (in category '*FFI-Kernel') ----- + externalType + + ^ self new contentType asArrayType: nil! Item was added: + ----- Method: String>>atByteOffset: (in category '*FFI-Kernel-accessing') ----- + atByteOffset: byteOffset + + | index | + index := ((byteOffset-1) / self contentType byteSize) + 1. + ^ self at: index! Item was added: + ----- Method: String>>atByteOffset:put: (in category '*FFI-Kernel-accessing') ----- + atByteOffset: byteOffset put: value + + | index | + index := ((byteOffset-1) / self contentType byteSize) + 1. + ^ self at: index put: value! Item was added: + ----- Method: String>>contentType (in category '*FFI-Kernel-external data') ----- + contentType + + self subclassResponsibility.! Item was added: + ----- Method: String>>externalType (in category '*FFI-Kernel-external data') ----- + externalType + + ^ self contentType asArrayType: self size! Item was added: + ----- Method: String>>free (in category '*FFI-Kernel-external data') ----- + free + + self shouldNotImplement.! Item was added: + ----- Method: String>>from: (in category '*FFI-Kernel-external data') ----- + from: firstIndex + "See ExternalData" + + ^ self copyFrom: firstIndex to: self size! Item was added: + ----- Method: String>>from:to: (in category '*FFI-Kernel-external data') ----- + from: firstIndex to: lastIndex + "See ExternalData" + + ^ self copyFrom: firstIndex to: lastIndex! Item was added: + ----- Method: String>>getHandle (in category '*FFI-Kernel-external data') ----- + getHandle + "I am my own handle." + + ^ self! Item was added: + ----- Method: String>>integerAt:put:size:signed: (in category '*FFI-Kernel-accessing') ----- + integerAt: byteOffset put: value size: nBytes signed: aBoolean + "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 asCharacter.! Item was added: + ----- Method: String>>integerAt:size:signed: (in category '*FFI-Kernel-accessing') ----- + integerAt: byteOffset size: nBytes signed: aBoolean + "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: String>>isFFIArray (in category '*FFI-Kernel-external data') ----- + isFFIArray + + ^ true! Item was added: + ----- Method: String>>isNull (in category '*FFI-Kernel-external data') ----- + isNull + + ^ false! Item was added: + ----- Method: String>>reader (in category '*FFI-Kernel-external data') ----- + reader + + ^ self! Item was added: + ----- Method: String>>setContentType: (in category '*FFI-Kernel-external data') ----- + setContentType: type + "See ExternalData." + + self shouldNotImplement.! Item was added: + ----- Method: String>>setSize: (in category '*FFI-Kernel-external data') ----- + setSize: size + "See ExternalData." + + self shouldNotImplement.! Item was added: + ----- Method: String>>writer (in category '*FFI-Kernel-external data') ----- + writer + + ^ self! Item was added: + ----- Method: String>>zeroMemory (in category '*FFI-Kernel-external data') ----- + zeroMemory + + 1 to: self size do: [:index | + self at: index put: Character null].! Item was added: + ----- Method: WideString>>contentType (in category '*FFI-Kernel-external data') ----- + contentType + + ^ ExternalType uchar32_t! Item was added: + ----- Method: WideString>>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: WideString>>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 asCharacter! Item was changed: + (PackageInfo named: 'FFI-Kernel') postscript: '"Reinitialize new names and codes for atomic types. Includes new types for 16-bit and 32-bit characters." - (PackageInfo named: 'FFI-Kernel') postscript: '"Reinitialize new names and codes for atomic types." FFIConstants initialize. + ExternalType resetAllTypes..'! - ExternalType resetAllTypes.'!

1 0

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

17 Aug '21

Marcel Taeumel uploaded a new version of FFI-Pools to project FFI: http://source.squeak.org/FFI/FFI-Pools-mt.34.mcz ==================== Summary ==================== Name: FFI-Pools-mt.34 Author: mt Time: 17 August 2021, 12:15:05.644505 pm UUID: d3ca52ac-2ed4-d646-8721-896e19dbaaf2 Ancestors: FFI-Pools-mt.33 First attempt on extending the range of atomic types. By example, add 16-bit and 32-bit character types, which both fall-back to the already existing 8-bit character type for now. Complements the commentary in FFI-Kernel-mt.207 and manifest the current atomic-type codes for plugin v1, sketching a possible extension in v2. Same vor #callingConventions and #errorConstants. Note that the plugin version dictates the upper bound for supported initializers. If no matching initializer can be found, the user will be notified. (Includes updates for ExternalPoolReadWriter to reduce the noise. But please wait for and take a look at complementary commits to FFI-Kernel.) =============== Diff against FFI-Pools-mt.33 =============== Item was changed: ----- Method: ExternalPoolReadWriter class>>initializeAtomicTypesExtra (in category 'class initialization') ----- initializeAtomicTypesExtra "Initialize C type names and format placeholders for printf, which are used during C code generation. The implementation follows the one for initialization of atomic types in ExternalType. Even though all type names are repeated here explicitely, their location in the list of atomic types is looked up dynamically. So you can change the order to improve readability." | type typeName cTypeName cFormatPlaceholder | AtomicCTypeNames := IdentityDictionary new. AtomicCFormatPlaceholders := IdentityDictionary new. #( "name C type name C printf % format" ('void' 'void' 'p') ('bool' 'unsigned int' 'u') "See ByteArray >> #booleanAt:" + ('uint8_t' 'unsigned char' 'hhu') "Not 'c' to avoid conversion issues" ('int8_t' 'signed char' 'hhd') "Not 'c' to avoid conversion issues" ('uint16_t' 'unsigned short' 'hu') ('int16_t' 'signed short' 'hd') ('uint32_t' 'unsigned int' 'u') "Not 'lu' bc. not unsigned long, see above" ('int32_t' 'signed int' 'd') "Not 'ld' bc. not signed long, see above" ('uint64_t' 'unsigned long long' 'llu') ('int64_t' 'signed long long' 'lld') + + ('uchar8_t' 'unsigned char' 'hhu') "Not 'c' to avoid conversion issues" + ('char8_t' 'signed char' 'hhd') "Not 'c' to avoid conversion issues" + ('uchar16_t' 'unsigned short' 'hu') + ('char16_t' 'signed short' 'hd') + ('uchar32_t' 'unsigned int' 'u') "Not 'lu' bc. not unsigned long, see above" + ('char32_t' 'signed int' 'd') "Not 'ld' bc. not signed long, see above" + - ('char' 'unsigned char' 'hhu') "Not 'c' to avoid conversion issues" - ('schar' 'signed char' 'hhd') "Not 'c' to avoid conversion issues" ('float' 'float' 'g') "Not 'G' bc. notation in lowercase letters" ('double' 'double' 'g') "Not 'G' bc. notation in lowercase letters" "TODO: ('longdouble' 'long double' 'Lg')" ) do: [:typeSpec | typeName := typeSpec first. cTypeName := typeSpec second. cFormatPlaceholder := '%', typeSpec third. type := ExternalType atomicTypeNamed: typeName. AtomicCTypeNames at: type atomicType put: cTypeName. AtomicCFormatPlaceholders at: type atomicType put: cFormatPlaceholder].! Item was changed: SharedPool subclass: #FFIConstants instanceVariableNames: '' + classVariableNames: 'FFIAtomicTypeMask FFIAtomicTypeShift FFICallFlagThreaded FFICallTypeApi FFICallTypeCDecl FFICallTypesMask FFIErrorAddressNotFound FFIErrorAttemptToPassVoid FFIErrorBadAddress FFIErrorBadArg FFIErrorBadArgs FFIErrorBadAtomicType FFIErrorBadExternalFunction FFIErrorBadExternalLibrary FFIErrorBadReturn FFIErrorCallFrameTooBig FFIErrorCallType FFIErrorCoercionFailed FFIErrorGenericError FFIErrorIntAsPointer FFIErrorInvalidPointer FFIErrorModuleNotFound FFIErrorNoModule FFIErrorNotFunction FFIErrorStructSize FFIErrorWrongType FFIFlagAtomic FFIFlagPointer FFIFlagStructure FFINoCalloutAvailable FFIStructSizeMask FFITypeBool FFITypeDoubleFloat FFITypeSignedChar16 FFITypeSignedChar32 FFITypeSignedChar8 FFITypeSignedInt16 FFITypeSignedInt32 FFITypeSignedInt64 FFITypeSignedInt8 FFITypeSingleFloat FFITypeUnsignedChar16 FFITypeUnsignedChar32 FFITypeUnsignedChar8 FFITypeUnsignedInt16 FFITypeUnsignedInt32 FFITypeUnsignedInt64 FFITypeUnsignedInt8 FFITypeVoid' - classVariableNames: 'FFIAtomicTypeMask FFIAtomicTypeShift FFICallFlagThreaded FFICallTypeApi FFICallTypeCDecl FFICallTypesMask FFIErrorAddressNotFound FFIErrorAttemptToPassVoid FFIErrorBadAddress FFIErrorBadArg FFIErrorBadArgs FFIErrorBadAtomicType FFIErrorBadExternalFunction FFIErrorBadExternalLibrary FFIErrorBadReturn FFIErrorCallFrameTooBig FFIErrorCallType FFIErrorCoercionFailed FFIErrorGenericError FFIErrorIntAsPointer FFIErrorInvalidPointer FFIErrorModuleNotFound FFIErrorNoModule FFIErrorNotFunction FFIErrorStructSize FFIErrorWrongType FFIFlagAtomic FFIFlagPointer FFIFlagStructure FFINoCalloutAvailable FFIStructSizeMask FFITypeBool FFITypeDoubleFloat FFITypeSignedChar FFITypeSignedInt16 FFITypeSignedInt32 FFITypeSignedInt64 FFITypeSignedInt8 FFITypeSingleFloat FFITypeUnsignedChar FFITypeUnsignedInt16 FFITypeUnsignedInt32 FFITypeUnsignedInt64 FFITypeUnsignedInt8 FFITypeVoid' poolDictionaries: '' category: 'FFI-Pools'! !FFIConstants commentStamp: 'TorstenBergmann 4/27/2017 11:02' prior: 0! Constants definitions for FFI! Item was added: + ----- Method: FFIConstants class>>initialize: (in category 'pool initialization') ----- + initialize: aspect + + | prefix currentVersion max pragma | + prefix := ('initialize', aspect capitalized) asSymbol. + currentVersion := self pluginVersion. + max := 0 -> nil. + self class methodsDo: [:method | + ((method selector beginsWith: prefix) and: [(pragma := method pragmaAt: #pluginVersion:) notNil]) + ifTrue: [ + | targetVersion | + targetVersion := pragma argumentAt: 1. + (targetVersion <= currentVersion and: [max key < targetVersion]) + ifTrue: [max := targetVersion -> method]]]. + + max value ifNil: [ + ^ self error: 'No initializer found for: ', aspect]. + max key < currentVersion ifTrue: [ + self notify: 'Current FFI plugin is newer than what the image code supports. Please update your image code to initialize ', aspect, ' correctly']. + + self executeMethod: max value.! Item was changed: + ----- Method: FFIConstants class>>initializeCallingConventions (in category 'pool initialization') ----- - ----- Method: FFIConstants class>>initializeCallingConventions (in category 'private - initialization') ----- initializeCallingConventions + + self initialize: #callingConventions.! - "These constants map onto the flags inst var of an ExternalFunction. - The first eight bits define the calling convention. Attribute flags - occupy bits 8 on up." - "FFIConstants initializeCallingConventions" - FFICallTypesMask := 255. - FFICallTypeCDecl := 0. - FFICallTypeApi := 1. - FFICallFlagThreaded := 256! Item was added: + ----- Method: FFIConstants class>>initializeCallingConventions_v1 (in category 'pool initialization') ----- + initializeCallingConventions_v1 + "These constants map onto the flags inst var of an ExternalFunction. + The first eight bits define the calling convention. Attribute flags + occupy bits 8 on up." + "FFIConstants initializeCallingConventions" + <pluginVersion: 1> + FFICallTypesMask := 255. + FFICallTypeCDecl := 0. + FFICallTypeApi := 1. + FFICallFlagThreaded := 256! Item was changed: + ----- Method: FFIConstants class>>initializeErrorConstants (in category 'pool initialization') ----- - ----- Method: FFIConstants class>>initializeErrorConstants (in category 'private - initialization') ----- initializeErrorConstants - "FFIConstants initializeErrorConstants" + self initialize: #errorConstants.! - "No callout mechanism available" - FFINoCalloutAvailable := -1. - "generic error" - FFIErrorGenericError := 0. - "primitive invoked without ExternalFunction" - FFIErrorNotFunction := 1. - "bad arguments to primitive call" - FFIErrorBadArgs := 2. - - "generic bad argument" - FFIErrorBadArg := 3. - "int passed as pointer" - FFIErrorIntAsPointer := 4. - "bad atomic type (e.g., unknown)" - FFIErrorBadAtomicType := 5. - "argument coercion failed" - FFIErrorCoercionFailed := 6. - "Type check for non-atomic types failed" - FFIErrorWrongType := 7. - "struct size wrong or too large" - FFIErrorStructSize := 8. - "unsupported calling convention" - FFIErrorCallType := 9. - "cannot return the given type" - FFIErrorBadReturn := 10. - "bad function address" - FFIErrorBadAddress := 11. - "no module given but required for finding address" - FFIErrorNoModule := 12. - "function address not found" - FFIErrorAddressNotFound := 13. - "attempt to pass 'void' parameter" - FFIErrorAttemptToPassVoid := 14. - "module not found" - FFIErrorModuleNotFound := 15. - "external library invalid" - FFIErrorBadExternalLibrary := 16. - "external function invalid" - FFIErrorBadExternalFunction := 17. - "ExternalAddress points to ST memory (don't you dare to do this!!)" - FFIErrorInvalidPointer := 18. - "Stack frame required more than 16k bytes to pass arguments." - FFIErrorCallFrameTooBig := 19! Item was added: + ----- Method: FFIConstants class>>initializeErrorConstants_v1 (in category 'pool initialization') ----- + initializeErrorConstants_v1 + "FFIConstants initializeErrorConstants" + <pluginVersion: 1> + "No callout mechanism available" + FFINoCalloutAvailable := -1. + "generic error" + FFIErrorGenericError := 0. + "primitive invoked without ExternalFunction" + FFIErrorNotFunction := 1. + "bad arguments to primitive call" + FFIErrorBadArgs := 2. + + "generic bad argument" + FFIErrorBadArg := 3. + "int passed as pointer" + FFIErrorIntAsPointer := 4. + "bad atomic type (e.g., unknown)" + FFIErrorBadAtomicType := 5. + "argument coercion failed" + FFIErrorCoercionFailed := 6. + "Type check for non-atomic types failed" + FFIErrorWrongType := 7. + "struct size wrong or too large" + FFIErrorStructSize := 8. + "unsupported calling convention" + FFIErrorCallType := 9. + "cannot return the given type" + FFIErrorBadReturn := 10. + "bad function address" + FFIErrorBadAddress := 11. + "no module given but required for finding address" + FFIErrorNoModule := 12. + "function address not found" + FFIErrorAddressNotFound := 13. + "attempt to pass 'void' parameter" + FFIErrorAttemptToPassVoid := 14. + "module not found" + FFIErrorModuleNotFound := 15. + "external library invalid" + FFIErrorBadExternalLibrary := 16. + "external function invalid" + FFIErrorBadExternalFunction := 17. + "ExternalAddress points to ST memory (don't you dare to do this!!)" + FFIErrorInvalidPointer := 18. + "Stack frame required more than 16k bytes to pass arguments." + FFIErrorCallFrameTooBig := 19! Item was changed: + ----- Method: FFIConstants class>>initializeTypeConstants (in category 'pool initialization') ----- - ----- Method: FFIConstants class>>initializeTypeConstants (in category 'private - initialization') ----- initializeTypeConstants - "type void" - FFITypeVoid := 0. + self initialize: #typeConstants.! - "type bool" - FFITypeBool := 1. - - "basic integer types. - note: (integerType anyMask: 1) = integerType isSigned" - - FFITypeUnsignedInt8 := 2. - FFITypeSignedInt8 := 3. - FFITypeUnsignedInt16 := 4. - FFITypeSignedInt16 := 5. - FFITypeUnsignedInt32 := 6. - FFITypeSignedInt32 := 7. - FFITypeUnsignedInt64 := 8. - FFITypeSignedInt64 := 9. - - "special integer types" - FFITypeUnsignedChar := 10. - FFITypeSignedChar := 11. - - "float types" - FFITypeSingleFloat := 12. - FFITypeDoubleFloat := 13. - - "type flags" - FFIFlagAtomic := 16r40000. "type is atomic" - FFIFlagPointer := 16r20000. "type is pointer to base type" - FFIFlagStructure := 16r10000. "baseType is structure of 64k length" - FFIStructSizeMask := 16rFFFF. "mask for max size of structure" - FFIAtomicTypeMask := 16r0F000000. "mask for atomic type spec" - FFIAtomicTypeShift := 24. "shift for atomic type" - ! Item was added: + ----- Method: FFIConstants class>>initializeTypeConstants_v1 (in category 'pool initialization') ----- + initializeTypeConstants_v1 + <pluginVersion: 1> + + "type void" + FFITypeVoid := 0. + + "type bool" + FFITypeBool := 1. + + "basic integer types. + note: (integerType anyMask: 1) = integerType isSigned" + + FFITypeUnsignedInt8 := 2. + FFITypeSignedInt8 := 3. + FFITypeUnsignedInt16 := 4. + FFITypeSignedInt16 := 5. + FFITypeUnsignedInt32 := 6. + FFITypeSignedInt32 := 7. + FFITypeUnsignedInt64 := 8. + FFITypeSignedInt64 := 9. + + "special integer types" + FFITypeUnsignedChar8 := 10. + FFITypeSignedChar8 := 11. + FFITypeUnsignedChar16 := 10. "v1 is for backwards compatibility" + FFITypeSignedChar16 := 11. "v1 is for backwards compatibility" + FFITypeUnsignedChar32 := 10. "v1 is for backwards compatibility" + FFITypeSignedChar32 := 11. "v1 is for backwards compatibility" + + "float types" + FFITypeSingleFloat := 12. + FFITypeDoubleFloat := 13. + + "type flags" + FFIFlagAtomic := 16r40000. "type is atomic" + FFIFlagPointer := 16r20000. "type is pointer to base type" + FFIFlagStructure := 16r10000. "baseType is structure of 64k length" + FFIStructSizeMask := 16rFFFF. "mask for max size of structure" + FFIAtomicTypeMask := 16r0F000000. "mask for atomic type spec" + FFIAtomicTypeShift := 24. "shift for atomic type" + ! Item was added: + ----- Method: FFIConstants class>>initializeTypeConstants_v2 (in category 'pool initialization') ----- + initializeTypeConstants_v2 + <pluginVersion: 2> + + self halt. "Not fully specified and still to be discussed." + + "type void" + FFITypeVoid := 0. + + "type bool" + FFITypeBool := 1. + + "basic integer types. + note: (integerType anyMask: 1) = integerType isSigned" + + FFITypeUnsignedInt8 := 2. + FFITypeSignedInt8 := 3. + FFITypeUnsignedInt16 := 4. + FFITypeSignedInt16 := 5. + FFITypeUnsignedInt32 := 6. + FFITypeSignedInt32 := 7. + FFITypeUnsignedInt64 := 8. + FFITypeSignedInt64 := 9. + + "special integer types" + FFITypeUnsignedChar8 := 10. + FFITypeSignedChar8 := 11. + FFITypeUnsignedChar16 := 12. + FFITypeSignedChar16 := 13. + FFITypeUnsignedChar32 := 14. + FFITypeSignedChar32 := 15. + + "float types" + FFITypeSingleFloat := 16. + FFITypeDoubleFloat := 17. + + "type flags" + FFIFlagAtomic := 16r40000. "type is atomic" + FFIFlagPointer := 16r20000. "type is pointer to base type" + FFIFlagStructure := 16r10000. "baseType is structure of 64k length" + FFIStructSizeMask := 16rFFFF. "mask for max size of structure" + FFIAtomicTypeMask := 16r0F000000. "mask for atomic type spec" + FFIAtomicTypeShift := 24. "shift for atomic type" + ! Item was added: + ----- Method: FFIConstants class>>pluginVersion (in category 'pool initialization') ----- + pluginVersion + "See FFIPlatformDescription." + <primitive: #primitivePluginVersion module: #SqueakFFIPrims> + ^ 1!

1 0

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

17 Aug '21

Marcel Taeumel uploaded a new version of FFI-Kernel to project FFI: http://source.squeak.org/FFI/FFI-Kernel-mt.207.mcz ==================== Summary ==================== Name: FFI-Kernel-mt.207 Author: mt Time: 17 August 2021, 12:08:20.929505 pm UUID: 693d99be-bab4-8d4c-801c-96a534e6f7d0 Ancestors: FFI-Kernel-mt.206 Adds version number of FFI plugin to the platform description. Needs primitivePluginVersion but defaults to 1 since this is a new concept. I will add this to the plugin shortly. Note that the plugin version can be used to coordinate the communication the relies on shared data structures such as atomic-type codes and classes in the special-objects array. Then, older FFI plugins can keep on working with newer FFI images. This makes it easier to develop plugin and image-code concurrently but not in parallel. :-) Note that we do not have an "Update this VM" button in the image but we can easily update image code. Additional warnings can then help users to be notified when more recent VMs/plugins might be available. Note that this does not help with older image code running on newer plugins. So, update your image first, then update the VM/plugins. Note that I used the name #pluginVersion from the SqueakSSL plugin, which already provides that information. =============== Diff against FFI-Kernel-mt.206 =============== Item was changed: Object subclass: #FFIPlatformDescription + instanceVariableNames: 'name osVersion subtype wordSize endianness pluginVersion' - instanceVariableNames: 'name osVersion subtype wordSize endianness' classVariableNames: 'CheckFFIOnStartUp LastPlatform' poolDictionaries: '' category: 'FFI-Kernel-Support'! !FFIPlatformDescription commentStamp: 'mt 6/2/2020 15:18' prior: 0! This class stores the information about the current (host) platform. It supports testing instances for platform compatibility and specificity. The entire FFI machinery should go through here, when making platform-specific decisions such as when figuring out the #wordSize for pointers to external memory (i.e., ExternalAddress class >> #new) or when looking up compatible definitions for external pools (i.e., ExternalPool class >> #compatibleResolvedDefinitions). 1. DETECT PLATFORM CHANGE ON STARTUP This class is registered for system startup. It then checks whether the current platform is different from the last one. In that case, a selection of FFI classes gets notified such as ExternalObject and ExternalType. 2. PLATFORM SPECIFICITY Platform descriptions may be unspecific, that is, some of their values may be undefined. For example, (FFIPlatformDescription name: 'unix') creates a valid description but is not specific about #osVersion or #wordSize. When comparing such descriptions, precedence of the platform values are: platform name > osVersion > subtype > wordSize So, if one description has a #name and the other does not, the first one is more specific. If both have #name but only the second one has #osVersion, the second one is more specific. If one has only #wordSize and another one has only #subtype, the second one is more specific because #subtype has a higher precedence than #wordSize. 3. PLATFORM COMPATIBILITY Platform descriptions implement a notion of compatibility, which is coupled to its notion of specificity as mentioned before. Using the same rules of precedence, compatibility is checked by comparing the description's values. If not specificed, compatibility is assumed. If specified, values must match via #= to be regarded compatible. Here is an interesting edge case of two compatible platform descriptions: | p1 p2 | p1 := FFIPlatformDescription name: 'Win32' osVersion: '' subtype: 'IX86' wordSize: nil. p2 := FFIPlatformDescription name: '' osVersion: 'linux-gnu' subtype: '' wordSize: 8. p1 isCompatibleWith: p2. Consequently, the developer has to be careful with unspecific platform descriptions, which are used, for example, in the definitions of external pools. 4. FURTHER READING - all references to FFIPlatformDescription - all senders of #wordSize - class comments of ExternalAddress, ExternalType, ExternalPool, ExternalObject ! Item was added: + ----- Method: FFIPlatformDescription class>>currentPluginVersion (in category 'system startup') ----- + currentPluginVersion + "Answers the version of the currently loaded FFI plugin. Can be used to coordinate the communication that relies on shared data structures such as type codes (e.g., v1 means float = 12 and double = 13) and classes (e.g., v1 means ExternalType has compiledSpec at instVar[1] and ExternalObject has handle at instVar[1]." + <primitive: #primitivePluginVersion module: #SqueakFFIPrims> + ^ 1! Item was added: + ----- Method: FFIPlatformDescription class>>name:osVersion:subtype:wordSize:pluginVersion: (in category 'instance creation') ----- + name: aName osVersion: anOSVersionString subtype: aSubtypeString wordSize: aWordSize pluginVersion: aVersionNumber + ^ self new + name: aName; + osVersion: anOSVersionString; + subtype: aSubtypeString; + wordSize: aWordSize; + pluginVersion: aVersionNumber! Item was changed: ----- Method: FFIPlatformDescription class>>newCurrent (in category 'instance creation') ----- newCurrent ^ self name: self currentName osVersion: self currentOSVersion subtype: self currentSubtype + wordSize: self currentWordSize + pluginVersion: self currentPluginVersion! - wordSize: self currentWordSize! Item was changed: ----- Method: FFIPlatformDescription>>= (in category 'comparing') ----- = anObject self == anObject ifTrue: [^ true]. self species == anObject species ifFalse: [^ false]. ^ self name = anObject name and: [self osVersion = anObject osVersion + and: [self subtype = anObject subtype + and: [self wordSize = anObject wordSize + and: [self pluginVersion = anObject pluginVersion]]]]! - and: [self subtype = anObject subtype - and: [self wordSize = anObject wordSize]]].! Item was added: + ----- Method: FFIPlatformDescription>>pluginVersion (in category 'accessing') ----- + pluginVersion + ^ pluginVersion ifNil: [pluginVersion := 1]! Item was added: + ----- Method: FFIPlatformDescription>>pluginVersion: (in category 'accessing') ----- + pluginVersion: anInteger + pluginVersion := anInteger!

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
23
Older →

Jump to page: