Squeak-dev May 2021

squeak-dev@lists.squeakfoundation.org

32 participants
344 discussions

Dictionary >> #at:ifAbsentPut:ifPresentPut:
by Thiede, Christoph 01 May '21

01 May '21

Hi all, recently I stumbled upon an extension method for Dictionary which *might* fit well into the Trunk: Dictionary >> #at: key ifAbsentPut: startBlock ifPresentPut: nextBlock "(c) 2020 Basti Kruck und Marcel Taeumel. :-)" (self includesKey: key) ifFalse: [ ^ self at: key put: startBlock value]. ^ self at: key put: (nextBlock value: (self at: key)) See https://github.com/hpi-swa/vivide/blob/c4ac5ea562bd563358d52ee41c149a3fbcff…. Usage: counter := counters at: key ifAbsentPut: [0] ifPresentPut: [:i | i + 1] What do you think, should we copy this into the Trunk? Or is it just fine to do something like this instead at the sender side: counter := counters at: key put: (counters at: key ifAbsent: [0] ifPresent: [:i | i + 1]) <http://www.hpi.de/> Also, I'm not sure about the order of arguments. Best, Christoph

4 4

FFI: FFI-Callbacks-mt.6.mcz
by commits＠source.squeak.org 01 May '21

01 May '21

Marcel Taeumel uploaded a new version of FFI-Callbacks to project FFI: http://source.squeak.org/FFI/FFI-Callbacks-mt.6.mcz ==================== Summary ==================== Name: FFI-Callbacks-mt.6 Author: mt Time: 1 May 2021, 8:27:57.27619 am UUID: d17398f2-ff43-0945-aa04-e00bf7b6e0ae Ancestors: FFI-Callbacks-mt.5 Adds register lookup for dynamic callback evaluation. Based on the assumption that a callback context is only used once per callback. =============== Diff against FFI-Callbacks-mt.5 =============== Item was changed: ----- Method: FFICallback>>evaluateDynamic: (in category 'callback - evaluators') ----- 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." + | byteOffset args intArgs intPos floatArgs floatPos | - | offset args | - offset := 1. - args := Array new: argumentTypes size. + handle := callbackContext stackPtr getHandle. + type := callbackContext stackPtr contentType. + byteOffset := 1. + + intArgs := callbackContext integerArguments. + intPos := 0. + floatArgs := callbackContext floatArguments. + floatPos := 0. + + args := Array new: argumentTypes size. 1 to: args size do: [:argIndex | | argType data | argType := argumentTypes at: argIndex. + + "1) Try to read arguments from registers." + data := (intPos < intArgs size and: [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]]. + + "2) If nothing was read, read the argument from the stack." + data ifNil: [ + data := argType handle: handle at: byteOffset. + byteOffset := byteOffset + + ((type byteSize max: argType byteSize) roundUpTo: type byteAlignment)]. + + args at: argIndex put: data]. - data := argType handle: handle at: offset. - args at: argIndex put: data. - "Move the offset. Consider the byte-alignment?" - offset := offset + ((type byteSize max: argType byteSize) roundUpTo: type byteSize)]. - ^ self setResult: (evaluableObject valueWithArguments: args) inContext: callbackContext! Item was changed: ----- Method: FFICallback>>evaluateDynamic_ARM32: (in category 'callback - evaluators') ----- evaluateDynamic_ARM32: callbackContext "Set handle to access arguments as most appropriate for the ABI. For ''RISCs'' it is the pointer to the integer register." <abi: #ARM32> <evaluator> + callbackContext integerArguments size: 4. + callbackContext floatArguments size: 8. - | intRegArgs floatRegArgs stackPtr | - intRegArgs := callbackContext intRegArgs. - intRegArgs size: 4. - floatRegArgs := callbackContext floatRegArgs. - floatRegArgs size: 8. - - stackPtr := callbackContext stackPtr. - - self assert: [argumentTypes size <= intRegArgs size]. - - self setArgData: intRegArgs. ^ self evaluateDynamic: callbackContext! Item was changed: ----- Method: FFICallback>>evaluateDynamic_ARM64: (in category 'callback - evaluators') ----- evaluateDynamic_ARM64: callbackContext "Set handle to access arguments as most appropriate for the ABI. ARMv8 with AArch64." <abi: #ARM64> <evaluator> + + callbackContext integerArguments size: 8. + callbackContext floatArguments size: 8. - - | intRegArgs floatRegArgs stackPtr | - intRegArgs := callbackContext intRegArgs. - intRegArgs size: 8. - floatRegArgs := callbackContext floatRegArgs. - floatRegArgs size: 8. - - stackPtr := callbackContext stackPtr. - - self assert: [argumentTypes size <= intRegArgs size]. - - self setArgData: intRegArgs. ^ self evaluateDynamic: callbackContext! Item was changed: ----- Method: FFICallback>>evaluateDynamic_IA32: (in category 'callback - evaluators') ----- evaluateDynamic_IA32: callbackContext "Set handle to access arguments as most appropriate for the ABI. For x86 (i.e. IA32) it is the stack pointer." + <abi: #IA32> <evaluator> - <abi: 'IA32'> <evaluator> + callbackContext integerArguments size: 0. + callbackContext floatArguments size: 0. - self setArgData: callbackContext stackPtr. ^ self evaluateDynamic: callbackContext! Item was changed: ----- Method: FFICallback>>evaluateDynamic_X64: (in category 'callback - evaluators') ----- evaluateDynamic_X64: callbackContext "Set handle to access arguments as most appropriate for the ABI. For ''RISCs'' it is the pointer to the integer register." <abi: #X64> <evaluator> + callbackContext integerArguments size: 6. + callbackContext floatArguments size: 8. - | intRegArgs floatRegArgs stackPtr | - intRegArgs := callbackContext intRegArgs. - intRegArgs size: 6. - floatRegArgs := callbackContext floatRegArgs. - floatRegArgs size: 8. - - stackPtr := callbackContext stackPtr. - - self assert: [argumentTypes size <= intRegArgs size]. - - self setArgData: intRegArgs. ^ self evaluateDynamic: callbackContext! Item was changed: ----- Method: FFICallback>>evaluateDynamic_X64Win64: (in category 'callback - evaluators') ----- evaluateDynamic_X64Win64: callbackContext "Set handle to access arguments as most appropriate for the ABI. For ''RISCs'' it is the pointer to the integer register." <abi: #X64Win64> <evaluator> + + callbackContext integerArguments size: 4. + callbackContext floatArguments size: 4. - - | intRegArgs floatRegArgs stackPtr | - intRegArgs := callbackContext intRegArgs. - intRegArgs size: 4. - floatRegArgs := callbackContext floatRegArgs. - floatRegArgs size: 4. - - stackPtr := callbackContext stackPtr. - - self assert: [argumentTypes size <= intRegArgs size]. - - self setArgData: intRegArgs. ^ self evaluateDynamic: callbackContext! Item was changed: ExternalStructure subclass: #FFICallbackContext + instanceVariableNames: 'floatArguments integerArguments' - instanceVariableNames: '' classVariableNames: '' poolDictionaries: 'FFICallbackConstants' category: 'FFI-Callbacks'! !FFICallbackContext commentStamp: 'mt 4/30/2021 11:32' prior: 0! A callback context is a data structure prepared from the VM for accessing the callback's arguments. See FFICallback >> #thunkEntryAddress. !!!!!! BE AWARE that the actual location of argument values in this structure depend on the current ABI (i.e. 'Application Binary Interface'). See FFIPlatformDescription to access the current ABI.! Item was added: + ----- Method: FFICallbackContext>>floatArguments (in category 'callback arguments') ----- + floatArguments + "Cache proxy to the list of float arguments (i.e. an ExternalData) to attach ABI-specific properties such as #size." + + ^ floatArguments ifNil: [ + floatArguments := self floatRegArgs]! Item was added: + ----- Method: FFICallbackContext>>integerArguments (in category 'callback arguments') ----- + integerArguments + "Cache proxy to the list of integer arguments (i.e. an ExternalData) to attach ABI-specific properties such as #size." + + ^ integerArguments ifNil: [ + integerArguments := self intRegArgs]!

1 0

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

01 May '21

Marcel Taeumel uploaded a new version of FFI-Kernel to project FFI: http://source.squeak.org/FFI/FFI-Kernel-mt.122.mcz ==================== Summary ==================== Name: FFI-Kernel-mt.122 Author: mt Time: 1 May 2021, 8:25:28.22519 am UUID: 6c3424fd-34f9-f44e-b109-3e27c0690885 Ancestors: FFI-Kernel-mt.121 Adds check to separate integer types from float types. There already is #isIntegerType. For example, callback handles can use this to choose between integer-registers and float-registers easily based on argument types. =============== Diff against FFI-Kernel-mt.121 =============== Item was added: + ----- Method: ExternalStructureType>>isFloatType (in category 'testing') ----- + isFloatType + "Overwritten to not raise an error for struct types." + + ^ false! Item was added: + ----- Method: ExternalType>>isFloatType (in category 'testing') ----- + isFloatType + "Return true if the receiver is a built-in float type" + | type | + type := self atomicType. + ^type = FFITypeSingleFloat or: [type = FFITypeDoubleFloat]!

1 0

The Trunk: Morphic-ct.1768.mcz
by commits＠source.squeak.org 01 May '21

01 May '21

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-ct.1768.mcz ==================== Summary ==================== Name: Morphic-ct.1768 Author: ct Time: 30 April 2021, 8:02:20.035293 pm UUID: 2c143938-6557-0b42-973c-6453d49680cf Ancestors: Morphic-mt.1767 Fixes a GrafPort bug when drawing round rectangle frames. In the past, the horizontal segments were too wide. Original snippet to reproduce (provided by Marcel, mt): morph := Morph new. morph extent: 500@500; borderWidth: 50; borderColor: Color red; cornerStyle: #rounded; cornerRadius: 20; yourself. morph openInHand. =============== Diff against Morphic-mt.1767 =============== Item was changed: ----- Method: GrafPort>>frameRoundRect:radius:borderWidth: (in category 'drawing support') ----- frameRoundRect: aRectangle radius: radius borderWidth: borderWidth | nextY outer nextOuterX ovalDiameter rectExtent rectOffset rectX rectY rectWidth rectHeight ovalRadius ovalRect innerRadius innerDiameter innerRect inner nextInnerX wp | aRectangle area <= 0 ifTrue: [^ self]. ovalDiameter := (radius * 2) asPoint min: aRectangle extent. (ovalDiameter x <= 0 or:[ovalDiameter y <= 0]) ifTrue:[ ^self fillRect: aRectangle offset: 0@0. ]. "force diameter to be even - this simplifies lots of stuff" ovalRadius := (ovalDiameter x // 2) @ (ovalDiameter y // 2). (ovalRadius x <= 0 or:[ovalRadius y <= 0]) ifTrue:[ ^self fillRect: aRectangle offset: 0@0. ]. wp := borderWidth asPoint. ovalDiameter := ovalRadius * 2. innerRadius := ovalRadius - borderWidth max: 0@0. innerDiameter := innerRadius * 2. rectExtent := aRectangle extent - ovalDiameter. rectWidth := rectExtent x. rectHeight := rectExtent y. rectOffset := aRectangle origin + ovalRadius. rectX := rectOffset x. rectY := rectOffset y. ovalRect := 0@0 extent: ovalDiameter. innerRect := 0@0 extent: innerDiameter. height := 1. outer := EllipseMidpointTracer new on: ovalRect. inner := EllipseMidpointTracer new on: innerRect. nextY := ovalRadius y. 1 to: (wp y min: nextY) do:[:i| nextOuterX := outer stepInY. width := nextOuterX * 2 + rectWidth. destX := rectX - nextOuterX. destY := rectY - nextY. self copyBits. destY := rectY + nextY + rectHeight - 1. self copyBits. nextY := nextY - 1. ]. [nextY > 0] whileTrue:[ nextOuterX := outer stepInY. nextInnerX := inner stepInY. destX := rectX - nextOuterX. destY := rectY - nextY. width := nextOuterX - nextInnerX. self copyBits. destX := rectX + nextInnerX + rectWidth. self copyBits. destX := rectX - nextOuterX. destY := rectY + nextY + rectHeight-1. self copyBits. destX := rectX + nextInnerX + rectWidth. self copyBits. nextY := nextY - 1. ]. destX := aRectangle left. destY := rectOffset y. height := rectHeight. width := wp x. self copyBits. destX := aRectangle right - width. self copyBits. innerRadius y = 0 ifTrue:[ destX := aRectangle left + wp x. destY := rectY. + width := aRectangle width - (wp x * 2). - width := rectWidth. height := wp y - ovalRadius y. self copyBits. destY := aRectangle bottom - wp y. self copyBits. ].!

1 0

Jump to page: