Vm-dev December 2022

vm-dev@lists.squeakfoundation.org

12 participants
52 discussions

[OpenSmalltalk/opensmalltalk-vm] d56cdd: Make sure ClipboardExtendedPlugin is internal to a...
by Eliot Miranda 15 Dec '22

15 Dec '22

Branch: refs/heads/virtend Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: d56cddf99581ef934cbd3826720e54b959f13297 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/d56cddf99581ef934c… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2022-12-15 (Thu, 15 Dec 2022) Changed paths: M building/win32x86/newspeak.cog.spur/plugins.ext M building/win32x86/newspeak.cog.spur/plugins.int M building/win32x86/newspeak.stack.spur/plugins.ext M building/win32x86/newspeak.stack.spur/plugins.int M building/win32x86/pharo.cog.spur/plugins.ext M building/win32x86/pharo.cog.spur/plugins.int M building/win32x86/pharo.sista.spur/plugins.ext M building/win32x86/pharo.sista.spur/plugins.int M building/win32x86/pharo.stack.spur/plugins.ext M building/win32x86/pharo.stack.spur/plugins.int M building/win32x86/squeak.cog.spur.lowcode/plugins.ext M building/win32x86/squeak.cog.spur.lowcode/plugins.int M building/win32x86/squeak.cog.spur/plugins.ext M building/win32x86/squeak.cog.spur/plugins.int M building/win32x86/squeak.cog.v3/plugins.ext M building/win32x86/squeak.cog.v3/plugins.int M building/win32x86/squeak.sista.spur/plugins.ext M building/win32x86/squeak.sista.spur/plugins.int M building/win32x86/squeak.stack.spur/plugins.ext M building/win32x86/squeak.stack.spur/plugins.int M building/win32x86/squeak.stack.v3/plugins.ext M building/win32x86/squeak.stack.v3/plugins.int M building/win64x64/squeak.cog.spur/plugins.ext M building/win64x64/squeak.cog.spur/plugins.int M building/win64x64/squeak.stack.spur/plugins.ext M building/win64x64/squeak.stack.spur/plugins.int Log Message: ----------- Make sure ClipboardExtendedPlugin is internal to all Squeak spur VMs. Make sure all plugins.int/.ext files are in unix format

1 0

[OpenSmalltalk/opensmalltalk-vm] 2699c0: Fix dependency for sqNamedPrims.h on windows; path...
by Eliot Miranda 15 Dec '22

15 Dec '22

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 2699c0d545911e36ea9066f1f4c9d777e49faf34 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/2699c0d545911e36ea… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2022-12-04 (Sun, 04 Dec 2022) Changed paths: M building/win32x86/common/Makefile M building/win32x86/common/Makefile.msvc M building/win64x64/common/Makefile M building/win64x64/common/Makefile.msvc Log Message: ----------- Fix dependency for sqNamedPrims.h on windows; path for sqNamedPrims.c was wrong Commit: 76da8d4bf5bd4c8d22498b42d682c729edb3ac94 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/76da8d4bf5bd4c8d22… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2022-12-15 (Thu, 15 Dec 2022) Changed paths: M platforms/Cross/vm/sqMemoryAccess.h M platforms/Mac OS/vm/sqMacMemory.c M platforms/iOS/vm/Common/sqMacV2Memory.c M platforms/minheadless/windows/sqWin32SpurAlloc.c M platforms/unix/vm/sqUnixSpurMemory.c M platforms/win32/vm/sqWin32SpurAlloc.c R src/plugins/MP4MediaFilePlugin M src/spur32.cog.lowcode/cogit.h M src/spur32.cog.lowcode/cogitARMv5.c M src/spur32.cog.lowcode/cogitIA32.c M src/spur32.cog.lowcode/cointerp.c M src/spur32.cog.lowcode/cointerp.h M src/spur32.cog.lowcode/gcc3x-cointerp.c M src/spur32.cog/cogit.h M src/spur32.cog/cogitARMv5.c M src/spur32.cog/cogitIA32.c M src/spur32.cog/cointerp.c M src/spur32.cog/cointerp.h M src/spur32.cog/cointerpmt.c M src/spur32.cog/cointerpmt.h M src/spur32.cog/gcc3x-cointerp.c M src/spur32.cog/gcc3x-cointerpmt.c M src/spur32.sista/cogit.h M src/spur32.sista/cogitARMv5.c M src/spur32.sista/cogitIA32.c M src/spur32.sista/cointerp.c M src/spur32.sista/cointerp.h M src/spur32.sista/gcc3x-cointerp.c M src/spur32.stack.lowcode/gcc3x-interp.c M src/spur32.stack.lowcode/interp.c M src/spur32.stack/gcc3x-interp.c M src/spur32.stack/interp.c M src/spur64.cog.lowcode/cogit.h M src/spur64.cog.lowcode/cogitARMv8.c M src/spur64.cog.lowcode/cogitX64SysV.c M src/spur64.cog.lowcode/cogitX64WIN64.c M src/spur64.cog.lowcode/cointerp.c M src/spur64.cog.lowcode/cointerp.h M src/spur64.cog.lowcode/gcc3x-cointerp.c M src/spur64.cog.newspeak/cogitARMv8.c M src/spur64.cog.newspeak/cogitX64SysV.c M src/spur64.cog.newspeak/cogitX64WIN64.c M src/spur64.cog.newspeak/cointerp.c M src/spur64.cog.newspeak/gcc3x-cointerp.c M src/spur64.cog/cogit.h M src/spur64.cog/cogitARMv8.c M src/spur64.cog/cogitX64SysV.c M src/spur64.cog/cogitX64WIN64.c M src/spur64.cog/cointerp.c M src/spur64.cog/cointerp.h M src/spur64.cog/cointerpmt.c M src/spur64.cog/cointerpmt.h M src/spur64.cog/gcc3x-cointerp.c M src/spur64.cog/gcc3x-cointerpmt.c M src/spur64.sista/cogit.h M src/spur64.sista/cogitARMv8.c M src/spur64.sista/cogitX64SysV.c M src/spur64.sista/cogitX64WIN64.c M src/spur64.sista/cointerp.c M src/spur64.sista/cointerp.h M src/spur64.sista/gcc3x-cointerp.c M src/spur64.stack.lowcode/gcc3x-interp.c M src/spur64.stack.lowcode/interp.c M src/spur64.stack/gcc3x-interp.c M src/spur64.stack/interp.c M src/v3.cog/cogit.h M src/v3.cog/cogitARMv5.c M src/v3.cog/cogitIA32.c M src/v3.cog/cointerp.c M src/v3.cog/cointerp.h M src/v3.cog/gcc3x-cointerp.c M src/v3.stack/gcc3x-interp.c M src/v3.stack/interp.c Log Message: ----------- Merge branch 'Cog' of github.com:OpenSmalltalk/opensmalltalk-vm into Cog Commit: 547723dd1821df84a160d368f7940ee680ba8d2a https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/547723dd1821df84a1… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2022-12-15 (Thu, 15 Dec 2022) Changed paths: M building/win32x86/newspeak.cog.spur/plugins.ext M building/win32x86/newspeak.cog.spur/plugins.int M building/win32x86/newspeak.stack.spur/plugins.ext M building/win32x86/newspeak.stack.spur/plugins.int M building/win32x86/pharo.cog.spur/plugins.ext M building/win32x86/pharo.cog.spur/plugins.int M building/win32x86/pharo.sista.spur/plugins.ext M building/win32x86/pharo.sista.spur/plugins.int M building/win32x86/pharo.stack.spur/plugins.ext M building/win32x86/pharo.stack.spur/plugins.int M building/win32x86/squeak.cog.spur.lowcode/plugins.ext M building/win32x86/squeak.cog.spur.lowcode/plugins.int M building/win32x86/squeak.cog.spur/plugins.ext M building/win32x86/squeak.cog.spur/plugins.int M building/win32x86/squeak.cog.v3/plugins.ext M building/win32x86/squeak.cog.v3/plugins.int M building/win32x86/squeak.sista.spur/plugins.ext M building/win32x86/squeak.sista.spur/plugins.int M building/win32x86/squeak.stack.spur/plugins.ext M building/win32x86/squeak.stack.spur/plugins.int M building/win32x86/squeak.stack.v3/plugins.ext M building/win32x86/squeak.stack.v3/plugins.int M building/win64x64/squeak.cog.spur/plugins.ext M building/win64x64/squeak.cog.spur/plugins.int M building/win64x64/squeak.stack.spur/plugins.ext M building/win64x64/squeak.stack.spur/plugins.int Log Message: ----------- Make sure ClipboardExtendedPlugin is internal to all Squeak spur VMs. Make sure all plugins.int/.ext files are in unix format Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/9aebec0fabb2...54…

1 0

[OpenSmalltalk/opensmalltalk-vm] 6f21cb: CogVM source as per VMMaker.oscog-eem.3282
by Eliot Miranda 14 Dec '22

14 Dec '22

Branch: refs/heads/virtend Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 6f21cbc8f65f522bc7aa87195e7a3890a8ca9755 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/6f21cbc8f65f522bc7… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2022-12-13 (Tue, 13 Dec 2022) Changed paths: M src/spur32.cog.lowcode/cogit.h M src/spur32.cog.lowcode/cogitARMv5.c M src/spur32.cog.lowcode/cogitIA32.c M src/spur32.cog/cogit.h M src/spur32.cog/cogitARMv5.c M src/spur32.cog/cogitIA32.c M src/spur32.sista/cogit.h M src/spur32.sista/cogitARMv5.c M src/spur32.sista/cogitIA32.c M src/spur64.cog.lowcode/cogit.h M src/spur64.cog.lowcode/cogitARMv8.c M src/spur64.cog.lowcode/cogitX64SysV.c M src/spur64.cog.lowcode/cogitX64WIN64.c M src/spur64.cog/cogit.h M src/spur64.cog/cogitARMv8.c M src/spur64.cog/cogitX64SysV.c M src/spur64.cog/cogitX64WIN64.c M src/spur64.sista/cogit.h M src/spur64.sista/cogitARMv8.c M src/spur64.sista/cogitX64SysV.c M src/spur64.sista/cogitX64WIN64.c M src/v3.cog/cogit.h M src/v3.cog/cogitARMv5.c M src/v3.cog/cogitIA32.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.3282 Check the argument count of the target method in the jitted perform primitive. Thanks to Boris Shingarov and Juan Vuletich for finding this. Commit: b3451ed511c7b11ba667b547ac34fde37d503c47 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/b3451ed511c7b11ba6… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2022-12-13 (Tue, 13 Dec 2022) Changed paths: M platforms/Cross/vm/sqMemoryAccess.h M platforms/Mac OS/vm/sqMacMemory.c M platforms/iOS/vm/Common/sqMacV2Memory.c M platforms/minheadless/windows/sqWin32SpurAlloc.c M platforms/unix/vm/sqUnixSpurMemory.c M platforms/win32/vm/sqWin32SpurAlloc.c Log Message: ----------- Change the type of sqAllocateMemorySegmentOfSizeAboveAllocatedSizeInto to get sqMacV2Memory.c to compile on 32-bit MacOS. It should have taken usqInts in the first place. Implement allocateJITMemory for sqMacV2Memory.c/V3 macOS. Commit: c5c526cc08453e4f0a0703776e93681a80f740cb https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/c5c526cc08453e4f0a… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2022-12-13 (Tue, 13 Dec 2022) Changed paths: M src/spur32.cog.lowcode/cogit.h M src/spur32.cog.lowcode/cogitARMv5.c M src/spur32.cog.lowcode/cogitIA32.c M src/spur32.cog/cogit.h M src/spur32.cog/cogitARMv5.c M src/spur32.cog/cogitIA32.c M src/spur32.sista/cogit.h M src/spur32.sista/cogitARMv5.c M src/spur32.sista/cogitIA32.c M src/spur64.cog.lowcode/cogit.h M src/spur64.cog.lowcode/cogitARMv8.c M src/spur64.cog.lowcode/cogitX64SysV.c M src/spur64.cog.lowcode/cogitX64WIN64.c M src/spur64.cog/cogit.h M src/spur64.cog/cogitARMv8.c M src/spur64.cog/cogitX64SysV.c M src/spur64.cog/cogitX64WIN64.c M src/spur64.sista/cogit.h M src/spur64.sista/cogitARMv8.c M src/spur64.sista/cogitX64SysV.c M src/spur64.sista/cogitX64WIN64.c M src/v3.cog/cogit.h M src/v3.cog/cogitARMv5.c M src/v3.cog/cogitIA32.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.3283 Implement a machine code primitive for 84 perform:withArguments:. It is about 5x faster, and some applications make heavy use of it. Have genLoadcmNumArgsOf:into: deal with the optional zero-extension byte read convention. Fix slips in CogARMv8Compiler>>isImmNImmSImmREncodableBitmask:ifTrue:ifFalse:/ decodeN:imms:immr: Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/1a7f4f3c818f...c5…

1 0

[OpenSmalltalk/opensmalltalk-vm] 9aebec: CogVM source as per VMMaker.oscog-eem.3283
by Eliot Miranda 14 Dec '22

14 Dec '22

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 9aebec0fabb2482baebbc263032b44c9a4b42b95 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/9aebec0fabb2482bae… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2022-12-13 (Tue, 13 Dec 2022) Changed paths: M src/spur32.cog.lowcode/cogit.h M src/spur32.cog.lowcode/cogitARMv5.c M src/spur32.cog.lowcode/cogitIA32.c M src/spur32.cog/cogit.h M src/spur32.cog/cogitARMv5.c M src/spur32.cog/cogitIA32.c M src/spur32.sista/cogit.h M src/spur32.sista/cogitARMv5.c M src/spur32.sista/cogitIA32.c M src/spur64.cog.lowcode/cogit.h M src/spur64.cog.lowcode/cogitARMv8.c M src/spur64.cog.lowcode/cogitX64SysV.c M src/spur64.cog.lowcode/cogitX64WIN64.c M src/spur64.cog/cogit.h M src/spur64.cog/cogitARMv8.c M src/spur64.cog/cogitX64SysV.c M src/spur64.cog/cogitX64WIN64.c M src/spur64.sista/cogit.h M src/spur64.sista/cogitARMv8.c M src/spur64.sista/cogitX64SysV.c M src/spur64.sista/cogitX64WIN64.c M src/v3.cog/cogit.h M src/v3.cog/cogitARMv5.c M src/v3.cog/cogitIA32.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.3283 Implement a machine code primitive for 84 perform:withArguments:. It is about 5x faster, and some applications make heavy use of it. Have genLoadcmNumArgsOf:into: deal with the optional zero-extension byte read convention. Fix slips in CogARMv8Compiler>>isImmNImmSImmREncodableBitmask:ifTrue:ifFalse:/ decodeN:imms:immr:

1 0

VM Maker: VMMaker.oscog-eem.3283.mcz
by commits＠source.squeak.org 14 Dec '22

14 Dec '22

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3283.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3283 Author: eem Time: 13 December 2022, 5:38:34.192759 pm UUID: f71bc561-0105-4115-ba0a-2656d886c8ad Ancestors: VMMaker.oscog-eem.3282 Implement a machine code primitive for 84 perform:withArguments:. It is about 5x faster, and some applications make heavy use of it. Have genLoadcmNumArgsOf:into: deal with the optional zero-extension byte read convention. Fix slips in CogARMv8Compiler>>decodeN:imms:immr:/isImmNImmSImmREncodableBitmask:ifTrue:ifFalse: Generalize instructionIndex so one can have a collection of breakpoints for maybeBreakGeneratingInstructionWithIndex:, and have Cog[SS]BytecodeFixup print its instruction index. Fix some comments =============== Diff against VMMaker.oscog-eem.3282 =============== Item was changed: ----- Method: CogARMv8Compiler>>decodeN:imms:immr: (in category 'generate machine code - support') ----- decodeN: n imms: imms immr: immr "See aarch64/instrs/integer/bitmasks/DecodeBitMasks J1-7389." <returnTypeC: #usqInt> | bits immediate mask rotation width | <var: 'mask' type: #usqInt> self assert: ((n between: 0 and: 1) and: [(imms between: 0 and: 63) and: [immr between: 0 and: 63]]). "For logical immediates an all-ones value of S is reserved since it would generate a useless all-ones result (many times)" imms = 63 ifTrue: [^self cCode: [0] inSmalltalk: [#undefined]]. n = 1 ifTrue: [width := 64. mask := 16rffffffffffffffff. bits := imms. rotation := immr] ifFalse: [imms < 16r20 ifTrue: [width := 32. bits := imms] ifFalse: [ imms < 16r30 ifTrue: [width := 16. bits := imms bitAnd: 16rF] ifFalse: [ imms < 16r38 ifTrue: [width := 8. bits := imms bitAnd: 16r7] ifFalse: [ imms < 16r3C ifTrue: [width := 4. bits := imms bitAnd: 16r3] ifFalse: [ imms < 16r3E ifTrue: [width := 2. bits := imms bitAnd: 16r1] ifFalse: [self error: 'invalid logical immediate']]]]]. mask := 1 << width - 1. rotation := immr bitAnd: width - 1]. width - 1 = bits ifTrue: [^0]. immediate := (1 << (bits + 1)) - 1. rotation > 0 ifTrue: + [immediate := immediate << (width - rotation)]. - [immediate := immediate << (width - rotation) - 1]. (width between: 2 and: 32) ifTrue: [immediate := (immediate bitShift: width) bitOr: immediate]. ^immediate! Item was added: + ----- Method: CogARMv8Compiler>>deconstructBitwiseImmediateInsruction: (in category 'debugging') ----- + deconstructBitwiseImmediateInsruction: v + <doNotGenerate> + ^{#n. v >> 22 bitAnd: 1. #imms. v >> 10 bitAnd: 16r3F. (v >> 10 bitAnd: 16r3F) hex. #immr. v >> 16 bitAnd: 16r3F. (v >> 16 bitAnd: 16r3F) hex } + + "self basicNew deconstructBitwiseImmediateInsruction: 16r321a3be0"! Item was changed: ----- Method: CogARMv8Compiler>>isImmNImmSImmREncodableBitmask:ifTrue:ifFalse: (in category 'generate machine code - support') ----- isImmNImmSImmREncodableBitmask: constant ifTrue: trinaryBlock "[:n :imms :immr|...]" ifFalse: nullaryBlock "See DecodeBitMasks J1-7389. See https://dinfuehr.github.io/blog/encoding-of-immediate-values-on-aarch64/ This method is adapted from The LLVM Compiler Infrastructure, AArch64AddressingModes.h processLogicalImmediate" <inline: #always> | imm size mask numLeadingOnes numTrailingOnes immr n nImms rotateCount | <var: 'mask' type: #usqInt> <var: 'nImms' type: #usqInt> (constant between: -1 and: 0) ifTrue: [^nullaryBlock value]. imm := self cCode: [constant] inSmalltalk: [constant signedIntToLong64]. "First, determine the element size." size := 32. [mask := 1 << size - 1. + (imm bitAnd: mask) ~= ((imm >> size) bitAnd: mask) - (imm bitAnd: mask) ~= (imm >> size) ifTrue: [size := size * 2. false] ifFalse: [size > 2]] whileTrue: [size := size / 2]. "Second, determine the rotation to make the element be: 0^m 1^n." mask := 1 << 64 - 1 >> (64 - size). imm := imm bitAnd: mask. (self isShiftedMask: imm) ifTrue: [rotateCount := self countTrailingZeros: imm. numTrailingOnes := self countTrailingOnes: imm >> rotateCount] ifFalse: [imm := imm bitOr: mask bitInvert64. (self isShiftedMask: imm) ifFalse: [^nullaryBlock value]. numLeadingOnes := self countLeadingOnes: imm. rotateCount := 64 - numLeadingOnes. numTrailingOnes := numLeadingOnes + (self countTrailingOnes: imm) - (64 - size)]. "Encode in Immr the number of RORs it would take to get *from* 0^m 1^n to our target value, where I is the number of RORs to go the opposite direction." self assert: size > rotateCount. "rotateCount should be smaller than element size" immr := size - rotateCount bitAnd: size - 1. "If size has a 1 in the n'th bit, create a value that has zeroes in bits [0, n] and ones above that." nImms := self cCode: [(size - 1) bitInvert64 << 1] inSmalltalk: [(size - 1) bitInvert64 << 1 bitAnd: 16rFFFFFFFFFFFFFFFF]. "Or the CTO value into the low bits, which must be below the Nth bit mentioned above." nImms := nImms bitOr: numTrailingOnes - 1. "Extract the seventh bit and toggle it to create the N field." n := ((nImms >> 6) bitAnd: 1) bitXor: 1. nImms := nImms bitAnd: 16r3F. self assert: (self decodeN: n imms: nImms immr: immr) = constant signedIntToLong64. ^trinaryBlock value: n value: nImms value: immr ! Item was changed: ----- Method: CogBytecodeFixup>>printStateOn: (in category 'debug printing') ----- printStateOn: aStream <doNotGenerate> + targetInstruction ifNil: + [^self]. + aStream space; nextPut: $(. targetInstruction ifNotNil: + [aStream space; print: targetInstruction]. + instructionIndex ifNotNil: + [aStream nextPutAll: ' ix '; print: instructionIndex]. + bcpc ifNotNil: + [aStream nextPutAll: ' bc '; print: bcpc]. + aStream nextPut: $)! - [aStream space; nextPut: $(; print: targetInstruction; nextPutAll: ' bc '; print: bcpc; nextPut: $)]! Item was added: + ----- Method: CogObjectRepresentationFor32BitSpur>>genFetchRegArgsForPerformWithArguments: (in category 'primitive generators') ----- + genFetchRegArgsForPerformWithArguments: sizeReg + "The arguments are imn an array in Arg1Reg. Its size is in sizeReg. + Load Arg0Reg and Arg1Reg with the first two slots. + Since objects always have at least one slot and are aligned to 64-bits + it is safe to load both args without checking." + + cogit + MoveMw: self baseHeaderSize r: Arg1Reg R: Arg0Reg; + MoveMw: self baseHeaderSize + self wordSize r: Arg1Reg R: Arg1Reg. + ^0! Item was added: + ----- Method: CogObjectRepresentationFor64BitSpur>>genFetchRegArgsForPerformWithArguments: (in category 'primitive generators') ----- + genFetchRegArgsForPerformWithArguments: sizeReg + "The arguments are imn an array in Arg1Reg. Its size is in sizeReg. + Load Arg0Reg and Arg1Reg with the first two slots, as appropriate. + Since objects always have at least one slot it is safe to load arg0 without checking. + But the array could be at teh end of memory so we must check taht it has two + slots before it is safe to access the second slot." + + | skip | + cogit MoveMw: objectMemory baseHeaderSize r: Arg1Reg R: Arg0Reg. + cogit CmpCq: 2 R: sizeReg. + skip := cogit JumpLess: 0. + cogit MoveMw: objectMemory baseHeaderSize + self wordSize r: Arg1Reg R: Arg1Reg. + skip jmpTarget: cogit Label. + ^0! Item was added: + ----- Method: CogObjectRepresentationForSpur>>genFetchRegArgsForPerformWithArguments: (in category 'primitive generators') ----- + genFetchRegArgsForPerformWithArguments: sizeReg + "The arguments are imn an array in Arg1Reg. Its size is in sizeReg. + Load Arg0Reg and Arg1Reg with the first two slots." + ^self subclassResponsibility! Item was added: + ----- Method: CogObjectRepresentationForSpur>>genPrimitivePerformWithArguments (in category 'primitive generators') ----- + genPrimitivePerformWithArguments + <doNotGenerate> + ^cogit genPrimitivePerformWithArguments! Item was changed: ----- Method: CogSSBytecodeFixup>>printStateOn: (in category 'debug printing') ----- printStateOn: aStream <doNotGenerate> (targetInstruction isNil and: [simStackPtr isNil]) ifTrue: [^self]. aStream space; nextPut: $(. targetInstruction ifNotNil: [aStream space; print: targetInstruction]. + instructionIndex ifNotNil: + [aStream nextPutAll: ' ix '; print: instructionIndex]. simStackPtr ifNotNil: [aStream nextPutAll: ' sp '; print: simStackPtr]. bcpc ifNotNil: [aStream nextPutAll: ' bc '; print: bcpc]. aStream nextPut: $)! Item was changed: ----- Method: Cogit class>>initializeErrorCodes (in category 'class initialization') ----- initializeErrorCodes "External errors, returned to or from cog:selector:" NotFullyInitialized := -1. InsufficientCodeSpace := -2. MethodTooBig := -4. YoungSelectorInPIC := -5. EncounteredUnknownBytecode := -6. + UnimplementedPrimitive := -7. "Answered by a primitive generator that always falls back on the interpreter primitive." - UnimplementedPrimitive := -7. ShouldNotJIT := -8. MaxNegativeErrorCode := ShouldNotJIT. "Internal errors returned by generator routines to other generator routines" BadRegisterSet := 1. UnimplementedOperation := 2. "Internal successes answered by CogObjectRepresentation to JIT, etc" + UnfailingPrimitive := 3. "Answered by a primitive generator for a primitive that will never fail, and hence does not need to fall back on the interpreter primitive." + CompletePrimitive := 4 "Answered by a primitive generator that does not need to fall back on the interpreter primitive except for an error code. + The fall back code will only be generated if the method being jitted uses the error code."! - UnfailingPrimitive := 3. "Answered by a primitive generator for a primitive that will never fail" - CompletePrimitive := 4 "Answered by a primitive generator that does not bneed to fall back on the interpreter primitive except for an error code."! Item was changed: ----- Method: Cogit>>MoveMb:r:R: (in category 'abstract instructions') ----- MoveMb: offset r: baseReg R: destReg + "N.B. This instruction is guaranteed to zero-extend the byte into destReg + iff backEnd byteReadsZeroExtend." - "N.B. This instruction is guaranteed to zero-extend the byte into destReg." <inline: true> <returnTypeC: #'AbstractInstruction *'> ^self gen: MoveMbrR quickConstant: offset operand: baseReg operand: destReg! Item was added: + ----- Method: Cogit>>genPrimitivePerformWithArguments (in category 'primitive generators') ----- + genPrimitivePerformWithArguments + "Generate an in-line perform:withArguments: primitive. The lookup code requires the selector to be in Arg0Reg + and the array to be in Arg1Reg. The primitive will only handle cases 0 to numRegArgs. Is it worth it you ask? + Here are arguemnt count requencies for a short run of Croquet/Virtend which show that even for V3, with only + one rtegister arg, it very much is (but we wimp out on V3 cuz of the complexity of checking the Array): + [0] = 253743 52.5% + [1] = 116117 24%/76.5% + [2] = 99876 20.7%/97.2% + [3] = 12837 2.7%/99.9% + [4] = 209 + [5] = 84 + [6] = 2 + [7] = 313 + [8] = 0 + [9] = 0 + [10] = 0 + [11] = 1 + [12] = 0 + [13] = 0 + [14] = 0 + [15] = 0" + ^UnimplementedPrimitive! Item was changed: ----- Method: Cogit>>maybeBreakGeneratingInstructionWithIndex: (in category 'simulation only') ----- maybeBreakGeneratingInstructionWithIndex: index "Variation on maybeBreakAt: that only works for integer abstract instruction indexes, so we can have break blocks that stop at any pc, except when generating." <cmacro: '(i) 0'> "Simulation only; void in C" + (InitializationOptions at: #instructionIndex ifAbsent: nil) ifNotNil: + [:breakIndexOrIndices| + (breakIndexOrIndices isCollection + ifTrue: [breakIndexOrIndices includes: index] + ifFalse: [breakIndexOrIndices = index]) ifTrue: + [self halt]]! - (InitializationOptions at: #instructionIndex ifAbsent: nil) ifNotNil: [:breakIndex| index = breakIndex ifTrue: [self halt]]! Item was changed: ----- Method: SimpleStackBasedCogit class>>initializePrimitiveTableForNewsqueak (in category 'class initialization') ----- initializePrimitiveTableForNewsqueak "Initialize the table of primitive generators. This does not include normal primitives implemented in the coInterpreter. N.B. primitives that don't have an explicit arg count (the integer following the generator) may be variadic." "SimpleStackBasedCogit initializePrimitiveTableForNewsqueak" MaxCompiledPrimitiveIndex := self objectRepresentationClass wordSize = 8 ifTrue: [575] ifFalse: [575]. primitiveTable := CArrayAccessor on: (Array new: MaxCompiledPrimitiveIndex + 1). self table: primitiveTable from: #( "Integer Primitives (0-19)" (1 genPrimitiveAdd 1) (2 genPrimitiveSubtract 1) (3 genPrimitiveLessThan 1) (4 genPrimitiveGreaterThan 1) (5 genPrimitiveLessOrEqual 1) (6 genPrimitiveGreaterOrEqual 1) (7 genPrimitiveEqual 1) (8 genPrimitiveNotEqual 1) (9 genPrimitiveMultiply 1) (10 genPrimitiveDivide 1) (11 genPrimitiveMod 1) (12 genPrimitiveDiv 1) (13 genPrimitiveQuo 1) (14 genPrimitiveBitAnd 1) (15 genPrimitiveBitOr 1) (16 genPrimitiveBitXor 1) (17 genPrimitiveBitShift 1) "(18 primitiveMakePoint)" "(19 primitiveFail)" "Guard primitive for simulation -- *must* fail" "LargeInteger Primitives (20-39)" "(20 primitiveFail)" "(21 primitiveAddLargeIntegers)" "(22 primitiveSubtractLargeIntegers)" "(23 primitiveLessThanLargeIntegers)" "(24 primitiveGreaterThanLargeIntegers)" "(25 primitiveLessOrEqualLargeIntegers)" "(26 primitiveGreaterOrEqualLargeIntegers)" "(27 primitiveEqualLargeIntegers)" "(28 primitiveNotEqualLargeIntegers)" "(29 primitiveMultiplyLargeIntegers)" "(30 primitiveDivideLargeIntegers)" "(31 primitiveModLargeIntegers)" "(32 primitiveDivLargeIntegers)" "(33 primitiveQuoLargeIntegers)" "(34 primitiveBitAndLargeIntegers)" "(35 primitiveBitOrLargeIntegers)" "(36 primitiveBitXorLargeIntegers)" "(37 primitiveBitShiftLargeIntegers)" "Float Primitives (38-59)" "(38 genPrimitiveFloatAt)" "(39 genPrimitiveFloatAtPut)" (40 genPrimitiveAsFloat 0) (41 genPrimitiveFloatAdd 1) (42 genPrimitiveFloatSubtract 1) (43 genPrimitiveFloatLessThan 1) (44 genPrimitiveFloatGreaterThan 1) (45 genPrimitiveFloatLessOrEqual 1) (46 genPrimitiveFloatGreaterOrEqual 1) (47 genPrimitiveFloatEqual 1) (48 genPrimitiveFloatNotEqual 1) (49 genPrimitiveFloatMultiply 1) (50 genPrimitiveFloatDivide 1) "(51 genPrimitiveTruncated)" "(52 genPrimitiveFractionalPart)" "(53 genPrimitiveExponent)" "(54 genPrimitiveTimesTwoPower)" (55 genPrimitiveFloatSquareRoot 0) "(56 genPrimitiveSine)" "(57 genPrimitiveArctan)" "(58 genPrimitiveLogN)" "(59 genPrimitiveExp)" "Subscript and Stream Primitives (60-67)" (60 genPrimitiveAt 1) (61 genPrimitiveAtPut 2) (62 genPrimitiveSize 0) (63 genPrimitiveStringAt 1) (64 genPrimitiveStringAtPut 2) "The stream primitives no longer pay their way; normal Smalltalk code is faster." (65 genFastPrimFail)"was primitiveNext" (66 genFastPrimFail) "was primitiveNextPut" (67 genFastPrimFail) "was primitiveAtEnd" "StorageManagement Primitives (68-79)" (68 genPrimitiveObjectAt 1) "Good for debugger/InstructionStream performance" "(69 primitiveObjectAtPut)" (70 genPrimitiveNew) "For VMMirror support 1 argument instantiateFixedClass: as well as baiscNew" (71 genPrimitiveNewWithArg) "For VMMirror support 2 argument instantiateVariableClass:withSize: as well as baiscNew:" "(72 primitiveArrayBecomeOneWay)" "Blue Book: primitiveBecome" "(73 primitiveInstVarAt)" "(74 primitiveInstVarAtPut)" (75 genPrimitiveIdentityHash 0) "(76 primitiveStoreStackp)" "Blue Book: primitiveAsObject" "(77 primitiveSomeInstance)" "(78 primitiveNextInstance)" (79 genPrimitiveNewMethod 2) "Control Primitives (80-89)" "(80 primitiveFail)" "Blue Book: primitiveBlockCopy" "(81 primitiveFail)" "Blue Book: primitiveValue" "(82 primitiveFail)" "Blue Book: primitiveValueWithArgs" (83 genPrimitivePerform) + (84 genPrimitivePerformWithArguments 2) - "(84 primitivePerformWithArgs)" "(85 primitiveSignal)" "(86 primitiveWait)" "(87 primitiveResume)" "(88 primitiveSuspend)" "(89 primitiveFlushCache)" "System Primitives (110-119)" (110 genPrimitiveIdentical 1) (111 genPrimitiveClass) "For objectClass: and VMMirror support 1 argument classOf: as well as class" "(112 primitiveBytesLeft)" "(113 primitiveQuit)" "(114 primitiveExitToDebugger)" "(115 primitiveChangeClass)" "Blue Book: primitiveOopsLeft" "(116 primitiveFlushCacheByMethod)" "(117 primitiveExternalCall)" "(118 primitiveDoPrimitiveWithArgs)" "(119 primitiveFlushCacheSelective)" (148 genPrimitiveShallowCopy 0) "a.k.a. clone" (165 genPrimitiveIntegerAt 1) "Signed version of genPrimitiveAt" (166 genPrimitiveIntegerAtPut 2) "Signed version of genPrimitiveAtPut" (169 genPrimitiveNotIdentical 1) (170 genPrimitiveAsCharacter) "SmallInteger>>asCharacter, Character class>>value:" (171 genPrimitiveImmediateAsInteger 0) "Character>>asInteger/hash/identityHash, SmallFloat64>>identityHash" "(173 primitiveSlotAt 1)" "(174 primitiveSlotAtPut 2)" (175 genPrimitiveIdentityHash 0) "Behavior>>identityHash" "Old closure primitives" "(186 primitiveFail)" "was primitiveClosureValue" "(187 primitiveFail)" "was primitiveClosureValueWithArgs" "Perform method directly" "(188 primitiveExecuteMethodArgsArray)" "(189 primitiveExecuteMethod)" "Unwind primitives" "(195 primitiveFindNextUnwindContext)" "(196 primitiveTerminateTo)" "(197 primitiveFindHandlerContext)" (198 genFastPrimFail "primitiveMarkUnwindMethod") (199 genFastPrimFail "primitiveMarkHandlerMethod") "new closure primitives" "(200 primitiveClosureCopyWithCopiedValues)" (201 genPrimitiveClosureValue 0) "value" (202 genPrimitiveClosureValue 1) "value:" (203 genPrimitiveClosureValue 2) "value:value:" (204 genPrimitiveClosureValue 3) "value:value:value:" (205 genPrimitiveClosureValue 4) "value:value:value:value:" "(206 genPrimitiveClosureValueWithArgs)" "valueWithArguments:" "(210 primitiveContextAt)" "(211 primitiveContextAtPut)" "(212 primitiveContextSize)" "(218 primitiveDoNamedPrimitiveWithArgs)" "(219 primitiveFail)" "reserved for Cog primitives" "(220 primitiveFail)" "reserved for Cog primitives" (221 genPrimitiveClosureValue 0) "valueNoContextSwitch" (222 genPrimitiveClosureValue 1) "valueNoContextSwitch:" "SmallFloat primitives (540-559)" (541 genPrimitiveSmallFloatAdd 1) (542 genPrimitiveSmallFloatSubtract 1) (543 genPrimitiveSmallFloatLessThan 1) (544 genPrimitiveSmallFloatGreaterThan 1) (545 genPrimitiveSmallFloatLessOrEqual 1) (546 genPrimitiveSmallFloatGreaterOrEqual 1) (547 genPrimitiveSmallFloatEqual 1) (548 genPrimitiveSmallFloatNotEqual 1) (549 genPrimitiveSmallFloatMultiply 1) (550 genPrimitiveSmallFloatDivide 1) "(551 genPrimitiveSmallFloatTruncated 0)" "(552 genPrimitiveSmallFloatFractionalPart 0)" "(553 genPrimitiveSmallFloatExponent 0)" "(554 genPrimitiveSmallFloatTimesTwoPower 1)" (555 genPrimitiveSmallFloatSquareRoot 0) "(556 genPrimitiveSmallFloatSine 0)" "(557 genPrimitiveSmallFloatArctan 0)" "(558 genPrimitiveSmallFloatLogN 0)" "(559 genPrimitiveSmallFloatExp 0)" (575 genPrimitiveHighBit 0) )! Item was changed: ----- Method: SimpleStackBasedCogit class>>initializePrimitiveTableForSqueak (in category 'class initialization') ----- initializePrimitiveTableForSqueak "Initialize the table of primitive generators. This does not include normal primitives implemented in the coInterpreter. N.B. primitives that don't have an explicit arg count (the integer following the generator) may be variadic." "SimpleStackBasedCogit initializePrimitiveTableForSqueak" MaxCompiledPrimitiveIndex := 582. primitiveTable := CArrayAccessor on: (Array new: MaxCompiledPrimitiveIndex + 1). self table: primitiveTable from: #( "Integer Primitives (0-19)" (1 genPrimitiveAdd 1) (2 genPrimitiveSubtract 1) (3 genPrimitiveLessThan 1) (4 genPrimitiveGreaterThan 1) (5 genPrimitiveLessOrEqual 1) (6 genPrimitiveGreaterOrEqual 1) (7 genPrimitiveEqual 1) (8 genPrimitiveNotEqual 1) (9 genPrimitiveMultiply 1) (10 genPrimitiveDivide 1) (11 genPrimitiveMod 1) (12 genPrimitiveDiv 1) (13 genPrimitiveQuo 1) (14 genPrimitiveBitAnd 1) (15 genPrimitiveBitOr 1) (16 genPrimitiveBitXor 1) (17 genPrimitiveBitShift 1) (18 genPrimitiveMakePoint 1) "this is here mainly to remove noise from printPrimTraceLog()" "(19 primitiveFail)" "Guard primitive for simulation -- *must* fail" "LargeInteger Primitives (20-39)" "(20 primitiveFail)" "(21 primitiveAddLargeIntegers)" "(22 primitiveSubtractLargeIntegers)" "(23 primitiveLessThanLargeIntegers)" "(24 primitiveGreaterThanLargeIntegers)" "(25 primitiveLessOrEqualLargeIntegers)" "(26 primitiveGreaterOrEqualLargeIntegers)" "(27 primitiveEqualLargeIntegers)" "(28 primitiveNotEqualLargeIntegers)" "(29 primitiveMultiplyLargeIntegers)" "(30 primitiveDivideLargeIntegers)" "(31 primitiveModLargeIntegers)" "(32 primitiveDivLargeIntegers)" "(33 primitiveQuoLargeIntegers)" "(34 primitiveBitAndLargeIntegers)" "(35 primitiveBitOrLargeIntegers)" "(36 primitiveBitXorLargeIntegers)" "(37 primitiveBitShiftLargeIntegers)" "Float Primitives (38-59)" "(38 genPrimitiveFloatAt)" "(39 genPrimitiveFloatAtPut)" (40 genPrimitiveAsFloat 0) (41 genPrimitiveFloatAdd 1) (42 genPrimitiveFloatSubtract 1) (43 genPrimitiveFloatLessThan 1) (44 genPrimitiveFloatGreaterThan 1) (45 genPrimitiveFloatLessOrEqual 1) (46 genPrimitiveFloatGreaterOrEqual 1) (47 genPrimitiveFloatEqual 1) (48 genPrimitiveFloatNotEqual 1) (49 genPrimitiveFloatMultiply 1) (50 genPrimitiveFloatDivide 1) "(51 genPrimitiveTruncated)" "(52 genPrimitiveFractionalPart)" "(53 genPrimitiveExponent)" "(54 genPrimitiveTimesTwoPower)" (55 genPrimitiveFloatSquareRoot 0) "(56 genPrimitiveSine)" "(57 genPrimitiveArctan)" "(58 genPrimitiveLogN)" "(59 genPrimitiveExp)" "Subscript and Stream Primitives (60-67)" (60 genPrimitiveAt 1) (61 genPrimitiveAtPut 2) (62 genPrimitiveSize 0) (63 genPrimitiveStringAt 1) (64 genPrimitiveStringAtPut 2) "The stream primitives no longer pay their way; normal Smalltalk code is faster." (65 genFastPrimFail)"was primitiveNext" (66 genFastPrimFail) "was primitiveNextPut" (67 genFastPrimFail) "was primitiveAtEnd" "StorageManagement Primitives (68-79)" (68 genPrimitiveObjectAt 1) "Good for debugger/InstructionStream performance" "(69 primitiveObjectAtPut)" (70 genPrimitiveNew 0) (71 genPrimitiveNewWithArg 1) "(72 primitiveArrayBecomeOneWay)" "Blue Book: primitiveBecome" "(73 primitiveInstVarAt)" "(74 primitiveInstVarAtPut)" (75 genPrimitiveIdentityHash 0) "(76 primitiveStoreStackp)" "Blue Book: primitiveAsObject" "(77 primitiveSomeInstance)" "(78 primitiveNextInstance)" (79 genPrimitiveNewMethod 2) "Control Primitives (80-89)" "(80 primitiveFail)" "Blue Book: primitiveBlockCopy" "(81 primitiveFail)" "Blue Book: primitiveValue" "(82 primitiveFail)" "Blue Book: primitiveValueWithArgs" (83 genPrimitivePerform) + (84 genPrimitivePerformWithArguments 2) - "(84 primitivePerformWithArgs)" "(85 primitiveSignal)" "(86 primitiveWait)" "(87 primitiveResume)" "(88 primitiveSuspend)" "(89 primitiveFlushCache)" "(90 primitiveMousePoint)" "(91 primitiveTestDisplayDepth)" "Blue Book: primitiveCursorLocPut" "(92 primitiveSetDisplayMode)" "Blue Book: primitiveCursorLink" "(93 primitiveInputSemaphore)" "(94 primitiveGetNextEvent)" "Blue Book: primitiveSampleInterval" "(95 primitiveInputWord)" "(96 primitiveFail)" "primitiveCopyBits" "(97 primitiveSnapshot)" "(98 primitiveStoreImageSegment)" "(99 primitiveLoadImageSegment)" "(100 primitivePerformInSuperclass)" "Blue Book: primitiveSignalAtTick" "(101 primitiveBeCursor)" "(102 primitiveBeDisplay)" "(103 primitiveScanCharacters)" "(104 primitiveFail)" "primitiveDrawLoop" (105 genPrimitiveStringReplace) "(106 primitiveScreenSize)" "(107 primitiveMouseButtons)" "(108 primitiveKbdNext)" "(109 primitiveKbdPeek)" "System Primitives (110-119)" (110 genPrimitiveIdentical 1) (111 genPrimitiveClass) "Support both class and Context>>objectClass:" "(112 primitiveBytesLeft)" "(113 primitiveQuit)" "(114 primitiveExitToDebugger)" "(115 primitiveChangeClass)" "Blue Book: primitiveOopsLeft" "(116 primitiveFlushCacheByMethod)" "(117 primitiveExternalCall)" "(118 primitiveDoPrimitiveWithArgs)" "(119 primitiveFlushCacheSelective)" (148 genPrimitiveShallowCopy 0) "a.k.a. clone" (158 genPrimitiveStringCompareWith 1) (159 genPrimitiveHashMultiply 0) (165 genPrimitiveIntegerAt 1) "Signed version of genPrimitiveAt" (166 genPrimitiveIntegerAtPut 2) "Signed version of genPrimitiveAtPut" (169 genPrimitiveNotIdentical 1) (170 genPrimitiveAsCharacter) "SmallInteger>>asCharacter, Character class>>value:" (171 genPrimitiveImmediateAsInteger 0) "Character>>asInteger/hash/identityHash, SmallFloat64>>identityHash" (173 genPrimitiveSlotAt 1) "Good for micro-benchmark performance, and for reducing noise in Croquet primitive trace logs" (174 genPrimitiveSlotAtPut 2) "ditto" (175 genPrimitiveIdentityHash 0) "Behavior>>identityHash" "Old closure primitives" "(186 primitiveFail)" "was primitiveClosureValue" "(187 primitiveFail)" "was primitiveClosureValueWithArgs" "Perform method directly" "(188 primitiveExecuteMethodArgsArray)" "(189 primitiveExecuteMethod)" "Unwind primitives" "(195 primitiveFindNextUnwindContext)" "(196 primitiveTerminateTo)" "(197 primitiveFindHandlerContext)" (198 genFastPrimFail "primitiveMarkUnwindMethod") (199 genFastPrimFail "primitiveMarkHandlerMethod") "new closure primitives" "(200 primitiveClosureCopyWithCopiedValues)" (201 genPrimitiveClosureValue 0) "value" (202 genPrimitiveClosureValue 1) "value:" (203 genPrimitiveClosureValue 2) "value:value:" (204 genPrimitiveClosureValue 3) "value:value:value:" (205 genPrimitiveClosureValue 4) "value:value:value:value:" "(206 genPrimitiveClosureValueWithArgs)" "valueWithArguments:" (207 genPrimitiveFullClosureValue) "value[:value:value:value:] et al" "(208 genPrimitiveFullClosureValueWithArgs)" "valueWithArguments:" (209 genPrimitiveFullClosureValue) "valueNoContextSwitch[:value:] et al" "(210 primitiveContextAt)" "(211 primitiveContextAtPut)" "(212 primitiveContextSize)" "(218 primitiveDoNamedPrimitiveWithArgs)" "(219 primitiveFail)" "reserved for Cog primitives" "(220 primitiveFail)" "reserved for Cog primitives" (221 genPrimitiveClosureValue 0) "valueNoContextSwitch" (222 genPrimitiveClosureValue 1) "valueNoContextSwitch:" "SmallFloat primitives (540-559)" (541 genPrimitiveSmallFloatAdd 1) (542 genPrimitiveSmallFloatSubtract 1) (543 genPrimitiveSmallFloatLessThan 1) (544 genPrimitiveSmallFloatGreaterThan 1) (545 genPrimitiveSmallFloatLessOrEqual 1) (546 genPrimitiveSmallFloatGreaterOrEqual 1) (547 genPrimitiveSmallFloatEqual 1) (548 genPrimitiveSmallFloatNotEqual 1) (549 genPrimitiveSmallFloatMultiply 1) (550 genPrimitiveSmallFloatDivide 1) "(551 genPrimitiveSmallFloatTruncated 0)" "(552 genPrimitiveSmallFloatFractionalPart 0)" "(553 genPrimitiveSmallFloatExponent 0)" "(554 genPrimitiveSmallFloatTimesTwoPower 1)" (555 genPrimitiveSmallFloatSquareRoot 0) "(556 genPrimitiveSmallFloatSine 0)" "(557 genPrimitiveSmallFloatArctan 0)" "(558 genPrimitiveSmallFloatLogN 0)" "(559 genPrimitiveSmallFloatExp 0)" "(568 primitiveSuspendBackingUpV1) 0)" (575 genPrimitiveHighBit 0) "(578 primitiveSuspendBackingUpV2 0)" "(580 primitivePinnedNewInOldSpace 0)" "(581 primitivePinnedNewWithArgInOldSpace 1)" (582 genPrimitiveUninitializedNewWithArg 1) "reserved for (583 primitivePinnedUninitializedNewWithArgInOldSpace 1)" )! Item was changed: ----- Method: SimpleStackBasedCogit>>genLoadcmNumArgsOf:into: (in category 'primitive generators') ----- genLoadcmNumArgsOf: cogMethodReg into: targetReg "Currently cmNumArgs is the first byte following the objectHeader." <inline: true> + backEnd byteReadsZeroExtend ifFalse: + [self MoveCq: 0 R: targetReg]. self MoveMb: objectRepresentation wordSize r: cogMethodReg R: targetReg! Item was added: + ----- Method: SimpleStackBasedCogit>>genLookupForPerformWithArguments (in category 'primitive generators') ----- + genLookupForPerformWithArguments + "Compile the code for a probe of the first-level method cache for the perform:withArguments: primitive. + The selector is assumed to be in Arg0Reg an d the array in Arg1Reg. Fall back to the interpreter if + the size of the array is greater than numRegArgs." + <inline: true> + | jumpImmArray jumpSelectorMiss jumpClassMiss jumpInterpret jumpBadNumArgs1 jumpBadNumArgs2 itsAHit cacheBaseReg | + + "N.B. Can't assume TempReg already contains the tag because a method can + of course be invoked via the unchecked entry-point, e.g. as does perform:." + jumpImmArray := objectRepresentation genJumpImmediate: Arg1Reg. + objectRepresentation genGetInlineCacheClassTagFrom: ReceiverResultReg into: SendNumArgsReg forEntry: false. + + + self flag: #lookupInMethodCacheSel:classTag:. "so this method shows up as a sender of lookupInMethodCacheSel:class:" + + cacheBaseReg := NoReg. + (backEnd isWithinMwOffsetRange: coInterpreter methodCacheAddress) ifFalse: + [self MoveCq: coInterpreter methodCacheAddress R: (cacheBaseReg := Extra0Reg)]. + + "Do first of three probes. See CoInterpreter>>lookupInMethodCacheSel:classTag:" + jumpSelectorMiss := self compilePerformMethodCacheProbeFor: Arg0Reg withShift: 0 baseRegOrNone: cacheBaseReg. + jumpClassMiss := self JumpNonZero: 0. + + "Fetch the method, and check if it is cogged." + itsAHit := self MoveMw: (cacheBaseReg = NoReg + ifTrue: [coInterpreter methodCacheAddress + (MethodCacheMethod << objectMemory shiftForWord)] + ifFalse: [MethodCacheMethod << objectMemory shiftForWord]) + r: ClassReg + R: SendNumArgsReg. + "If the method is not compiled fall back on the interpreter primitive." + objectRepresentation genLoadSlot: HeaderIndex sourceReg: SendNumArgsReg destReg: ClassReg. + jumpInterpret := objectRepresentation genJumpImmediate: ClassReg. + "check the argument count; if it's wrong fall back on the interpreter primitive." + self genLoadcmNumArgsOf: ClassReg into: SendNumArgsReg. + objectRepresentation genGetRawSlotSizeOfNonImm: Arg1Reg into: TempReg. + self CmpR: TempReg R: SendNumArgsReg. + jumpBadNumArgs1 := self JumpNonZero: 0. + self CmpCq: self numRegArgs R: SendNumArgsReg. + jumpBadNumArgs2 := self JumpGreater: 0. + + "Fetch arguments and jump to the method's unchecked entry-point." + objectRepresentation genFetchRegArgsForPerformWithArguments: TempReg. + self AddCq: cmNoCheckEntryOffset R: ClassReg. + self JumpR: ClassReg. + + "First probe missed. Do second of three probes. Shift hash right one and retry." + jumpSelectorMiss jmpTarget: (jumpClassMiss jmpTarget: self Label). + jumpSelectorMiss := self compilePerformMethodCacheProbeFor: Arg0Reg withShift: 1 baseRegOrNone: cacheBaseReg. + self JumpZero: itsAHit. + + "Second probe missed. Do last probe. Shift hash right two and retry." + jumpSelectorMiss jmpTarget: self Label. + jumpSelectorMiss := self compilePerformMethodCacheProbeFor: Arg0Reg withShift: 2 baseRegOrNone: cacheBaseReg. + self JumpZero: itsAHit. + + "Last probe missed/not jitted/bad num args. Caller will generate the call to fall back on the interpreter primitive." + jumpImmArray jmpTarget: + (jumpSelectorMiss jmpTarget: + (jumpInterpret jmpTarget: + (jumpBadNumArgs1 jmpTarget: + (jumpBadNumArgs2 jmpTarget: self Label)))). + ^0! Item was added: + ----- Method: SimpleStackBasedCogit>>genPrimitivePerformWithArguments (in category 'primitive generators') ----- + genPrimitivePerformWithArguments + "Generate an in-line perform:withArguments: primitive. The lookup code requires the selector to be in Arg0Reg + and the array to be in Arg1Reg. The primitive will only handle cases 0 to numRegArgs. Is it worth it you ask? + Here are arguemnt count requencies for a short run of Croquet/Virtend which show that even for V3, with only + one rtegister arg, it very much is (but we wimp out on V3 cuz of the complexity of checking the Array): + [0] = 253743 52.5% + [1] = 116117 24%/76.5% + [2] = 99876 20.7%/97.2% + [3] = 12837 2.7%/99.9% + [4] = 209 + [5] = 84 + [6] = 2 + [7] = 313 + [8] = 0 + [9] = 0 + [10] = 0 + [11] = 1 + [12] = 0 + [13] = 0 + [14] = 0 + [15] = 0" + <option: #SpurObjectMemory> + self MoveMw: (backEnd hasLinkRegister + ifTrue: [1] + ifFalse: [2]) * objectMemory wordSize + r: SPReg + R: Arg0Reg; + MoveMw: (backEnd hasLinkRegister + ifTrue: [2] + ifFalse: [3]) * objectMemory wordSize + r: SPReg + R: Arg1Reg. + ^self genLookupForPerformWithArguments! Item was added: + ----- Method: StackToRegisterMappingCogit>>genPrimitivePerformWithArguments (in category 'primitive generators') ----- + genPrimitivePerformWithArguments + "Generate an in-line perform:withArguments: primitive. The lookup code requires the selector to be in Arg0Reg + and the array to be in Arg1Reg. The primitive will only handle cases 0 to numRegArgs. Is it worth it you ask? + Here are arguemnt count requencies for a short run of Croquet/Virtend which show that even for V3, with only + one rtegister arg, it very much is (but we wimp out on V3 cuz of the complexity of checking the Array): + [0] = 253743 52.5% + [1] = 116117 24%/76.5% + [2] = 99876 20.7%/97.2% + [3] = 12837 2.7%/99.9% + [4] = 209 + [5] = 84 + [6] = 2 + [7] = 313 + [8] = 0 + [9] = 0 + [10] = 0 + [11] = 1 + [12] = 0 + [13] = 0 + [14] = 0 + [15] = 0" + <option: #SpurObjectMemory> + ^self genLookupForPerformWithArguments!

1 0

[OpenSmalltalk/opensmalltalk-vm] b0558b: Change the type of sqAllocateMemorySegmentOfSizeAb...
by Eliot Miranda 14 Dec '22

14 Dec '22

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: b0558b43c6598198f870834f00def6b85f8ab5d6 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/b0558b43c6598198f8… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2022-12-13 (Tue, 13 Dec 2022) Changed paths: M platforms/Cross/vm/sqMemoryAccess.h M platforms/Mac OS/vm/sqMacMemory.c M platforms/iOS/vm/Common/sqMacV2Memory.c M platforms/minheadless/windows/sqWin32SpurAlloc.c M platforms/unix/vm/sqUnixSpurMemory.c M platforms/win32/vm/sqWin32SpurAlloc.c Log Message: ----------- Change the type of sqAllocateMemorySegmentOfSizeAboveAllocatedSizeInto to get sqMacV2Memory.c to compile on 32-bit MacOS. It should have taken usqInts in the first place. Implement allocateJITMemory for sqMacV2Memory.c/V3 macOS.

1 0

[OpenSmalltalk/opensmalltalk-vm] 58e4e9: CogVM source as per VMMaker.oscog-eem.3282
by Eliot Miranda 12 Dec '22

12 Dec '22

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 58e4e939ecf0b0bba5f99f060628b678c4c5ffbf https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/58e4e939ecf0b0bba5… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2022-12-12 (Mon, 12 Dec 2022) Changed paths: M src/spur32.cog.lowcode/cogit.h M src/spur32.cog.lowcode/cogitARMv5.c M src/spur32.cog.lowcode/cogitIA32.c M src/spur32.cog/cogit.h M src/spur32.cog/cogitARMv5.c M src/spur32.cog/cogitIA32.c M src/spur32.sista/cogit.h M src/spur32.sista/cogitARMv5.c M src/spur32.sista/cogitIA32.c M src/spur64.cog.lowcode/cogit.h M src/spur64.cog.lowcode/cogitARMv8.c M src/spur64.cog.lowcode/cogitX64SysV.c M src/spur64.cog.lowcode/cogitX64WIN64.c M src/spur64.cog/cogit.h M src/spur64.cog/cogitARMv8.c M src/spur64.cog/cogitX64SysV.c M src/spur64.cog/cogitX64WIN64.c M src/spur64.sista/cogit.h M src/spur64.sista/cogitARMv8.c M src/spur64.sista/cogitX64SysV.c M src/spur64.sista/cogitX64WIN64.c M src/v3.cog/cogit.h M src/v3.cog/cogitARMv5.c M src/v3.cog/cogitIA32.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.3282 Check the argument count of the target method in the jitted perform primitive. Thanks to Boris Shingarov and Juan Vuletich for finding this.

1 0

VM Maker: VMMaker.oscog-eem.3282.mcz
by commits＠source.squeak.org 12 Dec '22

12 Dec '22

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3282.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3282 Author: eem Time: 12 December 2022, 9:23:01.283007 am UUID: c6ec4e7f-ae4d-4ead-a0d1-4be83e94848a Ancestors: VMMaker.oscog-eem.3281 Check the argument count of the target method in the jitted perform primitive. Thanks to Boris Shingarov and Juan Vuletich for finding this. =============== Diff against VMMaker.oscog-eem.3281 =============== Item was added: + ----- Method: SimpleStackBasedCogit>>genLoadcmNumArgsOf:into: (in category 'primitive generators') ----- + genLoadcmNumArgsOf: cogMethodReg into: targetReg + "Currently cmNumArgs is the first byte following the objectHeader." + <inline: true> + self MoveMb: objectRepresentation wordSize r: cogMethodReg R: targetReg! Item was changed: ----- Method: SimpleStackBasedCogit>>genLookupForPerformNumArgs: (in category 'primitive generators') ----- genLookupForPerformNumArgs: numArgs "Compile the code for a probe of the first-level method cache for a perform primitive. The selector is assumed to be in Arg0Reg. Defer to adjustArgumentsForPerform: to adjust the arguments before the jump to the method." + | jumpSelectorMiss jumpClassMiss jumpInterpret jumpBadNumArgs itsAHit cacheBaseReg | - | jumpSelectorMiss jumpClassMiss jumpInterpret itsAHit cacheBaseReg | - <var: #jumpSelectorMiss type: #'AbstractInstruction *'> - <var: #jumpClassMiss type: #'AbstractInstruction *'> - <var: #jumpInterpret type: #'AbstractInstruction *'> - <var: #itsAHit type: #'AbstractInstruction *'> "N.B. Can't assume TempReg already contains the tag because a method can of course be invoked via the unchecked entry-point, e.g. as does perform:." objectRepresentation genGetInlineCacheClassTagFrom: ReceiverResultReg into: SendNumArgsReg forEntry: false. self flag: #lookupInMethodCacheSel:classTag:. "so this method shows up as a sender of lookupInMethodCacheSel:class:" cacheBaseReg := NoReg. (backEnd isWithinMwOffsetRange: coInterpreter methodCacheAddress) ifFalse: [self MoveCq: coInterpreter methodCacheAddress R: (cacheBaseReg := Extra0Reg)]. "Do first of three probes. See CoInterpreter>>lookupInMethodCacheSel:classTag:" jumpSelectorMiss := self compilePerformMethodCacheProbeFor: Arg0Reg withShift: 0 baseRegOrNone: cacheBaseReg. jumpClassMiss := self JumpNonZero: 0. "Fetch the method, and check if it is cogged." itsAHit := self MoveMw: (cacheBaseReg = NoReg ifTrue: [coInterpreter methodCacheAddress + (MethodCacheMethod << objectMemory shiftForWord)] ifFalse: [MethodCacheMethod << objectMemory shiftForWord]) r: ClassReg R: SendNumArgsReg. "If the method is not compiled fall back on the interpreter primitive." objectRepresentation genLoadSlot: HeaderIndex sourceReg: SendNumArgsReg destReg: ClassReg. jumpInterpret := objectRepresentation genJumpImmediate: ClassReg. + "check the argument count; if it's wrong fall back on the interpreter primitive." + self genLoadcmNumArgsOf: ClassReg into: SendNumArgsReg. + self CmpCq: numArgs R: SendNumArgsReg. + jumpBadNumArgs := self JumpNonZero: 0. + "Adjust arguments and jump to the method's unchecked entry-point." self AddCq: cmNoCheckEntryOffset R: ClassReg. self adjustArgumentsForPerform: numArgs. self JumpR: ClassReg. "First probe missed. Do second of three probes. Shift hash right one and retry." jumpSelectorMiss jmpTarget: (jumpClassMiss jmpTarget: self Label). jumpSelectorMiss := self compilePerformMethodCacheProbeFor: Arg0Reg withShift: 1 baseRegOrNone: cacheBaseReg. self JumpZero: itsAHit. "Second probe missed. Do last probe. Shift hash right two and retry." jumpSelectorMiss jmpTarget: self Label. jumpSelectorMiss := self compilePerformMethodCacheProbeFor: Arg0Reg withShift: 2 baseRegOrNone: cacheBaseReg. self JumpZero: itsAHit. + "Last probe missed/not jitted/bad num args. Caller will generate the call to fall back on the interpreter primitive." - "Last probe missed. Caller will generate the call to fall back on the interpreter primitive." jumpSelectorMiss jmpTarget: + (jumpInterpret jmpTarget: + (jumpBadNumArgs jmpTarget: self Label)). - (jumpInterpret jmpTarget: self Label). ^0!

1 0

VM Maker: VMMaker.oscog.seperateMarking-eem.3286.mcz
by commits＠source.squeak.org 10 Dec '22

10 Dec '22

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog.seperateMarking-eem.3286.mcz ==================== Summary ==================== Name: VMMaker.oscog.seperateMarking-eem.3286 Author: eem Time: 10 December 2022, 12:39:31.947015 pm UUID: 11df3955-6e89-421a-a7e1-d02beb4d1cfb Ancestors: VMMaker.oscog.seperateMarking-eem.3285 Add some assert checking and supporting emumeration code to SpurSegmentManager. Assert that when freeing an incrementally compacted segment all objects there-in are forwarded and no free space there-in is on the global free list. =============== Diff against VMMaker.oscog.seperateMarking-eem.3285 =============== Item was changed: ----- Method: SpurIncrementalCompactor>>compactSegment:freeStart:segIndex: (in category 'incremental compaction') ----- compactSegment: segInfo freeStart: initialFreeStart segIndex: segIndex <var: 'segInfo' type: #'SpurSegmentInfo *'> + + | fillStart | - - | currentEntity fillStart bytesToCopy bridge | fillStart := initialFreeStart. - bridge := manager segmentManager bridgeFor: segInfo. - currentEntity := manager objectStartingAt: segInfo segStart. self deny: segIndex = 0. "Cannot compact seg 0" + manager segmentManager + allEntitiesInSegment: segInfo + exceptTheLastBridgeDo: + [:entity| + (manager isFreeObject: entity) + ifTrue: + [manager detachFreeObject: entity. + "To avoid confusing too much Spur (especially the leak/free checks), we mark the free chunk as a word object." + manager set: entity classIndexTo: manager wordSizeClassIndexPun formatTo: manager wordIndexableFormat] + ifFalse: + ["During the mutator runs new forwarding references can be created. Ignore them as they get resolved with the other forwarders in this segment in the next marking pass" + (manager isForwarded: entity) ifFalse: + [| bytesToCopy | + "Copy the object in segmentToFill and replace it by a forwarder." + bytesToCopy := manager bytesInBody: entity. + + self migrate: entity sized: bytesToCopy to: fillStart. + - [self oop: currentEntity isLessThan: bridge] whileTrue: - [(manager isFreeObject: currentEntity) - ifTrue: - [manager detachFreeObject: currentEntity. - "To avoid confusing too much Spur (especially the leak/free checks), we mark the free chunk as a word object." - manager set: currentEntity classIndexTo: manager wordSizeClassIndexPun formatTo: manager wordIndexableFormat] - ifFalse: - ["During the mutator runs new forwarding references can be created. Ignore them as they get resolved with the other forwarders in this segment in the next marking pass" - (manager isForwarded: currentEntity) not - ifTrue: ["Copy the object in segmentToFill and replace it by a forwarder." - bytesToCopy := manager bytesInBody: currentEntity. - - self migrate: currentEntity sized: bytesToCopy to: fillStart. - fillStart := fillStart + bytesToCopy. + self assert: (self oop: fillStart isLessThan: (segmentToFill segLimit - manager bridgeSize))]]]. + - self assert: (self oop: fillStart isLessThan: (segmentToFill segLimit - manager bridgeSize))]]. - - currentEntity := manager objectAfter: currentEntity limit: manager endOfMemory]. - - self assert: currentEntity = bridge. currentSegment := currentSegment + 1. ^ fillStart! Item was changed: ----- Method: SpurIncrementalCompactor>>freePastSegmentsAndSetSegmentToFill (in category 'api') ----- freePastSegmentsAndSetSegmentToFill "The first segment being claimed met becomes the segmentToFill. The others are just freed." - | segInfo | <var: 'segInfo' type: #'SpurSegmentInfo *'> 0 to: manager numSegments - 1 do: + [:i| | segInfo | - [:i| segInfo := manager segInfoAt: i. (self isSegmentBeingCompacted: segInfo) ifTrue: [ | freeChunk chunkBytes | + self assert: (manager segmentManager allObjectsAreForwardedInSegment: segInfo includingFreeSpace: false). + self assert: (manager noElementOfFreeSpaceIsInSegment: segInfo). coInterpreter cr; print: 'freeing segment from: '; printHex: segInfo segStart; print: ' to: '; printHex: segInfo segStart + segInfo segSize ;tab; flush. chunkBytes := segInfo segSize - manager bridgeSize. freeChunk := manager addFreeChunkWithBytes: chunkBytes at: segInfo segStart. segmentToFill ifNil: [manager detachFreeObject: freeChunk. segmentToFill := segInfo]]]! Item was added: + ----- Method: SpurMemoryManager>>noElementOfFreeSpaceIsInSegment: (in category 'debug support') ----- + noElementOfFreeSpaceIsInSegment: segInfo + "Check that no free space on teh system's free lists is in the segment. + N.B. This is slightly different to there is no free space in the segment." + <var: 'segInfo' type: #'SpurSegmentInfo *'> + self allFreeObjectsDo: + [:freeBird| (segmentManager is: freeBird inSegment: segInfo) ifTrue: [^false]]. + ^true! Item was changed: + ----- Method: SpurSegmentManager>>allBridgesMarked (in category 'testing') ----- - ----- Method: SpurSegmentManager>>allBridgesMarked (in category 'debug support') ----- allBridgesMarked 0 to: numSegments - 1 do: [:i| | bridgeObj | bridgeObj := self bridgeAt: i. self assert: (self isValidSegmentBridge: bridgeObj). (manager isMarked: bridgeObj) ifFalse: [^false]]. ^true "for debugging:" "(0 to: numSegments - 1) select: [:i| | bridgeObj | bridgeObj := self bridgeAt: i. self assert: (self isValidSegmentBridge: bridgeObj). manager isMarked: bridgeObj]"! Item was added: + ----- Method: SpurSegmentManager>>allEntitiesInSegment:exceptTheLastBridgeDo: (in category 'enumerating') ----- + allEntitiesInSegment: segInfo exceptTheLastBridgeDo: aUnaryBlock + <var: 'segInfo' type: #'SpurSegmentInfo *'> + <include: #always> + | bridge currentEntity | + bridge := self bridgeFor: segInfo. + currentEntity := manager objectStartingAt: segInfo segStart. + [self oop: currentEntity isLessThan: bridge] whileTrue: + [aUnaryBlock value: currentEntity. + currentEntity := manager objectAfter: currentEntity limit: manager endOfMemory]. + self assert: currentEntity = bridge! Item was added: + ----- Method: SpurSegmentManager>>allObjectsAreForwardedInSegment:includingFreeSpace: (in category 'testing') ----- + allObjectsAreForwardedInSegment: segInfo includingFreeSpace: includeFreeSpace + "Answer if all objects in the segment are forwarded to somewhere outside the segment. + If includeFreeSpace is true, answer false if there is any unforwarded free space in the segment." + + <var: 'segInfo' type: #'SpurSegmentInfo *'> + self allEntitiesInSegment: segInfo exceptTheLastBridgeDo: + [:thing| + (manager isFreeObject: thing) + ifTrue: [includeFreeSpace ifTrue: [^false]] + ifFalse: + [(manager isForwarded: thing) ifFalse: + [^false]. + (self is: (manager fetchPointer: 0 ofMaybeForwardedObject: thing) inSegment: segInfo) ifTrue: + [^false]]]. + ^true! Item was added: + ----- Method: SpurSegmentManager>>allObjectsAreWhiteInSegment: (in category 'testing') ----- + allObjectsAreWhiteInSegment: segInfo + "Answer if all objects in the segment are white." + + <var: 'segInfo' type: #'SpurSegmentInfo *'> + self allEntitiesInSegment: segInfo exceptTheLastBridgeDo: + [:thing| + ((manager isFreeObject: thing) + or: [manager isWhite: thing]) ifFalse: + [^false]]. + ^true! Item was added: + ----- Method: SpurSegmentManager>>is:inSegment: (in category 'testing') ----- + is: address inSegment: segInfo + <var: 'address' type: #usqInt> + <var: 'segInfo' type: #'SpurSegmentInfo *'> + ^(self oop: address isLessThan: segInfo segLimit) + and: [self oop: address isGreaterThanOrEqualTo: segInfo segStart]! Item was changed: ----- Method: SpurSelectiveCompactor>>compactSegment:freeStart:segIndex: (in category 'compaction') ----- compactSegment: segInfo freeStart: initialFreeStart segIndex: segIndex <var: 'segInfo' type: #'SpurSegmentInfo *'> + | fillStart | - | currentEntity fillStart bytesToCopy bridge copy | fillStart := initialFreeStart. - bridge := manager segmentManager bridgeFor: segInfo. - currentEntity := manager objectStartingAt: segInfo segStart. self deny: segIndex = 0. "Cannot compact seg 0" lastLilliputianChunk := self lastLilliputianChunkAtIndex: segIndex - 1. + manager segmentManager + allEntitiesInSegment: segInfo + exceptTheLastBridgeDo: + [:entity| + (manager isFreeObject: entity) + ifTrue: + ["To avoid confusing too much Spur (especially the leak/free checks), we mark the free chunk as a word object." + (manager isLilliputianSize: (manager bytesInBody: entity)) + ifTrue: [self incrementalUnlinkLilliputianChunk: entity] "Performance hack for single linked list" + ifFalse: [manager detachFreeObject: entity]. + manager set: entity classIndexTo: manager wordSizeClassIndexPun formatTo: manager wordIndexableFormat] + ifFalse: + [| bytesToCopy copy | + "Copy the object in segmentToFill and replace it by a forwarder." + self assert: (manager isPinned: entity) not. + bytesToCopy := manager bytesInBody: entity. + manager memcpy: fillStart asVoidPointer _: (manager startOfObject: entity) asVoidPointer _: bytesToCopy. + copy := manager objectStartingAt: fillStart. + (manager isRemembered: copy) ifTrue: + ["copy has the remembered bit set, but is not in the remembered table." + manager setIsRememberedOf: copy to: false. + scavenger remember: copy]. + manager forward: entity to: (manager objectStartingAt: fillStart). + fillStart := fillStart + bytesToCopy. + self assert: (self oop: fillStart isLessThan: (segmentToFill segLimit - manager bridgeSize))]]. - [self oop: currentEntity isLessThan: bridge] whileTrue: - [(manager isFreeObject: currentEntity) - ifTrue: - ["To avoid confusing too much Spur (especially the leak/free checks), we mark the free chunk as a word object." - (manager isLilliputianSize: (manager bytesInBody: currentEntity)) - ifTrue: [self incrementalUnlinkLilliputianChunk: currentEntity] "Performance hack for single linked list" - ifFalse: [manager detachFreeObject: currentEntity]. - manager set: currentEntity classIndexTo: manager wordSizeClassIndexPun formatTo: manager wordIndexableFormat] - ifFalse: - ["Copy the object in segmentToFill and replace it by a forwarder." - self assert: (manager isPinned: currentEntity) not. - bytesToCopy := manager bytesInBody: currentEntity. - manager memcpy: fillStart asVoidPointer _: (manager startOfObject: currentEntity) asVoidPointer _: bytesToCopy. - copy := manager objectStartingAt: fillStart. - (manager isRemembered: copy) ifTrue: - ["copy has the remembered bit set, but is not in the remembered table." - manager setIsRememberedOf: copy to: false. - scavenger remember: copy]. - manager forward: currentEntity to: (manager objectStartingAt: fillStart). - fillStart := fillStart + bytesToCopy. - self assert: (self oop: fillStart isLessThan: (segmentToFill segLimit - manager bridgeSize))]. - currentEntity := manager objectAfter: currentEntity limit: manager endOfMemory]. - self assert: currentEntity = bridge. ^ fillStart!

1 0

VM Maker: VMMaker.oscog.seperateMarking-eem.3285.mcz
by commits＠source.squeak.org 10 Dec '22

10 Dec '22

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog.seperateMarking-eem.3285.mcz ==================== Summary ==================== Name: VMMaker.oscog.seperateMarking-eem.3285 Author: eem Time: 9 December 2022, 8:39:24.945581 pm UUID: 5f310817-3af2-4f0c-98e4-720ab7e1305c Ancestors: VMMaker.oscog.seperateMarking-eem.3284 Add an assert to SpurIncrementalCompactor>>#markSegmentAsBeingCompacted: to check there is more than one segment and that we're not trying to compact/free the first segment. Add an accessor for getting a pointer to a segment (manager/segmentManager seginfoAt:). =============== Diff against VMMaker.oscog.seperateMarking-eem.3284 =============== Item was changed: ----- Method: SpurIncrementalCompactor>>assertNoSegmentBeingCompacted (in category 'testing') ----- assertNoSegmentBeingCompacted "Assertion only - no segment is being claimed at this point. All being compacted bits get cleared during sweeping when setting the occupation of the segments" | segInfo | <var: 'segInfo' type: #'SpurSegmentInfo *'> 0 to: manager numSegments - 1 do: [:i| + segInfo := manager segInfoAt: i. - segInfo := self addressOf: (manager segmentManager segments at: i). self deny: (self isSegmentBeingCompacted: segInfo). (self isSegmentBeingCompacted: segInfo) ifTrue: [self cCode: 'raise(SIGINT)']].! Item was changed: ----- Method: SpurIncrementalCompactor>>completeCompact (in category 'as yet unclassified') ----- completeCompact | segInfo | self initCompactionIfNecessary. 0 to: manager numSegments - 1 do: [:i | + segInfo := manager segInfoAt: i. - segInfo := self addressOf: (manager segmentManager segments at: i). (self isSegmentBeingCompacted: segInfo) ifTrue: [currentSegment := i. currentHeapPointer := self compactSegment: segInfo freeStart: currentHeapPointer segIndex: i. self assert: (self oop: currentHeapPointer isLessThan: (segmentToFill segLimit - manager bridgeSize))]]. self postCompactionAction. self finishCompaction.! Item was changed: ----- Method: SpurIncrementalCompactor>>doIncrementalCompact (in category 'incremental compaction') ----- doIncrementalCompact <inline: #never> | segInfo | currentSegment to: manager numSegments - 1 do: [:i | + segInfo := manager segInfoAt: i. - segInfo := self addressOf: (manager segmentManager segments at: i). (self isSegmentBeingCompacted: segInfo) ifTrue: [currentSegment := i. coInterpreter cr; print: 'Compact from: '; printHex: segInfo segStart; print: ' to: '; printHex: segInfo segStart + segInfo segSize; print: ' into: ' ; printHex: segmentToFill segStart; tab; flush. currentHeapPointer := self compactSegment: segInfo freeStart: currentHeapPointer segIndex: i. self assert: manager totalFreeOldSpace = manager totalFreeListBytes. self assert: (self oop: currentHeapPointer isLessThan: (segmentToFill segLimit - manager bridgeSize)). "guarantee heap parsability for the segmentToFill, for example when invoking checkHeapFreeSpaceIntegrityForIncrementalGC where we walk to whole heap and could enter segmentToFill in an invalid state" self occupyRestOfFreeCompactedIntoSegment. coInterpreter cr; print: 'Pointer now: '; printHex: currentHeapPointer; tab; flush. self flag: #Todo. "for now we compact one segment at a time" ^ currentSegment = (manager numSegments - 1) ifTrue: [true] ifFalse: [false]]]. ^ true! Item was changed: ----- Method: SpurIncrementalCompactor>>findAndSetSegmentToFill (in category 'segment to fill') ----- findAndSetSegmentToFill | segInfo | <var: 'segInfo' type: #'SpurSegmentInfo *'> 0 to: manager numSegments - 1 do: [:i| + segInfo := manager segInfoAt: i. - segInfo := self addressOf: (manager segmentManager segments at: i). (self segmentIsEmpty: segInfo) ifTrue: [segmentToFill := segInfo. ^i]]. ^-1! Item was changed: ----- Method: SpurIncrementalCompactor>>findNextSegmentToCompact (in category 'compaction planning') ----- findNextSegmentToCompact "Answers the next segment to compact or nil if none. The next segment to compact: - cannot be segment 0 (Segment 0 has specific objects (nil, true, etc.) and special size computed at start-up that we don't want to deal with) - cannot have a high occupation rate (> MaxOccupationForCompaction)" | leastOccupied leastOccupiedSegment tempOccupied segInfo | <var: 'segInfo' type: #'SpurSegmentInfo *'> leastOccupied := 16rFFFF. 1 to: manager numSegments - 1 do: [:i| + segInfo := manager segInfoAt: i. - segInfo := self addressOf: (manager segmentManager segments at: i). (self cannotBeCompacted: segInfo) ifFalse: [(tempOccupied := self occupationOf: segInfo) <= leastOccupied ifTrue: [ leastOccupied := tempOccupied. leastOccupiedSegment := segInfo ]]]. leastOccupied > MaxOccupationForCompaction ifTrue: [^self cCoerceSimple: nil to: #'SpurSegmentInfo *']. ^leastOccupiedSegment! Item was changed: ----- Method: SpurIncrementalCompactor>>freePastSegmentsAndSetSegmentToFill (in category 'api') ----- freePastSegmentsAndSetSegmentToFill "The first segment being claimed met becomes the segmentToFill. The others are just freed." | segInfo | <var: 'segInfo' type: #'SpurSegmentInfo *'> 0 to: manager numSegments - 1 do: [:i| + segInfo := manager segInfoAt: i. + (self isSegmentBeingCompacted: segInfo) ifTrue: + [ | freeChunk chunkBytes | + coInterpreter + cr; print: 'freeing segment from: '; printHex: segInfo segStart; + print: ' to: '; printHex: segInfo segStart + segInfo segSize ;tab; flush. + chunkBytes := segInfo segSize - manager bridgeSize. + freeChunk := manager + addFreeChunkWithBytes: chunkBytes + at: segInfo segStart. + segmentToFill ifNil: + [manager detachFreeObject: freeChunk. + segmentToFill := segInfo]]]! - segInfo := self addressOf: (manager segmentManager segments at: i). - (self isSegmentBeingCompacted: segInfo) - ifTrue: - [ | freeChunk chunkBytes | - coInterpreter cr; print: 'freeing segment from: '; printHex: segInfo segStart; print: ' to: '; - printHex: segInfo segStart + segInfo segSize ;tab; flush. - chunkBytes := segInfo segSize - manager bridgeSize. - freeChunk := manager - addFreeChunkWithBytes: chunkBytes - at: segInfo segStart. - segmentToFill - ifNil: [manager detachFreeObject: freeChunk. - segmentToFill := segInfo]]]! Item was changed: ----- Method: SpurIncrementalCompactor>>markSegmentAsBeingCompacted: (in category 'segment access') ----- markSegmentAsBeingCompacted: segInfo <var: 'segInfo' type: #'SpurSegmentInfo *'> "Swizzle is abused bit 16 isBeingCompacted bits 0-15 occupation" + self assert: (manager numSegments > 1 and: [segInfo ~= (manager segInfoAt: 0)]). segInfo swizzle: (segInfo swizzle bitOr: 1 << 16)! Item was changed: ----- Method: SpurIncrementalCompactor>>postSwizzleAction (in category 'api') ----- postSwizzleAction "Since the compact abuses the swizzle field of segment, it needs to be reset after start-up." | segInfo | <var: 'segInfo' type: #'SpurSegmentInfo *'> 0 to: manager numSegments - 1 do: [:i| + segInfo := manager segInfoAt: i. - segInfo := self addressOf: (manager segmentManager segments at: i). segInfo swizzle: 0 ]! Item was changed: ----- Method: SpurIncrementalGarbageCollector>>canReactToShiftSegment:to: (in category 'as yet unclassified') ----- canReactToShiftSegment: segmentAddress to: anIndex "because we have a pointer to segmentToFill changes in the segments array (where segmentToFill is pointing to) can invalidate our pointer (it now points to an incorrect segment). Therefore react to this change and set the segmentToFill to the new address" segmentAddress = compactor segmentToFill ifTrue: [ + compactor setSegmentToFillToAddress: (manager segInfoAt: anIndex)]! - compactor setSegmentToFillToAddress: (self addressOf: (manager segmentManager segments at: anIndex))]! Item was changed: ----- Method: SpurIncrementalSweeper>>setOccupationAtIndex:used:unused: (in category 'compactor support') ----- setOccupationAtIndex: segmentIndex used: used unused: unused "WARNING: Resets the isCompacted bit" "Swizzle is abused bit 16 isBeingCompacted bits 0-15 occupation Setting occupation resets the claim bit" | occupation segInfo | <var: 'segInfo' type: #'SpurSegmentInfo *'> + segInfo := manager segInfoAt: segmentIndex. - segInfo := self addressOf: (manager segmentManager segments at: segmentIndex). "careful with overflow here..." occupation := ((used asFloat / (used + unused)) * 16rFFFF) asInteger. self assert: (occupation between: 0 and: 16rFFFF). segInfo swizzle: occupation! Item was added: + ----- Method: SpurMemoryManager>>segInfoAt: (in category 'segments') ----- + segInfoAt: zeroRelativeIndex + <doNotGenerate> + ^segmentManager segInfoAt: zeroRelativeIndex! Item was added: + ----- Method: SpurSegmentManager>>segInfoAt: (in category 'accessing') ----- + segInfoAt: zeroRelativeIndex + <inline: #always> + ^self addressOf: (segments at: zeroRelativeIndex)! Item was changed: ----- Method: SpurSelectiveCompactor>>assertNoSegmentBeingCompacted (in category 'compaction') ----- assertNoSegmentBeingCompacted "Assertion only - no segment is being claimed at this point" | segInfo | <var: 'segInfo' type: #'SpurSegmentInfo *'> 0 to: manager numSegments - 1 do: [:i| + segInfo := manager segInfoAt: i. - segInfo := self addressOf: (manager segmentManager segments at: i). self deny: (self isSegmentBeingCompacted: segInfo)]. ! Item was changed: ----- Method: SpurSelectiveCompactor>>compactSegmentsToCompact (in category 'compaction') ----- compactSegmentsToCompact "Forwards all objects in segments to compact and removes their freechunks" | segInfo fillStart | <var: 'segInfo' type: #'SpurSegmentInfo *'> fillStart := segmentToFill segStart. "Removes initial free chunk in segment to fill... (Segment is entirely free)" manager detachFreeObject: (manager objectStartingAt: fillStart). "Compact each segment to compact..." 0 to: manager numSegments - 1 do: [:i| + segInfo := manager segInfoAt: i. - segInfo := self addressOf: (manager segmentManager segments at: i). (self isSegmentBeingCompacted: segInfo) ifTrue: [fillStart := self compactSegment: segInfo freeStart: fillStart segIndex: i]]. "Final free chunk in segment to fill..." manager addFreeChunkWithBytes: segmentToFill segSize - manager bridgeSize + segmentToFill segStart - fillStart at: fillStart. self postCompactionAction ! Item was changed: ----- Method: SpurSelectiveCompactor>>findAndSetSegmentToFill (in category 'segment to fill') ----- findAndSetSegmentToFill | segInfo firstEntity | <var: 'segInfo' type: #'SpurSegmentInfo *'> 0 to: manager numSegments - 1 do: [:i| + segInfo := manager segInfoAt: i. - segInfo := self addressOf: (manager segmentManager segments at: i). firstEntity := manager objectStartingAt: segInfo segStart. ((manager isFreeObject: firstEntity) and: [(manager objectAfter: firstEntity limit: manager endOfMemory) = (manager segmentManager bridgeFor: segInfo)]) ifTrue: [segmentToFill := segInfo. ^i]]. ^-1 ! Item was changed: ----- Method: SpurSelectiveCompactor>>findNextSegmentToCompact (in category 'compaction') ----- findNextSegmentToCompact "Answers the next segment to compact or nil if none. The next segment to compact: - cannot be segment 0 (Segment 0 has specific objects (nil, true, etc.) and special size computed at start-up that we don't want to deal with) - cannot have a high occupation rate (> MaxOccupationForCompaction)" | leastOccupied leastOccupiedSegment tempOccupied segInfo | <var: 'segInfo' type: #'SpurSegmentInfo *'> leastOccupied := 16rFFFF. 1 to: manager numSegments - 1 do: [:i| + segInfo := manager segInfoAt: i. - segInfo := self addressOf: (manager segmentManager segments at: i). ((self isSegmentBeingCompacted: segInfo) or: [segInfo containsPinned or: [manager segmentManager isEmptySegment: segInfo] ]) ifFalse: [(tempOccupied := self occupationOf: segInfo) <= leastOccupied ifTrue: [ leastOccupied := tempOccupied. leastOccupiedSegment := segInfo ]]]. leastOccupied > MaxOccupationForCompaction ifTrue: [^self cCoerceSimple: nil to: #'SpurSegmentInfo *']. ^leastOccupiedSegment! Item was changed: ----- Method: SpurSelectiveCompactor>>freePastSegmentsAndSetSegmentToFill (in category 'segment access') ----- freePastSegmentsAndSetSegmentToFill "The first segment being claimed met becomes the segmentToFill. The others are just freed." | segInfo | <var: 'segInfo' type: #'SpurSegmentInfo *'> segmentToFill := nil. 0 to: manager numSegments - 1 do: [:i| + segInfo := manager segInfoAt: i. - segInfo := self addressOf: (manager segmentManager segments at: i). (self isSegmentBeingCompacted: segInfo) ifTrue: [manager initFreeChunkWithBytes: segInfo segSize - manager bridgeSize at: segInfo segStart. segmentToFill ifNil: [segmentToFill := segInfo]]]! Item was changed: ----- Method: SpurSelectiveCompactor>>lastLilliputianChunkAtIndex: (in category 'segment access') ----- lastLilliputianChunkAtIndex: segIndex <inline: true> "Abuse lastFreeObject field, can be used during compaction only, used for different purpose during snapshot" + ^(manager segInfoAt: 0) lastFreeObject! - ^(self addressOf: (manager segmentManager segments at: 0)) lastFreeObject! Item was changed: ----- Method: SpurSelectiveCompactor>>postSwizzleAction (in category 'api') ----- postSwizzleAction "Since the compact abuses the swizzle field of segment, it needs to be reset after start-up." | segInfo | <var: 'segInfo' type: #'SpurSegmentInfo *'> 0 to: manager numSegments - 1 do: [:i| + segInfo := manager segInfoAt: i. - segInfo := self addressOf: (manager segmentManager segments at: i). segInfo swizzle: 0 ]! Item was changed: ----- Method: SpurSelectiveCompactor>>setLastLilliputianChunkAtindex:to: (in category 'segment access') ----- setLastLilliputianChunkAtindex: segIndex to: chunk <inline: true> "Abuse lastFreeObject field, can be used during compaction only, used for different purpose during snapshot" + (manager segInfoAt: 0) lastFreeObject: chunk! - (self addressOf: (manager segmentManager segments at: 0)) lastFreeObject: chunk! Item was changed: ----- Method: SpurSelectiveCompactor>>setOccupationAtIndex:used:unused: (in category 'segment access') ----- setOccupationAtIndex: segmentIndex used: used unused: unused "WARNING: Resets the isCompacted bit" "Swizzle is abused bit 16 isBeingCompacted bits 0-15 occupation Setting occupation resets the claim bit" | occupation segInfo | <var: 'segInfo' type: #'SpurSegmentInfo *'> + segInfo := manager segInfoAt: segmentIndex. - segInfo := self addressOf: (manager segmentManager segments at: segmentIndex). "careful with overflow here..." occupation := ((used asFloat / (used + unused)) * 16rFFFF) asInteger. self assert: (occupation between: 0 and: 16rFFFF). segInfo swizzle: occupation! Item was changed: ----- Method: SpurSelectiveCompactorSimulator>>checkSegmentsIterable (in category 'debugging') ----- checkSegmentsIterable "Check only 1 free object at the end or none. Check segment is iterable until bridge" | currentEntity bridge | self talk: 'Checking segments iterable'. 0 to: manager numSegments - 1 do: [:i| | segInfo | + segInfo := manager segInfoAt: i. - segInfo := self addressOf: (manager segmentManager segments at: i). bridge := manager segmentManager bridgeFor: segInfo. currentEntity := manager objectStartingAt: segInfo segStart. [self oop: currentEntity isLessThan: bridge] whileTrue: [currentEntity := manager objectAfter: currentEntity limit: manager endOfMemory]. "End of iteration should end on bridge" self assert: currentEntity = bridge.]. self talkNoCr: ' OK'.! Item was changed: ----- Method: SpurSelectiveCompactorSimulator>>globalSweepAndSegmentOccupationAnalysis (in category 'sweep phase') ----- globalSweepAndSegmentOccupationAnalysis super globalSweepAndSegmentOccupationAnalysis. self talk: 'Occupation map: '. 0 to: manager numSegments - 1 do: [:i| | segInfo | + segInfo := manager segInfoAt: i. - segInfo := self addressOf: (manager segmentManager segments at: i). self talkNoCr: i. self talkNoCr: '->'. self talkNoCr: (self occupationOf: segInfo) printString. self talkNoCr: '('. self talkNoCr: ((self occupationOf: segInfo) * 100 * 100 // 16rFFFF / 100) asFloat printString. self talkNoCr: '%);']. self checkSegmentsIterable. ! Item was changed: ----- Method: SpurSelectiveCompactorSimulator>>tellMeWhichSegmentsAreBeingCompacted (in category 'debugging') ----- tellMeWhichSegmentsAreBeingCompacted <doNotGenerate> | beingCompacted | beingCompacted := OrderedCollection new. 0 to: manager numSegments - 1 do: [:i| | segInfo | + segInfo := manager segInfoAt: i. - segInfo := self addressOf: (manager segmentManager segments at: i). (self isSegmentBeingCompacted: segInfo) ifTrue: [beingCompacted add: segInfo]]. self talk: 'Segment being compacted: ' , (beingCompacted collect: [:seg | manager segmentManager indexOfSegment: seg ]) asArray printString ! Item was changed: ----- Method: StackInterpreterPrimitives>>primitiveGCInfo (in category 'system control primitives') ----- primitiveGCInfo "VM parameters are numbered as follows: 0 stopTheWorld (0) or incremental gc (1) 1 if incremental gc: current gc phase -> 0 marking; 1 sweeping; 2 compacting if stopTheWorld -> -1 2 eden start 3 eden limit 4 freeStart 5 scavengeThreshold 6 amount of old space segments " | result staticCount oldSpaceSegmentCount segmentInfoCount | staticCount := 8. segmentInfoCount := 5. oldSpaceSegmentCount := objectMemory numSegments. result := objectMemory instantiateClass: (objectMemory splObj: ClassArray) indexableSize: staticCount + (oldSpaceSegmentCount * segmentInfoCount). objectMemory storePointerUnchecked: 0 ofObject: result withValue: (objectMemory integerObjectOf: (objectMemory gc isIncremental ifTrue: [1] ifFalse: [0])). objectMemory storePointerUnchecked: 1 ofObject: result withValue: (objectMemory integerObjectOf: (objectMemory gc isIncremental ifTrue: [objectMemory gc phase] ifFalse: [-1])). objectMemory storePointerUnchecked: 2 ofObject: result withValue: (objectMemory integerObjectOf: objectMemory scavenger eden start). objectMemory storePointerUnchecked: 3 ofObject: result withValue: (objectMemory integerObjectOf: objectMemory scavenger eden limit). objectMemory storePointerUnchecked: 4 ofObject: result withValue: (objectMemory integerObjectOf: objectMemory freeStart). objectMemory storePointerUnchecked: 5 ofObject: result withValue: (objectMemory integerObjectOf: objectMemory scavengeThreshold). objectMemory storePointerUnchecked: 6 ofObject: result withValue: (objectMemory integerObjectOf: objectMemory statSurvivorCount). objectMemory storePointerUnchecked: 7 ofObject: result withValue: (self positiveMachineIntegerFor: oldSpaceSegmentCount). 0 to: oldSpaceSegmentCount - 1 do: [:index | | baseIndex segInfo | + segInfo := objectMemory segInfoAt: index. - segInfo := self addressOf: (objectMemory segmentManager segments at: index). baseIndex := staticCount + (index * segmentInfoCount). objectMemory storePointerUnchecked: baseIndex ofObject: result withValue: (objectMemory integerObjectOf: segInfo segStart). objectMemory storePointerUnchecked: baseIndex + 1 ofObject: result withValue: (objectMemory integerObjectOf: segInfo segSize). objectMemory storePointerUnchecked: baseIndex + 2 ofObject: result withValue: (objectMemory integerObjectOf: (segInfo swizzle bitAnd: 16rFFFF)). objectMemory storePointerUnchecked: baseIndex + 3 ofObject: result withValue: (objectMemory integerObjectOf: segInfo containsPinned). objectMemory storePointerUnchecked: baseIndex + 4 ofObject: result withValue: (objectMemory integerObjectOf: (segInfo swizzle bitOr: 1 << 16))]. objectMemory beRootIfOld: result. self methodReturnValue: result!

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev December 2022