Vm-dev August 2020

vm-dev@lists.squeakfoundation.org

15 participants
109 discussions

Still Failing: OpenSmalltalk/opensmalltalk-vm#2148 (Cog - 671bcff)
by Travis CI 30 Aug '20

30 Aug '20

Build Update for OpenSmalltalk/opensmalltalk-vm ------------------------------------- Build: #2148 Status: Still Failing Duration: 20 mins and 20 secs Commit: 671bcff (Cog) Author: Eliot Miranda Message: CogVM source as per VMMaker.oscog-eem.2796 Interpreter: Fix a few storePointer:...withValue: objectMemory nilObject's to be storePointerUnchecked:. ThreadedARM64Plugin: Implement support for Homogenous Float Arrays (HVAs, structs with up to four float fields, or up to four double fields). These are passed and returned in floating-point argument registers, on call if sufficient are available. To implement this the ThreadedARM64Plugin uses a union of a struct containing four doubles, and a struct containing eight floats. All float/double/HVA returns are handled by a call that expects a struct of four doubles. Hence Slang changes are needed (see below) to allow the struct to be conveniently defined with local methods. This fixes about five test cases in the FFI tests. Mark all methods required to be inlined to be in the same function as the alloca as inline: #always. Hence their code will only occur inlined, not a second time in an unused function. Tidy up, pulling the unaligned accessor macros out of the preamble and explicitly into methods, whether Slang has a chance to generate code correctly given their presence. Also make sure that all references to a type spec are typed as unsigned int/unsigned int *, including the callout state's ffiArgSpec. Fix a warning by typing InterpreterProxy>>characterObjectOf:'s argument as int to agree with sqVirtualMachine.h. Slang: Fix several issues with inlining and type inferrence to support the above ThreadedARM64Plugin fixes. Distinguish macros from struct accessors; previously isStructSend: could be confused. Make sure that structTargetKindForDeclaration: answers #pointer only for types endign with a *; previously it could be confused by e.g. a struct containing pointers. Make isTypePointerToStruct: more robust, answering false for anything that isn't a string and then analysing the string. emitCCodeAsFieldReferenceOn:level:generator: must also check for shouldGenerateAsInterpreterProxySend:. tryToInlineMethodsIn: must push the current method's declarations onto the scope stack to allow proper type inferrence while inlining. Since these changes now allow e.g. a structure method to be inlined, extend node:typeCompatibleWith:inliningInto:in: to inline such arguments; it needs to take the address of the argument to derive the lined pointer to the actual argument. View the changeset: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/57d91d0d2f97...67… View the full build log and details: https://travis-ci.org/github/OpenSmalltalk/opensmalltalk-vm/builds/72240743… -- You can unsubscribe from build emails from the OpenSmalltalk/opensmalltalk-vm repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=8795279&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

[OpenSmalltalk/opensmalltalk-vm] 671bcf: CogVM source as per VMMaker.oscog-eem.2796
by Eliot Miranda 30 Aug '20

30 Aug '20

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 671bcff621d1ba87cf868a7f1a0c24fdbcfd020f https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/671bcff621d1ba87cf… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2020-08-29 (Sat, 29 Aug 2020) Changed paths: M nsspur64src/vm/cogit.h M nsspur64src/vm/cointerp.c M nsspur64src/vm/cointerp.h M nsspur64src/vm/gcc3x-cointerp.c M nsspursrc/vm/cogit.h M nsspursrc/vm/cointerp.c M nsspursrc/vm/cointerp.h M nsspursrc/vm/gcc3x-cointerp.c M nsspurstack64src/vm/gcc3x-interp.c M nsspurstack64src/vm/interp.c M nsspurstacksrc/vm/gcc3x-interp.c M nsspurstacksrc/vm/interp.c M platforms/Cross/plugins/IA32ABI/x64win64abicc.c M scripts/revertIfEssentiallyUnchanged M spur64src/vm/cointerp.c M spur64src/vm/cointerp.h M spur64src/vm/cointerpmt.c M spur64src/vm/cointerpmt.h M spur64src/vm/gcc3x-cointerp.c M spur64src/vm/gcc3x-cointerpmt.c M spurlowcode64src/vm/cointerp.c M spurlowcode64src/vm/cointerp.h M spurlowcode64src/vm/gcc3x-cointerp.c M spurlowcodesrc/vm/cointerp.c M spurlowcodesrc/vm/cointerp.h M spurlowcodesrc/vm/gcc3x-cointerp.c M spurlowcodestack64src/vm/gcc3x-interp.c M spurlowcodestack64src/vm/interp.c M spurlowcodestacksrc/vm/gcc3x-interp.c M spurlowcodestacksrc/vm/interp.c M spursista64src/vm/cointerp.c M spursista64src/vm/cointerp.h M spursista64src/vm/gcc3x-cointerp.c M spursistasrc/vm/cointerp.c M spursistasrc/vm/cointerp.h M spursistasrc/vm/gcc3x-cointerp.c M spursrc/vm/cointerp.c M spursrc/vm/cointerp.h M spursrc/vm/cointerpmt.c M spursrc/vm/cointerpmt.h M spursrc/vm/gcc3x-cointerp.c M spursrc/vm/gcc3x-cointerpmt.c M spurstack64src/vm/gcc3x-interp.c M spurstack64src/vm/interp.c M spurstack64src/vm/validImage.c M spurstacksrc/vm/gcc3x-interp.c M spurstacksrc/vm/interp.c M spurstacksrc/vm/validImage.c M src/plugins/B2DPlugin/B2DPlugin.c M src/plugins/FilePlugin/FilePlugin.c M src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c M src/plugins/SqueakFFIPrims/ARM64FFIPlugin.c M src/plugins/SqueakFFIPrims/IA32FFIPlugin.c M src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c M src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c M src/vm/cointerp.c M src/vm/cointerp.h M src/vm/cointerpmt.c M src/vm/cointerpmt.h M src/vm/gcc3x-cointerp.c M src/vm/gcc3x-cointerpmt.c M stacksrc/vm/gcc3x-interp.c M stacksrc/vm/interp.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.2796 Interpreter: Fix a few storePointer:...withValue: objectMemory nilObject's to be storePointerUnchecked:. ThreadedARM64Plugin: Implement support for Homogenous Float Arrays (HVAs, structs with up to four float fields, or up to four double fields). These are passed and returned in floating-point argument registers, on call if sufficient are available. To implement this the ThreadedARM64Plugin uses a union of a struct containing four doubles, and a struct containing eight floats. All float/double/HVA returns are handled by a call that expects a struct of four doubles. Hence Slang changes are needed (see below) to allow the struct to be conveniently defined with local methods. This fixes about five test cases in the FFI tests. Mark all methods required to be inlined to be in the same function as the alloca as inline: #always. Hence their code will only occur inlined, not a second time in an unused function. Tidy up, pulling the unaligned accessor macros out of the preamble and explicitly into methods, whether Slang has a chance to generate code correctly given their presence. Also make sure that all references to a type spec are typed as unsigned int/unsigned int *, including the callout state's ffiArgSpec. Fix a warning by typing InterpreterProxy>>characterObjectOf:'s argument as int to agree with sqVirtualMachine.h. Slang: Fix several issues with inlining and type inferrence to support the above ThreadedARM64Plugin fixes. Distinguish macros from struct accessors; previously isStructSend: could be confused. Make sure that structTargetKindForDeclaration: answers #pointer only for types endign with a *; previously it could be confused by e.g. a struct containing pointers. Make isTypePointerToStruct: more robust, answering false for anything that isn't a string and then analysing the string. emitCCodeAsFieldReferenceOn:level:generator: must also check for shouldGenerateAsInterpreterProxySend:. tryToInlineMethodsIn: must push the current method's declarations onto the scope stack to allow proper type inferrence while inlining. Since these changes now allow e.g. a structure method to be inlined, extend node:typeCompatibleWith:inliningInto:in: to inline such arguments; it needs to take the address of the argument to derive the lined pointer to the actual argument.

1 0

VM Maker: VMMaker.oscog-eem.2796.mcz
by commits＠source.squeak.org 30 Aug '20

30 Aug '20

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2796.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2796 Author: eem Time: 29 August 2020, 7:20:43.067441 pm UUID: 28a85911-a957-43f5-9311-3434d5f7727c Ancestors: VMMaker.oscog-eem.2795 Fix a few storePointer:...withValue: objectMemory nilObject's to be storePointerUnchecked:. =============== Diff against VMMaker.oscog-eem.2795 =============== Item was changed: ----- Method: CoInterpreterPrimitives>>primitiveSuspend (in category 'process primitives') ----- primitiveSuspend "Primitive. Suspend the receiver, aProcess such that it can be executed again by sending #resume. If the given process is not currently running, take it off its corresponding list. The primitive returns the list the receiver was previously on." | process myList | process := self stackTop. process = self activeProcess ifTrue: [| inInterpreter | "We're going to switch process, either to an interpreted frame or a machine code frame. To know whether to return or enter machine code we have to know from whence we came. We could have come from the interpreter, either directly or via a machine code primitive. We could have come from machine code. The instructionPointer tells us where from:" self pop: 1 thenPush: objectMemory nilObject. inInterpreter := instructionPointer >= objectMemory startOfMemory. self transferTo: self wakeHighestPriority from: CSSuspend. ^self forProcessPrimitiveReturnToExecutivePostContextSwitch: inInterpreter]. myList := objectMemory fetchPointer: MyListIndex ofObject: process. "XXXX Fixme. We should really check whether myList is a kind of LinkedList or not but we can't easily so just do a quick check for nil which is the most common case." myList = objectMemory nilObject ifTrue: [^self primitiveFailFor: PrimErrBadReceiver]. "Alas in Spur we need a read barrier" (objectMemory isForwarded: myList) ifTrue: [myList := objectMemory followForwarded: myList. objectMemory storePointer: MyListIndex ofObject: process withValue: myList]. self removeProcess: process fromList: myList. self successful ifTrue: + [objectMemory storePointerUnchecked: MyListIndex ofObject: process withValue: objectMemory nilObject. - [objectMemory storePointer: MyListIndex ofObject: process withValue: objectMemory nilObject. self pop: 1 thenPush: myList]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveNewMethod (in category 'compiled methods') ----- primitiveNewMethod | header bytecodeCount class size theMethod literalCount | header := self stackTop. bytecodeCount := self stackValue: 1. ((objectMemory isIntegerObject: header) and: [(objectMemory isIntegerObject: bytecodeCount) and: [(bytecodeCount := objectMemory integerValueOf: bytecodeCount) >= 0]]) ifFalse: [self primitiveFailFor: PrimErrBadArgument. ^self]. class := self stackValue: 2. literalCount := objectMemory literalCountOfMethodHeader: header. size := literalCount + LiteralStart * objectMemory bytesPerOop + bytecodeCount. objectMemory hasSpurMemoryManagerAPI ifTrue: [theMethod := objectMemory instantiateCompiledMethodClass: class indexableSize: size. theMethod ifNil: [self primitiveFailFor: ((objectMemory isCompiledMethodFormat: (objectMemory instSpecOfClass: class)) ifTrue: [PrimErrNoMemory] ifFalse: [PrimErrBadReceiver]). ^self]] ifFalse: [theMethod := objectMemory instantiateClass: class indexableSize: size]. objectMemory storePointerUnchecked: HeaderIndex ofObject: theMethod withValue: header. 1 to: literalCount do: + [:i | objectMemory storePointerUnchecked: i ofObject: theMethod withValue: objectMemory nilObject]. - [:i | objectMemory storePointer: i ofObject: theMethod withValue: objectMemory nilObject]. self pop: 3 thenPush: theMethod! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSuspend (in category 'process primitives') ----- primitiveSuspend "Primitive. Suspend the receiver, aProcess such that it can be executed again by sending #resume. If the given process is not currently running, take it off its corresponding list. The primitive returns the list the receiver was previously on." | process myList | process := self stackTop. process = self activeProcess ifTrue: [self pop: 1 thenPush: objectMemory nilObject. ^self transferTo: self wakeHighestPriority]. myList := objectMemory fetchPointer: MyListIndex ofObject: process. "XXXX Fixme. We should really check whether myList is a kind of LinkedList or not but we can't easily so just do a quick check for nil which is the most common case." myList = objectMemory nilObject ifTrue: [^self primitiveFailFor: PrimErrBadReceiver]. "Alas in Spur we need a read barrier" (objectMemory isForwarded: myList) ifTrue: [myList := objectMemory followForwarded: myList. objectMemory storePointer: MyListIndex ofObject: process withValue: myList]. self removeProcess: process fromList: myList. self successful ifTrue: + [objectMemory storePointerUnchecked: MyListIndex ofObject: process withValue: objectMemory nilObject. - [objectMemory storePointer: MyListIndex ofObject: process withValue: objectMemory nilObject. self pop: 1 thenPush: myList]! Item was changed: ----- Method: StackInterpreter>>removeProcess:fromList: (in category 'process primitive support') ----- removeProcess: aProcess fromList: aList "Remove a given process from a linked list. May fail if aProcess is not on the list." | firstLink lastLink nextLink tempLink | self deny: (objectMemory isForwarded: aProcess). self deny: (objectMemory isForwarded: aList). firstLink := objectMemory fetchPointer: FirstLinkIndex ofObject: aList. lastLink := objectMemory fetchPointer: LastLinkIndex ofObject: aList. self deny: (objectMemory isForwarded: firstLink). self deny: (objectMemory isForwarded: lastLink). aProcess = firstLink ifTrue: [nextLink := objectMemory fetchPointer: NextLinkIndex ofObject: aProcess. self deny: (objectMemory isForwarded: nextLink). objectMemory storePointer: FirstLinkIndex ofObject: aList withValue: nextLink. aProcess = lastLink ifTrue: [objectMemory storePointerUnchecked: LastLinkIndex ofObject: aList withValue: objectMemory nilObject]] ifFalse: [tempLink := firstLink. [self deny: (objectMemory isForwarded: tempLink). tempLink = objectMemory nilObject ifTrue: [self primitiveFail. ^self]. nextLink := objectMemory fetchPointer: NextLinkIndex ofObject: tempLink. nextLink = aProcess] whileFalse: [tempLink := objectMemory fetchPointer: NextLinkIndex ofObject: tempLink]. nextLink := objectMemory fetchPointer: NextLinkIndex ofObject: aProcess. objectMemory storePointer: NextLinkIndex ofObject: tempLink withValue: nextLink. aProcess = lastLink ifTrue: [objectMemory storePointer: LastLinkIndex ofObject: aList withValue: tempLink]]. + objectMemory storePointerUnchecked: NextLinkIndex ofObject: aProcess withValue: objectMemory nilObject! - objectMemory storePointer: NextLinkIndex ofObject: aProcess withValue: objectMemory nilObject! Item was changed: ----- Method: StackInterpreterPrimitives>>primitiveSignalAtMilliseconds (in category 'system control primitives') ----- primitiveSignalAtMilliseconds "Cause the time semaphore, if one has been registered, to be signalled when the microsecond clock is greater than or equal to the given tick value. A tick value of zero turns off timer interrupts." | msecsObj msecs deltaMsecs sema limit | <var: #msecs type: #sqLong> <var: #deltaMsecs type: #sqLong> <var: #limit type: #sqLong> msecsObj := self stackTop. sema := self stackValue: 1. msecs := self positive32BitValueOf: msecsObj. self successful ifTrue: [(objectMemory isSemaphoreOop: sema) ifTrue: [objectMemory splObj: TheTimerSemaphore put: sema. deltaMsecs := msecs - (self ioMSecs bitAnd: MillisecondClockMask). limit := MillisecondClockMask >> 1. "Handle a roll-over that could happen in between image invocation of ioMSecs and this invocation. This will limit the maximum relative duration to MillisecondClockMask/2, about 3 days currently. Every delay longer than that limit may lead to undefined behavior (shorten delay, or no delay at all)" deltaMsecs > limit ifTrue: [deltaMsecs := deltaMsecs - MillisecondClockMask]. nextWakeupUsecs := deltaMsecs > 0 ifTrue: [self ioUTCMicroseconds + (deltaMsecs * 1000)] ifFalse: [self ioUTCMicroseconds]. ^self pop: 2]. sema = objectMemory nilObject ifTrue: [objectMemory + storePointerUnchecked: TheTimerSemaphore - storePointer: TheTimerSemaphore ofObject: objectMemory specialObjectsOop withValue: objectMemory nilObject. nextWakeupUsecs := 0. ^self pop: 2]]. self primitiveFailFor: PrimErrBadArgument! Item was changed: ----- Method: StackInterpreterPrimitives>>primitiveSignalAtUTCMicroseconds (in category 'system control primitives') ----- primitiveSignalAtUTCMicroseconds "Cause the time semaphore, if one has been registered, to be signalled when the microsecond clock is greater than or equal to the given tick value. A tick value of zero turns off timer interrupts." | usecsObj sema usecs | <var: #usecs type: #usqLong> usecsObj := self stackTop. sema := self stackValue: 1. usecs := self positive64BitValueOf: usecsObj. self successful ifTrue: [(objectMemory isSemaphoreOop: sema) ifTrue: [objectMemory splObj: TheTimerSemaphore put: sema. nextWakeupUsecs := usecs. ^self pop: 2]. sema = objectMemory nilObject ifTrue: [objectMemory + storePointerUnchecked: TheTimerSemaphore - storePointer: TheTimerSemaphore ofObject: objectMemory specialObjectsOop withValue: objectMemory nilObject. nextWakeupUsecs := 0. ^self pop: 2]]. self primitiveFailFor: PrimErrBadArgument!

1 0

Still Failing: OpenSmalltalk/opensmalltalk-vm#2147 (Cog - 57d91d0)
by Travis CI 30 Aug '20

30 Aug '20

Build Update for OpenSmalltalk/opensmalltalk-vm ------------------------------------- Build: #2147 Status: Still Failing Duration: 21 mins and 23 secs Commit: 57d91d0 (Cog) Author: Eliot Miranda Message: Merge pull request #515 from KenDickey/Cog vm-display-fbdev View the changeset: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/03812efd76a0...57… View the full build log and details: https://travis-ci.org/github/OpenSmalltalk/opensmalltalk-vm/builds/72239532… -- You can unsubscribe from build emails from the OpenSmalltalk/opensmalltalk-vm repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=8795279&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

VM Maker: VMMaker.oscog-eem.2795.mcz
by commits＠source.squeak.org 30 Aug '20

30 Aug '20

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2795.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2795 Author: eem Time: 29 August 2020, 6:11:51.399954 pm UUID: 94ce8042-5549-46ab-b693-8d00f36d6d71 Ancestors: VMMaker.oscog-eem.2794 ThreadedARM64Plugin: Implement support for Homogenous Float Arrays (HVAs, structs with up to four float fields, or up to four double fields). These are passed and returned in floating-point argument registers, on call if sufficient are available. To implement this the ThreadedARM64Plugin uses a union of a struct containing four doubles, and a struct containing eight floats. All float/double/HVA returns are handled by a call that expects a struct of four doubles. hence Slang changes are needed (see below) to allow the struct to be conveniently defined with local methods. Mark all methods required to be inlined to be in the same funcuton as the alloca as inline: #always. Hence their code will only occur inlined, not a second time in an unused function. Tidy up, pulling the unaligned accessor macros out of the preamble and explicitly into methods, whether Slang has a chance to generate code correctly given their presence. Also make sure that all references to a type spec are typed as unsigned int/unsigned int *, including the callout state's ffiArgSpec. This fixes about five test cases in the FFI tests. Fix a warning by typing InterpreterProxy>>characterObjectOf:'s argument as int to agree with sqVirtualMachine.h. Slang: Fix several issues with inlining and type inferrence to support the above. Distinguish macros from struct accessors; previously isStructSend: could be confused. Make sure that structTargetKindForDeclaration: answers #pointer only for types endign with a *; previously it could be confused by e.g. a struct containing pointers. Make isTypePointerToStruct: more robust, answering false for anything that isn't a string and then analysing the string. emitCCodeAsFieldReferenceOn:level:generator: must also check for shouldGenerateAsInterpreterProxySend:. tryToInlineMethodsIn: must push the current method's declarations onto the scope stack to allow priper type inferrence while inlining. Since these changes now allow e.g. a structure method to be inlined, extend node:typeCompatibleWith:inliningInto:in: to inline such arguments; it needs to take the address of the argument to derive the lined pointer to the actual argument. =============== Diff against VMMaker.oscog-eem.2794 =============== Item was added: + ----- Method: CCodeGenerator>>isKernelMacroSelector: (in category 'utilities') ----- + isKernelMacroSelector: sel + "Answer if the given selector is one of the selectors implemented as a macro in platform header fiels." + + ^(self isKernelSelector: sel) + or: [VMBasicConstants mostBasicConstantSelectors includes: sel]! Item was added: + ----- Method: CCodeGenerator>>isMacroSelector: (in category 'utilities') ----- + isMacroSelector: sel + "Answer if the given selector is one of the selectors implemented as a macro in platform header fiels." + + ^(self isKernelSelector: sel) + or: [(VMBasicConstants mostBasicConstantSelectors includes: sel) + or: [(self methodNamed: sel) + ifNil: [false] + ifNotNil: [:m| m definedAsMacro]]]! Item was changed: ----- Method: CCodeGenerator>>node:typeCompatibleWith:inliningInto:in: (in category 'inlining') ----- node: exprNode typeCompatibleWith: argName inliningInto: targetMethod in: aTMethod "Answer either exprNode or, if required, a cast of exprNode to the type of argName. The cast is required if - argName is typed and exprNode is untyped - argName is untyped and exprNode is an arithmetic type of size > #sqInt - both argName and exprNode are typed but they are incompatible" | formalType actualType | formalType := targetMethod typeFor: argName in: self. actualType := self typeFor: exprNode in: aTMethod. + "First check for inlining a struct method/accessor" + ((argName beginsWith: 'self_in_') + and: [formalType last == $* + and: [(formalType beginsWith: actualType) + and: [(formalType allButFirst: actualType size) withBlanksTrimmed = '*']]]) ifTrue: + [^TSendNode new + setSelector: #addressOf: + receiver: (TVariableNode new setName: 'self') + arguments: { exprNode } + isBuiltInOp: false]. + "Second check for arithmetic coercion" + ((exprNode isSend or: [exprNode isVariable]) - ^((exprNode isSend or: [exprNode isVariable]) and: [(formalType notNil and: [actualType isNil]) or: [(formalType isNil and: [actualType notNil and: [(self isIntegralCType: actualType) and: [(self sizeOfIntegralCType: actualType) > (self sizeOfIntegralCType: #sqInt)]]]) or: [(self variableOfType: formalType acceptsValue: exprNode ofType: actualType) not]]]) + ifTrue: + [^self nodeToCast: exprNode to: (formalType ifNil: [#sqInt])]. + "Next check for type errors..." + ((exprNode isSend or: [exprNode isVariable]) + and: [(self + variableOfType: (targetMethod typeFor: argName in: self) + acceptsValue: exprNode + ofType: (self typeFor: exprNode in: aTMethod)) not]) ifTrue: + [logger + nextPutAll: + 'type mismatch for formal ', argName, ' and actual "', exprNode asString, + '" when inlining ', targetMethod selector, ' in ', aTMethod selector, '. Use a cast.'; + cr; flush]. + "No conversion is necessary, or there's a type error..." + ^exprNode! - ifTrue: [self nodeToCast: exprNode to: (formalType ifNil: [#sqInt])] - ifFalse: - [((exprNode isSend or: [exprNode isVariable]) - and: [(self - variableOfType: (targetMethod typeFor: argName in: self) - acceptsValue: exprNode - ofType: (self typeFor: exprNode in: aTMethod)) not]) ifTrue: - [logger - nextPutAll: - 'type mismatch for formal ', argName, ' and actual "', exprNode asString, - '" when inlining ', targetMethod selector, ' in ', aTMethod selector, '. Use a cast.'; - cr; flush]. - exprNode]! Item was changed: ----- Method: InterpreterProxy>>characterObjectOf: (in category 'object access') ----- characterObjectOf: characterCode <option: #(atLeastVMProxyMajor:minor: 1 13)> + <var: 'characterCode' type: #int> ^StackInterpreter objectMemoryClass characterObjectOf: characterCode! Item was changed: ----- Method: TMethod>>checkForCompletenessIn: (in category 'inlining support') ----- checkForCompletenessIn: aCodeGen "Set the complete flag if the parse tree contains no further candidates for inlining." | foundIncompleteSend incompleteSends | aCodeGen maybeBreakForTestOfInliningOf: selector. foundIncompleteSend := false. incompleteSends := IdentitySet new. parseTree nodesDo: [:node| node isSend ifTrue: [(self methodIsEffectivelyComplete: node selector in: aCodeGen) ifTrue: [(self inlineableFunctionCall: node in: aCodeGen) ifTrue: + [incompleteSends add: node. + complete := false. "more inlining to do" + ^self]] - [complete := false. "more inlining to do" - ^self]] ifFalse: [foundIncompleteSend := true. incompleteSends add: node]]] unless: [:node| node isSend and: [node selector == #cCode:inSmalltalk: or: [aCodeGen isAssertSelector: node selector]]]. foundIncompleteSend ifFalse: [complete := true]! Item was changed: ----- Method: TMethod>>inlineableFunctionCall:in: (in category 'inlining') ----- inlineableFunctionCall: aNode in: aCodeGen "Answer if the given send node is a call to a 'functional' method--a method whose body is a single return statement of some expression and whose actual parameters can all be directly substituted." aCodeGen maybeBreakForTestToInline: aNode in: self. aNode isSend ifFalse: [^false]. + ((aCodeGen shouldGenerateAsInterpreterProxySend: aNode) + or: [aCodeGen isStructSend: aNode]) ifTrue: + [^false]. ^(aCodeGen methodNamed: aNode selector) ifNil: [aNode asTransformedConstantPerform ifNil: [self isInlineableConditional: aNode in: aCodeGen] ifNotNil: [:n| self inlineableFunctionCall: n in: aCodeGen]] ifNotNil: [:m| (m ~~ self and: [((m isFunctionalIn: aCodeGen) or: [m mustBeInlined and: [m isComplete]]) and: [m mayBeInlined and: [(aCodeGen mayInline: m selector) and: [aNode args allSatisfy: [:a| self isSubstitutableNode: a intoMethod: m in: aCodeGen]]]]]) or: [m checkForRequiredInlinability]]! Item was changed: ----- Method: TMethod>>methodIsEffectivelyComplete:in: (in category 'inlining support') ----- methodIsEffectivelyComplete: selector in: aCodeGen "Answer if selector is effectively not inlineable in the receiver. This is tricky because block inlining requires that certain methods must be inlined, which can be at odds wuth the opportunistic strategy the inliner takes. Since the inliner only inlines complete methods and certain methods may never be marked as complete (e.g. recursive methods) we have to short-cut certain kinds of send. In particular, short-cut sends that turn into jumps in the interpret routine (sharedCase and sharedLabel below)." ^(aCodeGen methodNamed: selector) ifNil: [true] "builtins or externals are not inlineable" ifNotNil: [:m| m isComplete "unlinable methods can't be inlined" or: [m mayBeInlined not "Methods which are inlined as jumps don't need inlining" + or: [m sharedCase notNil or: [m sharedLabel notNil + "Macros and struct accessors don't need inlining" + or: [m definedAsMacro or: [m isStructAccessor]]]]]]! - or: [m sharedCase notNil or: [m sharedLabel notNil]]]]! Item was changed: ----- Method: TMethod>>tryToInlineMethodsIn: (in category 'inlining') ----- tryToInlineMethodsIn: aCodeGen "Expand any (complete) inline methods sent by this method. Set the complete flag when all inlining has been done. Answer if something was inlined." - | didSomething statementLists | - "complete ifTrue: - [^false]." - self definedAsMacro ifTrue: [complete ifTrue: [^false]. ^complete := true]. + ^aCodeGen + pushScope: declarations + while: + [| didSomething statementLists | + self ensureConditionalAssignmentsAreTransformedIn: aCodeGen. + didSomething := self tryToInlineMethodStatementsIn: aCodeGen statementListsInto: [:stmtLists| statementLists := stmtLists]. + didSomething := (self tryToInlineMethodExpressionsIn: aCodeGen) or: [didSomething]. - self ensureConditionalAssignmentsAreTransformedIn: aCodeGen. - didSomething := self tryToInlineMethodStatementsIn: aCodeGen statementListsInto: [:stmtLists| statementLists := stmtLists]. - didSomething := (self tryToInlineMethodExpressionsIn: aCodeGen) or: [didSomething]. + didSomething ifTrue: + [writtenToGlobalVarsCache := nil]. - didSomething ifTrue: - [writtenToGlobalVarsCache := nil]. + complete ifFalse: + [self checkForCompletenessIn: aCodeGen. + complete ifTrue: [didSomething := true]]. "marking a method complete is progress" + didSomething]! - complete ifFalse: - [self checkForCompletenessIn: aCodeGen. - complete ifTrue: [didSomething := true]]. "marking a method complete is progress" - ^didSomething! Item was changed: ----- Method: TSendNode>>emitCCodeAsFieldReferenceOn:level:generator: (in category 'C code generation') ----- emitCCodeAsFieldReferenceOn: aStream level: level generator: aCodeGen "If appropriate, translate this message send as a pointer dereference" | parenCount | (aCodeGen isStructSend: self) ifFalse: [^false]. + (aCodeGen shouldGenerateAsInterpreterProxySend: self) ifTrue: + [^false]. parenCount := receiver isSend ifTrue: [2] ifFalse: [1]. aStream next: parenCount put: $(. receiver emitCCodeAsExpressionOn: aStream level: 0 generator: aCodeGen. parenCount > 1 ifTrue: [aStream nextPut: $)]. (receiver structTargetKindIn: aCodeGen) caseOf: { [#pointer] -> [aStream nextPut: $-; nextPut: $>]. [#struct] -> [aStream nextPut: $.] }. aStream nextPutAll: (aCodeGen cFunctionNameFor: selector). arguments isEmpty ifFalse: [self assert: arguments size = 1. aStream nextPutAll: ' = '. arguments first emitCCodeAsExpressionOn: aStream level: level generator: aCodeGen]. aStream nextPut: $). ^true! Item was changed: ----- 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: #always> - <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: (self addressOf: intRet) ofType: (self ffiReturnType: specOnStack) in: calloutState]. ^self ffiCreateIntegralResultOop: intRet ofAtomicType: atomicType in: calloutState! Item was added: + ----- Method: ThreadedARM64FFIPlugin class>>isStructType: (in category 'translation') ----- + isStructType: typeName + | space | + ^(space := typeName indexOf: Character space) > 0 + and: [#(union struct) includes: (typeName copyFrom: 1 to: space - 1)]! Item was added: + ----- Method: ThreadedARM64FFIPlugin>>d (in category 'translation support') ----- + d + "Hack for floatRet in ffiCalloutTo:SpecOnStack:in:" + <returnTypeC: 'struct { double doubles[4]; }'> + <inline: #always> "to make it disappear..." + ^0! Item was added: + ----- Method: ThreadedARM64FFIPlugin>>doubles (in category 'translation support') ----- + doubles + "Hack for floatRet in ffiCalloutTo:SpecOnStack:in:" + <returnTypeC: #'double *'> + <inline: #always> "to make it disappear..." + ^0! Item was added: + ----- Method: ThreadedARM64FFIPlugin>>f (in category 'translation support') ----- + f + "Hack for floatRet in ffiCalloutTo:SpecOnStack:in:" + <returnTypeC: 'struct { float floats[8]; }'> + <inline: #always> "to make it disappear..." + ^0! Item was changed: ----- Method: ThreadedARM64FFIPlugin>>ffiCall:ArgArrayOrNil:NumArgs: (in category 'callout support') ----- ffiCall: externalFunction ArgArrayOrNil: argArrayOrNil NumArgs: nArgs "Generic callout. Does the actual work. If argArrayOrNil is nil it takes args from the stack and the spec from the method. If argArrayOrNil is not nil takes args from argArrayOrNil and the spec from the receiver." | flags argTypeArray address argType oop argSpec argClass err theCalloutState calloutState requiredStackSize stackSize allocation result primNumArgs | + <inline: false> - <inline: true> <var: #theCalloutState type: #'CalloutState'> <var: #calloutState type: #'CalloutState *'> <var: #allocation type: #'char *'> primNumArgs := interpreterProxy methodArgumentCount. (interpreterProxy is: externalFunction KindOfClass: interpreterProxy classExternalFunction) ifFalse: [^self ffiFail: FFIErrorNotFunction]. "Load and check the values in the externalFunction before we call out" flags := interpreterProxy fetchInteger: ExternalFunctionFlagsIndex ofObject: externalFunction. interpreterProxy failed ifTrue: [^self ffiFail: FFIErrorBadArgs]. "This must come early for compatibility with the old FFIPlugin. Image-level code may assume the function pointer is loaded eagerly. Thanks to Nicolas Cellier." address := self ffiLoadCalloutAddress: externalFunction. interpreterProxy failed ifTrue: [^0 "error code already set by ffiLoadCalloutAddress:"]. argTypeArray := interpreterProxy fetchPointer: ExternalFunctionArgTypesIndex ofObject: externalFunction. "must be array of arg types" ((interpreterProxy isArray: argTypeArray) and: [(interpreterProxy slotSizeOf: argTypeArray) = (nArgs + 1)]) ifFalse: [^self ffiFail: FFIErrorBadArgs]. "check if the calling convention is supported" self cppIf: COGMTVM ifTrue: [(self ffiSupportsCallingConvention: (flags bitAnd: FFICallTypesMask)) ifFalse: [^self ffiFail: FFIErrorCallType]] ifFalse: "not masking causes threaded calls to fail, which is as they should if the plugin is not threaded." [(self ffiSupportsCallingConvention: flags) ifFalse: [^self ffiFail: FFIErrorCallType]]. requiredStackSize := self externalFunctionHasStackSizeSlot ifTrue: [interpreterProxy fetchInteger: ExternalFunctionStackSizeIndex ofObject: externalFunction] ifFalse: [-1]. interpreterProxy failed ifTrue: [^interpreterProxy primitiveFailFor: (argArrayOrNil isNil ifTrue: [PrimErrBadMethod] ifFalse: [PrimErrBadReceiver])]. stackSize := requiredStackSize < 0 ifTrue: [DefaultMaxStackSize] ifFalse: [requiredStackSize]. self cCode: [] inSmalltalk: [theCalloutState := self class calloutStateClass new]. calloutState := self addressOf: theCalloutState. self cCode: [self memset: calloutState _: 0 _: (self sizeof: #CalloutState)]. calloutState callFlags: flags. "Fetch return type and args" argType := interpreterProxy fetchPointer: 0 ofObject: argTypeArray. argSpec := interpreterProxy fetchPointer: 0 ofObject: argType. argClass := interpreterProxy fetchPointer: 1 ofObject: argType. (err := self ffiCheckReturn: argSpec With: argClass in: calloutState) ~= 0 ifTrue: [^self ffiFail: err]. "cannot return" "alloca the outgoing stack frame, leaving room for marshalling args, and including space for the return struct, if any. Additional space reserved for saving register args like mandated by Win64 X64 or PPC ABI, will be managed by the call itself" allocation := self alloca: stackSize + calloutState structReturnSize + self cStackAlignment. self mustAlignStack ifTrue: [allocation := self cCoerce: (allocation asUnsignedIntegerPtr bitClear: self cStackAlignment - 1) to: #'char *']. calloutState argVector: allocation; currentArg: allocation; limit: allocation + stackSize. 1 to: nArgs do: [:i| argType := interpreterProxy fetchPointer: i ofObject: argTypeArray. argSpec := interpreterProxy fetchPointer: 0 ofObject: argType. argClass := interpreterProxy fetchPointer: 1 ofObject: argType. oop := argArrayOrNil isNil ifTrue: [interpreterProxy stackValue: nArgs - i] ifFalse: [interpreterProxy fetchPointer: i - 1 ofObject: argArrayOrNil]. err := self ffiArgument: oop Spec: argSpec Class: argClass in: calloutState. err ~= 0 ifTrue: [self cleanupCalloutState: calloutState. self cppIf: COGMTVM ifTrue: [err = PrimErrObjectMayMove negated ifTrue: [^PrimErrObjectMayMove]]. "N.B. Do not fail if object may move because caller will GC and retry." ^self ffiFail: err]]. "coercion failed or out of stack space" "Failures must be reported back from ffiArgument:Spec:Class:in:. Should not fail from here on in." self assert: interpreterProxy failed not. self ffiLogCallout: externalFunction. (requiredStackSize < 0 and: [self externalFunctionHasStackSizeSlot]) ifTrue: [stackSize := calloutState currentArg - calloutState argVector. interpreterProxy storeInteger: ExternalFunctionStackSizeIndex ofObject: externalFunction withValue: stackSize]. "Go out and call this guy" result := self ffiCalloutTo: address SpecOnStack: argArrayOrNil notNil in: calloutState. self cleanupCalloutState: calloutState. "Can not safely use argumentCount (via e.g. methodReturnValue:) since it may have been changed by a callback." interpreterProxy pop: primNumArgs + 1 thenPush: result. ^result! Item was changed: ----- Method: ThreadedARM64FFIPlugin>>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 x1Ret specSize | + <var: #floatRet type: 'union { struct { float floats[8]; } f; struct dprr { double doubles[4]; } d; }'> - | myThreadIndex atomicType floatRet intRet x1Ret | - <var: #floatRet type: #double> <var: #intRet type: #usqLong> <var: #x1Ret type: #usqLong> + <inline: #always> + self cCode: [] inSmalltalk: [floatRet := ByteArray new: 32]. "Just a hack to placate the Smalltalk compiler; this shoudl be a proper struct..." - <inline: true> myThreadIndex := interpreterProxy disownVM: (self disownFlagsFor: calloutState). calloutState floatRegisterIndex > 0 ifTrue: [self loadFloatRegs: (calloutState floatRegisters at: 0) _: (calloutState floatRegisters at: 1) _: (calloutState floatRegisters at: 2) _: (calloutState floatRegisters at: 3) _: (calloutState floatRegisters at: 4) _: (calloutState floatRegisters at: 5) _: (calloutState floatRegisters at: 6) _: (calloutState floatRegisters at: 7)]. (self allocaLiesSoSetSpBeforeCall or: [self mustAlignStack]) ifTrue: [self setsp: calloutState argVector]. atomicType := self atomicTypeOf: calloutState ffiRetHeader. + ((atomicType >> 1) = (FFITypeSingleFloat >> 1) + or: [(calloutState ffiRetHeader bitAnd: FFIFlagPointer+FFIFlagStructure) = FFIFlagStructure + and: [self structIsHomogenousFloatArrayOfSize: (calloutState ffiRetHeader bitAnd: FFIStructSizeMask) + typeSpec: (self cCoerce: (interpreterProxy firstIndexableField: calloutState ffiRetSpec) to: #'unsigned int *') + ofLength: (specSize := interpreterProxy byteSizeOf: calloutState ffiRetSpec) / (self sizeof: #'unsigned int')]]) ifTrue: + [floatRet d: (self + dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'struct dprr (*)(sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_t)') - (atomicType >> 1) = (FFITypeSingleFloat >> 1) ifTrue: - [atomicType = FFITypeSingleFloat - ifTrue: - [floatRet := self - dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'float (*)(sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_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) with: (calloutState integerRegisters at: 4) with: (calloutState integerRegisters at: 5) with: (calloutState integerRegisters at: 6) + with: (calloutState integerRegisters at: 7)). - with: (calloutState integerRegisters at: 7)] - ifFalse: "atomicType = FFITypeDoubleFloat" - [floatRet := self - dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'double (*)(sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_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) - with: (calloutState integerRegisters at: 4) - with: (calloutState integerRegisters at: 5) - with: (calloutState integerRegisters at: 6) - with: (calloutState integerRegisters at: 7)]. "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. + atomicType = FFITypeDoubleFloat ifTrue: + [^interpreterProxy floatObjectOf: (floatRet d doubles at: 0)]. + atomicType = FFITypeSingleFloat ifTrue: + [^interpreterProxy floatObjectOf: (floatRet f floats at: 0)]. + "If the struct is a vector of floats then move float[2] to float[1], float[4] to float[2] and float[6] to float[3], + to pack the float data in the double fields. We can tell if the struct is composed of floats if its size is less + than the spec size, since the spec size is (1 + n fields) * 4 bytes, and the struct size is n fields * 4 bytes + for floats and n fields * 8 bytes for doubles. We can't access the spec post call because it may have moved." + specSize > calloutState structReturnSize ifTrue: + [floatRet f floats at: 1 put: (floatRet f floats at: 2). + floatRet f floats at: 2 put: (floatRet f floats at: 4). + floatRet f floats at: 3 put: (floatRet f floats at: 6)]. + ^self ffiReturnStruct: (self addressOf: floatRet) ofType: (self ffiReturnType: specOnStack) in: calloutState]. - ^interpreterProxy floatObjectOf: floatRet]. "If struct address used for return value, call is special" (self mustReturnStructOnStack: calloutState structReturnSize) ifTrue: [ intRet := 0. + self setReturnRegister: (self cCoerceSimple: calloutState limit to: #sqLong) "stack alloca'd struct" + andCall: (self cCoerceSimple: procAddr to: #sqLong) + withArgsArray: (self cCoerceSimple: (self addressOf: calloutState integerRegisters) to: #sqLong). - self setReturnRegister: (self cCoerceSimple: calloutState limit to: 'sqLong') "stack alloca'd struct" - andCall: (self cCoerceSimple: procAddr to: 'sqLong') - withArgsArray: (self cCoerceSimple: (self addressOf: calloutState integerRegisters) to: 'sqLong'). ] ifFalse: [ intRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'usqIntptr_t (*)(sqIntptr_t, sqIntptr_t, sqIntptr_t, sqIntptr_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) with: (calloutState integerRegisters at: 4) with: (calloutState integerRegisters at: 5) with: (calloutState integerRegisters at: 6) with: (calloutState integerRegisters at: 7). x1Ret := self getX1register. "Capture x1 immediately. No problem if unused" ]. "If struct returned in registers, place register values into calloutState integerRegisters" (calloutState structReturnSize > 0 and: [self returnStructInRegisters: calloutState]) ifTrue: ["Only 2 regs used in ARMv8/Aarch64 current" calloutState integerRegisters at: 0 put: intRet. "X0" calloutState integerRegisters at: 1 put: x1Ret]. "X1" "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: (((self returnStructInRegisters: calloutState) + ifTrue: [self addressOf: calloutState integerRegisters] + ifFalse: [calloutState limit])) + ofType: (self ffiReturnType: specOnStack) + in: calloutState]. - ^self ffiReturnStruct: (self addressOf: intRet) ofType: (self ffiReturnType: specOnStack) in: calloutState]. ^self ffiCreateIntegralResultOop: intRet ofAtomicType: atomicType in: calloutState! Item was changed: ----- Method: ThreadedARM64FFIPlugin>>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: #'unsigned int *'> - <var: #argSpec type: #'sqInt *'> <var: #calloutState type: #'CalloutState *'> <inline: true> | availableRegisterSpace stackPartSize roundedSize | + "See IHI0055B_aapcs64.pdf sections 4.3.5 & 5.4.2 Stage C; we don't yet support HVA's" + (self structIsHomogenousFloatArrayOfSize: structSize typeSpec: argSpec ofLength: argSpecSize) + ifTrue: + [availableRegisterSpace := (NumFloatRegArgs - calloutState floatRegisterIndex) * self wordSize. + structSize <= availableRegisterSpace ifTrue: "Stage C, step C.2, all in floating-point registers (!!!!)" + [self + memcpy: (self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: calloutState floatRegisterIndex)) to: #'void *') + _: pointer + _: structSize. + "Round structSize up and divide by 8 ( NB: _not_ 4 !!)" + calloutState floatRegisterIndex: calloutState floatRegisterIndex + (structSize + 7 bitShift: -3). + ^0]. + "Stage C, step C.3" + availableRegisterSpace := 0. + calloutState floatRegisterIndex: 8] + ifFalse: + [availableRegisterSpace := (NumIntRegArgs - calloutState integerRegisterIndex) * self wordSize]. - - availableRegisterSpace := (NumIntRegArgs - calloutState integerRegisterIndex) * self wordSize. stackPartSize := structSize. + availableRegisterSpace > 0 ifTrue: + [structSize <= availableRegisterSpace ifTrue:"all in integer registers" + [self + memcpy: (self cCoerceSimple: (self addressOf: (calloutState integerRegisters at: calloutState integerRegisterIndex)) to: #'void *') + _: pointer + _: structSize. + "Round structSize up and divide by 8 ( NB: _not_ 4 !!)" + calloutState integerRegisterIndex: calloutState integerRegisterIndex + (structSize + 7 bitShift: -3). + ^0]. + "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]. + "Stage C, step C.11" + calloutState integerRegisterIndex: NumIntRegArgs]. - 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. - "Round structSize up and divide by 8 ( NB: _not_ 4 !!)" - calloutState integerRegisterIndex: calloutState integerRegisterIndex + (structSize + 3 bitShift: -3) ] - 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]. - 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 changed: ----- Method: ThreadedARM64FFIPlugin>>ffiReturnStruct:ofType:in: (in category 'callout support') ----- ffiReturnStruct: longLongRetPtr ofType: ffiRetType in: calloutState <var: #longLongRetPtr type: #'void *'> <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 integer registers." | 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) + _: longLongRetPtr - _: ((self returnStructInRegisters: calloutState) - ifTrue: [self addressOf: calloutState integerRegisters] - ifFalse: [calloutState limit]) _: calloutState structReturnSize. interpreterProxy storePointer: 0 ofObject: retOop withValue: oop. ^retOop! Item was added: + ----- Method: ThreadedARM64FFIPlugin>>floats (in category 'translation support') ----- + floats + "Hack for floatRet in ffiCalloutTo:SpecOnStack:in:" + <returnTypeC: #'float *'> + <inline: #always> "to make it disappear..." + ^0! Item was added: + ----- Method: ThreadedARM64FFIPlugin>>structIsHomogenousFloatArrayOfSize:typeSpec:ofLength: (in category 'marshalling') ----- + structIsHomogenousFloatArrayOfSize: structSize typeSpec: argSpec ofLength: argSpecSize + <var: #argSpec type: #'unsigned int *'> + | firstField typeOfFirstField | + (structSize <= (4 * (self sizeof: #double)) + and: [argSpecSize <= 5]) "header plus up to four fields" ifFalse: + [^false]. + typeOfFirstField := self atomicTypeOf: (firstField := argSpec at: 1). + (typeOfFirstField ~= FFITypeSingleFloat and: [typeOfFirstField ~= FFITypeDoubleFloat]) ifTrue: + [^false]. + 2 to: argSpecSize - 1 do: + [:idx| + firstField ~= (argSpec at: idx) ifTrue: + [^false]]. + ^true! Item was changed: ----- Method: ThreadedFFICalloutState 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." self instVarNames do: [:ivn| aBinaryBlock value: ivn value: (ivn caseOf: { ['argVector'] -> [#'char *']. ['currentArg'] -> [#'char *']. ['limit'] -> [#'char *']. + ['ffiArgSpec'] -> [#'unsigned int *']. "ffiArgSpecs are WordArrays" - ['ffiArgSpec'] -> [#'void *']. ['stringArgs'] -> [{#'char *'. '[MaxNumArgs]'}] } otherwise: [#sqInt])]! Item was changed: ----- Method: ThreadedFFIPlugin class>>preambleCCode (in category 'translation') ----- preambleCCode "For a source of builtin defines grep for builtin_define in a gcc release config directory. + See platforms/Cross/vm/sqCogStackAlignment.h for per-platform definitions for + STACK_ALIGN_BYTES MUST_ALIGN_STACK, getsp, et al." - See See platforms/Cross/vm/sqCogStackAlignment.h for per-platform definitions for - STACK_ALIGN_BYTES MUST_ALIGN_STACK et al." ^' #include "sqAssert.h" /* for assert */ #define ThreadedFFIPlugin 1 /* to filter-out unwanted declarations from sqFFI.h */ #include "sqFFI.h" /* for logging and surface functions */ #include "sqCogStackAlignment.h" /* for STACK_ALIGN_BYTES and getsp() */ #ifdef _MSC_VER # define alloca _alloca #endif + #if !!defined(setsp) && defined(__GNUC__) + # if defined(_X86_) || defined(i386) || defined(__i386) || defined(__i386__) + # define setsp(spval) asm volatile ("movl %0,%%esp" : : "m"(spval)) + # elif defined(__amd64__) || defined(__x86_64__) || defined(__amd64) || defined(__x86_64) + # define setsp(spval) asm volatile ("movq %0,%%rsp" : : "m"(spval)) - #if defined(__GNUC__) && (defined(_X86_) || defined(i386) || defined(__i386) || defined(__i386__)) - # define setsp(sp) asm volatile ("movl %0,%%esp" : : "m"(sp)) - # elif defined(__GNUC__) && (defined(__amd64__) || defined(__x86_64__) || defined(__amd64) || defined(__x86_64)) - # define setsp(sp) asm volatile ("movq %0,%%rsp" : : "m"(sp)) # elif defined(__arm64__) || defined(__aarch64__) || defined(ARM64) /* https://gcc.gnu.org/onlinedocs/gcc/Extended-Asm.html#Extended-Asm * http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.den0024a/index.… */ + # define setsp(spval) asm volatile ("mov sp, %0" : : "r"(spval)) + # elif defined(__arm__) + # define setsp(spval) asm volatile ("ldr %%sp, %0" : : "m"(spval)) + # endif - # if __GNUC__ - # define getfp() ({ usqIntptr_t fp; \ - asm volatile ("mov x0, x29" : "=r"(x29) : ); \ - fp; }) - # define getsp() ({ usqIntptr_t sp; \ - asm volatile ("mov x0, sp" : "=r"(sp) : ); \ - sp; }) - # define setsp(sp) asm volatile ("ldr x16, %0 \n\t" "mov sp, x16" : : "m"(sp) ) - # endif - # elif defined(__GNUC__) && (defined(__arm__)) - # define setsp(sp) asm volatile ("ldr %%sp, %0" : : "m"(sp)) #endif #if !!defined(getsp) # define getsp() 0 #endif #if !!defined(setsp) # define setsp(ignored) 0 #endif #if !!defined(STACK_ALIGN_BYTES) # define STACK_ALIGN_BYTES 0 #endif /* !!defined(STACK_ALIGN_BYTES) */ /* For ABI that require stack alignment greater than natural word size */ #define MUST_ALIGN_STACK (STACK_ALIGN_BYTES > sizeof(void*)) #if defined(_X86_) || defined(i386) || defined(__i386) || defined(__i386__) /* Both Mac OS X x86 and Win32 x86 return structs of a power of two in size * less than or equal to eight bytes in length in registers. Linux never does so. */ # if __linux__ # define WIN32_X86_STRUCT_RETURN 0 # else # define WIN32_X86_STRUCT_RETURN 1 # endif # if _WIN32 # define PLATFORM_API_USES_CALLEE_POPS_CONVENTION 1 # endif + #elif defined(__amd64__) || defined(__x86_64__) || defined(__amd64) || defined(__x86_64) - # elif defined(__amd64__) || defined(__x86_64__) || defined(__amd64) || defined(__x86_64) # if _WIN32 | _WIN64 # define PLATFORM_API_USES_CALLEE_POPS_CONVENTION 1 # endif #endif /* defined(_X86_) || defined(i386) || defined(__i386) || defined(__i386__) */ #if !!defined(ALLOCA_LIES_SO_SETSP_BEFORE_CALL) # if defined(__MINGW32__) && !!defined(__clang__) && (__GNUC__ >= 3) && (defined(_X86_) || defined(i386) || defined(__i386) || defined(__i386__)) /* * cygwin -mno-cygwin (MinGW) gcc 3.4.x''s alloca is a library routine that answers * %esp + xx, so the outgoing stack is offset by one or more word if uncorrected. * Grab the actual stack pointer to correct. */ # define ALLOCA_LIES_SO_SETSP_BEFORE_CALL 1 # else # define ALLOCA_LIES_SO_SETSP_BEFORE_CALL 0 # endif #endif /* !!defined(ALLOCA_LIES_SO_SETSP_BEFORE_CALL) */ #if !!defined(PLATFORM_API_USES_CALLEE_POPS_CONVENTION) # define PLATFORM_API_USES_CALLEE_POPS_CONVENTION 0 #endif - /* This alignment stuff is a hack for integerAt:put:size:signed:/primitiveFFIIntegerAt[Put]. - * The assumption right now is that all processors support unaligned access. That only - * holds true for x86, x86-64 & ARMv6 & later. But this keeps us going until we can address - * it properly. - */ - #define unalignedShortAt(a) shortAt(a) - #define unalignedShortAtput(a,v) shortAtput(a,v) - #define unalignedLong32At(a) long32At(a) - #define unalignedLong32Atput(a,v) long32Atput(a,v) - #define unalignedLong64At(a) long64At(a) - #define unalignedLong64Atput(a,v) long64Atput(a,v) - /* The dispatchOn:in:with:with: generates an unwanted call on error. Just squash it. */ #define error(foo) 0 - #ifndef SQUEAK_BUILTIN_PLUGIN - /* but print assert failures. */ - void - warning(char *s) { /* Print an error message but don''t exit. */ - printf("\n%s\n", s); - } - #endif /* sanitize */ #ifdef SQUEAK_BUILTIN_PLUGIN # define EXTERN #else # define EXTERN extern #endif '! Item was changed: ----- Method: ThreadedFFIPlugin>>alignmentOfStructSpec:OfLength:StartingAt: (in category 'marshalling-struct') ----- alignmentOfStructSpec: specs OfLength: specSize StartingAt: indexPtr "Answer with the alignment requirement for a structure/union. Note that indexPtr is a pointer so as to be changed on return. On input, the index points to the structure header (the one with FFIFlagStructure + structSize). On output, the index points the the structure trailer (the FFIFlagStructure)." | spec byteAlignment thisAlignment | + <var: #specs type: #'unsigned int *'> + <var: #indexPtr type: #'sqInt *'> - <var: #specs type: #'unsigned int*'> - <var: #indexPtr type: #'unsigned int*'> <inline: false> spec := specs at: (indexPtr at: 0). self assert: (spec bitAnd: FFIFlagPointer + FFIFlagAtomic + FFIFlagStructure) = FFIFlagStructure. byteAlignment := 1. [indexPtr at: 0 put: (indexPtr at: 0) + 1. (indexPtr at: 0) < specSize] whileTrue: [spec := specs at: (indexPtr at: 0). spec = FFIFlagStructure ifTrue: [^byteAlignment]. thisAlignment := (spec anyMask: FFIFlagPointer) ifTrue: [BytesPerWord] ifFalse: [(spec anyMask: FFIFlagStructure) ifTrue: [self alignmentOfStructSpec: specs OfLength: specSize StartingAt: indexPtr] ifFalse: [spec bitAnd: FFIStructSizeMask]]. byteAlignment := byteAlignment max: thisAlignment]. self assert: false. "should not reach here - because only ever called for sub-struct" ^byteAlignment! Item was changed: ----- Method: ThreadedFFIPlugin>>checkAlignmentOfStructSpec:OfLength:StartingAt: (in category 'marshalling-struct') ----- checkAlignmentOfStructSpec: specs OfLength: specSize StartingAt: startIndex "Check the alignment of a structure and return true if correctly aligned. If computed size = declared size, then the struct is assumed correctly aligned." | index spec computedSize fieldAlignment fieldSize declaredSize maxAlignment | + <var: #specs type: #'unsigned int *'> - <var: #specs type: #'unsigned int*'> <inline: false> index := startIndex. spec := specs at: index. self assert: (spec bitAnd: FFIFlagPointer + FFIFlagAtomic + FFIFlagStructure) = FFIFlagStructure. + (self isUnionSpec: specs OfLength: specSize StartingAt: index) ifTrue: + [^self checkAlignmentOfUnionSpec: specs OfLength: specSize StartingAt: startIndex]. - (self isUnionSpec: specs OfLength: specSize StartingAt: index) - ifTrue: - [^self checkAlignmentOfUnionSpec: specs OfLength: specSize StartingAt: startIndex]. declaredSize := spec bitAnd: FFIStructSizeMask. computedSize := 0. maxAlignment := 1. + [(index := index + 1) < specSize] whileTrue: + [spec := specs at: index. + spec = FFIFlagStructure ifTrue: + [^(computedSize - 1 bitOr: maxAlignment - 1) + 1 = declaredSize]. + (spec anyMask: FFIFlagPointer) + ifTrue: + [fieldSize := BytesPerWord. + fieldAlignment := fieldSize] + ifFalse: + [fieldSize := spec bitAnd: FFIStructSizeMask. + (spec anyMask: FFIFlagStructure) + ifTrue: + [(self checkAlignmentOfStructSpec: specs OfLength: specSize StartingAt: index) ifFalse: + [^false]. + fieldAlignment := self alignmentOfStructSpec: specs OfLength: specSize StartingAt: (self addressOf: index put: [:v| index := v])] + ifFalse: [fieldAlignment := fieldSize]]. + "round to fieldAlignment" + maxAlignment := maxAlignment max: fieldAlignment. + computedSize := (computedSize - 1 bitOr: fieldAlignment - 1) + 1. + computedSize := computedSize + fieldSize]. - [index := index + 1. - index < specSize] - whileTrue: - [spec := specs at: index. - spec = FFIFlagStructure - ifTrue: [^(computedSize - 1 bitOr: maxAlignment - 1) + 1 = declaredSize]. - (spec anyMask: FFIFlagPointer) - ifTrue: - [fieldSize := BytesPerWord. - fieldAlignment := fieldSize] - ifFalse: - [fieldSize := spec bitAnd: FFIStructSizeMask. - (spec anyMask: FFIFlagStructure) - ifTrue: - [(self checkAlignmentOfStructSpec: specs OfLength: specSize StartingAt: index) - ifFalse: [^false]. - fieldAlignment := self alignmentOfStructSpec: specs OfLength: specSize StartingAt: (self addressOf: index)] - ifFalse: [fieldAlignment := fieldSize]]. - "round to fieldAlignment" - maxAlignment := maxAlignment max: fieldAlignment. - computedSize := (computedSize - 1 bitOr: fieldAlignment - 1) + 1. - computedSize := computedSize + fieldSize]. ^(computedSize - 1 bitOr: maxAlignment - 1) + 1 = declaredSize! Item was changed: ----- Method: ThreadedFFIPlugin>>externalFunctionHasStackSizeSlot (in category 'symbol loading') ----- externalFunctionHasStackSizeSlot + <inline: #always> - <inline: true> ^externalFunctionInstSize > ExternalFunctionStackSizeIndex! Item was changed: ----- Method: ThreadedFFIPlugin>>ffiArgument:Spec:Class:in: (in category 'callout support') ----- ffiArgument: oop Spec: argSpec Class: argClass in: calloutState "Callout support. Prepare the given oop as argument. argSpec defines the compiled spec for the argument. argClass (if non-nil) defines the required (super)class for the argument." <var: #calloutState type: #'CalloutState *'> | valueOop oopClass isStruct nilOop | <inline: false> oopClass := interpreterProxy fetchClassOf: oop. "Prefetch class (we'll need it)" nilOop := interpreterProxy nilObject. "Do the necessary type checks" + argClass = nilOop ifFalse: - argClass = nilOop ifFalse:[ "Type check 1: + Is the required class of the argument a general instance of ExternalStructure?" + [(interpreterProxy + includesBehavior: argClass + ThatOf: interpreterProxy classExternalStructure) ifFalse: + [^FFIErrorWrongType]. - Is the required class of the argument a subclass of ExternalStructure?" - (interpreterProxy includesBehavior: argClass - ThatOf: interpreterProxy classExternalStructure) - ifFalse:[^FFIErrorWrongType]. "Nope. Fail." "Type check 2: + Is the class of the argument a general instance of the required class?" + (nilOop = oop or: [interpreterProxy includesBehavior: oopClass ThatOf: argClass]) ifFalse: + [^FFIErrorCoercionFailed]]. + "Okay, we've passed the type check (so far)" - Is the class of the argument a subclass of required class?" - ((nilOop = oop) or:[interpreterProxy includesBehavior: oopClass ThatOf: argClass]) - ifFalse:[^FFIErrorCoercionFailed]. "Nope. Fail." - "Okay, we've passed the type check (so far)" - ]. + "Check if oopClass is a general instance of ExternalStructure. + If this is the case we'll work on its handle and not the actual oop." - "Check if oopClass is a subclass of ExternalStructure. - If this is the case we'll work on it's handle and not the actual oop." isStruct := false. (oop ~= nilOop and: [interpreterProxy isPointers: oop]) ifTrue: "#isPointers: will fail if oop is immediate so don't even attempt to use it" [isStruct := interpreterProxy includesBehavior: oopClass ThatOf: interpreterProxy classExternalStructure. (argClass = nilOop or: [isStruct]) ifFalse: [^FFIErrorCoercionFailed]]. "note: the test for #isPointers: above should speed up execution since no pointer type ST objects are allowed in external calls and thus if #isPointers: is true then the arg must be ExternalStructure to work. If it isn't then the code fails anyways so speed isn't an issue." "Determine valueOop (e.g., the actual oop to pass as argument)" + valueOop := isStruct + ifTrue: [interpreterProxy fetchPointer: 0 ofObject: oop] + ifFalse: [oop]. - isStruct - ifTrue:[valueOop := interpreterProxy fetchPointer: 0 ofObject: oop] - ifFalse:[valueOop := oop]. "Fetch and check the contents of the compiled spec" + (interpreterProxy isWords: argSpec) ifFalse: + [^FFIErrorWrongType]. + calloutState ffiArgSpecSize: (interpreterProxy byteSizeOf: argSpec) / (self sizeof: #'unsigned int'). + calloutState ffiArgSpecSize = 0 ifTrue: + [^FFIErrorWrongType]. + calloutState ffiArgSpec: (self cCoerce: (interpreterProxy firstIndexableField: argSpec) to: #'unsigned int *'). + calloutState ffiArgHeader: (calloutState ffiArgSpec at: 0). - (interpreterProxy isWords: argSpec) - ifFalse:[^FFIErrorWrongType]. - calloutState ffiArgSpecSize: (interpreterProxy slotSizeOf: argSpec). - calloutState ffiArgSpecSize = 0 ifTrue:[^FFIErrorWrongType]. - calloutState ffiArgSpec: (interpreterProxy firstIndexableField: argSpec). - calloutState ffiArgHeader: (interpreterProxy longAt: calloutState ffiArgSpec). "Do the actual preparation of the argument" "Note: Order is important since FFIFlagStructure + FFIFlagPointer is used to represent 'typedef void* VoidPointer' and VoidPointer really is *struct* not pointer." + (calloutState ffiArgHeader anyMask: FFIFlagStructure) ifTrue: "argument must be ExternalStructure" + [isStruct ifFalse: + [^FFIErrorCoercionFailed]. + (calloutState ffiArgHeader anyMask: FFIFlagAtomic) ifTrue: + [^FFIErrorWrongType]. "bad combination" - (calloutState ffiArgHeader anyMask: FFIFlagStructure) ifTrue:[ - "argument must be ExternalStructure" - isStruct ifFalse:[^FFIErrorCoercionFailed]. - (calloutState ffiArgHeader anyMask: FFIFlagAtomic) - ifTrue:[^FFIErrorWrongType]. "bad combination" ^self ffiPushStructureContentsOf: valueOop in: calloutState]. + (calloutState ffiArgHeader anyMask: FFIFlagPointer) ifTrue: "no integers (or characters) for pointers please" + [(interpreterProxy isImmediate: oop) ifTrue: + [^FFIErrorIntAsPointer]. - (calloutState ffiArgHeader anyMask: FFIFlagPointer) ifTrue:[ - "no integers (or characters) for pointers please" - (interpreterProxy isImmediate: oop) - ifTrue:[^FFIErrorIntAsPointer]. "but allow passing nil pointer for any pointer type" + oop = nilOop ifTrue: + [^self ffiPushPointer: nil in: calloutState]. - oop = nilOop ifTrue:[^self ffiPushPointer: nil in: calloutState]. "argument is reference to either atomic or structure type" + (calloutState ffiArgHeader anyMask: FFIFlagAtomic) ifTrue: + [isStruct ifTrue:"e.g., ExternalData" + [^self ffiAtomicStructByReference: oop Class: oopClass in: calloutState]. + ^self ffiAtomicArgByReference: oop Class: oopClass in: calloutState]. - (calloutState ffiArgHeader anyMask: FFIFlagAtomic) ifTrue:[ - isStruct "e.g., ExternalData" - ifTrue:[^self ffiAtomicStructByReference: oop Class: oopClass in: calloutState] - ifFalse:[^self ffiAtomicArgByReference: oop Class: oopClass in: calloutState]. "********* NOTE: The above uses 'oop' not 'valueOop' (for ExternalData) ******" - ]. "Needs to be external structure here" + isStruct ifTrue: + [^self ffiPushPointerContentsOf: valueOop in: calloutState]. + ^FFIErrorCoercionFailed]. - isStruct ifFalse:[^FFIErrorCoercionFailed]. - ^self ffiPushPointerContentsOf: valueOop in: calloutState]. + (calloutState ffiArgHeader anyMask: FFIFlagAtomic) ifTrue: "argument is atomic value" + [^self ffiArgByValue: valueOop in: calloutState]. + - (calloutState ffiArgHeader anyMask: FFIFlagAtomic) ifTrue:[ - "argument is atomic value" - ^self ffiArgByValue: valueOop in: calloutState]. "None of the above - bad spec" ^FFIErrorWrongType! Item was changed: ----- Method: ThreadedFFIPlugin>>ffiCalloutTo:SpecOnStack:in: (in category 'callout support') ----- ffiCalloutTo: procAddr SpecOnStack: specOnStack in: calloutState <var: #procAddr type: #'void *'> <arg: #calloutState type: #'CalloutState *'> "Perform the callout, collect the result and and create the return value. If a threaded call, disown and own VM around the call. If there are floating-point arguments that are passed in registers then call a dummy function to load them. This *must* be inlined because of the alloca of the outgoing stack frame in ffiCall:SpecOnStack:Flags:NumArgs:Args:AndTypes:" + <inline: #always> - <inline: true> self subclassResponsibility! Item was changed: ----- Method: ThreadedFFIPlugin>>ffiCreateIntegralResultOop:ofAtomicType:in: (in category 'callout support') ----- ffiCreateIntegralResultOop: retVal ofAtomicType: atomicType in: calloutState <inline: true> <var: #calloutState type: #'CalloutState *'> <var: #retVal type: #usqLong> "Callout support. Return the appropriate oop for the given atomic type" | shift value mask byteSize | <var: 'value' type: #usqLong> <var: 'mask' type: #usqLong> self assert: atomicType < FFITypeSingleFloat. atomicType = FFITypeBool ifTrue: ["Make sure bool honors the byte size requested" byteSize := calloutState ffiRetHeader bitAnd: FFIStructSizeMask. value := byteSize = (self sizeof: retVal) ifTrue:[retVal] ifFalse:[retVal bitAnd: 1 asUnsignedLongLong << (byteSize * 8) - 1]. ^value = 0 ifTrue:[interpreterProxy falseObject] ifFalse:[interpreterProxy trueObject]]. atomicType <= FFITypeSignedInt ifTrue: ["these are all generall integer returns" atomicType <= (BytesPerWord = 8 ifTrue: [FFITypeSignedInt] ifFalse: [FFITypeSignedShort]) ifTrue: ["byte/short. first extract partial word, then sign extend" shift := (BytesPerWord = 8 and: [atomicType >= FFITypeUnsignedInt]) ifTrue: [32] ifFalse: [(atomicType >> 1) * 8]. "# of significant bits" value := retVal bitAnd: (1 asUnsignedLongLong << shift - 1). (atomicType anyMask: 1) ifTrue: ["make the guy signed" mask := 1 asUnsignedLongLong << (shift-1). value := (value bitAnd: mask-1) - (value bitAnd: mask)]. ^interpreterProxy integerObjectOf: value]. "Word sized integer return" ^(atomicType anyMask: 1) ifTrue:[interpreterProxy signedMachineIntegerFor: retVal] "signed return" ifFalse:[interpreterProxy positiveMachineIntegerFor: retVal]]. "unsigned return" "longlong, char" + (atomicType >> 1) = (FFITypeSignedLongLong >> 1) ifTrue: + [^(atomicType anyMask: 1) + ifTrue: [interpreterProxy signed64BitIntegerFor: retVal] "signed return" + ifFalse: [interpreterProxy positive64BitIntegerFor: retVal]]. + self cppIf: #SPURVM + ifTrue: [^interpreterProxy characterObjectOf: (retVal bitAnd: 16r3FFFFFFF)] + ifFalse: [^interpreterProxy characterObjectOf: (retVal bitAnd: 16rFF)]! - ^(atomicType >> 1) = (FFITypeSignedLongLong >> 1) - ifTrue: - [(atomicType anyMask: 1) - ifTrue:[interpreterProxy signed64BitIntegerFor: retVal] "signed return" - ifFalse:[interpreterProxy positive64BitIntegerFor: retVal]] - ifFalse: - [interpreterProxy characterObjectOf: (retVal bitAnd: 16rFF)]! Item was changed: ----- Method: ThreadedFFIPlugin>>ffiPushPointerContentsOf:in: (in category 'marshalling') ----- ffiPushPointerContentsOf: oop in: calloutState <var: #calloutState type: #'CalloutState *'> "Push the contents of the given external structure" | ptrClass ptrAddress | <inline: false> ptrClass := interpreterProxy fetchClassOf: oop. ptrClass = interpreterProxy classExternalAddress ifTrue: [ptrAddress := (interpreterProxy fetchPointer: 0 ofObject: oop) asVoidPointer. "Don't you dare to pass pointers into object memory" + (interpreterProxy isInMemory: ptrAddress asUnsignedIntegerPtr) ifTrue: - (interpreterProxy isInMemory: ptrAddress) ifTrue: [^FFIErrorInvalidPointer]. ^self ffiPushPointer: ptrAddress in: calloutState]. ptrClass = interpreterProxy classByteArray ifTrue: ["Since this involves passing the address of the first indexable field we need to fail the call if it is threaded and the object is young, since it may move during the call." self cppIf: COGMTVM ifTrue: [((calloutState callFlags anyMask: FFICallFlagThreaded) and: [interpreterProxy isYoung: oop]) ifTrue: [^PrimErrObjectMayMove negated]]. ptrAddress := interpreterProxy firstIndexableField: oop. ^self ffiPushPointer: ptrAddress in: calloutState]. (interpreterProxy includesBehavior: ptrClass ThatOf: interpreterProxy classAlien) ifTrue: [self cppIf: COGMTVM ifTrue: [((calloutState callFlags anyMask: FFICallFlagThreaded) and: [(self isDirectAlien: oop) and: [interpreterProxy isYoung: oop]]) ifTrue: [^PrimErrObjectMayMove negated]]. + ptrAddress := self cCoerce: (self startOfData: oop) to: #'void *'. - ptrAddress := self startOfData: oop. ^self ffiPushPointer: ptrAddress in: calloutState]. ^FFIErrorBadArg! Item was changed: ----- Method: ThreadedFFIPlugin>>ffiPushStructureContentsOf:in: (in category 'marshalling-struct') ----- ffiPushStructureContentsOf: oop in: calloutState <var: #calloutState type: #'CalloutState *'> "Push the contents of the given external structure" | ptrClass ptrAddress | <inline: true> ptrClass := interpreterProxy fetchClassOf: oop. ptrClass = interpreterProxy classExternalAddress ifTrue: "ExternalAddress is bytes" [ptrAddress := (interpreterProxy fetchPointer: 0 ofObject: oop) asVoidPointer. "There is no way we can make sure the structure is valid. But we can at least check for attempts to pass pointers to ST memory." + (interpreterProxy isInMemory: ptrAddress asUnsignedIntegerPtr) ifTrue: - (interpreterProxy isInMemory: ptrAddress) ifTrue: [^FFIErrorInvalidPointer]. ^self ffiPushStructure: ptrAddress ofSize: (calloutState ffiArgHeader bitAnd: FFIStructSizeMask) typeSpec: calloutState ffiArgSpec ofLength: calloutState ffiArgSpecSize in: calloutState]. ptrClass = interpreterProxy classByteArray ifTrue: ["The following is a somewhat pessimistic test but I like being sure..." (interpreterProxy byteSizeOf: oop) = (calloutState ffiArgHeader bitAnd: FFIStructSizeMask) ifFalse:[^FFIErrorStructSize]. ptrAddress := interpreterProxy firstIndexableField: oop. (calloutState ffiArgHeader anyMask: FFIFlagPointer) ifFalse: "Since this involves passing the address of the first indexable field we need to fail the call if it is threaded and the object is young, since it may move during the call." [self cppIf: COGMTVM ifTrue: [((calloutState callFlags anyMask: FFICallFlagThreaded) and: [interpreterProxy isYoung: oop]) ifTrue: [^PrimErrObjectMayMove negated]]. ^self ffiPushStructure: ptrAddress ofSize: (calloutState ffiArgHeader bitAnd: FFIStructSizeMask) typeSpec: calloutState ffiArgSpec ofLength: calloutState ffiArgSpecSize in: calloutState]. "If FFIFlagPointer + FFIFlagStructure is set use ffiPushPointer on the contents" (calloutState ffiArgHeader bitAnd: FFIStructSizeMask) = BytesPerWord ifFalse: [^FFIErrorStructSize]. ptrAddress := (interpreterProxy fetchPointer: 0 ofObject: oop) asVoidPointer. + (interpreterProxy isInMemory: ptrAddress asUnsignedIntegerPtr) ifTrue: - (interpreterProxy isInMemory: ptrAddress) ifTrue: [^FFIErrorInvalidPointer]. ^self ffiPushPointer: ptrAddress in: calloutState]. ^FFIErrorBadArg! Item was changed: ----- Method: ThreadedFFIPlugin>>isUnionSpec:OfLength:StartingAt: (in category 'marshalling-struct') ----- isUnionSpec: specs OfLength: specSize StartingAt: startIndex "We can't easily distinguish union from structures with available flags. But we have a trick: a union should have one field size equal to its own size." | index spec unionSize thisSize | <var: #specs type: #'unsigned int*'> <inline: false> index := startIndex. spec := specs at: index. self assert: (spec bitAnd: FFIFlagPointer + FFIFlagAtomic + FFIFlagStructure) = FFIFlagStructure. unionSize := spec bitAnd: FFIStructSizeMask. [index := index + 1. index < specSize] whileTrue: [spec := specs at: index. spec = FFIFlagStructure ifTrue: [^false]. thisSize := spec bitAnd: FFIStructSizeMask. thisSize = unionSize ifTrue: [^true]. ((spec bitAnd: FFIFlagPointer + FFIFlagStructure) = FFIFlagStructure) ifTrue: ["Asking for alignment is a trick for skipping this sub structure/union" + self alignmentOfStructSpec: specs OfLength: specSize StartingAt: (self addressOf: index put: [:v| index := v])]]. - self alignmentOfStructSpec: specs OfLength: specSize StartingAt: (self addressOf: index)]]. ^false! Item was changed: ----- Method: ThreadedFFIPlugin>>primitiveFFIDoubleAt (in category 'primitives') ----- primitiveFFIDoubleAt "Return a (signed or unsigned) n byte integer from the given byte offset." | byteOffset rcvr addr floatValue | <export: true> <inline: false> <var: #floatValue type: #double> byteOffset := interpreterProxy stackIntegerValue: 0. rcvr := interpreterProxy stackObjectValue: 1. interpreterProxy failed ifTrue:[^0]. addr := self ffiAddressOf: rcvr startingAt: byteOffset size: 8. addr = 0 ifTrue: [^interpreterProxy primitiveFail]. self memcpy: (self addressOf: floatValue) _: addr _: (self sizeof: floatValue). + interpreterProxy methodReturnFloat: floatValue - interpreterProxy pop: 2. - ^interpreterProxy pushFloat: floatValue ! Item was changed: ----- Method: ThreadedFFIPlugin>>primitiveFFIDoubleAtPut (in category 'primitives') ----- primitiveFFIDoubleAtPut "Return a (signed or unsigned) n byte integer from the given byte offset." | byteOffset rcvr addr floatValue floatOop | <export: true> <inline: false> <var: #floatValue type: #double> floatOop := interpreterProxy stackValue: 0. (interpreterProxy isIntegerObject: floatOop) + ifTrue:[floatValue := self cCoerce: (interpreterProxy integerValueOf: floatOop) to: #double] + ifFalse:[floatValue := self cCoerce: (interpreterProxy floatValueOf: floatOop) to: #double]. - ifTrue:[floatValue := self cCoerce: (interpreterProxy integerValueOf: floatOop) to:'double'] - ifFalse:[floatValue := self cCoerce: (interpreterProxy floatValueOf: floatOop) to:'double']. byteOffset := interpreterProxy stackIntegerValue: 1. rcvr := interpreterProxy stackObjectValue: 2. interpreterProxy failed ifTrue:[^0]. addr := self ffiAddressOf: rcvr startingAt: byteOffset size: 8. addr = 0 ifTrue: [^interpreterProxy primitiveFail]. self memcpy: addr _: (self addressOf: floatValue) _: (self sizeof: floatValue). ^interpreterProxy pop: 3 thenPush: floatOop! Item was changed: ----- Method: ThreadedFFIPlugin>>primitiveFFIFloatAt (in category 'primitives') ----- primitiveFFIFloatAt "Return a (signed or unsigned) n byte integer from the given byte offset." | byteOffset rcvr addr floatValue | <export: true> <inline: false> <var: #floatValue type: #float> byteOffset := interpreterProxy stackIntegerValue: 0. rcvr := interpreterProxy stackObjectValue: 1. interpreterProxy failed ifTrue:[^0]. addr := self ffiAddressOf: rcvr startingAt: byteOffset size: 4. addr = 0 ifTrue: [^interpreterProxy primitiveFail]. self memcpy: (self addressOf: floatValue) _: addr _: (self sizeof: floatValue). + interpreterProxy methodReturnFloat: floatValue! - interpreterProxy pop: 2. - ^interpreterProxy pushFloat: floatValue! Item was changed: ----- Method: ThreadedFFIPlugin>>primitiveFFIFloatAtPut (in category 'primitives') ----- primitiveFFIFloatAtPut "Return a (signed or unsigned) n byte integer from the given byte offset." | byteOffset rcvr addr floatValue floatOop | <export: true> <inline: false> <var: #floatValue type: #float> floatOop := interpreterProxy stackValue: 0. (interpreterProxy isIntegerObject: floatOop) + ifTrue:[floatValue := self cCoerce: (interpreterProxy integerValueOf: floatOop) to: #float] + ifFalse:[floatValue := self cCoerce: (interpreterProxy floatValueOf: floatOop) to: #float]. - ifTrue:[floatValue := self cCoerce: (interpreterProxy integerValueOf: floatOop) to:'float'] - ifFalse:[floatValue := self cCoerce: (interpreterProxy floatValueOf: floatOop) to:'float']. byteOffset := interpreterProxy stackIntegerValue: 1. rcvr := interpreterProxy stackObjectValue: 2. interpreterProxy failed ifTrue:[^0]. addr := self ffiAddressOf: rcvr startingAt: byteOffset size: 4. addr = 0 ifTrue: [^interpreterProxy primitiveFail]. self memcpy: addr _: (self addressOf: floatValue) _: (self sizeof: floatValue). ^interpreterProxy pop: 3 thenPush: floatOop! Item was changed: ----- Method: ThreadedFFIPlugin>>primitiveFFIFree (in category 'primitives') ----- primitiveFFIFree "Primitive. Free the object pointed to on the external heap." | addr oop ptr | <export: true> <inline: false> <var: #ptr type: #'sqIntptr_t *'> oop := interpreterProxy stackObjectValue: 0. ((interpreterProxy fetchClassOf: oop) = interpreterProxy classExternalAddress and: [(interpreterProxy byteSizeOf: oop) = (self sizeof: #'sqIntptr_t')]) ifFalse: [^interpreterProxy primitiveFail]. ptr := interpreterProxy firstIndexableField: oop. addr := ptr at: 0. "Don't you dare to free Squeak's memory!!" (addr = 0 or: [(addr asUnsignedIntegerPtr bitAnd: (self sizeof: #'sqIntptr_t') - 1) ~= 0 + or: [interpreterProxy isInMemory: addr asUnsignedIntegerPtr]]) ifTrue: - or: [interpreterProxy isInMemory: addr]]) ifTrue: [^interpreterProxy primitiveFail]. self ffiFree: addr. ^ptr at: 0 put: 0 "cleanup"! Item was changed: ----- Method: ThreadedFFIPlugin>>primitiveStructureElementAlignment (in category 'primitives') ----- primitiveStructureElementAlignment "Answer the alignment of an element of an atomic type, or a structure, within a structure on the current platform." <export: true> | typeCode alignment | + <var: 'alignment' type: #'void *'> typeCode := interpreterProxy stackValue: 0. ((interpreterProxy isIntegerObject: typeCode) and: [((typeCode := interpreterProxy integerValueOf: typeCode) between: FFITypeUnsignedByte and: FFITypeDoubleFloat) or: [typeCode = FFIFlagStructure]]) ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. alignment := typeCode caseOf: { [FFITypeUnsignedByte] -> [self structOffsetOf: 'structByte *' atomicTypeCode: FFITypeUnsignedByte]. [FFITypeSignedByte] -> [self structOffsetOf: 'structByte *' atomicTypeCode: FFITypeUnsignedByte]. [FFITypeUnsignedShort] -> [self structOffsetOf: 'structShort *' atomicTypeCode: FFITypeUnsignedShort]. [FFITypeSignedShort] -> [self structOffsetOf: 'structShort *' atomicTypeCode: FFITypeUnsignedShort]. [FFITypeUnsignedInt] -> [self structOffsetOf: 'structInt *' atomicTypeCode: FFITypeUnsignedInt]. [FFITypeSignedInt] -> [self structOffsetOf: 'structInt *' atomicTypeCode: FFITypeUnsignedInt]. [FFITypeUnsignedLongLong] -> [self structOffsetOf: 'structLongLong *' atomicTypeCode: FFITypeUnsignedLongLong]. [FFITypeSignedLongLong] -> [self structOffsetOf: 'structLongLong *' atomicTypeCode: FFITypeUnsignedLongLong]. [FFITypeSingleFloat] -> [self structOffsetOf: 'structFloat *' atomicTypeCode: FFITypeSingleFloat]. [FFITypeDoubleFloat] -> [self structOffsetOf: 'structDouble *' atomicTypeCode: FFITypeDoubleFloat]. } otherwise: [self structOffsetOf: 'structStruct *' atomicTypeCode: FFIFlagStructure]. + ^interpreterProxy methodReturnInteger: alignment asUnsignedIntegerPtr! - ^interpreterProxy methodReturnInteger: alignment! Item was added: + ----- Method: ThreadedFFIPlugin>>unalignedLong32At: (in category 'primitive support') ----- + unalignedLong32At: index + "This alignment stuff is a hack for integerAt:put:size:signed:/primitiveFFIIntegerAt[Put]. + The assumption right now is that all processors support unaligned access. That only holds true + for x86, x86-64 & ARMv6 & later. But this keeps us going until we can address it properly." + <cmacro: '(index) long32At(index)'> + ^interpreterProxy long32At: index! Item was added: + ----- Method: ThreadedFFIPlugin>>unalignedLong32At:put: (in category 'primitive support') ----- + unalignedLong32At: index put: value + "This alignment stuff is a hack for integerAt:put:size:signed:/primitiveFFIIntegerAt[Put]. + The assumption right now is that all processors support unaligned access. That only holds true + for x86, x86-64 & ARMv6 & later. But this keeps us going until we can address it properly." + <cmacro: '(index,value) long32Atput(index,value)'> + ^interpreterProxy long32At: index put: value! Item was added: + ----- Method: ThreadedFFIPlugin>>unalignedLong64At: (in category 'primitive support') ----- + unalignedLong64At: index + "This alignment stuff is a hack for integerAt:put:size:signed:/primitiveFFIIntegerAt[Put]. + The assumption right now is that all processors support unaligned access. That only holds true + for x86, x86-64 & ARMv6 & later. But this keeps us going until we can address it properly." + <cmacro: '(index) long64At(index)'> + ^interpreterProxy long64At: index! Item was added: + ----- Method: ThreadedFFIPlugin>>unalignedLong64At:put: (in category 'primitive support') ----- + unalignedLong64At: index put: value + "This alignment stuff is a hack for integerAt:put:size:signed:/primitiveFFIIntegerAt[Put]. + The assumption right now is that all processors support unaligned access. That only holds true + for x86, x86-64 & ARMv6 & later. But this keeps us going until we can address it properly." + <cmacro: '(index,value) long64Atput(index,value)'> + ^interpreterProxy long64At: index put: value! Item was added: + ----- Method: ThreadedFFIPlugin>>unalignedShortAt: (in category 'primitive support') ----- + unalignedShortAt: index + "This alignment stuff is a hack for integerAt:put:size:signed:/primitiveFFIIntegerAt[Put]. + The assumption right now is that all processors support unaligned access. That only holds true + for x86, x86-64 & ARMv6 & later. But this keeps us going until we can address it properly." + <cmacro: '(index) shortAt(index)'> + ^interpreterProxy shortAt: index! Item was added: + ----- Method: ThreadedFFIPlugin>>unalignedShortAt:put: (in category 'primitive support') ----- + unalignedShortAt: index put: value + "This alignment stuff is a hack for integerAt:put:size:signed:/primitiveFFIIntegerAt[Put]. + The assumption right now is that all processors support unaligned access. That only holds true + for x86, x86-64 & ARMv6 & later. But this keeps us going until we can address it properly." + <cmacro: '(index,value) shortAtput(index,value)'> + ^interpreterProxy shortAt: index put: value! Item was changed: ----- Method: ThreadedIA32FFIPlugin>>ffiCalloutTo:SpecOnStack:in: (in category 'callout support') ----- ffiCalloutTo: procAddr SpecOnStack: specOnStack in: calloutState <var: #procAddr type: #'void *'> <var: #calloutState type: #'CalloutState *'> "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: #always> - <inline: true> myThreadIndex := interpreterProxy disownVM: (self disownFlagsFor: calloutState). (self allocaLiesSoSetSpBeforeCall or: [self mustAlignStack]) ifTrue: [self setsp: calloutState argVector]. atomicType := self atomicTypeOf: calloutState ffiRetHeader. (atomicType >> 1) = (FFITypeSingleFloat >> 1) ifTrue: [floatRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'double (*)()'). "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: 'usqLong (*)()'). "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: (self addressOf: intRet) ofType: (self ffiReturnType: specOnStack) in: calloutState]. ^self ffiCreateIntegralResultOop: intRet ofAtomicType: atomicType in: calloutState! Item was changed: ----- Method: ThreadedX64SysVFFIPlugin>>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 sddRet sdiRet sidRet siiRet returnStructByValue registerType sRetPtr | <var: #floatRet type: #double> <var: #intRet type: #sqInt> <var: #siiRet type: #SixteenByteReturnII> <var: #sidRet type: #SixteenByteReturnID> <var: #sdiRet type: #SixteenByteReturnDI> <var: #sddRet type: #SixteenByteReturnDD> <var: #sRetPtr type: #'void *'> + <inline: #always> - <inline: true> returnStructByValue := (calloutState ffiRetHeader bitAnd: FFIFlagStructure + FFIFlagPointer + FFIFlagAtomic) = FFIFlagStructure. myThreadIndex := interpreterProxy disownVM: (self disownFlagsFor: calloutState). calloutState floatRegisterIndex > 0 ifTrue: [self load: (calloutState floatRegisters at: 0) Flo: (calloutState floatRegisters at: 1) a: (calloutState floatRegisters at: 2) t: (calloutState floatRegisters at: 3) R: (calloutState floatRegisters at: 4) e: (calloutState floatRegisters at: 5) g: (calloutState floatRegisters at: 6) s: (calloutState floatRegisters at: 7)]. (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, sqIntptr_t, sqIntptr_t)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3) with: (calloutState integerRegisters at: 4) with: (calloutState integerRegisters at: 5)] ifFalse: "atomicType = FFITypeDoubleFloat" [floatRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'double (*)(sqIntptr_t, sqIntptr_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) with: (calloutState integerRegisters at: 4) with: (calloutState integerRegisters at: 5)]. interpreterProxy ownVM: myThreadIndex. ^interpreterProxy floatObjectOf: floatRet]. returnStructByValue ifFalse: [intRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'sqInt (*)(sqIntptr_t, sqIntptr_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) with: (calloutState integerRegisters at: 4) with: (calloutState integerRegisters at: 5). interpreterProxy ownVM: myThreadIndex. (calloutState ffiRetHeader anyMask: FFIFlagPointer) ifTrue: [^self ffiReturnPointer: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState]. ^self ffiCreateIntegralResultOop: intRet ofAtomicType: atomicType in: calloutState]. registerType := calloutState structReturnType. registerType caseOf: {[2r00] -> [sddRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'SixteenByteReturnDD (*)(sqIntptr_t, sqIntptr_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) with: (calloutState integerRegisters at: 4) with: (calloutState integerRegisters at: 5). sRetPtr := (self addressOf: sddRet) asVoidPointer]. [2r01] -> [sidRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'SixteenByteReturnID (*)(sqIntptr_t, sqIntptr_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) with: (calloutState integerRegisters at: 4) with: (calloutState integerRegisters at: 5). sRetPtr := (self addressOf: sidRet) asVoidPointer]. [2r10] -> [sdiRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'SixteenByteReturnDI (*)(sqIntptr_t, sqIntptr_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) with: (calloutState integerRegisters at: 4) with: (calloutState integerRegisters at: 5). sRetPtr := (self addressOf: sdiRet) asVoidPointer]. [2r11] -> [siiRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'SixteenByteReturnII (*)(sqIntptr_t, sqIntptr_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) with: (calloutState integerRegisters at: 4) with: (calloutState integerRegisters at: 5). sRetPtr := (self addressOf: siiRet) asVoidPointer]. [2r100] -> [floatRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'double (*)(sqIntptr_t, sqIntptr_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) with: (calloutState integerRegisters at: 4) with: (calloutState integerRegisters at: 5). sRetPtr := (self addressOf: floatRet) asVoidPointer]. [2r101] -> [intRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'sqInt (*)(sqIntptr_t, sqIntptr_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) with: (calloutState integerRegisters at: 4) with: (calloutState integerRegisters at: 5). sRetPtr := (self addressOf: intRet) asVoidPointer]. [2r110] -> ["return a pointer to alloca'd memory" intRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'sqInt (*)(sqIntptr_t, sqIntptr_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) with: (calloutState integerRegisters at: 4) with: (calloutState integerRegisters at: 5). sRetPtr := intRet asVoidPointer "address of struct is returned in RAX, which also is calloutState limit"]} otherwise: [interpreterProxy ownVM: myThreadIndex. self ffiFail: FFIErrorWrongType. ^nil]. interpreterProxy ownVM: myThreadIndex. ^self ffiReturnStruct: sRetPtr ofType: (self ffiReturnType: specOnStack) in: calloutState! Item was changed: ----- Method: ThreadedX64SysVFFIPlugin>>registerType:ForStructSpecs:OfLength:StartingAt:ByteOffset:EightbyteOffset: (in category 'marshalling') ----- registerType: initialRegisterType ForStructSpecs: specs OfLength: specSize StartingAt: indexPtr ByteOffset: initialByteOffset EightbyteOffset: initialEightbyteOffset "Answer with a number characterizing the register type for passing a struct of size <= 16 bytes. On input, the index points to the structure header (the one with FFIFlagStructure + structSize) On output, the index points to the structure trailer (the FFIFlagStructure)." + <var: #specs type: #'unsigned int *'> + <var: #indexPtr type: #'sqInt *'> - <var: #specs type: #'unsigned int*'> - <var: #indexPtr type: #'unsigned int*'> - <var: #subIndex type: #'unsigned int'> <inline: false> | registerType eightbyteOffset byteOffset spec fieldSize alignment atomic subIndex isInt recurse subLevel | registerType := initialRegisterType. byteOffset := initialByteOffset. eightbyteOffset := initialEightbyteOffset. [indexPtr at: 0 put: (indexPtr at: 0) + 1. subLevel := 0. (indexPtr at: 0) < specSize] whileTrue: [spec := specs at: (indexPtr at: 0). isInt := false. recurse := false. spec = FFIFlagStructure "this marks end of structure/union" ifTrue: [subLevel = 0 ifTrue: [^registerType]. subLevel := subLevel - 1] ifFalse: [(spec anyMask: FFIFlagPointer) ifTrue: [fieldSize := BytesPerWord. alignment := fieldSize. isInt := true] ifFalse: [(spec bitAnd: FFIFlagStructure + FFIFlagAtomic) caseOf: {[FFIFlagStructure] -> [fieldSize := 0. subIndex := indexPtr at: 0. + alignment := self alignmentOfStructSpec: specs OfLength: specSize StartingAt: (self addressOf: subIndex put: [:v| subIndex := v]). - alignment := self alignmentOfStructSpec: specs OfLength: specSize StartingAt: (self addressOf: subIndex). recurse := self isUnionSpec: specs OfLength: specSize StartingAt: (indexPtr at: 0). recurse ifTrue: [fieldSize := spec bitAnd: FFIStructSizeMask] ifFalse: [subLevel := subLevel + 1]]. [FFIFlagAtomic] -> [fieldSize := spec bitAnd: FFIStructSizeMask. alignment := fieldSize. atomic := self atomicTypeOf: spec. isInt := (atomic >> 1) ~= (FFITypeSingleFloat >> 1)]} otherwise: ["invalid spec" ^-1]]. (byteOffset bitAnd: alignment - 1) = 0 ifFalse: ["this field requires alignment" byteOffset := (byteOffset bitClear: alignment - 1) + alignment]. byteOffset + fieldSize > 8 ifTrue: ["Not enough room on current Eightbyte for this field, skip to next one" eightbyteOffset := eightbyteOffset + 1. byteOffset := 0]. isInt ifTrue: ["If this eightbyte contains an int field, then we must use an int register" registerType := registerType bitOr: 1 << eightbyteOffset]. recurse ifTrue: ["union in structs require a recursive form, because we handle byteOffset/eightbyteOffset differently" registerType := self registerType: registerType ForUnionSpecs: specs OfLength: specSize StartingAt: indexPtr ByteOffset: byteOffset EightbyteOffset: eightbyteOffset]. "where to put the next field?" byteOffset := byteOffset + fieldSize. byteOffset >= 8 ifTrue: ["This eightbyte is full, skip to next one" eightbyteOffset := eightbyteOffset + 1. byteOffset := 0]]]. self assert: subLevel = 0. ^registerType! Item was changed: ----- Method: ThreadedX64SysVFFIPlugin>>registerType:ForUnionSpecs:OfLength:StartingAt:ByteOffset:EightbyteOffset: (in category 'marshalling') ----- registerType: initialRegisterType ForUnionSpecs: specs OfLength: specSize StartingAt: indexPtr ByteOffset: byteOffset EightbyteOffset: eightbyteOffset "Answer with a number characterizing the register type for passing a union of size <= 16 bytes. On input, the index points to the structure header (the one with FFIFlagStructure + structSize) On output, the index points to the structure trailer (the FFIFlagStructure)." + <var: #specs type: #'unsigned int *'> + <var: #indexPtr type: #'sqInt *'> - <var: #specs type: #'unsigned int*'> - <var: #indexPtr type: #'unsigned int*'> <inline: false> | registerType spec atomic isInt recurse subLevel | registerType := initialRegisterType. [indexPtr at: 0 put: (indexPtr at: 0) + 1. subLevel := 0. (indexPtr at: 0) < specSize] whileTrue: [spec := specs at: (indexPtr at: 0). isInt := false. recurse := false. spec = FFIFlagStructure "this marks end of structure/union" ifTrue: [subLevel = 0 ifTrue: [^registerType]. subLevel := subLevel - 1] ifFalse: [(spec anyMask: FFIFlagPointer) ifTrue: [isInt := true] ifFalse: [(spec bitAnd: FFIFlagStructure + FFIFlagAtomic) caseOf: {[FFIFlagStructure] -> [recurse := (self isUnionSpec: specs OfLength: specSize StartingAt: (indexPtr at: 0))not. recurse ifFalse: [subLevel := subLevel + 1]]. [FFIFlagAtomic] -> [atomic := self atomicTypeOf: spec. isInt := (atomic >> 1) ~= (FFITypeSingleFloat >> 1)]} otherwise: ["invalid spec" ^-1]]. isInt ifTrue: ["If this eightbyte contains an int field, then we must use an int register" registerType := registerType bitOr: 1 << eightbyteOffset]. recurse ifTrue: ["struct in union require a recursive form, because we handle byteOffset/eightbyteOffset differently" registerType := self registerType: registerType ForStructSpecs: specs OfLength: specSize StartingAt: indexPtr ByteOffset: byteOffset EightbyteOffset: eightbyteOffset]]]. self assert: subLevel = 0. ^registerType! Item was changed: ----- Method: ThreadedX64SysVFFIPlugin>>registerTypeForStructSpecs:OfLength: (in category 'marshalling') ----- registerTypeForStructSpecs: specs OfLength: specSize "Answer with a number characterizing the register type for passing a struct of size <= 16 bytes. The bit at offset i of registerType is set to 1 if eightbyte at offset i is a int register (RAX ...) The bit at offset 2 indicates if there is a single eightbyte (struct size <= 8) * 2r00 for float float (XMM0 XMM1) * 2r01 for int float (RAX XMM0) * 2r10 for float int (XMM0 RAX) * 2r11 for int int (RAX RDX) * 2r100 for float (XMM0) * 2r101 for int (RAX) * 2r110 INVALID (not aligned) Beware, the bits must be read from right to left for decoding register type. Note: this method reconstructs the struct layout according to X64 alignment rules. Therefore, it will not work for packed struct or other exotic alignment." + <var: #specs type: #'unsigned int *'> - <var: #specs type: #'unsigned int*'> <inline: false> | index byteSize registerType | index := 0. byteSize := (specs at: index) bitAnd: FFIStructSizeMask. byteSize > 16 ifTrue: [^2r110]. (self checkAlignmentOfStructSpec: specs OfLength: specSize StartingAt: index) ifFalse: [^2r110]. registerType := byteSize <= 8 ifTrue: [2r100] ifFalse: [0]. ^(self isUnionSpec: specs OfLength: specSize StartingAt: 0) ifTrue: [ self registerType: registerType ForUnionSpecs: specs OfLength: specSize + StartingAt: (self addressOf: index put: [:v| index := v]) - StartingAt: (self addressOf: index) ByteOffset: 0 EightbyteOffset: 0 ] ifFalse: [ self registerType: registerType ForStructSpecs: specs OfLength: specSize + StartingAt: (self addressOf: index put: [:v| index := v]) - StartingAt: (self addressOf: index) ByteOffset: 0 EightbyteOffset: 0 ]! Item was changed: ----- Method: ThreadedX64Win64FFIPlugin>>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)'> "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: #always> - <inline: true> myThreadIndex := interpreterProxy disownVM: (self disownFlagsFor: calloutState). calloutState floatRegisterSignature > 0 ifTrue: [self load: (calloutState floatRegisters at: 0) Flo: (calloutState floatRegisters at: 1) atR: (calloutState floatRegisters at: 2) egs: (calloutState floatRegisters at: 3)]. (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: (self addressOf: intRet) ofType: (self ffiReturnType: specOnStack) in: calloutState]. ^self ffiCreateIntegralResultOop: intRet ofAtomicType: atomicType in: calloutState! Item was changed: ----- Method: ThreadedX64Win64FFIPlugin>>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 *'> <var: #arg type: #usqLong> <inline: true> structSize <= 0 ifTrue: [^FFIErrorStructSize]. + "See https://docs.microsoft.com/en-us/cpp/build/x64-calling-convention?view=vs-2…" (structSize <= WordSize and: [(structSize bitAnd: structSize - 1) = 0 "a.k.a. structSize isPowerOfTwo"]) ifTrue: [| arg | self memcpy: (self addressOf: arg) _: pointer _: structSize. ^self ffiPushUnsignedLongLong: arg in: calloutState]. + "BUG!!!! This memory should be 16-byte aligned; Spur guarantees only 8-byte alignment." + self flag: #bug. - "For now just push the pointer; we should copy the struct to the outgoing stack frame!!!!" - self flag: 'quick hack'. ^self ffiPushPointer: pointer in: calloutState! Item was changed: ----- Method: VMPluginCodeGenerator>>isStructSend: (in category 'utilities') ----- isStructSend: aTSendNode "Answer if the argument aTSendNode is a send of a structure accessor. This is tricky. We want foo bar => foo->bar foo bar => foo.bar foo bar: expr => foo->bar = expr foo bar: expr => foo.bar = expr depending on whether foo is a struct or a pointer to a struct, but only if both foo is a struct type and bar is a field accessor. The tricky cases are self-sends within struct class methods. Here we need to distinguish between self-sends of ordinary methods from self sends of accessors. Override to avoid requiring that there be a struct accessor method for the selector." ^aTSendNode numArgs <= 1 + and: [(self isMacroSelector: aTSendNode selector) not + and: [(aTSendNode receiver structTargetKindIn: self) notNil]]! - and: [(aTSendNode receiver structTargetKindIn: self) notNil]! Item was added: + ----- Method: VMPluginCodeGenerator>>selectorReturnsPointerToStruct: (in category 'C code generator') ----- + selectorReturnsPointerToStruct: selector "<Symbol>" + | tMethod | + ^(tMethod := methods + at: selector + ifAbsent: + [apiMethods ifNotNil: + [apiMethods at: selector ifAbsent: []]]) notNil + and: [(VMStructType isTypePointerToStruct: tMethod returnType) + or: [(pluginClass isStructType: tMethod returnType) + and: [tMethod returnType last == $*]]]! Item was added: + ----- Method: VMPluginCodeGenerator>>selectorReturnsStruct: (in category 'C code generator') ----- + selectorReturnsStruct: selector "<Symbol>" + | tMethod | + ^(tMethod := methods + at: selector + ifAbsent: + [apiMethods ifNotNil: + [apiMethods at: selector ifAbsent: []]]) notNil + and: [(VMStructType isTypeStruct: tMethod returnType) + or: [(pluginClass isStructType: tMethod returnType) + and: [tMethod returnType last ~~ $*]]]! Item was changed: ----- Method: VMPluginCodeGenerator>>shouldGenerateAsInterpreterProxySend: (in category 'utilities') ----- shouldGenerateAsInterpreterProxySend: aSendNode "Answer if this send should be generated as interpreterProxy->foo or its moral equivalent (*). (*) since we now use function pointers declared in each external plugin we only indirect through interopreterProxy at plugin initialization. But we still have to find the set of sends a plugin uses." + (aSendNode receiver isVariable and: ['interpreterProxy' = aSendNode receiver name]) ifFalse: + [^false]. + (self isMacroSelector: aSendNode selector) ifTrue: + [^false]. - | selector | - (aSendNode receiver isVariable and: ['interpreterProxy' = aSendNode receiver name]) ifFalse: [^false]. - selector := aSendNode selector. - "baseHeaderSize, minSmallInteger et al are #defined in each VM's interp.h" - (VMBasicConstants mostBasicConstantSelectors includes: selector) ifTrue: [^false]. "Only include genuine InterpreterProxy methods, excluding things not understood by InterpreterProxy and things in its initialize, private and simulation protocols." + ^(#(initialize private #'simulation only') includes: (InterpreterProxy compiledMethodAt: aSendNode selector ifAbsent: [^false]) protocol) not! - ^(#(initialize private #'simulation only') includes: (InterpreterProxy compiledMethodAt: selector ifAbsent: [^false]) protocol) not! Item was changed: ----- Method: VMPluginCodeGenerator>>structTargetKindForDeclaration: (in category 'C code generator') ----- structTargetKindForDeclaration: decl "<String>" ^(super structTargetKindForDeclaration: decl) ifNil: [pluginClass ifNotNil: + [| isPointer | + (pluginClass isStructType: ((isPointer := decl last == $*) + ifTrue: [decl allButLast withBlanksTrimmed] + ifFalse: [decl])) ifTrue: + [isPointer - [(pluginClass isStructType: (decl last = $* - ifTrue: [decl allButLast] - ifFalse: [decl]) withBlanksTrimmed) ifTrue: - [(decl indexOf: $*) > 0 ifTrue: [#pointer] ifFalse: [#struct]]]]! Item was changed: ----- Method: VMStructType class>>isTypePointerToStruct: (in category 'translation') ----- isTypePointerToStruct: type | index | + ^type isString - ^type notNil and: [(index := type indexOf: $*) > 0 and: [self ensureStructTypeCache anySatisfy: [:structType| (type beginsWith: structType) and: [index > structType size]]]]!

1 0

[OpenSmalltalk/opensmalltalk-vm] vm-display-fbdev (#515)
by Ken Dickey 30 Aug '20

30 Aug '20

Note: mvm needs TLC for framebuffer builds. Armbian does not use MUSL, but -DMUSL was harmless. ToDo: mouse wheel events not yet converted to arrow codes. Armbian-Notes.txt and AlpineLinux-Notes.txt need to be migrated or merged into HowToBuild You can view, comment on, or merge this pull request online at: https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/515 -- Commit Summary -- * just a start * adding Evdev * evdev * much unparsed code * mumble * simplify * commentary * a bit closer (unparsed) * parses;untested * basic evdev mouse & keyboard * build flags - stdoutStack * display looks good * cursor tracks now; no kbd * still lacking mouse button events * because white pixels are boring * latest trial * mouse buttons seen * basics work * keymap fixups * elided X11 cruft * static fbSelf * useful * dup * added openssl-dev to apk * hdmi boot config * cruft removal * shell vars * cursor looks OK now * platform independent sizes (16ok|32no) * 32bit fb depth OK * reboot lossage fixup * 32 bit depth works * cmd-. works * shorted splash screen display time * new -- File Changes -- A AlpineLinux-Notes.txt (80) A Armbian-Notes.txt (21) A build.linux64ARMv8/HowToBuild (352) M build.linux64ARMv8/squeak.cog.spur/build/mvm (7) M build.linux64ARMv8/squeak.stack.spur/build.debug/mvm (7) M build.linux64ARMv8/squeak.stack.spur/build/mvm (8) M platforms/Cross/vm/sqVirtualMachine.c (4) M platforms/unix/vm-display-fbdev/00_README.fbdev (9) A platforms/unix/vm-display-fbdev/Balloon.h (2644) A platforms/unix/vm-display-fbdev/sqUnixEvdevKeyMouse.c (660) A platforms/unix/vm-display-fbdev/sqUnixEvdevKeycodeMap.c (620) M platforms/unix/vm-display-fbdev/sqUnixFBDev.c (27) M platforms/unix/vm-display-fbdev/sqUnixFBDevFramebuffer.c (176) M platforms/unix/vm/debug.h (2) M platforms/unix/vm/sqUnixMain.c (5) -- Patch Links -- https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/515.patch https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/515.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/515

2 8

[OpenSmalltalk/opensmalltalk-vm] ab9f3b: just a start
by Eliot Miranda 30 Aug '20

30 Aug '20

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: ab9f3b6cdf6159fcfebeb28c4a0d8ff27bdd19db https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/ab9f3b6cdf6159fcfe… Author: KenDickey <Ken.Dickey(a)Whidbey.COM> Date: 2020-08-03 (Mon, 03 Aug 2020) Changed paths: A platforms/unix/vm-display-fbdev/sqUnixEvdevKeyboard.c A platforms/unix/vm-display-fbdev/sqUnixEvdevKeymap.c A platforms/unix/vm-display-fbdev/sqUnixEvdevMouse.c Log Message: ----------- just a start Commit: 182cc2c9254cd48f1fadbe0baffd565d1abbe66d https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/182cc2c9254cd48f1f… Author: KenDickey <Ken.Dickey(a)Whidbey.COM> Date: 2020-08-03 (Mon, 03 Aug 2020) Changed paths: M platforms/unix/vm-display-fbdev/sqUnixFBDev.c Log Message: ----------- adding Evdev Commit: 0c22aace0488b0b4342a0022eaa0c8ed97731c41 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/0c22aace0488b0b434… Author: KenDickey <Ken.Dickey(a)Whidbey.COM> Date: 2020-08-03 (Mon, 03 Aug 2020) Changed paths: M platforms/unix/vm-display-fbdev/00_README.fbdev Log Message: ----------- evdev Commit: 0a229a10acc32a8b917054162b25034f612b9a64 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/0a229a10acc32a8b91… Author: KenDickey <Ken.Dickey(a)Whidbey.COM> Date: 2020-08-04 (Tue, 04 Aug 2020) Changed paths: M platforms/unix/vm-display-fbdev/sqUnixEvdevKeyboard.c M platforms/unix/vm-display-fbdev/sqUnixEvdevMouse.c Log Message: ----------- much unparsed code Commit: 9549dcb00aa495331962d38b732aa5e6a2a42d71 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/9549dcb00aa4953319… Author: KenDickey <Ken.Dickey(a)Whidbey.COM> Date: 2020-08-04 (Tue, 04 Aug 2020) Changed paths: M platforms/unix/vm-display-fbdev/sqUnixEvdevKeyboard.c M platforms/unix/vm-display-fbdev/sqUnixEvdevMouse.c Log Message: ----------- mumble Commit: 387d8ebd1f6bab7be9768f63f7a1116616d7fc27 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/387d8ebd1f6bab7be9… Author: KenDickey <Ken.Dickey(a)Whidbey.COM> Date: 2020-08-06 (Thu, 06 Aug 2020) Changed paths: A platforms/unix/vm-display-fbdev/sqUnixEvdevKeyMouse.c Log Message: ----------- simplify Commit: d9c7be92d4c186b90df508994113aa0091745955 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/d9c7be92d4c186b90d… Author: KenDickey <Ken.Dickey(a)Whidbey.COM> Date: 2020-08-06 (Thu, 06 Aug 2020) Changed paths: A platforms/unix/vm-display-fbdev/sqUnixEvdevKeycodeMap.c Log Message: ----------- commentary Commit: bddaf7e8631bda3194179c000a35bbb01112f208 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/bddaf7e8631bda3194… Author: KenDickey <Ken.Dickey(a)Whidbey.COM> Date: 2020-08-07 (Fri, 07 Aug 2020) Changed paths: M platforms/unix/vm-display-fbdev/sqUnixEvdevKeyMouse.c M platforms/unix/vm-display-fbdev/sqUnixFBDev.c Log Message: ----------- a bit closer (unparsed) Commit: 655d536656c25eada39501c7d628ca21f8b7f649 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/655d536656c25eada3… Author: KenDickey <Ken.Dickey(a)Whidbey.COM> Date: 2020-08-08 (Sat, 08 Aug 2020) Changed paths: M platforms/unix/vm-display-fbdev/sqUnixEvdevKeyMouse.c M platforms/unix/vm-display-fbdev/sqUnixEvdevKeycodeMap.c M platforms/unix/vm-display-fbdev/sqUnixFBDev.c Log Message: ----------- parses;untested Commit: abc0cd01896fd7c72560b64b811526c9744faa71 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/abc0cd01896fd7c725… Author: KenDickey <Ken.Dickey(a)Whidbey.COM> Date: 2020-08-09 (Sun, 09 Aug 2020) Changed paths: M platforms/unix/vm-display-fbdev/sqUnixEvdevKeyMouse.c M platforms/unix/vm-display-fbdev/sqUnixFBDev.c Log Message: ----------- basic evdev mouse & keyboard Commit: 43af5aea3594e8d66389777b168a9b64b95e32e0 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/43af5aea3594e8d663… Author: KenDickey <Ken.Dickey(a)Whidbey.COM> Date: 2020-08-09 (Sun, 09 Aug 2020) Changed paths: M build.linux64ARMv8/squeak.stack.spur/build.debug/mvm M build.linux64ARMv8/squeak.stack.spur/build/mvm M platforms/Cross/vm/sqVirtualMachine.c R platforms/unix/vm-display-fbdev/sqUnixEvdevKeyboard.c R platforms/unix/vm-display-fbdev/sqUnixEvdevKeymap.c R platforms/unix/vm-display-fbdev/sqUnixEvdevMouse.c M platforms/unix/vm/debug.h M platforms/unix/vm/sqUnixMain.c Log Message: ----------- build flags - stdoutStack Commit: 8eda0134a0308aa84b92e9a444ff8a845f87573e https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/8eda0134a0308aa84b… Author: KenDickey <Ken.Dickey(a)Whidbey.COM> Date: 2020-08-10 (Mon, 10 Aug 2020) Changed paths: M platforms/unix/vm-display-fbdev/sqUnixFBDevFramebuffer.c Log Message: ----------- display looks good Commit: a2a09546f21dd3246349c5cb3e7d1d920ce2fcc7 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/a2a09546f21dd32463… Author: KenDickey <Ken.Dickey(a)Whidbey.COM> Date: 2020-08-10 (Mon, 10 Aug 2020) Changed paths: M platforms/unix/vm-display-fbdev/sqUnixEvdevKeyMouse.c Log Message: ----------- cursor tracks now; no kbd Commit: ab7cd135dff678acb91da8f0b2340cc43e3bd5c0 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/ab7cd135dff678acb9… Author: KenDickey <Ken.Dickey(a)Whidbey.COM> Date: 2020-08-11 (Tue, 11 Aug 2020) Changed paths: M platforms/unix/vm-display-fbdev/sqUnixEvdevKeyMouse.c M platforms/unix/vm-display-fbdev/sqUnixEvdevKeycodeMap.c Log Message: ----------- still lacking mouse button events Commit: 9a8b6d14c22fd8a20f8fab28ddc0cd6f9cf6f211 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/9a8b6d14c22fd8a20f… Author: KenDickey <Ken.Dickey(a)Whidbey.COM> Date: 2020-08-12 (Wed, 12 Aug 2020) Changed paths: A platforms/unix/vm-display-fbdev/Balloon.h M platforms/unix/vm-display-fbdev/sqUnixFBDevFramebuffer.c Log Message: ----------- because white pixels are boring Commit: cefe64708ba2a2fe162e098b362b820ec924b536 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/cefe64708ba2a2fe16… Author: KenDickey <Ken.Dickey(a)Whidbey.COM> Date: 2020-08-12 (Wed, 12 Aug 2020) Changed paths: M platforms/unix/vm-display-fbdev/sqUnixEvdevKeyMouse.c M platforms/unix/vm-display-fbdev/sqUnixFBDev.c Log Message: ----------- latest trial Commit: 3803a80dbfbf2623a86f85646a8a0cd4d93bacd7 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/3803a80dbfbf2623a8… Author: KenDickey <Ken.Dickey(a)Whidbey.COM> Date: 2020-08-13 (Thu, 13 Aug 2020) Changed paths: M build.linux64ARMv8/squeak.cog.spur/build/mvm M platforms/unix/vm-display-fbdev/sqUnixEvdevKeyMouse.c Log Message: ----------- mouse buttons seen Commit: 75832b1d606169251c1ad42e9e9a309c4de72993 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/75832b1d606169251c… Author: KenDickey <Ken.Dickey(a)Whidbey.COM> Date: 2020-08-14 (Fri, 14 Aug 2020) Changed paths: M platforms/unix/vm-display-fbdev/sqUnixEvdevKeyMouse.c M platforms/unix/vm-display-fbdev/sqUnixEvdevKeycodeMap.c M platforms/unix/vm-display-fbdev/sqUnixFBDevFramebuffer.c Log Message: ----------- basics work Commit: db2b422b2438bbf5acee13ad5a35db9ce712951f https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/db2b422b2438bbf5ac… Author: KenDickey <Ken.Dickey(a)Whidbey.COM> Date: 2020-08-14 (Fri, 14 Aug 2020) Changed paths: M build.linux64ARMv8/squeak.cog.spur/build/mvm M platforms/unix/vm-display-fbdev/sqUnixEvdevKeyMouse.c M platforms/unix/vm-display-fbdev/sqUnixEvdevKeycodeMap.c Log Message: ----------- keymap fixups Commit: 33983b11b2860a49531a7f752cc54c5df3b4930f https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/33983b11b2860a4953… Author: KenDickey <Ken.Dickey(a)Whidbey.COM> Date: 2020-08-16 (Sun, 16 Aug 2020) Changed paths: M platforms/unix/vm-display-fbdev/sqUnixEvdevKeyMouse.c M platforms/unix/vm-display-fbdev/sqUnixEvdevKeycodeMap.c Log Message: ----------- elided X11 cruft Commit: ecb3a853e00dcb1ac04e6395b82738fd16c9c162 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/ecb3a853e00dcb1ac0… Author: KenDickey <Ken.Dickey(a)Whidbey.COM> Date: 2020-08-16 (Sun, 16 Aug 2020) Changed paths: M build.linux64ARMv8/squeak.stack.spur/build.debug/mvm M platforms/unix/vm-display-fbdev/sqUnixFBDevFramebuffer.c Log Message: ----------- static fbSelf Commit: 8740796c610b002763d5d46ac03a8829cf39c7da https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/8740796c610b002763… Author: Linux User <kend(a)alpine-rpi4.Home> Date: 2020-08-18 (Tue, 18 Aug 2020) Changed paths: A AlpineLinux-Notes.txt Log Message: ----------- useful Commit: 48a32528a5e77bccb661159c6a8fa8b005d98526 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/48a32528a5e77bccb6… Author: Linux User <kend(a)alpine-rpi4.Home> Date: 2020-08-17 (Mon, 17 Aug 2020) Changed paths: A build.linux64ARMv8/HowToBuild Log Message: ----------- dup Commit: 27d524cfcde8d23b06319445002e4d220c65b4f2 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/27d524cfcde8d23b06… Author: KenDickey <Ken.Dickey(a)Whidbey.COM> Date: 2020-08-19 (Wed, 19 Aug 2020) Changed paths: M AlpineLinux-Notes.txt Log Message: ----------- added openssl-dev to apk Commit: d44807de5ea5326f3709790d5625ef03182b0445 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/d44807de5ea5326f37… Author: KenDickey <Ken.Dickey(a)Whidbey.COM> Date: 2020-08-19 (Wed, 19 Aug 2020) Changed paths: M AlpineLinux-Notes.txt Log Message: ----------- hdmi boot config Commit: 2b2ea2de2af68faf3005ad5d3edbb583b752fc4e https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/2b2ea2de2af68faf30… Author: KenDickey <Ken.Dickey(a)Whidbey.COM> Date: 2020-08-19 (Wed, 19 Aug 2020) Changed paths: M platforms/unix/vm-display-fbdev/sqUnixFBDevFramebuffer.c Log Message: ----------- cruft removal Commit: 2c2a9ea989c83b14f2f398cf9dd68a3d80dedb8d https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/2c2a9ea989c83b14f2… Author: KenDickey <Ken.Dickey(a)Whidbey.COM> Date: 2020-08-19 (Wed, 19 Aug 2020) Changed paths: M AlpineLinux-Notes.txt Log Message: ----------- shell vars Commit: 7a46ec6d1a53bab36787584dc7fbe00b18001cc7 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/7a46ec6d1a53bab367… Author: KenDickey <Ken.Dickey(a)Whidbey.COM> Date: 2020-08-20 (Thu, 20 Aug 2020) Changed paths: M build.linux64ARMv8/squeak.stack.spur/build.debug/mvm M platforms/unix/vm-display-fbdev/sqUnixEvdevKeycodeMap.c M platforms/unix/vm-display-fbdev/sqUnixFBDevFramebuffer.c Log Message: ----------- cursor looks OK now Commit: a400bd95c3e52a9d38802bbe0d9bf2473964cebc https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/a400bd95c3e52a9d38… Author: KenDickey <Ken.Dickey(a)Whidbey.COM> Date: 2020-08-21 (Fri, 21 Aug 2020) Changed paths: M platforms/unix/vm-display-fbdev/sqUnixFBDevFramebuffer.c Log Message: ----------- platform independent sizes (16ok|32no) Commit: f74203c8d525dd5763b98e1cb3beafa3bf037520 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/f74203c8d525dd5763… Author: KenDickey <Ken.Dickey(a)Whidbey.COM> Date: 2020-08-21 (Fri, 21 Aug 2020) Changed paths: M platforms/unix/vm-display-fbdev/sqUnixFBDevFramebuffer.c Log Message: ----------- 32bit fb depth OK Commit: 1afa6e6a2755c0790446e774fb85a3c17e574c5e https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/1afa6e6a2755c07904… Author: KenDickey <Ken.Dickey(a)Whidbey.COM> Date: 2020-08-21 (Fri, 21 Aug 2020) Changed paths: M AlpineLinux-Notes.txt Log Message: ----------- reboot lossage fixup Commit: 42be8a22e6721f0b90180b140a4cf671fd26ad8a https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/42be8a22e6721f0b90… Author: KenDickey <Ken.Dickey(a)Whidbey.COM> Date: 2020-08-21 (Fri, 21 Aug 2020) Changed paths: M AlpineLinux-Notes.txt Log Message: ----------- 32 bit depth works Commit: 276fe4ce40da9559ff47f3b85e968ef5bbf949ab https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/276fe4ce40da9559ff… Author: KenDickey <Ken.Dickey(a)Whidbey.COM> Date: 2020-08-21 (Fri, 21 Aug 2020) Changed paths: M platforms/unix/vm-display-fbdev/sqUnixEvdevKeyMouse.c Log Message: ----------- cmd-. works Commit: 204f7b960b1da849869749cb2c73af594c115000 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/204f7b960b1da84986… Author: KenDickey <Ken.Dickey(a)Whidbey.COM> Date: 2020-08-21 (Fri, 21 Aug 2020) Changed paths: M platforms/unix/vm-display-fbdev/sqUnixFBDevFramebuffer.c Log Message: ----------- shorted splash screen display time Commit: 6278529fa50c03ff62c680358c20674fc3373952 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/6278529fa50c03ff62… Author: KenDickey <Ken.Dickey(a)Whidbey.COM> Date: 2020-08-22 (Sat, 22 Aug 2020) Changed paths: A Armbian-Notes.txt Log Message: ----------- new Commit: c39f01fc1aa724d58e637c52f1b0e8e0a9ac1c9d https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/c39f01fc1aa724d58e… Author: KenDickey <Ken.Dickey(a)Whidbey.COM> Date: 2020-08-25 (Tue, 25 Aug 2020) Changed paths: M platforms/unix/vm-display-fbdev/sqUnixEvdevKeyMouse.c M platforms/unix/vm-display-fbdev/sqUnixFBDevFramebuffer.c Log Message: ----------- Wheel events Commit: 889a93bfc69ff14fcd2e5820cec22d68cb9b0348 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/889a93bfc69ff14fcd… Author: KenDickey <Ken.Dickey(a)Whidbey.COM> Date: 2020-08-29 (Sat, 29 Aug 2020) Changed paths: R AlpineLinux-Notes.txt R Armbian-Notes.txt A platforms/unix/vm-display-fbdev/AlpineLinux-Notes.txt A platforms/unix/vm-display-fbdev/Armbian-Notes.txt Log Message: ----------- Updated usage notes Commit: 59ad054d8ce5726bd5741280c063d8a1cabe69c1 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/59ad054d8ce5726bd5… Author: KenDickey <Ken.Dickey(a)Whidbey.COM> Date: 2020-08-29 (Sat, 29 Aug 2020) Changed paths: M build.linux64ARMv8/HowToBuild Log Message: ----------- Works with amd64 as well as aarch64 Commit: c8946a46dd8f70ff04c3e9b464d4c4a37c7e6264 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/c8946a46dd8f70ff04… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2020-08-29 (Sat, 29 Aug 2020) Changed paths: M .gitignore M build.linux64ARMv8/HowToBuild M build.macos32x86/common/Makefile.vm M build.macos64ARMv8/common/Makefile.app M build.macos64ARMv8/common/Makefile.flags M build.macos64ARMv8/common/Makefile.vm A build.macos64ARMv8/common/entitlements.plist M build.macos64ARMv8/makeallinstall M build.macos64ARMv8/makeproduct M build.macos64ARMv8/squeak.cog.spur/plugins.ext M build.macos64x64/common/Makefile.flags M build.macos64x64/common/Makefile.vm M nsspur64src/vm/cogit.h M nsspur64src/vm/cogitARMv8.c M nsspur64src/vm/cogitX64SysV.c M nsspur64src/vm/cogitX64WIN64.c M nsspur64src/vm/cointerp.c M nsspur64src/vm/cointerp.h M nsspur64src/vm/gcc3x-cointerp.c M nsspursrc/vm/cogit.h M nsspursrc/vm/cogitARMv5.c M nsspursrc/vm/cogitIA32.c M nsspursrc/vm/cogitMIPSEL.c M nsspursrc/vm/cointerp.c M nsspursrc/vm/cointerp.h M nsspursrc/vm/gcc3x-cointerp.c M nsspurstack64src/vm/gcc3x-interp.c M nsspurstack64src/vm/interp.c M nsspurstacksrc/vm/gcc3x-interp.c M nsspurstacksrc/vm/interp.c M platforms/Cross/plugins/FloatMathPlugin/ieee754names.h M platforms/Cross/plugins/IA32ABI/arm32abicc.c M platforms/Cross/plugins/IA32ABI/arm64abicc.c M platforms/Cross/plugins/IA32ABI/dabusiness.h M platforms/Cross/plugins/IA32ABI/dabusinessARM.h M platforms/Cross/plugins/IA32ABI/dabusinessARM32.h M platforms/Cross/plugins/IA32ABI/dabusinessARM64.h M platforms/Cross/plugins/IA32ABI/dabusinessPostLogic.h M platforms/Cross/plugins/IA32ABI/dabusinessppc.h M platforms/Cross/plugins/IA32ABI/dabusinessppcPostLogicDouble.h M platforms/Cross/plugins/IA32ABI/dabusinessppcPostLogicFloat.h M platforms/Cross/plugins/IA32ABI/dabusinessppcPostLogicInteger.h M platforms/Cross/plugins/IA32ABI/ia32abicc.c M platforms/Cross/plugins/IA32ABI/ppc32abicc.c M platforms/Cross/plugins/IA32ABI/x64sysvabicc.c M platforms/Cross/plugins/IA32ABI/x64win64abicc.c M platforms/Cross/vm/sq.h M platforms/Cross/vm/sqAssert.h M platforms/Mac OS/vm/sqMacMain.c M platforms/iOS/plugins/SoundPlugin/sqSqueakSoundCoreAudio.h M platforms/iOS/plugins/SoundPlugin/sqSqueakSoundCoreAudio.m M platforms/iOS/vm/Common/Classes/sqSqueakMainApp.m M platforms/iOS/vm/OSX/sqSqueakOSXApplication+attributes.m M platforms/iOS/vm/OSX/sqSqueakOSXApplication.m M platforms/iOS/vm/OSX/sqSqueakOSXScreenAndWindow.m M platforms/iOS/vm/iPhone/Classes/sqSqueakIPhoneApplication+attributes.m M platforms/iOS/vm/iPhone/Classes/sqSqueakIPhoneApplication.m M platforms/minheadless/generic/sqPlatformSpecific-Generic.c M platforms/minheadless/unix/sqPlatformSpecific-Unix.c M platforms/minheadless/windows/sqPlatformSpecific-Win32.c M platforms/unix/vm-display-X11/sqUnixXdnd.c M platforms/unix/vm/include_ucontext.h M platforms/unix/vm/sqUnixMain.c M platforms/win32/vm/sqWin32VMProfile.c M platforms/win32/vm/sqWin32Window.c M spur64src/vm/cogit.h M spur64src/vm/cogitARMv8.c M spur64src/vm/cogitX64SysV.c M spur64src/vm/cogitX64WIN64.c M spur64src/vm/cointerp.c M spur64src/vm/cointerp.h M spur64src/vm/cointerpmt.c M spur64src/vm/cointerpmt.h M spur64src/vm/gcc3x-cointerp.c M spur64src/vm/gcc3x-cointerpmt.c M spurlowcode64src/vm/cogit.h M spurlowcode64src/vm/cogitARMv8.c M spurlowcode64src/vm/cogitX64SysV.c M spurlowcode64src/vm/cogitX64WIN64.c M spurlowcode64src/vm/cointerp.c M spurlowcode64src/vm/cointerp.h M spurlowcode64src/vm/gcc3x-cointerp.c M spurlowcodesrc/vm/cogit.h M spurlowcodesrc/vm/cogitARMv5.c M spurlowcodesrc/vm/cogitIA32.c M spurlowcodesrc/vm/cogitMIPSEL.c M spurlowcodesrc/vm/cointerp.c M spurlowcodesrc/vm/cointerp.h M spurlowcodesrc/vm/gcc3x-cointerp.c M spurlowcodestack64src/vm/gcc3x-interp.c M spurlowcodestack64src/vm/interp.c M spurlowcodestacksrc/vm/gcc3x-interp.c M spurlowcodestacksrc/vm/interp.c M spursista64src/vm/cogit.h M spursista64src/vm/cogitARMv8.c M spursista64src/vm/cogitX64SysV.c M spursista64src/vm/cogitX64WIN64.c M spursista64src/vm/cointerp.c M spursista64src/vm/cointerp.h M spursista64src/vm/gcc3x-cointerp.c M spursistasrc/vm/cogit.h M spursistasrc/vm/cogitARMv5.c M spursistasrc/vm/cogitIA32.c M spursistasrc/vm/cogitMIPSEL.c M spursistasrc/vm/cointerp.c M spursistasrc/vm/cointerp.h M spursistasrc/vm/gcc3x-cointerp.c M spursrc/vm/cogit.h M spursrc/vm/cogitARMv5.c M spursrc/vm/cogitIA32.c M spursrc/vm/cogitMIPSEL.c M spursrc/vm/cointerp.c M spursrc/vm/cointerp.h M spursrc/vm/cointerpmt.c M spursrc/vm/cointerpmt.h M spursrc/vm/gcc3x-cointerp.c M spursrc/vm/gcc3x-cointerpmt.c M spurstack64src/vm/gcc3x-interp.c M spurstack64src/vm/interp.c M spurstack64src/vm/validImage.c M spurstacksrc/vm/gcc3x-interp.c M spurstacksrc/vm/interp.c M spurstacksrc/vm/validImage.c M src/ckformat.c M src/plugins/SecurityPlugin/SecurityPlugin.c M src/plugins/SoundPlugin/SoundPlugin.c M src/vm/cogit.h M src/vm/cogitARMv5.c M src/vm/cogitIA32.c M src/vm/cogitMIPSEL.c M src/vm/cointerp.c M src/vm/cointerp.h M src/vm/cointerpmt.c M src/vm/cointerpmt.h M src/vm/gcc3x-cointerp.c M src/vm/gcc3x-cointerpmt.c M stacksrc/vm/gcc3x-interp.c M stacksrc/vm/interp.c Log Message: ----------- Merge branch 'Cog' into Cog Commit: 57d91d0d2f973e09b46fde76f9f1dc2ec302a1f5 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/57d91d0d2f973e09b4… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2020-08-29 (Sat, 29 Aug 2020) Changed paths: M build.linux64ARMv8/HowToBuild M build.linux64ARMv8/squeak.cog.spur/build/mvm M build.linux64ARMv8/squeak.stack.spur/build.debug/mvm M build.linux64ARMv8/squeak.stack.spur/build/mvm M platforms/Cross/vm/sqVirtualMachine.c M platforms/unix/vm-display-fbdev/00_README.fbdev A platforms/unix/vm-display-fbdev/AlpineLinux-Notes.txt A platforms/unix/vm-display-fbdev/Armbian-Notes.txt A platforms/unix/vm-display-fbdev/Balloon.h A platforms/unix/vm-display-fbdev/sqUnixEvdevKeyMouse.c A platforms/unix/vm-display-fbdev/sqUnixEvdevKeycodeMap.c M platforms/unix/vm-display-fbdev/sqUnixFBDev.c M platforms/unix/vm-display-fbdev/sqUnixFBDevFramebuffer.c M platforms/unix/vm/debug.h M platforms/unix/vm/sqUnixMain.c Log Message: ----------- Merge pull request #515 from KenDickey/Cog vm-display-fbdev Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/03812efd76a0...57…

1 0

[OpenSmalltalk/opensmalltalk-vm] ThreadedFFIPlugin ffiReturnStruct:ofType:in: can be refactored. (#517)
by Eliot Miranda 30 Aug '20

30 Aug '20

Currently some implementations of ffiReturnStruct:ofType:in: have knowledge about whether structs are returned in registers or not (a nice recent improvement by Nicolas Cellier). However, it would be better if this information was pulled out into the caller. Then there would be a single ffiReturnStruct:ofType:in: that would be passed a painter. The pointer should be something like self structResultPointerFor: calloutState and: ... In fixing the ARMv8 ThreadedFFIPlugin for the case of Homogenous Float Arrays it was necessary to have two separate invocations of ffiReturnStruct:ofType:in:, one for the float return and one for a normal struct return which may be returned in integer registers or through memory. On ARMv8 a struct can be returned through memory, in integer registers or in floating-point registers. So putting the logic in ffiReturnStruct:ofType:in: isn't as good as putting the logic in the caller ffiCalloutTo:SpecOnStack:in: -- 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/issues/517

1 0

[OpenSmalltalk/opensmalltalk-vm] ThreadedFFIPlugin can access stale objects after a callout. (#516)
by Eliot Miranda 30 Aug '20

30 Aug '20

In structure return the FFIPlugin creates an instance of the return type (retType in ffiReturnStruct:ofType:in:), but the return type has been fetched from the stack or method *before* the callout, not after. This should be fixed, but it needs thought to determine the best way to access the type object. -- 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/issues/516

1 0

SQUEAK_SPY environment variable
by stes＠PANDORA.BE 28 Aug '20

28 Aug '20

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Does anybody know what the -spy option or the variable SQUEAK_SPY is doing ? platforms/unix/vm-display-X11/sqUnixX11.c:int withSpy= 0; platforms/unix/vm-display-X11/sqUnixX11.c: if (getenv("SQUEAK_SPY")) withSpy= 1; platforms/unix/vm/sqUnixMain.c: int withSpy= 0; platforms/unix/vm/sqUnixMain.c: else if (!strcmp(argv[0], VMOPTION("spy"))) { withSpy = 1; return 1; } Also I wonder why both .c files (sqUnixX11.c and sqUnixMain.c) both define the same global variable (they both define withSpy). I'd expect one of them to define it, and the other declare it extern. But I don't immediately see where 'withSpy' is used. David Stes -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBCAAGBQJfST8iAAoJEAwpOKXMq1MaU6cH/RmKzH2tRKLan4gdI8NDaVow XGOT09pmKjZNqiRxd8DAGXQ+4X/SopbLv6n7qRKFVCyscH9KRQPiZ5SwV36cKAYo Pwiekgn7G0g1choGne4Xav8HJTBsbZ6Q5zEiB8razD7ScYFwLVkP6ghY2QtAAfkY wa88aOsDyZjIpLOgEO/PXIyioZ4Qi5mr333FmjAHLON+P4Z4oRRXuRNuWFThf70y 2334DMxTwCXgFUY/zfBSR1YGvUPu1no558AYZPjI137xZ4fk93mMSBDAu4koFMeI XQkSRrf7fw9wZGemg6Lpe43S9OAO/HNFJJokgjuZOTIPuNUzjMamCD9UDf6BZX0= =3zbk -----END PGP SIGNATURE-----

1 2

← Newer
1
2
3
4
5
6
7
8
...
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev August 2020