Vm-dev August 2021

vm-dev@lists.squeakfoundation.org

17 participants
161 discussions

[OpenSmalltalk/opensmalltalk-vm] cfa01f: CogVM source as per VMMaker.oscog-eem.3024
by Eliot Miranda 04 Aug '21

04 Aug '21

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: cfa01f56cb530d4669a5f5f70e060fd3b22f5f47 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/cfa01f56cb530d4669… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2021-08-03 (Tue, 03 Aug 2021) Changed paths: 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 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 src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c M src/plugins/AioPlugin/AioPlugin.c M src/plugins/AsynchFilePlugin/AsynchFilePlugin.c M src/plugins/B2DPlugin/B2DPlugin.c M src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c M src/plugins/BochsIA32Plugin/BochsIA32Plugin.c M src/plugins/BochsX64Plugin/BochsX64Plugin.c M src/plugins/CameraPlugin/CameraPlugin.c M src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c M src/plugins/DESPlugin/DESPlugin.c M src/plugins/DSAPrims/DSAPrims.c M src/plugins/DropPlugin/DropPlugin.c M src/plugins/FFTPlugin/FFTPlugin.c M src/plugins/FileAttributesPlugin/FileAttributesPlugin.c M src/plugins/FileCopyPlugin/FileCopyPlugin.c M src/plugins/FilePlugin/FilePlugin.c M src/plugins/GdbARMPlugin/GdbARMPlugin.c M src/plugins/GdbARMv8Plugin/GdbARMv8Plugin.c M src/plugins/GeniePlugin/GeniePlugin.c M src/plugins/HostWindowPlugin/HostWindowPlugin.c M src/plugins/IA32ABI/IA32ABI.c M src/plugins/ImmX11Plugin/ImmX11Plugin.c M src/plugins/InternetConfigPlugin/InternetConfigPlugin.c M src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c M src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c M src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c M src/plugins/Klatt/Klatt.c M src/plugins/LargeIntegers/LargeIntegers.c M src/plugins/LocalePlugin/LocalePlugin.c M src/plugins/MD5Plugin/MD5Plugin.c M src/plugins/MIDIPlugin/MIDIPlugin.c M src/plugins/MacMenubarPlugin/MacMenubarPlugin.c M src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c M src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c M src/plugins/Mpeg3Plugin/Mpeg3Plugin.c M src/plugins/QuicktimePlugin/QuicktimePlugin.c M src/plugins/RePlugin/RePlugin.c M src/plugins/SHA2Plugin/SHA2Plugin.c M src/plugins/ScratchPlugin/ScratchPlugin.c M src/plugins/SecurityPlugin/SecurityPlugin.c M src/plugins/SerialPlugin/SerialPlugin.c M src/plugins/SocketPlugin/SocketPlugin.c M src/plugins/SoundCodecPrims/SoundCodecPrims.c M src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c M src/plugins/SoundPlugin/SoundPlugin.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/plugins/SqueakSSL/SqueakSSL.c M src/plugins/StarSqueakPlugin/StarSqueakPlugin.c M src/plugins/UUIDPlugin/UUIDPlugin.c M src/plugins/UnicodePlugin/UnicodePlugin.c M src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c M src/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c M src/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c M src/plugins/WeDoPlugin/WeDoPlugin.c M src/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c M src/plugins/XDisplayControlPlugin/XDisplayControlPlugin.c M src/plugins/ZipPlugin/ZipPlugin.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/gcc3x-cointerp.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.3024 Cog: add a trace flag to turn on logging of FastCCall primitives. Mark a few of the flag methods in the Cogit as <inline: #always> and make compileOnStackExternalPrimitive:flags: a Spur-only option (it is anyway, so the code shouldn't be incuded in V3 Cogits). Remove the inline marker from a couple of api methods. Plugins regenerated as per VMMaker.oscog-eem.3014.

1 0

VM Maker: VMMaker.oscog-eem.3024.mcz
by commits＠source.squeak.org 04 Aug '21

04 Aug '21

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3024.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3024 Author: eem Time: 3 August 2021, 7:23:47.714158 pm UUID: 417aa150-be4e-4631-b35b-948afa18e190 Ancestors: VMMaker.oscog-eem.3023 Cog: add a trace flag to turn on logging of FastCCall primitives. Mark a few of the flag methods in the Cogit as <inline: #always> and make compileOnStackExternalPrimitive:flags: a Spur-only option (it is anyway, so the code shouldn't be incuded in V3 Cogits). Remove the inline marker from a couple of api methods. =============== Diff against VMMaker.oscog-eem.3023 =============== Item was changed: ----- Method: CoInterpreter>>recordFastCCallPrimTraceForMethod: (in category 'compiled methods') ----- recordFastCCallPrimTraceForMethod: aMethodObj "This is a little elaborate. The primTraceLog is only useful if it is not full of noise. To reduce noise when debugging a specific plugin we allow a plugin name to be specified and will only generate the primTraceLog code for primitives in that plugin." <api> - <inline: true> ^cogit recordFastCCallPrimTrace and: [primTracePluginName ifNil: [true] ifNotNil: [self methodHasPrimitiveInPrimTracePlugin: aMethodObj]]! Item was changed: ----- Method: CoInterpreter>>recordPrimTraceForMethod: (in category 'compiled methods') ----- recordPrimTraceForMethod: aMethodObj "This is a little elaborate. The primTraceLog is only useful if it is not full of noise. To reduce noise when debugging a specific plugin we allow a plugin name to be specified and will only generate the primTraceLog code for primitives in that plugin." <api> - <inline: true> ^cogit recordPrimTrace and: [primTracePluginName ifNil: [true] ifNotNil: [self methodHasPrimitiveInPrimTracePlugin: aMethodObj]]! Item was changed: ----- Method: CogAbstractInstruction>>isWithinMwOffsetRange: (in category 'testing') ----- isWithinMwOffsetRange: anAddress "Answer if an address can be accessed using the offset in a MoveMw:r:R: or similar instruction. We assume this is true for 32-bit processors and expect 64-bit processors to answer false for values in the interpreter or the object memory." + <inline: true> - ^true! Item was changed: ----- Method: CogObjectRepresentation>>canPinObjects (in category 'testing') ----- canPinObjects "Answer if the memory manager supports pinned objects." + <inline: #always> ^false! Item was changed: + ----- Method: CogObjectRepresentation>>createsArraysInline (in category 'testing') ----- - ----- Method: CogObjectRepresentation>>createsArraysInline (in category 'bytecode generator support') ----- createsArraysInline "Answer if the object representation allocates arrays inline. By default answer false. Better code can be generated when creating arrays inline if values are /not/ flushed to the stack." + <inline: #always> ^false! Item was changed: + ----- Method: CogObjectRepresentation>>createsClosuresInline (in category 'testing') ----- - ----- Method: CogObjectRepresentation>>createsClosuresInline (in category 'bytecode generator support') ----- createsClosuresInline "Answer if the object representation allocates closures inline. By default answer false. Better code can be generated when creating closures inline if copied values are /not/ flushed to the stack." + <inline: #always> ^false! Item was changed: ----- Method: CogObjectRepresentation>>hasSpurMemoryManagerAPI (in category 'testing') ----- hasSpurMemoryManagerAPI + <inline: #always> ^false! Item was changed: ----- Method: CogObjectRepresentationForSpur>>canPinObjects (in category 'testing') ----- canPinObjects "Answer if the memory manager supports pinned objects." + <inline: #always> ^true! Item was changed: ----- Method: CogObjectRepresentationForSpur>>createsArraysInline (in category 'bytecode generator support') ----- createsArraysInline "Answer if the object representation allocates arrays inline. By default answer false. Better code can be generated when creating arrays inline if values are /not/ flushed to the stack." + <inline: #always> ^true! Item was changed: ----- Method: CogObjectRepresentationForSpur>>createsClosuresInline (in category 'bytecode generator support') ----- createsClosuresInline "Answer if the object representation allocates closures inline. By default answer false. Better code can be generated when creating closures inline if copied values are /not/ flushed to the stack." + <inline: #always> ^true! Item was changed: ----- Method: CogObjectRepresentationForSpur>>hasSpurMemoryManagerAPI (in category 'testing') ----- hasSpurMemoryManagerAPI + <inline: #always> ^true! Item was changed: ----- Method: CogObjectRepresentationForSpur>>isSmallIntegerTagNonZero (in category 'object representation') ----- isSmallIntegerTagNonZero + <inline: #always> ^true! Item was changed: ----- Method: CogObjectRepresentationForSpur>>smallIntegerIsOnlyImmediateType (in category 'testing') ----- smallIntegerIsOnlyImmediateType + <inline: #always> ^false! Item was changed: ----- Method: CogObjectRepresentationForSqueakV3>>isSmallIntegerTagNonZero (in category 'object representation') ----- isSmallIntegerTagNonZero + <inline: #always> ^true! Item was changed: ----- Method: CogObjectRepresentationForSqueakV3>>smallIntegerIsOnlyImmediateType (in category 'testing') ----- smallIntegerIsOnlyImmediateType + <inline: #always> ^true! Item was changed: ----- Method: CogX64Compiler>>isWithinMwOffsetRange: (in category 'testing') ----- isWithinMwOffsetRange: anAddress "Answer if an address can be accessed using the offset in a MoveMw:r:R: or similar instruction. We assume this is true for 32-bit processors and expect 64-bit processors to answer false for values in the interpreter or the object memory. Restrict our use of offsets to reference addresses within the method zone, rather than checking for a 32-bit offset, so as to keep the simulator and real VM in sync." + <inline: true> - ^cogit addressIsInCodeZone: anAddress! Item was changed: ----- Method: SimpleStackBasedCogit>>compileOnStackExternalPrimitive:flags: (in category 'primitive generators') ----- compileOnStackExternalPrimitive: primitiveRoutine flags: flags "Compile a fast call of a C primitive using the current stack page, avoiding the stack switch except on failure. This convention still uses stackPointer and argumentCount to access operands. Push all operands to the stack, assign stackPointer, argumentCount, and zero primFailCode. Make the call (saving a LinkReg if required). Test for failure and return. On failure on Spur, if there is an accessor depth, assign framePointer and newMethod, do the stack switch, call checkForAndFollowForwardedPrimitiveState, and loop back if forwarders are found. Fall through to frame build." + <option: #SpurObjectMemory> - <var: #primitiveRoutine declareC: 'void (*primitiveRoutine)(void)'> | calleeSavedRegisterMask linkRegSaveRegister spRegSaveRegister jmp retry | self assert: (objectRepresentation hasSpurMemoryManagerAPI and: [flags anyMask: PrimCallOnSmalltalkStack]). self deny: (backEnd hasVarBaseRegister and: [self register: VarBaseReg isInMask: ABICallerSavedRegisterMask]). (coInterpreter recordFastCCallPrimTraceForMethod: methodObj) ifTrue: [self genFastPrimTraceUsing: ClassReg and: SendNumArgsReg]. "Clear the primFailCode and set argumentCount" self MoveCq: 0 R: TempReg. self MoveR: TempReg Aw: coInterpreter primFailCodeAddress. methodOrBlockNumArgs ~= 0 ifTrue: [self AddCq: methodOrBlockNumArgs R: TempReg]. "As small or smaller than move on most archs" self MoveR: TempReg Aw: coInterpreter argumentCountAddress. self genExternalizeStackPointerForFastPrimitiveCall. "We may need to save LinkReg and/or SPReg, and given the stack machinations it is much easier to save them in callee saved registers than on the stack itself." calleeSavedRegisterMask := ABICalleeSavedRegisterMask bitClear: (self registerMaskFor: ClassReg). backEnd hasLinkRegister ifTrue: [linkRegSaveRegister := self availableRegisterOrNoneIn: calleeSavedRegisterMask. self deny: linkRegSaveRegister = NoReg. self MoveR: LinkReg R: linkRegSaveRegister. calleeSavedRegisterMask := calleeSavedRegisterMask bitClear: (self registerMaskFor: linkRegSaveRegister)]. spRegSaveRegister := NoReg. (SPReg ~= NativeSPReg and: [(self isCalleeSavedReg: SPReg) not]) ifTrue: [spRegSaveRegister := self availableRegisterOrNoneIn: calleeSavedRegisterMask. self deny: spRegSaveRegister = NoReg. self MoveR: SPReg R: spRegSaveRegister]. retry := self Label. (flags anyMask: PrimCallOnSmalltalkStackAlign2x) ifTrue: [self AndCq: (objectMemory wordSize * 2 - 1) bitInvert R: SPReg R: NativeSPReg] ifFalse: [SPReg ~= NativeSPReg ifTrue: [backEnd genLoadNativeSPRegWithAlignedSPReg]]. self CallFullRT: primitiveRoutine. self MoveAw: coInterpreter primFailCodeAddress R: TempReg. spRegSaveRegister ~= NoReg ifTrue: [self MoveR: spRegSaveRegister R: SPReg]. self CmpCq: 0 R: TempReg. jmp := self JumpNonZero: 0. "At this point the primitive has cut back stackPointer to point to the result." self MoveAw: coInterpreter stackPointerAddress R: TempReg. "get result and restore retpc" backEnd hasLinkRegister ifTrue: [self MoveMw: 0 r: TempReg R: ReceiverResultReg; AddCq: objectMemory wordSize R: TempReg R: SPReg; MoveR: linkRegSaveRegister R: LinkReg] ifFalse: [| retpcOffset | "The original retpc is (argumentCount + 1) words below stackPointer." retpcOffset := (methodOrBlockNumArgs + 1 * objectMemory wordSize) negated. self MoveMw: retpcOffset r: TempReg R: ClassReg; "get retpc" MoveR: TempReg R: SPReg; MoveMw: 0 r: TempReg R: ReceiverResultReg; MoveR: ClassReg Mw: 0 r: TempReg "put it back on stack for the return..."]. self RetN: 0. jmp jmpTarget: self Label. (coInterpreter accessorDepthForExternalPrimitiveMethod: methodObj) >= 0 ifTrue: [| skip | "Given that following primitive state to the accessor depth is recursive, we're asking for trouble if we run the fixup on the Smalltalk stack page. Run it on the full C stack instead. This won't be a performance issue since primitive failure should be very rare." self MoveR: FPReg Aw: coInterpreter framePointerAddress. self MoveCw: primitiveRoutine asInteger R: TempReg. self MoveR: TempReg Aw: coInterpreter primitiveFunctionPointerAddress. methodLabel addDependent: (self annotateAbsolutePCRef: (self MoveCw: methodLabel asInteger R: ClassReg)). self MoveMw: (self offset: CogMethod of: #methodObject) r: ClassReg R: TempReg. self MoveR: TempReg Aw: coInterpreter newMethodAddress. self genLoadCStackPointersForPrimCall. self CallFullRT: (self cCode: [#checkForAndFollowForwardedPrimitiveState asUnsignedIntegerPtr] inSmalltalk: [self simulatedTrampolineFor: #checkForAndFollowForwardedPrimitiveState]). backEnd genLoadStackPointersForFastPrimCall: ClassReg. self CmpCq: 0 R: ABIResultReg. skip := self JumpZero: 0. self MoveCq: 0 R: TempReg. self MoveR: TempReg Aw: coInterpreter primFailCodeAddress. self Jump: retry. skip jmpTarget: self Label] ifFalse: "must reload SPReg to undo any alignment change," [(flags anyMask: PrimCallOnSmalltalkStackAlign2x) ifTrue: [backEnd genLoadStackPointersForFastPrimCall: ClassReg]]. "The LinkRegister now contains the return address either of the primitive call or of checkForAndFollowForwardedPrimitiveState. It must be restored to the return address of the send invoking this primtiive method." backEnd hasLinkRegister ifTrue: [self MoveR: linkRegSaveRegister R: LinkReg]. "Finally remember to reload ReceiverResultReg if required. Even if arguments have been pushed, the prolog sequence assumes it is live." (self register: ReceiverResultReg isInMask: ABICallerSavedRegisterMask) ifTrue: [self MoveMw: (methodOrBlockNumArgs + (backEnd hasLinkRegister ifTrue: [0] ifFalse: [1])) * objectMemory wordSize r: SPReg R: ReceiverResultReg]. "continue to frame build..." ^0! Item was changed: ----- Method: SimpleStackBasedCogit>>compilePrimitive (in category 'primitive generators') ----- compilePrimitive "Compile a primitive. If possible, performance-critical primitives will be generated by their own routines (primitiveGenerator). Otherwise, if there is a primitive at all, we call the C routine with the usual stack-switching dance, test the primFailCode and then either return on success or continue to the method body." <inline: false> | primitiveDescriptor primitiveRoutine flags | <var: #primitiveDescriptor type: #'PrimitiveDescriptor *'> <var: #primitiveRoutine declareC: 'void (*primitiveRoutine)(void)'> primitiveIndex = 0 ifTrue: [^0]. "If a descriptor specifies an argument count (by numArgs >= 0) then it must match for the generated code to be correct. For example for speed many primitives use ResultReceiverReg instead of accessing the stack, so the receiver better be at numArgs down the stack. Use the interpreter version if not." ((primitiveDescriptor := self primitiveGeneratorOrNil) notNil and: [primitiveDescriptor primitiveGenerator notNil and: [(primitiveDescriptor primNumArgs < 0 "means generator doesn't care" or: [primitiveDescriptor primNumArgs = (coInterpreter argumentCountOf: methodObj)])]]) ifTrue: [| opcodeIndexAtPrimitive code | "Note opcodeIndex so that any arg load instructions for unimplemented primitives can be discarded." opcodeIndexAtPrimitive := opcodeIndex. code := objectRepresentation perform: primitiveDescriptor primitiveGenerator. (code < 0 and: [code ~= UnimplementedPrimitive]) ifTrue: "Generator failed, so no point continuing..." [^code]. "If the primitive can never fail then there is nothing more that needs to be done." code = UnfailingPrimitive ifTrue: [^0]. "If the machine code version handles all cases the only reason to call the interpreter primitive is to reap the primitive error code. Don't bother if it isn't used." (code = CompletePrimitive and: [(self methodUsesPrimitiveErrorCode: methodObj header: methodHeader) not]) ifTrue: [^0]. "Discard any arg load code generated by the primitive generator." code = UnimplementedPrimitive ifTrue: [opcodeIndex := opcodeIndexAtPrimitive]]. primitiveRoutine := coInterpreter functionPointerForCompiledMethod: methodObj primitiveIndex: primitiveIndex primitivePropertyFlagsInto: (self addressOf: flags put: [:val| flags := val]). (flags anyMask: PrimCallDoNotJIT) ifTrue: [^ShouldNotJIT]. (primitiveRoutine = 0 "no primitive" or: [primitiveRoutine = (self cCoerceSimple: #primitiveFail to: 'void (*)(void)')]) ifTrue: [^self genFastPrimFail]. (flags anyMask: PrimCallOnSmalltalkStack) ifTrue: [self deny: ((flags anyMask: FastCPrimitiveUseCABIFlag) and: [flags anyMask: PrimCallOnSmalltalkStackAlign2x]). (flags anyMask: FastCPrimitiveUseCABIFlag) ifTrue: [^self compileMachineCodeInterpreterPrimitive: (self cCoerceSimple: (coInterpreter mcprimFunctionForPrimitiveIndex: primitiveIndex) to: 'void (*)(void)')]. + objectRepresentation hasSpurMemoryManagerAPI ifTrue: + [^self compileOnStackExternalPrimitive: primitiveRoutine flags: flags]]. - ^self compileOnStackExternalPrimitive: primitiveRoutine flags: flags]. minValidCallAddress := minValidCallAddress min: primitiveRoutine asUnsignedInteger. ^self compileInterpreterPrimitive: primitiveRoutine flags: flags!

1 0

VM Maker: VMMaker.oscog-eem.3023.mcz
by commits＠source.squeak.org 04 Aug '21

04 Aug '21

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3023.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3023 Author: eem Time: 3 August 2021, 6:45:07.99875 pm UUID: 61eede2e-898d-4e76-bfda-c8977f0add59 Ancestors: VMMaker.oscog-eem.3022 Add a separate trace flag to turn on logging of FastCPrimitiveCall primitives. =============== Diff against VMMaker.oscog-eem.3022 =============== Item was added: + ----- Method: CoInterpreter>>recordFastCCallPrimTraceForMethod: (in category 'compiled methods') ----- + recordFastCCallPrimTraceForMethod: aMethodObj + "This is a little elaborate. The primTraceLog is only useful if it is not full of noise. + To reduce noise when debugging a specific plugin we allow a plugin name to be + specified and will only generate the primTraceLog code for primitives in that plugin." + <api> + <inline: true> + ^cogit recordFastCCallPrimTrace + and: [primTracePluginName + ifNil: [true] + ifNotNil: [self methodHasPrimitiveInPrimTracePlugin: aMethodObj]]! Item was added: + ----- Method: Cogit>>recordFastCCallPrimTrace (in category 'debugging') ----- + recordFastCCallPrimTrace + <api> + <cmacro: '() (traceFlags & 512)'> + ^(traceFlags bitAnd: 512) ~= 0! Item was changed: ----- Method: Cogit>>sendTrace: (in category 'debugging') ----- sendTrace: aBooleanOrInteger <doNotGenerate> "traceFlags is a set of flags. 1 => print trace (if something below is selected) 2 => trace sends 4 => trace block activations + 8 => trace interpreter primitives (on by default; see Cogit class>>#declareCVarsIn:) - 8 => trace interpreter primitives 16 => trace events (context switches, GCs, etc) 32 => trace stack overflow 64 => send breakpoint on implicit receiver (Newspeak VM only) 128 => check stack depth on send (simulation only) + 256 => trace linked sends + 512 => trace fast C call interpreter primitives (off by default)" - 256 => trace linked sends " traceFlags := aBooleanOrInteger isInteger + ifTrue: [aBooleanOrInteger] + ifFalse: [aBooleanOrInteger ifTrue: [traceFlags bitOr: 6] ifFalse: [traceFlags bitClear: 6]]! - ifTrue: [aBooleanOrInteger] - ifFalse: [aBooleanOrInteger ifTrue: [6] ifFalse: [0]]! Item was changed: ----- Method: InterpreterPlugin>>doesNotUnderstand: (in category 'simulation support') ----- doesNotUnderstand: aMessage <doNotGenerate> + "Override doesNotUnderstand: to intercept sends of translated primitive selectors. - "Override doesNotUnderstand: to iuntercept sends of translated primitive selectors. The translated primitives are primitives derived from the primitive methods themselves + translating their failure code/method body into Slang code. There used to be several + translated primitives in the MiscPrimitivePlugin, but these have been replaced. As of + mid 2021 only ADPCMCodec[Plugin] class and AbstractSound/SoundGenerationPlugin class + define translatedPrimitives." - translating their failure code/method body into Slang code." (self methodAndTypesOrNilForTranslatedPrimitiveSelector: aMessage selector) ifNil: [^super doesNotUnderstand: aMessage] ifNotNil: [:tuple| | method | "First check the cache for validity; if the last element of the tuple is the actual method then the cache is up-to-date. if it is not, the method has changed and should be regenerated." method := tuple last. method == (method methodClass >> method selector) ifFalse: [translatedMethodCache removeKey: aMessage selector. ^self doesNotUnderstand: aMessage]. method := tuple first. tuple second ifNil: [interpreterProxy primitiveFail] ifNotNil: [:types| self tryToRunTranslatedPrimitive: method types: types subsidiaries: tuple third]. + interpreterProxy transcript print: method; cr. + interpreterProxy coInterpreter printExternalHeadFrame. - (#( compare:with:collated: - findFirstInString:inSet:startingAt: - findSubstring:in:startingAt:matchTable: - hashBytes:startingWith: - indexOfAscii:inString:startingAt: - translate:from:to:table: - compress:toByteArray: - decompress:fromByteArray:at:) - includes: method selector) ifFalse: - [interpreterProxy transcript print: method; cr. - interpreterProxy coInterpreter printExternalHeadFrame]. interpreterProxy failed ifTrue: [interpreterProxy transcript nextPutAll: 'WARNING!! Failing translated primitive '; nextPutAll: aMessage selector; nextPutAll: ' implemented by '; nextPutAll: method methodClass name; nextPutAll: '>>'; nextPutAll: method selector; cr; flush]]! Item was changed: ----- Method: SimpleStackBasedCogit>>compileOnStackExternalPrimitive:flags: (in category 'primitive generators') ----- compileOnStackExternalPrimitive: primitiveRoutine flags: flags "Compile a fast call of a C primitive using the current stack page, avoiding the stack switch except on failure. This convention still uses stackPointer and argumentCount to access operands. Push all operands to the stack, assign stackPointer, argumentCount, and zero primFailCode. Make the call (saving a LinkReg if required). Test for failure and return. On failure on Spur, if there is an accessor depth, assign framePointer and newMethod, do the stack switch, call checkForAndFollowForwardedPrimitiveState, and loop back if forwarders are found. Fall through to frame build." <var: #primitiveRoutine declareC: 'void (*primitiveRoutine)(void)'> | calleeSavedRegisterMask linkRegSaveRegister spRegSaveRegister jmp retry | self assert: (objectRepresentation hasSpurMemoryManagerAPI and: [flags anyMask: PrimCallOnSmalltalkStack]). self deny: (backEnd hasVarBaseRegister and: [self register: VarBaseReg isInMask: ABICallerSavedRegisterMask]). + + (coInterpreter recordFastCCallPrimTraceForMethod: methodObj) ifTrue: + [self genFastPrimTraceUsing: ClassReg and: SendNumArgsReg]. + "Clear the primFailCode and set argumentCount" self MoveCq: 0 R: TempReg. self MoveR: TempReg Aw: coInterpreter primFailCodeAddress. methodOrBlockNumArgs ~= 0 ifTrue: [self AddCq: methodOrBlockNumArgs R: TempReg]. "As small or smaller than move on most archs" self MoveR: TempReg Aw: coInterpreter argumentCountAddress. self genExternalizeStackPointerForFastPrimitiveCall. "We may need to save LinkReg and/or SPReg, and given the stack machinations it is much easier to save them in callee saved registers than on the stack itself." calleeSavedRegisterMask := ABICalleeSavedRegisterMask bitClear: (self registerMaskFor: ClassReg). backEnd hasLinkRegister ifTrue: [linkRegSaveRegister := self availableRegisterOrNoneIn: calleeSavedRegisterMask. self deny: linkRegSaveRegister = NoReg. self MoveR: LinkReg R: linkRegSaveRegister. calleeSavedRegisterMask := calleeSavedRegisterMask bitClear: (self registerMaskFor: linkRegSaveRegister)]. spRegSaveRegister := NoReg. (SPReg ~= NativeSPReg and: [(self isCalleeSavedReg: SPReg) not]) ifTrue: [spRegSaveRegister := self availableRegisterOrNoneIn: calleeSavedRegisterMask. self deny: spRegSaveRegister = NoReg. self MoveR: SPReg R: spRegSaveRegister]. retry := self Label. (flags anyMask: PrimCallOnSmalltalkStackAlign2x) ifTrue: [self AndCq: (objectMemory wordSize * 2 - 1) bitInvert R: SPReg R: NativeSPReg] ifFalse: [SPReg ~= NativeSPReg ifTrue: [backEnd genLoadNativeSPRegWithAlignedSPReg]]. self CallFullRT: primitiveRoutine. self MoveAw: coInterpreter primFailCodeAddress R: TempReg. spRegSaveRegister ~= NoReg ifTrue: [self MoveR: spRegSaveRegister R: SPReg]. self CmpCq: 0 R: TempReg. jmp := self JumpNonZero: 0. "At this point the primitive has cut back stackPointer to point to the result." self MoveAw: coInterpreter stackPointerAddress R: TempReg. "get result and restore retpc" backEnd hasLinkRegister ifTrue: [self MoveMw: 0 r: TempReg R: ReceiverResultReg; AddCq: objectMemory wordSize R: TempReg R: SPReg; MoveR: linkRegSaveRegister R: LinkReg] ifFalse: [| retpcOffset | "The original retpc is (argumentCount + 1) words below stackPointer." retpcOffset := (methodOrBlockNumArgs + 1 * objectMemory wordSize) negated. self MoveMw: retpcOffset r: TempReg R: ClassReg; "get retpc" MoveR: TempReg R: SPReg; MoveMw: 0 r: TempReg R: ReceiverResultReg; MoveR: ClassReg Mw: 0 r: TempReg "put it back on stack for the return..."]. self RetN: 0. jmp jmpTarget: self Label. (coInterpreter accessorDepthForExternalPrimitiveMethod: methodObj) >= 0 ifTrue: [| skip | "Given that following primitive state to the accessor depth is recursive, we're asking for trouble if we run the fixup on the Smalltalk stack page. Run it on the full C stack instead. This won't be a performance issue since primitive failure should be very rare." self MoveR: FPReg Aw: coInterpreter framePointerAddress. self MoveCw: primitiveRoutine asInteger R: TempReg. self MoveR: TempReg Aw: coInterpreter primitiveFunctionPointerAddress. methodLabel addDependent: (self annotateAbsolutePCRef: (self MoveCw: methodLabel asInteger R: ClassReg)). self MoveMw: (self offset: CogMethod of: #methodObject) r: ClassReg R: TempReg. self MoveR: TempReg Aw: coInterpreter newMethodAddress. self genLoadCStackPointersForPrimCall. self CallFullRT: (self cCode: [#checkForAndFollowForwardedPrimitiveState asUnsignedIntegerPtr] inSmalltalk: [self simulatedTrampolineFor: #checkForAndFollowForwardedPrimitiveState]). backEnd genLoadStackPointersForFastPrimCall: ClassReg. self CmpCq: 0 R: ABIResultReg. skip := self JumpZero: 0. self MoveCq: 0 R: TempReg. self MoveR: TempReg Aw: coInterpreter primFailCodeAddress. self Jump: retry. skip jmpTarget: self Label] ifFalse: "must reload SPReg to undo any alignment change," [(flags anyMask: PrimCallOnSmalltalkStackAlign2x) ifTrue: [backEnd genLoadStackPointersForFastPrimCall: ClassReg]]. "The LinkRegister now contains the return address either of the primitive call or of checkForAndFollowForwardedPrimitiveState. It must be restored to the return address of the send invoking this primtiive method." backEnd hasLinkRegister ifTrue: [self MoveR: linkRegSaveRegister R: LinkReg]. "Finally remember to reload ReceiverResultReg if required. Even if arguments have been pushed, the prolog sequence assumes it is live." (self register: ReceiverResultReg isInMask: ABICallerSavedRegisterMask) ifTrue: [self MoveMw: (methodOrBlockNumArgs + (backEnd hasLinkRegister ifTrue: [0] ifFalse: [1])) * objectMemory wordSize r: SPReg R: ReceiverResultReg]. "continue to frame build..." ^0!

1 0

[OpenSmalltalk/opensmalltalk-vm] 2c4ce3: CogVM source as per Name: VMMaker.oscog-eem.3022
by Eliot Miranda 04 Aug '21

04 Aug '21

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 2c4ce31b8d6edf3c906958a7bf59b92d7fe52428 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/2c4ce31b8d6edf3c90… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2021-08-03 (Tue, 03 Aug 2021) Changed paths: M image/BuildSqueakSpurTrunkVMMakerImage.st M platforms/Cross/vm/sq.h M platforms/Cross/vm/sqNamedPrims.c M platforms/iOS/vm/OSX/sqMacUnixExternalPrims.m M platforms/minheadless/common/sqExternalPrimitives.c M platforms/unix/vm/sqUnixExternalPrims.c M platforms/win32/vm/sqWin32ExternalPrims.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/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c M src/plugins/BitBltPlugin/BitBltPlugin.c M src/plugins/CroquetPlugin/CroquetPlugin.c M src/plugins/Squeak3D/Squeak3D.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/gcc3x-cointerp.c M stacksrc/vm/gcc3x-interp.c M stacksrc/vm/interp.c Log Message: ----------- CogVM source as per Name: VMMaker.oscog-eem.3022 Cogit: FastCPrimitiveCall. Get the receiver and restore retpc correctly on CISCs. Save a few bytes setting argumentCount after zeroing primFailCode in C primitive invocation. Save and restore LinkReg and/or SPReg around the primitive and checkForAndFollowForwardedPrimitiveState calls. Spur CoInterpreter: Improve checkForAndFollowForwardedPrimitiveState. Allow the method's first literal (if an FFI or named primitive) to be forwarded, unfollowing it *before* accessorDepth is fetched. Follow it to the relevant depth. Cog: use symbolic constants for Spur primitive metadata manipulation. Refactor linkExternalCall:ifFail: into linkExternalCall:errInto: so it doesn't have to be inlined. Fix mapToBytecodePCIfActivationOfExternalMethod: to asvoid an assert fail for an interpreter frame activation of an external method. Use faster length accessors (numSlotsOf: numBytesOfBytes:) in a few places. Reorder the storing of newMethod and the setting of stack pointers in compileOnStackExternalPrimitive:flags:, as well as making an invariant on VarBase clear. Merge Ben Avison's minor changes that help support the improvements he made for the ARM64 bitblt Have the CroquetPlugin primitives use the FastCPrimitiveFlag FastCPrimitiveAlignForFloatsFlag flags. Use the methodReturnFoo: protocol. Use symbolic constants for the Spur primitive metadata manipulation. Don't pull in ClosedVMMaker when building a trunk VMMaker image. ClosedVMMaker is history.

1 0

VM Maker: VMMaker.oscog-eem.3022.mcz
by commits＠source.squeak.org 04 Aug '21

04 Aug '21

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3022.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3022 Author: eem Time: 3 August 2021, 5:18:30.600299 pm UUID: 0f8fef46-0ddf-4c88-96d8-a682a0493727 Ancestors: VMMaker.oscog-eem.3021 Cogit: FastCPrimitiveCall. Get the receiver and restore retpc correctly on CISCs. Save a few bytes setting argumentCount after zeroing primFailCode in C primitive invocation. Simulation: generate a more informative symbolic for a named primitive than "some bock in..." =============== Diff against VMMaker.oscog-eem.3021 =============== Item was changed: ----- Method: Cogit>>labelForSimulationAccessor: (in category 'simulation only') ----- labelForSimulationAccessor: blockOrMessageSendOrSelector <doNotGenerate> ^'&', (blockOrMessageSendOrSelector isBlock + ifTrue: [(coInterpreter mappedPluginEntries detect: [:tuple| tuple third == blockOrMessageSendOrSelector] ifNone: []) + ifNil: ['block in ', blockOrMessageSendOrSelector method selector] + ifNotNil: [:tuple| '[=>', tuple second, ' (prim 117)]']] - ifTrue: ['block in ', blockOrMessageSendOrSelector method selector] ifFalse: [blockOrMessageSendOrSelector isMessageSend ifTrue: [blockOrMessageSendOrSelector selector] ifFalse: [blockOrMessageSendOrSelector]])! Item was changed: ----- Method: SimpleStackBasedCogit>>compileInterpreterPrimitive:flags: (in category 'primitive generators') ----- compileInterpreterPrimitive: primitiveRoutine flags: flags "Compile a call to an interpreter primitive. Call the C routine with the usual stack-switching dance, test the primFailCode and then either return on success or continue to the method body." <var: #primitiveRoutine declareC: 'void (*primitiveRoutine)(void)'> | jmp jmpSamplePrim continuePostSamplePrim jmpSampleNonPrim continuePostSampleNonPrim | self deny: (backEnd hasVarBaseRegister and: [self register: VarBaseReg isInMask: ABICallerSavedRegisterMask]). "Save processor fp, sp and return pc in the interpreter's frame stack and instruction pointers" self genExternalizePointersForPrimitiveCall. "Switch to the C stack." self genLoadCStackPointersForPrimCall. (flags anyMask: PrimCallCollectsProfileSamples) ifTrue: ["Test nextProfileTick for being non-zero and call checkProfileTick if so" objectMemory wordSize = 4 ifTrue: [self MoveAw: coInterpreter nextProfileTickAddress R: TempReg. self MoveAw: coInterpreter nextProfileTickAddress + objectMemory wordSize R: ClassReg. self OrR: TempReg R: ClassReg] ifFalse: [self MoveAw: coInterpreter nextProfileTickAddress R: TempReg. self CmpCq: 0 R: TempReg]. "If set, jump to record sample call." jmpSampleNonPrim := self JumpNonZero: 0. continuePostSampleNonPrim := self Label]. "Old old full prim trace is in VMMaker-eem.550 and prior. Old simpler full prim trace is in VMMaker-eem.2969 and prior." (coInterpreter recordPrimTraceForMethod: methodObj) ifTrue: [self genFastPrimTraceUsing: ClassReg and: SendNumArgsReg]. "Clear the primFailCode and set argumentCount" self MoveCq: 0 R: TempReg. self MoveR: TempReg Aw: coInterpreter primFailCodeAddress. methodOrBlockNumArgs ~= 0 ifTrue: + [self AddCq: methodOrBlockNumArgs R: TempReg]. "As small or smaller than move on most archs" - [self MoveCq: methodOrBlockNumArgs R: TempReg]. self MoveR: TempReg Aw: coInterpreter argumentCountAddress. "If required, set primitiveFunctionPointer and newMethod" (flags anyMask: PrimCallNeedsPrimitiveFunction) ifTrue: [self MoveCw: primitiveRoutine asInteger R: TempReg. self MoveR: TempReg Aw: coInterpreter primitiveFunctionPointerAddress]. (flags anyMask: PrimCallNeedsNewMethod+PrimCallMayEndureCodeCompaction) ifTrue: ["The ceActivateFailingPrimitiveMethod: machinery can't handle framelessness." (flags anyMask: PrimCallMayEndureCodeCompaction) ifTrue: [needsFrame := true]. methodLabel addDependent: (self annotateAbsolutePCRef: (self MoveCw: methodLabel asInteger R: ClassReg)). self MoveMw: (self offset: CogMethod of: #methodObject) r: ClassReg R: TempReg. self MoveR: TempReg Aw: coInterpreter newMethodAddress]. "Invoke the primitive" self PrefetchAw: coInterpreter primFailCodeAddress. (flags anyMask: PrimCallMayEndureCodeCompaction) ifTrue: "Sideways call the C primitive routine so that we return through cePrimReturnEnterCogCode." ["On Spur ceActivateFailingPrimitiveMethod: would like to retry if forwarders are found. So insist on PrimCallNeedsPrimitiveFunction being set too." objectMemory hasSpurMemoryManagerAPI ifTrue: [self assert: (flags anyMask: PrimCallNeedsPrimitiveFunction)]. backEnd genMarshallNArgs: 0 arg: nil arg: nil arg: nil arg: nil; genSubstituteReturnAddress: ((flags anyMask: PrimCallCollectsProfileSamples) ifTrue: [cePrimReturnEnterCogCodeProfiling] ifFalse: [cePrimReturnEnterCogCode]). self JumpFullRT: primitiveRoutine asInteger. jmp := jmpSamplePrim := continuePostSamplePrim := nil] ifFalse: ["Call the C primitive routine." backEnd genMarshallNArgs: 0 arg: 0 arg: 0 arg: 0 arg: 0. self CallFullRT: primitiveRoutine asInteger. backEnd genRemoveNArgsFromStack: 0. (flags anyMask: PrimCallCollectsProfileSamples) ifTrue: [self assert: (flags anyMask: PrimCallNeedsNewMethod). "Test nextProfileTick for being non-zero and call checkProfileTick if so" objectMemory wordSize = 4 ifTrue: [self MoveAw: coInterpreter nextProfileTickAddress R: TempReg. self MoveAw: coInterpreter nextProfileTickAddress + objectMemory wordSize R: ClassReg. self OrR: TempReg R: ClassReg] ifFalse: [self MoveAw: coInterpreter nextProfileTickAddress R: TempReg. self CmpCq: 0 R: TempReg]. "If set, jump to record sample call." jmpSamplePrim := self JumpNonZero: 0. continuePostSamplePrim := self Label]. objectRepresentation maybeCompileRetryOnPrimitiveFail: primitiveIndex. "Switch back to the Smalltalk stack. Stack better be in either of these two states: success: stackPointer -> result (was receiver) arg1 ... argN return pc failure: receiver arg1 ... stackPointer -> argN return pc In either case we can push the instructionPointer or load it into the LinkRegister to reestablish the return pc" self MoveAw: coInterpreter instructionPointerAddress R: (backEnd hasLinkRegister ifTrue: [LinkReg] ifFalse: [ClassReg]). backEnd genLoadStackPointers. "Test primitive failure" self MoveAw: coInterpreter primFailCodeAddress R: TempReg. backEnd hasLinkRegister ifFalse: [self PushR: ClassReg]. "Restore return pc on CISCs" self flag: 'ask concrete code gen if move sets condition codes?'. self CmpCq: 0 R: TempReg. jmp := self JumpNonZero: 0. "Fetch result from stack" self MoveMw: (backEnd hasLinkRegister ifTrue: [0] ifFalse: [objectMemory wordSize]) r: SPReg R: ReceiverResultReg. self RetN: objectMemory wordSize]. "return to caller, popping receiver" (flags anyMask: PrimCallCollectsProfileSamples) ifTrue: ["The sample is collected by cePrimReturnEnterCogCode for external calls" jmpSamplePrim ifNotNil: ["Call ceCheckProfileTick: to record sample and then continue." jmpSamplePrim jmpTarget: self Label. self assert: (flags anyMask: PrimCallNeedsNewMethod). self CallFullRT: (self cCode: [#ceCheckProfileTick asUnsignedIntegerPtr] inSmalltalk: [self simulatedTrampolineFor: #ceCheckProfileTick]). "reenter the post-primitive call flow" self Jump: continuePostSamplePrim]. "Null newMethod and call ceCheckProfileTick: to record sample and then continue. ceCheckProfileTick will map null/0 to coInterpreter nilObject" jmpSampleNonPrim jmpTarget: self Label. self MoveCq: 0 R: TempReg. self MoveR: TempReg Aw: coInterpreter newMethodAddress. self CallFullRT: (self cCode: [#ceCheckProfileTick asUnsignedIntegerPtr] inSmalltalk: [self simulatedTrampolineFor: #ceCheckProfileTick]). "reenter the post-primitive call flow" self Jump: continuePostSampleNonPrim]. jmp ifNotNil: ["Jump to restore of receiver reg and proceed to frame build for failure." jmp jmpTarget: self Label. "Restore receiver reg from stack. If on RISCs ret pc is in LinkReg, if on CISCs ret pc is on stack." self MoveMw: objectMemory wordSize * (methodOrBlockNumArgs + (backEnd hasLinkRegister ifTrue: [0] ifFalse: [1])) r: SPReg R: ReceiverResultReg]. ^0! Item was changed: ----- Method: SimpleStackBasedCogit>>compileOnStackExternalPrimitive:flags: (in category 'primitive generators') ----- compileOnStackExternalPrimitive: primitiveRoutine flags: flags "Compile a fast call of a C primitive using the current stack page, avoiding the stack switch except on failure. This convention still uses stackPointer and argumentCount to access operands. Push all operands to the stack, assign stackPointer, argumentCount, and zero primFailCode. Make the call (saving a LinkReg if required). Test for failure and return. On failure on Spur, if there is an accessor depth, assign framePointer and newMethod, do the stack switch, call checkForAndFollowForwardedPrimitiveState, and loop back if forwarders are found. Fall through to frame build." <var: #primitiveRoutine declareC: 'void (*primitiveRoutine)(void)'> | calleeSavedRegisterMask linkRegSaveRegister spRegSaveRegister jmp retry | self assert: (objectRepresentation hasSpurMemoryManagerAPI and: [flags anyMask: PrimCallOnSmalltalkStack]). self deny: (backEnd hasVarBaseRegister and: [self register: VarBaseReg isInMask: ABICallerSavedRegisterMask]). "Clear the primFailCode and set argumentCount" self MoveCq: 0 R: TempReg. self MoveR: TempReg Aw: coInterpreter primFailCodeAddress. methodOrBlockNumArgs ~= 0 ifTrue: + [self AddCq: methodOrBlockNumArgs R: TempReg]. "As small or smaller than move on most archs" - [self MoveCq: methodOrBlockNumArgs R: TempReg]. self MoveR: TempReg Aw: coInterpreter argumentCountAddress. self genExternalizeStackPointerForFastPrimitiveCall. "We may need to save LinkReg and/or SPReg, and given the stack machinations it is much easier to save them in callee saved registers than on the stack itself." calleeSavedRegisterMask := ABICalleeSavedRegisterMask bitClear: (self registerMaskFor: ClassReg). backEnd hasLinkRegister ifTrue: [linkRegSaveRegister := self availableRegisterOrNoneIn: calleeSavedRegisterMask. self deny: linkRegSaveRegister = NoReg. self MoveR: LinkReg R: linkRegSaveRegister. calleeSavedRegisterMask := calleeSavedRegisterMask bitClear: (self registerMaskFor: linkRegSaveRegister)]. spRegSaveRegister := NoReg. (SPReg ~= NativeSPReg and: [(self isCalleeSavedReg: SPReg) not]) ifTrue: [spRegSaveRegister := self availableRegisterOrNoneIn: calleeSavedRegisterMask. self deny: spRegSaveRegister = NoReg. self MoveR: SPReg R: spRegSaveRegister]. retry := self Label. (flags anyMask: PrimCallOnSmalltalkStackAlign2x) ifTrue: [self AndCq: (objectMemory wordSize * 2 - 1) bitInvert R: SPReg R: NativeSPReg] ifFalse: [SPReg ~= NativeSPReg ifTrue: [backEnd genLoadNativeSPRegWithAlignedSPReg]]. self CallFullRT: primitiveRoutine. self MoveAw: coInterpreter primFailCodeAddress R: TempReg. spRegSaveRegister ~= NoReg ifTrue: [self MoveR: spRegSaveRegister R: SPReg]. self CmpCq: 0 R: TempReg. jmp := self JumpNonZero: 0. + "At this point the primitive has cut back stackPointer to point to the result." - "At this point the primitive has cut back stackPointer to point to the result. - The original retpc is (argumentCount + 1) words beneath it." self MoveAw: coInterpreter stackPointerAddress R: TempReg. - self MoveR: TempReg R: SPReg. "get result and restore retpc" backEnd hasLinkRegister ifTrue: + [self MoveMw: 0 r: TempReg R: ReceiverResultReg; + AddCq: objectMemory wordSize R: TempReg R: SPReg; + MoveR: linkRegSaveRegister R: LinkReg] - [self PopR: ReceiverResultReg. - self MoveR: linkRegSaveRegister R: LinkReg] ifFalse: [| retpcOffset | + "The original retpc is (argumentCount + 1) words below stackPointer." retpcOffset := (methodOrBlockNumArgs + 1 * objectMemory wordSize) negated. + self MoveMw: retpcOffset r: TempReg R: ClassReg; "get retpc" + MoveR: TempReg R: SPReg; - self MoveMw: retpcOffset negated r: TempReg R: ClassReg; "get retpc" MoveMw: 0 r: TempReg R: ReceiverResultReg; MoveR: ClassReg Mw: 0 r: TempReg "put it back on stack for the return..."]. self RetN: 0. jmp jmpTarget: self Label. (coInterpreter accessorDepthForExternalPrimitiveMethod: methodObj) >= 0 ifTrue: [| skip | "Given that following primitive state to the accessor depth is recursive, we're asking for trouble if we run the fixup on the Smalltalk stack page. Run it on the full C stack instead. This won't be a performance issue since primitive failure should be very rare." self MoveR: FPReg Aw: coInterpreter framePointerAddress. self MoveCw: primitiveRoutine asInteger R: TempReg. self MoveR: TempReg Aw: coInterpreter primitiveFunctionPointerAddress. methodLabel addDependent: (self annotateAbsolutePCRef: (self MoveCw: methodLabel asInteger R: ClassReg)). self MoveMw: (self offset: CogMethod of: #methodObject) r: ClassReg R: TempReg. self MoveR: TempReg Aw: coInterpreter newMethodAddress. self genLoadCStackPointersForPrimCall. self CallFullRT: (self cCode: [#checkForAndFollowForwardedPrimitiveState asUnsignedIntegerPtr] inSmalltalk: [self simulatedTrampolineFor: #checkForAndFollowForwardedPrimitiveState]). backEnd genLoadStackPointersForFastPrimCall: ClassReg. self CmpCq: 0 R: ABIResultReg. skip := self JumpZero: 0. self MoveCq: 0 R: TempReg. self MoveR: TempReg Aw: coInterpreter primFailCodeAddress. self Jump: retry. skip jmpTarget: self Label] ifFalse: "must reload SPReg to undo any alignment change," [(flags anyMask: PrimCallOnSmalltalkStackAlign2x) ifTrue: [backEnd genLoadStackPointersForFastPrimCall: ClassReg]]. "The LinkRegister now contains the return address either of the primitive call or of checkForAndFollowForwardedPrimitiveState. It must be restored to the return address of the send invoking this primtiive method." backEnd hasLinkRegister ifTrue: [self MoveR: linkRegSaveRegister R: LinkReg]. "Finally remember to reload ReceiverResultReg if required. Even if arguments have been pushed, the prolog sequence assumes it is live." (self register: ReceiverResultReg isInMask: ABICallerSavedRegisterMask) ifTrue: [self MoveMw: (methodOrBlockNumArgs + (backEnd hasLinkRegister ifTrue: [0] ifFalse: [1])) * objectMemory wordSize r: SPReg R: ReceiverResultReg]. "continue to frame build..." ^0!

1 0

VM Maker: VMMaker.oscog-eem.3021.mcz
by commits＠source.squeak.org 03 Aug '21

03 Aug '21

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3021.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3021 Author: eem Time: 3 August 2021, 2:21:16.144209 pm UUID: 2c777da9-4008-4da6-969c-9a92ef4d977f Ancestors: VMMaker.oscog-eem.3020 Cogit: FastCPrimitiveCall. Save and restore LinkReg and/or SPReg around the primitive and checkForAndFollowForwardedPrimitiveState calls. At least do so on ARMv8. ARMv6 et al still needs testing. =============== Diff against VMMaker.oscog-eem.3020 =============== Item was changed: ----- Method: SimpleStackBasedCogit>>compileOnStackExternalPrimitive:flags: (in category 'primitive generators') ----- compileOnStackExternalPrimitive: primitiveRoutine flags: flags "Compile a fast call of a C primitive using the current stack page, avoiding the stack switch except on failure. This convention still uses stackPointer and argumentCount to access operands. Push all operands to the stack, assign stackPointer, argumentCount, and zero primFailCode. Make the call (saving a LinkReg if required). Test for failure and return. On failure on Spur, if there is an accessor depth, assign framePointer and newMethod, do the stack switch, call checkForAndFollowForwardedPrimitiveState, and loop back if forwarders are found. Fall through to frame build." + - <var: #primitiveRoutine declareC: 'void (*primitiveRoutine)(void)'> + | calleeSavedRegisterMask linkRegSaveRegister spRegSaveRegister jmp retry | - | jmp retry calleeSavedReg | self assert: (objectRepresentation hasSpurMemoryManagerAPI and: [flags anyMask: PrimCallOnSmalltalkStack]). self deny: (backEnd hasVarBaseRegister and: [self register: VarBaseReg isInMask: ABICallerSavedRegisterMask]). - "Clear the primFailCode and set argumentCount" self MoveCq: 0 R: TempReg. self MoveR: TempReg Aw: coInterpreter primFailCodeAddress. methodOrBlockNumArgs ~= 0 ifTrue: [self MoveCq: methodOrBlockNumArgs R: TempReg]. self MoveR: TempReg Aw: coInterpreter argumentCountAddress. self genExternalizeStackPointerForFastPrimitiveCall. + "We may need to save LinkReg and/or SPReg, and given the stack machinations + it is much easier to save them in callee saved registers than on the stack itself." + calleeSavedRegisterMask := ABICalleeSavedRegisterMask bitClear: (self registerMaskFor: ClassReg). backEnd hasLinkRegister ifTrue: + [linkRegSaveRegister := self availableRegisterOrNoneIn: calleeSavedRegisterMask. + self deny: linkRegSaveRegister = NoReg. + self MoveR: LinkReg R: linkRegSaveRegister. + calleeSavedRegisterMask := calleeSavedRegisterMask bitClear: (self registerMaskFor: linkRegSaveRegister)]. + spRegSaveRegister := NoReg. - [self PushR: LinkReg]. - retry := self Label. - calleeSavedReg := NoReg. (SPReg ~= NativeSPReg and: [(self isCalleeSavedReg: SPReg) not]) ifTrue: + [spRegSaveRegister := self availableRegisterOrNoneIn: calleeSavedRegisterMask. + self deny: spRegSaveRegister = NoReg. + self MoveR: SPReg R: spRegSaveRegister]. + retry := self Label. - [calleeSavedReg := self availableRegisterOrNoneIn: ABICalleeSavedRegisterMask. - self deny: calleeSavedReg = NoReg. - self MoveR: SPReg R: calleeSavedReg]. (flags anyMask: PrimCallOnSmalltalkStackAlign2x) ifTrue: [self AndCq: (objectMemory wordSize * 2 - 1) bitInvert R: SPReg R: NativeSPReg] ifFalse: [SPReg ~= NativeSPReg ifTrue: [backEnd genLoadNativeSPRegWithAlignedSPReg]]. self CallFullRT: primitiveRoutine. self MoveAw: coInterpreter primFailCodeAddress R: TempReg. + spRegSaveRegister ~= NoReg ifTrue: + [self MoveR: spRegSaveRegister R: SPReg]. - calleeSavedReg ~= NoReg ifTrue: - [self MoveR: calleeSavedReg R: SPReg]. self CmpCq: 0 R: TempReg. jmp := self JumpNonZero: 0. "At this point the primitive has cut back stackPointer to point to the result. The original retpc is (argumentCount + 1) words beneath it." self MoveAw: coInterpreter stackPointerAddress R: TempReg. - self MoveMw: (methodOrBlockNumArgs + 1 * objectMemory wordSize) negated - r: TempReg - R: (backEnd hasLinkRegister ifTrue: [LinkReg] ifFalse: [ClassReg]). self MoveR: TempReg R: SPReg. + "get result and restore retpc" backEnd hasLinkRegister + ifTrue: + [self PopR: ReceiverResultReg. + self MoveR: linkRegSaveRegister R: LinkReg] - ifTrue: [self PopR: ReceiverResultReg] "i.e. get result" ifFalse: + [| retpcOffset | + retpcOffset := (methodOrBlockNumArgs + 1 * objectMemory wordSize) negated. + self MoveMw: retpcOffset negated r: TempReg R: ClassReg; "get retpc" + MoveMw: 0 r: TempReg R: ReceiverResultReg; + MoveR: ClassReg Mw: 0 r: TempReg "put it back on stack for the return..."]. - [self MoveMw: 0 r: TempReg R: ReceiverResultReg; - MoveR: ClassReg Mw: 0 r: TempReg]. "i.e. get result and restore retpc" self RetN: 0. jmp jmpTarget: self Label. (coInterpreter accessorDepthForExternalPrimitiveMethod: methodObj) >= 0 ifTrue: [| skip | "Given that following primitive state to the accessor depth is recursive, we're asking for trouble if we run the fixup on the Smalltalk stack page. Run it on the full C stack instead. This won't be a performance issue since primitive failure should be very rare." self MoveR: FPReg Aw: coInterpreter framePointerAddress. self MoveCw: primitiveRoutine asInteger R: TempReg. self MoveR: TempReg Aw: coInterpreter primitiveFunctionPointerAddress. methodLabel addDependent: (self annotateAbsolutePCRef: (self MoveCw: methodLabel asInteger R: ClassReg)). self MoveMw: (self offset: CogMethod of: #methodObject) r: ClassReg R: TempReg. self MoveR: TempReg Aw: coInterpreter newMethodAddress. self genLoadCStackPointersForPrimCall. self CallFullRT: (self cCode: [#checkForAndFollowForwardedPrimitiveState asUnsignedIntegerPtr] inSmalltalk: [self simulatedTrampolineFor: #checkForAndFollowForwardedPrimitiveState]). backEnd genLoadStackPointersForFastPrimCall: ClassReg. self CmpCq: 0 R: ABIResultReg. skip := self JumpZero: 0. self MoveCq: 0 R: TempReg. self MoveR: TempReg Aw: coInterpreter primFailCodeAddress. self Jump: retry. skip jmpTarget: self Label] ifFalse: "must reload SPReg to undo any alignment change," [(flags anyMask: PrimCallOnSmalltalkStackAlign2x) ifTrue: [backEnd genLoadStackPointersForFastPrimCall: ClassReg]]. + "The LinkRegister now contains the return address either of the primitive call or of checkForAndFollowForwardedPrimitiveState. + It must be restored to the return address of the send invoking this primtiive method." + backEnd hasLinkRegister ifTrue: + [self MoveR: linkRegSaveRegister R: LinkReg]. "Finally remember to reload ReceiverResultReg if required. Even if arguments have been pushed, the prolog sequence assumes it is live." (self register: ReceiverResultReg isInMask: ABICallerSavedRegisterMask) ifTrue: + [self MoveMw: (methodOrBlockNumArgs + (backEnd hasLinkRegister ifTrue: [0] ifFalse: [1])) * objectMemory wordSize - [self MoveMw: (backEnd hasLinkRegister ifTrue: [methodOrBlockNumArgs] ifFalse: [methodOrBlockNumArgs + 1]) * objectMemory wordSize r: SPReg R: ReceiverResultReg]. + "continue to frame build..." ^0! Item was changed: ----- Method: StackInterpreter>>checkForAndFollowForwardedPrimitiveState (in category 'primitive support') ----- checkForAndFollowForwardedPrimitiveState "In Spur a primitive may fail due to encountering a forwarder. On failure, check the accessorDepth for the primitive and if non-negative scan the args to the depth, following any forwarders. Answer if any are found so the prim can be retried. The primitive index is derived from newMethod. See http://www.mirandabanda.org/cogblog/2014/02/08/primitives-and-the-partial-r… and SpurMemoryManager's class comment." <option: #SpurObjectMemory> | primIndex accessorDepth found | self assert: self failed. found := false. primIndex := self primitiveIndexOf: newMethod. self assert: (argumentCount = (self argumentCountOf: newMethod) or: [self isMetaPrimitiveIndex: primIndex]). "First things first; make sure the metadata has been followed before it is accessed to derive accessorDepth..." + (((self isCalloutPrimitiveIndex: primIndex) or: [primIndex = PrimNumberDoExternalCall]) - ((self isCalloutPrimitiveIndex: primIndex) and: [self unfollowFirstLiteralOfMaybeCalloutMethod: newMethod primitiveIndex: primIndex]) ifTrue: [found := true]. "If the primitive is one of the meta primitives PrimNumberDoPrimitive or PrimNumberDoExternalCall, then metaAccessorDepth will have been set to nil at the start of the primitive, and to the accessor depth of the called primitive (or external call) immediately before dispatch. Hence if primIndex is that of a meta primitive then if metaAccessorDepth is -2, the accessor depth is that of the meta primitive, and if > -2, then metaAccessorDepth is the accessor depth of the primitive (or external call). Similarly, if the primitive is primitiveExternalCall then the accessor depth is that of primitiveExternalCall until primitiveFunctionPointer is assigned, at which point the accessor depth is taken from the slot in newMethod's first literal." accessorDepth := ((self isMetaPrimitiveIndex: primIndex) and: [metaAccessorDepth > -2]) ifTrue: [metaAccessorDepth] ifFalse: [(primIndex = PrimNumberExternalCall and: [primitiveFunctionPointer ~~ #primitiveExternalCall]) ifTrue: [self primitiveAccessorDepthForExternalPrimitiveMethod: newMethod] ifFalse: [primitiveAccessorDepthTable at: primIndex]]. self assert: (self saneFunctionPointerForFailureOfPrimIndex: primIndex). self assert: (accessorDepth between: -1 and: 5). accessorDepth >= 0 ifTrue: [| scannedStackFrame | scannedStackFrame := false. 0 to: argumentCount do: [:index| | oop | oop := self stackValue: index. (objectMemory isNonImmediate: oop) ifTrue: [(objectMemory isForwarded: oop) ifTrue: [self assert: index < argumentCount. "receiver should have been caught at send time." found := true. oop := objectMemory followForwarded: oop. self stackValue: index put: oop. scannedStackFrame ifFalse: [scannedStackFrame := true. self "Avoid repeated primitive failures by following all state in the current stack frame." followForwardedFrameContents: framePointer stackPointer: stackPointer + (argumentCount + 1 * objectMemory wordSize)]]. (accessorDepth > 0 and: [(objectMemory hasPointerFields: oop) and: [objectMemory followForwardedObjectFields: oop toDepth: accessorDepth]]) ifTrue: [found := true]]]]. ^found!

1 0

testOutOfMemorySignalExtreme
by Eliot Miranda 03 Aug '21

03 Aug '21

Hi All, something needs to be done about this test. Whenever I run it on macos it never runs out of memory before the system starts complaining. I've just been presented with a dialog telling me that the system is out of application memory and something needs to quit, while the Squeak process is 236 Gb big. A test that locks up the system isn't very useful. _,,,^..^,,,_ best, Eliot

3 2

VM Maker: VMMaker.oscog-eem.3020.mcz
by commits＠source.squeak.org 03 Aug '21

03 Aug '21

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3020.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3020 Author: eem Time: 3 August 2021, 12:17:53.467431 pm UUID: 51321827-cf3b-4b5a-b120-04e3634dc699 Ancestors: VMMaker.oscog-eem.3019 Spur CoInterpreter: Improve checkForAndFollowForwardedPrimitiveState. Allow the method's first literal (if an FFI or named primitive) to be forwarded, unfollowing it *before* accessorDepth is fetched. Follow it to the relevant depth. =============== Diff against VMMaker.oscog-eem.3019 =============== Item was changed: ----- Method: StackInterpreter>>checkForAndFollowForwardedPrimitiveState (in category 'primitive support') ----- checkForAndFollowForwardedPrimitiveState + "In Spur a primitive may fail due to encountering a forwarder. On failure, check the accessorDepth for the + primitive and if non-negative scan the args to the depth, following any forwarders. Answer if any are found + so the prim can be retried. The primitive index is derived from newMethod. - "In Spur a primitive may fail due to encountering a forwarder. On failure, - check the accessorDepth for the primitive and if non-negative scan the - args to the depth, following any forwarders. Answer if any are found so - the prim can be retried. The primitive index is derived from newMethod. See http://www.mirandabanda.org/cogblog/2014/02/08/primitives-and-the-partial-r… and SpurMemoryManager's class comment." <option: #SpurObjectMemory> + | primIndex accessorDepth found | - | primIndex accessorDepth found scannedStackFrame | self assert: self failed. + found := false. - found := scannedStackFrame := false. primIndex := self primitiveIndexOf: newMethod. self assert: (argumentCount = (self argumentCountOf: newMethod) or: [self isMetaPrimitiveIndex: primIndex]). + "First things first; make sure the metadata has been followed before it is accessed to derive accessorDepth..." + ((self isCalloutPrimitiveIndex: primIndex) + and: [self unfollowFirstLiteralOfMaybeCalloutMethod: newMethod primitiveIndex: primIndex]) ifTrue: + [found := true]. "If the primitive is one of the meta primitives PrimNumberDoPrimitive or PrimNumberDoExternalCall, then metaAccessorDepth will have been set to nil at the start of the primitive, and to the accessor depth of the called primitive (or external call) immediately before dispatch. Hence if primIndex is that of a meta primitive then if metaAccessorDepth is -2, the accessor depth is that of the meta primitive, and if > -2, then metaAccessorDepth is the accessor depth of the primitive (or external call). Similarly, if the primitive is primitiveExternalCall then the accessor depth is that of primitiveExternalCall until primitiveFunctionPointer is assigned, at which point the accessor depth is taken from the slot in newMethod's first literal." accessorDepth := ((self isMetaPrimitiveIndex: primIndex) and: [metaAccessorDepth > -2]) ifTrue: [metaAccessorDepth] ifFalse: [(primIndex = PrimNumberExternalCall and: [primitiveFunctionPointer ~~ #primitiveExternalCall]) ifTrue: [self primitiveAccessorDepthForExternalPrimitiveMethod: newMethod] ifFalse: [primitiveAccessorDepthTable at: primIndex]]. self assert: (self saneFunctionPointerForFailureOfPrimIndex: primIndex). self assert: (accessorDepth between: -1 and: 5). accessorDepth >= 0 ifTrue: + [| scannedStackFrame | + scannedStackFrame := false. - [(self isCalloutPrimitiveIndex: primIndex) ifTrue: - [(objectMemory - followForwardedObjectFields: (self literal: 0 ofMethod: newMethod) - toDepth: accessorDepth) ifTrue: - [found := true]]. 0 to: argumentCount do: [:index| | oop | oop := self stackValue: index. (objectMemory isNonImmediate: oop) ifTrue: [(objectMemory isForwarded: oop) ifTrue: [self assert: index < argumentCount. "receiver should have been caught at send time." found := true. oop := objectMemory followForwarded: oop. self stackValue: index put: oop. scannedStackFrame ifFalse: [scannedStackFrame := true. self "Avoid repeated primitive failures by following all state in the current stack frame." followForwardedFrameContents: framePointer stackPointer: stackPointer + (argumentCount + 1 * objectMemory wordSize)]]. (accessorDepth > 0 and: [(objectMemory hasPointerFields: oop) and: [objectMemory followForwardedObjectFields: oop toDepth: accessorDepth]]) ifTrue: [found := true]]]]. ^found! Item was added: + ----- Method: StackInterpreter>>unfollowFirstLiteralOfMaybeCalloutMethod:primitiveIndex: (in category 'primitive support') ----- + unfollowFirstLiteralOfMaybeCalloutMethod: methodObj primitiveIndex: primIndex + "Follow the first literal of either a primitiveCallout or primitiveExternalCall primitive method. This + will be an ExternalFunction for primitiveCallout or a four element Array for primitiveExternalCall. + This is here to avoid following all the literals in a method, which would be slow. Remember + forwarders are unlikely, so we only want to follow what is necessary, and for an FFI call or + external primitive only the first literal is salient." + <option: #SpurObjectMemory> + | found firstLiteral | + found := false. + "inlined self literal: 0 ofMethod: methodObj for clarity..." + firstLiteral := objectMemory fetchPointer: LiteralStart ofObject: methodObj. + (objectMemory isOopForwarded: firstLiteral) ifTrue: + [found := true. + firstLiteral := objectMemory fixFollowedField: LiteralStart ofObject: methodObj withInitialValue: firstLiteral]. + (objectMemory + followForwardedObjectFields: firstLiteral + toDepth: (primIndex = PrimNumberFFICall + ifTrue: [(primitiveAccessorDepthTable at: primIndex) - 1] + ifFalse: [0])) ifTrue: + [found := true]. + ^found!

1 0

VM Maker: VMMaker.oscog-eem.3019.mcz
by commits＠source.squeak.org 03 Aug '21

03 Aug '21

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3019.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3019 Author: eem Time: 3 August 2021, 1:02:06.715258 am UUID: e99c07f6-81f2-4d58-9ff4-943d9e7ef0dc Ancestors: VMMaker.oscog-tpr.3018 Cog: use symbolic constants for Spur primitive metadata manipulation. Refactor linkExternalCall:ifFail: into linkExternalCall:errInto: so it doesn't have to be inlined. Fix mapToBytecodePCIfActivationOfExternalMethod: to asvoid an assert fail for an interpreter frame activation of an external method. Use faster length accessors (numSlotsOf: numBytesOfBytes:) in a few places. Reorder teh storing of newMethod and the setting of stack pointers in compileOnStackExternalPrimitive:flags:, as well as making an invariant on VarBase clear. CroquetPlugin: simulate ioGatherEntropy:_:, along with a hook to supply constant entropy via InitializationOptions. =============== Diff against VMMaker.oscog-tpr.3018 =============== Item was changed: ----- Method: CoInterpreter class>>initializeMiscConstants (in category 'initialization') ----- initializeMiscConstants super initializeMiscConstants. COGVM := true. MinBackwardJumpCountForCompile := 40. MaxNumArgs := 15. PrimCallNeedsNewMethod := 1. PrimCallNeedsPrimitiveFunction := 2. PrimCallMayEndureCodeCompaction := 4. PrimCallCollectsProfileSamples := 8. PrimCallDoNotJIT := 16. PrimCallIsExternalCall := 32. "CheckAllocationFillerAfterPrimCall := 32. this has never been successfully used in all the years we've had it; nuking it" PrimCallOnSmalltalkStack := 64. "Speed up simple external prims by avoiding stack switch" PrimCallOnSmalltalkStackAlign2x := 128. "Align stack to a 2 x word size boundary, e.g. for MMX instructions etc" FastCPrimitiveUseCABIFlag := 256. "Flags for use in export:flags:, shifted to overlap with the PrimCallXXX flags above" FastCPrimitiveFlag := 1. "a.k.a. PrimCallOnSmalltalkStack" FastCPrimitiveAlignForFloatsFlag := 2. "a.k.a. PrimCallOnSmalltalkStackAlign2x" FastCPrimitiveUseCABIFlag := 4. "a.k.a. FastCPrimitiveUseCABIFlag" PrimitiveMetadataFlagsShift := PrimCallOnSmalltalkStack highBit - FastCPrimitiveFlag highBit. + "And to shift away the flags, to compute the accessor depth, use... + c.f. NullSpurMetadata in sq.h" + SpurPrimitiveAccessorDepthShift := 8. + SpurPrimitiveFlagsMask := 1 << SpurPrimitiveAccessorDepthShift - 1. + "the primitive trace log; a record of the last 256 named/external primitives or significant events invoked." PrimTraceLogSize := 256. "Room for 256 selectors. Must be 256 because we use a byte to hold the index" TraceBufferSize := 256 * 3. "Room for 256 events" TraceContextSwitch := self objectMemoryClass basicNew integerObjectOf: 1. TraceBlockActivation := self objectMemoryClass basicNew integerObjectOf: 2. TraceBlockCreation := self objectMemoryClass basicNew integerObjectOf: 3. TraceIncrementalGC := self objectMemoryClass basicNew integerObjectOf: 4. TraceFullGC := self objectMemoryClass basicNew integerObjectOf: 5. TraceCodeCompaction := self objectMemoryClass basicNew integerObjectOf: 6. TraceOwnVM := self objectMemoryClass basicNew integerObjectOf: 7. TraceDisownVM := self objectMemoryClass basicNew integerObjectOf: 8. TraceThreadSwitch := self objectMemoryClass basicNew integerObjectOf: 9. TracePreemptDisowningThread := self objectMemoryClass basicNew integerObjectOf: 10. TraceVMCallback := self objectMemoryClass basicNew integerObjectOf: 11. TraceVMCallbackReturn := self objectMemoryClass basicNew integerObjectOf: 12. TraceStackOverflow := self objectMemoryClass basicNew integerObjectOf: 13. TracePrimitiveFailure := self objectMemoryClass basicNew integerObjectOf: 14. TracePrimitiveRetry := self objectMemoryClass basicNew integerObjectOf: 15. TraceIsFromMachineCode := 1. TraceIsFromInterpreter := 2. CSCallbackEnter := 3. CSCallbackLeave := 4. CSEnterCriticalSection := 5. CSExitCriticalSection := 6. CSResume := 7. CSSignal := 8. CSSuspend := 9. CSWait := 10. CSYield := 11. CSCheckEvents := 12. CSThreadSchedulingLoop := 13. CSOwnVM := 14. CSThreadBind := 15. CSSwitchIfNeccessary := 16. TraceSources := CArrayAccessor on: #('?' 'm' 'i' 'callbackEnter' 'callbackLeave' 'enterCritical' 'exitCritical' 'resume' 'signal' 'suspend' 'wait' 'yield' 'eventcheck' 'threadsched' 'ownVM' 'bindToThread' 'switchIfNecessary'). "this is simulation only" RumpCStackSize := 4096! Item was changed: ----- Method: CoInterpreter>>accessorDepthForExternalPrimitiveMethod: (in category 'plugin primitive support') ----- accessorDepthForExternalPrimitiveMethod: methodObj <api> <option: #SpurMemoryManager> | flags lit | self assert: (self isLinkedExternalPrimitive: methodObj). lit := self literal: 0 ofMethod: methodObj. flags := objectMemory fetchPointer: ExternalCallLiteralFlagsIndex ofObject: lit. + ^(objectMemory integerValueOf: flags) >>> SpurPrimitiveAccessorDepthShift! - ^(objectMemory integerValueOf: flags) bitShift: -8! Item was changed: ----- Method: CoInterpreter>>attemptToLinkExternalPrimitive: (in category 'plugin primitive support') ----- attemptToLinkExternalPrimitive: methodObj | header primIdx firstLiteral targetFunctionIndex | header := objectMemory methodHeaderOf: methodObj. primIdx := self primitiveIndexOfMethod: methodObj header: header. firstLiteral := self literal: 0 ofMethod: methodObj. self assert: (primIdx = PrimNumberExternalCall and: [(objectMemory literalCountOfMethodHeader: header) > 0 and: [(objectMemory isArray: firstLiteral) and: [(objectMemory numSlotsOf: firstLiteral) = 4]]]). targetFunctionIndex := objectMemory fetchPointer: ExternalCallLiteralTargetFunctionIndex ofObject: firstLiteral. self assert: (objectMemory isIntegerObject: targetFunctionIndex). (objectMemory integerValueOf: targetFunctionIndex) = 0 ifTrue: + [self linkExternalCall: firstLiteral errInto: nil]. - [self linkExternalCall: firstLiteral ifFail: []]. ^firstLiteral! Item was changed: ----- Method: CoInterpreter>>functionPointerForCompiledMethod:primitiveIndex:primitivePropertyFlagsInto: (in category 'cog jit support') ----- functionPointerForCompiledMethod: methodObj primitiveIndex: primitiveIndex primitivePropertyFlagsInto: flagsPtr <api> <returnTypeC: 'void (*functionPointerForCompiledMethodprimitiveIndexprimitivePropertyFlagsInto(sqInt methodObj, sqInt primitiveIndex, sqInt *flagsPtr))(void)'> | functionPointer | <var: #functionPointer declareC: #'void (*functionPointer)(void)'> flagsPtr ifNotNil: [flagsPtr at: 0 put: (self primitivePropertyFlags: primitiveIndex)]. functionPointer := self functionPointerFor: primitiveIndex inClass: nil. functionPointer == #primitiveCalloutToFFI ifTrue: [^self functionForPrimitiveCallout]. functionPointer == #primitiveExternalCall ifTrue: [| lit | lit := self attemptToLinkExternalPrimitive: methodObj. "N.B. We only support the FastCPrimitiveFlag on Spur because Spur will *not* run a GC to satisfy an allocation in a primitive. The V3 ObjectMemory will and hence the depth of stack needed in a V3 primitive is probably too large to safely execute on a stack page." objectMemory hasSpurMemoryManagerAPI ifTrue: [| flags shiftedMetadataFlags | flags := objectMemory fetchPointer: ExternalCallLiteralFlagsIndex ofObject: lit. (objectMemory isIntegerObject: flags) ifTrue: + [shiftedMetadataFlags := ((objectMemory integerValueOf: flags) bitAnd: SpurPrimitiveFlagsMask) bitShift: PrimitiveMetadataFlagsShift. + profileSemaphore ~= objectMemory nilObject ifTrue: + [shiftedMetadataFlags := shiftedMetadataFlags bitOr: PrimCallCollectsProfileSamples]. - [shiftedMetadataFlags := ((objectMemory integerValueOf: flags) bitAnd: 16rFF) bitShift: PrimitiveMetadataFlagsShift. shiftedMetadataFlags ~= 0 ifTrue: [flagsPtr at: 0 put: shiftedMetadataFlags]]]. ^self functionForPrimitiveExternalCall: methodObj]. ^functionPointer! Item was changed: ----- Method: CoInterpreter>>mapToBytecodePCIfActivationOfExternalMethod: (in category 'plugin primitive support') ----- mapToBytecodePCIfActivationOfExternalMethod: ctxtObj (self isExternalMethodInPlugin: (objectMemory fetchPointer: MethodIndex ofObject: ctxtObj)) ifTrue: [(self isMarriedOrWidowedContext: ctxtObj) ifTrue: + [| theFP | + (self isWidowedContext: ctxtObj) ifTrue: + [^self]. + theFP := self frameOfMarriedContext: ctxtObj. + (self isMachineCodeFrame: theFP) ifFalse: - [(self asserta: (self isWidowedContext: ctxtObj)) ifTrue: [^self]]. self ensureContextHasBytecodePC: ctxtObj]! Item was changed: ----- Method: CogVMSimulator>>classNameOf:Is: (in category 'plugin support') ----- classNameOf: aClass Is: className "Check if aClass' name is className" | name | + (objectMemory numSlotsOf: aClass) <= classNameIndex ifTrue: - (objectMemory lengthOf: aClass) <= classNameIndex ifTrue: [^false]. "Not a class but maybe behavior" name := objectMemory fetchPointer: classNameIndex ofObject: aClass. (objectMemory isBytes: name) ifFalse: [^false]. ^ className = (self stringOf: name)! Item was added: + ----- Method: CroquetPlugin>>ioGatherEntropy:_: (in category 'simulation support') ----- + ioGatherEntropy: bytes _: length + <doNotGenerate> + | entropy | + (InitializationOptions at: #entropy ifAbsent: nil) + ifNotNil: [:repeatableEntropy| + self assert: repeatableEntropy size = length. + entropy := repeatableEntropy] + ifNil: + [entropy := ByteArray new: length. + (Random gatherEntropyInto: entropy) ifFalse: + [^false]]. + self memcpy: bytes _: entropy _: length. + ^true! Item was changed: ----- Method: SimpleStackBasedCogit>>compileInterpreterPrimitive:flags: (in category 'primitive generators') ----- compileInterpreterPrimitive: primitiveRoutine flags: flags "Compile a call to an interpreter primitive. Call the C routine with the usual stack-switching dance, test the primFailCode and then either return on success or continue to the method body." <var: #primitiveRoutine declareC: 'void (*primitiveRoutine)(void)'> | jmp jmpSamplePrim continuePostSamplePrim jmpSampleNonPrim continuePostSampleNonPrim | + self deny: (backEnd hasVarBaseRegister + and: [self register: VarBaseReg isInMask: ABICallerSavedRegisterMask]). + "Save processor fp, sp and return pc in the interpreter's frame stack and instruction pointers" self genExternalizePointersForPrimitiveCall. "Switch to the C stack." self genLoadCStackPointersForPrimCall. (flags anyMask: PrimCallCollectsProfileSamples) ifTrue: ["Test nextProfileTick for being non-zero and call checkProfileTick if so" objectMemory wordSize = 4 ifTrue: [self MoveAw: coInterpreter nextProfileTickAddress R: TempReg. self MoveAw: coInterpreter nextProfileTickAddress + objectMemory wordSize R: ClassReg. self OrR: TempReg R: ClassReg] ifFalse: [self MoveAw: coInterpreter nextProfileTickAddress R: TempReg. self CmpCq: 0 R: TempReg]. "If set, jump to record sample call." jmpSampleNonPrim := self JumpNonZero: 0. continuePostSampleNonPrim := self Label]. "Old old full prim trace is in VMMaker-eem.550 and prior. Old simpler full prim trace is in VMMaker-eem.2969 and prior." (coInterpreter recordPrimTraceForMethod: methodObj) ifTrue: [self genFastPrimTraceUsing: ClassReg and: SendNumArgsReg]. "Clear the primFailCode and set argumentCount" self MoveCq: 0 R: TempReg. self MoveR: TempReg Aw: coInterpreter primFailCodeAddress. methodOrBlockNumArgs ~= 0 ifTrue: [self MoveCq: methodOrBlockNumArgs R: TempReg]. self MoveR: TempReg Aw: coInterpreter argumentCountAddress. "If required, set primitiveFunctionPointer and newMethod" (flags anyMask: PrimCallNeedsPrimitiveFunction) ifTrue: [self MoveCw: primitiveRoutine asInteger R: TempReg. self MoveR: TempReg Aw: coInterpreter primitiveFunctionPointerAddress]. (flags anyMask: PrimCallNeedsNewMethod+PrimCallMayEndureCodeCompaction) ifTrue: ["The ceActivateFailingPrimitiveMethod: machinery can't handle framelessness." (flags anyMask: PrimCallMayEndureCodeCompaction) ifTrue: [needsFrame := true]. methodLabel addDependent: (self annotateAbsolutePCRef: (self MoveCw: methodLabel asInteger R: ClassReg)). self MoveMw: (self offset: CogMethod of: #methodObject) r: ClassReg R: TempReg. self MoveR: TempReg Aw: coInterpreter newMethodAddress]. "Invoke the primitive" self PrefetchAw: coInterpreter primFailCodeAddress. (flags anyMask: PrimCallMayEndureCodeCompaction) ifTrue: "Sideways call the C primitive routine so that we return through cePrimReturnEnterCogCode." ["On Spur ceActivateFailingPrimitiveMethod: would like to retry if forwarders are found. So insist on PrimCallNeedsPrimitiveFunction being set too." objectMemory hasSpurMemoryManagerAPI ifTrue: [self assert: (flags anyMask: PrimCallNeedsPrimitiveFunction)]. backEnd genMarshallNArgs: 0 arg: nil arg: nil arg: nil arg: nil; genSubstituteReturnAddress: ((flags anyMask: PrimCallCollectsProfileSamples) ifTrue: [cePrimReturnEnterCogCodeProfiling] ifFalse: [cePrimReturnEnterCogCode]). self JumpFullRT: primitiveRoutine asInteger. jmp := jmpSamplePrim := continuePostSamplePrim := nil] ifFalse: ["Call the C primitive routine." backEnd genMarshallNArgs: 0 arg: 0 arg: 0 arg: 0 arg: 0. self CallFullRT: primitiveRoutine asInteger. backEnd genRemoveNArgsFromStack: 0. (flags anyMask: PrimCallCollectsProfileSamples) ifTrue: [self assert: (flags anyMask: PrimCallNeedsNewMethod). "Test nextProfileTick for being non-zero and call checkProfileTick if so" objectMemory wordSize = 4 ifTrue: [self MoveAw: coInterpreter nextProfileTickAddress R: TempReg. self MoveAw: coInterpreter nextProfileTickAddress + objectMemory wordSize R: ClassReg. self OrR: TempReg R: ClassReg] ifFalse: [self MoveAw: coInterpreter nextProfileTickAddress R: TempReg. self CmpCq: 0 R: TempReg]. "If set, jump to record sample call." jmpSamplePrim := self JumpNonZero: 0. continuePostSamplePrim := self Label]. objectRepresentation maybeCompileRetryOnPrimitiveFail: primitiveIndex. "Switch back to the Smalltalk stack. Stack better be in either of these two states: success: stackPointer -> result (was receiver) arg1 ... argN return pc failure: receiver arg1 ... stackPointer -> argN return pc In either case we can push the instructionPointer or load it into the LinkRegister to reestablish the return pc" self MoveAw: coInterpreter instructionPointerAddress R: (backEnd hasLinkRegister ifTrue: [LinkReg] ifFalse: [ClassReg]). backEnd genLoadStackPointers. "Test primitive failure" self MoveAw: coInterpreter primFailCodeAddress R: TempReg. backEnd hasLinkRegister ifFalse: [self PushR: ClassReg]. "Restore return pc on CISCs" self flag: 'ask concrete code gen if move sets condition codes?'. self CmpCq: 0 R: TempReg. jmp := self JumpNonZero: 0. "Fetch result from stack" self MoveMw: (backEnd hasLinkRegister ifTrue: [0] ifFalse: [objectMemory wordSize]) r: SPReg R: ReceiverResultReg. self RetN: objectMemory wordSize]. "return to caller, popping receiver" (flags anyMask: PrimCallCollectsProfileSamples) ifTrue: ["The sample is collected by cePrimReturnEnterCogCode for external calls" jmpSamplePrim ifNotNil: ["Call ceCheckProfileTick: to record sample and then continue." jmpSamplePrim jmpTarget: self Label. self assert: (flags anyMask: PrimCallNeedsNewMethod). self CallFullRT: (self cCode: [#ceCheckProfileTick asUnsignedIntegerPtr] inSmalltalk: [self simulatedTrampolineFor: #ceCheckProfileTick]). "reenter the post-primitive call flow" self Jump: continuePostSamplePrim]. "Null newMethod and call ceCheckProfileTick: to record sample and then continue. ceCheckProfileTick will map null/0 to coInterpreter nilObject" jmpSampleNonPrim jmpTarget: self Label. self MoveCq: 0 R: TempReg. self MoveR: TempReg Aw: coInterpreter newMethodAddress. self CallFullRT: (self cCode: [#ceCheckProfileTick asUnsignedIntegerPtr] inSmalltalk: [self simulatedTrampolineFor: #ceCheckProfileTick]). "reenter the post-primitive call flow" self Jump: continuePostSampleNonPrim]. jmp ifNotNil: ["Jump to restore of receiver reg and proceed to frame build for failure." jmp jmpTarget: self Label. "Restore receiver reg from stack. If on RISCs ret pc is in LinkReg, if on CISCs ret pc is on stack." self MoveMw: objectMemory wordSize * (methodOrBlockNumArgs + (backEnd hasLinkRegister ifTrue: [0] ifFalse: [1])) r: SPReg R: ReceiverResultReg]. ^0! Item was changed: ----- Method: SimpleStackBasedCogit>>compileOnStackExternalPrimitive:flags: (in category 'primitive generators') ----- compileOnStackExternalPrimitive: primitiveRoutine flags: flags "Compile a fast call of a C primitive using the current stack page, avoiding the stack switch except on failure. This convention still uses stackPointer and argumentCount to access operands. Push all operands to the stack, assign stackPointer, argumentCount, and zero primFailCode. Make the call (saving a LinkReg if required). Test for failure and return. On failure on Spur, if there is an accessor depth, assign framePointer and newMethod, do the stack switch, call checkForAndFollowForwardedPrimitiveState, and loop back if forwarders are found. Fall through to frame build." <var: #primitiveRoutine declareC: 'void (*primitiveRoutine)(void)'> | jmp retry calleeSavedReg | self assert: (objectRepresentation hasSpurMemoryManagerAPI and: [flags anyMask: PrimCallOnSmalltalkStack]). + self deny: (backEnd hasVarBaseRegister + and: [self register: VarBaseReg isInMask: ABICallerSavedRegisterMask]). "Clear the primFailCode and set argumentCount" self MoveCq: 0 R: TempReg. self MoveR: TempReg Aw: coInterpreter primFailCodeAddress. methodOrBlockNumArgs ~= 0 ifTrue: [self MoveCq: methodOrBlockNumArgs R: TempReg]. self MoveR: TempReg Aw: coInterpreter argumentCountAddress. self genExternalizeStackPointerForFastPrimitiveCall. backEnd hasLinkRegister ifTrue: [self PushR: LinkReg]. retry := self Label. calleeSavedReg := NoReg. (SPReg ~= NativeSPReg and: [(self isCalleeSavedReg: SPReg) not]) ifTrue: [calleeSavedReg := self availableRegisterOrNoneIn: ABICalleeSavedRegisterMask. self deny: calleeSavedReg = NoReg. self MoveR: SPReg R: calleeSavedReg]. (flags anyMask: PrimCallOnSmalltalkStackAlign2x) ifTrue: [self AndCq: (objectMemory wordSize * 2 - 1) bitInvert R: SPReg R: NativeSPReg] ifFalse: [SPReg ~= NativeSPReg ifTrue: [backEnd genLoadNativeSPRegWithAlignedSPReg]]. self CallFullRT: primitiveRoutine. self MoveAw: coInterpreter primFailCodeAddress R: TempReg. calleeSavedReg ~= NoReg ifTrue: [self MoveR: calleeSavedReg R: SPReg]. self CmpCq: 0 R: TempReg. jmp := self JumpNonZero: 0. "At this point the primitive has cut back stackPointer to point to the result. The original retpc is (argumentCount + 1) words beneath it." self MoveAw: coInterpreter stackPointerAddress R: TempReg. self MoveMw: (methodOrBlockNumArgs + 1 * objectMemory wordSize) negated r: TempReg R: (backEnd hasLinkRegister ifTrue: [LinkReg] ifFalse: [ClassReg]). self MoveR: TempReg R: SPReg. backEnd hasLinkRegister ifTrue: [self PopR: ReceiverResultReg] "i.e. get result" ifFalse: [self MoveMw: 0 r: TempReg R: ReceiverResultReg; MoveR: ClassReg Mw: 0 r: TempReg]. "i.e. get result and restore retpc" self RetN: 0. jmp jmpTarget: self Label. (coInterpreter accessorDepthForExternalPrimitiveMethod: methodObj) >= 0 ifTrue: [| skip | "Given that following primitive state to the accessor depth is recursive, we're asking for trouble if we run the fixup on the Smalltalk stack page. Run it on the full C stack instead. This won't be a performance issue since primitive failure should be very rare." self MoveR: FPReg Aw: coInterpreter framePointerAddress. self MoveCw: primitiveRoutine asInteger R: TempReg. self MoveR: TempReg Aw: coInterpreter primitiveFunctionPointerAddress. - self genLoadCStackPointersForPrimCall. methodLabel addDependent: (self annotateAbsolutePCRef: (self MoveCw: methodLabel asInteger R: ClassReg)). self MoveMw: (self offset: CogMethod of: #methodObject) r: ClassReg R: TempReg. self MoveR: TempReg Aw: coInterpreter newMethodAddress. + self genLoadCStackPointersForPrimCall. self CallFullRT: (self cCode: [#checkForAndFollowForwardedPrimitiveState asUnsignedIntegerPtr] inSmalltalk: [self simulatedTrampolineFor: #checkForAndFollowForwardedPrimitiveState]). backEnd genLoadStackPointersForFastPrimCall: ClassReg. self CmpCq: 0 R: ABIResultReg. skip := self JumpZero: 0. self MoveCq: 0 R: TempReg. self MoveR: TempReg Aw: coInterpreter primFailCodeAddress. self Jump: retry. skip jmpTarget: self Label] ifFalse: "must reload SPReg to undo any alignment change," [(flags anyMask: PrimCallOnSmalltalkStackAlign2x) ifTrue: [backEnd genLoadStackPointersForFastPrimCall: ClassReg]]. "Finally remember to reload ReceiverResultReg if required. Even if arguments have been pushed, the prolog sequence assumes it is live." (self register: ReceiverResultReg isInMask: ABICallerSavedRegisterMask) ifTrue: [self MoveMw: (backEnd hasLinkRegister ifTrue: [methodOrBlockNumArgs] ifFalse: [methodOrBlockNumArgs + 1]) * objectMemory wordSize r: SPReg R: ReceiverResultReg]. ^0! Item was changed: ----- Method: StackInterpreter>>classNameOf:Is: (in category 'plugin primitive support') ----- classNameOf: aClass Is: className "Check if aClass's name is className" | srcName name length | <var: #className type: #'char *'> <var: #srcName type: #'char *'> + (objectMemory numSlotsOf: aClass) <= classNameIndex ifTrue: - (objectMemory lengthOf: aClass) <= classNameIndex ifTrue: [^ false]. "Not a class but might be behavior" name := objectMemory fetchPointer: classNameIndex ofObject: aClass. (objectMemory isBytes: name) ifFalse: [^false]. + length := self numBytesOfBytes: name. - length := self stSizeOf: name. srcName := self cCoerce: (self arrayValueOf: name) to: 'char *'. 0 to: length - 1 do: [:i | (srcName at: i) = (className at: i) ifFalse: [^false]]. "Check if className really ends at this point" ^(className at: length) = 0! Item was changed: ----- Method: StackInterpreter>>primitiveAccessorDepthForExternalPrimitiveMethod: (in category 'primitive support') ----- primitiveAccessorDepthForExternalPrimitiveMethod: methodObj ^(objectMemory integerValueOf: (objectMemory + fetchPointer: ExternalCallLiteralFlagsIndex + ofObject: (self literal: 0 ofMethod: methodObj))) >>> SpurPrimitiveAccessorDepthShift! - fetchPointer: 2 - ofObject: (self literal: 0 ofMethod: methodObj))) >>> 8! Item was added: + ----- Method: StackInterpreterPrimitives>>linkExternalCall:errInto: (in category 'plugin primitive support') ----- + linkExternalCall: externalCallLiteral errInto: failPtr + <returnTypeC: 'void (*linkExternalCallerrInto(sqInt externalCallLiteral, sqInt *failPtr))()'> + <var: 'failPtr' type: #'sqInt *'> + "The function has not been loaded yet. Fetch module and function name." + | addr functionLength functionName index metadata moduleLength moduleName | + <inline: false> + <var: #addr declareC: 'void (*addr)()'> + moduleName := objectMemory fetchPointer: ExternalCallLiteralModuleNameIndex ofObject: externalCallLiteral. + moduleName = objectMemory nilObject + ifTrue: [moduleLength := 0] + ifFalse: [(objectMemory isBytes: moduleName) ifFalse: + [failPtr ifNotNil: [failPtr at: 0 put: PrimErrBadMethod]. + ^0]. + moduleLength := objectMemory numBytesOfBytes: moduleName]. + functionName := objectMemory fetchPointer: ExternalCallLiteralFunctionNameIndex ofObject: externalCallLiteral. + (objectMemory isBytes: functionName) ifFalse: + [failPtr ifNotNil: [failPtr at: 0 put: PrimErrBadMethod]. + ^0]. + functionLength := objectMemory numBytesOfBytes: functionName. + + "Spur needs metadata for the primitive, which is stored in the third slot of the literal." + objectMemory hasSpurMemoryManagerAPI + ifTrue: + [addr := self ioLoadExternalFunction: functionName + objectMemory baseHeaderSize + OfLength: functionLength + FromModule: moduleName + objectMemory baseHeaderSize + OfLength: moduleLength + MetadataInto: (self addressOf: metadata + put: [:val| metadata := val]). + addr = 0 + ifTrue: [index := -1] + ifFalse: "add the function to the external primitive table" + [self assert: (metadata >>> SpurPrimitiveAccessorDepthShift between: -1 and: 5). + index := self addToExternalPrimitiveTable: addr. + objectMemory + storePointerUnchecked: ExternalCallLiteralFlagsIndex + ofObject: externalCallLiteral + withValue: (objectMemory integerObjectOf: metadata)]] + ifFalse: + [addr := self ioLoadExternalFunction: functionName + objectMemory baseHeaderSize + OfLength: functionLength + FromModule: moduleName + objectMemory baseHeaderSize + OfLength: moduleLength. + addr = 0 + ifTrue: [index := -1] + ifFalse: "add the function to the external primitive table" + [index := self addToExternalPrimitiveTable: addr]]. + + "Store the index (or -1 if failure) back in the literal" + objectMemory + storePointerUnchecked: ExternalCallLiteralTargetFunctionIndex + ofObject: externalCallLiteral + withValue: (objectMemory integerObjectOf: index). + + "If the function has been successfully loaded cache it" + self rewriteMethodCacheEntryForExternalPrimitiveToFunction: (index >= 0 + ifTrue: [self cCode: [addr] inSmalltalk: [1000 + index]] + ifFalse: [0]). + ^addr! Item was removed: - ----- Method: StackInterpreterPrimitives>>linkExternalCall:ifFail: (in category 'plugin primitive support') ----- - linkExternalCall: externalCallLiteral ifFail: failBlock - <inline: #always> - "The function has not been loaded yet. Fetch module and function name." - | addr functionLength functionName index metadata moduleLength moduleName | - <var: #addr declareC: 'void (*addr)()'> - moduleName := objectMemory fetchPointer: ExternalCallLiteralModuleNameIndex ofObject: externalCallLiteral. - moduleName = objectMemory nilObject - ifTrue: [moduleLength := 0] - ifFalse: [(objectMemory isBytes: moduleName) ifFalse: - [failBlock value. - ^0]. - moduleLength := objectMemory lengthOf: moduleName]. - functionName := objectMemory fetchPointer: ExternalCallLiteralFunctionNameIndex ofObject: externalCallLiteral. - (objectMemory isBytes: functionName) ifFalse: - [failBlock value. - ^0]. - functionLength := objectMemory lengthOf: functionName. - - "Spur needs metadata for the primitive, which is stored in the third slot of the literal." - objectMemory hasSpurMemoryManagerAPI - ifTrue: - [addr := self ioLoadExternalFunction: functionName + objectMemory baseHeaderSize - OfLength: functionLength - FromModule: moduleName + objectMemory baseHeaderSize - OfLength: moduleLength - MetadataInto: (self addressOf: metadata - put: [:val| metadata := val]). - addr = 0 - ifTrue: [index := -1] - ifFalse: "add the function to the external primitive table" - [index := self addToExternalPrimitiveTable: addr. - objectMemory - storePointerUnchecked: ExternalCallLiteralFlagsIndex - ofObject: externalCallLiteral - withValue: (objectMemory integerObjectOf: metadata)]] - ifFalse: - [addr := self ioLoadExternalFunction: functionName + objectMemory baseHeaderSize - OfLength: functionLength - FromModule: moduleName + objectMemory baseHeaderSize - OfLength: moduleLength. - addr = 0 - ifTrue: [index := -1] - ifFalse: "add the function to the external primitive table" - [index := self addToExternalPrimitiveTable: addr]]. - - "Store the index (or -1 if failure) back in the literal" - objectMemory - storePointerUnchecked: ExternalCallLiteralTargetFunctionIndex - ofObject: externalCallLiteral - withValue: (objectMemory integerObjectOf: index). - - "If the function has been successfully loaded cache it" - self rewriteMethodCacheEntryForExternalPrimitiveToFunction: (index >= 0 - ifTrue: [self cCode: [addr] inSmalltalk: [1000 + index]] - ifFalse: [0]). - ^addr! Item was changed: ----- Method: StackInterpreterPrimitives>>primitiveDoNamedPrimitiveWithArgs (in category 'plugin primitives') ----- primitiveDoNamedPrimitiveWithArgs "Simulate an primitiveExternalCall invocation (e.g. for the Debugger). Do not cache anything. e.g. ContextPart>>tryNamedPrimitiveIn: aCompiledMethod for: aReceiver withArgs: arguments" | argumentArray arraySize methodArg methodHeader moduleName functionName moduleLength functionLength spec addr primRcvr isArray | <var: #addr declareC: 'void (*addr)()'> objectMemory hasSpurMemoryManagerAPI ifTrue: "See checkForAndFollowForwardedPrimitiveState" [metaAccessorDepth := -2]. argumentArray := self stackTop. methodArg := self stackValue: 2. ((objectMemory isArray: argumentArray) and: [objectMemory isOopCompiledMethod: methodArg]) ifFalse: [^self primitiveFailFor: -2]. "invalid args" arraySize := objectMemory numSlotsOf: argumentArray. (self roomToPushNArgs: arraySize) ifFalse: [^self primitiveFailFor: -2]. "invalid args" methodHeader := objectMemory methodHeaderOf: methodArg. (objectMemory literalCountOfMethodHeader: methodHeader) > 2 ifFalse: [^self primitiveFailFor: -3]. "invalid methodArg state" spec := objectMemory fetchPointer: 1 "first literal" ofObject: methodArg. isArray := self isInstanceOfClassArray: spec. (isArray and: [(objectMemory numSlotsOf: spec) = 4 and: [(self primitiveIndexOfMethod: methodArg header: methodHeader) = PrimNumberExternalCall]]) ifFalse: [^self primitiveFailFor: -3]. "invalid methodArg state" (self argumentCountOfMethodHeader: methodHeader) = arraySize ifFalse: [^self primitiveFailFor: -2]. "invalid args (Array args wrong size)" "The function has not been loaded yet. Fetch module and function name." moduleName := objectMemory fetchPointer: 0 ofObject: spec. moduleName = objectMemory nilObject ifTrue: [moduleLength := 0] ifFalse: [self success: (objectMemory isBytes: moduleName). + moduleLength := objectMemory numBytesOfBytes: moduleName]. - moduleLength := objectMemory lengthOf: moduleName]. functionName := objectMemory fetchPointer: 1 ofObject: spec. self success: (objectMemory isBytes: functionName). + functionLength := objectMemory numBytesOfBytes: functionName. - functionLength := objectMemory lengthOf: functionName. self successful ifFalse: [^self primitiveFailFor: -3]. "invalid methodArg state" "Spur needs to know the primitive's accessorDepth." objectMemory hasSpurMemoryManagerAPI ifTrue: [addr := self ioLoadExternalFunction: functionName + objectMemory baseHeaderSize OfLength: functionLength FromModule: moduleName + objectMemory baseHeaderSize OfLength: moduleLength MetadataInto: (self addressOf: metaAccessorDepth put: [:val| metaAccessorDepth := val]). "N.B. the accessor depth is the second byte of the primitive's metadata; the first byte is various flags (currently l.s.b. = use fast C linkage)." metaAccessorDepth := addr = 0 ifTrue: [-2] ifFalse: [metaAccessorDepth bitShift: -8]] ifFalse: [addr := self ioLoadExternalFunction: functionName + objectMemory baseHeaderSize OfLength: functionLength FromModule: moduleName + objectMemory baseHeaderSize OfLength: moduleLength]. addr = 0 ifTrue: [^self primitiveFailFor: -1]. "could not find function; answer generic failure (see below)" "Cannot fail this primitive from now on. Can only fail the external primitive." tempOop := objectMemory eeInstantiateClassIndex: ClassArrayCompactIndex format: objectMemory arrayFormat numSlots: 4. objectMemory storePointerUnchecked: 0 ofObject: tempOop withValue: (argumentArray := self popStack); storePointerUnchecked: 1 ofObject: tempOop withValue: (primRcvr := self popStack); storePointerUnchecked: 2 ofObject: tempOop withValue: self popStack; "the method" storePointerUnchecked: 3 ofObject: tempOop withValue: self popStack. "the context receiver" self push: primRcvr. "replace context receiver with actual receiver" argumentCount := arraySize. 1 to: arraySize do: [:index| self push: (objectMemory fetchPointer: index - 1 ofObject: argumentArray)]. self callExternalPrimitive: addr. self successful ifFalse: "If primitive failed, then restore state for failure code" [self pop: arraySize + 1. self push: (objectMemory fetchPointer: 3 ofObject: tempOop). self push: (objectMemory fetchPointer: 2 ofObject: tempOop). self push: (objectMemory fetchPointer: 1 ofObject: tempOop). self push: (objectMemory fetchPointer: 0 ofObject: tempOop). argumentCount := 3. "Must reset primitiveFunctionPointer for checkForAndFollowForwardedPrimitiveState" objectMemory hasSpurMemoryManagerAPI ifTrue: [primitiveFunctionPointer := #primitiveDoNamedPrimitiveWithArgs]. "Hack. A nil prim error code (primErrorCode = 1) is interpreted by the image as meaning this primitive is not implemented. So to pass back nil as an error code we use -1 to indicate generic failure." primFailCode = 1 ifTrue: [primFailCode := -1]]! Item was changed: ----- Method: StackInterpreterPrimitives>>primitiveExternalCall (in category 'plugin primitives') ----- primitiveExternalCall "Call an external primitive. External primitive methods first literals are an array of * The module name (String | Symbol) * The function name (String | Symbol) * The session ID (SmallInteger) [OBSOLETE], or in Spur, the metadata (accessorDepth and flags; Integer)) * The function index (Integer) in the externalPrimitiveTable For fast interpreter dispatch in subsequent invocations the primitiveFunctionPointer in the method cache is rewritten, either to the function itself, or to zero if the external function is not found. This allows for fast responses as long as the method stays in the cache. The cache rewrite relies on lastMethodCacheProbeWrite which is set in addNewMethodToCache:. Now that the VM flushes function addresses from its tables, the session ID is obsolete, but it is kept for backward compatibility. Also, a failed lookup is reported specially. If a method has been looked up and not been found, the function address is stored as -1 (i.e., the SmallInteger -1 to distinguish from 16rFFFFFFFF which may be returned from lookup), and the primitive fails with PrimErrNotFound." | lit addr index | "Check for it being a method for primitiveDoPrimitiveWithArgs. Fetch the first literal of the method; check its an Array of length 4. Look at the function index in case it has been loaded before" ((objectMemory isOopCompiledMethod: newMethod) and: [(objectMemory literalCountOf: newMethod) > 0 and: [lit := self literal: 0 ofMethod: newMethod. (objectMemory isArray: lit) and: [(objectMemory numSlotsOf: lit) = 4 and: [index := objectMemory fetchPointer: ExternalCallLiteralTargetFunctionIndex ofObject: lit. objectMemory isIntegerObject: index]]]]) ifFalse: [^self primitiveFailFor: PrimErrBadMethod]. index := objectMemory integerValueOf: index. "Check if we have already looked up the function and failed." index < 0 ifTrue: ["Function address was not found in this session, Void the primitive function." self rewriteMethodCacheEntryForExternalPrimitiveToFunction: 0. ^self primitiveFailFor: PrimErrNotFound]. "Try to call the function directly" (index > 0 and: [index <= MaxExternalPrimitiveTableSize]) ifTrue: [addr := externalPrimitiveTable at: index - 1. addr ~= 0 ifTrue: [self rewriteMethodCacheEntryForExternalPrimitiveToFunction: (self cCode: 'addr' inSmalltalk: [1000 + index]). self callExternalPrimitive: addr. "On Spur, sets primitiveFunctionPointer" self maybeRetryPrimitiveOnFailure. ^nil]. "if we get here, then an index to the external prim was kept on the ST side although the underlying prim table was already flushed" ^self primitiveFailFor: PrimErrNamedInternal]. "Clean up session id/metadata and external primitive index" objectMemory storePointerUnchecked: ExternalCallLiteralFlagsIndex ofObject: lit withValue: ConstZero. objectMemory storePointerUnchecked: ExternalCallLiteralTargetFunctionIndex ofObject: lit withValue: ConstZero. "The function has not been loaded yet. Attempt to link it, cache it, and call it." + addr := self linkExternalCall: lit errInto: (self addressOf: primFailCode put: [:v| primFailCode := v]). - addr := self linkExternalCall: lit ifFail: [^self primitiveFailFor: PrimErrBadMethod]. addr = 0 ifTrue: [self assert: (objectMemory fetchPointer: ExternalCallLiteralFlagsIndex ofObject: lit) = ConstZero. + ^self primitiveFailFor: (primFailCode = 0 ifTrue: [PrimErrNotFound] ifFalse: [primFailCode])]. - ^self primitiveFailFor: PrimErrNotFound]. self callExternalPrimitive: addr. self maybeRetryPrimitiveOnFailure ! Item was changed: ----- Method: StackInterpreterSimulator>>classNameOf:Is: (in category 'plugin support') ----- classNameOf: aClass Is: className "Check if aClass' name is className" | name | + (objectMemory numSlotsOf: aClass) <= classNameIndex ifTrue: - (objectMemory lengthOf: aClass) <= classNameIndex ifTrue: [^false]. "Not a class but maybe behavior" name := objectMemory fetchPointer: classNameIndex ofObject: aClass. (objectMemory isBytes: name) ifFalse: [^false]. ^ className = (self stringOf: name)! Item was changed: VMBasicConstants subclass: #VMSpurObjectRepresentationConstants instanceVariableNames: '' + classVariableNames: 'BecameActiveClassFlag BecameCompiledMethodFlag BecamePointerObjectFlag OldBecameNewFlag SpurPrimitiveAccessorDepthShift SpurPrimitiveFlagsMask' - classVariableNames: 'BecameActiveClassFlag BecameCompiledMethodFlag BecamePointerObjectFlag OldBecameNewFlag' poolDictionaries: '' category: 'VMMaker-Interpreter'!

1 0

VM Maker: VMMaker.oscog-tpr.3018.mcz
by commits＠source.squeak.org 03 Aug '21

03 Aug '21

tim Rowledge uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-tpr.3018.mcz ==================== Summary ==================== Name: VMMaker.oscog-tpr.3018 Author: tpr Time: 2 August 2021, 7:11:46.43285 pm UUID: c57c2e71-7aca-4fc8-a32a-887b9393dd3a Ancestors: VMMaker.oscog-eem.3017 Merge Ben Avison's minor changes that help support the improvements he made for the ARM64 bitblt =============== Diff against VMMaker.oscog-eem.3017 =============== Item was changed: ----- Method: BitBltSimulation>>copyBits:Fallback: (in category 'setup') ----- copyBits: op Fallback: flags "Recover from the fast path specialised code saying Help-I-cant-cope" |done | <static: false> <returnTypeC: 'void'> <inline: false> <var: #op type: 'operation_t *'> <var: #flags type:'unsigned int'> self cppIf: #'ENABLE_FAST_BLT' ifTrue:[ "recover values from the operation struct used by the fast ARM code" self cCode:' combinationRule = op->combinationRule; noSource = op->noSource; sourceBits = (sqInt) op->src.bits; sourcePitch = op->src.pitch; sourceDepth = op->src.depth; sourceMSB = op->src.msb; sx = op->src.x; sy = op->src.y; destBits = (sqInt) op->dest.bits; destPitch = op->dest.pitch; destDepth = op->dest.depth; destMSB = op->dest.msb; dx = op->dest.x; dy = op->dest.y; bbW = op->width; bbH = op->height; cmFlags = op->cmFlags; cmShiftTable = (void *) op->cmShiftTable; cmMaskTable = (void *) op->cmMaskTable; cmMask = op->cmMask; cmLookupTable = (void *) op->cmLookupTable; noHalftone = op->noHalftone; halftoneHeight = op->halftoneHeight; halftoneBase = (sqInt) op->halftoneBase; if (combinationRule == 30 || combinationRule == 31) { sourceAlpha = op->opt.sourceAlpha; } if (combinationRule == 41) { componentAlphaModeColor = op->opt.componentAlpha.componentAlphaModeColor; componentAlphaModeAlpha = op->opt.componentAlpha.componentAlphaModeAlpha; gammaLookupTable = (void *) op->opt.componentAlpha.gammaLookupTable; ungammaLookupTable = (void *) op->opt.componentAlpha.ungammaLookupTable; }'. destPPW := 32 / destDepth. + sourcePPW := 32 / sourceDepth. cmBitsPerColor := 0. cmMask = 16r1FF ifTrue: [cmBitsPerColor := 3]. cmMask = 16rFFF ifTrue: [cmBitsPerColor := 4]. cmMask = 16r7FFF ifTrue: [cmBitsPerColor := 5]. + " In some places, sourceForm and destForm are compared in order to detect + whether we're reading and writing the same image. However, these have + not always been initialised by the time we get here, so substitute + sourceBits and destBits if so. " + (sourceForm == 0 and: [destForm == 0]) + ifTrue: + [sourceForm := sourceBits. + destForm := destBits]. "Try a shortcut for stuff that should be run as quickly as possible" done := self tryCopyingBitsQuickly. done ifTrue:[^nil]. bitCount := 0. "Choose and perform the actual copy loop." self performCopyLoop] ! Item was changed: ----- Method: BitBltSimulation>>rgbComponentAlpha:with: (in category 'combination rules') ----- rgbComponentAlpha: sourceWord with: destinationWord " componentAlphaModeColor is the color, sourceWord contains an alpha value for each component of RGB each of which is encoded as0 meaning 0.0 and 255 meaning 1.0 . the rule is... color = componentAlphaModeColor. colorAlpha = componentAlphaModeAlpha. mask = sourceWord. dst.A = colorAlpha + (1 - colorAlpha) * dst.A dst.R = color.R * mask.R * colorAlpha + (1 - (mask.R * colorAlpha)) * dst.R dst.G = color.G * mask.G * colorAlpha + (1 - (mask.G* colorAlpha)) * dst.G dst.B = color.B * mask.B * colorAlpha + (1 - (mask.B* colorAlpha)) * dst.B " <inline: false> "Do NOT inline this into optimized loops" | alpha | alpha := sourceWord. + "This is not a valid optimisation because alpha == 0 can change the destination + due to rounding errors in blending and/or in gamma lookup round-trip + alpha = 0 ifTrue:[^destinationWord]." - alpha = 0 ifTrue:[^destinationWord]. ^self partitionedRgbComponentAlpha: sourceWord dest: destinationWord nBits: destDepth nPartitions: destPPW.!

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev August 2021