Squeak-dev April 2017

squeak-dev@lists.squeakfoundation.org

48 participants
221 discussions

The Trunk: Compiler-eem.340.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.340.mcz ==================== Summary ==================== Name: Compiler-eem.340 Author: eem Time: 3 April 2017, 5:00:32.319924 pm UUID: 76902ca3-f64d-427a-af3d-466a103a3ce3 Ancestors: Compiler-eem.339 Use the encoder-specifc limit for maxNumLiterals. =============== Diff against Compiler-eem.339 =============== Item was changed: ----- Method: BytecodeEncoder>>computeMethodHeaderForNumArgs:numTemps:numLits:primitive: (in category 'method generation') ----- computeMethodHeaderForNumArgs: numArgs numTemps: numTemps numLits: numLits primitive: primitiveIndex numArgs > 15 ifTrue: [^self error: 'Cannot compile -- too many arguments']. numTemps > 63 ifTrue: [^self error: 'Cannot compile -- too many temporary variables']. + numLits > self maxNumLiterals ifTrue: - numLits > 32767 ifTrue: [^self error: 'Cannot compile -- too many literals']. ^(CompiledMethod headerFlagForEncoder: self) + (numArgs bitShift: 24) + (numTemps bitShift: 18) "+ (largeBit bitShift: 17)" "largeBit gets filled in later" + (primitiveIndex > 0 ifTrue: [1 bitShift: 16] ifFalse: [0]) "+ (optimizedBit bitShift: 15)" "Sista marker may get filled in later" + numLits!

1 0

Broken trunk update and workaround
by Eliot Miranda 06 Apr '17

06 Apr '17

Hi All, I'm very sorry to report that my recent changes (adding CompiledCode and CompiledBlock to the CompiledMethod hierarchy in anticipation of full blocks, and merging ContextPart and MethodContext and renaming them as Context, to eliminate obsolete block and closer implementations) has broken the update process. I do not believe there is an easy fix as i think the issues are to do with the citations that exist on the stack while the update proceeds (the progress indicators). There is a clumsy work-around that appears reliable. The pauses between loads get rid of the progress indication activations and hence avoid trying to upgrade running processes through these kernel changes. Open the trunk repository from your Monticello Browser. Locate the update package (the penultimate entry in the list of packages). Load (or merge) update-eem.400.mcm. Load (or merge) update-eem.403.mcm. Load (or merge) update-eem.406.mcm. Save your image. Local the Kernel package. Load Kernel-eem.1078. Save your image. Update I'm so sorry. Eliot

7 24

The Inbox: MonticelloConfigurations-bf.152.mcz
by commits＠source.squeak.org 05 Apr '17

05 Apr '17

A new version of MonticelloConfigurations was added to project The Inbox: http://source.squeak.org/inbox/MonticelloConfigurations-bf.152.mcz ==================== Summary ==================== Name: MonticelloConfigurations-bf.152 Author: bf Time: 5 April 2017, 4:49:13.051869 pm UUID: e3104caa-ad4e-4ea5-bf42-eb0b004442dc Ancestors: MonticelloConfigurations-bf.151 Suppress even more progress during version load =============== Diff against MonticelloConfigurations-ul.150 =============== Item was changed: ----- Method: MCConfiguration>>depsSatisfying:versionDo:displayingProgress: (in category 'private') ----- depsSatisfying: selectBlock versionDo: verBlock displayingProgress: progressString | count selectedVersions cleanWorkingCopies | self cacheAllFileNamesDuring: [ self repositories do: [ :eachRepository | MCRepositoryGroup default addRepository: eachRepository ]. "First, download selected versions" count := 0. selectedVersions := OrderedCollection new. self withProgress: progressString in: self dependencies do: [ :dep | | verName repo | verName := dep versionInfo name. self class extraProgressInfo ifTrue: [ ProgressNotification signal: '' extra: 'Downloading ' , verName ]. repo := self repositories detect: [ :eachRepository | eachRepository includesVersionNamed: verName ] ifNone: [ self logError: 'Version ' , verName , ' not found in any repository'. self logError: 'Aborting'. ^ count ]. (selectBlock value: dep) ifTrue: [ | version | version := self versionNamed: verName for: dep from: repo. version ifNil: [ self logError: 'Could not download version ' , verName , ' from ' , repo description. self logError: 'Aborting'. ^ count ]. dep package workingCopy newRepositoryGroupIfDefault. "fix old working copies" dep package workingCopy repositoryGroup addRepository: repo. selectedVersions add: version]]. "Then, process only those definitions that moved from one package to another, to avoid order dependence" cleanWorkingCopies := MCWorkingCopy allManagers reject: [ :wc | wc modified ]. MCReorganizationPreloader preloadMovesBetween: selectedVersions. "Finally, load/merge selected versions" self withProgress: progressString in: selectedVersions do: [ :version | self logUpdate: version package with: version. self class extraProgressInfo ifTrue: [ ProgressNotification signal: '' extra: 'Installing ' , version info name ]. + self noProgressDuring: [verBlock value: version]. - verBlock value: version. count := count + 1 ]. "Clean up packages made dirty by MCReorganizationPreloader" cleanWorkingCopies do: [ :wc | wc modified ifTrue: [[wc checkModified] on: Error do: [:ex | self logWarning: ex description] ]]. ]. ^ count! Item was added: + ----- Method: MCConfiguration>>noProgressDuring: (in category 'private') ----- + noProgressDuring: block + ^block + on: ProgressInitiationException + do: [ :ex | ex sendNotificationsTo: [ :min :max :curr | "ignore" ] ] + on: ProgressNotification + do: [ :ex | ex resume ]!

1 0

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

05 Apr '17

Eliot Miranda uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-eem.1086.mcz ==================== Summary ==================== Name: Kernel-eem.1086 Author: eem Time: 4 April 2017, 5:56:56.293644 pm UUID: b7a5b8d8-6a97-4193-87b9-f1ca83a6f52d Ancestors: Kernel-eem.1085 Improve Context's comment and move methods out of the effectively obsolete closure-specific instruction-decoding category. =============== Diff against Kernel-eem.1085 =============== Item was changed: InstructionStream variableSubclass: #Context instanceVariableNames: 'stackp method closureOrNil receiver' classVariableNames: 'MaxLengthForASingleDebugLogReport MaxStackDepthForASingleDebugLogReport PrimitiveFailToken QuickStep ValueIndex' poolDictionaries: '' category: 'Kernel-Methods'! + !Context commentStamp: 'eem 4/4/2017 17:45' prior: 0! + My instances hold all the dynamic state associated with the execution of either a method activation resulting from a message send or a block activation resulting from a block evaluation. In addition to their inherited state, this includes the receiver (self), the closure for a BlockClosure activation (which is nil for a method activation), a CompiledMethod, and space in the variable part of the context for arguments, temporary variables, and intermediate results, and the stack pointer to the top of stack in this variable part. + + Contexts are created automatically (at least conceptually (*)) whenever a message send activates a method, or a block evaluation activates a block. The current context can always be accessed via the thisContext pseudo-variable. For example, explore the following: + { thisContext. thisContext copy. thisContext method. thisContext pc. thisContext receiver. thisContext stackPtr. thisContext sender }. + + Contexts refer to the context in which they were created via the sender inst var. An execution stack is made up of of a linked list of contexts, linked through their sender inst var. Returning involves returning back to the sender. When a context is returned from its sender and pc are nilled, and, if the context is still referred to, the virtual machine guarantees to preserve only the arguments after a return. A Smalltalk Process is simply a chain of contexts specific to that process. The debugger is essentially a Process inspector. Stepping in the debugger is done by sending messages to contexts to get them to execute their bytecodes. See methods in the instruction decoding protocol. + - !Context commentStamp: 'eem 3/30/2017 17:27' prior: 0! - My instances hold all the dynamic state associated with the execution of either a method activation resulting from a message send or a block activation resulting from a block evaluation. In addition to their inherited state, this includes the receiver (self), the closure for a BlockClosure activation (which is nil for a method activation), a CompiledMethod, and space in the variable part of the context for arguments and temporary variables. - Contexts, though normal in their variable size, are actually only used in two sizes, small and large, which are determined by the temporary space required by the method being executed. + Contexts must only be created using the method newForMethod:. Note that it is impossible to determine the real object size of a Context except by asking for the frameSize of its method. Any fields above the stack pointer (stackp) are truly invisible -- even (and especially!!) to the garbage collector. Any store into stackp other than by the primitive method stackp: is potentially fatal. + + (*) efficient virtual machines create contexts lazily on demand, avoiding the overhead of creating them on every message send and of copying receiver and arguments from sender context to caller context. This optimization is invisible to the Smalltalk system.! - Contexts must only be created using the method newForMethod:. Note that it is impossible to determine the real object size of a Context except by asking for the frameSize of its method. Any fields above the stack pointer (stackp) are truly invisible -- even (and especially!!) to the garbage collector. Any store into stackp other than by the primitive method stackp: is potentially fatal.! Item was changed: + ----- Method: Context>>blockReturnTop (in category 'instruction decoding') ----- - ----- Method: Context>>blockReturnTop (in category 'instruction decoding (closures)') ----- blockReturnTop "Simulate the interpreter's action when a ReturnTopOfStackToCaller bytecode is encountered in the receiver. This should only happen in a closure activation." self assert: closureOrNil isClosure. ^self return: self pop from: self! Item was changed: + ----- Method: Context>>pushConsArrayWithElements: (in category 'instruction decoding') ----- - ----- Method: Context>>pushConsArrayWithElements: (in category 'instruction decoding (closures)') ----- pushConsArrayWithElements: numElements | array | array := Array new: numElements. numElements to: 1 by: -1 do: [:i| array at: i put: self pop]. self push: array!

1 0

The Trunk: EToys-eem.291.mcz
by commits＠source.squeak.org 05 Apr '17

05 Apr '17

Eliot Miranda uploaded a new version of EToys to project The Trunk: http://source.squeak.org/trunk/EToys-eem.291.mcz ==================== Summary ==================== Name: EToys-eem.291 Author: eem Time: 4 April 2017, 5:55:00.217947 pm UUID: c62015f2-3ec7-4885-a001-f7b39758b4d5 Ancestors: EToys-eem.290 Remove more unused cruft from EToys kernel and compiler classes. =============== Diff against EToys-eem.290 =============== Item was removed: - ----- Method: CompiledMethod>>qDecompress: (in category '*Etoys-Squeakland-source code management') ----- - qDecompress: byteArray - "Decompress strings compressed by qCompress:. - Most common 12 chars get values 0-11 packed in one 4-bit nibble; - others get values 12-15 (2 bits) * 16 plus next nibble" - | charTable extended ext | - charTable := "Character encoding table must match qCompress:" - ' eatrnoislcm bdfghjkpquvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'. - ^ String streamContents: - [:strm | extended := false. "Flag for 2-nibble characters" - byteArray do: - [:byte | - (Array with: byte//16 with: byte\\16) - do: - [:nibble | extended - ifTrue: [strm nextPut: (charTable at: ext*16+nibble + 1). extended := false] - ifFalse: [nibble < 12 ifTrue: [strm nextPut: (charTable at: nibble + 1)] - ifFalse: [ext := nibble-12. extended := true]]]]]! Item was removed: - ----- Method: CompiledMethod>>scanLongLoad: (in category '*Etoys-Squeakland-scanning') ----- - scanLongLoad: extension - "Answer whether the receiver contains a long load whose extension is the - argument." - - | scanner | - scanner := InstructionStream on: self. - ^scanner scanFor: [:instr | instr = 128 and: [scanner followingByte = extension]]! Item was removed: - ----- Method: CompiledMethod>>scanLongStore: (in category '*Etoys-Squeakland-scanning') ----- - scanLongStore: extension - "Answer whether the receiver contains a long store whose extension is - the argument." - | scanner | - scanner := InstructionStream on: self. - ^scanner scanFor: - [:instr | (instr = 129 or: [instr = 130]) and: [scanner followingByte = extension]]! Item was removed: - ----- Method: CompiledMethod>>scanVeryLongLoad:offset: (in category '*Etoys-Squeakland-scanning') ----- - scanVeryLongLoad: extension offset: offset - "Answer whether the receiver contains a long load whose extension is the - argument." - | scanner | - scanner := InstructionStream on: self. - ^ scanner scanFor: [:instr | (instr = 132 and: [scanner followingByte = extension]) - and: [scanner thirdByte = offset]]! Item was removed: - ----- Method: Decompiler>>checkForBlock: (in category '*Etoys-Squeakland-control') ----- - checkForBlock: receiver - "We just saw a blockCopy: message. Check for a following block." - - | savePc jump args argPos block | - receiver == constructor codeThisContext ifFalse: [^false]. - savePc := pc. - (jump := self interpretJump) notNil - ifFalse: - [pc := savePc. ^nil]. - "Definitely a block" - jump := jump + pc. - argPos := statements size. - [self willStorePop] - whileTrue: - [stack addLast: ArgumentFlag. "Flag for doStore:" - self interpretNextInstructionFor: self]. - args := Array new: statements size - argPos. - 1 to: args size do: "Retrieve args" - [:i | args at: i put: statements removeLast. - (args at: i) scope: -1 "flag args as block temps"]. - block := self blockTo: jump. - stack addLast: (constructor codeArguments: args block: block). - ^true! Item was removed: - ----- Method: InstructionStream>>interpretExtension:in:for: (in category '*Etoys-Squeakland-private') ----- - interpretExtension: offset in: method for: client - | type offset2 byte2 byte3 | - offset <=6 ifTrue: - ["Extended op codes 128-134" - byte2 := method at: pc. - pc := pc + 1. - offset <= 2 ifTrue: - ["128-130: extended pushes and pops" - type := byte2 // 64. - offset2 := byte2 \\ 64. - offset = 0 ifTrue: - [type = 0 ifTrue: [^ client pushReceiverVariable: offset2]. - type = 1 ifTrue: [^ client pushTemporaryVariable: offset2]. - type = 2 ifTrue: [^ client pushConstant: (method literalAt: offset2 + 1)]. - type = 3 ifTrue: [^ client pushLiteralVariable: (method literalAt: offset2 + 1)]]. - offset = 1 ifTrue: - [type = 0 ifTrue: [^ client storeIntoReceiverVariable: offset2]. - type = 1 ifTrue: [^ client storeIntoTemporaryVariable: offset2]. - type = 2 ifTrue: [self error: 'illegalStore']. - type = 3 ifTrue: [^ client storeIntoLiteralVariable: (method literalAt: offset2 + 1)]]. - offset = 2 ifTrue: - [type = 0 ifTrue: [^ client popIntoReceiverVariable: offset2]. - type = 1 ifTrue: [^ client popIntoTemporaryVariable: offset2]. - type = 2 ifTrue: [self error: 'illegalStore']. - type = 3 ifTrue: [^ client popIntoLiteralVariable: (method literalAt: offset2 + 1)]]]. - "131-134: extended sends" - offset = 3 ifTrue: "Single extended send" - [^ client send: (method literalAt: byte2 \\ 32 + 1) - super: false numArgs: byte2 // 32]. - offset = 4 ifTrue: "Double extended do-anything" - [byte3 := method at: pc. pc := pc + 1. - type := byte2 // 32. - type = 0 ifTrue: [^ client send: (method literalAt: byte3 + 1) - super: false numArgs: byte2 \\ 32]. - type = 1 ifTrue: [^ client send: (method literalAt: byte3 + 1) - super: true numArgs: byte2 \\ 32]. - type = 2 ifTrue: [^ client pushReceiverVariable: byte3]. - type = 3 ifTrue: [^ client pushConstant: (method literalAt: byte3 + 1)]. - type = 4 ifTrue: [^ client pushLiteralVariable: (method literalAt: byte3 + 1)]. - type = 5 ifTrue: [^ client storeIntoReceiverVariable: byte3]. - type = 6 ifTrue: [^ client popIntoReceiverVariable: byte3]. - type = 7 ifTrue: [^ client storeIntoLiteralVariable: (method literalAt: byte3 + 1)]]. - offset = 5 ifTrue: "Single extended send to super" - [^ client send: (method literalAt: byte2 \\ 32 + 1) - super: true numArgs: byte2 // 32]. - offset = 6 ifTrue: "Second extended send" - [^ client send: (method literalAt: byte2 \\ 64 + 1) - super: false numArgs: byte2 // 64]]. - offset = 7 ifTrue: [^ client doPop]. - offset = 8 ifTrue: [^ client doDup]. - offset = 9 ifTrue: [^ client pushActiveContext]. - self error: 'unusedBytecode'!

1 0

The Trunk: EToys-eem.290.mcz
by commits＠source.squeak.org 05 Apr '17

05 Apr '17

Eliot Miranda uploaded a new version of EToys to project The Trunk: http://source.squeak.org/trunk/EToys-eem.290.mcz ==================== Summary ==================== Name: EToys-eem.290 Author: eem Time: 4 April 2017, 5:25:34.811493 pm UUID: 225c2132-0e40-4ed9-9134-9621442c5a2b Ancestors: EToys-eem.289 Eliminate some VMMaker-speciasif cruft from EToys. Have primitiveFindSubstring:in:startingAt:matchTable: declare vars using the pragma form to avoid dependency on the (obsolete) empty Object method. =============== Diff against EToys-eem.289 =============== Item was changed: ----- Method: ByteString>>primitiveFindSubstring:in:startingAt:matchTable: (in category '*Etoys-Squeakland-comparing') ----- primitiveFindSubstring: key in: body startingAt: start matchTable: matchTable "Answer the index in the string body at which the substring key first occurs, at or beyond start. The match is determined using matchTable, which can be used to effect, eg, case-insensitive matches. If no match is found, zero will be returned. The algorithm below is not optimum -- it is intended to be translated to C which will go so fast that it wont matter." | index | <primitive: 'primitiveFindSubstring' module: 'MiscPrimitivePlugin'> + <var: #key declareC: 'unsigned char *key'> + <var: #body declareC: 'unsigned char *body'> + <var: #matchTable declareC: 'unsigned char *matchTable'> - self var: #key declareC: 'unsigned char *key'. - self var: #body declareC: 'unsigned char *body'. - self var: #matchTable declareC: 'unsigned char *matchTable'. key size = 0 ifTrue: [^ 0]. start to: body size - key size + 1 do: [:startIndex | index := 1. [(matchTable at: (body at: startIndex+index-1) asciiValue + 1) = (matchTable at: (key at: index) asciiValue + 1)] whileTrue: [index = key size ifTrue: [^ startIndex]. index := index+1]]. ^ 0 " ' ' findSubstring: 'abc' in: 'abcdefabcd' startingAt: 1 matchTable: CaseSensitiveOrder 1 ' ' findSubstring: 'abc' in: 'abcdefabcd' startingAt: 2 matchTable: CaseSensitiveOrder 7 ' ' findSubstring: 'abc' in: 'abcdefabcd' startingAt: 8 matchTable: CaseSensitiveOrder 0 ' ' findSubstring: 'abc' in: 'abcdefABcd' startingAt: 2 matchTable: CaseSensitiveOrder 0 ' ' findSubstring: 'abc' in: 'abcdefABcd' startingAt: 2 matchTable: CaseInsensitiveOrder 7 "! Item was removed: - ----- Method: Object>>var:declareC: (in category '*Etoys-Squeakland-translation support') ----- - var: varSymbol declareC: declString - "For translation only; noop when running in Smalltalk."! Item was removed: - ----- Method: String class>>ccg:prolog:expr:index: (in category '*Etoys-Squeakland-plugin generation') ----- - ccg: cg prolog: aBlock expr: aString index: anInteger - - ^cg - ccgLoad: aBlock - expr: aString - asCharPtrFrom: anInteger - andThen: (cg ccgValBlock: 'isBytes') - ! Item was removed: - ----- Method: String class>>ccgDeclareCForVar: (in category '*Etoys-Squeakland-plugin generation') ----- - ccgDeclareCForVar: aSymbolOrString - - ^'char *', aSymbolOrString - !

1 0

The Trunk: ST80-cmm.227.mcz
by commits＠source.squeak.org 04 Apr '17

04 Apr '17

Chris Muller uploaded a new version of ST80 to project The Trunk: http://source.squeak.org/trunk/ST80-cmm.227.mcz ==================== Summary ==================== Name: ST80-cmm.227 Author: cmm Time: 4 April 2017, 3:54:17.967782 pm UUID: e738a074-c662-4707-81e2-92802a6bc926 Ancestors: ST80-eem.226 Fix the race condition introduced with Debugger>>'ErrorRecursion' which was causing an inescapable Emergency Evaluator to appear even when there was no recursion. =============== Diff against ST80-eem.226 =============== Item was changed: ----- Method: Debugger class>>mvcOpenContext:label:contents: (in category '*ST80-opening') ----- + mvcOpenContext: aContext label: aString contents: contentsStringOrNil - mvcOpenContext: aContext label: aString contents: contentsStringOrNil "Open a notifier in response to an error, halt, or notify. A notifier view just shows a short view of the sender stack and provides a menu that lets the user open a full debugger." + "Simulation guard" + <primitive: 19> + ErrorRecursionGuard critical: + [ ErrorRecursion not & Preferences logDebuggerStackToFile ifTrue: + [ Smalltalk + logSqueakError: aString + inContext: aContext ]. + ErrorRecursion ifTrue: + [ ErrorRecursion := false. + self primitiveError: aString ]. + ErrorRecursion := true. + self + informExistingDebugger: aContext + label: aString. + (Debugger mvcContext: aContext) + openNotifierContents: contentsStringOrNil + label: aString. - <primitive: 19> "Simulation guard" - ErrorRecursion not & Preferences logDebuggerStackToFile ifTrue: - [Smalltalk logSqueakError: aString inContext: aContext]. - ErrorRecursion ifTrue:[ ErrorRecursion := false. + Processor activeProcess suspend ]! - self primitiveError: aString]. - ErrorRecursion := true. - self informExistingDebugger: aContext label: aString. - (Debugger mvcContext: aContext) - openNotifierContents: contentsStringOrNil - label: aString. - ErrorRecursion := false. - Processor activeProcess suspend.!

1 0

Re: [squeak-dev] Arc morph?
by Henrik Nergaard 04 Apr '17

04 Apr '17

You could use a Form to draw the arc/circle to get nice antialiasing, and then transfer it onto the canvas. Here is an example: ----------------------------------------------------------------------------------------------------------------------------- | circle painter canvas | circle := [ :radius :lineWidth | | form halfR aaw color center | aaw := 1.3. color := Color white. halfR := radius / 2.0. center := halfR asPoint. form := Form extent: radius asPoint depth: 32. 0 to: radius - 1 do: [ :y | 0 to: radius - 1 do: [ :x | | l rp | rp := (x @ y) distanceTo: center. l := rp + aaw > halfR ifTrue: [ (halfR - rp min: aaw max: 0.0) / aaw ] ifFalse: [ (rp - halfR + lineWidth min: aaw max: 0.0) / aaw ]. form colorAt: x @ y put: (color alpha: l) ] ]. form ]. painter := [ :form :color | | output bitBlt | output := Form extent: form extent depth: 32. bitBlt := BitBlt toForm: output. output fillColor: color. bitBlt sourceForm: form; combinationRule: 37; sourceRect: form boundingBox; copyBits. output ]. "=====================================" canvas := FormCanvas extent: 200@200. World fullDrawOn: canvas. canvas translucentImage: (painter value: (circle value: 50 value: 10) value: Color orange) at: 20@20; translucentImage: (painter value: (circle value: 60 value: 15) value: Color purple) at: 90@20; fillRectangle: (40@45 extent: 12@12) color: Color green; fillRectangle: (110@55 extent: 12@12) color: Color blue; fillRectangle: (77@75 extent: 16@21) color: Color brown; translucentImage: (painter value: (circle value: 100 value: 7) value: Color red) at: 30@95 sourceRect: (0@60 extent: 100 @ 40). canvas form inspect -------------------------------------------------------------------------------------------------------------------- Best regards, Henrik

1 0

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

04 Apr '17

Eliot Miranda uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-eem.337.mcz ==================== Summary ==================== Name: Compiler-eem.337 Author: eem Time: 3 April 2017, 2:06:32.26662 pm UUID: 85f04687-1157-4f7a-9a4c-c02c733b638e Ancestors: Compiler-eem.336 Eliminate the support for blue book block decompilastion and collapse DecompilerConstructorForClosures into DecompilerConstructor. Refactor MethodNode>>preen to also check for temps declared in blocks that conflict with method-level temps. On decompilation this is a sign that the method level temps were delcraed in sme optimized block and the preen pass finds out where to push the method level temps down to. =============== Diff against Compiler-eem.336 =============== Item was removed: - ----- Method: Decompiler>>checkForBlockCopy: (in category 'control') ----- - checkForBlockCopy: receiver - "We just saw a blockCopy: message. Check for a following block." - - | savePc jump args argPos block | - receiver == constructor codeThisContext ifFalse: [^false]. - savePc := pc. - (jump := self interpretJump) ifNil: - [pc := savePc. ^false]. - self sawBlueBookBlock. - "Definitely a block" - jump := jump + pc. - argPos := statements size. - [self willStorePop] - whileTrue: - [stack addLast: ArgumentFlag. "Flag for doStore:" - self interpretNextInstructionFor: self]. - args := Array new: statements size - argPos. - 1 to: args size do: "Retrieve args" - [:i | args at: i put: statements removeLast. - (args at: i) scope: -1 "flag args as block temps"]. - block := self blockTo: jump. - stack addLast: (constructor codeArguments: args block: block). - ^true! Item was changed: ----- Method: Decompiler>>constructorForMethod: (in category 'private') ----- constructorForMethod: aMethod + ^DecompilerConstructor new! - ^(aMethod isBlueBookCompiled - ifTrue: [DecompilerConstructor] - ifFalse: [DecompilerConstructorForClosures]) new! Item was changed: ----- Method: Decompiler>>popIntoRemoteTemp:inVectorAt: (in category 'instruction decoding') ----- popIntoRemoteTemp: remoteTempIndex inVectorAt: tempVectorIndex - self sawClosureBytecode. self pushRemoteTemp: remoteTempIndex inVectorAt: tempVectorIndex; doStore: statements! Item was changed: ----- Method: Decompiler>>pushClosureCopyNumCopiedValues:numArgs:blockSize: (in category 'instruction decoding') ----- pushClosureCopyNumCopiedValues: numCopied numArgs: numArgs blockSize: blockSize | copiedValues | - self sawClosureBytecode. copiedValues := ((1 to: numCopied) collect: [:ign| stack removeLast]) reversed. self doClosureCopyCopiedValues: copiedValues numArgs: numArgs blockSize: blockSize! Item was changed: ----- Method: Decompiler>>pushConsArrayWithElements: (in category 'instruction decoding') ----- pushConsArrayWithElements: numElements | array | - self sawClosureBytecode. array := Array new: numElements. numElements to: 1 by: -1 do: [:i| array at: i put: stack removeLast]. stack addLast: (constructor codeBrace: array)! Item was changed: ----- Method: Decompiler>>pushNewArrayOfSize: (in category 'instruction decoding') ----- pushNewArrayOfSize: size - self sawClosureBytecode. stack addLast: #pushNewArray -> (Array new: size)! Item was changed: ----- Method: Decompiler>>pushRemoteTemp:inVectorAt: (in category 'instruction decoding') ----- pushRemoteTemp: remoteTempIndex inVectorAt: tempVectorIndex - self sawClosureBytecode. stack addLast: ((tempVars at: tempVectorIndex + 1) remoteTemps at: remoteTempIndex + 1)! Item was removed: - ----- Method: Decompiler>>sawBlueBookBlock (in category 'private') ----- - sawBlueBookBlock - constructor isForClosures ifTrue: - [constructor primitiveChangeClassTo: DecompilerConstructor new]! Item was removed: - ----- Method: Decompiler>>sawClosureBytecode (in category 'private') ----- - sawClosureBytecode - constructor isForClosures ifFalse: - [constructor primitiveChangeClassTo: DecompilerConstructorForClosures new]! Item was changed: ----- Method: Decompiler>>storeIntoRemoteTemp:inVectorAt: (in category 'instruction decoding') ----- storeIntoRemoteTemp: remoteTempIndex inVectorAt: tempVectorIndex - self sawClosureBytecode. self pushRemoteTemp: remoteTempIndex inVectorAt: tempVectorIndex; doStore: stack! Item was changed: ----- Method: DecompilerConstructor>>codeMethod:block:tempVars:primitive:class: (in category 'constructor') ----- codeMethod: selector block: block tempVars: vars primitive: primitive class: class + | blockNode selectorNode visibleTemps invisibleTemps arguments temporaries properties | + selectorNode := self codeSelector: selector code: nil. - | node methodTemps arguments temporaries | - node := self codeSelector: selector code: nil. tempVars := vars. + visibleTemps := OrderedCollection new. + invisibleTemps := OrderedCollection new. + tempVars do: [:t| + ((t isIndirectTempVector or: [t scope >= 0]) + ifTrue: [visibleTemps] + ifFalse: [invisibleTemps]) addLast: t]. + arguments := visibleTemps copyFrom: 1 to: nArgs. + temporaries := visibleTemps copyFrom: nArgs + 1 to: visibleTemps size. - methodTemps := tempVars select: [:t | t scope >= 0]. - arguments := methodTemps copyFrom: 1 to: nArgs. - temporaries := methodTemps copyFrom: nArgs + 1 to: methodTemps size. block arguments: arguments; temporaries: temporaries. + properties := method properties copy. + (properties at: #onceCache ifAbsent: []) ifNotNil: + [:onceCache| + properties := properties copyWithout: (Association + key: #onceCache + value: onceCache)]. + blockNode := MethodNode new + selector: selectorNode - ^MethodNode new - selector: node arguments: arguments precedence: selector precedence temporaries: temporaries block: block + encoder: (method encoderClass new initScopeAndLiteralTables + temps: visibleTemps, invisibleTemps - encoder: (Encoder new initScopeAndLiteralTables - temps: tempVars literals: literalValues class: class) + primitive: primitive + properties: properties. + blockNode properties method: blockNode. + ^blockNode! - primitive: primitive! Item was added: + ----- Method: DecompilerConstructor>>codeRemoteTemp:remoteTemps: (in category 'as yet unclassified') ----- + codeRemoteTemp: index remoteTemps: tempVector + + ^(RemoteTempVectorNode new + name: '_r', index printString + index: index + type: LdTempType + scope: 0) + remoteTemps: tempVector; + yourself! Item was removed: - ----- Method: DecompilerConstructor>>isForClosures (in category 'testing') ----- - isForClosures - ^false! Item was removed: - DecompilerConstructor subclass: #DecompilerConstructorForClosures - instanceVariableNames: 'tempNameCounter' - classVariableNames: '' - poolDictionaries: '' - category: 'Compiler-Support'! Item was removed: - ----- Method: DecompilerConstructorForClosures>>codeMethod:block:tempVars:primitive:class: (in category 'constructor') ----- - codeMethod: selector block: block tempVars: vars primitive: primitive class: class - - | blockNode selectorNode visibleTemps invisibleTemps arguments temporaries properties | - selectorNode := self codeSelector: selector code: nil. - tempVars := vars. - visibleTemps := OrderedCollection new. - invisibleTemps := OrderedCollection new. - tempVars do: [:t| - ((t isIndirectTempVector or: [t scope >= 0]) - ifTrue: [visibleTemps] - ifFalse: [invisibleTemps]) addLast: t]. - arguments := visibleTemps copyFrom: 1 to: nArgs. - temporaries := visibleTemps copyFrom: nArgs + 1 to: visibleTemps size. - block - arguments: arguments; - temporaries: temporaries. - properties := method properties copy. - (properties at: #onceCache ifAbsent: []) ifNotNil: - [:onceCache| - properties := properties copyWithout: (Association - key: #onceCache - value: onceCache)]. - blockNode := MethodNode new - selector: selectorNode - arguments: arguments - precedence: selector precedence - temporaries: temporaries - block: block - encoder: (method encoderClass new initScopeAndLiteralTables - temps: visibleTemps, invisibleTemps - literals: literalValues - class: class) - primitive: primitive - properties: properties. - blockNode properties method: blockNode. - ^blockNode! Item was removed: - ----- Method: DecompilerConstructorForClosures>>codeRemoteTemp:remoteTemps: (in category 'constructor') ----- - codeRemoteTemp: index remoteTemps: tempVector - - ^(RemoteTempVectorNode new - name: '_r', index printString - index: index - type: LdTempType - scope: 0) - remoteTemps: tempVector; - yourself! Item was removed: - ----- Method: DecompilerConstructorForClosures>>isForClosures (in category 'testing') ----- - isForClosures - ^true! Item was changed: ----- Method: MethodNode>>preen (in category 'converting') ----- preen "Preen for pretty-printing and/or decompilation. i.e. post-process to cover up for inadequacies in both algorithms. - Currently one case, hiding the assignment to the arg of an inlined block arg to ifNotNil:, - (var := expr) ifNil: [...] ifNotNil: [...] => expr ifNil: [...] ifNotNil: [:var| ...]." + Currently two cases: + + preenLocalIfNotNilArg: blockNode + hiding the assignment to the arg of an inlined block arg to ifNotNil:, + (var := expr) ifNil: [...] ifNotNil: [...] => expr ifNil: [...] ifNotNil: [:var| ...]. + + preenTempsConflictingWithBlockNode: temps + hiding the declaration of a temp that is redeclared in some block" + + self preenableNodes keysAndValuesDo: + [:nodeOrArray :selector | + self perform: selector with: nodeOrArray]! - self preenLocalIfNotNilArg! Item was added: + ----- Method: MethodNode>>preenIfNotNilNode: (in category 'converting-private') ----- + preenIfNotNilNode: messageNode + "Transform a (var := expr) ifNil: [...] ifNotNil: [...] where var is only used in the ifNotNil: block + and convert it to expr ifNil: [...] ifNotNil: [:var| ...]. Deal both with the pretty-print case where + the block already declares the variable and the decompile case where it does not." + + | variable | + self assert: (messageNode isMessageNode + and: [messageNode macroPrinter == #printIfNilNotNil:indent: + and: [messageNode receiver receiver isAssignmentNode]]). + variable := messageNode receiver receiver variable. + self assert: (variable isTemp and: [variable isRemote not]). + messageNode arguments last arguments isEmpty + ifTrue: [messageNode arguments last arguments: { variable }] + ifFalse: + [self assert: messageNode arguments last arguments asArray = { variable }. + variable := nil]. + messageNode receiver receiver: messageNode receiver receiver value. + variable ifNil: [^self]. + self nodesDo: + [:node| + ((node == self or: [node isBlockNode]) + and: [node temporaries includes: variable]) ifTrue: + [node temporaries: (node temporaries copyWithout: variable)]]! Item was removed: - ----- Method: MethodNode>>preenLocalIfNotNilArg (in category 'converting') ----- - preenLocalIfNotNilArg - "Try and spot a (var := expr) ifNil: [...] ifNotNil: [...] where var is only used in the ifNotNil: block - and convert it to expr ifNil: [...] ifNotNil: [:var| ...]. Deal both with the pretty-print case where - the block already declares the variable and the decompile case where it does not." - - | varsToHide | - varsToHide := Set new. - self nodesDo: - [:node| | variable | - (node isMessageNode - and: [node macroPrinter == #printIfNilNotNil:indent: - and: [node receiver isMessageNode - and: [node receiver selector key == #== - and: [node receiver receiver isAssignmentNode - and: [(variable := node receiver receiver variable) isTemp - and: [variable isRemote not - and: [variable isOnlySubnodeOf: node in: self]]]]]]]) ifTrue: - [node arguments last arguments isEmpty - ifTrue: [node arguments last arguments: { variable }. - varsToHide add: variable] - ifFalse: [self assert: node arguments last arguments asArray = { variable }]. - node receiver receiver: node receiver receiver value]]. - varsToHide notEmpty ifTrue: - [self nodesDo: - [:node| - ((node == self or: [node isBlockNode]) - and: [node temporaries anySatisfy: [:temp| varsToHide includes: temp]]) ifTrue: - [node temporaries: (node temporaries reject: [:temp| varsToHide includes: temp])]]]! Item was added: + ----- Method: MethodNode>>preenTempsConflictingWithBlockNode: (in category 'converting-private') ----- + preenTempsConflictingWithBlockNode: temps + "Push temps that conflict with other bocks down into their narrowest enclosing block scope." + temps do: + [:tempVar| + (self accept: (NarrowerVariableScopeFinder new ofVariable: tempVar)) ifNotNil: + [:enclosingScope | + self assert: enclosingScope isBlockNode. + self nodesDo: + [:node| + ((node == self or: [node isBlockNode]) + and: [node temporaries includes: tempVar]) ifTrue: + [node temporaries: (node temporaries copyWithout: tempVar)]]. + enclosingScope temporaries: enclosingScope temporaries, { tempVar }]]! Item was added: + ----- Method: MethodNode>>preenableNodes (in category 'converting-private') ----- + preenableNodes + "Answer a Dictionary from node or sequence of nodes to preen method selector for nodes + in the tree that require post-processing after either a format or a decompile. Such issues + are the variable for an ifNotNil: which is local to the ifNotNil: block but, due to the inlining + of ifNotNil: appears to be declared at the outer level, and, similarly, a temporary variable + that conflicts with one of the same name in a block when, were the variable declared + local to some inlined block it would no longer conflict. The resulting dictionary is used to + perform the value with the key (node or array) as argument to preen the tree." + + | preenableNodes priorBlocks priorVariables | + preenableNodes := Dictionary new. + priorBlocks := OrderedCollection new. + priorVariables := Set new. + self nodesDo: + [:node| | variable temps | + (node isMessageNode + and: [node macroPrinter == #printIfNilNotNil:indent: + and: [node receiver isMessageNode + and: [node receiver selector key == #== + and: [node receiver receiver isAssignmentNode + and: [(variable := node receiver receiver variable) isTemp + and: [variable isRemote not + and: [variable isOnlySubnodeOf: node in: self]]]]]]]) ifTrue: + [preenableNodes at: node put: #preenIfNotNilNode:. + priorVariables add: variable]. + node isBlockNode ifTrue: + [temps := OrderedCollection new. + node temporaries do: + [:temp| + priorBlocks do: + [:aBlock| + aBlock temporaries do: + [:priorTemp| + (priorVariables includes: priorTemp) ifFalse: + [priorTemp key = temp key ifTrue: + [temps addLast: priorTemp]]]]]. + temps isEmpty ifFalse: + [preenableNodes at: temps put: #preenTempsConflictingWithBlockNode:]. + priorBlocks addLast: node]]. + ^preenableNodes! Item was added: + VariableScopeFinder subclass: #NarrowerVariableScopeFinder + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'Compiler-Support'! + + !NarrowerVariableScopeFinder commentStamp: 'eem 4/3/2017 11:59' prior: 0! + A NarrowerVariableScopeFinder is used to find a smaller scope for an already declared variable.! Item was added: + ----- Method: NarrowerVariableScopeFinder>>visitTempVariableNode: (in category 'visiting') ----- + visitTempVariableNode: aVariableNode + ^theVariable = aVariableNode ifTrue: [theVariable]! Item was added: + ----- Method: NarrowerVariableScopeFinder>>visitUndeclaredVariableNode: (in category 'visiting') ----- + visitUndeclaredVariableNode: aVariableNode + ^nil!

3 3

Arc morph?
by tim Rowledge 04 Apr '17

04 Apr '17

I’m trying to find a nice way to do circular arc morphs; so far CurveMorph isn’t playing very nice for this and google is not finding anything that looks interesting. Has anyone seen suitable code, or is anyone in possession of the Seekrit Knowledge of how to make CurveMorph do clean circular arcs? tim -- tim Rowledge; tim(a)rowledge.org; http://www.rowledge.org/tim For every action, there is an equal and opposite criticism.

4 6

Jump to page: