Vm-dev September 2013

vm-dev@lists.squeakfoundation.org

31 participants
155 discussions

Re: [Vm-dev] VM Maker: Cog-eem.97.mcz
by Frank Shearar 21 Sep '13

21 Sep '13

On 21 September 2013 15:37, <commits(a)source.squeak.org> wrote: > > Eliot Miranda uploaded a new version of Cog to project VM Maker: > http://source.squeak.org/VMMaker/Cog-eem.97.mcz > > ==================== Summary ==================== > > Name: Cog-eem.97 > Author: eem > Time: 21 September 2013, 7:37:46.803 am > UUID: afadf03b-6e6a-4c2c-9bf1-b398b50369e5 > Ancestors: Cog-eem.96 > > SpurBootstrap: > Add ^self versions for all Character copy methods. > Add correct Behavior>>instSpec method > > =============== Diff against Cog-eem.96 =============== > > Item was added: > + ----- Method: SpurBootstrap class>>BehaviorPROTOTYPEinstSpec (in category 'method prototypes') ----- > + BehaviorPROTOTYPEinstSpec > + "Answer the instance specification part of the format that defines what kind of object > + an instance of the receiver is. The formats are0 = 0 sized objects (UndefinedObject True False et al) It's a trivial nit, but you probably want a newline between 'are' and '0 = '. frank

1 0

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

21 Sep '13

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.98.mcz ==================== Summary ==================== Name: Cog-eem.98 Author: eem Time: 21 September 2013, 7:41:44.069 am UUID: 8027e935-f7b0-417a-be44-954c5765582d Ancestors: Cog-eem.97 fix a couple of comments =============== Diff against Cog-eem.97 =============== Item was changed: ----- Method: SpurBootstrap class>>SmalltalkImagePROTOTYPEsetGCParameters (in category 'method prototypes') ----- SmalltalkImagePROTOTYPEsetGCParameters "Adjust the VM's default GC parameters to avoid too much tenuring. Maybe this should be left to the VM?" | proportion edenSize survivorSize averageObjectSize numObjects | proportion := 0.9. "tenure when 90% of pastSpace is full" edenSize := SmalltalkImage current vmParameterAt: 44. + survivorSize := edenSize / 5.0. "David's paper uses 140Kb eden + 2 x 28kb survivor spaces; Spur uses the same ratios :-)" - survivorSize := edenSize / 5.0. "David's paper uses 140Kb eden + 2 x 28kb survivor spaces; Spur does the same :-)" averageObjectSize := 8 * self wordSize. "a good approximation" numObjects := (proportion * survivorSize / averageObjectSize) rounded. SmalltalkImage current vmParameterAt: 6 put: numObjects "tenure when more than this many objects survive the GC"! Item was changed: ----- Method: SpurBootstrap class>>SystemDictionaryPROTOTYPEsetGCParameters (in category 'method prototypes') ----- SystemDictionaryPROTOTYPEsetGCParameters "Adjust the VM's default GC parameters to avoid too much tenuring. Maybe this should be left to the VM?" | proportion edenSize survivorSize averageObjectSize numObjects | proportion := 0.9. "tenure when 90% of pastSpace is full" edenSize := SmalltalkImage current vmParameterAt: 44. + survivorSize := edenSize / 5.0. "David's paper uses 140Kb eden + 2 x 28kb survivor spaces; Spur uses the same ratios :-)" - survivorSize := edenSize / 5.0. "David's paper uses 140Kb eden + 2 x 28kb survivor spaces; Spur does the same :-)" averageObjectSize := 8 * self wordSize. "a good approximation" numObjects := (proportion * survivorSize / averageObjectSize) rounded. SmalltalkImage current vmParameterAt: 6 put: numObjects "tenure when more than this many objects survive the GC"!

1 0

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

21 Sep '13

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.97.mcz ==================== Summary ==================== Name: Cog-eem.97 Author: eem Time: 21 September 2013, 7:37:46.803 am UUID: afadf03b-6e6a-4c2c-9bf1-b398b50369e5 Ancestors: Cog-eem.96 SpurBootstrap: Add ^self versions for all Character copy methods. Add correct Behavior>>instSpec method =============== Diff against Cog-eem.96 =============== Item was added: + ----- Method: SpurBootstrap class>>BehaviorPROTOTYPEinstSpec (in category 'method prototypes') ----- + BehaviorPROTOTYPEinstSpec + "Answer the instance specification part of the format that defines what kind of object + an instance of the receiver is. The formats are0 = 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, reserved for exotic pointer objects? + 7 reserved by the VM + 8 unused, reserved for exotic non-pointer objects? + 9 (?) 64-bit indexable + 10 - 11 32-bit indexable + 12 - 15 16-bit indexable + 16 - 23 byte indexable + 24 - 31 compiled method" + ^(format bitShift: -16) bitAnd: 16r1F! Item was added: + ----- Method: SpurBootstrap class>>CharacterPROTOTYPEclone (in category 'method prototypes') ----- + CharacterPROTOTYPEclone + ^self! Item was added: + ----- Method: SpurBootstrap class>>CharacterPROTOTYPEcopy (in category 'method prototypes') ----- + CharacterPROTOTYPEcopy + ^self! Item was added: + ----- Method: SpurBootstrap class>>CharacterPROTOTYPEdeepCopy (in category 'method prototypes') ----- + CharacterPROTOTYPEdeepCopy + ^self! Item was added: + ----- Method: SpurBootstrap class>>CharacterPROTOTYPEshallowCopy (in category 'method prototypes') ----- + CharacterPROTOTYPEshallowCopy + ^self! Item was added: + ----- Method: SpurBootstrap class>>CharacterPROTOTYPEveryDeepCopyWith: (in category 'method prototypes') ----- + CharacterPROTOTYPEveryDeepCopyWith: deepCopier + ^self! Item was changed: ----- Method: SpurBootstrap>>validate (in category 'bootstrap image') ----- 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: ((newHeap arrayClassIndexPun to: maxClassIndex) select: [:idx| | classObj | (classObj := newHeap classAtIndex: idx) ~= newHeap nilObject and: [(newHeap classIndexOf: classObj) = (newHeap rawHashBitsOf: classObj)]]) isEmpty. 0 to: maxClassIndex do: [:index| | classObj | (index <= newHeap tagMask and: [index > newHeap isForwardedObjectClassIndexPun]) ifTrue: [(classObj := newHeap classAtIndex: index) = newHeap nilObject ifTrue: [self assert: (classToIndex keyAtValue: index ifAbsent: []) isNil] ifFalse: [self assert: (newHeap classIndexOf: classObj) ~= (newHeap rawHashBitsOf: classObj). (duplicates includes: index) ifFalse: [self assert: (newHeap rawHashBitsOf: classObj) = index]]]]. classToIndex keysAndValuesDo: [:oldClass :idx| self assert: (newHeap rawHashBitsOf: (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" + + "check some class properties to ensure the format changes are correct" + self assert: (newHeap fixedFieldsOfClassFormat: (newHeap formatOfClass: newHeap classArray)) = 0. + self assert: (newHeap instSpecOfClassFormat: (newHeap formatOfClass: newHeap classArray)) = newHeap arrayFormat! - self assert: (n between: map size and: map size + 5) "+ 5 is room for classTable"!

1 0

integrating latest changes in my branch
by Esteban Lorenzano 21 Sep '13

21 Sep '13

Hi Eliot, I'm trying to integrate my branch with your sources and I see that there are tons of new changes... it is safe to merge with the latest package (I think is 384)? Esteban

3 2

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

21 Sep '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.399.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.399 Author: eem Time: 20 September 2013, 6:28:56.308 pm UUID: 89f8fefe-b59d-42d7-9c11-7f848d0e5131 Ancestors: VMMaker.oscog-eem.398 A few isIntegerObject:'s => isImmediate:'s in primitives. More protocol. The Spur VM now draws its first window!! =============== Diff against VMMaker.oscog-eem.398 =============== Item was changed: ----- Method: BalloonEngineBase>>loadWorkBufferFrom: (in category 'loading state') ----- loadWorkBufferFrom: wbOop "Load the working buffer from the given oop" <inline: false> + (interpreterProxy isImmediate: wbOop) ifTrue:[^GEFWorkBufferIsInteger]. - (interpreterProxy isIntegerObject: wbOop) ifTrue:[^GEFWorkBufferIsInteger]. (interpreterProxy isWords: wbOop) ifFalse:[^GEFWorkBufferIsPointers]. (interpreterProxy slotSizeOf: wbOop) < GWMinimalSize ifTrue:[^GEFWorkBufferTooSmall]. self workBufferPut: wbOop. self magicNumberGet = GWMagicNumber ifFalse:[^GEFWorkBufferBadMagic]. "Sanity checks" (self wbSizeGet = (interpreterProxy slotSizeOf: wbOop)) ifFalse:[^GEFWorkBufferWrongSize]. self objStartGet = GWHeaderSize ifFalse:[^GEFWorkBufferStartWrong]. "Load buffers" objBuffer := workBuffer + self objStartGet. getBuffer := objBuffer + self objUsedGet. aetBuffer := getBuffer + self getUsedGet. "Make sure we don't exceed the work buffer" GWHeaderSize + self objUsedGet + self getUsedGet + self aetUsedGet > self wbSizeGet ifTrue:[^GEFWorkTooBig]. ^0! Item was changed: ----- Method: BalloonEngineBase>>quickLoadEngineFrom: (in category 'loading state') ----- quickLoadEngineFrom: engineOop "Load the minimal required state from the engineOop, e.g., just the work buffer. Answer 0 on success or non-zero a failure code on failure" <inline: false> | failCode | interpreterProxy failed ifTrue:[^GEFAlreadyFailed]. + (interpreterProxy isImmediate: engineOop) ifTrue:[^GEFEngineIsInteger]. - (interpreterProxy isIntegerObject: engineOop) ifTrue:[^GEFEngineIsInteger]. (interpreterProxy isPointers: engineOop) ifFalse:[^GEFEngineIsWords]. (interpreterProxy slotSizeOf: engineOop) < BEBalloonEngineSize ifTrue:[^GEFEngineTooSmall]. engine := engineOop. (failCode := self loadWorkBufferFrom: (interpreterProxy fetchPointer: BEWorkBufferIndex ofObject: engineOop)) = 0 ifFalse: [^failCode]. self stopReasonPut: 0. objUsed := self objUsedGet. engineStopped := false. ^0! Item was changed: ----- Method: FilePlugin>>primitiveFileSetPosition (in category 'file primitives') ----- primitiveFileSetPosition | newPosition file sz | <var: 'file' type: 'SQFile *'> <var: 'newPosition' type: 'squeakFileOffsetType'> <export: true> + (interpreterProxy isImmediate: (interpreterProxy stackValue: 0)) ifFalse: - (interpreterProxy isIntegerObject: (interpreterProxy stackValue: 0)) ifFalse: [sz := self cCode: 'sizeof(squeakFileOffsetType)'. (interpreterProxy byteSizeOf: (interpreterProxy stackValue: 0)) > sz ifTrue: [^interpreterProxy primitiveFail]]. newPosition := interpreterProxy positive64BitValueOf: (interpreterProxy stackValue: 0). file := self fileValueOf: (interpreterProxy stackValue: 1). interpreterProxy failed ifFalse:[ self sqFile: file SetPosition: newPosition ]. interpreterProxy failed ifFalse:[ interpreterProxy pop: 2 "pop position, file; leave rcvr on stack" ].! Item was added: + ----- Method: Spur32BitMMLESimulator>>positive32BitIntegerFor: (in category 'simulation only') ----- + positive32BitIntegerFor: integerValue + "hack around the CoInterpreter/ObjectMemory split refactoring" + ^coInterpreter positive32BitIntegerFor: integerValue! Item was added: + ----- Method: Spur32BitMMLESimulator>>positive32BitValueOf: (in category 'simulation only') ----- + positive32BitValueOf: oop + "hack around the CoInterpreter/ObjectMemory split refactoring" + ^coInterpreter positive32BitValueOf: oop! Item was added: + ----- Method: Spur32BitMMLESimulator>>positive64BitIntegerFor: (in category 'simulation only') ----- + positive64BitIntegerFor: integerValue + "hack around the CoInterpreter/ObjectMemory split refactoring" + ^coInterpreter positive64BitIntegerFor: integerValue! Item was added: + ----- Method: Spur32BitMMLESimulator>>positive64BitValueOf: (in category 'simulation only') ----- + positive64BitValueOf: oop + "hack around the CoInterpreter/ObjectMemory split refactoring" + ^coInterpreter positive64BitValueOf: oop! Item was added: + ----- Method: Spur32BitMMLESimulator>>primitiveFailureCode (in category 'simulation only') ----- + primitiveFailureCode + "hack around the CoInterpreter/ObjectMemory split refactoring" + ^coInterpreter primitiveFailureCode! Item was added: + ----- Method: Spur32BitMMLESimulator>>push: (in category 'simulation only') ----- + push: oop + "hack around the CoInterpreter/ObjectMemory split refactoring" + ^coInterpreter push: oop! Item was added: + ----- Method: Spur32BitMMLESimulator>>pushInteger: (in category 'simulation only') ----- + pushInteger: integerValue + "hack around the CoInterpreter/ObjectMemory split refactoring" + ^coInterpreter pushInteger: integerValue! Item was added: + ----- Method: Spur32BitMMLESimulator>>stackIntegerValue: (in category 'simulation only') ----- + stackIntegerValue: offset + "hack around the CoInterpreter/ObjectMemory split refactoring" + ^coInterpreter stackIntegerValue: offset! Item was added: + ----- Method: Spur32BitMMLESimulator>>stackObjectValue: (in category 'simulation only') ----- + stackObjectValue: offset + "hack around the CoInterpreter/ObjectMemory split refactoring" + ^coInterpreter stackObjectValue: offset! Item was added: + ----- Method: Spur32BitMMLESimulator>>stringOf: (in category 'simulation only') ----- + stringOf: oop + "hack around the CoInterpreter/ObjectMemory split refactoring" + ^coInterpreter stringOf: oop! Item was added: + ----- Method: SpurMemoryManager>>classBitmap (in category 'plugin support') ----- + classBitmap + ^self splObj: ClassBitmap! Item was changed: + ----- Method: SpurMemoryManager>>classByteArray (in category 'plugin support') ----- - ----- Method: SpurMemoryManager>>classByteArray (in category 'interpreter access') ----- classByteArray "a.k.a. self fetchPointer: ClassByteArrayCompactIndex ofObject: classTableFirstPage" ^self splObj: ClassByteArray! Item was added: + ----- Method: SpurMemoryManager>>classPoint (in category 'plugin support') ----- + classPoint + ^self splObj: ClassPoint! Item was changed: ----- Method: SpurMemoryManager>>isIntegerObject: (in category 'object testing') ----- isIntegerObject: oop "This list records the valid senders of isIntegerObject: as we replace uses of isIntegerObject: by isImmediate: where appropriate." | sel | sel := thisContext sender method selector. (#( DoIt DoItIn: on:do: "from the debugger" makeBaseFrameFor: quickFetchInteger:ofObject: frameOfMarriedContext: objCouldBeClassObj: isMarriedOrWidowedContext: shortPrint: bytecodePrimAt bytecodePrimAtPut commonAt: commonAtPut: loadFloatOrIntFrom: positive32BitValueOf: primitiveExternalCall checkedIntegerValueOf: bytecodePrimAtPut commonAtPut: primitiveVMParameter checkIsStillMarriedContext:currentFP: displayBitsOf:Left:Top:Right:Bottom: fetchStackPointerOf: primitiveContextAt primitiveContextAtPut subscript:with:storing:format: printContext: compare31or32Bits:equal: signed64BitValueOf: primDigitMultiply:negative: digitLength: isNegativeIntegerValueOf: magnitude64BitValueOf: primitiveMakePoint primitiveAsCharacter primitiveInputSemaphore baseFrameReturn primitiveExternalCall primDigitCompare: isLiveContext: numPointerSlotsOf: fileValueOf: loadBitBltDestForm fetchIntOrFloat:ofObject:ifNil: fetchIntOrFloat:ofObject: + loadBitBltSourceForm + loadPoint:from: + primDigitAdd: + primDigitSubtract: + positive64BitValueOf:) includes: sel) ifFalse: - loadBitBltSourceForm) includes: sel) ifFalse: [self halt]. ^(oop bitAnd: 1) ~= 0!

1 0

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

21 Sep '13

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.96.mcz ==================== Summary ==================== Name: Cog-eem.96 Author: eem Time: 20 September 2013, 6:27:12.089 pm UUID: bd2cd65c-986e-413e-beb1-c0e9d480f5bb Ancestors: Cog-eem.95 Make sure the format inst var of /all/ behaviors is converted to the new representation. Fix BehaviorPROTOTYPEbasicNew[:] to use handleFailingBasicNew[:] instead of failingBasicNew[:]. =============== Diff against Cog-eem.95 =============== Item was changed: Object subclass: #SpurBootstrap + instanceVariableNames: 'oldHeap newHeap map reverseMap classToIndex oldInterpreter lastClassTablePage literalMap methodClasses installedPrototypes sizeSym rehashSym classMetaclass' - instanceVariableNames: 'oldHeap newHeap map reverseMap classToIndex oldInterpreter lastClassTablePage literalMap methodClasses installedPrototypes sizeSym rehashSym' classVariableNames: 'ImageHeaderFlags ImageName TransformedImage' poolDictionaries: 'VMObjectIndices' category: 'Cog-Bootstrapping'! !SpurBootstrap commentStamp: 'eem 9/11/2013 05:45' 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 Bootstrap issues: - should it implement a deterministic Symbol identityHash? This means set a Symbol's identityHash at instance creation time based on its string hash so that e.g. MethodDIctionary instances have a deterministic order and don't need to be rehashed on load. - should it collapse ContextPart and MethodContext down onto Context (and perhaps eliminate BlockContext)? 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 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 handleFailingBasicNew! - ^self failingBasicNew! Item was changed: ----- 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 handleFailingBasicNew: sizeRequested]. - ^self failingBasicNew: sizeRequested]. self primitiveFailed! Item was changed: ----- Method: SpurBootstrap>>fillInPointerObject:from: (in category 'bootstrap image') ----- fillInPointerObject: newObj from: oldObj "Fill-in a newObj with appropriately mapped contents from oldObj. Filter-out the character table and the compact classes array. Map character objects to immediate characters." 0 to: (oldHeap lastPointerOf: oldObj) / oldHeap wordSize - 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 or: [oldValue = (oldHeap splObj: CompactClasses)]) 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]. + (self isOldObjABehavior: oldObj) ifTrue: - (classToIndex includesKey: oldObj) ifTrue: [newHeap storePointerUnchecked: InstanceSpecificationIndex ofObject: newObj withValue: (self newClassFormatFor: oldObj)]! Item was changed: + ----- Method: SpurBootstrap>>findRequiredGlobals (in category 'bootstrap image') ----- - ----- Method: SpurBootstrap>>findRequiredGlobals (in category 'bootstrap methods') ----- findRequiredGlobals "Look for the necessary gobal bindings in the prototype methods in the old image. + This has to be done early by sending bindingOf: to Smalltalk. Also find out + Metaclass, needed for identofying classes." - This has to be done early by sending bindingOf: to Smalltalk." | globals bindingOf | globals := Set new. self prototypeClassNameMetaSelectorMethodDo: [:c :m :s :method| globals addAll: (method literals select: [:l| l isVariableBinding and: [l key isSymbol and: [(Smalltalk bindingOf: l key) == l]]])]. bindingOf := self findSymbol: #bindingOf:. self withExecutableInterpreter: oldInterpreter do: [globals do: [:global| literalMap at: global put: (self interpreter: oldInterpreter object: (oldHeap splObj: 8) "Smalltalk" perform: bindingOf + withArguments: {self findSymbol: global key})]]. + + classMetaclass := oldHeap fetchClassOfNonImm: (oldHeap fetchClassOfNonImm: oldHeap classArray)! - withArguments: {self findSymbol: global key})]]! Item was changed: ----- Method: SpurBootstrap>>freeForwarders (in category 'bootstrap image') ----- freeForwarders "Check that all forwarders have been followed. Then free them." | numForwarders numFreed | numForwarders := numFreed := 0. newHeap allObjectsDo: [:o| (newHeap isForwarded: o) ifTrue: [numForwarders := numForwarders + 1] ifFalse: [0 to: (newHeap numPointerSlotsOf: o) - 1 do: [:i| self assert: (newHeap isOopForwarded: (newHeap fetchPointer: i ofObject: o)) not]]]. + Transcript ensureCr; nextPutAll: 'freeing '; print: numForwarders; nextPutAll: ' forwarders'; cr; flush. - Transcript nextPutAll: 'freeing '; print: numForwarders; nextPutAll: ' forwarders'; cr; flush. newHeap allObjectsDo: [:o| (newHeap isForwarded: o) ifTrue: [numFreed := numFreed + 1. newHeap freeObject: o]]. self assert: numFreed = numForwarders! Item was added: + ----- Method: SpurBootstrap>>isOldObjABehavior: (in category 'bootstrap image') ----- + isOldObjABehavior: oldObj + | oldObjClass oldObjClassClass | + ^(classToIndex includesKey: oldObj) + or: [oldObjClass := oldHeap fetchClassOfNonImm: oldObj. + oldObjClassClass := oldHeap fetchClassOfNonImm: oldObjClass. + oldObjClass = classMetaclass + or: [oldObjClassClass = classMetaclass]]!

1 0

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

21 Sep '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.398.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.398 Author: eem Time: 20 September 2013, 3:44:40.472 pm UUID: 64814c0c-d38d-4665-9e06-a93bdc68cc80 Ancestors: VMMaker.oscog-eem.397 Add remap buffer support. More protocol. Spur VM gets to first bitblt. =============== Diff against VMMaker.oscog-eem.397 =============== Item was changed: ----- Method: InterpreterPrimitives>>primitiveShortAt (in category 'sound primitives') ----- primitiveShortAt "Treat the receiver, which can be indexible by either bytes or words, as an array of signed 16-bit values. Return the contents of the given index. Note that the index specifies the i-th 16-bit entry, not the i-th byte or word." | index rcvr sz addr value | index := self stackIntegerValue: 0. self successful ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. rcvr := self stackValue: 1. + (objectMemory isWordsOrBytes: rcvr) ifFalse: - ((objectMemory isIntegerObject: rcvr) - or: [(objectMemory isWordsOrBytes: rcvr) not]) ifTrue: [^self primitiveFailFor: PrimErrInappropriate]. + sz := (objectMemory numSlotsOf: rcvr) * objectMemory bytesPerOop // 2. "number of 16-bit fields" - sz := ((objectMemory sizeBitsOf: rcvr) - BaseHeaderSize) // 2. "number of 16-bit fields" ((index >= 1) and: [index <= sz]) ifFalse: [^self primitiveFailFor: PrimErrBadIndex]. + addr := rcvr + objectMemory baseHeaderSize + (2 * (index - 1)). - addr := rcvr + BaseHeaderSize + (2 * (index - 1)). value := objectMemory shortAt: addr. self pop: 2 thenPushInteger: value! Item was added: + ----- Method: Spur32BitMMLESimulator>>fetchInteger:ofObject: (in category 'simulation only') ----- + fetchInteger: fieldIndex ofObject: objectPointer + "hack around the CoInterpreter/ObjectMemory split refactoring" + ^coInterpreter fetchInteger: fieldIndex ofObject: objectPointer! Item was added: + ----- Method: Spur32BitMMLESimulator>>primitiveFail (in category 'simulation only') ----- + primitiveFail + "hack around the CoInterpreter/ObjectMemory split refactoring" + ^coInterpreter primitiveFail! Item was added: + ----- Method: Spur32BitMMLESimulator>>shortAt: (in category 'memory access') ----- + shortAt: byteAddress + "Return the half-word at byteAddress which must be even." + | lowBits long | + lowBits := byteAddress bitAnd: 2. + long := self longAt: byteAddress - lowBits. + ^ lowBits = 2 + ifTrue: [ long bitShift: -16 ] + ifFalse: [ long bitAnd: 16rFFFF ]! Item was added: + ----- Method: Spur32BitMMLESimulator>>showDisplayBits:Left:Top:Right:Bottom: (in category 'simulation only') ----- + showDisplayBits: aForm Left: l Top: t Right: r Bottom: b + "hack around the CoInterpreter/ObjectMemory split refactoring" + ^coInterpreter showDisplayBits: aForm Left: l Top: t Right: r Bottom: b! Item was added: + ----- Method: Spur32BitMMLESimulator>>transcript (in category 'simulation only') ----- + transcript + "hack around the CoInterpreter/ObjectMemory split refactoring" + ^coInterpreter transcript! Item was changed: CogClass subclass: #SpurMemoryManager (excessive size, no diff calculated) Item was changed: ----- Method: SpurMemoryManager class>>initialize (in category 'class initialization') ----- initialize "CogObjectMemory initialize" NumFreeLists := 65. "One for each size up to and including 64 slots. One for sizes > 64 slots." + CheckObjectOverwrite := true. + + "The remap buffer support is for compatibility; Spur doesn't GC during allocation. + Eventually this should die." + RemapBufferSize := 25! - CheckObjectOverwrite := true! Item was added: + ----- Method: SpurMemoryManager>>classArray (in category 'plugin support') ----- + classArray + "a.k.a. self fetchPointer: ClassArrayCompactIndex ofObject: classTableFirstPage" + ^self splObj: ClassArray! Item was added: + ----- Method: SpurMemoryManager>>classByteArray (in category 'interpreter access') ----- + classByteArray + "a.k.a. self fetchPointer: ClassByteArrayCompactIndex ofObject: classTableFirstPage" + ^self splObj: ClassByteArray! Item was changed: ----- Method: SpurMemoryManager>>initialize (in category 'initialization') ----- initialize + "We can put all initializatins that set something to 0 or to false here. + In C all global variables are initialized to 0, and 0 is false." freeLists := CArrayAccessor on: (Array new: NumFreeLists withAll: 0). + remapBuffer := Array new: RemapBufferSize. + remapBufferCount := 0. freeListsMask := 0. checkForLeaks := 0. needGCFlag := signalLowSpace := scavengeInProgress := false. becomeEffectsFlags := 0. - heapMap := self wordSize = 4 ifTrue: [CogCheck32BitHeapMap new]. statScavenges := statIncrGCs := statFullGCs := 0. statScavengeGCUsecs := statIncrGCUsecs := statFullGCUsecs := 0. + statSGCDeltaUsecs := statIGCDeltaUsecs := statFGCDeltaUsecs := 0. + + "We can also initialize here anything that is only for simulation." + heapMap := self wordSize = 4 ifTrue: [CogCheck32BitHeapMap new]! - statSGCDeltaUsecs := statIGCDeltaUsecs := statFGCDeltaUsecs := 0! Item was changed: ----- Method: SpurMemoryManager>>isIntegerObject: (in category 'object testing') ----- isIntegerObject: oop "This list records the valid senders of isIntegerObject: as we replace uses of isIntegerObject: by isImmediate: where appropriate." | sel | sel := thisContext sender method selector. (#( DoIt DoItIn: on:do: "from the debugger" makeBaseFrameFor: quickFetchInteger:ofObject: frameOfMarriedContext: objCouldBeClassObj: isMarriedOrWidowedContext: shortPrint: bytecodePrimAt bytecodePrimAtPut commonAt: commonAtPut: loadFloatOrIntFrom: positive32BitValueOf: primitiveExternalCall checkedIntegerValueOf: bytecodePrimAtPut commonAtPut: primitiveVMParameter checkIsStillMarriedContext:currentFP: displayBitsOf:Left:Top:Right:Bottom: fetchStackPointerOf: primitiveContextAt primitiveContextAtPut subscript:with:storing:format: printContext: compare31or32Bits:equal: signed64BitValueOf: primDigitMultiply:negative: digitLength: isNegativeIntegerValueOf: magnitude64BitValueOf: primitiveMakePoint primitiveAsCharacter primitiveInputSemaphore baseFrameReturn primitiveExternalCall primDigitCompare: isLiveContext: numPointerSlotsOf: + fileValueOf: + loadBitBltDestForm + fetchIntOrFloat:ofObject:ifNil: + fetchIntOrFloat:ofObject: + loadBitBltSourceForm) includes: sel) ifFalse: - fileValueOf:) includes: sel) ifFalse: [self halt]. ^(oop bitAnd: 1) ~= 0! Item was added: + ----- Method: SpurMemoryManager>>isWordsOrBytes: (in category 'object testing') ----- + isWordsOrBytes: oop + ^(self isNonImmediate: oop) + and: [self isWordsOrBytesNonImm: oop]! Item was added: + ----- Method: SpurMemoryManager>>isWordsOrBytesNonImm: (in category 'object testing') ----- + isWordsOrBytesNonImm: objOop + ^(self formatOf: objOop) > self lastPointerFormat! Item was added: + ----- Method: SpurMemoryManager>>popRemappableOop (in category 'interpreter access') ----- + popRemappableOop + "Pop and return the possibly remapped object from the remap buffer. + We support this excessence for compatibility with ObjectMemory. + Spur doesn't GC during allocation." + <api> + | oop | + oop := remapBuffer at: remapBufferCount. + remapBufferCount := remapBufferCount - 1. + ^oop! Item was added: + ----- Method: SpurMemoryManager>>pushRemappableOop: (in category 'interpreter access') ----- + pushRemappableOop: oop + "Record the given object in a the remap buffer. Objects in this buffer are remapped + when a compaction occurs. This facility is used by the interpreter to ensure that + objects in temporary variables are properly remapped. + We support this excessence for compatibility with ObjectMemory. + Spur doesn't GC during allocation." + <api> + self assert: (self addressCouldBeOop: oop). + remapBuffer at: (remapBufferCount := remapBufferCount + 1) put: oop. + remapBufferCount <= RemapBufferSize ifFalse: + [self error: 'remapBuffer overflow']! Item was added: + ----- Method: SpurMemoryManager>>remapBuffer (in category 'interpreter access') ----- + remapBuffer + "We support this excessence for compatibility with ObjectMemory. + Spur doesn't GC during allocation." + ^remapBuffer! Item was changed: ----- Method: SpurMemoryManager>>sufficientSpaceAfterGC: (in category 'generation scavenging') ----- sufficientSpaceAfterGC: numBytes "This is ObjectMemory's funky entry-point into its incremental GC, which is a stop-the-world a young generation reclaimer. In Spur we run the scavenger." self assert: numBytes = 0. + self assert: remapBufferCount = 0. "coInterpreter printCallStackFP: coInterpreter framePointer" self runLeakCheckerForFullGC: false. coInterpreter preGCAction: GCModeIncr. needGCFlag := false. gcStartUsecs := coInterpreter ioUTCMicrosecondsNow. scavengeInProgress := true. pastSpaceStart := scavenger scavenge. self assert: (self oop: pastSpaceStart isGreaterThanOrEqualTo: scavenger pastSpace start andLessThanOrEqualTo: scavenger pastSpace limit). freeStart := scavenger eden start. self initSpaceForAllocationCheck: scavenger eden. scavengeInProgress := false. statScavenges := statScavenges + 1. statGCEndUsecs := coInterpreter ioUTCMicrosecondsNow. statSGCDeltaUsecs := statGCEndUsecs - gcStartUsecs. statScavengeGCUsecs := statScavengeGCUsecs + statSGCDeltaUsecs. coInterpreter postGCAction. self runLeakCheckerForFullGC: false. ^true! Item was added: + ----- Method: SpurMemoryManager>>topRemappableOop (in category 'interpreter access') ----- + topRemappableOop + <api> + "Answers the top of the remappable oop stack. Useful when writing loops. + We support this excessence for compatibility with ObjectMemory. + Spur doesn't GC during allocation." + ^remapBuffer at: remapBufferCount! Item was changed: ----- Method: StackInterpreterPrimitives>>primitiveObjectPointsTo (in category 'object access primitives') ----- primitiveObjectPointsTo "This primitive is assumed to be fast (see e.g. MethodDictionary>>includesKey:) so make it so. N.B. Written to use literalHeaderOf: so that in Cog subclasses cogged methods (whose headers point to the machine code method) are still correctly scanned, for the header as well as literals." | rcvr thang header fmt lastField methodHeader | thang := self stackTop. rcvr := self stackValue: 1. + (objectMemory isImmediate: rcvr) ifTrue: - (objectMemory isIntegerObject: rcvr) ifTrue: [^self pop: 2 thenPushBool: false]. "Inlined version of lastPointerOf: for speed in determining if rcvr is a context." header := objectMemory baseHeader: rcvr. fmt := objectMemory formatOfHeader: header. (objectMemory isPointersFormat: fmt) ifTrue: [(fmt = objectMemory indexablePointersFormat and: [objectMemory isContextHeader: header]) ifTrue: [(self isMarriedOrWidowedContext: rcvr) ifTrue: [self externalWriteBackHeadFramePointers. (self isStillMarriedContext: rcvr) ifTrue: [^self pop: 2 thenPushBool: (self marriedContext: rcvr pointsTo: thang stackDeltaForCurrentFrame: 2)]]. "contexts end at the stack pointer" + lastField := CtxtTempFrameStart + (self fetchStackPointerOf: rcvr) * BytesPerOop] - lastField := CtxtTempFrameStart + (self fetchStackPointerOf: rcvr) * BytesPerWord] ifFalse: + [lastField := (objectMemory sizeBitsOfSafe: rcvr) - objectMemory baseHeaderSize]] - [lastField := (objectMemory sizeBitsOfSafe: rcvr) - BaseHeaderSize]] ifFalse: [fmt < objectMemory firstCompiledMethodFormat "no pointers" ifTrue: [^self pop: 2 thenPushBool: false]. "CompiledMethod: contains both pointers and bytes:" methodHeader := self headerOf: rcvr. methodHeader = thang ifTrue: [^self pop: 2 thenPushBool: true]. + lastField := ((self literalCountOfHeader: methodHeader) + 1) * BytesPerOop]. - lastField := ((self literalCountOfHeader: methodHeader) + 1) * BytesPerWord]. + objectMemory baseHeaderSize to: lastField by: objectMemory bytesPerOop do: - BaseHeaderSize to: lastField by: BytesPerWord do: [:i | (self longAt: rcvr + i) = thang ifTrue: [^self pop: 2 thenPushBool: true]]. self pop: 2 thenPushBool: false!

1 0

Re: [Vm-dev] VM Maker: Cog-eem.89.mcz
by Frank Shearar 21 Sep '13

21 Sep '13

On 18 September 2013 02:11, <commits(a)source.squeak.org> wrote: > > Eliot Miranda uploaded a new version of Cog to project VM Maker: > http://source.squeak.org/VMMaker/Cog-eem.89.mcz > > ==================== Summary ==================== > > Name: Cog-eem.89 > Author: eem > Time: 17 September 2013, 6:11:13.622 pm > UUID: d56a6961-bf18-450f-9aaa-427cfb9e753d > Ancestors: Cog-eem.88 > > Bring modifyCharacterMethods into withExecutableInterpreter: > scope. > > Fix replacementForCharacterMethod: (was installing oop of > asInteger selector as a SmallInteger, not the oop itself). > > Make sure interpreter:object:perform:withArguments: increments > byteCount even if performed send is primitive. > > Needs VMMaker.oscog-eem.388. > > =============== Diff against Cog-eem.88 =============== Did you mean to leave a selt halt in SpurBootstrap>> replacementForCharacterMethod:? frank

4 7

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

21 Sep '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.397.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.397 Author: eem Time: 20 September 2013, 3:03:30.831 pm UUID: 52862ea4-1375-4ead-852f-2e65e2941a26 Ancestors: VMMaker.oscog-eem.396 weakArrayFormat can also have fixed inst vars. You learn something new every day. Add format printing to longPrintOop:. Fix isIntegerObject: for debugging (add #on:do:). =============== Diff against VMMaker.oscog-eem.395 =============== Item was added: + ----- Method: CogVMSimulator>>checkStackIntegrity (in category 'object memory support') ----- + checkStackIntegrity + "Override to deal with incomplete initialization." + stackPages ifNil: [^true]. + ^super checkStackIntegrity! Item was changed: ----- Method: Spur32BitMMLESimulator>>firstIndexableField: (in category 'object format') ----- firstIndexableField: objOop "NOTE: overridden from SpurMemoryManager to add coercion to CArray, so please duplicate any changes. There are only two important cases, both for objects with named inst vars, i.e. formats 2,3 & 5. The first indexable field for formats 2 & 5 is the slot count (by convention, even though that's off the end of the object). For 3 we must go to the class." | fmt classFormat | <returnTypeC: #'void *'> fmt := self formatOf: objOop. fmt <= self lastPointerFormat ifTrue: "pointer; may need to delve into the class format word" + [(fmt between: self indexablePointersFormat and: self weakArrayFormat) ifTrue: - [fmt = self indexablePointersFormat ifTrue: [classFormat := self formatOfClass: (self fetchClassOfNonImm: objOop). ^self cCoerce: (self pointerForOop: objOop + self baseHeaderSize + ((self fixedFieldsOfClassFormat: classFormat) << self wordSize)) to: #'oop *']. ^self cCoerce: (self pointerForOop: objOop + self baseHeaderSize + ((self numSlotsOf: objOop) << self wordSize)) to: #'oop *']. "All bit objects, and indeed CompiledMethod, though this is a non-no, start at 0" self assert: (fmt >= self sixtyFourBitIndexableFormat and: [fmt < self firstCompiledMethodFormat]). ^self cCoerce: (self pointerForOop: objOop + self baseHeaderSize) to: (fmt < self firstByteFormat ifTrue: [fmt = self sixtyFourBitIndexableFormat ifTrue: ["64 bit field objects" #'long long *'] ifFalse: [fmt < self firstShortFormat ifTrue: ["32 bit field objects" #'int *'] ifFalse: ["16-bit field objects" #'short *']]] ifFalse: ["byte objects (including CompiledMethod" #'char *'])! Item was changed: ----- Method: Spur32BitMMLESimulator>>longLongAt:put: (in category 'memory access') ----- longLongAt: byteAddress put: a64BitValue "memory is a Bitmap, a 32-bit indexable array of bits" byteAddress \\ 8 ~= 0 ifTrue: [self unalignedAccessError]. + "((byteAddress = 16r120DBDC or: [byteAddress = 16r120DBD8]) - ((byteAddress = 16r120DBDC or: [byteAddress = 16r120DBD8]) and: [a64BitValue >> 32 = 16r16000000 or: [(a64BitValue bitAnd: 16rffffffff) = 16r16000000]]) ifTrue: + [self halt]." - [self halt]. memory at: byteAddress // 4 + 1 put: (a64BitValue bitAnd: 16rffffffff); at: byteAddress // 4 + 2 put: a64BitValue >> 32. ^a64BitValue! Item was added: + ----- Method: Spur32BitMMLESimulator>>pushBool: (in category 'simulation only') ----- + pushBool: trueOrFalse + "hack around the CoInterpreter/ObjectMemory split refactoring" + ^coInterpreter pushBool: trueOrFalse! Item was changed: ----- Method: Spur32BitMemoryManager>>checkHeapIntegrity (in category 'debug support') ----- checkHeapIntegrity "Perform an integrity/leak check using the heapMap. Assume clearLeakMapAndMapAccessibleObjects has set a bit at each object's header. Scan all objects in the heap checking that every pointer points to a header. Scan the rootTable, remapBuffer and extraRootTable checking that every entry is a pointer to a header. Check that the number of roots is correct and that all rootTable entries have their rootBit set. Answer if all checks pass." + | prevObj prevPrevObj ok numRememberedRootsInHeap | - | ok numRememberedRootsInHeap | <inline: false> ok := true. numRememberedRootsInHeap := 0. + self allHeapEntitiesDo: - self allObjectsDo: [:obj| | containsYoung fieldOop classIndex classOop | (self isFreeObject: obj) ifFalse: [containsYoung := false. (self isRemembered: obj) ifTrue: [numRememberedRootsInHeap := numRememberedRootsInHeap + 1. (scavenger isInRememberedTable: obj) ifFalse: [coInterpreter print: 'remembered object '; printHex: obj; print: ' is not in remembered table'; cr. self eek. ok := false]]. (self isForwarded: obj) ifTrue: [fieldOop := self fetchPointer: 0 ofMaybeForwardedObject: obj. (heapMap heapMapAtWord: (self pointerForOop: fieldOop)) = 0 ifTrue: [coInterpreter print: 'object leak in forwarder '; printHex: obj; print: ' to unmapped '; printHex: fieldOop; cr. self eek. ok := false]. (self isYoung: fieldOop) ifTrue: [containsYoung := true]] ifFalse: [classOop := self classAtIndex: (classIndex := self classIndexOf: obj). (classOop isNil or: [classOop = nilObj]) ifTrue: [coInterpreter print: 'object leak in '; printHex: obj; print: ' invalid class index '; printHex: classIndex; print: ' -> '; printHex: classOop; cr. self eek. ok := false]. self baseHeaderSize to: (self lastPointerOf: obj) by: BytesPerOop do: [:ptr| fieldOop := self longAt: obj + ptr. (self isNonImmediate: fieldOop) ifTrue: [| fi | fi := ptr - self baseHeaderSize / self wordSize. (fieldOop bitAnd: self wordSize - 1) ~= 0 ifTrue: [coInterpreter print: 'misaligned oop in '; printHex: obj; print: ' @ '; printNum: fi; print: ' = '; printHex: fieldOop; cr. self eek. ok := false] ifFalse: [(heapMap heapMapAtWord: (self pointerForOop: fieldOop)) = 0 ifTrue: [coInterpreter print: 'object leak in '; printHex: obj; print: ' @ '; printNum: fi; print: ' = '; printHex: fieldOop; cr. self eek. ok := false]. (self isYoung: fieldOop) ifTrue: [containsYoung := true]]]]]. (containsYoung and: [(self isYoung: obj) not]) ifTrue: [(self isRemembered: obj) ifFalse: [coInterpreter print: 'unremembered object '; printHex: obj; print: ' contains young oop(s)'; cr. self eek. + ok := false]]]. + prevPrevObj := prevObj. + prevObj := obj]. - ok := false]]]]. numRememberedRootsInHeap ~= scavenger rememberedSetSize ifTrue: [coInterpreter print: 'root count mismatch. #heap roots '; printNum: numRememberedRootsInHeap; print: '; #roots '; printNum: scavenger rememberedSetSize; cr. "But the system copes with overflow..." self flag: 'no support for remembered set overflow yet'. "ok := rootTableOverflowed and: [needGCFlag]"]. scavenger rememberedSetWithIndexDo: [:obj :i| (obj bitAnd: self wordSize - 1) ~= 0 ifTrue: [coInterpreter print: 'misaligned oop in rootTable @ '; printNum: i; print: ' = '; printHex: obj; cr. self eek. ok := false] ifFalse: [(heapMap heapMapAtWord: (self pointerForOop: obj)) = 0 ifTrue: [coInterpreter print: 'object leak in rootTable @ '; printNum: i; print: ' = '; printHex: obj; cr. self eek. ok := false] ifFalse: [(self isYoung: obj) ifTrue: [coInterpreter print: 'non-root in rootTable @ '; printNum: i; print: ' = '; printHex: obj; cr. self eek. ok := false]]]]. self flag: 'no support for remap buffer yet'. "1 to: remapBufferCount do: [:ri| obj := remapBuffer at: ri. (obj bitAnd: self wordSize - 1) ~= 0 ifTrue: [coInterpreter print: 'misaligned remapRoot @ '; printNum: ri; print: ' = '; printHex: obj; cr. self eek. ok := false] ifFalse: [(heapMap heapMapAtWord: (self pointerForOop: obj)) = 0 ifTrue: [coInterpreter print: 'object leak in remapRoots @ '; printNum: ri; print: ' = '; printHex: obj; cr. self eek. ok := false]]]." self flag: 'no support for extraRoots yet'. "1 to: extraRootCount do: [:ri| obj := (extraRoots at: ri) at: 0. (obj bitAnd: self wordSize - 1) ~= 0 ifTrue: [coInterpreter print: 'misaligned extraRoot @ '; printNum: ri; print: ' => '; printHex: obj; cr. self eek. ok := false] ifFalse: [(heapMap heapMapAtWord: (self pointerForOop: obj)) = 0 ifTrue: [coInterpreter print: 'object leak in extraRoots @ '; printNum: ri; print: ' => '; printHex: obj; cr. self eek. ok := false]]]." ^ok! Item was changed: ----- Method: Spur32BitMemoryManager>>instantiateClass:indexableSize: (in category 'allocation') ----- instantiateClass: classObj indexableSize: nElements | instSpec classFormat numSlots classIndex newObj fillValue | classFormat := self formatOfClass: classObj. instSpec := self instSpecOfClassFormat: classFormat. fillValue := 0. instSpec caseOf: { [self arrayFormat] -> [numSlots := nElements. fillValue := nilObj]. [self indexablePointersFormat] -> [numSlots := (self fixedFieldsOfClassFormat: classFormat) + nElements. fillValue := nilObj]. [self weakArrayFormat] -> + [numSlots := (self fixedFieldsOfClassFormat: classFormat) + nElements. - [numSlots := nElements. fillValue := nilObj]. [self sixtyFourBitIndexableFormat] -> [numSlots := nElements * 2]. [self firstLongFormat] -> [numSlots := nElements]. [self firstShortFormat] -> [numSlots := nElements + 1 // 2. instSpec := instSpec + (nElements bitAnd: 1)]. [self firstByteFormat] -> [numSlots := nElements + 3 // 4. instSpec := instSpec + (4 - nElements bitAnd: 3)]. [self firstCompiledMethodFormat] -> [numSlots := nElements + 3 // 4. instSpec := instSpec + (4 - nElements bitAnd: 3)] } otherwise: [^nil]. "non-indexable" classIndex := self ensureBehaviorHash: classObj. classIndex < 0 ifTrue: [coInterpreter primitiveFailFor: classIndex negated. ^nil]. newObj := self allocateSlots: numSlots format: instSpec classIndex: classIndex. newObj ifNotNil: [self fillObj: newObj numSlots: numSlots with: fillValue]. ^newObj! Item was changed: ----- Method: Spur64BitMemoryManager>>instantiateClass:indexableSize: (in category 'allocation') ----- instantiateClass: classObj indexableSize: nElements | instSpec classFormat numSlots classIndex newObj fillValue | classFormat := self formatOfClass: classObj. instSpec := self instSpecOfClassFormat: classFormat. fillValue := 0. instSpec caseOf: { [self arrayFormat] -> [numSlots := nElements. fillValue := nilObj]. [self indexablePointersFormat] -> [numSlots := (self fixedFieldsOfClassFormat: classFormat) + nElements. fillValue := nilObj]. [self weakArrayFormat] -> + [numSlots := (self fixedFieldsOfClassFormat: classFormat) + nElements. - [numSlots := nElements. fillValue := nilObj]. [self sixtyFourBitIndexableFormat] -> [numSlots := nElements]. [self firstLongFormat] -> [numSlots := nElements + 1 // 2. instSpec := instSpec + (nElements bitAnd: 1)]. [self firstShortFormat] -> [numSlots := nElements + 3 // 4. instSpec := instSpec + (4 - nElements bitAnd: 3)]. [self firstByteFormat] -> [numSlots := nElements + 7 // 8. instSpec := instSpec + (8 - nElements bitAnd: 7)]. [self firstCompiledMethodFormat] -> [numSlots := nElements + 7 // 8. instSpec := instSpec + (8 - nElements bitAnd: 7)] } otherwise: [^nil]. "non-indexable" classIndex := self ensureBehaviorHash: classObj. classIndex < 0 ifTrue: [coInterpreter primitiveFailFor: classIndex negated. ^nil]. newObj := self allocateSlots: numSlots format: instSpec classIndex: classIndex. newObj ifNotNil: [self fillObj: newObj numSlots: numSlots with: fillValue]. ^newObj! Item was changed: ----- Method: SpurGenerationScavenger>>scavengeLoop (in category 'scavenger') ----- scavengeLoop "This is the inner loop of the main routine, scavenge. It first scavenges the new objects immediately reachable from old ones. Then it scavenges those that are transitively reachable. If this results in a promotion, the promotee gets remembered, and it first scavenges objects adjacent to the promotee, then scavenges the ones reachable from the promoted. This loop continues until no more reachable objects are left. At that point, pastSurvivorSpace is exchanged with futureSurvivorSpace. Notice that each pointer in a live object is inspected once and only once. The previousRememberedSetSize and previousFutureSurvivorSpaceLimit variables ensure that no object is scanned twice, as well as detecting closure. If this were not true, some pointers might get forwarded twice." | firstTime previousRememberedSetSize previousFutureSurvivorStart | self assert: futureSurvivorStart = futureSpace start. "future space should be empty at the start" firstTime := true. previousRememberedSetSize := 0. previousFutureSurvivorStart := futureSurvivorStart. [self scavengeRememberedSetStartingAt: previousRememberedSetSize. previousFutureSurvivorStart = futureSurvivorStart ifTrue: [^self]. previousRememberedSetSize := rememberedSetSize. + firstTime ifTrue: - firstTime ifTrue: [coInterpreter mapInterpreterOops. firstTime := false]. + self scavengeFutureSurvivorSpaceStartingAt: previousFutureSurvivorStart. + previousRememberedSetSize = rememberedSetSize ifTrue: - previousFutureSurvivorStart = rememberedSetSize ifTrue: [^self]. previousFutureSurvivorStart := futureSurvivorStart] repeat! Item was added: + ----- Method: SpurMemoryManager>>allHeapEntitiesDo: (in category 'object enumeration') ----- + allHeapEntitiesDo: aBlock + <inline: true> + self allNewSpaceEntitiesDo: aBlock. + self allOldSpaceEntitiesDo: aBlock! Item was added: + ----- Method: SpurMemoryManager>>allNewSpaceEntitiesDo: (in category 'object enumeration') ----- + allNewSpaceEntitiesDo: aBlock + "Enumerate all new space objects, including free objects, + excluding any objects created during the ennumeration." + <inline: true> + | prevObj prevPrevObj objOop limit | + prevPrevObj := prevObj := nil. + "After a scavenge eden is empty, futureSpace is empty, and all newSpace objects are + in pastSpace. Objects are allocated in eden. So enumerate only eden and pastSpace." + objOop := self objectStartingAt: scavenger eden start. + [objOop < freeStart] whileTrue: + [aBlock value: objOop. + prevPrevObj := prevObj. + prevObj := objOop. + objOop := self objectAfter: objOop limit: freeStart]. + objOop := self objectStartingAt: scavenger pastSpace start. + limit := pastSpaceStart. + [objOop < limit] whileTrue: + [aBlock value: objOop. + prevPrevObj := prevObj. + prevObj := objOop. + objOop := self objectAfter: objOop limit: limit]. + prevPrevObj class. + prevObj class! Item was added: + ----- Method: SpurMemoryManager>>allOldSpaceEntitiesDo: (in category 'object enumeration') ----- + allOldSpaceEntitiesDo: aBlock + <inline: true> + | prevObj prevPrevObj objOop | + prevPrevObj := prevObj := nil. + objOop := self firstObject. + [self assert: objOop \\ self allocationUnit = 0. + objOop < freeOldSpaceStart] whileTrue: + [aBlock value: objOop. + prevPrevObj := prevObj. + prevObj := objOop. + objOop := self objectAfter: objOop limit: freeOldSpaceStart]. + prevPrevObj class. + prevObj class! Item was changed: ----- Method: SpurMemoryManager>>enterIntoClassTable: (in category 'class table') ----- enterIntoClassTable: aBehavior "Enter aBehavior into the class table and answer 0. Otherwise answer a primitive failure code." | initialMajorIndex majorIndex minorIndex page | majorIndex := classTableIndex >> self classTableMajorIndexShift. initialMajorIndex := majorIndex. "classTableIndex should never index the first page; it's reserved for known classes" self assert: initialMajorIndex > 0. minorIndex := classTableIndex bitAnd: self classTableMinorIndexMask. [page := self fetchPointer: majorIndex ofObject: classTableRootObj. page = nilObj ifTrue: + [page := self allocateSlotsInOldSpace: self classTablePageSize - [page := self allocateSlots: self classTablePageSize format: self arrayFormat classIndex: self arrayClassIndexPun. page ifNil: [^PrimErrNoMemory]. self fillObj: page numSlots: self classTablePageSize with: nilObj. self storePointer: majorIndex ofObject: classTableRootObj withValue: page. minorIndex := 0]. minorIndex to: self classTablePageSize - 1 do: [:i| (self fetchPointer: i ofObject: page) = nilObj ifTrue: [classTableIndex := majorIndex << self classTableMajorIndexShift + i. self storePointer: i ofObject: page withValue: aBehavior. self setHashBitsOf: aBehavior to: classTableIndex. self assert: (self classAtIndex: (self rawHashBitsOf: aBehavior)) = aBehavior. "now fault-in method lookup chain." self scanClassPostBecome: aBehavior effects: BecamePointerObjectFlag+BecameCompiledMethodFlag. ^0]]. majorIndex := (majorIndex + 1 bitAnd: self classIndexMask) max: 1. majorIndex = initialMajorIndex ifTrue: "wrapped; table full" [^PrimErrLimitExceeded]] repeat! Item was changed: ----- Method: SpurMemoryManager>>firstIndexableField: (in category 'object format') ----- firstIndexableField: objOop "NOTE: overridden in various simulator subclasses to add coercion to CArray, so please duplicate any changes. There are only two important cases, both for objects with named inst vars, i.e. formats 2,3 & 5. The first indexable field for formats 2 & 5 is the slot count (by convention, even though that's off the end of the object). For 3 we must go to the class." | fmt classFormat | <returnTypeC: #'void *'> fmt := self formatOf: objOop. fmt <= self lastPointerFormat ifTrue: "pointer; may need to delve into the class format word" + [(fmt between: self indexablePointersFormat and: self weakArrayFormat) ifTrue: - [fmt = self indexablePointersFormat ifTrue: [classFormat := self formatOfClass: (self fetchClassOfNonImm: objOop). ^self pointerForOop: objOop + self baseHeaderSize + ((self fixedFieldsOfClassFormat: classFormat) << self wordSize)]. ^self pointerForOop: objOop + self baseHeaderSize + ((self numSlotsOf: objOop) << self wordSize)]. "All bit objects, and indeed CompiledMethod, though this is a non-no, start at 0" self assert: fmt < self firstCompiledMethodFormat. ^self pointerForOop: objOop + self baseHeaderSize! Item was added: + ----- Method: SpurMemoryManager>>freeObject: (in category 'free space') ----- + freeObject: objOop + ^self freeChunkWithBytes: (self bytesInObject: objOop) at: (self startOfObject: objOop)! Item was changed: ----- Method: SpurMemoryManager>>isIndexableFormat: (in category 'object testing') ----- isIndexableFormat: format ^format >= self arrayFormat + and: [format <= self weakArrayFormat - and: [format <= self indexablePointersFormat or: [format >= self sixtyFourBitIndexableFormat]]! Item was changed: ----- Method: SpurMemoryManager>>isIntegerObject: (in category 'object testing') ----- isIntegerObject: oop "This list records the valid senders of isIntegerObject: as we replace uses of isIntegerObject: by isImmediate: where appropriate." + | sel | + sel := thisContext sender method selector. (#( DoIt DoItIn: + on:do: "from the debugger" makeBaseFrameFor: quickFetchInteger:ofObject: frameOfMarriedContext: objCouldBeClassObj: isMarriedOrWidowedContext: shortPrint: bytecodePrimAt bytecodePrimAtPut commonAt: commonAtPut: loadFloatOrIntFrom: positive32BitValueOf: primitiveExternalCall checkedIntegerValueOf: bytecodePrimAtPut commonAtPut: primitiveVMParameter checkIsStillMarriedContext:currentFP: displayBitsOf:Left:Top:Right:Bottom: fetchStackPointerOf: primitiveContextAt primitiveContextAtPut subscript:with:storing:format: printContext: compare31or32Bits:equal: signed64BitValueOf: primDigitMultiply:negative: digitLength: isNegativeIntegerValueOf: magnitude64BitValueOf: primitiveMakePoint primitiveAsCharacter primitiveInputSemaphore baseFrameReturn primitiveExternalCall primDigitCompare: + isLiveContext: + numPointerSlotsOf: + fileValueOf:) includes: sel) ifFalse: - isLiveContext:) includes: thisContext sender method selector) ifFalse: [self halt]. ^(oop bitAnd: 1) ~= 0! Item was changed: ----- Method: StackInterpreter>>bereaveAllMarriedContexts (in category 'frame access') ----- bereaveAllMarriedContexts "Enumerate all contexts and convert married contexts to widowed contexts so that the snapshot contains only single contexts. This allows the test for being married to avoid checking for a context's frame pointer being in bounds. Thanks to Greg Nuyens for this idea." - | oop | <asmLabel: false> + objectMemory allObjectsDo: + [:obj| + ((objectMemory isContextNonImm: obj) + and: [self isMarriedOrWidowedContext: obj]) ifTrue: + [self markContextAsDead: obj]]! - oop := objectMemory firstObject. - [oop < objectMemory freeStart] whileTrue: - [((objectMemory isFreeObject: oop) not - and: [(objectMemory isContextNonImm: oop) - and: [self isMarriedOrWidowedContext: oop]]) ifTrue: - [self markContextAsDead: oop]. - oop := objectMemory objectAfter: oop]! Item was changed: ----- Method: StackInterpreter>>checkInterpreterIntegrity (in category 'object memory support') ----- checkInterpreterIntegrity "Perform an integrity/leak check using the heapMap. Assume clearLeakMapAndMapAccessibleObjects has set a bit at each object's header. Check that all oops in the interpreter's state points to a header. Answer if all checks pass." | ok | ok := true. (objectMemory checkOopIntegrity: objectMemory specialObjectsOop named: 'specialObjectsOop')ifFalse: [ok := false]. + "No longer check messageSelector; it is ephemeral, not living beyond message lookup. (objectMemory isNonImmediate: messageSelector) ifTrue: [(objectMemory checkOopIntegrity: messageSelector named: 'messageSelector')ifFalse: + [ok := false]]." - [ok := false]]. (objectMemory checkOopIntegrity: newMethod named: 'newMethod')ifFalse: [ok := false]. + "No longer check lkupClass; it is ephemeral, not living beyond message lookup. (objectMemory checkOopIntegrity: lkupClass named: 'lkupClass')ifFalse: + [ok := false]." - [ok := false]. (objectMemory checkOopIntegrity: profileProcess named: 'profileProcess')ifFalse: [ok := false]. (objectMemory checkOopIntegrity: profileMethod named: 'profileMethod')ifFalse: [ok := false]. (objectMemory checkOopIntegrity: profileSemaphore named: 'profileSemaphore')ifFalse: [ok := false]. tempOop = 0 ifFalse: [(objectMemory checkOopIntegrity: tempOop named: 'tempOop')ifFalse: [ok := false]]. "Callback support - check suspended callback list" 1 to: jmpDepth do: [:i| (objectMemory checkOopIntegrity: (suspendedCallbacks at: i) named: 'suspendedCallbacks' index: i) ifFalse: [ok := false]. (objectMemory checkOopIntegrity: (suspendedMethods at: i) named: 'suspendedMethods' index: i) ifFalse: [ok := false]]. self checkLogIntegrity ifFalse: [ok := false]. ^ok! Item was changed: ----- Method: StackInterpreter>>convertFloatsToPlatformOrderFrom:to: (in category 'image save/restore') ----- convertFloatsToPlatformOrderFrom: startOop to: stopAddr "Byte-swap the words of all bytes objects in a range of the image, including Strings, ByteArrays, and CompiledMethods. This returns these objects to their original byte ordering after blindly byte-swapping the entire image. For compiled methods, byte-swap only their bytecodes part. Ensure floats are in platform-order." - | oop temp | objectMemory vmEndianness = imageFloatsBigEndian ifTrue: [^nil]. self assert: ClassFloatCompactIndex ~= 0. + objectMemory allObjectsDo: + [:obj| | temp | + (objectMemory compactClassIndexOf: obj) = ClassFloatCompactIndex ifTrue: + [temp := self longAt: obj + BaseHeaderSize. + self longAt: obj + BaseHeaderSize put: (self longAt: obj + BaseHeaderSize + 4). + self longAt: obj + BaseHeaderSize + 4 put: temp]]! - oop := startOop. - [self oop: oop isLessThan: stopAddr] whileTrue: - [(objectMemory isFreeObject: oop) ifFalse: - [(objectMemory compactClassIndexOf: oop) = ClassFloatCompactIndex ifTrue: - [temp := self longAt: oop + BaseHeaderSize. - self longAt: oop + BaseHeaderSize put: (self longAt: oop + BaseHeaderSize + 4). - self longAt: oop + BaseHeaderSize + 4 put: temp]]. - oop := objectMemory objectAfter: oop]! Item was changed: ----- Method: StackInterpreter>>longPrintOop: (in category 'debug printing') ----- longPrintOop: oop <api> | class fmt lastIndex startIP bytecodesPerLine column | ((objectMemory isImmediate: oop) or: [(objectMemory addressCouldBeObj: oop) not or: [(oop bitAnd: objectMemory allocationUnit - 1) ~= 0 or: [(objectMemory isFreeObject: oop) or: [objectMemory isForwarded: oop]]]]) ifTrue: [^self printOop: oop]. class := objectMemory fetchClassOfNonImm: oop. self printHex: oop; print: ': a(n) '; printNameOfClass: class count: 5; print: ' ('; printHex: class; print: ')'. fmt := objectMemory formatOf: oop. + self print: ' format '; printHex: fmt. fmt > objectMemory lastPointerFormat ifTrue: [self print: ' nbytes '; printNum: (objectMemory byteLengthOf: oop)]. objectMemory printHeaderTypeOf: oop. + self print: ' hash '; printHex: (objectMemory rawHashBitsOf: oop). - self print: ', hash '; printHex: (objectMemory rawHashBitsOf: oop). self cr. (fmt between: objectMemory firstLongFormat and: objectMemory firstCompiledMethodFormat - 1) ifTrue: [^self]. "this is nonsense. apologies." startIP := (objectMemory lastPointerOf: oop) + BytesPerOop - objectMemory baseHeaderSize / BytesPerOop. lastIndex := 256 min: startIP. lastIndex > 0 ifTrue: [1 to: lastIndex do: [:i| | fieldOop | fieldOop := objectMemory fetchPointer: i - 1 ofObject: oop. self space; printNum: i - 1; space; printHex: fieldOop; space. (i = 1 and: [objectMemory isCompiledMethod: oop]) ifTrue: [self printMethodHeaderOop: fieldOop] ifFalse: [self printOopShort: fieldOop]. self cr]]. (objectMemory isCompiledMethod: oop) ifFalse: [startIP > 64 ifTrue: [self print: '...'; cr]] ifTrue: [startIP := startIP * BytesPerWord + 1. lastIndex := objectMemory lengthOf: oop. lastIndex - startIP > 100 ifTrue: [lastIndex := startIP + 100]. bytecodesPerLine := 8. column := 1. startIP to: lastIndex do: [:index| | byte | column = 1 ifTrue: [self cCode: 'printf("0x%08x: ", oop+BaseHeaderSize+index-1)' inSmalltalk: [self print: (oop+BaseHeaderSize+index-1) hex; print: ': ']]. byte := objectMemory fetchByte: index - 1 ofObject: oop. self cCode: 'printf(" %02x/%-3d", byte,byte)' inSmalltalk: [self space; print: (byte radix: 16); printChar: $/; printNum: byte]. column := column + 1. column > bytecodesPerLine ifTrue: [column := 1. self cr]]. column = 1 ifFalse: [self cr]]! Item was changed: ----- Method: StackInterpreter>>snapshot: (in category 'image save/restore') ----- snapshot: embedded "update state of active context" | activeContext activeProc dataSize rcvr setMacType stackIndex | <var: #setMacType type: 'void *'> "For nowe the stack munging below doesn't deal with more than omne argument. It can, and should." argumentCount ~= 0 ifTrue: [^self primitiveFailFor: PrimErrBadNumArgs]. "Need to convert all frames into contexts since the snapshot file only holds objects." self push: instructionPointer. activeContext := self voidVMStateForSnapshot. "update state of active process" activeProc := self activeProcess. objectMemory storePointer: SuspendedContextIndex ofObject: activeProc withValue: activeContext. objectMemory pushRemappableOop: activeContext. + "garbage collect, bereave contexts and flush external methods." - "compact memory and compute the size of the memory actually in use" - objectMemory incrementalGC. - - "maximimize space for forwarding table" - objectMemory fullGC. self snapshotCleanUp. "Nothing moves from here on so it is safe to grab the activeContext again." activeContext := objectMemory popRemappableOop. dataSize := objectMemory freeStart - objectMemory startOfMemory. "Assume all objects are below the start of the free block" self successful ifTrue: ["Without contexts or stacks simulate rcvr := self popStack. ''pop rcvr'' self push: trueObj. to arrange that the snapshot resumes with true. N.B. stackIndex is one-relative." stackIndex := self quickFetchInteger: StackPointerIndex ofObject: activeContext. rcvr := objectMemory fetchPointer: stackIndex + CtxtTempFrameStart - 1 ofObject: activeContext. objectMemory storePointerUnchecked: stackIndex + CtxtTempFrameStart - 1 ofObject: activeContext withValue: objectMemory trueObject. "now attempt to write the snapshot file" self writeImageFileIO: dataSize. (self successful and: [embedded not]) ifTrue: ["set Mac file type and creator; this is a noop on other platforms" setMacType := self ioLoadFunction: 'setMacFileTypeAndCreator' From: 'FilePlugin'. setMacType = 0 ifFalse: [self cCode: '((sqInt (*)(char *, char *, char *))setMacType)(imageName, "STim", "FAST")']]. "Without contexts or stacks simulate self pop: 1" objectMemory storePointerUnchecked: StackPointerIndex ofObject: activeContext withValue: (objectMemory integerObjectOf: stackIndex - 1)]. self marryContextInNewStackPageAndInitializeInterpreterRegisters: activeContext. self successful ifTrue: [self push: objectMemory falseObject] ifFalse: [self push: rcvr. self justActivateNewMethod]! Item was changed: ----- Method: StackInterpreter>>snapshotCleanUp (in category 'image save/restore') ----- snapshotCleanUp + "Clean up right before saving an image, garbage collecting, sweeping memory and: - "Clean up right before saving an image, sweeping memory and: * nilling out all fields of contexts above the stack pointer. * flushing external primitives * clearing the root bit of any object in the root table * bereaving widowed contexts. By ensuring that all contexts are single in a snapshot (i.e. that no married contexts exist) we can maintain the invariant that a married or widowed context's frame reference (in its sender field) must point into the stack pages since no married or widowed contexts are present from older runs of the system." + + objectMemory hasSpurMemoryManagerAPI + ifTrue: [objectMemory flushNewSpace] + ifFalse: [objectMemory incrementalGC] "compact memory and compute the size of the memory actually in use" + + "maximimize space for forwarding table" + objectMemory fullGC. + + objectMemory allObjectsDo: + [:obj| | header fmt sz | + header := self longAt: obj. + fmt := objectMemory formatOfHeader: header. + "Clean out context" + (fmt = objectMemory indexablePointersFormat + and: [objectMemory isContextHeader: header]) ifTrue: + ["All contexts have been divorced. Bereave remaining widows." + (self isMarriedOrWidowedContext: obj) ifTrue: + [self markContextAsDead: obj]. + "Fill slots beyond top of stack with nil" + (self fetchStackPointerOf: obj) to: (objectMemory numSlotsOf: obj) do: + [:i | objectMemory + storePointerUnchecked: i + CtxtTempFrameStart + ofObject: obj + withValue: objectMemory nilObject]]. + "Clean out external functions from compiled methods" + fmt >= objectMemory firstCompiledMethodFormat ifTrue: + ["Its primitiveExternalCall" + (self primitiveIndexOf: obj) = PrimitiveExternalCallIndex ifTrue: + [self flushExternalPrimitiveOf: obj]]]. + + objectMemory hasSpurMemoryManagerAPI ifFalse: + [objectMemory clearRootsTable]! - | oop header fmt sz | - oop := objectMemory firstObject. - [self oop: oop isLessThan: objectMemory freeStart] whileTrue: - [(objectMemory isFreeObject: oop) ifFalse: - [header := self longAt: oop. - fmt := objectMemory formatOfHeader: header. - "Clean out context" - (fmt = objectMemory indexablePointersFormat - and: [objectMemory isContextHeader: header]) ifTrue: - ["All contexts have been divorced. Bereave remaining widows." - (self isMarriedOrWidowedContext: oop) ifTrue: - [self markContextAsDead: oop]. - sz := objectMemory sizeBitsOf: oop. - (objectMemory lastPointerOf: oop) + BytesPerWord - to: sz - BaseHeaderSize by: BytesPerWord - do: [:i | self longAt: oop + i put: objectMemory nilObject]]. - "Clean out external functions from compiled methods" - fmt >= objectMemory firstCompiledMethodFormat ifTrue: - ["Its primitiveExternalCall" - (self primitiveIndexOf: oop) = PrimitiveExternalCallIndex ifTrue: - [self flushExternalPrimitiveOf: oop]]]. - oop := objectMemory objectAfter: oop]. - objectMemory clearRootsTable! Item was changed: ----- Method: StackInterpreterSimulator>>allObjectsSelect: (in category 'debug support') ----- allObjectsSelect: objBlock "self allObjectsSelect: [:oop | (self baseHeader: oop) = 1234]" + | selected | - | oop selected | - oop := objectMemory firstObject. selected := OrderedCollection new. + objectMemory allObjectsDo: + [:obj| + (objBlock value: obj) ifTrue: [selected addLast: obj]]. + ^selected! - [oop < objectMemory endOfMemory] whileTrue: - [(objectMemory isFreeObject: oop) - ifFalse: [(objBlock value: oop) ifTrue: [selected addLast: oop]]. - oop := objectMemory objectAfter: oop]. - ^ selected! Item was added: + ----- Method: StackInterpreterSimulator>>checkStackIntegrity (in category 'object memory support') ----- + checkStackIntegrity + "Override to deal with incomplete initialization." + stackPages ifNil: [^true]. + ^super checkStackIntegrity!

1 0

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

20 Sep '13

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.95.mcz ==================== Summary ==================== Name: Cog-eem.95 Author: eem Time: 20 September 2013, 2:38:26.947 pm UUID: b1121b44-9ae1-4477-b7b2-1b09935e73c5 Ancestors: Cog-eem.94 SpurBootstrap: Implement freeForwarders & a stub compactImage. Turns out not to be needed because the scavenger is effecive enough that no forwarders get tenured during rehash. Comment the halt in replacementForCharacterMethod: (thanks Frank!). Allocate a bigger heap. Run the leak checker on launch (probably doubling up, but what the hell). =============== Diff against Cog-eem.94 =============== Item was added: + ----- Method: SpurBootstrap>>compactImage (in category 'bootstrap image') ----- + compactImage + | firstFree lastUsed | + newHeap allHeapEntitiesDo: + [:o| + (newHeap isFreeObject: o) + ifTrue: [firstFree ifNil: [firstFree := o]] + ifFalse: [lastUsed := o]]. + lastUsed < firstFree ifTrue: "nothing to do" + [^self]. + self halt! Item was added: + ----- Method: SpurBootstrap>>freeForwarders (in category 'bootstrap image') ----- + freeForwarders + "Check that all forwarders have been followed. Then free them." + | numForwarders numFreed | + numForwarders := numFreed := 0. + newHeap allObjectsDo: + [:o| + (newHeap isForwarded: o) + ifTrue: [numForwarders := numForwarders + 1] + ifFalse: + [0 to: (newHeap numPointerSlotsOf: o) - 1 do: + [:i| + self assert: (newHeap isOopForwarded: (newHeap fetchPointer: i ofObject: o)) not]]]. + Transcript nextPutAll: 'freeing '; print: numForwarders; nextPutAll: ' forwarders'; cr; flush. + newHeap allObjectsDo: + [:o| + (newHeap isForwarded: o) ifTrue: + [numFreed := numFreed + 1. + newHeap freeObject: o]]. + self assert: numFreed = numForwarders! Item was changed: ----- Method: SpurBootstrap>>launch:headerFlags: (in category 'testing') ----- launch: heap headerFlags: headerFlags | sim | sim := StackInterpreterSimulator onObjectMemory: heap. heap coInterpreter: sim. sim initializeInterpreter: 0; setImageHeaderFlagsFrom: headerFlags; imageName: ImageName; flushExternalPrimitives; openAsMorph; transcript: Transcript. "deep copy copies this" "sim instVarNamed: 'printSends' put: true; instVarNamed: 'printReturns' put: true; instVarNamed: 'methodDictLinearSearchLimit' put: SmallInteger maxVal." "for now" + heap + setCheckForLeaks: 15; + runLeakCheckerForFullGC: true. + - heap setCheckForLeaks: 15. sim halt; run! Item was changed: ----- Method: SpurBootstrap>>on: (in category 'initialize-release') ----- on: imageName StackInterpreter initializeWithOptions: Dictionary new. oldInterpreter := StackInterpreterSimulator new. oldInterpreter openOn: imageName extraMemory: 0. oldHeap := oldInterpreter objectMemory. newHeap := Spur32BitMMLESimulator new. newHeap + allocateMemoryOfSize: (oldHeap youngStart * 3 / 2 roundUpTo: 1024 * 1024) - allocateMemoryOfSize: (oldHeap youngStart * 5 / 4 roundUpTo: 8) newSpaceSize: 1024 * 1024 codeSize: 1024 * 1024. + newHeap setCheckForLeaks: 15 - 4. "don't check become; soooo many rehashes in bootstrap" - newHeap setCheckForLeaks: 15 - 4. "don't check become" map := Dictionary new: oldHeap memory size // 4. reverseMap := Dictionary new: oldHeap memory size // 4. classToIndex := Dictionary new: 1024. literalMap := IdentityDictionary new. methodClasses := Set new. installedPrototypes := Set new! Item was changed: ----- Method: SpurBootstrap>>replacementForCharacterMethod: (in category 'bootstrap methods') ----- replacementForCharacterMethod: characterMethodOop "Answer a replacement method for the argument if it refers to Character's old inst var value. Otherwise answer nil." | proxy asIntegerProxy clone assembly newInsts newMethod | "(oldHeap stringOf: (oldHeap longAt: characterMethodOop + (oldHeap lastPointerOf: characterMethodOop) - 4)) = 'isOctetCharacter' ifTrue: [self halt]." proxy := VMCompiledMethodProxy new for: characterMethodOop coInterpreter: oldInterpreter objectMemory: oldHeap. clone := self cloneMethodProxy: proxy. + "Quick methods accessing value should have been replaced. The halt will fire if there + is a missing prototype for such a method on the class side of SpurBootstrap. The + relevant Character prototypes there so far are Character>>asInteger, Character>> + asciiValue, Character>>hash & Character>>identityHash. Conceivably the bootstrap + could be applied to an image that has others; hence the halt." - "Quick methods accessing value should have been replaced." clone isReturnField ifTrue: [self halt]. clone hasInstVarRef ifFalse: [^nil]. clone setSourcePointer: 0. asIntegerProxy := VMObjectProxy new for: (literalMap at: #asInteger) coInterpreter: oldInterpreter objectMemory: oldHeap. assembly := BytecodeDisassembler new disassemble: clone. assembly literals: (assembly literals allButLast: 2), {asIntegerProxy}, (assembly literals last: 2). "Do this by looking for index of pushReceiverVariable: and replacing it by pushSelf, send asInteger" newInsts := (assembly instructions piecesCutWhere: [:msgOrLabelAssoc :nextInst| msgOrLabelAssoc isVariableBinding not and: [msgOrLabelAssoc selector == #pushReceiverVariable:]]) fold: [:a :b| a allButLast, { Message selector: #pushReceiver. Message selector: #send:super:numArgs: arguments: {asIntegerProxy. false. 0}}, b]. assembly instructions: newInsts. newMethod := assembly assemble. ^self installableMethodFor: newMethod selector: clone selector className: #Character isMeta: false! Item was changed: ----- Method: SpurBootstrap>>transform (in category 'bootstrap image') ----- transform self rememberRehashSymbol. self findRequiredGlobals. self installModifiedMethods. self bootstrapImage. self validate. self rehashImage. self followForwardingPointers. self scavengeImage. + self freeForwarders. + self compactImage. Transcript nextPutAll: 'done.'; flush.!

1 0

← Newer
1
2
3
4
5
6
7
8
...
16
Older →

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