Packages May 2021

packages@lists.squeakfoundation.org

1 participants
169 discussions

FFI: FFI-Kernel-mt.124.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.124.mcz ==================== Summary ==================== Name: FFI-Kernel-mt.124 Author: mt Time: 1 May 2021, 6:29:01.295408 pm UUID: 7c619637-8c9f-5648-b752-5043a9a455c9 Ancestors: FFI-Kernel-mt.123 Removes deprecated collection interface from ExternalData. Nukes unused instVar 'fieldTypes' in structure types. I could not remember what I planned to do with it. Could not find it on squeak-dev either. Extends print-string for external types with byteSize and byteAlignment. It does not look too noisy. I hope it will help remind programmers about the bytes they are working with. Well, if it becomes too noisy, we could make it a preference. =============== Diff against FFI-Kernel-mt.123 =============== Item was removed: - ----- Method: ExternalData>>collectWithIndex: (in category 'enumerating') ----- - collectWithIndex: elementAndIndexBlock - "See SequenceableCollection >> #collectWithIndex:." - - ^ self collectWithIndex: elementAndIndexBlock! Item was removed: - ----- Method: ExternalData>>doWithIndex: (in category 'enumerating') ----- - doWithIndex: elementAndIndexBlock - "See SequenceableCollection >> #doWithIndex:." - - self withIndexDo: elementAndIndexBlock.! Item was changed: ExternalType subclass: #ExternalStructureType + instanceVariableNames: '' - instanceVariableNames: 'fieldTypes' classVariableNames: '' poolDictionaries: '' category: 'FFI-Kernel'! !ExternalStructureType commentStamp: 'mt 6/18/2020 08:54' prior: 0! I am specializing types for external structures. While compiledSpec and referentClass are still paramount when the FFI plugin is processing FFI calls, this specialization can help untangle in-image processing of external structures and their data. In terms of plugin compatibility, you could still use instances of ExternalType as, for example, argument types in ExternalFunction -- given that compiledSpec and referentClass are correct. Argument coercing in FFI calls would still work. However, you could no longer use in-image facilities such as #readFieldAt: / #writeFieldAt:width, which is used for generating struct-field accessors. And the dynamic access through #handle:at: / #handle:at:put: would fail. Also, #printOn: would not be very helpful anymore. So, having this specialization of ExternalType for ExternalStructure helps packaging code. :-) Of course, this type can also be used for ExternalUnion, ExternalPackagedStructure, and ExternalTypeAlias.! Item was changed: ----- Method: ExternalStructureType>>printOn: (in category 'printing') ----- printOn: aStream self isTypeAlias ifTrue: [ aStream nextPutAll: referentClass name. aStream nextPutAll: '~>'; print: self originalType. self isEmpty ifTrue: [aStream nextPutAll: ' ???']. ^ self]. referentClass == nil ifTrue:[aStream nextPutAll: '<unknown struct type>'] ifFalse:[ + super printOn: aStream. - aStream nextPutAll: referentClass name. self isEmpty ifTrue: [aStream nextPutAll: ' { void }']].! Item was changed: ----- Method: ExternalType>>printOn: (in category 'printing') ----- printOn: aStream aStream nextPutAll: (referentClass ifNil: [self atomicTypeName] ifNotNil: [referentClass name]). + self isPointerType ifTrue: [aStream nextPut: $*]. + + aStream + space; + nextPut: $(; + nextPutAll: self byteSize asString; + space; + nextPutAll: self byteAlignment asString; + nextPut: $).! - self isPointerType ifTrue: [aStream nextPut: $*].!

1 0

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

01 May '21

Marcel Taeumel uploaded a new version of Monticello to project The Trunk: http://source.squeak.org/trunk/Monticello-ct.746.mcz ==================== Summary ==================== Name: Monticello-ct.746 Author: ct Time: 1 May 2021, 2:41:51.667049 pm UUID: 6079f513-f9db-2245-9e92-878ae823e5ee Ancestors: Monticello-nice.745 Fixes and cleans up snapshot creation in MCVersionHistoryBrowser. Instead of scanning the global repository group for a version, ask the current package for its specific repository group. Make sure to always pass the package. Nuke unused instvar repositoryGroup. =============== Diff against Monticello-nice.745 =============== Item was changed: MCTool subclass: #MCVersionHistoryBrowser + instanceVariableNames: 'ancestry index package infos' - instanceVariableNames: 'ancestry index repositoryGroup package infos' classVariableNames: '' poolDictionaries: '' category: 'Monticello-UI'! Item was changed: ----- Method: MCVersionHistoryBrowser>>repositoryGroup (in category 'accessing') ----- repositoryGroup + + ^ self package workingCopy repositoryGroup! - ^ MCRepositoryGroup default! Item was changed: ----- Method: MCVersionInspector>>history (in category 'accessing') ----- history + (MCVersionHistoryBrowser new + package: self version package; + ancestry: self versionInfo) show! - (MCVersionHistoryBrowser new ancestry: self versionInfo) show!

1 0

The Trunk: Tools-mt.1054.mcz
by commits＠source.squeak.org 01 May '21

01 May '21

Marcel Taeumel uploaded a new version of Tools to project The Trunk: http://source.squeak.org/trunk/Tools-mt.1054.mcz ==================== Summary ==================== Name: Tools-mt.1054 Author: mt Time: 1 May 2021, 12:06:08.609299 pm UUID: 9da21c77-f717-ab4c-b024-42dfbe629f2e Ancestors: Tools-mt.1053 Adds preference and means to embed a transcript in workspaces. Thanks to Jaromir (jar) for the idea! The preference is disabled by default. =============== Diff against Tools-mt.1053 =============== Item was changed: StringHolder subclass: #Workspace instanceVariableNames: 'bindings acceptDroppedMorphs acceptAction mustDeclareVariables shouldStyle environment' + classVariableNames: 'DeclareVariablesAutomatically EmbedTranscript LookupPools ShouldStyle' - classVariableNames: 'DeclareVariablesAutomatically LookupPools ShouldStyle' poolDictionaries: '' category: 'Tools-Base'! !Workspace commentStamp: 'fbs 6/2/2012 20:46' prior: 0! A Workspace is a text area plus a lot of support for executable code. It is a great place to execute top-level commands to compute something useful, and it is a great place to develop bits of a program before those bits get put into class methods. To open a new workspace, execute: Workspace open A workspace can have its own variables, called "workspace variables", to hold intermediate results. For example, if you type into a workspace "x := 5" and do-it, then later you could type in "y := x * 2" and y would become 10. Additionally, in Morphic, a workspace can gain access to morphs that are on the screen. If acceptDroppedMorphs is turned on, then whenever a morph is dropped on the workspace, a variable will be created which references that morph. This functionality is toggled with the window-wide menu of a workspace. The instance variables of this class are: bindings - holds the workspace variables for this workspace acceptDroppedMorphs - whether dropped morphs should create new variables! Item was added: + ----- Method: Workspace class>>embedTranscript (in category 'preferences') ----- + embedTranscript + <preference: 'Embed a Transcript in Workspace' + category: 'browsing' + description: 'If true, new workspaces will open with an embedded Transcript.' + type: #Boolean> + ^ EmbedTranscript ifNil: [ false ]! Item was added: + ----- Method: Workspace class>>embedTranscript: (in category 'preferences') ----- + embedTranscript: aBoolean + + EmbedTranscript := aBoolean.! Item was added: + ----- Method: Workspace>>buildTranscriptWith: (in category 'toolbuilder') ----- + buildTranscriptWith: builder + + | textSpec | + textSpec := builder pluggableTextSpec new. + textSpec + model: Transcript; + menu: #codePaneMenu:shifted:. + ^ textSpec! Item was added: + ----- Method: Workspace>>buildWith: (in category 'toolbuilder') ----- + buildWith: builder + + ^ self class embedTranscript + ifTrue: [self buildWorkspaceTranscriptWith: builder] + ifFalse: [super buildWith: builder]! Item was added: + ----- Method: Workspace>>buildWorkspaceTranscriptWith: (in category 'toolbuilder') ----- + buildWorkspaceTranscriptWith: builder + + | windowSpec | + windowSpec := self buildWindowWith: builder specs: { + (0.0 @ 0.0 corner: 1.0 @ 0.6) -> [self buildCodePaneWith: builder]. + (0.0 @ 0.6 corner: 1.0 @ 1.0) -> [self buildTranscriptWith: builder]. + }. + ^builder build: windowSpec!

1 0

FFI: FFI-Callbacks-mt.9.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.9.mcz ==================== Summary ==================== Name: FFI-Callbacks-mt.9 Author: mt Time: 1 May 2021, 10:24:12.802394 am UUID: 937a46d5-7f6d-9344-8165-515cc5a54b55 Ancestors: FFI-Callbacks-mt.7 Restructure callback examples. Adds a fourth example that sorts integers. Complements FFI-Kernel-mt.123. =============== Diff against FFI-Callbacks-mt.7 =============== Item was removed: - ----- Method: FFICallback class>>exampleCqsort (in category 'examples') ----- - exampleCqsort - "Call the libc qsort function (which requires a callback)." - "FFICallback exampleCqsort" - "(Time millisecondsToRun: [100 timesRepeat: [FFICallback exampleCqsort]]) / 100.0" - - | type cb rand nElements sizeofDouble values orig sort libcName knownLibcNames fn | - - knownLibcNames := #('libobjc.dylib' 'libgcc_s.1.dylib' 'libc.dylib' 'libc.so.6' 'libc.so' 'msvcrt.dll'). - libcName := Project uiManager chooseFrom: knownLibcNames title: 'Choose your libc'. - libcName = 0 ifTrue: [^ self]. - libcName := knownLibcNames at: libcName. - - rand := Random new. - type := ExternalType double. - sizeofDouble := type byteSize. - nElements := 10. - values := ExternalData - fromHandle: (ExternalAddress allocate: nElements * sizeofDouble) - type: type asPointerType. - "Initialize external data and set size for enumeration." - 1 to: nElements do: [:i| values at: i put: rand next]. - values size: nElements. - "Fetch a local copy of the external data." - orig := values collect: [:each | each]. - - "Construct the callback structure." - cb := FFICallback - signature: '<callback: int (*)(double* double*)>' - "signature: #(int 'double*' 'double*')" - block: [ :arg1 :arg2 | - | a b | - a := arg1 doubleAt: 1. - b := arg2 doubleAt: 1. - Transcript showln: ('Comparing {1} and {2}' format: {a. b}). - self halt. - (a - b) sign]. - - "void qsort( void *base, size_t number, size_t width, int (__cdecl *compare )(const void *, const void *) );" - fn := ExternalLibraryFunction - name: 'qsort' module: libcName - callType: ExternalLibraryFunction callTypeCDecl - returnType: ExternalType void - argumentTypes: (ExternalType lookupTypes: #('void*' size_t size_t 'void*')). - - "Invoke!!" - fn invokeWith: values "getHandle" with: nElements with: sizeofDouble with: cb thunk "getHandle". - - sort := values collect: [:each | each]. - values getHandle free. - ^orig -> sort! Item was added: + ----- Method: FFICallback class>>exampleCqsort01 (in category 'examples') ----- + exampleCqsort01 + "Call the libc qsort function (which requires a callback)." + "FFICallback exampleCqsort01" + "(Time millisecondsToRun: [100 timesRepeat: [FFICallback exampleCqsort]]) / 100.0" + + | type cb rand nElements sizeofDouble values orig sort libcName knownLibcNames fn | + + knownLibcNames := #('libobjc.dylib' 'libgcc_s.1.dylib' 'libc.dylib' 'libc.so.6' 'libc.so' 'msvcrt.dll'). + libcName := Project uiManager chooseFrom: knownLibcNames title: 'Choose your libc'. + libcName = 0 ifTrue: [^ self]. + libcName := knownLibcNames at: libcName. + + rand := Random new. + type := ExternalType double. + sizeofDouble := type byteSize. + nElements := 10. + values := ExternalData + fromHandle: (ExternalAddress allocate: nElements * sizeofDouble) + type: type asPointerType. + "Initialize external data and set size for enumeration." + 1 to: nElements do: [:i| values at: i put: rand next]. + values size: nElements. + "Fetch a local copy of the external data." + orig := values collect: [:each | each]. + + "Construct the callback structure." + cb := FFICallback + signature: '<callback: int (*)(double* double*)>' + "signature: #(int 'double*' 'double*')" + block: [ :arg1 :arg2 | + | a b | + a := arg1 doubleAt: 1. + b := arg2 doubleAt: 1. + Transcript showln: ('Comparing {1} and {2}' format: {a. b}). + self halt. + (a - b) sign]. + + "void qsort( void *base, size_t number, size_t width, int (__cdecl *compare )(const void *, const void *) );" + fn := ExternalLibraryFunction + name: 'qsort' module: libcName + callType: ExternalLibraryFunction callTypeCDecl + returnType: ExternalType void + argumentTypes: (ExternalType lookupTypes: #('void*' size_t size_t 'void*')). + + "Invoke!!" + fn invokeWith: values "getHandle" with: nElements with: sizeofDouble with: cb thunk "getHandle". + + sort := values collect: [:each | each]. + values getHandle free. + ^orig -> sort! Item was added: + ----- Method: FFICallback class>>exampleCqsort02 (in category 'examples') ----- + exampleCqsort02 + "Call the libc qsort function (which requires a callback)." + " + FFICallback exampleCqsort02 + " + "(Time millisecondsToRun: [100 timesRepeat: [FFICallback exampleCqsort]]) / 100.0" + + | type rand nElements sizeofDouble values orig sort | + + rand := Random new. + type := ExternalType double. + sizeofDouble := type byteSize. + nElements := 10. + values := ExternalData + fromHandle: (ExternalAddress allocate: nElements * sizeofDouble) + type: type asPointerType. + "Initialize external data and set size for enumeration." + 1 to: nElements do: [:i| values at: i put: rand next]. + values size: nElements. + "Fetch a local copy of the external data." + orig := values collect: [:each | each]. + + "Invoke!!" + self + qsort: values with: nElements with: sizeofDouble + with: [ :arg1 :arg2 | + | a b | + a := arg1 doubleAt: 1. + b := arg2 doubleAt: 1. + Transcript showln: ('Comparing {1} and {2}' format: {a. b}). + self halt. + (a - b) sign]. + + sort := values collect: [:each | each]. + values getHandle free. + ^orig -> sort! Item was added: + ----- Method: FFICallback class>>exampleCqsort03 (in category 'examples') ----- + exampleCqsort03 + "Call the libc qsort function (which requires a callback)." + " + FFICallback exampleCqsort03 + " + "(Time millisecondsToRun: [100 timesRepeat: [FFICallback exampleCqsort]]) / 100.0" + + | type rand nElements sizeofDouble values orig sort cb | + + rand := Random new. + type := ExternalType double. + sizeofDouble := type byteSize. + nElements := 10. + values := ExternalData + fromHandle: (ExternalAddress allocate: nElements * sizeofDouble) + type: type asPointerType. + "Initialize external data and set size for enumeration." + 1 to: nElements do: [:i| values at: i put: rand next]. + values size: nElements. + "Fetch a local copy of the external data." + orig := values collect: [:each | each]. + + "Construct the callback structure." + cb := FFICallback + signature: '<callback: int (*)(double* double*)>' + "signature: #(int 'double*' 'double*')" + block: [ :arg1 :arg2 | + | a b | + a := arg1 doubleAt: 1. + b := arg2 doubleAt: 1. + Transcript showln: ('Comparing {1} and {2}' format: {a. b}). + self halt. + (a - b) sign]. + + + "Invoke!!" + self + cdeclQsort: values with: nElements with: sizeofDouble + with: cb thunk. + + sort := values collect: [:each | each]. + values getHandle free. + ^orig -> sort! Item was added: + ----- Method: FFICallback class>>exampleCqsort04 (in category 'examples') ----- + exampleCqsort04 + " + FFICallback exampleCqsort04 + " + + | type in out fn cb | + type := ExternalType int32_t. + in := type allocateExternal: 10. + 1 to: in size do: [:each | + in at: each put: 100 atRandom]. + + cb := FFICallback + signature: '<callback: int (*)(int32_t* int32_t*)>' + "signature: #(int 'double*' 'double*')" + block: [ :arg1 :arg2 | + | a b | + a := arg1 signedLongAt: 1. + b := arg2 signedLongAt: 1. + Transcript showln: ('Comparing {1} and {2}' format: {a. b}). + "self halt." + (a - b) sign]. + + fn := ExternalLibraryFunction + name: 'qsort' module: 'msvcrt.dll' + callType: ExternalLibraryFunction callTypeCDecl + returnType: ExternalType void + argumentTypes: (ExternalType lookupTypes: #('void*' size_t size_t 'void*')). + + "Invoke!!" + fn + invokeWith: in "getHandle" + with: in size + with: in contentType byteSize + with: cb thunk "getHandle". + + out := in collect: [:each | each]. + in free. + ^ out! Item was removed: - ----- Method: FFICallback class>>exampleCqsortThree (in category 'examples') ----- - exampleCqsortThree - "Call the libc qsort function (which requires a callback)." - " - FFICallback exampleCqsortThree - " - "(Time millisecondsToRun: [100 timesRepeat: [FFICallback exampleCqsort]]) / 100.0" - - | type rand nElements sizeofDouble values orig sort cb | - - rand := Random new. - type := ExternalType double. - sizeofDouble := type byteSize. - nElements := 10. - values := ExternalData - fromHandle: (ExternalAddress allocate: nElements * sizeofDouble) - type: type asPointerType. - "Initialize external data and set size for enumeration." - 1 to: nElements do: [:i| values at: i put: rand next]. - values size: nElements. - "Fetch a local copy of the external data." - orig := values collect: [:each | each]. - - "Construct the callback structure." - cb := FFICallback - signature: '<callback: int (*)(double* double*)>' - "signature: #(int 'double*' 'double*')" - block: [ :arg1 :arg2 | - | a b | - a := arg1 doubleAt: 1. - b := arg2 doubleAt: 1. - Transcript showln: ('Comparing {1} and {2}' format: {a. b}). - self halt. - (a - b) sign]. - - - "Invoke!!" - self - cdeclQsort: values with: nElements with: sizeofDouble - with: cb thunk. - - sort := values collect: [:each | each]. - values getHandle free. - ^orig -> sort! Item was removed: - ----- Method: FFICallback class>>exampleCqsortTwo (in category 'examples') ----- - exampleCqsortTwo - "Call the libc qsort function (which requires a callback)." - " - FFICallback exampleCqsortTwo - " - "(Time millisecondsToRun: [100 timesRepeat: [FFICallback exampleCqsort]]) / 100.0" - - | type rand nElements sizeofDouble values orig sort | - - rand := Random new. - type := ExternalType double. - sizeofDouble := type byteSize. - nElements := 10. - values := ExternalData - fromHandle: (ExternalAddress allocate: nElements * sizeofDouble) - type: type asPointerType. - "Initialize external data and set size for enumeration." - 1 to: nElements do: [:i| values at: i put: rand next]. - values size: nElements. - "Fetch a local copy of the external data." - orig := values collect: [:each | each]. - - "Invoke!!" - self - qsort: values with: nElements with: sizeofDouble - with: [ :arg1 :arg2 | - | a b | - a := arg1 doubleAt: 1. - b := arg2 doubleAt: 1. - Transcript showln: ('Comparing {1} and {2}' format: {a. b}). - self halt. - (a - b) sign]. - - sort := values collect: [:each | each]. - values getHandle free. - ^orig -> sort!

1 0

FFI: FFI-Kernel-mt.123.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.123.mcz ==================== Summary ==================== Name: FFI-Kernel-mt.123 Author: mt Time: 1 May 2021, 10:22:08.119394 am UUID: 8a1725e7-90a1-2348-9e01-3ce391c4036f Ancestors: FFI-Kernel-mt.122 Given that we usually talk to external types or external structures (and unions ...) where #allocate: is the current pattern to prepare a list of such things, use #allocateExternal: to allocate external memory, not internal object memory. While this conflicts with ExternalAddress class #allocate:, clients might not notice because they should usually not deal with the difference between handles being either ByteArray or ExternalAddress (or atomics). I suppose. Let #free for handles being ExternAdress also null that address. Maybe we could establish a common prototype for a null-address? (Removes duplicate #isExternalAddress.) =============== Diff against FFI-Kernel-mt.122 =============== Item was removed: - ----- Method: ByteArray>>isExternalAddress (in category '*FFI-Kernel-testing') ----- - isExternalAddress - "Return true if the receiver describes the address of an object in the outside world" - ^false! Item was added: + ----- Method: ExternalStructure class>>allocateExternal: (in category 'instance creation') ----- + allocateExternal: anInteger + "Create an ExternalData with enough room for storing an array of size anInteger of such structure. Don't forget to free the allocated memory!!!!!!" + ^self externalType allocateExternal: anInteger! Item was changed: ----- Method: ExternalStructure>>free (in category 'initialize-release') ----- free "Free the handle pointed to by the receiver" + + handle isExternalAddress + ifTrue: [handle free; beNull] + ifFalse: [handle := nil].! - (handle ~~ nil and:[handle isExternalAddress]) ifTrue:[handle free]. - handle := nil.! Item was added: + ----- Method: ExternalType>>allocateExternal: (in category 'external data') ----- + allocateExternal: anInteger + "Allocate space for containing an array of size anInteger of this dataType" + + | handle | + handle := ExternalAddress allocate: self byteSize * anInteger. + ^(ExternalData fromHandle: handle type: self) size: anInteger!

1 0

FFI: FFI-Callbacks-mt.7.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.7.mcz ==================== Summary ==================== Name: FFI-Callbacks-mt.7 Author: mt Time: 1 May 2021, 9:06:54.87419 am UUID: 1094c754-1e24-d342-8822-31dce676cd6a Ancestors: FFI-Callbacks-mt.6 Fixes regression. I forgot to resolve materialize pointers from integers when reading intRegArgs. (For debugging, adds #mostRecent shortcut to FFICallbackContext class.) =============== Diff against FFI-Callbacks-mt.6 =============== 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 | 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 isPointer | - | argType data | argType := argumentTypes at: argIndex. "1) Try to read arguments from registers." + data := (intPos < intArgs size and: [(isPointer := argType isPointerType) or: [argType isIntegerType]]) - 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]]. + data + ifNotNil: [ "1b) Materialize pointers from integers." + isPointer ifTrue: [ + self flag: #designSmell. "mt: If we had a way to set, for example, double** as container type and double* as content type for intArgs, we would not have to construct the correct external object here but already had it." + self flag: #discuss. "mt: Should we resolve atomic types? That is, double* to an actual float object etc? Well, for pointers to external structures (unions, ...) it would make sense to provide an actual instance of that structure to the callback... If so, we just need to send #value below." + data := (ExternalData + fromHandle: (ExternalAddress fromInteger: data) + type: argType) size: 1; "value; " yourself]] + ifNil: [ "2) If nothing was read, read the argument from the stack." + data := argType handle: handle at: byteOffset. + byteOffset := byteOffset + + ((type byteSize max: argType byteSize) roundUpTo: type byteAlignment)]. - "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]. ^ self setResult: (evaluableObject valueWithArguments: args) inContext: callbackContext! Item was added: + ----- Method: FFICallbackContext class>>mostRecent (in category 'instance lookup') ----- + mostRecent + + ^ FFICallbackMemory mostRecentCallbackContext!

1 0

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:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Packages May 2021