Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3107.mcz
==================== Summary ====================
Name: VMMaker.oscog-eem.3107 Author: eem Time: 21 November 2021, 1:39:08.900085 pm UUID: c238edb9-02dd-4085-8e56-ef88927e16d0 Ancestors: VMMaker.oscog-eem.3106
Cog simulation: Commit up-to-date surrogate accessors; mostly deletions.
=============== Diff against VMMaker.oscog-eem.3106 ===============
Item was removed: - ----- Method: CogMethodSurrogate32>>cbUsesInstVars (in category 'accessing generated') ----- - cbUsesInstVars - <bitPosition: 17 width: 1> - ^(((objectMemory byteAt: address + 2 + baseHeaderSize) bitShift: -1) bitAnd: 16r1) ~= 0!
Item was removed: - ----- Method: CogMethodSurrogate32>>cbUsesInstVars: (in category 'accessing generated') ----- - cbUsesInstVars: aValue - - | index delta | - index := address + 2 + baseHeaderSize. - (delta := cogit getCodeToDataDelta) > 0 ifTrue: - [self assert: (cogit addressIsInCodeZone: address - delta). - objectMemory - byteAt: index - delta - put: (((objectMemory byteAt: index - delta) bitAnd: 16rFD) + (aValue ifTrue: [2] ifFalse: [0]))]. - objectMemory - byteAt: index - put: (((objectMemory byteAt: index) bitAnd: 16rFD) + (aValue ifTrue: [2] ifFalse: [0])). - ^aValue!
Item was removed: - ----- Method: CogMethodSurrogate32>>cmHasMovableLiteral (in category 'accessing generated') ----- - cmHasMovableLiteral - <bitPosition: 18 width: 1> - ^(((objectMemory byteAt: address + 2 + baseHeaderSize) bitShift: -2) bitAnd: 16r1) ~= 0!
Item was removed: - ----- Method: CogMethodSurrogate32>>cmHasMovableLiteral: (in category 'accessing generated') ----- - cmHasMovableLiteral: aValue - - | index delta | - index := address + 2 + baseHeaderSize. - (delta := cogit getCodeToDataDelta) > 0 ifTrue: - [self assert: (cogit addressIsInCodeZone: address - delta). - objectMemory - byteAt: index - delta - put: (((objectMemory byteAt: index - delta) bitAnd: 16rFB) + (aValue ifTrue: [4] ifFalse: [0]))]. - objectMemory - byteAt: index - put: (((objectMemory byteAt: index) bitAnd: 16rFB) + (aValue ifTrue: [4] ifFalse: [0])). - ^aValue!
Item was removed: - ----- Method: CogMethodSurrogate32>>cmNumArgs (in category 'accessing generated') ----- - cmNumArgs - <bitPosition: 0 width: 8> - ^objectMemory byteAt: address + baseHeaderSize!
Item was removed: - ----- Method: CogMethodSurrogate32>>cmNumArgs: (in category 'accessing generated') ----- - cmNumArgs: aValue - - | index delta | - index := address + baseHeaderSize. - (delta := cogit getCodeToDataDelta) > 0 ifTrue: - [self assert: (cogit addressIsInCodeZone: address - delta). - objectMemory - byteAt: index - delta - put: aValue]. - ^objectMemory - byteAt: index - put: aValue!
Item was removed: - ----- Method: CogMethodSurrogate32>>cmRefersToYoung (in category 'accessing generated') ----- - cmRefersToYoung - <bitPosition: 11 width: 1> - ^(((objectMemory byteAt: address + 1 + baseHeaderSize) bitShift: -3) bitAnd: 16r1) ~= 0!
Item was removed: - ----- Method: CogMethodSurrogate32>>cmRefersToYoung: (in category 'accessing generated') ----- - cmRefersToYoung: aValue - - | index delta | - index := address + 1 + baseHeaderSize. - (delta := cogit getCodeToDataDelta) > 0 ifTrue: - [self assert: (cogit addressIsInCodeZone: address - delta). - objectMemory - byteAt: index - delta - put: (((objectMemory byteAt: index - delta) bitAnd: 16rF7) + (aValue ifTrue: [8] ifFalse: [0]))]. - objectMemory - byteAt: index - put: (((objectMemory byteAt: index) bitAnd: 16rF7) + (aValue ifTrue: [8] ifFalse: [0])). - ^aValue!
Item was removed: - ----- Method: CogMethodSurrogate32>>cmType (in category 'accessing generated') ----- - cmType - <bitPosition: 8 width: 3> - ^(objectMemory byteAt: address + 1 + baseHeaderSize) bitAnd: 16r7!
Item was removed: - ----- Method: CogMethodSurrogate32>>cmType: (in category 'accessing generated') ----- - cmType: aValue - - | index delta | - index := address + 1 + baseHeaderSize. - self assert: (aValue between: 0 and: 16r7). - (delta := cogit getCodeToDataDelta) > 0 ifTrue: - [self assert: (cogit addressIsInCodeZone: address - delta). - objectMemory - byteAt: index - delta - put: ((objectMemory byteAt: index - delta) bitAnd: 16rF8) + aValue]. - objectMemory - byteAt: index - put: ((objectMemory byteAt: index) bitAnd: 16rF8) + aValue. - ^aValue!
Item was removed: - ----- Method: CogMethodSurrogate32>>cmUsageCount (in category 'accessing generated') ----- - cmUsageCount - <bitPosition: 13 width: 3> - ^((objectMemory byteAt: address + 1 + baseHeaderSize) bitShift: -5) bitAnd: 16r7!
Item was removed: - ----- Method: CogMethodSurrogate32>>cmUsageCount: (in category 'accessing generated') ----- - cmUsageCount: aValue - - | index delta | - index := address + 1 + baseHeaderSize. - self assert: (aValue between: 0 and: 16r7). - (delta := cogit getCodeToDataDelta) > 0 ifTrue: - [self assert: (cogit addressIsInCodeZone: address - delta). - objectMemory - byteAt: index - delta - put: ((objectMemory byteAt: index - delta) bitAnd: 16r1F) + (aValue bitShift: 5)]. - objectMemory - byteAt: index - put: ((objectMemory byteAt: index) bitAnd: 16r1F) + (aValue bitShift: 5). - ^aValue!
Item was removed: - ----- Method: CogMethodSurrogate32>>cmUsesPenultimateLit (in category 'accessing generated') ----- - cmUsesPenultimateLit - <bitPosition: 16 width: 1> - ^((objectMemory byteAt: address + 2 + baseHeaderSize) bitAnd: 16r1) ~= 0!
Item was removed: - ----- Method: CogMethodSurrogate32>>cmUsesPenultimateLit: (in category 'accessing generated') ----- - cmUsesPenultimateLit: aValue - - | index delta | - index := address + 2 + baseHeaderSize. - (delta := cogit getCodeToDataDelta) > 0 ifTrue: - [self assert: (cogit addressIsInCodeZone: address - delta). - objectMemory - byteAt: index - delta - put: (((objectMemory byteAt: index - delta) bitAnd: 16rFE) + (aValue ifTrue: [1] ifFalse: [0]))]. - objectMemory - byteAt: index - put: (((objectMemory byteAt: index) bitAnd: 16rFE) + (aValue ifTrue: [1] ifFalse: [0])). - ^aValue!
Item was removed: - ----- Method: CogMethodSurrogate32>>cpicHasMNUCaseOrCMIsFullBlock (in category 'accessing generated') ----- - cpicHasMNUCaseOrCMIsFullBlock - <bitPosition: 12 width: 1> - ^(((objectMemory byteAt: address + 1 + baseHeaderSize) bitShift: -4) bitAnd: 16r1) ~= 0!
Item was removed: - ----- Method: CogMethodSurrogate32>>cpicHasMNUCaseOrCMIsFullBlock: (in category 'accessing generated') ----- - cpicHasMNUCaseOrCMIsFullBlock: aValue - - | index delta | - index := address + 1 + baseHeaderSize. - (delta := cogit getCodeToDataDelta) > 0 ifTrue: - [self assert: (cogit addressIsInCodeZone: address - delta). - objectMemory - byteAt: index - delta - put: (((objectMemory byteAt: index - delta) bitAnd: 16rEF) + (aValue ifTrue: [16] ifFalse: [0]))]. - objectMemory - byteAt: index - put: (((objectMemory byteAt: index) bitAnd: 16rEF) + (aValue ifTrue: [16] ifFalse: [0])). - ^aValue!
Item was removed: - ----- Method: CogMethodSurrogate32>>stackCheckOffset (in category 'accessing generated') ----- - stackCheckOffset - <bitPosition: 20 width: 12> - ^((objectMemory shortAt: address + 2 + baseHeaderSize) bitShift: -4) bitAnd: 16rFFF!
Item was removed: - ----- Method: CogMethodSurrogate32>>stackCheckOffset: (in category 'accessing generated') ----- - stackCheckOffset: aValue - - | index delta | - index := address + 2 + baseHeaderSize. - self assert: (aValue between: 0 and: 16rFFF). - (delta := cogit getCodeToDataDelta) > 0 ifTrue: - [self assert: (cogit addressIsInCodeZone: address - delta). - objectMemory - shortAt: index - delta - put: ((objectMemory shortAt: index - delta) bitAnd: 16rF) + (aValue bitShift: 4)]. - objectMemory - shortAt: index - put: ((objectMemory shortAt: index) bitAnd: 16rF) + (aValue bitShift: 4). - ^aValue!
Item was removed: - ----- Method: CogMethodSurrogate64>>cbUsesInstVars (in category 'accessing generated') ----- - cbUsesInstVars - <bitPosition: 17 width: 1> - ^(((objectMemory byteAt: address + 2 + baseHeaderSize) bitShift: -1) bitAnd: 16r1) ~= 0!
Item was removed: - ----- Method: CogMethodSurrogate64>>cbUsesInstVars: (in category 'accessing generated') ----- - cbUsesInstVars: aValue - - | index delta | - index := address + 2 + baseHeaderSize. - (delta := cogit getCodeToDataDelta) > 0 ifTrue: - [self assert: (cogit addressIsInCodeZone: address - delta). - objectMemory - byteAt: index - delta - put: (((objectMemory byteAt: index - delta) bitAnd: 16rFD) + (aValue ifTrue: [2] ifFalse: [0]))]. - objectMemory - byteAt: index - put: (((objectMemory byteAt: index) bitAnd: 16rFD) + (aValue ifTrue: [2] ifFalse: [0])). - ^aValue!
Item was removed: - ----- Method: CogMethodSurrogate64>>cmHasMovableLiteral (in category 'accessing generated') ----- - cmHasMovableLiteral - <bitPosition: 18 width: 1> - ^(((objectMemory byteAt: address + 2 + baseHeaderSize) bitShift: -2) bitAnd: 16r1) ~= 0!
Item was removed: - ----- Method: CogMethodSurrogate64>>cmHasMovableLiteral: (in category 'accessing generated') ----- - cmHasMovableLiteral: aValue - - | index delta | - index := address + 2 + baseHeaderSize. - (delta := cogit getCodeToDataDelta) > 0 ifTrue: - [self assert: (cogit addressIsInCodeZone: address - delta). - objectMemory - byteAt: index - delta - put: (((objectMemory byteAt: index - delta) bitAnd: 16rFB) + (aValue ifTrue: [4] ifFalse: [0]))]. - objectMemory - byteAt: index - put: (((objectMemory byteAt: index) bitAnd: 16rFB) + (aValue ifTrue: [4] ifFalse: [0])). - ^aValue!
Item was removed: - ----- Method: CogMethodSurrogate64>>cmNumArgs (in category 'accessing generated') ----- - cmNumArgs - <bitPosition: 0 width: 8> - ^objectMemory byteAt: address + baseHeaderSize!
Item was removed: - ----- Method: CogMethodSurrogate64>>cmNumArgs: (in category 'accessing generated') ----- - cmNumArgs: aValue - - | index delta | - index := address + baseHeaderSize. - (delta := cogit getCodeToDataDelta) > 0 ifTrue: - [self assert: (cogit addressIsInCodeZone: address - delta). - objectMemory - byteAt: index - delta - put: aValue]. - ^objectMemory - byteAt: index - put: aValue!
Item was removed: - ----- Method: CogMethodSurrogate64>>cmRefersToYoung (in category 'accessing generated') ----- - cmRefersToYoung - <bitPosition: 11 width: 1> - ^(((objectMemory byteAt: address + 1 + baseHeaderSize) bitShift: -3) bitAnd: 16r1) ~= 0!
Item was removed: - ----- Method: CogMethodSurrogate64>>cmRefersToYoung: (in category 'accessing generated') ----- - cmRefersToYoung: aValue - - | index delta | - index := address + 1 + baseHeaderSize. - (delta := cogit getCodeToDataDelta) > 0 ifTrue: - [self assert: (cogit addressIsInCodeZone: address - delta). - objectMemory - byteAt: index - delta - put: (((objectMemory byteAt: index - delta) bitAnd: 16rF7) + (aValue ifTrue: [8] ifFalse: [0]))]. - objectMemory - byteAt: index - put: (((objectMemory byteAt: index) bitAnd: 16rF7) + (aValue ifTrue: [8] ifFalse: [0])). - ^aValue!
Item was removed: - ----- Method: CogMethodSurrogate64>>cmType (in category 'accessing generated') ----- - cmType - <bitPosition: 8 width: 3> - ^(objectMemory byteAt: address + 1 + baseHeaderSize) bitAnd: 16r7!
Item was removed: - ----- Method: CogMethodSurrogate64>>cmType: (in category 'accessing generated') ----- - cmType: aValue - - | index delta | - index := address + 1 + baseHeaderSize. - self assert: (aValue between: 0 and: 16r7). - (delta := cogit getCodeToDataDelta) > 0 ifTrue: - [self assert: (cogit addressIsInCodeZone: address - delta). - objectMemory - byteAt: index - delta - put: ((objectMemory byteAt: index - delta) bitAnd: 16rF8) + aValue]. - objectMemory - byteAt: index - put: ((objectMemory byteAt: index) bitAnd: 16rF8) + aValue. - ^aValue!
Item was removed: - ----- Method: CogMethodSurrogate64>>cmUsageCount (in category 'accessing generated') ----- - cmUsageCount - <bitPosition: 13 width: 3> - ^((objectMemory byteAt: address + 1 + baseHeaderSize) bitShift: -5) bitAnd: 16r7!
Item was removed: - ----- Method: CogMethodSurrogate64>>cmUsageCount: (in category 'accessing generated') ----- - cmUsageCount: aValue - - | index delta | - index := address + 1 + baseHeaderSize. - self assert: (aValue between: 0 and: 16r7). - (delta := cogit getCodeToDataDelta) > 0 ifTrue: - [self assert: (cogit addressIsInCodeZone: address - delta). - objectMemory - byteAt: index - delta - put: ((objectMemory byteAt: index - delta) bitAnd: 16r1F) + (aValue bitShift: 5)]. - objectMemory - byteAt: index - put: ((objectMemory byteAt: index) bitAnd: 16r1F) + (aValue bitShift: 5). - ^aValue!
Item was removed: - ----- Method: CogMethodSurrogate64>>cmUsesPenultimateLit (in category 'accessing generated') ----- - cmUsesPenultimateLit - <bitPosition: 16 width: 1> - ^((objectMemory byteAt: address + 2 + baseHeaderSize) bitAnd: 16r1) ~= 0!
Item was removed: - ----- Method: CogMethodSurrogate64>>cmUsesPenultimateLit: (in category 'accessing generated') ----- - cmUsesPenultimateLit: aValue - - | index delta | - index := address + 2 + baseHeaderSize. - (delta := cogit getCodeToDataDelta) > 0 ifTrue: - [self assert: (cogit addressIsInCodeZone: address - delta). - objectMemory - byteAt: index - delta - put: (((objectMemory byteAt: index - delta) bitAnd: 16rFE) + (aValue ifTrue: [1] ifFalse: [0]))]. - objectMemory - byteAt: index - put: (((objectMemory byteAt: index) bitAnd: 16rFE) + (aValue ifTrue: [1] ifFalse: [0])). - ^aValue!
Item was removed: - ----- Method: CogMethodSurrogate64>>cpicHasMNUCaseOrCMIsFullBlock (in category 'accessing generated') ----- - cpicHasMNUCaseOrCMIsFullBlock - <bitPosition: 12 width: 1> - ^(((objectMemory byteAt: address + 1 + baseHeaderSize) bitShift: -4) bitAnd: 16r1) ~= 0!
Item was removed: - ----- Method: CogMethodSurrogate64>>cpicHasMNUCaseOrCMIsFullBlock: (in category 'accessing generated') ----- - cpicHasMNUCaseOrCMIsFullBlock: aValue - - | index delta | - index := address + 1 + baseHeaderSize. - (delta := cogit getCodeToDataDelta) > 0 ifTrue: - [self assert: (cogit addressIsInCodeZone: address - delta). - objectMemory - byteAt: index - delta - put: (((objectMemory byteAt: index - delta) bitAnd: 16rEF) + (aValue ifTrue: [16] ifFalse: [0]))]. - objectMemory - byteAt: index - put: (((objectMemory byteAt: index) bitAnd: 16rEF) + (aValue ifTrue: [16] ifFalse: [0])). - ^aValue!
Item was removed: - ----- Method: CogMethodSurrogate64>>stackCheckOffset (in category 'accessing generated') ----- - stackCheckOffset - <bitPosition: 20 width: 12> - ^((objectMemory shortAt: address + 2 + baseHeaderSize) bitShift: -4) bitAnd: 16rFFF!
Item was removed: - ----- Method: CogMethodSurrogate64>>stackCheckOffset: (in category 'accessing generated') ----- - stackCheckOffset: aValue - - | index delta | - index := address + 2 + baseHeaderSize. - self assert: (aValue between: 0 and: 16rFFF). - (delta := cogit getCodeToDataDelta) > 0 ifTrue: - [self assert: (cogit addressIsInCodeZone: address - delta). - objectMemory - shortAt: index - delta - put: ((objectMemory shortAt: index - delta) bitAnd: 16rF) + (aValue bitShift: 4)]. - objectMemory - shortAt: index - put: ((objectMemory shortAt: index) bitAnd: 16rF) + (aValue bitShift: 4). - ^aValue!
Item was changed: ----- Method: CogNewspeakMethodSurrogate32>>nextMethodOrIRCs: (in category 'accessing generated') ----- nextMethodOrIRCs: aValue | index delta | + index := address + 20 + baseHeaderSize. - index := address + baseHeaderSize + 20. (delta := cogit getCodeToDataDelta) > 0 ifTrue: [self assert: (cogit addressIsInCodeZone: address - delta). objectMemory + long32At: index - delta + put: ((aValue ifNotNil: [aValue asUnsignedInteger] ifNil: [0]))]. - longAt: index - delta - put: aValue]. ^objectMemory + long32At: index + put: ((aValue ifNotNil: [aValue asUnsignedInteger] ifNil: [0]))! - longAt: index - put: aValue!
Item was changed: ----- Method: CogNewspeakMethodSurrogate64>>nextMethodOrIRCs: (in category 'accessing generated') ----- nextMethodOrIRCs: aValue | index delta | + index := address + 32 + baseHeaderSize. - index := address + baseHeaderSize + 32. (delta := cogit getCodeToDataDelta) > 0 ifTrue: [self assert: (cogit addressIsInCodeZone: address - delta). objectMemory long64At: index - delta + put: ((aValue ifNotNil: [aValue asUnsignedInteger] ifNil: [0]))]. - put: aValue]. ^objectMemory long64At: index + put: ((aValue ifNotNil: [aValue asUnsignedInteger] ifNil: [0]))! - put: aValue!
Item was changed: ----- Method: CogSistaMethodSurrogate32>>counters: (in category 'accessing generated') ----- counters: aValue | index delta | index := address + 20 + baseHeaderSize. (delta := cogit getCodeToDataDelta) > 0 ifTrue: [self assert: (cogit addressIsInCodeZone: address - delta). objectMemory long32At: index - delta + put: ((aValue ifNotNil: [aValue asUnsignedInteger] ifNil: [0]))]. - put: aValue]. ^objectMemory long32At: index + put: ((aValue ifNotNil: [aValue asUnsignedInteger] ifNil: [0]))! - put: aValue!
Item was changed: ----- Method: CogSistaMethodSurrogate64>>counters: (in category 'accessing generated') ----- counters: aValue | index delta | index := address + 32 + baseHeaderSize. (delta := cogit getCodeToDataDelta) > 0 ifTrue: [self assert: (cogit addressIsInCodeZone: address - delta). objectMemory long64At: index - delta + put: ((aValue ifNotNil: [aValue asUnsignedInteger] ifNil: [0]))]. - put: aValue]. ^objectMemory long64At: index + put: ((aValue ifNotNil: [aValue asUnsignedInteger] ifNil: [0]))! - put: aValue!
vm-dev@lists.squeakfoundation.org