Vm-dev March 2020

vm-dev@lists.squeakfoundation.org

31 participants
136 discussions

VM Maker: VMMaker.oscog-nice.2723.mcz
by commits＠source.squeak.org 10 Mar '20

10 Mar '20

Nicolas Cellier uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-nice.2723.mcz ==================== Summary ==================== Name: VMMaker.oscog-nice.2723 Author: nice Time: 10 March 2020, 12:26:31.04183 am UUID: c1319382-406c-43a7-9f55-2b48c4007d80 Ancestors: VMMaker.oscog-eem.2722 Fix the right shift: dont convert to usqInt a type longer than usqInt =============== Diff against VMMaker.oscog-eem.2722 =============== Item was changed: ----- Method: CCodeGenerator>>generateBitShift:on:indent: (in category 'C translation') ----- generateBitShift: msgNode on: aStream indent: level "Generate the C code for this message onto the given stream." + | arg shift rightShift | + (self isConstantNode: (arg := msgNode args first) valueInto: [:shiftValue| shift := shiftValue]) - | arg rcvr shift | - arg := msgNode args first. - rcvr := msgNode receiver. - (self isConstantNode: arg valueInto: [:shiftValue| shift := shiftValue]) ifTrue: "bit shift amount is a constant" + [aStream nextPut: $(. - [aStream nextPutAll: '((usqInt) '. - self emitCExpression: rcvr on: aStream. shift < 0 + ifTrue: + [rightShift := TSendNode new + setSelector: #>> + receiver: msgNode receiver + arguments: {TConstantNode new setValue: shift negated}. + self generateShiftRight: rightShift on: aStream indent: level] + ifFalse: [self generateShiftLeft: msgNode on: aStream indent: level]. - ifTrue: [aStream nextPutAll: ' >> '; print: shift negated] - ifFalse: [aStream nextPutAll: ' << '; print: shift]. aStream nextPut: $)] ifFalse: "bit shift amount is an expression" + [rightShift := TSendNode new + setSelector: #>> + receiver: msgNode receiver + arguments: {TSendNode new + setSelector: #negated + receiver: arg + arguments: #()}. + aStream nextPutAll: '(('. + self emitCExpression: arg on: aStream. + aStream nextPutAll: ' < 0) ? ('. + self generateShiftRight: rightShift on: aStream indent: level. + aStream nextPutAll: ') : ('. + self generateShiftLeft: msgNode on: aStream indent: level. - [aStream nextPutAll: '(('. - self emitCExpression: arg on: aStream indent: level. - aStream nextPutAll: ' < 0) ? ((usqInt) '. - self emitCExpression: rcvr on: aStream indent: level. - aStream nextPutAll: ' >> -'. - self emitCExpression: arg on: aStream indent: level. - aStream nextPutAll: ') : ((usqInt) '. - self emitCExpression: rcvr on: aStream indent: level. - aStream nextPutAll: ' << '. - self emitCExpression: arg on: aStream indent: level. aStream nextPutAll: '))']! Item was changed: ----- Method: CCodeGenerator>>generateShiftRight:on:indent: (in category 'C translation') ----- generateShiftRight: msgNode on: aStream indent: level + "Generate the C code for this message onto the given stream. + Note that this generates a Logical Shift (unsigned), not an Arithmetic Shift (signed)." - "Generate the C code for this message onto the given stream." + | type typeIsUnsigned mustCastToUnsigned unsignedType | + type := self typeFor: msgNode receiver in: currentMethod. + typeIsUnsigned := type first = $u. + mustCastToUnsigned := typeIsUnsigned not or: + ["cast to usqInt if the int is shorter: we want to avoid UB related to a shift exceeeding bit width" + (self sizeOfIntegralCType: type) < (self sizeOfIntegralCType: #usqInt)]. + "If not unsigned cast it to unsigned." + mustCastToUnsigned - | type | - "If the variable is a 64-bit type then don't cast it to usqInt (typically a 32-bit type)" - (self is64BitIntegralVariable: msgNode receiver typeInto: [:t| type := t]) ifTrue: + ["If the variable is a 64-bit type then don't cast it to usqInt (typically a 32-bit type)" + unsignedType := (self sizeOfIntegralCType: type) < (self sizeOfIntegralCType: #usqLong) + ifTrue: [#usqInt] + ifFalse: [self unsignedTypeForIntegralType: type]. + aStream nextPutAll: '(('; nextPutAll: unsignedType; nextPutAll: ')('. - ["If not unsigned cast it to unsigned." - type first ~= $u ifTrue: - [aStream nextPutAll: '((unsigned '; nextPutAll: type; nextPut: $)]. self emitCExpression: msgNode receiver on: aStream indent: level. + aStream nextPutAll: '))'] - type first ~= $u ifTrue: - [aStream nextPut: $)]] ifFalse: + [aStream nextPutAll: '('. - [aStream nextPutAll: '((usqInt) '. self emitCExpression: msgNode receiver on: aStream indent: level. aStream nextPut: $)]. aStream nextPutAll: ' >> '. self emitCExpression: msgNode args first on: aStream indent: level! Item was changed: ----- Method: CCodeGenerator>>generateSignedBitShift:on:indent: (in category 'C translation') ----- generateSignedBitShift: msgNode on: aStream indent: level "Generate the C code for this message onto the given stream." + | arg shift rightShift | - | cast type arg shift | - "since ``signed'' is a synonym for ``signed int'' do not cast 64-bit values to signed if at all possible." - cast := (self is64BitIntegralVariable: msgNode receiver typeInto: [:t| type := t]) - ifTrue: ['(', (type first = $u ifTrue: [type allButFirst: (type second = $n ifTrue: [2] ifFalse: [1])] ifFalse: [type]), ')'] - ifFalse: ['(signed)']. (self isConstantNode: (arg := msgNode args first) valueInto: [:shiftValue| shift := shiftValue]) ifTrue: "bit shift amount is a constant" + [aStream nextPut: $(. - [aStream nextPut: $(; nextPutAll: cast. - self emitCExpression: msgNode receiver on: aStream. shift < 0 + ifTrue: + [rightShift := TSendNode new + setSelector: #>> + receiver: msgNode receiver + arguments: {TConstantNode new setValue: shift negated}. + self generateSignedShiftRight: rightShift on: aStream indent: level] + ifFalse: [self generateShiftLeft: msgNode on: aStream indent: level]. - ifTrue: [aStream nextPutAll: ' >> '; print: shift negated] - ifFalse: [aStream nextPutAll: ' << '; print: shift]. aStream nextPut: $)] ifFalse: "bit shift amount is an expression" + [rightShift := TSendNode new + setSelector: #>> + receiver: msgNode receiver + arguments: {TSendNode new + setSelector: #negated + receiver: arg + arguments: #()}. + aStream nextPutAll: '(('. - [aStream nextPutAll: '(('. self emitCExpression: arg on: aStream. + aStream nextPutAll: ' < 0) ? ('. + self generateSignedShiftRight: rightShift on: aStream indent: level. + aStream nextPutAll: ') : ('. + self generateShiftLeft: msgNode on: aStream indent: level. - aStream nextPutAll: ' < 0) ? ('; nextPutAll: cast. - self emitCExpression: msgNode receiver on: aStream. - aStream nextPutAll: ' >> -'. - self emitCExpression: arg on: aStream. - aStream nextPutAll: ') : ('; nextPutAll: cast. - self emitCExpression: msgNode receiver on: aStream. - aStream nextPutAll: ' << '. - self emitCExpression: arg on: aStream. aStream nextPutAll: '))']! Item was changed: ----- Method: CCodeGenerator>>generateSignedShiftRight:on:indent: (in category 'C translation') ----- generateSignedShiftRight: msgNode on: aStream indent: level "Generate the C code for >>> onto the given stream." + | type typeIsUnsigned mustCastToSigned signedType | + type := self typeFor: msgNode receiver in: currentMethod. + typeIsUnsigned := type first = $u. + mustCastToSigned := typeIsUnsigned or: + ["cast to sqInt if the int is shorter: we want to avoid UB related to a shift exceeeding bit width" + (self sizeOfIntegralCType: type) < (self sizeOfIntegralCType: #usqInt)]. + mustCastToSigned - (self is64BitIntegralVariable: msgNode receiver typeInto: [:t|]) ifTrue: + ["If the variable is a 64-bit type then don't cast it to usqInt (typically a 32-bit type)" + signedType := (self sizeOfIntegralCType: type) < (self sizeOfIntegralCType: #usqLong) + ifTrue: [#usqInt] + ifFalse: [self signedTypeForIntegralType: type]. + aStream nextPutAll: '(('; nextPutAll: signedType; nextPutAll: ')('. + self emitCExpression: msgNode receiver on: aStream indent: level. + aStream nextPutAll: '))'] - [aStream nextPutAll: '((sqLong) '] ifFalse: + [aStream nextPutAll: '('. + self emitCExpression: msgNode receiver on: aStream indent: level. + aStream nextPut: $)]. + aStream nextPutAll: ' >> '. - [aStream nextPutAll: '((sqInt) ']. - self emitCExpression: msgNode receiver on: aStream. - aStream nextPutAll: ') >> '. self emitCExpression: msgNode args first on: aStream!

4 5

Smalltalk code calling SHA2Plugin
by Robert 10 Mar '20

10 Mar '20

Hi Levente, I got the SHA2Plugin built and deployed to my Crypto plugins folder. Now I am trying to figure out how to call it from SHA512. https://www.dropbox.com/sh/yhv253rwrhq0q5p/AAB7PKP2KPiGpDnIyule2h_Ia?dl=0 [plugin] I looked at it and please understand I think the classes you wrote and the framework is really quite nice. I am thrilled we found SHA512! It's impressive that your one plugin can handle a number of hash functions! Now all I need is to find the code that calls the SHA2Plugin. Levente, would you share that code, please? Kindly, Robert

2 2

VM Maker: VMMaker.oscog-eem.2726.mcz
by commits＠source.squeak.org 10 Mar '20

10 Mar '20

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2726.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2726 Author: eem Time: 10 March 2020, 12:39:57.341971 pm UUID: d5624270-54d1-4938-aed8-fde6413afc79 Ancestors: VMMaker.oscog-eem.2725 Actally fix a bogus failing assert over-zealously added to the VMMaker.oscog-eem.2724 commit. =============== Diff against VMMaker.oscog-eem.2725 =============== Item was changed: ----- Method: SpurMemoryManager>>relocateObjStackForPlanningCompactor:andContents: (in category 'compaction') ----- relocateObjStackForPlanningCompactor: objStack andContents: relocateContents + "Relocate all objStack pages that comprise objStack, including contents if requested." - "Relocate all objStack pages that comprise objStack." | stackOrNil freeList next relocated result | objStack = nilObj ifTrue: [^objStack]. + self assert: (relocateContents or: [(self rawHashBitsOf: objStack) = 0]). - self assert: (relocateContents or: [(self isEmptyObjStack: objStack) or: [compactor isMobile: objStack]]). stackOrNil := objStack. freeList := self fetchPointer: ObjStackFreex ofObject: objStack. [self assert: (self numSlotsOfAny: stackOrNil) = ObjStackPageSlots. "There are four fixed slots in an obj stack, and a Topx of 0 indicates empty, so if there were 5 slots in an oop stack, full would be 2, and the last 0-rel index is 4. + Hence the last index is topx + fixed slots - 1, or topx + ObjStackNextx. The first + two slots, Topx and Myx are not object references." - Hence the last index is topx + fixed slots - 1, or topx + ObjStackNextx" next := self fetchPointer: ObjStackNextx ofObject: stackOrNil. relocated := compactor relocateObjectsInHeapEntity: stackOrNil from: ObjStackFreex to: ObjStackNextx + (relocateContents ifTrue: [self rawHashBitsOf: stackOrNil] ifFalse: [0]). stackOrNil = objStack ifTrue: [result := relocated]. next ~= 0] whileTrue: [stackOrNil := next]. [freeList ~= 0] whileTrue: [self assert: (self numSlotsOfAny: freeList) = ObjStackPageSlots. next := self fetchPointer: ObjStackFreex ofObject: freeList. compactor relocateObjectsInHeapEntity: freeList from: ObjStackFreex to: ObjStackFreex. freeList := next]. + self assert: (relocateContents or: [(self rawHashBitsOf: relocated) = 0]). - self assert: (relocateContents or: [self isEmptyObjStack: relocated]). ^relocated!

1 0

VM Maker: VMMaker.oscog-eem.2725.mcz
by commits＠source.squeak.org 10 Mar '20

10 Mar '20

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2725.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2725 Author: eem Time: 10 March 2020, 12:25:11.601767 pm UUID: d3f3f9ff-f591-4358-9d5e-3270e0ed6527 Ancestors: VMMaker.oscog-eem.2724 Fix a bogus failing assert over-zealously added to the previous commit. =============== Diff against VMMaker.oscog-eem.2724 =============== Item was changed: ----- Method: SpurMemoryManager>>relocateObjStackForPlanningCompactor:andContents: (in category 'compaction') ----- relocateObjStackForPlanningCompactor: objStack andContents: relocateContents "Relocate all objStack pages that comprise objStack." | stackOrNil freeList next relocated result | objStack = nilObj ifTrue: [^objStack]. + self assert: (relocateContents or: [(self isEmptyObjStack: objStack) or: [compactor isMobile: objStack]]). stackOrNil := objStack. freeList := self fetchPointer: ObjStackFreex ofObject: objStack. [self assert: (self numSlotsOfAny: stackOrNil) = ObjStackPageSlots. "There are four fixed slots in an obj stack, and a Topx of 0 indicates empty, so if there were 5 slots in an oop stack, full would be 2, and the last 0-rel index is 4. Hence the last index is topx + fixed slots - 1, or topx + ObjStackNextx" next := self fetchPointer: ObjStackNextx ofObject: stackOrNil. relocated := compactor relocateObjectsInHeapEntity: stackOrNil from: ObjStackFreex to: ObjStackNextx + (relocateContents ifTrue: [self rawHashBitsOf: stackOrNil] ifFalse: [0]). stackOrNil = objStack ifTrue: [result := relocated]. next ~= 0] whileTrue: [stackOrNil := next]. [freeList ~= 0] whileTrue: [self assert: (self numSlotsOfAny: freeList) = ObjStackPageSlots. next := self fetchPointer: ObjStackFreex ofObject: freeList. compactor relocateObjectsInHeapEntity: freeList from: ObjStackFreex to: ObjStackFreex. freeList := next]. + self assert: (relocateContents or: [self isEmptyObjStack: relocated]). ^relocated! Item was changed: ----- Method: SpurMemoryManager>>relocateObjStacksForPlanningCompactor (in category 'compaction') ----- relocateObjStacksForPlanningCompactor "Relocate all non-empty objStack pages, following the objStacks from the roots." - self assert: (self isEmptyObjStack: markStack). markStack := self relocateObjStackForPlanningCompactor: markStack andContents: false. - self assert: (self isEmptyObjStack: weaklingStack). weaklingStack := self relocateObjStackForPlanningCompactor: weaklingStack andContents: false. + mournQueue := self relocateObjStackForPlanningCompactor: mournQueue andContents: true! - mournQueue := self relocateObjStackForPlanningCompactor: mournQueue andContents: true.!

1 0

Still Failing: OpenSmalltalk/opensmalltalk-vm#1972 (Cog - aa688da)
by Travis CI 10 Mar '20

10 Mar '20

Build Update for OpenSmalltalk/opensmalltalk-vm ------------------------------------- Build: #1972 Status: Still Failing Duration: 3 mins and 1 sec Commit: aa688da (Cog) Author: Eliot Miranda Message: CogVM source as per VMMaker.oscog-eem.2724 Slang: Fix the right shift: dont convert to usqInt a type longer than usqInt SpurMemoryManager/SpurPlanningCompactor: Fix one bug thrown up by Marcel's EphemeronLink example. The planning compactor failed to update objects in the mournQueue objStack. Make sure prepareObjStacksForPlanningCompactor is actually invoked (!!). Refactor a couple of obj stack routines to take an "also do contents" flag, printObjStack:printContents:, relocateObjStackForPlanningCompactor:andContents:, the last one fixing the bug in question. Refactor runLeakCheckerForFreeSpace: into runLeakCheckerForFreeSpace:ignoring: to allow the most recenty allocated object in clone (the shallowCopy primitive) to be ignored, because its contents are not yet initialized when the free space check is done. Make sure to run the free space integrity check as part of leak checking. VMMaker image: Add MULTIPLEBYTECODESETS true to all launch examples in the VM Simulation workspace. Use Squeak 5.3 to build new VMMaker images. View the changeset: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/051a0fe56561...aa… View the full build log and details: https://travis-ci.org/OpenSmalltalk/opensmalltalk-vm/builds/660467741?utm_m… -- You can unsubscribe from build emails from the OpenSmalltalk/opensmalltalk-vm repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=8795279&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

Plugin code generation issues
by Levente Uzonyi 10 Mar '20

10 Mar '20

Hi All, I wrote a new plugin the other day and found two issues with code generation. The first one, which is less important is related to the inline pragma. I expected that methods marked with <inline: true> will either not be generated at all when the code generator inlines all occurrences of them or they'll be generated as inline C functions. But they are generated as regular static functions even though they are never used. The other one, which is more significant is related to type casts. I've got the following method: rotateRight64: value by: amount <inline: true> <var: #value type: #'unsigned long long'> <returnTypeC: #'unsigned long long'> ^(value >> amount) bitOr: (value << (64 - amount)) The code using the above method has the variable declaration <var: #w declareC: 'unsigned long long w[80]'> The method is used with individual elements of w: self rotateRight64: (w at: i - 2) by: 61 The generated function gets inlined as expected, but the elements of the array are casted to usqInt before right shifts: ((((usqInt) (w[i2 - 2])) >> 61) | ((w[i2 - 2]) << (3))) This is a problem on 32-bit platforms, because usqInt is unsigned int there, so the upper 32-bits will be lost by the cast. When the method is used with non-array variables, then the generator works as expected: self rotateRight64: a by: 39 is generated as: ((a >> 39) | (a << (25))) where a is declared as <var: #a type: #'unsigned long long'> I tried to fix the issue by declaring w as <var: #w type: #'unsigned long long*'> But is didn't make the usqInt casts go away. Is it possible that the code generator doesn't know that the type of w[i] is unsigned long long, when w is unsigned long long*? Levente P.S.: The code is available here http://squeaksource.com/Cryptography/CryptographyPlugins-ul.18.mcz . Generate SHA2Plugin to see the problem.

4 5

Still Failing: OpenSmalltalk/opensmalltalk-vm#1972 (Cog - aa688da)
by Travis CI 10 Mar '20

10 Mar '20

Build Update for OpenSmalltalk/opensmalltalk-vm ------------------------------------- Build: #1972 Status: Still Failing Duration: 1 hr, 3 mins, and 48 secs Commit: aa688da (Cog) Author: Eliot Miranda Message: CogVM source as per VMMaker.oscog-eem.2724 Slang: Fix the right shift: dont convert to usqInt a type longer than usqInt SpurMemoryManager/SpurPlanningCompactor: Fix one bug thrown up by Marcel's EphemeronLink example. The planning compactor failed to update objects in the mournQueue objStack. Make sure prepareObjStacksForPlanningCompactor is actually invoked (!!). Refactor a couple of obj stack routines to take an "also do contents" flag, printObjStack:printContents:, relocateObjStackForPlanningCompactor:andContents:, the last one fixing the bug in question. Refactor runLeakCheckerForFreeSpace: into runLeakCheckerForFreeSpace:ignoring: to allow the most recenty allocated object in clone (the shallowCopy primitive) to be ignored, because its contents are not yet initialized when the free space check is done. Make sure to run the free space integrity check as part of leak checking. VMMaker image: Add MULTIPLEBYTECODESETS true to all launch examples in the VM Simulation workspace. Use Squeak 5.3 to build new VMMaker images. View the changeset: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/051a0fe56561...aa… View the full build log and details: https://travis-ci.org/OpenSmalltalk/opensmalltalk-vm/builds/660467741?utm_m… -- You can unsubscribe from build emails from the OpenSmalltalk/opensmalltalk-vm repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=8795279&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

[OpenSmalltalk/opensmalltalk-vm] aa688d: CogVM source as per VMMaker.oscog-eem.2724
by Eliot Miranda 10 Mar '20

10 Mar '20

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: aa688da5c4dbe09a4d2e09e3adde54346ed5596f https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/aa688da5c4dbe09a4d… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2020-03-09 (Mon, 09 Mar 2020) Changed paths: M build.macos64x64/common/Makefile.vm M image/VM Simulation Workspace.text M image/getlatesttrunk64image.sh M nsspur64src/vm/cogit.h M nsspur64src/vm/cogitX64SysV.c M nsspur64src/vm/cogitX64WIN64.c M nsspur64src/vm/cointerp.c M nsspur64src/vm/cointerp.h M nsspur64src/vm/gcc3x-cointerp.c M nsspursrc/vm/cogit.h M nsspursrc/vm/cogitARMv5.c M nsspursrc/vm/cogitIA32.c M nsspursrc/vm/cogitMIPSEL.c M nsspursrc/vm/cointerp.c M nsspursrc/vm/cointerp.h M nsspursrc/vm/gcc3x-cointerp.c M nsspurstack64src/vm/gcc3x-interp.c M nsspurstack64src/vm/interp.c M nsspurstacksrc/vm/gcc3x-interp.c M nsspurstacksrc/vm/interp.c M spur64src/vm/cogit.h 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/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/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/ADPCMCodecPlugin/ADPCMCodecPlugin.c M src/plugins/AioPlugin/AioPlugin.c M src/plugins/B2DPlugin/B2DPlugin.c M src/plugins/BitBltPlugin/BitBltPlugin.c M src/plugins/BochsIA32Plugin/BochsIA32Plugin.c M src/plugins/BochsX64Plugin/BochsX64Plugin.c M src/plugins/DESPlugin/DESPlugin.c M src/plugins/DSAPrims/DSAPrims.c M src/plugins/FileAttributesPlugin/FileAttributesPlugin.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/JPEGReaderPlugin/JPEGReaderPlugin.c M src/plugins/LargeIntegers/LargeIntegers.c M src/plugins/MD5Plugin/MD5Plugin.c M src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c M src/plugins/SHA256Plugin/SHA256Plugin.c M src/plugins/ScratchPlugin/ScratchPlugin.c M src/plugins/SocketPlugin/SocketPlugin.c M src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c M src/plugins/Squeak3D/Squeak3D.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/StarSqueakPlugin/StarSqueakPlugin.c M src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.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/cointerpmt.c M src/vm/cointerpmt.h M src/vm/gcc3x-cointerp.c M src/vm/gcc3x-cointerpmt.c M stacksrc/vm/gcc3x-interp.c M stacksrc/vm/interp.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.2724 Slang: Fix the right shift: dont convert to usqInt a type longer than usqInt SpurMemoryManager/SpurPlanningCompactor: Fix one bug thrown up by Marcel's EphemeronLink example. The planning compactor failed to update objects in the mournQueue objStack. Make sure prepareObjStacksForPlanningCompactor is actually invoked (!!). Refactor a couple of obj stack routines to take an "also do contents" flag, printObjStack:printContents:, relocateObjStackForPlanningCompactor:andContents:, the last one fixing the bug in question. Refactor runLeakCheckerForFreeSpace: into runLeakCheckerForFreeSpace:ignoring: to allow the most recenty allocated object in clone (the shallowCopy primitive) to be ignored, because its contents are not yet initialized when the free space check is done. Make sure to run the free space integrity check as part of leak checking. VMMaker image: Add MULTIPLEBYTECODESETS true to all launch examples in the VM Simulation workspace. Use Squeak 5.3 to build new VMMaker images.

1 0

VM Maker: VMMaker.oscog-eem.2724.mcz
by commits＠source.squeak.org 10 Mar '20

10 Mar '20

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2724.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2724 Author: eem Time: 9 March 2020, 9:25:33.195338 pm UUID: 8312b062-c234-4dbb-bc52-8541f45811bb Ancestors: VMMaker.oscog-nice.2723 SpurMemoryManager/SpurPlanningCompactor: Fix one bug thrown up by Marcel's EphemeronLink example. The planning compactor failed to update objects in the mournQueue objStack. Make sure prepareObjStacksForPlanningCompactor is actually invoked (!!). Refactor a couple of obj stack routines to take an "also do contents" flag, printObjStack:printContents:, relocateObjStackForPlanningCompactor:andContents:, the last one fixing the bug in question. Refactor runLeakCheckerForFreeSpace: into runLeakCheckerForFreeSpace:ignoring: to allow the most recenty allocated object in clone (the shallowCopy primitive) to be ignored, because its contents are not yet initialized when the free space check is done. Make sure to run the free space integrity check as part of leak checking. Fix a comment typo. Simulator: StackInterpreter: fix simulaiton of primitiveHighBit on 64-bits. Make withSimulatorFetchPointerMovedAsideDo: monotonic, allowing the free space checker to be run in the context of the leak checker. VMMaker initialization, hack fix initialization in the current Squeak Git support context. =============== Diff against VMMaker.oscog-nice.2723 =============== Item was changed: ----- Method: ImageLeakChecker class>>prepareToBeAddedToCodeGenerator: (in category 'translation') ----- prepareToBeAddedToCodeGenerator: aCodeGen aCodeGen removeMethodForSelector: #become:with:; removeMethodForSelector: #fullGC; removeMethodForSelector: #growOldSpaceByAtLeast:; removeMethodForSelector: #runLeakCheckerFor:; + removeMethodForSelector: #runLeakCheckerForFreeSpace:ignoring:; - removeMethodForSelector: #runLeakCheckerForFreeSpace:; removeMethodForSelector: #runLeakCheckerFor:excludeUnmarkedObjs:classIndicesShouldBeValid:; removeMethodForSelector: #inLineRunLeakCheckerFor:excludeUnmarkedObjs:classIndicesShouldBeValid:; removeMethodForSelector: #scheduleScavenge; removeMethodForSelector: #tenuringIncrementalGC! Item was removed: - ----- Method: ImageLeakChecker>>runLeakCheckerForFreeSpace: (in category 'implementation') ----- - runLeakCheckerForFreeSpace: gcModes! Item was added: + ----- Method: ImageLeakChecker>>runLeakCheckerForFreeSpace:ignoring: (in category 'implementation') ----- + runLeakCheckerForFreeSpace: gcModes ignoring: anOop! Item was changed: ----- Method: InterpreterPrimitives>>primitiveHighBit (in category 'arithmetic integer primitives') ----- primitiveHighBit | integerReceiverOop leadingZeroCount highestBitZeroBased | integerReceiverOop := self stackTop. "Convert the receiver Oop to use a single tag bit" objectMemory numSmallIntegerTagBits > 1 ifTrue: + [integerReceiverOop := (integerReceiverOop >>> (objectMemory numSmallIntegerTagBits-1) bitOr: 1)]. - [integerReceiverOop := (integerReceiverOop >>> (self numSmallIntegerTagBits-1) bitOr: 1)]. self cppIf: #'__GNUC__' defined ifTrue: ["Note: in gcc, result is undefined if input is zero (for compatibility with BSR fallback when no CLZ instruction available). but input is never zero because we pass the oop with tag bits set, so we are safe" objectMemory wordSize = 4 ifTrue: [leadingZeroCount := self __builtin_clz: integerReceiverOop] ifFalse: [leadingZeroCount := self __builtin_clzll: integerReceiverOop]. leadingZeroCount = 0 ifTrue: ["highBit is not defined for negative Integer" self primitiveFail] ifFalse: ["Nice bit trick: 1-based high-bit is (32 - clz) - 1 to account for tag bit. This is like two-complement - clz - 1 on 5 bits, or in other words a bit-invert operation clz ^16r1F" self pop: 1 thenPushInteger: (leadingZeroCount bitXor: (BytesPerWord * 8 - 1))]. ^self]. self cppIf: #'__GNUC__' defined not & (#'_MSC_VER' defined | #'__ICC' defined) ifTrue: ["In MSVC, _lzcnt and _lzcnt64 builtins do not fallback to BSR when not supported by CPU Instead of messing with __cpuid() we always use the BSR intrinsic" "Trick: we test the oop sign rather than the integerValue. Assume oop are signed (so far, they are, sqInt are signed)" integerReceiverOop < 0 ifTrue: [self primitiveFail] ifFalse: [ "Setting this variable is useless, but VMMaker will generate an automatic initialization at a worse place if this isn't initialized explicitly." highestBitZeroBased := 0. "We do not even test the return value, because integerReceiverOop is never zero" self cCode: [objectMemory wordSize = 4 ifTrue: [self _BitScanReverse: (self addressOf: highestBitZeroBased) _: integerReceiverOop] ifFalse: [self _BitScanReverse64: (self addressOf: highestBitZeroBased) _: integerReceiverOop]] inSmalltalk: [highestBitZeroBased := integerReceiverOop highBit - 1]. "thanks to the tag bit, the +1 operation for getting 1-based rank is not necessary" self pop: 1 thenPushInteger: highestBitZeroBased]. ^self]. self cppIf: #'__GNUC__' defined not & #'_MSC_VER' defined not & #'__ICC' defined not ifTrue: ["not gcc/clang, nor MSVC/ICC, you have to implement if your compiler provide useful builtins" self cCode: [self primitiveFail] inSmalltalk: "Simulate so that the simulatror is closer to the actual VM" [integerReceiverOop < 0 ifTrue: [self primitiveFail] ifFalse: [self pop: 1 thenPushInteger: integerReceiverOop highBit - 1]]]! Item was changed: ----- Method: Spur32BitMMLESimulator>>checkHeapIntegrity:classIndicesShouldBeValid: (in category 'debug support') ----- checkHeapIntegrity: excludeUnmarkedObjs classIndicesShouldBeValid: classIndicesShouldBeValid "Almost all of the time spent in SourMemoryManager>>checkHeapIntegrity:classIndicesShouldBeValid: used to go into the asserts in fetchPointer:ofObject: in the simulator class overrides. + Since we know here the indices used are valid we temporarily remove them to claw back that performance." - Since we know here the indices used are valid we temporarily remove them to claw back that poerformance." ^self withSimulatorFetchPointerMovedAsideDo: [super checkHeapIntegrity: excludeUnmarkedObjs classIndicesShouldBeValid: classIndicesShouldBeValid]! Item was changed: ----- Method: Spur64BitMMLECoSimulator>>checkHeapIntegrity:classIndicesShouldBeValid: (in category 'debug support') ----- checkHeapIntegrity: excludeUnmarkedObjs classIndicesShouldBeValid: classIndicesShouldBeValid "Almost all of the time spent in SourMemoryManager>>checkHeapIntegrity:classIndicesShouldBeValid: used to go into the asserts in fetchPointer:ofObject: in the simulator class overrides. + Since we know here the indices used are valid we temporarily remove them to claw back that performance." - Since we know here the indices used are valid we temporarily remove them to claw back that poerformance." ^self withSimulatorFetchPointerMovedAsideDo: [super checkHeapIntegrity: excludeUnmarkedObjs classIndicesShouldBeValid: classIndicesShouldBeValid]! Item was changed: ----- Method: Spur64BitMMLESimulator>>checkHeapIntegrity:classIndicesShouldBeValid: (in category 'debug support') ----- checkHeapIntegrity: excludeUnmarkedObjs classIndicesShouldBeValid: classIndicesShouldBeValid "Almost all of the time spent in SourMemoryManager>>checkHeapIntegrity:classIndicesShouldBeValid: used to go into the asserts in fetchPointer:ofObject: in the simulator class overrides. + Since we know here the indices used are valid we temporarily remove them to claw back that performance." - Since we know here the indices used are valid we temporarily remove them to claw back that poerformance." ^self withSimulatorFetchPointerMovedAsideDo: [super checkHeapIntegrity: excludeUnmarkedObjs classIndicesShouldBeValid: classIndicesShouldBeValid]! Item was changed: ----- Method: Spur64BitMemoryManager>>allocateSlotsInOldSpace:bytes:format:classIndex: (in category 'allocation') ----- allocateSlotsInOldSpace: numSlots bytes: totalBytes format: formatField classIndex: classIndex "Answer the oop of a chunk of space in oldSpace with numSlots slots. The header will have been filled-in but not the contents. If no memory is available answer nil." <var: #totalBytes type: #usqInt> <inline: false> | chunk | chunk := self allocateOldSpaceChunkOfBytes: totalBytes. chunk ifNil: [^nil]. numSlots >= self numSlotsMask ifTrue: "for header parsing we put a saturated slot count in the prepended overflow size word" [self longAt: chunk put: numSlots + (self numSlotsMask << self numSlotsFullShift). self longAt: chunk + self baseHeaderSize put: (self headerForSlots: self numSlotsMask format: formatField classIndex: classIndex). + self checkFreeSpace: GCModeNewSpace ignoring: chunk + self baseHeaderSize. - self checkFreeSpace: GCModeNewSpace. ^chunk + self baseHeaderSize]. self longAt: chunk put: (self headerForSlots: numSlots format: formatField classIndex: classIndex). + self checkFreeSpace: GCModeNewSpace ignoring: chunk. - self checkFreeSpace: GCModeNewSpace. ^chunk! Item was changed: CogClass subclass: #SpurMemoryManager (excessive size, no diff calculated) Item was changed: ----- Method: SpurMemoryManager class>>initialize (in category 'class initialization') ----- initialize "SpurMemoryManager initialize" BitsPerByte := 8. "Initialize at least the become constants for the Spur bootstrap where the old ObjectMemory simulator is used before a Spur simulator is created.." self initializeSpurObjectRepresentationConstants. "An obj stack is a stack of objects stored in a hidden root slot, such as the markStack or the ephemeronQueue. It is a linked list of segments, with the hot end at the head of the list. It is a word object. The stack pointer is in ObjStackTopx and 0 means empty. The list goes through ObjStackNextx. We don't want to shrink objStacks, since they're used in GC and it's good to keep their memory around. So unused pages created by popping emptied pages are kept on the ObjStackFreex list. ObjStackNextx must be the last field for swizzleObjStackAt:." + ObjStackPageSlots := 4092. "+ double header = 16k bytes per page in 32-bits, 32k bytes per page in 64 bits" - ObjStackPageSlots := 4092. "+ double header = 16k bytes per page in 32-bits" ObjStackTopx := 0. ObjStackMyx := 1. ObjStackFreex := 2. ObjStackNextx := 3. ObjStackFixedSlots := 4. ObjStackLimit := ObjStackPageSlots - ObjStackFixedSlots. + "The hiddenRootsObject contains the classTable pages and up to 8 additional objects. + Currently we use four; the three objStacks (the mark stack, the weaklings and the + mourn queue), and the rememberedSet." - "The hiddenHootsObject contains the classTable pages and up to 8 additional objects. - Currently we use four; the three objStacks, the mark stack, the weaklings and the - mourn queue, and the rememberedSet." MarkStackRootIndex := self basicNew classTableRootSlots. WeaklingStackRootIndex := MarkStackRootIndex + 1. MournQueueRootIndex := MarkStackRootIndex + 2. RememberedSetRootIndex := MarkStackRootIndex + 3. MarkObjectsForEnumerationPrimitives := false. "The remap buffer support is for compatibility; Spur doesn't GC during allocation. Eventually this should die." RemapBufferSize := 25. "Extra roots are for plugin support." ExtraRootsSize := 2048. "max. # of external roots" "gcPhaseInProgress takes these values to identify phases as required." ScavengeInProgress := 1. SlidingCompactionInProgress := 2! Item was changed: ----- Method: SpurMemoryManager>>checkFreeSpace: (in category 'debug support') ----- checkFreeSpace: gcModes <api> self assert: self bitsSetInFreeSpaceMaskForAllFreeLists. self assert: totalFreeOldSpace = self totalFreeListBytes. (gcModes > 0 and: [checkForLeaks allMask: (GCModeFreeSpace bitOr: gcModes)]) ifTrue: + [self runLeakCheckerForFreeSpace: GCModeFreeSpace ignoring: nil]! - [self runLeakCheckerForFreeSpace: GCModeFreeSpace]! Item was added: + ----- Method: SpurMemoryManager>>checkFreeSpace:ignoring: (in category 'debug support') ----- + checkFreeSpace: gcModes ignoring: anOopToIgnore + <api> + self assert: self bitsSetInFreeSpaceMaskForAllFreeLists. + self assert: totalFreeOldSpace = self totalFreeListBytes. + (gcModes > 0 + and: [checkForLeaks allMask: (GCModeFreeSpace bitOr: gcModes)]) ifTrue: + [self runLeakCheckerForFreeSpace: GCModeFreeSpace ignoring: anOopToIgnore]! Item was changed: ----- Method: SpurMemoryManager>>checkHeapFreeSpaceIntegrity (in category 'debug support') ----- checkHeapFreeSpaceIntegrity "Perform an integrity/leak check using the heapMap. Assume clearLeakMapAndMapAccessibleFreeSpace has set a bit at each free chunk's header. Scan all objects in the heap checking that no pointer points to a free chunk and that all free chunks that refer to others refer to marked chunks. Answer if all checks pass." | ok total | <inline: false> <var: 'total' type: #usqInt> ok := true. total := 0. 0 to: self numFreeLists - 1 do: [:i| (freeLists at: i) ~= 0 ifTrue: [(heapMap heapMapAtWord: (self pointerForOop: (freeLists at: i))) = 0 ifTrue: [coInterpreter print: 'leak in free list '; printNum: i; print: ' to non-free '; printHex: (freeLists at: i); cr. self eek. ok := false]]]. "Excuse the duplication but performance is at a premium and we avoid some tests by splitting the newSpace and oldSpace enumerations." self allNewSpaceEntitiesDo: [:obj| | fieldOop | (self isFreeObject: obj) ifTrue: [coInterpreter print: 'young object '; printHex: obj; print: ' is free'; cr. self eek. ok := false] ifFalse: + [obj ~= freeSpaceCheckOopToIgnore ifTrue: + [0 to: (self numPointerSlotsOf: obj) - 1 do: + [:fi| + fieldOop := self fetchPointer: fi ofObject: obj. + (self isNonImmediate: fieldOop) ifTrue: + [(heapMap heapMapAtWord: (self pointerForOop: fieldOop)) ~= 0 ifTrue: + [coInterpreter print: 'object leak in '; printHex: obj; print: ' @ '; printNum: fi; print: ' = '; printHex: fieldOop; print: ' is free'; cr. + self eek. + ok := false]]]]]]. - [0 to: (self numPointerSlotsOf: obj) - 1 do: - [:fi| - fieldOop := self fetchPointer: fi ofObject: obj. - (self isNonImmediate: fieldOop) ifTrue: - [(heapMap heapMapAtWord: (self pointerForOop: fieldOop)) ~= 0 ifTrue: - [coInterpreter print: 'object leak in '; printHex: obj; print: ' @ '; printNum: fi; print: ' = '; printHex: fieldOop; print: ' is free'; cr. - self eek. - ok := false]]]]]. self allOldSpaceEntitiesDo: [:obj| | fieldOop | (self isFreeObject: obj) ifTrue: [(heapMap heapMapAtWord: (self pointerForOop: obj)) = 0 ifTrue: [coInterpreter print: 'leak in free chunk '; printHex: obj; print: ' is unmapped?!! '; cr. self eek. ok := false]. fieldOop := self fetchPointer: self freeChunkNextIndex ofFreeChunk: obj. (fieldOop ~= 0 and: [(heapMap heapMapAtWord: (self pointerForOop: fieldOop)) = 0]) ifTrue: [coInterpreter print: 'leak in free chunk '; printHex: obj; print: ' @ 0 = '; printHex: fieldOop; print: ' is unmapped'; cr. self eek. ok := false]. (self isLilliputianSize: (self bytesInObject: obj)) ifFalse: [fieldOop := self fetchPointer: self freeChunkPrevIndex ofFreeChunk: obj. (fieldOop ~= 0 and: [(heapMap heapMapAtWord: (self pointerForOop: fieldOop)) = 0]) ifTrue: [coInterpreter print: 'leak in free chunk '; printHex: obj; print: ' @ 0 = '; printHex: fieldOop; print: ' is unmapped'; cr. self eek. ok := false]]. (self isLargeFreeObject: obj) ifTrue: [self freeChunkParentIndex to: self freeChunkLargerIndex do: [:fi| fieldOop := self fetchPointer: fi ofFreeChunk: obj. (fieldOop ~= 0 and: [(heapMap heapMapAtWord: (self pointerForOop: fieldOop)) = 0]) ifTrue: [coInterpreter print: 'leak in free chunk '; printHex: obj; print: ' @ '; printNum: fi; print: ' = '; printHex: fieldOop; print: ' is unmapped'; cr. self eek. ok := false]]]. total := total + (self bytesInObject: obj)] ifFalse: + [obj ~= freeSpaceCheckOopToIgnore ifTrue: + [0 to: (self numPointerSlotsOf: obj) - 1 do: + [:fi| + (self isForwarded: obj) + ifTrue: + [self assert: fi = 0. "I'm now trying to use forwarders in GC algorithms..." + fieldOop := self fetchPointer: fi ofMaybeForwardedObject: obj] + ifFalse: "We keep #fetchPointer:ofObject: API here for assertions" + [fieldOop := self fetchPointer: fi ofObject: obj]. + (self isNonImmediate: fieldOop) ifTrue: + [(heapMap heapMapAtWord: (self pointerForOop: fieldOop)) ~= 0 ifTrue: + [coInterpreter print: 'object leak in '; printHex: obj; print: ' @ '; printNum: fi; print: ' = '; printHex: fieldOop; print: ' is free'; cr. + self eek. + ok := false]]]]]]. - [0 to: (self numPointerSlotsOf: obj) - 1 do: - [:fi| - (self isForwarded: obj) - ifTrue: - [self assert: fi = 0. "I'm now trying to use forwarders in GC algorithms..." - fieldOop := self fetchPointer: fi ofMaybeForwardedObject: obj] - ifFalse: "We keep #fetchPointer:ofObject: API here for assertions" - [fieldOop := self fetchPointer: fi ofObject: obj]. - (self isNonImmediate: fieldOop) ifTrue: - [(heapMap heapMapAtWord: (self pointerForOop: fieldOop)) ~= 0 ifTrue: - [coInterpreter print: 'object leak in '; printHex: obj; print: ' @ '; printNum: fi; print: ' = '; printHex: fieldOop; print: ' is free'; cr. - self eek. - ok := false]]]]]. total ~= totalFreeOldSpace ifTrue: [coInterpreter print: 'incorrect totalFreeOldSpace; expected '; printNum: totalFreeOldSpace; print: ' found '; printNum: total; cr. self eek. ok := false]. ^ok! Item was changed: ----- Method: SpurMemoryManager>>inLineRunLeakCheckerFor:excludeUnmarkedObjs:classIndicesShouldBeValid: (in category 'debug support') ----- inLineRunLeakCheckerFor: gcModes excludeUnmarkedObjs: excludeUnmarkedObjs classIndicesShouldBeValid: classIndicesShouldBeValid <inline: true> (gcModes anyMask: checkForLeaks) ifTrue: [(gcModes anyMask: GCModeFull) ifTrue: [coInterpreter reverseDisplayFrom: 0 to: 7] ifFalse: [coInterpreter reverseDisplayFrom: 8 to: 15]. self clearLeakMapAndMapAccessibleObjects. self asserta: (self checkHeapIntegrity: excludeUnmarkedObjs classIndicesShouldBeValid: classIndicesShouldBeValid). self asserta: coInterpreter checkInterpreterIntegrity = 0. + self asserta: coInterpreter checkInterpreterIntegrity = 0. self asserta: coInterpreter checkStackIntegrity. + self asserta: (coInterpreter checkCodeIntegrity: gcModes). + (gcModes anyMask: GCModeFreeSpace) ifTrue: + [self clearLeakMapAndMapAccessibleFreeSpace. + self asserta: self checkHeapFreeSpaceIntegrity]]! - self asserta: (coInterpreter checkCodeIntegrity: gcModes)]! Item was changed: ----- Method: SpurMemoryManager>>printObjStack: (in category 'obj stacks') ----- printObjStack: objStack <api> + self printObjStack: objStack printContents: false! - objStack = nilObj - ifTrue: - [coInterpreter print: 'nil'; cr] - ifFalse: - [self printObjStackPage: objStack - myIndex: (self fetchPointer: ObjStackMyx ofObject: objStack) - pageType: ObjStackMyx]! Item was added: + ----- Method: SpurMemoryManager>>printObjStack:printContents: (in category 'obj stacks') ----- + printObjStack: objStack printContents: printContents + <api> + objStack = nilObj + ifTrue: + [coInterpreter print: 'nil'; cr] + ifFalse: + [self printObjStackPage: objStack + myIndex: (self fetchPointer: ObjStackMyx ofObject: objStack) + pageType: ObjStackMyx + printContents: printContents]! Item was added: + ----- Method: SpurMemoryManager>>printObjStackPage:myIndex:pageType:printContents: (in category 'obj stacks') ----- + printObjStackPage: objStackPage myIndex: myx pageType: pageType printContents: printContents + | freeOrNextPage page isFirstPage isNextPage isFreePage | + <inline: false> + isFirstPage := pageType = ObjStackMyx. + isNextPage := pageType = ObjStackNextx. + isFreePage := pageType = ObjStackFreex. + self printObjStackPage: objStackPage + myIndex: myx + tag: (isFirstPage ifTrue: ['head'] ifFalse: [isFreePage ifTrue: ['free'] ifFalse: ['next']]). + (isFirstPage or: [isNextPage]) ifTrue: + [coInterpreter tab; print: 'topx: '; printNum: (self fetchPointer: ObjStackTopx ofObject: objStackPage); print: ' next: '; printHex: (self fetchPointer: ObjStackNextx ofObject: objStackPage). + isFirstPage ifTrue: + [coInterpreter print: ' free: '; printHex: (self fetchPointer: ObjStackFreex ofObject: objStackPage)]. + coInterpreter cr]. + isFirstPage ifTrue: + [freeOrNextPage := self fetchPointer: ObjStackFreex ofObject: objStackPage. + [freeOrNextPage ~= 0] whileTrue: + [self printObjStackPage: freeOrNextPage myIndex: myx pageType: ObjStackFreex printContents: false. + page := self fetchPointer: ObjStackFreex ofObject: freeOrNextPage. + (page = freeOrNextPage + or: [page = objStackPage]) ifTrue: + [coInterpreter print: 'circularity in free page list!!!!'; cr. + page := 0]. + freeOrNextPage := page]]. + freeOrNextPage := self fetchPointer: ObjStackNextx ofObject: objStackPage. + freeOrNextPage ~= 0 ifTrue: + [self printObjStackPage: freeOrNextPage myIndex: myx pageType: ObjStackNextx printContents: printContents]. + printContents ifTrue: + [| index | + index := (self fetchPointer: ObjStackTopx ofObject: objStackPage) + ObjStackNextx. + [index >= ObjStackFixedSlots] whileTrue: + [coInterpreter space; printHex: (self fetchPointer: index ofObject: objStackPage). + index := index - 1]. + (self fetchPointer: ObjStackTopx ofObject: objStackPage) + ObjStackNextx >= ObjStackFixedSlots ifTrue: + [coInterpreter cr]]! Item was removed: - ----- Method: SpurMemoryManager>>relocateObjStackForPlanningCompactor: (in category 'compaction') ----- - relocateObjStackForPlanningCompactor: objStack - "Relocate all objStack pages that comprise objStack." - | stackOrNil freeList next relocated result | - objStack = nilObj ifTrue: - [^objStack]. - stackOrNil := objStack. - freeList := self fetchPointer: ObjStackFreex ofObject: objStack. - [self assert: (self numSlotsOfAny: stackOrNil) = ObjStackPageSlots. - "There are four fixed slots in an obj stack, and a Topx of 0 indicates empty, so - if there were 5 slots in an oop stack, full would be 2, and the last 0-rel index is 4. - Hence the last index is topx + fixed slots - 1, or topx + ObjStackNextx" - next := self fetchPointer: ObjStackNextx ofObject: stackOrNil. - relocated := compactor - relocateObjectsInHeapEntity: stackOrNil - from: ObjStackFreex - to: ObjStackNextx + (self rawHashBitsOf: stackOrNil). - stackOrNil = objStack ifTrue: - [result := relocated]. - self setHashBitsOf: stackOrNil to: 0. - next ~= 0] - whileTrue: - [stackOrNil := next]. - [freeList ~= 0] whileTrue: - [self assert: (self numSlotsOfAny: freeList) = ObjStackPageSlots. - next := self fetchPointer: ObjStackFreex ofObject: freeList. - compactor - relocateObjectsInHeapEntity: freeList - from: ObjStackFreex - to: ObjStackFreex. - freeList := next]. - ^relocated! Item was added: + ----- Method: SpurMemoryManager>>relocateObjStackForPlanningCompactor:andContents: (in category 'compaction') ----- + relocateObjStackForPlanningCompactor: objStack andContents: relocateContents + "Relocate all objStack pages that comprise objStack." + | stackOrNil freeList next relocated result | + objStack = nilObj ifTrue: + [^objStack]. + stackOrNil := objStack. + freeList := self fetchPointer: ObjStackFreex ofObject: objStack. + [self assert: (self numSlotsOfAny: stackOrNil) = ObjStackPageSlots. + "There are four fixed slots in an obj stack, and a Topx of 0 indicates empty, so + if there were 5 slots in an oop stack, full would be 2, and the last 0-rel index is 4. + Hence the last index is topx + fixed slots - 1, or topx + ObjStackNextx" + next := self fetchPointer: ObjStackNextx ofObject: stackOrNil. + relocated := compactor + relocateObjectsInHeapEntity: stackOrNil + from: ObjStackFreex + to: ObjStackNextx + (relocateContents ifTrue: [self rawHashBitsOf: stackOrNil] ifFalse: [0]). + stackOrNil = objStack ifTrue: + [result := relocated]. + next ~= 0] + whileTrue: + [stackOrNil := next]. + [freeList ~= 0] whileTrue: + [self assert: (self numSlotsOfAny: freeList) = ObjStackPageSlots. + next := self fetchPointer: ObjStackFreex ofObject: freeList. + compactor + relocateObjectsInHeapEntity: freeList + from: ObjStackFreex + to: ObjStackFreex. + freeList := next]. + ^relocated! Item was changed: ----- Method: SpurMemoryManager>>relocateObjStacksForPlanningCompactor (in category 'compaction') ----- relocateObjStacksForPlanningCompactor "Relocate all non-empty objStack pages, following the objStacks from the roots." + self assert: (self isEmptyObjStack: markStack). + markStack := self relocateObjStackForPlanningCompactor: markStack andContents: false. + self assert: (self isEmptyObjStack: weaklingStack). + weaklingStack := self relocateObjStackForPlanningCompactor: weaklingStack andContents: false. + mournQueue := self relocateObjStackForPlanningCompactor: mournQueue andContents: true.! - markStack := self relocateObjStackForPlanningCompactor: markStack. - weaklingStack := self relocateObjStackForPlanningCompactor: weaklingStack. - mournQueue := self relocateObjStackForPlanningCompactor: mournQueue! Item was removed: - ----- Method: SpurMemoryManager>>runLeakCheckerForFreeSpace: (in category 'debug support') ----- - runLeakCheckerForFreeSpace: gcModes - <inline: false> - (gcModes anyMask: GCModeFreeSpace) ifTrue: - [coInterpreter reverseDisplayFrom: 16 to: 19. - self clearLeakMapAndMapAccessibleFreeSpace. - self asserta: self checkHeapFreeSpaceIntegrity]! Item was added: + ----- Method: SpurMemoryManager>>runLeakCheckerForFreeSpace:ignoring: (in category 'debug support') ----- + runLeakCheckerForFreeSpace: gcModes ignoring: anOopOrNil + "Check free space integrity by setting bits in the map corresponding to all free space objects + and checking tat no pointer field refers to a free object. anOopOrNil is provided to filter-out + the as-yet-to-be initialized object in primitiveShallowCopy/primitiveClone." + <inline: false> + (gcModes anyMask: GCModeFreeSpace) ifTrue: + [coInterpreter reverseDisplayFrom: 16 to: 19. + self clearLeakMapAndMapAccessibleFreeSpace. + freeSpaceCheckOopToIgnore := anOopOrNil. + self asserta: self checkHeapFreeSpaceIntegrity. + freeSpaceCheckOopToIgnore := nil]! Item was changed: ----- Method: SpurMemoryManager>>withSimulatorFetchPointerMovedAsideDo: (in category 'debug support') ----- withSimulatorFetchPointerMovedAsideDo: aBlock "For performance, remove the simulator implementation of fetchPointer:ofObject: while aBlock is running and answer the block's result." | theMethod | theMethod := self class lookupSelector: #fetchPointer:ofObject:. + self deny: theMethod isNil. + theMethod methodClass == SpurMemoryManager + ifTrue: [theMethod := nil] + ifFalse: [theMethod methodClass basicRemoveSelector: #fetchPointer:ofObject:]. - self deny: (theMethod isNil or: [theMethod methodClass == SpurMemoryManager]). - theMethod methodClass basicRemoveSelector: #fetchPointer:ofObject:. ^aBlock ensure: + [theMethod ifNotNil: + [theMethod methodClass + basicAddSelector: #fetchPointer:ofObject: + withMethod: theMethod]]! - [theMethod methodClass - basicAddSelector: #fetchPointer:ofObject: - withMethod: theMethod]! Item was changed: ----- Method: SpurPlanningCompactor>>initializeCompaction (in category 'compaction') ----- initializeCompaction manager checkFreeSpace: GCModeFull. self selectSavedFirstFieldsSpace. self unpinRememberedSet. manager resetFreeListHeads; + prepareObjStacksForPlanningCompactor; totalFreeOldSpace: 0; beginSlidingCompaction. savedFirstFieldsSpace top: savedFirstFieldsSpace start - manager bytesPerOop! Item was changed: ----- Method: SpurSelectiveCompactorSimulator>>compact (in category 'api') ----- compact self talk: '~~ Start selective compaction ~~'. self tellMeNumSegmentAndTotalFreeSpace. self tellMeWhichSegmentsAreBeingCompacted. super compact. self tellMeNumSegmentAndTotalFreeSpace. self tellMeWhichSegmentsAreBeingCompacted. + manager runLeakCheckerForFreeSpace: GCModeFreeSpace ignoring: nil. - manager runLeakCheckerForFreeSpace: GCModeFreeSpace. self talk: '~~ Finished selective compaction ~~'. ! Item was changed: ----- Method: VMMaker class>>initialize (in category 'initialisation') ----- initialize "VMMaker initialize" DirNames := Dictionary new. DirNames at: #coreVMDir put: 'vm'; at: #platformsDir put: 'platforms'; at: #pluginsDir put: 'plugins'; at: #sourceDir put: 'src'. "Try and decide where the Cog source tree is. Two configurations are likely. One is that the VMMaker image is running in the image directory in the source tree and hence everything will be at '..'. Another is where the source tree is at the same level as the VMMaker image, in which case it is likely called oscogvm or Cog." #('../platforms' 'oscogvm/platforms' 'Cog/platforms' '../oscogvm/platforms') with: #('..' 'oscogvm' 'Cog' '../oscogvm') + do: ((Smalltalk classNamed: #FileLocator) - do: ((Smalltalk classNamed: #FileSystem) ifNotNil: + [:classFileLocator| + [:dir :path| + (classFileLocator cwd / dir) isDirectory ifTrue: - [[:dir :path| - (FileLocator cwd / dir) isDirectory ifTrue: [DirNames at: #sourceTree put: path. ^self]]] ifNil: [[:dir :path| (FileDirectory default directoryExists: dir) ifTrue: [DirNames at: #sourceTree put: path. ^self]]])!

1 0

[PRO-CRYPTO}[RELEASE] ProCrypto release: Fragmentation Release, with dependencies
by Robert 08 Mar '20

08 Mar '20

Finally, got her done. CryptoGreen. I fragmented Cryptography and established correct dependencies for the various chunk packages. Here is a list of the latest ProCrypto release packages, available in the Oceanside repository. I will wait a few days and if no issues arise, I will publish to Cryptography. http://www.squeaksource.com/Oceanside.html and check the Releases. --- Here is the official list of dependencies between chunks: - a list of the packages released and - their sizes, as well as - a list of their dependencies, as part of the ProCrypto release: - @ 18 kb, Name: CryptographyCore-rww.5 - @ 58 kb, Name: CryptographyASN1-rww.4 - @ 23 kb, Name: CryptographyRandom-rww.4 - ---->> CryptographyCore-rww.5 - @ 730 kb, Name: CryptographyHashing-rww.6 - ---->> CryptographyCore-rww.5 - @ 74 kb, Name: CryptographyCiphers-rww.7 - ---->> CryptographyHashing-rww.6 - ---->>---->> CryptographyCore-rww.5 - ---->> CryptographyRandom-rww.4 - ---->>---->> CryptographyCore-rww.5 - @ 38 kb, Name: CryptographySignatures-rww.7 - ---->> CryptographyCiphers-rww.7 - ---->> CryptographyRandom-rww.4 - ---->> CryptographyHashing-rww.6 - ---->> CryptographyCore-rww.5 - @ 7 kb, Name: CryptographyKeyExchange-rww.6 - ---->> CryptographySignatures-rww.7 - ---->> CryptographyCiphers-rww.7 - ---->> CryptographyRandom-rww.4 - ---->> CryptographyHashing-rww.6 - ---->> CryptographyCore-rww.5 - @ 19 kb, Name: CryptographyArchive-rww.8 - ---->> CryptographyKeyExchange-rww.6 - ---->> CryptographySignatures-rww.7 - ---->> CryptographyCiphers-rww.7 - ---->> CryptographyRandom-rww.4 - ---->> CryptographyHashing-rww.6 - ---->> CryptographyCore-rww.5 - @ 37 kb, Name: CryptographyX509-rww.6 - ---->> CryptographyArchive-rww.8 - ---->> CryptographyKeyExchange-rww.6 - ---->> CryptographySignatures-rww.7 - ---->> CryptographyCiphers-rww.7 - ---->> CryptographyRandom-rww.4 - ---->> CryptographyHashing-rww.6 - ---->> CryptographyCore-rww.5 For a total of 1,004 MBs in size. All packages are independently loadable and pull in the dependent packages through Monticello's package mgmt. All are linked to the latest versions. X509 pulls in everything and Archive almost does as well. I will treat this as the working copy, going forwards. Kindly, Robert

1 1

← Newer
1
...
8
9
10
11
12
13
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev March 2020