Packages April 2017

packages@lists.squeakfoundation.org

1 participants
121 discussions

The Trunk: Compiler-eem.345.mcz
by commits＠source.squeak.org 06 Apr '17

06 Apr '17

Eliot Miranda uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-eem.345.mcz ==================== Summary ==================== Name: Compiler-eem.345 Author: eem Time: 5 April 2017, 11:10:14.91524 pm UUID: 8ee5b263-f80b-47b2-86c3-1fc462750b6b Ancestors: Compiler-eem.342 Have generate:using: use the new generation method that lives in BytecodeEncoder. Recategorize all "code generation (closures)" methods as "closure analysis". =============== Diff against Compiler-eem.342 =============== Item was changed: + ----- Method: AssignmentNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'closure analysis') ----- - ----- Method: AssignmentNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'code generation (closures)') ----- analyseTempsWithin: scopeBlock "<BlockNode>" rootNode: rootNode "<MethodNode>" assignmentPools: assignmentPools "<Dictionary>" "N.B. since assigment happens _after_ the value is evaluated the value is sent the message _first_." value analyseTempsWithin: scopeBlock rootNode: rootNode assignmentPools: assignmentPools. variable beingAssignedToAnalyseTempsWithin: scopeBlock rootNode: rootNode assignmentPools: assignmentPools! Item was changed: + ----- Method: BlockNode>>actualScope (in category 'closure analysis') ----- - ----- Method: BlockNode>>actualScope (in category 'code generation (closures)') ----- actualScope "Answer the actual scope for the receiver. If this is an unoptimized block then it is its actual scope, but if this is an optimized block then the actual scope is some outer block." ^actualScopeIfOptimized ifNil: [self]! Item was changed: + ----- Method: BlockNode>>addHoistedTemps: (in category 'closure analysis') ----- - ----- Method: BlockNode>>addHoistedTemps: (in category 'code generation (closures)') ----- addHoistedTemps: additionalTemporaries "<SequenceableCollection>" | tempsToBeMerged additionalTempsToAdd | additionalTemporaries do: [:temp| temp definingScope ifNil: [temp definingScope: self]]. (temporaries isNil or: [temporaries isEmpty]) ifTrue: [temporaries := additionalTemporaries copy. ^self]. tempsToBeMerged := additionalTemporaries select: [:t| t isBlockArg and: [temporaries anySatisfy: [:existing| existing isBlockArg and: [existing key = t key]]]]. additionalTempsToAdd := tempsToBeMerged isEmpty ifTrue: [additionalTemporaries copy] ifFalse: [additionalTemporaries reject: [:temp| tempsToBeMerged identityIncludes: temp]]. temporaries := (temporaries isNil or: [temporaries isEmpty]) ifTrue: [additionalTempsToAdd] ifFalse: [temporaries last isIndirectTempVector ifTrue: [temporaries allButLast, additionalTempsToAdd, { temporaries last }] ifFalse: [temporaries, additionalTempsToAdd]]. tempsToBeMerged do: [:t| | merge | merge := temporaries detect: [:existing| existing isBlockArg and: [existing key = t key]]. merge absorbHoistedTemp: t]! Item was changed: + ----- Method: BlockNode>>addRemoteTemp:rootNode: (in category 'closure analysis') ----- - ----- Method: BlockNode>>addRemoteTemp:rootNode: (in category 'code generation (closures)') ----- addRemoteTemp: aTempVariableNode rootNode: rootNode "<MethodNode>" "Add aTempVariableNode to my actualScope's sequence of remote temps. If I am an optimized block then the actual scope is my actualScopeIfOptimized, otherwise it is myself." remoteTempNode == nil ifTrue: [remoteTempNode := RemoteTempVectorNode new name: self remoteTempNodeName index: arguments size + temporaries size type: LdTempType scope: 0. actualScopeIfOptimized ifNil: [self addTempNode: remoteTempNode. remoteTempNode definingScope: self] ifNotNil: [actualScopeIfOptimized addHoistedTemps: { remoteTempNode }]]. remoteTempNode addRemoteTemp: aTempVariableNode encoder: rootNode encoder. "use remove:ifAbsent: because the deferred analysis for optimized loops can result in the temp has already been hoised into the root." self removeTempNode: aTempVariableNode ifAbsent: [ self actualScope removeTempNode: aTempVariableNode ifAbsent: ["should not happen"]]. ^remoteTempNode! Item was changed: + ----- Method: BlockNode>>addTempNode: (in category 'closure analysis') ----- - ----- Method: BlockNode>>addTempNode: (in category 'code generation (closures)') ----- addTempNode: aTempVariableNode "Utilities for when we want to add some temporaries." self makeTemporariesRemovable. ^temporaries add: aTempVariableNode! Item was changed: + ----- Method: BlockNode>>analyseArguments:temporaries:rootNode: (in category 'closure analysis') ----- - ----- Method: BlockNode>>analyseArguments:temporaries:rootNode: (in category 'code generation (closures)') ----- analyseArguments: methodArguments temporaries: methodTemporaries rootNode: rootNode "<MethodNode>" "^<Sequence of: <TempVarNade>>" "Top level entry-point for analysing temps within the hierarchy of blocks in the receiver's method. Answer the (possibly modified) sequence of temp vars. Need to hoist temps out of macro-optimized blocks into their actual blocks. Need to note reads and writes to temps from blocks other than their actual blocks to determine whether blocks can be local (simple slots within a block/method context) or remote (slots in indirection vectors that are shared between contexts by sharing indirection vectors). The algorithm is based on numbering temporary reads and writes and block extents. The index used for numbering starts at zero and is incremented on every block entry and block exit. So the following | a b blk r1 r2 t | a := 1. b := 2. t := 0. blk := [ | s | s := a + b. t := t + s]. r1 := blk value. b := -100. r2 := blk value. r1 -> r2 -> t is numbered as method block 0 to: 6: | a b blk r1 r2 t | a w@1 := 1. b w@1 := 2. t w@1 := 0. blk w@5 := [entry@2 | s | t w@3 := t r@3 + a r@3 + b r@3 ] exit@4. r1 w@5 := blk r@5 value. b w@5 := nil. r2 w@5 := blk r@5 value. r1 r@5 -> r2 r@5 -> t r@5 So: b and blk cannot be copied because for both there exists a write @5 that follows a read @4 within block 2 through 4 t must be remote because there exists a write @3 within block (2 to: 4) Complications are introduced by optimized blocks. In the following temp is written to after it is closed over by [ temp ] since the inlined block is executed more than once. | temp coll | coll := OrderedCollection new. 1 to: 5 do: [ :index | temp := index. coll add: [ temp ] ]. self assert: (coll collect: [:ea| ea value]) asArray = #(5 5 5 5 5) In the following i is local to the block and must be initialized each time around the loop but if the block is inlined it must be declared at method level. | col | col := OrderedCollection new. 1 to: 3 do: [ :each | | i | i := each. col add: [ i ]. i := i + 1 ]. self assert: (col collect: [ :each | each value ]) asArray = #(2 3 4)" self assert: (arguments isEmpty or: [arguments hasEqualElements: methodArguments]). arguments := methodArguments asArray. "won't change" self assert: (temporaries isNil or: [temporaries isEmpty or: [temporaries hasEqualElements: methodTemporaries]]). temporaries := OrderedCollection withAll: methodTemporaries. self assert: optimized not. "the top-level block should not be optimized." self analyseTempsWithin: self rootNode: rootNode assignmentPools: Dictionary new. "The top-level block needs to reindex temporaries since analysis may have rearranged them. This happens when temps are made remote and/or a remote node is added." temporaries withIndexDo: [:temp :offsetPlusOne| temp index: arguments size + offsetPlusOne - 1]. "Answer the (possibly modified) sequence of temps." ^temporaries asArray! Item was changed: + ----- Method: BlockNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'closure analysis') ----- - ----- Method: BlockNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'code generation (closures)') ----- analyseTempsWithin: scopeBlock "<BlockNode>" rootNode: rootNode "<MethodNode>" assignmentPools: assignmentPools "<Dictionary>" | effectiveScope blockStart | effectiveScope := optimized ifTrue: [actualScopeIfOptimized := scopeBlock] ifFalse: [self]. arguments ifNotNil: [arguments do: [:temp| temp definingScope: self]]. temporaries ifNotNil: [temporaries do: [:temp| temp definingScope: self]]. optimized ifFalse: "if optimized this isn't an actual scope" [rootNode noteBlockEntry: [:entryNumber| blockExtent := (blockStart := entryNumber) to: 0]]. "Need to enumerate a copy because closure analysis can add a statement via ifHasRemoteTempNodeEnsureInitializationStatementExists:." statements copy do: [:statement| statement analyseTempsWithin: effectiveScope rootNode: rootNode assignmentPools: assignmentPools]. optimized ifTrue: "if optimized loop need to add nils for any temps read before written" [optimizedMessageNode isOptimizedLoop ifTrue: [self nilReadBeforeWrittenTemps]] ifFalse: "if optimized this isn't an actual scope" [rootNode noteBlockExit: [:exitNumber| blockExtent := blockStart to: exitNumber]]. "Now that the analysis is done move any temps that need to be moved." self postNumberingProcessTempsWithin: effectiveScope rootNode: rootNode. "This is simply a nicety for compiler developers..." temporaries do: [:temp| (temp isIndirectTempVector and: [temp name includes: $?]) ifTrue: [temp name: temp definingScope remoteTempNodeName]]! Item was changed: + ----- Method: BlockNode>>blockExtent (in category 'closure analysis') ----- - ----- Method: BlockNode>>blockExtent (in category 'code generation (closures)') ----- blockExtent "^<Interval>" ^blockExtent! Item was changed: + ----- Method: BlockNode>>computeCopiedValues: (in category 'closure analysis') ----- - ----- Method: BlockNode>>computeCopiedValues: (in category 'code generation (closures)') ----- computeCopiedValues: rootNode | referencedValues | referencedValues := rootNode referencedValuesWithinBlockExtent: blockExtent. ^(referencedValues reject: [:temp| temp isDefinedWithinBlockExtent: blockExtent]) asArray sort: ParseNode tempSortBlock! Item was changed: + ----- Method: BlockNode>>deoptimize (in category 'closure analysis') ----- - ----- Method: BlockNode>>deoptimize (in category 'code generation (closures)') ----- deoptimize optimized := false. optimizedMessageNode := nil! Item was changed: + ----- Method: BlockNode>>ifHasRemoteTempNodeEnsureInitializationStatementExists: (in category 'closure analysis') ----- - ----- Method: BlockNode>>ifHasRemoteTempNodeEnsureInitializationStatementExists: (in category 'code generation (closures)') ----- ifHasRemoteTempNodeEnsureInitializationStatementExists: rootNode "If a remoteTempNode has been added ensure a statement exists to initialize it." remoteTempNode ~~ nil ifTrue: [(statements notEmpty and: [statements first isAssignmentNode and: [statements first variable isTemp and: [statements first variable isIndirectTempVector]]]) ifTrue: "If this is a decompiled tree, or if a temporary has been added later in the analysis then there already is a temp vector initialization node." [(statements first variable ~~ remoteTempNode) ifTrue: [statements first variable become: remoteTempNode]. statements first value numElements: remoteTempNode remoteTemps size] ifFalse: [statements addFirst: (remoteTempNode nodeToInitialize: rootNode encoder)]].! Item was changed: + ----- Method: BlockNode>>makeTemporariesRemovable (in category 'closure analysis') ----- - ----- Method: BlockNode>>makeTemporariesRemovable (in category 'code generation (closures)') ----- makeTemporariesRemovable "Utilities for when we want to remove some temporaries." temporaries isArray ifTrue: [temporaries := temporaries asOrderedCollection].! Item was changed: + ----- Method: BlockNode>>nilReadBeforeWrittenTemps (in category 'closure analysis') ----- - ----- Method: BlockNode>>nilReadBeforeWrittenTemps (in category 'code generation (closures)') ----- nilReadBeforeWrittenTemps | visitor readBeforeWritten | temporaries isEmpty ifTrue: [^self]. self accept: (visitor := OptimizedBlockLocalTempReadBeforeWrittenVisitor new). readBeforeWritten := visitor readBeforeWritten. temporaries reverseDo: [:temp| ((readBeforeWritten includes: temp) and: [temp isRemote not]) ifTrue: [statements addFirst: (AssignmentNode new variable: temp value: NodeNil)]]! Item was changed: + ----- Method: BlockNode>>noteOptimizedIn: (in category 'closure analysis') ----- - ----- Method: BlockNode>>noteOptimizedIn: (in category 'code generation (closures)') ----- noteOptimizedIn: anOptimizedMessageNode optimized := true. optimizedMessageNode := anOptimizedMessageNode! Item was changed: + ----- Method: BlockNode>>optimizedBlockHoistTempsInto: (in category 'closure analysis') ----- - ----- Method: BlockNode>>optimizedBlockHoistTempsInto: (in category 'code generation (closures)') ----- optimizedBlockHoistTempsInto: scopeBlock "<BlockNode>" "This is a No-op for all nodes except non-optimized BlockNodes." "Let's assume the special > 0 guard in MessageNode>>analyseTempsWithin:forValue:encoder: is correct. Then we can simply hoist our temps up." self assert: (arguments isNil or: [arguments size <= 1]). (arguments notNil and: [arguments notEmpty]) ifTrue: [scopeBlock addHoistedTemps: arguments. arguments := #()]. temporaries notEmpty ifTrue: [scopeBlock addHoistedTemps: temporaries. temporaries := #()]! Item was changed: + ----- Method: BlockNode>>postNumberingProcessTempsWithin:rootNode: (in category 'closure analysis') ----- - ----- Method: BlockNode>>postNumberingProcessTempsWithin:rootNode: (in category 'code generation (closures)') ----- postNumberingProcessTempsWithin: scopeBlock "<BlockNode>" rootNode: rootNode "<MethodNode>" "A temp can be local (and copied) if it is not written to after it is captured. A temp cannot be local if it is written to remotely. Need to enumerate a copy of the temporaries because any temps becoming remote will be removed from temporaries in analyseClosure: (and a single remote temp node will get added)" temporaries copy do: [:each| each isIndirectTempVector ifFalse: [each analyseClosure: rootNode]]. "If this is an optimized node we need to hoist temporaries up into the relevant block scope." optimized ifTrue: [self optimizedBlockHoistTempsInto: scopeBlock]. "Now we may have added a remoteTempNode. So we need a statement to initialize it." self ifHasRemoteTempNodeEnsureInitializationStatementExists: rootNode. "Now add all arguments and locals to the pool so that copiedValues can be computed during sizing." rootNode addLocalsToPool: arguments; addLocalsToPool: temporaries! Item was changed: + ----- Method: BlockNode>>reindexingLocalsDo:encoder: (in category 'closure analysis') ----- - ----- Method: BlockNode>>reindexingLocalsDo:encoder: (in category 'code generation (closures)') ----- reindexingLocalsDo: aBlock encoder: encoderOrNil "Evaluate aBlock wih arguments, temporaries and copiedValues reindexed for their positions within the receiver's block, restoring the correct indices afterwards. If encoder is not nil remember the temps for this block's extent." | tempIndices result tempsToReindex | self assert: copiedValues notNil. tempsToReindex := arguments asArray, copiedValues, temporaries. tempIndices := tempsToReindex collect: [:temp| temp index]. tempsToReindex withIndexDo: [:temp :newIndex| temp index: newIndex - 1. self assert: temp index + 1 = newIndex]. encoderOrNil ifNotNil: [encoderOrNil noteBlockExtent: blockExtent hasLocals: tempsToReindex]. result := aBlock ensure: ["Horribly pragmatic hack. The copiedValues will have completely unrelated indices within the closure method and sub-method. Avoiding the effort of rebinding temps in the inner scope simply update the indices to their correct ones during the generation of the closure method and restore the indices immedately there-after." tempsToReindex with: tempIndices do: [:temp :oldIndex| temp index: oldIndex. self assert: temp index = oldIndex]]. ^result! Item was changed: + ----- Method: BlockNode>>remoteTempNodeName (in category 'closure analysis') ----- - ----- Method: BlockNode>>remoteTempNodeName (in category 'code generation (closures)') ----- remoteTempNodeName "Answer a useful name for a RemoteTempVectorNode in the receiver." | prefix scope extent | prefix := actualScopeIfOptimized ifNil: ['<'] ifNotNil: [ '<...']. scope := self. [extent := scope blockExtent. extent == nil and: [scope actualScope ~~ scope]] whileTrue: [scope := scope actualScope]. ^extent ifNil: [prefix, '?-?>'] ifNotNil: [prefix, extent first printString, '-', (extent last isZero ifTrue: ['?'] ifFalse: [extent last printString]), '>']! Item was changed: + ----- Method: BlockNode>>removeTempNode:ifAbsent: (in category 'closure analysis') ----- - ----- Method: BlockNode>>removeTempNode:ifAbsent: (in category 'code generation (closures)') ----- removeTempNode: aTempVariableNode ifAbsent: aBlock "Utilities for when we want to remove some temporaries." self makeTemporariesRemovable. ^temporaries remove: aTempVariableNode ifAbsent: aBlock ! Item was changed: + ----- Method: BraceNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'closure analysis') ----- - ----- Method: BraceNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'code generation (closures)') ----- analyseTempsWithin: scopeBlock "<BlockNode>" rootNode: rootNode "<MethodNode>" assignmentPools: assignmentPools "<Dictionary>" elements do: [:node| node analyseTempsWithin: scopeBlock rootNode: rootNode assignmentPools: assignmentPools]! Item was changed: + ----- Method: CascadeNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'closure analysis') ----- - ----- Method: CascadeNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'code generation (closures)') ----- analyseTempsWithin: scopeBlock "<BlockNode>" rootNode: rootNode "<MethodNode>" assignmentPools: assignmentPools "<Dictionary>" { receiver }, messages do: [:node| node analyseTempsWithin: scopeBlock rootNode: rootNode assignmentPools: assignmentPools]! Item was changed: + ----- Method: FutureNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'closure analysis') ----- - ----- Method: FutureNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'code generation (closures)') ----- analyseTempsWithin: scopeBlock "<BlockNode>" rootNode: rootNode "<MethodNode>" assignmentPools: assignmentPools "<Dictionary>" { receiver. futureDelta }, (futureArgs ifNil: [#()]) do: [:node| node == nil ifFalse: [node analyseTempsWithin: scopeBlock rootNode: rootNode assignmentPools: assignmentPools]]! Item was changed: + ----- Method: LeafNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'closure analysis') ----- - ----- Method: LeafNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'code generation (closures)') ----- analyseTempsWithin: scopeBlock "<BlockNode>" rootNode: rootNode "<MethodNode>" assignmentPools: assignmentPools "<Dictionary>" "This is a no-op except in TempVariableNode" ^self! Item was changed: + ----- Method: MessageNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'closure analysis') ----- - ----- Method: MessageNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'code generation (closures)') ----- analyseTempsWithin: scopeBlock "<BlockNode>" rootNode: rootNode "<MethodNode>" assignmentPools: assignmentPools "<Dictionary>" "Assignments within optimized loops are tricky. Because a loop repeats a write to a temporary in an optimized loop effectively occurs after the loop. To handle this collect the set of temps assigned to in optimized loops and add extra writes after traversing the optimized loop constituents." | writtenToTemps | self isOptimizedLoop ifTrue: [{ receiver }, arguments do: [:node| (node notNil and: [node isBlockNode and: [node optimized]]) ifTrue: [assignmentPools at: node put: Set new]]]. "receiver is nil in cascades" receiver == nil ifFalse: [receiver analyseTempsWithin: scopeBlock rootNode: rootNode assignmentPools: assignmentPools]. arguments do: [:node| node == nil ifFalse: "last argument of optimized to:do: can be nil" [node analyseTempsWithin: scopeBlock rootNode: rootNode assignmentPools: assignmentPools]]. "Add assignments representing subsequent iterations and redo the closure analysis for the written-to temps." self isOptimizedLoop ifTrue: [writtenToTemps := Set new. { receiver }, arguments do: [:node| (node notNil and: [node isBlockNode and: [node optimized]]) ifTrue: [(assignmentPools removeKey: node) do: [:temp| temp isBlockArg ifFalse: "ignore added assignments to to:do: loop args" [writtenToTemps add: temp. temp addWriteWithin: node at: rootNode locationCounter]]]]. writtenToTemps isEmpty ifFalse: [(writtenToTemps sorted: ParseNode tempSortBlock) do: [:each| each analyseClosure: rootNode]. (writtenToTemps collect: [:each| each definingScope]) do: [:blockNode| blockNode ifHasRemoteTempNodeEnsureInitializationStatementExists: rootNode]]]! Item was changed: + ----- Method: MethodNode>>addLocalsToPool: (in category 'closure analysis') ----- - ----- Method: MethodNode>>addLocalsToPool: (in category 'code generation (closures)') ----- addLocalsToPool: locals "<Set of: TempVariableNode>" localsPool isNil ifTrue: [localsPool := IdentitySet new]. localsPool addAll: locals! Item was changed: + ----- Method: MethodNode>>ensureClosureAnalysisDone (in category 'closure analysis') ----- - ----- Method: MethodNode>>ensureClosureAnalysisDone (in category 'code generation (closures)') ----- ensureClosureAnalysisDone block blockExtent ifNil: [temporaries := block analyseArguments: arguments temporaries: temporaries rootNode: self]! Item was changed: ----- Method: MethodNode>>generate:using: (in category 'code generation') ----- generate: trailer using: aCompiledMethodClass "The receiver is the root of a parse tree. Answer an instance of aCompiledMethodClass. The argument, trailer, is arbitrary but is typically either the reference to the source code that is stored with every CompiledMethod, or an encoding of the method's temporary names." + | method | - | primErrNode blkSize nLits locals literals stack header method | self generate: trailer using: aCompiledMethodClass ifQuick: [:m | + m literalAt: 2 put: encoder associationForClass; - encoder noteBlockExtent: (0 to: 2) hasLocals: arguments. - m literalAt: 2 put: encoder associationForClass; properties: properties. + ^m]. + method := encoder generateMethodOfClass: aCompiledMethodClass trailer: trailer from: self. - ^m]. - primErrNode := self primitiveErrorVariableName ifNotNil: - [encoder fixTemp: self primitiveErrorVariableName]. - self ensureClosureAnalysisDone. - encoder rootNode: self. "this is for BlockNode>>sizeCodeForClosureValue:" - blkSize := (block sizeCodeForEvaluatedValue: encoder) - + (primitive > 0 - ifTrue: [encoder sizeCallPrimitive: primitive] - ifFalse: [0]) - + (primErrNode - ifNil: [0] - ifNotNil: - [primErrNode - index: arguments size + temporaries size; - sizeCodeForStore: encoder "The VM relies on storeIntoTemp: (129)"]). - locals := arguments, temporaries, (primErrNode ifNil: [#()] ifNotNil: [{primErrNode}]). - encoder noteBlockExtent: block blockExtent hasLocals: locals. - header := encoder computeMethodHeaderForNumArgs: arguments size - numTemps: locals size - numLits: (nLits := (literals := encoder allLiterals) size) - primitive: primitive. - method := trailer - createMethod: blkSize - class: aCompiledMethodClass - header: header. - 1 to: nLits do: [:lit | method literalAt: lit put: (literals at: lit)]. - encoder streamToMethod: method. - stack := ParseStack new init. - primitive > 0 ifTrue: - [encoder genCallPrimitive: primitive. - primErrNode ifNotNil: - [primErrNode emitCodeForStore: stack encoder: encoder]]. - stack position: method numTemps. - [block emitCodeForEvaluatedValue: stack encoder: encoder] - on: Error "If an attempt is made to write too much code the method will be asked" - do: [:ex| "to grow, and the grow attempt will fail in CompiledMethod class>>#new:" - ex signalerContext sender method = (CompiledMethod class>>#new:) - ifTrue: [^self error: 'Compiler code size discrepancy'] - ifFalse: [ex pass]]. - stack position ~= (method numTemps + 1) ifTrue: - [^self error: 'Compiler stack discrepancy']. - encoder methodStreamPosition ~= (method size - trailer size) ifTrue: - [^self error: 'Compiler code size discrepancy']. - method needsFrameSize: stack size - method numTemps. method properties: properties. ^method! Item was changed: + ----- Method: MethodNode>>locationCounter (in category 'closure analysis') ----- - ----- Method: MethodNode>>locationCounter (in category 'code generation (closures)') ----- locationCounter ^locationCounter! Item was changed: + ----- Method: MethodNode>>noteBlockEntry: (in category 'closure analysis') ----- - ----- Method: MethodNode>>noteBlockEntry: (in category 'code generation (closures)') ----- noteBlockEntry: aBlock "Evaluate aBlock with the numbering for the block entry." locationCounter isNil ifTrue: [locationCounter := -1]. aBlock value: locationCounter + 1. locationCounter := locationCounter + 2! Item was changed: + ----- Method: MethodNode>>noteBlockExit: (in category 'closure analysis') ----- - ----- Method: MethodNode>>noteBlockExit: (in category 'code generation (closures)') ----- noteBlockExit: aBlock "Evaluate aBlock with the numbering for the block exit." aBlock value: locationCounter + 1. locationCounter := locationCounter + 2! Item was changed: + ----- Method: MethodNode>>referencedValuesWithinBlockExtent: (in category 'closure analysis') ----- - ----- Method: MethodNode>>referencedValuesWithinBlockExtent: (in category 'code generation (closures)') ----- referencedValuesWithinBlockExtent: anInterval ^(localsPool select: [:temp| temp isReferencedWithinBlockExtent: anInterval]) collect: [:temp| temp isRemote ifTrue: [temp remoteNode] ifFalse: [temp]]! Item was changed: + ----- Method: NewArrayNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'closure analysis') ----- - ----- Method: NewArrayNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'code generation (closures)') ----- analyseTempsWithin: scopeBlock "<BlockNode>" rootNode: rootNode "<MethodNode>" assignmentPools: assignmentPools "<Dictionary>" "This is a no-op except in TempVariableNode" ^self! Item was changed: + ----- Method: RemoteTempVectorNode>>addRemoteTemp:encoder: (in category 'closure analysis') ----- - ----- Method: RemoteTempVectorNode>>addRemoteTemp:encoder: (in category 'code generation (closures)') ----- addRemoteTemp: aTempVariableNode encoder: encoder remoteTemps ifNil: [remoteTemps := OrderedCollection new]. remoteTemps addLast: aTempVariableNode. aTempVariableNode referenceScopesAndIndicesDo: [:scopeBlock "<BlockNode>" :location "<Integer>"| self addReadWithin: scopeBlock at: location]! Item was changed: + ----- Method: RemoteTempVectorNode>>isIndirectTempVector (in category 'closure analysis') ----- - ----- Method: RemoteTempVectorNode>>isIndirectTempVector (in category 'code generation (closures)') ----- isIndirectTempVector ^true! Item was changed: + ----- Method: RemoteTempVectorNode>>referenceScopesAndIndicesDo: (in category 'closure analysis') ----- - ----- Method: RemoteTempVectorNode>>referenceScopesAndIndicesDo: (in category 'code generation (closures)') ----- referenceScopesAndIndicesDo: aBinaryBlock self shouldNotImplement! Item was changed: + ----- Method: ReturnNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'closure analysis') ----- - ----- Method: ReturnNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'code generation (closures)') ----- analyseTempsWithin: scopeBlock "<BlockNode>" rootNode: rootNode "<MethodNode>" assignmentPools: assignmentPools "<Dictionary>" "Note we could do this: scopeBlock ~~ rootNode block ifTrue: [scopeBlock noteNonLocalReturn]. and pass up the flag in <BlockNode>>>analyseTempsWithin:rootNode: which may be fast but will also give less information the debugger. For now we consider clean blocks a premature optimization." self flag: 'consider clean blocks'. expr analyseTempsWithin: scopeBlock rootNode: rootNode assignmentPools: assignmentPools! Item was changed: + ----- Method: TempVariableNode>>absorbHoistedTemp: (in category 'closure analysis') ----- - ----- Method: TempVariableNode>>absorbHoistedTemp: (in category 'code generation (closures)') ----- absorbHoistedTemp: aTempVar "Collapse aTempVar into the receiver, being sure to update any closure analysis." aTempVar copyScopeAccessTo: self. aTempVar becomeForward: self! Item was changed: + ----- Method: TempVariableNode>>addReadWithin:at: (in category 'closure analysis') ----- - ----- Method: TempVariableNode>>addReadWithin:at: (in category 'code generation (closures)') ----- addReadWithin: scopeBlock "<BlockNode>" at: location "<Integer>" readingScopes ifNil: [readingScopes := Dictionary new]. (readingScopes at: scopeBlock ifAbsentPut: [Set new]) add: location. remoteNode ifNotNil: [remoteNode addReadWithin: scopeBlock at: location]! Item was changed: + ----- Method: TempVariableNode>>addWriteWithin:at: (in category 'closure analysis') ----- - ----- Method: TempVariableNode>>addWriteWithin:at: (in category 'code generation (closures)') ----- addWriteWithin: scopeBlock "<BlockNode>" at: location "<Integer>" writingScopes ifNil: [writingScopes := Dictionary new]. (writingScopes at: scopeBlock ifAbsentPut: [Set new]) add: location. remoteNode ifNotNil: [remoteNode addReadWithin: scopeBlock at: location]! Item was changed: + ----- Method: TempVariableNode>>analyseClosure: (in category 'closure analysis') ----- - ----- Method: TempVariableNode>>analyseClosure: (in category 'code generation (closures)') ----- analyseClosure: rootNode "<MethodNode>" "Analyse whether the temporary needs to be made remote or not, and answer whether it was made remote. A temp cannot be local if it is written to remotely, or if it is written to after it is closed-over. An exception is an inlined block argument that appears to be written remotely but is actually local to a block." | latestWrite | self isBlockArg ifTrue: [^false]. remoteNode ifNotNil: [^false]. "If already remote, don't remote a second time" latestWrite := 0. ((writingScopes notNil and: [writingScopes associations anySatisfy: [:assoc| [:blockScope :refs| refs do: [:write| latestWrite := write max: latestWrite]. "A temp cannot be local if it is written to remotely." blockScope actualScope ~~ definingScope actualScope] value: assoc key value: assoc value]]) or: [readingScopes notNil and: [readingScopes associations anySatisfy: [:assoc| [:blockScope :refs| "A temp cannot be local if it is written to after it is closed-over." blockScope actualScope ~~ definingScope actualScope and: [refs anySatisfy: [:read| read < latestWrite]]] value: assoc key value: assoc value]]]) ifTrue: [remoteNode := definingScope addRemoteTemp: self rootNode: rootNode. ^true]. ^false! Item was changed: + ----- Method: TempVariableNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'closure analysis') ----- - ----- Method: TempVariableNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'code generation (closures)') ----- analyseTempsWithin: scopeBlock "<BlockNode>" rootNode: rootNode "<MethodNode>" assignmentPools: assignmentPools "<Dictionary>" self addReadWithin: scopeBlock at: rootNode locationCounter! Item was changed: + ----- Method: TempVariableNode>>beingAssignedToAnalyseTempsWithin:rootNode:assignmentPools: (in category 'closure analysis') ----- - ----- Method: TempVariableNode>>beingAssignedToAnalyseTempsWithin:rootNode:assignmentPools: (in category 'code generation (closures)') ----- beingAssignedToAnalyseTempsWithin: scopeBlock "<BlockNode>" rootNode: rootNode "<MethodNode>" assignmentPools: assignmentPools "<Dictionary>" self addWriteWithin: scopeBlock at: rootNode locationCounter. "For analysis of optimized blocks also record the set of temporaries written to within optimized blocks so that additional writes can be added at locations that represent subsequent iterations of the loop. e.g. testInlineBlockCollectionSD1" assignmentPools keysAndValuesDo: [:outerScopeBlock :set| "definingScope can be nil in expr in expr ifNil: [:arg|...] expressions because arg gets its definingScope set when [:arg|...] is analysed." outerScopeBlock actualScope = (definingScope ifNil: [scopeBlock] ifNotNil: [definingScope actualScope]) ifTrue: [set add: self]]! Item was changed: + ----- Method: TempVariableNode>>copyScopeAccessTo: (in category 'closure analysis') ----- - ----- Method: TempVariableNode>>copyScopeAccessTo: (in category 'code generation (closures)') ----- copyScopeAccessTo: aTempVar "For absorbHoistedTemp:, copy the receiver's reads and writes into the record in aTempVar." readingScopes ifNotNil: [readingScopes keysAndValuesDo: [:scopeBlock :reads| reads do: [:location| aTempVar addReadWithin: scopeBlock "<BlockNode>" at: location]]]. writingScopes ifNotNil: [writingScopes keysAndValuesDo: [:scopeBlock :writes| writes do: [:location| aTempVar addWriteWithin: scopeBlock "<BlockNode>" at: location]]]! Item was changed: + ----- Method: TempVariableNode>>definingScope (in category 'closure analysis') ----- - ----- Method: TempVariableNode>>definingScope (in category 'code generation (closures)') ----- definingScope ^definingScope! Item was changed: + ----- Method: TempVariableNode>>definingScope: (in category 'closure analysis') ----- - ----- Method: TempVariableNode>>definingScope: (in category 'code generation (closures)') ----- definingScope: scopeBlock "<BlockNode>" definingScope = scopeBlock ifTrue: [^ self]. "No need to bail" definingScope ifNotNil: [self error: 'temp has more than one defining scope. This is probably a parser error']. definingScope := scopeBlock! Item was changed: + ----- Method: TempVariableNode>>index: (in category 'closure analysis') ----- - ----- Method: TempVariableNode>>index: (in category 'code generation (closures)') ----- index: anInteger "For renumbering temps in the closure compiler." index := anInteger. code := self code: index type: LdTempType! Item was changed: + ----- Method: TempVariableNode>>isDefinedWithinBlockExtent: (in category 'closure analysis') ----- - ----- Method: TempVariableNode>>isDefinedWithinBlockExtent: (in category 'code generation (closures)') ----- isDefinedWithinBlockExtent: anInterval ^anInterval rangeIncludes: definingScope actualScope blockExtent first! Item was changed: + ----- Method: TempVariableNode>>isIndirectTempVector (in category 'closure analysis') ----- - ----- Method: TempVariableNode>>isIndirectTempVector (in category 'code generation (closures)') ----- isIndirectTempVector ^false! Item was changed: + ----- Method: TempVariableNode>>isReferencedWithinBlockExtent: (in category 'closure analysis') ----- - ----- Method: TempVariableNode>>isReferencedWithinBlockExtent: (in category 'code generation (closures)') ----- isReferencedWithinBlockExtent: anInterval readingScopes ~~ nil ifTrue: [readingScopes do: [:set "<Set of <Integer>>"| set do: [:location| (anInterval rangeIncludes: location) ifTrue: [^true]]]]. writingScopes ~~ nil ifTrue: [writingScopes do: [:set "<Set of <Integer>>"| set do: [:location| (anInterval rangeIncludes: location) ifTrue: [^true]]]]. ^false! Item was changed: + ----- Method: TempVariableNode>>referenceScopesAndIndicesDo: (in category 'closure analysis') ----- - ----- Method: TempVariableNode>>referenceScopesAndIndicesDo: (in category 'code generation (closures)') ----- referenceScopesAndIndicesDo: aBinaryBlock "Evaluate aBinaryBlock with all read or write scopes and locations. This is used to copy the reference information into RemoteTempVectorNodes" readingScopes ~~ nil ifTrue: [readingScopes keysAndValuesDo: [:scopeBlock "<BlockNode>" :set "<Set of <Integer>>"| set do: [:location| aBinaryBlock value: scopeBlock value: location]]]. writingScopes ~~ nil ifTrue: [writingScopes keysAndValuesDo: [:scopeBlock "<BlockNode>" :set "<Set of <Integer>>"| set do: [:location| aBinaryBlock value: scopeBlock value: location]]]! Item was changed: + ----- Method: VariableNode>>beingAssignedToAnalyseTempsWithin:rootNode:assignmentPools: (in category 'closure analysis') ----- - ----- Method: VariableNode>>beingAssignedToAnalyseTempsWithin:rootNode:assignmentPools: (in category 'code generation (closures)') ----- beingAssignedToAnalyseTempsWithin: scopeBlock "<BlockNode>" rootNode: rootNode "<MethodNode>" assignmentPools: assignmentPools "<Dictionary>" "No-op overridden by TempVariableNode"!

1 0

The Trunk: Compiler-eem.342.mcz
by commits＠source.squeak.org 06 Apr '17

06 Apr '17

Eliot Miranda uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-eem.342.mcz ==================== Summary ==================== Name: Compiler-eem.342 Author: eem Time: 5 April 2017, 11:07:52.115372 pm UUID: afa59f0b-fa51-4de2-82c9-4398447bc85d Ancestors: Compiler-eem.341 Remove most, if not all, of the old pre-closure-bytecode and blue-book block support from the compiler. Recategorize code generation (size & emit methods) under "code generation", leaving closure analysis in "code generation (closures)" (to be changed later). Eliminate the short-form brace node creation code (which has used the cons array bytecode since the use of the closure bytecodes). =============== Diff against Compiler-eem.341 =============== Item was changed: + ----- Method: BlockNode>>constructClosureCreationNode: (in category 'code generation') ----- - ----- Method: BlockNode>>constructClosureCreationNode: (in category 'code generation (closures)') ----- constructClosureCreationNode: encoder copiedValues := self computeCopiedValues: encoder rootNode. + ^self ensureClosureCreationNode! - encoder supportsClosureOpcodes ifTrue: - [^self closureCreationNode]. - "Without the bytecode we can still get by." - ^MessageNode new - receiver: (encoder encodeVariable: 'thisContext') - selector: #closureCopy:copiedValues: - arguments: (Array - with: (encoder encodeLiteral: arguments size) - with: (copiedValues isEmpty - ifTrue: [NodeNil] - ifFalse: [BraceNode new elements: copiedValues])) - precedence: 3 - from: encoder! Item was removed: - ----- Method: BlockNode>>emitCodeForClosureValue:encoder: (in category 'code generation (closures)') ----- - emitCodeForClosureValue: stack encoder: encoder - "if not supportsClosureOpcodes closureCreationSupportNode is the - node for thisContext closureCopy: numArgs [ copiedValues: { values } ]" - encoder supportsClosureOpcodes - ifTrue: - [copiedValues do: - [:copiedValue| copiedValue emitCodeForValue: stack encoder: encoder]. - closureCreationNode pc: encoder methodStreamPosition + 1. - encoder - genPushClosureCopyNumCopiedValues: copiedValues size - numArgs: arguments size - jumpSize: size. - stack - pop: copiedValues size; - push: 1] - ifFalse: - [closureCreationNode emitCodeForValue: stack encoder: encoder. - encoder genJumpLong: size]. "Force a two byte jump." - "Emit the body of the block" - self emitCodeForEvaluatedClosureValue: stack encoder: encoder! Item was changed: + ----- Method: BlockNode>>emitCodeForEvaluatedClosureValue:encoder: (in category 'code generation') ----- - ----- Method: BlockNode>>emitCodeForEvaluatedClosureValue:encoder: (in category 'code generation (closures)') ----- emitCodeForEvaluatedClosureValue: stack encoder: encoder | position | position := stack position. stack position: arguments size + temporaries size + copiedValues size. encoder genPushNClosureTemps: temporaries size. self reindexingLocalsDo: [self emitCodeForEvaluatedValue: stack encoder: encoder] encoder: encoder. self returns ifFalse: [encoder genReturnTopToCaller. pc := encoder methodStreamPosition]. stack position: position! Item was changed: ----- Method: BlockNode>>emitCodeForValue:encoder: (in category 'code generation') ----- emitCodeForValue: stack encoder: encoder + copiedValues do: + [:copiedValue| copiedValue emitCodeForValue: stack encoder: encoder]. + closureCreationNode pc: encoder methodStreamPosition + 1. + encoder + genPushClosureCopyNumCopiedValues: copiedValues size + numArgs: arguments size + jumpSize: size. + stack + pop: copiedValues size; + push: 1. + "Emit the body of the block" + self emitCodeForEvaluatedClosureValue: stack encoder: encoder! - - self generateAsClosure ifTrue: - [^self emitCodeForClosureValue: stack encoder: encoder]. - encoder genPushThisContext. - stack push: 1. - nArgsNode emitCodeForValue: stack encoder: encoder. - remoteCopyNode - emitCode: stack - args: 1 - encoder: encoder. - "Force a two byte jump." - encoder genJumpLong: size. - stack push: arguments size. - arguments reverseDo: [:arg | arg emitCodeForStorePop: stack encoder: encoder]. - self emitCodeForEvaluatedValue: stack encoder: encoder. - self returns ifFalse: - [encoder genReturnTopToCaller. - pc := encoder methodStreamPosition]. - stack pop: 1! Item was added: + ----- Method: BlockNode>>ensureClosureCreationNode (in category 'accessing') ----- + ensureClosureCreationNode + closureCreationNode ifNil: + [closureCreationNode := LeafNode new + key: #closureCreationNode + code: nil]. + ^closureCreationNode! Item was removed: - ----- Method: BlockNode>>generateAsClosure (in category 'testing') ----- - generateAsClosure - "Answer if we're compiling under the closure regime. If blockExtent has been set by - analyseTempsWithin:rootNode: et al then we're compiling under the closure regime." - ^blockExtent ~~ nil! Item was changed: ----- Method: BlockNode>>noteSourceRangeStart:end:encoder: (in category 'initialize-release') ----- noteSourceRangeStart: start end: end encoder: encoder "Note two source ranges for this node. One is for the debugger and is of the last expression, the result of the block. One is for source analysis and is for the entire block." encoder noteSourceRange: (start to: end) + forNode: self ensureClosureCreationNode. - forNode: self closureCreationNode. startOfLastStatement ifNil: [encoder noteSourceRange: (start to: end) forNode: self] ifNotNil: [encoder noteSourceRange: (startOfLastStatement to: end - 1) forNode: self]! Item was removed: - ----- Method: BlockNode>>sizeCodeForClosureValue: (in category 'code generation (closures)') ----- - sizeCodeForClosureValue: encoder - "Compute the size for the creation of the block and its code." - "If we have the closure bytecodes constructClosureCreationNode: will note - the copied values in the copiedValues inst var and answer #pushCopiedValues." - closureCreationNode := self constructClosureCreationNode: encoder. - "Remember size of body for emit time so we know the size of the jump around it." - size := self sizeCodeForEvaluatedClosureValue: encoder. - ^encoder supportsClosureOpcodes - ifTrue: - [(copiedValues inject: 0 into: [:sum :node| sum + (node sizeCodeForValue: encoder)]) - + (encoder sizePushClosureCopyNumCopiedValues: copiedValues size numArgs: arguments size jumpSize: size) - + size] - ifFalse: - ["closureCreationSupportNode is send closureCopy:copiedValues:" - (closureCreationNode sizeCodeForValue: encoder) - + (encoder sizeJumpLong: size) - + size]! Item was changed: + ----- Method: BlockNode>>sizeCodeForEvaluatedClosureValue: (in category 'code generation') ----- - ----- Method: BlockNode>>sizeCodeForEvaluatedClosureValue: (in category 'code generation (closures)') ----- sizeCodeForEvaluatedClosureValue: encoder "The closure value primitives push the arguments and the copied values. The compiler guarantees that any copied values come before all local temps. So on closure activation we only need to push nils for the remaining temporaries." ^(encoder sizePushNClosureTemps: temporaries size) + (self reindexingLocalsDo: [self sizeCodeForEvaluatedValue: encoder] encoder: nil "don't store temps yet") + (self returns ifTrue: [0] ifFalse: [encoder sizeReturnTopToCaller])! Item was changed: ----- Method: BlockNode>>sizeCodeForValue: (in category 'code generation') ----- sizeCodeForValue: encoder + "Compute the size for the creation of the block and its code." + copiedValues := self computeCopiedValues: encoder rootNode. + self ensureClosureCreationNode. + "Remember size of body for emit time so we know the size of the jump around it." + size := self sizeCodeForEvaluatedClosureValue: encoder. + ^(copiedValues inject: 0 into: [:sum :node| sum + (node sizeCodeForValue: encoder)]) + + (encoder sizePushClosureCopyNumCopiedValues: copiedValues size numArgs: arguments size jumpSize: size) + + size! - self generateAsClosure ifTrue: - [^self sizeCodeForClosureValue: encoder]. - - nArgsNode := encoder encodeLiteral: arguments size. - remoteCopyNode := encoder encodeSelector: #blockCopy:. - size := self sizeCodeForEvaluatedValue: encoder. - self returns ifFalse: - [size := size + encoder sizeReturnTopToCaller]. "endBlock" - arguments := arguments collect: "Chance to prepare debugger remote temps" - [:arg | arg asStorableNode: encoder]. - arguments do: [:arg | size := size + (arg sizeCodeForStorePop: encoder)]. - ^encoder sizePushThisContext - + (nArgsNode sizeCodeForValue: encoder) - + (remoteCopyNode sizeCode: encoder args: 1 super: false) - + (encoder sizeJumpLong: size) - + size! Item was changed: + ----- Method: BraceNode>>elements (in category 'code generation') ----- - ----- Method: BraceNode>>elements (in category 'code generation (closures)') ----- elements ^elements! Item was changed: ----- Method: BraceNode>>emitCodeForValue:encoder: (in category 'code generation') ----- emitCodeForValue: stack encoder: encoder + "Hack; when sizing we have no way of knowing how much stack space is available." + elements size <= self maxElementsForConsArray ifTrue: - - (encoder supportsClosureOpcodes - "Hack; we have no way of knowing how much stack space is available" - and: [elements size <= self maxElementsForConsArray]) ifTrue: [elements do: [:node| node emitCodeForValue: stack encoder: encoder]. encoder genPushConsArray: elements size. stack pop: elements size; push: 1. ^self]. ^emitNode emitCodeForValue: stack encoder: encoder! Item was changed: + ----- Method: BraceNode>>maxElementsForConsArray (in category 'code generation') ----- - ----- Method: BraceNode>>maxElementsForConsArray (in category 'code generation (closures)') ----- maxElementsForConsArray "Hack; we have no way of knowing how much stack space is available during sizing" ^8! Item was changed: ----- Method: BraceNode>>sizeCodeForValue: (in category 'code generation') ----- sizeCodeForValue: encoder + "Hack; we have no way of knowing how much stack space is available." + elements size <= self maxElementsForConsArray ifTrue: - (encoder supportsClosureOpcodes - "Hack; we have no way of knowing how much stack space is available" - and: [elements size <= self maxElementsForConsArray]) ifTrue: [^(elements inject: 0 into: [:sum :node| sum + (node sizeCodeForValue: encoder)]) + (encoder sizePushConsArray: elements size)]. + "Long form: (Array braceStream: N) nextPut: a; nextPut: b; ...; braceArray" + emitNode := CascadeNode new - emitNode := elements size <= 4 - ifTrue: ["Short form: Array braceWith: a with: b ... " - MessageNode new - receiver: (encoder encodeVariable: #Array) - selector: (self selectorForShortForm: elements size) - arguments: elements precedence: 3 from: encoder] - ifFalse: ["Long form: (Array braceStream: N) nextPut: a; nextPut: b; ...; braceArray" - CascadeNode new receiver: (MessageNode new receiver: (encoder encodeVariable: #Array) selector: #braceStream: + arguments: {encoder encodeLiteral: elements size} - arguments: (Array with: (encoder encodeLiteral: elements size)) precedence: 3 from: encoder) + messages: ((elements collect: [:elt | + MessageNode new + receiver: nil + selector: #nextPut: + arguments: {elt} + precedence: 3 + from: encoder]) + copyWith: (MessageNode new + receiver: nil + selector: #braceArray + arguments: #() + precedence: 1 + from: encoder)). - messages: ((elements collect: [:elt | MessageNode new receiver: nil - selector: #nextPut: - arguments: (Array with: elt) - precedence: 3 from: encoder]) - copyWith: (MessageNode new receiver: nil - selector: #braceArray - arguments: (Array new) - precedence: 1 from: encoder))]. ^emitNode sizeCodeForValue: encoder! Item was changed: ----- Method: BytecodeEncoder>>bindBlockArg:within: (in category 'temps') ----- bindBlockArg: name within: aBlockNode - "Read the comment in the superclass's method. - If we have closures we should check the argument - count against the block, not the method. - - (Note that this isn't entirely adequate either since optimized blocks - will slip through the cracks (their arguments (i.e. ifNotNil: [:expr|) - are charged against their enclosing block, not themselves))." | nArgs | - self supportsClosureOpcodes ifFalse: - [^super bindBlockArg: name within: aBlockNode]. (nArgs := aBlockNode nArgsSlot) isNil ifTrue: [aBlockNode nArgsSlot: (nArgs := 0)]. + nArgs >= 15 ifTrue: - nArgs >= 15 ifTrue: [^self notify: 'Too many arguments']. aBlockNode nArgsSlot: nArgs + 1. ^(self bindTemp: name) beBlockArg; nowHasDef; nowHasRef; yourself! Item was changed: ----- Method: BytecodeEncoder>>bindBlockTemp:within: (in category 'temps') ----- bindBlockTemp: name within: aBlockNode - "Read the comment in the superclass's bindBlockArg:within: method. - If we have closures we should check the argument - count against the block, not the method. - - (Note that this isn't entirely adequate either since optimized blocks - will slip through the cracks (their arguments (i.e. ifNotNil: [:expr|) - are charged against their enclosing block, not themselves))." | nArgs | + (nArgs := aBlockNode nArgsSlot) ifNil: - self supportsClosureOpcodes ifFalse: - [^super bindBlockTemp: name within: aBlockNode]. - (nArgs := aBlockNode nArgsSlot) isNil ifTrue: [aBlockNode nArgsSlot: (nArgs := 0)]. nArgs >= (CompiledMethod fullFrameSize - 1) ifTrue: [^self notify: 'Too many temporaries']. aBlockNode nArgsSlot: nArgs + 1. ^self bindTemp: name! Item was changed: ----- Method: BytecodeEncoder>>bindTemp: (in category 'temps') ----- bindTemp: name + "Declare a temporary; error not if a field or class variable or out-of-scope temp." - "Declare a temporary; error not if a field or class variable or out-of-scope temp. - Read the comment in Encoder>>bindBlockArg:within: and subclass implementations." - self supportsClosureOpcodes ifFalse: - [^super bindTemp: name]. scopeTable at: name ifPresent: [:node| "When non-interactive raise the error only if it is a duplicate" node isTemp ifTrue:[node scope >= 0 ifTrue: [^self notify: 'Name already used in this method']] ifFalse:[self warnAboutShadowed: name]]. ^self reallyBind: name! Item was changed: ----- Method: RemoteTempVectorNode>>addRemoteTemp:encoder: (in category 'code generation (closures)') ----- addRemoteTemp: aTempVariableNode encoder: encoder + remoteTemps ifNil: - remoteTemps isNil ifTrue: [remoteTemps := OrderedCollection new]. remoteTemps addLast: aTempVariableNode. aTempVariableNode referenceScopesAndIndicesDo: [:scopeBlock "<BlockNode>" :location "<Integer>"| + self addReadWithin: scopeBlock at: location]! - self addReadWithin: scopeBlock at: location]. - encoder supportsClosureOpcodes ifFalse: - [encoder encodeLiteral: remoteTemps size. - readNode := encoder encodeSelector: #at:. - writeNode := encoder encodeSelector: #at:put:]! Item was removed: - ----- Method: RemoteTempVectorNode>>emitCodeForIndexOf:stack:encoder: (in category 'code generation (closures)') ----- - emitCodeForIndexOf: aTempVariableNode stack: stack encoder: encoder - self assert: encoder supportsClosureOpcodes not. - (encoder encodeLiteral: (remoteTemps indexOf: aTempVariableNode)) - emitCodeForValue: stack encoder: encoder! Item was removed: - ----- Method: RemoteTempVectorNode>>emitCodeForLoadFor:stack:encoder: (in category 'code generation (closures)') ----- - emitCodeForLoadFor: aTempVariableNode stack: stack encoder: encoder - encoder supportsClosureOpcodes ifTrue: - [^self]. - "Need to generate the first half of - tempVector at: index put: expr - i.e. the push of tempVector and index." - super emitCodeForValue: stack encoder: encoder. - self emitCodeForIndexOf: aTempVariableNode stack: stack encoder: encoder! Item was changed: + ----- Method: RemoteTempVectorNode>>emitCodeForStoreInto:stack:encoder: (in category 'code generation') ----- - ----- Method: RemoteTempVectorNode>>emitCodeForStoreInto:stack:encoder: (in category 'code generation (closures)') ----- emitCodeForStoreInto: aTempVariableNode stack: stack encoder: encoder + encoder + genStoreRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 + inVectorAt: index! - encoder supportsClosureOpcodes - ifTrue: - [encoder - genStoreRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 - inVectorAt: index] - ifFalse: - [writeNode - emitCode: stack - args: 2 - encoder: encoder - super: false]! Item was changed: + ----- Method: RemoteTempVectorNode>>emitCodeForStorePopInto:stack:encoder: (in category 'code generation') ----- - ----- Method: RemoteTempVectorNode>>emitCodeForStorePopInto:stack:encoder: (in category 'code generation (closures)') ----- emitCodeForStorePopInto: aTempVariableNode stack: stack encoder: encoder + encoder + genStorePopRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 + inVectorAt: index. - encoder supportsClosureOpcodes - ifTrue: - [encoder - genStorePopRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 - inVectorAt: index] - ifFalse: - [self emitCodeForStoreInto: aTempVariableNode stack: stack encoder: encoder. - encoder genPop]. stack pop: 1! Item was changed: + ----- Method: RemoteTempVectorNode>>emitCodeForValueOf:stack:encoder: (in category 'code generation') ----- - ----- Method: RemoteTempVectorNode>>emitCodeForValueOf:stack:encoder: (in category 'code generation (closures)') ----- emitCodeForValueOf: aTempVariableNode stack: stack encoder: encoder + encoder + genPushRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 + inVectorAt: index. + stack push: 1! - encoder supportsClosureOpcodes - ifTrue: - [encoder - genPushRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 - inVectorAt: index. - stack push: 1] - ifFalse: - [self emitCodeForLoadFor: aTempVariableNode stack: stack encoder: encoder. - readNode - emitCode: stack - args: 1 - encoder: encoder - super: false]! Item was changed: + ----- Method: RemoteTempVectorNode>>nodeToInitialize: (in category 'code generation') ----- - ----- Method: RemoteTempVectorNode>>nodeToInitialize: (in category 'code generation (closures)') ----- nodeToInitialize: encoder ^AssignmentNode new variable: self + value: (NewArrayNode new numElements: remoteTemps size)! - value: (encoder supportsClosureOpcodes - ifTrue: [NewArrayNode new numElements: remoteTemps size] - ifFalse: - [MessageNode new - receiver: (encoder encodeVariable: 'Array') - selector: #new: - arguments: (Array with: (encoder encodeLiteral: remoteTemps size)) - precedence: 3 - from: encoder])! Item was changed: + ----- Method: RemoteTempVectorNode>>scope (in category 'code generation') ----- - ----- Method: RemoteTempVectorNode>>scope (in category 'code generation (closures)') ----- scope "Answer scope of temporary variables. Currently only the following distinctions are made: 0 outer level: args and user-declared temps 1 block args and doLimiT temps -1 a block temp that is no longer active -2 a block temp that held limit of to:do: -3 an indirect temp vector" ^-3! Item was removed: - ----- Method: RemoteTempVectorNode>>sizeCodeForIndexOf:encoder: (in category 'code generation (closures)') ----- - sizeCodeForIndexOf: aTempVariableNode encoder: encoder - self assert: encoder supportsClosureOpcodes not. - ^(encoder encodeLiteral: (remoteTemps indexOf: aTempVariableNode)) sizeCodeForValue: encoder! Item was removed: - ----- Method: RemoteTempVectorNode>>sizeCodeForLoadFor:encoder: (in category 'code generation (closures)') ----- - sizeCodeForLoadFor: aTempVariableNode encoder: encoder - encoder supportsClosureOpcodes ifTrue: - [^0]. - "Need to size the first half of - tempVector at: index put: expr - i.e. the push of tempVector and index." - ^(super sizeCodeForValue: encoder) - + (self sizeCodeForIndexOf: aTempVariableNode encoder: encoder)! Item was changed: + ----- Method: RemoteTempVectorNode>>sizeCodeForStoreInto:encoder: (in category 'code generation') ----- - ----- Method: RemoteTempVectorNode>>sizeCodeForStoreInto:encoder: (in category 'code generation (closures)') ----- sizeCodeForStoreInto: aTempVariableNode encoder: encoder + ^encoder + sizeStoreRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 + inVectorAt: index! - encoder supportsClosureOpcodes ifTrue: - [^encoder sizeStoreRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 inVectorAt: index]. - ^writeNode sizeCode: encoder args: 2 super: false! Item was changed: + ----- Method: RemoteTempVectorNode>>sizeCodeForStorePopInto:encoder: (in category 'code generation') ----- - ----- Method: RemoteTempVectorNode>>sizeCodeForStorePopInto:encoder: (in category 'code generation (closures)') ----- sizeCodeForStorePopInto: aTempVariableNode encoder: encoder + ^encoder + sizeStorePopRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 + inVectorAt: index! - encoder supportsClosureOpcodes ifTrue: - [^encoder sizeStorePopRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 inVectorAt: index]. - ^(self sizeCodeForStoreInto: aTempVariableNode encoder: encoder) - + encoder sizePop! Item was changed: + ----- Method: RemoteTempVectorNode>>sizeCodeForValueOf:encoder: (in category 'code generation') ----- - ----- Method: RemoteTempVectorNode>>sizeCodeForValueOf:encoder: (in category 'code generation (closures)') ----- sizeCodeForValueOf: aTempVariableNode encoder: encoder + ^encoder + sizePushRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 + inVectorAt: index! - encoder supportsClosureOpcodes ifTrue: - [^encoder sizePushRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 inVectorAt: index]. - ^(self sizeCodeForValue: encoder) - + (self sizeCodeForIndexOf: aTempVariableNode encoder: encoder) - + (readNode sizeCode: encoder args: 1 super: false)! Item was changed: + ----- Method: SpecialLiteralNode>>emitCodeForValue:encoder: (in category 'code generation') ----- - ----- Method: SpecialLiteralNode>>emitCodeForValue:encoder: (in category 'code generation (closures)') ----- emitCodeForValue: stack encoder: encoder stack push: 1. encoder genPushSpecialLiteral: key! Item was changed: + ----- Method: SpecialLiteralNode>>sizeCodeForValue: (in category 'code generation') ----- - ----- Method: SpecialLiteralNode>>sizeCodeForValue: (in category 'code generation (closures)') ----- sizeCodeForValue: encoder ^encoder sizePushSpecialLiteral: key! Item was removed: - ----- Method: TempVariableNode>>emitCodeForLoad:forValue:encoder: (in category 'code generation') ----- - emitCodeForLoad: stack forValue: forValue encoder: encoder - remoteNode ~~ nil ifTrue: - [remoteNode emitCodeForLoadFor: self stack: stack encoder: encoder]! Item was removed: - ----- Method: TempVariableNode>>sizeCodeForLoad:forValue: (in category 'code generation') ----- - sizeCodeForLoad: encoder forValue: forValue - ^remoteNode - ifNil: [0] - ifNotNil: [remoteNode sizeCodeForLoadFor: self encoder: encoder]! Item was removed: - ----- Method: VariableNode>>emitCodeForLoad:forValue:encoder: (in category 'code generation') ----- - emitCodeForLoad: stack forValue: forValue encoder: encoder - "Do nothing"!

1 0

The Trunk: Compiler-eem.342.mcz
by commits＠source.squeak.org 06 Apr '17

06 Apr '17

Eliot Miranda uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-eem.342.mcz ==================== Summary ==================== Name: Compiler-eem.342 Author: eem Time: 5 April 2017, 9:07:14.875209 pm UUID: afb21a91-4d9d-425f-b990-9daed043097d Ancestors: Compiler-eem.341 Remove most of, if not all, old pre-closure-bytecode and blue-book block support from the compiler. Recategorize code generation (size & emit methods) under "code generation", leaving closure analysis in "code generation (closures)" (to be changed later). Eliminate the short-form brace node creation code (which has used the cons array bytecode since the use of the closure bytecodes). =============== Diff against Compiler-eem.341 =============== Item was changed: + ----- Method: BlockNode>>constructClosureCreationNode: (in category 'code generation') ----- - ----- Method: BlockNode>>constructClosureCreationNode: (in category 'code generation (closures)') ----- constructClosureCreationNode: encoder copiedValues := self computeCopiedValues: encoder rootNode. + ^self ensureClosureCreationNode! - encoder supportsClosureOpcodes ifTrue: - [^self closureCreationNode]. - "Without the bytecode we can still get by." - ^MessageNode new - receiver: (encoder encodeVariable: 'thisContext') - selector: #closureCopy:copiedValues: - arguments: (Array - with: (encoder encodeLiteral: arguments size) - with: (copiedValues isEmpty - ifTrue: [NodeNil] - ifFalse: [BraceNode new elements: copiedValues])) - precedence: 3 - from: encoder! Item was removed: - ----- Method: BlockNode>>emitCodeForClosureValue:encoder: (in category 'code generation (closures)') ----- - emitCodeForClosureValue: stack encoder: encoder - "if not supportsClosureOpcodes closureCreationSupportNode is the - node for thisContext closureCopy: numArgs [ copiedValues: { values } ]" - encoder supportsClosureOpcodes - ifTrue: - [copiedValues do: - [:copiedValue| copiedValue emitCodeForValue: stack encoder: encoder]. - closureCreationNode pc: encoder methodStreamPosition + 1. - encoder - genPushClosureCopyNumCopiedValues: copiedValues size - numArgs: arguments size - jumpSize: size. - stack - pop: copiedValues size; - push: 1] - ifFalse: - [closureCreationNode emitCodeForValue: stack encoder: encoder. - encoder genJumpLong: size]. "Force a two byte jump." - "Emit the body of the block" - self emitCodeForEvaluatedClosureValue: stack encoder: encoder! Item was changed: + ----- Method: BlockNode>>emitCodeForEvaluatedClosureValue:encoder: (in category 'code generation') ----- - ----- Method: BlockNode>>emitCodeForEvaluatedClosureValue:encoder: (in category 'code generation (closures)') ----- emitCodeForEvaluatedClosureValue: stack encoder: encoder | position | position := stack position. stack position: arguments size + temporaries size + copiedValues size. encoder genPushNClosureTemps: temporaries size. self reindexingLocalsDo: [self emitCodeForEvaluatedValue: stack encoder: encoder] encoder: encoder. self returns ifFalse: [encoder genReturnTopToCaller. pc := encoder methodStreamPosition]. stack position: position! Item was changed: ----- Method: BlockNode>>emitCodeForValue:encoder: (in category 'code generation') ----- emitCodeForValue: stack encoder: encoder + copiedValues do: + [:copiedValue| copiedValue emitCodeForValue: stack encoder: encoder]. + closureCreationNode pc: encoder methodStreamPosition + 1. + encoder + genPushClosureCopyNumCopiedValues: copiedValues size + numArgs: arguments size + jumpSize: size. + stack + pop: copiedValues size; + push: 1. + "Emit the body of the block" + self emitCodeForEvaluatedClosureValue: stack encoder: encoder! - - self generateAsClosure ifTrue: - [^self emitCodeForClosureValue: stack encoder: encoder]. - encoder genPushThisContext. - stack push: 1. - nArgsNode emitCodeForValue: stack encoder: encoder. - remoteCopyNode - emitCode: stack - args: 1 - encoder: encoder. - "Force a two byte jump." - encoder genJumpLong: size. - stack push: arguments size. - arguments reverseDo: [:arg | arg emitCodeForStorePop: stack encoder: encoder]. - self emitCodeForEvaluatedValue: stack encoder: encoder. - self returns ifFalse: - [encoder genReturnTopToCaller. - pc := encoder methodStreamPosition]. - stack pop: 1! Item was added: + ----- Method: BlockNode>>ensureClosureCreationNode (in category 'accessing') ----- + ensureClosureCreationNode + closureCreationNode ifNil: + [closureCreationNode := LeafNode new + key: #closureCreationNode + code: nil]. + ^closureCreationNode! Item was removed: - ----- Method: BlockNode>>generateAsClosure (in category 'testing') ----- - generateAsClosure - "Answer if we're compiling under the closure regime. If blockExtent has been set by - analyseTempsWithin:rootNode: et al then we're compiling under the closure regime." - ^blockExtent ~~ nil! Item was changed: ----- Method: BlockNode>>noteSourceRangeStart:end:encoder: (in category 'initialize-release') ----- noteSourceRangeStart: start end: end encoder: encoder "Note two source ranges for this node. One is for the debugger and is of the last expression, the result of the block. One is for source analysis and is for the entire block." encoder noteSourceRange: (start to: end) + forNode: self ensureClosureCreationNode. - forNode: self closureCreationNode. startOfLastStatement ifNil: [encoder noteSourceRange: (start to: end) forNode: self] ifNotNil: [encoder noteSourceRange: (startOfLastStatement to: end - 1) forNode: self]! Item was removed: - ----- Method: BlockNode>>sizeCodeForClosureValue: (in category 'code generation (closures)') ----- - sizeCodeForClosureValue: encoder - "Compute the size for the creation of the block and its code." - "If we have the closure bytecodes constructClosureCreationNode: will note - the copied values in the copiedValues inst var and answer #pushCopiedValues." - closureCreationNode := self constructClosureCreationNode: encoder. - "Remember size of body for emit time so we know the size of the jump around it." - size := self sizeCodeForEvaluatedClosureValue: encoder. - ^encoder supportsClosureOpcodes - ifTrue: - [(copiedValues inject: 0 into: [:sum :node| sum + (node sizeCodeForValue: encoder)]) - + (encoder sizePushClosureCopyNumCopiedValues: copiedValues size numArgs: arguments size jumpSize: size) - + size] - ifFalse: - ["closureCreationSupportNode is send closureCopy:copiedValues:" - (closureCreationNode sizeCodeForValue: encoder) - + (encoder sizeJumpLong: size) - + size]! Item was changed: + ----- Method: BlockNode>>sizeCodeForEvaluatedClosureValue: (in category 'code generation') ----- - ----- Method: BlockNode>>sizeCodeForEvaluatedClosureValue: (in category 'code generation (closures)') ----- sizeCodeForEvaluatedClosureValue: encoder "The closure value primitives push the arguments and the copied values. The compiler guarantees that any copied values come before all local temps. So on closure activation we only need to push nils for the remaining temporaries." ^(encoder sizePushNClosureTemps: temporaries size) + (self reindexingLocalsDo: [self sizeCodeForEvaluatedValue: encoder] encoder: nil "don't store temps yet") + (self returns ifTrue: [0] ifFalse: [encoder sizeReturnTopToCaller])! Item was changed: ----- Method: BlockNode>>sizeCodeForValue: (in category 'code generation') ----- sizeCodeForValue: encoder + "Compute the size for the creation of the block and its code." + copiedValues := self computeCopiedValues: encoder rootNode. + self ensureClosureCreationNode. + "Remember size of body for emit time so we know the size of the jump around it." + size := self sizeCodeForEvaluatedClosureValue: encoder. + ^(copiedValues inject: 0 into: [:sum :node| sum + (node sizeCodeForValue: encoder)]) + + (encoder sizePushClosureCopyNumCopiedValues: copiedValues size numArgs: arguments size jumpSize: size) + + size! - self generateAsClosure ifTrue: - [^self sizeCodeForClosureValue: encoder]. - - nArgsNode := encoder encodeLiteral: arguments size. - remoteCopyNode := encoder encodeSelector: #blockCopy:. - size := self sizeCodeForEvaluatedValue: encoder. - self returns ifFalse: - [size := size + encoder sizeReturnTopToCaller]. "endBlock" - arguments := arguments collect: "Chance to prepare debugger remote temps" - [:arg | arg asStorableNode: encoder]. - arguments do: [:arg | size := size + (arg sizeCodeForStorePop: encoder)]. - ^encoder sizePushThisContext - + (nArgsNode sizeCodeForValue: encoder) - + (remoteCopyNode sizeCode: encoder args: 1 super: false) - + (encoder sizeJumpLong: size) - + size! Item was changed: + ----- Method: BraceNode>>elements (in category 'code generation') ----- - ----- Method: BraceNode>>elements (in category 'code generation (closures)') ----- elements ^elements! Item was changed: ----- Method: BraceNode>>emitCodeForValue:encoder: (in category 'code generation') ----- emitCodeForValue: stack encoder: encoder + "Hack; when sizing we have no way of knowing how much stack space is available." + elements size <= self maxElementsForConsArray ifTrue: - - (encoder supportsClosureOpcodes - "Hack; we have no way of knowing how much stack space is available" - and: [elements size <= self maxElementsForConsArray]) ifTrue: [elements do: [:node| node emitCodeForValue: stack encoder: encoder]. encoder genPushConsArray: elements size. stack pop: elements size; push: 1. ^self]. ^emitNode emitCodeForValue: stack encoder: encoder! Item was changed: + ----- Method: BraceNode>>maxElementsForConsArray (in category 'code generation') ----- - ----- Method: BraceNode>>maxElementsForConsArray (in category 'code generation (closures)') ----- maxElementsForConsArray "Hack; we have no way of knowing how much stack space is available during sizing" ^8! Item was changed: ----- Method: BraceNode>>sizeCodeForValue: (in category 'code generation') ----- sizeCodeForValue: encoder + "Hack; we have no way of knowing how much stack space is available." + elements size <= self maxElementsForConsArray ifTrue: - (encoder supportsClosureOpcodes - "Hack; we have no way of knowing how much stack space is available" - and: [elements size <= self maxElementsForConsArray]) ifTrue: [^(elements inject: 0 into: [:sum :node| sum + (node sizeCodeForValue: encoder)]) + (encoder sizePushConsArray: elements size)]. + "Long form: (Array braceStream: N) nextPut: a; nextPut: b; ...; braceArray" + emitNode := CascadeNode new - emitNode := elements size <= 4 - ifTrue: ["Short form: Array braceWith: a with: b ... " - MessageNode new - receiver: (encoder encodeVariable: #Array) - selector: (self selectorForShortForm: elements size) - arguments: elements precedence: 3 from: encoder] - ifFalse: ["Long form: (Array braceStream: N) nextPut: a; nextPut: b; ...; braceArray" - CascadeNode new receiver: (MessageNode new receiver: (encoder encodeVariable: #Array) selector: #braceStream: + arguments: {encoder encodeLiteral: elements size} - arguments: (Array with: (encoder encodeLiteral: elements size)) precedence: 3 from: encoder) + messages: ((elements collect: [:elt | + MessageNode new + receiver: nil + selector: #nextPut: + arguments: {elt} + precedence: 3 + from: encoder]) + copyWith: (MessageNode new + receiver: nil + selector: #braceArray + arguments: #() + precedence: 1 + from: encoder)). - messages: ((elements collect: [:elt | MessageNode new receiver: nil - selector: #nextPut: - arguments: (Array with: elt) - precedence: 3 from: encoder]) - copyWith: (MessageNode new receiver: nil - selector: #braceArray - arguments: (Array new) - precedence: 1 from: encoder))]. ^emitNode sizeCodeForValue: encoder! Item was changed: ----- Method: BytecodeEncoder>>bindBlockArg:within: (in category 'temps') ----- bindBlockArg: name within: aBlockNode - "Read the comment in the superclass's method. - If we have closures we should check the argument - count against the block, not the method. - - (Note that this isn't entirely adequate either since optimized blocks - will slip through the cracks (their arguments (i.e. ifNotNil: [:expr|) - are charged against their enclosing block, not themselves))." | nArgs | - self supportsClosureOpcodes ifFalse: - [^super bindBlockArg: name within: aBlockNode]. (nArgs := aBlockNode nArgsSlot) isNil ifTrue: [aBlockNode nArgsSlot: (nArgs := 0)]. + nArgs >= 15 ifTrue: - nArgs >= 15 ifTrue: [^self notify: 'Too many arguments']. aBlockNode nArgsSlot: nArgs + 1. ^(self bindTemp: name) beBlockArg; nowHasDef; nowHasRef; yourself! Item was changed: ----- Method: BytecodeEncoder>>bindBlockTemp:within: (in category 'temps') ----- bindBlockTemp: name within: aBlockNode - "Read the comment in the superclass's bindBlockArg:within: method. - If we have closures we should check the argument - count against the block, not the method. - - (Note that this isn't entirely adequate either since optimized blocks - will slip through the cracks (their arguments (i.e. ifNotNil: [:expr|) - are charged against their enclosing block, not themselves))." | nArgs | + (nArgs := aBlockNode nArgsSlot) ifNil: - self supportsClosureOpcodes ifFalse: - [^super bindBlockTemp: name within: aBlockNode]. - (nArgs := aBlockNode nArgsSlot) isNil ifTrue: [aBlockNode nArgsSlot: (nArgs := 0)]. nArgs >= (CompiledMethod fullFrameSize - 1) ifTrue: [^self notify: 'Too many temporaries']. aBlockNode nArgsSlot: nArgs + 1. ^self bindTemp: name! Item was changed: ----- Method: BytecodeEncoder>>bindTemp: (in category 'temps') ----- bindTemp: name + "Declare a temporary; error not if a field or class variable or out-of-scope temp." - "Declare a temporary; error not if a field or class variable or out-of-scope temp. - Read the comment in Encoder>>bindBlockArg:within: and subclass implementations." - self supportsClosureOpcodes ifFalse: - [^super bindTemp: name]. scopeTable at: name ifPresent: [:node| "When non-interactive raise the error only if it is a duplicate" node isTemp ifTrue:[node scope >= 0 ifTrue: [^self notify: 'Name already used in this method']] ifFalse:[self warnAboutShadowed: name]]. ^self reallyBind: name! Item was changed: ----- Method: RemoteTempVectorNode>>addRemoteTemp:encoder: (in category 'code generation (closures)') ----- addRemoteTemp: aTempVariableNode encoder: encoder + remoteTemps ifNil: - remoteTemps isNil ifTrue: [remoteTemps := OrderedCollection new]. remoteTemps addLast: aTempVariableNode. aTempVariableNode referenceScopesAndIndicesDo: [:scopeBlock "<BlockNode>" :location "<Integer>"| + self addReadWithin: scopeBlock at: location]! - self addReadWithin: scopeBlock at: location]. - encoder supportsClosureOpcodes ifFalse: - [encoder encodeLiteral: remoteTemps size. - readNode := encoder encodeSelector: #at:. - writeNode := encoder encodeSelector: #at:put:]! Item was removed: - ----- Method: RemoteTempVectorNode>>emitCodeForIndexOf:stack:encoder: (in category 'code generation (closures)') ----- - emitCodeForIndexOf: aTempVariableNode stack: stack encoder: encoder - self assert: encoder supportsClosureOpcodes not. - (encoder encodeLiteral: (remoteTemps indexOf: aTempVariableNode)) - emitCodeForValue: stack encoder: encoder! Item was removed: - ----- Method: RemoteTempVectorNode>>emitCodeForLoadFor:stack:encoder: (in category 'code generation (closures)') ----- - emitCodeForLoadFor: aTempVariableNode stack: stack encoder: encoder - encoder supportsClosureOpcodes ifTrue: - [^self]. - "Need to generate the first half of - tempVector at: index put: expr - i.e. the push of tempVector and index." - super emitCodeForValue: stack encoder: encoder. - self emitCodeForIndexOf: aTempVariableNode stack: stack encoder: encoder! Item was changed: + ----- Method: RemoteTempVectorNode>>emitCodeForStoreInto:stack:encoder: (in category 'code generation') ----- - ----- Method: RemoteTempVectorNode>>emitCodeForStoreInto:stack:encoder: (in category 'code generation (closures)') ----- emitCodeForStoreInto: aTempVariableNode stack: stack encoder: encoder + encoder + genStoreRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 + inVectorAt: index! - encoder supportsClosureOpcodes - ifTrue: - [encoder - genStoreRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 - inVectorAt: index] - ifFalse: - [writeNode - emitCode: stack - args: 2 - encoder: encoder - super: false]! Item was changed: + ----- Method: RemoteTempVectorNode>>emitCodeForStorePopInto:stack:encoder: (in category 'code generation') ----- - ----- Method: RemoteTempVectorNode>>emitCodeForStorePopInto:stack:encoder: (in category 'code generation (closures)') ----- emitCodeForStorePopInto: aTempVariableNode stack: stack encoder: encoder + encoder + genStorePopRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 + inVectorAt: index. - encoder supportsClosureOpcodes - ifTrue: - [encoder - genStorePopRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 - inVectorAt: index] - ifFalse: - [self emitCodeForStoreInto: aTempVariableNode stack: stack encoder: encoder. - encoder genPop]. stack pop: 1! Item was changed: + ----- Method: RemoteTempVectorNode>>emitCodeForValueOf:stack:encoder: (in category 'code generation') ----- - ----- Method: RemoteTempVectorNode>>emitCodeForValueOf:stack:encoder: (in category 'code generation (closures)') ----- emitCodeForValueOf: aTempVariableNode stack: stack encoder: encoder + encoder + genPushRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 + inVectorAt: index. + stack push: 1! - encoder supportsClosureOpcodes - ifTrue: - [encoder - genPushRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 - inVectorAt: index. - stack push: 1] - ifFalse: - [self emitCodeForLoadFor: aTempVariableNode stack: stack encoder: encoder. - readNode - emitCode: stack - args: 1 - encoder: encoder - super: false]! Item was changed: + ----- Method: RemoteTempVectorNode>>nodeToInitialize: (in category 'code generation') ----- - ----- Method: RemoteTempVectorNode>>nodeToInitialize: (in category 'code generation (closures)') ----- nodeToInitialize: encoder ^AssignmentNode new variable: self + value: (NewArrayNode new numElements: remoteTemps size)! - value: (encoder supportsClosureOpcodes - ifTrue: [NewArrayNode new numElements: remoteTemps size] - ifFalse: - [MessageNode new - receiver: (encoder encodeVariable: 'Array') - selector: #new: - arguments: (Array with: (encoder encodeLiteral: remoteTemps size)) - precedence: 3 - from: encoder])! Item was changed: + ----- Method: RemoteTempVectorNode>>scope (in category 'code generation') ----- - ----- Method: RemoteTempVectorNode>>scope (in category 'code generation (closures)') ----- scope "Answer scope of temporary variables. Currently only the following distinctions are made: 0 outer level: args and user-declared temps 1 block args and doLimiT temps -1 a block temp that is no longer active -2 a block temp that held limit of to:do: -3 an indirect temp vector" ^-3! Item was removed: - ----- Method: RemoteTempVectorNode>>sizeCodeForIndexOf:encoder: (in category 'code generation (closures)') ----- - sizeCodeForIndexOf: aTempVariableNode encoder: encoder - self assert: encoder supportsClosureOpcodes not. - ^(encoder encodeLiteral: (remoteTemps indexOf: aTempVariableNode)) sizeCodeForValue: encoder! Item was removed: - ----- Method: RemoteTempVectorNode>>sizeCodeForLoadFor:encoder: (in category 'code generation (closures)') ----- - sizeCodeForLoadFor: aTempVariableNode encoder: encoder - encoder supportsClosureOpcodes ifTrue: - [^0]. - "Need to size the first half of - tempVector at: index put: expr - i.e. the push of tempVector and index." - ^(super sizeCodeForValue: encoder) - + (self sizeCodeForIndexOf: aTempVariableNode encoder: encoder)! Item was changed: + ----- Method: RemoteTempVectorNode>>sizeCodeForStoreInto:encoder: (in category 'code generation') ----- - ----- Method: RemoteTempVectorNode>>sizeCodeForStoreInto:encoder: (in category 'code generation (closures)') ----- sizeCodeForStoreInto: aTempVariableNode encoder: encoder + ^encoder + sizeStoreRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 + inVectorAt: index! - encoder supportsClosureOpcodes ifTrue: - [^encoder sizeStoreRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 inVectorAt: index]. - ^writeNode sizeCode: encoder args: 2 super: false! Item was changed: + ----- Method: RemoteTempVectorNode>>sizeCodeForStorePopInto:encoder: (in category 'code generation') ----- - ----- Method: RemoteTempVectorNode>>sizeCodeForStorePopInto:encoder: (in category 'code generation (closures)') ----- sizeCodeForStorePopInto: aTempVariableNode encoder: encoder + ^encoder + sizeStorePopRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 + inVectorAt: index! - encoder supportsClosureOpcodes ifTrue: - [^encoder sizeStorePopRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 inVectorAt: index]. - ^(self sizeCodeForStoreInto: aTempVariableNode encoder: encoder) - + encoder sizePop! Item was changed: + ----- Method: RemoteTempVectorNode>>sizeCodeForValueOf:encoder: (in category 'code generation') ----- - ----- Method: RemoteTempVectorNode>>sizeCodeForValueOf:encoder: (in category 'code generation (closures)') ----- sizeCodeForValueOf: aTempVariableNode encoder: encoder + ^encoder + sizePushRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 + inVectorAt: index! - encoder supportsClosureOpcodes ifTrue: - [^encoder sizePushRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 inVectorAt: index]. - ^(self sizeCodeForValue: encoder) - + (self sizeCodeForIndexOf: aTempVariableNode encoder: encoder) - + (readNode sizeCode: encoder args: 1 super: false)! Item was changed: + ----- Method: SpecialLiteralNode>>emitCodeForValue:encoder: (in category 'code generation') ----- - ----- Method: SpecialLiteralNode>>emitCodeForValue:encoder: (in category 'code generation (closures)') ----- emitCodeForValue: stack encoder: encoder stack push: 1. encoder genPushSpecialLiteral: key! Item was changed: + ----- Method: SpecialLiteralNode>>sizeCodeForValue: (in category 'code generation') ----- - ----- Method: SpecialLiteralNode>>sizeCodeForValue: (in category 'code generation (closures)') ----- sizeCodeForValue: encoder ^encoder sizePushSpecialLiteral: key! Item was removed: - ----- Method: TempVariableNode>>emitCodeForLoad:forValue:encoder: (in category 'code generation') ----- - emitCodeForLoad: stack forValue: forValue encoder: encoder - remoteNode ~~ nil ifTrue: - [remoteNode emitCodeForLoadFor: self stack: stack encoder: encoder]! Item was removed: - ----- Method: TempVariableNode>>sizeCodeForLoad:forValue: (in category 'code generation') ----- - sizeCodeForLoad: encoder forValue: forValue - ^remoteNode - ifNil: [0] - ifNotNil: [remoteNode sizeCodeForLoadFor: self encoder: encoder]! Item was removed: - ----- Method: VariableNode>>emitCodeForLoad:forValue:encoder: (in category 'code generation') ----- - emitCodeForLoad: stack forValue: forValue encoder: encoder - "Do nothing"!

1 0

The Trunk: Compiler-eem.341.mcz
by commits＠source.squeak.org 06 Apr '17

06 Apr '17

Eliot Miranda uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-eem.341.mcz ==================== Summary ==================== Name: Compiler-eem.341 Author: eem Time: 5 April 2017, 8:21:57.818217 pm UUID: cffd92b7-b368-49ea-9ddd-2f01e7552079 Ancestors: Compiler-eem.340 Add the refactored encoder-specific method generator. This one moves generation from MethodNode to BytecodeEncoder and subclasses, and hence allows easier bytecode set selection, or at least far more sends to self than to encoder. Add the MethodNode>>primitive accessor it requires. =============== Diff against Compiler-eem.340 =============== Item was added: + ----- Method: BytecodeEncoder>>generateMethodOfClass:trailer:from: (in category 'method encoding') ----- + generateMethodOfClass: aCompiledMethodClass trailer: trailer from: methodNode + "The receiver is the root of a parse tree. Answer an instance of aCompiledMethodClass. + The argument, trailer, is arbitrary but is typically either the reference to the source code + that is stored with every CompiledMethod, or an encoding of the method's temporary names." + + | primErrNode blkSize nLits locals literals header method stack | + primErrNode := methodNode primitiveErrorVariableName ifNotNil: + [self fixTemp: methodNode primitiveErrorVariableName]. + methodNode ensureClosureAnalysisDone. + self rootNode: methodNode. "this is for BlockNode>>sizeCodeForClosureValue:" + blkSize := (methodNode block sizeCodeForEvaluatedValue: self) + + (methodNode primitive > 0 + ifTrue: [self sizeCallPrimitive: methodNode primitive] + ifFalse: [0]) + + (primErrNode + ifNil: [0] + ifNotNil: + [primErrNode + index: methodNode arguments size + methodNode temporaries size; + sizeCodeForStore: self "The VM relies on storeIntoTemp: (129)"]). + locals := methodNode arguments, methodNode temporaries, (primErrNode ifNil: [#()] ifNotNil: [{primErrNode}]). + self noteBlockExtent: methodNode block blockExtent hasLocals: locals. + header := self computeMethodHeaderForNumArgs: methodNode arguments size + numTemps: locals size + numLits: (nLits := (literals := self allLiterals) size) + primitive: methodNode primitive. + method := trailer + createMethod: blkSize + class: aCompiledMethodClass + header: header. + 1 to: nLits do: [:lit | method literalAt: lit put: (literals at: lit)]. + self streamToMethod: method. + stack := ParseStack new init. + methodNode primitive > 0 ifTrue: + [self genCallPrimitive: methodNode primitive]. + primErrNode ifNotNil: + [primErrNode emitCodeForStore: stack encoder: self]. + stack position: method numTemps. + [methodNode block emitCodeForEvaluatedValue: stack encoder: self] + on: Error "If an attempt is made to write too much code the method will be asked" + do: [:ex| "to grow, and the grow attempt will fail in CompiledMethod class>>#new:" + ex signalerContext sender method = (CompiledMethod class>>#new:) + ifTrue: [^self error: 'Compiler code size discrepancy'] + ifFalse: [ex pass]]. + stack position ~= (method numTemps + 1) ifTrue: + [^self error: 'Compiler stack discrepancy']. + self methodStreamPosition ~= (method size - trailer size) ifTrue: + [^self error: 'Compiler code size discrepancy']. + method needsFrameSize: stack size - method numTemps. + ^method! Item was added: + ----- Method: MethodNode>>primitive (in category 'accessing') ----- + primitive + ^primitive!

1 0

The Trunk: Compiler-eem.342.mcz
by commits＠source.squeak.org 06 Apr '17

06 Apr '17

Eliot Miranda uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-eem.342.mcz ==================== Summary ==================== Name: Compiler-eem.342 Author: eem Time: 5 April 2017, 8:01:34.530464 pm UUID: 6db0ec16-cf48-4f6f-a8db-138710ad4ded Ancestors: Compiler-eem.341 Remove most, if not all, of the old pre-closure-bytecode and blue-book block support from the compiler. Recategorize code generation (size & emit methods) under "code generation", leaving closure analysis in "code generation (closures)" (to be changed later). Eliminate the short-form brace node creation code (which has used the cons array bytecode since the closure bytecodes). Add MethodNode>>primitive, needed by the soon-to-be-refactored generate:using:. =============== Diff against Compiler-eem.341 =============== Item was changed: + ----- Method: BlockNode>>constructClosureCreationNode: (in category 'code generation') ----- - ----- Method: BlockNode>>constructClosureCreationNode: (in category 'code generation (closures)') ----- constructClosureCreationNode: encoder copiedValues := self computeCopiedValues: encoder rootNode. + ^self ensureClosureCreationNode! - encoder supportsClosureOpcodes ifTrue: - [^self closureCreationNode]. - "Without the bytecode we can still get by." - ^MessageNode new - receiver: (encoder encodeVariable: 'thisContext') - selector: #closureCopy:copiedValues: - arguments: (Array - with: (encoder encodeLiteral: arguments size) - with: (copiedValues isEmpty - ifTrue: [NodeNil] - ifFalse: [BraceNode new elements: copiedValues])) - precedence: 3 - from: encoder! Item was removed: - ----- Method: BlockNode>>emitCodeForClosureValue:encoder: (in category 'code generation (closures)') ----- - emitCodeForClosureValue: stack encoder: encoder - "if not supportsClosureOpcodes closureCreationSupportNode is the - node for thisContext closureCopy: numArgs [ copiedValues: { values } ]" - encoder supportsClosureOpcodes - ifTrue: - [copiedValues do: - [:copiedValue| copiedValue emitCodeForValue: stack encoder: encoder]. - closureCreationNode pc: encoder methodStreamPosition + 1. - encoder - genPushClosureCopyNumCopiedValues: copiedValues size - numArgs: arguments size - jumpSize: size. - stack - pop: copiedValues size; - push: 1] - ifFalse: - [closureCreationNode emitCodeForValue: stack encoder: encoder. - encoder genJumpLong: size]. "Force a two byte jump." - "Emit the body of the block" - self emitCodeForEvaluatedClosureValue: stack encoder: encoder! Item was changed: + ----- Method: BlockNode>>emitCodeForEvaluatedClosureValue:encoder: (in category 'code generation') ----- - ----- Method: BlockNode>>emitCodeForEvaluatedClosureValue:encoder: (in category 'code generation (closures)') ----- emitCodeForEvaluatedClosureValue: stack encoder: encoder | position | position := stack position. stack position: arguments size + temporaries size + copiedValues size. encoder genPushNClosureTemps: temporaries size. self reindexingLocalsDo: [self emitCodeForEvaluatedValue: stack encoder: encoder] encoder: encoder. self returns ifFalse: [encoder genReturnTopToCaller. pc := encoder methodStreamPosition]. stack position: position! Item was changed: ----- Method: BlockNode>>emitCodeForValue:encoder: (in category 'code generation') ----- emitCodeForValue: stack encoder: encoder + copiedValues do: + [:copiedValue| copiedValue emitCodeForValue: stack encoder: encoder]. + closureCreationNode pc: encoder methodStreamPosition + 1. + encoder + genPushClosureCopyNumCopiedValues: copiedValues size + numArgs: arguments size + jumpSize: size. + stack + pop: copiedValues size; + push: 1. + "Emit the body of the block" + self emitCodeForEvaluatedClosureValue: stack encoder: encoder! - - self generateAsClosure ifTrue: - [^self emitCodeForClosureValue: stack encoder: encoder]. - encoder genPushThisContext. - stack push: 1. - nArgsNode emitCodeForValue: stack encoder: encoder. - remoteCopyNode - emitCode: stack - args: 1 - encoder: encoder. - "Force a two byte jump." - encoder genJumpLong: size. - stack push: arguments size. - arguments reverseDo: [:arg | arg emitCodeForStorePop: stack encoder: encoder]. - self emitCodeForEvaluatedValue: stack encoder: encoder. - self returns ifFalse: - [encoder genReturnTopToCaller. - pc := encoder methodStreamPosition]. - stack pop: 1! Item was added: + ----- Method: BlockNode>>ensureClosureCreationNode (in category 'accessing') ----- + ensureClosureCreationNode + closureCreationNode ifNil: + [closureCreationNode := LeafNode new + key: #closureCreationNode + code: nil]. + ^closureCreationNode! Item was removed: - ----- Method: BlockNode>>generateAsClosure (in category 'testing') ----- - generateAsClosure - "Answer if we're compiling under the closure regime. If blockExtent has been set by - analyseTempsWithin:rootNode: et al then we're compiling under the closure regime." - ^blockExtent ~~ nil! Item was changed: ----- Method: BlockNode>>noteSourceRangeStart:end:encoder: (in category 'initialize-release') ----- noteSourceRangeStart: start end: end encoder: encoder "Note two source ranges for this node. One is for the debugger and is of the last expression, the result of the block. One is for source analysis and is for the entire block." encoder noteSourceRange: (start to: end) + forNode: self ensureClosureCreationNode. - forNode: self closureCreationNode. startOfLastStatement ifNil: [encoder noteSourceRange: (start to: end) forNode: self] ifNotNil: [encoder noteSourceRange: (startOfLastStatement to: end - 1) forNode: self]! Item was removed: - ----- Method: BlockNode>>sizeCodeForClosureValue: (in category 'code generation (closures)') ----- - sizeCodeForClosureValue: encoder - "Compute the size for the creation of the block and its code." - "If we have the closure bytecodes constructClosureCreationNode: will note - the copied values in the copiedValues inst var and answer #pushCopiedValues." - closureCreationNode := self constructClosureCreationNode: encoder. - "Remember size of body for emit time so we know the size of the jump around it." - size := self sizeCodeForEvaluatedClosureValue: encoder. - ^encoder supportsClosureOpcodes - ifTrue: - [(copiedValues inject: 0 into: [:sum :node| sum + (node sizeCodeForValue: encoder)]) - + (encoder sizePushClosureCopyNumCopiedValues: copiedValues size numArgs: arguments size jumpSize: size) - + size] - ifFalse: - ["closureCreationSupportNode is send closureCopy:copiedValues:" - (closureCreationNode sizeCodeForValue: encoder) - + (encoder sizeJumpLong: size) - + size]! Item was changed: + ----- Method: BlockNode>>sizeCodeForEvaluatedClosureValue: (in category 'code generation') ----- - ----- Method: BlockNode>>sizeCodeForEvaluatedClosureValue: (in category 'code generation (closures)') ----- sizeCodeForEvaluatedClosureValue: encoder "The closure value primitives push the arguments and the copied values. The compiler guarantees that any copied values come before all local temps. So on closure activation we only need to push nils for the remaining temporaries." ^(encoder sizePushNClosureTemps: temporaries size) + (self reindexingLocalsDo: [self sizeCodeForEvaluatedValue: encoder] encoder: nil "don't store temps yet") + (self returns ifTrue: [0] ifFalse: [encoder sizeReturnTopToCaller])! Item was changed: ----- Method: BlockNode>>sizeCodeForValue: (in category 'code generation') ----- sizeCodeForValue: encoder + "Compute the size for the creation of the block and its code." + copiedValues := self computeCopiedValues: encoder rootNode. + self ensureClosureCreationNode. + "Remember size of body for emit time so we know the size of the jump around it." + size := self sizeCodeForEvaluatedClosureValue: encoder. + ^(copiedValues inject: 0 into: [:sum :node| sum + (node sizeCodeForValue: encoder)]) + + (encoder sizePushClosureCopyNumCopiedValues: copiedValues size numArgs: arguments size jumpSize: size) + + size! - self generateAsClosure ifTrue: - [^self sizeCodeForClosureValue: encoder]. - - nArgsNode := encoder encodeLiteral: arguments size. - remoteCopyNode := encoder encodeSelector: #blockCopy:. - size := self sizeCodeForEvaluatedValue: encoder. - self returns ifFalse: - [size := size + encoder sizeReturnTopToCaller]. "endBlock" - arguments := arguments collect: "Chance to prepare debugger remote temps" - [:arg | arg asStorableNode: encoder]. - arguments do: [:arg | size := size + (arg sizeCodeForStorePop: encoder)]. - ^encoder sizePushThisContext - + (nArgsNode sizeCodeForValue: encoder) - + (remoteCopyNode sizeCode: encoder args: 1 super: false) - + (encoder sizeJumpLong: size) - + size! Item was changed: + ----- Method: BraceNode>>elements (in category 'code generation') ----- - ----- Method: BraceNode>>elements (in category 'code generation (closures)') ----- elements ^elements! Item was changed: ----- Method: BraceNode>>emitCodeForValue:encoder: (in category 'code generation') ----- emitCodeForValue: stack encoder: encoder + "Hack; when sizing we have no way of knowing how much stack space is available." + elements size <= self maxElementsForConsArray ifTrue: - - (encoder supportsClosureOpcodes - "Hack; we have no way of knowing how much stack space is available" - and: [elements size <= self maxElementsForConsArray]) ifTrue: [elements do: [:node| node emitCodeForValue: stack encoder: encoder]. encoder genPushConsArray: elements size. stack pop: elements size; push: 1. ^self]. ^emitNode emitCodeForValue: stack encoder: encoder! Item was changed: + ----- Method: BraceNode>>maxElementsForConsArray (in category 'code generation') ----- - ----- Method: BraceNode>>maxElementsForConsArray (in category 'code generation (closures)') ----- maxElementsForConsArray "Hack; we have no way of knowing how much stack space is available during sizing" ^8! Item was changed: ----- Method: BraceNode>>sizeCodeForValue: (in category 'code generation') ----- sizeCodeForValue: encoder + "Hack; we have no way of knowing how much stack space is available." + elements size <= self maxElementsForConsArray ifTrue: - (encoder supportsClosureOpcodes - "Hack; we have no way of knowing how much stack space is available" - and: [elements size <= self maxElementsForConsArray]) ifTrue: [^(elements inject: 0 into: [:sum :node| sum + (node sizeCodeForValue: encoder)]) + (encoder sizePushConsArray: elements size)]. + "Long form: (Array braceStream: N) nextPut: a; nextPut: b; ...; braceArray" + emitNode := CascadeNode new - emitNode := elements size <= 4 - ifTrue: ["Short form: Array braceWith: a with: b ... " - MessageNode new - receiver: (encoder encodeVariable: #Array) - selector: (self selectorForShortForm: elements size) - arguments: elements precedence: 3 from: encoder] - ifFalse: ["Long form: (Array braceStream: N) nextPut: a; nextPut: b; ...; braceArray" - CascadeNode new receiver: (MessageNode new receiver: (encoder encodeVariable: #Array) selector: #braceStream: + arguments: {encoder encodeLiteral: elements size} - arguments: (Array with: (encoder encodeLiteral: elements size)) precedence: 3 from: encoder) + messages: ((elements collect: [:elt | + MessageNode new + receiver: nil + selector: #nextPut: + arguments: {elt} + precedence: 3 + from: encoder]) + copyWith: (MessageNode new + receiver: nil + selector: #braceArray + arguments: #() + precedence: 1 + from: encoder)). - messages: ((elements collect: [:elt | MessageNode new receiver: nil - selector: #nextPut: - arguments: (Array with: elt) - precedence: 3 from: encoder]) - copyWith: (MessageNode new receiver: nil - selector: #braceArray - arguments: (Array new) - precedence: 1 from: encoder))]. ^emitNode sizeCodeForValue: encoder! Item was changed: ----- Method: BytecodeEncoder>>bindBlockArg:within: (in category 'temps') ----- bindBlockArg: name within: aBlockNode - "Read the comment in the superclass's method. - If we have closures we should check the argument - count against the block, not the method. - - (Note that this isn't entirely adequate either since optimized blocks - will slip through the cracks (their arguments (i.e. ifNotNil: [:expr|) - are charged against their enclosing block, not themselves))." | nArgs | - self supportsClosureOpcodes ifFalse: - [^super bindBlockArg: name within: aBlockNode]. (nArgs := aBlockNode nArgsSlot) isNil ifTrue: [aBlockNode nArgsSlot: (nArgs := 0)]. + nArgs >= 15 ifTrue: - nArgs >= 15 ifTrue: [^self notify: 'Too many arguments']. aBlockNode nArgsSlot: nArgs + 1. ^(self bindTemp: name) beBlockArg; nowHasDef; nowHasRef; yourself! Item was changed: ----- Method: BytecodeEncoder>>bindBlockTemp:within: (in category 'temps') ----- bindBlockTemp: name within: aBlockNode - "Read the comment in the superclass's bindBlockArg:within: method. - If we have closures we should check the argument - count against the block, not the method. - - (Note that this isn't entirely adequate either since optimized blocks - will slip through the cracks (their arguments (i.e. ifNotNil: [:expr|) - are charged against their enclosing block, not themselves))." | nArgs | + (nArgs := aBlockNode nArgsSlot) ifNil: - self supportsClosureOpcodes ifFalse: - [^super bindBlockTemp: name within: aBlockNode]. - (nArgs := aBlockNode nArgsSlot) isNil ifTrue: [aBlockNode nArgsSlot: (nArgs := 0)]. nArgs >= (CompiledMethod fullFrameSize - 1) ifTrue: [^self notify: 'Too many temporaries']. aBlockNode nArgsSlot: nArgs + 1. ^self bindTemp: name! Item was changed: ----- Method: BytecodeEncoder>>bindTemp: (in category 'temps') ----- bindTemp: name + "Declare a temporary; error not if a field or class variable or out-of-scope temp." - "Declare a temporary; error not if a field or class variable or out-of-scope temp. - Read the comment in Encoder>>bindBlockArg:within: and subclass implementations." - self supportsClosureOpcodes ifFalse: - [^super bindTemp: name]. scopeTable at: name ifPresent: [:node| "When non-interactive raise the error only if it is a duplicate" node isTemp ifTrue:[node scope >= 0 ifTrue: [^self notify: 'Name already used in this method']] ifFalse:[self warnAboutShadowed: name]]. ^self reallyBind: name! Item was added: + ----- Method: MethodNode>>primitive (in category 'accessing') ----- + primitive + ^primitive! Item was changed: ----- Method: RemoteTempVectorNode>>addRemoteTemp:encoder: (in category 'code generation (closures)') ----- addRemoteTemp: aTempVariableNode encoder: encoder + remoteTemps ifNil: - remoteTemps isNil ifTrue: [remoteTemps := OrderedCollection new]. remoteTemps addLast: aTempVariableNode. aTempVariableNode referenceScopesAndIndicesDo: [:scopeBlock "<BlockNode>" :location "<Integer>"| + self addReadWithin: scopeBlock at: location]! - self addReadWithin: scopeBlock at: location]. - encoder supportsClosureOpcodes ifFalse: - [encoder encodeLiteral: remoteTemps size. - readNode := encoder encodeSelector: #at:. - writeNode := encoder encodeSelector: #at:put:]! Item was removed: - ----- Method: RemoteTempVectorNode>>emitCodeForIndexOf:stack:encoder: (in category 'code generation (closures)') ----- - emitCodeForIndexOf: aTempVariableNode stack: stack encoder: encoder - self assert: encoder supportsClosureOpcodes not. - (encoder encodeLiteral: (remoteTemps indexOf: aTempVariableNode)) - emitCodeForValue: stack encoder: encoder! Item was removed: - ----- Method: RemoteTempVectorNode>>emitCodeForLoadFor:stack:encoder: (in category 'code generation (closures)') ----- - emitCodeForLoadFor: aTempVariableNode stack: stack encoder: encoder - encoder supportsClosureOpcodes ifTrue: - [^self]. - "Need to generate the first half of - tempVector at: index put: expr - i.e. the push of tempVector and index." - super emitCodeForValue: stack encoder: encoder. - self emitCodeForIndexOf: aTempVariableNode stack: stack encoder: encoder! Item was changed: + ----- Method: RemoteTempVectorNode>>emitCodeForStoreInto:stack:encoder: (in category 'code generation') ----- - ----- Method: RemoteTempVectorNode>>emitCodeForStoreInto:stack:encoder: (in category 'code generation (closures)') ----- emitCodeForStoreInto: aTempVariableNode stack: stack encoder: encoder + encoder + genStoreRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 + inVectorAt: index! - encoder supportsClosureOpcodes - ifTrue: - [encoder - genStoreRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 - inVectorAt: index] - ifFalse: - [writeNode - emitCode: stack - args: 2 - encoder: encoder - super: false]! Item was changed: + ----- Method: RemoteTempVectorNode>>emitCodeForStorePopInto:stack:encoder: (in category 'code generation') ----- - ----- Method: RemoteTempVectorNode>>emitCodeForStorePopInto:stack:encoder: (in category 'code generation (closures)') ----- emitCodeForStorePopInto: aTempVariableNode stack: stack encoder: encoder + encoder + genStorePopRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 + inVectorAt: index. - encoder supportsClosureOpcodes - ifTrue: - [encoder - genStorePopRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 - inVectorAt: index] - ifFalse: - [self emitCodeForStoreInto: aTempVariableNode stack: stack encoder: encoder. - encoder genPop]. stack pop: 1! Item was changed: + ----- Method: RemoteTempVectorNode>>emitCodeForValueOf:stack:encoder: (in category 'code generation') ----- - ----- Method: RemoteTempVectorNode>>emitCodeForValueOf:stack:encoder: (in category 'code generation (closures)') ----- emitCodeForValueOf: aTempVariableNode stack: stack encoder: encoder + encoder + genPushRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 + inVectorAt: index. + stack push: 1! - encoder supportsClosureOpcodes - ifTrue: - [encoder - genPushRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 - inVectorAt: index. - stack push: 1] - ifFalse: - [self emitCodeForLoadFor: aTempVariableNode stack: stack encoder: encoder. - readNode - emitCode: stack - args: 1 - encoder: encoder - super: false]! Item was changed: + ----- Method: RemoteTempVectorNode>>nodeToInitialize: (in category 'code generation') ----- - ----- Method: RemoteTempVectorNode>>nodeToInitialize: (in category 'code generation (closures)') ----- nodeToInitialize: encoder ^AssignmentNode new variable: self + value: (NewArrayNode new numElements: remoteTemps size)! - value: (encoder supportsClosureOpcodes - ifTrue: [NewArrayNode new numElements: remoteTemps size] - ifFalse: - [MessageNode new - receiver: (encoder encodeVariable: 'Array') - selector: #new: - arguments: (Array with: (encoder encodeLiteral: remoteTemps size)) - precedence: 3 - from: encoder])! Item was changed: + ----- Method: RemoteTempVectorNode>>scope (in category 'code generation') ----- - ----- Method: RemoteTempVectorNode>>scope (in category 'code generation (closures)') ----- scope "Answer scope of temporary variables. Currently only the following distinctions are made: 0 outer level: args and user-declared temps 1 block args and doLimiT temps -1 a block temp that is no longer active -2 a block temp that held limit of to:do: -3 an indirect temp vector" ^-3! Item was removed: - ----- Method: RemoteTempVectorNode>>sizeCodeForIndexOf:encoder: (in category 'code generation (closures)') ----- - sizeCodeForIndexOf: aTempVariableNode encoder: encoder - self assert: encoder supportsClosureOpcodes not. - ^(encoder encodeLiteral: (remoteTemps indexOf: aTempVariableNode)) sizeCodeForValue: encoder! Item was removed: - ----- Method: RemoteTempVectorNode>>sizeCodeForLoadFor:encoder: (in category 'code generation (closures)') ----- - sizeCodeForLoadFor: aTempVariableNode encoder: encoder - encoder supportsClosureOpcodes ifTrue: - [^0]. - "Need to size the first half of - tempVector at: index put: expr - i.e. the push of tempVector and index." - ^(super sizeCodeForValue: encoder) - + (self sizeCodeForIndexOf: aTempVariableNode encoder: encoder)! Item was changed: + ----- Method: RemoteTempVectorNode>>sizeCodeForStoreInto:encoder: (in category 'code generation') ----- - ----- Method: RemoteTempVectorNode>>sizeCodeForStoreInto:encoder: (in category 'code generation (closures)') ----- sizeCodeForStoreInto: aTempVariableNode encoder: encoder + ^encoder + sizeStoreRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 + inVectorAt: index! - encoder supportsClosureOpcodes ifTrue: - [^encoder sizeStoreRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 inVectorAt: index]. - ^writeNode sizeCode: encoder args: 2 super: false! Item was changed: + ----- Method: RemoteTempVectorNode>>sizeCodeForStorePopInto:encoder: (in category 'code generation') ----- - ----- Method: RemoteTempVectorNode>>sizeCodeForStorePopInto:encoder: (in category 'code generation (closures)') ----- sizeCodeForStorePopInto: aTempVariableNode encoder: encoder + ^encoder + sizeStorePopRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 + inVectorAt: index! - encoder supportsClosureOpcodes ifTrue: - [^encoder sizeStorePopRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 inVectorAt: index]. - ^(self sizeCodeForStoreInto: aTempVariableNode encoder: encoder) - + encoder sizePop! Item was changed: + ----- Method: RemoteTempVectorNode>>sizeCodeForValueOf:encoder: (in category 'code generation') ----- - ----- Method: RemoteTempVectorNode>>sizeCodeForValueOf:encoder: (in category 'code generation (closures)') ----- sizeCodeForValueOf: aTempVariableNode encoder: encoder + ^encoder + sizePushRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 + inVectorAt: index! - encoder supportsClosureOpcodes ifTrue: - [^encoder sizePushRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 inVectorAt: index]. - ^(self sizeCodeForValue: encoder) - + (self sizeCodeForIndexOf: aTempVariableNode encoder: encoder) - + (readNode sizeCode: encoder args: 1 super: false)! Item was changed: + ----- Method: SpecialLiteralNode>>emitCodeForValue:encoder: (in category 'code generation') ----- - ----- Method: SpecialLiteralNode>>emitCodeForValue:encoder: (in category 'code generation (closures)') ----- emitCodeForValue: stack encoder: encoder stack push: 1. encoder genPushSpecialLiteral: key! Item was changed: + ----- Method: SpecialLiteralNode>>sizeCodeForValue: (in category 'code generation') ----- - ----- Method: SpecialLiteralNode>>sizeCodeForValue: (in category 'code generation (closures)') ----- sizeCodeForValue: encoder ^encoder sizePushSpecialLiteral: key! Item was removed: - ----- Method: TempVariableNode>>emitCodeForLoad:forValue:encoder: (in category 'code generation') ----- - emitCodeForLoad: stack forValue: forValue encoder: encoder - remoteNode ~~ nil ifTrue: - [remoteNode emitCodeForLoadFor: self stack: stack encoder: encoder]! Item was removed: - ----- Method: TempVariableNode>>sizeCodeForLoad:forValue: (in category 'code generation') ----- - sizeCodeForLoad: encoder forValue: forValue - ^remoteNode - ifNil: [0] - ifNotNil: [remoteNode sizeCodeForLoadFor: self encoder: encoder]! Item was removed: - ----- Method: VariableNode>>emitCodeForLoad:forValue:encoder: (in category 'code generation') ----- - emitCodeForLoad: stack forValue: forValue encoder: encoder - "Do nothing"!

1 0

The Trunk: Compiler-eem.344.mcz
by commits＠source.squeak.org 06 Apr '17

06 Apr '17

Eliot Miranda uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-eem.344.mcz ==================== Summary ==================== Name: Compiler-eem.344 Author: eem Time: 5 April 2017, 6:57:34.110671 pm UUID: 012c0721-0dac-419e-ab4a-c8fc9ac95718 Ancestors: Compiler-eem.343 Add the missing acessor for MethodNode>>primitive (perhaps too late? If so, I'l redo Compiler-eem.341 to add it). Add EncoderForSistaV1. \Add decompiler & temp counter support for blockReturnConstant: =============== Diff against Compiler-eem.343 =============== Item was added: + ----- Method: BlockLocalTempCounter>>blockReturnConstant: (in category 'instruction decoding') ----- + blockReturnConstant: value + "Return Constant From Block bytecode." + scanner pc < blockEnd ifTrue: + [self doJoin]! Item was added: + ----- Method: BytecodeEncoder class>>stackDeltaForPrimitive:in: (in category 'bytecode decoding') ----- + stackDeltaForPrimitive: primitiveIndex in: method + "This is the default implementation. Subclasses with inline primitives will need to override." + ^0! Item was added: + ----- Method: BytecodeEncoder>>sizeTrapIfNotInstanceOf: (in category 'opcode sizing') ----- + sizeTrapIfNotInstanceOf: litIndex + ^self sizeOpcodeSelector: #genTrapIfNotInstanceOf: withArguments: {litIndex}! Item was added: + ----- Method: Decompiler>>blockReturnConstant: (in category 'instruction decoding') ----- + blockReturnConstant: value + + self pushConstant: value; blockReturnTop! Item was added: + BytecodeEncoder subclass: #EncoderForSistaV1 + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'Compiler-Kernel'! + + !EncoderForSistaV1 commentStamp: 'eem 8/8/2014 19:37' prior: 0! + EncoderForSistaV1 encodes a bytecode set for Sista, the Speculative Inlining Smalltalk Architecture, a project by Clément Bera and Eliot Miranda. Sista is an optimizer that exists in the Smalltalk image, /not/ in the VM, and optimizes by substituting normal bytecoded methods by optimized bytecoded methods that may use special bytecodes for which the Cogit can generate faster code. These bytecodes eliminate overheads such as bounds checks or polymorphic code (indexing Array, ByteArray, String etc). But the bulk of the optimization performed is in inlining blocks and sends for the common path. This bytecode set therefore differs from a normal Smalltalk set in providing a set of inlined primitives that do not validate their arguments that the compiler generates only when it can prove that the primitives' arguments are valid. + + The basic scheme is that the Cogit generates code containing performance counters. When these counters trip, a callback into the image is performed, at which point Sista analyses some portion of the stack, looking at performance data for the methods on the stack, and optimises based on the stack and performance data. Execution then resumes in the optimized code. + + The Sista Cogit (e.g. SistaStackToRegisterMappingCogit) adds counters to conditional branches. Each branch has an executed and a taken count. On execution the executed count is decremented and if the count goes below zero the VM sends a message at a special index in the specialObjectsArray (as of writing, conditionalCounterTrippedOn:). Then if the branch is taken the taken count is decremented. The two counter values allow the Sista optimizer to collect basic block execution paths and to know what are the "hot" paths through execution that are worth agressively optimizing. Since conditional branches are about 1/6 as frequent as sends, and since they can be used to determine the hot path through code, they are a better choice to count than, for example, method or block entry. + + The VM provides a primitive that fills an Array with the state of the counters, and the state of each linked send in a method. Tthe optimizer obtains the branch and send data for a method via this primitive. + + + This bytecde set encodes a bytecode set for Smalltalk that lifts limits on the number of literals and branch distances, and extended push integer and push character bytecodes. Bytecodes are ordered by length to make decoding easier. Bytecodes marked with an * are extensible via a prefix bytecode. + + N.B. Extension bytecodes can only come before extensible bytecodes, and only if valid (one cannot extend a bytecode extensible by Ext A with an Ext B). An extensible bytecode consumes (and zeros) its extension(s). Hence the hidden implicit variables holding extensions are always zero except after a valid sequence of extension bytecodes. + + Instance Variables (inherited) + + 1 Byte Bytecodes + 0-15 0000 iiii Push Receiver Variable #iiii + 16-31 0001 iiii Push Literal Variable #iiii + 32-63 001 iiiii Push Literal #iiiii + 64-71 01000 iii Push Temp #iii + 72-75 010010 ii Push Temp #ii + 8 + 76 01001100 Push Receiver + 77 01001101 Push true + 78 01001110 Push false + 79 01001111 Push nil + 80 01010000 Push 0 + 81 01010001 Push 1 + * 82 01010010 Push thisContext, (then Extend B = 1 => push thisProcess) + 83 01010011 Duplicate Stack Top + 84-87 010101 ii UNASSIGNED + 88-91 010110 ii Return Receiver/true/false/nil + 92 01011100 Return top + 93 01011101 BlockReturn nil + * 94 01011110 BlockReturn Top [* return from enclosing block N, N = Extend A, then jump by Ext B ] + * 95 01011111 Nop + 96-111 0110 iiii Send Arithmetic Message #iiii #(#+ #- #< #> #'<=' #'>=' #= #'~=' #* #/ #'\\' #@ #bitShift: #'//' #bitAnd: #bitOr:) + 112-119 01110 iii Send Special Message #iii #(#at: #at:put: #size #next #nextPut: #atEnd #'==' class) + 120 01111000 UNASSIGNED (was: blockCopy:) + 121 01111001 Send Special Message #value + 122-123 0111101 i Send Special Message #i #(#value: #do:) + 124-127 011111 ii Send Special Message #ii #(#new #new: #x #y)) + 128-143 1000 iiii Send Literal Selector #iiii With 0 Argument + 144-159 1001 iiii Send Literal Selector #iiii With 1 Arguments + 160-175 1010 iiii Send Literal Selector #iiii With 2 Arguments + 176-183 10110 iii Jump iii + 1 (i.e., 1 through 8) + 184-191 10111 iii Pop and Jump 0n True iii +1 (i.e., 1 through 8) + 192-199 11000 iii Pop and Jump 0n False iii +1 (i.e., 1 through 8) + 200-207 11001 iii Pop and Store Receiver Variable #iii + 208-215 11010 iii Pop and Store Temporary Variable #iii + 216 11011000 Pop Stack Top + 217 11011001 UNASSIGNED + 218-219 1101101 i UNASSIGNED + 220-223 110111 ii UNASSIGNED + + 2 Byte Bytecodes + * 224 11100000 aaaaaaaa Extend A (Ext A = Ext A prev * 256 + Ext A) + * 225 11100001 bbbbbbbb Extend B (Ext B = Ext B prev * 256 + Ext B) + * 226 11100010 iiiiiiii Push Receiver Variable #iiiiiiii (+ Extend A * 256) + * 227 11100011 iiiiiiii Push Literal Variable #iiiiiiii (+ Extend A * 256) + * 228 11100100 iiiiiiii Push Literal #iiiiiiii (+ Extend A * 256) + 229 11100101 iiiiiiii Push Temporary Variable #iiiiiiii + 230 11100110 iiiiiiii PushNClosureTemps iiiiiiii + 231 11100111 jkkkkkkk Push (Array new: kkkkkkk) (j = 0) + & Pop kkkkkkk elements into: (Array new: kkkkkkk) (j = 1) + * 232 11101000 iiiiiiii Push Integer #iiiiiiii (+ Extend B * 256, where bbbbbbbb = sddddddd, e.g. -32768 = i=0, a=0, s=1) + * 233 11101001 iiiiiiii Push Character #iiiiiiii (+ Extend B * 256) + ** 234 11101010 iiiiijjj Send Literal Selector #iiiii (+ Extend A * 32) with jjj (+ Extend B * 8) Arguments + ** 235 11101011 iiiiijjj Send To Superclass Literal Selector #iiiii (+ Extend A * 32) with jjj (+ Extend B * 8) Arguments + * 236 11101100 iiiiiiii Trap If Not Instance Of Behavior/Array Of Behavior #iiiiiiii (+ Extend A * 256, where Extend A >= 0) + * 237 11101101 iiiiiiii Jump #iiiiiiii (+ Extend B * 256, where bbbbbbbb = sddddddd, e.g. -32768 = i=0, a=0, s=1) + * 238 11101110 iiiiiiii Pop and Jump 0n True #iiiiiiii (+ Extend B * 256, where Extend B >= 0) + * 239 11101111 iiiiiiii Pop and Jump 0n False #iiiiiiii (+ Extend B * 256, where Extend B >= 0) + * 240 11110000 iiiiiiii Pop and Store Receiver Variable #iiiiiii (+ Extend A * 256) + * 241 11110001 iiiiiiii Pop and Store Literal Variable #iiiiiiii (+ Extend A * 256) + 242 11110010 iiiiiiii Pop and Store Temporary Variable #iiiiiiii + * 243 11110011 iiiiiiii Store Receiver Variable #iiiiiii (+ Extend A * 256) + * 244 11110100 iiiiiiii Store Literal Variable #iiiiiiii (+ Extend A * 256) + 245 11110110 iiiiiiii Store Temporary Variable #iiiiiiii + 246-247 1111011 i xxxxxxxx UNASSIGNED + + 3 Byte Bytecodes + 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. + 249 11111001 xxxxxxxx syyyyyyy Reserved for Push Float + ** 250 11111010 eeiiikkk jjjjjjjj Push Closure Num Copied iii (+ExtA//16*8) Num Args kkk (+ ExtA\\16*8) BlockSize jjjjjjjj (+ExtB*256). ee = num extensions + 251 11111011 kkkkkkkk jjjjjjjj Push Temp At kkkkkkkk In Temp Vector At: jjjjjjjj + 252 11111100 kkkkkkkk jjjjjjjj Store Temp At kkkkkkkk In Temp Vector At: jjjjjjjj + 253 11111101 kkkkkkkk jjjjjjjj Pop and Store Temp At kkkkkkkk In Temp Vector At: jjjjjjjj + 254-255 1111111i xxxxxxxx yyyyyyyy UNASSIGNED + + The Call Primitive Bytecode specifies either a primitive in the primitive table (m=0) or an inlined primitive (m=1). Non-inlined primtiives from the primitive table have index (jjjjjjj * 256) + iiiiiiii and return from the method if they succeed. This bytecode is only valid as the first bytecode of a method. Inline primitives have index (jjjjjjj * 256) + iiiiiiii, cannot fail, and do not return when they succeed, yielding a result (typically on top of stack after popping their arguments, but possibly in a byte data stack, for example for unboxed floating-point primitives). + + We define the following inlined primitives: + 00 unchecked class + 01 unchecked pointer numSlots + 02 unchecked pointer basicSize + 03 unchecked byte8Type format numBytes (includes CompiledMethod) + 04 unchecked short16Type format numShorts + 05 unchecked word32Type format numWords + 06 unchecked doubleWord64Type format numDoubleWords + + 1000 unchecked SmallInteger #+. Both arguments are SmallIntegers and the result fits in a SmallInteger (* depends on word size) + 1001 unchecked SmallInteger #-. Both arguments are SmallIntegers and the result fits in a SmallInteger (* depends on word size) + 1002 unchecked SmallInteger #*. Both arguments are SmallIntegers and the result fits in a SmallInteger (* depends on word size) + 1003 unchecked SmallInteger #/. Both arguments are SmallIntegers and the result fits in a SmallInteger (* depends on word size) + 1004 unchecked SmallInteger #//. Both arguments are SmallIntegers and the result fits in a SmallInteger (* depends on word size) + 1005 unchecked SmallInteger #\\. Both arguments are SmallIntegers and the result fits in a SmallInteger (* depends on word size) + 1006 unchecked SmallInteger #quo:. Both arguments are SmallIntegers and the result fits in a SmallInteger (* depends on word size) + + 1016 unchecked SmallInteger #bitAnd:. Both arguments are SmallIntegers and the result fits in a SmallInteger (* depends on word size) + 1017 unchecked SmallInteger #bitOr:. Both arguments are SmallIntegers and the result fits in a SmallInteger (* depends on word size) + 1018 unchecked SmallInteger #bitXor:. Both arguments are SmallIntegers and the result fits in a SmallInteger (* depends on word size) + 1019 unchecked SmallInteger #bitShift:. Both arguments are SmallIntegers and the result fits in a SmallInteger (* depends on word size) + + 1032 unchecked SmallInteger #>. Both arguments are SmallIntegers + 1033 unchecked SmallInteger #<. Both arguments are SmallIntegers + 1034 unchecked SmallInteger #>=. Both arguments are SmallIntegers + 1035 unchecked SmallInteger #<=. Both arguments are SmallIntegers + 1036 unchecked SmallInteger #=. Both arguments are SmallIntegers + 1037 unchecked SmallInteger #~=. Both arguments are SmallIntegers + + 1064 unchecked Pointer Object>>at:. The receiver is guaranteed to be a pointer object. The 0-relative (1-relative?) index is an in-range SmallInteger + 1065 unchecked Byte Object>>at:. The receiver is guaranteed to be a non-pointer object. The 0-relative (1-relative?) index is an in-range SmallInteger. The result is a SmallInteger. + 1066 unchecked Word Object>>at:. The receiver is guaranteed to be a non-pointer object. The 0-relative (1-relative?) index is an in-range SmallInteger. The result is a SmallInteger. + 1067 unchecked DoubleWord Object>>at:. The receiver is guaranteed to be a non-pointer object. The 0-relative (1-relative?) index is an in-range SmallInteger. The result is a SmallInteger or a LargePositiveInteger. + 1068 unchecked QuadWord Object>>at:. The receiver is guaranteed to be a non-pointer object. The 0-relative (1-relative?) index is an in-range SmallInteger. The result is a SmallInteger or a LargePositiveInteger. + + 2000 unchecked Pointer Object>>at:put:. The receiver is guaranteed to be a pointer object. The 0-relative (1-relative?) index is an in-range SmallInteger + 2001 unchecked Byte Object>>at:put:. The receiver is guaranteed to be a non-pointer object. The 0-relative (1-relative?) index is an in-range SmallInteger. The argument is a SmallInteger. The primitive stores the least significant 8 bits. + 2002 unchecked Word Object>>at:put:. The receiver is guaranteed to be a non-pointer object. The 0-relative (1-relative?) index is an in-range SmallInteger. The argument is a SmallInteger. The primitive stores the least significant 16 bits. + 2003 unchecked DoubleWord Object>>at:put:. The receiver is guaranteed to be a non-pointer object. The 0-relative (1-relative?) index is an in-range SmallInteger. The argument is a SmallInteger. The primitive stores the least significant 32 bits. + 2004 unchecked QuadWord Object>>at:put:. The receiver is guaranteed to be a non-pointer object. The 0-relative (1-relative?) index is an in-range SmallInteger. The argument is a SmallInteger. The primitive stores the least significant 64 bits.! Item was added: + ----- Method: EncoderForSistaV1 class>>bindingReadScanBlockFor:using: (in category 'compiled method support') ----- + bindingReadScanBlockFor: litVarIndex using: scanner + "Answer a block argument for InstructionStream>>scanFor: that answers true + for reads of the value of the binding with zero-relative index litVarIndex. + N.B. Don't assume the compiler uses the most compact encoding available." + + " 16-31 0001 i i i i Push Literal Variable #iiii + * 224 11100000 aaaaaaaa Extend A (Ext A = Ext A prev * 256 + Ext A) + * 227 11100011 i i i i i i i i Push Literal Variable #iiiiiiii (+ Extend A * 256)" + | extension | + extension := 0. + ^[:b| | prevext | + prevext := extension. + extension := b = 224 ifTrue: [scanner followingByte bitShift: 8] ifFalse: [0]. + (b < 32 and: [b >= 16 and: [b - 16 = litVarIndex]]) + or: [b = 227 + and: [scanner followingByte + prevext = litVarIndex]]]! Item was added: + ----- Method: EncoderForSistaV1 class>>bindingWriteScanBlockFor:using: (in category 'compiled method support') ----- + bindingWriteScanBlockFor: litVarIndex using: scanner + "Answer a block argument for InstructionStream>>scanFor: that answers true + for writes of the value of the binding with zero-relative index litVarIndex. + N.B. Don't assume the compiler uses the most compact encoding available." + + "* 224 11100000 aaaaaaaa Extend A (Ext A = Ext A prev * 256 + Ext A) + * 241 11110001 iiiiiiii Pop and Store Literal Variable #iiiiiiii (+ Extend A * 256) + * 244 11110100 iiiiiiii Store Literal Variable #iiiiiiii (+ Extend A * 256)" + | extension | + extension := 0. + ^[:b| | prevext | + prevext := extension. + extension := b = 224 ifTrue: [scanner followingByte bitShift: 8] ifFalse: [0]. + (b = 241 or: [b = 244]) + and: [scanner followingByte + prevext = litVarIndex]]! Item was added: + ----- Method: EncoderForSistaV1 class>>bytecodeSize: (in category 'instruction stream support') ----- + bytecodeSize: bytecode + "Answer the number of bytes in the bytecode." + bytecode < 224 ifTrue: [^1]. + bytecode < 248 ifTrue: [^2]. + ^3! Item was added: + ----- Method: EncoderForSistaV1 class>>callPrimitiveCode (in category 'bytecode decoding') ----- + callPrimitiveCode + "Answer the call primitive bytecode, if it exists in the encoder's bytecode set, or nil if not. + 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution." + ^248! Item was added: + ----- Method: EncoderForSistaV1 class>>createClosureScanBlock (in category 'compiled method support') ----- + createClosureScanBlock + "Answer a block argument for InstructionStream>>scanFor: that answers true + for block closure creation bytecodes. ote that with this interface we can't answer + true for the extension in front of a push closure bytecode and so the interface may + have to change at some point." + + "* 224 11100000 aaaaaaaa Extend A (Ext A = Ext A prev * 256 + Ext A) + * 225 11100001 bbbbbbbb Extend B (Ext B = Ext B prev * 256 + Ext B) + ** 250 11111010 eeiiikkk jjjjjjjj Push Closure Num Copied iii (+ExtA//16*8) Num Args kkk (+ ExtA\\16*8) BlockSize jjjjjjjj (+ExtB*256). ee = num extensions" + ^[:b| b = 250]! Item was added: + ----- Method: EncoderForSistaV1 class>>extensionsAt:in:into: (in category 'compiled method support') ----- + extensionsAt: bcpc in: method into: aTrinaryBlock + "If the bytecode at pc is an extension then evaluate aBinaryBlock with the values of extA and extB and number of extension *bytes*. + If the bytecode at pc is not extended then evaluate aBinaryBlock with 0 and 0. + 224 11100000 aaaaaaaa Extend A (Ext A = Ext A prev * 256 + Ext A) + 225 11100001 bbbbbbbb Extend B (Ext B = Ext B prev * 256 + Ext B)" + + | scanpc byte extByte extA extB | + scanpc := bcpc. + "There may be an extension (it could be a false positive). We must scan as fast as possible..." + extA := extB := 0. + [byte := method at: scanpc. + byte >= 224 and: [byte <= 225]] whileTrue: + [extByte := method at: scanpc + 1. + scanpc := scanpc + 2. + byte = 224 + ifTrue: + [extA := (extA bitShift: 8) + extByte] + ifFalse: + [extB := (extB = 0 and: [extByte > 127]) + ifTrue: [extByte - 256] + ifFalse: [(extB bitShift: 8) + extByte]]]. + ^aTrinaryBlock value: extA value: extB value: scanpc - bcpc + + + "Why use + byte >= 224 and: [byte <= 225] + and not + (byte bitAnd: 16rFE) = 16rE0 + ? + | n | + n := 100000000. + #(0 224) collect: + [:byte| + { Time millisecondsToRun: [1 to: n do: [:i| (byte >= 224 and: [byte <= 225]) ifTrue: []]]. + Time millisecondsToRun: [1 to: n do: [:i| (byte bitAnd: 16rFE) = 16rE0 ifTrue: []]] }] #(#(297 599) #(702 671))"! Item was added: + ----- Method: EncoderForSistaV1 class>>instVarReadScanBlockFor:using: (in category 'compiled method support') ----- + instVarReadScanBlockFor: varIndexCode using: scanner + "Answer a block argument for InstructionStream>>scanFor: that answers true + for reads of the inst var with zero-relative index varIndexCode. + N.B. Don't assume the compiler uses the most compact encoding available." + + " 0-15 0000 i i i i Push Receiver Variable #iiii + * 224 11100000 aaaaaaaa Extend A (Ext A = Ext A prev * 256 + Ext A) + * 226 11100010 i i i i i i i i Push Receiver Variable #iiiiiiii (+ Extend A * 256)" + | extension | + extension := 0. + ^[:b| | prevext | + prevext := extension. + extension := b = 224 ifTrue: [scanner followingByte bitShift: 8] ifFalse: [0]. + (b < 16 and: [b = varIndexCode]) + or: [b = 226 + and: [scanner followingByte + prevext = varIndexCode]]]! Item was added: + ----- Method: EncoderForSistaV1 class>>instVarWriteScanBlockFor:using: (in category 'compiled method support') ----- + instVarWriteScanBlockFor: varIndexCode using: scanner + "Answer a block argument for InstructionStream>>scanFor: that answers true + for writes of the inst var with zero-relative index varIndexCode. + N.B. Don't assume the compiler uses the most compact encoding available." + + " 200-207 11001 iii Pop and Store Receiver Variable #iii + * 224 11100000 aaaaaaaa Extend A (Ext A = Ext A prev * 256 + Ext A) + * 240 11110000 iiiiiiii Pop and Store Receiver Variable #iiiiiii (+ Extend A * 256) + * 243 11110011 iiiiiiii Store Receiver Variable #iiiiiii (+ Extend A * 256)" + | extension | + extension := 0. + ^[:b| | prevext | + prevext := extension. + extension := b = 224 ifTrue: [scanner followingByte bitShift: 8] ifFalse: [0]. + (b >= 200 + and: [b < 208 + and: [b - 200 = varIndexCode]]) + or: [(b = 240 or: [b = 243]) + and: [scanner followingByte + prevext = varIndexCode]]]! Item was added: + ----- Method: EncoderForSistaV1 class>>interpretJumpIfCondIn: (in category 'compiled method support') ----- + interpretJumpIfCondIn: anInstructionStream + "Double-dispatch through the encoder to select the correct conditional jump decoder for the instruction set." + ^anInstructionStream interpretSistaV1JumpIfCond! Item was added: + ----- Method: EncoderForSistaV1 class>>interpretJumpIn: (in category 'compiled method support') ----- + interpretJumpIn: anInstructionStream + "Double-dispatch through the encoder to select the correct unconditional jump decoder for the instruction set." + ^anInstructionStream interpretSistaV1Jump! Item was added: + ----- Method: EncoderForSistaV1 class>>interpretNextInstructionFor:in: (in category 'instruction stream support') ----- + interpretNextInstructionFor: aClient in: anInstructionStream + "Double-dispatch through the encoder to select the correct instruction set decoder." + ^anInstructionStream interpretNextSistaV1InstructionFor: aClient! Item was added: + ----- Method: EncoderForSistaV1 class>>isBlockReturnAt:in: (in category 'instruction stream support') ----- + isBlockReturnAt: pc in: method + "Answer whether the bytecode at pc is a return from block." + " 93 01011101 BlockReturn nil + * 94 01011110 BlockReturn Top [* return from enclosing block N, N = Extend A, then jump by Ext B ]" + ^(self nonExtensionBytecodeAt: pc in: method) between: 93 and: 94! Item was added: + ----- Method: EncoderForSistaV1 class>>isBranchIfFalseAt:in: (in category 'instruction stream support') ----- + isBranchIfFalseAt: pc in: method + "Answer whether the bytecode at pc is a conditional branch-if-false." + + " 192-199 11000 iii Pop and Jump 0n False iii +1 (i.e., 1 through 8) + * 239 11101111 iiiiiiii Pop and Jump 0n False #iiiiiiii (+ Extend B * 256, where Extend B >= 0)" + | byte | + byte := self nonExtensionBytecodeAt: pc in: method. + ^byte >= 192 and: [byte <= 199 or: [byte = 239]]! Item was added: + ----- Method: EncoderForSistaV1 class>>isBranchIfTrueAt:in: (in category 'instruction stream support') ----- + isBranchIfTrueAt: pc in: method + "Answer whether the bytecode at pc is a conditional branch-if-true." + + " 184-191 10111 iii Pop and Jump 0n True iii +1 (i.e., 1 through 8) + * 238 11101110 iiiiiiii Pop and Jump 0n True #iiiiiiii (+ Extend B * 256, where Extend B >= 0))" + | byte | + byte := self nonExtensionBytecodeAt: pc in: method. + ^byte >= 184 and: [byte <= 191 or: [byte = 238]]! Item was added: + ----- Method: EncoderForSistaV1 class>>isExtension: (in category 'instruction stream support') ----- + isExtension: bytecode + "Answer if the bytecode is an extension bytecode, i.e. one that extends + the range of the following bytecode." + ^bytecode >= 16rE0 and: [bytecode <= 16rE1]! Item was added: + ----- Method: EncoderForSistaV1 class>>isJumpAt:in: (in category 'instruction stream support') ----- + isJumpAt: pc in: method + "Answer whether the bytecode at pc is an (unconditional) jump." + + " 176-183 10110 iii Jump iii + 1 (i.e., 1 through 8) + * 225 11100001 bbbbbbbb Extend B (Ext B = Ext B prev * 256 + Ext B) + * 237 11101101 iiiiiiii Jump #iiiiiiii (+ Extend B * 256, where bbbbbbbb = sddddddd, e.g. -32768 = i=0, a=0, s=1)" + | byte | + byte := self nonExtensionBytecodeAt: pc in: method. + ^byte >= 176 and: [byte <= 183 or: [byte = 237]]! Item was added: + ----- Method: EncoderForSistaV1 class>>isJustPopAt:in: (in category 'instruction stream support') ----- + isJustPopAt: pc in: method + "Answer whether the bytecode at pc is a pop." + + ^(method at: pc) = 216 "216 11011000 Pop Stack Top"! Item was added: + ----- Method: EncoderForSistaV1 class>>isRealSendAt:in: (in category 'instruction stream support') ----- + isRealSendAt: pc in: method + "Answer whether the bytecode at pc is a real message-send, not blockCopy:." + + ^self isSendAt: pc in: method! Item was added: + ----- Method: EncoderForSistaV1 class>>isReturnAt:in: (in category 'instruction stream support') ----- + isReturnAt: pc in: method + "Answer whether the bytecode at pc is a return from block." + " 88-91 010110 ii Return Receiver/true/false/nil + 92 01011100 Return top + 93 01011101 BlockReturn nil + * 94 01011110 BlockReturn Top [* return from enclosing block N, N = Extend A, then jump by Ext B ]" + ^(self nonExtensionBytecodeAt: pc in: method) between: 88 and: 94! Item was added: + ----- Method: EncoderForSistaV1 class>>isSendAt:in: (in category 'instruction stream support') ----- + isSendAt: pc in: method + "Answer whether the bytecode at pc is a message-send." + + " 96-111 0110 iiii Send Arithmetic Message #iiii #(#+ #- #< #> #'<=' #'>=' #= #'~=' #* #/ #'\\' #@ #bitShift: #'//' #bitAnd: #bitOr:) + 112-119 01110 iii Send Special Message #iii #(#at: #at:put: #size #next #nextPut: #atEnd #'==' class) + 120 01111000 UNASSIGNED (was: blockCopy:) + 121 01111001 Send Special Message #value + 122-123 0111101 i Send Special Message #i #(#value: #do:) + 124-127 011111 ii Send Special Message #ii #(#new #new: #x #y)) + 128-143 1000 iiii Send Literal Selector #iiii With 0 Argument + 144-159 1001 iiii Send Literal Selector #iiii With 1 Arguments + 160-175 1010 iiii Send Literal Selector #iiii With 2 Arguments + ** 234 11101010 iiiiijjj Send Literal Selector #iiiii (+ Extend A * 32) with jjj (+ Extend B * 8) Arguments + ** 235 11101011 iiiiijjj Send To Superclass Literal Selector #iiiii (+ Extend A * 32) with jjj (+ Extend B * 8) Arguments" + + | byte | + byte := self nonExtensionBytecodeAt: pc in: method. + ^byte >= 96 + and: [byte <= 175 + or: [byte >= 234 and: [byte <= 235]]]! Item was added: + ----- Method: EncoderForSistaV1 class>>isStoreAt:in: (in category 'instruction stream support') ----- + isStoreAt: pc in: method + "Answer whether the bytecode at pc is a store or store-pop." + + " 200-207 11001 iii Pop and Store Receiver Variable #iii + 208-215 11010 iii Pop and Store Temporary Variable #iii + * 224 11100000 aaaaaaaa Extend A (Ext A = Ext A prev * 256 + Ext A) + * 240 11110000 iiiiiiii Pop and Store Receiver Variable #iiiiiii (+ Extend A * 256) + * 241 11110001 iiiiiiii Pop and Store Literal Variable #iiiiiiii (+ Extend A * 256) + 242 11110010 iiiiiiii Pop and Store Temporary Variable #iiiiiiii + * 243 11110011 iiiiiiii Store Receiver Variable #iiiiiii (+ Extend A * 256) + * 244 11110100 iiiiiiii Store Literal Variable #iiiiiiii (+ Extend A * 256) + 245 11110110 iiiiiiii Store Temporary Variable #iiiiiiii + + 252 11111100 kkkkkkkk jjjjjjjj Store Temp At kkkkkkkk In Temp Vector At: jjjjjjjj + 253 11111101 kkkkkkkk jjjjjjjj Pop and Store Temp At kkkkkkkk In Temp Vector At: jjjjjjjj" + + | byte | + byte := self nonExtensionBytecodeAt: pc in: method. + ^byte >= 200 + and: [byte <= 215 + or: [(byte between: 240 and: 245) + or: [(byte between: 252 and: 253)]]]! Item was added: + ----- Method: EncoderForSistaV1 class>>isStorePopAt:in: (in category 'instruction stream support') ----- + isStorePopAt: pc in: method + "Answer whether the bytecode at pc is a store or store-pop." + + " 200-207 11001 iii Pop and Store Receiver Variable #iii + 208-215 11010 iii Pop and Store Temporary Variable #iii + * 224 11100000 aaaaaaaa Extend A (Ext A = Ext A prev * 256 + Ext A) + * 240 11110000 iiiiiiii Pop and Store Receiver Variable #iiiiiii (+ Extend A * 256) + * 241 11110001 iiiiiiii Pop and Store Literal Variable #iiiiiiii (+ Extend A * 256) + 242 11110010 iiiiiiii Pop and Store Temporary Variable #iiiiiiii + + 253 11111101 kkkkkkkk jjjjjjjj Pop and Store Temp At kkkkkkkk In Temp Vector At: jjjjjjjj" + + | byte | + byte := self nonExtensionBytecodeAt: pc in: method. + ^byte >= 200 + and: [byte <= 215 + or: [(byte between: 240 and: 242) + or: [byte = 253]]]! Item was added: + ----- Method: EncoderForSistaV1 class>>method:refersInBytecodeToLiteral:specialSelectorIndex: (in category 'scanning') ----- + method: method refersInBytecodeToLiteral: aLiteral specialSelectorIndex: specialOrNil + "Answer if method refers to the literal aLiteral in the bytecode, as opposed to in its literal frame." + + " 77 01001101 Push true + 78 01001110 Push false + 79 01001111 Push nil + 80 01010000 Push 0 + 81 01010001 Push 1 + 88-91 010110 ii Return Receiver/true/false/nil + 93 01011101 BlockReturn nil + 96-111 0110 iiii Send Arithmetic Message #iiii #(#+ #- #< #> #'<=' #'>=' #= #'~=' #* #/ #'\\' #@ #bitShift: #'//' #bitAnd: #bitOr:) + 112-119 01110 iii Send Special Message #iii #(#at: #at:put: #size #next #nextPut: #atEnd #'==' class) + 120 01111000 UNASSIGNED (was: blockCopy:) + 121 01111001 Send Special Message #value + 122-123 0111101 i Send Special Message #i #(#value: #do:) + 124-127 011111 ii Send Special Message #ii #(#new #new: #x #y)) + * 224 11100000 aaaaaaaa Extend A (Ext A = Ext A prev * 256 + Ext A) + * 225 11100001 sbbbbbbb Extend B (Ext B = Ext B prev * 256 + Ext B) + * 232 11101000 iiiiiiii Push Integer #iiiiiiii (+ Extend B * 256, where bbbbbbbb = sddddddd, e.g. -32768 = i=0, a=0, s=1) + * 233 11101001 iiiiiiii Push Character #iiiiiiii (+ Extend B * 256) + 249 11111001 xxxxxxxx syyyyyyy Reserved for Push Float" + | byte extended scanner | + specialOrNil ifNotNil: + [byte := specialOrNil + 95. + ^(InstructionStream on: method) scanFor: [:b| b = byte]]. + extended := false. + aLiteral isInteger ifTrue: + [(aLiteral >= -32768 and: [aLiteral <= 32767]) ifFalse: [^false]. + scanner := InstructionStream on: method. + (aLiteral >= 0 and: [aLiteral <= 255]) ifTrue: + [aLiteral <= 1 ifTrue: + [byte := aLiteral + 80. + ^scanner scanFor: [:b| b = byte]]. + ^scanner scanFor: + [:b| + (b = 232 + and: [extended not + and: [scanner followingByte = aLiteral]]) + or: [extended := b = 225. + false]]]. + byte := (aLiteral bitShift: -8) bitAnd: 255. + ^scanner scanFor: + [:b| + (b = 232 + and: [extended + and: [scanner followingByte = (aLiteral bitAnd: 255)]]) + or: [extended := b = 225 and: [scanner followingByte = byte]. + false]]]. + aLiteral isCharacter ifTrue: + [aLiteral asciiValue <= 65535 ifFalse: [^false]. + scanner := InstructionStream on: method. + aLiteral asciiValue <= 255 ifTrue: + [^scanner scanFor: + [:b| + (b = 233 + and: [extended not + and: [scanner followingByte = aLiteral]]) + or: [extended := b = 225. + false]]]. + byte := (aLiteral bitShift: -8) bitAnd: 255. + ^scanner scanFor: + [:b| + (b = 233 + and: [extended + and: [scanner followingByte = (aLiteral bitAnd: 255)]]) + or: [extended := b = 225 and: [scanner followingByte = byte]. + false]]]. + aLiteral == nil ifTrue: + [^(InstructionStream on: method) scanFor: [:b| b = 79 or: [b = 91 or: b = 93]]]. + aLiteral == true ifTrue: + [^(InstructionStream on: method) scanFor: [:b| b = 77 or: [b = 89]]]. + aLiteral == false ifTrue: + [^(InstructionStream on: method) scanFor: [:b| b = 78 or: [b = 90]]]. + + ^false! Item was added: + ----- Method: EncoderForSistaV1 class>>nonExtensionBytecodeAt:in: (in category 'instruction stream support') ----- + nonExtensionBytecodeAt: pc in: method + "Answer the actual bytecode at pc in method, skipping past any preceeding extensions." + | thePC bytecode | + thePC := pc. + [self isExtension: (bytecode := method at: thePC)] whileTrue: + [thePC := thePC + (self bytecodeSize: bytecode)]. + ^bytecode! Item was added: + ----- Method: EncoderForSistaV1 class>>pcOfBlockCreationBytecodeForBlockStartingAt:in: (in category 'bytecode decoding') ----- + pcOfBlockCreationBytecodeForBlockStartingAt: startpc in: method + "Answer the pc of the push closure bytecode whose block starts at startpc in method. + May need to back up to include extension bytecodes." + + "* 224 11100000 aaaaaaaa Extend A (Ext A = Ext A prev * 256 + Ext A) + * 225 11100001 bbbbbbbb Extend B (Ext B = Ext B prev * 256 + Ext B) + ** 250 11111010 eeiiikkk jjjjjjjj Push Closure Num Copied iii (+ExtA//16*8) Num Args kkk (+ ExtA\\16*8) BlockSize jjjjjjjj (+ExtB*256). ee = num extensions" + | numExtensions | + self assert: (method at: startpc - 3) = 250. + numExtensions := (method at: startpc - 2) >> 6. + ^startpc - 3 - (numExtensions * 2)! Item was added: + ----- Method: EncoderForSistaV1 class>>pushClosureBytecodeSize (in category 'bytecode decoding') ----- + pushClosureBytecodeSize + "Answer the size of the push closure bytecode. + ** 250 11111010 eeiiikkk jjjjjjjj Push Closure Num Copied iii (+ExtA//16*8) Num Args kkk (+ ExtA\\16*8) BlockSize jjjjjjjj (+ExtB*256). ee = num extensions" + ^3! Item was added: + ----- Method: EncoderForSistaV1 class>>stackDeltaForPrimitive:in: (in category 'bytecode decoding') ----- + stackDeltaForPrimitive: primitiveIndex in: method + "Answer the stack delta for the callPrimitive: bytecode (see my class comment). + There is no delta for non-inlined primitives (its implicitly 0 - method numArgs). + Inlined primitives are grouped by the thousand by argument count, 32 args max ;-)." + ^primitiveIndex < 32678 + ifTrue: [0] + ifFalse: [primitiveIndex - 32768 // 1000]! Item was added: + ----- Method: EncoderForSistaV1 class>>superSendScanBlockUsing: (in category 'instruction stream support') ----- + superSendScanBlockUsing: scanner + "Answer a block argument for InstructionStream>>scanFor: + that answers true for super sends." + + "* 224 11100000 aaaaaaaa Extend A (Ext A = Ext A prev * 256 + Ext A) + * 225 11100001 sbbbbbbb Extend B (Ext B = Ext B prev * 256 + Ext B) + ** 235 11101011 iiiiijjj Send To Superclass Literal Selector #iiiii (+ Extend A * 32) with jjj (+ Extend B * 8) Arguments" + + ^[:instr | instr = 235]! Item was added: + ----- Method: EncoderForSistaV1 class>>supportsClosures (in category 'compiled method support') ----- + supportsClosures + "Answer if the instruction set supports closures (contains + closure creation and indirect temp access bytecodes)." + + ^true! Item was added: + ----- Method: EncoderForSistaV1 class>>unusedBytecode (in category 'bytecode decoding') ----- + unusedBytecode + "Answer the opcode of a single-byte unused bytecode, if it exists in the encoder's bytecode set, or nil if not." + ^223! Item was added: + ----- Method: EncoderForSistaV1>>computeMethodHeaderForNumArgs:numTemps:numLits:primitive: (in category 'method encoding') ----- + computeMethodHeaderForNumArgs: numArgs numTemps: numTemps numLits: numLits primitive: primitiveIndex + numTemps > 63 ifTrue: + [^self error: 'Cannot compile -- too many temporary variables']. + numLits > 65535 ifTrue: + [^self error: 'Cannot compile -- too many literals']. + ^SmallInteger minVal "sign bit is the flag for the alternative bytecode set" + + (numArgs bitShift: 24) + + (numTemps bitShift: 18) + "+ (largeBit bitShift: 17)" "largeBit gets filled in later" + + numLits + + (primitiveIndex > 0 ifTrue: [1 bitShift: 16] ifFalse: [0])! Item was added: + ----- Method: EncoderForSistaV1>>genBranchPopFalse: (in category 'bytecode generation') ----- + genBranchPopFalse: distance + (distance > 0 and: [distance < 9]) ifTrue: + ["192-199 11000 iii Pop and Jump 0n False iii + 1 (i.e., 1 through 8)" + stream nextPut: 191 + distance. + ^self]. + ^self genBranchPopFalseLong: distance! Item was added: + ----- Method: EncoderForSistaV1>>genBranchPopFalseLong: (in category 'bytecode generation') ----- + genBranchPopFalseLong: distance + "239 11101111 iiiiiiii Pop and Jump 0n False #iiiiiiii (+ Extend B * 256, where Extend B >= 0) " + | distanceMod256 | + (distance < 0 or: [distance > 32767]) ifTrue: + [^self outOfRangeError: 'distance' index: distance range: 0 to: 32767]. + distanceMod256 := (distance < 0 or: [distance > 255]) + ifTrue: + [self genUnsignedSingleExtendB: (distance bitShift: -8). + distance bitAnd: 255] + ifFalse: [distance]. + stream + nextPut: 239; + nextPut: distanceMod256! Item was added: + ----- Method: EncoderForSistaV1>>genBranchPopTrue: (in category 'bytecode generation') ----- + genBranchPopTrue: distance + (distance > 0 and: [distance < 9]) ifTrue: + ["184-191 10111 iii Pop and Jump 0n True iii + 1 (i.e., 1 through 8)" + stream nextPut: 183 + distance. + ^self]. + ^self genBranchPopTrueLong: distance! Item was added: + ----- Method: EncoderForSistaV1>>genBranchPopTrueLong: (in category 'bytecode generation') ----- + genBranchPopTrueLong: distance + "238 11101110 iiiiiiii Pop and Jump 0n True #iiiiiiii (+ Extend B * 256, where Extend B >= 0)" + | distanceMod256 | + (distance < 0 or: [distance > 32767]) ifTrue: + [^self outOfRangeError: 'distance' index: distance range: 0 to: 32767]. + (distance > 0 and: [distance < 9]) ifTrue: + ["184-191 10111 iii Pop and Jump 0n True iii + 1 (i.e., 1 through 8)" + stream nextPut: 183 + distance. + ^self]. + distanceMod256 := (distance < 0 or: [distance > 255]) + ifTrue: + [self genUnsignedSingleExtendB: (distance bitShift: -8). + distance bitAnd: 255] + ifFalse: [distance]. + stream + nextPut: 238; + nextPut: distanceMod256! Item was added: + ----- Method: EncoderForSistaV1>>genCallInlinePrimitive: (in category 'bytecode generation') ----- + genCallInlinePrimitive: primitiveIndex + "248 11111000 i i i i i i i i 1jjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256)" + "N.B. We could have made CallPrimitive a 2-byte code taking an extension, but that would + complicate the VM's determination of the primitive number and the primitive error code + store since the extension, being optional, would make the sequence variable length." + (primitiveIndex < 1 or: [primitiveIndex > 32767]) ifTrue: + [self outOfRangeError: 'primitive index' index: primitiveIndex range: 1 to: 32767]. + stream + nextPut: 248; + nextPut: (primitiveIndex bitAnd: 255); + nextPut: (primitiveIndex bitShift: -8) + 128! Item was added: + ----- Method: EncoderForSistaV1>>genCallPrimitive: (in category 'bytecode generation') ----- + genCallPrimitive: primitiveIndex + "248 11111000 i i i i i i i i 0jjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256)" + "N.B. We could have made CallPrimitive a 2-byte code taking an extension, but that would + complicate the VM's determination of the primitive number and the primitive error code + store since the extension, being optional, would make the sequence variable length." + (primitiveIndex < 1 or: [primitiveIndex > 65535]) ifTrue: + [self outOfRangeError: 'primitive index' index: primitiveIndex range: 1 to: 65535]. + stream + nextPut: 248; + nextPut: (primitiveIndex bitAnd: 255); + nextPut: (primitiveIndex bitShift: -8)! Item was added: + ----- Method: EncoderForSistaV1>>genDup (in category 'bytecode generation') ----- + genDup + "83 01010011 Duplicate Stack Top" + stream nextPut: 83! Item was added: + ----- Method: EncoderForSistaV1>>genInlineSmallIntegerAdd (in category 'in-line primitive generation') ----- + genInlineSmallIntegerAdd + ^self genCallInlinePrimitive: 0! Item was added: + ----- Method: EncoderForSistaV1>>genJump: (in category 'bytecode generation') ----- + genJump: distance + (distance > 0 and: [distance < 9]) ifTrue: + ["176-183 10110 iii Jump iii + 1 (i.e., 1 through 8)" + stream nextPut: 175 + distance. + ^self]. + "237 11101101 iiiiiiii Jump #iiiiiiii (+ Extend B * 256, where bbbbbbbb = sddddddd, e.g. -32768 = i=0, a=0, s=1)" + ^self genJumpLong: distance! Item was added: + ----- Method: EncoderForSistaV1>>genJumpLong: (in category 'bytecode generation') ----- + genJumpLong: distance + "237 11101101 iiiiiiii Jump #iiiiiiii (+ Extend B * 256, where bbbbbbbb = sddddddd, e.g. -32768 = i=0, a=0, s=1)" + (distance between: -32768 and: 32767) ifFalse: + [^self outOfRangeError: 'index' index: distance range: -32768 to: 32767]. + (distance < 0 or: [distance > 255]) ifTrue: + [self genSignedSingleExtendB: (distance bitShift: -8)]. + stream + nextPut: 237; + nextPut: (distance bitAnd: 255)! Item was added: + ----- Method: EncoderForSistaV1>>genNop (in category 'bytecode generation') ----- + genNop + "95 01011111 Nop" + stream nextPut: 95! Item was added: + ----- Method: EncoderForSistaV1>>genPop (in category 'bytecode generation') ----- + genPop + "216 11011000 Pop Stack Top" + stream nextPut: 216! Item was added: + ----- Method: EncoderForSistaV1>>genPushCharacter: (in category 'bytecode generation') ----- + genPushCharacter: aCharacterOrCode + "233 11101001 i i i i i i i i Push Character #iiiiiiii (+ Extend B * 256)" + "Why restrict the range to 16 bits when we could encode arbitrarily 32-bit Characters? + Well, 16 bits requires 4 bytes (extB + byte, 78 + byte) and so beyond this range we + lose space verses a single-byte pushLiteral and a 4 byte Character literal on 32-bits. + And generating the same bytecode on 64-bit and 32-bit is important if we want to be + able to load binary code from one to the other (e.g. via Fuel)." + | code | + code := aCharacterOrCode isInteger ifTrue: [aCharacterOrCode] ifFalse: [aCharacterOrCode asInteger]. + (code < 0 or: [code > 65535]) ifTrue: + [^self outOfRangeError: 'character' index: code range: 0 to: 65535]. + (code > 255) ifTrue: + [self genUnsignedSingleExtendB: (code bitShift: -8)]. + stream + nextPut: 233; + nextPut: (code bitAnd: 255)! Item was added: + ----- Method: EncoderForSistaV1>>genPushClosureCopyNumCopiedValues:numArgs:jumpSize: (in category 'bytecode generation') ----- + genPushClosureCopyNumCopiedValues: numCopied numArgs: numArgs jumpSize: jumpSize + "250 11111010 eeiiikkk jjjjjjjj Push Closure Num Copied iii (+ Ext A // 16 * 8) Num Args kkk (+ Ext A \\ 16 * 8) BlockSize jjjjjjjj (+ Ext B * 256). ee = num extensions" + "Including numExtensions makes decoding the bytecode quicker since it obviates having to scan from the beginning of a method." + | numExtensions numCopiedMod8 numArgsMod8 extA | + (jumpSize < 0 or: [jumpSize > 65535]) ifTrue: + [^self outOfRangeError: 'block size' index: jumpSize range: 0 to: 65535]. + (numCopied < 0 or: [numCopied > 127]) ifTrue: + [^self outOfRangeError: 'num copied' index: numCopied range: 0 to: 127]. + (numArgs < 0 or: [numArgs > 127]) ifTrue: + [^self outOfRangeError: 'num args' index: numArgs range: 0 to: 127]. + extA := numExtensions := 0. + (numArgsMod8 := numArgs) > 7 ifTrue: + [extA := numArgs // 8. + numArgsMod8 := numArgsMod8 \\ 8]. + (numCopiedMod8 := numCopied) > 7 ifTrue: + [extA := extA + (numCopied // 8 * 16). + numCopiedMod8 := numCopiedMod8 \\ 8]. + extA ~= 0 ifTrue: + [self genUnsignedSingleExtendA: extA. + numExtensions := 1]. + jumpSize > 255 ifTrue: + [numExtensions := numExtensions + 1. + self genUnsignedSingleExtendB: jumpSize // 256]. + stream + nextPut: 250; + nextPut: (numExtensions bitShift: 6) + (numCopiedMod8 bitShift: 3) + numArgsMod8; + nextPut: (jumpSize bitAnd: 16rFF)! Item was added: + ----- Method: EncoderForSistaV1>>genPushConsArray: (in category 'bytecode generation') ----- + genPushConsArray: size + (size < 0 or: [size > 127]) ifTrue: + [^self outOfRangeError: 'size' index: size range: 0 to: 127]. + "233 11101001 jkkkkkkk Push (Array new: kkkkkkk) (j = 0) + & Pop kkkkkkk elements into: (Array new: kkkkkkk) (j = 1)" + stream + nextPut: 233; + nextPut: size + 128! Item was added: + ----- Method: EncoderForSistaV1>>genPushInstVar: (in category 'bytecode generation') ----- + genPushInstVar: instVarIndex + (instVarIndex between: 0 and: 15) ifTrue: + ["0-15 0000iiii Push Receiver Variable #iiii" + stream nextPut: 0 + instVarIndex. + ^self]. + self genPushInstVarLong: instVarIndex! Item was added: + ----- Method: EncoderForSistaV1>>genPushInstVarLong: (in category 'bytecode generation') ----- + genPushInstVarLong: instVarIndex + "226 11100010 i i i i i i i i Push Receiver Variable #iiiiiiii (+ Extend A * 256)" + "See also MaybeContextInstanceVariableNode" + (instVarIndex < 0 or: [instVarIndex > 65535]) ifTrue: + [^self outOfRangeError: 'index' index: instVarIndex range: 0 to: 65535]. + instVarIndex > 255 ifTrue: + [self genUnsignedSingleExtendA: instVarIndex // 256]. + stream + nextPut: 226; + nextPut: instVarIndex \\ 256! Item was added: + ----- Method: EncoderForSistaV1>>genPushInteger: (in category 'bytecode generation') ----- + genPushInteger: anInteger + "80 01010000 Push 0 + 81 01010001 Push 1 + 232 11101000 i i i i i i i i Push Integer #iiiiiiii (+ Extend B * 256, where bbbbbbbb = sddddddd, e.g. -32768 = i=0, a=0, s=1)" + "Why restrict the range to 16 bits when we could encode arbitrarily large integers? + Well, 16 bits requires 4 bytes (extB + byte, 78 + byte) and so beyond this range we lose space + verses a single-byte pushLiteral and a 4 byte integer literal on 32-bits. And generating the same + bytecode on 64-bit and 32-bit is important if we want to be able to load binary code from one to + the other (e.g. via Fuel)." + anInteger = 0 ifTrue: + [stream nextPut: 80. + ^self]. + anInteger = 1 ifTrue: + [stream nextPut: 81. + ^self]. + (anInteger < -32768 or: [anInteger > 32767]) ifTrue: + [^self outOfRangeError: 'integer' index: anInteger range: -32768 to: 32767]. + (anInteger < 0 or: [anInteger > 255]) ifTrue: + [self genSignedSingleExtendB: (anInteger bitShift: -8)]. + stream + nextPut: 232; + nextPut: (anInteger bitAnd: 255)! Item was added: + ----- Method: EncoderForSistaV1>>genPushLiteral: (in category 'bytecode generation') ----- + genPushLiteral: literalIndex + | extendedIndex | + (literalIndex < 0 or: [literalIndex > 65535]) ifTrue: + [^self outOfRangeError: 'index' index: literalIndex range: 0 to: 65536]. + literalIndex < 32 ifTrue: + ["32-63 001iiiii Push Literal #iiiii" + stream nextPut: 32 + literalIndex. + ^self]. + "228 11100100 i i i i i i i i Push Literal #iiiiiiii (+ Extend A * 256)" + (extendedIndex := literalIndex) > 255 ifTrue: + [self genUnsignedSingleExtendA: extendedIndex // 256. + extendedIndex := extendedIndex \\ 256]. + stream + nextPut: 228; + nextPut: extendedIndex! Item was added: + ----- Method: EncoderForSistaV1>>genPushLiteralVar: (in category 'bytecode generation') ----- + genPushLiteralVar: literalIndex + | extendedIndex | + (literalIndex < 0 or: [literalIndex > 65535]) ifTrue: + [^self outOfRangeError: 'index' index: literalIndex range: 0 to: 65535]. + literalIndex < 16 ifTrue: + ["16-31 0001 i i i i Push Literal Variable #iiii" + stream nextPut: 16 + literalIndex. + ^self]. + "227 11100011 i i i i i i i i Push Literal Variable #iiiiiiii (+ Extend A * 256)" + (extendedIndex := literalIndex) > 255 ifTrue: + [self genUnsignedSingleExtendA: extendedIndex // 256. + extendedIndex := extendedIndex \\ 256]. + stream + nextPut: 227; + nextPut: extendedIndex! Item was added: + ----- Method: EncoderForSistaV1>>genPushNewArray: (in category 'bytecode generation') ----- + genPushNewArray: size + (size < 0 or: [size > 127]) ifTrue: + [^self outOfRangeError: 'size' index: size range: 0 to: 127]. + "231 11100111 jkkkkkkk Push (Array new: kkkkkkk) (j = 0) + & Pop kkkkkkk elements into: (Array new: kkkkkkk) (j = 1)" + stream + nextPut: 231; + nextPut: size! Item was added: + ----- Method: EncoderForSistaV1>>genPushReceiver (in category 'bytecode generation') ----- + genPushReceiver + "76 01001100 Push Receiver" + stream nextPut: 76! Item was added: + ----- Method: EncoderForSistaV1>>genPushRemoteTemp:inVectorAt: (in category 'bytecode generation') ----- + genPushRemoteTemp: tempIndex inVectorAt: tempVectorIndex + "251 11111011 kkkkkkkk jjjjjjjj Push Temp At kkkkkkkk In Temp Vector At: jjjjjjjj" + (tempIndex < 0 or: [tempIndex >= 256]) ifTrue: + [^self outOfRangeError: 'remoteTempIndex' index: tempIndex range: 0 to: 255]. + (tempVectorIndex < 0 or: [tempVectorIndex >= 256]) ifTrue: + [^self outOfRangeError: 'tempVectorIndex' index: tempVectorIndex range: 0 to: 255]. + stream + nextPut: 251; + nextPut: tempIndex; + nextPut: tempVectorIndex! Item was added: + ----- Method: EncoderForSistaV1>>genPushSpecialLiteral: (in category 'bytecode generation') ----- + genPushSpecialLiteral: aLiteral + "77 01001101 Push true + 78 01001110 Push false + 79 01001111 Push nil + 80 01010000 Push 0 + 81 01010001 Push 1 + 232 11101000 iiiiiiii Push Integer #iiiiiiii (+ Extend B * 256, where bbbbbbbb = sddddddd, e.g. -32768 = i=0, a=0, s=1)" + | index | + aLiteral isInteger ifTrue: + [aLiteral == 0 ifTrue: + [stream nextPut: 80. + ^self]. + aLiteral == 1 ifTrue: + [stream nextPut: 81. + ^self]. + ^self genPushInteger: aLiteral]. + index := #(false true nil) + indexOf: aLiteral + ifAbsent: [^self error: 'push special literal: ', aLiteral printString, ' is not one of true false nil']. + stream nextPut: 76 + index! Item was added: + ----- Method: EncoderForSistaV1>>genPushTemp: (in category 'bytecode generation') ----- + genPushTemp: tempIndex + (tempIndex < 0 or: [tempIndex > 63]) ifTrue: + [^self outOfRangeError: 'index' index: tempIndex range: 0 to: 63]. + tempIndex < 12 ifTrue: + ["64-71 01000 i i i Push Temporary Variable #iii + 72-75 010010 i i Push Temporary Variable #ii + 8" + stream nextPut: 64 + tempIndex. + ^self]. + "229 11100101 i i i i i i i i Push Temporary Variable #iiiiiiii" + stream + nextPut: 229; + nextPut: tempIndex! Item was added: + ----- Method: EncoderForSistaV1>>genPushThisContext (in category 'bytecode generation') ----- + genPushThisContext + "82 01010010 Push thisContext, (then e.g. Extend B 1 = push thisProcess)" + stream nextPut: 82! Item was added: + ----- Method: EncoderForSistaV1>>genReturnReceiver (in category 'bytecode generation') ----- + genReturnReceiver + "88-91 010110 ii Return Receiver/true/false/nil" + stream nextPut: 88! Item was added: + ----- Method: EncoderForSistaV1>>genReturnSpecialLiteral: (in category 'bytecode generation') ----- + genReturnSpecialLiteral: aLiteral + "88-91 010110 ii Return Receiver/true/false/nil" + | index | + index := #(true false nil) indexOf: aLiteral ifAbsent: 0. + index = 0 ifTrue: + [^self error: 'return special literal: ', aLiteral printString, ' is not one of true false nil']. + stream nextPut: 88 + index! Item was added: + ----- Method: EncoderForSistaV1>>genReturnTop (in category 'bytecode generation') ----- + genReturnTop + "92 1011100 Return Stack Top From Message" + stream nextPut: 92! Item was added: + ----- Method: EncoderForSistaV1>>genReturnTopToCaller (in category 'bytecode generation') ----- + genReturnTopToCaller + "93 1011101 Return Stack Top From Block [* return from enclosing block N, ExtA]" + "If extended, the least significant bit of the extension determines if we return to the caller or not + and the most significant bits determine how many levels of the static chain to return from. + ExtA = iiiiiiij + iiiiiii=0,j=0 => return to caller + iiiiiii=0,j=1 => illegal + iiiiiii=1,j=0 => return to outerContext + iiiiiii=1,j=1 => return to outerContext sender/return from outerContext + iiiiiii=2,j=0 => return to outerContext outerContext + iiiiiii=2,j=1 => return to outerContext outerContext sender/return from outerContext outerContext + etc" + + stream nextPut: 93! Item was added: + ----- Method: EncoderForSistaV1>>genSend:numArgs: (in category 'bytecode generation') ----- + genSend: selectorLiteralIndex numArgs: nArgs + | extendedIndex extendedNArgs | + (selectorLiteralIndex < 0 or: [selectorLiteralIndex > 65535]) ifTrue: + [^self outOfRangeError: 'selectorLiteralIndex' index: selectorLiteralIndex range: 0 to: 65535]. + (nArgs < 0 or: [nArgs > 31]) ifTrue: + [^self outOfRangeError: 'numArgs' index: nArgs range: 0 to: 31 "!!!!"]. + (selectorLiteralIndex < 16 and: [nArgs < 3]) ifTrue: + ["128-143 1000 iiii Send Literal Selector #iiii With 0 Argument + 144-159 1001 iiii Send Literal Selector #iiii With 1 Arguments + 160-175 1010 iiii Send Literal Selector #iiii With 2 Arguments" + stream nextPut: 128 + (nArgs * 16) + selectorLiteralIndex. + ^self]. + (extendedIndex := selectorLiteralIndex) > 31 ifTrue: + [self genUnsignedSingleExtendA: extendedIndex // 32. + extendedIndex := extendedIndex \\ 32]. + (extendedNArgs := nArgs) > 7 ifTrue: + [self genUnsignedSingleExtendB: extendedNArgs // 8. + extendedNArgs := extendedNArgs \\ 8]. + "234 11101010 i i i i i j j j Send Literal Selector #iiiii (+ Extend A * 32) with jjj (+ Extend B * 8) Arguments" + stream + nextPut: 238; + nextPut: extendedNArgs + (extendedIndex * 8)! Item was added: + ----- Method: EncoderForSistaV1>>genSendSpecial:numArgs: (in category 'bytecode generation') ----- + genSendSpecial: specialSelectorIndex numArgs: nArgs + self assert: (specialSelectorIndex between: 1 and: Smalltalk specialSelectorSize). + self assert: nArgs = (Smalltalk specialNargsAt: specialSelectorIndex). + "Special selector sends. + 96-111 0110 iiii Send Arithmetic Message #iiii #(#+ #- #< #> #'<=' #'>=' #= #'~=' #* #/ #'\\' #@ #bitShift: #'//' #bitAnd: #bitOr:) + 112-119 01110 iii Send Special Message #iii #(#at: #at:put: #size ? ? ? #'==' class ? value value: ? ? ? ? ?)" + + stream nextPut: specialSelectorIndex + 95! Item was added: + ----- Method: EncoderForSistaV1>>genSendSuper:numArgs: (in category 'bytecode generation') ----- + genSendSuper: selectorLiteralIndex numArgs: nArgs + | extendedIndex extendedNArgs | + (selectorLiteralIndex < 0 or: [selectorLiteralIndex > 65535]) ifTrue: + [^self outOfRangeError: 'selectorLiteralIndex' index: selectorLiteralIndex range: 0 to: 65535]. + (nArgs < 0 or: [nArgs > 31]) ifTrue: + [^self outOfRangeError: 'numArgs' index: nArgs range: 0 to: 31 "!!!!"]. + (extendedIndex := selectorLiteralIndex) > 31 ifTrue: + [self genUnsignedSingleExtendA: extendedIndex // 32. + extendedIndex := extendedIndex \\ 32]. + (extendedNArgs := nArgs) > 7 ifTrue: + [self genUnsignedSingleExtendB: extendedNArgs // 8. + extendedNArgs := extendedNArgs \\ 8]. + "235 11101011 iiiiijjj Send To Superclass Literal Selector #iiiii (+ Extend A * 32) with jjj (+ Extend B * 8) Arguments" + stream + nextPut: 235; + nextPut: extendedNArgs + (extendedIndex * 8)! Item was added: + ----- Method: EncoderForSistaV1>>genSignedSingleExtendB: (in category 'bytecode generation') ----- + genSignedSingleExtendB: extendedIndex + (extendedIndex between: -128 and: 127) ifFalse: + [^self outOfRangeError: 'index' index: extendedIndex range: -128 to: 127]. + "225 11100001 sbbbbbbb Extend B (Ext B = Ext B prev * 256 + Ext B)" + stream + nextPut: 225; + nextPut: (extendedIndex >= 0 ifTrue: [extendedIndex] ifFalse: [extendedIndex + 256]) ! Item was added: + ----- Method: EncoderForSistaV1>>genStoreInstVar: (in category 'bytecode generation') ----- + genStoreInstVar: instVarIndex + "243 11110011 iiiiiiii Store Receiver Variable #iiiiiii (+ Extend A * 256)" + self genStoreInstVarLong: instVarIndex! Item was added: + ----- Method: EncoderForSistaV1>>genStoreInstVarLong: (in category 'bytecode generation') ----- + genStoreInstVarLong: instVarIndex + "243 11110011 iiiiiiii Store Receiver Variable #iiiiiii (+ Extend A * 256)" + (instVarIndex < 0 or: [instVarIndex > 65535]) ifTrue: + [^self outOfRangeError: 'index' index: instVarIndex range: 0 to: 65535]. + instVarIndex > 255 ifTrue: + [self genUnsignedSingleExtendA: instVarIndex // 256]. + stream + nextPut: 243; + nextPut: instVarIndex \\ 256! Item was added: + ----- Method: EncoderForSistaV1>>genStoreLiteralVar: (in category 'bytecode generation') ----- + genStoreLiteralVar: literalIndex + "244 11110100 iiiiiiii Store Literal Variable #iiiiiiii (+ Extend A * 256)" + (literalIndex < 0 or: [literalIndex > 65535]) ifTrue: + [^self outOfRangeError: 'index' index: literalIndex range: 0 to: 65535]. + literalIndex > 255 ifTrue: + [self genUnsignedSingleExtendA: literalIndex // 256]. + stream + nextPut: 244; + nextPut: literalIndex \\ 256! Item was added: + ----- Method: EncoderForSistaV1>>genStorePopInstVar: (in category 'bytecode generation') ----- + genStorePopInstVar: instVarIndex + "200-207 11001 iii Pop and Store Receiver Variable #iii + 240 11110000 iiiiiiii Pop and Store Receiver Variable #iiiiiii (+ Extend A * 256)" + (instVarIndex < 0 or: [instVarIndex > 7]) ifTrue: + [^self genStorePopInstVarLong: instVarIndex]. + stream nextPut: 200 + instVarIndex! Item was added: + ----- Method: EncoderForSistaV1>>genStorePopInstVarLong: (in category 'bytecode generation') ----- + genStorePopInstVarLong: instVarIndex + "240 11110000 iiiiiiii Pop and Store Receiver Variable #iiiiiii (+ Extend A * 256)" + (instVarIndex < 0 or: [instVarIndex > 65535]) ifTrue: + [^self outOfRangeError: 'index' index: instVarIndex range: 0 to: 65535]. + instVarIndex > 255 ifTrue: + [self genUnsignedSingleExtendA: instVarIndex // 256]. + stream + nextPut: 240; + nextPut: instVarIndex \\ 256! Item was added: + ----- Method: EncoderForSistaV1>>genStorePopLiteralVar: (in category 'bytecode generation') ----- + genStorePopLiteralVar: literalIndex + "241 11110001 iiiiiiii Pop and Store Literal Variable #iiiiiiii (+ Extend A * 256)" + (literalIndex < 0 or: [literalIndex > 65535]) ifTrue: + [^self outOfRangeError: 'index' index: literalIndex range: 0 to: 65535]. + literalIndex > 255 ifTrue: + [self genUnsignedSingleExtendA: literalIndex // 256]. + stream + nextPut: 241; + nextPut: literalIndex \\ 256! Item was added: + ----- Method: EncoderForSistaV1>>genStorePopRemoteTemp:inVectorAt: (in category 'bytecode generation') ----- + genStorePopRemoteTemp: tempIndex inVectorAt: tempVectorIndex + "253 11111101 kkkkkkkk jjjjjjjj Pop and Store Temp At kkkkkkkk In Temp Vector At: jjjjjjjj" + (tempIndex < 0 or: [tempIndex >= 256]) ifTrue: + [^self outOfRangeError: 'remoteTempIndex' index: tempIndex range: 0 to: 255]. + (tempVectorIndex < 0 or: [tempVectorIndex >= 256]) ifTrue: + [^self outOfRangeError: 'tempVectorIndex' index: tempVectorIndex range: 0 to: 255]. + stream + nextPut: 253; + nextPut: tempIndex; + nextPut: tempVectorIndex! Item was added: + ----- Method: EncoderForSistaV1>>genStorePopTemp: (in category 'bytecode generation') ----- + genStorePopTemp: tempIndex + "208-215 11010 iii Pop and Store Temporary Variable #iii + 242 11110010 iiiiiiii Pop and Store Temporary Variable #iiiiiiii" + (tempIndex < 0 or: [tempIndex > 63]) ifTrue: + [^self outOfRangeError: 'index' index: tempIndex range: 0 to: 63]. + tempIndex < 8 ifTrue: + [stream nextPut: 208 + tempIndex. + ^self]. + stream + nextPut: 242; + nextPut: tempIndex! Item was added: + ----- Method: EncoderForSistaV1>>genStoreRemoteTemp:inVectorAt: (in category 'bytecode generation') ----- + genStoreRemoteTemp: tempIndex inVectorAt: tempVectorIndex + "252 11111100 kkkkkkkk jjjjjjjj Store Temp At kkkkkkkk In Temp Vector At: jjjjjjjj" + (tempIndex < 0 or: [tempIndex >= 256]) ifTrue: + [^self outOfRangeError: 'remoteTempIndex' index: tempIndex range: 0 to: 255]. + (tempVectorIndex < 0 or: [tempVectorIndex >= 256]) ifTrue: + [^self outOfRangeError: 'tempVectorIndex' index: tempVectorIndex range: 0 to: 255]. + stream + nextPut: 252; + nextPut: tempIndex; + nextPut: tempVectorIndex! Item was added: + ----- Method: EncoderForSistaV1>>genStoreTemp: (in category 'bytecode generation') ----- + genStoreTemp: tempIndex + "242 11110010 iiiiiiii Pop and Store Temporary Variable #iiiiiiii" + (tempIndex < 0 or: [tempIndex > 63]) ifTrue: + [^self outOfRangeError: 'index' index: tempIndex range: 0 to: 63]. + stream + nextPut: 242; + nextPut: tempIndex! Item was added: + ----- Method: EncoderForSistaV1>>genTrapIfNotInstanceOf: (in category 'bytecode generation') ----- + genTrapIfNotInstanceOf: literalIndex + "* 236 11101100 iiiiiiii Trap If Not Instance Of Behavior/Array Of Behavior #iiiiiiii (+ Extend A * 256, where Extend A >= 0)" + + | extendedIndex | + (literalIndex < 0 or: [literalIndex > 65535]) ifTrue: + [^self outOfRangeError: 'index' index: literalIndex range: 0 to: 65536]. + (extendedIndex := literalIndex) > 255 ifTrue: + [self genUnsignedSingleExtendA: extendedIndex // 256. + extendedIndex := extendedIndex \\ 256]. + stream + nextPut: 236; + nextPut: extendedIndex! Item was added: + ----- Method: EncoderForSistaV1>>genUnsignedMultipleExtendA: (in category 'bytecode generation') ----- + genUnsignedMultipleExtendA: extendedIndex + "224 11100000 aaaaaaaa Extend A (Ext A = Ext A prev * 256 + Ext A)" + extendedIndex > 255 ifTrue: + [self genUnsignedMultipleExtendA: extendedIndex // 256]. + stream + nextPut: 224; + nextPut: extendedIndex \\ 256! Item was added: + ----- Method: EncoderForSistaV1>>genUnsignedSingleExtendA: (in category 'bytecode generation') ----- + genUnsignedSingleExtendA: extendedIndex + (extendedIndex between: 0 and: 255) ifFalse: + [^self outOfRangeError: 'index' index: extendedIndex range: 0 to: 255]. + "224 11100000 aaaaaaaa Extend A (Ext A = Ext A prev * 256 + Ext A)" + stream + nextPut: 224; + nextPut: extendedIndex! Item was added: + ----- Method: EncoderForSistaV1>>genUnsignedSingleExtendB: (in category 'bytecode generation') ----- + genUnsignedSingleExtendB: extendedIndex + (extendedIndex between: 0 and: 255) ifFalse: + [^self outOfRangeError: 'index' index: extendedIndex range: 0 to: 255]. + "225 11100001 sbbbbbbb Extend B (Ext B = Ext B prev * 256 + Ext B)" + stream + nextPut: 225; + nextPut: extendedIndex! Item was added: + ----- Method: EncoderForSistaV1>>generateMethodOfClass:trailer:from: (in category 'method encoding') ----- + generateMethodOfClass: aCompiledMethodClass trailer: trailer from: methodNode + "The receiver is the root of a parse tree. Answer an instance of aCompiledMethodClass. + The argument, trailer, is arbitrary but is typically either the reference to the source code + that is stored with every CompiledMethod, or an encoding of the method's temporary names." + + | primErrNode blkSize nLits locals literals header method stack | + primErrNode := methodNode primitiveErrorVariableName ifNotNil: + [self fixTemp: methodNode primitiveErrorVariableName]. + methodNode ensureClosureAnalysisDone. + self rootNode: methodNode. "this is for BlockNode>>sizeCodeForClosureValue:" + blkSize := (methodNode block sizeCodeForEvaluatedValue: self) + + (methodNode primitive > 0 + ifTrue: [self sizeCallPrimitive: methodNode primitive] + ifFalse: [0]) + + (primErrNode + ifNil: [0] + ifNotNil: + [primErrNode + index: methodNode arguments size + methodNode temporaries size; + sizeCodeForStore: self "The VM relies on storeIntoTemp: (129)"]). + locals := methodNode arguments, methodNode temporaries, (primErrNode ifNil: [#()] ifNotNil: [{primErrNode}]). + self noteBlockExtent: methodNode block blockExtent hasLocals: locals. + header := self computeMethodHeaderForNumArgs: methodNode arguments size + numTemps: locals size + numLits: (nLits := (literals := self allLiterals) size) + primitive: methodNode primitive. + method := trailer + createMethod: blkSize + class: aCompiledMethodClass + header: header. + 1 to: nLits do: [:lit | method literalAt: lit put: (literals at: lit)]. + self streamToMethod: method. + stack := ParseStack new init. + methodNode primitive > 0 ifTrue: + [self genCallPrimitive: methodNode primitive]. + primErrNode ifNotNil: + [primErrNode emitCodeForStore: stack encoder: self]. + stack position: method numTemps. + [methodNode block emitCodeForEvaluatedValue: stack encoder: self] + on: Error "If an attempt is made to write too much code the method will be asked" + do: [:ex| "to grow, and the grow attempt will fail in CompiledMethod class>>#new:" + ex signalerContext sender method = (CompiledMethod class>>#new:) + ifTrue: [^self error: 'Compiler code size discrepancy'] + ifFalse: [ex pass]]. + stack position ~= (method numTemps + 1) ifTrue: + [^self error: 'Compiler stack discrepancy']. + self methodStreamPosition ~= (method size - trailer size) ifTrue: + [^self error: 'Compiler code size discrepancy']. + method needsFrameSize: stack size - method numTemps. + ^method! Item was added: + ----- Method: MethodNode>>primitive (in category 'accessing') ----- + primitive + ^primitive!

1 0

The Trunk: Kernel-eem.1087.mcz
by commits＠source.squeak.org 06 Apr '17

06 Apr '17

Eliot Miranda uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-eem.1087.mcz ==================== Summary ==================== Name: Kernel-eem.1087 Author: eem Time: 5 April 2017, 6:52:09.802183 pm UUID: 79b19c31-bee8-4906-95da-83f2a3b61396 Ancestors: Kernel-eem.1086 Add the SistaV1 bytecode set decoders and some of the new SistaV1 bytecode support (enough for printing). =============== Diff against Kernel-eem.1086 =============== Item was added: + ----- Method: ClosureExtractor>>blockReturnConstant: (in category 'instruction decoding') ----- + blockReturnConstant: value + currentContext := currentContext sender! Item was added: + ----- Method: Context>>blockReturnConstant: (in category 'instruction decoding') ----- + blockReturnConstant: value + "Simulate the interpreter's action when a ReturnConstantToCaller bytecode is + encountered in the receiver. This should only happen in a closure activation." + self assert: closureOrNil isClosure. + ^self return: value from: self! Item was added: + ----- Method: InstructionClient>>blockReturnConstant: (in category 'instruction decoding') ----- + blockReturnConstant: value + "Return Constant From Block bytecode." + + ! Item was changed: ----- Method: InstructionClient>>callPrimitive: (in category 'instruction decoding') ----- callPrimitive: pimIndex + "SqueakV3PlusClosures: 239 11101111 iiiiiiii jjjjjjjj Call Primitive #iiiiiiii + (jjjjjjjj * 256) + NewsqueakV4: 249 11111001 iiiiiiii jjjjjjjj Call Primitive #iiiiiiii + (jjjjjjjj * 256) + SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) + m=1 means inlined primitive, no hard return after execution."! - "V3PlusClosures: 139 10001011 iiiiiiii jjjjjjjj Call Primitive #iiiiiiii + (jjjjjjjj * 256) - NewsqueakV4: 249 11111001 iiiiiiii jjjjjjjj Call Primitive #iiiiiiii + (jjjjjjjj * 256) - SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + ( jjjjjjj * 256) - m=1 means inlined primitive, no hard return after execution."! Item was added: + ----- Method: InstructionClient>>trapIfNotInstanceOf: (in category 'instruction decoding') ----- + trapIfNotInstanceOf: behaviorOrArrayOfBehavior + "If the top of stack is not an instance of either the argument, or, if the argument is an Array, + any of the elements of the argument, send the class trap message to the current context."! Item was added: + ----- Method: InstructionPrinter>>blockReturnConstant: (in category 'instruction decoding') ----- + blockReturnConstant: value + "Print the Return Constant From Block bytecode." + + self print: 'blockReturn: ', value printString! Item was added: + ----- Method: InstructionPrinter>>trapIfNotInstanceOf: (in category 'instruction decoding') ----- + trapIfNotInstanceOf: behaviorOrArrayOfBehavior + "If the top of stack is not an instance of either the argument, or, if the argument is an Array, + any of the elements of the argument, send the class trap message to the current context." + self print: 'trapIfNotInstanceOf: ', behaviorOrArrayOfBehavior printString! Item was added: + ----- Method: InstructionStream>>interpretNext2ByteSistaV1Instruction:for:extA:extB:startPC: (in category 'decoding - private - sista v1') ----- + interpretNext2ByteSistaV1Instruction: bytecode for: client extA: extA extB: extB startPC: startPC + "Send to the argument, client, a message that specifies the next instruction. + This method handles the two-byte codes. + For a table of the bytecode set, see EncoderForV1's class comment." + + | byte method | + method := self method. + byte := self method at: pc. + pc := pc + 1. + "We do an inline quasi-binary search on bytecode" + bytecode < 234 ifTrue: "pushes" + [bytecode < 231 ifTrue: + [bytecode < 229 ifTrue: + [| literal | + bytecode = 226 ifTrue: + [^client pushReceiverVariable: (extA bitShift: 8) + byte]. + literal := method literalAt: (extA bitShift: 8) + byte + 1. + bytecode = 227 ifTrue: + [^client pushLiteralVariable: literal]. + ^client pushConstant: literal]. + bytecode = 229 ifTrue: + [^client pushClosureTemps: byte]. + ^client pushTemporaryVariable: byte]. + bytecode = 231 ifTrue: + [^byte < 128 + ifTrue: [client pushNewArrayOfSize: byte] + ifFalse: [client pushConsArrayWithElements: byte - 128]]. + bytecode = 232 ifTrue: + [^client pushConstant: (extB bitShift: 8) + byte]. + ^client pushConstant: (Character value: (extB bitShift: 8) + byte)]. + bytecode < 240 ifTrue: "sends, trap and jump" + [bytecode < 236 ifTrue: "sends" + [^client + send: (method literalAt: (extA bitShift: 5) + (byte // 8) + 1) + super: bytecode = 239 + numArgs: (extB bitShift: 3) + (byte \\ 8)]. + bytecode = 236 ifTrue: + [^client trapIfNotInstanceOf: (method literalAt: (extA bitShift: 8) + byte + 1)]. + bytecode = 237 ifTrue: + [^client jump: (extB bitShift: 8) + byte]. + ^client jump: (extB bitShift: 8) + byte if: bytecode = 238]. + bytecode < 243 ifTrue: + [bytecode = 240 ifTrue: + [^client popIntoReceiverVariable: (extA bitShift: 8) + byte]. + bytecode = 241 ifTrue: + [^client popIntoLiteralVariable: (method literalAt: (extA bitShift: 8) + byte + 1)]. + ^client popIntoTemporaryVariable: byte]. + bytecode = 243 ifTrue: + [^client storeIntoReceiverVariable: (extA bitShift: 8) + byte]. + bytecode = 244 ifTrue: + [^client storeIntoLiteralVariable: (method literalAt: (extA bitShift: 8) + byte + 1)]. + bytecode = 245 ifTrue: + [^client storeIntoTemporaryVariable: byte]. + "246-247 1111011 i xxxxxxxx UNASSIGNED" + ^self unusedBytecode: client at: startPC! Item was added: + ----- Method: InstructionStream>>interpretNext3ByteSistaV1Instruction:for:extA:extB:startPC: (in category 'decoding - private - sista v1') ----- + interpretNext3ByteSistaV1Instruction: bytecode for: client extA: extA extB: extB startPC: startPC + "Send to the argument, client, a message that specifies the next instruction. + This method handles the three-byte codes. + For a table of the bytecode set, see EncoderForSistaV1's class comment." + + | method byte2 byte3 | + method := self method. + byte2 := method at: pc. + byte3 := method at: pc + 1. + pc := pc + 2. + "we search the bytecodes by what we expect to be the static frequency." + bytecode = 248 ifTrue: + [^client callPrimitive: byte2 + (byte3 bitShift: 8)]. + bytecode = 250 ifTrue: + ["** 250 11111010 eeiiikkk jjjjjjjj Push Closure Num Copied iii (+ExtA//16*8) Num Args kkk (+ ExtA\\16*8) BlockSize jjjjjjjj (+ExtB*256). ee = num extensions" + ^client + pushClosureCopyNumCopiedValues: ((byte2 bitShift: -3) bitAnd: 7) + (extA // 16 bitShift: 3) + numArgs: (byte2 bitAnd: 7) + (extA \\ 16 bitShift: 3) + blockSize: byte3 + (extB bitShift: 8)]. + bytecode = 251 ifTrue: + [^client pushRemoteTemp: byte2 inVectorAt: byte3]. + bytecode = 252 ifTrue: + [^client popIntoRemoteTemp: byte2 inVectorAt: byte3]. + bytecode = 253 ifTrue: + [^client storeIntoRemoteTemp: byte2 inVectorAt: byte3]. + "249 11111001 xxxxxxxx syyyyyyy Reserved for Push Float" + "254-255 1111111 i xxxxxxxx yyyyyyyy UNASSIGNED" + ^self unusedBytecode: client at: startPC! Item was added: + ----- Method: InstructionStream>>interpretNextSistaV1InstructionFor: (in category 'decoding - private - sista v1') ----- + interpretNextSistaV1InstructionFor: client + "Send to the argument, client, a message that specifies the next instruction." + + | byte div16 offset method extA extB savedPC | + method := self method. + "For a table of the bytecode set, see EncoderForSistaV1's class comment." + "consume and compute any extensions first." + extA := extB := 0. + savedPC := pc. + [byte := self method at: pc. + pc := pc + 1. + byte >= 16rE0 and: [byte <= 16rE1]] whileTrue: + [| extByte | + extByte := self method at: pc. + pc := pc + 1. + byte = 16rE0 + ifTrue: + [extA := (extA bitShift: 8) + extByte] + ifFalse: + [extB := (extB = 0 and: [extByte > 127]) + ifTrue: [extByte - 256] + ifFalse: [(extB bitShift: 8) + extByte]]]. + div16 := byte // 16. + offset := byte \\ 16. + "We do an inline quasi-binary search on each of the possible 16 values of div16" + div16 < 11 ifTrue: + [div16 < 6 ifTrue: + [div16 < 4 ifTrue: + [div16 < 2 ifTrue: + [div16 = 0 ifTrue: + [^client pushReceiverVariable: offset]. + ^client pushLiteralVariable: (method literalAt: offset + 1)]. "div16 = 1" + ^client pushConstant: (method literalAt: byte \\ 32 + 1)]. + div16 = 4 ifTrue: + [offset < 12 ifTrue: + [^client pushTemporaryVariable: offset]. + offset = 12 ifTrue: + [^client pushReceiver]. + offset = 13 ifTrue: + [^client pushConstant: true]. + offset = 14 ifTrue: + [^client pushConstant: false]. + offset = 15 ifTrue: + [^client pushConstant: nil]]. + "div16 = 5" + offset < 2 ifTrue: + [^client pushConstant: offset]. + offset = 3 ifTrue: + [^self interpretSistaV1ExtendedPush: extB for: client]. + offset = 4 ifTrue: + [^client doDup]. + offset = 8 ifTrue: + [^client methodReturnReceiver]. + offset = 9 ifTrue: + [^client methodReturnConstant: true]. + offset = 10 ifTrue: + [^client methodReturnConstant: false]. + offset = 11 ifTrue: + [^client methodReturnConstant: nil]. + offset = 12 ifTrue: + [^client methodReturnTop]. + offset = 13 ifTrue: + [^client blockReturnConstant: nil]. + offset = 14 ifTrue: + [^client blockReturnTop]. + offset = 15 ifTrue: + [^client doNop]. + ^self unusedBytecode: client at: savedPC]. + "short sends" + div16 = 6 ifTrue: + [^client + send: (Smalltalk specialSelectorAt: offset + 1) + super: false + numArgs: (Smalltalk specialNargsAt: offset + 1)]. + div16 = 7 ifTrue: + [^client + send: (Smalltalk specialSelectorAt: offset + 17) + super: false + numArgs: (Smalltalk specialNargsAt: offset + 17)]. + ^client + send: (method literalAt: offset + 1) + super: false + numArgs: div16 - 8]. + "div16 >= 11; bytecode >= 176" + div16 < 14 ifTrue: + [div16 = 11 ifTrue: + [offset < 8 ifTrue: + [^client jump: offset + 1]. + ^client jump: offset - 7 if: true]. + div16 = 12 ifTrue: + [offset < 8 ifTrue: + [^client jump: offset + 1 if: false]. + ^client popIntoReceiverVariable: offset - 8]. + "div16 = 13" + offset < 8 ifTrue: + [^client popIntoTemporaryVariable: offset]. + offset = 9 ifTrue: + [^client doDup]. + ^self unusedBytecode: client at: savedPC]. + "2 byte and 3 byte codes" + byte < 248 ifTrue: + [^self interpretNext2ByteSistaV1Instruction: byte for: client extA: extA extB: extB startPC: savedPC]. + ^self interpretNext3ByteSistaV1Instruction: byte for: client extA: extA extB: extB startPC: savedPC! Item was added: + ----- Method: InstructionStream>>interpretSistaV1ExtendedPush:for: (in category 'decoding - private - sista v1') ----- + interpretSistaV1ExtendedPush: extB for: client + "Implement the extended push for non-zero extensions." + "* 82 01010010 Push thisContext, (then Extend B = 1 => push thisProcess)" + extB = 0 ifTrue: + [^client pushActiveContext]. + extB = 1 ifTrue: + [^client pushActiveProcess]. + self error: 'undefined extended push'! Item was added: + ----- Method: InstructionStream>>interpretSistaV1Jump (in category 'decoding - private - sista v1') ----- + interpretSistaV1Jump + "If the instruction at pc is an unconditional jump, interpret it, advancing the pc, + and answering the jump distance. Otherwise answer nil." + + " 176-183 10110 iii Jump iii + 1 (i.e., 1 through 8) + * 225/16rE1 11100001 sbbbbbbb Extend B (Ext B = Ext B prev * 256 + Ext B) + * 237 11101101 iiiiiiii Jump #iiiiiiii (+ Extend B * 256, where bbbbbbbb = sddddddd, e.g. -32768 = i=0, a=0, s=1)" + | method byte nextpc extB | + method := self method. + "consume and compute any extension first." + extB := 0. + nextpc := pc. "must not advance pc unless this is a jump." + [byte := self method at: nextpc. + nextpc := nextpc + 1. + byte = 16rE1] whileTrue: + [| extByte | + extByte := self method at: nextpc. + nextpc := nextpc + 1. + extB := (extB = 0 and: [extByte > 127]) + ifTrue: [extByte - 256] + ifFalse: [(extB bitShift: 8) + extByte]]. + (byte between: 176 and: 183) ifTrue: + [pc := nextpc. + ^byte - 191]. + byte = 237 ifTrue: + [byte := method at: nextpc. + pc := nextpc + 1. + ^(extB bitShift: 8) + byte]. + ^nil! Item was added: + ----- Method: InstructionStream>>interpretSistaV1JumpIfCond (in category 'decoding - private - sista v1') ----- + interpretSistaV1JumpIfCond + "If the instruction at pc is a conditional jump, interpret it, advancing the pc, + and answering the jump distance. Otherwise answer nil." + + " 184-191 10111 iii Pop and Jump 0n True iii +1 (i.e., 1 through 8) + 192-199 11000 iii Pop and Jump 0n False iii +1 (i.e., 1 through 8) + * 225/E1 11100001 sbbbbbbb Extend B (Ext B = Ext B prev * 256 + Ext B) + * 238 11101110 iiiiiiii Pop and Jump 0n True #iiiiiiii (+ Extend B * 256, where Extend B >= 0) + * 239 11101111 iiiiiiii Pop and Jump 0n False #iiiiiiii (+ Extend B * 256, where Extend B >= 0)" + | method byte nextpc extB | + method := self method. + "consume and compute any extension first." + extB := 0. + nextpc := pc. "must not advance pc unless this is a jump." + [byte := self method at: nextpc. + nextpc := nextpc + 1. + byte = 16rE1] whileTrue: + [| extByte | + extByte := self method at: nextpc. + nextpc := nextpc + 1. + extB := (extB = 0 and: [extByte > 127]) + ifTrue: [extByte - 256] + ifFalse: [(extB bitShift: 8) + extByte]]. + (byte between: 184 and: 199) ifTrue: + [pc := nextpc. + ^(byte bitAnd: 7) + 1]. + (byte between: 238 and: 239) ifTrue: + [byte := method at: nextpc. + pc := nextpc + 1. + ^(extB bitShift: 8) + byte]. + ^nil!

1 0

The Trunk: Compiler-eem.343.mcz
by commits＠source.squeak.org 06 Apr '17

06 Apr '17

Eliot Miranda uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-eem.343.mcz ==================== Summary ==================== Name: Compiler-eem.343 Author: eem Time: 5 April 2017, 6:30:30.31475 pm UUID: c07d12a4-02e9-40c5-b9aa-99fad4927cd4 Ancestors: Compiler-eem.342 Have generate:using: use the new generation method that lives in BytecodeEncoder. Recategorize all "code generation (closures)" methods as "closure analysis". =============== Diff against Compiler-eem.342 =============== Item was changed: + ----- Method: AssignmentNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'closure analysis') ----- - ----- Method: AssignmentNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'code generation (closures)') ----- analyseTempsWithin: scopeBlock "<BlockNode>" rootNode: rootNode "<MethodNode>" assignmentPools: assignmentPools "<Dictionary>" "N.B. since assigment happens _after_ the value is evaluated the value is sent the message _first_." value analyseTempsWithin: scopeBlock rootNode: rootNode assignmentPools: assignmentPools. variable beingAssignedToAnalyseTempsWithin: scopeBlock rootNode: rootNode assignmentPools: assignmentPools! Item was changed: + ----- Method: BlockNode>>actualScope (in category 'closure analysis') ----- - ----- Method: BlockNode>>actualScope (in category 'code generation (closures)') ----- actualScope "Answer the actual scope for the receiver. If this is an unoptimized block then it is its actual scope, but if this is an optimized block then the actual scope is some outer block." ^actualScopeIfOptimized ifNil: [self]! Item was changed: + ----- Method: BlockNode>>addHoistedTemps: (in category 'closure analysis') ----- - ----- Method: BlockNode>>addHoistedTemps: (in category 'code generation (closures)') ----- addHoistedTemps: additionalTemporaries "<SequenceableCollection>" | tempsToBeMerged additionalTempsToAdd | additionalTemporaries do: [:temp| temp definingScope ifNil: [temp definingScope: self]]. (temporaries isNil or: [temporaries isEmpty]) ifTrue: [temporaries := additionalTemporaries copy. ^self]. tempsToBeMerged := additionalTemporaries select: [:t| t isBlockArg and: [temporaries anySatisfy: [:existing| existing isBlockArg and: [existing key = t key]]]]. additionalTempsToAdd := tempsToBeMerged isEmpty ifTrue: [additionalTemporaries copy] ifFalse: [additionalTemporaries reject: [:temp| tempsToBeMerged identityIncludes: temp]]. temporaries := (temporaries isNil or: [temporaries isEmpty]) ifTrue: [additionalTempsToAdd] ifFalse: [temporaries last isIndirectTempVector ifTrue: [temporaries allButLast, additionalTempsToAdd, { temporaries last }] ifFalse: [temporaries, additionalTempsToAdd]]. tempsToBeMerged do: [:t| | merge | merge := temporaries detect: [:existing| existing isBlockArg and: [existing key = t key]]. merge absorbHoistedTemp: t]! Item was changed: + ----- Method: BlockNode>>addRemoteTemp:rootNode: (in category 'closure analysis') ----- - ----- Method: BlockNode>>addRemoteTemp:rootNode: (in category 'code generation (closures)') ----- addRemoteTemp: aTempVariableNode rootNode: rootNode "<MethodNode>" "Add aTempVariableNode to my actualScope's sequence of remote temps. If I am an optimized block then the actual scope is my actualScopeIfOptimized, otherwise it is myself." remoteTempNode == nil ifTrue: [remoteTempNode := RemoteTempVectorNode new name: self remoteTempNodeName index: arguments size + temporaries size type: LdTempType scope: 0. actualScopeIfOptimized ifNil: [self addTempNode: remoteTempNode. remoteTempNode definingScope: self] ifNotNil: [actualScopeIfOptimized addHoistedTemps: { remoteTempNode }]]. remoteTempNode addRemoteTemp: aTempVariableNode encoder: rootNode encoder. "use remove:ifAbsent: because the deferred analysis for optimized loops can result in the temp has already been hoised into the root." self removeTempNode: aTempVariableNode ifAbsent: [ self actualScope removeTempNode: aTempVariableNode ifAbsent: ["should not happen"]]. ^remoteTempNode! Item was changed: + ----- Method: BlockNode>>addTempNode: (in category 'closure analysis') ----- - ----- Method: BlockNode>>addTempNode: (in category 'code generation (closures)') ----- addTempNode: aTempVariableNode "Utilities for when we want to add some temporaries." self makeTemporariesRemovable. ^temporaries add: aTempVariableNode! Item was changed: + ----- Method: BlockNode>>analyseArguments:temporaries:rootNode: (in category 'closure analysis') ----- - ----- Method: BlockNode>>analyseArguments:temporaries:rootNode: (in category 'code generation (closures)') ----- analyseArguments: methodArguments temporaries: methodTemporaries rootNode: rootNode "<MethodNode>" "^<Sequence of: <TempVarNade>>" "Top level entry-point for analysing temps within the hierarchy of blocks in the receiver's method. Answer the (possibly modified) sequence of temp vars. Need to hoist temps out of macro-optimized blocks into their actual blocks. Need to note reads and writes to temps from blocks other than their actual blocks to determine whether blocks can be local (simple slots within a block/method context) or remote (slots in indirection vectors that are shared between contexts by sharing indirection vectors). The algorithm is based on numbering temporary reads and writes and block extents. The index used for numbering starts at zero and is incremented on every block entry and block exit. So the following | a b blk r1 r2 t | a := 1. b := 2. t := 0. blk := [ | s | s := a + b. t := t + s]. r1 := blk value. b := -100. r2 := blk value. r1 -> r2 -> t is numbered as method block 0 to: 6: | a b blk r1 r2 t | a w@1 := 1. b w@1 := 2. t w@1 := 0. blk w@5 := [entry@2 | s | t w@3 := t r@3 + a r@3 + b r@3 ] exit@4. r1 w@5 := blk r@5 value. b w@5 := nil. r2 w@5 := blk r@5 value. r1 r@5 -> r2 r@5 -> t r@5 So: b and blk cannot be copied because for both there exists a write @5 that follows a read @4 within block 2 through 4 t must be remote because there exists a write @3 within block (2 to: 4) Complications are introduced by optimized blocks. In the following temp is written to after it is closed over by [ temp ] since the inlined block is executed more than once. | temp coll | coll := OrderedCollection new. 1 to: 5 do: [ :index | temp := index. coll add: [ temp ] ]. self assert: (coll collect: [:ea| ea value]) asArray = #(5 5 5 5 5) In the following i is local to the block and must be initialized each time around the loop but if the block is inlined it must be declared at method level. | col | col := OrderedCollection new. 1 to: 3 do: [ :each | | i | i := each. col add: [ i ]. i := i + 1 ]. self assert: (col collect: [ :each | each value ]) asArray = #(2 3 4)" self assert: (arguments isEmpty or: [arguments hasEqualElements: methodArguments]). arguments := methodArguments asArray. "won't change" self assert: (temporaries isNil or: [temporaries isEmpty or: [temporaries hasEqualElements: methodTemporaries]]). temporaries := OrderedCollection withAll: methodTemporaries. self assert: optimized not. "the top-level block should not be optimized." self analyseTempsWithin: self rootNode: rootNode assignmentPools: Dictionary new. "The top-level block needs to reindex temporaries since analysis may have rearranged them. This happens when temps are made remote and/or a remote node is added." temporaries withIndexDo: [:temp :offsetPlusOne| temp index: arguments size + offsetPlusOne - 1]. "Answer the (possibly modified) sequence of temps." ^temporaries asArray! Item was changed: + ----- Method: BlockNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'closure analysis') ----- - ----- Method: BlockNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'code generation (closures)') ----- analyseTempsWithin: scopeBlock "<BlockNode>" rootNode: rootNode "<MethodNode>" assignmentPools: assignmentPools "<Dictionary>" | effectiveScope blockStart | effectiveScope := optimized ifTrue: [actualScopeIfOptimized := scopeBlock] ifFalse: [self]. arguments ifNotNil: [arguments do: [:temp| temp definingScope: self]]. temporaries ifNotNil: [temporaries do: [:temp| temp definingScope: self]]. optimized ifFalse: "if optimized this isn't an actual scope" [rootNode noteBlockEntry: [:entryNumber| blockExtent := (blockStart := entryNumber) to: 0]]. "Need to enumerate a copy because closure analysis can add a statement via ifHasRemoteTempNodeEnsureInitializationStatementExists:." statements copy do: [:statement| statement analyseTempsWithin: effectiveScope rootNode: rootNode assignmentPools: assignmentPools]. optimized ifTrue: "if optimized loop need to add nils for any temps read before written" [optimizedMessageNode isOptimizedLoop ifTrue: [self nilReadBeforeWrittenTemps]] ifFalse: "if optimized this isn't an actual scope" [rootNode noteBlockExit: [:exitNumber| blockExtent := blockStart to: exitNumber]]. "Now that the analysis is done move any temps that need to be moved." self postNumberingProcessTempsWithin: effectiveScope rootNode: rootNode. "This is simply a nicety for compiler developers..." temporaries do: [:temp| (temp isIndirectTempVector and: [temp name includes: $?]) ifTrue: [temp name: temp definingScope remoteTempNodeName]]! Item was changed: + ----- Method: BlockNode>>blockExtent (in category 'closure analysis') ----- - ----- Method: BlockNode>>blockExtent (in category 'code generation (closures)') ----- blockExtent "^<Interval>" ^blockExtent! Item was changed: + ----- Method: BlockNode>>computeCopiedValues: (in category 'closure analysis') ----- - ----- Method: BlockNode>>computeCopiedValues: (in category 'code generation (closures)') ----- computeCopiedValues: rootNode | referencedValues | referencedValues := rootNode referencedValuesWithinBlockExtent: blockExtent. ^(referencedValues reject: [:temp| temp isDefinedWithinBlockExtent: blockExtent]) asArray sort: ParseNode tempSortBlock! Item was changed: + ----- Method: BlockNode>>deoptimize (in category 'closure analysis') ----- - ----- Method: BlockNode>>deoptimize (in category 'code generation (closures)') ----- deoptimize optimized := false. optimizedMessageNode := nil! Item was changed: + ----- Method: BlockNode>>ifHasRemoteTempNodeEnsureInitializationStatementExists: (in category 'closure analysis') ----- - ----- Method: BlockNode>>ifHasRemoteTempNodeEnsureInitializationStatementExists: (in category 'code generation (closures)') ----- ifHasRemoteTempNodeEnsureInitializationStatementExists: rootNode "If a remoteTempNode has been added ensure a statement exists to initialize it." remoteTempNode ~~ nil ifTrue: [(statements notEmpty and: [statements first isAssignmentNode and: [statements first variable isTemp and: [statements first variable isIndirectTempVector]]]) ifTrue: "If this is a decompiled tree, or if a temporary has been added later in the analysis then there already is a temp vector initialization node." [(statements first variable ~~ remoteTempNode) ifTrue: [statements first variable become: remoteTempNode]. statements first value numElements: remoteTempNode remoteTemps size] ifFalse: [statements addFirst: (remoteTempNode nodeToInitialize: rootNode encoder)]].! Item was changed: + ----- Method: BlockNode>>makeTemporariesRemovable (in category 'closure analysis') ----- - ----- Method: BlockNode>>makeTemporariesRemovable (in category 'code generation (closures)') ----- makeTemporariesRemovable "Utilities for when we want to remove some temporaries." temporaries isArray ifTrue: [temporaries := temporaries asOrderedCollection].! Item was changed: + ----- Method: BlockNode>>nilReadBeforeWrittenTemps (in category 'closure analysis') ----- - ----- Method: BlockNode>>nilReadBeforeWrittenTemps (in category 'code generation (closures)') ----- nilReadBeforeWrittenTemps | visitor readBeforeWritten | temporaries isEmpty ifTrue: [^self]. self accept: (visitor := OptimizedBlockLocalTempReadBeforeWrittenVisitor new). readBeforeWritten := visitor readBeforeWritten. temporaries reverseDo: [:temp| ((readBeforeWritten includes: temp) and: [temp isRemote not]) ifTrue: [statements addFirst: (AssignmentNode new variable: temp value: NodeNil)]]! Item was changed: + ----- Method: BlockNode>>noteOptimizedIn: (in category 'closure analysis') ----- - ----- Method: BlockNode>>noteOptimizedIn: (in category 'code generation (closures)') ----- noteOptimizedIn: anOptimizedMessageNode optimized := true. optimizedMessageNode := anOptimizedMessageNode! Item was changed: + ----- Method: BlockNode>>optimizedBlockHoistTempsInto: (in category 'closure analysis') ----- - ----- Method: BlockNode>>optimizedBlockHoistTempsInto: (in category 'code generation (closures)') ----- optimizedBlockHoistTempsInto: scopeBlock "<BlockNode>" "This is a No-op for all nodes except non-optimized BlockNodes." "Let's assume the special > 0 guard in MessageNode>>analyseTempsWithin:forValue:encoder: is correct. Then we can simply hoist our temps up." self assert: (arguments isNil or: [arguments size <= 1]). (arguments notNil and: [arguments notEmpty]) ifTrue: [scopeBlock addHoistedTemps: arguments. arguments := #()]. temporaries notEmpty ifTrue: [scopeBlock addHoistedTemps: temporaries. temporaries := #()]! Item was changed: + ----- Method: BlockNode>>postNumberingProcessTempsWithin:rootNode: (in category 'closure analysis') ----- - ----- Method: BlockNode>>postNumberingProcessTempsWithin:rootNode: (in category 'code generation (closures)') ----- postNumberingProcessTempsWithin: scopeBlock "<BlockNode>" rootNode: rootNode "<MethodNode>" "A temp can be local (and copied) if it is not written to after it is captured. A temp cannot be local if it is written to remotely. Need to enumerate a copy of the temporaries because any temps becoming remote will be removed from temporaries in analyseClosure: (and a single remote temp node will get added)" temporaries copy do: [:each| each isIndirectTempVector ifFalse: [each analyseClosure: rootNode]]. "If this is an optimized node we need to hoist temporaries up into the relevant block scope." optimized ifTrue: [self optimizedBlockHoistTempsInto: scopeBlock]. "Now we may have added a remoteTempNode. So we need a statement to initialize it." self ifHasRemoteTempNodeEnsureInitializationStatementExists: rootNode. "Now add all arguments and locals to the pool so that copiedValues can be computed during sizing." rootNode addLocalsToPool: arguments; addLocalsToPool: temporaries! Item was changed: + ----- Method: BlockNode>>reindexingLocalsDo:encoder: (in category 'closure analysis') ----- - ----- Method: BlockNode>>reindexingLocalsDo:encoder: (in category 'code generation (closures)') ----- reindexingLocalsDo: aBlock encoder: encoderOrNil "Evaluate aBlock wih arguments, temporaries and copiedValues reindexed for their positions within the receiver's block, restoring the correct indices afterwards. If encoder is not nil remember the temps for this block's extent." | tempIndices result tempsToReindex | self assert: copiedValues notNil. tempsToReindex := arguments asArray, copiedValues, temporaries. tempIndices := tempsToReindex collect: [:temp| temp index]. tempsToReindex withIndexDo: [:temp :newIndex| temp index: newIndex - 1. self assert: temp index + 1 = newIndex]. encoderOrNil ifNotNil: [encoderOrNil noteBlockExtent: blockExtent hasLocals: tempsToReindex]. result := aBlock ensure: ["Horribly pragmatic hack. The copiedValues will have completely unrelated indices within the closure method and sub-method. Avoiding the effort of rebinding temps in the inner scope simply update the indices to their correct ones during the generation of the closure method and restore the indices immedately there-after." tempsToReindex with: tempIndices do: [:temp :oldIndex| temp index: oldIndex. self assert: temp index = oldIndex]]. ^result! Item was changed: + ----- Method: BlockNode>>remoteTempNodeName (in category 'closure analysis') ----- - ----- Method: BlockNode>>remoteTempNodeName (in category 'code generation (closures)') ----- remoteTempNodeName "Answer a useful name for a RemoteTempVectorNode in the receiver." | prefix scope extent | prefix := actualScopeIfOptimized ifNil: ['<'] ifNotNil: [ '<...']. scope := self. [extent := scope blockExtent. extent == nil and: [scope actualScope ~~ scope]] whileTrue: [scope := scope actualScope]. ^extent ifNil: [prefix, '?-?>'] ifNotNil: [prefix, extent first printString, '-', (extent last isZero ifTrue: ['?'] ifFalse: [extent last printString]), '>']! Item was changed: + ----- Method: BlockNode>>removeTempNode:ifAbsent: (in category 'closure analysis') ----- - ----- Method: BlockNode>>removeTempNode:ifAbsent: (in category 'code generation (closures)') ----- removeTempNode: aTempVariableNode ifAbsent: aBlock "Utilities for when we want to remove some temporaries." self makeTemporariesRemovable. ^temporaries remove: aTempVariableNode ifAbsent: aBlock ! Item was changed: + ----- Method: BraceNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'closure analysis') ----- - ----- Method: BraceNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'code generation (closures)') ----- analyseTempsWithin: scopeBlock "<BlockNode>" rootNode: rootNode "<MethodNode>" assignmentPools: assignmentPools "<Dictionary>" elements do: [:node| node analyseTempsWithin: scopeBlock rootNode: rootNode assignmentPools: assignmentPools]! Item was changed: + ----- Method: CascadeNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'closure analysis') ----- - ----- Method: CascadeNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'code generation (closures)') ----- analyseTempsWithin: scopeBlock "<BlockNode>" rootNode: rootNode "<MethodNode>" assignmentPools: assignmentPools "<Dictionary>" { receiver }, messages do: [:node| node analyseTempsWithin: scopeBlock rootNode: rootNode assignmentPools: assignmentPools]! Item was changed: + ----- Method: FutureNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'closure analysis') ----- - ----- Method: FutureNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'code generation (closures)') ----- analyseTempsWithin: scopeBlock "<BlockNode>" rootNode: rootNode "<MethodNode>" assignmentPools: assignmentPools "<Dictionary>" { receiver. futureDelta }, (futureArgs ifNil: [#()]) do: [:node| node == nil ifFalse: [node analyseTempsWithin: scopeBlock rootNode: rootNode assignmentPools: assignmentPools]]! Item was changed: + ----- Method: LeafNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'closure analysis') ----- - ----- Method: LeafNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'code generation (closures)') ----- analyseTempsWithin: scopeBlock "<BlockNode>" rootNode: rootNode "<MethodNode>" assignmentPools: assignmentPools "<Dictionary>" "This is a no-op except in TempVariableNode" ^self! Item was changed: + ----- Method: MessageNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'closure analysis') ----- - ----- Method: MessageNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'code generation (closures)') ----- analyseTempsWithin: scopeBlock "<BlockNode>" rootNode: rootNode "<MethodNode>" assignmentPools: assignmentPools "<Dictionary>" "Assignments within optimized loops are tricky. Because a loop repeats a write to a temporary in an optimized loop effectively occurs after the loop. To handle this collect the set of temps assigned to in optimized loops and add extra writes after traversing the optimized loop constituents." | writtenToTemps | self isOptimizedLoop ifTrue: [{ receiver }, arguments do: [:node| (node notNil and: [node isBlockNode and: [node optimized]]) ifTrue: [assignmentPools at: node put: Set new]]]. "receiver is nil in cascades" receiver == nil ifFalse: [receiver analyseTempsWithin: scopeBlock rootNode: rootNode assignmentPools: assignmentPools]. arguments do: [:node| node == nil ifFalse: "last argument of optimized to:do: can be nil" [node analyseTempsWithin: scopeBlock rootNode: rootNode assignmentPools: assignmentPools]]. "Add assignments representing subsequent iterations and redo the closure analysis for the written-to temps." self isOptimizedLoop ifTrue: [writtenToTemps := Set new. { receiver }, arguments do: [:node| (node notNil and: [node isBlockNode and: [node optimized]]) ifTrue: [(assignmentPools removeKey: node) do: [:temp| temp isBlockArg ifFalse: "ignore added assignments to to:do: loop args" [writtenToTemps add: temp. temp addWriteWithin: node at: rootNode locationCounter]]]]. writtenToTemps isEmpty ifFalse: [(writtenToTemps sorted: ParseNode tempSortBlock) do: [:each| each analyseClosure: rootNode]. (writtenToTemps collect: [:each| each definingScope]) do: [:blockNode| blockNode ifHasRemoteTempNodeEnsureInitializationStatementExists: rootNode]]]! Item was changed: + ----- Method: MethodNode>>addLocalsToPool: (in category 'closure analysis') ----- - ----- Method: MethodNode>>addLocalsToPool: (in category 'code generation (closures)') ----- addLocalsToPool: locals "<Set of: TempVariableNode>" localsPool isNil ifTrue: [localsPool := IdentitySet new]. localsPool addAll: locals! Item was changed: + ----- Method: MethodNode>>ensureClosureAnalysisDone (in category 'closure analysis') ----- - ----- Method: MethodNode>>ensureClosureAnalysisDone (in category 'code generation (closures)') ----- ensureClosureAnalysisDone block blockExtent ifNil: [temporaries := block analyseArguments: arguments temporaries: temporaries rootNode: self]! Item was changed: ----- Method: MethodNode>>generate:using: (in category 'code generation') ----- generate: trailer using: aCompiledMethodClass "The receiver is the root of a parse tree. Answer an instance of aCompiledMethodClass. The argument, trailer, is arbitrary but is typically either the reference to the source code that is stored with every CompiledMethod, or an encoding of the method's temporary names." + | method | - | primErrNode blkSize nLits locals literals stack header method | self generate: trailer using: aCompiledMethodClass ifQuick: [:m | + m literalAt: 2 put: encoder associationForClass; - encoder noteBlockExtent: (0 to: 2) hasLocals: arguments. - m literalAt: 2 put: encoder associationForClass; properties: properties. + ^m]. + method := encoder generateMethodOfClass: aCompiledMethodClass trailer: trailer from: self. - ^m]. - primErrNode := self primitiveErrorVariableName ifNotNil: - [encoder fixTemp: self primitiveErrorVariableName]. - self ensureClosureAnalysisDone. - encoder rootNode: self. "this is for BlockNode>>sizeCodeForClosureValue:" - blkSize := (block sizeCodeForEvaluatedValue: encoder) - + (primitive > 0 - ifTrue: [encoder sizeCallPrimitive: primitive] - ifFalse: [0]) - + (primErrNode - ifNil: [0] - ifNotNil: - [primErrNode - index: arguments size + temporaries size; - sizeCodeForStore: encoder "The VM relies on storeIntoTemp: (129)"]). - locals := arguments, temporaries, (primErrNode ifNil: [#()] ifNotNil: [{primErrNode}]). - encoder noteBlockExtent: block blockExtent hasLocals: locals. - header := encoder computeMethodHeaderForNumArgs: arguments size - numTemps: locals size - numLits: (nLits := (literals := encoder allLiterals) size) - primitive: primitive. - method := trailer - createMethod: blkSize - class: aCompiledMethodClass - header: header. - 1 to: nLits do: [:lit | method literalAt: lit put: (literals at: lit)]. - encoder streamToMethod: method. - stack := ParseStack new init. - primitive > 0 ifTrue: - [encoder genCallPrimitive: primitive. - primErrNode ifNotNil: - [primErrNode emitCodeForStore: stack encoder: encoder]]. - stack position: method numTemps. - [block emitCodeForEvaluatedValue: stack encoder: encoder] - on: Error "If an attempt is made to write too much code the method will be asked" - do: [:ex| "to grow, and the grow attempt will fail in CompiledMethod class>>#new:" - ex signalerContext sender method = (CompiledMethod class>>#new:) - ifTrue: [^self error: 'Compiler code size discrepancy'] - ifFalse: [ex pass]]. - stack position ~= (method numTemps + 1) ifTrue: - [^self error: 'Compiler stack discrepancy']. - encoder methodStreamPosition ~= (method size - trailer size) ifTrue: - [^self error: 'Compiler code size discrepancy']. - method needsFrameSize: stack size - method numTemps. method properties: properties. ^method! Item was changed: + ----- Method: MethodNode>>locationCounter (in category 'closure analysis') ----- - ----- Method: MethodNode>>locationCounter (in category 'code generation (closures)') ----- locationCounter ^locationCounter! Item was changed: + ----- Method: MethodNode>>noteBlockEntry: (in category 'closure analysis') ----- - ----- Method: MethodNode>>noteBlockEntry: (in category 'code generation (closures)') ----- noteBlockEntry: aBlock "Evaluate aBlock with the numbering for the block entry." locationCounter isNil ifTrue: [locationCounter := -1]. aBlock value: locationCounter + 1. locationCounter := locationCounter + 2! Item was changed: + ----- Method: MethodNode>>noteBlockExit: (in category 'closure analysis') ----- - ----- Method: MethodNode>>noteBlockExit: (in category 'code generation (closures)') ----- noteBlockExit: aBlock "Evaluate aBlock with the numbering for the block exit." aBlock value: locationCounter + 1. locationCounter := locationCounter + 2! Item was changed: + ----- Method: MethodNode>>referencedValuesWithinBlockExtent: (in category 'closure analysis') ----- - ----- Method: MethodNode>>referencedValuesWithinBlockExtent: (in category 'code generation (closures)') ----- referencedValuesWithinBlockExtent: anInterval ^(localsPool select: [:temp| temp isReferencedWithinBlockExtent: anInterval]) collect: [:temp| temp isRemote ifTrue: [temp remoteNode] ifFalse: [temp]]! Item was changed: + ----- Method: NewArrayNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'closure analysis') ----- - ----- Method: NewArrayNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'code generation (closures)') ----- analyseTempsWithin: scopeBlock "<BlockNode>" rootNode: rootNode "<MethodNode>" assignmentPools: assignmentPools "<Dictionary>" "This is a no-op except in TempVariableNode" ^self! Item was changed: + ----- Method: RemoteTempVectorNode>>addRemoteTemp:encoder: (in category 'closure analysis') ----- - ----- Method: RemoteTempVectorNode>>addRemoteTemp:encoder: (in category 'code generation (closures)') ----- addRemoteTemp: aTempVariableNode encoder: encoder remoteTemps ifNil: [remoteTemps := OrderedCollection new]. remoteTemps addLast: aTempVariableNode. aTempVariableNode referenceScopesAndIndicesDo: [:scopeBlock "<BlockNode>" :location "<Integer>"| self addReadWithin: scopeBlock at: location]! Item was changed: + ----- Method: RemoteTempVectorNode>>isIndirectTempVector (in category 'closure analysis') ----- - ----- Method: RemoteTempVectorNode>>isIndirectTempVector (in category 'code generation (closures)') ----- isIndirectTempVector ^true! Item was changed: + ----- Method: RemoteTempVectorNode>>referenceScopesAndIndicesDo: (in category 'closure analysis') ----- - ----- Method: RemoteTempVectorNode>>referenceScopesAndIndicesDo: (in category 'code generation (closures)') ----- referenceScopesAndIndicesDo: aBinaryBlock self shouldNotImplement! Item was changed: + ----- Method: ReturnNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'closure analysis') ----- - ----- Method: ReturnNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'code generation (closures)') ----- analyseTempsWithin: scopeBlock "<BlockNode>" rootNode: rootNode "<MethodNode>" assignmentPools: assignmentPools "<Dictionary>" "Note we could do this: scopeBlock ~~ rootNode block ifTrue: [scopeBlock noteNonLocalReturn]. and pass up the flag in <BlockNode>>>analyseTempsWithin:rootNode: which may be fast but will also give less information the debugger. For now we consider clean blocks a premature optimization." self flag: 'consider clean blocks'. expr analyseTempsWithin: scopeBlock rootNode: rootNode assignmentPools: assignmentPools! Item was changed: + ----- Method: TempVariableNode>>absorbHoistedTemp: (in category 'closure analysis') ----- - ----- Method: TempVariableNode>>absorbHoistedTemp: (in category 'code generation (closures)') ----- absorbHoistedTemp: aTempVar "Collapse aTempVar into the receiver, being sure to update any closure analysis." aTempVar copyScopeAccessTo: self. aTempVar becomeForward: self! Item was changed: + ----- Method: TempVariableNode>>addReadWithin:at: (in category 'closure analysis') ----- - ----- Method: TempVariableNode>>addReadWithin:at: (in category 'code generation (closures)') ----- addReadWithin: scopeBlock "<BlockNode>" at: location "<Integer>" readingScopes ifNil: [readingScopes := Dictionary new]. (readingScopes at: scopeBlock ifAbsentPut: [Set new]) add: location. remoteNode ifNotNil: [remoteNode addReadWithin: scopeBlock at: location]! Item was changed: + ----- Method: TempVariableNode>>addWriteWithin:at: (in category 'closure analysis') ----- - ----- Method: TempVariableNode>>addWriteWithin:at: (in category 'code generation (closures)') ----- addWriteWithin: scopeBlock "<BlockNode>" at: location "<Integer>" writingScopes ifNil: [writingScopes := Dictionary new]. (writingScopes at: scopeBlock ifAbsentPut: [Set new]) add: location. remoteNode ifNotNil: [remoteNode addReadWithin: scopeBlock at: location]! Item was changed: + ----- Method: TempVariableNode>>analyseClosure: (in category 'closure analysis') ----- - ----- Method: TempVariableNode>>analyseClosure: (in category 'code generation (closures)') ----- analyseClosure: rootNode "<MethodNode>" "Analyse whether the temporary needs to be made remote or not, and answer whether it was made remote. A temp cannot be local if it is written to remotely, or if it is written to after it is closed-over. An exception is an inlined block argument that appears to be written remotely but is actually local to a block." | latestWrite | self isBlockArg ifTrue: [^false]. remoteNode ifNotNil: [^false]. "If already remote, don't remote a second time" latestWrite := 0. ((writingScopes notNil and: [writingScopes associations anySatisfy: [:assoc| [:blockScope :refs| refs do: [:write| latestWrite := write max: latestWrite]. "A temp cannot be local if it is written to remotely." blockScope actualScope ~~ definingScope actualScope] value: assoc key value: assoc value]]) or: [readingScopes notNil and: [readingScopes associations anySatisfy: [:assoc| [:blockScope :refs| "A temp cannot be local if it is written to after it is closed-over." blockScope actualScope ~~ definingScope actualScope and: [refs anySatisfy: [:read| read < latestWrite]]] value: assoc key value: assoc value]]]) ifTrue: [remoteNode := definingScope addRemoteTemp: self rootNode: rootNode. ^true]. ^false! Item was changed: + ----- Method: TempVariableNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'closure analysis') ----- - ----- Method: TempVariableNode>>analyseTempsWithin:rootNode:assignmentPools: (in category 'code generation (closures)') ----- analyseTempsWithin: scopeBlock "<BlockNode>" rootNode: rootNode "<MethodNode>" assignmentPools: assignmentPools "<Dictionary>" self addReadWithin: scopeBlock at: rootNode locationCounter! Item was changed: + ----- Method: TempVariableNode>>beingAssignedToAnalyseTempsWithin:rootNode:assignmentPools: (in category 'closure analysis') ----- - ----- Method: TempVariableNode>>beingAssignedToAnalyseTempsWithin:rootNode:assignmentPools: (in category 'code generation (closures)') ----- beingAssignedToAnalyseTempsWithin: scopeBlock "<BlockNode>" rootNode: rootNode "<MethodNode>" assignmentPools: assignmentPools "<Dictionary>" self addWriteWithin: scopeBlock at: rootNode locationCounter. "For analysis of optimized blocks also record the set of temporaries written to within optimized blocks so that additional writes can be added at locations that represent subsequent iterations of the loop. e.g. testInlineBlockCollectionSD1" assignmentPools keysAndValuesDo: [:outerScopeBlock :set| "definingScope can be nil in expr in expr ifNil: [:arg|...] expressions because arg gets its definingScope set when [:arg|...] is analysed." outerScopeBlock actualScope = (definingScope ifNil: [scopeBlock] ifNotNil: [definingScope actualScope]) ifTrue: [set add: self]]! Item was changed: + ----- Method: TempVariableNode>>copyScopeAccessTo: (in category 'closure analysis') ----- - ----- Method: TempVariableNode>>copyScopeAccessTo: (in category 'code generation (closures)') ----- copyScopeAccessTo: aTempVar "For absorbHoistedTemp:, copy the receiver's reads and writes into the record in aTempVar." readingScopes ifNotNil: [readingScopes keysAndValuesDo: [:scopeBlock :reads| reads do: [:location| aTempVar addReadWithin: scopeBlock "<BlockNode>" at: location]]]. writingScopes ifNotNil: [writingScopes keysAndValuesDo: [:scopeBlock :writes| writes do: [:location| aTempVar addWriteWithin: scopeBlock "<BlockNode>" at: location]]]! Item was changed: + ----- Method: TempVariableNode>>definingScope (in category 'closure analysis') ----- - ----- Method: TempVariableNode>>definingScope (in category 'code generation (closures)') ----- definingScope ^definingScope! Item was changed: + ----- Method: TempVariableNode>>definingScope: (in category 'closure analysis') ----- - ----- Method: TempVariableNode>>definingScope: (in category 'code generation (closures)') ----- definingScope: scopeBlock "<BlockNode>" definingScope = scopeBlock ifTrue: [^ self]. "No need to bail" definingScope ifNotNil: [self error: 'temp has more than one defining scope. This is probably a parser error']. definingScope := scopeBlock! Item was changed: + ----- Method: TempVariableNode>>index: (in category 'closure analysis') ----- - ----- Method: TempVariableNode>>index: (in category 'code generation (closures)') ----- index: anInteger "For renumbering temps in the closure compiler." index := anInteger. code := self code: index type: LdTempType! Item was changed: + ----- Method: TempVariableNode>>isDefinedWithinBlockExtent: (in category 'closure analysis') ----- - ----- Method: TempVariableNode>>isDefinedWithinBlockExtent: (in category 'code generation (closures)') ----- isDefinedWithinBlockExtent: anInterval ^anInterval rangeIncludes: definingScope actualScope blockExtent first! Item was changed: + ----- Method: TempVariableNode>>isIndirectTempVector (in category 'closure analysis') ----- - ----- Method: TempVariableNode>>isIndirectTempVector (in category 'code generation (closures)') ----- isIndirectTempVector ^false! Item was changed: + ----- Method: TempVariableNode>>isReferencedWithinBlockExtent: (in category 'closure analysis') ----- - ----- Method: TempVariableNode>>isReferencedWithinBlockExtent: (in category 'code generation (closures)') ----- isReferencedWithinBlockExtent: anInterval readingScopes ~~ nil ifTrue: [readingScopes do: [:set "<Set of <Integer>>"| set do: [:location| (anInterval rangeIncludes: location) ifTrue: [^true]]]]. writingScopes ~~ nil ifTrue: [writingScopes do: [:set "<Set of <Integer>>"| set do: [:location| (anInterval rangeIncludes: location) ifTrue: [^true]]]]. ^false! Item was changed: + ----- Method: TempVariableNode>>referenceScopesAndIndicesDo: (in category 'closure analysis') ----- - ----- Method: TempVariableNode>>referenceScopesAndIndicesDo: (in category 'code generation (closures)') ----- referenceScopesAndIndicesDo: aBinaryBlock "Evaluate aBinaryBlock with all read or write scopes and locations. This is used to copy the reference information into RemoteTempVectorNodes" readingScopes ~~ nil ifTrue: [readingScopes keysAndValuesDo: [:scopeBlock "<BlockNode>" :set "<Set of <Integer>>"| set do: [:location| aBinaryBlock value: scopeBlock value: location]]]. writingScopes ~~ nil ifTrue: [writingScopes keysAndValuesDo: [:scopeBlock "<BlockNode>" :set "<Set of <Integer>>"| set do: [:location| aBinaryBlock value: scopeBlock value: location]]]! Item was changed: + ----- Method: VariableNode>>beingAssignedToAnalyseTempsWithin:rootNode:assignmentPools: (in category 'closure analysis') ----- - ----- Method: VariableNode>>beingAssignedToAnalyseTempsWithin:rootNode:assignmentPools: (in category 'code generation (closures)') ----- beingAssignedToAnalyseTempsWithin: scopeBlock "<BlockNode>" rootNode: rootNode "<MethodNode>" assignmentPools: assignmentPools "<Dictionary>" "No-op overridden by TempVariableNode"!

1 0

The Trunk: Compiler-eem.342.mcz
by commits＠source.squeak.org 06 Apr '17

06 Apr '17

Eliot Miranda uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-eem.342.mcz ==================== Summary ==================== Name: Compiler-eem.342 Author: eem Time: 5 April 2017, 6:17:30.333161 pm UUID: 6a05266a-a653-41b9-bd16-577f666b4c98 Ancestors: Compiler-eem.341 Remove most of, if not all, old pre-closure-bytecode and blue-book block support from the compiler. Recategorize code generation (size & emit methods) under "code generation", leaving closure analysis in "code generation (closures)" (to be changed later). Eliminate the short-0form brace node creation code (which has used the cons array bytecode since the closure bytecodes). =============== Diff against Compiler-eem.341 =============== Item was changed: + ----- Method: BlockNode>>constructClosureCreationNode: (in category 'code generation') ----- - ----- Method: BlockNode>>constructClosureCreationNode: (in category 'code generation (closures)') ----- constructClosureCreationNode: encoder copiedValues := self computeCopiedValues: encoder rootNode. + ^self ensureClosureCreationNode! - encoder supportsClosureOpcodes ifTrue: - [^self closureCreationNode]. - "Without the bytecode we can still get by." - ^MessageNode new - receiver: (encoder encodeVariable: 'thisContext') - selector: #closureCopy:copiedValues: - arguments: (Array - with: (encoder encodeLiteral: arguments size) - with: (copiedValues isEmpty - ifTrue: [NodeNil] - ifFalse: [BraceNode new elements: copiedValues])) - precedence: 3 - from: encoder! Item was removed: - ----- Method: BlockNode>>emitCodeForClosureValue:encoder: (in category 'code generation (closures)') ----- - emitCodeForClosureValue: stack encoder: encoder - "if not supportsClosureOpcodes closureCreationSupportNode is the - node for thisContext closureCopy: numArgs [ copiedValues: { values } ]" - encoder supportsClosureOpcodes - ifTrue: - [copiedValues do: - [:copiedValue| copiedValue emitCodeForValue: stack encoder: encoder]. - closureCreationNode pc: encoder methodStreamPosition + 1. - encoder - genPushClosureCopyNumCopiedValues: copiedValues size - numArgs: arguments size - jumpSize: size. - stack - pop: copiedValues size; - push: 1] - ifFalse: - [closureCreationNode emitCodeForValue: stack encoder: encoder. - encoder genJumpLong: size]. "Force a two byte jump." - "Emit the body of the block" - self emitCodeForEvaluatedClosureValue: stack encoder: encoder! Item was changed: + ----- Method: BlockNode>>emitCodeForEvaluatedClosureValue:encoder: (in category 'code generation') ----- - ----- Method: BlockNode>>emitCodeForEvaluatedClosureValue:encoder: (in category 'code generation (closures)') ----- emitCodeForEvaluatedClosureValue: stack encoder: encoder | position | position := stack position. stack position: arguments size + temporaries size + copiedValues size. encoder genPushNClosureTemps: temporaries size. self reindexingLocalsDo: [self emitCodeForEvaluatedValue: stack encoder: encoder] encoder: encoder. self returns ifFalse: [encoder genReturnTopToCaller. pc := encoder methodStreamPosition]. stack position: position! Item was changed: ----- Method: BlockNode>>emitCodeForValue:encoder: (in category 'code generation') ----- emitCodeForValue: stack encoder: encoder + copiedValues do: + [:copiedValue| copiedValue emitCodeForValue: stack encoder: encoder]. + closureCreationNode pc: encoder methodStreamPosition + 1. + encoder + genPushClosureCopyNumCopiedValues: copiedValues size + numArgs: arguments size + jumpSize: size. + stack + pop: copiedValues size; + push: 1. + "Emit the body of the block" + self emitCodeForEvaluatedClosureValue: stack encoder: encoder! - - self generateAsClosure ifTrue: - [^self emitCodeForClosureValue: stack encoder: encoder]. - encoder genPushThisContext. - stack push: 1. - nArgsNode emitCodeForValue: stack encoder: encoder. - remoteCopyNode - emitCode: stack - args: 1 - encoder: encoder. - "Force a two byte jump." - encoder genJumpLong: size. - stack push: arguments size. - arguments reverseDo: [:arg | arg emitCodeForStorePop: stack encoder: encoder]. - self emitCodeForEvaluatedValue: stack encoder: encoder. - self returns ifFalse: - [encoder genReturnTopToCaller. - pc := encoder methodStreamPosition]. - stack pop: 1! Item was added: + ----- Method: BlockNode>>ensureClosureCreationNode (in category 'accessing') ----- + ensureClosureCreationNode + closureCreationNode ifNil: + [closureCreationNode := LeafNode new + key: #closureCreationNode + code: nil]. + ^closureCreationNode! Item was removed: - ----- Method: BlockNode>>generateAsClosure (in category 'testing') ----- - generateAsClosure - "Answer if we're compiling under the closure regime. If blockExtent has been set by - analyseTempsWithin:rootNode: et al then we're compiling under the closure regime." - ^blockExtent ~~ nil! Item was changed: ----- Method: BlockNode>>noteSourceRangeStart:end:encoder: (in category 'initialize-release') ----- noteSourceRangeStart: start end: end encoder: encoder "Note two source ranges for this node. One is for the debugger and is of the last expression, the result of the block. One is for source analysis and is for the entire block." encoder noteSourceRange: (start to: end) + forNode: self ensureClosureCreationNode. - forNode: self closureCreationNode. startOfLastStatement ifNil: [encoder noteSourceRange: (start to: end) forNode: self] ifNotNil: [encoder noteSourceRange: (startOfLastStatement to: end - 1) forNode: self]! Item was removed: - ----- Method: BlockNode>>sizeCodeForClosureValue: (in category 'code generation (closures)') ----- - sizeCodeForClosureValue: encoder - "Compute the size for the creation of the block and its code." - "If we have the closure bytecodes constructClosureCreationNode: will note - the copied values in the copiedValues inst var and answer #pushCopiedValues." - closureCreationNode := self constructClosureCreationNode: encoder. - "Remember size of body for emit time so we know the size of the jump around it." - size := self sizeCodeForEvaluatedClosureValue: encoder. - ^encoder supportsClosureOpcodes - ifTrue: - [(copiedValues inject: 0 into: [:sum :node| sum + (node sizeCodeForValue: encoder)]) - + (encoder sizePushClosureCopyNumCopiedValues: copiedValues size numArgs: arguments size jumpSize: size) - + size] - ifFalse: - ["closureCreationSupportNode is send closureCopy:copiedValues:" - (closureCreationNode sizeCodeForValue: encoder) - + (encoder sizeJumpLong: size) - + size]! Item was changed: + ----- Method: BlockNode>>sizeCodeForEvaluatedClosureValue: (in category 'code generation') ----- - ----- Method: BlockNode>>sizeCodeForEvaluatedClosureValue: (in category 'code generation (closures)') ----- sizeCodeForEvaluatedClosureValue: encoder "The closure value primitives push the arguments and the copied values. The compiler guarantees that any copied values come before all local temps. So on closure activation we only need to push nils for the remaining temporaries." ^(encoder sizePushNClosureTemps: temporaries size) + (self reindexingLocalsDo: [self sizeCodeForEvaluatedValue: encoder] encoder: nil "don't store temps yet") + (self returns ifTrue: [0] ifFalse: [encoder sizeReturnTopToCaller])! Item was changed: ----- Method: BlockNode>>sizeCodeForValue: (in category 'code generation') ----- sizeCodeForValue: encoder + "Compute the size for the creation of the block and its code." + copiedValues := self computeCopiedValues: encoder rootNode. + self ensureClosureCreationNode. + "Remember size of body for emit time so we know the size of the jump around it." + size := self sizeCodeForEvaluatedClosureValue: encoder. + ^(copiedValues inject: 0 into: [:sum :node| sum + (node sizeCodeForValue: encoder)]) + + (encoder sizePushClosureCopyNumCopiedValues: copiedValues size numArgs: arguments size jumpSize: size) + + size! - self generateAsClosure ifTrue: - [^self sizeCodeForClosureValue: encoder]. - - nArgsNode := encoder encodeLiteral: arguments size. - remoteCopyNode := encoder encodeSelector: #blockCopy:. - size := self sizeCodeForEvaluatedValue: encoder. - self returns ifFalse: - [size := size + encoder sizeReturnTopToCaller]. "endBlock" - arguments := arguments collect: "Chance to prepare debugger remote temps" - [:arg | arg asStorableNode: encoder]. - arguments do: [:arg | size := size + (arg sizeCodeForStorePop: encoder)]. - ^encoder sizePushThisContext - + (nArgsNode sizeCodeForValue: encoder) - + (remoteCopyNode sizeCode: encoder args: 1 super: false) - + (encoder sizeJumpLong: size) - + size! Item was changed: + ----- Method: BraceNode>>elements (in category 'code generation') ----- - ----- Method: BraceNode>>elements (in category 'code generation (closures)') ----- elements ^elements! Item was changed: ----- Method: BraceNode>>emitCodeForValue:encoder: (in category 'code generation') ----- emitCodeForValue: stack encoder: encoder + "Hack; when sizing we have no way of knowing how much stack space is available." + elements size <= self maxElementsForConsArray ifTrue: - - (encoder supportsClosureOpcodes - "Hack; we have no way of knowing how much stack space is available" - and: [elements size <= self maxElementsForConsArray]) ifTrue: [elements do: [:node| node emitCodeForValue: stack encoder: encoder]. encoder genPushConsArray: elements size. stack pop: elements size; push: 1. ^self]. ^emitNode emitCodeForValue: stack encoder: encoder! Item was changed: + ----- Method: BraceNode>>maxElementsForConsArray (in category 'code generation') ----- - ----- Method: BraceNode>>maxElementsForConsArray (in category 'code generation (closures)') ----- maxElementsForConsArray "Hack; we have no way of knowing how much stack space is available during sizing" ^8! Item was changed: ----- Method: BraceNode>>sizeCodeForValue: (in category 'code generation') ----- sizeCodeForValue: encoder + "Hack; we have no way of knowing how much stack space is available." + elements size <= self maxElementsForConsArray ifTrue: - (encoder supportsClosureOpcodes - "Hack; we have no way of knowing how much stack space is available" - and: [elements size <= self maxElementsForConsArray]) ifTrue: [^(elements inject: 0 into: [:sum :node| sum + (node sizeCodeForValue: encoder)]) + (encoder sizePushConsArray: elements size)]. + "Long form: (Array braceStream: N) nextPut: a; nextPut: b; ...; braceArray" + emitNode := CascadeNode new - emitNode := elements size <= 4 - ifTrue: ["Short form: Array braceWith: a with: b ... " - MessageNode new - receiver: (encoder encodeVariable: #Array) - selector: (self selectorForShortForm: elements size) - arguments: elements precedence: 3 from: encoder] - ifFalse: ["Long form: (Array braceStream: N) nextPut: a; nextPut: b; ...; braceArray" - CascadeNode new receiver: (MessageNode new receiver: (encoder encodeVariable: #Array) selector: #braceStream: + arguments: {encoder encodeLiteral: elements size} - arguments: (Array with: (encoder encodeLiteral: elements size)) precedence: 3 from: encoder) + messages: ((elements collect: [:elt | + MessageNode new + receiver: nil + selector: #nextPut: + arguments: {elt} + precedence: 3 + from: encoder]) + copyWith: (MessageNode new + receiver: nil + selector: #braceArray + arguments: #() + precedence: 1 + from: encoder)). - messages: ((elements collect: [:elt | MessageNode new receiver: nil - selector: #nextPut: - arguments: (Array with: elt) - precedence: 3 from: encoder]) - copyWith: (MessageNode new receiver: nil - selector: #braceArray - arguments: (Array new) - precedence: 1 from: encoder))]. ^emitNode sizeCodeForValue: encoder! Item was changed: ----- Method: BytecodeEncoder>>bindBlockArg:within: (in category 'temps') ----- bindBlockArg: name within: aBlockNode - "Read the comment in the superclass's method. - If we have closures we should check the argument - count against the block, not the method. - - (Note that this isn't entirely adequate either since optimized blocks - will slip through the cracks (their arguments (i.e. ifNotNil: [:expr|) - are charged against their enclosing block, not themselves))." | nArgs | - self supportsClosureOpcodes ifFalse: - [^super bindBlockArg: name within: aBlockNode]. (nArgs := aBlockNode nArgsSlot) isNil ifTrue: [aBlockNode nArgsSlot: (nArgs := 0)]. + nArgs >= 15 ifTrue: - nArgs >= 15 ifTrue: [^self notify: 'Too many arguments']. aBlockNode nArgsSlot: nArgs + 1. ^(self bindTemp: name) beBlockArg; nowHasDef; nowHasRef; yourself! Item was changed: ----- Method: BytecodeEncoder>>bindBlockTemp:within: (in category 'temps') ----- bindBlockTemp: name within: aBlockNode - "Read the comment in the superclass's bindBlockArg:within: method. - If we have closures we should check the argument - count against the block, not the method. - - (Note that this isn't entirely adequate either since optimized blocks - will slip through the cracks (their arguments (i.e. ifNotNil: [:expr|) - are charged against their enclosing block, not themselves))." | nArgs | + (nArgs := aBlockNode nArgsSlot) ifNil: - self supportsClosureOpcodes ifFalse: - [^super bindBlockTemp: name within: aBlockNode]. - (nArgs := aBlockNode nArgsSlot) isNil ifTrue: [aBlockNode nArgsSlot: (nArgs := 0)]. nArgs >= (CompiledMethod fullFrameSize - 1) ifTrue: [^self notify: 'Too many temporaries']. aBlockNode nArgsSlot: nArgs + 1. ^self bindTemp: name! Item was changed: ----- Method: BytecodeEncoder>>bindTemp: (in category 'temps') ----- bindTemp: name + "Declare a temporary; error not if a field or class variable or out-of-scope temp." - "Declare a temporary; error not if a field or class variable or out-of-scope temp. - Read the comment in Encoder>>bindBlockArg:within: and subclass implementations." - self supportsClosureOpcodes ifFalse: - [^super bindTemp: name]. scopeTable at: name ifPresent: [:node| "When non-interactive raise the error only if it is a duplicate" node isTemp ifTrue:[node scope >= 0 ifTrue: [^self notify: 'Name already used in this method']] ifFalse:[self warnAboutShadowed: name]]. ^self reallyBind: name! Item was changed: ----- Method: RemoteTempVectorNode>>addRemoteTemp:encoder: (in category 'code generation (closures)') ----- addRemoteTemp: aTempVariableNode encoder: encoder + remoteTemps ifNil: - remoteTemps isNil ifTrue: [remoteTemps := OrderedCollection new]. remoteTemps addLast: aTempVariableNode. aTempVariableNode referenceScopesAndIndicesDo: [:scopeBlock "<BlockNode>" :location "<Integer>"| + self addReadWithin: scopeBlock at: location]! - self addReadWithin: scopeBlock at: location]. - encoder supportsClosureOpcodes ifFalse: - [encoder encodeLiteral: remoteTemps size. - readNode := encoder encodeSelector: #at:. - writeNode := encoder encodeSelector: #at:put:]! Item was removed: - ----- Method: RemoteTempVectorNode>>emitCodeForIndexOf:stack:encoder: (in category 'code generation (closures)') ----- - emitCodeForIndexOf: aTempVariableNode stack: stack encoder: encoder - self assert: encoder supportsClosureOpcodes not. - (encoder encodeLiteral: (remoteTemps indexOf: aTempVariableNode)) - emitCodeForValue: stack encoder: encoder! Item was removed: - ----- Method: RemoteTempVectorNode>>emitCodeForLoadFor:stack:encoder: (in category 'code generation (closures)') ----- - emitCodeForLoadFor: aTempVariableNode stack: stack encoder: encoder - encoder supportsClosureOpcodes ifTrue: - [^self]. - "Need to generate the first half of - tempVector at: index put: expr - i.e. the push of tempVector and index." - super emitCodeForValue: stack encoder: encoder. - self emitCodeForIndexOf: aTempVariableNode stack: stack encoder: encoder! Item was changed: + ----- Method: RemoteTempVectorNode>>emitCodeForStoreInto:stack:encoder: (in category 'code generation') ----- - ----- Method: RemoteTempVectorNode>>emitCodeForStoreInto:stack:encoder: (in category 'code generation (closures)') ----- emitCodeForStoreInto: aTempVariableNode stack: stack encoder: encoder + encoder + genStoreRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 + inVectorAt: index! - encoder supportsClosureOpcodes - ifTrue: - [encoder - genStoreRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 - inVectorAt: index] - ifFalse: - [writeNode - emitCode: stack - args: 2 - encoder: encoder - super: false]! Item was changed: + ----- Method: RemoteTempVectorNode>>emitCodeForStorePopInto:stack:encoder: (in category 'code generation') ----- - ----- Method: RemoteTempVectorNode>>emitCodeForStorePopInto:stack:encoder: (in category 'code generation (closures)') ----- emitCodeForStorePopInto: aTempVariableNode stack: stack encoder: encoder + encoder + genStorePopRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 + inVectorAt: index. - encoder supportsClosureOpcodes - ifTrue: - [encoder - genStorePopRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 - inVectorAt: index] - ifFalse: - [self emitCodeForStoreInto: aTempVariableNode stack: stack encoder: encoder. - encoder genPop]. stack pop: 1! Item was changed: + ----- Method: RemoteTempVectorNode>>emitCodeForValueOf:stack:encoder: (in category 'code generation') ----- - ----- Method: RemoteTempVectorNode>>emitCodeForValueOf:stack:encoder: (in category 'code generation (closures)') ----- emitCodeForValueOf: aTempVariableNode stack: stack encoder: encoder + encoder + genPushRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 + inVectorAt: index. + stack push: 1! - encoder supportsClosureOpcodes - ifTrue: - [encoder - genPushRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 - inVectorAt: index. - stack push: 1] - ifFalse: - [self emitCodeForLoadFor: aTempVariableNode stack: stack encoder: encoder. - readNode - emitCode: stack - args: 1 - encoder: encoder - super: false]! Item was changed: + ----- Method: RemoteTempVectorNode>>nodeToInitialize: (in category 'code generation') ----- - ----- Method: RemoteTempVectorNode>>nodeToInitialize: (in category 'code generation (closures)') ----- nodeToInitialize: encoder ^AssignmentNode new variable: self + value: (NewArrayNode new numElements: remoteTemps size)! - value: (encoder supportsClosureOpcodes - ifTrue: [NewArrayNode new numElements: remoteTemps size] - ifFalse: - [MessageNode new - receiver: (encoder encodeVariable: 'Array') - selector: #new: - arguments: (Array with: (encoder encodeLiteral: remoteTemps size)) - precedence: 3 - from: encoder])! Item was changed: + ----- Method: RemoteTempVectorNode>>scope (in category 'code generation') ----- - ----- Method: RemoteTempVectorNode>>scope (in category 'code generation (closures)') ----- scope "Answer scope of temporary variables. Currently only the following distinctions are made: 0 outer level: args and user-declared temps 1 block args and doLimiT temps -1 a block temp that is no longer active -2 a block temp that held limit of to:do: -3 an indirect temp vector" ^-3! Item was removed: - ----- Method: RemoteTempVectorNode>>sizeCodeForIndexOf:encoder: (in category 'code generation (closures)') ----- - sizeCodeForIndexOf: aTempVariableNode encoder: encoder - self assert: encoder supportsClosureOpcodes not. - ^(encoder encodeLiteral: (remoteTemps indexOf: aTempVariableNode)) sizeCodeForValue: encoder! Item was removed: - ----- Method: RemoteTempVectorNode>>sizeCodeForLoadFor:encoder: (in category 'code generation (closures)') ----- - sizeCodeForLoadFor: aTempVariableNode encoder: encoder - encoder supportsClosureOpcodes ifTrue: - [^0]. - "Need to size the first half of - tempVector at: index put: expr - i.e. the push of tempVector and index." - ^(super sizeCodeForValue: encoder) - + (self sizeCodeForIndexOf: aTempVariableNode encoder: encoder)! Item was changed: + ----- Method: RemoteTempVectorNode>>sizeCodeForStoreInto:encoder: (in category 'code generation') ----- - ----- Method: RemoteTempVectorNode>>sizeCodeForStoreInto:encoder: (in category 'code generation (closures)') ----- sizeCodeForStoreInto: aTempVariableNode encoder: encoder + ^encoder + sizeStoreRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 + inVectorAt: index! - encoder supportsClosureOpcodes ifTrue: - [^encoder sizeStoreRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 inVectorAt: index]. - ^writeNode sizeCode: encoder args: 2 super: false! Item was changed: + ----- Method: RemoteTempVectorNode>>sizeCodeForStorePopInto:encoder: (in category 'code generation') ----- - ----- Method: RemoteTempVectorNode>>sizeCodeForStorePopInto:encoder: (in category 'code generation (closures)') ----- sizeCodeForStorePopInto: aTempVariableNode encoder: encoder + ^encoder + sizeStorePopRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 + inVectorAt: index! - encoder supportsClosureOpcodes ifTrue: - [^encoder sizeStorePopRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 inVectorAt: index]. - ^(self sizeCodeForStoreInto: aTempVariableNode encoder: encoder) - + encoder sizePop! Item was changed: + ----- Method: RemoteTempVectorNode>>sizeCodeForValueOf:encoder: (in category 'code generation') ----- - ----- Method: RemoteTempVectorNode>>sizeCodeForValueOf:encoder: (in category 'code generation (closures)') ----- sizeCodeForValueOf: aTempVariableNode encoder: encoder + ^encoder + sizePushRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 + inVectorAt: index! - encoder supportsClosureOpcodes ifTrue: - [^encoder sizePushRemoteTemp: (remoteTemps indexOf: aTempVariableNode) - 1 inVectorAt: index]. - ^(self sizeCodeForValue: encoder) - + (self sizeCodeForIndexOf: aTempVariableNode encoder: encoder) - + (readNode sizeCode: encoder args: 1 super: false)! Item was changed: + ----- Method: SpecialLiteralNode>>emitCodeForValue:encoder: (in category 'code generation') ----- - ----- Method: SpecialLiteralNode>>emitCodeForValue:encoder: (in category 'code generation (closures)') ----- emitCodeForValue: stack encoder: encoder stack push: 1. encoder genPushSpecialLiteral: key! Item was changed: + ----- Method: SpecialLiteralNode>>sizeCodeForValue: (in category 'code generation') ----- - ----- Method: SpecialLiteralNode>>sizeCodeForValue: (in category 'code generation (closures)') ----- sizeCodeForValue: encoder ^encoder sizePushSpecialLiteral: key! Item was removed: - ----- Method: TempVariableNode>>emitCodeForLoad:forValue:encoder: (in category 'code generation') ----- - emitCodeForLoad: stack forValue: forValue encoder: encoder - remoteNode ~~ nil ifTrue: - [remoteNode emitCodeForLoadFor: self stack: stack encoder: encoder]! Item was removed: - ----- Method: TempVariableNode>>sizeCodeForLoad:forValue: (in category 'code generation') ----- - sizeCodeForLoad: encoder forValue: forValue - ^remoteNode - ifNil: [0] - ifNotNil: [remoteNode sizeCodeForLoadFor: self encoder: encoder]! Item was removed: - ----- Method: VariableNode>>emitCodeForLoad:forValue:encoder: (in category 'code generation') ----- - emitCodeForLoad: stack forValue: forValue encoder: encoder - "Do nothing"!

1 0

The Trunk: Compiler-eem.341.mcz
by commits＠source.squeak.org 06 Apr '17

06 Apr '17

Eliot Miranda uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-eem.341.mcz ==================== Summary ==================== Name: Compiler-eem.341 Author: eem Time: 3 April 2017, 5:25:34.125602 pm UUID: a66d7b39-0d0f-4d67-8e82-02964c101b10 Ancestors: Compiler-eem.340 Add the refactored encoder-specific method generator. This one moves generation from MethodNode to BytecodeEncoder and subclasses, and hence allows easier bytecode set selection, or at least far more sends to self than to encoder. =============== Diff against Compiler-eem.340 =============== Item was added: + ----- Method: BytecodeEncoder>>generateMethodOfClass:trailer:from: (in category 'method encoding') ----- + generateMethodOfClass: aCompiledMethodClass trailer: trailer from: methodNode + "The receiver is the root of a parse tree. Answer an instance of aCompiledMethodClass. + The argument, trailer, is arbitrary but is typically either the reference to the source code + that is stored with every CompiledMethod, or an encoding of the method's temporary names." + + | primErrNode blkSize nLits locals literals header method stack | + primErrNode := methodNode primitiveErrorVariableName ifNotNil: + [self fixTemp: methodNode primitiveErrorVariableName]. + methodNode ensureClosureAnalysisDone. + self rootNode: methodNode. "this is for BlockNode>>sizeCodeForClosureValue:" + blkSize := (methodNode block sizeCodeForEvaluatedValue: self) + + (methodNode primitive > 0 + ifTrue: [self sizeCallPrimitive: methodNode primitive] + ifFalse: [0]) + + (primErrNode + ifNil: [0] + ifNotNil: + [primErrNode + index: methodNode arguments size + methodNode temporaries size; + sizeCodeForStore: self "The VM relies on storeIntoTemp: (129)"]). + locals := methodNode arguments, methodNode temporaries, (primErrNode ifNil: [#()] ifNotNil: [{primErrNode}]). + self noteBlockExtent: methodNode block blockExtent hasLocals: locals. + header := self computeMethodHeaderForNumArgs: methodNode arguments size + numTemps: locals size + numLits: (nLits := (literals := self allLiterals) size) + primitive: methodNode primitive. + method := trailer + createMethod: blkSize + class: aCompiledMethodClass + header: header. + 1 to: nLits do: [:lit | method literalAt: lit put: (literals at: lit)]. + self streamToMethod: method. + stack := ParseStack new init. + methodNode primitive > 0 ifTrue: + [self genCallPrimitive: methodNode primitive]. + primErrNode ifNotNil: + [primErrNode emitCodeForStore: stack encoder: self]. + stack position: method numTemps. + [methodNode block emitCodeForEvaluatedValue: stack encoder: self] + on: Error "If an attempt is made to write too much code the method will be asked" + do: [:ex| "to grow, and the grow attempt will fail in CompiledMethod class>>#new:" + ex signalerContext sender method = (CompiledMethod class>>#new:) + ifTrue: [^self error: 'Compiler code size discrepancy'] + ifFalse: [ex pass]]. + stack position ~= (method numTemps + 1) ifTrue: + [^self error: 'Compiler stack discrepancy']. + self methodStreamPosition ~= (method size - trailer size) ifTrue: + [^self error: 'Compiler code size discrepancy']. + method needsFrameSize: stack size - method numTemps. + ^method!

1 0

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Packages April 2017