Squeak-dev August 2014

squeak-dev@lists.squeakfoundation.org

38 participants
130 discussions

The Trunk: Compiler-eem.285.mcz
by commits＠source.squeak.org 06 Aug '14

06 Aug '14

Eliot Miranda uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-eem.285.mcz ==================== Summary ==================== Name: Compiler-eem.285 Author: eem Time: 5 August 2014, 7:52:00.572 pm UUID: 99d40074-99f4-4e36-875e-e3f1cd61acfa Ancestors: Compiler-eem.284 Lots more support for multiple bytecode sets. Abstract out of InstructionStream: size of closure creation bytecode scanning for inst var reads and writes Provide support for bytecode set specific callPrimitiveBytecode unusedBytecode Provide support for different special literal and special selector encodings. Ensure bytecode sizing of backward branches use negative distances. Other: Make the MessageNode transformations check for the relevant block argument count. =============== Diff against Compiler-eem.284 =============== Item was added: + ----- Method: BlockLocalTempCounter class>>tempCountForBlockStartingAt:in: (in category 'instance creation') ----- + tempCountForBlockStartingAt: startpc in: method + ^self new + tempCountForBlockAt: (method encoderClass pcOfBlockCreationBytecodeForBlockStartingAt: startpc in: method) + in: method! Item was changed: ----- Method: BytecodeEncoder class>>bytecodeSize: (in category 'instruction stream support') ----- + bytecodeSize: aByte - bytecodeSize: bytecode - "Answer the number of bytes in the (unextended) bytecode." - self subclassResponsibility! Item was added: + ----- Method: BytecodeEncoder class>>callPrimitiveCode (in category 'bytecode decoding') ----- + callPrimitiveCode + "Answer the call primitive bytecode, if it exists in the encoder's byetcode set, or nil if not." + ^nil! Item was added: + ----- Method: BytecodeEncoder class>>method:readsField: (in category 'scanning') ----- + method: method readsField: varIndex + "Answer if method loads the instance variable indexed by varIndex." + ^self subclassResponsibility! Item was added: + ----- Method: BytecodeEncoder class>>method:writesField: (in category 'scanning') ----- + method: method writesField: varIndex + "Answer if method stores into the instance variable indexed by varIndex." + ^self subclassResponsibility! Item was added: + ----- Method: BytecodeEncoder 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." + ^self subclassResponsibility! Item was added: + ----- Method: BytecodeEncoder class>>pushClosureBytecodeSize (in category 'bytecode decoding') ----- + pushClosureBytecodeSize + "Answer the size of the push closure bytecode, if there is one." + ^self subclassResponsibility! Item was added: + ----- Method: BytecodeEncoder 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." + ^nil! Item was added: + ----- Method: BytecodeEncoder>>sizeCallPrimitive: (in category 'opcode sizing') ----- + sizeCallPrimitive: primitiveIndex + ^self sizeOpcodeSelector: #genCallPrimitive: withArguments: {primitiveIndex}! Item was added: + ----- Method: BytecodeEncoder>>sizeSendSpecial:numArgs: (in category 'opcode sizing') ----- + sizeSendSpecial: specialSelectorIndex numArgs: nArgs + ^self sizeOpcodeSelector: #genSendSpecial:numArgs: withArguments: {specialSelectorIndex. nArgs}! Item was changed: ----- Method: Decompiler>>decompile:in:method:using: (in category 'public access') ----- decompile: aSelector in: aClass method: aMethod using: aConstructor | block node | constructor := aConstructor. method := aMethod. self initSymbols: aClass. "create symbol tables" method isQuick ifTrue: [block := self quickMethod] ifFalse: [stack := OrderedCollection new: method frameSize. lastJumpIfPcStack := OrderedCollection new. caseExits := OrderedCollection new. statements := OrderedCollection new: 20. numLocalTemps := 0. super method: method pc: method initialPC. "skip primitive error code store if necessary" + (method primitive ~= 0 and: [self skipCallPrimitive; willStore]) ifTrue: + [pc := pc + (method encoderClass bytecodeSize: self firstByte). - (method primitive ~= 0 and: [self willStore]) ifTrue: - [pc := pc + 2. tempVars := tempVars asOrderedCollection]. block := self blockTo: method endPC + 1. stack isEmpty ifFalse: [self error: 'stack not empty']]. node := constructor codeMethod: aSelector block: block tempVars: tempVars primitive: method primitive class: aClass. method primitive > 0 ifTrue: [node removeAndRenameLastTempIfErrorCode]. ^node preen! Item was changed: ----- Method: Decompiler>>doClosureCopyCopiedValues:numArgs:blockSize: (in category 'control') ----- doClosureCopyCopiedValues: blockCopiedValues numArgs: numArgs blockSize: blockSize | startpc savedTemps savedTempVarCount savedNumLocalTemps jump blockArgs blockTemps blockTempsOffset block | savedTemps := tempVars. savedTempVarCount := tempVarCount. savedNumLocalTemps := numLocalTemps. jump := blockSize + (startpc := pc). + numLocalTemps := BlockLocalTempCounter + tempCountForBlockStartingAt: pc + in: method. - numLocalTemps := BlockLocalTempCounter tempCountForBlockAt: pc - 4 in: method. blockTempsOffset := numArgs + blockCopiedValues size. (blockStartsToTempVars notNil "implies we were intialized with temp names." and: [blockStartsToTempVars includesKey: pc]) ifTrue: [tempVars := blockStartsToTempVars at: pc] ifFalse: [blockArgs := (1 to: numArgs) collect: [:i| (constructor codeTemp: i - 1 named: 't', (tempVarCount + i) printString) beBlockArg]. blockTemps := (1 to: numLocalTemps) collect: [:i| constructor codeTemp: i + blockTempsOffset - 1 named: 't', (tempVarCount + i + numArgs) printString]. tempVars := blockArgs, blockCopiedValues, blockTemps]. numLocalTemps timesRepeat: [self interpretNextInstructionFor: self. stack removeLast]. tempVarCount := tempVarCount + numArgs + numLocalTemps. block := self blockTo: jump. stack addLast: ((constructor codeArguments: (tempVars copyFrom: 1 to: numArgs) temps: (tempVars copyFrom: blockTempsOffset + 1 to: blockTempsOffset + numLocalTemps) block: block) pc: startpc; yourself). tempVars := savedTemps. tempVarCount := savedTempVarCount. numLocalTemps := savedNumLocalTemps! Item was changed: ----- Method: Decompiler>>interpretNextInstructionFor: (in category 'private') ----- interpretNextInstructionFor: client | code varNames | "Change false here will trace all state in Transcript." + true ifTrue: [^super interpretNextInstructionFor: client]. - true ifTrue: [^ super interpretNextInstructionFor: client]. varNames := self class allInstVarNames. code := (self method at: pc) radix: 16. + Transcript cr; cr; print: pc; space; nextPutAll: '<' , code, '>'. + (varNames indexOf: 'stack') to: varNames size do: + [:i | + i <= 10 ifTrue: [Transcript cr] ifFalse: [Transcript space; space]. + Transcript nextPutAll: (varNames at: i); nextPutAll: ': '; print: (self instVarAt: i)]. + Transcript flush. + ^super interpretNextInstructionFor: client! - Transcript cr; cr; print: pc; space; - nextPutAll: '<' , code, '>'. - 8 to: varNames size do: - [:i | i <= 10 ifTrue: [Transcript cr] - ifFalse: [Transcript space; space]. - Transcript nextPutAll: (varNames at: i); - nextPutAll: ': '; print: (self instVarAt: i)]. - Transcript endEntry. - ^ super interpretNextInstructionFor: client! Item was changed: ----- 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 - encoder: (EncoderForV3PlusClosures new initScopeAndLiteralTables temps: visibleTemps, invisibleTemps literals: literalValues class: class) primitive: primitive properties: properties. blockNode properties method: blockNode. ^blockNode! Item was added: + ----- Method: EncoderForV3 class>>method:readsField: (in category 'scanning') ----- + method: method readsField: varIndex + "Answer if method loads the instance variable indexed by varIndex. + N.B. Don't assume the compiler uses the most compact encoding available. + 0-15 0000iiii Push Receiver Variable #iiii + 128 10000000 jjkkkkkk Push (Receiver Variable, Temporary Location, Literal Constant, Literal Variable) [jj] #kkkkkk + 132 10000100 iiijjjjj kkkkkkkk (Send, Send Super, Push Receiver Variable, Push Literal Constant, Push Literal Variable, Store Receiver Variable, Store-Pop Receiver Variable, Store Literal Variable)[iii] #kkkkkkkk jjjjj (for sends jjjjj = numArgs)" + | varIndexCode scanner | + varIndexCode := varIndex - 1. + method isReturnField ifTrue: + [^method returnField = varIndexCode]. + ^(scanner := InstructionStream on: method) scanFor: + [:b| + b < 16 + ifTrue: [b = varIndexCode] + ifFalse: + [b = 128 + ifTrue: [scanner followingByte = varIndexCode and: [varIndexCode <= 63]] + ifFalse: + [b = 132 + and: [(scanner followingByte between: 64 and: 95) + and: [scanner thirdByte = varIndexCode]]]]]! Item was added: + ----- Method: EncoderForV3 class>>method:writesField: (in category 'scanning') ----- + method: method writesField: varIndex + "Answer if method stores into the instance variable indexed by varIndex. + N.B. Don't assume the compiler uses the most compact encoding available. + 96-103 01100iii Pop and Store Receiver Variable #iii + 129 10000001 jjkkkkkk Store (Receiver Variable, Temporary Location, Illegal, Literal Variable) [jj] #kkkkkk + 130 10000010 jjkkkkkk Pop and Store (Receiver Variable, Temporary Location, Illegal, Literal Variable) [jj] #kkkkkk + 132 10000100 iiijjjjj kkkkkkkk (Send, Send Super, Push Receiver Variable, Push Literal Constant, Push Literal Variable, Store Receiver Variable, Store-Pop Receiver Variable, Store Literal Variable)[iii] #kkkkkkkk jjjjj (for sends jjjjj = numArgs)" + | varIndexCode scanner | + method isQuick ifTrue: [^false]. + varIndexCode := varIndex - 1. + ^(scanner := InstructionStream on: method) scanFor: + [:b| + b >= 96 + and: [b <= 103 + ifTrue: [b - 96 = varIndexCode] + ifFalse: + [(b = 129 or: [b = 130]) + ifTrue: [scanner followingByte = varIndexCode and: [varIndexCode <= 63]] + ifFalse: + [b = 132 + and: [(scanner followingByte between: 160 and: 223) + and: [scanner thirdByte = varIndexCode]]]]]]! Item was added: + ----- Method: EncoderForV3 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." + ^126! Item was added: + ----- Method: EncoderForV3>>genSendSpecial:numArgs: (in category 'bytecode generation') ----- + genSendSpecial: specialSelectorIndex numArgs: nArgs + "See BlueBook page 596" + self assert: (specialSelectorIndex between: 1 and: Smalltalk specialSelectorSize). + self assert: nArgs = (Smalltalk specialNargsAt: specialSelectorIndex). + "Special selector sends. + 176-191 1011iiii Send Arithmetic Message #iiii + 192-207 1100iiii Send Special Message #iiii" + stream nextPut: specialSelectorIndex + 175! Item was changed: ----- Method: EncoderForV3PlusClosures class>>bytecodeSize: (in category 'instruction stream support') ----- bytecodeSize: bytecode "Answer the number of bytes in the bytecode." bytecode <= 125 ifTrue: [^1]. bytecode >= 176 ifTrue: [^1]. bytecode >= 160 ifTrue: "long jumps" [^2]. bytecode >= 144 ifTrue: "short jumps" [^1]. "extensions" bytecode >= 128 ifTrue: [^#(2 2 2 2 3 2 2 1 1 1 2 nil 3 3 3 4) at: bytecode - 127]. ^nil! Item was added: + ----- Method: EncoderForV3PlusClosures 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. + 143 10001111 llllkkkk jjjjjjjj iiiiiiii Push Closure Num Copied llll Num Args kkkk BlockSize jjjjjjjjiiiiiiii" + ^startpc - 4! Item was added: + ----- Method: EncoderForV3PlusClosures class>>pushClosureBytecodeSize (in category 'bytecode decoding') ----- + pushClosureBytecodeSize + "Answer the size of the push closure bytecode. + 143 10001111 llllkkkk jjjjjjjj iiiiiiii Push Closure Num Copied llll Num Args kkkk BlockSize jjjjjjjjiiiiiiii" + ^4! Item was removed: - ----- Method: MessageNode>>checkBlock:as:from: (in category 'private') ----- - checkBlock: node as: nodeName from: encoder - - ^self checkBlock: node as: nodeName from: encoder maxArgs: 0! Item was changed: ----- Method: MessageNode>>sizeCodeForRepeat:value: (in category 'code generation') ----- sizeCodeForRepeat: encoder value: forValue "L1: ... Jmp(L1) nil (nil for value only);" | loopSize | + "We assume long backward branches are always maximal size branches." + loopSize := (receiver sizeCodeForEvaluatedEffect: encoder) + (encoder sizeJumpLong: -1). - loopSize := (receiver sizeCodeForEvaluatedEffect: encoder) + (encoder sizeJumpLong: 1). sizes := Array with: loopSize. ^loopSize + (forValue ifTrue: [encoder sizePushSpecialLiteral: nil] ifFalse: [0])! Item was changed: ----- Method: MessageNode>>sizeCodeForWhile:value: (in category 'code generation') ----- sizeCodeForWhile: encoder value: forValue "L1: ... Bfp(L2) ... Jmp(L1) L2: nil (nil for value only); justStmt, wholeLoop, justJump." | cond stmt stmtSize loopSize branchSize | cond := receiver. stmt := arguments at: 1. + "We assume long backward branches are always maximal size branches." + stmtSize := (stmt sizeCodeForEvaluatedEffect: encoder) + (encoder sizeJumpLong: -1). - stmtSize := (stmt sizeCodeForEvaluatedEffect: encoder) + (encoder sizeJumpLong: 1). branchSize := self sizeCode: encoder forBranchOn: selector key == #whileFalse: "Btp for whileFalse" dist: stmtSize. loopSize := (cond sizeCodeForEvaluatedValue: encoder) + branchSize + stmtSize. sizes := Array with: stmtSize with: loopSize. ^loopSize + (forValue ifTrue: [encoder sizePushSpecialLiteral: nil] ifFalse: [0])! Item was changed: ----- Method: MessageNode>>transformBoolean: (in category 'macro transformations') ----- transformBoolean: encoder ^self checkBlock: (arguments at: 1) as: 'argument' + from: encoder + maxArgs: 0! - from: encoder! Item was changed: ----- Method: MessageNode>>transformCase: (in category 'macro transformations') ----- transformCase: encoder | caseNode | caseNode := arguments first. + (caseNode isMemberOf: BraceNode) ifFalse: [^false]. + (caseNode blockAssociationCheck: encoder) ifFalse: [^false]. + (arguments size = 1 + or: [self checkBlock: arguments last as: 'otherwise arg' from: encoder maxArgs: 0]) ifFalse: + [^false]. + caseNode elements do: + [:messageNode | - (caseNode isMemberOf: BraceNode) ifFalse: [ ^false ]. - (caseNode blockAssociationCheck: encoder) ifFalse: [ ^false ]. - (arguments size = 1 or: [ - self checkBlock: arguments last as: 'otherwise arg' from: encoder ]) ifFalse: [ - ^false ]. - caseNode elements do: [ :messageNode | messageNode receiver noteOptimizedIn: self. + messageNode arguments first noteOptimizedIn: self]. + arguments size = 2 ifTrue: + [arguments last noteOptimizedIn: self]. - messageNode arguments first noteOptimizedIn: self ]. - arguments size = 2 ifTrue: [ arguments last noteOptimizedIn: self ]. ^true! Item was changed: ----- Method: MessageNode>>transformIfFalseIfTrue: (in category 'macro transformations') ----- transformIfFalseIfTrue: encoder + ^(self checkBlock: (arguments at: 1) as: 'False arg' from: encoder maxArgs: 0) + and: [(self checkBlock: (arguments at: 2) as: 'True arg' from: encoder maxArgs: 0) - ^(self checkBlock: (arguments at: 1) as: 'False arg' from: encoder) - and: [(self checkBlock: (arguments at: 2) as: 'True arg' from: encoder) and: [selector := SelectorNode new key: #ifTrue:ifFalse: code: #macro. arguments swap: 1 with: 2. arguments do: [:arg| arg noteOptimizedIn: self]. true]]! Item was changed: ----- Method: MessageNode>>transformIfTrueIfFalse: (in category 'macro transformations') ----- transformIfTrueIfFalse: encoder + ^(self checkBlock: (arguments at: 1) as: 'True arg' from: encoder maxArgs: 0) + and: [(self checkBlock: (arguments at: 2) as: 'False arg' from: encoder maxArgs: 0) - ^(self checkBlock: (arguments at: 1) as: 'True arg' from: encoder) - and: [(self checkBlock: (arguments at: 2) as: 'False arg' from: encoder) and: [arguments do: [:arg| arg noteOptimizedIn: self]. true]]! Item was changed: ----- Method: MessageNode>>transformRepeat: (in category 'macro transformations') ----- transformRepeat: encoder "answer true if this #repeat message can be optimized" + ^(self checkBlock: receiver as: 'receiver' from: encoder maxArgs: 0) - ^(self checkBlock: receiver as: 'receiver' from: encoder) and: [receiver noteOptimizedIn: self. true]! Item was changed: ----- Method: MessageNode>>transformWhile: (in category 'macro transformations') ----- transformWhile: encoder + (self checkBlock: receiver as: 'receiver' from: encoder maxArgs: 0) ifFalse: - (self checkBlock: receiver as: 'receiver' from: encoder) ifFalse: [^false]. arguments size = 0 ifTrue: "transform bodyless form to body form" [selector := SelectorNode new key: (special = 10 ifTrue: [#whileTrue:] ifFalse: [#whileFalse:]) code: #macro. arguments := Array with: ((BlockNode withJust: NodeNil) noteOptimizedIn: self). receiver noteOptimizedIn: self. ^true]. ^(self transformBoolean: encoder) and: [receiver noteOptimizedIn: self. arguments first noteOptimizedIn: self. true]! Item was added: + LiteralNode subclass: #SpecialLiteralNode + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'Compiler-ParseNodes'! Item was added: + ----- Method: SpecialLiteralNode>>emitCodeForValue:encoder: (in category 'code generation (closures)') ----- + emitCodeForValue: stack encoder: encoder + stack push: 1. + encoder genPushSpecialLiteral: key! Item was added: + ----- Method: SpecialLiteralNode>>sizeCodeForValue: (in category 'code generation (closures)') ----- + sizeCodeForValue: encoder + ^encoder sizePushSpecialLiteral: key! Item was added: + SelectorNode subclass: #SpecialSelectorNode + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'Compiler-ParseNodes'! Item was added: + ----- Method: SpecialSelectorNode>>emitCode:args:encoder:super: (in category 'code generation') ----- + emitCode: stack args: nArgs encoder: encoder super: supered + "Generate a special selector send. + A super send of a special selector must be handled like a normal send." + supered + ifTrue: + [super emitCode: stack args: nArgs encoder: encoder super: supered] + ifFalse: + [stack pop: nArgs. + encoder genSendSpecial: code numArgs: nArgs]! Item was added: + ----- Method: SpecialSelectorNode>>sizeCode:args:super: (in category 'code generation') ----- + sizeCode: encoder args: nArgs super: supered + "Size a special selector send. + A super send of a special selector must be handled like a normal send." + ^supered + ifTrue: [super sizeCode: encoder args: nArgs super: supered] + ifFalse: [encoder sizeSendSpecial: code numArgs: nArgs]! Item was changed: ----- Method: VariableNode class>>initialize (in category 'class initialization') ----- initialize "VariableNode initialize. Decompiler initialize" | encoder | encoder := Encoder new. StdVariables := Dictionary new: 16. encoder fillDict: StdVariables with: VariableNode mapping: #('self' 'thisContext' 'super' 'nil' 'false' 'true' ) to: (Array with: LdSelf with: LdThisContext with: LdSuper) , (Array with: LdNil with: LdFalse with: LdTrue). StdSelectors := Dictionary new: 64. encoder fillDict: StdSelectors + with: SpecialSelectorNode - with: SelectorNode mapping: ((1 to: Smalltalk specialSelectorSize) collect: [:i | Smalltalk specialSelectorAt: i]) + to: (1 to: Smalltalk specialSelectorSize) asArray. - to: (SendPlus to: SendPlus + 31). StdLiterals := PluggableDictionary new equalBlock: [ :x :y | x literalEqual: y ]. encoder fillDict: StdLiterals with: LiteralNode mapping: #(-1 0 1 2 ) to: (LdMinus1 to: LdMinus1 + 3). encoder initScopeAndLiteralTables. NodeNil := encoder encodeVariable: 'nil'. NodeTrue := encoder encodeVariable: 'true'. NodeFalse := encoder encodeVariable: 'false'. NodeSelf := encoder encodeVariable: 'self'. NodeThisContext := encoder encodeVariable: 'thisContext'. NodeSuper := encoder encodeVariable: 'super'!

1 0

The Trunk: Kernel-eem.862.mcz
by commits＠source.squeak.org 06 Aug '14

06 Aug '14

Eliot Miranda uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-eem.862.mcz ==================== Summary ==================== Name: Kernel-eem.862 Author: eem Time: 5 August 2014, 7:35:31.651 pm UUID: ff1a01aa-168f-486e-9fd6-53d9d56218dc Ancestors: Kernel-eem.861 Add skipCallPrimtiive for multiple-bytecode-sets capable Decompiler. =============== Diff against Kernel-eem.861 =============== Item was added: + ----- Method: InstructionStream>>skipCallPrimitive (in category 'decoding') ----- + skipCallPrimitive + self method encoderClass callPrimitiveCode ifNotNil: + [:callPrimitiveCode| + (self method byteAt: pc) = callPrimitiveCode ifTrue: + [pc := pc + (self method encoderClass bytecodeSize: callPrimitiveCode)]]!

1 0

The Trunk: System-eem.684.mcz
by commits＠source.squeak.org 06 Aug '14

06 Aug '14

Eliot Miranda uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-eem.684.mcz ==================== Summary ==================== Name: System-eem.684 Author: eem Time: 5 August 2014, 7:30:44.652 pm UUID: fd43866f-b1d4-4e9b-8cee-33b5b74c3054 Ancestors: System-nice.683 Fix mis-categorization =============== Diff against System-nice.683 =============== Item was changed: + ----- Method: SmalltalkImage>>buildDate (in category 'system attributes') ----- - ----- Method: SmalltalkImage>>buildDate (in category 'system attribute') ----- buildDate "Return a String reflecting the build date of the VM" "Smalltalk buildDate" ^self getSystemAttribute: 1006!

1 0

The Trunk: Kernel.spur-eem.861.mcz
by commits＠source.squeak.org 06 Aug '14

06 Aug '14

Eliot Miranda uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel.spur-eem.861.mcz ==================== Summary ==================== Name: Kernel.spur-eem.861 Author: eem Time: 5 August 2014, 5:27:24.372 pm UUID: d83077cc-0fd1-4a3b-b4f9-3e4447dd472d Ancestors: Kernel-eem.861 Kernel-eem.861 patched for Spur by SpurBootstrapMonticelloPackagePatcher Cog-eem.179 Slightly more efficient ProtoObject>>become:. Eliminate isKindOf:'s in InstructionPrinter>>pushConstant:. Provide CompiledMethod>>protocol to answer its selector's category^H^H^H^H^H^H^H^Hprotocol. =============== Diff against Kernel-eem.861 =============== Item was changed: ----- Method: Behavior>>allInstances (in category 'accessing instances and variables') ----- + allInstances + "Answer all instances of the receiver." + <primitive: 177> + "The primitive can fail because memory is low. If so, fall back on the old + enumeration code, which gives the system a chance to GC and/or grow. + Because aBlock might change the class of inst (for example, using become:), + it is essential to compute next before aBlock value: inst." + | inst insts next | + insts := WriteStream on: (Array new: 64). + inst := self someInstance. + [inst == nil] whileFalse: + [next := inst nextInstance. + (inst == insts or: [inst == insts originalContents]) ifFalse: [insts nextPut: inst]. + inst := next]. + ^insts contents! - allInstances - "Answer a collection of all current instances of the receiver." - - | all | - all := OrderedCollection new. - self allInstancesDo: [:x | x == all ifFalse: [all add: x]]. - ^ all asArray - ! Item was changed: ----- Method: Behavior>>allInstancesDo: (in category 'enumerating') ----- + allInstancesDo: aBlock + "Evaluate aBlock with each of the current instances of the receiver." + | instances inst next | + instances := self allInstancesOrNil. + instances ifNotNil: + [instances do: aBlock. + ^self]. + "allInstancesOrNil can fail because memory is low. If so, fall back on the old + enumeration code. Because aBlock might change the class of inst (for example, + using become:), it is essential to compute next before aBlock value: inst." - allInstancesDo: aBlock - "Evaluate the argument, aBlock, for each of the current instances of the - receiver. - - Because aBlock might change the class of inst (for example, using become:), - it is essential to compute next before aBlock value: inst." - | inst next | inst := self someInstance. + [inst == nil] whileFalse: + [next := inst nextInstance. + aBlock value: inst. + inst := next]! - [inst == nil] - whileFalse: - [ - next := inst nextInstance. - aBlock value: inst. - inst := next]! Item was added: + ----- Method: Behavior>>allInstancesOrNil (in category 'enumerating') ----- + allInstancesOrNil + "Answer all instances of the receiver, or nil if the primitive + fails, which it may be due to being out of memory." + <primitive: 177> + ^nil! Item was changed: ----- Method: Behavior>>basicNew (in category 'instance creation') ----- basicNew "Primitive. Answer an instance of the receiver (which is a class) with no + indexable variables. Fail if the class is indexable. Essential. See Object + documentation whatIsAPrimitive. + + If the primitive fails because space is low then the scavenger + will run before the method is activated. Check arguments and + retry via handleFailingBasicNew if they're OK." - indexable variables. Fail if the class is indexable. Essential. See Object - documentation whatIsAPrimitive." <primitive: 70> + self isVariable ifTrue: [^self basicNew: 0]. + "space must have been low, and the scavenger must have run. + retry after the scavenge." + ^self handleFailingBasicNew! - self isVariable ifTrue: [ ^ self basicNew: 0 ]. - "space must be low" - OutOfMemory signal. - ^ self basicNew "retry if user proceeds" - ! Item was changed: ----- Method: Behavior>>basicNew: (in category 'instance creation') ----- basicNew: sizeRequested + "Primitive. Answer an instance of this class with the number of indexable + variables specified by the argument, sizeRequested. Fail if this class is not + indexable or if the argument is not a positive Integer, or if there is not + enough memory available. Essential. See Object documentation whatIsAPrimitive. + + If the primitive fails because space is low then the scavenger will run before the + method is activated. Check args and retry via handleFailingBasicNew: if they're OK." - "Primitive. Answer an instance of this class with the number - of indexable variables specified by the argument, sizeRequested. - Fail if this class is not indexable or if the argument is not a - positive Integer, or if there is not enough memory available. - Essential. See Object documentation whatIsAPrimitive." <primitive: 71> self isVariable ifFalse: [self error: self printString, ' cannot have variable sized instances']. (sizeRequested isInteger and: [sizeRequested >= 0]) ifTrue: + ["arg okay; space must have been low, and the scavenger must have run. + retry after the scavenge" + ^self handleFailingBasicNew: sizeRequested]. - ["arg okay; space must be low." - OutOfMemory signal. - ^ self basicNew: sizeRequested "retry if user proceeds"]. self primitiveFailed! Item was added: + ----- Method: Behavior>>byteSizeOfInstance (in category 'accessing instances and variables') ----- + byteSizeOfInstance + "Answer the total memory size of an instance of the receiver." + + <primitive: 181 error: ec> + self isVariable ifTrue: + [^self byteSizeOfInstanceOfSize: 0]. + self primitiveFailed! Item was added: + ----- Method: Behavior>>byteSizeOfInstanceOfSize: (in category 'accessing instances and variables') ----- + byteSizeOfInstanceOfSize: basicSize + "Answer the total memory size of an instance of the receiver + with the given number of indexable instance variables." + + <primitive: 181 error: ec> + self isVariable + ifTrue: "If the primitive overflowed answer a close approximation" + [(basicSize isInteger + and: [basicSize >= 16r1000000]) ifTrue: + [^2 * (self byteSizeOfInstanceOfSize: basicSize + 1 // 2) + - (self byteSizeOfInstanceOfSize: 0)]] + ifFalse: + [basicSize = 0 ifTrue: + [^self byteSizeOfInstance]]. + self primitiveFailed! Item was added: + ----- Method: Behavior>>elementSize (in category 'accessing instances and variables') ----- + elementSize + "Answer the size in bytes of an element in the receiver. The formats are + 0 = 0 sized objects (UndefinedObject True False et al) + 1 = non-indexable objects with inst vars (Point et al) + 2 = indexable objects with no inst vars (Array et al) + 3 = indexable objects with inst vars (MethodContext AdditionalMethodState et al) + 4 = weak indexable objects with inst vars (WeakArray et al) + 5 = weak non-indexable objects with inst vars (ephemerons) (Ephemeron) + 6 = unused + 7 = immediates (SmallInteger, Character) + 8 = unused + 9 = 64-bit indexable + 10-11 = 32-bit indexable (Bitmap) + 12-15 = 16-bit indexable + 16-23 = 8-bit indexable + 24-31 = compiled methods (CompiledMethod)" + | instSpec | + instSpec := self instSpec. + instSpec < 9 ifTrue: [^Smalltalk wordSize]. + instSpec >= 16 ifTrue: [^1]. + instSpec >= 12 ifTrue: [^2]. + instSpec >= 10 ifTrue: [^4]. + ^8! Item was added: + ----- Method: Behavior>>handleFailingBasicNew (in category 'private') ----- + handleFailingBasicNew + "handleFailingBasicNew gets sent after basicNew has failed and allowed + a scavenging garbage collection to occur. The scavenging collection + will have happened as the VM is activating the (failing) basicNew. If + handleFailingBasicNew fails then the scavenge failed to reclaim sufficient + space and a global garbage collection is required. Retry after garbage + collecting and growing memory if necessary. + + Primitive. Answer an instance of this class with the number of indexable + variables specified by the argument, sizeRequested. Fail if this class is not + indexable or if the argument is not a positive Integer, or if there is not + enough memory available. Essential. See Object documentation whatIsAPrimitive." + + <primitive: 70> + Smalltalk garbageCollect < 1048576 ifTrue: + [Smalltalk growMemoryByAtLeast: 1048576]. + ^self handleFailingFailingBasicNew "retry after global garbage collect"! Item was added: + ----- Method: Behavior>>handleFailingBasicNew: (in category 'private') ----- + handleFailingBasicNew: sizeRequested + "handleFailingBasicNew: gets sent after basicNew: has failed and allowed + a scavenging garbage collection to occur. The scavenging collection + will have happened as the VM is activating the (failing) basicNew:. If + handleFailingBasicNew: fails then the scavenge failed to reclaim sufficient + space and a global garbage collection is required. Retry after garbage + collecting and growing memory if necessary. + + Primitive. Answer an instance of this class with the number of indexable + variables specified by the argument, sizeRequested. Fail if this class is not + indexable or if the argument is not a positive Integer, or if there is not + enough memory available. Essential. See Object documentation whatIsAPrimitive." + + <primitive: 71> + | bytesRequested | + bytesRequested := self byteSizeOfInstanceOfSize: sizeRequested. + Smalltalk garbageCollect < bytesRequested ifTrue: + [Smalltalk growMemoryByAtLeast: bytesRequested]. + "retry after global garbage collect and possible grow" + ^self handleFailingFailingBasicNew: sizeRequested! Item was added: + ----- Method: Behavior>>handleFailingFailingBasicNew (in category 'private') ----- + handleFailingFailingBasicNew + "This basicNew gets sent after handleFailingBasicNew: has done a full + garbage collection and possibly grown memory. If this basicNew fails + then the system really is low on space, so raise the OutOfMemory signal. + + Primitive. Answer an instance of this class with the number of indexable + variables specified by the argument, sizeRequested. Fail if this class is not + indexable or if the argument is not a positive Integer, or if there is not + enough memory available. Essential. See Object documentation whatIsAPrimitive." + + <primitive: 70> + "space must be low" + OutOfMemory signal. + ^self basicNew "retry if user proceeds"! Item was added: + ----- Method: Behavior>>handleFailingFailingBasicNew: (in category 'private') ----- + handleFailingFailingBasicNew: sizeRequested + "This basicNew: gets sent after handleFailingBasicNew: has done a full + garbage collection and possibly grown memory. If this basicNew: fails + then the system really is low on space, so raise the OutOfMemory signal. + + Primitive. Answer an instance of this class with the number of indexable + variables specified by the argument, sizeRequested. Fail if this class is not + indexable or if the argument is not a positive Integer, or if there is not + enough memory available. Essential. See Object documentation whatIsAPrimitive." + + <primitive: 71> + "space must be low." + OutOfMemory signal. + ^self basicNew: sizeRequested "retry if user proceeds"! Item was added: + ----- Method: Behavior>>identityHash (in category 'comparing') ----- + identityHash + "Answer a SmallInteger whose value is related to the receiver's identity. + Behavior implements identityHash to allow the VM to use an object representation which + does not include a direct reference to an object's class in an object. If the VM is using + this implementation then classes are held in a class table and instances contain the index + of their class in the table. A class's class table index is its identityHash so that an instance + can be created without searching the table for a class's index. The VM uses this primitive + to enter the class into the class table, assigning its identityHash with an as yet unused + class table index. If this primitive fails it means that the class table is full. In Spur as of + 2014 there are 22 bits of classTable index and 22 bits of identityHash per object. + + Primitive. Essential. Do not override. See Object documentation whatIsAPrimitive." + + <primitive: 175> + self primitiveFailed! Item was changed: ----- Method: Behavior>>indexIfCompact (in category 'private') ----- indexIfCompact + "Backward compatibility with the Squeak V3 object format. + Spur does not have a distinction between compact and non-compact classes." + ^0! - "If these 5 bits are non-zero, then instances of this class - will be compact. It is crucial that there be an entry in - Smalltalk compactClassesArray for any class so optimized. - See the msgs becomeCompact and becomeUncompact." - ^ (format bitShift: -11) bitAnd: 16r1F - " - Smalltalk compactClassesArray doWithIndex: - [:c :i | c == nil ifFalse: - [c indexIfCompact = i ifFalse: [self halt]]] - "! Item was changed: ----- Method: Behavior>>instSize (in category 'testing') ----- instSize "Answer the number of named instance variables + (as opposed to indexed variables) of the receiver. + Above Cog Spur the class format is + <5 bits inst spec><16 bits inst size>" + ^format bitAnd: 16rFFFF! - (as opposed to indexed variables) of the receiver." - - self flag: #instSizeChange. "Smalltalk browseAllCallsOn: #instSizeChange" - " - NOTE: This code supports the backward-compatible extension to 8 bits of instSize. - When we revise the image format, it should become... - ^ ((format bitShift: -1) bitAnd: 16rFF) - 1 - Note also that every other method in this category will require - 2 bits more of right shift after the change. - " - ^ ((format bitShift: -10) bitAnd: 16rC0) + ((format bitShift: -1) bitAnd: 16r3F) - 1! Item was changed: ----- Method: Behavior>>instSpec (in category 'testing') ----- instSpec + "Answer the instance specification part of the format that defines what kind of object + an instance of the receiver is. The formats are + 0 = 0 sized objects (UndefinedObject True False et al) + 1 = non-indexable objects with inst vars (Point et al) + 2 = indexable objects with no inst vars (Array et al) + 3 = indexable objects with inst vars (MethodContext AdditionalMethodState et al) + 4 = weak indexable objects with inst vars (WeakArray et al) + 5 = weak non-indexable objects with inst vars (ephemerons) (Ephemeron) + 6 = unused + 7 = immediates (SmallInteger, Character) + 8 = unused + 9 = 64-bit indexable + 10-11 = 32-bit indexable (Bitmap) + 12-15 = 16-bit indexable + 16-23 = 8-bit indexable + 24-31 = compiled methods (CompiledMethod)" + ^(format bitShift: -16) bitAnd: 16r1F! - ^ (format bitShift: -7) bitAnd: 16rF! Item was changed: ----- Method: Behavior>>isBits (in category 'testing') ----- isBits + "Answer whether the receiver contains just bits (not pointers). + Above Cog Spur the class format is + <5 bits inst spec><16 bits inst size> + where the 5-bit inst spec is + 0 = 0 sized objects (UndefinedObject True False et al) + 1 = non-indexable objects with inst vars (Point et al) + 2 = indexable objects with no inst vars (Array et al) + 3 = indexable objects with inst vars (MethodContext AdditionalMethodState et al) + 4 = weak indexable objects with inst vars (WeakArray et al) + 5 = weak non-indexable objects with inst vars (ephemerons) (Ephemeron) + 6 = unused + 7 = immediates (SmallInteger, Character) + 8 = unused + 9 = 64-bit indexable + 10-11 = 32-bit indexable (Bitmap) + 12-15 = 16-bit indexable + 16-23 = 8-bit indexable + 24-31 = compiled methods (CompiledMethod)" + ^self instSpec >= 7! - "Answer whether the receiver contains just bits (not pointers)." - - ^ self instSpec >= 6! Item was changed: ----- Method: Behavior>>isBytes (in category 'testing') ----- isBytes + "Answer whether the receiver has 8-bit instance variables. + Above Cog Spur the class format is + <5 bits inst spec><16 bits inst size> + where the 5-bit inst spec is + 0 = 0 sized objects (UndefinedObject True False et al) + 1 = non-indexable objects with inst vars (Point et al) + 2 = indexable objects with no inst vars (Array et al) + 3 = indexable objects with inst vars (MethodContext AdditionalMethodState et al) + 4 = weak indexable objects with inst vars (WeakArray et al) + 5 = weak non-indexable objects with inst vars (ephemerons) (Ephemeron) + 6 = unused + 7 = immediates (SmallInteger, Character) + 8 = unused + 9 = 64-bit indexable + 10-11 = 32-bit indexable (Bitmap) + 12-15 = 16-bit indexable + 16-23 = 8-bit indexable + 24-31 = compiled methods (CompiledMethod)" + ^self instSpec >= 16! - "Answer whether the receiver has 8-bit instance variables." - - ^ self instSpec >= 8! Item was added: + ----- Method: Behavior>>isEphemeronClass (in category 'testing') ----- + isEphemeronClass + "Answer whether the receiver has ephemeral instance variables. The garbage collector will + fire (queue for finalization) any ephemeron whose first instance variable is not referenced + other than from the transitive closure of references from ephemerons. Hence referring to + an object from the first inst var of an ephemeron will cause the ephemeron to fire when + the rest of the system does not refer to the object and that object is ready to be collected. + Since references from the remaining inst vars of an ephemeron will not prevent the ephemeron + from firing, ephemerons may act as the associations in weak dictionaries such that the value + (e.g. properties attached to the key) will not prevent firing when the key is no longer referenced + other than from ephemerons. Ephemerons can therefore be used to implement instance-based + pre-mortem finalization." + ^self instSpec = 5! Item was added: + ----- Method: Behavior>>isImmediateClass (in category 'testing') ----- + isImmediateClass + "Answer whether the receiver has immediate instances. Immediate instances + store their value in their object pointer, not in an object body. Hence immediates + take no space and are immutable. The immediates are distinguished by tag bits + in the pointer. They include SmallIntegers and Characters. Hence in the 32-bit + system SmallIntegers are 31-bit signed integers and Characters are 30-bit + unsigned character codes." + ^self instSpec = 7! Item was changed: ----- Method: Behavior>>isVariable (in category 'testing') ----- isVariable + "Answer whether the receiver has indexable variables. + Above Cog Spur the class format is + <5 bits inst spec><16 bits inst size> + where the 5-bit inst spec is + 0 = 0 sized objects (UndefinedObject True False et al) + 1 = non-indexable objects with inst vars (Point et al) + 2 = indexable objects with no inst vars (Array et al) + 3 = indexable objects with inst vars (MethodContext AdditionalMethodState et al) + 4 = weak indexable objects with inst vars (WeakArray et al) + 5 = weak non-indexable objects with inst vars (ephemerons) (Ephemeron) + 6 = unused + 7 = immediates (SmallInteger, Character) + 8 = unused + 9 = 64-bit indexable + 10-11 = 32-bit indexable (Bitmap) + 12-15 = 16-bit indexable + 16-23 = 8-bit indexable + 24-31 = compiled methods (CompiledMethod)" + | instSpec | + instSpec := self instSpec. + ^instSpec >= 2 and: [instSpec <= 4 or: [instSpec >= 9]]! - "Answer whether the receiver has indexable variables." - - ^ self instSpec >= 2! Item was changed: ----- Method: Behavior>>kindOfSubclass (in category 'testing class hierarchy') ----- kindOfSubclass + "Answer a String that is the keyword that describes the receiver's kind of subclass, + either a regular subclass, a variableSubclass, a variableByteSubclass, + a variableWordSubclass, a weakSubclass, an ephemeronSubclass or an immediateSubclass. + c.f. typeOfClass" + ^self isVariable + ifTrue: + [self isBits + ifTrue: + [self isBytes + ifTrue: [' variableByteSubclass: '] + ifFalse: [' variableWordSubclass: ']] + ifFalse: + [self isWeak + ifTrue: [' weakSubclass: '] + ifFalse: [' variableSubclass: ']]] + ifFalse: + [self isImmediateClass + ifTrue: [' immediateSubclass: '] + ifFalse: + [self isEphemeronClass + ifTrue: [' ephemeronSubclass: '] + ifFalse: [' subclass: ']]]! - "Answer a String that is the keyword that describes the receiver's kind - of subclass, either a regular subclass, a variableSubclass, a - variableByteSubclass, a variableWordSubclass, or a weakSubclass." - self isWeak - ifTrue: [^ ' weakSubclass: ']. - ^ self isVariable - ifTrue: [self isBits - ifTrue: [self isBytes - ifTrue: [ ' variableByteSubclass: '] - ifFalse: [ ' variableWordSubclass: ']] - ifFalse: [ ' variableSubclass: ']] - ifFalse: [ ' subclass: ']! Item was changed: ----- Method: Behavior>>shouldNotBeRedefined (in category 'testing') ----- shouldNotBeRedefined + "Answer if the receiver should not be redefined. + The assumption is that classes in Smalltalk specialObjects and + instance-specific Behaviors should not be redefined" - "Return true if the receiver should not be redefined. - The assumption is that compact classes, - classes in Smalltalk specialObjects and - Behaviors should not be redefined" + ^(Smalltalk specialObjectsArray + identityIndexOf: self + ifAbsent: [(self isKindOf: self) ifTrue: [1] ifFalse: [0]]) ~= 0! - ^(Smalltalk compactClassesArray includes: self) - or:[(Smalltalk specialObjectsArray includes: self) - or:[self isKindOf: self]]! Item was changed: ----- Method: Behavior>>typeOfClass (in category 'accessing') ----- typeOfClass + "Answer a symbol uniquely describing the type of the receiver. c.f. kindOfSubclass" + self isBytes ifTrue: + [^self instSpec = CompiledMethod instSpec + ifTrue: [#compiledMethod] "Very special!!" + ifFalse: [#bytes]]. + (self isWords and: [self isPointers not]) ifTrue: + [^self instSpec = SmallInteger instSpec + ifTrue: [#immediate] "Very special!!" + ifFalse: [#words]]. + self isWeak ifTrue: [^#weak]. + self isVariable ifTrue: [^#variable]. + self isEphemeronClass ifTrue: [^#ephemeron]. + ^#normal! - "Answer a symbol uniquely describing the type of the receiver" - self instSpec = CompiledMethod instSpec ifTrue:[^#compiledMethod]. "Very special!!" - self isBytes ifTrue:[^#bytes]. - (self isWords and:[self isPointers not]) ifTrue:[^#words]. - self isWeak ifTrue:[^#weak]. - self isVariable ifTrue:[^#variable]. - ^#normal.! Item was added: + ----- Method: Class>>immediateSubclass:instanceVariableNames:classVariableNames:poolDictionaries:category: (in category 'subclass creation') ----- + immediateSubclass: t instanceVariableNames: f classVariableNames: d poolDictionaries: s category: cat + "This is the standard initialization message for creating a new + immediate class as a subclass of an existing class (the receiver)." + ^ClassBuilder new + superclass: self + immediateSubclass: t + instanceVariableNames: f + classVariableNames: d + poolDictionaries: s + category: cat! Item was changed: ----- Method: ClassBuilder>>computeFormat:instSize:forSuper:ccIndex: (in category 'class format') ----- computeFormat: type instSize: newInstSize forSuper: newSuper ccIndex: ccIndex "Compute the new format for making oldClass a subclass of newSuper. + Answer the format or nil if there is any problem." - Return the format or nil if there is any problem." | instSize isVar isWords isPointers isWeak | type == #compiledMethod ifTrue: + [newInstSize > 0 ifTrue: + [self error: 'A compiled method class cannot have named instance variables'. + ^nil]. + ^CompiledMethod format]. - [^(CompiledMethod format - bitClear: (16r1F bitShift: 11)) - bitOr: (ccIndex bitShift: 11)]. instSize := newInstSize + (newSuper ifNil:[0] ifNotNil:[newSuper instSize]). + instSize > 65535 ifTrue: - instSize > 254 ifTrue: [self error: 'Class has too many instance variables (', instSize printString,')'. ^nil]. type == #normal ifTrue:[isVar := isWeak := false. isWords := isPointers := true]. type == #bytes ifTrue:[isVar := true. isWords := isPointers := isWeak := false]. type == #words ifTrue:[isVar := isWords := true. isPointers := isWeak := false]. type == #variable ifTrue:[isVar := isPointers := isWords := true. isWeak := false]. type == #weak ifTrue:[isVar := isWeak := isWords := isPointers := true]. + type == #ephemeron ifTrue:[isVar := false. isWeak := isWords := isPointers := true]. + type == #immediate ifTrue:[isVar := isWeak := isPointers := false. isWords := true]. + (isPointers not and: [instSize > 0]) ifTrue: + [self error: 'A non-pointer class cannot have named instance variables'. - (isPointers not and:[instSize > 0]) ifTrue: - [self error:'A non-pointer class cannot have instance variables'. ^nil]. + ^self format: instSize variable: isVar words: isWords pointers: isPointers weak: isWeak! - ^(self format: instSize - variable: isVar - words: isWords - pointers: isPointers - weak: isWeak) + (ccIndex bitShift: 11).! Item was changed: ----- Method: ClassBuilder>>format:variable:words:pointers:weak: (in category 'class format') ----- format: nInstVars variable: isVar words: isWords pointers: isPointers weak: isWeak + "Compute the format for the given instance specfication. + Above Cog Spur the class format is + <5 bits inst spec><16 bits inst size> + where the 5-bit inst spec is + 0 = 0 sized objects (UndefinedObject True False et al) + 1 = non-indexable objects with inst vars (Point et al) + 2 = indexable objects with no inst vars (Array et al) + 3 = indexable objects with inst vars (MethodContext AdditionalMethodState et al) + 4 = weak indexable objects with inst vars (WeakArray et al) + 5 = weak non-indexable objects with inst vars (ephemerons) (Ephemeron) + 6 = unused + 7 = immediates (SmallInteger, Character) + 8 = unused + 9 = reserved for 64-bit indexable + 10-11 = 32-bit indexable (Bitmap) + 12-15 = 16-bit indexable + 16-23 = 8-bit indexable + 24-31 = compiled methods (CompiledMethod)" + | instSpec | - "Compute the format for the given instance specfication." - | cClass instSpec sizeHiBits fmt | - self flag: #instSizeChange. - " - Smalltalk browseAllCallsOn: #instSizeChange. - Smalltalk browseAllImplementorsOf: #fixedFieldsOf:. - Smalltalk browseAllImplementorsOf: #instantiateClass:indexableSize:. - " - " - NOTE: This code supports the backward-compatible extension to 8 bits of instSize. - For now the format word is... - <2 bits=instSize//64><5 bits=cClass><4 bits=instSpec><6 bits=instSize\\64><1 bit=0> - But when we revise the image format, it should become... - <5 bits=cClass><4 bits=instSpec><8 bits=instSize><1 bit=0> - " - sizeHiBits := (nInstVars+1) // 64. - cClass := 0. "for now" instSpec := isWeak + ifTrue: + [isVar + ifTrue: [4] + ifFalse: [5]] + ifFalse: + [isPointers + ifTrue: + [isVar + ifTrue: [nInstVars > 0 ifTrue: [3] ifFalse: [2]] + ifFalse: [nInstVars > 0 ifTrue: [1] ifFalse: [0]]] + ifFalse: + [isVar + ifTrue: [isWords ifTrue: [12] ifFalse: [16]] + ifFalse: [7]]]. + ^(instSpec bitShift: 16) + nInstVars! - ifTrue:[4] - ifFalse:[isPointers - ifTrue: [isVar - ifTrue: [nInstVars>0 ifTrue: [3] ifFalse: [2]] - ifFalse: [nInstVars>0 ifTrue: [1] ifFalse: [0]]] - ifFalse: [isWords ifTrue: [6] ifFalse: [8]]]. - fmt := sizeHiBits. - fmt := (fmt bitShift: 5) + cClass. - fmt := (fmt bitShift: 4) + instSpec. - fmt := (fmt bitShift: 6) + ((nInstVars+1)\\64). "+1 since prim size field includes header" - fmt := (fmt bitShift: 1). "This shift plus integer bit lets wordSize work like byteSize" - ^fmt! Item was added: + ----- Method: ClassBuilder>>superclass:immediateSubclass:instanceVariableNames:classVariableNames:poolDictionaries:category: (in category 'public') ----- + superclass: aClass + immediateSubclass: t instanceVariableNames: f + classVariableNames: d poolDictionaries: s category: cat + "This is the standard initialization message for creating a + new immediate class as a subclass of an existing class." + | env | + aClass instSize > 0 + ifTrue: [^self error: 'cannot make an immediate subclass of a class with named fields']. + aClass isVariable + ifTrue: [^self error: 'cannot make an immediate subclass of a class with indexed instance variables']. + aClass isPointers + ifFalse: [^self error: 'cannot make an immediate subclass of a class without pointer fields']. + "Cope with pre-environment and environment versions. Simplify asap." + env := (Smalltalk classNamed: #EnvironmentRequest) + ifNil: [aClass environment] + ifNotNil: [:erc| erc signal ifNil: [aClass environment]]. + ^self + name: t + inEnvironment: env + subclassOf: aClass + type: #immediate + instanceVariableNames: f + classVariableNames: d + poolDictionaries: s + category: cat! Item was changed: ----- Method: ClassBuilder>>update:to: (in category 'class mutation') ----- update: oldClass to: newClass + "Convert oldClass, all its instances and possibly its meta class into newClass, + instances of newClass and possibly its meta class. The process is surprisingly + simple in its implementation and surprisingly complex in its nuances and potentially + bad side effects. + We can rely on two assumptions (which are critical): + #1: The method #updateInstancesFrom: will not create any lasting pointers to + 'old' instances ('old' is quote on quote since #updateInstancesFrom: will do + a become of the old vs. the new instances and therefore it will not create + pointers to *new* instances before the #become: which are *old* afterwards) + #2: The non-preemptive execution of the critical piece of code guarantees that + nobody can get a hold by 'other means' (such as process interruption and + reflection) on the old instances. + Given the above two, we know that after #updateInstancesFrom: there are no pointers + to any old instances. After the forwarding become there will be no pointers to the old + class or meta class either. + Andreas Raab, 2/27/2003 23:42" - "Convert oldClass, all its instances and possibly its meta class into newClass, instances of newClass and possibly its meta class. The process is surprisingly simple in its implementation and surprisingly complex in its nuances and potentially bad side effects. - We can rely on two assumptions (which are critical): - #1: The method #updateInstancesFrom: will not create any lasting pointers to 'old' instances ('old' is quote on quote since #updateInstancesFrom: will do a become of the old vs. the new instances and therefore it will not create pointers to *new* instances before the #become: which are *old* afterwards) - #2: The non-preemptive execution of the critical piece of code guarantees that nobody can get a hold by 'other means' (such as process interruption and reflection) on the old instances. - Given the above two, we know that after #updateInstancesFrom: there are no pointer to any old instances. After the forwarding become there will be no pointers to the old class or meta class either. Meaning that if we throw in a nice fat GC at the end of the critical block, everything will be gone (but see the comment right there). There's no need to worry. - " | meta | meta := oldClass isMeta. "Note: Everything from here on will run without the ability to get interrupted to prevent any other process to create new instances of the old class." + ["Note: The following removal may look somewhat obscure and needs an explanation. + When we mutate the class hierarchy we create new classes for any existing subclass. + So it may look as if we don't have to remove the old class from its superclass. However, + at the top of the hierarchy (the first class we reshape) that superclass itself is not newly + created so therefore it will hold both the oldClass and newClass in its (obsolete or not) + subclasses. Since the #become: below will transparently replace the pointers to oldClass + with newClass the superclass would have newClass in its subclasses TWICE. With rather + unclear effects if we consider that we may convert the meta-class hierarchy itself (which + is derived from the non-meta class hierarchy). + Due to this problem ALL classes are removed from their superclass just prior to converting + them. Here, breaking the superclass/subclass invariant really doesn't matter since we will + effectively remove the oldClass (becomeForward:) just a few lines below." - [ - "Note: The following removal may look somewhat obscure and needs an explanation. When we mutate the class hierarchy we create new classes for any existing subclass. So it may look as if we don't have to remove the old class from its superclass. However, at the top of the hierarchy (the first class we reshape) that superclass itself is not newly created so therefore it will hold both the oldClass and newClass in its (obsolete or not) subclasses. Since the #become: below will transparently replace the pointers to oldClass with newClass the superclass would have newClass in its subclasses TWICE. With rather unclear effects if we consider that we may convert the meta-class hierarchy itself (which is derived from the non-meta class hierarchy). - Due to this problem ALL classes are removed from their superclass just prior to converting them. Here, breaking the superclass/subclass invariant really doesn't matter since we will effectively remove the oldClass (become+GC) just a few lines below." oldClass superclass removeSubclass: oldClass. oldClass superclass removeObsoleteSubclass: oldClass. "make sure that the VM cache is clean" oldClass methodDict do: [:cm | cm flushCache]. "Convert the instances of oldClass into instances of newClass" newClass updateInstancesFrom: oldClass. meta ifTrue: [oldClass becomeForward: newClass. oldClass updateMethodBindingsTo: oldClass binding] ifFalse: [{oldClass. oldClass class} elementsForwardIdentityTo: {newClass. newClass class}. oldClass updateMethodBindingsTo: oldClass binding. oldClass class updateMethodBindingsTo: oldClass class binding]. + "eem 5/31/2014 07:22 At this point there used to be a garbage collect whose purpose was + to ensure no old instances existed after the becomeForward:. Without the GC it was possible + to resurrect old instances using e.g. allInstancesDo:. This was because the becomeForward: + updated references from the old objects to new objects but didn't destroy the old objects. + But as of late 2013/early 2014 becomeForward: has been modified to free all the old objects."] + valueUnpreemptively! - Smalltalk garbageCollect. - - "Warning: Read this before you even think about removing the GC. Yes, it slows us down. Quite heavily if you have a large image. However, there's no good and simple alternative here, since unfortunately, #become: does change class pointers. What happens is that after the above become all of the instances of the old class will have a class pointer identifying them as instances of newClass. If we get our hands on any of these instances we will break immediately since their expected instance layout (that of its class, e.g., newClass) will not match their actual instance layout (that of oldClass). And getting your hands on any of those instances is really simple - just reshaping one class two times in rapid succession will do it. Reflection techniques, interrupts, etc. will only add to this problem. In the case of Metaclass things get even worse since when we recompile the entire class hierarchy we will recompile both, Metaclass and its instances (and some of its instances will have the old and some the new layout). - - The only easy solution to this problem would be to 'fix up' the class pointers of the old instances to point to the old class (using primitiveChangeClassTo:). But this won't work either - as we do a one-way become we would have to search the entire object memory for the oldClass and couldn't even clearly identify it unless we give it some 'special token' which sounds quite error-prone. If you really need to get rid of the GC here are some alternatives: - - On the image level, one could create a copy of the oldClass before becoming it into the new class and, after becoming it, 'fix up' the old instances. That would certainly work but it sounds quite complex, as we need to make sure we're not breaking any of the superclass/subclass meta/non-meta class variants. - - Alternatively, fix up #becomeForward on the VM-level to 'dump the source objects' of #become. This would be quite doable (just 'convert' them into a well known special class such as bitmap) yet it has problems if (accidentally or not) one of the objects in #become: appears on 'both sides of the fence' (right now, this will work ... in a way ... even though the consequences are unclear). - - Another alternative is to provide a dedicated primitive for this (instead of using it implicitly in become) which would allow us to dump all the existing instances right here. This is equivalent to a more general primitiveChangeClassTo: and might be worthwhile but it would likely have to keep in mind the differences between bits and pointer thingies etc. - - Since all of the alternatives seem rather complex and magical compared to a straight-forward GC it seems best to stick with the GC solution for now. If someone has a real need to fix this problem, that person will likely be motivated enough to check out the alternatives. Personally I'd probably go for #1 (copy the old class and remap the instances to it) since it's a solution that could be easily reverted from within the image if there's any problem with it." - - ] valueUnpreemptively. - ! Item was changed: ----- Method: Integer class>>initialize (in category 'class initialization') ----- + initialize + "Integer initialize" + self initializeLowBitPerByteTable! - initialize "Integer initialize" - "Ensure we have the right compact class index" - - "LPI has been a compact class forever - just ensure basic correctness" - (LargePositiveInteger indexIfCompact = 5) ifFalse:[ - (Smalltalk compactClassesArray at: 5) - ifNil:[LargePositiveInteger becomeCompactSimplyAt: 5] - ifNotNil:[self error: 'Unexpected compact class setup']]. - - "Cog requires LNI to be compact at 4 (replacing PseudoContext)" - (LargeNegativeInteger indexIfCompact = 4) ifFalse:[ - "PseudoContext will likely get removed at some point so write this test - without introducing a hard dependency" - (Smalltalk compactClassesArray at: 4) name == #PseudoContext - ifTrue:[Smalltalk compactClassesArray at: 4 put: nil]. - (Smalltalk compactClassesArray at: 4) - ifNil:[LargeNegativeInteger becomeCompactSimplyAt: 4] - ifNotNil:[self error: 'Unexpected compact class setup']]. - - self initializeLowBitPerByteTable - ! Item was added: + ----- Method: MethodContext class>>allInstances (in category 'enumerating') ----- + allInstances + "Answer all instances of the receiver." + <primitive: 177> + "The primitive can fail because memory is low. If so, fall back on the old + enumeration code, which gives the system a chance to GC and/or grow. + Because aBlock might change the class of inst (for example, using become:), + it is essential to compute next before aBlock value: inst. + Only count until thisContext since this context has been created only to + compute the existing instances." + | inst insts next | + insts := WriteStream on: (Array new: 64). + inst := self someInstance. + [inst == thisContext or: [inst == nil]] whileFalse: + [next := inst nextInstance. + insts nextPut: inst. + inst := next]. + ^insts contents! Item was changed: ----- Method: MethodContext class>>allInstancesDo: (in category 'private') ----- allInstancesDo: aBlock + "Evaluate aBlock with each of the current instances of the receiver." + | instances inst next | + instances := self allInstancesOrNil. + instances ifNotNil: + [instances do: aBlock. + ^self]. + "allInstancesOrNil can fail because memory is low. If so, fall back on the old + enumeration code. Because aBlock might change the class of inst (for example, + using become:), it is essential to compute next before aBlock value: inst. + Only count until thisContext since evaluation of aBlock will create new contexts." - "Only count until thisContext since evaluation of aBlock will create new contexts." - | inst next | inst := self someInstance. + [inst == thisContext or: [inst == nil]] whileFalse: + [next := inst nextInstance. + aBlock value: inst. + inst := next]! - [inst == thisContext] whileFalse:[ - next := inst nextInstance. - aBlock value: inst. - inst := next] - ! Item was changed: ----- Method: ProtoObject>>scaledIdentityHash (in category 'comparing') ----- scaledIdentityHash "For identityHash values returned by primitive 75, answer + such values times 2^8. Otherwise, match the existing + identityHash implementation" - such values times 2^18. Otherwise, match the existing - identityHash implementation" + ^self identityHash * 256 "bitShift: 8"! - ^self identityHash * 262144 "bitShift: 18"! Item was changed: ==== ERROR === Error: Unrecognized class type 6 August 2014 12:28:23.253 am VM: unix - a SmalltalkImage Image: Squeak3.11alpha [latest update: #8824] SecurityManager state: Restricted: false FileAccess: true SocketAccess: true Working Dir /home/squeaksource Trusted Dir /home/squeaksource/secure Untrusted Dir /home/squeaksource/My Squeak MCClassDefinition(Object)>>error: Receiver: a MCClassDefinition(SmallInteger) Arguments and temporary variables: aString: 'Unrecognized class type' Receiver's instance variables: name: #SmallInteger superclassName: #Integer variables: an OrderedCollection() category: #'Kernel-Numbers' type: #immediate comment: 'My instances are 31-bit numbers, stored in twos complement form. The ...etc... commentStamp: '<historical>' traitComposition: nil classTraitComposition: nil MCClassDefinition>>kindOfSubclass Receiver: a MCClassDefinition(SmallInteger) Arguments and temporary variables: Receiver's instance variables: name: #SmallInteger superclassName: #Integer variables: an OrderedCollection() category: #'Kernel-Numbers' type: #immediate comment: 'My instances are 31-bit numbers, stored in twos complement form. The ...etc... commentStamp: '<historical>' traitComposition: nil classTraitComposition: nil MCClassDefinition>>printDefinitionOn: Receiver: a MCClassDefinition(SmallInteger) Arguments and temporary variables: stream: a WriteStream Receiver's instance variables: name: #SmallInteger superclassName: #Integer variables: an OrderedCollection() category: #'Kernel-Numbers' type: #immediate comment: 'My instances are 31-bit numbers, stored in twos complement form. The ...etc... commentStamp: '<historical>' traitComposition: nil classTraitComposition: nil [] in MCDiffyTextWriter(MCStWriter)>>writeClassDefinition: Receiver: a MCDiffyTextWriter Arguments and temporary variables: definition: a WriteStream s: a MCClassDefinition(SmallInteger) Receiver's instance variables: stream: a WriteStream initStream: nil --- The full stack --- MCClassDefinition(Object)>>error: MCClassDefinition>>kindOfSubclass MCClassDefinition>>printDefinitionOn: [] in MCDiffyTextWriter(MCStWriter)>>writeClassDefinition: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - String class(SequenceableCollection class)>>new:streamContents: String class(SequenceableCollection class)>>streamContents: MCDiffyTextWriter(MCTextWriter)>>chunkContents: MCDiffyTextWriter(MCStWriter)>>writeClassDefinition: MCDiffyTextWriter(MCStWriter)>>visitClassDefinition: MCClassDefinition>>accept: [] in MCDiffyTextWriter(MCTextWriter)>>visitInFork: String class(SequenceableCollection class)>>new:streamContents: String class(SequenceableCollection class)>>streamContents: MCDiffyTextWriter(MCTextWriter)>>visitInFork: MCDiffyTextWriter>>writePatchFrom:to: MCDiffyTextWriter>>writeModification: [] in MCDiffyTextWriter>>writePatch: SortedCollection(OrderedCollection)>>do: MCDiffyTextWriter>>writePatch: SSDiffyTextWriter>>writePatch: [] in SSDiffyTextWriter>>writeVersion:for: BlockClosure>>on:do: SSDiffyTextWriter>>writeVersion:for: [] in SSEMailSubscription>>versionAdded:to: BlockClosure>>on:do: SSEMailSubscription>>versionAdded:to: [] in [] in SSProject>>versionAdded: [] in BlockClosure>>newProcess

1 0

Daily Commit Log
by commits＠source.squeak.org 06 Aug '14

06 Aug '14

Changes to Trunk (http://source.squeak.org/trunk.html) in the last 24 hours: http://lists.squeakfoundation.org/pipermail/packages/2014-August/007229.html Name: Monticello-bp.598 Ancestors: Monticello-cmm.597 When checking all packages for changes show the package name in the progress bar so that you know which package is currently checked. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2014-August/007230.html Name: Kernel-eem.861 Ancestors: Kernel-nice.860 Slightly more efficient ProtoObject>>become:. Eliminate isKindOf:'s in InstructionPrinter>>pushConstant:. Provide CompiledMethod>>protocol to answer its selector's category^H^H^H^H^H^H^H^Hprotocol. =============================================

1 0

The Trunk: Kernel-eem.861.mcz
by commits＠source.squeak.org 05 Aug '14

05 Aug '14

Eliot Miranda uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-eem.861.mcz ==================== Summary ==================== Name: Kernel-eem.861 Author: eem Time: 5 August 2014, 12:11:04.902 pm UUID: 06be17f2-e2b8-436d-b85f-49ac68899bc6 Ancestors: Kernel-nice.860 Slightly more efficient ProtoObject>>become:. Eliminate isKindOf:'s in InstructionPrinter>>pushConstant:. Provide CompiledMethod>>protocol to answer its selector's category^H^H^H^H^H^H^H^Hprotocol. =============== Diff against Kernel-nice.860 =============== Item was added: + ----- Method: CompiledMethod>>protocol (in category 'accessing') ----- + protocol + ^self methodClass ifNotNil: + [:class| + self selector ifNotNil: + [:selector| + class whichCategoryIncludesSelector: selector]]! Item was changed: ----- Method: InstructionPrinter>>pushConstant: (in category 'instruction decoding') ----- pushConstant: obj "Print the Push Constant, obj, on Top Of Stack bytecode." self print: (String streamContents: [:s | s nextPutAll: 'pushConstant: '. + obj isVariableBinding + ifTrue: + [obj key + ifNotNil: [s nextPutAll: '##'; nextPutAll: obj key] + ifNil: [s nextPutAll: '###'; nextPutAll: obj value soleInstance name]] + ifFalse: + [obj isClosure + ifTrue: [s nextPutAll: obj sourceString] + ifFalse: [obj printOn: s]]]). - (obj isKindOf: LookupKey) - ifFalse: [obj printOn: s] - ifTrue: [obj key - ifNotNil: [s nextPutAll: '##'; nextPutAll: obj key] - ifNil: [s nextPutAll: '###'; nextPutAll: obj value soleInstance name]]]). + obj isCompiledMethod ifTrue: - (obj isKindOf: CompiledMethod) ifTrue: [obj longPrintOn: stream indent: self indent + 2. + ^self]! - ^self].! Item was changed: ----- Method: ProtoObject>>become: (in category 'system primitives') ----- become: otherObject "Primitive. Swap the object pointers of the receiver and the argument. All variables in the entire system that used to point to the receiver now point to the argument, and vice-versa. Fails if either object is a SmallInteger" + {self} elementsExchangeIdentityWith: {otherObject}! - (Array with: self) - elementsExchangeIdentityWith: - (Array with: otherObject)!

1 0

The Trunk: Monticello-bp.598.mcz
by commits＠source.squeak.org 05 Aug '14

05 Aug '14

Bernhard Pieber uploaded a new version of Monticello to project The Trunk: http://source.squeak.org/trunk/Monticello-bp.598.mcz ==================== Summary ==================== Name: Monticello-bp.598 Author: bp Time: 5 August 2014, 9:36:41.563 am UUID: e5d5434e-e1ab-4fb0-8da5-e934eecc0ba9 Ancestors: Monticello-cmm.597 When checking all packages for changes show the package name in the progress bar so that you know which package is currently checked. =============== Diff against Monticello-cmm.597 =============== Item was changed: ----- Method: MCWorkingCopy class>>checkModified: (in category 'as yet unclassified') ----- checkModified: thorough "Verify that all working copies with a modified flag are really modified, by comparing them to their stored snapshot. If the 'thorough' argument is true, check all packages, even unmodified ones." "MCWorkingCopy checkModified: true" | workingCopies | workingCopies := self allManagers. thorough ifFalse: [ workingCopies := workingCopies select: [:wc | wc modified]]. workingCopies do: [:wc | wc checkModified] + displayingProgress: [:wc | 'Checking package {1} for changes ...' translated format: {wc packageName}]! - displayingProgress: 'Checking package changes ...' translated. - !

1 0

Daily Commit Log
by commits＠source.squeak.org 05 Aug '14

05 Aug '14

Changes to Trunk (http://source.squeak.org/trunk.html) in the last 24 hours: http://lists.squeakfoundation.org/pipermail/packages/2014-August/007228.html Name: Morphic-cmm.739 Ancestors: Morphic-kfr.733, Morphic-cmm.738 Re-save changes from nice.736 and nice.737. =============================================

1 0

The Trunk: Morphic-cmm.739.mcz
by commits＠source.squeak.org 04 Aug '14

04 Aug '14

Chris Muller uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-cmm.739.mcz ==================== Summary ==================== Name: Morphic-cmm.739 Author: cmm Time: 4 August 2014, 1:35:54.444 pm UUID: 267ead18-a751-4d26-b317-1e09c6442940 Ancestors: Morphic-kfr.733, Morphic-cmm.738 Re-save changes from nice.736 and nice.737. =============== Diff against Morphic-kfr.733 =============== Item was changed: ----- Method: MorphicProject class>>compileNewDefaultBackgroundFrom: (in category 'utilities') ----- compileNewDefaultBackgroundFrom: aForm "Compile a new #defaultBackgroundForm method in this class-side which uses aForm as the background." + | formStream base64 | + formStream := ByteArray new writeStream. - | formStream base64Stream | - formStream := RWBinaryOrTextStream on: ByteArray new. PNGReadWriter putForm: aForm onStream: formStream. + base64 := formStream base64Encoded. - base64Stream := Base64MimeConverter mimeEncode: formStream. self class compile: (String streamContents: [ : stream | stream nextPutAll: 'defaultBackgroundForm ^ Form fromBinaryStream: ' ; nextPut: $' ; + nextPutAll: base64 ; - nextPutAll: base64Stream contents ; nextPut: $' ; nextPutAll: ' base64Decoded asByteArray readStream' ]) classified: 'class initialization'! Item was changed: ----- Method: TextEditor>>selectionAsStream (in category 'accessing-selection') ----- selectionAsStream "Answer a ReadStream on the text in the paragraph that is currently selected." + ^ReadStream - ^ReadWriteStream on: paragraph string from: self startIndex to: self stopIndex - 1!

1 0

Re: [Vm-dev] Delay machinery (was Re: [Pharo-dev] Suspending a Process)
by Nicolai Hess 02 Aug '14

02 Aug '14

So, we are going to change it in Pharo. What about Squeak ? 2014-07-28 21:39 GMT+02:00 Eliot Miranda <eliot.miranda(a)gmail.com>: > > Hi Nicolai, > > On Jul 27, 2014, at 10:59 PM, Nicolai Hess <nicolaihess(a)web.de> wrote: > > >> >> Then you're not reading it properly. It clearly shows you have a >> deadlock: >> >> Process 0xb9148c20 priority 40 >> 0xff7907b8 M [] in Semaphore>critical: 0xb82f8ef4: a(n) Semaphore >> 0xff7907d8 M BlockClosure>ensure: 0xb91502e0: a(n) BlockClosure >> 0xff7907f8 M Semaphore>critical: 0xb82f8ef4: a(n) Semaphore >> 0xff790814 M Delay>schedule 0xb91501e4: a(n) Delay >> 0xff79082c M Delay>wait 0xb91501e4: a(n) Delay >> 0xff790850 I [] in BackgroundWorkDisplayMorph>initialize 0xb91488b0: >> a(n) BackgroundWorkDisplayMorph >> 0xff790870 I [] in BlockClosure>newProcess 0xb9148b40: a(n) BlockClosure >> >> Process 0xb7902630 priority 40 >> 0xff764784 M [] in Semaphore>critical: 0xb82f8ef4: a(n) Semaphore >> 0xff7647a4 M BlockClosure>ensure: 0xb916b7a4: a(n) BlockClosure >> 0xff7647c4 M Semaphore>critical: 0xb82f8ef4: a(n) Semaphore >> 0xff7647e0 M Delay>schedule 0xb916b6a8: a(n) Delay >> 0xff7647f8 M Delay>wait 0xb916b6a8: a(n) Delay >> 0xff764818 M WorldState>interCyclePause: 0xb75e8fd8: a(n) WorldState >> 0xff764834 M WorldState>doOneCycleFor: 0xb75e8fd8: a(n) WorldState >> 0xff764850 M WorldMorph>doOneCycle 0xb75e8fa4: a(n) WorldMorph >> 0xff764870 I [] in MorphicUIManager()>? 0xb770ac38: a(n) MorphicUIManager >> 0xb78cb554 s [] in BlockClosure()>? >> >> >> > Ah, Ok. > So, it is not my "misuse" of delays but a bug in Delay>>#schedule, like > ben already guessed? > Two processes in the same critical section should not happen, right? > > > Right, and fortunately Ben already provided a solution. > > Nicolai > > > Aloha, > Eliot (phone) > >

2 1