Squeak-dev August 2021

squeak-dev@lists.squeakfoundation.org

18 participants
222 discussions

The Trunk: Regex-Core-mt.61.mcz
by commits＠source.squeak.org 13 Aug '21

13 Aug '21

Marcel Taeumel uploaded a new version of Regex-Core to project The Trunk: http://source.squeak.org/trunk/Regex-Core-mt.61.mcz ==================== Summary ==================== Name: Regex-Core-mt.61 Author: mt Time: 13 August 2021, 12:30:55.775724 pm UUID: 866793bc-45be-f944-887d-f1b359e7b85b Ancestors: Regex-Core-ct.60, Regex-Core-tobe.60 Merge =============== Diff against Regex-Core-ct.60 =============== Item was changed: ----- Method: RxCharSetParser>>parseEscapeChar (in category 'parsing') ----- parseEscapeChar + | first | self match: $\. + first := (RxsPredicate forEscapedLetter: lookahead) + ifNil: [ RxsCharacter with: lookahead ]. + self next == $- ifFalse: [^ elements add: first]. + self next ifNil: [ + elements add: first. + ^ self addChar: $-]. + self addRangeFrom: first character to: lookahead. - elements add: ((RxsPredicate forEscapedLetter: lookahead) - ifNil: [ RxsCharacter with: lookahead ]). self next!

1 0

FFI: FFI-Kernel.terf-eem.202.mcz
by commits＠source.squeak.org 13 Aug '21

13 Aug '21

Eliot Miranda uploaded a new version of FFI-Kernel to project FFI: http://source.squeak.org/FFI/FFI-Kernel.terf-eem.202.mcz ==================== Summary ==================== Name: FFI-Kernel.terf-eem.202 Author: eem Time: 12 August 2021, 1:45:51.806758 pm UUID: ac9a5229-0be7-4ef7-abde-cef2682ee2f0 Ancestors: FFI-Kernel-mt.201 Fork because of indefensible definition of Float32Array>>floatAt: =============== Diff against FFI-Kernel-mt.201 =============== Item was removed: - ----- 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 removed: - ----- 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!

2 1

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

13 Aug '21

Marcel Taeumel uploaded a new version of FFI-Kernel to project FFI: http://source.squeak.org/FFI/FFI-Kernel-mt.202.mcz ==================== Summary ==================== Name: FFI-Kernel-mt.202 Author: mt Time: 13 August 2021, 10:08:38.629551 am UUID: b7a408ea-4287-7248-bc5a-a18fff4dab53 Ancestors: FFI-Kernel-mt.201 Fixes a regression / ensures compatibility with Alien and 3DTransform around floatAt:(put:). Note that Alien (being a subclass of ByteArray) breaks polymorphism in the sense that it changes all atomic read/write primitives from byteOffset-based to index-based. Yet, Alien is way older than what the recent SqueakFFI efforts are trying to achieve here: a more robust programming model. The fundamental issue considering the programming model is as follows: anArray at: 4 put: 1.234. "Easy. Dynamic. Clear semantics." anArray floatAt: 4 put: 1.234. "Depends on whether you got Alien or ByteArray ... or Float32Array for that matter." Note that this issue does not occur with the integer primitives ... even though it might make sense to add the #*ByteOffset:* variants as well in the future. Note that 3DTransform actually adds the extension #floatAt:(put:) to FloatArray. =============== Diff against FFI-Kernel-mt.201 =============== Item was changed: ----- Method: ByteArray>>doubleAt: (in category '*FFI-Kernel-accessing - float') ----- doubleAt: byteOffset "Primitive. Return a float value from the receiver. - FAILS IF the receiver has not enough bytes for an IEEE 754 (64 bits) floating point number. - NOTE that this primitive will access memory in the outer space if invoked from ExternalAddress. - SEE Float class >> #fromIEEE64Bit: and Float >> #asIEEE64BitWord" <primitive: #primitiveFFIDoubleAt module: #SqueakFFIPrims> + "<ffiAtomicRead: #double> -- See #doubleAtByteOffset:." - <ffiAtomicRead: #double> "Examples: ExternalType double handle: #[ 0 0 0 255 0 0 0 0 ] at: 1. ExternalType double handle: #[ 0 0 0 255 ] at: 1. --- Error. " ^ self primitiveFailed! Item was changed: ----- Method: ByteArray>>doubleAt:put: (in category '*FFI-Kernel-accessing - float') ----- doubleAt: byteOffset put: value "Primitive. Store the given value as IEEE 754 (64 bits) floating point number. - FAILS IF the receiver has not enough bytes for that representation. - NOTE that this primitive will access memory in the outer space if invoked from ExternalAddress. - SEE Float class >> #fromIEEE64Bit: and Float >> #asIEEE64BitWord" <primitive: #primitiveFFIDoubleAtPut module: #SqueakFFIPrims> + "<ffiAtomicWrite: #double> -- See doubleAtByteOffset:put:." - <ffiAtomicWrite: #double> "Examples: ExternalType double allocate value: 123.4567890; explore ExternalType double allocate value: 0.0001; explore " ^ self primitiveFailed! Item was added: + ----- Method: ByteArray>>doubleAtByteOffset: (in category '*FFI-Kernel-accessing - float') ----- + doubleAtByteOffset: byteOffset + "Duplicates #doubleAt: for compatibility reasons with Alien and 3DTransform. See comment in #doubleAt:." + <primitive: #primitiveFFIDoubleAt module: #SqueakFFIPrims> + <ffiAtomicRead: #double> + ^ self primitiveFailed! Item was added: + ----- Method: ByteArray>>doubleAtByteOffset:put: (in category '*FFI-Kernel-accessing - float') ----- + doubleAtByteOffset: byteOffset put: value + "Duplicates #doubleAt:put: for compatibility reasons with Alien and 3DTransform. See comment in #doubleAt:put:." + <primitive: #primitiveFFIDoubleAtPut module: #SqueakFFIPrims> + <ffiAtomicWrite: #double> + ^ self primitiveFailed! Item was changed: ----- Method: ByteArray>>floatAt: (in category '*FFI-Kernel-accessing - float') ----- floatAt: byteOffset "Primitive. Return a float value from the receiver. - FAILS IF the receiver has not enough bytes for an IEEE 754 (32 bits) floating point number. - NOTE that this primitive will access memory in the outer space if invoked from ExternalAddress. - SEE Float class >> #fromIEEE32Bit: and Float >> #asIEEE32BitWord" <primitive: #primitiveFFIFloatAt module: #SqueakFFIPrims> + "<ffiAtomicRead: #float> -- See #floatAtByteOffset:." - <ffiAtomicRead: #float> "Examples: ExternalType float handle: #[ 0 0 0 255 ] at: 1. ExternalType float handle: #[ 0 0 255 ] at: 1. --- Error. " ^ self primitiveFailed! Item was changed: ----- Method: ByteArray>>floatAt:put: (in category '*FFI-Kernel-accessing - float') ----- floatAt: byteOffset put: value "Primitive. Store the given value as IEEE 754 (32 bits) floating point number. - FAILS IF the receiver has not enough bytes for that representation. - NOTE that this primitive will access memory in the outer space if invoked from ExternalAddress. - SEE Float class >> #fromIEEE32Bit: and Float >> #asIEEE32BitWord" <primitive: #primitiveFFIFloatAtPut module: #SqueakFFIPrims> + "<ffiAtomicWrite: #float> -- See floatAtByteOffset:put:." - <ffiAtomicWrite: #float> "Examples: ExternalType float allocate value: 123.4567890; explore ExternalType float allocate value: 0.0001; explore " ^ self primitiveFailed! Item was added: + ----- Method: ByteArray>>floatAtByteOffset: (in category '*FFI-Kernel-accessing - float') ----- + floatAtByteOffset: byteOffset + "Duplicates #floatAt: for compatibility reasons with Alien and 3DTransform. See comment in #floatAt:." + <primitive: #primitiveFFIFloatAt module: #SqueakFFIPrims> + <ffiAtomicRead: #float> + ^ self primitiveFailed! Item was added: + ----- Method: ByteArray>>floatAtByteOffset:put: (in category '*FFI-Kernel-accessing - float') ----- + floatAtByteOffset: byteOffset put: value + "Duplicates #floatAt:put: for compatibility reasons with Alien and 3DTransform. See comment in #floatAt:put:." + <primitive: #primitiveFFIFloatAtPut module: #SqueakFFIPrims> + <ffiAtomicWrite: #float> + ^ self primitiveFailed! Item was changed: ----- Method: ByteArrayReadWriter>>doubleAt: (in category 'read/write atomics') ----- doubleAt: oByteOffset + self shouldNotImplement. "See doubleAtByteOffset:"! - self checkAt: oByteOffset. - ^ byteArray doubleAt: oByteOffset + byteOffset! Item was changed: ----- Method: ByteArrayReadWriter>>doubleAt:put: (in category 'read/write atomics') ----- doubleAt: oByteOffset put: value + self shouldNotImplement. "See doubleAtByteOffset:put:"! - self checkAt: oByteOffset. - ^ byteArray doubleAt: oByteOffset + byteOffset put: value! Item was added: + ----- Method: ByteArrayReadWriter>>doubleAtByteOffset: (in category 'read/write atomics') ----- + doubleAtByteOffset: oByteOffset + + self checkAt: oByteOffset. + ^ byteArray doubleAtByteOffset: oByteOffset + byteOffset! Item was added: + ----- Method: ByteArrayReadWriter>>doubleAtByteOffset:put: (in category 'read/write atomics') ----- + doubleAtByteOffset: oByteOffset put: value + + self checkAt: oByteOffset. + ^ byteArray doubleAtByteOffset: oByteOffset + byteOffset put: value! Item was changed: ----- Method: ByteArrayReadWriter>>floatAt: (in category 'read/write atomics') ----- floatAt: oByteOffset + self shouldNotImplement. "See floatAtByteOffset:"! - self checkAt: oByteOffset. - ^ byteArray floatAt: oByteOffset + byteOffset! Item was changed: ----- Method: ByteArrayReadWriter>>floatAt:put: (in category 'read/write atomics') ----- floatAt: oByteOffset put: value + self shouldNotImplement. "See floatAtByteOffset:put:"! - self checkAt: oByteOffset. - ^ byteArray floatAt: oByteOffset + byteOffset put: value! Item was added: + ----- Method: ByteArrayReadWriter>>floatAtByteOffset: (in category 'read/write atomics') ----- + floatAtByteOffset: oByteOffset + + self checkAt: oByteOffset. + ^ byteArray floatAtByteOffset: oByteOffset + byteOffset! Item was added: + ----- Method: ByteArrayReadWriter>>floatAtByteOffset:put: (in category 'read/write atomics') ----- + floatAtByteOffset: oByteOffset put: value + + self checkAt: oByteOffset. + ^ byteArray floatAtByteOffset: oByteOffset + byteOffset put: value! Item was removed: - ----- 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 removed: - ----- 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: Float32Array>>floatAtByteOffset: (in category '*FFI-Kernel-accessing') ----- + floatAtByteOffset: 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>>floatAtByteOffset:put: (in category '*FFI-Kernel-accessing') ----- + floatAtByteOffset: 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 removed: - ----- 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 removed: - ----- 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 added: + ----- Method: Float64Array>>doubleAtByteOffset: (in category '*FFI-Kernel-accessing') ----- + doubleAtByteOffset: 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>>doubleAtByteOffset:put: (in category '*FFI-Kernel-accessing') ----- + doubleAtByteOffset: 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!

1 0

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

12 Aug '21

Marcel Taeumel uploaded a new version of FFI-Kernel to project FFI: http://source.squeak.org/FFI/FFI-Kernel-mt.201.mcz ==================== Summary ==================== Name: FFI-Kernel-mt.201 Author: mt Time: 12 August 2021, 4:59:01.488801 pm UUID: 31d99f8f-471c-4b4d-ae81-67d2d93588c1 Ancestors: FFI-Kernel-mt.200 Speed up struct-field accessor generation/compilation further. Make logging opt-in via preference for debugging or learning purposes only. =============== Diff against FFI-Kernel-mt.200 =============== Item was changed: ExternalObject subclass: #ExternalStructure instanceVariableNames: '' + classVariableNames: 'LogAccessorSourceCode' - classVariableNames: '' poolDictionaries: 'ExternalTypePool FFIConstants' category: 'FFI-Kernel'! ExternalStructure class instanceVariableNames: 'compiledSpec byteAlignment'! !ExternalStructure commentStamp: 'eem 6/26/2019 15:26' prior: 0! An ExternalStructure is for representing external data that is - either a structure composed of different fields (a struct of C language) - or an alias for another type (like a typedef of C language) It reserves enough bytes of data for representing all the fields. The data is stored into the handle instance variable which can be of two different types: - ExternalAddress If the handle is an external address then the object described does not reside in the Smalltalk object memory. - ByteArray If the handle is a byte array then the object described resides in Smalltalk memory. Instance Variables (class side) byteAlignment: <Integer> compiledSpec: <WordArray> byteAlignment - the required alignment for the structure compiledSpec - the bit-field definiton of the structure in the ExternalType encoding understood by the VM's FFI call marshalling machinery. A specific structure is defined by subclassing ExternalStructure and specifying its #fields via a class side method. For example if we define a subclass: ExternalStructure subclass: #StructExample instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'garbage'. Then declare the fields like this: StructExample class compile: 'fields ^#( (name ''char*'') (color ''ulong'') )' classified: 'garbage'. It means that this type is composed of two different fields: - a string (accessed thru the field #name) - and an unsigned 32bit integer (accessed thru the field #color). It represents the following C type: struct StructExample {char *name; uint32_t color; }; The accessors for those fields can be generated automatically like this: StructExample defineFields. As can be verified in a Browser: StructExample browse. We see that name and color fields are stored sequentially in different zones of data. The total size of the structure can be verified with: StructExample byteSize = (Smalltalk wordSize + 4). An ExternalStructure can also be used for defining an alias. The fields definition must contain only 2 elements: an eventual accessor (or nil) and the type. For example, We can define a machine dependent 'unsigned long' like this: ExternalStructure subclass: #UnsignedLong instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'garbage'. Then set the fields like this: UnsignedLong class compile: 'fields ^(Smalltalk wordSize=4 or: [Smalltalk platformName=''Win64'']) ifTrue: [#(nil ''ulong'')] ifFalse: [#(nil ''ulonglong'')]' classified: 'garbage'. And verify the size on current platform: UnsignedLong byteSize. Then, the class names 'UnsignedLong' and 'StructExamples' acts as a type specification. They can be used for composing other types, and for defining prototype of external functions: LibraryExample>>initMyStruct: aStructExample name: name color: anInteger <cdecl: void 'init_my_struct'( StructExample * char * UnsignedLong )> self externalCallFailed ! ExternalStructure class instanceVariableNames: 'compiledSpec byteAlignment'! Item was added: + ----- Method: ExternalStructure class>>logAccessorSourceCode (in category 'preferences') ----- + logAccessorSourceCode + <preference: 'Log source code for generated accessors' + categoryList: #('FFI Kernel') + description: 'When true, keep the sources generated for struct-field accessors in the method trailer. While this might increase the image file notably, no sources file will be accessed for performance reasons. When false, only the decompiled sources will be available for those accessors.' + type: #Boolean> + ^ LogAccessorSourceCode ifNil: [false]! Item was added: + ----- Method: ExternalStructure class>>logAccessorSourceCode: (in category 'preferences') ----- + logAccessorSourceCode: aBoolean + + LogAccessorSourceCode = aBoolean ifTrue: [^ self]. + LogAccessorSourceCode := aBoolean. + ExternalStructure defineAllFields.! Item was changed: ----- Method: ExternalStructure class>>maybeCompileAccessor:withSelector: (in category 'field definition - support') ----- maybeCompileAccessor: newSourceString withSelector: selector + "When logging is enabled, only compile if category or source changed." - "Only compile if category or source changed. Use generic author initials during compilation." + | log newCategory oldMethod newMethod | + log := self logAccessorSourceCode. - | newCategory existingReference method | newCategory := #'*autogenerated - accessing'. + + (log and: [self includesSelector: selector]) ifTrue: [ + oldMethod := self compiledMethodAt: selector. + ((self organization categoryOfElement: selector) = newCategory + and: [oldMethod trailer sourceCode = newSourceString]) + ifTrue: [^ self]]. - ((existingReference := MethodReference class: self selector: selector) isValid - and: [existingReference category = newCategory] - and: [existingReference sourceString = newSourceString]) - ifTrue: [^ self]. "Compile silently. No changeStamp. No access to sources file. Keep source code in method trailer." self compileSilently: newSourceString classified: newCategory. + log ifTrue: [ + newMethod := self compiledMethodAt: selector. + newMethod becomeForward: (newMethod copyWithSourceCode: newSourceString)].! - method := self compiledMethodAt: selector. - method becomeForward: (method copyWithSourceCode: newSourceString).! Item was changed: ----- Method: GenericIntegerReadWriteSend class>>useSpecificIntegerPrimitives: (in category 'preferences') ----- useSpecificIntegerPrimitives: aBoolean UseSpecificIntegerPrimitives = aBoolean ifTrue: [^ self]. aBoolean ~= self canUseSpecificIntegerPrimitives ifTrue: [self notify: 'FFI plugin does not support specific integer primitives. Proceed to update atomic sends anyway. Fallback code will redirect to generic integer primitive. Performance might be affected.']. UseSpecificIntegerPrimitives := aBoolean. Cursor wait showWhile: [ ExternalType initializeAtomicSends. + ExternalStructure defineAllFields].! - MessageTally spyOn: [ExternalStructure defineAllFields]].!

1 0

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

12 Aug '21

Marcel Taeumel uploaded a new version of FFI-Tests to project FFI: http://source.squeak.org/FFI/FFI-Tests-mt.60.mcz ==================== Summary ==================== Name: FFI-Tests-mt.60 Author: mt Time: 12 August 2021, 4:33:41.048047 pm UUID: d606180c-bdf8-ba4d-bc00-78ec76a5a699 Ancestors: FFI-Tests-mt.59 Complements FFI-Kernel-mt.200 =============== Diff against FFI-Tests-mt.59 =============== Item was changed: ----- Method: FFIPluginLibraryTests>>invoke:withArguments: (in category 'support') ----- invoke: functionName withArguments: someObjects "Use an instance of the library. Compile class-side methods to instance-side methods as needed." | selector library | selector := self lookupSelector: functionName numArgs: someObjects size. library := FFITestLibrary new. + (library respondsTo: selector) ifFalse: [ | signature source prototype method | - (library respondsTo: selector) ifFalse: [ | signature source prototype priorAuthorInitials | "1) Build method signature." signature := String streamContents: [:s | | index | index := 0. selector do: [:char | s nextPut: char. char = $: ifTrue: [ index := index + 1. s space; nextPutAll: 'arg'; nextPutAll: index asString; space]]]. "2) Construct method source." prototype := library class class compiledMethodAt: selector. source := '{1}\ {2}\ <generated>\ {3}\ ^ self externalCallFailed' withCRs format: { signature. '"This method was automatically generated. See {1}>>{2}"' format: {prototype methodClass. prototype selector}. prototype externalLibraryFunction copy setModule: nil; printString }. "3) Compile instance-side FFI call in library." + library class compileSilently: source classified: '*autogenerated - primitives'. + method := library class compiledMethodAt: selector. + method becomeForward: (method copyWithSourceCode: source)]. - priorAuthorInitials := Utilities authorInitialsPerSe. - [Utilities authorInitials: 'FFI'. - library class compile: source classified: '*autogenerated - primitives' - ] ensure: [Utilities authorInitials: priorAuthorInitials]]. ^ library perform: selector withArguments: someObjects!

1 0

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

12 Aug '21

Marcel Taeumel uploaded a new version of FFI-Kernel to project FFI: http://source.squeak.org/FFI/FFI-Kernel-mt.200.mcz ==================== Summary ==================== Name: FFI-Kernel-mt.200 Author: mt Time: 12 August 2021, 4:33:08.122047 pm UUID: f601ec88-0b93-734e-a69a-3f2b36f727a9 Ancestors: FFI-Kernel-mt.199 Speed up compilation of field accessors by: 1. Not logging the source in the sources file; use method trailer instead 2. Not signaling the SystemChangeNotifier =============== Diff against FFI-Kernel-mt.199 =============== 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." + | newCategory existingReference method | - | newCategory existingReference priorAuthorInitials | newCategory := #'*autogenerated - accessing'. ((existingReference := MethodReference class: self selector: selector) isValid and: [existingReference category = newCategory] and: [existingReference sourceString = newSourceString]) ifTrue: [^ self]. + "Compile silently. No changeStamp. No access to sources file. Keep source code in method trailer." + self compileSilently: newSourceString classified: newCategory. + method := self compiledMethodAt: selector. + method becomeForward: (method copyWithSourceCode: newSourceString).! - priorAuthorInitials := Utilities authorInitialsPerSe. - [Utilities authorInitials: 'FFI'. - self compile: newSourceString classified: newCategory. - ] ensure: [Utilities authorInitials: priorAuthorInitials].!

1 0

FFI: FFI-CallbacksTests-mt.6.mcz
by commits＠source.squeak.org 12 Aug '21

12 Aug '21

Marcel Taeumel uploaded a new version of FFI-CallbacksTests to project FFI: http://source.squeak.org/FFI/FFI-CallbacksTests-mt.6.mcz ==================== Summary ==================== Name: FFI-CallbacksTests-mt.6 Author: mt Time: 12 August 2021, 2:35:45.614321 pm UUID: 9df855fd-4775-2741-b964-acdddb6e003a Ancestors: FFI-CallbacksTests-mt.5 Complements FFI-Callbacks-mt.27. Looks actually more readable now because it the block matches the type signature. =============== Diff against FFI-CallbacksTests-mt.5 =============== Item was changed: ----- Method: FFICallbackTests>>test08ManagedCallback (in category 'tests') ----- test08ManagedCallback | array unsorted sorted compare callback | unsorted := #(71 66 33 77 16 63 91 54 48 52). sorted := #(16 33 48 52 54 63 66 71 77 91). array := ExternalType int32_t allocate: 10. 1 to: array size do: [:index | array at: index put: (unsorted at: index)]. + compare := [:a :b | (a value - b value) sign]. - compare := [:a :b | (a - b) sign]. callback := compare gcSignature: #(int32_t 'int32_t*' 'int32_t*'). lib qsort: array with: array size with: array contentType byteSize with: callback. self assert: (sorted hasEqualElements: array). "Callback no longer needed but still there." Smalltalk garbageCollect. self deny: callback isNull. "Callback depends on the existence of the compare block." self assert: callback identical: (FFICallback fromEvaluable: compare). compare := nil. Smalltalk garbageCollect. self assert: callback isNull.! Item was changed: ----- Method: FFICallbackTests>>test09UnmanagedCallback (in category 'tests') ----- test09UnmanagedCallback | array unsorted sorted compare callback | unsorted := #(71 66 33 77 16 63 91 54 48 52). sorted := #(16 33 48 52 54 63 66 71 77 91). array := ExternalType int32_t allocate: 10. 1 to: array size do: [:index | array at: index put: (unsorted at: index)]. + compare := [:a :b | (a value - b value) sign]. - compare := [:a :b | (a - b) sign]. callback := compare signature: #(int32_t 'int32_t*' 'int32_t*'). lib qsort: array with: array size with: array contentType byteSize with: callback. self assert: (sorted hasEqualElements: array). "Callback no longer needed but still there." Smalltalk garbageCollect. self deny: callback isNull. "Callback independent from the compare block." self assert: (FFICallback fromEvaluable: compare) isNil. compare := nil. Smalltalk garbageCollect. self deny: callback isNull. "Callback needs to be free'd manually." callback free. self assert: callback isNull.!

1 0

FFI: FFI-Callbacks-mt.27.mcz
by commits＠source.squeak.org 12 Aug '21

12 Aug '21

Marcel Taeumel uploaded a new version of FFI-Callbacks to project FFI: http://source.squeak.org/FFI/FFI-Callbacks-mt.27.mcz ==================== Summary ==================== Name: FFI-Callbacks-mt.27 Author: mt Time: 12 August 2021, 2:34:41.941321 pm UUID: 3083fa60-01de-fd48-a299-3b344e4e5883 Ancestors: FFI-Callbacks-mt.26 In dynamic callback evaluation, do not unpack pointer arguments anymore, which was wrong for stack args anyway. =============== Diff against FFI-Callbacks-mt.26 =============== Item was changed: ----- Method: CStandardLibrary>>compare:through: (in category '*FFI-Callbacks') ----- compare: contentType through: evaluable + "Answers a callback for comparing the given contentType through the given evaluable, i.e., messages sends or blocks. Supports pointer types as contentType via array-type indirection. Automatically unpacks pointers to atomics so that evaluable can directly work on Smalltalk objects. Does not support void as contentType." - "Answers a callback for comparing the given contentType through the given evaluable, i.e., messages sends or blocks. Supports pointer types as contentType." <callback: int32_t (*)(const void*, const void*)> | argType signature | self assert: [evaluable numArgs = 2]. argType := contentType isPointerType + ifTrue: [(contentType asArrayType: nil) "HACKY!!"] - ifTrue: [(contentType asArrayType: nil)] ifFalse: [contentType]. signature := ((thisContext method pragmaAt: #callback:) argumentAt: 1) copy. signature at: 2 put: argType asPointerType. signature at: 3 put: argType asPointerType. + + ^ ((contentType isAtomic or: [contentType isPointerType]) + ifTrue: [ [:arg1 :arg2 | evaluable value: arg1 value value: arg2 value] ] + ifFalse: [evaluable]) gcSignature: signature! - - ^ evaluable gcSignature: signature! Item was changed: ----- Method: FFICallback>>evaluateDynamic: (in category 'evaluating') ----- evaluateDynamic: callbackContext "Read all arguments and make the call(back). Assume that 'handle' and 'type' are set correctly. Only watch out for the sign. See field definition in FFICallbackContext to explore alternative ways to read the arguments." | arguments stack stackType stackByteOffset intArgs intPos floatArgs floatPos | stack := callbackContext stackPtr getHandle. stackType := callbackContext stackPtr contentType. stackByteOffset := 1. intArgs := callbackContext intRegArgs. intPos := 0. floatArgs := callbackContext floatRegArgs. floatPos := 0. arguments := Array new: argumentTypes size. 1 to: arguments size do: [:argIndex | | argType data isPointer | argType := argumentTypes at: argIndex. "1) Try to read arguments from registers." data := (intPos < intArgs size and: [(isPointer := argType isPointerType) or: [argType isIntegerType]]) ifTrue: [intPos := intPos + 1. intArgs at: intPos] ifFalse: [(floatPos < floatArgs size and: [argType isFloatType]) ifTrue: [floatPos := floatPos + 1. floatArgs at: floatPos]]. data ifNotNil: [ "1b) Read pointers from register value." isPointer ifFalse: ["data is already an integer"] ifTrue: [ + data := argType "isPointerType!!" handle: data "address-as-integer" at: 1]] - data := (ExternalData - fromHandle: (ExternalAddress fromInteger: data) - type: argType asNonPointerType "contentType") value]] ifNil: [ "2) If nothing was read, read the argument from the stack." + data := argType handle: stack at: stackByteOffset. - data := (argType handle: stack at: stackByteOffset) value. stackByteOffset := stackByteOffset + ((stackType byteSize max: argType byteSize) roundUpTo: stackType byteAlignment)]. arguments at: argIndex put: data]. ^ self setResult: (self evaluableObject valueWithArguments: arguments) inContext: callbackContext! Item was changed: ----- Method: FFICallback>>init__ccall_ARM64 (in category 'private') ----- init__ccall_ARM64 <abi: #ARM64> <init_ccall> "Initialize the receiver with a __ccall thunk. The thunk calls thunkEntry in the Alien/IA32ABI plugin, whose source is in platforms/Cross/plugins/IA32ABI/arm64abicc.c. thunkEntry is the entry point for Callbacks. The objective of the thunk is to call thunkEntry with all arguments to the call of the thunk (registers and stack) as well as a pointer to the thunk itself. thunkEntry is as follows: long long thunkEntry(long x0, long x1, long x2, long x3, long x4, long x5, long x6, long x7, double d0, double d1, double d2, double d3, double d4, double d5, double d6, double d7, void *thunkpPlus16, sqIntptr_t *stackp) thunkEntry then collects the various arguments (thunk, integer register arguments, floating-point register arguments, stack pointer) in a VMCallbackContext and invokes the callback via invokeCallbackContext:." | bytes | bytes := #["0 mov x16, sp" 16rF0 16r03 16r00 16r91 "4 sub sp, sp, #0x20" 16rFF 16r83 16r00 16rD1 "8 stp x16, x30, [sp, #0x8]" 16rF0 16rFB 16r00 16rA9 "c bl 0x10" 16r01 16r00 16r00 16r94 "10 str x30, [sp]" 16rFE 16r03 16r00 16rF9 "14 ldr x16, #0x14" 16rB0 16r00 16r00 16r58 "18 blr x16 " 16r00 16r02 16r3F 16rD6 "1C ldr x30, [sp, #0x16]" 16rFE 16r0B 16r40 16rF9 "20 add sp, sp, #0x20" 16rFF 16r83 16r00 16r91 "24 ret" 16rC0 16r03 16r5F 16rD6 0 0 0 0 0 0 0 0] copy. + bytes type: #pointer at: 41 put: self primThunkEntryAddress. - bytes type: #uint64_t at: 41 put: self primThunkEntryAddress. self class writeExecutableBlockAt: handle "thunk" bytes: bytes. "self newCCall"! Item was added: + ----- Method: Integer>>pointerAt:length: (in category '*FFI-Callbacks') ----- + pointerAt: byteOffset length: length + "Interpret the receiver directly as external address. Now, this lifts Integer to the same level as ByteArray and ExternalAddress ... at least when reading pointers. Polymorphism for the win. :-) " + + "self assert: [byteOffset = 1]" + "self assert: [length = ExternalAddress wordSize]" + ^ ExternalAddress fromInteger: self! Item was added: + ----- Method: Integer>>pointerAt:put:length: (in category '*FFI-Callbacks') ----- + pointerAt: byteOffset put: pointer length: length + "Interpret the receiver directly as external address." + + self shouldNotImplement. "Integers are read-only."!

1 0

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

12 Aug '21

Marcel Taeumel uploaded a new version of FFI-Tests to project FFI: http://source.squeak.org/FFI/FFI-Tests-mt.59.mcz ==================== Summary ==================== Name: FFI-Tests-mt.59 Author: mt Time: 12 August 2021, 1:50:04.867908 pm UUID: 2a0cb345-47c3-1c4b-9bd3-c008f3ad0a0a Ancestors: FFI-Tests-mt.58 Complements FFI-Kernel-mt.199 =============== Diff against FFI-Tests-mt.58 =============== Item was added: + ----- Method: FFIAllocateTests>>test22ArrayForVoidPointers (in category 'tests - array') ----- + test22ArrayForVoidPointers + "Use a single external object to avoid #isNull check." + + | type array object | + type := ExternalType void asPointerType. + array := self allocate: type size: 1. + + object := (externalObjects add: FFITestPoint2 allocateExternal). + array at: 1 put: object getHandle. "Write address, discard type." + + self deny: array isNull. + self deny: array first isNull. + + self assert: array byteSize isNil. "Unknown because of void* content" + self assert: array first byteSize isNil. "Unknown because of void content"!

1 0

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

12 Aug '21

Marcel Taeumel uploaded a new version of FFI-Kernel to project FFI: http://source.squeak.org/FFI/FFI-Kernel-mt.199.mcz ==================== Summary ==================== Name: FFI-Kernel-mt.199 Author: mt Time: 12 August 2021, 1:49:34.824908 pm UUID: 87ed955e-5c3c-0f47-8924-03fe051d3b19 Ancestors: FFI-Kernel-mt.198 Fixes bug in ExternalData considering #byteSize for arrays of void* . Also fix VoidReadWriteSend to have 0 as #byteSize, just like 'ExternalType void' has. =============== Diff against FFI-Kernel-mt.198 =============== Item was changed: ----- Method: ExternalData>>byteSize (in category 'accessing') ----- byteSize "Answer how many bytes the receiver manages." | ct myBytes | self isNull ifTrue: [^ 0]. self size ifNil: [^ nil "We don't know"]. myBytes := self size * (ct := self contentType) byteSize. + - ^ ct isPointerType + ifTrue: [ + ct asNonPointerType isVoid ifTrue: [nil] ifFalse: [ + "Locally managed pointers do not count. See ByteArray >> #isNull." + (handle isExternalAddress ifTrue: [myBytes] ifFalse: [0]) + + (self reader collect: [:each | each byteSize]) sum ]] - ifTrue: [ "Locally managed pointers do not ocunt. See ByteArray >> #isNull." - (handle isExternalAddress ifTrue: [myBytes] ifFalse: [0]) - + (self reader collect: [:each | each byteSize]) sum ] ifFalse: [ myBytes ]! Item was changed: ----- Method: VoidReadWriteSend class>>fromType: (in category 'instance creation') ----- fromType: type ^ { + (self receiver: nil selector: #voidAt:) byteSize: type byteSize; yourself. + (self receiver: nil selector: #voidAt:put:) byteSize: type byteSize; yourself}! - self receiver: nil selector: #voidAt:. - self receiver: nil selector: #voidAt:put:}! Item was removed: - ----- Method: VoidReadWriteSend>>handle:atIndex: (in category 'evaluating') ----- - handle: handle atIndex: byteOffset - "no accessors for void" - self shouldNotImplement.! Item was removed: - ----- Method: VoidReadWriteSend>>handle:atIndex:put: (in category 'evaluating') ----- - handle: handle atIndex: byteOffset put: value - "no accessors for void" - self shouldNotImplement.! Item was changed: (PackageInfo named: 'FFI-Kernel') postscript: '"Reinitialize FFIAtomicReadWriteSend to use the new integer primitives" + ExternalType resetAllTypes...'! - ExternalType resetAllAtomicTypes.'!

1 0

← Newer
1
...
16
17
18
19
20
21
22
23
Older →

Jump to page: