Vm-dev January 2019

vm-dev@lists.squeakfoundation.org

29 participants
374 discussions

[OpenSmalltalk/opensmalltalk-vm] 671f59: Patch callback thunkEntry to not optimize, failing...
by GitHub 22 Jan '19

22 Jan '19

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 671f597de24517b9323c48e8664964974642f930 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/671f597de24517b932… Author: Guille Polito <guillermopolito(a)gmail.com> Date: 2019-01-16 (Wed, 16 Jan 2019) Changed paths: M platforms/Cross/plugins/IA32ABI/ia32abicc.c Log Message: ----------- Patch callback thunkEntry to not optimize, failing in win32 using gcc 7.4.0 Commit: 426dbc0dd789313605334f84aa97681323250f6e https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/426dbc0dd789313605… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2019-01-22 (Tue, 22 Jan 2019) Changed paths: M platforms/Cross/plugins/IA32ABI/ia32abicc.c Log Message: ----------- Merge pull request #353 from guillep/patch/callback-win32 Patch callback thunkEntry to not optimize Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/eedd22e8beba...42… **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.

1 0

[OpenSmalltalk/opensmalltalk-vm] 231a17: When used with SDL, the events in the main VM wind...
by GitHub 22 Jan '19

22 Jan '19

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 231a175ea3c833543bbe77e0edc5b0c1ee245b58 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/231a175ea3c833543b… Author: Pablo Tesone <tesonep(a)gmail.com> Date: 2019-01-22 (Tue, 22 Jan 2019) Changed paths: M platforms/win32/vm/sqWin32Window.c Log Message: ----------- When used with SDL, the events in the main VM windows are not properly handled. SDL has its own GetMessage / DispatchMessage loop. The VM implemnetation was expecting to have a pointer to the message read from GetMessage. Stored in the variable lastMessage. This variable is Null when the GetMessage is executed by SDL. So, I have modified the process to recreate the MSG from the information provided by the Window Callback Arguments. Commit: eedd22e8bebab3b17878f19a41b594b49e78212d https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/eedd22e8bebab3b178… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2019-01-22 (Tue, 22 Jan 2019) Changed paths: M platforms/win32/vm/sqWin32Window.c Log Message: ----------- Merge pull request #358 from tesonep/Cog Win32 Events when using SDL Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/f4721045b9b5...ee… **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.

1 0

[OpenSmalltalk/opensmalltalk-vm] Win32 Events when using SDL (#358)
by Pablo Tesone 22 Jan '19

22 Jan '19

When used with SDL, the events in the main VM windows are not properly handled. SDL has its own GetMessage / DispatchMessage loop. The VM implementation was expecting to have a pointer to the message read from GetMessage. Stored in the variable lastMessage. This variable is Null when the GetMessage is executed by SDL. So, I have modified the process to recreate the MSG from the information provided by the Window Callback Arguments. You can view, comment on, or merge this pull request online at: https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/358 -- Commit Summary -- * When used with SDL, the events in the main VM windows are not properly handled. -- File Changes -- M platforms/win32/vm/sqWin32Window.c (57) -- Patch Links -- https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/358.patch https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/358.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/358

2 1

[OpenSmalltalk/opensmalltalk-vm] lost? (#357)
by Ken Dickey 22 Jan '19

22 Jan '19

I did a checkout and tried a build, but 3 files seem to have been lost. Added & built fine (still fail 3 unit tests). Huh??? arm64abicc.c dabusinessARM64.h dabusinessARM32.h You can view, comment on, or merge this pull request online at: https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/357 -- Commit Summary -- * lost? -- File Changes -- A platforms/Cross/plugins/IA32ABI/arm64abicc.c (280) A platforms/Cross/plugins/IA32ABI/dabusinessARM32.h (191) A platforms/Cross/plugins/IA32ABI/dabusinessARM64.h (196) -- Patch Links -- https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/357.patch https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/357.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/357

2 3

[OpenSmalltalk/opensmalltalk-vm] d99e4d: lost?
by GitHub 22 Jan '19

22 Jan '19

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: d99e4d8ba6a60f0f32292d21fc9b2ce0acf7ac20 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/d99e4d8ba6a60f0f32… Author: Ken Dickey <Ken.Dickey(a)Whidbey.com> Date: 2019-01-21 (Mon, 21 Jan 2019) Changed paths: A platforms/Cross/plugins/IA32ABI/arm64abicc.c A platforms/Cross/plugins/IA32ABI/dabusinessARM32.h A platforms/Cross/plugins/IA32ABI/dabusinessARM64.h Log Message: ----------- lost? Commit: 01dbec3e7f1b155ab9b71c2069e83a16de2e9847 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/01dbec3e7f1b155ab9… Author: Ken Dickey <Ken.Dickey(a)Whidbey.com> Date: 2019-01-22 (Tue, 22 Jan 2019) Changed paths: M platforms/Cross/plugins/IA32ABI/arm32abicc.c M platforms/Cross/plugins/IA32ABI/arm64abicc.c Log Message: ----------- unified dabusinessARM.h Commit: f4721045b9b5cfa83b728731d19a362b507d79dc https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/f4721045b9b5cfa83b… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2019-01-22 (Tue, 22 Jan 2019) Changed paths: M platforms/Cross/plugins/IA32ABI/arm32abicc.c A platforms/Cross/plugins/IA32ABI/arm64abicc.c A platforms/Cross/plugins/IA32ABI/dabusinessARM32.h A platforms/Cross/plugins/IA32ABI/dabusinessARM64.h Log Message: ----------- Merge pull request #357 from KenDickey/Cog lost? Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/234f27281b46...f4… **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.

1 0

Win32OSProcessPlugin question (was: Better management of encoding of environment variables)
by David T. Lewis 22 Jan '19

22 Jan '19

Hi Nicolas, Motivated by the discussion on Pharo list, I added new primitives to OSProcessPlugin to answer environment variables and path information as raw ByteArray, such that those byte arrays can be converted in the image to strings with any encoding. I did the changes in "trunk" OSPP, and am now implementing them in the oscog branch. I have tested the Unix changes in both branches. Unfortunately I do not have a Windows development at the moment, so I need to ask for help. In Win32OSProcessPlugin, I am adding two primitives: #primitiveGetCurrentWorkingDirectoryAsBytes #primitiveGetEnvironmentStringsAsBytes These are based on the two string primitives, which remain available: #primitiveGetCurrentWorkingDirectory #primitiveGetEnvironmentStrings The string primitives include your recent changes for UTF8 encoding, and the "xxxAsBytes" variants are based on my earlier logic without the UTF8 support. This means that OSProcess on Windows will use your UTF8 string support, and the additional primitives (based on the old logic, and answering raw bytes) will be available for people who want to do the encoding work in the image. Does this sound like the right approach? Thanks, Dave I have a question concerning the Win32 changes. On Wed, Jan 16, 2019 at 10:24:51AM +0100, Nicolas Cellier wrote: > IMO, windows VM (and plugins) should do the UCS2 -> UTF8 conversion because > the purpose of a VM is to provide an OS independant fa??ade. > I made progress recently in this area, but we should finish the > job/test/consolidate. > If someone bypass the VM and use direct windows API thru FFI, then he takes > the responsibility, but uniformity doesn't hurt. > > Le mer. 16 janv. 2019 ?? 10:14, Guillermo Polito <guillermopolito(a)gmail.com> > a ??crit : > > > Hi Stephan, > > > > I'm sorry for the noise. > > > > At the time, both #at: and #getEnv: variants existed. The changes > > backported from the PharoLauncher were only using the getter versions of > > getEnv, but for Pharo I decided to implement also the setter versions. And > > after checking the code and its users in image, I've finally decided to go > > for an at:[[ifAbsent]put:] version. So I'd say that the leading > > **guideline** was at the end the one here in the mailing list, but also if > > you check the PR I've introduced a more complete and consistent API, > > following the one of dictionaries. > > > > https://github.com/pharo-project/pharo/pull/1980/files > > > > at: > > at:ifAbsent: > > at:ifPresent: > > at:ifPresent:ifAbsent: > > at:put: > > removeKey: > > > > Plus, in *nix, variants where an encoding can be specified. > > > > I'm sorry if I've introduced some confussion. > > > > > > On Wed, Jan 16, 2019 at 9:47 AM Stephan Eggermont <stephan(a)stack.nl> > > wrote: > > > > > > Guillermo Polito <guillermopolito(a)gmail.com> > > > wrote: > > > > Hi all, > > > > > > > > following the meeting we had here @Inria headquarters, I'll be > > backporting > > > > some of the improvements we did in the launcher this last month > > regarding > > > > the encoding of environment variables. > > > > > > > > I've opened for this issue https://pharo.fogbugz.com/f/cases/22658/ > > > > > > > > We have already studied possible alternatives with Pablo and > > Christophe and > > > > we have some conclusions and we propose some changes: > > > > > > > > API Proposal for OSEnvironment > > > > ========================= > > > > > > > > > > > > - > > > > *at: aVariableName * > > > > > > > > Gets the String value of an environment variable called `aVariableName` > > > > It is the system reponsibility to manage the encoding. > > > > Rationale: A common denominator for all platforms providing an already > > > > decoded string, because windows does not (compared to *nix systems) > > provide > > > > a encoded byte representation of the value. Windows has instead its own > > > > wide string representation. > > > > > > > > - *[optionally] rawAt: anEncodedVariableName* > > > > > > > > Gets the Byte value of an environment variable called > > > > `anEncodedVariableName`. > > > > It is the user responsibility to encode and decode argument and return > > > > values in the encoding of this preference. > > > > Rationale: Some systems may want to have the liberty to use different > > > > encodings, or even to put binary data in the variables. > > > > > > > > - *[optionally] at: aVariableName encoding: anEncoding* > > > > > > > > Gets the value of an environment variable called `aVariableName` using > > > > `anEncoding` to encode/decode arguments and return values. > > > > Rationale: *xes could potentially use different encodings for their > > > > environment variables or even use different encodings in different > > parts of > > > > their file system. > > > > > > > > Other Implementation details > > > > ========================= > > > > > > > > - VM primitives returning paths Strings should be carefuly managed > > to > > > > decode them, since they are actually C strings (so byte arrays) > > disguised > > > > as ByteStrings. > > > > - Windows requires calling the right *Wide version of the functions > > from > > > > C, plus the correct encoding routine. This could be implemented as > > an FFI > > > > call or by modifying the VM to do it properly instead of calling > > the Ascii > > > > version > > > > > > > > > > > > > > What is the conclusion from this and issue 22658? See PR 2238. #getEnv: > > is > > > public API > > > > > > Stephan > > > > > > > > > > > > > > > -- > > > > > > > > Guille Polito > > > > Research Engineer > > > > Centre de Recherche en Informatique, Signal et Automatique de Lille > > > > CRIStAL - UMR 9189 > > > > French National Center for Scientific Research - http://www.cnrs.fr > > > > > > Web: http://guillep.github.io > > > > Phone: +33 06 52 70 66 13 > >

2 2

arm64 float vs double
by ken.dickey＠whidbey.com 22 Jan '19

22 Jan '19

> I don't understand this proposed change. float is a 32-bit > datatype, double is a 64-bit datatype. My understanding is that on > ARM64 floating-point arguments are passed as doubles. What am I > missing? What I was missing was the rationale for using only even numbered array indices for floatRegisters in ThreadedARM{32,64}FFIPlugin>>ffiCalloutTo:SpecOnStack:in: I am following the pattern of ThreadedARM32FFIPlugin: - floats get assigned to the register array slots [#ffiPushSingleFloat:in:] - doubles get mem-copied to the register array slots [#ffiPushDoubleFloat:in:] C casting tricks are then used to interpret memory properly for FFI usage. One could do the other way around. Case of 6 of one, half a dozen of the other. This is why we need to leave mouse tracks (er, document) our artifacts. Hey, this confused the heck out of me! -KenD

1 0

VM Maker Inbox: VMMaker.oscog-KenD.2512.mcz
by commits＠source.squeak.org 22 Jan '19

22 Jan '19

A new version of VMMaker was added to project VM Maker Inbox: http://source.squeak.org/VMMakerInbox/VMMaker.oscog-KenD.2512.mcz ==================== Summary ==================== Name: VMMaker.oscog-KenD.2512 Author: KenD Time: 22 January 2019, 1:43:48.627694 pm UUID: 16315d2e-c233-4b5d-aa9b-f2d221803525 Ancestors: VMMaker.oscog-KenD.2511 Renamed ThreadedARMFFIPlugin to ThreadedARM32FFIPlugin to accord with ThreadedARM64FFIPlugin (more descriptive) =============== Diff against VMMaker.oscog-KenD.2511 =============== Item was changed: ----- Method: RiscOSVMMaker class>>generateSqueakStackVM (in category 'configurations') ----- generateSqueakStackVM "RISC OS version; build needed plugins, make sure filename tweaking is used" "RiscOSVMMaker generateSqueakStackVM" ^self generate: StackInterpreter to: (FileDirectory default directoryNamed: 'stacksrc') fullName platformDir: (FileDirectory default directoryNamed: 'platforms') fullName + excluding: #(AsynchFilePlugin BrokenPlugin CroquetPlugin FFIPlugin IA32ABIPlugin ImmX11Plugin InternetConfigPlugin JoystickTabletPlugin MIDIPlugin MacMenubarPlugin Mpeg3Plugin NewsqueakIA32ABIPlugin QuicktimePlugin SerialPlugin TestOSAPlugin ThreadedARM32FFIPlugin ThreadedARMFFI64Plugin ThreadedFFIPlugin ThreadedIA32FFIPlugin ThreadedPPCBEFFIPlugin UUIDPlugin VMProfileMacSupportPlugin)! - excluding: #(AsynchFilePlugin BrokenPlugin CroquetPlugin FFIPlugin IA32ABIPlugin ImmX11Plugin InternetConfigPlugin JoystickTabletPlugin MIDIPlugin MacMenubarPlugin Mpeg3Plugin NewsqueakIA32ABIPlugin QuicktimePlugin SerialPlugin TestOSAPlugin ThreadedARMFFIPlugin ThreadedARMFFI64Plugin ThreadedFFIPlugin ThreadedIA32FFIPlugin ThreadedPPCBEFFIPlugin UUIDPlugin VMProfileMacSupportPlugin)! Item was added: + ThreadedFFIPlugin subclass: #ThreadedARM32FFIPlugin + instanceVariableNames: '' + classVariableNames: 'NumFloatRegArgs NumIntRegArgs' + poolDictionaries: '' + category: 'VMMaker-Plugins-FFI'! + + !ThreadedARM32FFIPlugin commentStamp: '<historical>' prior: 0! + This subclass is for the 32-bit ARM ABI. It typically has 4 integer registers.! Item was added: + ----- Method: ThreadedARM32FFIPlugin class>>calloutStateClass (in category 'translation') ----- + calloutStateClass + ^ThreadedFFICalloutStateForARM32! Item was added: + ----- Method: ThreadedARM32FFIPlugin class>>identifyingPredefinedMacros (in category 'translation') ----- + identifyingPredefinedMacros + ^#('__ARM_ARCH__' '__arm__' '__arm32__' 'ARM32')! Item was added: + ----- Method: ThreadedARM32FFIPlugin class>>initialize (in category 'class initialization') ----- + initialize + super initialize. + NumIntRegArgs := 4. + NumFloatRegArgs := 16! Item was added: + ----- Method: ThreadedARM32FFIPlugin class>>moduleName (in category 'translation') ----- + moduleName + ^'ARM32FFIPlugin'! Item was added: + ----- Method: ThreadedARM32FFIPlugin class>>numFloatRegArgs (in category 'accessing') ----- + numFloatRegArgs + ^NumFloatRegArgs! Item was added: + ----- Method: ThreadedARM32FFIPlugin class>>numIntRegArgs (in category 'accessing') ----- + numIntRegArgs + ^NumIntRegArgs! Item was added: + ----- Method: ThreadedARM32FFIPlugin>>ffiCalloutTo:SpecOnStack:in: (in category 'callout support') ----- + ffiCalloutTo: procAddr SpecOnStack: specOnStack in: calloutState + <var: #procAddr type: #'void *'> + <var: #calloutState type: #'CalloutState *'> + <var: #loadFloatRegs declareC: 'extern void loadFloatRegs(double, double, double, double, double, double, double, double)'> + "Go out, call this guy and create the return value. This *must* be inlined because of + the alloca of the outgoing stack frame in ffiCall:WithFlags:NumArgs:Args:AndTypes:" + | myThreadIndex atomicType floatRet intRet | + <var: #floatRet type: #double> + <var: #intRet type: #usqLong> + <inline: true> + myThreadIndex := interpreterProxy disownVM: (self disownFlagsFor: calloutState). + + calloutState floatRegisterIndex > 0 ifTrue: + [self + load: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 0)) to: 'double *') at: 0) + Flo: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 2)) to: 'double *') at: 0) + a: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 4)) to: 'double *') at: 0) + t: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 6)) to: 'double *') at: 0) + R: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 8)) to: 'double *') at: 0) + e: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 10)) to: 'double *') at: 0) + g: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 12)) to: 'double *') at: 0) + s: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 14)) to: 'double *') at: 0)]. + + (self allocaLiesSoSetSpBeforeCall or: [self mustAlignStack]) ifTrue: + [self setsp: calloutState argVector]. + + atomicType := self atomicTypeOf: calloutState ffiRetHeader. + (atomicType >> 1) = (FFITypeSingleFloat >> 1) ifTrue: + [atomicType = FFITypeSingleFloat + ifTrue: + [floatRet := self + dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'float (*)(sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t)') + with: (calloutState integerRegisters at: 0) + with: (calloutState integerRegisters at: 1) + with: (calloutState integerRegisters at: 2) + with: (calloutState integerRegisters at: 3)] + ifFalse: "atomicType = FFITypeDoubleFloat" + [floatRet := self + dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'double (*)(sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t)') + with: (calloutState integerRegisters at: 0) + with: (calloutState integerRegisters at: 1) + with: (calloutState integerRegisters at: 2) + with: (calloutState integerRegisters at: 3)]. + + "undo any callee argument pops because it may confuse stack management with the alloca." + (self isCalleePopsConvention: calloutState callFlags) ifTrue: + [self setsp: calloutState argVector]. + interpreterProxy ownVM: myThreadIndex. + + ^interpreterProxy floatObjectOf: floatRet]. + + intRet := self + dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'usqIntptr_t (*)(sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t)') + with: (calloutState integerRegisters at: 0) + with: (calloutState integerRegisters at: 1) + with: (calloutState integerRegisters at: 2) + with: (calloutState integerRegisters at: 3). + + "undo any callee argument pops because it may confuse stack management with the alloca." + (self isCalleePopsConvention: calloutState callFlags) ifTrue: + [self setsp: calloutState argVector]. + interpreterProxy ownVM: myThreadIndex. + + (calloutState ffiRetHeader anyMask: FFIFlagPointer+FFIFlagStructure) ifTrue: + ["Note: Order is important here since FFIFlagPointer + FFIFlagStructure is used to represent + 'typedef void* VoidPointer' and VoidPointer must be returned as pointer *not* as struct." + (calloutState ffiRetHeader anyMask: FFIFlagPointer) ifTrue: + [^self ffiReturnPointer: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState]. + ^self ffiReturnStruct: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState]. + + ^self ffiCreateIntegralResultOop: intRet ofAtomicType: atomicType in: calloutState! Item was added: + ----- Method: ThreadedARM32FFIPlugin>>ffiPushDoubleFloat:in: (in category 'marshalling') ----- + ffiPushDoubleFloat: value in: calloutState + <var: #value type: #double> + <var: #calloutState type: #'CalloutState *'> + <inline: #always> + + calloutState floatRegisterIndex < (NumFloatRegArgs - 1) + ifTrue: + [(calloutState floatRegisterIndex bitAnd: 1) = 1 + ifTrue: + [calloutState backfillFloatRegisterIndex: calloutState floatRegisterIndex. + calloutState floatRegisterIndex: (calloutState floatRegisterIndex + 1)]. + (self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: calloutState floatRegisterIndex)) + to: 'double*') + at: 0 + put: value. + calloutState floatRegisterIndex: calloutState floatRegisterIndex + 2] + ifFalse: + [calloutState currentArg + 8 > calloutState limit ifTrue: + [^FFIErrorCallFrameTooBig]. + calloutState floatRegisterIndex: NumFloatRegArgs. + interpreterProxy storeFloatAtPointer: calloutState currentArg from: value. + calloutState currentArg: calloutState currentArg + 8]. + ^0! Item was added: + ----- Method: ThreadedARM32FFIPlugin>>ffiPushPointer:in: (in category 'marshalling') ----- + ffiPushPointer: pointer in: calloutState + <var: #pointer type: #'void *'> + <var: #calloutState type: #'CalloutState *'> + <inline: true> + calloutState integerRegisterIndex < NumIntRegArgs + ifTrue: + [calloutState integerRegisters at: calloutState integerRegisterIndex put: pointer asInteger. + calloutState integerRegisterIndex: calloutState integerRegisterIndex + 1] + ifFalse: + [calloutState currentArg + self wordSize > calloutState limit ifTrue: + [^FFIErrorCallFrameTooBig]. + interpreterProxy longAt: calloutState currentArg put: pointer. + calloutState currentArg: calloutState currentArg + self wordSize]. + ^0! Item was added: + ----- Method: ThreadedARM32FFIPlugin>>ffiPushSignedByte:in: (in category 'marshalling') ----- + ffiPushSignedByte: value in: calloutState + <var: #calloutState type: #'CalloutState *'> + <inline: true> + calloutState integerRegisterIndex < NumIntRegArgs + ifTrue: + [calloutState integerRegisters at: calloutState integerRegisterIndex put: (self cCoerceSimple: value to: #'signed char'). + calloutState integerRegisterIndex: calloutState integerRegisterIndex + 1] + ifFalse: + [calloutState currentArg + self wordSize > calloutState limit ifTrue: + [^FFIErrorCallFrameTooBig]. + interpreterProxy longAt: calloutState currentArg put: (self cCoerceSimple: value to: #'signed char'). + calloutState currentArg: calloutState currentArg + self wordSize]. + ^0! Item was added: + ----- Method: ThreadedARM32FFIPlugin>>ffiPushSignedChar:in: (in category 'marshalling') ----- + ffiPushSignedChar: value in: calloutState + <var: #calloutState type: #'CalloutState *'> + <inline: true> + calloutState integerRegisterIndex < NumIntRegArgs + ifTrue: + [calloutState integerRegisters at: calloutState integerRegisterIndex put: (self cCoerceSimple: value to: #'signed char'). + calloutState integerRegisterIndex: calloutState integerRegisterIndex + 1] + ifFalse: + [calloutState currentArg + self wordSize > calloutState limit ifTrue: + [^FFIErrorCallFrameTooBig]. + interpreterProxy longAt: calloutState currentArg put: (self cCoerceSimple: value to: #'signed char'). + calloutState currentArg: calloutState currentArg + self wordSize]. + ^0! Item was added: + ----- Method: ThreadedARM32FFIPlugin>>ffiPushSignedInt:in: (in category 'marshalling') ----- + ffiPushSignedInt: value in: calloutState + <var: #calloutState type: #'CalloutState *'> + <inline: true> + calloutState integerRegisterIndex < NumIntRegArgs + ifTrue: + [calloutState integerRegisters at: calloutState integerRegisterIndex put: value. + calloutState integerRegisterIndex: calloutState integerRegisterIndex + 1] + ifFalse: + [calloutState currentArg + self wordSize > calloutState limit ifTrue: + [^FFIErrorCallFrameTooBig]. + interpreterProxy longAt: calloutState currentArg put: value. + calloutState currentArg: calloutState currentArg + self wordSize]. + ^0 + ! Item was added: + ----- Method: ThreadedARM32FFIPlugin>>ffiPushSignedLongLong:in: (in category 'marshalling') ----- + ffiPushSignedLongLong: value in: calloutState + <var: #value type: #sqLong> + <var: #calloutState type: #'CalloutState *'> + <inline: true> + calloutState integerRegisterIndex < (NumIntRegArgs - 1) + ifTrue: + [calloutState integerRegisterIndex: (calloutState integerRegisterIndex + 1 bitClear: 1). + calloutState integerRegisters at: calloutState integerRegisterIndex put: (self cCoerceSimple: value to: #usqInt). + calloutState integerRegisters at: calloutState integerRegisterIndex + 1 put: (self cCoerceSimple: value >> 32 to: #usqInt). + calloutState integerRegisterIndex: calloutState integerRegisterIndex + 2] + ifFalse: + [calloutState currentArg + 8 > calloutState limit ifTrue: [^FFIErrorCallFrameTooBig]. + calloutState integerRegisterIndex: NumIntRegArgs. + interpreterProxy + longAt: calloutState currentArg put: (self cCoerceSimple: value to: #usqInt); + longAt: calloutState currentArg + self wordSize put: (self cCoerceSimple: value >> 32 to: #usqInt). + calloutState currentArg: calloutState currentArg + 8]. + ^0! Item was added: + ----- Method: ThreadedARM32FFIPlugin>>ffiPushSignedShort:in: (in category 'marshalling') ----- + ffiPushSignedShort: value in: calloutState + <var: #calloutState type: #'CalloutState *'> + <inline: true> + calloutState integerRegisterIndex < NumIntRegArgs + ifTrue: + [calloutState integerRegisters at: calloutState integerRegisterIndex put: (self cCoerceSimple: value to: #'signed short'). + calloutState integerRegisterIndex: calloutState integerRegisterIndex + 1] + ifFalse: + [calloutState currentArg + self wordSize > calloutState limit ifTrue: + [^FFIErrorCallFrameTooBig]. + interpreterProxy longAt: calloutState currentArg put: (self cCoerceSimple: value to: #'signed short'). + calloutState currentArg: calloutState currentArg + self wordSize]. + ^0! Item was added: + ----- Method: ThreadedARM32FFIPlugin>>ffiPushSingleFloat:in: (in category 'marshalling') ----- + ffiPushSingleFloat: value in: calloutState + <var: #value type: #float> + <var: #calloutState type: #'CalloutState *'> + <inline: #always> + calloutState floatRegisterIndex < NumFloatRegArgs + ifTrue: + [calloutState backfillFloatRegisterIndex > 0 + ifTrue: + [calloutState floatRegisters at: calloutState backfillFloatRegisterIndex put: value. + calloutState backfillFloatRegisterIndex: 0] + ifFalse: + [calloutState floatRegisters at: calloutState floatRegisterIndex put: value. + calloutState floatRegisterIndex: calloutState floatRegisterIndex + 1]] + ifFalse: + [calloutState currentArg + self wordSize > calloutState limit ifTrue: + [^FFIErrorCallFrameTooBig]. + interpreterProxy storeSingleFloatAtPointer: calloutState currentArg from: value. + calloutState currentArg: calloutState currentArg + self wordSize]. + ^0! Item was added: + ----- Method: ThreadedARM32FFIPlugin>>ffiPushStructure:ofSize:typeSpec:ofLength:in: (in category 'marshalling') ----- + ffiPushStructure: pointer ofSize: structSize typeSpec: argSpec ofLength: argSpecSize in: calloutState + <var: #pointer type: #'void *'> + <var: #argSpec type: #'sqInt *'> + <var: #calloutState type: #'CalloutState *'> + <inline: true> + | availableRegisterSpace stackPartSize roundedSize | + + availableRegisterSpace := (NumIntRegArgs - calloutState integerRegisterIndex) * 4. + stackPartSize := structSize. + availableRegisterSpace > 0 + ifTrue: + [structSize <= availableRegisterSpace + ifTrue: + ["all in registers" + stackPartSize := 0. + self + memcpy: (self cCoerceSimple: (self addressOf: (calloutState integerRegisters at: calloutState integerRegisterIndex)) to: 'void *') + _: pointer + _: structSize. + calloutState integerRegisterIndex: calloutState integerRegisterIndex + (structSize + 3 bitShift: -2) ] + ifFalse: + ["If no previous co-processor candidate arg has already been pushed on the stack, then split the struct between registers and stack. + Otherwise push entire struct on stack." + calloutState currentArg = calloutState argVector + ifTrue: + [stackPartSize := structSize - availableRegisterSpace. + self + memcpy: (self cCoerceSimple: (self addressOf: (calloutState integerRegisters at: calloutState integerRegisterIndex)) to: 'void *') + _: pointer + _: availableRegisterSpace] + ifFalse: + [availableRegisterSpace := 0]. + calloutState integerRegisterIndex: NumIntRegArgs]]. + + stackPartSize > 0 + ifTrue: + [roundedSize := stackPartSize + 3 bitClear: 3. + calloutState currentArg + roundedSize > calloutState limit ifTrue: + [^FFIErrorCallFrameTooBig]. + self memcpy: calloutState currentArg _: (self addressOf: ((self cCoerceSimple: pointer to: 'char *') at: availableRegisterSpace)) _: stackPartSize. + calloutState currentArg: calloutState currentArg + roundedSize]. + ^0! Item was added: + ----- Method: ThreadedARM32FFIPlugin>>ffiPushUnsignedByte:in: (in category 'marshalling') ----- + ffiPushUnsignedByte: value in: calloutState + <var: #calloutState type: #'CalloutState *'> + <inline: true> + calloutState integerRegisterIndex < NumIntRegArgs + ifTrue: + [calloutState integerRegisters at: calloutState integerRegisterIndex put: (self cCoerceSimple: value to: #'unsigned char'). + calloutState integerRegisterIndex: calloutState integerRegisterIndex + 1] + ifFalse: + [calloutState currentArg + self wordSize > calloutState limit ifTrue: + [^FFIErrorCallFrameTooBig]. + interpreterProxy longAt: calloutState currentArg put: (self cCoerceSimple: value to: #'unsigned char'). + calloutState currentArg: calloutState currentArg + self wordSize]. + ^0 + ! Item was added: + ----- Method: ThreadedARM32FFIPlugin>>ffiPushUnsignedChar:in: (in category 'marshalling') ----- + ffiPushUnsignedChar: value in: calloutState + <var: #calloutState type: #'CalloutState *'> + <inline: true> + calloutState integerRegisterIndex < NumIntRegArgs + ifTrue: + [calloutState integerRegisters at: calloutState integerRegisterIndex put: (self cCoerceSimple: value to: #'unsigned char'). + calloutState integerRegisterIndex: calloutState integerRegisterIndex + 1] + ifFalse: + [calloutState currentArg + self wordSize > calloutState limit ifTrue: + [^FFIErrorCallFrameTooBig]. + interpreterProxy longAt: calloutState currentArg put: (self cCoerceSimple: value to: #'unsigned char'). + calloutState currentArg: calloutState currentArg + self wordSize]. + ^0! Item was added: + ----- Method: ThreadedARM32FFIPlugin>>ffiPushUnsignedInt:in: (in category 'marshalling') ----- + ffiPushUnsignedInt: value in: calloutState + <var: #calloutState type: #'CalloutState *'> + <inline: true> + calloutState integerRegisterIndex < NumIntRegArgs + ifTrue: + [calloutState integerRegisters at: calloutState integerRegisterIndex put: value. + calloutState integerRegisterIndex: calloutState integerRegisterIndex + 1] + ifFalse: + [calloutState currentArg + self wordSize > calloutState limit ifTrue: + [^FFIErrorCallFrameTooBig]. + interpreterProxy longAt: calloutState currentArg put: value. + calloutState currentArg: calloutState currentArg + self wordSize]. + ^0 + + ! Item was added: + ----- Method: ThreadedARM32FFIPlugin>>ffiPushUnsignedLongLong:in: (in category 'marshalling') ----- + ffiPushUnsignedLongLong: value in: calloutState + <var: #value type: #usqLong> + <var: #calloutState type: #'CalloutState *'> + <inline: true> + calloutState integerRegisterIndex < (NumIntRegArgs - 1) + ifTrue: + [calloutState integerRegisterIndex: (calloutState integerRegisterIndex + 1 bitClear: 1). + calloutState integerRegisters at: calloutState integerRegisterIndex put: (self cCoerceSimple: value to: #usqInt). + calloutState integerRegisters at: calloutState integerRegisterIndex + 1 put: (self cCoerceSimple: value >> 32 to: #usqInt). + calloutState integerRegisterIndex: calloutState integerRegisterIndex + 2] + ifFalse: + [calloutState currentArg + 8 > calloutState limit ifTrue: [^FFIErrorCallFrameTooBig]. + calloutState integerRegisterIndex: NumIntRegArgs. + interpreterProxy + longAt: calloutState currentArg put: (self cCoerceSimple: value to: #usqInt); + longAt: calloutState currentArg + self wordSize put: (self cCoerceSimple: value >> 32 to: #usqInt). + calloutState currentArg: calloutState currentArg + 8]. + ^0 + ! Item was added: + ----- Method: ThreadedARM32FFIPlugin>>ffiPushUnsignedShort:in: (in category 'marshalling') ----- + ffiPushUnsignedShort: value in: calloutState + <var: #calloutState type: #'CalloutState *'> + <inline: true> + calloutState integerRegisterIndex < NumIntRegArgs + ifTrue: + [calloutState integerRegisters at: calloutState integerRegisterIndex put: (self cCoerceSimple: value to: #'unsigned short'). + calloutState integerRegisterIndex: calloutState integerRegisterIndex + 1] + ifFalse: + [calloutState currentArg + self wordSize > calloutState limit ifTrue: + [^FFIErrorCallFrameTooBig]. + interpreterProxy longAt: calloutState currentArg put: (self cCoerceSimple: value to: #'unsigned short'). + calloutState currentArg: calloutState currentArg + self wordSize]. + ^0! Item was added: + ----- Method: ThreadedARM32FFIPlugin>>ffiReturnStruct:ofType:in: (in category 'callout support') ----- + ffiReturnStruct: longLongRet ofType: ffiRetType in: calloutState + <var: #longLongRet type: #usqLong> + <var: #calloutState type: #'CalloutState *'> + "Create a structure return value from an external function call. The value has been stored in + alloca'ed space pointed to by the calloutState or in the return value." + | retOop retClass oop | + <inline: true> + retClass := interpreterProxy fetchPointer: 1 ofObject: ffiRetType. + retOop := interpreterProxy instantiateClass: retClass indexableSize: 0. + self remapOop: retOop + in: [oop := interpreterProxy + instantiateClass: interpreterProxy classByteArray + indexableSize: calloutState structReturnSize]. + self memcpy: (interpreterProxy firstIndexableField: oop) + _: ((self returnStructInRegisters: calloutState structReturnSize) + ifTrue: [self addressOf: longLongRet] + ifFalse: [calloutState limit]) + _: calloutState structReturnSize. + interpreterProxy storePointer: 0 ofObject: retOop withValue: oop. + ^retOop! Item was added: + ----- Method: ThreadedARM32FFIPlugin>>returnStructInRegisters: (in category 'marshalling') ----- + returnStructInRegisters: returnStructSize + "Answer if a struct result of a given size is returned in memory or not." + ^returnStructSize <= self wordSize! Item was added: + ----- Method: ThreadedARM32FFIPlugin>>wordSize (in category 'simulation support') ----- + wordSize + + ^ 4 "arm32"! Item was changed: + ThreadedARM32FFIPlugin subclass: #ThreadedARM64FFIPlugin - ThreadedARMFFIPlugin subclass: #ThreadedARM64FFIPlugin instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'VMMaker-Plugins-FFI'! !ThreadedARM64FFIPlugin commentStamp: 'KenD 12/17/2018 14:38' prior: 0! A ThreadedARM64FFIPlugin is for the 64-bit ARM ABI. It typically has 8 integer registers Instance Variables ! Item was removed: - ThreadedFFIPlugin subclass: #ThreadedARMFFIPlugin - instanceVariableNames: '' - classVariableNames: 'NumFloatRegArgs NumIntRegArgs' - poolDictionaries: '' - category: 'VMMaker-Plugins-FFI'! - - !ThreadedARMFFIPlugin commentStamp: '<historical>' prior: 0! - This subclass is for the 32-bit ARM ABI. It typically has 4 integer registers.! Item was removed: - ----- Method: ThreadedARMFFIPlugin class>>calloutStateClass (in category 'translation') ----- - calloutStateClass - ^ThreadedFFICalloutStateForARM32! Item was removed: - ----- Method: ThreadedARMFFIPlugin class>>identifyingPredefinedMacros (in category 'translation') ----- - identifyingPredefinedMacros - ^#('__ARM_ARCH__' '__arm__' '__arm32__' 'ARM32')! Item was removed: - ----- Method: ThreadedARMFFIPlugin class>>initialize (in category 'class initialization') ----- - initialize - super initialize. - NumIntRegArgs := 4. - NumFloatRegArgs := 16! Item was removed: - ----- Method: ThreadedARMFFIPlugin class>>moduleName (in category 'translation') ----- - moduleName - ^'ARM32FFIPlugin'! Item was removed: - ----- Method: ThreadedARMFFIPlugin class>>numFloatRegArgs (in category 'accessing') ----- - numFloatRegArgs - ^NumFloatRegArgs! Item was removed: - ----- Method: ThreadedARMFFIPlugin class>>numIntRegArgs (in category 'accessing') ----- - numIntRegArgs - ^NumIntRegArgs! Item was removed: - ----- Method: ThreadedARMFFIPlugin>>ffiCalloutTo:SpecOnStack:in: (in category 'callout support') ----- - ffiCalloutTo: procAddr SpecOnStack: specOnStack in: calloutState - <var: #procAddr type: #'void *'> - <var: #calloutState type: #'CalloutState *'> - <var: #loadFloatRegs declareC: 'extern void loadFloatRegs(double, double, double, double, double, double, double, double)'> - "Go out, call this guy and create the return value. This *must* be inlined because of - the alloca of the outgoing stack frame in ffiCall:WithFlags:NumArgs:Args:AndTypes:" - | myThreadIndex atomicType floatRet intRet | - <var: #floatRet type: #double> - <var: #intRet type: #usqLong> - <inline: true> - myThreadIndex := interpreterProxy disownVM: (self disownFlagsFor: calloutState). - - calloutState floatRegisterIndex > 0 ifTrue: - [self - load: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 0)) to: 'double *') at: 0) - Flo: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 2)) to: 'double *') at: 0) - a: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 4)) to: 'double *') at: 0) - t: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 6)) to: 'double *') at: 0) - R: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 8)) to: 'double *') at: 0) - e: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 10)) to: 'double *') at: 0) - g: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 12)) to: 'double *') at: 0) - s: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 14)) to: 'double *') at: 0)]. - - (self allocaLiesSoSetSpBeforeCall or: [self mustAlignStack]) ifTrue: - [self setsp: calloutState argVector]. - - atomicType := self atomicTypeOf: calloutState ffiRetHeader. - (atomicType >> 1) = (FFITypeSingleFloat >> 1) ifTrue: - [atomicType = FFITypeSingleFloat - ifTrue: - [floatRet := self - dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'float (*)(sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t)') - with: (calloutState integerRegisters at: 0) - with: (calloutState integerRegisters at: 1) - with: (calloutState integerRegisters at: 2) - with: (calloutState integerRegisters at: 3)] - ifFalse: "atomicType = FFITypeDoubleFloat" - [floatRet := self - dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'double (*)(sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t)') - with: (calloutState integerRegisters at: 0) - with: (calloutState integerRegisters at: 1) - with: (calloutState integerRegisters at: 2) - with: (calloutState integerRegisters at: 3)]. - - "undo any callee argument pops because it may confuse stack management with the alloca." - (self isCalleePopsConvention: calloutState callFlags) ifTrue: - [self setsp: calloutState argVector]. - interpreterProxy ownVM: myThreadIndex. - - ^interpreterProxy floatObjectOf: floatRet]. - - intRet := self - dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'usqIntptr_t (*)(sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t)') - with: (calloutState integerRegisters at: 0) - with: (calloutState integerRegisters at: 1) - with: (calloutState integerRegisters at: 2) - with: (calloutState integerRegisters at: 3). - - "undo any callee argument pops because it may confuse stack management with the alloca." - (self isCalleePopsConvention: calloutState callFlags) ifTrue: - [self setsp: calloutState argVector]. - interpreterProxy ownVM: myThreadIndex. - - (calloutState ffiRetHeader anyMask: FFIFlagPointer+FFIFlagStructure) ifTrue: - ["Note: Order is important here since FFIFlagPointer + FFIFlagStructure is used to represent - 'typedef void* VoidPointer' and VoidPointer must be returned as pointer *not* as struct." - (calloutState ffiRetHeader anyMask: FFIFlagPointer) ifTrue: - [^self ffiReturnPointer: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState]. - ^self ffiReturnStruct: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState]. - - ^self ffiCreateIntegralResultOop: intRet ofAtomicType: atomicType in: calloutState! Item was removed: - ----- Method: ThreadedARMFFIPlugin>>ffiPushDoubleFloat:in: (in category 'marshalling') ----- - ffiPushDoubleFloat: value in: calloutState - <var: #value type: #double> - <var: #calloutState type: #'CalloutState *'> - <inline: #always> - - calloutState floatRegisterIndex < (NumFloatRegArgs - 1) - ifTrue: - [(calloutState floatRegisterIndex bitAnd: 1) = 1 - ifTrue: - [calloutState backfillFloatRegisterIndex: calloutState floatRegisterIndex. - calloutState floatRegisterIndex: (calloutState floatRegisterIndex + 1)]. - (self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: calloutState floatRegisterIndex)) - to: 'double*') - at: 0 - put: value. - calloutState floatRegisterIndex: calloutState floatRegisterIndex + 2] - ifFalse: - [calloutState currentArg + 8 > calloutState limit ifTrue: - [^FFIErrorCallFrameTooBig]. - calloutState floatRegisterIndex: NumFloatRegArgs. - interpreterProxy storeFloatAtPointer: calloutState currentArg from: value. - calloutState currentArg: calloutState currentArg + 8]. - ^0! Item was removed: - ----- Method: ThreadedARMFFIPlugin>>ffiPushPointer:in: (in category 'marshalling') ----- - ffiPushPointer: pointer in: calloutState - <var: #pointer type: #'void *'> - <var: #calloutState type: #'CalloutState *'> - <inline: true> - calloutState integerRegisterIndex < NumIntRegArgs - ifTrue: - [calloutState integerRegisters at: calloutState integerRegisterIndex put: pointer asInteger. - calloutState integerRegisterIndex: calloutState integerRegisterIndex + 1] - ifFalse: - [calloutState currentArg + self wordSize > calloutState limit ifTrue: - [^FFIErrorCallFrameTooBig]. - interpreterProxy longAt: calloutState currentArg put: pointer. - calloutState currentArg: calloutState currentArg + self wordSize]. - ^0! Item was removed: - ----- Method: ThreadedARMFFIPlugin>>ffiPushSignedByte:in: (in category 'marshalling') ----- - ffiPushSignedByte: value in: calloutState - <var: #calloutState type: #'CalloutState *'> - <inline: true> - calloutState integerRegisterIndex < NumIntRegArgs - ifTrue: - [calloutState integerRegisters at: calloutState integerRegisterIndex put: (self cCoerceSimple: value to: #'signed char'). - calloutState integerRegisterIndex: calloutState integerRegisterIndex + 1] - ifFalse: - [calloutState currentArg + self wordSize > calloutState limit ifTrue: - [^FFIErrorCallFrameTooBig]. - interpreterProxy longAt: calloutState currentArg put: (self cCoerceSimple: value to: #'signed char'). - calloutState currentArg: calloutState currentArg + self wordSize]. - ^0! Item was removed: - ----- Method: ThreadedARMFFIPlugin>>ffiPushSignedChar:in: (in category 'marshalling') ----- - ffiPushSignedChar: value in: calloutState - <var: #calloutState type: #'CalloutState *'> - <inline: true> - calloutState integerRegisterIndex < NumIntRegArgs - ifTrue: - [calloutState integerRegisters at: calloutState integerRegisterIndex put: (self cCoerceSimple: value to: #'signed char'). - calloutState integerRegisterIndex: calloutState integerRegisterIndex + 1] - ifFalse: - [calloutState currentArg + self wordSize > calloutState limit ifTrue: - [^FFIErrorCallFrameTooBig]. - interpreterProxy longAt: calloutState currentArg put: (self cCoerceSimple: value to: #'signed char'). - calloutState currentArg: calloutState currentArg + self wordSize]. - ^0! Item was removed: - ----- Method: ThreadedARMFFIPlugin>>ffiPushSignedInt:in: (in category 'marshalling') ----- - ffiPushSignedInt: value in: calloutState - <var: #calloutState type: #'CalloutState *'> - <inline: true> - calloutState integerRegisterIndex < NumIntRegArgs - ifTrue: - [calloutState integerRegisters at: calloutState integerRegisterIndex put: value. - calloutState integerRegisterIndex: calloutState integerRegisterIndex + 1] - ifFalse: - [calloutState currentArg + self wordSize > calloutState limit ifTrue: - [^FFIErrorCallFrameTooBig]. - interpreterProxy longAt: calloutState currentArg put: value. - calloutState currentArg: calloutState currentArg + self wordSize]. - ^0 - ! Item was removed: - ----- Method: ThreadedARMFFIPlugin>>ffiPushSignedLongLong:in: (in category 'marshalling') ----- - ffiPushSignedLongLong: value in: calloutState - <var: #value type: #sqLong> - <var: #calloutState type: #'CalloutState *'> - <inline: true> - calloutState integerRegisterIndex < (NumIntRegArgs - 1) - ifTrue: - [calloutState integerRegisterIndex: (calloutState integerRegisterIndex + 1 bitClear: 1). - calloutState integerRegisters at: calloutState integerRegisterIndex put: (self cCoerceSimple: value to: #usqInt). - calloutState integerRegisters at: calloutState integerRegisterIndex + 1 put: (self cCoerceSimple: value >> 32 to: #usqInt). - calloutState integerRegisterIndex: calloutState integerRegisterIndex + 2] - ifFalse: - [calloutState currentArg + 8 > calloutState limit ifTrue: [^FFIErrorCallFrameTooBig]. - calloutState integerRegisterIndex: NumIntRegArgs. - interpreterProxy - longAt: calloutState currentArg put: (self cCoerceSimple: value to: #usqInt); - longAt: calloutState currentArg + self wordSize put: (self cCoerceSimple: value >> 32 to: #usqInt). - calloutState currentArg: calloutState currentArg + 8]. - ^0! Item was removed: - ----- Method: ThreadedARMFFIPlugin>>ffiPushSignedShort:in: (in category 'marshalling') ----- - ffiPushSignedShort: value in: calloutState - <var: #calloutState type: #'CalloutState *'> - <inline: true> - calloutState integerRegisterIndex < NumIntRegArgs - ifTrue: - [calloutState integerRegisters at: calloutState integerRegisterIndex put: (self cCoerceSimple: value to: #'signed short'). - calloutState integerRegisterIndex: calloutState integerRegisterIndex + 1] - ifFalse: - [calloutState currentArg + self wordSize > calloutState limit ifTrue: - [^FFIErrorCallFrameTooBig]. - interpreterProxy longAt: calloutState currentArg put: (self cCoerceSimple: value to: #'signed short'). - calloutState currentArg: calloutState currentArg + self wordSize]. - ^0! Item was removed: - ----- Method: ThreadedARMFFIPlugin>>ffiPushSingleFloat:in: (in category 'marshalling') ----- - ffiPushSingleFloat: value in: calloutState - <var: #value type: #float> - <var: #calloutState type: #'CalloutState *'> - <inline: #always> - calloutState floatRegisterIndex < NumFloatRegArgs - ifTrue: - [calloutState backfillFloatRegisterIndex > 0 - ifTrue: - [calloutState floatRegisters at: calloutState backfillFloatRegisterIndex put: value. - calloutState backfillFloatRegisterIndex: 0] - ifFalse: - [calloutState floatRegisters at: calloutState floatRegisterIndex put: value. - calloutState floatRegisterIndex: calloutState floatRegisterIndex + 1]] - ifFalse: - [calloutState currentArg + self wordSize > calloutState limit ifTrue: - [^FFIErrorCallFrameTooBig]. - interpreterProxy storeSingleFloatAtPointer: calloutState currentArg from: value. - calloutState currentArg: calloutState currentArg + self wordSize]. - ^0! Item was removed: - ----- Method: ThreadedARMFFIPlugin>>ffiPushStructure:ofSize:typeSpec:ofLength:in: (in category 'marshalling') ----- - ffiPushStructure: pointer ofSize: structSize typeSpec: argSpec ofLength: argSpecSize in: calloutState - <var: #pointer type: #'void *'> - <var: #argSpec type: #'sqInt *'> - <var: #calloutState type: #'CalloutState *'> - <inline: true> - | availableRegisterSpace stackPartSize roundedSize | - - availableRegisterSpace := (NumIntRegArgs - calloutState integerRegisterIndex) * 4. - stackPartSize := structSize. - availableRegisterSpace > 0 - ifTrue: - [structSize <= availableRegisterSpace - ifTrue: - ["all in registers" - stackPartSize := 0. - self - memcpy: (self cCoerceSimple: (self addressOf: (calloutState integerRegisters at: calloutState integerRegisterIndex)) to: 'void *') - _: pointer - _: structSize. - calloutState integerRegisterIndex: calloutState integerRegisterIndex + (structSize + 3 bitShift: -2) ] - ifFalse: - ["If no previous co-processor candidate arg has already been pushed on the stack, then split the struct between registers and stack. - Otherwise push entire struct on stack." - calloutState currentArg = calloutState argVector - ifTrue: - [stackPartSize := structSize - availableRegisterSpace. - self - memcpy: (self cCoerceSimple: (self addressOf: (calloutState integerRegisters at: calloutState integerRegisterIndex)) to: 'void *') - _: pointer - _: availableRegisterSpace] - ifFalse: - [availableRegisterSpace := 0]. - calloutState integerRegisterIndex: NumIntRegArgs]]. - - stackPartSize > 0 - ifTrue: - [roundedSize := stackPartSize + 3 bitClear: 3. - calloutState currentArg + roundedSize > calloutState limit ifTrue: - [^FFIErrorCallFrameTooBig]. - self memcpy: calloutState currentArg _: (self addressOf: ((self cCoerceSimple: pointer to: 'char *') at: availableRegisterSpace)) _: stackPartSize. - calloutState currentArg: calloutState currentArg + roundedSize]. - ^0! Item was removed: - ----- Method: ThreadedARMFFIPlugin>>ffiPushUnsignedByte:in: (in category 'marshalling') ----- - ffiPushUnsignedByte: value in: calloutState - <var: #calloutState type: #'CalloutState *'> - <inline: true> - calloutState integerRegisterIndex < NumIntRegArgs - ifTrue: - [calloutState integerRegisters at: calloutState integerRegisterIndex put: (self cCoerceSimple: value to: #'unsigned char'). - calloutState integerRegisterIndex: calloutState integerRegisterIndex + 1] - ifFalse: - [calloutState currentArg + self wordSize > calloutState limit ifTrue: - [^FFIErrorCallFrameTooBig]. - interpreterProxy longAt: calloutState currentArg put: (self cCoerceSimple: value to: #'unsigned char'). - calloutState currentArg: calloutState currentArg + self wordSize]. - ^0 - ! Item was removed: - ----- Method: ThreadedARMFFIPlugin>>ffiPushUnsignedChar:in: (in category 'marshalling') ----- - ffiPushUnsignedChar: value in: calloutState - <var: #calloutState type: #'CalloutState *'> - <inline: true> - calloutState integerRegisterIndex < NumIntRegArgs - ifTrue: - [calloutState integerRegisters at: calloutState integerRegisterIndex put: (self cCoerceSimple: value to: #'unsigned char'). - calloutState integerRegisterIndex: calloutState integerRegisterIndex + 1] - ifFalse: - [calloutState currentArg + self wordSize > calloutState limit ifTrue: - [^FFIErrorCallFrameTooBig]. - interpreterProxy longAt: calloutState currentArg put: (self cCoerceSimple: value to: #'unsigned char'). - calloutState currentArg: calloutState currentArg + self wordSize]. - ^0! Item was removed: - ----- Method: ThreadedARMFFIPlugin>>ffiPushUnsignedInt:in: (in category 'marshalling') ----- - ffiPushUnsignedInt: value in: calloutState - <var: #calloutState type: #'CalloutState *'> - <inline: true> - calloutState integerRegisterIndex < NumIntRegArgs - ifTrue: - [calloutState integerRegisters at: calloutState integerRegisterIndex put: value. - calloutState integerRegisterIndex: calloutState integerRegisterIndex + 1] - ifFalse: - [calloutState currentArg + self wordSize > calloutState limit ifTrue: - [^FFIErrorCallFrameTooBig]. - interpreterProxy longAt: calloutState currentArg put: value. - calloutState currentArg: calloutState currentArg + self wordSize]. - ^0 - - ! Item was removed: - ----- Method: ThreadedARMFFIPlugin>>ffiPushUnsignedLongLong:in: (in category 'marshalling') ----- - ffiPushUnsignedLongLong: value in: calloutState - <var: #value type: #usqLong> - <var: #calloutState type: #'CalloutState *'> - <inline: true> - calloutState integerRegisterIndex < (NumIntRegArgs - 1) - ifTrue: - [calloutState integerRegisterIndex: (calloutState integerRegisterIndex + 1 bitClear: 1). - calloutState integerRegisters at: calloutState integerRegisterIndex put: (self cCoerceSimple: value to: #usqInt). - calloutState integerRegisters at: calloutState integerRegisterIndex + 1 put: (self cCoerceSimple: value >> 32 to: #usqInt). - calloutState integerRegisterIndex: calloutState integerRegisterIndex + 2] - ifFalse: - [calloutState currentArg + 8 > calloutState limit ifTrue: [^FFIErrorCallFrameTooBig]. - calloutState integerRegisterIndex: NumIntRegArgs. - interpreterProxy - longAt: calloutState currentArg put: (self cCoerceSimple: value to: #usqInt); - longAt: calloutState currentArg + self wordSize put: (self cCoerceSimple: value >> 32 to: #usqInt). - calloutState currentArg: calloutState currentArg + 8]. - ^0 - ! Item was removed: - ----- Method: ThreadedARMFFIPlugin>>ffiPushUnsignedShort:in: (in category 'marshalling') ----- - ffiPushUnsignedShort: value in: calloutState - <var: #calloutState type: #'CalloutState *'> - <inline: true> - calloutState integerRegisterIndex < NumIntRegArgs - ifTrue: - [calloutState integerRegisters at: calloutState integerRegisterIndex put: (self cCoerceSimple: value to: #'unsigned short'). - calloutState integerRegisterIndex: calloutState integerRegisterIndex + 1] - ifFalse: - [calloutState currentArg + self wordSize > calloutState limit ifTrue: - [^FFIErrorCallFrameTooBig]. - interpreterProxy longAt: calloutState currentArg put: (self cCoerceSimple: value to: #'unsigned short'). - calloutState currentArg: calloutState currentArg + self wordSize]. - ^0! Item was removed: - ----- Method: ThreadedARMFFIPlugin>>ffiReturnStruct:ofType:in: (in category 'callout support') ----- - ffiReturnStruct: longLongRet ofType: ffiRetType in: calloutState - <var: #longLongRet type: #usqLong> - <var: #calloutState type: #'CalloutState *'> - "Create a structure return value from an external function call. The value has been stored in - alloca'ed space pointed to by the calloutState or in the return value." - | retOop retClass oop | - <inline: true> - retClass := interpreterProxy fetchPointer: 1 ofObject: ffiRetType. - retOop := interpreterProxy instantiateClass: retClass indexableSize: 0. - self remapOop: retOop - in: [oop := interpreterProxy - instantiateClass: interpreterProxy classByteArray - indexableSize: calloutState structReturnSize]. - self memcpy: (interpreterProxy firstIndexableField: oop) - _: ((self returnStructInRegisters: calloutState structReturnSize) - ifTrue: [self addressOf: longLongRet] - ifFalse: [calloutState limit]) - _: calloutState structReturnSize. - interpreterProxy storePointer: 0 ofObject: retOop withValue: oop. - ^retOop! Item was removed: - ----- Method: ThreadedARMFFIPlugin>>returnStructInRegisters: (in category 'marshalling') ----- - returnStructInRegisters: returnStructSize - "Answer if a struct result of a given size is returned in memory or not." - ^returnStructSize <= self wordSize! Item was removed: - ----- Method: ThreadedARMFFIPlugin>>wordSize (in category 'simulation support') ----- - wordSize - - ^ 4 "arm32"! Item was changed: ----- Method: ThreadedFFICalloutStateForARM32>>initialize (in category 'initialize-release') ----- initialize super initialize. integerRegisterIndex := 0. floatRegisterIndex := 0. backfillFloatRegisterIndex := 0. + integerRegisters := CArrayAccessor on: (Array new: ThreadedARM32FFIPlugin numIntRegArgs). + floatRegisters := CArrayAccessor on: (Array new: ThreadedARM32FFIPlugin numFloatRegArgs)! - integerRegisters := CArrayAccessor on: (Array new: ThreadedARMFFIPlugin numIntRegArgs). - floatRegisters := CArrayAccessor on: (Array new: ThreadedARMFFIPlugin numFloatRegArgs)! Item was changed: ----- Method: ThreadedFFIPlugin>>morphIntoConcreteSubclass: (in category 'simulation') ----- morphIntoConcreteSubclass: aCoInterpreter <doNotGenerate> | concreteClass | concreteClass := aCoInterpreter ISA caseOf: { [#X64] -> [(Smalltalk platformName beginsWith: 'Win') ifTrue: [ThreadedX64Win64FFIPlugin] ifFalse: [ThreadedX64SysVFFIPlugin]]. [#IA32] -> [ThreadedIA32FFIPlugin]. + [#ARMv5] -> [ThreadedARM32FFIPlugin] } - [#ARMv5] -> [ThreadedARMFFIPlugin] } otherwise: [self error: 'simulation not set up for this ISA']. "If the concreteClass has an initialize method, other than ThreadedFFIPlugin class>>initialize then it needs to be run." ((concreteClass class whichClassIncludesSelector: #initialize) inheritsFrom: self class class) ifTrue: [concreteClass initialize]. concreteClass adoptInstance: self! Item was changed: ----- Method: VMMaker class>>generateVMPlugins (in category 'configurations') ----- generateVMPlugins ^VMMaker generatePluginsTo: self sourceTree, '/src' options: #() platformDir: self sourceTree, '/platforms' including:#( ADPCMCodecPlugin AsynchFilePlugin BalloonEnginePlugin B3DAcceleratorPlugin B3DEnginePlugin BMPReadWriterPlugin BitBltSimulation BochsIA32Plugin BochsX64Plugin CameraPlugin CroquetPlugin DeflatePlugin DropPlugin "Cryptography Plugins:" DESPlugin DSAPlugin MD5Plugin SHA256Plugin "FT2Plugin" FFTPlugin FileCopyPlugin FilePlugin FileAttributesPlugin FloatArrayPlugin FloatMathPlugin GeniePlugin GdbARMPlugin HostWindowPlugin IA32ABIPlugin ImmX11Plugin InternetConfigPlugin JPEGReadWriter2Plugin JPEGReaderPlugin JoystickTabletPlugin KlattSynthesizerPlugin LargeIntegersPlugin LocalePlugin MIDIPlugin MacMenubarPlugin Matrix2x3Plugin MiscPrimitivePlugin Mpeg3Plugin QuicktimePlugin RePlugin ScratchPlugin SecurityPlugin SerialPlugin SocketPlugin SoundCodecPlugin SoundGenerationPlugin SoundPlugin SqueakSSLPlugin StarSqueakPlugin + ThreadedFFIPlugin ThreadedARM32FFIPlugin ThreadedARM64FFIPlugin ThreadedIA32FFIPlugin - ThreadedFFIPlugin ThreadedARMFFIPlugin ThreadedARM64FFIPlugin ThreadedIA32FFIPlugin ThreadedX64SysVFFIPlugin ThreadedX64Win64FFIPlugin UnicodePlugin UnixAioPlugin UUIDPlugin UnixOSProcessPlugin Win32OSProcessPlugin VMProfileLinuxSupportPlugin VMProfileMacSupportPlugin WeDoPlugin XDisplayControlPlugin)!

1 0

VM Maker Inbox: VMMaker.oscog-KenD.2511.mcz
by commits＠source.squeak.org 22 Jan '19

22 Jan '19

A new version of VMMaker was added to project VM Maker Inbox: http://source.squeak.org/VMMakerInbox/VMMaker.oscog-KenD.2511.mcz ==================== Summary ==================== Name: VMMaker.oscog-KenD.2511 Author: KenD Time: 22 January 2019, 9:00:55.084764 am UUID: d4e9e0d4-b0bb-4bf0-84c0-b173cf9d8362 Ancestors: VMMaker.oscog-eem.2510 Needed StackInterpreter initializeMiscConstants. and double -> float for floatArgRegisters =============== Diff against VMMaker.oscog-eem.2510 =============== Item was changed: ----- Method: ThreadedFFICalloutStateForARM64 class>>instVarNamesAndTypesForTranslationDo: (in category 'translation') ----- instVarNamesAndTypesForTranslationDo: aBinaryBlock "enumerate aBinaryBlock with the names and C type strings for the inst vars to include in a ThreadedFFICalloutState struct." superclass instVarNamesAndTypesForTranslationDo: aBinaryBlock. self instVarNames do: [:ivn| aBinaryBlock value: ivn value: (ivn caseOf: { ['integerRegisters'] -> [{#sqInt. '[NumIntRegArgs]'}]. + ['floatRegisters'] -> [{#float. '[NumFloatRegArgs]'}] } - ['floatRegisters'] -> [{#double. '[NumFloatRegArgs]'}] } otherwise: [#sqInt])]!

2 1

arm64 ffi update [working better]
by ken.dickey＠whidbey.com 22 Jan '19

22 Jan '19

Back to 3 unit test fails with VMMaker generated arm64 FFI! VMMaker.oscog-KenD.2511.mcz [1] plus latest pull to fix arm64abicc.c [2] Two basic problems. [1] Somehow, StackInterpreter lost some of its class variable values (e.g. for DisownVM). Had to invoke StackInterpreter initializeMiscConstants Note that "StackInterpreter initialize" did _not_ set these. [2] I found/find pattern of "use every other float register" wacky. Now I begin to see that this is to work around C typecast hoop jumps. So floatRegisters are now declared #float rather than #double. This changed the number of unit test failures from 7 to 3. We probably need to (better) document this somewhere. On to those remaining unit tests, then I get to write some more! ;^) -KenD Links: ------ [1] http://source.squeak.org/VMMakerInbox/VMMaker.oscog-KenD.2511.mcz [2] https://github.com/KenDickey/opensmalltalk-vm/blob/Cog/platforms/Cross/plug…

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev January 2019