Vm-dev September 2013

vm-dev@lists.squeakfoundation.org

31 participants
155 discussions

VM Maker: VMMaker.oscog-eem.355.mcz
by commits＠source.squeak.org 08 Sep '13

08 Sep '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.355.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.355 Author: eem Time: 8 September 2013, 1:54:12.22 pm UUID: abc761d5-9502-4f4b-9c3a-6482da435a09 Ancestors: VMMaker.oscog-eem.354 Implement classIsItselfClassIndexPun for instance-specific behavior. Define isSegmentSpanningFakeObjectPun. =============== Diff against VMMaker.oscog-eem.354 =============== Item was added: + ----- Method: SpurMemoryManager>>classIsItselfClassIndexPun (in category 'class table') ----- + classIsItselfClassIndexPun + ^4! Item was changed: ----- Method: SpurMemoryManager>>fetchClassOf: (in category 'object access') ----- + fetchClassOf: oop - fetchClassOf: oop | tagBits | (tagBits := oop bitAnd: self tagMask) ~= 0 ifTrue: [^self fetchPointer: tagBits ofObject: classTableFirstPage]. + ^self fetchClassOfNonImm: oop! - ^self classAtIndex: (self classIndexOf: oop)! Item was changed: ----- Method: SpurMemoryManager>>fetchClassOfNonImm: (in category 'object access') ----- + fetchClassOfNonImm: objOop - fetchClassOfNonImm: objOop | classIndex | classIndex := self classIndexOf: objOop. + classIndex = self classIsItselfClassIndexPun ifTrue: + [^objOop]. ^self classAtIndex: classIndex! Item was changed: ----- Method: SpurMemoryManager>>isForwarded: (in category 'object testing') ----- isForwarded: objOop + ^(self classIndexOf: objOop) = self isForwardedObjectClassIndexPun! - ^(self classIndexOf: objOop) = self isForwardedClassIndexPun! Item was removed: - ----- Method: SpurMemoryManager>>isForwardedClassIndexPun (in category 'class table') ----- - isForwardedClassIndexPun - ^1! Item was added: + ----- Method: SpurMemoryManager>>isForwardedObjectClassIndexPun (in category 'class table') ----- + isForwardedObjectClassIndexPun + ^1! Item was removed: - ----- Method: SpurMemoryManager>>isFreeClassIndexPun (in category 'class table') ----- - isFreeClassIndexPun - ^0! Item was changed: ----- Method: SpurMemoryManager>>isFreeObject: (in category 'object testing') ----- isFreeObject: objOop + ^(self classIndexOf: objOop) = self isFreeObjectClassIndexPun! - ^(self classIndexOf: objOop) = self isFreeClassIndexPun! Item was added: + ----- Method: SpurMemoryManager>>isFreeObjectClassIndexPun (in category 'class table') ----- + isFreeObjectClassIndexPun + ^0! Item was added: + ----- Method: SpurMemoryManager>>isSegmentSpanningFakeObjectPun (in category 'class table') ----- + isSegmentSpanningFakeObjectPun + ^3!

1 0

VM Maker: Cog-eem.78.mcz
by commits＠source.squeak.org 08 Sep '13

08 Sep '13

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.78.mcz ==================== Summary ==================== Name: Cog-eem.78 Author: eem Time: 7 September 2013, 5:05:10.843 pm UUID: c76f476f-a48b-479a-aed5-10ba74bf8cf0 Ancestors: Cog-eem.77 Finish installation of replacement methods. Modifying Character methods that access value is next (and last!). =============== Diff against Cog-eem.77 =============== Item was changed: Object subclass: #SpurBootstrap + instanceVariableNames: 'oldHeap newHeap map reverseMap classToIndex oldInterpreter lastClassTablePage symbolMap methodClasses installedPrototypes' - instanceVariableNames: 'oldHeap newHeap map reverseMap classToIndex oldInterpreter lastClassTablePage symbolMap methodClasses' classVariableNames: '' poolDictionaries: 'VMObjectIndices' category: 'Cog-Bootstrapping'! !SpurBootstrap commentStamp: 'eem 9/7/2013 13:23' prior: 0! SpurBootstrap bootstraps an image in SpurMemoryManager format from a Squeak V3 + closures format. e.g. (SpurBootstrap32 new on: '/Users/eliot/Cog/startreader.image') transform; launch Instance Variables classToIndex: <Dictionary> lastClassTablePage: <Integer> map: <Dictionary> methodClasses: <Set> newHeap: <SpurMemoryManager> oldHeap: <NewObjectMemory> oldInterpreter: <StackInterpreterSimulator> reverseMap: <Dictionary> symbolMap: <Dictionary> classToIndex - oldClass to new classIndex map lastClassTablePage - oop in newHeap of last classTable page. U<sed in validation to filter-out class table. methodClasses - cache of methodClassAssociations for classes in which modified methods are installed map - oldObject to newObject map newHeap - the output, bootstrapped image oldHeap - the input, image oldInterpreter - the interpreter associated with oldHeap, needed for a hack to grab WeakArray reverseMap - newObject to oldObject map symbolMap - symbol toi symbol oop in oldHeap, used to map prototype methdos to methods in oldHeap! Item was changed: ----- Method: SpurBootstrap>>addNewMethods (in category 'bootstrap methods') ----- addNewMethods "Get the simulator to add any and all missing methods immediately." | cmaiaSym basSym | cmaiaSym := self findSymbol: #compiledMethodAt:ifAbsent:. basSym := self findSymbol: #basicAddSelector:withMethod:. basSym ifNil: [basSym := self findSymbol: #addSelectorSilently:withMethod:]. self allPrototypeClassNamesDo: [:sym :symIsMeta| | class | class := self findClassNamed: (symbolMap at: sym). symIsMeta ifTrue: [class := oldHeap fetchClassOfNonImm: class]. self prototypeClassNameMetaSelectorMethodDo: [:className :isMeta :selector :method| | methodOrNil | (className = sym and: [symIsMeta = isMeta]) ifTrue: ["probe method dictionary of the class for each method, installing a dummy if not found." Transcript cr; nextPutAll: 'checking for '; nextPutAll: selector; flush. methodOrNil := self interpreterObject: class perform: cmaiaSym withArguments: {symbolMap at: selector. oldHeap nilObject}. methodOrNil = oldHeap nilObject ifTrue: "no method. install the real thing now" [Transcript cr; nextPutAll: 'installing '; nextPutAll: className; nextPutAll: (isMeta ifTrue: [' class>>'] ifFalse: ['>>']); store: selector; flush. self interpreterObject: class perform: basSym withArguments: { symbolMap at: selector. self installableMethodFor: method selector: selector className: className + isMeta: isMeta}. + installedPrototypes add: method selector] - isMeta: isMeta}] ifFalse: "existing method; collect the methodClassAssociation; its needed later" [methodClasses add: (oldInterpreter methodClassAssociationOf: methodOrNil)]]]]! Item was added: + ----- Method: SpurBootstrap>>indexOfSelector:in: (in category 'bootstrap methods') ----- + indexOfSelector: selectorOop in: methodDict + SelectorStart to: (oldHeap fetchWordLengthOf: methodDict) - 1 do: + [:i| + (oldHeap fetchPointer: i ofObject: methodDict) = selectorOop ifTrue: + [^i]]. + self error: 'could not find selector in method dict'! Item was changed: ----- Method: SpurBootstrap>>installModifiedMethods (in category 'bootstrap methods') ----- installModifiedMethods "Install all the methods in the class-side method prototypes protocol in the relevant classes in the new image. First use the simulator to get the image to intern all symbols and add dummy methods under new selectors. With that done we can manually replace the relevant methods with the prototypes, mapping selectors and global variables as required." symbolMap := Dictionary new. methodClasses := Set new. + installedPrototypes := Set new. self withExecutableInterpreterDo: [self internAllSymbols. self addNewMethods. self replaceMethods]. self modifyCharacterMethods! Item was added: + ----- Method: SpurBootstrap>>modifyCharacterMethods (in category 'bootstrap methods') ----- + modifyCharacterMethods + self shouldBeImplemented! Item was added: + ----- Method: SpurBootstrap>>replaceMethods (in category 'bootstrap methods') ----- + replaceMethods + "Replace all the modified method prototypes." + self allPrototypeClassNamesDo: + [:sym :symIsMeta| | class | + class := self findClassNamed: (symbolMap at: sym). + symIsMeta ifTrue: [class := oldHeap fetchClassOfNonImm: class]. + self prototypeClassNameMetaSelectorMethodDo: + [:className :isMeta :selector :method| | replacement methodDict index | + (className = sym + and: [symIsMeta = isMeta]) ifTrue: + [(installedPrototypes includes: method selector) ifFalse: + ["probe method dictionary of the class for each method, installing a dummy if not found." + Transcript cr; nextPutAll: 'replacing '; nextPutAll: selector; flush. + replacement := self installableMethodFor: method + selector: selector + className: className + isMeta: isMeta. + methodDict := oldHeap fetchPointer: MethodDictionaryIndex ofObject: class. + index := self indexOfSelector: (symbolMap at: selector) in: methodDict. + oldHeap + storePointer: index - SelectorStart + ofObject: (oldHeap fetchPointer: MethodArrayIndex ofObject: methodDict) + withValue: replacement. + installedPrototypes add: method selector]]]]!

1 0

VM Maker: Cog-eem.77.mcz
by commits＠source.squeak.org 07 Sep '13

07 Sep '13

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.77.mcz ==================== Summary ==================== Name: Cog-eem.77 Author: eem Time: 7 September 2013, 2:04:35.375 pm UUID: bec1ed80-2794-4350-b2d6-91d25c87c0c4 Ancestors: Cog-eem.76 Finish installation of prototype methods; modifying Character methods yet to be done. =============== Diff against Cog-eem.76 =============== Item was changed: ----- Method: SpurBootstrap>>addNewMethods (in category 'bootstrap methods') ----- addNewMethods "Get the simulator to add any and all missing methods immediately." | cmaiaSym basSym | cmaiaSym := self findSymbol: #compiledMethodAt:ifAbsent:. basSym := self findSymbol: #basicAddSelector:withMethod:. + basSym ifNil: + [basSym := self findSymbol: #addSelectorSilently:withMethod:]. self allPrototypeClassNamesDo: [:sym :symIsMeta| | class | class := self findClassNamed: (symbolMap at: sym). symIsMeta ifTrue: [class := oldHeap fetchClassOfNonImm: class]. self prototypeClassNameMetaSelectorMethodDo: [:className :isMeta :selector :method| | methodOrNil | (className = sym and: [symIsMeta = isMeta]) ifTrue: ["probe method dictionary of the class for each method, installing a dummy if not found." Transcript cr; nextPutAll: 'checking for '; nextPutAll: selector; flush. methodOrNil := self interpreterObject: class perform: cmaiaSym withArguments: {symbolMap at: selector. oldHeap nilObject}. methodOrNil = oldHeap nilObject ifTrue: "no method. install the real thing now" [Transcript cr; nextPutAll: 'installing '; nextPutAll: className; nextPutAll: (isMeta ifTrue: [' class>>'] ifFalse: ['>>']); store: selector; flush. self interpreterObject: class perform: basSym withArguments: { symbolMap at: selector. self installableMethodFor: method selector: selector className: className isMeta: isMeta}] ifFalse: "existing method; collect the methodClassAssociation; its needed later" [methodClasses add: (oldInterpreter methodClassAssociationOf: methodOrNil)]]]]! Item was added: + ----- Method: SpurBootstrap>>findLiteral: (in category 'bootstrap methods') ----- + findLiteral: aLiteral + | symbolOop smalltalk array | + aLiteral isString ifTrue: + [^self stringFor: aLiteral]. + self assert: aLiteral isVariableBinding. + symbolOop := self findSymbol: aLiteral key. + smalltalk := oldHeap splObj: 8. + array := oldHeap fetchPointer: 1 ofObject: smalltalk. + self assert: (oldHeap isArray: array). + 0 to: (oldHeap fetchWordLengthOf: array) - 1 do: + [:i| | bindingOrNil | + bindingOrNil := oldHeap fetchPointer: i ofObject: array. + (bindingOrNil ~= oldHeap nilObject + and: [symbolOop = (oldHeap fetchPointer: KeyIndex ofObject: bindingOrNil) + and: [aLiteral key == #Smalltalk + ifTrue: + [(oldHeap fetchPointer: ValueIndex ofObject: bindingOrNil) = smalltalk] + ifFalse: + [oldInterpreter + classNameOf: (oldHeap fetchPointer: ValueIndex ofObject: bindingOrNil) + Is: aLiteral key]]]) ifTrue: + [^bindingOrNil]]. + self error: 'couldn''t find literal ', aLiteral printString! Item was changed: ----- Method: SpurBootstrap>>installableMethodFor:selector:className:isMeta: (in category 'bootstrap methods') ----- installableMethodFor: aCompiledMethod selector: selector className: className isMeta: isMeta | compiledMethodClass sourcelessMethod bytes newMethod methodClass | compiledMethodClass := self findClassNamed: (self findSymbol: #CompiledMethod). sourcelessMethod := aCompiledMethod copyWithTempsFromMethodNode: aCompiledMethod methodNode. sourcelessMethod selector: selector. bytes := sourcelessMethod size - sourcelessMethod initialPC + 1. newMethod := self interpreterObject: compiledMethodClass perform: (self findSymbol: #newMethod:header:) withArguments: { oldHeap integerObjectOf: bytes. oldHeap integerObjectOf: sourcelessMethod header }. 1 to: sourcelessMethod numLiterals - 1 do: [:i| | literal | literal := sourcelessMethod literalAt: i. + literal isMethodProperties ifTrue: + [literal := selector]. literal := literal isInteger ifTrue: [oldHeap integerObjectOf: literal] + ifFalse: [symbolMap at: literal ifAbsent: [self findLiteral: literal]]. - ifFalse: [symbolMap at: literal]. oldHeap storePointer: i ofObject: newMethod withValue: literal]. methodClass := self methodClassForClassName: className isMeta: isMeta. oldHeap storePointer: sourcelessMethod numLiterals ofObject: newMethod withValue: methodClass. sourcelessMethod initialPC to: sourcelessMethod size do: [:i| oldHeap storeByte: i - 1 ofObject: newMethod withValue: (sourcelessMethod byteAt: i)]. ^newMethod! Item was changed: ----- Method: SpurBootstrap>>internAllSymbols (in category 'bootstrap methods') ----- internAllSymbols "Ensure that all symbols in the method prototypes are interned so that later we can install them. Enter them into the map, this system's symbol -> oldHeap's version. Do this by interpreting Symbol intern: 'aSymbol' for each symbol." | internSym | internSym := self findSymbol: #intern:. self allPrototypeMethodSymbols do: + [:sym| - [:sym| | string | (self findSymbol: sym) ifNotNil: [:imageSym| symbolMap at: sym put: imageSym] + ifNil:[Transcript cr; nextPutAll: 'interning '; nextPutAll: sym; flush. - ifNil: - [Transcript cr; nextPutAll: 'interning '; nextPutAll: sym; flush. - string := oldHeap instantiateClass: (oldHeap splObj: ClassByteString) indexableSize: sym size. - 1 to: sym size do: - [:i| oldHeap storeByte: i - 1 ofObject: string withValue: (sym at: i) asInteger]. "Interpret Symbol intern: sym to ... intern it :-)" symbolMap at: sym put: (self interpreterObject: self symbolClass perform: internSym + withArguments: {self stringFor: sym})]]. - withArguments: {string})]]. symbolMap keysAndValuesDo: [:sym :imageSym| self assert: sym = (oldHeap stringOf: imageSym)]! Item was changed: ----- Method: SpurBootstrap>>methodClassForClassName:isMeta: (in category 'bootstrap methods') ----- methodClassForClassName: classNameSymbol isMeta: isMeta | class | + class := self findClassNamed: (symbolMap at: classNameSymbol). - class := self findClassNamed: classNameSymbol. isMeta ifTrue: [class := oldHeap fetchClassOfNonImm: class]. methodClasses do: [:mca| class = (oldHeap fetchPointer: ValueIndex ofObject: mca) ifTrue: [^mca]]. oldHeap allObjectsDo: [:o| | methodClassAssociation | (oldHeap isCompiledMethod: o) ifTrue: [methodClassAssociation := oldInterpreter methodClassAssociationOf: o. class == (oldHeap fetchPointer: ValueIndex ofObject: methodClassAssociation) ifTrue: [methodClasses add: methodClassAssociation. ^methodClassAssociation]]]. self error: 'could not find methodClassAssociation for ', classNameSymbol, (isMeta ifTrue: [' class'] ifFalse:[''])! Item was added: + ----- Method: SpurBootstrap>>stringFor: (in category 'bootstrap methods') ----- + stringFor: aString + | string | + string := oldHeap instantiateClass: (oldHeap splObj: ClassByteString) indexableSize: aString size. + 1 to: aString size do: + [:i| oldHeap storeByte: i - 1 ofObject: string withValue: (aString at: i) asInteger]. + ^string + !

1 0

VM Maker: Cog-eem.76.mcz
by commits＠source.squeak.org 07 Sep '13

07 Sep '13

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.76.mcz ==================== Summary ==================== Name: Cog-eem.76 Author: eem Time: 7 September 2013, 1:25:36.672 pm UUID: b037d52a-2e90-453d-9e0a-73358bdbd71c Ancestors: Cog-eem.75 Update SpurBootstrap class comment. Document idea of having prototype methods for different Squeak/Pharo versions. =============== Diff against Cog-eem.75 =============== Item was changed: Object subclass: #SpurBootstrap instanceVariableNames: 'oldHeap newHeap map reverseMap classToIndex oldInterpreter lastClassTablePage symbolMap methodClasses' classVariableNames: '' poolDictionaries: 'VMObjectIndices' category: 'Cog-Bootstrapping'! + !SpurBootstrap commentStamp: 'eem 9/7/2013 13:23' prior: 0! + SpurBootstrap bootstraps an image in SpurMemoryManager format from a Squeak V3 + closures format. - !SpurBootstrap commentStamp: 'eem 9/2/2013 13:26' prior: 0! - SpurBootstrap bootstraps an image in CogMemoryManager format from a Squeak V3 + closures format. e.g. (SpurBootstrap32 new on: '/Users/eliot/Cog/startreader.image') transform; launch Instance Variables + classToIndex: <Dictionary> + lastClassTablePage: <Integer> + map: <Dictionary> + methodClasses: <Set> + newHeap: <SpurMemoryManager> + oldHeap: <NewObjectMemory> + oldInterpreter: <StackInterpreterSimulator> + reverseMap: <Dictionary> + symbolMap: <Dictionary> - classToIndex: <Dictionary> - map: <Dictionary> - newHeap: <CogMemoryManager> - oldHeap: <NewObjectMemory> - oldInterpreter: <StackInterpreterSimulator> classToIndex - oldClass to new classIndex map + lastClassTablePage + - oop in newHeap of last classTable page. U<sed in validation to filter-out class table. + + methodClasses + - cache of methodClassAssociations for classes in which modified methods are installed + map - oldObject to newObject map newHeap - the output, bootstrapped image oldHeap - the input, image oldInterpreter - the interpreter associated with oldHeap, needed for a hack to grab WeakArray + + reverseMap + - newObject to oldObject map + + symbolMap + - symbol toi symbol oop in oldHeap, used to map prototype methdos to methods in oldHeap! - ! Item was changed: ----- Method: SpurBootstrap>>prototypeClassNameMetaSelectorMethodDo: (in category 'method prototypes') ----- prototypeClassNameMetaSelectorMethodDo: quaternaryBlock + "Evaluate aBlock with class name, class is meta, method and selector. + For now find methods in class-side category #'method prototypes'. + Scheme could be extended to have different protocols for different + Squeak/Pharo versions." - "Evaluate aBlock with class name, class is meta, method and selector." (SpurBootstrap class organization listAtCategoryNamed: #'method prototypes') do: [:protoSelector| | method className isMeta | method := SpurBootstrap class >> protoSelector. className := self classNameForPrototypeMethod: method. (isMeta := className endsWith: 'class') ifTrue: [className := (className allButLast: 5) asSymbol]. quaternaryBlock value: className value: isMeta value: (self selectorForPrototypeMethod: method) value: method]!

1 0

VM Maker: Cog-eem.75.mcz
by commits＠source.squeak.org 07 Sep '13

07 Sep '13

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.75.mcz ==================== Summary ==================== Name: Cog-eem.75 Author: eem Time: 7 September 2013, 1:18:24.463 pm UUID: f6d7520c-4738-4d03-b5b0-5126b4650eb7 Ancestors: Cog-eem.74 Refactor enumeration of prototype metods to add isMeta info. FIrst cut of installableMethodFor:selector:className:isMeta:. =============== Diff against Cog-eem.74 =============== Item was changed: Object subclass: #SpurBootstrap + instanceVariableNames: 'oldHeap newHeap map reverseMap classToIndex oldInterpreter lastClassTablePage symbolMap methodClasses' - instanceVariableNames: 'oldHeap newHeap map reverseMap classToIndex oldInterpreter lastClassTablePage symbolMap' classVariableNames: '' poolDictionaries: 'VMObjectIndices' category: 'Cog-Bootstrapping'! !SpurBootstrap commentStamp: 'eem 9/2/2013 13:26' prior: 0! SpurBootstrap bootstraps an image in CogMemoryManager format from a Squeak V3 + closures format. e.g. (SpurBootstrap32 new on: '/Users/eliot/Cog/startreader.image') transform; launch Instance Variables classToIndex: <Dictionary> map: <Dictionary> newHeap: <CogMemoryManager> oldHeap: <NewObjectMemory> oldInterpreter: <StackInterpreterSimulator> classToIndex - oldClass to new classIndex map map - oldObject to newObject map newHeap - the output, bootstrapped image oldHeap - the input, image oldInterpreter - the interpreter associated with oldHeap, needed for a hack to grab WeakArray ! Item was changed: ----- Method: SpurBootstrap>>addNewMethods (in category 'bootstrap methods') ----- addNewMethods + "Get the simulator to add any and all missing methods immediately." - "Get the simulator to add fake methods for all missing methods so that when we install - the prototypes we can assign directly to the method dictionaries since by this time the - system could well be inconsistent and broken by the changes." | cmaiaSym basSym | cmaiaSym := self findSymbol: #compiledMethodAt:ifAbsent:. basSym := self findSymbol: #basicAddSelector:withMethod:. + self allPrototypeClassNamesDo: + [:sym :symIsMeta| | class | - self allPrototypeClassNames do: - [:sym| | class | class := self findClassNamed: (symbolMap at: sym). + symIsMeta ifTrue: [class := oldHeap fetchClassOfNonImm: class]. + self prototypeClassNameMetaSelectorMethodDo: + [:className :isMeta :selector :method| | methodOrNil | + (className = sym + and: [symIsMeta = isMeta]) ifTrue: - self prototypeClassNameSelectorMethodDo: - [:className :selector :method| - className = sym ifTrue: ["probe method dictionary of the class for each method, installing a dummy if not found." + Transcript cr; nextPutAll: 'checking for '; nextPutAll: selector; flush. + methodOrNil := self interpreterObject: class + perform: cmaiaSym + withArguments: {symbolMap at: selector. oldHeap nilObject}. + methodOrNil = oldHeap nilObject + ifTrue: "no method. install the real thing now" + [Transcript + cr; + nextPutAll: 'installing '; + nextPutAll: className; + nextPutAll: (isMeta ifTrue: [' class>>'] ifFalse: ['>>']); + store: selector; flush. + self interpreterObject: class + perform: basSym + withArguments: { symbolMap at: selector. + self installableMethodFor: method + selector: selector + className: className + isMeta: isMeta}] + ifFalse: "existing method; collect the methodClassAssociation; its needed later" + [methodClasses add: (oldInterpreter methodClassAssociationOf: methodOrNil)]]]]! - [Transcript cr; nextPutAll: 'checking for '; nextPutAll: selector; flush. - (self interpreterObject: class - perform: cmaiaSym - withArguments: {symbolMap at: selector. oldHeap nilObject}) = oldHeap nilObject ifTrue: - ["no method. install the real thing now" - self interpreterObject: class - perform: basSym - withArguments: {symbolMap at: selector. self installableMethodFor: method}]]]]]! Item was removed: - ----- Method: SpurBootstrap>>allPrototypeClassNames (in category 'method prototypes') ----- - allPrototypeClassNames - "self basicNew allPrototypeClassNames" - | symbols | - symbols := Set new. - (SpurBootstrap class organization listAtCategoryNamed: #'method prototypes') do: - [:protoSelector| | method | - method := SpurBootstrap class >> protoSelector. - symbols add: (self classNameForPrototypeMethod: method)]. - ^symbols! Item was added: + ----- Method: SpurBootstrap>>allPrototypeClassNamesDo: (in category 'method prototypes') ----- + allPrototypeClassNamesDo: aBlock + "self basicNew allPrototypeClassNames" + | pairs | + pairs := Set new. + self prototypeClassNameMetaSelectorMethodDo: + [:className :isMeta :selector :method | + pairs add: {className. isMeta}]. + pairs do: [:pair| aBlock value: pair first value: pair last]! Item was changed: ----- Method: SpurBootstrap>>allPrototypeMethodSymbols (in category 'method prototypes') ----- allPrototypeMethodSymbols "self basicNew allPrototypeMethodSymbols" | symbols | symbols := Set new. + self prototypeClassNameMetaSelectorMethodDo: + [:className :isMeta :selector :method | + symbols + add: className; + add: selector; + addAll: (method literals select: [:l| l isSymbol and: [l ~~ method selector]])]. - (SpurBootstrap class organization listAtCategoryNamed: #'method prototypes') do: - [:protoSelector| | method | - method := SpurBootstrap class >> protoSelector. - symbols add: (self selectorForPrototypeMethod: method). - symbols addAll: (method literals select: [:l| l isSymbol and: [l ~~ protoSelector]])]. ^symbols! Item was added: + ----- Method: SpurBootstrap>>findClassNamed: (in category 'bootstrap methods') ----- + findClassNamed: symbolOop + oldHeap allObjectsDo: + [:o| + ((oldHeap isPointersNonImm: o) + and: [(oldInterpreter addressCouldBeClassObj: o) + and: [(oldHeap fetchPointer: oldInterpreter classNameIndex ofObject: o) = symbolOop]]) ifTrue: + [^o]]. + ^nil! Item was changed: ----- Method: SpurBootstrap>>installModifiedMethods (in category 'bootstrap methods') ----- installModifiedMethods "Install all the methods in the class-side method prototypes protocol in the relevant classes in the new image. First use the simulator to get the image to intern all symbols and add dummy methods under new selectors. With that done we can manually replace the relevant methods with the prototypes, mapping selectors and global variables as required." + symbolMap := Dictionary new. + methodClasses := Set new. self withExecutableInterpreterDo: [self internAllSymbols. self addNewMethods. self replaceMethods]. self modifyCharacterMethods! Item was added: + ----- Method: SpurBootstrap>>installableMethodFor:selector:className:isMeta: (in category 'bootstrap methods') ----- + installableMethodFor: aCompiledMethod selector: selector className: className isMeta: isMeta + | compiledMethodClass sourcelessMethod bytes newMethod methodClass | + compiledMethodClass := self findClassNamed: (self findSymbol: #CompiledMethod). + sourcelessMethod := aCompiledMethod copyWithTempsFromMethodNode: aCompiledMethod methodNode. + sourcelessMethod selector: selector. + bytes := sourcelessMethod size - sourcelessMethod initialPC + 1. + newMethod := self + interpreterObject: compiledMethodClass + perform: (self findSymbol: #newMethod:header:) + withArguments: { oldHeap integerObjectOf: bytes. + oldHeap integerObjectOf: sourcelessMethod header }. + 1 to: sourcelessMethod numLiterals - 1 do: + [:i| | literal | + literal := sourcelessMethod literalAt: i. + literal := literal isInteger + ifTrue: [oldHeap integerObjectOf: literal] + ifFalse: [symbolMap at: literal]. + oldHeap storePointer: i ofObject: newMethod withValue: literal]. + methodClass := self methodClassForClassName: className isMeta: isMeta. + oldHeap storePointer: sourcelessMethod numLiterals ofObject: newMethod withValue: methodClass. + sourcelessMethod initialPC to: sourcelessMethod size do: + [:i| + oldHeap storeByte: i - 1 ofObject: newMethod withValue: (sourcelessMethod byteAt: i)]. + ^newMethod! Item was changed: ----- Method: SpurBootstrap>>internAllSymbols (in category 'bootstrap methods') ----- internAllSymbols "Ensure that all symbols in the method prototypes are interned so that later we can install them. Enter them into the map, this system's symbol -> oldHeap's version. Do this by interpreting Symbol intern: 'aSymbol' for each symbol." | internSym | - symbolMap := Dictionary new. internSym := self findSymbol: #intern:. self allPrototypeMethodSymbols do: [:sym| | string | (self findSymbol: sym) ifNotNil: [:imageSym| symbolMap at: sym put: imageSym] ifNil: [Transcript cr; nextPutAll: 'interning '; nextPutAll: sym; flush. string := oldHeap instantiateClass: (oldHeap splObj: ClassByteString) indexableSize: sym size. 1 to: sym size do: [:i| oldHeap storeByte: i - 1 ofObject: string withValue: (sym at: i) asInteger]. "Interpret Symbol intern: sym to ... intern it :-)" symbolMap at: sym put: (self interpreterObject: self symbolClass perform: internSym withArguments: {string})]]. symbolMap keysAndValuesDo: [:sym :imageSym| self assert: sym = (oldHeap stringOf: imageSym)]! Item was added: + ----- Method: SpurBootstrap>>methodClassForClassName:isMeta: (in category 'bootstrap methods') ----- + methodClassForClassName: classNameSymbol isMeta: isMeta + | class | + class := self findClassNamed: classNameSymbol. + isMeta ifTrue: [class := oldHeap fetchClassOfNonImm: class]. + methodClasses do: + [:mca| + class = (oldHeap fetchPointer: ValueIndex ofObject: mca) ifTrue: + [^mca]]. + oldHeap allObjectsDo: + [:o| | methodClassAssociation | + (oldHeap isCompiledMethod: o) ifTrue: + [methodClassAssociation := oldInterpreter methodClassAssociationOf: o. + class == (oldHeap fetchPointer: ValueIndex ofObject: methodClassAssociation) ifTrue: + [methodClasses add: methodClassAssociation. + ^methodClassAssociation]]]. + self error: 'could not find methodClassAssociation for ', classNameSymbol, (isMeta ifTrue: [' class'] ifFalse:[''])! Item was added: + ----- Method: SpurBootstrap>>prototypeClassNameMetaSelectorMethodDo: (in category 'method prototypes') ----- + prototypeClassNameMetaSelectorMethodDo: quaternaryBlock + "Evaluate aBlock with class name, class is meta, method and selector." + (SpurBootstrap class organization listAtCategoryNamed: #'method prototypes') do: + [:protoSelector| | method className isMeta | + method := SpurBootstrap class >> protoSelector. + className := self classNameForPrototypeMethod: method. + (isMeta := className endsWith: 'class') ifTrue: + [className := (className allButLast: 5) asSymbol]. + quaternaryBlock + value: className + value: isMeta + value: (self selectorForPrototypeMethod: method) + value: method]! Item was removed: - ----- Method: SpurBootstrap>>prototypeClassNameSelectorMethodDo: (in category 'method prototypes') ----- - prototypeClassNameSelectorMethodDo: trinaryBlock - "Evaluate aBlock with class name, method and selector." - (SpurBootstrap class organization listAtCategoryNamed: #'method prototypes') do: - [:protoSelector| | method | - method := SpurBootstrap class >> protoSelector. - trinaryBlock - value: (self classNameForPrototypeMethod: method) - value: (self selectorForPrototypeMethod: method) - value: method]!

1 0

VM Maker: VMMaker.oscog-eem.354.mcz
by commits＠source.squeak.org 07 Sep '13

07 Sep '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.354.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.354 Author: eem Time: 7 September 2013, 1:15:18.221 pm UUID: 4bea1550-abc0-4737-b97d-dc24cba3a366 Ancestors: VMMaker.oscog-eem.353 Move classNameIndex uo to StackInterpreter. Fix erroneous non-immediate assumptions in addressCouldBeClassObj: =============== Diff against VMMaker.oscog-eem.353 =============== Item was removed: - ----- Method: CoInterpreter>>classNameIndex (in category 'simulation') ----- - classNameIndex - <doNotGenerate> - ^classNameIndex! Item was changed: ----- Method: StackInterpreter>>addressCouldBeClassObj: (in category 'debug support') ----- addressCouldBeClassObj: maybeClassObj "Answer if maybeClassObj looks like a class object" <inline: false> ^(objectMemory addressCouldBeObj: maybeClassObj) and: [((objectMemory isPointersNonImm: maybeClassObj) and: [(objectMemory lengthOf: maybeClassObj) >= (InstanceSpecificationIndex+1)]) + and: [(objectMemory isPointers: (objectMemory fetchPointer: SuperclassIndex ofObject: maybeClassObj)) + and: [(objectMemory isPointers: (objectMemory fetchPointer: MethodDictionaryIndex ofObject: maybeClassObj)) - and: [(objectMemory isPointersNonImm: (objectMemory fetchPointer: SuperclassIndex ofObject: maybeClassObj)) - and: [(objectMemory isPointersNonImm: (objectMemory fetchPointer: MethodDictionaryIndex ofObject: maybeClassObj)) and: [(objectMemory isIntegerObject: (objectMemory fetchPointer: InstanceSpecificationIndex ofObject: maybeClassObj))]]]]! Item was added: + ----- Method: StackInterpreter>>classNameIndex (in category 'simulation') ----- + classNameIndex + <doNotGenerate> + ^classNameIndex!

1 0

VM Maker: Cog-eem.74.mcz
by commits＠source.squeak.org 07 Sep '13

07 Sep '13

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.74.mcz ==================== Summary ==================== Name: Cog-eem.74 Author: eem Time: 6 September 2013, 3:40:17.104 pm UUID: 0cc1769d-327b-40b3-80d3-32335718ae96 Ancestors: Cog-eem.73 Refactor the simulated execution of oldInterpreter/oldHeap. Add addNewMethods to install the missing prototype methods. =============== Diff against Cog-eem.73 =============== Item was added: + ----- Method: SpurBootstrap class>>CharacterPROTOTYPEasInteger (in category 'method prototypes') ----- + CharacterPROTOTYPEasInteger + <primitive: 171> + ^self primitiveFailed! Item was changed: ----- Method: SpurBootstrap class>>ProtoObjectPROTOTYPEscaledIdentityHash (in category 'method prototypes') ----- ProtoObjectPROTOTYPEscaledIdentityHash "For identityHash values returned by primitive 75, answer + such values times 2^8. Otherwise, match the existing - such values times 2^18. Otherwise, match the existing identityHash implementation" ^self identityHash * 256 "bitShift: 8"! Item was added: + ----- Method: SpurBootstrap>>addNewMethods (in category 'bootstrap methods') ----- + addNewMethods + "Get the simulator to add fake methods for all missing methods so that when we install + the prototypes we can assign directly to the method dictionaries since by this time the + system could well be inconsistent and broken by the changes." + | cmaiaSym basSym | + cmaiaSym := self findSymbol: #compiledMethodAt:ifAbsent:. + basSym := self findSymbol: #basicAddSelector:withMethod:. + self allPrototypeClassNames do: + [:sym| | class | + class := self findClassNamed: (symbolMap at: sym). + self prototypeClassNameSelectorMethodDo: + [:className :selector :method| + className = sym ifTrue: + ["probe method dictionary of the class for each method, installing a dummy if not found." + [Transcript cr; nextPutAll: 'checking for '; nextPutAll: selector; flush. + (self interpreterObject: class + perform: cmaiaSym + withArguments: {symbolMap at: selector. oldHeap nilObject}) = oldHeap nilObject ifTrue: + ["no method. install the real thing now" + self interpreterObject: class + perform: basSym + withArguments: {symbolMap at: selector. self installableMethodFor: method}]]]]]! Item was added: + ----- Method: SpurBootstrap>>allPrototypeClassNames (in category 'method prototypes') ----- + allPrototypeClassNames + "self basicNew allPrototypeClassNames" + | symbols | + symbols := Set new. + (SpurBootstrap class organization listAtCategoryNamed: #'method prototypes') do: + [:protoSelector| | method | + method := SpurBootstrap class >> protoSelector. + symbols add: (self classNameForPrototypeMethod: method)]. + ^symbols! Item was changed: ----- Method: SpurBootstrap>>installModifiedMethods (in category 'bootstrap methods') ----- installModifiedMethods "Install all the methods in the class-side method prototypes protocol in the relevant classes in the new image. First use the simulator to get the image to intern all symbols and add dummy methods under new selectors. With that done we can manually replace the relevant methods with the prototypes, mapping selectors and global variables as required." + self withExecutableInterpreterDo: + [self internAllSymbols. + self addNewMethods. + self replaceMethods]. - self internAllSymbols. - self addDummyMethods. - self addInstallMethods. self modifyCharacterMethods! Item was changed: ----- Method: SpurBootstrap>>internAllSymbols (in category 'bootstrap methods') ----- internAllSymbols "Ensure that all symbols in the method prototypes are interned so that later we can install them. + Enter them into the map, this system's symbol -> oldHeap's version. + Do this by interpreting Symbol intern: 'aSymbol' for each symbol." + | internSym | - Do this by interpreting Symbol intern: 'aSymbol' for each symbol. Make sure the execution state - has not advanced when doing so, and restore the image to the state it has on snapshot." - | internSym savedpc initialContext finalContext | symbolMap := Dictionary new. internSym := self findSymbol: #intern:. - oldInterpreter - initStackPages; - loadInitialContext; - internalizeIPandSP. - initialContext := oldInterpreter frameContext: oldInterpreter localFP. - savedpc := oldInterpreter localIP. - "oldInterpreter printHeadFrame." self allPrototypeMethodSymbols do: + [:sym| | string | - [:sym| | string fp | (self findSymbol: sym) ifNotNil: [:imageSym| symbolMap at: sym put: imageSym] ifNil: [Transcript cr; nextPutAll: 'interning '; nextPutAll: sym; flush. string := oldHeap instantiateClass: (oldHeap splObj: ClassByteString) indexableSize: sym size. 1 to: sym size do: [:i| oldHeap storeByte: i - 1 ofObject: string withValue: (sym at: i) asInteger]. "Interpret Symbol intern: sym to ... intern it :-)" + symbolMap + at: sym + put: (self interpreterObject: self symbolClass + perform: internSym + withArguments: {string})]]. - oldInterpreter - internalPush: self symbolClass; - internalPush: string; - argumentCount: 1; - messageSelector: internSym. - fp := oldInterpreter localFP. - oldInterpreter normalSend. - [fp = oldInterpreter localFP] whileFalse: - [oldInterpreter singleStep]. - symbolMap at: sym put: oldInterpreter internalPopStack. - self assert: oldInterpreter localIP - 1 = savedpc. - oldInterpreter localIP: savedpc]]. symbolMap keysAndValuesDo: [:sym :imageSym| + self assert: sym = (oldHeap stringOf: imageSym)]! - self assert: sym = (oldHeap stringOf: imageSym)]. - "oldInterpreter printHeadFrame." - oldInterpreter - internalPush: oldInterpreter localIP; - externalizeIPandSP. - "now undo the execution state" - finalContext := oldInterpreter voidVMStateForSnapshot. - self assert: initialContext = finalContext. - self assert: oldInterpreter localIP = savedpc! Item was added: + ----- Method: SpurBootstrap>>interpreterObject:perform:withArguments: (in category 'bootstrap methods') ----- + interpreterObject: receiver perform: selector withArguments: arguments + "Interpret an expression in oldHeap using oldInterpreter. + Answer the result." + | fp savedpc result | + savedpc := oldInterpreter localIP. + oldInterpreter internalPush: receiver. + arguments do: [:arg| oldInterpreter internalPush: arg]. + oldInterpreter + argumentCount: arguments size; + messageSelector: selector. + fp := oldInterpreter localFP. + oldInterpreter normalSend. + [fp = oldInterpreter localFP] whileFalse: + [oldInterpreter singleStep]. + result := oldInterpreter internalPopStack. + self assert: oldInterpreter localIP - 1 = savedpc. + oldInterpreter localIP: savedpc. + ^result! Item was added: + ----- Method: SpurBootstrap>>prototypeClassNameSelectorMethodDo: (in category 'method prototypes') ----- + prototypeClassNameSelectorMethodDo: trinaryBlock + "Evaluate aBlock with class name, method and selector." + (SpurBootstrap class organization listAtCategoryNamed: #'method prototypes') do: + [:protoSelector| | method | + method := SpurBootstrap class >> protoSelector. + trinaryBlock + value: (self classNameForPrototypeMethod: method) + value: (self selectorForPrototypeMethod: method) + value: method]! Item was added: + ----- Method: SpurBootstrap>>withExecutableInterpreterDo: (in category 'bootstrap methods') ----- + withExecutableInterpreterDo: aBlock + "With the oldInterpreter ready to execute code, evaluate aBlock, + then return the interpreter (and the heap) to the ``just snapshotted'' state." + | savedpc initialContext finalContext | + oldInterpreter + initStackPages; + loadInitialContext; + internalizeIPandSP. + initialContext := oldInterpreter frameContext: oldInterpreter localFP. + savedpc := oldInterpreter localIP. + "oldInterpreter printHeadFrame." + aBlock value. + "oldInterpreter printHeadFrame." + oldInterpreter + internalPush: oldInterpreter localIP; + externalizeIPandSP. + "now undo the execution state" + finalContext := oldInterpreter voidVMStateForSnapshot. + self assert: initialContext = finalContext. + self assert: oldInterpreter localIP = savedpc!

1 0

VM Maker: Cog-eem.73.mcz
by commits＠source.squeak.org 06 Sep '13

06 Sep '13

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.73.mcz ==================== Summary ==================== Name: Cog-eem.73 Author: eem Time: 6 September 2013, 2:14:04.626 pm UUID: f0f69347-38f2-489a-b027-ade5091ddc1d Ancestors: Cog-eem.72 Reorganize, splitting bootstrap into bootstrap image & bootstrap methods. Add prototypes for instance creation that allow the scavenger to run. Write first-phase of installing modified methods; intern any and all symbols in the prototype methods. =============== Diff against Cog-eem.72 =============== Item was changed: Object subclass: #SpurBootstrap + instanceVariableNames: 'oldHeap newHeap map reverseMap classToIndex oldInterpreter lastClassTablePage symbolMap' - instanceVariableNames: 'oldHeap newHeap map reverseMap classToIndex oldInterpreter lastClassTablePage' classVariableNames: '' poolDictionaries: 'VMObjectIndices' category: 'Cog-Bootstrapping'! !SpurBootstrap commentStamp: 'eem 9/2/2013 13:26' prior: 0! SpurBootstrap bootstraps an image in CogMemoryManager format from a Squeak V3 + closures format. e.g. (SpurBootstrap32 new on: '/Users/eliot/Cog/startreader.image') transform; launch Instance Variables classToIndex: <Dictionary> map: <Dictionary> newHeap: <CogMemoryManager> oldHeap: <NewObjectMemory> oldInterpreter: <StackInterpreterSimulator> classToIndex - oldClass to new classIndex map map - oldObject to newObject map newHeap - the output, bootstrapped image oldHeap - the input, image oldInterpreter - the interpreter associated with oldHeap, needed for a hack to grab WeakArray ! Item was added: + ----- Method: SpurBootstrap class>>BehaviorPROTOTYPEbasicNew (in category 'method prototypes') ----- + BehaviorPROTOTYPEbasicNew + "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 failingBasicNew: if they're OK." + + <primitive: 70> + self isVariable ifTrue: [^self basicNew: 0]. + "space must have been low, and the scavenger must have run. + retry after the scavenge." + ^self failingBasicNew! Item was added: + ----- Method: SpurBootstrap class>>BehaviorPROTOTYPEbasicNew: (in category 'method prototypes') ----- + BehaviorPROTOTYPEbasicNew: 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 arguments and retry via failingBasicNew: if they're OK." + + <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 failingBasicNew: sizeRequested]. + self primitiveFailed! Item was added: + ----- Method: SpurBootstrap class>>BehaviorPROTOTYPEhandleFailingBasicNew (in category 'method prototypes') ----- + BehaviorPROTOTYPEhandleFailingBasicNew + "This basicNew 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 failingBasicNew fails then the scavenge failed to reclaim sufficient + space and a global garbage collection is required. + + 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> + self isVariable ifTrue: [^self basicNew: 0]. + Smalltalk garbageCollect. + ^self failingFailingBasicNew "retry after global garbage collect"! Item was added: + ----- Method: SpurBootstrap class>>BehaviorPROTOTYPEhandleFailingBasicNew: (in category 'method prototypes') ----- + BehaviorPROTOTYPEhandleFailingBasicNew: sizeRequested + "This basicNew: 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 failingBasicNew: fails then the scavenge failed to reclaim sufficient + space and a global garbage collection is required. + + 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: + [Smalltalk garbageCollect. + ^self failingFailingBasicNew: sizeRequested "retry after global garbage collect"]. + self primitiveFailed! Item was added: + ----- Method: SpurBootstrap class>>BehaviorPROTOTYPEhandleFailingFailingBasicNew (in category 'method prototypes') ----- + BehaviorPROTOTYPEhandleFailingFailingBasicNew + "This basicNew gets sent after failingBasicNew: has sent Smalltalk garbageCollect. + If this fails then the system really is low on space. + + 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> + self isVariable ifTrue: [^self basicNew: 0]. + "space must be low" + OutOfMemory signal. + ^self basicNew "retry if user proceeds"! Item was added: + ----- Method: SpurBootstrap class>>BehaviorPROTOTYPEhandleFailingFailingBasicNew: (in category 'method prototypes') ----- + BehaviorPROTOTYPEhandleFailingFailingBasicNew: sizeRequested + "This basicNew: gets sent after failingBasicNew: has sent Smalltalk garbageCollect. + If that fails the system really is low on space. + + 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 be low." + OutOfMemory signal. + ^self basicNew: sizeRequested "retry if user proceeds"]. + self primitiveFailed! Item was changed: ----- Method: SpurBootstrap class>>ClassBuilderPROTOTYPEformat:variable:words:pointers:weak: (in category 'method prototypes') ----- ClassBuilderPROTOTYPEformat: 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,7,8 unused 9 (?) 64-bit indexable 10 - 11 32-bit indexable 12 - 15 16-bit indexable 16 - 23 byte indexable 24 - 31 compiled method" | instSpec | instSpec := isWeak ifTrue: [4] ifFalse: [isPointers ifTrue: [isVar ifTrue: [nInstVars > 0 ifTrue: [3] ifFalse: [2]] ifFalse: [nInstVars > 0 ifTrue: [1] ifFalse: [0]]] ifFalse: [isWords ifTrue: [12] ifFalse: [16]]]. + ^(instSpec bitShift: 16) + nInstVars! - ^instSpec << 16 + nInstVars! Item was added: + ----- Method: SpurBootstrap>>allPrototypeMethodSymbols (in category 'method prototypes') ----- + allPrototypeMethodSymbols + "self basicNew allPrototypeMethodSymbols" + | symbols | + symbols := Set new. + (SpurBootstrap class organization listAtCategoryNamed: #'method prototypes') do: + [:protoSelector| | method | + method := SpurBootstrap class >> protoSelector. + symbols add: (self selectorForPrototypeMethod: method). + symbols addAll: (method literals select: [:l| l isSymbol and: [l ~~ protoSelector]])]. + ^symbols! Item was changed: + ----- Method: SpurBootstrap>>allocateClassTable (in category 'bootstrap image') ----- - ----- Method: SpurBootstrap>>allocateClassTable (in category 'bootstrap') ----- allocateClassTable "Allocate the root of the classTable plus enough pages to accomodate all classes in the classToIndex map. Don't fill in the entries yet; the classes have yet to be cloned." | tableRootSize tableRoot page maxSize numPages | tableRootSize := self classTableSize / newHeap classTablePageSize. tableRoot := newHeap allocateSlots: tableRootSize format: newHeap arrayFormat classIndex: newHeap arrayClassIndexPun. self assert: (newHeap numSlotsOf: tableRoot) = tableRootSize. self assert: (newHeap formatOf: tableRoot) = newHeap arrayFormat. self assert: (newHeap classIndexOf: tableRoot) = newHeap arrayClassIndexPun. newHeap nilFieldsOf: tableRoot. "first page is strong" page := newHeap allocateSlots: newHeap classTablePageSize format: newHeap arrayFormat classIndex: newHeap arrayClassIndexPun. self assert: (newHeap numSlotsOf: page) = newHeap classTablePageSize. self assert: (newHeap formatOf: tableRoot) = newHeap arrayFormat. self assert: (newHeap classIndexOf: tableRoot) = newHeap arrayClassIndexPun. self assert: (newHeap objectAfter: tableRoot limit: newHeap freeStart) = page. lastClassTablePage := page. newHeap nilFieldsOf: page. newHeap storePointer: 0 ofObject: tableRoot withValue: page. newHeap classTableRootObj: tableRoot. maxSize := classToIndex inject: 0 into: [:a :b| a max: b]. numPages := (maxSize + newHeap classTableMinorIndexMask / newHeap classTablePageSize) truncated. 2 to: numPages do: [:i| page := newHeap allocateSlots: newHeap classTablePageSize format: newHeap weakArrayFormat classIndex: newHeap weakArrayClassIndexPun. self assert: (newHeap numSlotsOf: page) = newHeap classTablePageSize. self assert: (newHeap formatOf: page) = newHeap weakArrayFormat. self assert: (newHeap classIndexOf: page) = newHeap weakArrayClassIndexPun. newHeap nilFieldsOf: page. newHeap storePointer: i - 1 ofObject: tableRoot withValue: page. self assert: (newHeap objectAfter: (newHeap fetchPointer: i - 2 ofObject: tableRoot) limit: newHeap freeStart) = page. lastClassTablePage := page]! Item was changed: + ----- Method: SpurBootstrap>>bootstrapImage (in category 'bootstrap image') ----- - ----- Method: SpurBootstrap>>bootstrapImage (in category 'bootstrap') ----- bootstrapImage self cloneNilTrueAndFalse. self buildClassMap. self allocateClassTable. self cloneObjects. self fillInObjects. self fillInClassTable! Item was changed: + ----- Method: SpurBootstrap>>buildClassMap (in category 'bootstrap image') ----- - ----- Method: SpurBootstrap>>buildClassMap (in category 'bootstrap') ----- buildClassMap "enumerate all objects asking isBehavior:? (class == Metaclass or class class == Metaclass) doesn't work for Newspeak" "Build a map from all classes in oldHeap to a class index. ONLY DEALS WITH CLASSES THAT HAVE INSTANCES!!!! (can walk superclass chain? Can walk subclasses set? Can ask class == Metaclass or class class == Metaclass class?)" | classes classTableIndex | self defineKnownClassIndices. classes := classToIndex keys asSet. classTableIndex := classToIndex inject: 0 into: [:a :b| a max: b]. oldHeap allObjectsDo: [:oldObj| | oldClass | oldClass := oldHeap fetchClassOfNonImm: oldObj. self assert: (oldHeap isPointersNonImm: oldClass). (classes includes: oldClass) ifFalse: [classes add: oldClass. classToIndex at: oldClass put: (classTableIndex := classTableIndex + 1)]]! Item was added: + ----- Method: SpurBootstrap>>classNameForPrototypeMethod: (in category 'method prototypes') ----- + classNameForPrototypeMethod: protoMethod + | protoSelector | + protoSelector := protoMethod selector. + ^(protoSelector first: (protoSelector indexOfSubCollection: 'PROTOTYPE') - 1) asSymbol! Item was changed: + ----- Method: SpurBootstrap>>clone:classIndex: (in category 'bootstrap image') ----- - ----- Method: SpurBootstrap>>clone:classIndex: (in category 'bootstrap') ----- clone: oldObj classIndex: classIndex | newObj | newObj := newHeap allocateSlots: (oldHeap fetchWordLengthOf: oldObj) format: (self newFormatFor: oldObj) classIndex: classIndex. reverseMap at: newObj put: oldObj. ^map at: oldObj put: newObj! Item was changed: + ----- Method: SpurBootstrap>>cloneNilTrueAndFalse (in category 'bootstrap image') ----- - ----- Method: SpurBootstrap>>cloneNilTrueAndFalse (in category 'bootstrap') ----- cloneNilTrueAndFalse { oldHeap nilObject. oldHeap falseObject. oldHeap trueObject. } with: (self firstOrdinaryClassIndex to: self firstOrdinaryClassIndex + 2) do: [:obj :classIndex| classToIndex at: (oldHeap fetchClassOfNonImm: obj) put: classIndex. self clone: obj classIndex: classIndex]. newHeap nilObject: (map at: oldHeap nilObject); "needed for nilling objects etc" falseObject: (map at: oldHeap falseObject); trueObject: (map at: oldHeap trueObject)! Item was changed: + ----- Method: SpurBootstrap>>cloneObjects (in category 'bootstrap image') ----- - ----- Method: SpurBootstrap>>cloneObjects (in category 'bootstrap') ----- cloneObjects | characterClass characterTable oldObj oldClass | characterClass := oldHeap classCharacter. characterTable := oldHeap characterTable. oldObj := oldHeap objectAfter: oldHeap trueObject. [oldObj < oldHeap freeStart] whileTrue: [oldClass := oldHeap fetchClassOfNonImm: oldObj. (oldObj ~= characterTable and: [oldClass ~= characterClass]) ifTrue: [self clone: oldObj classIndex: (classToIndex at: oldClass)]. oldObj := oldHeap objectAfter: oldObj]. newHeap specialObjectsOop: (map at: oldHeap specialObjectsOop)! Item was changed: + ----- Method: SpurBootstrap>>fillInClassTable (in category 'bootstrap image') ----- - ----- Method: SpurBootstrap>>fillInClassTable (in category 'bootstrap') ----- fillInClassTable | firstPage classWeakArray | classToIndex keysAndValuesDo: [:oldClass :index| | newClass page | newClass := map at: oldClass. self assert: (newHeap isPointersNonImm: newClass). newHeap setHashBitsOf: newClass to: index. page := newHeap fetchPointer: index >> newHeap classTableMajorIndexShift ofObject: newHeap classTableRootObj. newHeap storePointer: (index bitAnd: newHeap classTableMinorIndexMask) ofObject: page withValue: newClass. self assert: (newHeap classAtIndex: index) = newClass]. firstPage := newHeap fetchPointer: 0 ofObject: newHeap classTableRootObj. classWeakArray := classToIndex keys detect: [:oldClass| (oldHeap instSpecOfClass: oldClass) = 4 and: [oldInterpreter classNameOf: oldClass Is: 'WeakArray']]. newHeap storePointer: 1 ofObject: firstPage withValue: (map at: oldHeap classSmallInteger); storePointer: 2 ofObject: firstPage withValue: (map at: oldHeap classCharacter); storePointer: 3 ofObject: firstPage withValue: (map at: oldHeap classSmallInteger); storePointer: newHeap arrayClassIndexPun ofObject: firstPage withValue: (map at: oldHeap classArray); storePointer: newHeap weakArrayClassIndexPun ofObject: firstPage withValue: (map at: classWeakArray)! Item was changed: + ----- Method: SpurBootstrap>>fillInCompiledMethod:from: (in category 'bootstrap image') ----- - ----- Method: SpurBootstrap>>fillInCompiledMethod:from: (in category 'bootstrap') ----- fillInCompiledMethod: newObj from: oldObj self fillInBitsObject: newObj from: oldObj. self fillInPointerObject: newObj from: oldObj! Item was changed: + ----- Method: SpurBootstrap>>fillInObjects (in category 'bootstrap image') ----- - ----- Method: SpurBootstrap>>fillInObjects (in category 'bootstrap') ----- fillInObjects oldHeap allObjectsDo: [:oldObj| (map at: oldObj ifAbsent: nil) ifNotNil: [:newObj| (newHeap isCompiledMethod: newObj) ifTrue: [self fillInCompiledMethod: newObj from: oldObj] ifFalse: [(newHeap isPointersNonImm: newObj) ifTrue: [self fillInPointerObject: newObj from: oldObj] ifFalse: [self fillInBitsObject: newObj from: oldObj]]]]! Item was changed: + ----- Method: SpurBootstrap>>fillInPointerObject:from: (in category 'bootstrap image') ----- - ----- Method: SpurBootstrap>>fillInPointerObject:from: (in category 'bootstrap') ----- fillInPointerObject: newObj from: oldObj 0 to: (oldHeap lastPointerOf: oldObj) / oldHeap bytesPerWord - 1 do: [:i| | oldValue newValue | oldValue := oldHeap fetchPointer: i ofObject: oldObj. newValue := (oldHeap isIntegerObject: oldValue) ifTrue: [oldValue] ifFalse: [map at: oldValue ifAbsent: [oldValue = oldHeap characterTable ifTrue: [newHeap nilObject] ifFalse: [self assert: (oldHeap fetchClassOfNonImm: oldValue) = oldHeap classCharacter. newHeap characterObjectOf: (oldHeap integerValueOf: (oldHeap fetchPointer: CharacterValueIndex ofObject: oldValue))]]]. newHeap storePointerUnchecked: i ofObject: newObj withValue: newValue]. (classToIndex includesKey: oldObj) ifTrue: [newHeap storePointerUnchecked: InstanceSpecificationIndex ofObject: newObj withValue: (self newClassFormatFor: oldObj)]! Item was added: + ----- Method: SpurBootstrap>>findSymbol: (in category 'bootstrap methods') ----- + findSymbol: aString + "Find the Symbol equal to aString in oldHeap." + | symbolClass | + symbolClass := self symbolClass. + oldHeap allObjectsDo: + [:o| + (symbolClass = (oldHeap fetchClassOfNonImm: o) + and: [(oldHeap byteLengthOf: o) = aString size + and: [aString = (oldHeap stringOf: o)]]) ifTrue: + [^o]]. + ^nil! Item was added: + ----- Method: SpurBootstrap>>installModifiedMethods (in category 'bootstrap methods') ----- + installModifiedMethods + "Install all the methods in the class-side method prototypes protocol in the relevant classes + in the new image. First use the simulator to get the image to intern all symbols and add + dummy methods under new selectors. With that done we can manually replace the relevant + methods with the prototypes, mapping selectors and global variables as required." + self internAllSymbols. + self addDummyMethods. + self addInstallMethods. + self modifyCharacterMethods! Item was added: + ----- Method: SpurBootstrap>>internAllSymbols (in category 'bootstrap methods') ----- + internAllSymbols + "Ensure that all symbols in the method prototypes are interned so that later we can install them. + Do this by interpreting Symbol intern: 'aSymbol' for each symbol. Make sure the execution state + has not advanced when doing so, and restore the image to the state it has on snapshot." + | internSym savedpc initialContext finalContext | + symbolMap := Dictionary new. + internSym := self findSymbol: #intern:. + oldInterpreter + initStackPages; + loadInitialContext; + internalizeIPandSP. + initialContext := oldInterpreter frameContext: oldInterpreter localFP. + savedpc := oldInterpreter localIP. + "oldInterpreter printHeadFrame." + self allPrototypeMethodSymbols do: + [:sym| | string fp | + (self findSymbol: sym) + ifNotNil: [:imageSym| symbolMap at: sym put: imageSym] + ifNil: + [Transcript cr; nextPutAll: 'interning '; nextPutAll: sym; flush. + string := oldHeap instantiateClass: (oldHeap splObj: ClassByteString) indexableSize: sym size. + 1 to: sym size do: + [:i| oldHeap storeByte: i - 1 ofObject: string withValue: (sym at: i) asInteger]. + "Interpret Symbol intern: sym to ... intern it :-)" + oldInterpreter + internalPush: self symbolClass; + internalPush: string; + argumentCount: 1; + messageSelector: internSym. + fp := oldInterpreter localFP. + oldInterpreter normalSend. + [fp = oldInterpreter localFP] whileFalse: + [oldInterpreter singleStep]. + symbolMap at: sym put: oldInterpreter internalPopStack. + self assert: oldInterpreter localIP - 1 = savedpc. + oldInterpreter localIP: savedpc]]. + symbolMap keysAndValuesDo: + [:sym :imageSym| + self assert: sym = (oldHeap stringOf: imageSym)]. + "oldInterpreter printHeadFrame." + oldInterpreter + internalPush: oldInterpreter localIP; + externalizeIPandSP. + "now undo the execution state" + finalContext := oldInterpreter voidVMStateForSnapshot. + self assert: initialContext = finalContext. + self assert: oldInterpreter localIP = savedpc! Item was changed: + ----- Method: SpurBootstrap>>newClassFormatFor: (in category 'bootstrap image') ----- - ----- Method: SpurBootstrap>>newClassFormatFor: (in category 'bootstrap') ----- newClassFormatFor: oldClassObj "OLD: <2 bits=instSize//64><5 bits=cClass><4 bits=instSpec><6 bits=instSize\\64><1 bit=0> NEW: <5 bits inst spec><16 bits inst size>" | oldFormat instSize newInstSpec | oldFormat := oldHeap formatOfClass: oldClassObj. "N.B. SmallInteger with tag bit cleared" oldFormat := oldFormat >> 1. instSize := ((oldFormat bitShift: -10) bitAnd: 16rC0) + ((oldFormat bitShift: -1) bitAnd: 16r3F) - 1. newInstSpec := #(0 1 2 3 4 5 6 7 16 16 16 16 24 24 24 24) at: ((oldFormat bitShift: -7) bitAnd: 16rF) + 1. ^newHeap integerObjectOf: newInstSpec << 16 + instSize! Item was changed: + ----- Method: SpurBootstrap>>newFormatFor: (in category 'bootstrap image') ----- - ----- Method: SpurBootstrap>>newFormatFor: (in category 'bootstrap') ----- newFormatFor: oldObj "OLD: 0 no fields 1 fixed fields only (all containing pointers) 2 indexable fields only (all containing pointers) 3 both fixed and indexable fields (all containing pointers) 4 both fixed and indexable weak fields (all containing pointers). 5 unused 6 indexable word fields only (no pointers) 7 indexable long (64-bit) fields (only in 64-bit images) 8-11 indexable byte fields only (no pointers) (low 2 bits are low 2 bits of size) 12-15 compiled methods: # of literal oops specified in method header, followed by indexable bytes (same interpretation of low 2 bits as above)" "NEW: 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) and here it gets messy, we need 8 CompiledMethod values, 8 byte values, 4 16-bit values, 2 32-bit values and a 64-bit value, = 23 values, 23 + 5 = 30, so there may be room. 9 (?) 64-bit indexable 10 - 11 32-bit indexable 12 - 15 16-bit indexable 16 - 23 byte indexable 24 - 31 compiled method" | oldFormat | oldFormat := oldHeap formatOf: oldObj. oldFormat <= 4 ifTrue: [^oldFormat]. oldFormat >= 12 ifTrue: "CompiledMethod" [^24 + (self wordSize - (oldHeap byteLengthOf: oldObj) bitAnd: self wordSizeMask)]. oldFormat >= 8 ifTrue: "ByteArray et al" [^16 + (self wordSize - (oldHeap byteLengthOf: oldObj) bitAnd: self wordSizeMask)]. oldFormat = 6 ifTrue: "32-bit indexable" [^10 + ((oldHeap byteLengthOf: oldObj) bitAnd: self wordSizeMask) sign]. oldFormat = 7 ifTrue: "64-bit indexable" [^9]. self error: 'illegal old format'! Item was added: + ----- Method: SpurBootstrap>>selectorForPrototypeMethod: (in category 'method prototypes') ----- + selectorForPrototypeMethod: protoMethod + | protoSelector | + protoSelector := protoMethod selector. + ^(protoSelector last: protoSelector size + - (protoSelector indexOfSubCollection: 'PROTOTYPE') + - 'PROTOTYPE' size + + 1) asSymbol! Item was added: + ----- Method: SpurBootstrap>>symbolClass (in category 'bootstrap methods') ----- + symbolClass + ^oldHeap fetchClassOfNonImm: (oldHeap splObj: SelectorDoesNotUnderstand)! Item was changed: + ----- Method: SpurBootstrap>>transform (in category 'bootstrap image') ----- - ----- Method: SpurBootstrap>>transform (in category 'bootstrap') ----- transform + self installModifiedMethods. self bootstrapImage. newHeap initializePostBootstrap. self validate! Item was changed: + ----- Method: SpurBootstrap>>validate (in category 'bootstrap image') ----- - ----- Method: SpurBootstrap>>validate (in category 'bootstrap') ----- validate | p n duplicates maxClassIndex | self assert: (reverseMap at: newHeap specialObjectsOop) = oldHeap specialObjectsOop. self assert: (map at: oldHeap specialObjectsOop) = newHeap specialObjectsOop. self assert: (reverseMap at: newHeap classTableRootObj ifAbsent: []) isNil. duplicates := { 3. newHeap arrayClassIndexPun. newHeap weakArrayClassIndexPun }. maxClassIndex := classToIndex inject: 0 into: [:a :b| a max: b]. self assert: ((0 to: maxClassIndex) select: [:idx| | classObj | (classObj := newHeap classAtIndex: idx) ~= newHeap nilObject and: [(newHeap classIndexOf: classObj) = (newHeap hashBitsOf: classObj)]]) isEmpty. 0 to: maxClassIndex do: [:index| | classObj | (classObj := newHeap classAtIndex: index) = newHeap nilObject ifTrue: [self assert: (classToIndex keyAtValue: index ifAbsent: []) isNil] ifFalse: [self assert: (newHeap classIndexOf: classObj) ~= (newHeap hashBitsOf: classObj). (duplicates includes: index) ifFalse: [self assert: (newHeap hashBitsOf: classObj) = index]]]. classToIndex keysAndValuesDo: [:oldClass :idx| self assert: (newHeap hashBitsOf: (map at: oldClass)) = idx. self assert: oldClass = (reverseMap at: (newHeap classAtIndex: idx))]. n := 0. newHeap allObjectsDo: [:o| (o <= newHeap trueObject or: [o > lastClassTablePage]) ifTrue: [self assert: (reverseMap includesKey: o). self assert: (newHeap fetchClassOfNonImm: o) = (map at: (oldHeap fetchClassOfNonImm: (reverseMap at: o)))]. n := n + 1. p := o]. p class. self assert: (n between: map size and: map size + 5) "+ 5 is room for classTable"!

1 0

VM Maker: VMMaker.oscog-eem.353.mcz
by commits＠source.squeak.org 06 Sep '13

06 Sep '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.353.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.353 Author: eem Time: 6 September 2013, 2:10:37.902 pm UUID: d557aea8-f45b-4dc2-8a4a-22b5fc74952e Ancestors: VMMaker.oscog-eem.352 Add some accessors to StackInterpreterSimulator so the Spur bootstrap can interpret code in the image to be bootstrapped. =============== Diff against VMMaker.oscog-eem.352 =============== Item was added: + ----- Method: StackInterpreterSimulator>>argumentCount: (in category 'spur bootstrap') ----- + argumentCount: n + argumentCount := n! Item was added: + ----- Method: StackInterpreterSimulator>>localFP (in category 'spur bootstrap') ----- + localFP + ^localFP! Item was added: + ----- Method: StackInterpreterSimulator>>localIP (in category 'spur bootstrap') ----- + localIP + ^localIP! Item was added: + ----- Method: StackInterpreterSimulator>>localIP: (in category 'spur bootstrap') ----- + localIP: pc + localIP := pc! Item was added: + ----- Method: StackInterpreterSimulator>>messageSelector: (in category 'spur bootstrap') ----- + messageSelector: s + messageSelector := s! Item was added: + ----- Method: StackInterpreterSimulator>>singleStep (in category 'testing') ----- + singleStep + self assertValidExecutionPointers. + self dispatchOn: currentBytecode in: BytecodeTable. + self incrementByteCount!

1 0

VM Maker: VMMaker.oscog-eem.352.mcz
by commits＠source.squeak.org 06 Sep '13

06 Sep '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.352.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.352 Author: eem Time: 6 September 2013, 10:45:51.056 am UUID: 9830d0ef-017d-4e8a-b370-2cd26c4b911d Ancestors: VMMaker.oscog-eem.351 Update SpurMemoryManager's class comment. Improve write-up of lazy become. Add a sketch of a possible incremental compaction algorithm. Add a sketch of a possible segmentation scheme that appears not to have any segments. =============== Diff against VMMaker.oscog-eem.351 =============== Item was changed: CogClass subclass: #SpurMemoryManager (excessive size, no diff calculated)

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev September 2013