Squeak-dev May 2021

squeak-dev@lists.squeakfoundation.org

32 participants
345 discussions

The Inbox: Kernel-jar.1400.mcz
by commits＠source.squeak.org 04 May '21

04 May '21

A new version of Kernel was added to project The Inbox: http://source.squeak.org/inbox/Kernel-jar.1400.mcz ==================== Summary ==================== Name: Kernel-jar.1400 Author: jar Time: 4 May 2021, 10:35:06.700121 pm UUID: 048df236-d26f-434e-964d-7707b8f2a9a8 Ancestors: Kernel-nice.1397 Fix a bug causing a cannot return error when re-signalling an already signalled exception. The fix makes re-signalling equivalent to sending #outer. Examples follow. Discussion see http://forum.world.st/The-Inbox-Kernel-jar-1399-mcz-tp5129370p5129434.html =============== Diff against Kernel-nice.1397 =============== Item was changed: ----- Method: Exception>>signal (in category 'signaling') ----- signal "Ask ContextHandlers in the sender chain to handle this signal. The default is to execute and return my defaultAction." + signalContext ifNotNil: [^self outer]. "re-signalling an already signalled exception is equivalent to sending #outer" signalContext := thisContext contextTag. ^(thisContext nextHandlerContextForSignal: self) handleSignal: self!

1 0

FFI: FFI-Kernel-mt.130.mcz
by commits＠source.squeak.org 04 May '21

04 May '21

Marcel Taeumel uploaded a new version of FFI-Kernel to project FFI: http://source.squeak.org/FFI/FFI-Kernel-mt.130.mcz ==================== Summary ==================== Name: FFI-Kernel-mt.130 Author: mt Time: 4 May 2021, 4:51:43.338881 pm UUID: 5c667740-5577-4541-876e-0be05657a18c Ancestors: FFI-Kernel-mt.129 Adds (simple?) support for array types such as char[12] or MyStruct[5]. Note that there is no plugin support for array types, which means that: 1. All FFI calls denoting array types will be passed as pointer type 2. Return types might work with atomic arrays (e.g. char[12]) but definitely not with struct arrays because the plugin will just give you a new instance of your struct with the handle, thus omitting the size information. Still, now you can finally embed array types in your struct definition: typedef struct { double d1; int32_t[5] a5i2; } FFITestSdA5i :-) More open tasks: - Array types are not cached and created on-demand. See #arrayTypeNamed: for placing a cache. - #typedef (in Tools) is not yet supported. =============== Diff against FFI-Kernel-mt.129 =============== Item was added: + ExternalType subclass: #ExternalArrayType + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'FFI-Kernel'! Item was added: + ----- Method: ExternalArrayType class>>newTypeForContentType:size: (in category 'as yet unclassified') ----- + newTypeForContentType: contentType size: numElements + "!!!!!! Be aware that only the pointer type can be used in calls. As of SqueakFFIPrims VMMaker.oscog-eem.2950, there is no actual support for array types in the FFI plugin !!!!!!" + + | type pointerType headerWord byteSize | + contentType ifNil: [^ nil]. + numElements < 0 ifTrue: [^ nil]. + + self + assert: [contentType isPointerType not] + description: 'No support for pointers as content type yet!!'. + + type := self basicNew. + pointerType := ExternalType basicNew. + + "1) Regular type" + byteSize := numElements * contentType byteSize. + self assert: [byteSize <= FFIStructSizeMask]. + headerWord := contentType headerWord copy. + headerWord := headerWord bitClear: FFIStructSizeMask. + headerWord := headerWord bitOr: byteSize. + type + setReferencedType: pointerType; + compiledSpec: (WordArray with: headerWord); + byteAlignment: contentType byteAlignment; + setReferentClass: contentType referentClass. + + "2) Pointer type. Reuse the compiledSpec of the content-type's pointer type." + pointerType + setReferencedType: type; + compiledSpec: contentType asPointerType compiledSpec copy; + byteAlignment: contentType asPointerType byteAlignment; + setReferentClass: contentType asPointerType referentClass. + + ^ type! Item was added: + ----- Method: ExternalArrayType>>checkType (in category 'external structure') ----- + checkType + + self class extraTypeChecks ifFalse: [^ self]. + + self + assert: [self isPointerType not] + description: 'Convert to ExternalType to use this feature'.! Item was added: + ----- Method: ExternalArrayType>>contentType (in category 'accessing') ----- + contentType + + ^ ExternalType typeNamed: super typeName! Item was added: + ----- Method: ExternalArrayType>>handle:at: (in category 'external data') ----- + handle: handle at: byteOffset + "Read the receiver's external type using the given handle and the byteOffset. This is the dynamic version of #readFieldAt:." + + self checkType. + + ^ (ExternalData + fromHandle: (handle structAt: byteOffset length: self byteSize) + type: self contentType) size: self size; yourself! Item was added: + ----- Method: ExternalArrayType>>handle:at:put: (in category 'external data') ----- + handle: handle at: byteOffset put: value + "Write a value using the receiver's external type at the given handle and byteOffset. This is the dynamic version of #writeFieldAt:with:." + + self checkType. + + handle + structAt: byteOffset + put: value getHandle + length: self byteSize.! Item was added: + ----- Method: ExternalArrayType>>isArrayType (in category 'testing') ----- + isArrayType + + ^ true! Item was added: + ----- Method: ExternalArrayType>>readFieldAt: (in category 'external structure') ----- + readFieldAt: byteOffset + "Answer a string defining the accessor to an entity of the receiver type starting at the given byte offset. + Private. Used for field definition only." + + self checkType. + + ^ String streamContents:[:s | + s nextPutAll:'^ (ExternalData fromHandle: (handle structAt: '; + print: byteOffset; + nextPutAll: ' length: '; + print: self byteSize; + nextPutAll: ') type: '. + + self contentType isAtomic + ifTrue: [s nextPutAll: 'ExternalType ', self contentType typeName] + ifFalse: [s nextPutAll: self contentType typeName, ' externalType']. + + s nextPutAll: ') size: '; print: self size; nextPutAll: '; yourself']! Item was added: + ----- Method: ExternalArrayType>>size (in category 'accessing') ----- + size + "Answers the number of elements for this array type." + + ^ self byteSize / self contentType byteSize! Item was added: + ----- Method: ExternalArrayType>>storeOn: (in category 'printing') ----- + storeOn: aStream + + aStream + nextPut: $(; + nextPutAll: ExternalType name; space; + nextPutAll: #arrayTypeNamed:; space; + store: self typeName; + nextPut: $).! Item was added: + ----- Method: ExternalArrayType>>typeName (in category 'accessing') ----- + typeName + + ^ String streamContents: [:stream | + stream + nextPutAll: super typeName; + nextPut: $[; + nextPutAll: self size asString; + nextPut: $]]! Item was added: + ----- Method: ExternalArrayType>>writeFieldArgName (in category 'external structure') ----- + writeFieldArgName + + ^ 'anExternalData_', self contentType typeName, self size! Item was added: + ----- Method: ExternalArrayType>>writeFieldAt:with: (in category 'external structure') ----- + writeFieldAt: byteOffset with: valueName + + self checkType. + + ^ String streamContents:[:s | + s nextPutAll:'handle structAt: '; + print: byteOffset; + nextPutAll: ' put: '; + nextPutAll: valueName; + nextPutAll: ' getHandle length: '; + print: self byteSize]! Item was added: + ----- Method: ExternalType class>>arrayTypeNamed: (in category 'instance lookup') ----- + arrayTypeNamed: typeName + "Lookup fails if content type is not present." + + | contentType | + self flag: #todo. "mt: Cache array types?" + + (contentType := self typeNamed: (typeName copyFrom: 1 to: (typeName indexOf: $[) - 1)) + ifNil: [^ nil]. + + ^ self newTypeNamed: typeName! Item was added: + ----- Method: ExternalType class>>newTypeForContentType:size: (in category 'instance creation') ----- + newTypeForContentType: contentType size: numElements + + ^ ExternalArrayType newTypeForContentType: contentType size: numElements! Item was changed: ----- Method: ExternalType class>>newTypeNamed: (in category 'instance creation') ----- newTypeNamed: aTypeName + "Create a new struct type or array type. Not needed for atomic types; see #initializeDefaultTypes." + + | structClass contentType contentTypeName numElements | - - | structClass | self assert: [aTypeName last ~~ $*] description: 'Pointer type will be created automatically'. + + aTypeName last == $] ifTrue: [ + "array type, e.g., char[50]" + contentTypeName:= aTypeName copyFrom: 1 to: (aTypeName indexOf: $[) - 1. + contentType := (self typeNamed: contentTypeName) "Create new if not already there." + ifNil: [self newTypeNamed: contentTypeName]. + numElements := ((aTypeName copyFrom: (aTypeName indexOf: $[) + 1 to: aTypeName size - 1) asInteger) + ifNil: [0]. + ^ self + newTypeForContentType: contentType + size: numElements]. structClass := (self environment classNamed: aTypeName) ifNotNil: [:class | (class includesBehavior: ExternalStructure) ifTrue: [class]]. ^ structClass ifNil: [self newTypeForUnknownNamed: aTypeName] ifNotNil: [self newTypeForStructureClass: structClass]! Item was changed: ----- Method: ExternalType class>>typeNamed: (in category 'instance lookup') ----- typeNamed: typeName "Supports pointer-type lookup for both atomic and structure types. Examples: 'long', 'long*', 'long *' or 'MyStruct', 'MyStruct*', 'MyStruct *'" + | isPointerType isArrayType actualTypeName type | + isArrayType := false. - | isPointerType actualTypeName type | (isPointerType := typeName last == $*) ifTrue: [actualTypeName := typeName allButLast withoutTrailingBlanks] + ifFalse: [(isArrayType := typeName last == $]) + ifFalse: [actualTypeName := typeName]]. - ifFalse: [actualTypeName := typeName]. + isArrayType + ifTrue: [^ self arrayTypeNamed: typeName]. + (Symbol lookup: actualTypeName) ifNotNil: [:sym | actualTypeName := sym]. type := (self atomicTypeNamed: actualTypeName) ifNil: [self structTypeNamed: actualTypeName]. ^ type ifNotNil: [isPointerType ifTrue: [type asPointerType] ifFalse: [type]]! Item was added: + ----- Method: ExternalType>>isArrayType (in category 'testing') ----- + isArrayType + + ^ false! Item was changed: ----- Method: Parser>>externalType: (in category '*FFI-Kernel') ----- externalType: descriptorClass "Parse and return an external type" + | xType typeName isArrayType | - | xType typeName | typeName := here. "Note that pointer token is not yet parsed!!" + self advance. + (isArrayType := self matchToken: $[) + ifTrue: [ + typeName := typeName, '[', here, ']'. + self advance. + self matchToken: $]]. (xType := descriptorClass typeNamed: typeName) ifNil: [ "Raise an error if user is there" self interactive ifTrue: [^nil]. "otherwise go over it silently -- use an unknown struct type" + xType := descriptorClass newTypeNamed: typeName]. + isArrayType ifTrue: [ + self flag: #todo. "mt: We must send arrays as pointers." + xType := xType asPointerType]. - xType := descriptorClass newTypeNamed: here]. - self advance. ^ (self matchToken: #*) ifTrue:[xType asPointerType] ifFalse:[(self matchToken: #**) ifTrue: [xType asPointerToPointerType] ifFalse: [xType]]!

2 1

FFI: FFI-Tools-mt.25.mcz
by commits＠source.squeak.org 04 May '21

04 May '21

Marcel Taeumel uploaded a new version of FFI-Tools to project FFI: http://source.squeak.org/FFI/FFI-Tools-mt.25.mcz ==================== Summary ==================== Name: FFI-Tools-mt.25 Author: mt Time: 4 May 2021, 4:52:46.043881 pm UUID: 231205aa-3bb9-7142-a9d3-e3b1e52e121d Ancestors: FFI-Tools-mt.24 Shout support for array types. Complements FFI-Kernel-mt.130 =============== Diff against FFI-Tools-mt.24 =============== Item was changed: ----- Method: SHParserST80>>parseExternalCall (in category '*FFI-Tools') ----- parseExternalCall self addRangeType: #externalFunctionCallingConvention. [self scanNext. ((Smalltalk at: #ExternalFunction) callingConventionModifierFor: currentToken) notNil] whileTrue. self failUnless: currentToken notNil. self scanPast: #externalCallType. currentToken = '*' ifTrue: [self scanPast: #externalCallTypePointerIndicator]. + currentToken = '[' + ifTrue: ["array types return" + self scanPast: #externalCallType. + [currentTokenFirst ~= $]] + whileTrue: [ + self failUnless: currentTokenFirst isDigit. + self scanPast: #externalCallType]. + self scanPast: #externalCallType]. currentTokenFirst isDigit ifTrue: [self scanPast: #integer] ifFalse: [ self failUnless: currentTokenFirst == $'. self parseString]. self failUnless: currentTokenFirst == $(. self scanPast: #leftParenthesis. [currentTokenFirst ~= $)] whileTrue: [ self failUnless: currentToken notNil. self scanPast: #externalCallType. currentToken = '*' ifTrue: [self scanPast: #externalCallTypePointerIndicator]]. self scanPast: #rightParenthesis. currentToken = 'module:' ifTrue: [ self scanPast: #module. self parseStringOrSymbol ]. currentToken = 'error:' ifTrue: [ self scanPast: #primitive. "there's no rangeType for error" self currentTokenType == #name ifTrue: [ self parseTemporary: #patternTempVar ] ifFalse: [ self parseStringOrSymbol ] ]. self failUnless: currentToken = '>'. self scanPast: #primitiveOrExternalCallEnd!

1 0

FFI: FFI-Tests-mt.25.mcz
by commits＠source.squeak.org 04 May '21

04 May '21

Marcel Taeumel uploaded a new version of FFI-Tests to project FFI: http://source.squeak.org/FFI/FFI-Tests-mt.25.mcz ==================== Summary ==================== Name: FFI-Tests-mt.25 Author: mt Time: 4 May 2021, 4:52:20.680881 pm UUID: 7168c581-7b46-2243-bc64-c48a504ce87c Ancestors: FFI-Tests-mt.24 More tests. Complements FFI-Kernel-mt.130 =============== Diff against FFI-Tests-mt.24 =============== Item was added: + ----- Method: ExternalStructureTests>>test07AccessingArrays (in category 'tests') ----- + test07AccessingArrays + + | data | + data := FFITestSdA5i new. + self assert: data a5i2 first equals: 0. + data writer a5i2 at: 1 put: 42. + self assert: data a5i2 first equals: 42. + + data := heapObject := FFITestSdA5i externalNew. + data zeroMemory. + self assert: data a5i2 first equals: 0. + data a5i2 at: 1 put: 42. + self assert: data a5i2 first equals: 42.! Item was added: + ----- Method: FFITestLibrary class>>ffiTestArrayType (in category 'mocks') ----- + ffiTestArrayType + + <cdecl: char[] 'ffiTestArrayType' (float[5] FFITestPoint2[10] int[0]) module: 'SqueakFFIPrims'> + ^ self externalCallFailed ! Item was added: + ExternalStructure subclass: #FFITestSdA5i + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'FFI-Tests-Fixtures'! Item was added: + ----- Method: FFITestSdA5i class>>fields (in category 'as yet unclassified') ----- + fields + " + FFITestSdA5i defineFields + " + ^ #( + (d1 'double') + (a5i2 'int32_t[5]') + )! Item was added: + ----- Method: FFITypeNameTests>>testArray (in category 'tests') ----- + testArray + + (self argTypesAt: #ffiTestArrayType) do: [:type | + self + assert: type isPointerType; + deny: type isArrayType; + assert: type asNonPointerType isArrayType; + assert: type asNonPointerType size >= 0]!

1 0

FFI: FFI-Tools-mt.24.mcz
by commits＠source.squeak.org 04 May '21

04 May '21

Marcel Taeumel uploaded a new version of FFI-Tools to project FFI: http://source.squeak.org/FFI/FFI-Tools-mt.24.mcz ==================== Summary ==================== Name: FFI-Tools-mt.24 Author: mt Time: 4 May 2021, 4:43:42.172881 pm UUID: 411d91ef-c5dc-3643-b69f-8c9620d93201 Ancestors: FFI-Tools-mt.23 Make use of the byte-array writer to conveniently explore composite structures along with proper support for do-it. Both of which is fine for heap objects but challenging for handles that are byte arrays. =============== Diff against FFI-Tools-mt.23 =============== Item was changed: ----- Method: ExternalObjectHandleWrapper>>objectString (in category 'accessing') ----- objectString + | label handle | + label := super objectString. + handle := self getHandle. - self getHandle class == ExternalAddress ifTrue: [^ super objectString]. - self getHandle class == ByteArray ifTrue: [^ super objectString]. + handle isExternalAddress ifTrue: [^ label]. + handle isInternalMemory ifTrue: [ + ^ (thisContext objectClass: handle) == ByteArrayReadWriter + ifFalse: [label] + ifTrue: [ | begin end | + label :=(thisContext object: handle instVarAt: 3) printString. + label := label copyFrom: 3 to: (label size - 1). + begin := (thisContext object: handle instVarAt: 1) + 1. + end := begin + (thisContext object: handle instVarAt: 2) - 1. + String streamContents: [:stream | + stream nextPutAll: '#[ '. + (label findTokens: ' ' "#[0 0 0 0 0]") withIndexDo: [:token :index | + (index between: begin and: end) + ifTrue: [stream nextPutAll: token] + ifFalse: ["Skip byte info" stream nextPut: $.]. + stream space]. + stream nextPutAll: ']'. + ]]]. + "Type aliases to atomic types store primitive Smalltalk objects in their handle. Indicate that role of actually being a handle for the FFI plugin with a small prefix." + ^ '-> ', label! - ^ '-> ', super objectString! Item was added: + ----- Method: ExternalStructure>>explore (in category '*FFI-Tools') ----- + explore + "Sneak in a reader so that do-its will work better from the obeject explorer." + + self reader perform: #explore withArguments: #() inSuperclass: ExternalObject.!

1 0

FFI: FFI-Kernel-mt.129.mcz
by commits＠source.squeak.org 04 May '21

04 May '21

Marcel Taeumel uploaded a new version of FFI-Kernel to project FFI: http://source.squeak.org/FFI/FFI-Kernel-mt.129.mcz ==================== Summary ==================== Name: FFI-Kernel-mt.129 Author: mt Time: 4 May 2021, 4:41:16.129881 pm UUID: 3f7ca6ff-5440-8242-8b9f-d21f6255163a Ancestors: FFI-Kernel-mt.128 Fixes a minor glitch in the byte-array read-writer. =============== Diff against FFI-Kernel-mt.128 =============== Item was added: + ----- Method: ByteArrayReadWriter>>perform:with: (in category 'message handling') ----- + perform: aSymbol with: anObject + "Needed because of AtomicSelectors. See ExternalType >> #handle:at:." + + <primitive: 83> + ^ self perform: aSymbol withArguments: { anObject }! Item was added: + ----- Method: ByteArrayReadWriter>>perform:with:with: (in category 'message handling') ----- + perform: aSymbol with: firstObject with: secondObject + "Needed because of AtomicSelectors. See ExternalType >> #handle:at:put:." + + <primitive: 83> + ^ self perform: aSymbol withArguments: { firstObject. secondObject }! Item was changed: ----- Method: ByteArrayReadWriter>>setArray: (in category 'initialization') ----- setArray: aByteArray + self setArray: aByteArray offset: 0 size: aByteArray size.! - byteArray := aByteArray. - byteOffset := 0. - byteSize := aByteArray size.!

1 0

FFI: FFI-Tests-mt.24.mcz
by commits＠source.squeak.org 04 May '21

04 May '21

Marcel Taeumel uploaded a new version of FFI-Tests to project FFI: http://source.squeak.org/FFI/FFI-Tests-mt.24.mcz ==================== Summary ==================== Name: FFI-Tests-mt.24 Author: mt Time: 4 May 2021, 12:23:31.205881 pm UUID: 1baeb097-81ea-2345-8bb8-b100fdb55983 Ancestors: FFI-Tests-mt.23 More tests. Complements FFI-Kernel-mt.128 =============== Diff against FFI-Tests-mt.23 =============== Item was added: + ----- Method: ExternalStructureTests>>test01FromToInternal (in category 'tests - external data') ----- + test01FromToInternal + "Access a sub-range in the external data. Internal memory will be copied if not accessed through a read-writer." + + | points portion | + points := FFITestPoint2 allocate: 5. + portion := points from: 2 to: 3. + self assert: portion getHandle isInternalMemory. + + portion withIndexDo: [:point :index | point setX: index+1 setY: index+1]. + self "Forgot to use a read-writer..." + assert: { 0@0 . 0@0 . 0@0 . 0@0 . 0@0 } + equals: (points collect: [:each | each asPoint]). + + portion withIndexDo: [:point :index | point setX: index+1 setY: index+1]. + self "Forgot to use a read-writer early enough..." + assert: { 0@0 . 0@0 . 0@0 . 0@0 . 0@0 } + equals: (points collect: [:each | each asPoint]). + + portion := points writer from: 2 to: 3. + portion withIndexDo: [:point :index | point setX: index+1 setY: index+1]. + self + assert: { 0@0 . 2@2 . 3@3 . 0@0 . 0@0 } + equals: (points collect: [:each | each asPoint]). + + points zeroMemory. + portion := points reader from: 2 to: 3. + portion writer withIndexDo: [:point :index | point setX: index+1 setY: index+1]. + self "Both #reader and #writer used. No worries." + assert: { 0@0 . 2@2 . 3@3 . 0@0 . 0@0 } + equals: (points collect: [:each | each asPoint]).! Item was added: + ----- Method: ExternalStructureTests>>test02FromToExternal (in category 'tests - external data') ----- + test02FromToExternal + "Access a sub-range in the external data. External memory will not be copied." + + | points portion | + points := heapObject := FFITestPoint2 allocateExternal: 5. + points zeroMemory. + + portion := points from: 2 to: 3. + self assert: portion getHandle isExternalAddress. + + portion withIndexDo: [:point :index | point setX: index+1 setY: index+1]. + self + assert: { 0@0 . 2@2 . 3@3 . 0@0 . 0@0 } + equals: (points collect: [:each | each asPoint]).! Item was added: + ----- Method: ExternalStructureTests>>test03CopyFromExternalToInternal (in category 'tests - external data') ----- + test03CopyFromExternalToInternal + + | points copy | + points := FFITestPoint2 allocateExternal: 5. + points zeroMemory. + self assert: points getHandle isExternalAddress. + + copy := points copyFrom: 2 to: 3. + self assert: copy getHandle isInternalMemory. + + "We need a writer to modify internal memory." + copy withIndexDo: [:point :index | point setX: index+1 setY: index+1]. + self deny: { 2@2 . 3@3 } equals: (copy collect: [:each | each asPoint]). + copy writer withIndexDo: [:point :index | point setX: index+1 setY: index+1]. + self assert: { 2@2 . 3@3 } equals: (copy collect: [:each | each asPoint]). + + "Check that we did not touch the external memory." + self + assert: { 0@0 . 0@0 . 0@0 . 0@0 . 0@0 } + equals: (points collect: [:each | each asPoint]).! Item was added: + ----- Method: ExternalStructureTests>>test04CopyFromInternalToInternal (in category 'tests - external data') ----- + test04CopyFromInternalToInternal + + | points copy | + points := FFITestPoint2 allocate: 5. + self assert: points getHandle isInternalMemory. + + copy := points copyFrom: 2 to: 3. + self assert: copy getHandle isInternalMemory. + + "We need a writer to modify internal memory." + copy withIndexDo: [:point :index | point setX: index+1 setY: index+1]. + self deny: { 2@2 . 3@3 } equals: (copy collect: [:each | each asPoint]). + copy writer withIndexDo: [:point :index | point setX: index+1 setY: index+1]. + self assert: { 2@2 . 3@3 } equals: (copy collect: [:each | each asPoint]). + + "Check that we did not touch the original." + self + assert: { 0@0 . 0@0 . 0@0 . 0@0 . 0@0 } + equals: (points collect: [:each | each asPoint]).! Item was changed: ----- Method: ExternalStructureTests>>test06AccessingTypeAliasForAtomic (in category 'tests') ----- test06AccessingTypeAliasForAtomic | char | self should: [FFITestCharAlias new] raise: Error. char := FFITestCharAlias fromHandle: $C. self assert: $C equals: char value. char value: $A. self assert: $A equals: char value. char zeroMemory. + self assert: 0 equals: char value asInteger.! - self assert: $0 equals: char value.!

1 0

FFI: FFI-Kernel-mt.128.mcz
by commits＠source.squeak.org 04 May '21

04 May '21

Marcel Taeumel uploaded a new version of FFI-Kernel to project FFI: http://source.squeak.org/FFI/FFI-Kernel-mt.128.mcz ==================== Summary ==================== Name: FFI-Kernel-mt.128 Author: mt Time: 4 May 2021, 12:22:47.736881 pm UUID: b1af22ec-1c21-a544-82f7-af8466544ab9 Ancestors: FFI-Kernel-mt.127 Renames byte-array writer to read-writer because it can improve reading by avoiding intermediate copies. Fixes and refactors #from:to: in ExternalData to support ByteArrayReadWriter by just re-using #structAt:length:, which works as expected on ByteArray and ExternalAddress. Signal an exception when trying to instantiate external data without a type. Adds some common accessors known from sequenceable collections to external data to help write more compact tests. =============== Diff against FFI-Kernel-mt.127 =============== Item was changed: SystemOrganization addCategory: #'FFI-Kernel'! + SystemOrganization addCategory: #'FFI-Kernel-Support'! Item was added: + ProtoObject subclass: #ByteArrayReadWriter + instanceVariableNames: 'byteOffset byteSize byteArray' + classVariableNames: '' + poolDictionaries: '' + category: 'FFI-Kernel-Support'! + + !ByteArrayReadWriter commentStamp: 'mt 5/3/2021 17:44' prior: 0! + I am a transparent wrapper over byte-array handles to allow access and manipulation just like through an external address.! Item was added: + ----- Method: ByteArrayReadWriter class>>on: (in category 'instance creation') ----- + on: handle + "Wraps the given handle into a read-writer. Avoid double-wrapping." + + self assert: [handle isInternalMemory]. + + ^ (thisContext objectClass: handle) == self + ifTrue: [handle] + ifFalse: [self new setArray: handle]! Item was added: + ----- Method: ByteArrayReadWriter>>doesNotUnderstand: (in category 'system primitives') ----- + doesNotUnderstand: aMessage + + | selector args | + selector := aMessage selector. + args := aMessage arguments. + args size caseOf: { + [ 1 ] -> [ (selector endsWith: 'At:') ifTrue: [ args at: 1 put: args first + byteOffset ] ]. + [ 2 ] -> [ (selector endsWith: 'length:') + ifTrue: [ + args at: 1 put: args first + byteOffset. + args first + args second > byteSize + ifTrue: [self errorSubscriptBounds: args first + args second] ] + ifFalse: [(selector endsWith: 'put:') ifTrue: [ + args at: 1 put: args first + byteOffset ]] ]. + [ 3 ] -> [ (selector endsWith: 'length:') + ifTrue: [ + args at: 1 put: args first + byteOffset. + args first + args third > byteSize + ifTrue: [self errorSubscriptBounds: args first + args third]]] + } otherwise: []. + ^ aMessage sendTo: byteArray! Item was added: + ----- Method: ByteArrayReadWriter>>errorSubscriptBounds: (in category 'initialization') ----- + errorSubscriptBounds: index + + Error signal: 'subscript is out of bounds: ' , index printString.! Item was added: + ----- Method: ByteArrayReadWriter>>setArray: (in category 'initialization') ----- + setArray: aByteArray + + byteArray := aByteArray. + byteOffset := 0. + byteSize := aByteArray size.! Item was added: + ----- Method: ByteArrayReadWriter>>setArray:offset:size: (in category 'initialization') ----- + setArray: aByteArray offset: aByteOffset size: aByteSize + + byteArray := aByteArray. + byteOffset := aByteOffset. + byteSize := aByteSize. + + (byteOffset + byteSize > byteArray size) + ifTrue: [self errorSubscriptBounds: byteOffset + byteSize].! Item was added: + ----- Method: ByteArrayReadWriter>>structAt:length: (in category 'accessing') ----- + structAt: newByteOffset length: newLength + + ^ ByteArrayReadWriter new + setArray: byteArray + offset: byteOffset + newByteOffset - 1 + size: newLength! Item was added: + ----- Method: ByteArrayReadWriter>>structAt:put:length: (in category 'accessing') ----- + structAt: newByteOffset put: value length: newLength + + (newByteOffset + newLength > byteSize) + ifTrue: [self errorSubscriptBounds: newByteOffset + newLength]. + + ^ byteArray + structAt: byteOffset + newByteOffset - 1 + put: value + length: newLength! Item was removed: - ProtoObject subclass: #ByteArrayWriter - instanceVariableNames: 'byteOffset byteSize byteArray' - classVariableNames: '' - poolDictionaries: '' - category: 'FFI-Kernel'! - - !ByteArrayWriter commentStamp: 'mt 5/3/2021 17:44' prior: 0! - I am a transparent wrapper over byte-array handles to allow access and manipulation just like through an external address.! Item was removed: - ----- Method: ByteArrayWriter class>>on: (in category 'instance creation') ----- - on: handle - - self assert: [handle isInternalMemory]. - ^ self new setArray: handle! Item was removed: - ----- Method: ByteArrayWriter>>doesNotUnderstand: (in category 'system primitives') ----- - doesNotUnderstand: aMessage - - | selector args | - selector := aMessage selector. - args := aMessage arguments. - args size caseOf: { - [ 1 ] -> [ (selector endsWith: 'At:') ifTrue: [ args at: 1 put: args first + byteOffset ] ]. - [ 2 ] -> [ (selector endsWith: 'length:') - ifTrue: [ - args at: 1 put: args first + byteOffset. - args first + args second > byteSize - ifTrue: [self errorSubscriptBounds: args first + args second] ] - ifFalse: [(selector endsWith: 'put:') ifTrue: [ - args at: 1 put: args first + byteOffset ]] ]. - [ 3 ] -> [ (selector endsWith: 'length:') - ifTrue: [ - args at: 1 put: args first + byteOffset. - args first + args third > byteSize - ifTrue: [self errorSubscriptBounds: args first + args third]]] - } otherwise: []. - ^ aMessage sendTo: byteArray! Item was removed: - ----- Method: ByteArrayWriter>>errorSubscriptBounds: (in category 'initialization') ----- - errorSubscriptBounds: index - - Error signal: 'subscript is out of bounds: ' , index printString.! Item was removed: - ----- Method: ByteArrayWriter>>setArray: (in category 'initialization') ----- - setArray: aByteArray - - byteArray := aByteArray. - byteOffset := 0. - byteSize := aByteArray size.! Item was removed: - ----- Method: ByteArrayWriter>>setArray:offset:size: (in category 'initialization') ----- - setArray: aByteArray offset: aByteOffset size: aByteSize - - byteArray := aByteArray. - byteOffset := aByteOffset. - byteSize := aByteSize. - - (byteOffset + byteSize > byteArray size) - ifTrue: [self errorSubscriptBounds: byteOffset + byteSize].! Item was removed: - ----- Method: ByteArrayWriter>>structAt:length: (in category 'accessing') ----- - structAt: newByteOffset length: newLength - - ^ ByteArrayWriter new - setArray: byteArray - offset: byteOffset + newByteOffset - 1 - size: newLength! Item was removed: - ----- Method: ByteArrayWriter>>structAt:put:length: (in category 'accessing') ----- - structAt: newByteOffset put: value length: newLength - - (newByteOffset + newLength > byteSize) - ifTrue: [self errorSubscriptBounds: newByteOffset + newLength]. - - ^ byteArray - structAt: byteOffset + newByteOffset - 1 - put: value - length: newLength! Item was added: + ----- Method: ExternalData class>>fromHandle: (in category 'instance creation') ----- + fromHandle: aHandle + "We need type information. See #fromHandle:type:" + self shouldNotImplement.! Item was added: + ----- Method: ExternalData>>eighth (in category 'accessing - convenience') ----- + eighth + + ^ self at: 8! Item was added: + ----- Method: ExternalData>>fifth (in category 'accessing - convenience') ----- + fifth + + ^ self at: 5! Item was added: + ----- Method: ExternalData>>first (in category 'accessing - convenience') ----- + first + + ^ self at: 1! Item was added: + ----- Method: ExternalData>>fourth (in category 'accessing - convenience') ----- + fourth + + ^ self at: 4! Item was changed: ----- Method: ExternalData>>from:to: (in category 'accessing') ----- from: firstIndex to: lastIndex "Only copy data if already in object memory, that is, as byte array. Only check size if configured." | byteOffset numElements byteSize newType | ((1 > firstIndex) or: [size notNil and: [lastIndex > size]]) ifTrue: [^ self errorSubscriptBounds: lastIndex]. byteOffset := ((firstIndex-1) * self contentType byteSize)+1. + numElements := lastIndex - firstIndex + 1 max: 0. - numElements := lastIndex - firstIndex + 1. byteSize := numElements * self contentType byteSize. "For portions of a null-terminated C string, change the type from char* to byte* to avoid confusion." newType := self containerType = ExternalType string ifTrue: [ExternalType byte asPointerType] ifFalse: [self containerType "No change"]. + ^ (ExternalData + fromHandle: (handle structAt: byteOffset length: byteSize) + type: newType) size: numElements; yourself! - ^ lastIndex < firstIndex - ifTrue: [ - handle isExternalAddress - ifTrue: [(ExternalData - fromHandle: handle + (byteOffset - 1) "Keep pointer." - type: newType) size: 0; yourself] - ifFalse: [(ExternalData - fromHandle: #[] "Empty memory" - type: newType) size: 0; yourself]] - ifFalse: [ - handle isExternalAddress - ifTrue: [(ExternalData - fromHandle: handle + (byteOffset - 1) - type: newType) size: numElements; yourself] - ifFalse: [(ExternalData - fromHandle: (handle copyFrom: byteOffset to: byteOffset+byteSize-1) - type: newType) size: numElements; yourself]]! Item was added: + ----- Method: ExternalData>>ninth (in category 'accessing - convenience') ----- + ninth + + ^ self at: 9! Item was added: + ----- Method: ExternalData>>second (in category 'accessing - convenience') ----- + second + + ^ self at: 2! Item was added: + ----- Method: ExternalData>>seventh (in category 'accessing - convenience') ----- + seventh + + ^ self at: 7! Item was added: + ----- Method: ExternalData>>sixth (in category 'accessing - convenience') ----- + sixth + + ^ self at: 6! Item was added: + ----- Method: ExternalData>>third (in category 'accessing - convenience') ----- + third + + ^ self at: 3! Item was added: + ----- Method: ExternalData>>writer (in category 'accessing') ----- + writer + "Overwritten to preserve type and size." + handle isInternalMemory ifFalse: [^ self]. + + ^ (self class + fromHandle: (ByteArrayReadWriter on: handle) + type: type) size: size; yourself! Item was added: + ----- Method: ExternalStructure>>reader (in category 'accessing') ----- + reader + + ^ self writer! Item was changed: ----- Method: ExternalStructure>>writer (in category 'accessing') ----- writer ^ handle isInternalMemory "Wrap handle into helper to address offsets in the byte array." + ifTrue: [self class fromHandle: (ByteArrayReadWriter on: handle)] - ifTrue: [self class fromHandle: (ByteArrayWriter on: handle)] "Either alias-to-atomic or already in external memory." ifFalse: [self]!

1 0

FFI: FFI-Tools-mt.23.mcz
by commits＠source.squeak.org 04 May '21

04 May '21

Marcel Taeumel uploaded a new version of FFI-Tools to project FFI: http://source.squeak.org/FFI/FFI-Tools-mt.23.mcz ==================== Summary ==================== Name: FFI-Tools-mt.23 Author: mt Time: 4 May 2021, 10:57:22.658881 am UUID: 1c015fd1-e56d-a84a-b4c8-5987e99cbcbd Ancestors: FFI-Tools-mt.22 In object explorers, change the repersentation of compiledSpec to better reflect its intentions. I suppose. :-) Note that compiledSpec is a WordArray. I changed the appearance of the words in the array to distinguish atomic type, type flags, byte size, and start/end of embedded structs. =============== Diff against FFI-Tools-mt.22 =============== Item was added: + ObjectExplorerWrapper subclass: #CompiledSpecWrapper + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: 'FFIConstants' + category: 'FFI-Tools'! Item was added: + ----- Method: CompiledSpecWrapper>>contents (in category 'accessing') ----- + contents + + ^ self object isInteger ifTrue: [#()] ifFalse: [ "WordArray" + Array streamContents: [:s | + self object withIndexDo: [:word :index | + s nextPut: (self class + with: word + name: index printString + model: self model)]]]! Item was added: + ----- Method: CompiledSpecWrapper>>objectString (in category 'accessing') ----- + objectString + + ^ self object isInteger + ifFalse: [self printWordArray] + ifTrue: [self printWordArrayElement]! Item was added: + ----- Method: CompiledSpecWrapper>>print:base:group:length: (in category 'printing') ----- + print: integer base: base group: group length: length + + ^ String streamContents: [:stream | + | label | + label := integer printStringBase: base. + label := label padded: #left to: length with: $0. + (1 to: label size by: group) + do: [:index | + 1 to: group do: [:gIndex | + stream nextPut: (label at: index + gIndex - 1)]] + separatedBy: [stream space]]! Item was added: + ----- Method: CompiledSpecWrapper>>printWordArray (in category 'printing') ----- + printWordArray + + ^ String streamContents: [:stream | + stream nextPutAll: '16r ['. + self object + do: [:word | stream nextPutAll: (self print: word base: 16 group: 2 length: 8)] + separatedBy: [stream nextPutAll: ' | ']. + stream nextPut: $] ]! Item was added: + ----- Method: CompiledSpecWrapper>>printWordArrayElement (in category 'printing') ----- + printWordArrayElement + + ^ String streamContents: [:stream | + + | atomicType externalType byteSize isStructStart isStructEnd isHeader | + atomicType := (self object bitAnd: FFIAtomicTypeMask) >> FFIAtomicTypeShift. + externalType := (self object bitAnd: 16rFF0000) >> (FFIAtomicTypeShift - 8). + byteSize := (self object bitAnd: FFIStructSizeMask). + + isHeader := self itemName = '1'. + isStructStart := isHeader not and: [(self object anyMask: FFIFlagStructure) and: [byteSize ~= 0]]. + isStructEnd := (self object anyMask: FFIFlagStructure) and: [byteSize = 0]. + + stream + nextPutAll: (atomicType asString padded: #left to: 2 with: Character space); + nextPutAll: ' | '; + nextPutAll: (self print: externalType base: 2 group: 4 length: 8); + nextPutAll: ' | '; + nextPutAll: (self print: byteSize base: 16 group: 2 length: 4); + nextPutAll: ' ('; + nextPutAll: byteSize asString; + nextPutAll: ' bytes)'. + isHeader ifTrue: [stream nextPutAll: ' --- HEADER']. + isStructStart ifTrue: [stream nextPutAll: ' --- STRUCT START']. + isStructEnd ifTrue: [stream nextPutAll: ' --- STRUCT END']].! Item was added: + ----- Method: ExternalType>>explorerContents (in category '*FFI-Tools') ----- + explorerContents + + | basicExplorerFields | + basicExplorerFields := super explorerContents. + basicExplorerFields do: [:explorerField | + explorerField itemName = 'compiledSpec' ifTrue: [ + explorerField changeClassTo: CompiledSpecWrapper]]. + ^ basicExplorerFields!

2 1

FFI: FFI-Kernel-mt.127.mcz
by commits＠source.squeak.org 04 May '21

04 May '21

Marcel Taeumel uploaded a new version of FFI-Kernel to project FFI: http://source.squeak.org/FFI/FFI-Kernel-mt.127.mcz ==================== Summary ==================== Name: FFI-Kernel-mt.127 Author: mt Time: 4 May 2021, 9:54:26.141881 am UUID: 143e5c5b-ccff-9143-823d-4d6657005d2c Ancestors: FFI-Kernel-mt.126 Makes extra type checks optional, disabled by default. (This feature more care because some checks are wrong. Thanks to Ron for reporting this!) (Also fixes Character zero, which should actually be the NUL character.) =============== Diff against FFI-Kernel-mt.126 =============== Item was changed: ----- Method: Character class>>zero (in category '*FFI-Kernel') ----- zero "See ExternalStructure >> #zeroMemory." + ^ Character value: 0! - ^ $0! Item was changed: ----- Method: ExternalStructureType>>checkType (in category 'external structure') ----- checkType + self class extraTypeChecks ifFalse: [^ self]. + self assert: [self isPointerType not] description: 'Convert to ExternalType to use this feature'. referentClass ifNil: [self error: 'Unknown structure type']. self isEmpty ifTrue: [self error: 'Empty structure']. ! Item was changed: ----- Method: ExternalStructureType>>handle:at: (in category 'external data') ----- handle: handle at: byteOffset "Read the receiver's external type using the given handle and the byteOffset. This is the dynamic version of #readFieldAt:." | result | + self checkType. - self - assert: [self isPointerType not] - description: 'Use ExternalStructure to use this feature.'. - referentClass ifNil: [self error: 'Unknown structure type']. - self isEmpty ifTrue: [self error: 'Empty structure']. - result := self isAtomic ifTrue: [ handle "alias to atomic" perform: (AtomicSelectors at: self atomicType) with: byteOffset] ifFalse: [ handle "regular struct or alias to struct or alias to pointer" structAt: byteOffset length: self byteSize]. ^ referentClass fromHandle: result! Item was changed: ----- Method: ExternalStructureType>>handle:at:put: (in category 'external data') ----- handle: handle at: byteOffset put: value "Write a value using the receiver's external type at the given handle and byteOffset. This is the dynamic version of #writeFieldAt:with:." + self checkType. - self - assert: [self isPointerType not] - description: 'Use ExternalType to use this feature.'. - - referentClass ifNil: [self error: 'Unknown structure type']. - self isEmpty ifTrue: [self error: 'Empty structure']. self isAtomic ifTrue: [ "alias to atomic" self flag: #addTypeCheck. "mt: Note that there is currently no mapping from objects that represent valid atomics to atomic types." ^ handle perform: ((AtomicSelectors at: self atomicType), 'put:') asSymbol with: byteOffset with: value getHandle] ifFalse: [ "regular struct or alias to struct or alias to pointer" self assert: [value externalType == self]. ^ handle structAt: byteOffset put: value getHandle length: self byteSize].! Item was changed: ----- Method: ExternalStructureType>>writeAliasWith: (in category 'external structure') ----- writeAliasWith: valueName "this is an aliased structure type" "expect the value have that structure type with either byte array or external address as handle" self checkType. ^ String streamContents: [:s | + self class extraTypeChecks ifTrue: [ + s nextPutAll: ('self assert: [{1} class externalType == {2}].' format: {valueName. self storeString}); crtab]. - s nextPutAll: ('self assert: [{1} class externalType == {2}].' format: {valueName. self storeString}); crtab. s nextPutAll:'handle := ', valueName,' getHandle']! Item was changed: ----- Method: ExternalStructureType>>writeFieldAt:with: (in category 'external structure') ----- writeFieldAt: byteOffset with: valueName "Answer a string defining the accessor to an entity of the receiver type starting at the given byte offset. Private. Used for field definition only." self checkType. ^String streamContents:[:s| self isAtomic ifTrue: [ "alias to atomic" + self class extraTypeChecks ifTrue: [ + self flag: #addTypeCheck. "mt: Note that there is currently no mapping from objects that represent valid atomics to atomic types."]. - self flag: #addTypeCheck. "mt: Note that there is currently no mapping from objects that represent valid atomics to atomic types." s nextPutAll:'handle '; nextPutAll: (AtomicSelectors at: self atomicType); space; print: byteOffset; nextPutAll:' put: '; nextPutAll: valueName; nextPutAll: ' getHandle'] ifFalse: [ "regular struct or alias to struct or alias to pointer" + self class extraTypeChecks ifTrue: ["expect either byte array or external address as handle" + s nextPutAll: ('self assert: [{1} class externalType == {2}].' format: {valueName. self storeString}); crtab]. - "expect either byte array or external address as handle" - s nextPutAll: ('self assert: [{1} class externalType == {2}].' format: {valueName. self storeString}); crtab. self isTypeAliasForPointer ifFalse: [ s nextPutAll:'handle structAt: '; print: byteOffset; nextPutAll:' put: '; nextPutAll: valueName; nextPutAll:' getHandle'; nextPutAll:' length: '; print: self byteSize; nextPutAll:'.'] ifTrue: [ s nextPutAll:'handle pointerAt: '; print: byteOffset; nextPutAll:' put: '; nextPutAll: valueName; nextPutAll:' getHandle asExternalPointer'; nextPutAll:' length: '; print: self byteSize; nextPutAll:'.']]].! Item was changed: Object subclass: #ExternalType instanceVariableNames: 'compiledSpec referentClass referencedType byteAlignment' + classVariableNames: 'AtomicSelectors AtomicTypeNames AtomicTypes ExtraTypeChecks StructTypes' - classVariableNames: 'AtomicSelectors AtomicTypeNames AtomicTypes StructTypes' 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 added: + ----- Method: ExternalType class>>extraTypeChecks (in category 'preferences') ----- + extraTypeChecks + <preference: 'Extra type checks' + categoryList: #('FFI Kernel') + description: 'When true, there will be extra type checks during dynamic or compiled access to external objects (e.g. structures, unions).' + type: #Boolean> + ^ExtraTypeChecks ifNil:[false]! Item was added: + ----- Method: ExternalType class>>extraTypeChecks: (in category 'preferences') ----- + extraTypeChecks: aBoolean + + ExtraTypeChecks = aBoolean ifTrue: [^ self]. + + ExtraTypeChecks := aBoolean. + + Cursor wait showWhile: [ + "Recompile all compiled artifacts." + ExternalStructure defineAllFields].! Item was changed: ----- Method: ExternalType>>checkType (in category 'external structure') ----- checkType + self class extraTypeChecks ifFalse: [^ self]. + (self isPointerType not and: [referentClass notNil]) ifTrue: [self error: 'Must convert to ExternalStructureType before use']. self assert: [self isStructureType not] description: 'Convert to ExternalStructureType to use this feature'.! Item was changed: ----- Method: ExternalType>>writeAliasWith: (in category 'external structure') ----- writeAliasWith: valueName self checkType. ^ String streamContents: [:s | self isPointerType ifFalse: [ "this is an aliased atomic non-pointer type" + self class extraTypeChecks ifTrue: [ + self flag: #addTypeCheck. "mt: Note that there is currently no mapping from objects that represent valid atomics to atomic types."]. - self flag: #addTypeCheck. "mt: Note that there is currently no mapping from objects that represent valid atomics to atomic types." s nextPutAll:'handle := ', valueName, '.'] ifTrue: [ "this is an aliased pointer type" + self class extraTypeChecks ifTrue: ["expect the value to be a structure/union/alias/data with an external address as handle" + s nextPutAll: ('self assert: [{1} externalType == {2}].' format: {valueName. self storeString}); crtab]. - "expect the value to be a structure/union/alias/data with an external address as handle" - s nextPutAll: ('self assert: [{1} externalType == {2}].' format: {valueName. self storeString}); crtab. s nextPutAll:'handle := ', valueName,' getHandle asByteArrayPointer']]! Item was changed: ----- Method: ExternalType>>writeFieldAt:with: (in category 'external structure') ----- writeFieldAt: byteOffset with: valueName "Answer a string defining the accessor to an entity of the receiver type starting at the given byte offset. Private. Used for field definition only." self checkType. ^ String streamContents: [:s | self isPointerType ifFalse: [ "Atomic value" + self class extraTypeChecks ifTrue: [ + self flag: #addTypeCheck. "mt: Note that there is currently no mapping from objects that represent valid atomics to atomic types."]. - self flag: #addTypeCheck. "mt: Note that there is currently no mapping from objects that represent valid atomics to atomic types." s nextPutAll:'handle '; nextPutAll: (AtomicSelectors at: self atomicType); space; print: byteOffset; nextPutAll:' put: '; nextPutAll: valueName] ifTrue: [ "Pointer to structure, union, type alias, or external data." + self class extraTypeChecks ifTrue: [ + s nextPutAll: ('self assert: [{1} externalType == {2}].' format: {valueName. self storeString}); crtab]. - s nextPutAll: ('self assert: [{1} externalType == {2}].' format: {valueName. self storeString}); crtab. s nextPutAll:'handle pointerAt: '; print: byteOffset; nextPutAll:' put: '; nextPutAll: valueName; nextPutAll:' getHandle'; nextPutAll: ' length: '; print: self byteSize; nextPutAll: '.']]! Item was changed: (PackageInfo named: 'FFI-Kernel') postscript: 'Smalltalk removeFromStartUpList: ExternalAddress. Smalltalk removeFromStartUpList: ExternalObject. "Split up types for external structures from atomic types." ExternalType resetAllStructureTypes. + "Re-generate all field accessors because type checks are now controlled by a new preference." - "Re-generate all field accessors because there are now type checks, too." ExternalStructure defineAllFields. '!

1 0

← Newer
1
...
28
29
30
31
32
33
34
35
Older →

Jump to page: